Revert zh_CN and zh_TW changes because gettext sucks

2002-05-08  JP Rosevear  <jpr@ximian.com>

	* Revert zh_CN and zh_TW changes because gettext sucks

svn path=/trunk/; revision=16727

3 files changed, 9244 insertions, 27321 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 12653c6e03..0c78448999 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,9 @@
 2002-05-08  JP Rosevear  <jpr@ximian.com>
 
+	* Revert zh_CN and zh_TW changes because gettext sucks
+
+2002-05-08  JP Rosevear  <jpr@ximian.com>
+	
 	* Update the po files to cut down on dist time
 
 2002-05-06  Christopher James Lahey  <clahey@ximian.com>
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e44aaea3b9..24d9131492 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-02-04 22:42+0800\n"
 "PO-Revision-Date: 2002-02-04 22:51+0800\n"
 "Last-Translator: Wang Li <charlesw1234@163.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -47,7 +47,7 @@ msgstr "将 VCard 文件导入 Evolution"
 # addressbook/backend/ebook/e-card-simple.c:60
 # addressbook/gui/widgets/e-addressbook-view.c:960
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "File As"
 msgstr ""
 
@@ -55,7 +55,6 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:61
 # addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "名称"
 
@@ -66,7 +65,7 @@ msgstr "名称"
 # addressbook/backend/ebook/e-card-simple.c:62
 # addressbook/gui/widgets/e-addressbook-view.c:962
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:962
 msgid "Email"
 msgstr "电子邮件"
 
@@ -103,7 +102,7 @@ msgstr "主要"
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/contact-editor/e-contact-editor.c:1716
-#: addressbook/gui/widgets/e-addressbook-view.c:369
+#: addressbook/gui/widgets/e-addressbook-view.c:994
 msgid "Assistant"
 msgstr "助手"
 
@@ -200,7 +199,7 @@ msgstr "家庭"
 # addressbook/backend/ebook/e-card-simple.c:69
 # addressbook/gui/widgets/e-addressbook-view.c:969
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "Organization"
 msgstr "组织"
 
@@ -252,7 +251,7 @@ msgstr "汽车"
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
 #: addressbook/gui/contact-editor/e-contact-editor.c:1719
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:974
 msgid "Business Fax"
 msgstr "商务传真"
 
@@ -274,7 +273,7 @@ msgstr "商务传真"
 # addressbook/gui/widgets/e-addressbook-view.c:975
 #: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1725
-#: addressbook/gui/widgets/e-addressbook-view.c:350
+#: addressbook/gui/widgets/e-addressbook-view.c:975
 msgid "Home Fax"
 msgstr "家庭传真"
 
@@ -318,7 +317,7 @@ msgstr "家庭 2"
 # addressbook/gui/widgets/e-addressbook-view.c:978
 #: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1726
-#: addressbook/gui/widgets/e-addressbook-view.c:353
+#: addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -341,6 +340,7 @@ msgstr "ISDN"
 #: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/contact-editor/e-contact-editor.c:1728
 #: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: mail/mail-config.glade.h:58
 msgid "Other"
 msgstr "其它"
 
@@ -355,7 +355,7 @@ msgstr "其它"
 # addressbook/gui/widgets/e-addressbook-view.c:980
 #: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:355
+#: addressbook/gui/widgets/e-addressbook-view.c:980
 msgid "Other Fax"
 msgstr "其它传真"
 
@@ -370,7 +370,7 @@ msgstr "其它传真"
 # addressbook/gui/widgets/e-addressbook-view.c:981
 #: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1730
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.c:981
 msgid "Pager"
 msgstr "传呼机"
 
@@ -385,7 +385,7 @@ msgstr "传呼机"
 # addressbook/gui/widgets/e-addressbook-view.c:982
 #: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/contact-editor/e-contact-editor.c:1732
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:982
 msgid "Radio"
 msgstr "收音机"
 
@@ -400,7 +400,7 @@ msgstr "收音机"
 # addressbook/gui/widgets/e-addressbook-view.c:983
 #: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1733
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.c:983
 msgid "Telex"
 msgstr "电传"
 
@@ -411,7 +411,7 @@ msgstr "电传"
 # addressbook/backend/ebook/e-card-simple.c:84
 # addressbook/gui/widgets/e-addressbook-view.c:984
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:984
 msgid "TTY"
 msgstr "TTY"
 
@@ -430,7 +430,7 @@ msgstr "TTY"
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
 #: addressbook/gui/contact-editor/e-contact-editor.c:1759
-#: addressbook/gui/widgets/e-addressbook-view.c:361
+#: addressbook/gui/widgets/e-addressbook-view.c:986
 msgid "Email 2"
 msgstr "电子邮件 2"
 
@@ -449,7 +449,7 @@ msgstr "电子邮件 2"
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
 #: addressbook/gui/contact-editor/e-contact-editor.c:1760
-#: addressbook/gui/widgets/e-addressbook-view.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:987
 msgid "Email 3"
 msgstr "电子邮件 3"
 
@@ -460,7 +460,7 @@ msgstr "电子邮件 3"
 # addressbook/backend/ebook/e-card-simple.c:88
 # addressbook/gui/widgets/e-addressbook-view.c:988
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:988
 msgid "Web Site"
 msgstr "网站"
 
@@ -478,7 +478,7 @@ msgstr "Url"
 # addressbook/backend/ebook/e-card-simple.c:89
 # addressbook/gui/widgets/e-addressbook-view.c:989
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:364
+#: addressbook/gui/widgets/e-addressbook-view.c:989
 msgid "Department"
 msgstr "部门"
 
@@ -496,7 +496,7 @@ msgstr "部门"
 # addressbook/backend/ebook/e-card-simple.c:90
 # addressbook/gui/widgets/e-addressbook-view.c:990
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.c:990
 msgid "Office"
 msgstr "办公室"
 
@@ -514,7 +514,7 @@ msgstr "办公室"
 # addressbook/backend/ebook/e-card-simple.c:91
 # addressbook/gui/widgets/e-addressbook-view.c:991
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:991
 msgid "Title"
 msgstr "头衔"
 
@@ -525,7 +525,7 @@ msgstr "头衔"
 # addressbook/backend/ebook/e-card-simple.c:92
 # addressbook/gui/widgets/e-addressbook-view.c:992
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:367
+#: addressbook/gui/widgets/e-addressbook-view.c:992
 msgid "Profession"
 msgstr "职业"
 
@@ -543,7 +543,7 @@ msgstr "职业"
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/gui/widgets/e-addressbook-view.c:993
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:368
+#: addressbook/gui/widgets/e-addressbook-view.c:993
 msgid "Manager"
 msgstr "经理"
 
@@ -568,7 +568,7 @@ msgstr "助手"
 # addressbook/backend/ebook/e-card-simple.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:995
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/widgets/e-addressbook-view.c:995
 msgid "Nickname"
 msgstr "绰号"
 
@@ -586,7 +586,7 @@ msgstr "绰号"
 # addressbook/backend/ebook/e-card-simple.c:96
 # addressbook/gui/widgets/e-addressbook-view.c:996
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/widgets/e-addressbook-view.c:996
 msgid "Spouse"
 msgstr "配偶"
 
@@ -597,7 +597,7 @@ msgstr "配偶"
 # addressbook/backend/ebook/e-card-simple.c:97
 # addressbook/gui/widgets/e-addressbook-view.c:997
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:372
+#: addressbook/gui/widgets/e-addressbook-view.c:997
 msgid "Note"
 msgstr "注释"
 
@@ -622,7 +622,7 @@ msgstr "日历 URI"
 # addressbook/backend/ebook/e-card-simple.c:99
 # addressbook/gui/widgets/e-addressbook-view.c:998
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:373
+#: addressbook/gui/widgets/e-addressbook-view.c:998
 msgid "Free-busy URL"
 msgstr "忙闲 URL"
 
@@ -683,14 +683,14 @@ msgstr "%x"
 # addressbook/backend/ebook/e-card.c:4235
 # addressbook/backend/ebook/e-card.c:4235
 # addressbook/backend/ebook/e-card.c:4235
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card.c:2677
 msgid "Multiple VCards"
 msgstr "多个 VCard"
 
 # addressbook/backend/ebook/e-card.c:4243
 # addressbook/backend/ebook/e-card.c:4243
 # addressbook/backend/ebook/e-card.c:4243
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2685
 #, c-format
 msgid "VCard for %s"
 msgstr "%s 的 VCard"
@@ -733,11 +733,11 @@ msgstr "%s 的 VCard"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
+#: addressbook/conduit/address-conduit.c:1721
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/conduits/todo/todo-conduit.c:1316
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -750,15 +750,15 @@ msgstr "无法初始化 Bonobo"
 # addressbook/backend/pas/pas-backend-ldap.c:2269
 # addressbook/backend/pas/pas-backend-file.c:259
 # addressbook/backend/pas/pas-backend-ldap.c:2272
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-file.c:260
+#: addressbook/backend/pas/pas-backend-ldap.c:2272
 msgid "Searching..."
 msgstr "搜索..."
 
 # addressbook/backend/pas/pas-backend-file.c:261
 # addressbook/backend/pas/pas-backend-file.c:261
 # addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:262
 msgid "Loading..."
 msgstr "装入..."
 
@@ -766,83 +766,77 @@ msgstr "装入..."
 # addressbook/backend/pas/pas-backend-file.c:270
 # addressbook/backend/pas/pas-backend-file.c:270
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:271
 msgid "Error in search expression."
 msgstr "搜索表达式错误。"
 
+# addressbook/backend/pas/pas-backend-ldap.c:483
+# addressbook/backend/pas/pas-backend-ldap.c:483
+# addressbook/backend/pas/pas-backend-ldap.c:486
+#: addressbook/backend/pas/pas-backend-ldap.c:486
+msgid "Connecting to LDAP server..."
+msgstr "正在连接 LDAP 服务器..."
+
+# addressbook/backend/pas/pas-backend-ldap.c:493
+# addressbook/backend/pas/pas-backend-ldap.c:493
+# addressbook/backend/pas/pas-backend-ldap.c:496
+#: addressbook/backend/pas/pas-backend-ldap.c:496
+msgid "Unable to connect to LDAP server."
+msgstr "无法连接 LDAP 服务器。"
+
+# addressbook/backend/pas/pas-backend-ldap.c:509
+# addressbook/backend/pas/pas-backend-ldap.c:509
+# addressbook/backend/pas/pas-backend-ldap.c:512
+#: addressbook/backend/pas/pas-backend-ldap.c:512
+msgid "Waiting for connection to LDAP server..."
+msgstr "正在等待与 LDAP 服务器的连接..."
+
 # addressbook/backend/pas/pas-backend-ldap.c:912
 # addressbook/backend/pas/pas-backend-ldap.c:912
 # addressbook/backend/pas/pas-backend-ldap.c:915
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:915
 msgid "Adding card to LDAP server..."
 msgstr "正在将卡片添加到 LDAP 服务器..."
 
 # addressbook/backend/pas/pas-backend-ldap.c:1013
 # addressbook/backend/pas/pas-backend-ldap.c:1013
 # addressbook/backend/pas/pas-backend-ldap.c:1016
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1016
 msgid "Removing card from LDAP server..."
 msgstr "正在从 LDAP 服务器删除卡片..."
 
 # addressbook/backend/pas/pas-backend-ldap.c:1123
 # addressbook/backend/pas/pas-backend-ldap.c:1123
 # addressbook/backend/pas/pas-backend-ldap.c:1126
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Modifying card from LDAP server..."
 msgstr "正在修改 LDAP 服务器上的卡片..."
 
-# addressbook/backend/pas/pas-backend-ldap.c:2219
-# addressbook/backend/pas/pas-backend-ldap.c:2219
-# addressbook/backend/pas/pas-backend-ldap.c:2222
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
-msgid "Restarting search."
-msgstr "开始搜索，"
-
 # addressbook/backend/pas/pas-backend-ldap.c:2214
 # addressbook/backend/pas/pas-backend-ldap.c:2214
 # addressbook/backend/pas/pas-backend-ldap.c:2217
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2217
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 的搜索结果..."
 
-# addressbook/gui/widgets/e-addressbook-util.c:95
-# addressbook/gui/widgets/e-addressbook-view.c:1278
-# addressbook/gui/widgets/e-addressbook-util.c:95
-# addressbook/gui/widgets/e-addressbook-view.c:1278
-# addressbook/gui/widgets/e-addressbook-util.c:95
-# addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
-#, fuzzy
-msgid "Error performing search"
-msgstr "删除卡片错误"
-
-# camel/camel-url.c:288
-# camel/camel-url.c:288
-# camel/camel-url.c:288
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
-#, fuzzy
-msgid "Could not parse query string"
-msgstr "无法解析 URL “%s”"
-
-# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:108
-#: addressbook/conduit/address-conduit.c:293
-#, fuzzy
-msgid "Default Sync Address:"
-msgstr "电子邮件地址(_E)："
+# addressbook/backend/pas/pas-backend-ldap.c:2219
+# addressbook/backend/pas/pas-backend-ldap.c:2219
+# addressbook/backend/pas/pas-backend-ldap.c:2222
+#: addressbook/backend/pas/pas-backend-ldap.c:2222
+msgid "Restarting search."
+msgstr "开始搜索，"
 
 # addressbook/conduit/address-conduit.c:294
 # addressbook/conduit/address-conduit.c:294
 # addressbook/conduit/address-conduit.c:426
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:426
 msgid "Cursor could not be loaded\n"
 msgstr "无法装入光标\n"
 
 # addressbook/conduit/address-conduit.c:307
 # addressbook/conduit/address-conduit.c:307
 # addressbook/conduit/address-conduit.c:439
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:439
 msgid "EBook not loaded\n"
 msgstr "没有装入 EBook\n"
 
@@ -855,9 +849,9 @@ msgstr "没有装入 EBook\n"
 # addressbook/conduit/address-conduit.c:1220
 # calendar/conduits/calendar/calendar-conduit.c:1203
 # calendar/conduits/todo/todo-conduit.c:824
-#: addressbook/conduit/address-conduit.c:1354
+#: addressbook/conduit/address-conduit.c:1220
 #: calendar/conduits/calendar/calendar-conduit.c:1203
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/todo/todo-conduit.c:824
 msgid "Could not start wombat server"
 msgstr "无法启动 wombat 服务器"
 
@@ -870,9 +864,9 @@ msgstr "无法启动 wombat 服务器"
 # addressbook/conduit/address-conduit.c:1221
 # calendar/conduits/calendar/calendar-conduit.c:1204
 # calendar/conduits/todo/todo-conduit.c:825
-#: addressbook/conduit/address-conduit.c:1355
+#: addressbook/conduit/address-conduit.c:1221
 #: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:890
+#: calendar/conduits/todo/todo-conduit.c:825
 msgid "Could not start wombat"
 msgstr "无法启动 wombat"
 
@@ -882,8 +876,8 @@ msgstr "无法启动 wombat"
 # addressbook/conduit/address-conduit.c:1128
 # addressbook/conduit/address-conduit.c:1251
 # addressbook/conduit/address-conduit.c:1254
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1251
+#: addressbook/conduit/address-conduit.c:1254
 msgid "Could not read pilot's Address application block"
 msgstr "无法读入 Pilot 的地址应用程序块"
 
@@ -906,90 +900,59 @@ msgstr "用于显示一条地址的 Bonobo 控制。"
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 # notes/GNOME_Evolution_Notes.oaf.in.h:1
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: notes/GNOME_Evolution_Notes.oaf.in.h:1
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "显示地址簿的 Bonobo 控制示例。"
 
-# addressbook/gui/component/addressbook-config.glade.h:4
-# addressbook/gui/component/addressbook-config.glade.h:4
-# addressbook/gui/component/addressbook-config.glade.h:6
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "地址簿资源"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "显示 Evolution 地址簿小卡片的控制。"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Directory Servers"
-msgstr ""
-
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution 地址簿小卡片显示器"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Evolution component for handling contacts."
 msgstr "处理联系人的 Evolution 成员。"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Factory for the Addressbook Minicard control"
 msgstr "地址簿小卡片控制车间"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Addressbook's address displayer"
 msgstr "地址簿地址显示器车间"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook's address popup"
 msgstr "地址簿地址对话框车间"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr ""
-
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the sample Addressbook control"
 msgstr "示例地址簿控制车间"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
-msgid "This page can be used to configure access to LDAP directory servers"
-msgstr ""
-
 # addressbook/gui/component/addressbook-component.c:71
 # calendar/gui/dialogs/comp-editor-util.c:310
 # calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
@@ -1002,31 +965,31 @@ msgstr ""
 # calendar/gui/dialogs/comp-editor-util.c:310
 # calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
 # shell/e-shortcuts.c:1061
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:71
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "联系人"
 
 # addressbook/gui/component/addressbook-component.c:71
 # addressbook/gui/component/addressbook-component.c:71
 # addressbook/gui/component/addressbook-component.c:71
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "含有联系人信息的文件夹"
 
 # addressbook/gui/component/addressbook-component.c:73
 # addressbook/gui/component/addressbook-component.c:73
 # addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
 # addressbook/gui/component/addressbook-component.c:73
 # addressbook/gui/component/addressbook-component.c:73
 # addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "LDAP server containing contact information"
 msgstr "含有联系人信息的 LDAP 服务器"
 
@@ -1036,32 +999,349 @@ msgstr "含有联系人信息的 LDAP 服务器"
 # ui/evolution-addressbook.xml.h:11
 # addressbook/gui/component/addressbook-component.c:527
 # ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:527
+#: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "新建联系人"
 
-# ui/evolution-addressbook.xml.h:31
-# ui/evolution-addressbook.xml.h:31
-# ui/evolution-addressbook.xml.h:32
-#: addressbook/gui/component/addressbook-component.c:562
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "联系人(_C)"
+# addressbook/gui/component/addressbook-component.c:526
+# addressbook/gui/component/addressbook-component.c:526
+# addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:527
+msgid "New _Contact"
+msgstr "新建联系人(_C)"
 
 # addressbook/gui/component/addressbook-component.c:527
 # addressbook/gui/component/addressbook-component.c:527
 # addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-component.c:530
 msgid "New Contact List"
 msgstr "新建联系人列表"
 
-# ui/evolution-addressbook.xml.h:32
-# ui/evolution-addressbook.xml.h:32
-# ui/evolution-addressbook.xml.h:33
-#: addressbook/gui/component/addressbook-component.c:565
-#, fuzzy
-msgid "Contact _List"
-msgstr "联系人列表(_C)"
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:530
+msgid "New Contact _List"
+msgstr "新建联系人列表(_L)"
+
+# addressbook/gui/component/addressbook-config.c:186
+# addressbook/gui/component/addressbook-config.c:186
+# addressbook/gui/component/addressbook-config.c:223
+#: addressbook/gui/component/addressbook-config.c:223
+msgid "Edit Addressbook"
+msgstr "编辑地址簿"
+
+# calendar/gui/e-calendar-table.c:437
+# calendar/gui/e-calendar-table.c:437
+# addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "100"
+msgstr "100"
+
+# addressbook/gui/component/addressbook-config.glade.h:1
+# addressbook/gui/component/addressbook-config.glade.h:1
+# addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "389"
+msgstr "389"
+
+# camel/providers/smtp/camel-smtp-transport.c:222
+# camel/providers/smtp/camel-smtp-transport.c:222
+# addressbook/gui/component/addressbook-config.glade.h:3
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "A_uthenticate with server using:"
+msgstr "以之与服务器进行认证(_U)："
+
+# addressbook/gui/component/addressbook-config.glade.h:2
+# addressbook/gui/component/addressbook-config.glade.h:2
+# addressbook/gui/component/addressbook-config.glade.h:4
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Account Name"
+msgstr "帐号名"
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:5
+msgid "Add Addressbook"
+msgstr "添加地址簿"
+
+# addressbook/gui/component/addressbook-config.glade.h:4
+# addressbook/gui/component/addressbook-config.glade.h:4
+# addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Addressbook Sources"
+msgstr "地址簿资源"
+
+# addressbook/gui/component/addressbook-config.glade.h:5
+# addressbook/gui/component/addressbook-config.glade.h:5
+# addressbook/gui/component/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:7
+msgid "Advanced"
+msgstr "高级"
+
+# addressbook/gui/component/addressbook-config.glade.h:6
+# addressbook/gui/component/addressbook-config.glade.h:6
+# addressbook/gui/component/addressbook-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.glade.h:8
+msgid "Base"
+msgstr "起点"
+
+# addressbook/gui/component/addressbook-config.glade.h:7
+# calendar/gui/dialogs/task-editor.c:178
+# addressbook/gui/component/addressbook-config.glade.h:7
+# calendar/gui/dialogs/task-editor.c:178
+# addressbook/gui/component/addressbook-config.glade.h:9
+# calendar/gui/dialogs/task-editor.c:178
+#: addressbook/gui/component/addressbook-config.glade.h:9
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "基本"
+
+# addressbook/gui/component/addressbook-config.glade.h:26
+# addressbook/gui/component/addressbook-config.glade.h:26
+# addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Check this if the server requires you to authenticate."
+msgstr "如果服务器需要您进行认证就监查它。"
+
+# addressbook/gui/component/addressbook-config.glade.h:8
+# addressbook/gui/component/addressbook-config.glade.h:8
+# addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:11
+msgid "De_lete"
+msgstr "删除(_L)"
+
+# addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/addressbook-config.glade.h:12
+msgid "Distinguished name (DN)"
+msgstr "识别姓名 (DN)"
+
+# addressbook/gui/component/addressbook-config.glade.h:9
+# addressbook/gui/component/addressbook-config.glade.h:9
+# addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/addressbook-config.glade.h:13
+msgid "Email address"
+msgstr "电子邮件地址"
+
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid ""
+"Evolution will use this Distinquished Name (DN) to authenticate you with the "
+"server"
+msgstr "Evolution 将使用该识别姓名 (DN) 在服务器上对您进行认证"
+
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr "Evolution 将使用该电子邮件地址在服务器上对您进行认证"
+
+# addressbook/gui/component/addressbook-config.glade.h:11
+# addressbook/gui/component/addressbook-config.glade.h:11
+# addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/addressbook-config.glade.h:16
+msgid "One"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:12
+# addressbook/gui/component/addressbook-config.glade.h:12
+# addressbook/gui/component/addressbook-config.glade.h:17
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid "Search _base:"
+msgstr "搜索起点(_B)："
+
+# addressbook/gui/component/addressbook-config.glade.h:13
+# addressbook/gui/component/addressbook-config.glade.h:13
+# addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid "Search s_cope: "
+msgstr "搜索范围(_C)："
+
+# addressbook/gui/component/addressbook-config.glade.h:14
+# addressbook/gui/component/addressbook-config.glade.h:14
+# addressbook/gui/component/addressbook-config.glade.h:19
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid "Server Name"
+msgstr "服务器名"
+
+# addressbook/gui/component/addressbook-config.glade.h:15
+# addressbook/gui/component/addressbook-config.glade.h:15
+# addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid "Sub"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:16
+# addressbook/gui/component/addressbook-config.glade.h:16
+# addressbook/gui/component/addressbook-config.glade.h:21
+#: addressbook/gui/component/addressbook-config.glade.h:21
+msgid "The information below is required in order to add an addressbook.  "
+msgstr "为添加地址簿，需要以下信息。  "
+
+# addressbook/gui/component/addressbook-config.glade.h:17
+# addressbook/gui/component/addressbook-config.glade.h:17
+# addressbook/gui/component/addressbook-config.glade.h:22
+#: addressbook/gui/component/addressbook-config.glade.h:22
+msgid "This information is not required for most ldap servers. "
+msgstr "大部分 LDAP 服务器都不需要该信息。"
+
+# addressbook/gui/component/addressbook-config.glade.h:18
+# addressbook/gui/component/addressbook-config.glade.h:18
+# addressbook/gui/component/addressbook-config.glade.h:23
+#: addressbook/gui/component/addressbook-config.glade.h:23
+msgid ""
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
+msgstr ""
+"您的 LDAP 服务器用该信息来确定在搜索中使用那个节点。详情请咨询您的服务器管理"
+"员。"
+
+# Addressbook/gui/component/addressbook-config.glade.h:19
+# addressbook/gui/component/addressbook-config.glade.h:19
+# addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:24
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
+"这是您在 LDAP 服务器上进行的所有搜索的基本节点。详情请咨询您的服务器管理员。"
+
+# addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/addressbook-config.glade.h:25
+msgid ""
+"This is the maximum number of cards to download.  Setting this number too "
+"large will slow down this addressbook."
+msgstr "这是可下载卡片的最大数量。将该数值设定得太大将导致地址本变慢。"
+
+# addressbook/gui/component/addressbook-config.glade.h:26
+#: addressbook/gui/component/addressbook-config.glade.h:26
+msgid ""
+"This is the method evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+"这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
+"对 ldap 服务器的匿名访问权限。"
+
+# addressbook/gui/component/addressbook-config.glade.h:20
+# addressbook/gui/component/addressbook-config.glade.h:20
+# addressbook/gui/component/addressbook-config.glade.h:27
+#: addressbook/gui/component/addressbook-config.glade.h:27
+msgid "This is the name of the server where your addressbook is located."
+msgstr "这是您的地址簿所在的服务器的名称。"
+
+# addressbook/gui/component/addressbook-config.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:28
+#: addressbook/gui/component/addressbook-config.glade.h:28
+msgid "This is the port that your ldap server uses."
+msgstr "这是您的 LDAP 服务器所使用的端口。"
+
+# addressbook/gui/component/addressbook-config.glade.h:22
+# addressbook/gui/component/addressbook-config.glade.h:22
+# addressbook/gui/component/addressbook-config.glade.h:29
+#: addressbook/gui/component/addressbook-config.glade.h:29
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr "这一名称将用于识别您的帐号。它只用于显示。"
+
+# addressbook/gui/component/addressbook-config.glade.h:23
+# addressbook/gui/component/addressbook-config.glade.h:23
+# addressbook/gui/component/addressbook-config.glade.h:30
+#: addressbook/gui/component/addressbook-config.glade.h:30
+msgid "_Account name:"
+msgstr "帐号名(_A)："
+
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:31
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
+#: addressbook/gui/component/addressbook-config.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:100 my-evolution/my-evolution.glade.h:21
+msgid "_Add"
+msgstr "添加(_A)"
+
+# addressbook/gui/component/addressbook-config.glade.h:32
+#: addressbook/gui/component/addressbook-config.glade.h:32
+msgid "_Distinguished Name:"
+msgstr "识别名称(_D)"
+
+# addressbook/gui/component/addressbook-config.glade.h:33
+#: addressbook/gui/component/addressbook-config.glade.h:33
+msgid "_Download Limit"
+msgstr "下载上限(_D)"
+
+# addressbook/gui/component/addressbook-config.glade.h:25
+# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+# ui/evolution-message-composer.xml.h:47
+# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+# ui/evolution-tasks.xml.h:16
+# addressbook/gui/component/addressbook-config.glade.h:25
+# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+# ui/evolution-message-composer.xml.h:47
+# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+# ui/evolution-tasks.xml.h:16
+# addressbook/gui/component/addressbook-config.glade.h:34
+# filter/filter.glade.h:9 mail/mail-config.glade.h:107
+# ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
+# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+# ui/evolution-message-composer.xml.h:47
+# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+# ui/evolution-tasks.xml.h:19
+#: addressbook/gui/component/addressbook-config.glade.h:34
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:109
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:19
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:99
+# addressbook/gui/component/addressbook-config.glade.h:35
+#: addressbook/gui/component/addressbook-config.glade.h:35
+#: mail/mail-config.glade.h:110
+msgid "_Email address:"
+msgstr "电子邮件地址(_E)："
+
+# addressbook/gui/component/addressbook-config.glade.h:27
+# addressbook/gui/component/addressbook-config.glade.h:27
+# addressbook/gui/component/addressbook-config.glade.h:36
+#: addressbook/gui/component/addressbook-config.glade.h:36
+msgid "_Port:"
+msgstr "端口(_P)："
+
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:37
+#: addressbook/gui/component/addressbook-config.glade.h:37
+msgid "_Server name:"
+msgstr "服务器名(_S)："
 
 # addressbook/gui/component/addressbook-factory.c:70
 # calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
@@ -1069,22 +1349,29 @@ msgstr "联系人列表(_C)"
 # calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 # addressbook/gui/component/addressbook-factory.c:70
 # calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 msgid "Could not initialize gnome-vfs"
 msgstr "无法创始化 gnome-vfs"
 
+# addressbook/gui/component/addressbook-storage.c:167
+# addressbook/gui/component/addressbook-storage.c:167
+# addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "其他联系人"
+
 # addressbook/gui/component/addressbook.c:485
 # addressbook/gui/component/addressbook.c:485
 # addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:499
 msgid "Unable to open addressbook"
 msgstr "无法打开地址簿"
 
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:508
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:508
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -1097,7 +1384,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:499
 # addressbook/gui/component/addressbook.c:499
 # addressbook/gui/component/addressbook.c:513
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:513
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -1112,7 +1399,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:507
 # addressbook/gui/component/addressbook.c:507
 # addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -1124,33 +1411,36 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:640
 # addressbook/gui/component/addressbook.c:655
 # addressbook/gui/component/addressbook.c:658
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:658
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "为 %s (用户 %s)输入口令"
 
-#: addressbook/gui/component/addressbook.c:769
-#, fuzzy
-msgid "Name begins with"
-msgstr "以之结束"
+# addressbook/gui/component/addressbook.c:803
+# calendar/gui/cal-search-bar.c:55
+# addressbook/gui/component/addressbook.c:803
+# calendar/gui/cal-search-bar.c:55
+# addressbook/gui/component/addressbook.c:836
+# calendar/gui/cal-search-bar.c:55
+#: addressbook/gui/component/addressbook.c:836
+#: calendar/gui/cal-search-bar.c:55
+msgid "Any field contains"
+msgstr "任何域含有"
 
-# addressbook/backend/ebook/e-card-simple.c:86
-# addressbook/gui/component/e-address-popup.c:484
-# addressbook/gui/contact-editor/e-contact-editor.c:1687
-# addressbook/gui/widgets/e-addressbook-view.c:875
-# addressbook/backend/ebook/e-card-simple.c:86
-# addressbook/gui/component/e-address-popup.c:484
-# addressbook/gui/contact-editor/e-contact-editor.c:1687
-# addressbook/gui/widgets/e-addressbook-view.c:875
-# addressbook/backend/ebook/e-card-simple.c:86
-# addressbook/gui/component/e-address-popup.c:484
-# addressbook/gui/contact-editor/e-contact-editor.c:1687
-# addressbook/gui/widgets/e-addressbook-view.c:986
-#: addressbook/gui/component/addressbook.c:770
-#, fuzzy
-msgid "Email is"
-msgstr "电子邮件 2"
+# addressbook/gui/component/addressbook.c:804
+# addressbook/gui/component/addressbook.c:804
+# addressbook/gui/component/addressbook.c:837
+#: addressbook/gui/component/addressbook.c:837
+msgid "Name contains"
+msgstr "名称含有"
+
+# addressbook/gui/component/addressbook.c:805
+# addressbook/gui/component/addressbook.c:805
+# addressbook/gui/component/addressbook.c:838
+#: addressbook/gui/component/addressbook.c:838
+msgid "Email contains"
+msgstr "电子邮件含有"
 
 # addressbook/gui/component/addressbook.c:806
 # calendar/gui/cal-search-bar.c:59
@@ -1158,29 +1448,19 @@ msgstr "电子邮件 2"
 # calendar/gui/cal-search-bar.c:59
 # addressbook/gui/component/addressbook.c:839
 # calendar/gui/cal-search-bar.c:59
-#: addressbook/gui/component/addressbook.c:771
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:839
+#: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "类别为"
 
-# addressbook/gui/component/addressbook.c:803
-# calendar/gui/cal-search-bar.c:55
-# addressbook/gui/component/addressbook.c:803
-# calendar/gui/cal-search-bar.c:55
-# addressbook/gui/component/addressbook.c:836
-# calendar/gui/cal-search-bar.c:55
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "任何域含有"
-
 # addressbook/gui/component/addressbook.c:807 widgets/misc/e-filter-bar.h:104
 # addressbook/gui/component/addressbook.c:807 widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
 # addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "高级..."
 
@@ -1191,18 +1471,30 @@ msgstr "高级..."
 # addressbook/gui/component/addressbook.c:1067
 # calendar/gui/cal-search-bar.c:412
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1067
+#: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "任何类别"
 
 # addressbook/gui/component/addressbook.c:1107
 # addressbook/gui/component/addressbook.c:1107
 # addressbook/gui/component/addressbook.c:1150
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1150
 msgid "The URI that the Folder Browser will display"
 msgstr "文件夹浏览器将显示的 URI"
 
+# shell/e-shell-view.c:1587
+# addressbook/gui/component/e-address-popup.c:178
+# addressbook/gui/component/e-address-popup.c:178
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(无)"
+
 # addressbook/gui/component/e-address-popup.c:474
 # addressbook/gui/contact-editor/contact-editor.glade.h:26
 # addressbook/gui/contact-editor/e-contact-editor.c:1686
@@ -1299,858 +1591,6 @@ msgstr "关闭查询"
 msgid "Enable Queries (Dangerous!)"
 msgstr "开启查询(危险！)"
 
-# addressbook/backend/pas/pas-backend-ldap.c:493
-# addressbook/backend/pas/pas-backend-ldap.c:493
-# addressbook/backend/pas/pas-backend-ldap.c:496
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "无法连接 LDAP 服务器。"
-
-# camel/providers/imap/camel-imap-store.c:596
-# camel/providers/imap/camel-imap-store.c:596
-# camel/providers/imap/camel-imap-store.c:596
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"无法认证到 IMAP 服务器。\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-# camel/camel-sasl-anonymous.c:131
-# camel/camel-sasl-anonymous.c:131
-# camel/camel-sasl-anonymous.c:131
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"无效的诲涩跟踪信息：\n"
-"%s"
-
-# camel/providers/imap/camel-imap-command.c:608
-# camel/providers/imap/camel-imap-command.c:608
-# camel/providers/imap/camel-imap-command.c:610
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP 服务器应答不含有 %s 信息"
-
-# mail/mail-config.glade.h:3
-# mail/mail-config.glade.h:3
-# mail/mail-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(在该版本的 evolution 中不支持SSL)"
-
-# calendar/gui/e-calendar-table.etspec.h:8
-# calendar/gui/e-calendar-table.etspec.h:8
-# calendar/gui/e-calendar-table.etspec.h:8
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "完成日期"
-
-# mail/mail-config.glade.h:1
-# mail/mail-config.glade.h:1
-# mail/mail-config.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:1
-#, fuzzy
-msgid "  S_how Supported Bases "
-msgstr "检查支持的类型(_C) "
-
-# addressbook/printing/e-contact-print.glade.h:23
-# addressbook/printing/e-contact-print.glade.h:23
-# addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "选项"
-
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "删除(_R)"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1234"
-msgstr ""
-
-# calendar/gui/e-calendar-table.c:437
-# calendar/gui/e-calendar-table.c:437
-# addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:5
-#, fuzzy
-msgid "1:00"
-msgstr "100"
-
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:1
-# addressbook/gui/component/addressbook-config.glade.h:1
-# addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:8
-#, fuzzy
-msgid "380"
-msgstr "389"
-
-# addressbook/gui/component/addressbook-config.glade.h:1
-# addressbook/gui/component/addressbook-config.glade.h:1
-# addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:9
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/ldap-config.glade.h:10
-msgid "5:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:11
-msgid "636"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:4
-# addressbook/gui/component/addressbook-config.glade.h:4
-# addressbook/gui/component/addressbook-config.glade.h:6
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "Addressbook Sources"
-msgstr "地址簿资源"
-
-# calendar/gui/e-calendar-table.etspec.h:3
-# calendar/gui/e-calendar-table.etspec.h:3
-# calendar/gui/e-calendar-table.etspec.h:3
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Always"
-msgstr "提醒"
-
-# camel/camel-sasl-anonymous.c:33
-# camel/camel-sasl-anonymous.c:33
-# camel/camel-sasl-anonymous.c:33
-#: addressbook/gui/component/ldap-config.glade.h:16
-#, fuzzy
-msgid "Anonymously"
-msgstr "匿名"
-
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
-msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
-"\n"
-"Please click the \"Finish\" button to save the settings you have entered "
-"here."
-msgstr ""
-
-# ui/evolution-addressbook.xml.h:31
-# ui/evolution-addressbook.xml.h:31
-# my-evolution/Locations.h:502
-#: addressbook/gui/component/ldap-config.glade.h:23
-#, fuzzy
-msgid "Connecting"
-msgstr "康涅狄格"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-# calendar/gui/e-meeting-time-sel.c:431
-# calendar/gui/e-meeting-time-sel.c:434
-# calendar/gui/e-meeting-time-sel.c:434
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "DN Customization"
-msgstr "没有信息"
-
-# addressbook/gui/component/addressbook-config.glade.h:8
-# addressbook/gui/component/addressbook-config.glade.h:8
-# addressbook/gui/component/addressbook-config.glade.h:11
-#: addressbook/gui/component/ldap-config.glade.h:26
-msgid "De_lete"
-msgstr "删除(_L)"
-
-# addressbook/gui/component/addressbook-config.glade.h:32
-#: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
-msgid "Distinguished _name:"
-msgstr "识别名称(_D)"
-
-# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:108
-#: addressbook/gui/component/ldap-config.glade.h:28
-#, fuzzy
-msgid "Email Address:"
-msgstr "电子邮件地址(_E)："
-
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
-msgid "Evolution Attribute"
-msgstr "Evolution 提醒"
-
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:15
-#: addressbook/gui/component/ldap-config.glade.h:30
-#, fuzzy
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution 将使用该电子邮件地址在服务器上对您进行认证"
-
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:15
-#: addressbook/gui/component/ldap-config.glade.h:31
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution 将使用该电子邮件地址在服务器上对您进行认证"
-
-# addressbook/gui/component/select-names/select-names.glade.h:3
-# addressbook/gui/component/select-names/select-names.glade.h:3
-# addressbook/gui/component/select-names/select-names.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:32
-#, fuzzy
-msgid "Finished"
-msgstr "查找(_I)"
-
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/component/ldap-config.glade.h:33
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "常规"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr ""
-
-# mail/mail-config.glade.h:15
-# mail/mail-config.glade.h:15
-# mail/mail-config.glade.h:19
-#: addressbook/gui/component/ldap-config.glade.h:35
-#, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "配置"
-
-# addressbook/printing/e-contact-print.glade.h:21
-# addressbook/printing/e-contact-print.glade.h:21
-# addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "边界"
-
-# mail/mail-config.glade.h:118
-# mail/mail-config.glade.h:118
-# mail/mail-config.glade.h:127
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
-#, fuzzy
-msgid "Never"
-msgstr "每(_E)"
-
-#: addressbook/gui/component/ldap-config.glade.h:38
-msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL "
-"(Secure Sockets Layer)\n"
-"and TLS (Transport Layer Security) protocols are used by some servers to "
-"cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses "
-"these protocols."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:11
-# addressbook/gui/component/addressbook-config.glade.h:11
-# addressbook/gui/component/addressbook-config.glade.h:16
-#: addressbook/gui/component/ldap-config.glade.h:44
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:47
-#, fuzzy
-msgid "R_estore Defaults"
-msgstr "默认"
-
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Re_store Defaults"
-msgstr "默认"
-
-# addressbook/gui/component/addressbook-config.glade.h:13
-# addressbook/gui/component/addressbook-config.glade.h:13
-# addressbook/gui/component/addressbook-config.glade.h:18
-#: addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
-msgid "S_earch scope: "
-msgstr "搜索范围(_C)："
-
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1675
-# calendar/gui/e-week-view.c:1182
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-# calendar/gui/e-week-view.c:1184
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-# calendar/gui/e-week-view.c:1188
-#. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
-msgid "Searching"
-msgstr "搜索"
-
-# ui/evolution-addressbook.xml.h:21
-# ui/evolution-addressbook.xml.h:21
-# ui/evolution-addressbook.xml.h:21
-#: addressbook/gui/component/ldap-config.glade.h:51
-#, fuzzy
-msgid "Select"
-msgstr "全选"
-
-#: addressbook/gui/component/ldap-config.glade.h:52
-#, fuzzy
-msgid "Selected:"
-msgstr "已删除"
-
-#: addressbook/gui/component/ldap-config.glade.h:53
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:55
-msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:59
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:62
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:64
-msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
-msgstr ""
-
-# mail/mail-config.glade.h:81
-# mail/mail-config.glade.h:81
-# mail/mail-config.glade.h:90
-#: addressbook/gui/component/ldap-config.glade.h:65
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "来源信息"
-
-# mail/mail-config.c:2184 mail/mail-config.c:2188
-# mail/mail-config.c:2233 mail/mail-config.c:2237
-# mail/mail-config.c:2326 mail/mail-config.c:2330
-#: addressbook/gui/component/ldap-config.glade.h:66
-#, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "正在连接服务器..."
-
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "Step 3: Searching the Directory"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
-msgid "Step 4: Display Name"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:15
-# addressbook/gui/component/addressbook-config.glade.h:15
-# addressbook/gui/component/addressbook-config.glade.h:20
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "Sub"
-msgstr ""
-
-# shell/evolution-shell-component.c:1023
-# shell/evolution-shell-component.c:1023
-# shell/evolution-shell-component.c:1036
-#: addressbook/gui/component/ldap-config.glade.h:70
-#, fuzzy
-msgid "Supported Search Bases"
-msgstr "不支持的方案"
-
-#: addressbook/gui/component/ldap-config.glade.h:71
-msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:73
-msgid ""
-"The options on this page control how many entries should be included in "
-"your\n"
-"searches, and how long a search should take. Ask your system administrator "
-"if you\n"
-"need to change these options."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:76
-msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:78
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
-"\n"
-"Adding a new LDAP server requires some specialized information\n"
-"about the server. Please contact your system administrator if you \n"
-"need help finding this information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:25
-#: addressbook/gui/component/ldap-config.glade.h:88
-#, fuzzy
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
-"too large will slow down your addressbook."
-msgstr ""
-"这是可下载卡片的最大数量。将该数值设定得太大将导致�"
-"�址本变慢。"
-
-# addressbook/gui/component/addressbook-config.glade.h:26
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"这是 evolution "
-"用来认证您的方法。请注意若在此设定为“电子邮件地址�"
-"�则需要您具有对 ldap 服务器的匿名访问权限。"
-
-# addressbook/gui/component/addressbook-config.glade.h:22
-# addressbook/gui/component/addressbook-config.glade.h:22
-# addressbook/gui/component/addressbook-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:91
-#, fuzzy
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
-msgstr "这一名称将用于识别您的帐号。它只用于显示。"
-
-#: addressbook/gui/component/ldap-config.glade.h:93
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:96
-msgid "This option controls how long a search will be run."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:97
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:100
-msgid "U_se SSL/TLS:"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:101
-#, fuzzy
-msgid "Using distinguished name (DN)"
-msgstr "识别姓名 (DN)"
-
-# addressbook/gui/component/addressbook-config.glade.h:9
-# addressbook/gui/component/addressbook-config.glade.h:9
-# addressbook/gui/component/addressbook-config.glade.h:13
-#: addressbook/gui/component/ldap-config.glade.h:102
-#, fuzzy
-msgid "Using email address"
-msgstr "电子邮件地址"
-
-#: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
-msgid "Whenever Possible"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:31
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:104
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
-msgid "_Add"
-msgstr "添加(_A)"
-
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:31
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:105
-#, fuzzy
-msgid "_Add ->"
-msgstr "添加(_A)"
-
-#: addressbook/gui/component/ldap-config.glade.h:106
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "添加动作"
-
-#: addressbook/gui/component/ldap-config.glade.h:107
-#, fuzzy
-msgid "_Add to DN"
-msgstr "添加动作"
-
-# calendar/gui/e-calendar-table.etspec.h:3
-# calendar/gui/e-calendar-table.etspec.h:3
-# calendar/gui/e-calendar-table.etspec.h:3
-#: addressbook/gui/component/ldap-config.glade.h:108
-#, fuzzy
-msgid "_Always"
-msgstr "提醒"
-
-# ui/evolution-message-composer.xml.h:46
-# ui/evolution-message-composer.xml.h:46
-# ui/evolution-message-composer.xml.h:46
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "全部删除(_D)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Display name:"
-msgstr "显示(_D)"
-
-# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:111
-#, fuzzy
-msgid "_Distinguished Name (DN):"
-msgstr "识别姓名 (DN)"
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:33
-#: addressbook/gui/component/ldap-config.glade.h:113
-#, fuzzy
-msgid "_Download limit:"
-msgstr "下载上限(_D)"
-
-# addressbook/gui/component/addressbook-config.glade.h:25
-# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
-# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-# ui/evolution-message-composer.xml.h:47
-# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:16
-# addressbook/gui/component/addressbook-config.glade.h:25
-# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
-# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-# ui/evolution-message-composer.xml.h:47
-# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:16
-# addressbook/gui/component/addressbook-config.glade.h:34
-# ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
-# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-# ui/evolution-message-composer.xml.h:47
-# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:19
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
-#: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-# calendar/gui/alarm-notify/alarm-notify.glade.h:4
-# calendar/gui/alarm-notify/alarm-notify.glade.h:4
-# calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:115
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "编辑约会(_E)"
-
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: addressbook/gui/component/ldap-config.glade.h:116
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "Evolution 提醒"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:118
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-msgid "_Log in method:"
-msgstr ""
-
-# calendar/gui/e-meeting-time-sel.c:467
-# calendar/gui/e-meeting-time-sel.c:470
-# calendar/gui/e-meeting-time-sel.c:470
-#: addressbook/gui/component/ldap-config.glade.h:121
-#, fuzzy
-msgid "_More Options >>"
-msgstr "选项(_O)"
-
-# addressbook/gui/component/addressbook-config.glade.h:27
-# addressbook/gui/component/addressbook-config.glade.h:27
-# addressbook/gui/component/addressbook-config.glade.h:36
-#: addressbook/gui/component/ldap-config.glade.h:122
-#, fuzzy
-msgid "_Port number:"
-msgstr "端口(_P)："
-
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:123
-#, fuzzy
-msgid "_Restore Defaults"
-msgstr "默认"
-
-# addressbook/gui/component/addressbook-config.glade.h:12
-# addressbook/gui/component/addressbook-config.glade.h:12
-# addressbook/gui/component/addressbook-config.glade.h:17
-#: addressbook/gui/component/ldap-config.glade.h:124
-#, fuzzy
-msgid "_Search base:"
-msgstr "搜索起点(_B)："
-
-# addressbook/gui/component/addressbook-config.glade.h:28
-# addressbook/gui/component/addressbook-config.glade.h:28
-# addressbook/gui/component/addressbook-config.glade.h:37
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "_Server name:"
-msgstr "服务器名(_S)："
-
-# calendar/gui/alarm-notify/alarm-notify.glade.h:3
-# calendar/gui/alarm-notify/alarm-notify.glade.h:3
-# calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:126
-#, fuzzy
-msgid "_Timeout (minutes):"
-msgstr "午睡时间(分钟)"
-
-# mail/mail-config.c:326
-# mail/mail-config.c:329
-# mail/mail-config.c:354
-#: addressbook/gui/component/ldap-config.glade.h:127
-#, fuzzy
-msgid "account-druid"
-msgstr "帐号 %d"
-
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#: addressbook/gui/component/ldap-config.glade.h:128
-#, fuzzy
-msgid "account-editor"
-msgstr "联系人列表编辑器"
-
-# addressbook/gui/widgets/e-addressbook-model.c:127
-# addressbook/gui/widgets/e-addressbook-model.c:127
-# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/component/ldap-config.glade.h:129
-#, fuzzy
-msgid "cards"
-msgstr "没有卡片"
-
-# mail/mail-ops.c:2089
-# mail/mail-ops.c:2091
-# mail/mail-ops.c:2134
-#: addressbook/gui/component/ldap-config.glade.h:130
-#, fuzzy
-msgid "connecting-tab"
-msgstr "重新与 %s 连接"
-
-#: addressbook/gui/component/ldap-config.glade.h:131
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "edit_server_window_simple"
-msgstr ""
-
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/component/ldap-config.glade.h:133
-#, fuzzy
-msgid "general-tab"
-msgstr "常规"
-
-#: addressbook/gui/component/ldap-config.glade.h:134
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "objectclasses-tab"
-msgstr ""
-
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1675
-# calendar/gui/e-week-view.c:1182
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-# calendar/gui/e-week-view.c:1184
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-# calendar/gui/e-week-view.c:1188
-#: addressbook/gui/component/ldap-config.glade.h:136
-#, fuzzy
-msgid "searching-tab"
-msgstr "搜索"
-
 # addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 # addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 # addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
@@ -2174,10 +1614,11 @@ msgstr "地址簿名称选择界面车间"
 # addressbook/gui/component/select-names/e-select-names-popup.c:163
 # addressbook/gui/component/select-names/e-select-names.c:830
 # composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
+# filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:830
+#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
+#: filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "删除"
 
@@ -2224,18 +1665,10 @@ msgstr "(%d 未显示)"
 msgid "Unnamed Contact"
 msgstr "未命名的联系人"
 
-# default_user/searches.xml.h:6
-# default_user/searches.xml.h:6
-# default_user/searches.xml.h:6
-#: addressbook/gui/component/select-names/e-select-names.c:600
-#, fuzzy
-msgid "Find contact in"
-msgstr "发件人含有"
-
 # addressbook/gui/component/select-names/e-select-names.c:524
 # addressbook/gui/component/select-names/e-select-names.c:524
 # addressbook/gui/component/select-names/e-select-names.c:581
-#: addressbook/gui/component/select-names/e-select-names.c:716
+#: addressbook/gui/component/select-names/e-select-names.c:581
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -2254,7 +1687,7 @@ msgstr ""
 # addressbook/gui/component/select-names/e-select-names.c:532
 # addressbook/gui/component/select-names/e-select-names.c:532
 # addressbook/gui/component/select-names/e-select-names.c:589
-#: addressbook/gui/component/select-names/e-select-names.c:724
+#: addressbook/gui/component/select-names/e-select-names.c:589
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -2269,67 +1702,49 @@ msgstr ""
 # addressbook/gui/component/select-names/e-select-names.c:608
 # addressbook/gui/component/select-names/e-select-names.c:608
 # addressbook/gui/component/select-names/e-select-names.c:671
-#: addressbook/gui/component/select-names/e-select-names.c:806
+#: addressbook/gui/component/select-names/e-select-names.c:671
 msgid "Select Contacts from Addressbook"
 msgstr "从地址簿中选择联系人"
 
-# addressbook/gui/component/select-names/select-names.glade.h:4
-# addressbook/gui/component/select-names/select-names.glade.h:4
-# addressbook/gui/component/select-names/select-names.glade.h:3
+# addressbook/gui/component/select-names/select-names.glade.h:1
+# addressbook/gui/component/select-names/select-names.glade.h:1
+# addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Select Names"
-msgstr "选择名称"
+msgid "C_ontaining:"
+msgstr "含有(_O)："
 
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/component/select-names/select-names.glade.h:3
+# addressbook/gui/component/select-names/select-names.glade.h:3
+# addressbook/gui/component/select-names/select-names.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
-msgid "Selected Contacts:"
-msgstr "删除联系人？"
+msgid "F_ind"
+msgstr "查找(_I)"
 
-# addressbook/gui/component/addressbook-component.c:71
-# calendar/gui/dialogs/comp-editor-util.c:310
-# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
-# shell/e-shortcuts.c:1061
-# addressbook/gui/component/addressbook-component.c:71
-# calendar/gui/dialogs/comp-editor-util.c:310
-# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
-# shell/e-shortcuts.c:1061
-# addressbook/gui/component/addressbook-component.c:71
-# calendar/gui/dialogs/comp-editor-util.c:310
-# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
-# shell/e-shortcuts.c:1061
+# addressbook/gui/component/select-names/select-names.glade.h:4
+# addressbook/gui/component/select-names/select-names.glade.h:4
+# addressbook/gui/component/select-names/select-names.glade.h:3
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
-msgid "Show Contacts"
-msgstr "联系人"
+msgid "Select Names"
+msgstr "选择名称"
 
+# addressbook/gui/component/select-names/select-names.glade.h:5
+# addressbook/gui/component/select-names/select-names.glade.h:5
+# addressbook/gui/component/select-names/select-names.glade.h:4
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid ""
-"Type a name into the entry, or\n"
-"select one from the list below:"
-msgstr ""
-
-# ui/evolution.xml.h:42
-# ui/evolution.xml.h:42
-# ui/evolution.xml.h:42
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "移动(_M)..."
+msgid "Show contacts matching the following criteria:"
+msgstr "显示符合以下条件的联系人："
 
 # addressbook/gui/component/select-names/select-names.glade.h:6
 # addressbook/gui/component/select-names/select-names.glade.h:6
 # addressbook/gui/component/select-names/select-names.glade.h:5
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "_Category:"
 msgstr "类别(_C)："
 
 # addressbook/gui/component/select-names/select-names.glade.h:7
 # addressbook/gui/component/select-names/select-names.glade.h:7
 # addressbook/gui/component/select-names/select-names.glade.h:6
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Folder:"
 msgstr "文件夹(_F)："
 
@@ -2441,6 +1856,13 @@ msgstr ""
 msgid "Full _Name..."
 msgstr "全名(_N)..."
 
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "常规"
+
 # addressbook/gui/contact-editor/contact-editor.glade.h:18
 # addressbook/gui/contact-editor/contact-editor.glade.h:18
 # addressbook/gui/contact-editor/contact-editor.glade.h:18
@@ -2449,9 +1871,7 @@ msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
 "of that information here."
-msgstr ""
-"如果此人把忙闲信息或其它日历信息发布到互联网上，就�"
-"�这里输入发布地址。"
+msgstr "如果此人把忙闲信息或其它日历信息发布到互联网上，就在这里输入发布地址。"
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:21
 # addressbook/gui/contact-editor/contact-editor.glade.h:21
@@ -2529,11 +1949,10 @@ msgstr "愿意接收 HTML 邮件(_H)"
 # ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
+#: mail/folder-browser.c:1478 mail/mail-config.glade.h:107
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "删除(_D)"
 
@@ -4390,10 +3809,19 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "您确定要删除该联系人吗？"
+
 # addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 # addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 # addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "删除联系人？"
 
@@ -4428,7 +3856,7 @@ msgstr "TTY/TDD"
 # addressbook/gui/contact-editor/e-contact-editor.c:2287
 # addressbook/gui/contact-editor/e-contact-editor.c:2287
 # addressbook/gui/contact-editor/e-contact-editor.c:2309
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2417
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "无法为域找到构件：“%s”"
@@ -4454,7 +3882,7 @@ msgstr "完全编辑"
 # addressbook/gui/contact-editor/e-contact-quick-add.c:326
 # addressbook/gui/widgets/e-addressbook-view.c:961
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:961
 msgid "Full Name"
 msgstr "全名"
 
@@ -4810,7 +4238,7 @@ msgstr ""
 # addressbook/gui/search/e-addressbook-search-dialog.c:145
 # widgets/misc/e-filter-bar.c:238
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:238
 msgid "Advanced Search"
 msgstr "高级搜索"
 
@@ -4828,32 +4256,184 @@ msgstr "搜索"
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-model.c:137
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 msgid "No cards"
 msgstr "没有卡片"
 
 # addressbook/gui/widgets/e-addressbook-model.c:130
 # addressbook/gui/widgets/e-addressbook-model.c:130
 # addressbook/gui/widgets/e-addressbook-model.c:130
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 msgid "1 card"
 msgstr "1 张卡片"
 
 # addressbook/gui/widgets/e-addressbook-model.c:133
 # addressbook/gui/widgets/e-addressbook-model.c:133
 # addressbook/gui/widgets/e-addressbook-model.c:133
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, c-format
 msgid "%d cards"
 msgstr "%d 张卡片"
 
-# shell/e-shell-importer.c:455
-# shell/e-shell-importer.c:455
-# shell/e-shell-importer.c:466
-#: addressbook/gui/widgets/e-addressbook-model.c:370
-#, fuzzy
-msgid "Error getting book view"
-msgstr "启动 %s 错误"
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+# addressbook/gui/widgets/e-addressbook-view.c:671
+# addressbook/gui/widgets/e-addressbook-view.c:733
+# addressbook/gui/widgets/e-addressbook-view.c:1405
+# ui/evolution-addressbook.xml.h:19
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+# addressbook/gui/widgets/e-addressbook-view.c:671
+# addressbook/gui/widgets/e-addressbook-view.c:733
+# addressbook/gui/widgets/e-addressbook-view.c:1405
+# ui/evolution-addressbook.xml.h:19
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
+# addressbook/gui/widgets/e-addressbook-view.c:734
+# addressbook/gui/widgets/e-addressbook-view.c:834
+# addressbook/gui/widgets/e-addressbook-view.c:1516
+# ui/evolution-addressbook.xml.h:19
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
+#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:834
+#: addressbook/gui/widgets/e-addressbook-view.c:1516
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard"
+msgstr "保存为 VCard"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+# ui/evolution-message-composer.xml.h:13
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+# ui/evolution-message-composer.xml.h:13
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
+# ui/evolution-message-composer.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "打开"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+# addressbook/gui/widgets/e-addressbook-view.c:734
+# ui/evolution-addressbook.xml.h:10
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+# addressbook/gui/widgets/e-addressbook-view.c:734
+# ui/evolution-addressbook.xml.h:10
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
+# addressbook/gui/widgets/e-addressbook-view.c:835
+# ui/evolution-addressbook.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
+#: addressbook/gui/widgets/e-addressbook-view.c:835
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "转发联系人"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+# addressbook/gui/widgets/e-addressbook-view.c:735
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+# addressbook/gui/widgets/e-addressbook-view.c:735
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
+# addressbook/gui/widgets/e-addressbook-view.c:836
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
+#: addressbook/gui/widgets/e-addressbook-view.c:836
+msgid "Send Message to Contact"
+msgstr "给联系人发邮件"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+# addressbook/gui/widgets/e-addressbook-view.c:736
+# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+# ui/my-evolution.xml.h:2
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+# addressbook/gui/widgets/e-addressbook-view.c:736
+# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+# ui/my-evolution.xml.h:2
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
+# addressbook/gui/widgets/e-addressbook-view.c:837
+# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+# ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
+#: addressbook/gui/widgets/e-addressbook-view.c:837
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/my-evolution.xml.h:2
+msgid "Print"
+msgstr "打印"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+# addressbook/gui/widgets/e-addressbook-view.c:738
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+# addressbook/gui/widgets/e-addressbook-view.c:738
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
+# addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
+#: addressbook/gui/widgets/e-addressbook-view.c:839
+msgid "Print Envelope"
+msgstr "打印信封"
+
+# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
+# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
+# addressbook/gui/widgets/e-addressbook-view.c:841
+# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
+#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
+msgid "Cut"
+msgstr "剪切"
+
+# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
+# ui/evolution-tasks.xml.h:3
+# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
+# ui/evolution-tasks.xml.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
+# addressbook/gui/widgets/e-addressbook-view.c:842
+# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
+# ui/evolution-tasks.xml.h:3
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
+#: addressbook/gui/widgets/e-addressbook-view.c:842
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
+#: ui/evolution-tasks.xml.h:3
+msgid "Copy"
+msgstr "复制"
+
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
+# addressbook/gui/widgets/e-addressbook-view.c:843
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
+#: addressbook/gui/widgets/e-addressbook-view.c:843
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
+msgid "Paste"
+msgstr "粘贴"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
+# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
+# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
+# ui/evolution-tasks.xml.h:8
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
+# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
+# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
+# ui/evolution-tasks.xml.h:8
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
+# addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
+# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
+# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
+#: mail/mail-accounts.c:295 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
+msgid "Delete"
+msgstr "删除"
 
 # addressbook/gui/widgets/e-addressbook-table-adapter.c:140
 # addressbook/gui/widgets/e-addressbook-util.c:85
@@ -4865,7 +4445,7 @@ msgstr "启动 %s 错误"
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-minicard.c:475
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "修改卡片错误"
@@ -4876,8 +4456,8 @@ msgstr "修改卡片错误"
 # shell/evolution-shell-component.c:1007
 # addressbook/gui/widgets/e-addressbook-util.c:33
 # shell/evolution-shell-component.c:1020
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1020
 msgid "Success"
 msgstr "成功"
 
@@ -4893,18 +4473,17 @@ msgstr "成功"
 # camel/providers/imap/camel-imap-command.c:275
 # camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
 # shell/e-storage.c:528 shell/evolution-shell-component.c:1057
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:34
 #: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
 msgid "Unknown error"
 msgstr "未知的错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:35
 # addressbook/gui/widgets/e-addressbook-util.c:35
 # addressbook/gui/widgets/e-addressbook-util.c:35
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "仓库离线"
 
@@ -4914,29 +4493,29 @@ msgstr "仓库离线"
 # shell/evolution-shell-component.c:1035
 # addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
 # shell/evolution-shell-component.c:1048
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1048
 msgid "Permission denied"
 msgstr "没有权限"
 
 # addressbook/gui/widgets/e-addressbook-util.c:37
 # addressbook/gui/widgets/e-addressbook-util.c:37
 # addressbook/gui/widgets/e-addressbook-util.c:37
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "找不到卡片"
 
 # addressbook/gui/widgets/e-addressbook-util.c:38
 # addressbook/gui/widgets/e-addressbook-util.c:38
 # addressbook/gui/widgets/e-addressbook-util.c:38
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "卡片 ID 已经存在"
 
 # addressbook/gui/widgets/e-addressbook-util.c:39
 # addressbook/gui/widgets/e-addressbook-util.c:39
 # addressbook/gui/widgets/e-addressbook-util.c:39
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "不支持的协议"
 
@@ -4955,18 +4534,18 @@ msgstr "不支持的协议"
 # calendar/gui/dialogs/task-details-page.glade.h:3
 # calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
 # camel/camel-service.c:610 camel/camel-service.c:646
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
+#: camel/camel-service.c:610 camel/camel-service.c:646
 msgid "Cancelled"
 msgstr "已经取消"
 
 # addressbook/gui/widgets/e-addressbook-util.c:41
 # addressbook/gui/widgets/e-addressbook-util.c:41
 # addressbook/gui/widgets/e-addressbook-util.c:41
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "其它错误"
 
@@ -4976,7 +4555,7 @@ msgstr "其它错误"
 # calendar/gui/dialogs/save-comp.c:50
 # addressbook/gui/widgets/e-addressbook-util.c:57
 # calendar/gui/dialogs/save-comp.c:50
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "您希望保存修改吗？"
@@ -4984,29 +4563,28 @@ msgstr "您希望保存修改吗？"
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "添加列表错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "添加卡片错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-addressbook-util.c:85
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "修改列表错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "删除列表错误"
 
@@ -5016,28 +4594,27 @@ msgstr "删除列表错误"
 # addressbook/gui/widgets/e-addressbook-view.c:1278
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1389
 msgid "Error removing card"
 msgstr "删除卡片错误"
 
 # mail/mail-config.glade.h:28
 # mail/mail-config.glade.h:28
 # addressbook/gui/widgets/e-addressbook-util.c:202
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:202
 msgid "Display Cards?"
 msgstr "显示卡片？"
 
 # mail/mail-config.glade.h:28
 # mail/mail-config.glade.h:28
 # addressbook/gui/widgets/e-addressbook-util.c:203
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:203
 msgid "Display Cards"
 msgstr "显示卡片"
 
 # addressbook/gui/widgets/e-addressbook-util.c:207
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -5047,388 +4624,132 @@ msgstr ""
 "您已经请求 %d 个卡片。这将在您的显示屏上打开\n"
 " %d 个新窗口。您真的希望显示所有这些卡片？"
 
-# addressbook/gui/widgets/e-addressbook-model.c:127
-# addressbook/gui/widgets/e-addressbook-model.c:127
-# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-util.c:344
-#, fuzzy
-msgid "Move card to"
-msgstr "没有卡片"
-
-# addressbook/gui/widgets/e-addressbook-model.c:127
-# addressbook/gui/widgets/e-addressbook-model.c:127
-# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-util.c:346
-#, fuzzy
-msgid "Copy card to"
-msgstr "没有卡片"
-
-# addressbook/gui/widgets/e-addressbook-model.c:127
-# addressbook/gui/widgets/e-addressbook-model.c:127
-# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-util.c:349
-#, fuzzy
-msgid "Move cards to"
-msgstr "没有卡片"
+# addressbook/gui/widgets/e-addressbook-view.c:378
+# addressbook/gui/widgets/e-addressbook-view.c:378
+# addressbook/gui/widgets/e-addressbook-view.c:404
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:404
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-# addressbook/gui/widgets/e-addressbook-model.c:127
-# addressbook/gui/widgets/e-addressbook-model.c:127
-# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-util.c:351
-#, fuzzy
-msgid "Copy cards to"
-msgstr "没有卡片"
+# addressbook/gui/widgets/e-addressbook-view.c:383
+# addressbook/gui/widgets/e-addressbook-view.c:383
+# addressbook/gui/widgets/e-addressbook-view.c:409
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:409
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
 # addressbook/gui/widgets/e-addressbook-view.c:848
 # addressbook/gui/widgets/e-addressbook-view.c:848
 # addressbook/gui/widgets/e-addressbook-view.c:959
-#: addressbook/gui/widgets/e-addressbook-view.c:334
+#: addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "* Click here to add a contact *"
 msgstr "* 点击此处以便添加联系人 *"
 
 # addressbook/gui/widgets/e-addressbook-view.c:852
 # addressbook/gui/widgets/e-addressbook-view.c:852
 # addressbook/gui/widgets/e-addressbook-view.c:963
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "Primary Phone"
 msgstr "主要电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:853
 # addressbook/gui/widgets/e-addressbook-view.c:853
 # addressbook/gui/widgets/e-addressbook-view.c:964
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "Assistant Phone"
 msgstr "辅助电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:854
 # addressbook/gui/widgets/e-addressbook-view.c:854
 # addressbook/gui/widgets/e-addressbook-view.c:965
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "Business Phone"
 msgstr "商务电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:855
 # addressbook/gui/widgets/e-addressbook-view.c:855
 # addressbook/gui/widgets/e-addressbook-view.c:966
-#: addressbook/gui/widgets/e-addressbook-view.c:341
+#: addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Callback Phone"
 msgstr "反馈电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:856
 # addressbook/gui/widgets/e-addressbook-view.c:856
 # addressbook/gui/widgets/e-addressbook-view.c:967
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Company Phone"
 msgstr "公司电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:857
 # addressbook/gui/widgets/e-addressbook-view.c:857
 # addressbook/gui/widgets/e-addressbook-view.c:968
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Home Phone"
 msgstr "家庭电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:859
 # addressbook/gui/widgets/e-addressbook-view.c:859
 # addressbook/gui/widgets/e-addressbook-view.c:970
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:970
 msgid "Business Address"
 msgstr "商务地址"
 
 # addressbook/gui/widgets/e-addressbook-view.c:860
 # addressbook/gui/widgets/e-addressbook-view.c:860
 # addressbook/gui/widgets/e-addressbook-view.c:971
-#: addressbook/gui/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:971
 msgid "Home Address"
 msgstr "家庭地址"
 
 # addressbook/gui/widgets/e-addressbook-view.c:861
 # addressbook/gui/widgets/e-addressbook-view.c:861
 # addressbook/gui/widgets/e-addressbook-view.c:972
-#: addressbook/gui/widgets/e-addressbook-view.c:347
+#: addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Mobile Phone"
 msgstr "手机"
 
 # addressbook/gui/widgets/e-addressbook-view.c:862
 # addressbook/gui/widgets/e-addressbook-view.c:862
 # addressbook/gui/widgets/e-addressbook-view.c:973
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Car Phone"
 msgstr "汽车电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:865
 # addressbook/gui/widgets/e-addressbook-view.c:865
 # addressbook/gui/widgets/e-addressbook-view.c:976
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:976
 msgid "Business Phone 2"
 msgstr "商务电话 2"
 
 # addressbook/gui/widgets/e-addressbook-view.c:866
 # addressbook/gui/widgets/e-addressbook-view.c:866
 # addressbook/gui/widgets/e-addressbook-view.c:977
-#: addressbook/gui/widgets/e-addressbook-view.c:352
+#: addressbook/gui/widgets/e-addressbook-view.c:977
 msgid "Home Phone 2"
 msgstr "家庭电话 2"
 
 # addressbook/gui/widgets/e-addressbook-view.c:868
 # addressbook/gui/widgets/e-addressbook-view.c:868
 # addressbook/gui/widgets/e-addressbook-view.c:979
-#: addressbook/gui/widgets/e-addressbook-view.c:354
+#: addressbook/gui/widgets/e-addressbook-view.c:979
 msgid "Other Phone"
 msgstr "其它电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:874
 # addressbook/gui/widgets/e-addressbook-view.c:874
 # addressbook/gui/widgets/e-addressbook-view.c:985
-#: addressbook/gui/widgets/e-addressbook-view.c:360
+#: addressbook/gui/widgets/e-addressbook-view.c:985
 msgid "Other Address"
 msgstr "其它地址"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-# addressbook/gui/widgets/e-addressbook-view.c:671
-# addressbook/gui/widgets/e-addressbook-view.c:733
-# addressbook/gui/widgets/e-addressbook-view.c:1405
-# ui/evolution-addressbook.xml.h:19
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-# addressbook/gui/widgets/e-addressbook-view.c:671
-# addressbook/gui/widgets/e-addressbook-view.c:733
-# addressbook/gui/widgets/e-addressbook-view.c:1405
-# ui/evolution-addressbook.xml.h:19
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
-# addressbook/gui/widgets/e-addressbook-view.c:734
-# addressbook/gui/widgets/e-addressbook-view.c:834
-# addressbook/gui/widgets/e-addressbook-view.c:1516
-# ui/evolution-addressbook.xml.h:19
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
-#: ui/evolution-addressbook.xml.h:21
-msgid "Save as VCard"
-msgstr "保存为 VCard"
-
-# addressbook/gui/component/addressbook-component.c:526
-# ui/evolution-addressbook.xml.h:11
-# addressbook/gui/component/addressbook-component.c:526
-# ui/evolution-addressbook.xml.h:11
-# addressbook/gui/component/addressbook-component.c:527
-# ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/widgets/e-addressbook-view.c:875
-#, fuzzy
-msgid "New Contact..."
-msgstr "新建联系人"
-
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/widgets/e-addressbook-view.c:876
-#, fuzzy
-msgid "New Contact List..."
-msgstr "新建联系人列表"
-
-# ui/evolution.xml.h:39
-# ui/evolution.xml.h:39
-# ui/evolution.xml.h:39
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#, fuzzy
-msgid "Go to Folder..."
-msgstr "转到文件夹(_G)..."
-
-# ui/evolution.xml.h:41
-# ui/evolution.xml.h:41
-# ui/evolution.xml.h:41
-#: addressbook/gui/widgets/e-addressbook-view.c:880
-#, fuzzy
-msgid "Import..."
-msgstr "正在导入(_I)..."
-
-# ui/evolution-addressbook.xml.h:39
-# ui/evolution-addressbook.xml.h:39
-# ui/evolution-addressbook.xml.h:41
-#: addressbook/gui/widgets/e-addressbook-view.c:882
-#, fuzzy
-msgid "Search for Contacts..."
-msgstr "搜索联系人(_S)"
-
-# ui/evolution-addressbook.xml.h:30
-# ui/evolution-addressbook.xml.h:30
-# ui/evolution-addressbook.xml.h:31
-#: addressbook/gui/widgets/e-addressbook-view.c:883
-#, fuzzy
-msgid "Addressbook Sources..."
-msgstr "地址簿来源(_A)..."
-
-# ui/evolution.xml.h:45
-# ui/evolution.xml.h:45
-# ui/evolution.xml.h:45
-#: addressbook/gui/widgets/e-addressbook-view.c:885
-#, fuzzy
-msgid "Pilot Settings..."
-msgstr "Pilot 设置(_P)..."
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-# addressbook/gui/widgets/e-addressbook-view.c:734
-# ui/evolution-addressbook.xml.h:10
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-# addressbook/gui/widgets/e-addressbook-view.c:734
-# ui/evolution-addressbook.xml.h:10
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-# addressbook/gui/widgets/e-addressbook-view.c:835
-# ui/evolution-addressbook.xml.h:10
-#: addressbook/gui/widgets/e-addressbook-view.c:889
-#: ui/evolution-addressbook.xml.h:12
-msgid "Forward Contact"
-msgstr "转发联系人"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-# addressbook/gui/widgets/e-addressbook-view.c:735
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-# addressbook/gui/widgets/e-addressbook-view.c:735
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-# addressbook/gui/widgets/e-addressbook-view.c:836
-#: addressbook/gui/widgets/e-addressbook-view.c:890
-msgid "Send Message to Contact"
-msgstr "给联系人发邮件"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-# addressbook/gui/widgets/e-addressbook-view.c:736
-# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
-# ui/my-evolution.xml.h:2
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-# addressbook/gui/widgets/e-addressbook-view.c:736
-# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
-# ui/my-evolution.xml.h:2
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-# addressbook/gui/widgets/e-addressbook-view.c:837
-# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
-# ui/my-evolution.xml.h:2
-#: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
-#: ui/my-evolution.xml.h:1
-msgid "Print"
-msgstr "打印"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-# addressbook/gui/widgets/e-addressbook-view.c:738
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-# addressbook/gui/widgets/e-addressbook-view.c:738
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-# addressbook/gui/widgets/e-addressbook-view.c:839
-#: addressbook/gui/widgets/e-addressbook-view.c:893
-msgid "Print Envelope"
-msgstr "打印信封"
-
-# mail/folder-browser.c:1467
-# mail/folder-browser.c:1476
-# mail/folder-browser.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:897
-#, fuzzy
-msgid "Copy to folder..."
-msgstr "复制到文件夹..."
-
-# mail/folder-browser.c:1466
-# mail/folder-browser.c:1475
-# mail/folder-browser.c:1476
-#: addressbook/gui/widgets/e-addressbook-view.c:898
-#, fuzzy
-msgid "Move to folder..."
-msgstr "移动到文件夹(_M)..."
-
-# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
-# addressbook/gui/widgets/e-addressbook-view.c:841
-# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-#: addressbook/gui/widgets/e-addressbook-view.c:901
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "剪切"
-
-# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-# ui/evolution-tasks.xml.h:3
-# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-# ui/evolution-tasks.xml.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-# addressbook/gui/widgets/e-addressbook-view.c:842
-# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-# ui/evolution-tasks.xml.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:902
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "复制"
-
-# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
-# addressbook/gui/widgets/e-addressbook-view.c:843
-# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-#: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
-msgid "Paste"
-msgstr "粘贴"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
-# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
-# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-# ui/evolution-tasks.xml.h:8
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
-# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
-# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-# ui/evolution-tasks.xml.h:8
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
-# addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
-# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
-# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
-msgid "Delete"
-msgstr "删除"
-
-# widgets/menus/gal-view-menus.c:195
-# widgets/menus/gal-view-menus.c:195
-# widgets/menus/gal-view-menus.c:195
-#: addressbook/gui/widgets/e-addressbook-view.c:907
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
-#, fuzzy
-msgid "Current View"
-msgstr "当前视图(_C)"
-
-# addressbook/gui/widgets/e-addressbook-view.c:378
-# addressbook/gui/widgets/e-addressbook-view.c:378
-# addressbook/gui/widgets/e-addressbook-view.c:404
-#. Minicard view stuff
-#. Translators: put here a list of labels you want to see on buttons in
-#. addressbook. You may use any character to separate labels but it must
-#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
-msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-
-# addressbook/gui/widgets/e-addressbook-view.c:383
-# addressbook/gui/widgets/e-addressbook-view.c:383
-# addressbook/gui/widgets/e-addressbook-view.c:409
-#. Translators: put here a list of characters that correspond to buttons
-#. in addressbook. You may use any character to separate labels but it
-#. must also be placed at the begining ot the string.
-#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
-msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-
 # addressbook/gui/widgets/e-minicard-control.c:185
 # addressbook/gui/widgets/e-minicard-control.c:185
 # addressbook/gui/widgets/e-minicard-control.c:185
@@ -5454,12 +4775,11 @@ msgstr "保存在地址簿中"
 # addressbook/gui/widgets/e-minicard-view.c:150
 # addressbook/gui/widgets/e-minicard-view.c:150
 # addressbook/gui/widgets/e-minicard-view.c:150
-#: addressbook/gui/widgets/e-minicard-view.c:140
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
-"There are no items to show in this view.\n"
+"There are no items to show in this view\n"
 "\n"
 "Double-click here to create a new Contact."
 msgstr ""
@@ -5469,22 +4789,6 @@ msgstr ""
 "\n"
 "在这里双击以创建新联系人。"
 
-# addressbook/gui/widgets/e-minicard-view.c:150
-# addressbook/gui/widgets/e-minicard-view.c:150
-# addressbook/gui/widgets/e-minicard-view.c:150
-#: addressbook/gui/widgets/e-minicard-view.c:143
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"本视图中没有可显示的项\n"
-"\n"
-"在这里双击以创建新联系人。"
-
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
@@ -5644,7 +4948,6 @@ msgstr "包含："
 # addressbook/printing/e-contact-print.glade.h:18
 # addressbook/printing/e-contact-print.glade.h:18
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "横向"
 
@@ -5687,7 +4990,6 @@ msgstr "选项"
 # addressbook/printing/e-contact-print.glade.h:24
 # addressbook/printing/e-contact-print.glade.h:24
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "方向"
 
@@ -5724,9 +5026,7 @@ msgstr "纸张来源："
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "纵向"
 
@@ -5837,8 +5137,9 @@ msgstr "无标题约会"
 # calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
 # calendar/gui/dialogs/task-details-page.glade.h:6
 # calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
 msgid "High"
 msgstr "高"
 
@@ -5854,9 +5155,10 @@ msgstr "高"
 # calendar/gui/calendar-model.c:1711
 # calendar/gui/dialogs/task-details-page.glade.h:9
 # calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
+#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
 msgid "Normal"
 msgstr "中"
 
@@ -5869,8 +5171,9 @@ msgstr "中"
 # calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 # calendar/gui/dialogs/task-details-page.glade.h:8
 # calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
 msgid "Low"
 msgstr "低"
 
@@ -5884,8 +5187,9 @@ msgstr "低"
 # calendar/gui/dialogs/task-details-page.glade.h:13
 # calendar/gui/e-calendar-table.c:409
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
+#: calendar/cal-util/cal-util.c:518
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:409
 msgid "Undefined"
 msgstr "未定义"
 
@@ -5896,7 +5200,7 @@ msgstr "未定义"
 # calendar/conduits/calendar/calendar-conduit.c:1150
 # calendar/conduits/todo/todo-conduit.c:770
 #: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/todo/todo-conduit.c:770
 msgid "Error while communicating with calendar server"
 msgstr "在与日历服务器通讯时发生错误"
 
@@ -5911,22 +5215,14 @@ msgstr "在与日历服务器通讯时发生错误"
 msgid "Could not read pilot's Calendar application block"
 msgstr "无法读入 Pilot 日历应用程序块"
 
-# calendar/gui/dialogs/task-details-page.glade.h:14
-# calendar/gui/dialogs/task-details-page.glade.h:14
-# calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/conduits/todo/todo-conduit.c:206
-#, fuzzy
-msgid "Default Priority:"
-msgstr "优先级(_P)："
-
 # calendar/conduits/todo/todo-conduit.c:756
 # calendar/conduits/todo/todo-conduit.c:759
 # calendar/conduits/todo/todo-conduit.c:756
 # calendar/conduits/todo/todo-conduit.c:759
 # calendar/conduits/todo/todo-conduit.c:886
 # calendar/conduits/todo/todo-conduit.c:889
-#: calendar/conduits/todo/todo-conduit.c:951
-#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:886
+#: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not read pilot's ToDo application block"
 msgstr "无法读入 Pilot ToDo 应用程序块"
 
@@ -5944,89 +5240,69 @@ msgstr "显示任务列表的 Bonobo 控制。"
 msgid "A sample Bonobo control which displays an calendar."
 msgstr "显示日历的示例 Bonobo 控制。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "日历和任务设置"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "Evolution 撰写器车间。"
-
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Evolution 日历实施概要组件。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution 日历 iTip/iMip 查看器"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "处理日历的 Evolution 组件。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "日历概要组件车间。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Evolution 任务控制车间"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "日历 iTip 视图控制车间"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "日历控制示例车间"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "日历组件编辑器对话框集中车间"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "创建组件编辑车间的车间"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
-msgid "This page can be used to configure Calendar and Task preferences"
-msgstr ""
-
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
@@ -6041,6 +5317,20 @@ msgstr "提醒服务"
 msgid "Factory for the alarm notification service"
 msgstr "提醒服务车间"
 
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "开始："
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "结束："
+
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:231
@@ -6048,6 +5338,13 @@ msgstr "提醒服务车间"
 msgid "invalid time"
 msgstr "无效时间"
 
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+msgid "Evolution Alarm"
+msgstr "Evolution 提醒"
+
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:371
@@ -6116,7 +5413,7 @@ msgstr ""
 # calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
 # widgets/misc/e-messagebox.c:159
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2297
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "警告"
@@ -6134,8 +5431,7 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Evolution "
-"日历提示器将要触发。该提示器被配置为运行以下程序：\n"
+"Evolution 日历提示器将要触发。该提示器被配置为运行以下程序：\n"
 "\n"
 "        %s\n"
 "\n"
@@ -6151,7 +5447,7 @@ msgstr "不要再次询问该问题。"
 # calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 # calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 # calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "无法初始化 GNOME"
 
@@ -6172,35 +5468,35 @@ msgstr "无法创建提醒服务车间"
 # calendar/gui/cal-search-bar.c:56
 # calendar/gui/cal-search-bar.c:56
 # calendar/gui/cal-search-bar.c:56
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:56
 msgid "Summary contains"
 msgstr "概要含有"
 
 # calendar/gui/cal-search-bar.c:57
 # calendar/gui/cal-search-bar.c:57
 # calendar/gui/cal-search-bar.c:57
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:57
 msgid "Description contains"
 msgstr "描述含有"
 
 # calendar/gui/cal-search-bar.c:58
 # calendar/gui/cal-search-bar.c:58
 # calendar/gui/cal-search-bar.c:58
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "注释含有"
 
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1072
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1074
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
 msgid "Unmatched"
 msgstr "未匹配"
 
 # calendar/gui/calendar-commands.c:446
 # calendar/gui/calendar-commands.c:446
 # calendar/gui/calendar-commands.c:446
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%Y %B %d %A"
 
@@ -6212,8 +5508,8 @@ msgstr "%Y %B %d %A"
 # calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%b %d %a"
 
@@ -6223,8 +5519,8 @@ msgstr "%b %d %a"
 # calendar/gui/calendar-commands.c:458
 # calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
 # calendar/gui/calendar-commands.c:458
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%Y %b %d %a"
 
@@ -6234,8 +5530,8 @@ msgstr "%Y %b %d %a"
 # calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 # calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
 # calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%Y %B %d"
 
@@ -6248,15 +5544,15 @@ msgstr "%Y %B %d"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%B %d"
 
 # calendar/gui/calendar-commands.c:805
 # calendar/gui/calendar-commands.c:820
 # calendar/gui/calendar-commands.c:820
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:820
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
@@ -6268,6 +5564,7 @@ msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
 # calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 # calendar/gui/e-calendar-table.c:385
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:385
 msgid "Private"
 msgstr "保密"
 
@@ -6278,13 +5575,14 @@ msgstr "保密"
 # calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
 # calendar/gui/e-calendar-table.c:386
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr "机密"
 
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
 msgid "Public"
 msgstr "公开"
 
@@ -6323,6 +5621,7 @@ msgstr "西"
 # calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
 # calendar/gui/e-calendar-table.c:458
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "放假"
 
@@ -6335,8 +5634,9 @@ msgstr "放假"
 # calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
 # calendar/gui/e-meeting-time-sel.c:432
 # shell/evolution-shell-component.c:1042
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
+#: calendar/gui/e-meeting-time-sel.c:432
+#: shell/evolution-shell-component.c:1042
 msgid "Busy"
 msgstr "繁忙"
 
@@ -6351,6 +5651,7 @@ msgstr "繁忙"
 # calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -6365,6 +5666,7 @@ msgstr "尚未开始"
 # calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "正在进行中"
 
@@ -6382,7 +5684,8 @@ msgstr "正在进行中"
 # calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
+#: calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "已完成"
 
@@ -6422,10 +5725,9 @@ msgstr ""
 # widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1496
+#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
+#: mail/mail-config.glade.h:56
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -6455,8 +5757,9 @@ msgstr "已分派"
 # calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
 # calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
 # calendar/gui/e-meeting-model.c:810
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:810
 msgid "Yes"
 msgstr "是"
 
@@ -6466,10 +5769,23 @@ msgstr "是"
 # calendar/gui/e-meeting-model.c:811
 # calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
 # calendar/gui/e-meeting-model.c:811
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:811
 msgid "No"
 msgstr "否"
 
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1675
+# calendar/gui/e-week-view.c:1182
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
+# calendar/gui/e-week-view.c:1184
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
+# calendar/gui/e-week-view.c:1188
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
+#: calendar/gui/e-week-view.c:1188
+msgid "Searching"
+msgstr "搜索"
+
 # calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 # calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 # calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
@@ -6504,15 +5820,15 @@ msgstr "月视图"
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "日历"
 
 # calendar/gui/component-factory.c:64
 # calendar/gui/component-factory.c:64
 # calendar/gui/component-factory.c:64
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "文件夹含有约会和事件"
 
@@ -6528,10 +5844,9 @@ msgstr "文件夹含有约会和事件"
 # my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
 # shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 # views/tasks/galview.xml.h:1
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "任务"
@@ -6539,102 +5854,49 @@ msgstr "任务"
 # calendar/gui/component-factory.c:69
 # calendar/gui/component-factory.c:69
 # calendar/gui/component-factory.c:69
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "文件夹含有 to-do 项"
 
-# my-evolution/my-evolution.glade.h:10
-# my-evolution/my-evolution.glade.h:10
-# my-evolution/my-evolution.glade.h:10
-#: calendar/gui/component-factory.c:695
-#, fuzzy
-msgid "New meeting"
-msgstr "新闻来源设置"
-
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/component-factory.c:695
-#, fuzzy
-msgid "_Meeting"
-msgstr "会见"
-
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/component-factory.c:699
-#, fuzzy
-msgid "New task"
-msgstr "新建任务"
-
-# ui/evolution-tasks.xml.h:18
-# ui/evolution-tasks.xml.h:18
-# ui/evolution-tasks.xml.h:22
-#: calendar/gui/component-factory.c:699
-msgid "_Task"
-msgstr "任务(_T)"
-
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:703
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "新建约会"
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "创建新约会"
 
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/component-factory.c:703
-#, fuzzy
-msgid "All _Day Appointment"
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
+msgid "New _Appointment"
 msgstr "新建约会(_A)"
 
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:707
-#, fuzzy
-msgid "New appointment"
-msgstr "新建约会"
-
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/component-factory.c:707
-#, fuzzy
-msgid "_Appointment"
-msgstr "约会"
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:6
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:6
+msgid "Create a new task"
+msgstr "创建新任务"
 
-# calendar/gui/gnome-cal.c:1499
-# calendar/gui/gnome-cal.c:1499
-# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/control-factory.c:123
-#, fuzzy, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "无法打开“%s”中的文件夹"
+# calendar/gui/component-factory.c:649
+# calendar/gui/component-factory.c:649
+# calendar/gui/component-factory.c:649
+#: calendar/gui/component-factory.c:649
+msgid "New _Task"
+msgstr "新建任务(_T)"
 
 # calendar/gui/control-factory.c:127
 # calendar/gui/control-factory.c:127
 # calendar/gui/control-factory.c:127
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "日历将显示的 URI"
 
-# ui/evolution.xml.h:3
-# ui/evolution.xml.h:3
-# executive-summary/component/e-summary-url.c:72
-#: calendar/gui/control-factory.c:174
-#, fuzzy
-msgid "The type of view to show"
-msgstr "将视图改变为 %s"
-
 # calendar/gui/dialogs/alarm-options.c:359
 # calendar/gui/dialogs/alarm-options.c:359
 # calendar/gui/dialogs/alarm-options.c:359
@@ -6713,8 +5975,8 @@ msgid ""
 "This is an email reminder, but Evolution does not yet support this kind of "
 "reminders.  You will not be able to edit the options for this reminder."
 msgstr ""
-"这是电子邮件提示器，但 Evolution "
-"尚不支持这类提示器。您无法为该提示器编辑选项。"
+"这是电子邮件提示器，但 Evolution 尚不支持这类提示器。您无法为该提示器编辑选"
+"项。"
 
 # calendar/gui/dialogs/alarm-options.glade.h:7
 # calendar/gui/dialogs/alarm-options.glade.h:7
@@ -6748,7 +6010,10 @@ msgstr "小时"
 # calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 # calendar/gui/dialogs/alarm-options.glade.h:11
 # executive-summary/test-service/rdf-summary.c:806
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+# filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: executive-summary/test-service/rdf-summary.c:806
+#: filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "分钟"
 
@@ -6978,7 +6243,7 @@ msgstr "提示器"
 # calendar/gui/e-itip-control.c:748 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:748 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "概要："
 
@@ -7031,7 +6296,7 @@ msgstr "小时"
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:129
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:131
 msgid "minute(s)"
 msgstr "分钟"
 
@@ -7098,35 +6363,49 @@ msgstr "被延误任务的颜色"
 msgid "Color for tasks due today"
 msgstr "今天到期任务的颜色"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Create new appointments with a default _reminder"
+msgstr "用默认提醒器创建新约会(_R)"
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "天数"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "First day of wee_k:"
+msgstr "每周的第一天(_K)："
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 # calendar/gui/dialogs/recurrence-page.c:963
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 # calendar/gui/dialogs/recurrence-page.c:963
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 # calendar/gui/dialogs/recurrence-page.c:963
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "星期五"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "小时"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "分钟"
 
@@ -7136,44 +6415,54 @@ msgstr "分钟"
 # calendar/gui/dialogs/recurrence-page.c:959
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 # calendar/gui/dialogs/recurrence-page.c:959
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "星期一"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "O_verdue tasks:"
+msgstr "被延误的任务(_V)："
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "星期六"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
-msgstr ""
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Show appointment _end times in week and month views"
+msgstr "在周视图和月视图中显示约会结束时间(_E)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "在日期浏览器中显示周数(_N)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Sta_rt of day:"
 msgstr "每天的开始(_R)："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Su_n"
 msgstr "星期日(_N)"
 
@@ -7183,40 +6472,31 @@ msgstr "星期日(_N)"
 # calendar/gui/dialogs/recurrence-page.c:965
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 # calendar/gui/dialogs/recurrence-page.c:965
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "星期日"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#, fuzzy
-msgid "T_asks due today:"
-msgstr "今天到期的任务(_K)："
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "星期四(_H)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "T_ue"
 msgstr "星期二(_U)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
-msgid "Task List"
-msgstr "任务列表(_T)"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Tas_ks due today:"
+msgstr "今天到期的任务(_K)："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 # calendar/gui/dialogs/recurrence-page.c:962
@@ -7224,29 +6504,36 @@ msgstr "任务列表(_T)"
 # calendar/gui/dialogs/recurrence-page.c:962
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 # calendar/gui/dialogs/recurrence-page.c:962
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "星期四"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr "时间"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time _zone:"
 msgstr "时区(_Z)："
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Time di_visions:"
+msgstr "时间分割(_V)："
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
 msgstr "时间格式："
 
@@ -7256,8 +6543,8 @@ msgstr "时间格式："
 # calendar/gui/dialogs/recurrence-page.c:960
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 # calendar/gui/dialogs/recurrence-page.c:960
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -7267,8 +6554,8 @@ msgstr "星期二"
 # calendar/gui/dialogs/recurrence-page.c:961
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 # calendar/gui/dialogs/recurrence-page.c:961
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -7278,124 +6565,113 @@ msgstr "星期三"
 # ui/evolution-calendar.xml.h:33
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 # ui/evolution-calendar.xml.h:33
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: ui/evolution-calendar.xml.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "一周工作日"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_12 hour (AM/PM)"
 msgstr "12 小时 (AM/PM) (_1)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_24 hour"
 msgstr "24 小时(_2)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Ask for confirmation when deleting items"
 msgstr "删除项时要求确认(_A)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Compress weekends in month view"
 msgstr "不在月视图中显示周末(_C)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "显示(_D)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_End of day:"
 msgstr "每天的结束(_E)："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Fri"
 msgstr "星期五(_F)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_General"
 msgstr "常规(_G)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Hide completed tasks after"
 msgstr "随后隐藏已完成的任务(_H)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Mon"
 msgstr "星期一(_M)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#, fuzzy
-msgid "_Overdue tasks:"
-msgstr "被延误的任务(_V)："
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+msgid "_Other"
+msgstr "其它(_O)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Sat"
 msgstr "星期六(_S)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#, fuzzy
-msgid "_Show appointment end times in week and month views"
-msgstr "在周视图和月视图中显示约会结束时间(_E)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#, fuzzy
-msgid "_Time divisions:"
-msgstr "时间分割(_V)："
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "_Task List"
+msgstr "任务列表(_T)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Wed"
 msgstr "星期三(_W)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "before the start of the appointment"
 msgstr "在约会开始以前"
 
@@ -7504,56 +6780,56 @@ msgstr "%s  您还没有进行修改，更新编辑器？"
 # calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 # calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 # calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr " 到 "
 
 # calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 # calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 # calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (完成 "
 
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "已完成 "
 
 # calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 # calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 # calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr " (预定 "
 
 # calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 # calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 # calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "预定 "
 
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:321
 msgid "Could not update object!"
 msgstr "无法更新对象！"
 
 # calendar/gui/dialogs/comp-editor.c:678
 # calendar/gui/dialogs/comp-editor.c:678
 # calendar/gui/dialogs/comp-editor.c:692
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:692
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
 # calendar/gui/dialogs/comp-editor.c:683
 # calendar/gui/dialogs/comp-editor.c:683
 # calendar/gui/dialogs/comp-editor.c:697
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:697
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
@@ -7561,7 +6837,7 @@ msgstr "约会 - %s"
 # calendar/gui/dialogs/comp-editor.c:686
 # calendar/gui/dialogs/comp-editor.c:686
 # calendar/gui/dialogs/comp-editor.c:700
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:700
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
@@ -7569,7 +6845,7 @@ msgstr "任务 - %s"
 # calendar/gui/dialogs/comp-editor.c:689
 # calendar/gui/dialogs/comp-editor.c:689
 # calendar/gui/dialogs/comp-editor.c:703
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:703
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日志条目 - %s"
@@ -7577,23 +6853,51 @@ msgstr "日志条目 - %s"
 # calendar/gui/dialogs/comp-editor.c:703
 # calendar/gui/dialogs/comp-editor.c:703
 # calendar/gui/dialogs/comp-editor.c:717
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:717
 msgid "No summary"
 msgstr "没有概要"
 
-# composer/e-msg-composer.c:943
-# composer/e-msg-composer.c:947
-# composer/e-msg-composer.c:912
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
-msgid "Save as..."
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
+# mail/mail-display.c:101
+#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2077
+#: mail/mail-display.c:101
+msgid "Overwrite file?"
+msgstr "覆盖文件？"
+
+# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
+# mail/mail-display.c:106
+# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:2034
+# mail/mail-display.c:106
+# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
+# mail/mail-display.c:105
+#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2084
+#: mail/mail-display.c:105
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"指定名称的文件已经存在。\n"
+"覆盖它？"
+
+# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
+# widgets/misc/e-filter-bar.h:101
+# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
+# widgets/misc/e-filter-bar.h:101
+# calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
+# widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
 msgstr "另存为..."
 
 # calendar/gui/dialogs/comp-editor.c:1272
 # calendar/gui/dialogs/comp-editor.c:1272
 # calendar/gui/dialogs/comp-editor.c:1277
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1277
 msgid "Unable to obtain current version!"
 msgstr "无法获取当前版本！"
 
@@ -7690,7 +6994,7 @@ msgstr "输入代表"
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "约会"
 
@@ -7719,7 +7023,7 @@ msgstr "再次发生"
 # calendar/gui/dialogs/event-editor.c:363
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:363
 msgid "Scheduling"
 msgstr "正在调度"
 
@@ -7734,7 +7038,7 @@ msgstr "正在调度"
 # calendar/gui/dialogs/event-editor.c:366
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:366
 msgid "Meeting"
 msgstr "会见"
 
@@ -7832,7 +7136,7 @@ msgstr "公开的(_B)"
 # calendar/gui/dialogs/event-page.glade.h:11
 # calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "按其显示时间"
 
@@ -7911,14 +7215,25 @@ msgstr "授权于(_D)..."
 msgid "Attendee"
 msgstr "出席者"
 
+# calendar/gui/dialogs/meeting-page.etspec.h:2
+# calendar/gui/e-meeting-time-sel.etspec.h:2
+# calendar/gui/dialogs/meeting-page.etspec.h:2
+# calendar/gui/e-meeting-time-sel.etspec.h:2
+# calendar/gui/dialogs/meeting-page.etspec.h:2
+# calendar/gui/e-meeting-time-sel.etspec.h:2
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "点击此处添加出席者"
+
 # calendar/gui/dialogs/meeting-page.etspec.h:3
 # calendar/gui/e-meeting-time-sel.etspec.h:3
 # calendar/gui/dialogs/meeting-page.etspec.h:3
 # calendar/gui/e-meeting-time-sel.etspec.h:3
 # calendar/gui/dialogs/meeting-page.etspec.h:3
 # calendar/gui/e-meeting-time-sel.etspec.h:3
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "通用名"
 
@@ -7928,8 +7243,8 @@ msgstr "通用名"
 # calendar/gui/e-meeting-time-sel.etspec.h:4
 # calendar/gui/dialogs/meeting-page.etspec.h:4
 # calendar/gui/e-meeting-time-sel.etspec.h:4
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "来自...的代表"
 
@@ -7939,8 +7254,8 @@ msgstr "来自...的代表"
 # calendar/gui/e-meeting-time-sel.etspec.h:5
 # calendar/gui/dialogs/meeting-page.etspec.h:5
 # calendar/gui/e-meeting-time-sel.etspec.h:5
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "授权于"
 
@@ -7950,8 +7265,8 @@ msgstr "授权于"
 # calendar/gui/e-meeting-time-sel.etspec.h:6
 # calendar/gui/dialogs/meeting-page.etspec.h:6
 # calendar/gui/e-meeting-time-sel.etspec.h:6
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "语言"
 
@@ -7961,8 +7276,8 @@ msgstr "语言"
 # calendar/gui/e-meeting-time-sel.etspec.h:7
 # calendar/gui/dialogs/meeting-page.etspec.h:7
 # calendar/gui/e-meeting-time-sel.etspec.h:7
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "成员"
 
@@ -7975,8 +7290,9 @@ msgstr "成员"
 # calendar/gui/dialogs/meeting-page.etspec.h:8
 # calendar/gui/e-itip-control.c:809
 # calendar/gui/e-meeting-time-sel.etspec.h:8
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
@@ -7986,8 +7302,8 @@ msgstr "RSVP"
 # calendar/gui/e-meeting-time-sel.etspec.h:9
 # calendar/gui/dialogs/meeting-page.etspec.h:9
 # calendar/gui/e-meeting-time-sel.etspec.h:9
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "角色"
 
@@ -8003,10 +7319,10 @@ msgstr "角色"
 # calendar/gui/e-calendar-table.etspec.h:15
 # calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:47
 # mail/message-list.etspec.h:9
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:47
+#: mail/message-list.etspec.h:9
 msgid "Status"
 msgstr "状态"
 
@@ -8022,9 +7338,9 @@ msgstr "状态"
 # calendar/gui/e-calendar-table.etspec.h:18
 # calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:94
 # shell/glade/e-active-connection-dialog.glade.h:5
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:95
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "类型"
@@ -8054,7 +7370,7 @@ msgstr "改变组织者(_C)"
 # calendar/gui/dialogs/meeting-page.glade.h:4
 # calendar/gui/e-meeting-time-sel.c:450
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:450
 msgid "_Invite Others..."
 msgstr "邀请其他人(_I)..."
 
@@ -8065,158 +7381,45 @@ msgstr "邀请其他人(_I)..."
 msgid "_Other Organizer"
 msgstr "其他组织者(_O)"
 
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-#, fuzzy
-msgid "st"
-msgstr "一号"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-#, fuzzy
-msgid "nd"
-msgstr "二号"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-#, fuzzy
-msgid "rd"
-msgstr "三号"
-
-# calendar/gui/dialogs/recurrence-page.c:1096
-# calendar/gui/dialogs/recurrence-page.c:1096
-# calendar/gui/dialogs/recurrence-page.c:1096
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
-msgstr ""
-
 # calendar/gui/dialogs/recurrence-page.c:571
 # calendar/gui/dialogs/recurrence-page.c:571
 # calendar/gui/dialogs/recurrence-page.c:571
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "该约会含有 Evolution 无法编辑的循环。"
 
 # calendar/gui/dialogs/recurrence-page.c:932
 # calendar/gui/dialogs/recurrence-page.c:932
 # calendar/gui/dialogs/recurrence-page.c:932
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "在"
 
-# addressbook/gui/contact-editor/e-contact-save-as.c:170
-# addressbook/gui/contact-editor/e-contact-save-as.c:170
-# addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: calendar/gui/dialogs/recurrence-page.c:1062
-#, fuzzy
-msgid "first"
-msgstr "列表"
-
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
-msgid "second"
-msgstr "秒"
-
-# addressbook/backend/ebook/e-card-simple.c:79
-# addressbook/backend/ebook/e-card-simple.c:85
-# addressbook/gui/contact-editor/e-contact-editor.c:1656
-# addressbook/gui/contact-editor/e-contact-editor.c:1714
-# mail/mail-config.glade.h:49
-# addressbook/backend/ebook/e-card-simple.c:79
-# addressbook/backend/ebook/e-card-simple.c:85
-# addressbook/gui/contact-editor/e-contact-editor.c:1656
-# addressbook/gui/contact-editor/e-contact-editor.c:1714
-# mail/mail-config.glade.h:49
-# addressbook/backend/ebook/e-card-simple.c:79
-# addressbook/backend/ebook/e-card-simple.c:85
-# addressbook/gui/contact-editor/e-contact-editor.c:1656
-# addressbook/gui/contact-editor/e-contact-editor.c:1714
-# mail/mail-config.glade.h:57
-#: calendar/gui/dialogs/recurrence-page.c:1064
-#, fuzzy
-msgid "third"
-msgstr "其它"
-
-# my-evolution/metar.c:64
-# my-evolution/metar.c:64
-# my-evolution/metar.c:64
-#: calendar/gui/dialogs/recurrence-page.c:1065
-#, fuzzy
-msgid "fourth"
-msgstr "北"
-
-# addressbook/gui/contact-editor/e-contact-save-as.c:170
-# addressbook/gui/contact-editor/e-contact-save-as.c:170
-# addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: calendar/gui/dialogs/recurrence-page.c:1066
-#, fuzzy
-msgid "last"
-msgstr "列表"
-
-# addressbook/backend/ebook/e-card-simple.c:80
-# addressbook/gui/contact-editor/e-contact-editor.c:1657
-# addressbook/gui/widgets/e-addressbook-view.c:869
-# addressbook/backend/ebook/e-card-simple.c:80
-# addressbook/gui/contact-editor/e-contact-editor.c:1657
-# addressbook/gui/widgets/e-addressbook-view.c:869
-# addressbook/backend/ebook/e-card-simple.c:80
-# addressbook/gui/contact-editor/e-contact-editor.c:1657
-# addressbook/gui/widgets/e-addressbook-view.c:980
-#: calendar/gui/dialogs/recurrence-page.c:1092
-#, fuzzy
-msgid "Other Date"
-msgstr "其它传真"
-
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "天"
 
 # calendar/gui/dialogs/recurrence-page.c:1088
 # calendar/gui/dialogs/recurrence-page.c:1088
 # calendar/gui/dialogs/recurrence-page.c:1088
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "在"
 
+# calendar/gui/dialogs/recurrence-page.c:1096
+# calendar/gui/dialogs/recurrence-page.c:1096
+# calendar/gui/dialogs/recurrence-page.c:1096
+#: calendar/gui/dialogs/recurrence-page.c:1096
+msgid "th"
+msgstr ""
+
 # calendar/gui/dialogs/recurrence-page.c:1269
 # calendar/gui/dialogs/recurrence-page.c:1269
 # calendar/gui/dialogs/recurrence-page.c:1269
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "循环"
 
@@ -8386,7 +7589,7 @@ msgstr "进度"
 # calendar/gui/dialogs/task-details-page.glade.h:12
 # my-evolution/e-summary-preferences.c:966
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "URL："
 
@@ -8404,16 +7607,6 @@ msgstr "优先级(_P)："
 msgid "_Status:"
 msgstr "状态(_S)："
 
-# addressbook/gui/component/addressbook-config.glade.h:7
-# calendar/gui/dialogs/task-editor.c:178
-# addressbook/gui/component/addressbook-config.glade.h:7
-# calendar/gui/dialogs/task-editor.c:178
-# addressbook/gui/component/addressbook-config.glade.h:9
-# calendar/gui/dialogs/task-editor.c:178
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "基本"
-
 # calendar/gui/dialogs/task-editor.c:190
 # calendar/gui/dialogs/task-editor.c:227
 # calendar/gui/dialogs/task-editor.c:322
@@ -8425,7 +7618,7 @@ msgstr "基本"
 # calendar/gui/dialogs/task-editor.c:322
 #: calendar/gui/dialogs/task-editor.c:190
 #: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "分派"
 
@@ -8438,9 +7631,9 @@ msgstr "分派"
 # calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:791
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:32
 msgid "Description:"
 msgstr "描述："
 
@@ -8458,14 +7651,102 @@ msgstr "开始日期(_R)："
 msgid "_Due Date:"
 msgstr "到期日期(_D)："
 
+# calendar/gui/e-calendar-table.c:427
+# calendar/gui/e-calendar-table.c:427
+# calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:428
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+# calendar/gui/e-calendar-table.c:428
+# calendar/gui/e-calendar-table.c:428
+# calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:429
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+# calendar/gui/e-calendar-table.c:429
+# calendar/gui/e-calendar-table.c:429
+# calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:430
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+# calendar/gui/e-calendar-table.c:430
+# calendar/gui/e-calendar-table.c:430
+# calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:431
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+# calendar/gui/e-calendar-table.c:431
+# calendar/gui/e-calendar-table.c:431
+# calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:432
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+# calendar/gui/e-calendar-table.c:432
+# calendar/gui/e-calendar-table.c:432
+# calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:433
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+# calendar/gui/e-calendar-table.c:433
+# calendar/gui/e-calendar-table.c:433
+# calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:434
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+# calendar/gui/e-calendar-table.c:434
+# calendar/gui/e-calendar-table.c:434
+# calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:435
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:436
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+# calendar/gui/e-calendar-table.c:436
+# calendar/gui/e-calendar-table.c:436
+# calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:437
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+# calendar/gui/e-calendar-table.c:437
+# calendar/gui/e-calendar-table.c:437
+# calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:438
+#, c-format
+msgid "100%"
+msgstr "100%"
+
 # calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2724
 # calendar/gui/e-week-view.c:1822
 # calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2726
 # calendar/gui/e-week-view.c:1824
 # calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
 # calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
+#: calendar/gui/e-week-view.c:1828
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
@@ -8478,37 +7759,12 @@ msgstr "删除选中的对象"
 # calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
 # calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
 # shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
+#: calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
+#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "打开(_O)"
 
-# composer/e-msg-composer.c:943
-# composer/e-msg-composer.c:947
-# composer/e-msg-composer.c:912
-#: calendar/gui/e-calendar-table.c:973
-#, fuzzy
-msgid "_Save as..."
-msgstr "另存为..."
-
-# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
-# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
-# ui/my-evolution.xml.h:7
-# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
-# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
-# ui/my-evolution.xml.h:7
-# ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
-# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
-# ui/my-evolution.xml.h:7
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
-msgid "_Print..."
-msgstr "打印(_P)..."
-
 # calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3553
 # calendar/gui/e-week-view.c:3431 ui/evolution-addressbook.xml.h:1
 # ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
@@ -8518,8 +7774,8 @@ msgstr "打印(_P)..."
 # calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
 # calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
 # ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
+#: calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪切(_U)"
@@ -8536,10 +7792,10 @@ msgstr "剪切(_U)"
 # calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
 # ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 # ui/evolution-tasks.xml.h:17
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3557
+#: calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "复制(_C)"
 
@@ -8558,49 +7814,39 @@ msgstr "复制(_C)"
 # calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
 # ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 # ui/evolution-tasks.xml.h:21
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:968 calendar/gui/e-day-view.c:3532
+#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3419
+#: calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:21
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-# ui/evolution-task-editor.xml.h:1
-# ui/evolution-task-editor.xml.h:1
-# ui/evolution-task-editor.xml.h:1
-#: calendar/gui/e-calendar-table.c:984
-#, fuzzy
-msgid "_Assign Task"
-msgstr "委派任务"
-
-# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-calendar-table.c:985
-#, fuzzy
-msgid "_Forward as iCalendar"
-msgstr "作为 iCalendar 转发(_C)"
-
 # calendar/gui/e-calendar-table.c:954
 # calendar/gui/e-calendar-table.c:954
 # calendar/gui/e-calendar-table.c:973
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:973
 msgid "_Mark as Complete"
 msgstr "标记为完成(_M)"
 
+# calendar/gui/e-calendar-table.c:956
+# calendar/gui/e-calendar-table.c:956
+# calendar/gui/e-calendar-table.c:975
+#: calendar/gui/e-calendar-table.c:975
+msgid "_Delete this Task"
+msgstr "删除该任务(_D)"
+
 # calendar/gui/e-calendar-table.c:959
 # calendar/gui/e-calendar-table.c:959
 # calendar/gui/e-calendar-table.c:978
-#: calendar/gui/e-calendar-table.c:987
-#, fuzzy
-msgid "_Mark Selected Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:978
+msgid "_Mark Tasks as Complete"
 msgstr "把任务标记为完成(_M)"
 
 # calendar/gui/e-calendar-table.c:961
 # calendar/gui/e-calendar-table.c:961
 # calendar/gui/e-calendar-table.c:980
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:980
 msgid "_Delete Selected Tasks"
 msgstr "删除选定的任务(_D)"
 
@@ -8610,8 +7856,8 @@ msgstr "删除选定的任务(_D)"
 # calendar/gui/e-week-view.c:3924
 # calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
 # calendar/gui/e-week-view.c:3928
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
+#: calendar/gui/e-week-view.c:3928
 msgid "Updating objects"
 msgstr "更新对象"
 
@@ -8621,7 +7867,8 @@ msgstr "更新对象"
 # calendar/gui/e-calendar-table.etspec.h:6
 # calendar/gui/e-calendar-table.c:1247
 # calendar/gui/e-calendar-table.etspec.h:6
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "点击以添加任务"
 
@@ -8638,50 +7885,50 @@ msgstr "提醒"
 # camel/camel-filter-driver.c:886
 # calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
 # camel/camel-filter-driver.c:1026
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:1026
 msgid "Complete"
 msgstr "完成"
 
 # calendar/gui/e-calendar-table.etspec.h:8
 # calendar/gui/e-calendar-table.etspec.h:8
 # calendar/gui/e-calendar-table.etspec.h:8
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "完成日期"
 
 # calendar/gui/e-calendar-table.etspec.h:9
 # calendar/gui/e-calendar-table.etspec.h:9
 # calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "约定日期"
 
 # calendar/gui/e-calendar-table.etspec.h:10
 # calendar/gui/e-calendar-table.etspec.h:10
 # calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "结束日期"
 
 # calendar/gui/e-calendar-table.etspec.h:11
 # calendar/gui/e-calendar-table.etspec.h:11
 # calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "地理位置"
 
 # calendar/gui/e-calendar-table.etspec.h:12
 # calendar/gui/e-calendar-table.etspec.h:12
 # calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "优先级"
 
 # calendar/gui/e-calendar-table.etspec.h:14
 # calendar/gui/e-calendar-table.etspec.h:14
 # calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "开始日期"
 
@@ -8696,22 +7943,23 @@ msgstr "开始日期"
 # shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "概要"
 
 # calendar/gui/e-calendar-table.etspec.h:17
 # calendar/gui/e-calendar-table.etspec.h:17
 # calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "任务排序"
 
 # calendar/gui/e-calendar-table.etspec.h:19
 # calendar/gui/e-calendar-table.etspec.h:19
 # calendar/gui/e-calendar-table.etspec.h:19
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -8769,8 +8017,8 @@ msgstr "%02i 分钟分割"
 # calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 #. 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:284 calendar/gui/e-day-view.c:1413
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1389
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
@@ -8782,7 +8030,7 @@ msgstr "%B %d %A"
 # calendar/gui/e-week-view-main-item.c:347
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1416
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b %d"
@@ -8794,7 +8042,8 @@ msgstr "%b %d"
 # calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
 # calendar/gui/print.c:768
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "上午"
 
@@ -8805,156 +8054,201 @@ msgstr "上午"
 # calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
 # calendar/gui/print.c:770
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "下午"
 
-# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/e-day-view.c:3549
-msgid "New _Appointment"
-msgstr "新建约会(_A)"
-
 # calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
 # calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3410
 # calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
-#, fuzzy
-msgid "New Meeting"
-msgstr "会见"
-
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
-msgid "New Task"
-msgstr "新建任务"
-
-# ui/evolution-comp-editor.xml.h:11
-# ui/evolution-comp-editor.xml.h:11
-# ui/evolution-comp-editor.xml.h:11
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "打印..."
-
 # calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
 # ui/evolution-calendar.xml.h:17
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3420
 # ui/evolution-calendar.xml.h:17
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
 # ui/evolution-calendar.xml.h:17
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
-#: ui/evolution-calendar.xml.h:10
+#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "转到今天(_T)"
 
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
 # calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3422
 # calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
 msgid "_Go to Date..."
 msgstr "转到日期(_G)..."
 
-# ui/evolution-calendar.xml.h:42
-# ui/evolution-calendar.xml.h:42
-# ui/evolution-calendar.xml.h:42
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
-#: ui/evolution-calendar.xml.h:31
-msgid "_Publish Free/Busy Information"
-msgstr "发布忙闲信息(_P)"
-
-# mail/mail-local.c:1416
-# mail/mail-local.c:1416
-# executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
-#, fuzzy
-msgid "_Configure..."
-msgstr "配置 %s"
-
-# mail/mail-local.c:1416
-# mail/mail-local.c:1416
-# executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
-#, fuzzy
-msgid "_Configure Pilot..."
-msgstr "配置 %s"
-
-# mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
-# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
-# mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
-msgid "_Save As..."
-msgstr "另存为(_S)..."
-
-# ui/evolution-event-editor.xml.h:7
-# ui/evolution-event-editor.xml.h:7
-# ui/evolution-event-editor.xml.h:7
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
-#, fuzzy
-msgid "_Schedule Meeting..."
-msgstr "调度会议(_M)"
-
-# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
-#, fuzzy
-msgid "_Forward as iCalendar..."
-msgstr "作为 iCalendar 转发(_C)"
+# calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
+# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3430
+# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
+#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
+msgid "_Delete this Appointment"
+msgstr "删除该约会(_D)"
 
 # calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3455
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
 msgid "Make this Occurrence _Movable"
 msgstr "使该事件可移动(_M)"
 
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3457
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
 msgid "Delete this _Occurrence"
 msgstr "删除该时间(_O)"
 
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
 # calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
 # calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
 msgid "Delete _All Occurrences"
 msgstr "删除所有事件(_A)"
 
-# shell/e-shell-view-menu.c:577
-# shell/e-shell-view-menu.c:577
-# shell/e-shell-view-menu.c:577
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "GNOME Pilot 工具好像并未安装到系统中。"
+# calendar/gui/e-itip-control.c:532
+# calendar/gui/e-itip-control.c:532
+# calendar/gui/e-itip-control.c:535
+#: calendar/gui/e-itip-control.c:535
+msgid "Meeting begins: <b>"
+msgstr "会议开始：<b>"
 
-# shell/e-shell-view-menu.c:585
-# shell/e-shell-view-menu.c:585
-# shell/e-shell-view-menu.c:585
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
-#, c-format
-msgid "Error executing %s."
-msgstr "执行 %s 错误。"
+# calendar/gui/e-itip-control.c:537
+# calendar/gui/e-itip-control.c:537
+# calendar/gui/e-itip-control.c:540
+#: calendar/gui/e-itip-control.c:540
+msgid "Task begins: <b>"
+msgstr "任务开始：<b>"
+
+# calendar/gui/e-itip-control.c:542
+# calendar/gui/e-itip-control.c:542
+# calendar/gui/e-itip-control.c:545
+#: calendar/gui/e-itip-control.c:545
+msgid "Free/Busy info begins: <b>"
+msgstr "忙闲信息开始于：<b>"
+
+# calendar/gui/e-itip-control.c:546
+# calendar/gui/e-itip-control.c:546
+# calendar/gui/e-itip-control.c:549
+#: calendar/gui/e-itip-control.c:549
+msgid "Begins: <b>"
+msgstr "开始时间：<b>"
+
+# calendar/gui/e-itip-control.c:558
+# calendar/gui/e-itip-control.c:558
+# calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:561
+msgid "Meeting ends: <b>"
+msgstr "会议结束时间：<b>"
+
+# calendar/gui/e-itip-control.c:561
+# calendar/gui/e-itip-control.c:561
+# calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:564
+msgid "Free/Busy info ends: <b>"
+msgstr "忙闲信息结束于：<b>"
+
+# calendar/gui/e-itip-control.c:565
+# calendar/gui/e-itip-control.c:565
+# calendar/gui/e-itip-control.c:568
+#: calendar/gui/e-itip-control.c:568
+msgid "Ends: <b>"
+msgstr "结束于：<b>"
+
+# calendar/gui/e-itip-control.c:579
+# calendar/gui/e-itip-control.c:579
+# calendar/gui/e-itip-control.c:582
+#: calendar/gui/e-itip-control.c:582
+msgid "Task Completed: <b>"
+msgstr "任务完成率：<b>"
+
+# calendar/gui/e-itip-control.c:589
+# calendar/gui/e-itip-control.c:589
+# calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:592
+msgid "Task Due: <b>"
+msgstr "任务到期时间：<b>"
+
+# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
+# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
+# calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
+msgid "iCalendar Information"
+msgstr "iCalendar 信息"
+
+# calendar/gui/e-itip-control.c:641
+# calendar/gui/e-itip-control.c:641
+# calendar/gui/e-itip-control.c:644
+#. Title
+#: calendar/gui/e-itip-control.c:644
+msgid "iCalendar Error"
+msgstr "iCalendar 错误"
+
+# calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
+# calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
+# calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
+msgid "An unknown person"
+msgstr "未知的人"
+
+# calendar/gui/e-itip-control.c:729
+# calendar/gui/e-itip-control.c:729
+# calendar/gui/e-itip-control.c:732
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:732
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作。"
+
+# calendar/gui/e-itip-control.c:745
+# calendar/gui/e-itip-control.c:745
+# calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:748
+msgid "<i>None</i>"
+msgstr "<i>无</i>"
+
+# calendar/gui/dialogs/task-details-page.glade.h:15
+# calendar/gui/dialogs/task-details-page.glade.h:15
+# calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/e-itip-control.c:760
+msgid "Status:"
+msgstr "状态："
+
+# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
+# calendar/gui/e-meeting-model.c:824
+# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
+# calendar/gui/e-meeting-model.c:824
+# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
+# calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-itip-control.c:765 calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-meeting-model.c:344 calendar/gui/e-meeting-model.c:824
+msgid "Accepted"
+msgstr "接受"
+
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:769
+msgid "Tentatively Accepted"
+msgstr "暂时接受"
+
+# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
+# calendar/gui/e-meeting-model.c:825
+# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
+# calendar/gui/e-meeting-model.c:825
+# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
+# calendar/gui/e-meeting-model.c:825
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:346 calendar/gui/e-meeting-model.c:825
+msgid "Declined"
+msgstr "否决"
 
 # calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:292
 # calendar/gui/e-meeting-model.c:357 calendar/gui/e-meeting-model.c:782
@@ -8975,98 +8269,461 @@ msgstr "执行 %s 错误。"
 # camel/providers/smtp/camel-smtp-transport.c:171
 # camel/providers/smtp/camel-smtp-transport.c:226
 # widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: calendar/gui/e-itip-control.c:777 calendar/gui/e-itip-control.c:976
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:357
+#: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-model.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
 msgid "Unknown"
 msgstr "未知"
 
+# calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:802
+# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
+# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
+# calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:802
+# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
+# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
+# calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
+# calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
+# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
+#: calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:855 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:881 calendar/gui/e-itip-control.c:894
+msgid "Choose an action:"
+msgstr "选择一项活动："
+
+# calendar/gui/e-itip-control.c:787
+# calendar/gui/e-itip-control.c:787
+# calendar/gui/e-itip-control.c:790
+#: calendar/gui/e-itip-control.c:824
+msgid "Update"
+msgstr "更新"
+
+# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
+# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
+# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
+# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
+# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
+# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
+# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
+# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
+# calendar/gui/e-itip-control.c:791 calendar/gui/e-itip-control.c:810
+# calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
+# calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
+# shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:825 calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:857 calendar/gui/e-itip-control.c:870
+#: calendar/gui/e-itip-control.c:883 calendar/gui/e-itip-control.c:896
+#: shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "确定"
+
+# calendar/gui/e-itip-control.c:803
+# calendar/gui/e-itip-control.c:803
+# calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:840
+msgid "Accept"
+msgstr "接受"
+
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:804
+# calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:841
+msgid "Tentatively accept"
+msgstr "暂时接受"
+
+# calendar/gui/e-itip-control.c:805
+# calendar/gui/e-itip-control.c:805
+# calendar/gui/e-itip-control.c:808
+#: calendar/gui/e-itip-control.c:842
+msgid "Decline"
+msgstr "否决"
+
+# calendar/gui/e-itip-control.c:819
+# calendar/gui/e-itip-control.c:819
+# calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:856
+msgid "Send Free/Busy Information"
+msgstr "发送忙闲信息"
+
+# calendar/gui/e-itip-control.c:832
+# calendar/gui/e-itip-control.c:832
+# calendar/gui/e-itip-control.c:835
+#: calendar/gui/e-itip-control.c:869
+msgid "Update respondent status"
+msgstr "更新应答者状态"
+
+# calendar/gui/e-itip-control.c:846
+# calendar/gui/e-itip-control.c:846
+# calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:882
+msgid "Send Latest Information"
+msgstr "发送最新的信息"
+
+# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
+# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
+# calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:895 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "取消"
+
+# calendar/gui/e-itip-control.c:875
+# calendar/gui/e-itip-control.c:875
+# calendar/gui/e-itip-control.c:909
+#: calendar/gui/e-itip-control.c:943
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> 发布了会议信息。"
+
+# calendar/gui/e-itip-control.c:876
+# calendar/gui/e-itip-control.c:876
+# calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:944
+msgid "Meeting Information"
+msgstr "会议信息"
+
+# calendar/gui/e-itip-control.c:880
+# calendar/gui/e-itip-control.c:880
+# calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:948
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> 请求您参加一个会议。"
+
+# calendar/gui/e-itip-control.c:881
+# calendar/gui/e-itip-control.c:881
+# calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:949
+msgid "Meeting Proposal"
+msgstr "会议建议"
+
+# calendar/gui/e-itip-control.c:885
+# calendar/gui/e-itip-control.c:885
+# calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:953
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> 希望加入到已存的会议。"
+
+# calendar/gui/e-itip-control.c:886
+# calendar/gui/e-itip-control.c:886
+# calendar/gui/e-itip-control.c:920
+#: calendar/gui/e-itip-control.c:954
+msgid "Meeting Update"
+msgstr "会议更新"
+
+# calendar/gui/e-itip-control.c:890
+# calendar/gui/e-itip-control.c:890
+# calendar/gui/e-itip-control.c:924
+#: calendar/gui/e-itip-control.c:958
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> 想收到最新的会议信息。"
+
+# calendar/gui/e-itip-control.c:891
+# calendar/gui/e-itip-control.c:891
+# calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:959
+msgid "Meeting Update Request"
+msgstr "会议更新请求"
+
+# calendar/gui/e-itip-control.c:895
+# calendar/gui/e-itip-control.c:895
+# calendar/gui/e-itip-control.c:948
+#: calendar/gui/e-itip-control.c:982
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> 已回复一个会议请求。"
+
+# calendar/gui/e-itip-control.c:896
+# calendar/gui/e-itip-control.c:896
+# calendar/gui/e-itip-control.c:949
+#: calendar/gui/e-itip-control.c:983
+msgid "Meeting Reply"
+msgstr "会议答复"
+
+# calendar/gui/e-itip-control.c:900
+# calendar/gui/e-itip-control.c:900
+# calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:987
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> 取消了一个会议。"
+
+# calendar/gui/e-itip-control.c:901
+# calendar/gui/e-itip-control.c:901
+# calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:988
+msgid "Meeting Cancellation"
+msgstr "会议取消"
+
+# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
+# calendar/gui/e-itip-control.c:990
+# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
+# calendar/gui/e-itip-control.c:990
+# calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
+# calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:992 calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1098
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> 发送了一个无法理解的信息。"
+
+# calendar/gui/e-itip-control.c:906
+# calendar/gui/e-itip-control.c:906
+# calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:993
+msgid "Bad Meeting Message"
+msgstr "错误的会议信息"
+
+# calendar/gui/e-itip-control.c:925
+# calendar/gui/e-itip-control.c:925
+# calendar/gui/e-itip-control.c:979
+#: calendar/gui/e-itip-control.c:1013
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> 发布了任务信息。"
+
+# calendar/gui/e-itip-control.c:926
+# calendar/gui/e-itip-control.c:926
+# calendar/gui/e-itip-control.c:980
+#: calendar/gui/e-itip-control.c:1014
+msgid "Task Information"
+msgstr "任务信息"
+
+# calendar/gui/e-itip-control.c:930
+# calendar/gui/e-itip-control.c:930
+# calendar/gui/e-itip-control.c:984
+#: calendar/gui/e-itip-control.c:1018
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> 请求您完成一个任务。"
+
+# calendar/gui/e-itip-control.c:931
+# calendar/gui/e-itip-control.c:931
+# calendar/gui/e-itip-control.c:985
+#: calendar/gui/e-itip-control.c:1019
+msgid "Task Proposal"
+msgstr "任务建议"
+
+# calendar/gui/e-itip-control.c:935
+# calendar/gui/e-itip-control.c:935
+# calendar/gui/e-itip-control.c:989
+#: calendar/gui/e-itip-control.c:1023
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s<b> 希望加入到已存在的任务。"
+
+# calendar/gui/e-itip-control.c:936
+# calendar/gui/e-itip-control.c:936
+# calendar/gui/e-itip-control.c:990
+#: calendar/gui/e-itip-control.c:1024
+msgid "Task Update"
+msgstr "任务更新"
+
+# calendar/gui/e-itip-control.c:940
+# calendar/gui/e-itip-control.c:940
+# calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1028
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> 希望获取最新的任务信息。"
+
+# calendar/gui/e-itip-control.c:941
+# calendar/gui/e-itip-control.c:941
+# calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1029
+msgid "Task Update Request"
+msgstr "任务更新请求"
+
+# calendar/gui/e-itip-control.c:945
+# calendar/gui/e-itip-control.c:945
+# calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1053
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> 已经回复了任务委派。"
+
+# calendar/gui/e-itip-control.c:946
+# calendar/gui/e-itip-control.c:946
+# calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1054
+msgid "Task Reply"
+msgstr "任务回复"
+
+# calendar/gui/e-itip-control.c:950
+# calendar/gui/e-itip-control.c:950
+# calendar/gui/e-itip-control.c:1024
+#: calendar/gui/e-itip-control.c:1058
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> 取消了任务。"
+
+# calendar/gui/e-itip-control.c:951
+# calendar/gui/e-itip-control.c:951
+# calendar/gui/e-itip-control.c:1025
+#: calendar/gui/e-itip-control.c:1059
+msgid "Task Cancellation"
+msgstr "任务取消"
+
+# calendar/gui/e-itip-control.c:956
+# calendar/gui/e-itip-control.c:956
+# calendar/gui/e-itip-control.c:1030
+#: calendar/gui/e-itip-control.c:1064
+msgid "Bad Task Message"
+msgstr "错误的任务邮件"
+
+# calendar/gui/e-itip-control.c:975
+# calendar/gui/e-itip-control.c:975
+# calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1083
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> 发布了忙闲信息。"
+
+# calendar/gui/e-itip-control.c:976
+# calendar/gui/e-itip-control.c:976
+# calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1084
+msgid "Free/Busy Information"
+msgstr "忙闲信息"
+
+# calendar/gui/e-itip-control.c:980
+# calendar/gui/e-itip-control.c:980
+# calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1088
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> 请求您的忙闲信息。"
+
+# calendar/gui/e-itip-control.c:981
+# calendar/gui/e-itip-control.c:981
+# calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1089
+msgid "Free/Busy Request"
+msgstr "忙闲请求"
+
+# calendar/gui/e-itip-control.c:985
+# calendar/gui/e-itip-control.c:985
+# calendar/gui/e-itip-control.c:1059
+#: calendar/gui/e-itip-control.c:1093
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> 应答了忙闲请求。"
+
+# calendar/gui/e-itip-control.c:986
+# calendar/gui/e-itip-control.c:986
+# calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1094
+msgid "Free/Busy Reply"
+msgstr "忙闲应答"
+
+# calendar/gui/e-itip-control.c:991
+# calendar/gui/e-itip-control.c:991
+# calendar/gui/e-itip-control.c:1065
+#: calendar/gui/e-itip-control.c:1099
+msgid "Bad Free/Busy Message"
+msgstr "错误的忙闲信息"
+
+# calendar/gui/e-itip-control.c:1064
+# calendar/gui/e-itip-control.c:1064
+# calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1172
+msgid "The message does not appear to be properly formed"
+msgstr "邮件的格式可能不正确"
+
+# calendar/gui/e-itip-control.c:1083
+# calendar/gui/e-itip-control.c:1083
+# calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1191
+msgid "The message contains only unsupported requests."
+msgstr "邮件只含有不支持的请求。"
+
+# calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
+# calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
+# calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1219 calendar/gui/e-itip-control.c:1225
+msgid "The attachment does not contain a valid calendar message"
+msgstr "附件中没有有效的日程信息"
+
+# calendar/gui/e-itip-control.c:1142
+# calendar/gui/e-itip-control.c:1142
+# calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1250
+msgid "The attachment has no viewable calendar items"
+msgstr "附件中没有可查看的日程项目"
+
 # calendar/gui/e-itip-control.c:1241
 # calendar/gui/e-itip-control.c:1241
 # calendar/gui/e-itip-control.c:1315
-#: calendar/gui/e-itip-control.c:1564
+#: calendar/gui/e-itip-control.c:1349
 msgid "Calendar file could not be updated!\n"
 msgstr "无法更新日历文件！\n"
 
 # calendar/gui/e-itip-control.c:1243
 # calendar/gui/e-itip-control.c:1243
 # calendar/gui/e-itip-control.c:1317
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1351
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-# calendar/gui/e-itip-control.c:1300
-# calendar/gui/e-itip-control.c:1300
-# calendar/gui/e-itip-control.c:1374
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "由于条目不再存在而无法更新参与者状态"
-
-#: calendar/gui/e-itip-control.c:1613
-msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-
 # calendar/gui/e-itip-control.c:1288
 # calendar/gui/e-itip-control.c:1288
 # calendar/gui/e-itip-control.c:1362
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1396
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "因为无效状态而无法更新参与者状态！\n"
 
 # calendar/gui/e-itip-control.c:1296
 # calendar/gui/e-itip-control.c:1296
 # calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1638
+#: calendar/gui/e-itip-control.c:1404
 msgid "Attendee status could not be updated!\n"
 msgstr "无法更新参与者状态！\n"
 
 # calendar/gui/e-itip-control.c:1298
 # calendar/gui/e-itip-control.c:1298
 # calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1406
 msgid "Attendee status updated\n"
 msgstr "更新参与者状态\n"
 
+# calendar/gui/e-itip-control.c:1300
+# calendar/gui/e-itip-control.c:1300
+# calendar/gui/e-itip-control.c:1374
+#: calendar/gui/e-itip-control.c:1408
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "由于条目不再存在而无法更新参与者状态"
+
 # calendar/gui/e-itip-control.c:1328
 # calendar/gui/e-itip-control.c:1328
 # calendar/gui/e-itip-control.c:1402
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1436
 msgid "Removal Complete"
 msgstr "删除完成"
 
 # calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
 # calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
 # calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1455 calendar/gui/e-itip-control.c:1505
 msgid "Item sent!\n"
 msgstr "项目已发送！\n"
 
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1457 calendar/gui/e-itip-control.c:1509
 msgid "The item could not be sent!\n"
 msgstr "无法发送项目！\n"
 
-# mail/mail-account-gui.c:837
-# mail/mail-account-gui.c:837
-# mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1861
-#, fuzzy
-msgid "Select Calendar Folder"
-msgstr "选择文件夹"
-
-# mail/mail-account-gui.c:837
-# mail/mail-account-gui.c:837
-# mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1868
-#, fuzzy
-msgid "Select Tasks Folder"
-msgstr "选择文件夹"
+# calendar/gui/e-itip-control.c:1581
+# calendar/gui/e-itip-control.c:1581
+# calendar/gui/e-itip-control.c:1648
+#: calendar/gui/e-itip-control.c:1682
+msgid "Unable to find any of your identities in the attendees list!\n"
+msgstr "无法在参与者列表中找到您的任何身份！\n"
 
 # calendar/gui/e-itip-control.glade.h:2
 # calendar/gui/e-itip-control.glade.h:2
@@ -9135,28 +8792,28 @@ msgstr "日期-开始"
 # calendar/gui/e-meeting-model.c:95
 # calendar/gui/e-meeting-model.c:95
 # calendar/gui/e-meeting-model.c:95
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:95
 msgid "Chair Persons"
 msgstr "主席人员"
 
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1550
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
 msgid "Required Participants"
 msgstr "必需的参与者"
 
 # calendar/gui/e-meeting-model.c:97
 # calendar/gui/e-meeting-model.c:97
 # calendar/gui/e-meeting-model.c:97
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:97
 msgid "Optional Participants"
 msgstr "可选的参与者"
 
 # calendar/gui/e-meeting-model.c:98
 # calendar/gui/e-meeting-model.c:98
 # calendar/gui/e-meeting-model.c:98
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:98
 msgid "Non-Participants"
 msgstr "不参加"
 
@@ -9166,8 +8823,8 @@ msgstr "不参加"
 # calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
 # calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
 # calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
 msgid "Individual"
 msgstr "个人"
 
@@ -9177,7 +8834,8 @@ msgstr "个人"
 # calendar/gui/e-meeting-model.c:779
 # calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
 # calendar/gui/e-meeting-model.c:779
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:779
 msgid "Group"
 msgstr "组"
 
@@ -9187,7 +8845,8 @@ msgstr "组"
 # calendar/gui/e-meeting-model.c:780
 # calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 # calendar/gui/e-meeting-model.c:780
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:780
 msgid "Resource"
 msgstr "资源"
 
@@ -9197,7 +8856,8 @@ msgstr "资源"
 # calendar/gui/e-meeting-model.c:781
 # calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
 # calendar/gui/e-meeting-model.c:781
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:781
 msgid "Room"
 msgstr "房间"
 
@@ -9207,7 +8867,8 @@ msgstr "房间"
 # calendar/gui/e-meeting-model.c:794
 # calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
 # calendar/gui/e-meeting-model.c:794
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
+#: calendar/gui/e-meeting-model.c:794
 msgid "Chair"
 msgstr "主席"
 
@@ -9217,8 +8878,8 @@ msgstr "主席"
 # calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
 # calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
 # calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
 msgid "Required Participant"
 msgstr "必需的参与者"
 
@@ -9228,7 +8889,8 @@ msgstr "必需的参与者"
 # calendar/gui/e-meeting-model.c:796
 # calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
 # calendar/gui/e-meeting-model.c:796
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:796
 msgid "Optional Participant"
 msgstr "可选的参与者"
 
@@ -9238,7 +8900,8 @@ msgstr "可选的参与者"
 # calendar/gui/e-meeting-model.c:797
 # calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
 # calendar/gui/e-meeting-model.c:797
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
+#: calendar/gui/e-meeting-model.c:797
 msgid "Non-Participant"
 msgstr "不参加"
 
@@ -9248,39 +8911,19 @@ msgstr "不参加"
 # calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 # calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
 # calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 msgid "Needs Action"
 msgstr "需要动作"
 
-# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-# calendar/gui/e-meeting-model.c:824
-# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-# calendar/gui/e-meeting-model.c:824
-# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-# calendar/gui/e-meeting-model.c:824
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "接受"
-
-# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-# calendar/gui/e-meeting-model.c:825
-# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-# calendar/gui/e-meeting-model.c:825
-# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-# calendar/gui/e-meeting-model.c:825
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "否决"
-
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:428
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
+#: calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
 msgid "Tentative"
 msgstr "暂时的"
 
@@ -9290,14 +8933,15 @@ msgstr "暂时的"
 # calendar/gui/e-meeting-model.c:827
 # calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
 # calendar/gui/e-meeting-model.c:827
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
+#: calendar/gui/e-meeting-model.c:827
 msgid "Delegated"
 msgstr "被委任的"
 
 # calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
 # calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
 # calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
 msgid "In Process"
 msgstr "正在处理"
 
@@ -9309,8 +8953,8 @@ msgstr "正在处理"
 # calendar/gui/e-meeting-time-sel.c:2102
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel-item.c:471
+#: calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%B月%d日 %A"
 
@@ -9325,8 +8969,8 @@ msgstr "%Y年%B月%d日 %A"
 # e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2132 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%Y年%m月%d日 %a"
@@ -9339,7 +8983,7 @@ msgstr "%Y年%m月%d日 %a"
 # e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
+#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
 #: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 msgid "%m/%d/%Y"
 msgstr "%Y年%m月%d日"
@@ -9347,112 +8991,112 @@ msgstr "%Y年%m月%d日"
 # calendar/gui/e-meeting-time-sel.c:430
 # calendar/gui/e-meeting-time-sel.c:433
 # calendar/gui/e-meeting-time-sel.c:433
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:433
 msgid "Out of Office"
 msgstr "办公室以外"
 
 # calendar/gui/e-meeting-time-sel.c:431
 # calendar/gui/e-meeting-time-sel.c:434
 # calendar/gui/e-meeting-time-sel.c:434
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "No Information"
 msgstr "没有信息"
 
 # calendar/gui/e-meeting-time-sel.c:467
 # calendar/gui/e-meeting-time-sel.c:470
 # calendar/gui/e-meeting-time-sel.c:470
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:470
 msgid "_Options"
 msgstr "选项(_O)"
 
 # calendar/gui/e-meeting-time-sel.c:484
 # calendar/gui/e-meeting-time-sel.c:487
 # calendar/gui/e-meeting-time-sel.c:487
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:487
 msgid "Show _Only Working Hours"
 msgstr "只显示工作小时(_O)"
 
 # calendar/gui/e-meeting-time-sel.c:497
 # calendar/gui/e-meeting-time-sel.c:500
 # calendar/gui/e-meeting-time-sel.c:500
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:500
 msgid "Show _Zoomed Out"
 msgstr "显示缩放的输出(_Z)"
 
 # calendar/gui/e-meeting-time-sel.c:515
 # calendar/gui/e-meeting-time-sel.c:518
 # calendar/gui/e-meeting-time-sel.c:518
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:518
 msgid "_Update Free/Busy"
 msgstr "更新忙闲(_U)"
 
 # calendar/gui/e-meeting-time-sel.c:533
 # calendar/gui/e-meeting-time-sel.c:536
 # calendar/gui/e-meeting-time-sel.c:536
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:536
 msgid "_<<"
 msgstr "_<<"
 
 # calendar/gui/e-meeting-time-sel.c:550
 # calendar/gui/e-meeting-time-sel.c:553
 # calendar/gui/e-meeting-time-sel.c:553
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:553
 msgid "_Autopick"
 msgstr "自动获取(_A)"
 
 # calendar/gui/e-meeting-time-sel.c:564
 # calendar/gui/e-meeting-time-sel.c:567
 # calendar/gui/e-meeting-time-sel.c:567
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid ">_>"
 msgstr ">_>"
 
 # calendar/gui/e-meeting-time-sel.c:581
 # calendar/gui/e-meeting-time-sel.c:584
 # calendar/gui/e-meeting-time-sel.c:584
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:584
 msgid "_All People and Resources"
 msgstr "所有人和资源(_A)"
 
 # calendar/gui/e-meeting-time-sel.c:594
 # calendar/gui/e-meeting-time-sel.c:597
 # calendar/gui/e-meeting-time-sel.c:597
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:597
 msgid "All _People and One Resource"
 msgstr "所有人和一个资源(_P)"
 
 # calendar/gui/e-meeting-time-sel.c:607
 # calendar/gui/e-meeting-time-sel.c:610
 # calendar/gui/e-meeting-time-sel.c:610
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:610
 msgid "_Required People"
 msgstr "必需的人(_R)"
 
 # calendar/gui/e-meeting-time-sel.c:620
 # calendar/gui/e-meeting-time-sel.c:623
 # calendar/gui/e-meeting-time-sel.c:623
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:623
 msgid "Required People and _One Resource"
 msgstr "必需的人和一个资源(_O)"
 
 # calendar/gui/e-meeting-time-sel.c:643
 # calendar/gui/e-meeting-time-sel.c:646
 # calendar/gui/e-meeting-time-sel.c:646
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:646
 msgid "Meeting _start time:"
 msgstr "会议开始时间(_S)："
 
 # calendar/gui/e-meeting-time-sel.c:662
 # calendar/gui/e-meeting-time-sel.c:665
 # calendar/gui/e-meeting-time-sel.c:665
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:665
 msgid "Meeting _end time:"
 msgstr "会议结束时间(_E)："
 
 # calendar/gui/e-tasks.c:328
 # calendar/gui/e-tasks.c:328
 # calendar/gui/e-tasks.c:342
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:342
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
@@ -9460,7 +9104,7 @@ msgstr "在 %s 打开任务"
 # calendar/gui/e-tasks.c:355
 # calendar/gui/e-tasks.c:355
 # calendar/gui/e-tasks.c:367
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "无法从“%s”中装入任务"
@@ -9468,55 +9112,29 @@ msgstr "无法从“%s”中装入任务"
 # calendar/gui/e-tasks.c:367
 # calendar/gui/e-tasks.c:367
 # calendar/gui/e-tasks.c:379
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:379
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "不支持装入“%s”必需的方法"
 
-# calendar/gui/e-calendar-table.etspec.h:8
-# calendar/gui/e-calendar-table.etspec.h:8
-# calendar/gui/e-calendar-table.etspec.h:8
-#: calendar/gui/e-tasks.c:543
-#, fuzzy
-msgid "Completing tasks..."
-msgstr "完成日期"
-
-# calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2724
-# calendar/gui/e-week-view.c:1822
-# calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2726
-# calendar/gui/e-week-view.c:1824
-# calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
-# calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-tasks.c:566
-#, fuzzy
-msgid "Deleting selected objects..."
-msgstr "删除选中的对象"
-
 # mail/mail-ops.c:1556
 # mail/mail-ops.c:1558
 # calendar/gui/e-tasks.c:629
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:629
 msgid "Expunging"
 msgstr "正在删除"
 
 # calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
 # calendar/gui/e-week-view.c:3408 calendar/gui/e-week-view.c:3446
 # calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-# calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3430
-# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "删除该约会(_D)"
-
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1493
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "无法打开“%s”中的文件夹"
@@ -9524,7 +9142,7 @@ msgstr "无法打开“%s”中的文件夹"
 # calendar/gui/gnome-cal.c:1510
 # calendar/gui/gnome-cal.c:1510
 # calendar/gui/gnome-cal.c:1504
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1504
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "不支持打开“%s”必需的方法"
@@ -9532,7 +9150,7 @@ msgstr "不支持打开“%s”必需的方法"
 # calendar/gui/gnome-cal.c:1865
 # calendar/gui/gnome-cal.c:1865
 # calendar/gui/gnome-cal.c:1859
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1859
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "从 %s 打开日历"
@@ -9638,294 +9256,344 @@ msgstr "九月"
 # calendar/gui/itip-utils.c:243
 # calendar/gui/itip-utils.c:243
 # calendar/gui/itip-utils.c:243
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:243
 msgid "At least one attendee is necessary"
 msgstr "至少需要一个参加者"
 
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "必须设定组织者。"
 
+# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
+# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
+# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
+#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
+msgid "Event information"
+msgstr "事件信息"
+
+# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
+# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
+# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
+#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
+msgid "Task information"
+msgstr "任务信息"
+
+# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
+# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
+# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
+#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
+msgid "Journal information"
+msgstr "日志信息"
+
+# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
+# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
+# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
+#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
+msgid "Free/Busy information"
+msgstr "忙闲信息"
+
+# calendar/gui/itip-utils.c:321
+# calendar/gui/itip-utils.c:321
+# calendar/gui/itip-utils.c:321
+#: calendar/gui/itip-utils.c:321
+msgid "Calendar information"
+msgstr "日历信息"
+
+# calendar/gui/itip-utils.c:370
+# calendar/gui/itip-utils.c:370
+# calendar/gui/itip-utils.c:370
+#: calendar/gui/itip-utils.c:370
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "忙闲信息 (%s 到 %s)"
+
+# calendar/gui/itip-utils.c:382
+# calendar/gui/itip-utils.c:382
+# calendar/gui/itip-utils.c:382
+#: calendar/gui/itip-utils.c:382
+msgid "iCalendar information"
+msgstr "iCalendar 信息"
+
 # calendar/gui/itip-utils.c:573
 # calendar/gui/itip-utils.c:573
 # calendar/gui/itip-utils.c:581
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:581
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的参与者。"
 
 # calendar/gui/main.c:91
 # calendar/gui/main.c:91
 # calendar/gui/main.c:91
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "无法创建组件编辑器车间"
 
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "一号"
 
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "二号"
 
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "三号"
 
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "四号"
 
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "五号"
 
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "六号"
 
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "七号"
 
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "八号"
 
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "九号"
 
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "十号"
 
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "十一号"
 
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "十二号"
 
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "十三号"
 
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "十四号"
 
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "十五号"
 
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "十六号"
 
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "十七号"
 
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "十八号"
 
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "十九号"
 
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "二十号"
 
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "二十一号"
 
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "二十二号"
 
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "二十三号"
 
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "二十四号"
 
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "二十五号"
 
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "二十六号"
 
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "二十七号"
 
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "二十八号"
 
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "二十九号"
 
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "三十号"
 
 # calendar/gui/print.c:431
 # calendar/gui/print.c:431
 # calendar/gui/print.c:431
-#: calendar/gui/print.c:462
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "三十一号"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "日"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "一"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "二"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "三"
 
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "四"
 
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "五"
 
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "六"
 
@@ -9933,21 +9601,21 @@ msgstr "六"
 # calendar/gui/print.c:1819
 # calendar/gui/print.c:1819
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "选中的日期 (%Y年%b月%d日 %a)"
 
 # calendar/gui/print.c:1844 calendar/gui/print.c:1848
 # calendar/gui/print.c:1844 calendar/gui/print.c:1848
 # calendar/gui/print.c:1844 calendar/gui/print.c:1848
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%b月%d日 %a"
 
 # calendar/gui/print.c:1845
 # calendar/gui/print.c:1845
 # calendar/gui/print.c:1845
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%Y年%d日 %a"
 
@@ -9957,15 +9625,15 @@ msgstr "%Y年%d日 %a"
 # calendar/gui/print.c:1852
 # calendar/gui/print.c:1849 calendar/gui/print.c:1851
 # calendar/gui/print.c:1852
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%Y年%b月%d日 %a"
 
 # calendar/gui/print.c:1856
 # calendar/gui/print.c:1856
 # calendar/gui/print.c:1856
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "选中的周 (%s - %s)"
@@ -9974,7 +9642,7 @@ msgstr "选中的周 (%s - %s)"
 # calendar/gui/print.c:1864
 # calendar/gui/print.c:1864
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "选中的月 (%Y年%b月)"
 
@@ -9982,14 +9650,68 @@ msgstr "选中的月 (%Y年%b月)"
 # calendar/gui/print.c:1871
 # calendar/gui/print.c:1871
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "选中的年 (%Y年)"
 
+# calendar/gui/print.c:2205
+# calendar/gui/print.c:2205
+# calendar/gui/print.c:2205
+#: calendar/gui/print.c:2205
+msgid "Task"
+msgstr "任务"
+
+# calendar/gui/print.c:2262
+# calendar/gui/print.c:2262
+# calendar/gui/print.c:2262
+#: calendar/gui/print.c:2262
+#, c-format
+msgid "Status: %s"
+msgstr "状态：%s"
+
+# calendar/gui/print.c:2280
+# calendar/gui/print.c:2280
+# calendar/gui/print.c:2280
+#: calendar/gui/print.c:2280
+#, c-format
+msgid "Priority: %s"
+msgstr "优先级：%s"
+
+# calendar/gui/print.c:2294
+# calendar/gui/print.c:2294
+# calendar/gui/print.c:2294
+#: calendar/gui/print.c:2294
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "完成率：%i"
+
+# calendar/gui/print.c:2306
+# calendar/gui/print.c:2306
+# calendar/gui/print.c:2306
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "URL: %s"
+msgstr "URL：%s"
+
+# calendar/gui/print.c:2320
+# calendar/gui/print.c:2320
+# calendar/gui/print.c:2320
+#: calendar/gui/print.c:2320
+#, c-format
+msgid "Categories: %s"
+msgstr "类别：%s"
+
+# calendar/gui/print.c:2331
+# calendar/gui/print.c:2331
+# calendar/gui/print.c:2331
+#: calendar/gui/print.c:2331
+msgid "Contacts: "
+msgstr "联系人："
+
 # calendar/gui/print.c:2386
 # calendar/gui/print.c:2386
 # calendar/gui/print.c:2386
-#: calendar/gui/print.c:2430
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "打印日历"
 
@@ -10002,24 +9724,23 @@ msgstr "打印日历"
 # calendar/gui/print.c:2477 calendar/gui/print.c:2569
 # mail/mail-callbacks.c:2597 my-evolution/e-summary.c:605
 # ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2611 my-evolution/e-summary.c:605
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
 msgid "Print Preview"
 msgstr "打印预览"
 
 # calendar/gui/print.c:2506
 # calendar/gui/print.c:2506
 # calendar/gui/print.c:2506
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "打印项"
 
 # calendar/gui/print.c:2587
 # calendar/gui/print.c:2587
 # calendar/gui/print.c:2587
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "打印设置"
 
@@ -10034,41 +9755,31 @@ msgstr "无法创建任务预览。请检查您的 ORBit 和 OAF 设置。"
 # calendar/gui/tasks-control.c:126
 # calendar/gui/tasks-control.c:126
 # calendar/gui/tasks-control.c:137
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:137
 msgid "The URI of the tasks folder to display"
 msgstr "要显示的任务文件夹的 URI"
 
 # mail/mail-callbacks.c:2135
 # mail/mail-callbacks.c:2254
 # calendar/gui/tasks-control.c:434
-#: calendar/gui/tasks-control.c:456
+#: calendar/gui/tasks-control.c:434
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"该操作将永久删除所有标记为完成的任务。如果您继续，�"
-"�将无法恢复这些任务。\n"
+"该操作将永久删除所有标记为完成的任务。如果您继续，您将无法恢复这些任务。\n"
 "\n"
 "确实删除这些任务？"
 
 # mail/mail-callbacks.c:2142
 # mail/mail-callbacks.c:2261
 # calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2311
 msgid "Do not ask me again."
 msgstr "不要再次询问。"
 
-# addressbook/printing/e-contact-print.c:1111
-# addressbook/printing/e-contact-print.c:1111
-# addressbook/printing/e-contact-print.c:1115
-#: calendar/gui/tasks-control.c:612
-#, fuzzy
-msgid "Print Tasks"
-msgstr "打印卡片"
-
 # calendar/gui/tasks-migrate.c:105
 # calendar/gui/tasks-migrate.c:105
 # calendar/gui/tasks-migrate.c:105
@@ -10077,9 +9788,7 @@ msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"Evolution "
-"已经获得了您日历文件夹中的任务并自动将它们迁移到了�"
-"�任务文件夹。"
+"Evolution 已经获得了您日历文件夹中的任务并自动将它们迁移到了新任务文件夹。"
 
 # calendar/gui/tasks-migrate.c:108
 # calendar/gui/tasks-migrate.c:108
@@ -10091,9 +9800,7 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolution "
-"已经试图从您的日志文件夹中获取任务并把它们迁移到新�"
-"�务文件夹。\n"
+"Evolution 已经试图从您的日志文件夹中获取任务并把它们迁移到新任务文件夹。\n"
 "有些任务无法迁移，所以该过程应在将来再次尝试。"
 
 # calendar/gui/tasks-migrate.c:120
@@ -10104,9 +9811,7 @@ msgstr ""
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
-msgstr ""
-"无法打开“%s”；不会从日志文件夹迁移项目到任务文件夹"
-"。"
+msgstr "无法打开“%s”；不会从日志文件夹迁移项目到任务文件夹。"
 
 # calendar/gui/tasks-migrate.c:133
 # calendar/gui/tasks-migrate.c:133
@@ -10116,9 +9821,7 @@ msgstr ""
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
-msgstr ""
-"不支持用于装入“%s”的方法；不会从日志文件夹迁移项目"
-"到任务文件夹。"
+msgstr "不支持用于装入“%s”的方法；不会从日志文件夹迁移项目到任务文件夹。"
 
 # calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 # calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
@@ -10141,218 +9844,175 @@ msgstr "将 iCalendar 文件导入 Evolution 的车间"
 msgid "Imports iCalendar files into Evolution"
 msgstr "将 iCalendar 文件导入 Evolution"
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
-#, fuzzy
-msgid "Imports vCalendar files into Evolution"
-msgstr "将 iCalendar 文件导入 Evolution"
-
-# calendar/gui/e-itip-control.glade.h:4
-# calendar/gui/e-itip-control.glade.h:4
-# calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:638
-#, fuzzy
-msgid "Calendar Events"
-msgstr "日历消息"
-
-# importers/pine-importer.c:663
-# importers/pine-importer.c:663
-# importers/pine-importer.c:663
-#: calendar/importers/icalendar-importer.c:663
-#, fuzzy
-msgid ""
-"Evolution has found Gnome Calendar files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution 找到 Pine 邮件文件。\n"
-"您是否原意把它们导入 Evolution？"
-
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/importers/icalendar-importer.c:670
-#, fuzzy
-msgid "Gnome Calendar"
-msgstr "日历"
-
 # calendar/pcs/query.c:246
 # calendar/pcs/query.c:246
 # calendar/pcs/query.c:246
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:246
 msgid "time-now expects 0 arguments"
 msgstr "time-now 需要 0 个参数"
 
 # calendar/pcs/query.c:270
 # calendar/pcs/query.c:270
 # calendar/pcs/query.c:270
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:270
 msgid "make-time expects 1 argument"
 msgstr "make-time 需要 1 个参数"
 
 # calendar/pcs/query.c:275
 # calendar/pcs/query.c:275
 # calendar/pcs/query.c:275
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:275
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time 的第一个参数应该是字符串"
 
 # calendar/pcs/query.c:283
 # calendar/pcs/query.c:283
 # calendar/pcs/query.c:283
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:283
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time 的第一个参数必须是 ISO 8601 日期/时间字符串"
 
 # calendar/pcs/query.c:312
 # calendar/pcs/query.c:312
 # calendar/pcs/query.c:312
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day 需要 2 个参数"
 
 # calendar/pcs/query.c:317
 # calendar/pcs/query.c:317
 # calendar/pcs/query.c:317
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:317
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:324
 # calendar/pcs/query.c:324
 # calendar/pcs/query.c:324
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:324
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day 的第二个参数应该是整数"
 
 # calendar/pcs/query.c:351
 # calendar/pcs/query.c:351
 # calendar/pcs/query.c:351
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:351
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin 需要 1 个参数"
 
 # calendar/pcs/query.c:356
 # calendar/pcs/query.c:356
 # calendar/pcs/query.c:356
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:356
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:383
 # calendar/pcs/query.c:383
 # calendar/pcs/query.c:383
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:383
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end 需要一个参数"
 
 # calendar/pcs/query.c:388
 # calendar/pcs/query.c:388
 # calendar/pcs/query.c:388
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:388
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:424
 # calendar/pcs/query.c:424
 # calendar/pcs/query.c:424
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:424
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype 需要 0 个参数"
 
 # calendar/pcs/query.c:520
 # calendar/pcs/query.c:520
 # calendar/pcs/query.c:520
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? 需要两个参数"
 
 # calendar/pcs/query.c:525
 # calendar/pcs/query.c:525
 # calendar/pcs/query.c:525
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:525
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:532
 # calendar/pcs/query.c:532
 # calendar/pcs/query.c:532
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:532
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-rang? 的第二个参数应该是 time_t"
 
 # calendar/pcs/query.c:662
 # calendar/pcs/query.c:662
 # calendar/pcs/query.c:662
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:662
 msgid "contains? expects 2 arguments"
 msgstr "contains? 需要 2 个参数"
 
 # calendar/pcs/query.c:667
 # calendar/pcs/query.c:667
 # calendar/pcs/query.c:667
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:667
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? 的第一个参数应该是字符串"
 
 # calendar/pcs/query.c:674
 # calendar/pcs/query.c:674
 # calendar/pcs/query.c:674
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:674
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? 的第二个参数应该是字符串"
 
 # calendar/pcs/query.c:691
 # calendar/pcs/query.c:691
 # calendar/pcs/query.c:691
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:691
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
-msgstr ""
-"contains? "
-"的第一个参数必须是“任意”、“概要”、“描述”之一"
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr "contains? 的第一个参数必须是“任意”、“概要”、“描述”之一"
 
 # calendar/pcs/query.c:733
 # calendar/pcs/query.c:733
 # calendar/pcs/query.c:733
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:733
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? 至少需要 1 个参数"
 
 # calendar/pcs/query.c:745
 # calendar/pcs/query.c:745
 # calendar/pcs/query.c:745
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:745
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
-msgstr ""
-"has-categories? "
-"的所有参数都应该为字符串或者它唯一的参数为布尔假 (#f)"
+msgstr "has-categories? 的所有参数都应该为字符串或者它唯一的参数为布尔假 (#f)"
 
 # calendar/pcs/query.c:833
 # calendar/pcs/query.c:833
 # calendar/pcs/query.c:833
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:833
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? 需要 0 个参数"
 
 # calendar/pcs/query.c:878
 # calendar/pcs/query.c:878
 # calendar/pcs/query.c:878
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:878
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? 需要 1 个参数"
 
 # calendar/pcs/query.c:883
 # calendar/pcs/query.c:883
 # calendar/pcs/query.c:883
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:883
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? 的第一个参数应该是 time_t"
 
@@ -12776,14 +12436,14 @@ msgstr "该密码不支持解密"
 # mail/mail-ops.c:1870
 # mail/mail-ops.c:1872
 # camel/camel-data-cache.c:159
-#: camel/camel-data-cache.c:169
+#: camel/camel-data-cache.c:166
 msgid "Unable to create cache path"
 msgstr "无法创建缓冲路径"
 
 # camel/providers/imap/camel-imap-message-cache.c:154
 # camel/providers/imap/camel-imap-message-cache.c:154
 # camel/camel-data-cache.c:426
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:438
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "无法删除缓冲条目：%s：%s"
@@ -12833,14 +12493,14 @@ msgstr "您必需在线工作以便完成该操作"
 # camel/camel-filter-driver.c:553 camel/camel-filter-driver.c:562
 # camel/camel-filter-driver.c:602 camel/camel-filter-driver.c:611
 # camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
 msgid "Syncing folders"
 msgstr "同步文件夹"
 
 # camel/camel-filter-driver.c:921
 # camel/camel-filter-driver.c:970
 # camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "解析过滤规则错误： %s： %s"
@@ -12848,7 +12508,7 @@ msgstr "解析过滤规则错误： %s： %s"
 # camel/camel-filter-driver.c:927
 # camel/camel-filter-driver.c:976
 # camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "执行过滤规则错误： %s： %s"
@@ -12856,35 +12516,36 @@ msgstr "执行过滤规则错误： %s： %s"
 # camel/camel-filter-driver.c:664
 # camel/camel-filter-driver.c:713
 # camel/camel-filter-driver.c:865
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:865
 msgid "Unable to open spool folder"
 msgstr "无法打开脱机文件夹"
 
 # camel/camel-filter-driver.c:673
 # camel/camel-filter-driver.c:722
 # camel/camel-filter-driver.c:874
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:874
 msgid "Unable to process spool folder"
 msgstr "无法处理脱机文件夹"
 
 # camel/camel-filter-driver.c:688
 # camel/camel-filter-driver.c:737
 # camel/camel-filter-driver.c:889
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:889
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "获取邮件 %d (%d%%)"
 
 # camel/camel-filter-driver.c:692
 # camel/camel-filter-driver.c:741
 # camel/camel-filter-driver.c:893
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:893
 msgid "Cannot open message"
 msgstr "无法打开消息"
 
 # camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
 # camel/camel-filter-driver.c:742 camel/camel-filter-driver.c:754
 # camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
 #, c-format
 msgid "Failed on message %d"
 msgstr "在消息 %d 失败"
@@ -12892,14 +12553,14 @@ msgstr "在消息 %d 失败"
 # camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
 # camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
 # camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
 msgid "Syncing folder"
 msgstr "正在同步文件夹"
 
 # camel/camel-filter-driver.c:789
 # camel/camel-filter-driver.c:838
 # camel/camel-filter-driver.c:988
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:988
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在获取第 %d 个消息，共 %d 个"
@@ -12907,7 +12568,7 @@ msgstr "正在获取第 %d 个消息，共 %d 个"
 # camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
 # camel/camel-filter-driver.c:843 camel/camel-filter-driver.c:861
 # camel/camel-filter-driver.c:1003
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1003
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d 个消息失败，共 %d 个"
@@ -12930,7 +12591,7 @@ msgstr "执行过滤规则搜索错误： %s： %s"
 # camel/camel-folder-search.c:332
 # camel/camel-folder-search.c:332
 # camel/camel-folder-search.c:332
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -12942,7 +12603,7 @@ msgstr ""
 # camel/camel-folder-search.c:342
 # camel/camel-folder-search.c:342
 # camel/camel-folder-search.c:342
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -12954,22 +12615,29 @@ msgstr ""
 # camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 # camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 # camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) 需要一个布尔结果"
 
 # camel/camel-folder-search.c:638
 # camel/camel-folder-search.c:638
 # camel/camel-folder-search.c:638
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "正在对未知的头进行查询： %s"
 
+# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
+# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
+# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
+msgid "Invalid type in body-contains, expecting string"
+msgstr "邮件体内容中的无效类型，应该是字符串"
+
 # camel/camel-folder.c:471
 # camel/camel-folder.c:471
 # camel/camel-folder.c:471
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:471
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "不支持的操作：附加邮件：附加 %s"
@@ -12977,7 +12645,7 @@ msgstr "不支持的操作：附加邮件：附加 %s"
 # camel/camel-folder.c:1040
 # camel/camel-folder.c:1040
 # camel/camel-folder.c:1040
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1040
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "不支持的操作：按表达式搜索：搜索 %s"
@@ -12985,7 +12653,7 @@ msgstr "不支持的操作：按表达式搜索：搜索 %s"
 # camel/camel-folder.c:1080
 # camel/camel-folder.c:1080
 # camel/camel-folder.c:1080
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1080
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "不支持的操作：按 uid 搜索：搜索 %s"
@@ -12993,7 +12661,7 @@ msgstr "不支持的操作：按 uid 搜索：搜索 %s"
 # camel/camel-folder.c:1262
 # camel/camel-folder.c:1262
 # camel/camel-folder.c:1262
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1262
 msgid "Moving messages"
 msgstr "正在移动邮件"
 
@@ -13168,21 +12836,21 @@ msgstr "请输入您的 %s 密码串"
 # camel/camel-pgp-context.c:575
 # camel/camel-pgp-context.c:575
 # camel/camel-pgp-context.c:575
-#: camel/camel-pgp-context.c:621
+#: camel/camel-pgp-context.c:575
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "无法签名该邮件：普通文本无法签名"
 
 # camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
 # camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
 # camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
+#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
 msgid "Cannot sign this message: no password provided"
 msgstr "无法签名该邮件：没有提供密码"
 
 # camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
 # camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
 # camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
+#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "无法签名该邮件：无法创建到 GPG/PGP 的管道： %s"
@@ -13190,21 +12858,21 @@ msgstr "无法签名该邮件：无法创建到 GPG/PGP 的管道： %s"
 # camel/camel-pgp-context.c:755
 # camel/camel-pgp-context.c:755
 # camel/camel-pgp-context.c:755
-#: camel/camel-pgp-context.c:795
+#: camel/camel-pgp-context.c:755
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "无法签名该邮件：普通文本无法清晰签名"
 
 # camel/camel-pgp-context.c:953
 # camel/camel-pgp-context.c:953
 # camel/camel-pgp-context.c:953
-#: camel/camel-pgp-context.c:987
+#: camel/camel-pgp-context.c:953
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "无法验证邮件：普通文本无法验证"
 
 # camel/camel-pgp-context.c:959
 # camel/camel-pgp-context.c:959
 # camel/camel-pgp-context.c:959
-#: camel/camel-pgp-context.c:993
+#: camel/camel-pgp-context.c:959
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "无法验证该邮件：无法创建到 GPG/PGP 的管道： %s"
@@ -13212,7 +12880,7 @@ msgstr "无法验证该邮件：无法创建到 GPG/PGP 的管道： %s"
 # camel/camel-pgp-context.c:970
 # camel/camel-pgp-context.c:970
 # camel/camel-pgp-context.c:970
-#: camel/camel-pgp-context.c:1004
+#: camel/camel-pgp-context.c:970
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "无法验证该邮件：无法创建临时文件： %s"
@@ -13220,21 +12888,21 @@ msgstr "无法验证该邮件：无法创建临时文件： %s"
 # camel/camel-pgp-context.c:1143
 # camel/camel-pgp-context.c:1143
 # camel/camel-pgp-context.c:1143
-#: camel/camel-pgp-context.c:1177
+#: camel/camel-pgp-context.c:1143
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "无法加密该邮件： 普通文本无法加密"
 
 # camel/camel-pgp-context.c:1153
 # camel/camel-pgp-context.c:1153
 # camel/camel-pgp-context.c:1153
-#: camel/camel-pgp-context.c:1187
+#: camel/camel-pgp-context.c:1153
 msgid "Cannot encrypt this message: no password provided"
 msgstr "无法加密该邮件： 没有提供密码"
 
 # camel/camel-pgp-context.c:1160
 # camel/camel-pgp-context.c:1160
 # camel/camel-pgp-context.c:1160
-#: camel/camel-pgp-context.c:1194
+#: camel/camel-pgp-context.c:1160
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "无法加密该邮件： 无法创建到 GPG/PGP 的管道： %s"
@@ -13242,42 +12910,116 @@ msgstr "无法加密该邮件： 无法创建到 GPG/PGP 的管道： %s"
 # camel/camel-pgp-context.c:1169
 # camel/camel-pgp-context.c:1169
 # camel/camel-pgp-context.c:1169
-#: camel/camel-pgp-context.c:1203
+#: camel/camel-pgp-context.c:1169
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "无法加密该邮件： 没有指明收件人"
 
 # camel/camel-pgp-context.c:1337
 # camel/camel-pgp-context.c:1337
 # camel/camel-pgp-context.c:1337
-#: camel/camel-pgp-context.c:1372
+#: camel/camel-pgp-context.c:1337
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "无法解密该邮件： 没有解密的密码"
 
 # camel/camel-pgp-context.c:1345
 # camel/camel-pgp-context.c:1345
 # camel/camel-pgp-context.c:1345
-#: camel/camel-pgp-context.c:1380
+#: camel/camel-pgp-context.c:1345
 msgid "Cannot decrypt this message: no password provided"
 msgstr "无法解密该邮件： 没有提供密码"
 
 # camel/camel-pgp-context.c:1352
 # camel/camel-pgp-context.c:1352
 # camel/camel-pgp-context.c:1352
-#: camel/camel-pgp-context.c:1387
+#: camel/camel-pgp-context.c:1352
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "无法解密该邮件： 无法创建到 GPG/PGP 的管道： %s"
 
 # camel/camel-pgp-mime.c:310
 # camel/camel-pgp-mime.c:310
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-pgp-mime.c:310
 msgid "This is a digitally signed message part"
 msgstr "这是消息的数字签名部分"
 
+# camel/camel-smime-context.c:173
+# camel/camel-smime-context.c:173
+# camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
+#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "情您为 %s 输入密码"
+
+# addressbook/gui/widgets/e-addressbook-util.c:76
+# addressbook/gui/widgets/e-addressbook-util.c:76
+# camel/camel-pkcs7-context.c:213
+#: camel/camel-pkcs7-context.c:213
+msgid "Error hashing password."
+msgstr "杂凑口令出错。"
+
+# shell/evolution-shell-component.c:1013
+# shell/evolution-shell-component.c:1013
+# camel/camel-pkcs7-context.c:222
+#: camel/camel-pkcs7-context.c:222
+msgid "Invalid password."
+msgstr "非法口令。"
+
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-pkcs7-context.c:329
+#: camel/camel-pkcs7-context.c:329
+#, c-format
+msgid "Could not sign: certificate not found for \"%s\"."
+msgstr "无法签名：找不到“%s”的证书。"
+
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-pkcs7-context.c:378
+#: camel/camel-pkcs7-context.c:378
+#, c-format
+msgid "Could not clearsign: certificate not found for \"%s\"."
+msgstr "无法清除签名：找不到“%s”的证书。"
+
+# camel/camel-pkcs7-context.c:567
+#: camel/camel-pkcs7-context.c:567
+msgid "Could not encrypt: failed to create enveloped data."
+msgstr "无法加密：创建封装数据失败。"
+
+# mail/mail-crypto.c:113
+# mail/mail-crypto.c:113
+# camel/camel-pkcs7-context.c:590
+#: camel/camel-pkcs7-context.c:590
+msgid "Could not encrypt: failed to create encryption context."
+msgstr "无法加密：创建加密上下文失败。"
+
+# camel/providers/pop3/camel-pop3-store.c:214
+# camel/providers/pop3/camel-pop3-store.c:214
+# camel/camel-pkcs7-context.c:620
+#: camel/camel-pkcs7-context.c:620
+#, c-format
+msgid "Could not encrypt data: invalid user key: \"%s\"."
+msgstr "无法加密数据：非法用户键：“%s”。"
+
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:962
+# camel/camel-pkcs7-context.c:626
+#: camel/camel-pkcs7-context.c:626
+msgid "Could not encrypt: encoding failed."
+msgstr "无法加密：编码失败。"
+
+# camel/camel-pkcs7-context.c:677
+#: camel/camel-pkcs7-context.c:677
+msgid "Failed to decrypt: Unknown"
+msgstr "无法解密：未知"
+
 # camel/camel-provider.c:130
 # camel/camel-provider.c:130
 # camel/camel-provider.c:130
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "无法装入 %s： 本系统不支持模块装入。"
@@ -13285,7 +13027,7 @@ msgstr "无法装入 %s： 本系统不支持模块装入。"
 # camel/camel-provider.c:139
 # camel/camel-provider.c:139
 # camel/camel-provider.c:139
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "无法装入 %s： %s"
@@ -13293,7 +13035,7 @@ msgstr "无法装入 %s： %s"
 # camel/camel-provider.c:147
 # camel/camel-provider.c:147
 # camel/camel-provider.c:147
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "无法装入 %s： 模块中没有初始化代码。"
@@ -13301,7 +13043,7 @@ msgstr "无法装入 %s： 模块中没有初始化代码。"
 # camel/camel-remote-store.c:203
 # camel/camel-remote-store.c:203
 # camel/camel-remote-store.c:203
-#: camel/camel-remote-store.c:199
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s server %s"
 msgstr "%s 服务器 %s"
@@ -13309,7 +13051,7 @@ msgstr "%s 服务器 %s"
 # camel/camel-remote-store.c:207
 # camel/camel-remote-store.c:207
 # camel/camel-remote-store.c:207
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:207
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s 为 %s 服务，在 %s"
@@ -13317,7 +13059,7 @@ msgstr "%s 为 %s 服务，在 %s"
 # camel/camel-remote-store.c:264
 # camel/camel-remote-store.c:264
 # camel/camel-remote-store.c:264
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
+#: camel/camel-remote-store.c:264
 msgid "Connection cancelled"
 msgstr "连接已取消"
 
@@ -13327,7 +13069,7 @@ msgstr "连接已取消"
 # camel/providers/smtp/camel-smtp-transport.c:273
 # camel/camel-remote-store.c:267
 # camel/providers/smtp/camel-smtp-transport.c:276
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
+#: camel/camel-remote-store.c:267
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
@@ -13336,7 +13078,7 @@ msgstr "无法连接到 %s (端口 %d)： %s"
 # camel/camel-remote-store.c:268
 # camel/camel-remote-store.c:268
 # camel/camel-remote-store.c:268
-#: camel/camel-remote-store.c:258
+#: camel/camel-remote-store.c:268
 msgid "(unknown host)"
 msgstr "(未知的主机)"
 
@@ -13352,8 +13094,8 @@ msgstr "(未知的主机)"
 # camel/camel-remote-store.c:481
 # camel/providers/imap/camel-imap-command.c:228
 # camel/providers/imap/camel-imap-command.c:409
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:481
 #: camel/providers/imap/camel-imap-command.c:228
 #: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
@@ -13365,7 +13107,7 @@ msgstr "操作已取消"
 # camel/providers/imap/camel-imap-command.c:274
 # camel/camel-remote-store.c:484
 # camel/providers/imap/camel-imap-command.c:274
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:484
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -13442,9 +13184,7 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr ""
-"如果服务器支持的话，该选项将用安全 CRAM-MD5 "
-"密码连接到服务器。"
+msgstr "如果服务器支持的话，该选项将用安全 CRAM-MD5 密码连接到服务器。"
 
 # camel/camel-sasl-digest-md5.c:43
 # camel/camel-sasl-digest-md5.c:43
@@ -13460,9 +13200,7 @@ msgstr "DIGEST-MD5"
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr ""
-"如果服务器支持的话，该选项将用安全 DIGEST-MD5 "
-"密码连接到服务器。"
+msgstr "如果服务器支持的话，该选项将用安全 DIGEST-MD5 密码连接到服务器。"
 
 # camel/camel-sasl-digest-md5.c:810
 # camel/camel-sasl-digest-md5.c:810
@@ -13539,7 +13277,7 @@ msgstr ""
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:495
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:495
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
 
@@ -13564,20 +13302,6 @@ msgstr "该选项将以普通密码连接到服务器。"
 msgid "Unknown authentication state."
 msgstr "未知的认证状态。"
 
-#: camel/camel-sasl-ntlm.c:31
-msgid "NTLM / SPA"
-msgstr ""
-
-# camel/camel-sasl-kerberos4.c:42
-# camel/camel-sasl-kerberos4.c:42
-# camel/camel-sasl-kerberos4.c:42
-#: camel/camel-sasl-ntlm.c:33
-#, fuzzy
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
-msgstr "该选项将用 Kerberos 4 认证连接到服务器。"
-
 # camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 # camel/providers/nntp/camel-nntp-store.c:149
 # camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
@@ -13588,8 +13312,8 @@ msgstr "该选项将用 Kerberos 4 认证连接到服务器。"
 # camel/providers/nntp/camel-nntp-store.c:149
 # camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
 msgid "Password"
 msgstr "密码"
 
@@ -13663,7 +13387,7 @@ msgstr "URL “%s” 需要路径组件"
 # camel/camel-service.c:611
 # camel/camel-service.c:614
 # camel/camel-service.c:614
-#: camel/camel-service.c:617
+#: camel/camel-service.c:614
 #, c-format
 msgid "Resolving: %s"
 msgstr "正在解析： %s"
@@ -13671,7 +13395,7 @@ msgstr "正在解析： %s"
 # camel/camel-service.c:638
 # camel/camel-service.c:641
 # camel/camel-service.c:641
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:641
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "域名寻找失败： %s"
@@ -13679,7 +13403,7 @@ msgstr "域名寻找失败： %s"
 # camel/camel-service.c:663
 # camel/camel-service.c:666
 # camel/camel-service.c:666
-#: camel/camel-service.c:673
+#: camel/camel-service.c:666
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "主机寻找失败： %s： 没有找到主机"
@@ -13687,35 +13411,11 @@ msgstr "主机寻找失败： %s： 没有找到主机"
 # camel/camel-service.c:665
 # camel/camel-service.c:668
 # camel/camel-service.c:668
-#: camel/camel-service.c:675
+#: camel/camel-service.c:668
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "主机寻找失败： %s： 未知的原因"
 
-# camel/camel-service.c:611
-# camel/camel-service.c:614
-# camel/camel-service.c:614
-#: camel/camel-service.c:725
-#, fuzzy
-msgid "Resolving address"
-msgstr "正在解析： %s"
-
-# camel/camel-service.c:663
-# camel/camel-service.c:666
-# camel/camel-service.c:666
-#: camel/camel-service.c:787
-#, fuzzy
-msgid "Host lookup failed: host not found"
-msgstr "主机寻找失败： %s： 没有找到主机"
-
-# camel/camel-service.c:665
-# camel/camel-service.c:668
-# camel/camel-service.c:668
-#: camel/camel-service.c:790
-#, fuzzy
-msgid "Host lookup failed: unknown reason"
-msgstr "主机寻找失败： %s： 未知的原因"
-
 # camel/camel-session.c:75
 # camel/camel-session.c:75
 # camel/camel-session.c:75
@@ -13733,7 +13433,7 @@ msgstr "关于将读入邮件作为对另一组文件夹的查询"
 # camel/camel-session.c:346 camel/camel-session.c:415
 # camel/camel-session.c:346 camel/camel-session.c:415
 # camel/camel-session.c:346 camel/camel-session.c:415
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "协议“%s”没有可用的提供者"
@@ -13741,7 +13441,7 @@ msgstr "协议“%s”没有可用的提供者"
 # camel/camel-session.c:532
 # camel/camel-session.c:532
 # camel/camel-session.c:532
-#: camel/camel-session.c:536
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -13750,14 +13450,6 @@ msgstr ""
 "无法创建目录 %s：\n"
 "%s"
 
-# camel/camel-smime-context.c:173
-# camel/camel-smime-context.c:173
-# camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#: camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "情您为 %s 输入密码"
-
 # camel/camel-smime-context.c:203
 # camel/camel-smime-context.c:203
 # camel/camel-smime-context.c:203
@@ -13817,19 +13509,19 @@ msgstr "验证证书失败。"
 # camel/camel-store.c:220
 # camel/camel-store.c:220
 # camel/camel-store.c:220
-#: camel/camel-store.c:222
+#: camel/camel-store.c:220
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "无法获取文件夹： 对该存储的无效操作"
 
 # camel/camel-store.c:282
 # camel/camel-store.c:282
 # camel/camel-store.c:282
-#: camel/camel-store.c:284
+#: camel/camel-store.c:282
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "无法创建文件夹： 对该存储的无效操作"
 
 # camel/camel-tcp-stream-openssl.c:519
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:519
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -13841,7 +13533,7 @@ msgstr ""
 # camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-openssl.c:524
-#: camel/camel-tcp-stream-openssl.c:619
+#: camel/camel-tcp-stream-openssl.c:524
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -13859,7 +13551,7 @@ msgstr ""
 # camel/camel-tcp-stream-ssl.c:438
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:438
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -13873,12 +13565,12 @@ msgstr ""
 "签名：           %s"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:444
 msgid "GOOD"
 msgstr "好"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:444
 msgid "BAD"
 msgstr "坏"
 
@@ -13886,7 +13578,7 @@ msgstr "坏"
 # camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-ssl.c:447
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:447
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -13920,7 +13612,7 @@ msgstr "在 %2$s 中没有消息 %1$s"
 # camel/camel-vee-folder.c:749
 # camel/camel-vee-folder.c:749
 # camel/camel-vee-folder.c:749
-#: camel/camel-vee-folder.c:753
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "没有邮件： %s"
@@ -13928,7 +13620,7 @@ msgstr "没有邮件： %s"
 # camel/camel-vee-store.c:258
 # camel/camel-vee-store.c:258
 # camel/camel-vee-store.c:258
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:258
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹： %s： 无效操作"
@@ -13936,7 +13628,7 @@ msgstr "无法删除文件夹： %s： 无效操作"
 # camel/camel-vee-store.c:293
 # camel/camel-vee-store.c:293
 # camel/camel-vee-store.c:293
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:293
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "无法删除文件夹： %s： 没有该文件夹"
@@ -13944,7 +13636,7 @@ msgstr "无法删除文件夹： %s： 没有该文件夹"
 # camel/camel-vee-store.c:306
 # camel/camel-vee-store.c:306
 # camel/camel-vee-store.c:306
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:306
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "无法重命名文件夹： %s： 无效操作"
@@ -13952,7 +13644,7 @@ msgstr "无法重命名文件夹： %s： 无效操作"
 # camel/camel-vee-store.c:314
 # camel/camel-vee-store.c:314
 # camel/camel-vee-store.c:314
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "无法重命名文件夹： %s： 没有该文件夹"
@@ -14006,7 +13698,7 @@ msgstr "来自 IMAP 服务器意外的 OK 应答： %s"
 # camel/providers/imap/camel-imap-folder.c:194
 # camel/providers/imap/camel-imap-folder.c:194
 # camel/providers/imap/camel-imap-folder.c:197
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:197
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "无法创建目录 %s： %s"
@@ -14014,7 +13706,7 @@ msgstr "无法创建目录 %s： %s"
 # camel/providers/imap/camel-imap-folder.c:213
 # camel/providers/imap/camel-imap-folder.c:213
 # camel/providers/imap/camel-imap-folder.c:216
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:216
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "无法为 %s 装入概要"
@@ -14022,7 +13714,7 @@ msgstr "无法为 %s 装入概要"
 # camel/providers/imap/camel-imap-folder.c:277
 # camel/providers/imap/camel-imap-folder.c:277
 # camel/providers/imap/camel-imap-folder.c:282
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:282
 msgid "Folder was destroyed and recreated on server."
 msgstr "文件夹已被删除并在服务器上重建了。"
 
@@ -14030,7 +13722,7 @@ msgstr "文件夹已被删除并在服务器上重建了。"
 # camel/providers/imap/camel-imap-folder.c:461
 # camel/providers/imap/camel-imap-folder.c:466
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:466
 msgid "Scanning for changed messages"
 msgstr "正在扫描改变了的邮件"
 
@@ -14040,8 +13732,8 @@ msgstr "正在扫描改变了的邮件"
 # camel/providers/imap/camel-imap-folder.c:2001
 # camel/providers/imap/camel-imap-folder.c:1632
 # camel/providers/imap/camel-imap-folder.c:2108
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1632
+#: camel/providers/imap/camel-imap-folder.c:2108
 msgid "This message is not currently available"
 msgstr "该邮件目前不可用"
 
@@ -14051,29 +13743,29 @@ msgstr "该邮件目前不可用"
 # camel/providers/imap/camel-imap-folder.c:1821
 # camel/providers/imap/camel-imap-folder.c:1787
 # camel/providers/imap/camel-imap-folder.c:1861
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1787
+#: camel/providers/imap/camel-imap-folder.c:1861
 msgid "Fetching summary information for new messages"
 msgstr "从新邮件中获取概要信息"
 
 # camel/providers/imap/camel-imap-folder.c:1746
 # camel/providers/imap/camel-imap-folder.c:1746
 # camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:1793
 msgid "Scanning for new messages"
 msgstr "正在扫描新邮件"
 
 # camel/providers/imap/camel-imap-folder.c:2038
 # camel/providers/imap/camel-imap-folder.c:2038
 # camel/providers/imap/camel-imap-folder.c:2145
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2145
 msgid "Could not find message body in FETCH response."
 msgstr "无法在 FETCH 应答中找到邮件体。"
 
 # camel/providers/imap/camel-imap-message-cache.c:154
 # camel/providers/imap/camel-imap-message-cache.c:154
 # camel/providers/imap/camel-imap-message-cache.c:154
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "无法打开缓冲器目录： %s"
@@ -14090,10 +13782,10 @@ msgstr "无法打开缓冲器目录： %s"
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
 # camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "缓冲邮件 %s 失败： %s"
@@ -14115,7 +13807,7 @@ msgstr "在所有文件夹中检查新邮件"
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:832
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:832
 msgid "Folders"
 msgstr "文件夹"
 
@@ -14171,7 +13863,7 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
 # camel/providers/imap/camel-imap-store.c:518
 # camel/providers/imap/camel-imap-store.c:518
 # camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -14182,8 +13874,8 @@ msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
 # camel/providers/smtp/camel-smtp-transport.c:389
 # camel/providers/imap/camel-imap-store.c:528
 # camel/providers/smtp/camel-smtp-transport.c:393
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:393
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支持验证类型 %s"
@@ -14191,7 +13883,7 @@ msgstr "不支持验证类型 %s"
 # camel/providers/imap/camel-imap-store.c:552
 # camel/providers/imap/camel-imap-store.c:552
 # camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:552
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -14202,15 +13894,15 @@ msgstr "%s请为 %s@%s 输入 IMAP 密码"
 # camel/providers/smtp/camel-smtp-transport.c:430
 # camel/providers/imap/camel-imap-store.c:567
 # camel/providers/smtp/camel-smtp-transport.c:434
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:434
 msgid "You didn't enter a password."
 msgstr "您没有输入密码。"
 
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:596
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -14224,7 +13916,7 @@ msgstr ""
 # camel/providers/imap/camel-imap-store.c:899
 # camel/providers/imap/camel-imap-store.c:899
 # camel/providers/imap/camel-imap-store.c:900
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:900
 #, c-format
 msgid "No such folder %s"
 msgstr "没有文件夹 %s"
@@ -14232,87 +13924,73 @@ msgstr "没有文件夹 %s"
 # camel/providers/imap/camel-imap-store.c:1274
 # camel/providers/imap/camel-imap-store.c:1274
 # camel/providers/imap/camel-imap-store.c:1275
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1275
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "父文件夹不允许含有子文件夹"
 
 # camel/providers/local/camel-local-provider.c:42
 # camel/providers/local/camel-local-provider.c:42
 # camel/providers/local/camel-local-provider.c:42
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "MH-格式的邮件目录"
 
 # camel/providers/local/camel-local-provider.c:43
 # camel/providers/local/camel-local-provider.c:43
 # camel/providers/local/camel-local-provider.c:43
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "在类似于 MH 的邮件目录中存储本地邮件。"
 
 # camel/providers/local/camel-local-provider.c:52
 # camel/providers/local/camel-local-provider.c:52
 # camel/providers/local/camel-local-provider.c:52
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "本地发送"
 
 # camel/providers/local/camel-local-provider.c:53
 # camel/providers/local/camel-local-provider.c:53
 # camel/providers/local/camel-local-provider.c:53
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
-msgstr ""
-"在按照标准邮件箱格式化的脱机文件中检索本地邮件。"
+msgstr "在按照标准邮件箱格式化的脱机文件中检索本地邮件。"
 
 # camel/providers/local/camel-local-provider.c:62
 # camel/providers/local/camel-local-provider.c:62
 # camel/providers/local/camel-local-provider.c:62
-#: camel/providers/local/camel-local-provider.c:76
-#: camel/providers/local/camel-local-provider.c:94
+#: camel/providers/local/camel-local-provider.c:62
 msgid "Apply filters to new messages in INBOX"
 msgstr "应用过滤规则到收件箱中的新邮件"
 
 # camel/providers/local/camel-local-provider.c:68
 # camel/providers/local/camel-local-provider.c:68
 # camel/providers/local/camel-local-provider.c:68
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Maildir-format mail directories"
 msgstr "Maildir 格式的邮件目录"
 
 # camel/providers/local/camel-local-provider.c:69
 # camel/providers/local/camel-local-provider.c:69
 # camel/providers/local/camel-local-provider.c:69
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:69
 msgid "For storing local mail in maildir directories."
 msgstr "在 maildir 邮件目录中存储本地邮件。"
 
 # camel/providers/local/camel-local-provider.c:80
 # camel/providers/local/camel-local-provider.c:80
 # camel/providers/local/camel-local-provider.c:80
-#: camel/providers/local/camel-local-provider.c:100
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "标准 Unix 邮件箱"
 
 # camel/providers/local/camel-local-provider.c:81
 # camel/providers/local/camel-local-provider.c:81
 # camel/providers/local/camel-local-provider.c:81
-#: camel/providers/local/camel-local-provider.c:101
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "在标准邮件箱文件中读取和存储本地邮件。"
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:117
-msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
-
 # camel/providers/local/camel-local-store.c:138
 # camel/providers/local/camel-local-store.c:227
 # camel/providers/local/camel-spool-store.c:109
@@ -14322,10 +14000,9 @@ msgstr ""
 # camel/providers/local/camel-local-store.c:138
 # camel/providers/local/camel-local-store.c:227
 # camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
 #: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "存储根目录 %s 不是绝对路径"
@@ -14333,7 +14010,7 @@ msgstr "存储根目录 %s 不是绝对路径"
 # camel/providers/local/camel-local-store.c:145
 # camel/providers/local/camel-local-store.c:145
 # camel/providers/local/camel-local-store.c:145
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "存储根目录 %s 不是普通目录"
@@ -14347,9 +14024,9 @@ msgstr "存储根目录 %s 不是普通目录"
 # camel/providers/local/camel-local-store.c:153
 # camel/providers/local/camel-local-store.c:169
 # camel/providers/local/camel-local-store.c:235
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "无法获取文件夹： %s： %s"
@@ -14357,14 +14034,14 @@ msgstr "无法获取文件夹： %s： %s"
 # camel/providers/local/camel-local-store.c:184
 # camel/providers/local/camel-local-store.c:184
 # camel/providers/local/camel-local-store.c:184
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "本地存储没有收件箱"
 
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地邮件文件 %s"
@@ -14372,23 +14049,15 @@ msgstr "本地邮件文件 %s"
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "无法将文件夹 %s 改名为 %s： %s"
 
-# camel/providers/local/camel-mbox-summary.c:650
-# camel/providers/local/camel-mbox-summary.c:650
-# camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-local-store.c:358
-#, fuzzy, c-format
-msgid "Could not rename '%s': %s"
-msgstr "无法重命名文件夹： %s"
-
 # camel/providers/local/camel-local-store.c:374
 # camel/providers/local/camel-local-store.c:374
 # camel/providers/local/camel-local-store.c:374
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "无法删除文件夹概要文件 “%s”： %s"
@@ -14396,7 +14065,7 @@ msgstr "无法删除文件夹概要文件 “%s”： %s"
 # camel/providers/local/camel-local-store.c:384
 # camel/providers/local/camel-local-store.c:384
 # camel/providers/local/camel-local-store.c:384
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "无法删除文件夹索引文件 “%s”： %s"
@@ -14404,7 +14073,7 @@ msgstr "无法删除文件夹索引文件 “%s”： %s"
 # camel/providers/local/camel-local-summary.c:367
 # camel/providers/local/camel-local-summary.c:367
 # camel/providers/local/camel-local-summary.c:367
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:367
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "无法保存概要： %s： %s"
@@ -14415,8 +14084,8 @@ msgstr "无法保存概要： %s： %s"
 # camel/providers/local/camel-spool-summary.c:1157
 # camel/providers/local/camel-local-summary.c:423
 # camel/providers/local/camel-spool-summary.c:1157
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:423
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "无法将邮件添加到概要中： 未知的原因"
 
@@ -14466,7 +14135,7 @@ msgstr "无法将邮件附加到邮件目录文件夹： %s： %s"
 #: camel/providers/local/camel-mh-folder.c:198
 #: camel/providers/local/camel-mh-folder.c:207
 #: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -14490,7 +14159,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:209
 #: camel/providers/local/camel-mbox-folder.c:331
 #: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "没有该邮件"
 
@@ -14511,7 +14180,7 @@ msgstr "无效的邮件内容"
 # camel/providers/local/camel-mh-store.c:89
 # camel/providers/local/camel-maildir-store.c:105
 # camel/providers/local/camel-mh-store.c:89
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:105
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -14530,8 +14199,8 @@ msgstr ""
 # camel/providers/local/camel-maildir-store.c:109
 # camel/providers/local/camel-mbox-store.c:100
 # camel/providers/local/camel-mh-store.c:96
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -14543,7 +14212,7 @@ msgstr "文件夹“%s”不存在。"
 # camel/providers/local/camel-mh-store.c:102
 # camel/providers/local/camel-maildir-store.c:116
 # camel/providers/local/camel-mh-store.c:102
-#: camel/providers/local/camel-maildir-store.c:117
+#: camel/providers/local/camel-maildir-store.c:116
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -14556,7 +14225,7 @@ msgstr ""
 # camel/providers/local/camel-maildir-store.c:131
 # camel/providers/local/camel-maildir-store.c:131
 # camel/providers/local/camel-maildir-store.c:131
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "“%s”不是邮件目录。"
@@ -14570,8 +14239,8 @@ msgstr "“%s”不是邮件目录。"
 # camel/providers/local/camel-maildir-store.c:166
 # camel/providers/local/camel-maildir-store.c:203
 # camel/providers/local/camel-mh-store.c:126
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
@@ -14580,15 +14249,14 @@ msgstr "无法删除文件夹“%s”： %s"
 # camel/providers/local/camel-maildir-store.c:167
 # camel/providers/local/camel-maildir-store.c:167
 # camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "不是邮件目录"
 
 # camel/providers/local/camel-maildir-store.c:331
 # camel/providers/local/camel-maildir-store.c:331
 # camel/providers/local/camel-maildir-store.c:331
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:331
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "无法扫描文件夹“%s”： %s"
@@ -14599,58 +14267,12 @@ msgstr "无法扫描文件夹“%s”： %s"
 # camel/providers/local/camel-maildir-summary.c:526
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "无法打开邮件目录路径： %s： %s"
 
-# camel/providers/imap/camel-imap-provider.c:43
-# camel/providers/imap/camel-imap-provider.c:43
-# camel/providers/imap/camel-imap-provider.c:43
-#: camel/providers/local/camel-maildir-summary.c:525
-#, fuzzy
-msgid "Checking folder consistency"
-msgstr "正在检查新邮件"
-
-# camel/providers/imap/camel-imap-folder.c:1746
-# camel/providers/imap/camel-imap-folder.c:1746
-# camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/local/camel-maildir-summary.c:629
-#, fuzzy
-msgid "Checking for new messages"
-msgstr "正在扫描新邮件"
-
-# camel/providers/local/camel-mbox-summary.c:248
-# camel/providers/local/camel-mbox-summary.c:497
-# camel/providers/local/camel-mbox-summary.c:698
-# camel/providers/local/camel-spool-summary.c:378
-# camel/providers/local/camel-spool-summary.c:643
-# camel/providers/local/camel-spool-summary.c:935
-# camel/providers/local/camel-mbox-summary.c:248
-# camel/providers/local/camel-mbox-summary.c:497
-# camel/providers/local/camel-mbox-summary.c:698
-# camel/providers/local/camel-spool-summary.c:378
-# camel/providers/local/camel-spool-summary.c:643
-# camel/providers/local/camel-spool-summary.c:935
-# camel/providers/local/camel-mbox-summary.c:248
-# camel/providers/local/camel-mbox-summary.c:497
-# camel/providers/local/camel-mbox-summary.c:698
-# camel/providers/local/camel-spool-summary.c:378
-# camel/providers/local/camel-spool-summary.c:643
-# camel/providers/local/camel-spool-summary.c:935
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
-msgid "Storing folder"
-msgstr "正在存储文件夹"
-
 # camel/providers/local/camel-mbox-folder.c:151
 # camel/providers/local/camel-spool-folder.c:274
 # camel/providers/local/camel-mbox-folder.c:151
@@ -14658,7 +14280,7 @@ msgstr "正在存储文件夹"
 # camel/providers/local/camel-mbox-folder.c:151
 # camel/providers/local/camel-spool-folder.c:274
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "无法在 %s 创建文件夹锁： %s"
@@ -14670,7 +14292,7 @@ msgstr "无法在 %s 创建文件夹锁： %s"
 # camel/providers/local/camel-mbox-folder.c:208
 # camel/providers/local/camel-spool-folder.c:456
 #: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "无法打开邮件箱： %s： %s\n"
@@ -14711,9 +14333,9 @@ msgstr "无法将邮件附加到邮件箱文件： %s： %s"
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mbox-folder.c:379
 #: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:639
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -14729,7 +14351,7 @@ msgstr ""
 # camel/providers/local/camel-mbox-folder.c:380
 # camel/providers/local/camel-spool-folder.c:628
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "文件夹好像已经被不可恢复地破坏了。"
 
@@ -14740,14 +14362,14 @@ msgstr "文件夹好像已经被不可恢复地破坏了。"
 # camel/providers/local/camel-mbox-folder.c:392
 # camel/providers/local/camel-spool-folder.c:640
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-spool-folder.c:640
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "邮件构造失败：邮件箱已损坏？"
 
 # camel/providers/local/camel-mbox-store.c:93
 # camel/providers/local/camel-mbox-store.c:93
 # camel/providers/local/camel-mbox-store.c:93
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -14759,7 +14381,7 @@ msgstr ""
 # camel/providers/local/camel-mbox-store.c:109
 # camel/providers/local/camel-mbox-store.c:109
 # camel/providers/local/camel-mbox-store.c:109
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -14774,8 +14396,8 @@ msgstr ""
 # camel/providers/local/camel-mbox-store.c:145
 # camel/providers/local/camel-mbox-store.c:118
 # camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "“%s”并不是普通文件。"
@@ -14786,8 +14408,8 @@ msgstr "“%s”并不是普通文件。"
 # camel/providers/local/camel-mbox-store.c:160
 # camel/providers/local/camel-mbox-store.c:137
 # camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -14799,19 +14421,48 @@ msgstr ""
 # camel/providers/local/camel-mbox-store.c:152
 # camel/providers/local/camel-mbox-store.c:152
 # camel/providers/local/camel-mbox-store.c:152
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "文件夹“%s”非空。没有删除。"
 
+# camel/providers/local/camel-mbox-summary.c:248
+# camel/providers/local/camel-mbox-summary.c:497
+# camel/providers/local/camel-mbox-summary.c:698
+# camel/providers/local/camel-spool-summary.c:378
+# camel/providers/local/camel-spool-summary.c:643
+# camel/providers/local/camel-spool-summary.c:935
+# camel/providers/local/camel-mbox-summary.c:248
+# camel/providers/local/camel-mbox-summary.c:497
+# camel/providers/local/camel-mbox-summary.c:698
+# camel/providers/local/camel-spool-summary.c:378
+# camel/providers/local/camel-spool-summary.c:643
+# camel/providers/local/camel-spool-summary.c:935
+# camel/providers/local/camel-mbox-summary.c:248
+# camel/providers/local/camel-mbox-summary.c:497
+# camel/providers/local/camel-mbox-summary.c:698
+# camel/providers/local/camel-spool-summary.c:378
+# camel/providers/local/camel-spool-summary.c:643
+# camel/providers/local/camel-spool-summary.c:935
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
+msgid "Storing folder"
+msgstr "正在存储文件夹"
+
 # camel/providers/local/camel-mbox-summary.c:253
 # camel/providers/local/camel-spool-summary.c:383
 # camel/providers/local/camel-mbox-summary.c:253
 # camel/providers/local/camel-spool-summary.c:383
 # camel/providers/local/camel-mbox-summary.c:253
 # camel/providers/local/camel-spool-summary.c:383
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "无法打开文件夹： %s： %s"
@@ -14822,8 +14473,8 @@ msgstr "无法打开文件夹： %s： %s"
 # camel/providers/local/camel-spool-summary.c:425
 # camel/providers/local/camel-mbox-summary.c:295
 # camel/providers/local/camel-spool-summary.c:425
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
@@ -14834,8 +14485,8 @@ msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
 # camel/providers/local/camel-spool-summary.c:497
 # camel/providers/local/camel-mbox-summary.c:370
 # camel/providers/local/camel-spool-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "无法检查文件夹： %s： %s"
@@ -14849,9 +14500,9 @@ msgstr "无法检查文件夹： %s： %s"
 # camel/providers/local/camel-mbox-summary.c:502
 # camel/providers/local/camel-mbox-summary.c:703
 # camel/providers/local/camel-spool-summary.c:648
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "无法打开文件： %s： %s"
@@ -14862,8 +14513,8 @@ msgstr "无法打开文件： %s： %s"
 # camel/providers/local/camel-spool-summary.c:672
 # camel/providers/local/camel-mbox-summary.c:519
 # camel/providers/local/camel-spool-summary.c:672
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "无法打开临时邮件箱： %s"
@@ -14892,14 +14543,14 @@ msgstr "无法打开临时邮件箱： %s"
 # camel/providers/local/camel-spool-summary.c:705
 # camel/providers/local/camel-spool-summary.c:978
 # camel/providers/local/camel-spool-summary.c:986
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "即使同步后，概要和文件夹仍然不匹配"
 
@@ -14909,8 +14560,8 @@ msgstr "即使同步后，概要和文件夹仍然不匹配"
 # camel/providers/local/camel-spool-summary.c:749
 # camel/providers/local/camel-mbox-summary.c:595
 # camel/providers/local/camel-spool-summary.c:749
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "写入临时文件夹错误： %s"
@@ -14921,8 +14572,8 @@ msgstr "写入临时文件夹错误： %s"
 # camel/providers/local/camel-spool-summary.c:771
 # camel/providers/local/camel-mbox-summary.c:612
 # camel/providers/local/camel-spool-summary.c:771
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "写入临时文件夹失败： %s： %s"
@@ -14936,9 +14587,9 @@ msgstr "写入临时文件夹失败： %s： %s"
 # camel/providers/local/camel-mbox-summary.c:630
 # camel/providers/local/camel-mbox-summary.c:799
 # camel/providers/local/camel-spool-summary.c:1036
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "无法关闭来源文件夹 %s： %s"
@@ -14946,7 +14597,7 @@ msgstr "无法关闭来源文件夹 %s： %s"
 # camel/providers/local/camel-mbox-summary.c:639
 # camel/providers/local/camel-mbox-summary.c:639
 # camel/providers/local/camel-mbox-summary.c:639
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "无法关闭临时文件夹： %s"
@@ -14954,7 +14605,7 @@ msgstr "无法关闭临时文件夹： %s"
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "无法重命名文件夹： %s"
@@ -14968,9 +14619,9 @@ msgstr "无法重命名文件夹： %s"
 # camel/providers/local/camel-mbox-summary.c:873
 # camel/providers/local/camel-spool-summary.c:544
 # camel/providers/local/camel-spool-summary.c:1110
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "未知的错误： %s"
@@ -15001,7 +14652,7 @@ msgstr "“%s”不是目录"
 # camel/providers/local/camel-mh-summary.c:218
 # camel/providers/local/camel-mh-summary.c:218
 # camel/providers/local/camel-mh-summary.c:218
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:218
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "无法打开 MH 目录： %s： %s"
@@ -15009,7 +14660,7 @@ msgstr "无法打开 MH 目录： %s： %s"
 # camel/providers/local/camel-spool-folder.c:512
 # camel/providers/local/camel-spool-folder.c:512
 # camel/providers/local/camel-spool-folder.c:512
-#: camel/providers/local/camel-spool-folder.c:515
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "无法将邮件附加到脱机文件： %s： %s"
@@ -15026,7 +14677,6 @@ msgstr "脱机文件“%s”不存在或不是普通文件"
 # camel/providers/local/camel-spool-store.c:141
 # camel/providers/local/camel-spool-store.c:141
 #: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "文件夹“%s/%s”不存在。"
@@ -15042,16 +14692,14 @@ msgstr "脱机邮件文件 %s"
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "脱机文件夹无法改名"
 
 # camel/providers/local/camel-spool-store.c:217
 # camel/providers/local/camel-spool-store.c:217
 # camel/providers/local/camel-spool-store.c:217
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "脱机文件夹无法删除"
 
@@ -15064,9 +14712,9 @@ msgstr "脱机文件夹无法删除"
 # camel/providers/local/camel-spool-summary.c:788
 # camel/providers/local/camel-spool-summary.c:797
 # camel/providers/local/camel-spool-summary.c:806
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "无法同步临时文件夹 %s： %s"
@@ -15074,7 +14722,7 @@ msgstr "无法同步临时文件夹 %s： %s"
 # camel/providers/local/camel-spool-summary.c:821
 # camel/providers/local/camel-spool-summary.c:821
 # camel/providers/local/camel-spool-summary.c:821
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "无法同步脱机文件夹 %s： %s"
@@ -15088,9 +14736,9 @@ msgstr "无法同步脱机文件夹 %s： %s"
 # camel/providers/local/camel-spool-summary.c:851
 # camel/providers/local/camel-spool-summary.c:869
 # camel/providers/local/camel-spool-summary.c:881
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -15102,30 +14750,117 @@ msgstr ""
 # camel/providers/local/camel-spool-summary.c:940
 # camel/providers/local/camel-spool-summary.c:940
 # camel/providers/local/camel-spool-summary.c:940
-#: camel/providers/local/camel-spool-summary.c:950
+#: camel/providers/local/camel-spool-summary.c:940
 #, c-format
 msgid "Could not file: %s: %s"
 msgstr "无法存档： %s： %s"
 
-# camel/providers/local/camel-spool-store.c:115
-# camel/providers/local/camel-spool-store.c:115
-# camel/providers/local/camel-spool-store.c:115
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "脱机文件“%s”不存在或不是普通文件"
+# camel/providers/nntp/camel-nntp-auth.c:44
+# camel/providers/nntp/camel-nntp-auth.c:44
+# camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "请为 %s@%s 输入 NNTP 密码"
 
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
+# camel/providers/nntp/camel-nntp-auth.c:64
+# camel/providers/nntp/camel-nntp-auth.c:64
+# camel/providers/nntp/camel-nntp-auth.c:64
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr "服务器拒绝的用户名"
 
-# mail/mail-autofilter.c:72
-# mail/mail-autofilter.c:72
-# mail/mail-autofilter.c:72
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "邮寄给 %s"
+# camel/providers/nntp/camel-nntp-auth.c:70
+# camel/providers/nntp/camel-nntp-auth.c:70
+# camel/providers/nntp/camel-nntp-auth.c:70
+#: camel/providers/nntp/camel-nntp-auth.c:70
+msgid "Failed to send username to server"
+msgstr "将用户名发送到服务器失败"
+
+# camel/providers/nntp/camel-nntp-auth.c:79
+# camel/providers/nntp/camel-nntp-auth.c:79
+# camel/providers/nntp/camel-nntp-auth.c:79
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr "服务器拒绝的 用户名/密码"
+
+# camel/providers/nntp/camel-nntp-folder.c:112
+#: camel/providers/nntp/camel-nntp-folder.c:112
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr "内部错误：非法格式的 uid：%s"
+
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# camel/providers/local/camel-spool-folder.c:579
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# camel/providers/local/camel-spool-folder.c:579
+# camel/providers/nntp/camel-nntp-folder.c:153
+# camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/nntp/camel-nntp-folder.c:153
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:439
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "无法获取消息 %s：%s"
+
+# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+# camel/camel-remote-store.c:481
+# camel/providers/imap/camel-imap-command.c:228
+# camel/providers/imap/camel-imap-command.c:409
+# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+# camel/camel-remote-store.c:481
+# camel/providers/imap/camel-imap-command.c:228
+# camel/providers/imap/camel-imap-command.c:409
+# camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/pop3/camel-pop3-folder.c:278
+#: camel/providers/pop3/camel-pop3-folder.c:437
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:510
+msgid "User cancelled"
+msgstr "用户已取消"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:45
+# camel/providers/nntp/camel-nntp-grouplist.c:45
+# camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr "无法从服务器获取组列表。"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:98
+# camel/providers/nntp/camel-nntp-grouplist.c:107
+# camel/providers/nntp/camel-nntp-grouplist.c:98
+# camel/providers/nntp/camel-nntp-grouplist.c:107
+# camel/providers/nntp/camel-nntp-grouplist.c:98
+# camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr "无法为 %s 装入组列表文件： %s"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:158
+# camel/providers/nntp/camel-nntp-grouplist.c:158
+# camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr "无法为 %s 保存组列表文件： %s"
 
 # camel/providers/nntp/camel-nntp-provider.c:41
 # camel/providers/nntp/camel-nntp-provider.c:41
@@ -15139,14 +14874,12 @@ msgstr "USENET 新闻"
 # camel/providers/nntp/camel-nntp-provider.c:43
 #: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-"这是一个从 USENET 新闻组和向 USENET "
-"新闻组发布消息的提供者。"
+msgstr "这是一个从 USENET 新闻组和向 USENET 新闻组发布消息的提供者。"
 
 # camel/providers/nntp/camel-nntp-store.c:144
 # camel/providers/nntp/camel-nntp-store.c:144
 # camel/providers/nntp/camel-nntp-store.c:144
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:144
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET 新闻 %s"
@@ -15154,7 +14887,7 @@ msgstr "USENET 新闻 %s"
 # camel/providers/nntp/camel-nntp-store.c:151
 # camel/providers/nntp/camel-nntp-store.c:151
 # camel/providers/nntp/camel-nntp-store.c:151
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:151
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -15230,26 +14963,10 @@ msgstr "操作失败：%s"
 # camel/providers/pop3/camel-pop3-folder.c:175
 # camel/providers/pop3/camel-pop3-folder.c:175
 # camel/providers/pop3/camel-pop3-folder.c:175
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:265
 msgid "Retrieving POP summary"
 msgstr "检索 POP 概要"
 
-# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-# camel/camel-remote-store.c:481
-# camel/providers/imap/camel-imap-command.c:228
-# camel/providers/imap/camel-imap-command.c:409
-# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-# camel/camel-remote-store.c:481
-# camel/providers/imap/camel-imap-command.c:228
-# camel/providers/imap/camel-imap-command.c:409
-# camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
-msgid "User cancelled"
-msgstr "用户已取消"
-
 # camel/providers/local/camel-maildir-folder.c:209
 # camel/providers/local/camel-maildir-folder.c:221
 # camel/providers/local/camel-maildir-folder.c:230
@@ -15268,7 +14985,7 @@ msgstr "用户已取消"
 # camel/providers/local/camel-spool-folder.c:579
 # camel/providers/nntp/camel-nntp-folder.c:153
 # camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:280
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "无法获取消息 POP 摘要：%s"
@@ -15276,14 +14993,14 @@ msgstr "无法获取消息 POP 摘要：%s"
 # camel/providers/pop3/camel-pop3-folder.c:252
 # camel/providers/pop3/camel-pop3-folder.c:252
 # camel/providers/pop3/camel-pop3-folder.c:252
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:316
 msgid "Expunging deleted messages"
 msgstr "彻底去除已删除的邮件"
 
 # camel/providers/pop3/camel-pop3-folder.c:367
 # camel/providers/pop3/camel-pop3-folder.c:367
 # camel/providers/pop3/camel-pop3-folder.c:367
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "No message with uid %s"
 msgstr "没有 uid 为 %s 的邮件"
@@ -15293,41 +15010,15 @@ msgstr "没有 uid 为 %s 的邮件"
 # camel/providers/pop3/camel-pop3-folder.c:371
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:418
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "检索 POP 邮件 %d"
 
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:221
-# camel/providers/local/camel-maildir-folder.c:230
-# camel/providers/local/camel-mbox-folder.c:331
-# camel/providers/local/camel-mh-folder.c:198
-# camel/providers/local/camel-mh-folder.c:207
-# camel/providers/local/camel-mh-folder.c:215
-# camel/providers/local/camel-spool-folder.c:579
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:221
-# camel/providers/local/camel-maildir-folder.c:230
-# camel/providers/local/camel-mbox-folder.c:331
-# camel/providers/local/camel-mh-folder.c:198
-# camel/providers/local/camel-mh-folder.c:207
-# camel/providers/local/camel-mh-folder.c:215
-# camel/providers/local/camel-spool-folder.c:579
-# camel/providers/nntp/camel-nntp-folder.c:153
-# camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "无法获取消息 %s：%s"
-
 # my-evolution/metar.c:247
 # my-evolution/metar.c:247
 # my-evolution/metar.c:247
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "Unknown reason"
 msgstr "未知原因"
 
@@ -15356,7 +15047,7 @@ msgstr "%s 天之后删除"
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:59
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:60
 msgid "POP"
 msgstr "POP"
 
@@ -15375,9 +15066,8 @@ msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"该选项使 Evolution 在连接到 POP "
-"服务器时使用明文密码。这是许多 POP "
-"服务器唯一支持的选项。"
+"该选项使 Evolution 在连接到 POP 服务器时使用明文密码。这是许多 POP 服务器唯一"
+"支持的选项。"
 
 # camel/providers/pop3/camel-pop3-provider.c:79
 # camel/providers/pop3/camel-pop3-provider.c:79
@@ -15388,51 +15078,22 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"该选项使 Evolution 在连接到 POP 服务器时使用 APOP "
-"协议。即使是声称支持这一功能的服务器，也不一定能使�"
-"�有用户工作。"
-
-# camel/providers/pop3/camel-pop3-store.c:377
-# camel/providers/pop3/camel-pop3-store.c:377
-# camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
-#, fuzzy, c-format
-msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr ""
-"无法连接到 POP 服务器。\n"
-"发送用户名错误： %s"
-
-# shell/e-storage.c:518
-# shell/e-storage.c:518
-# shell/e-storage.c:518
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "不支持的操作"
-
-# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
-# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
-# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "认证失败。"
+"该选项使 Evolution 在连接到 POP 服务器时使用 APOP 协议。即使是声称支持这一功"
+"能的服务器，也不一定能使所有用户工作。"
 
 # camel/providers/pop3/camel-pop3-store.c:321
 # camel/providers/pop3/camel-pop3-store.c:321
 # camel/providers/pop3/camel-pop3-store.c:321
-#: camel/providers/pop3/camel-pop3-store.c:348
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+#: camel/providers/pop3/camel-pop3-store.c:172
+#, c-format
+msgid "Could not connect to POP server on %s."
 msgstr "无法连接到在 %s 的 POP 服务器。"
 
 # camel/providers/pop3/camel-pop3-store.c:407
 # camel/providers/pop3/camel-pop3-store.c:407
 # camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/pop3/camel-pop3-store.c:316
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -15443,19 +15104,19 @@ msgstr ""
 # camel/providers/imap/camel-imap-command.c:362
 # camel/providers/imap/camel-imap-command.c:362
 # camel/providers/imap/camel-imap-command.c:362
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:229
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL“%s”登录失败：%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:240
 msgid "SASL Protocol error"
 msgstr "SASL 协议错误"
 
 # shell/e-storage.c:506
 # shell/e-storage.c:506
 # shell/e-storage.c:506
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:255
 #, c-format
 msgid "I/O Error: %s"
 msgstr "输入输出错误：%s"
@@ -15463,7 +15124,7 @@ msgstr "输入输出错误：%s"
 # camel/providers/pop3/camel-pop3-store.c:360
 # camel/providers/pop3/camel-pop3-store.c:360
 # camel/providers/pop3/camel-pop3-store.c:360
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:276
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 POP 密码"
@@ -15471,8 +15132,7 @@ msgstr "%s请为 %s@%s 输入 POP 密码"
 # camel/providers/pop3/camel-pop3-store.c:415
 # camel/providers/pop3/camel-pop3-store.c:415
 # camel/providers/pop3/camel-pop3-store.c:415
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:327
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -15484,7 +15144,7 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-store.c:480
 # camel/providers/pop3/camel-pop3-store.c:480
 # camel/providers/pop3/camel-pop3-store.c:480
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid "No such folder `%s'."
 msgstr "没有文件夹“%s”。"
@@ -15496,7 +15156,7 @@ msgstr "没有文件夹“%s”。"
 # camel/providers/sendmail/camel-sendmail-provider.c:36
 # mail/mail-config.glade.h:81
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:82
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -15509,17 +15169,10 @@ msgid ""
 "system."
 msgstr "将邮件传递到本地系统的“sendmail”来发送邮件。"
 
-# camel/camel-url.c:288
-# camel/camel-url.c:288
-# camel/providers/sendmail/camel-sendmail-transport.c:226
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
-msgid "Could not parse recipient list"
-msgstr "无法解析收件人列表"
-
 # camel/providers/sendmail/camel-sendmail-transport.c:106
 # camel/providers/sendmail/camel-sendmail-transport.c:106
 # camel/providers/sendmail/camel-sendmail-transport.c:107
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "无法创建到 sendmail 的管道： %s： 邮件未发送"
@@ -15527,7 +15180,7 @@ msgstr "无法创建到 sendmail 的管道： %s： 邮件未发送"
 # camel/providers/sendmail/camel-sendmail-transport.c:123
 # camel/providers/sendmail/camel-sendmail-transport.c:123
 # camel/providers/sendmail/camel-sendmail-transport.c:124
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "无法创建 sendmail 进程： %s： 邮件未发送"
@@ -15535,7 +15188,7 @@ msgstr "无法创建 sendmail 进程： %s： 邮件未发送"
 # camel/providers/sendmail/camel-sendmail-transport.c:149
 # camel/providers/sendmail/camel-sendmail-transport.c:149
 # camel/providers/sendmail/camel-sendmail-transport.c:150
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "无法发送邮件： %s"
@@ -15543,7 +15196,7 @@ msgstr "无法发送邮件： %s"
 # camel/providers/sendmail/camel-sendmail-transport.c:162
 # camel/providers/sendmail/camel-sendmail-transport.c:162
 # camel/providers/sendmail/camel-sendmail-transport.c:163
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail 以信号 %s 退出： 邮件未发送。"
@@ -15551,7 +15204,7 @@ msgstr "sendmail 以信号 %s 退出： 邮件未发送。"
 # camel/providers/sendmail/camel-sendmail-transport.c:169
 # camel/providers/sendmail/camel-sendmail-transport.c:169
 # camel/providers/sendmail/camel-sendmail-transport.c:170
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "无法执行 %s： 邮件未发送。"
@@ -15559,29 +15212,43 @@ msgstr "无法执行 %s： 邮件未发送。"
 # camel/providers/sendmail/camel-sendmail-transport.c:174
 # camel/providers/sendmail/camel-sendmail-transport.c:174
 # camel/providers/sendmail/camel-sendmail-transport.c:175
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail 以状态码 %d 退出： 邮件未发送。"
 
+# camel/providers/sendmail/camel-sendmail-transport.c:193
+# camel/providers/sendmail/camel-sendmail-transport.c:193
+# camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not find 'From' address in message"
+msgstr "无法在邮件中找到“收件人”地址"
+
+# camel/camel-url.c:288
+# camel/camel-url.c:288
+# camel/providers/sendmail/camel-sendmail-transport.c:226
+#: camel/providers/sendmail/camel-sendmail-transport.c:226
+msgid "Could not parse recipient list"
+msgstr "无法解析收件人列表"
+
 # camel/providers/sendmail/camel-sendmail-transport.c:246
 # camel/providers/sendmail/camel-sendmail-transport.c:246
 # camel/providers/sendmail/camel-sendmail-transport.c:259
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:248
 # camel/providers/sendmail/camel-sendmail-transport.c:248
 # camel/providers/sendmail/camel-sendmail-transport.c:261
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "通过 sendmail 程序发送邮件"
 
 # camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 # camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 # camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:74
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:75
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -15595,228 +15262,190 @@ msgstr "通过SMTP连接到远程邮件服务器来发送邮件。\n"
 # camel/providers/smtp/camel-smtp-transport.c:172
 # camel/providers/smtp/camel-smtp-transport.c:172
 # camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Syntax error, command unrecognized"
 msgstr "语法错误，无法识别的命令"
 
 # camel/providers/smtp/camel-smtp-transport.c:174
 # camel/providers/smtp/camel-smtp-transport.c:174
 # camel/providers/smtp/camel-smtp-transport.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error in parameters or arguments"
 msgstr "参数语法错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:176
 # camel/providers/smtp/camel-smtp-transport.c:176
 # camel/providers/smtp/camel-smtp-transport.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Command not implemented"
 msgstr "命令尚未实现"
 
 # camel/providers/smtp/camel-smtp-transport.c:178
 # camel/providers/smtp/camel-smtp-transport.c:178
 # camel/providers/smtp/camel-smtp-transport.c:179
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command parameter not implemented"
 msgstr "命令参数尚未实现"
 
 # camel/providers/smtp/camel-smtp-transport.c:180
 # camel/providers/smtp/camel-smtp-transport.c:180
 # camel/providers/smtp/camel-smtp-transport.c:181
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "System status, or system help reply"
 msgstr "系统状态，或系统求助就绪"
 
 # camel/providers/smtp/camel-smtp-transport.c:182
 # camel/providers/smtp/camel-smtp-transport.c:182
 # camel/providers/smtp/camel-smtp-transport.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Help message"
 msgstr "求助消息"
 
 # camel/providers/smtp/camel-smtp-transport.c:184
 # camel/providers/smtp/camel-smtp-transport.c:184
 # camel/providers/smtp/camel-smtp-transport.c:185
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service ready"
 msgstr "服务就绪"
 
 # camel/providers/smtp/camel-smtp-transport.c:186
 # camel/providers/smtp/camel-smtp-transport.c:186
 # camel/providers/smtp/camel-smtp-transport.c:187
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service closing transmission channel"
 msgstr "服务正在关闭传输通道"
 
 # camel/providers/smtp/camel-smtp-transport.c:188
 # camel/providers/smtp/camel-smtp-transport.c:188
 # camel/providers/smtp/camel-smtp-transport.c:189
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service not available, closing transmission channel"
 msgstr "服务不可用，正在关闭传输通道"
 
 # camel/providers/smtp/camel-smtp-transport.c:190
 # camel/providers/smtp/camel-smtp-transport.c:190
 # camel/providers/smtp/camel-smtp-transport.c:191
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action okay, completed"
 msgstr "邮件动作请求确认，已完成"
 
 # camel/providers/smtp/camel-smtp-transport.c:192
 # camel/providers/smtp/camel-smtp-transport.c:192
 # camel/providers/smtp/camel-smtp-transport.c:193
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; will forward to <forward-path>"
 msgstr "用户不在本地；将转发到 <转发路径>"
 
 # camel/providers/smtp/camel-smtp-transport.c:194
 # camel/providers/smtp/camel-smtp-transport.c:194
 # camel/providers/smtp/camel-smtp-transport.c:195
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "邮件动作请求未发生：邮件箱无效"
 
 # camel/providers/smtp/camel-smtp-transport.c:196
 # camel/providers/smtp/camel-smtp-transport.c:196
 # camel/providers/smtp/camel-smtp-transport.c:197
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "动作请求未发生：邮件箱无效"
 
 # camel/providers/smtp/camel-smtp-transport.c:198
 # camel/providers/smtp/camel-smtp-transport.c:198
 # camel/providers/smtp/camel-smtp-transport.c:199
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action aborted: error in processing"
 msgstr "动作请求已放弃：处理中出错"
 
 # camel/providers/smtp/camel-smtp-transport.c:200
 # camel/providers/smtp/camel-smtp-transport.c:200
 # camel/providers/smtp/camel-smtp-transport.c:201
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "User not local; please try <forward-path>"
 msgstr "用户不在本地；请尝试 <转发路径>"
 
 # camel/providers/smtp/camel-smtp-transport.c:202
 # camel/providers/smtp/camel-smtp-transport.c:202
 # camel/providers/smtp/camel-smtp-transport.c:203
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: insufficient system storage"
 msgstr "动作请求未发生：系统存储空间不足"
 
 # camel/providers/smtp/camel-smtp-transport.c:204
 # camel/providers/smtp/camel-smtp-transport.c:204
 # camel/providers/smtp/camel-smtp-transport.c:205
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "邮件动作请求已放弃：超定额德存储分配"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
 # camel/providers/smtp/camel-smtp-transport.c:206
 # camel/providers/smtp/camel-smtp-transport.c:207
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "动作请求未发生：不允许的邮件箱名称"
 
 # camel/providers/smtp/camel-smtp-transport.c:208
 # camel/providers/smtp/camel-smtp-transport.c:208
 # camel/providers/smtp/camel-smtp-transport.c:209
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "开始输入邮件；以 <CRLF>.<CRLF> 结束"
 
 # camel/providers/smtp/camel-smtp-transport.c:210
 # camel/providers/smtp/camel-smtp-transport.c:210
 # camel/providers/smtp/camel-smtp-transport.c:211
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Transaction failed"
 msgstr "事务失败"
 
 # camel/providers/smtp/camel-smtp-transport.c:214
 # camel/providers/smtp/camel-smtp-transport.c:214
 # camel/providers/smtp/camel-smtp-transport.c:215
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "A password transition is needed"
 msgstr "必须传输密码"
 
 # camel/providers/smtp/camel-smtp-transport.c:216
 # camel/providers/smtp/camel-smtp-transport.c:216
 # camel/providers/smtp/camel-smtp-transport.c:217
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication mechanism is too weak"
 msgstr "认证机制太弱"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
 # camel/providers/smtp/camel-smtp-transport.c:218
 # camel/providers/smtp/camel-smtp-transport.c:219
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Encryption required for requested authentication mechanism"
 msgstr "请求的认证机制必须加密"
 
 # camel/providers/smtp/camel-smtp-transport.c:220
 # camel/providers/smtp/camel-smtp-transport.c:220
 # camel/providers/smtp/camel-smtp-transport.c:221
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Temporary authentication failure"
 msgstr "临时认证失败"
 
 # camel/providers/smtp/camel-smtp-transport.c:222
 # camel/providers/smtp/camel-smtp-transport.c:222
 # camel/providers/smtp/camel-smtp-transport.c:223
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Authentication required"
 msgstr "必须认证"
 
 # camel/providers/smtp/camel-smtp-transport.c:317
 # camel/providers/smtp/camel-smtp-transport.c:317
 # camel/providers/smtp/camel-smtp-transport.c:320
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Welcome 应答错误： %s： 可能不致命"
 
-# camel/providers/pop3/camel-pop3-store.c:377
-# camel/providers/pop3/camel-pop3-store.c:377
-# camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
-#, fuzzy, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr ""
-"无法连接到 POP 服务器。\n"
-"发送用户名错误： %s"
-
-# calendar/gui/e-itip-control.c:1064
-# calendar/gui/e-itip-control.c:1064
-# calendar/gui/e-itip-control.c:1138
-#: camel/providers/smtp/camel-smtp-transport.c:336
-#, fuzzy
-msgid "server does not appear to support SSL"
-msgstr "邮件的格式可能不正确"
-
-# camel/providers/smtp/camel-smtp-transport.c:779
-# camel/providers/smtp/camel-smtp-transport.c:791
-# camel/providers/smtp/camel-smtp-transport.c:779
-# camel/providers/smtp/camel-smtp-transport.c:791
-# camel/providers/smtp/camel-smtp-transport.c:904
-# camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c:350
-#, fuzzy, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "AUTH 请求超时： %s"
-
-# camel/providers/smtp/camel-smtp-transport.c:1110
-# camel/providers/smtp/camel-smtp-transport.c:1110
-# camel/providers/smtp/camel-smtp-transport.c:1104
-#: camel/providers/smtp/camel-smtp-transport.c:365
-#, fuzzy
-msgid "STARTTLS response error"
-msgstr "DATA 应答错误"
-
 # camel/providers/smtp/camel-smtp-transport.c:379
 # camel/providers/smtp/camel-smtp-transport.c:379
 # camel/providers/smtp/camel-smtp-transport.c:383
-#: camel/providers/smtp/camel-smtp-transport.c:458
+#: camel/providers/smtp/camel-smtp-transport.c:383
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
@@ -15824,7 +15453,7 @@ msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
 # camel/providers/smtp/camel-smtp-transport.c:417
 # camel/providers/smtp/camel-smtp-transport.c:417
 # camel/providers/smtp/camel-smtp-transport.c:421
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:421
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -15832,7 +15461,7 @@ msgstr "%s请为 %s@%s 输入 SMTP 密码"
 # camel/providers/smtp/camel-smtp-transport.c:438
 # camel/providers/smtp/camel-smtp-transport.c:438
 # camel/providers/smtp/camel-smtp-transport.c:442
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:442
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -15846,7 +15475,7 @@ msgstr ""
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:565
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:565
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 服务器 %s"
@@ -15854,50 +15483,57 @@ msgstr "SMTP 服务器 %s"
 # camel/providers/smtp/camel-smtp-transport.c:556
 # camel/providers/smtp/camel-smtp-transport.c:556
 # camel/providers/smtp/camel-smtp-transport.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:567
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "通过 %s 发送 SMTP 邮件"
 
+# camel/providers/smtp/camel-smtp-transport.c:581
+# camel/providers/smtp/camel-smtp-transport.c:581
+# camel/providers/smtp/camel-smtp-transport.c:591
+#: camel/providers/smtp/camel-smtp-transport.c:591
+msgid "Cannot send message: sender address not defined."
+msgstr "无法发送邮件： 发件人地址无定义。"
+
 # camel/providers/smtp/camel-smtp-transport.c:588
 # camel/providers/smtp/camel-smtp-transport.c:588
 # camel/providers/smtp/camel-smtp-transport.c:598
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:598
 msgid "Cannot send message: sender address not valid."
 msgstr "无法发送邮件： 发件人地址不合法。"
 
 # camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:558
 # camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
 # camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
 msgid "Sending message"
 msgstr "正在发送邮件"
 
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:614
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:614
 msgid "Cannot send message: no recipients defined."
 msgstr "无法发送邮件： 没有定义收件人。"
 
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:624
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:624
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "无法发送消息：一个或多个非法收件人"
 
 # camel/providers/smtp/camel-smtp-transport.c:684
 # camel/providers/smtp/camel-smtp-transport.c:684
 # camel/providers/smtp/camel-smtp-transport.c:798
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:798
 msgid "SMTP Greeting"
 msgstr "SMTP 欢迎"
 
 # camel/providers/smtp/camel-smtp-transport.c:706
 # camel/providers/smtp/camel-smtp-transport.c:706
 # camel/providers/smtp/camel-smtp-transport.c:820
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:820
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELLO 请求超时： %s： 非致命"
@@ -15905,7 +15541,7 @@ msgstr "HELLO 请求超时： %s： 非致命"
 # camel/providers/smtp/camel-smtp-transport.c:726
 # camel/providers/smtp/camel-smtp-transport.c:726
 # camel/providers/smtp/camel-smtp-transport.c:840
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:840
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELLO 应答错误： %s： 非致命"
@@ -15913,14 +15549,14 @@ msgstr "HELLO 应答错误： %s： 非致命"
 # camel/providers/smtp/camel-smtp-transport.c:758
 # camel/providers/smtp/camel-smtp-transport.c:758
 # camel/providers/smtp/camel-smtp-transport.c:883
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:883
 msgid "SMTP Authentication"
 msgstr "SMTP 认证"
 
 # camel/providers/smtp/camel-smtp-transport.c:764
 # camel/providers/smtp/camel-smtp-transport.c:764
 # camel/providers/smtp/camel-smtp-transport.c:889
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:889
 msgid "Error creating SASL authentication object."
 msgstr "创建 SASL 认证对象错误。"
 
@@ -15930,8 +15566,8 @@ msgstr "创建 SASL 认证对象错误。"
 # camel/providers/smtp/camel-smtp-transport.c:791
 # camel/providers/smtp/camel-smtp-transport.c:904
 # camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:904
+#: camel/providers/smtp/camel-smtp-transport.c:916
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH 请求超时： %s"
@@ -15939,21 +15575,21 @@ msgstr "AUTH 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:800
 # camel/providers/smtp/camel-smtp-transport.c:800
 # camel/providers/smtp/camel-smtp-transport.c:925
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:925
 msgid "AUTH request failed."
 msgstr "AUTH 请求失败。"
 
 # camel/providers/smtp/camel-smtp-transport.c:848
 # camel/providers/smtp/camel-smtp-transport.c:848
 # camel/providers/smtp/camel-smtp-transport.c:973
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:973
 msgid "Bad authentication response from server.\n"
 msgstr "来自服务器的错误认证应答。\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:874
 # camel/providers/smtp/camel-smtp-transport.c:874
 # camel/providers/smtp/camel-smtp-transport.c:999
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:999
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM 请求超时： %s： 邮件未发送"
@@ -15961,20 +15597,20 @@ msgstr "MAIL FROM 请求超时： %s： 邮件未发送"
 # camel/providers/smtp/camel-smtp-transport.c:893
 # camel/providers/smtp/camel-smtp-transport.c:893
 # camel/providers/smtp/camel-smtp-transport.c:1013
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM 应答错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:918
 # camel/providers/smtp/camel-smtp-transport.c:918
 # camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1038
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO 请求超时： %s： 邮件未发送"
 
 # camel/providers/smtp/camel-smtp-transport.c:1054
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1054
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> 失败"
@@ -15982,7 +15618,7 @@ msgstr "RCPT TO <%s> 失败"
 # camel/providers/smtp/camel-smtp-transport.c:971
 # camel/providers/smtp/camel-smtp-transport.c:971
 # camel/providers/smtp/camel-smtp-transport.c:1090
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 请求超时： %s： 邮件未发送"
@@ -15993,7 +15629,7 @@ msgstr "DATA 请求超时： %s： 邮件未发送"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1104
 msgid "DATA response error"
 msgstr "DATA 应答错误"
 
@@ -16003,8 +15639,8 @@ msgstr "DATA 应答错误"
 # camel/providers/smtp/camel-smtp-transport.c:1048
 # camel/providers/smtp/camel-smtp-transport.c:1144
 # camel/providers/smtp/camel-smtp-transport.c:1162
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1144
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA 发送超时： 消息终止： %s： 邮件未发送"
@@ -16014,14 +15650,14 @@ msgstr "DATA 发送超时： 消息终止： %s： 邮件未发送"
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:495
 # camel/providers/smtp/camel-smtp-transport.c:1176
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1176
 msgid "DATA termination response error"
 msgstr "DATA 终止应答错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1199
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 请求超时： %s"
@@ -16029,14 +15665,14 @@ msgstr "RSET 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 msgid "RSET response error"
 msgstr "RSET 应答错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:1133
 # camel/providers/smtp/camel-smtp-transport.c:1133
 # camel/providers/smtp/camel-smtp-transport.c:1236
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1236
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT 请求超时： %s： 非致命"
@@ -16044,7 +15680,7 @@ msgstr "QUIT 请求超时： %s： 非致命"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1250
 msgid "QUIT response error"
 msgstr "QUIT 应答错误"
 
@@ -16091,7 +15727,7 @@ msgstr "%.1fG"
 # composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:136
 # composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
 msgid "attachment"
 msgstr "附件"
 
@@ -16164,14 +15800,14 @@ msgstr "MIME 类型："
 # composer/e-msg-composer-attachment.glade.h:5
 # composer/e-msg-composer-select-file.c:180
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:180
 msgid "Suggest automatic display of attachment"
 msgstr "建议自动显示附件"
 
 # composer/e-msg-composer-hdrs.c:327
 # composer/e-msg-composer-hdrs.c:327
 # composer/e-msg-composer-hdrs.c:326
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:326
 msgid "Click here for the address book"
 msgstr "点击此处以使用地址簿"
 
@@ -16181,7 +15817,7 @@ msgstr "点击此处以使用地址簿"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:356
 msgid "From:"
 msgstr "发件人："
 
@@ -16191,7 +15827,7 @@ msgstr "发件人："
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:362
 msgid "Reply-To:"
 msgstr "回复到："
 
@@ -16201,55 +15837,53 @@ msgstr "回复到："
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:373
 msgid "Subject:"
 msgstr "主题："
 
 # composer/e-msg-composer-hdrs.c:389
 # composer/e-msg-composer-hdrs.c:389
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:387
 msgid "To:"
 msgstr "收信人："
 
 # composer/e-msg-composer-hdrs.c:390
 # composer/e-msg-composer-hdrs.c:390
 # composer/e-msg-composer-hdrs.c:388
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the recipients of the message"
 msgstr "输入邮件的收件人"
 
 # composer/e-msg-composer-hdrs.c:393
 # composer/e-msg-composer-hdrs.c:393
 # composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Cc:"
 msgstr "抄送："
 
 # composer/e-msg-composer-hdrs.c:394
 # composer/e-msg-composer-hdrs.c:394
 # composer/e-msg-composer-hdrs.c:392
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "输入将接收该邮件副本的收件人地址"
 
 # composer/e-msg-composer-hdrs.c:397
 # composer/e-msg-composer-hdrs.c:397
 # composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Bcc:"
 msgstr "暗中抄送："
 
 # composer/e-msg-composer-hdrs.c:398
 # composer/e-msg-composer-hdrs.c:398
 # composer/e-msg-composer-hdrs.c:396
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:396
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
-msgstr ""
-"输入将接收该邮件副本，但不出现在收件人列表中的收件�"
-"�地址。"
+msgstr "输入将接收该邮件副本，但不出现在收件人列表中的收件人地址。"
 
 # composer/e-msg-composer-select-file.c:228
 # ui/evolution-message-composer.xml.h:2
@@ -16257,7 +15891,7 @@ msgstr ""
 # ui/evolution-message-composer.xml.h:2
 # composer/e-msg-composer-select-file.c:291
 # ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:267
+#: composer/e-msg-composer-select-file.c:291
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "附件一个文件"
@@ -16265,7 +15899,7 @@ msgstr "附件一个文件"
 # composer/e-msg-composer.c:743
 # composer/e-msg-composer.c:747
 # composer/e-msg-composer.c:695
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:697
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -16274,24 +15908,31 @@ msgstr ""
 "读入文件 %s 时发声错误：\n"
 "%s"
 
+# composer/e-msg-composer.c:943
+# composer/e-msg-composer.c:947
+# composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:914
+msgid "Save as..."
+msgstr "另存为..."
+
 # composer/e-msg-composer.c:952
 # composer/e-msg-composer.c:956
 # composer/e-msg-composer.c:921
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:923
 msgid "Warning!"
 msgstr "警告！"
 
 # composer/e-msg-composer.c:956
 # composer/e-msg-composer.c:960
 # composer/e-msg-composer.c:925
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:927
 msgid "File exists, overwrite?"
 msgstr "文件存在，覆盖它？"
 
 # composer/e-msg-composer.c:978
 # composer/e-msg-composer.c:982
 # composer/e-msg-composer.c:947
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:949
 #, c-format
 msgid "Error saving file: %s"
 msgstr "保存文件错误： %s"
@@ -16299,7 +15940,7 @@ msgstr "保存文件错误： %s"
 # composer/e-msg-composer.c:997
 # composer/e-msg-composer.c:1001
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:968
 #, c-format
 msgid "Error loading file: %s"
 msgstr "读入文件错误： %s"
@@ -16307,7 +15948,7 @@ msgstr "读入文件错误： %s"
 # composer/e-msg-composer.c:1118
 # composer/e-msg-composer.c:1032
 # composer/e-msg-composer.c:997
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:999
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "访问文件错误： %s"
@@ -16315,14 +15956,14 @@ msgstr "访问文件错误： %s"
 # composer/e-msg-composer.c:1126
 # composer/e-msg-composer.c:1040
 # composer/e-msg-composer.c:1005
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1007
 msgid "Unable to retrieve message from editor"
 msgstr "无法从编辑器检索邮件"
 
 # composer/e-msg-composer.c:1133
 # composer/e-msg-composer.c:1047
 # composer/e-msg-composer.c:1012
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1014
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -16334,7 +15975,7 @@ msgstr ""
 # composer/e-msg-composer.c:1140
 # composer/e-msg-composer.c:1054
 # composer/e-msg-composer.c:1019
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1021
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -16346,7 +15987,7 @@ msgstr ""
 # composer/e-msg-composer.c:1149
 # composer/e-msg-composer.c:1063
 # composer/e-msg-composer.c:1028
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1030
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -16358,7 +15999,7 @@ msgstr ""
 # composer/e-msg-composer.c:1251
 # composer/e-msg-composer.c:1165
 # composer/e-msg-composer.c:1130
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1132
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -16369,7 +16010,7 @@ msgstr ""
 # composer/e-msg-composer.c:1405
 # composer/e-msg-composer.c:1322
 # composer/e-msg-composer.c:1288
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1290
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -16382,35 +16023,35 @@ msgstr ""
 # composer/e-msg-composer.c:1412
 # composer/e-msg-composer.c:1329
 # composer/e-msg-composer.c:1295
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1297
 msgid "Warning: Modified Message"
 msgstr "警告： 已改动的邮件"
 
 # composer/e-msg-composer.c:1435
 # composer/e-msg-composer.c:1352
 # composer/e-msg-composer.c:1318
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1320
 msgid "Open file"
 msgstr "打开文件"
 
 # composer/e-msg-composer.c:1584
 # composer/e-msg-composer.c:1501
 # composer/e-msg-composer.c:1467
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1469
 msgid "Insert File"
 msgstr "插入文件"
 
 # composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
 # composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
 # composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1855 composer/e-msg-composer.c:2447
 msgid "Compose a message"
 msgstr "撰写邮件"
 
 # composer/e-msg-composer.c:2440
 # composer/e-msg-composer.c:2380
 # composer/e-msg-composer.c:2351
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2464
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -16421,7 +16062,7 @@ msgstr ""
 # composer/e-msg-composer.c:2463 composer/e-msg-composer.c:2518
 # composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
 # composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2487 composer/e-msg-composer.c:2542
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -16432,7 +16073,7 @@ msgstr ""
 # composer/evolution-composer.c:367
 # composer/evolution-composer.c:367
 # composer/evolution-composer.c:367
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -16443,7 +16084,7 @@ msgstr ""
 # composer/evolution-composer.c:382
 # composer/evolution-composer.c:382
 # composer/evolution-composer.c:382
-#: composer/evolution-composer.c:391
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "无法初始化 Evolution 的撰写器。"
 
@@ -16531,33 +16172,18 @@ msgstr "主题含有"
 msgid "Subject does not contain"
 msgstr "主题不含有"
 
-# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
-# mail/mail-display.c:106
-# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:2034
-# mail/mail-display.c:106
-# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
-# mail/mail-display.c:105
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
-#: mail/mail-display.c:122
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"指定名称的文件已经存在。\n"
-"覆盖它？"
-
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:269
 #. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:360 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "记住该密码"
 
 # e-util/e-passwords.c:362 mail/mail-session.c:268
 # e-util/e-passwords.c:362 mail/mail-session.c:268
 # e-util/e-passwords.c:362 mail/mail-session.c:270
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:362 mail/mail-session.c:270
 msgid "Remember this password for the remainder of this session"
 msgstr "在本会话中记住该密码"
 
@@ -16712,50 +16338,322 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
+# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+# executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "进行概括的 Evolution 组件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Evolution 实施概要组件车间。"
+
+# my-evolution/component-factory.c:153
+# my-evolution/component-factory.c:153
+# executive-summary/component/component-factory.c:151
+#: executive-summary/component/component-factory.c:151
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "无法初始化 Evolution 的实施概要组件。"
+
+# shell/e-shell-importer.c:617
+# shell/e-shell-importer.c:617
+# executive-summary/component/e-summary-callbacks.c:125
+#: executive-summary/component/e-summary-callbacks.c:125
+msgid "Select a service"
+msgstr "选择一个服务"
+
+# executive-summary/component/e-summary-callbacks.c:289
+#: executive-summary/component/e-summary-callbacks.c:289
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+"您可以为实施概要背景选择一个不同的 HTML 页面。\n"
+"\n"
+"若需默认值使其保持为空即可"
+
+# executive-summary/component/e-summary-url.c:69
+# executive-summary/component/e-summary-url.c:74
+# executive-summary/component/e-summary-url.c:81
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr "以默认 GNOME 应用程序打开 %s"
+
+# executive-summary/component/e-summary-url.c:70
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr "以默认 GNOME 网络浏览器打开 %s"
+
+# calendar/gui/dialogs/alarm-page.c:381
+# calendar/gui/dialogs/alarm-page.c:381
+# executive-summary/component/e-summary-url.c:71
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Send an email to %s"
+msgstr "给 %s 发送一封电子邮件"
+
+# ui/evolution.xml.h:3
+# ui/evolution.xml.h:3
+# executive-summary/component/e-summary-url.c:72
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr "将视图改变为 %s"
+
+# calendar/gui/print.c:2306
+# calendar/gui/print.c:2306
+# executive-summary/component/e-summary-url.c:73
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr "运行 %s"
+
+# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+# ui/evolution-contact-list-editor.xml.h:1
+# ui/evolution-mail-messagedisplay.xml.h:1
+# ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+# ui/evolution.xml.h:4
+# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+# ui/evolution-contact-list-editor.xml.h:1
+# ui/evolution-mail-messagedisplay.xml.h:1
+# ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+# ui/evolution.xml.h:4
+# executive-summary/component/e-summary-url.c:75
+#: executive-summary/component/e-summary-url.c:75
+#, c-format
+msgid "Close %s"
+msgstr "关闭 %s"
+
+# ui/evolution.xml.h:17
+# ui/evolution.xml.h:17
+# executive-summary/component/e-summary-url.c:76
+#: executive-summary/component/e-summary-url.c:76
+#, c-format
+msgid "Move %s to the left"
+msgstr "将 %s 移动到左边"
+
+# executive-summary/component/e-summary-url.c:77
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr "将 %s 移动到右边"
+
+# executive-summary/component/e-summary-url.c:78
+#: executive-summary/component/e-summary-url.c:78
+#, c-format
+msgid "Move %s into the previous row"
+msgstr "将 %s 移动岛上一行"
+
+# executive-summary/component/e-summary-url.c:79
+#: executive-summary/component/e-summary-url.c:79
+#, c-format
+msgid "Move %s into the next row"
+msgstr "将 %s 移动到下一行"
+
+# mail/mail-local.c:1416
+# mail/mail-local.c:1416
+# executive-summary/component/e-summary-url.c:80
+#: executive-summary/component/e-summary-url.c:80
+#, c-format
+msgid "Configure %s"
+msgstr "配置 %s"
+
+# addressbook/printing/e-contact-print.glade.h:25
+# addressbook/printing/e-contact-print.glade.h:25
+# executive-summary/component/e-summary-url.c:553
+#: executive-summary/component/e-summary-url.c:553
+msgid "page"
+msgstr "页面"
+
+# shell/e-shell-folder-commands.c:488
+# shell/e-shell-folder-commands.c:488
+# executive-summary/component/e-summary.c:925
+#: executive-summary/component/e-summary.c:925
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"无法打开 HTML 文件：\n"
+"%s"
+
+# shell/e-shell-importer.c:474
+# shell/e-shell-importer.c:474
+# executive-summary/component/e-summary.c:939
+#: executive-summary/component/e-summary.c:939
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+"读入数据错误：\n"
+"%s"
+
+# executive-summary/component/e-summary.c:957
+#: executive-summary/component/e-summary.c:957
+msgid "File does not have a place for the services.\n"
+msgstr "文件中没有服务空间。\n"
+
+# executive-summary/component/main.c:61
+#: executive-summary/component/main.c:61
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+"实施概要组件无法初始化 Bonobo。\n"
+"如果出现关于 RootPOA 的警告信息，可能表明\n"
+"您是与 GOAD 而不是 OAF 一起编译的 Bonobo。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+msgid "Factory for the RDF summary."
+msgstr "RDF 概要车间。"
+
+# calendar/gui/e-calendar-table.etspec.h:16
+# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
+# calendar/gui/e-calendar-table.etspec.h:16
+# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
+# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+msgid "RDF Summary"
+msgstr "RDF 概要"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+msgid "Factory for the test bonobo component."
+msgstr "测试 bonobo 组件车间。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+msgid "Factory for the test component."
+msgstr "测试组件车间。"
+
+# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+msgid "Test bonobo service"
+msgstr "测试 bonobo 服务"
+
+# widgets/misc/e-charset-picker.c:58
+# widgets/misc/e-charset-picker.c:58
+# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+msgid "Test service"
+msgstr "测试服务"
+
+# widgets/misc/e-messagebox.c:166
+# widgets/misc/e-messagebox.c:166
+# executive-summary/test-service/rdf-summary.c:512
+# executive-summary/test-service/rdf-summary.c:549
+# executive-summary/test-service/rdf-summary.c:594
+# widgets/misc/e-messagebox.c:166
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "错误"
+
+# executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update automatically"
+msgstr "自动更新"
+
+# calendar/gui/e-itip-control.c:787
+# calendar/gui/e-itip-control.c:787
+# executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:785
+msgid "Update now"
+msgstr "现在更新"
+
+# calendar/gui/e-meeting-time-sel.c:515
+# calendar/gui/e-meeting-time-sel.c:518
+# executive-summary/test-service/rdf-summary.c:795
+#: executive-summary/test-service/rdf-summary.c:795
+msgid "Update every "
+msgstr "更新间隔 "
+
+# filter/filter-datespec.c:80
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "年"
 
+# filter/filter-datespec.c:80
 #: filter/filter-datespec.c:80
 msgid "years"
 msgstr "年"
 
+# filter/filter-datespec.c:81
 #: filter/filter-datespec.c:81
 msgid "month"
 msgstr "月"
 
+# filter/filter-datespec.c:81
 #: filter/filter-datespec.c:81
 msgid "months"
 msgstr "月"
 
+# filter/filter-datespec.c:82
 #: filter/filter-datespec.c:82
 msgid "week"
 msgstr "周"
 
+# filter/filter-datespec.c:82
 #: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "周"
 
+# filter/filter-datespec.c:84
 #: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "小时"
 
+# filter/filter-datespec.c:85
 #: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "分钟"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+# filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86
+msgid "second"
+msgstr "秒"
+
+# filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "秒"
 
+# filter/filter-datespec.c:194
 #: filter/filter-datespec.c:194
 msgid "You have forgotten to choose a date."
 msgstr "您忘记选择日期了。"
 
+# filter/filter-datespec.c:196
 #: filter/filter-datespec.c:196
 msgid "You have chosen an invalid date."
 msgstr "您选择了无效的日期。"
 
+# filter/filter-datespec.c:271
 #: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
@@ -16766,6 +16664,7 @@ msgstr ""
 "日期或者虚拟文件夹打开的\n"
 "日期进行比较。"
 
+# filter/filter-datespec.c:294
 #: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
@@ -16774,6 +16673,7 @@ msgstr ""
 "邮件的日期将与您在这里\n"
 "指定的日期进行比较。"
 
+# filter/filter-datespec.c:334
 #: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
@@ -16784,63 +16684,77 @@ msgstr ""
 "运行的时间进行比较；\n"
 "例如：“一周以前”。"
 
+# filter/filter-datespec.c:369
 #. keep in sync with FilterDatespec_type!
 #: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "当前时间"
 
+# filter/filter-datespec.c:369
 #: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "您指定的时间"
 
+# filter/filter-datespec.c:370
 #: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "相对于当前时间的时间"
 
+# filter/filter-datespec.c:394
 #. The dialog
 #: filter/filter-datespec.c:394
 msgid "Select a time to compare against"
 msgstr "选择用于比较的时间"
 
+# filter/filter-datespec.c:428
 #. The label
 #: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "比较"
 
+# filter/filter-datespec.c:546 filter/filter-datespec.c:725
 #: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "现在"
 
+# filter/filter-datespec.c:575
 #: filter/filter-datespec.c:575
 msgid " ago"
 msgstr " 过去"
 
+# filter/filter-datespec.c:621
 #: filter/filter-datespec.c:621
 msgid "ago"
 msgstr "过去"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+# filter/filter-datespec.c:711 mail/message-list.c:973
+#: filter/filter-datespec.c:711 mail/message-list.c:973
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
+# filter/filter-datespec.c:722
 #: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<点击这里以选择日期>"
 
+# filter/filter-editor.c:132 filter/filter.glade.h:3
 #: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "过滤规则"
 
+# filter/filter-filter.c:487
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:487
 msgid "Then"
 msgstr "则"
 
-#: filter/filter-filter.c:502
+# filter/filter-filter.c:501
+#: filter/filter-filter.c:501
 msgid "Add action"
 msgstr "添加动作"
 
-#: filter/filter-folder.c:147
+# filter/filter-folder.c:156
+#: filter/filter-folder.c:156
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -16850,12 +16764,24 @@ msgstr ""
 
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
+# filter/filter-folder.c:239 filter/vfolder-rule.c:365
 # mail/mail-account-gui.c:834
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "选择文件夹"
 
+# filter/filter-folder.c:274
+#: filter/filter-folder.c:274
+msgid "Enter folder URI"
+msgstr "输入文件夹 URI"
+
+# filter/filter-folder.c:321
+#: filter/filter-folder.c:321
+msgid "<click here to select a folder>"
+msgstr "<点击这里以便选择文件夹>"
+
+# filter/filter-input.c:198
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -16865,342 +16791,380 @@ msgstr ""
 "常规表达式错误 “%s”：\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+# filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:488 shell/evolution-test-component.c:41
 msgid "Test"
 msgstr "测试"
 
+# filter/filter-rule.c:217
 #: filter/filter-rule.c:217
 msgid "You must name this filter."
 msgstr "您必须为该过滤规则命名。"
 
-#: filter/filter-rule.c:721
+# filter/filter-rule.c:720
+#: filter/filter-rule.c:720
 msgid "Rule name: "
 msgstr "规则名："
 
-#: filter/filter-rule.c:725
+# filter/filter-rule.c:724
+#: filter/filter-rule.c:724
 msgid "Untitled"
 msgstr "无标题"
 
-#: filter/filter-rule.c:742
+# filter/filter-rule.c:741
+#: filter/filter-rule.c:741
 msgid "If"
 msgstr "如果"
 
-#: filter/filter-rule.c:760
+# filter/filter-rule.c:759
+#: filter/filter-rule.c:759
 msgid "Execute actions"
 msgstr "执行动作"
 
-#: filter/filter-rule.c:764
+# filter/filter-rule.c:763
+#: filter/filter-rule.c:763
 msgid "if all criteria are met"
 msgstr "如果满足所有条件"
 
-#: filter/filter-rule.c:769
-#, fuzzy
-msgid "if any criterion are met"
+# filter/filter-rule.c:768
+#: filter/filter-rule.c:768
+msgid "if any criteria are met"
 msgstr "如果满足任一条件"
 
-#: filter/filter-rule.c:780
+# filter/filter-rule.c:779
+#: filter/filter-rule.c:779
 msgid "Add criterion"
 msgstr "添加条件"
 
-#: filter/filter-rule.c:865
+# filter/filter-rule.c:864
+#: filter/filter-rule.c:864
 msgid "incoming"
 msgstr "接收"
 
-#: filter/filter-rule.c:865
+# filter/filter-rule.c:864
+#: filter/filter-rule.c:864
 msgid "outgoing"
 msgstr "发送"
 
+# filter/filter.glade.h:1
 #: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "编辑过滤规则"
 
+# filter/filter.glade.h:2
 #: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "编辑虚拟文件夹"
 
+# filter/filter.glade.h:4
 #: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "接收"
 
+# filter/filter.glade.h:5
 #: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "发送"
 
+# filter/filter.glade.h:6 filter/vfolder-editor.c:130
 #: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "虚拟文件夹"
 
+# filter/filter.glade.h:11
 #: filter/filter.glade.h:11
 msgid "specific folders only"
 msgstr "仅指定文件夹"
 
+# filter/filter.glade.h:12
 #: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "虚拟文件夹来源"
 
+# filter/filter.glade.h:13
 #: filter/filter.glade.h:13
 msgid "with all active remote folders"
 msgstr "以全部活跃远程文件夹"
 
+# filter/filter.glade.h:14
 #: filter/filter.glade.h:14
 msgid "with all local and active remote folders"
 msgstr "以全部本地和活跃远程文件夹"
 
+# filter/filter.glade.h:15
 #: filter/filter.glade.h:15
 msgid "with all local folders"
 msgstr "以所有本地文件夹"
 
+# filter/libfilter-i18n.h:2
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-#, fuzzy
-msgid "Adjust Score"
-msgstr "指定分数"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "指定颜色"
 
-#: filter/libfilter-i18n.h:4
+# filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "指定分数"
 
-#: filter/libfilter-i18n.h:5
+# filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:4
 msgid "Attachments"
 msgstr "附件"
 
-# addressbook/gui/contact-editor/fulladdr.glade.h:23
-# addressbook/gui/contact-editor/fulladdr.glade.h:23
-# my-evolution/Locations.h:213
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "Beep"
-msgstr "伯利兹"
-
-#: filter/libfilter-i18n.h:7
+# filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:5
 msgid "contains"
 msgstr "含有"
 
-#: filter/libfilter-i18n.h:8
+# filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:6
 msgid "Copy to Folder"
 msgstr "复制到文件夹"
 
-#: filter/libfilter-i18n.h:9
+# filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:7
 msgid "Date received"
 msgstr "接收日期"
 
-#: filter/libfilter-i18n.h:10
+# filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:8
 msgid "Date sent"
 msgstr "发送日期"
 
-#: filter/libfilter-i18n.h:12
+# filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:10
 msgid "Deleted"
 msgstr "已删除"
 
-#: filter/libfilter-i18n.h:13
+# filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:11
 msgid "does not contain"
 msgstr "不含有"
 
-#: filter/libfilter-i18n.h:14
+# filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:12
 msgid "does not end with"
 msgstr "不以之结尾"
 
-#: filter/libfilter-i18n.h:15
+# filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:13
 msgid "does not exist"
 msgstr "不存在"
 
-#: filter/libfilter-i18n.h:16
+# filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:14
 msgid "does not sound like"
 msgstr "听起来不像"
 
-#: filter/libfilter-i18n.h:17
+# filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:15
 msgid "does not start with"
 msgstr "不以之开始"
 
-#: filter/libfilter-i18n.h:18
+# filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:16
 msgid "Do Not Exist"
 msgstr "不存在"
 
-#: filter/libfilter-i18n.h:19
+# filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:17
 msgid "Draft"
 msgstr "草稿"
 
-#: filter/libfilter-i18n.h:20
+# filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:18
 msgid "ends with"
 msgstr "以之结束"
 
-#: filter/libfilter-i18n.h:21
+# filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:19
 msgid "Execute Shell Command"
 msgstr "执行 Shell 命令"
 
-#: filter/libfilter-i18n.h:22
+# filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:20
 msgid "Exist"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:23
+# filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:21
 msgid "exists"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:24
+# filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:22
 msgid "Expression"
 msgstr "表达式"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
-#: mail/mail-config.glade.h:62
+# filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:23
 msgid "Important"
 msgstr "重要"
 
-#: filter/libfilter-i18n.h:27
+# filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:24
 msgid "is"
 msgstr "是"
 
-#: filter/libfilter-i18n.h:28
+# filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:25
 msgid "is after"
 msgstr "以后"
 
-#: filter/libfilter-i18n.h:29
+# filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:26
 msgid "is before"
 msgstr "以前"
 
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "已标志"
-
-#: filter/libfilter-i18n.h:31
+# filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:27
 msgid "is greater than"
 msgstr "大于"
 
-#: filter/libfilter-i18n.h:32
+# filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:28
 msgid "is less than"
 msgstr "小于"
 
-#: filter/libfilter-i18n.h:33
+# filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:29
 msgid "is not"
 msgstr "不是"
 
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-# mail/message-list.etspec.h:2
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "已标志"
-
-#: filter/libfilter-i18n.h:35
+# filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:30
 msgid "Mailing list"
 msgstr "邮件列表"
 
-#: filter/libfilter-i18n.h:36
+# filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:31
 msgid "Message Body"
 msgstr "邮件体"
 
-#: filter/libfilter-i18n.h:37
+# filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:32
 msgid "Message Header"
 msgstr "邮件头"
 
-#: filter/libfilter-i18n.h:38
+# filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:33
 msgid "Move to Folder"
 msgstr "移动到文件夹"
 
-# calendar/gui/dialogs/alarm-options.glade.h:3
-# calendar/gui/dialogs/alarm-options.glade.h:3
-# calendar/gui/dialogs/alarm-options.glade.h:3
-#: filter/libfilter-i18n.h:39
-#, fuzzy
-msgid "Play Sound"
-msgstr "播放声音："
+# calendar/gui/e-itip-control.c:986
+# calendar/gui/e-itip-control.c:986
+# filter/libfilter-i18n.h:34 mail/message-list.c:671
+# mail/message-list.etspec.h:4
+#: filter/libfilter-i18n.h:34 mail/message-list.c:671
+#: mail/message-list.etspec.h:4
+msgid "Needs Reply"
+msgstr "需要回复"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+# filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:35
 msgid "Read"
 msgstr "已读"
 
-#: filter/libfilter-i18n.h:41
+# filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:36
 msgid "Recipients"
 msgstr "收件人"
 
-#: filter/libfilter-i18n.h:42
+# filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:37
 msgid "Regex Match"
 msgstr "常规表达式匹配"
 
-#: filter/libfilter-i18n.h:43
+# filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:38
 msgid "Replied to"
 msgstr "已回复"
 
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
+# filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
 # mail/message-list.etspec.h:6
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:6
 msgid "Score"
 msgstr "分数"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+# filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1534
+#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1548
 msgid "Sender"
 msgstr "发件人"
 
-#: filter/libfilter-i18n.h:46
+# filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:41
 msgid "Set Status"
 msgstr "设置状态"
 
-#: filter/libfilter-i18n.h:47
+# filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:42
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
-#: filter/libfilter-i18n.h:48
+# filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:43
 msgid "sounds like"
 msgstr "听起来象"
 
-#: filter/libfilter-i18n.h:49
+# filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:44
 msgid "Source Account"
 msgstr "来源帐号"
 
-#: filter/libfilter-i18n.h:50
+# filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:45
 msgid "Specific header"
 msgstr "指定邮件头"
 
-#: filter/libfilter-i18n.h:51
+# filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:46
 msgid "starts with"
 msgstr "以之开始"
 
-#: filter/libfilter-i18n.h:53
+# filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:48
 msgid "Stop Processing"
 msgstr "停止处理"
 
 # mail/message-list.etspec.h:9
 # mail/message-list.etspec.h:10
+# filter/libfilter-i18n.h:49 mail/mail-format.c:932
 # mail/message-list.etspec.h:10
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
+#: mail/message-list.etspec.h:10
 msgid "Subject"
 msgstr "主题"
 
+# filter/rule-editor.c:179
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "规则"
 
-#: filter/rule-editor.c:286
+# filter/rule-editor.c:287
+#: filter/rule-editor.c:287
 msgid "Add Rule"
 msgstr "添加规则"
 
-#: filter/rule-editor.c:361
+# filter/rule-editor.c:360
+#: filter/rule-editor.c:360
 msgid "Edit Rule"
 msgstr "编辑规则"
 
+# filter/score-editor.c:130
 #: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "计分规则"
 
+# filter/vfolder-rule.c:204
 #: filter/vfolder-rule.c:204
 msgid "You must name this vfolder."
 msgstr "您必须为该虚拟文件夹命名。"
 
+# filter/vfolder-rule.c:213
 #: filter/vfolder-rule.c:213
 msgid "You need to to specify at least one folder as a source."
 msgstr "您至少需要把一个文件夹指定为源。"
@@ -17218,7 +17182,7 @@ msgstr "Evolution 正在导入您原来的电子邮件"
 # importers/pine-importer.c:101
 # importers/elm-importer.c:96 importers/netscape-importer.c:107
 # importers/pine-importer.c:101
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "正在导入..."
@@ -17229,7 +17193,7 @@ msgstr "正在导入..."
 # importers/pine-importer.c:103
 # importers/elm-importer.c:98 importers/netscape-importer.c:109
 # importers/pine-importer.c:103
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "请等待"
@@ -17240,7 +17204,7 @@ msgstr "请等待"
 # importers/pine-importer.c:365
 # importers/elm-importer.c:169 importers/netscape-importer.c:689
 # importers/pine-importer.c:365
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:689
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
@@ -17252,7 +17216,7 @@ msgstr "正在按 %2$s 导入 %1$s"
 # importers/pine-importer.c:471
 # importers/elm-importer.c:375 importers/netscape-importer.c:782
 # importers/pine-importer.c:471
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:782
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
@@ -17264,8 +17228,8 @@ msgstr "正在扫描 %s"
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/elm-importer.c:525 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "邮件"
 
@@ -17305,98 +17269,38 @@ msgstr ""
 "Evolution 找到了 GnomeCard 文件。\n"
 "您是否希望把它们导入 Evolution？"
 
-# calendar/gui/print.c:2280
-# calendar/gui/print.c:2280
-# calendar/gui/print.c:2280
-#: importers/netscape-importer.c:70
-#, fuzzy, c-format
-msgid "Priority Filter \"%s\""
-msgstr "优先级：%s"
-
-#: importers/netscape-importer.c:653
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-
-#: importers/netscape-importer.c:677
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-
-#: importers/netscape-importer.c:694
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-
 # importers/netscape-importer.c:106
 # importers/netscape-importer.c:106
 # importers/netscape-importer.c:106
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在导入您原来的 Netscape 数据"
 
-# mail/mail-ops.c:1058 shell/e-local-storage.c:178
-# mail/mail-ops.c:1060 shell/e-local-storage.c:178
-# mail/mail-ops.c:1103 shell/e-local-storage.c:178
-#: importers/netscape-importer.c:1865
-msgid "Trash"
-msgstr "已删除"
-
-# camel/providers/local/camel-local-store.c:196
-# camel/providers/local/camel-local-store.c:196
-# camel/providers/local/camel-local-store.c:196
-#: importers/netscape-importer.c:2021
-#, fuzzy
-msgid "Scanning mail filters"
-msgstr "本地邮件文件 %s"
-
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "正在扫描目录"
 
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "开始导入"
 
 # importers/netscape-importer.c:963
 # importers/netscape-importer.c:963
 # importers/netscape-importer.c:963
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "设置"
 
-#: importers/netscape-importer.c:2131
-#, fuzzy
-msgid "Mail Filters"
-msgstr "编辑过滤规则"
-
 # importers/netscape-importer.c:984
 # importers/netscape-importer.c:984
 # importers/netscape-importer.c:984
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -17429,141 +17333,76 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Evolution 撰写器车间。"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Evolution 任务控制车间"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Evolution 撰写器车间。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Evolution 撰写器车间。"
-
 # mail/GNOME_Evolution_Mail.oaf.in.h:1
 # mail/GNOME_Evolution_Mail.oaf.in.h:1
 # mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
 msgid "Evolution component for handling mail."
 msgstr "Evolution 处理邮件组件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
 msgid "Evolution mail composer."
 msgstr "Evolution 邮件撰写器。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:3
 # mail/GNOME_Evolution_Mail.oaf.in.h:3
 # mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
 msgid "Evolution mail executive summary component."
 msgstr "Evolution 邮件实施概要组件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
 msgid "Evolution mail folder display component."
 msgstr "Evolution 邮件文件夹显示组件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:5
 # mail/GNOME_Evolution_Mail.oaf.in.h:5
 # mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
 msgid "Evolution mail folder factory component."
 msgstr "Evolution 邮件文件夹车间组件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Factory for the Evolution composer."
 msgstr "Evolution 撰写器车间。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:7
 # mail/GNOME_Evolution_Mail.oaf.in.h:7
 # mail/GNOME_Evolution_Mail.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Factory for the Mail Summary component."
 msgstr "邮件概要组件车间。"
 
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-# calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-#, fuzzy
-msgid "Font Preferences"
-msgstr "没有循环(_N)"
-
-# mail/mail-config.glade.h:8
-# mail/mail-config.glade.h:8
-# mail/mail-config.glade.h:8
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
-#, fuzzy
-msgid "Mail Accounts"
-msgstr "帐号"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
-msgid "Mail Preferences"
-msgstr ""
-
 # mail/GNOME_Evolution_Mail.oaf.in.h:8
 # mail/GNOME_Evolution_Mail.oaf.in.h:8
 # mail/GNOME_Evolution_Mail.oaf.in.h:8
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Mail configuration interface"
 msgstr "邮件配置界面"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
-msgid "This Page can be used to configure the Fonts"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
-msgid "This page can be used to configure E-Mail Accounts"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19
-msgid "This page can be used to configure Mailer preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "This page can be used to configure the Composer"
-msgstr ""
-
 # mail/component-factory.c:100
 # mail/component-factory.c:100
 # mail/component-factory.c:100
-#: mail/component-factory.c:101
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "文件夹含有邮件"
 
+# mail/component-factory.c:101
+# mail/component-factory.c:101
+# mail/component-factory.c:101
+#: mail/component-factory.c:101
+msgid "Mail storage folder (internal)"
+msgstr "邮件存储文件夹 (内部)"
+
 # mail/component-factory.c:102
 # mail/component-factory.c:102
 # mail/component-factory.c:102
@@ -17578,57 +17417,57 @@ msgstr "虚拟已删除邮件箱"
 msgid "Virtual Trash folder"
 msgstr "虚拟已删除邮件文件夹"
 
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+#: mail/component-factory.c:129
+#, c-format
+msgid "Cannot connect to store: %s"
+msgstr "无法连接到存储： %s"
+
 # mail/component-factory.c:147
 # mail/component-factory.c:147
 # mail/component-factory.c:147
-#: mail/component-factory.c:118
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "该文件夹不能含有邮件。"
 
 # mail/component-factory.c:432
 # mail/component-factory.c:432
 # mail/component-factory.c:432
-#: mail/component-factory.c:403
+#: mail/component-factory.c:439
 msgid "Properties..."
 msgstr "属性..."
 
 # mail/component-factory.c:432
 # mail/component-factory.c:432
 # mail/component-factory.c:432
-#: mail/component-factory.c:403
+#: mail/component-factory.c:439
 msgid "Change this folder's properties"
 msgstr "改变该文件夹的属性"
 
 # mail/component-factory.c:783
 # mail/component-factory.c:783
 # mail/component-factory.c:786
-#: mail/component-factory.c:766
+#: mail/component-factory.c:800
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
-msgstr ""
-"您的某些邮件设置好像已崩溃，请按顺序检查所有内容。"
-
-# mail/mail-callbacks.c:230
-# mail/mail-callbacks.c:230
-# mail/mail-callbacks.c:187
-#: mail/component-factory.c:925
-msgid "You have not set a mail transport method"
-msgstr "您还没有设置邮件传输方法"
+msgstr "您的某些邮件设置好像已崩溃，请按顺序检查所有内容。"
 
 # mail/component-factory.c:951
 # mail/component-factory.c:951
 # mail/component-factory.c:955
-#: mail/component-factory.c:967
+#: mail/component-factory.c:969
 msgid "New Mail Message"
 msgstr "新建邮件"
 
-# ui/evolution-mail-global.xml.h:20
-# ui/evolution-mail-global.xml.h:20
-# ui/evolution-mail-global.xml.h:20
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
-msgid "_Mail Message"
-msgstr "邮件(_M)"
+# mail/component-factory.c:951
+# mail/component-factory.c:951
+# mail/component-factory.c:955
+#: mail/component-factory.c:969
+msgid "New _Mail Message"
+msgstr "新建邮件(_M)"
 
 # mail/component-factory.c:975
 # mail/component-factory.c:975
@@ -17651,25 +17490,17 @@ msgstr "无法初始化 Evolution 的邮件配置组件。"
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "无法初始化 Evolution 的文件夹信息组件。"
 
-# mail/mail-config.c:2184 mail/mail-config.c:2188
-# mail/mail-config.c:2233 mail/mail-config.c:2237
-# mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
-#, fuzzy
-msgid "Connecting..."
-msgstr "正在连接服务器..."
-
 # mail/component-factory.c:1206
 # mail/component-factory.c:1206
 # mail/component-factory.c:1211
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1225
 msgid "Cannot register storage with shell"
 msgstr "无法用 shell 注册存储"
 
 # mail/folder-browser-ui.c:272
 # mail/folder-browser-ui.c:272
 # mail/folder-browser-ui.c:273
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:273
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "“%s”的属性"
@@ -17677,14 +17508,14 @@ msgstr "“%s”的属性"
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:275
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:275
 msgid "Properties"
 msgstr "属性"
 
 # mail/folder-browser.c:297 mail/mail-display.c:298
 # mail/folder-browser.c:297 mail/mail-display.c:297
 # mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:298 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "无法创建临时目录： %s"
@@ -17692,7 +17523,7 @@ msgstr "无法创建临时目录： %s"
 # mail/folder-browser.c:731
 # mail/folder-browser.c:751
 # mail/folder-browser.c:752
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:752
 #, c-format
 msgid "%d new"
 msgstr "%d 新"
@@ -17703,21 +17534,21 @@ msgstr "%d 新"
 # mail/folder-browser.c:765
 # mail/folder-browser.c:755 mail/folder-browser.c:763
 # mail/folder-browser.c:766
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:755 mail/folder-browser.c:763
+#: mail/folder-browser.c:766
 msgid ", "
 msgstr "， "
 
 # mail/folder-browser.c:735
 # mail/folder-browser.c:756
 # mail/folder-browser.c:757
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:757
 #, c-format
 msgid "%d hidden"
 msgstr "隐藏 %d 个"
 
 # mail/folder-browser.c:759
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:759
 #, c-format
 msgid "%d visible"
 msgstr "%d 个可见"
@@ -17725,7 +17556,7 @@ msgstr "%d 个可见"
 # mail/folder-browser.c:740
 # mail/folder-browser.c:763
 # mail/folder-browser.c:764
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:764
 #, c-format
 msgid "%d selected"
 msgstr "选择 %d 个"
@@ -17733,7 +17564,7 @@ msgstr "选择 %d 个"
 # mail/folder-browser.c:763
 # mail/folder-browser.c:768
 # mail/folder-browser.c:769
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d unsent"
 msgstr "%d 个未发送"
@@ -17741,7 +17572,7 @@ msgstr "%d 个未发送"
 # mail/folder-browser.c:765
 # mail/folder-browser.c:770
 # mail/folder-browser.c:771
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:771
 #, c-format
 msgid "%d sent"
 msgstr "%d 个已发送"
@@ -17749,257 +17580,244 @@ msgstr "%d 个已发送"
 # mail/folder-browser.c:767
 # mail/folder-browser.c:772
 # mail/folder-browser.c:773
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:773
 #, c-format
 msgid "%d total"
 msgstr "共 %d 个"
 
-# ui/evolution-mail-message.xml.h:8
-# ui/evolution-mail-message.xml.h:8
-# ui/evolution-mail-message.xml.h:8
-#: mail/folder-browser.c:1088
-#, fuzzy
-msgid "Create _Virtual Folder From Search..."
-msgstr "从邮件创建虚拟文件夹(_V)"
+# mail/folder-browser.c:1049
+# mail/folder-browser.c:1054
+# mail/folder-browser.c:1055
+#: mail/folder-browser.c:1055
+msgid "Create vFolder from Search"
+msgstr "根据搜索创建虚拟文件夹"
 
 # mail/folder-browser.c:1430
 # mail/folder-browser.c:1437
 # mail/folder-browser.c:1438
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1438
 msgid "VFolder on _Subject"
 msgstr "关于主题的虚拟文件夹(_S)"
 
 # mail/folder-browser.c:1431
 # mail/folder-browser.c:1438
 # mail/folder-browser.c:1439
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1439
 msgid "VFolder on Se_nder"
 msgstr "关于发件人的虚拟文件夹(_N)"
 
 # mail/folder-browser.c:1432
 # mail/folder-browser.c:1439
 # mail/folder-browser.c:1440
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1440
 msgid "VFolder on _Recipients"
 msgstr "关于收件人的虚拟文件夹(_R)"
 
 # mail/folder-browser.c:1433
 # mail/folder-browser.c:1440
 # mail/folder-browser.c:1441
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1441
 msgid "VFolder on Mailing _List"
 msgstr "关于邮件列表的虚拟文件夹(_L)"
 
 # mail/folder-browser.c:1437
 # mail/folder-browser.c:1444
 # mail/folder-browser.c:1445
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1445
 msgid "Filter on Sub_ject"
 msgstr "过滤标题(_J)"
 
 # mail/folder-browser.c:1438
 # mail/folder-browser.c:1445
 # mail/folder-browser.c:1446
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1446
 msgid "Filter on Sen_der"
 msgstr "过滤发件人(_D)"
 
 # mail/folder-browser.c:1439
 # mail/folder-browser.c:1446
 # mail/folder-browser.c:1447
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1447
 msgid "Filter on Re_cipients"
 msgstr "过滤收件人(_C)"
 
 # mail/folder-browser.c:1440
 # mail/folder-browser.c:1447
 # mail/folder-browser.c:1448
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1448
 msgid "Filter on _Mailing List"
 msgstr "过滤邮件列表(_M)"
 
 # mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:96
 # mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:96
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:98
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:98
 msgid "_Edit as New Message..."
 msgstr "作为新邮件进行编辑(_E)..."
 
+# mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
+# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
+# mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
+#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
+msgid "_Save As..."
+msgstr "另存为(_S)..."
+
 # mail/folder-browser.c:1450
 # mail/folder-browser.c:1457
 # mail/folder-browser.c:1458
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1458
 msgid "_Print"
 msgstr "打印(_P)"
 
 # mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:104
 # mail/folder-browser.c:1461 ui/evolution-mail-message.xml.h:104
 # mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
 # mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:73
 # mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:73
 # mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:75
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
 # mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:72
 # mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:74
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
 # mail/folder-browser.c:1457
 # mail/folder-browser.c:1464
 # mail/folder-browser.c:1465
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1465
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: mail/folder-browser.c:1622
-msgid "Follo_w Up..."
-msgstr ""
-
-# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
-# calendar/gui/dialogs/task-details-page.glade.h:4
-# calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:329
-# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
-# calendar/gui/dialogs/task-details-page.glade.h:4
-# calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:329
-# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
-# calendar/gui/dialogs/task-details-page.glade.h:4
-# calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
-# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: mail/folder-browser.c:1623
-#, fuzzy
-msgid "Fla_g Completed"
-msgstr "已完成"
-
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-# widgets/misc/e-filter-bar.h:95
-# widgets/misc/e-filter-bar.h:95
-#: mail/folder-browser.c:1624
-#, fuzzy
-msgid "Cl_ear Flag"
-msgstr "清除"
-
 # mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:43
 # mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:43
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
-#. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
 # mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-#: mail/folder-browser.c:1629
-#, fuzzy
-msgid "Mark as _Unread"
+#: mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
 msgstr "标记为未读(_N)"
 
 # mail/folder-browser.c:1461
 # mail/folder-browser.c:1468
 # mail/folder-browser.c:1469
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1469
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
 # mail/folder-browser.c:1462
 # mail/folder-browser.c:1469
 # mail/folder-browser.c:1470
-#: mail/folder-browser.c:1631
-#, fuzzy
-msgid "_Mark as Unimportant"
+#: mail/folder-browser.c:1470
+msgid "Mark as Unim_portant"
 msgstr "标记为不重要(_P)"
 
-# mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
-# mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
-# mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-#: mail/folder-browser.c:1636
-#, fuzzy
-msgid "U_ndelete"
-msgstr "反删除(_U)"
+# calendar/gui/e-itip-control.c:896
+# calendar/gui/e-itip-control.c:896
+# mail/folder-browser.c:1471
+#: mail/folder-browser.c:1471
+msgid "Mark as Needing Reply"
+msgstr "标记为需要回复"
+
+# calendar/gui/e-itip-control.c:896
+# calendar/gui/e-itip-control.c:896
+# mail/folder-browser.c:1472
+#: mail/folder-browser.c:1472
+msgid "Mark as Not Needing Reply"
+msgstr "标记为不需要回复"
 
 # mail/folder-browser.c:1466
 # mail/folder-browser.c:1475
 # mail/folder-browser.c:1476
-#: mail/folder-browser.c:1640
-#, fuzzy
-msgid "Mo_ve to Folder..."
+#: mail/folder-browser.c:1476
+msgid "_Move to Folder..."
 msgstr "移动到文件夹(_M)..."
 
 # mail/folder-browser.c:1467
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1477
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1477
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹..."
 
-# ui/evolution-mail-message.xml.h:98
-# ui/evolution-mail-message.xml.h:98
-# my-evolution/Locations.h:1192
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "劳雷尔"
+# mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
+# mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
+# mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
+msgid "_Undelete"
+msgstr "反删除(_U)"
 
 # mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
 # mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
 # mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-#: mail/folder-browser.c:1649
-#, fuzzy
-msgid "Add Sender to Address_book"
+#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
+msgid "Add Sender to Address Book"
 msgstr "将发件人添加到地址簿"
 
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1485
 # mail/folder-browser.c:1486
-#: mail/folder-browser.c:1653
-#, fuzzy
-msgid "Appl_y Filters"
+#: mail/folder-browser.c:1486
+msgid "Apply Filters"
 msgstr "应用过滤规则"
 
 # mail/folder-browser.c:1478
 # mail/folder-browser.c:1487
 # mail/folder-browser.c:1488
-#: mail/folder-browser.c:1657
-#, fuzzy
-msgid "Crea_te Rule From Message"
+#: mail/folder-browser.c:1488
+msgid "Create Ru_le From Message"
 msgstr "从消息创建规则(_L)"
 
+# mail/folder-browser.c:1628
+# mail/folder-browser.c:1656
+# mail/folder-browser.c:1657
+#: mail/folder-browser.c:1657
+msgid "Filter on Mailing List"
+msgstr "过滤邮件列表"
+
 # mail/folder-browser.c:1629
 # mail/folder-browser.c:1657
 # mail/folder-browser.c:1658
-#: mail/folder-browser.c:1936
-#, fuzzy
-msgid "VFolder on M_ailing List"
+#: mail/folder-browser.c:1658
+msgid "VFolder on Mailing List"
 msgstr "关于邮件列表的虚拟文件夹"
 
 # mail/folder-browser.c:1631
 # mail/folder-browser.c:1659
 # mail/folder-browser.c:1660
-#: mail/folder-browser.c:1938
-#, fuzzy, c-format
-msgid "Filter on _Mailing List (%s)"
+#: mail/folder-browser.c:1660
+#, c-format
+msgid "Filter on Mailing List (%s)"
 msgstr "过滤邮件列表 (%s)"
 
 # mail/folder-browser.c:1632
 # mail/folder-browser.c:1660
 # mail/folder-browser.c:1661
-#: mail/folder-browser.c:1939
-#, fuzzy, c-format
-msgid "VFolder on M_ailing List (%s)"
+#: mail/folder-browser.c:1661
+#, c-format
+msgid "VFolder on Mailing List (%s)"
 msgstr "关于邮件列表 (%s) 的虚拟文件夹"
 
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/folder-browser.h:26
+#: mail/folder-browser.h:26
+msgid "Default"
+msgstr "默认"
+
 # mail/folder-info.c:64
 # mail/folder-info.c:64
 # mail/folder-info.c:64
@@ -18035,32 +17853,45 @@ msgstr "将 Outlook Express 4 的邮件导入 Evolution 的车间"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "将 Outlook Express 4 文件导入到 Evolution"
 
+# mail/local-config.glade.h:1
+# mail/local-config.glade.h:1
+# mail/local-config.glade.h:1
+#: mail/local-config.glade.h:1
+msgid "Body contents"
+msgstr "邮件体内容"
+
 # mail/local-config.glade.h:2
 # mail/local-config.glade.h:2
 # mail/local-config.glade.h:2
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "当前存储格式："
 
-# mail/local-config.glade.h:1
-# mail/local-config.glade.h:1
-# mail/local-config.glade.h:1
-#: mail/local-config.glade.h:2
-#, fuzzy
-msgid "Index body contents"
-msgstr "邮件体内容"
+# mail/local-config.glade.h:3
+# mail/local-config.glade.h:3
+# mail/local-config.glade.h:3
+#: mail/local-config.glade.h:3
+msgid "Indexing:"
+msgstr "正在建立索引："
+
+# mail/local-config.glade.h:4
+# mail/local-config.glade.h:4
+# mail/local-config.glade.h:4
+#: mail/local-config.glade.h:4
+msgid "Mailbox Format"
+msgstr "邮件箱格式"
 
 # mail/local-config.glade.h:5
 # mail/local-config.glade.h:5
 # mail/local-config.glade.h:5
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "新存储格式："
 
 # mail/local-config.glade.h:6
 # mail/local-config.glade.h:6
 # mail/local-config.glade.h:6
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -18073,21 +17904,21 @@ msgstr ""
 # mail/local-config.glade.h:9
 # mail/local-config.glade.h:9
 # mail/local-config.glade.h:9
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "邮件目录"
 
 # mail/local-config.glade.h:10
 # mail/local-config.glade.h:10
 # mail/local-config.glade.h:10
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "邮件箱"
 
 # mail/local-config.glade.h:11
 # mail/local-config.glade.h:11
 # mail/local-config.glade.h:11
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
@@ -18114,122 +17945,128 @@ msgstr "Evolution 新闻编辑器"
 msgid "Evolution Account Editor"
 msgstr "Evolution 帐号编辑器"
 
-# mail/mail-config.glade.h:104
-# mail/mail-config.glade.h:104
-# mail/mail-config.glade.h:113
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
-msgid "_Host:"
-msgstr "主机(_H)："
-
-# mail/mail-config.glade.h:117
-# mail/mail-config.glade.h:117
-# mail/mail-config.glade.h:126
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
-#, fuzzy
-msgid "User_name:"
-msgstr "用户名(_U)："
-
-# mail/mail-config.glade.h:112
-# mail/mail-config.glade.h:112
-# mail/mail-config.glade.h:121
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
-msgid "_Path:"
-msgstr "路径(_P)："
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:959
+#: mail/mail-account-gui.c:959
+msgid "Could not save signature file."
+msgstr "无法保存签名文件。"
 
-# addressbook/backend/ebook/e-card-simple.c:82
-# addressbook/gui/contact-editor/e-contact-editor.c:1660
-# addressbook/gui/widgets/e-addressbook-view.c:871
-# addressbook/backend/ebook/e-card-simple.c:82
-# addressbook/gui/contact-editor/e-contact-editor.c:1660
-# addressbook/gui/widgets/e-addressbook-view.c:871
-# addressbook/backend/ebook/e-card-simple.c:82
-# addressbook/gui/contact-editor/e-contact-editor.c:1660
-# addressbook/gui/widgets/e-addressbook-view.c:982
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "收音机"
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
+#: mail/mail-account-gui.c:1036
+msgid "Save signature"
+msgstr "保存签名"
 
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
+# mail/mail-account-gui.c:1045
+# mail/mail-account-gui.c:1045
+# mail/mail-account-gui.c:1042
+#: mail/mail-account-gui.c:1042
 msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
+"该签名已经被改变，但还没有存储。\n"
+"\n"
+"您希望保存改动吗？"
 
 # mail/mail-account-gui.c:1654
 # mail/mail-account-gui.c:1654
 # mail/mail-account-gui.c:1665
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1665
 msgid "You may not create two accounts with the same name."
 msgstr "您不能以相同的名字创建两个帐号。"
 
+# mail/mail-accounts.c:149
+# mail/mail-accounts.c:149
+# mail/mail-accounts.c:149
+#: mail/mail-accounts.c:149
+msgid " (default)"
+msgstr "(默认)"
+
+# mail/mail-accounts.c:194
+# mail/mail-accounts.c:194
+# mail/mail-accounts.c:194
+#: mail/mail-accounts.c:194
+msgid "Disable"
+msgstr "禁用"
+
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+#: mail/mail-accounts.c:196
+msgid "Enable"
+msgstr "启用"
+
 # mail/mail-accounts.c:293
 # mail/mail-accounts.c:293
 # mail/mail-accounts.c:293
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:292
 msgid "Are you sure you want to delete this account?"
 msgstr "您确信您要删除该帐号？"
 
 # mail/mail-accounts.c:297
 # mail/mail-accounts.c:297
 # mail/mail-accounts.c:297
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:296
 msgid "Don't delete"
 msgstr "不要删除"
 
 # mail/mail-accounts.c:300
 # mail/mail-accounts.c:300
 # mail/mail-accounts.c:300
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:299
 msgid "Really delete account?"
 msgstr "确实删除帐号？"
 
-# mail/mail-accounts.c:194
-# mail/mail-accounts.c:194
-# mail/mail-accounts.c:194
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
-msgid "Disable"
-msgstr "禁用"
-
-# mail/mail-accounts.c:196
-# mail/mail-accounts.c:196
-# mail/mail-accounts.c:196
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
-msgid "Enable"
-msgstr "启用"
-
 # mail/mail-accounts.c:532 mail/mail-accounts.c:536
 # mail/mail-accounts.c:532 mail/mail-accounts.c:536
 # mail/mail-accounts.c:532 mail/mail-accounts.c:536
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
 msgid "Are you sure you want to delete this news account?"
 msgstr "您确信您要删除该邮件帐号？"
 
-# mail/mail-config.glade.h:33
-# mail/mail-config.glade.h:33
-# mail/mail-config.glade.h:39
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
-msgid "Enabled"
-msgstr "已启用"
+# mail/mail-accounts.c:783 mail/mail-config.glade.h:42
+# mail/mail-accounts.c:798 mail/mail-config.glade.h:42
+# mail/mail-accounts.c:824 mail/mail-config.glade.h:49
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
+msgid "Mail Settings"
+msgstr "邮件设置"
 
-# addressbook/gui/component/addressbook-config.glade.h:23
-# addressbook/gui/component/addressbook-config.glade.h:23
-# addressbook/gui/component/addressbook-config.glade.h:30
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
-#, fuzzy
-msgid "Account name"
-msgstr "帐号名(_A)："
+# mail/mail-autofilter.c:72
+# mail/mail-autofilter.c:72
+# mail/mail-autofilter.c:72
+#: mail/mail-autofilter.c:72
+#, c-format
+msgid "Mail to %s"
+msgstr "邮寄给 %s"
 
-# addressbook/gui/contact-editor/fulladdr.glade.h:171
-# addressbook/gui/contact-editor/fulladdr.glade.h:171
-# addressbook/gui/contact-editor/e-contact-editor-address.c:298
-# my-evolution/Locations.h:1824
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
-#, fuzzy
-msgid "Protocol"
-msgstr "波多黎各"
+# mail/mail-autofilter.c:215
+# mail/mail-autofilter.c:217
+# mail/mail-autofilter.c:217
+#: mail/mail-autofilter.c:217
+#, c-format
+msgid "Subject is %s"
+msgstr "主题是 %s"
+
+# mail/mail-autofilter.c:231
+# mail/mail-autofilter.c:233
+# mail/mail-autofilter.c:233
+#: mail/mail-autofilter.c:233
+#, c-format
+msgid "Mail from %s"
+msgstr "邮件来自 %s"
+
+# mail/mail-autofilter.c:287
+# mail/mail-autofilter.c:289
+# mail/mail-autofilter.c:289
+#: mail/mail-autofilter.c:289
+#, c-format
+msgid "%s mailing list"
+msgstr "%s 邮件列表"
 
 # mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
 # mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
@@ -18241,7 +18078,7 @@ msgstr "添加过滤规则"
 # mail/mail-callbacks.c:137
 # mail/mail-callbacks.c:137
 # mail/mail-callbacks.c:94
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:94
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -18256,7 +18093,7 @@ msgstr ""
 # mail/mail-callbacks.c:186
 # mail/mail-callbacks.c:186
 # mail/mail-callbacks.c:143
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:143
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -18267,7 +18104,7 @@ msgstr ""
 # mail/mail-callbacks.c:200
 # mail/mail-callbacks.c:200
 # mail/mail-callbacks.c:157
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:157
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -18275,29 +18112,34 @@ msgstr ""
 "在您可以撰写邮件之前，\n"
 "您需要配置一个邮件传输。"
 
+# mail/mail-callbacks.c:230
+# mail/mail-callbacks.c:230
+# mail/mail-callbacks.c:187
+#: mail/mail-callbacks.c:187
+msgid "You have not set a mail transport method"
+msgstr "您还没有设置邮件传输方法"
+
 # mail/mail-callbacks.c:265
 # mail/mail-callbacks.c:265
 # mail/mail-callbacks.c:222
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:222
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
-msgstr ""
-"您正在发送 HTML 格式的消息，当以下收件人不希望接收 "
-"HTML 格式的邮件：\n"
+msgstr "您正在发送 HTML 格式的消息，当以下收件人不希望接收 HTML 格式的邮件：\n"
 
 # mail/mail-callbacks.c:280
 # mail/mail-callbacks.c:280
 # mail/mail-callbacks.c:237
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:237
 msgid "Send anyway?"
 msgstr "仍然发送？"
 
 # mail/mail-callbacks.c:322
 # mail/mail-callbacks.c:322
 # mail/mail-callbacks.c:279
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -18308,25 +18150,25 @@ msgstr ""
 # mail/mail-callbacks.c:366
 # mail/mail-callbacks.c:366
 # mail/mail-callbacks.c:323
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:323
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
-"由于您正在发送的邮件的接收人列表被配置为隐藏列表的�"
-"�址，该消息将只含有密件抄送收件人。"
+"由于您正在发送的邮件的接收人列表被配置为隐藏列表的地址，该消息将只含有密件抄"
+"送收件人。"
 
 # mail/mail-callbacks.c:370
 # mail/mail-callbacks.c:370
 # mail/mail-callbacks.c:327
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:327
 msgid "This message contains only Bcc recipients."
 msgstr "该邮件只含有密件抄送收件人。"
 
 # mail/mail-callbacks.c:374
 # mail/mail-callbacks.c:374
 # mail/mail-callbacks.c:331
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:331
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -18338,21 +18180,21 @@ msgstr ""
 # mail/mail-callbacks.c:504
 # mail/mail-callbacks.c:504
 # mail/mail-callbacks.c:460
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:436
 msgid "You must specify recipients in order to send this message."
 msgstr "您必须指定收件人以便发送该消息。"
 
 # mail/mail-callbacks.c:600
 # mail/mail-callbacks.c:600
 # mail/mail-callbacks.c:549
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:525
 msgid "You must configure an account before you can send this email."
 msgstr "在您能够发送该邮件之前您必须配置一个帐号。"
 
 # composer/e-msg-composer.c:1068
 # mail/mail-callbacks.c:716
 # mail/mail-callbacks.c:668
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -18363,35 +18205,35 @@ msgstr ""
 # mail/mail-callbacks.c:838
 # mail/mail-callbacks.c:928
 # mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:884
 msgid "an unknown sender"
 msgstr "未知的发件人"
 
 # mail/mail-callbacks.c:843
 # mail/mail-callbacks.c:933
 # mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:888
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "在 %Y-%m-%d %a 的 %H:%M， %%s 写道："
 
 # mail/mail-callbacks.c:1281 mail/message-browser.c:130
 # mail/mail-callbacks.c:1376 mail/message-browser.c:130
 # mail/mail-callbacks.c:1411 mail/message-browser.c:130
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1425 mail/message-browser.c:130
 msgid "Move message(s) to"
 msgstr "将消息移动到"
 
 # mail/mail-callbacks.c:1283 mail/message-browser.c:132
 # mail/mail-callbacks.c:1378 mail/message-browser.c:132
 # mail/mail-callbacks.c:1413 mail/message-browser.c:132
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1427 mail/message-browser.c:132
 msgid "Copy message(s) to"
 msgstr "将消息复制到"
 
 # mail/mail-callbacks.c:1759
 # mail/mail-callbacks.c:1878
 # mail/mail-callbacks.c:1914
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:1928
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "您确信您需要编辑所有的 %d 个消息？"
@@ -18399,7 +18241,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息？"
 # mail/mail-callbacks.c:1784
 # mail/mail-callbacks.c:1903
 # mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:1953
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -18410,7 +18252,7 @@ msgstr ""
 # mail/mail-callbacks.c:1823
 # mail/mail-callbacks.c:1942
 # mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:1992
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -18421,7 +18263,7 @@ msgstr ""
 # mail/mail-callbacks.c:1837
 # mail/mail-callbacks.c:1956
 # mail/mail-callbacks.c:1992
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2006
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "您确信您希望重新发送所有的 %d 个消息？"
@@ -18429,67 +18271,43 @@ msgstr "您确信您希望重新发送所有的 %d 个消息？"
 # mail/mail-callbacks.c:1863
 # mail/mail-callbacks.c:1982
 # mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2032
 msgid "No Message Selected"
 msgstr "没有选择消息"
 
-# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
-# mail/mail-display.c:102
-# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
-# mail/mail-display.c:102
-# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
-# mail/mail-display.c:101
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
-msgid "Overwrite file?"
-msgstr "覆盖文件？"
-
 # mail/mail-callbacks.c:1962
 # mail/mail-callbacks.c:2081
 # mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2131
 msgid "Save Message As..."
 msgstr "消息另存为..."
 
 # mail/mail-callbacks.c:1964
 # mail/mail-callbacks.c:2083
 # mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2133
 msgid "Save Messages As..."
 msgstr "消息另存为..."
 
-# ui/evolution-mail-message.xml.h:21
-# ui/evolution-mail-message.xml.h:21
-# ui/evolution-mail-message.xml.h:21
-#: mail/mail-callbacks.c:2366
-#, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "显示下一个未读文件"
-
-#: mail/mail-callbacks.c:2373
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-
 # mail/mail-callbacks.c:2135
 # mail/mail-callbacks.c:2254
 # mail/mail-callbacks.c:2290
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2304
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"该操作将永久删除所有标记为删除的所有消息。如果您继�"
-"�，您将无法恢复这些消息。\n"
+"该操作将永久删除所有标记为删除的所有消息。如果您继续，您将无法恢复这些消"
+"息。\n"
 "\n"
 "确实删除这些消息？"
 
 # mail/mail-callbacks.c:2250
 # mail/mail-callbacks.c:2369
 # mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2419
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -18501,14 +18319,14 @@ msgstr ""
 # mail/mail-callbacks.c:2262
 # mail/mail-callbacks.c:2381
 # mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2431
 msgid "Filters"
 msgstr "过滤规则"
 
 # camel/camel-filter-driver.c:789
 # camel/camel-filter-driver.c:838
 # mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2504
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
@@ -18516,27 +18334,27 @@ msgstr "第 %d 页，共 %d 页"
 # mail/mail-callbacks.c:2325
 # mail/mail-callbacks.c:2465
 # mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2556
 msgid "Print Message"
 msgstr "打印消息"
 
 # mail/mail-callbacks.c:2492
 # mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2583
 msgid "US-Letter"
 msgstr "美国信纸"
 
 # mail/mail-callbacks.c:2371
 # mail/mail-callbacks.c:2531
 # mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2618
 msgid "Printing of message failed"
 msgstr "打印消息失败"
 
 # mail/mail-callbacks.c:2473
 # mail/mail-callbacks.c:2697
 # mail/mail-callbacks.c:2770
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:2784
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息？"
@@ -18550,8 +18368,7 @@ msgid ""
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
-"请在下面输入您的名字和电子邮件地址。“可选”域可以�"
-"�填写，\n"
+"请在下面输入您的名字和电子邮件地址。“可选”域可以不填写，\n"
 "除非您希望在您发送的邮件中含有这些信息。"
 
 # mail/mail-config-druid.c:148
@@ -18563,8 +18380,7 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"请在下面输入您的接收邮件服务器的信息。如果您不能确�"
-"�，\n"
+"请在下面输入您的接收邮件服务器的信息。如果您不能确定，\n"
 "请询问您的系统管理员或互联网服务提供商。"
 
 # mail/mail-config-druid.c:150
@@ -18599,8 +18415,7 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"您基本上完成了邮件配置过程。身份标识、邮件接收服务�"
-"�和您提供\n"
+"您基本上完成了邮件配置过程。身份标识、邮件接收服务器和您提供\n"
 "的邮件发送传输方法将组合起来构成 Evolution 邮件帐号。\n"
 "请在下面输入该帐号的名称。\n"
 "该名称仅用于显示。"
@@ -18609,46 +18424,22 @@ msgstr ""
 # mail/mail-config-druid.c:599
 # mail/mail-config-druid.c:599
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帐号助手"
 
-# my-evolution/Locations.h:508
-#. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
-#, fuzzy
-msgid "Work"
-msgstr "科克"
-
-# my-evolution/Locations.h:1795
-#. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
-#, fuzzy
-msgid "Personal"
-msgstr "波纳尔"
-
-# addressbook/gui/contact-editor/fulladdr.glade.h:209
-# addressbook/gui/contact-editor/fulladdr.glade.h:209
-# addressbook/gui/contact-editor/e-contact-editor-address.c:335
-#. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
-#, fuzzy
-msgid "To Do"
-msgstr "多哥"
-
-# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
-# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
-# calendar/gui/dialogs/alarm-page.glade.h:11
-#. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "之后"
+# mail/mail-config.c:326
+# mail/mail-config.c:329
+# mail/mail-config.c:354
+#: mail/mail-config.c:354
+#, c-format
+msgid "Account %d"
+msgstr "帐号 %d"
 
 # mail/mail-config.c:1860
 # mail/mail-config.c:1902
 # mail/mail-config.c:1995
-#: mail/mail-config.c:2458
+#: mail/mail-config.c:1995
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -18659,263 +18450,174 @@ msgstr ""
 "%s\n"
 "没有创建快捷方式。"
 
+# mail/mail-config.c:1871
+# mail/mail-config.c:1913
+# mail/mail-config.c:2006
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:2006
+#, c-format
+msgid "%s: Inbox"
+msgstr "%s：收件箱"
+
 # mail/mail-config.c:2113
 # mail/mail-config.c:2155
 # mail/mail-config.c:2248
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2248
 msgid "Checking Service"
 msgstr "正在检查服务"
 
 # mail/mail-config.c:2184 mail/mail-config.c:2188
 # mail/mail-config.c:2233 mail/mail-config.c:2237
 # mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2326 mail/mail-config.c:2330
 msgid "Connecting to server..."
 msgstr "正在连接服务器..."
 
-# addressbook/gui/component/select-names/e-select-names-popup.c:506
-# addressbook/gui/component/select-names/e-select-names-popup.c:506
-# addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "未命名的联系人"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
-# mail/folder-browser.c:734 mail/folder-browser.c:739
-# mail/folder-browser.c:761
-# mail/folder-browser.c:754 mail/folder-browser.c:762
-# mail/folder-browser.c:765
-# mail/folder-browser.c:755 mail/folder-browser.c:763
-# mail/folder-browser.c:766
-#: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr "， "
-
-# addressbook/gui/component/addressbook-config.glade.h:25
-# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
-# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-# ui/evolution-message-composer.xml.h:47
-# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:16
-# addressbook/gui/component/addressbook-config.glade.h:25
-# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
-# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-# ui/evolution-message-composer.xml.h:47
-# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:16
-# addressbook/gui/component/addressbook-config.glade.h:34
-# ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
-# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-# ui/evolution-message-composer.xml.h:47
-# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:19
-#: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "编辑(_E)"
-
-# widgets/misc/e-charset-picker.c:101
-# widgets/misc/e-charset-picker.c:101
-# shell/e-shell-user-creatable-items-handler.c:495
-# shell/e-shell-user-creatable-items-handler.c:540
-# widgets/misc/e-charset-picker.c:104
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "新建"
-
 # mail/mail-config.glade.h:1
 # mail/mail-config.glade.h:1
 # mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:1
 msgid " _Check for supported types "
 msgstr "检查支持的类型(_C) "
 
+# mail/mail-config.glade.h:2
+# mail/mail-config.glade.h:2
+# mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:2
+msgid " color"
+msgstr " 颜色"
+
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(在该版本的 evolution 中不支持SSL)"
 
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(在该版本的 evolution 中不支持SSL)"
 
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
 # mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "当发送加密邮件时总是对自身加密(_L)"
 
-# mail/mail-config.c:326
-# mail/mail-config.c:329
-# mail/mail-config.c:354
-#: mail/mail-config.glade.h:8
-#, fuzzy
-msgid "Account Editor"
-msgstr "帐号 %d"
+# mail/mail-config.glade.h:5
+# mail/mail-config.glade.h:5
+# mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
+msgid "Account"
+msgstr "帐号"
 
 # mail/mail-config.glade.h:6
 # mail/mail-config.glade.h:6
 # mail/mail-config.glade.h:6
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Account Information"
 msgstr "帐号信息"
 
 # mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 # mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 # mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "帐号管理"
 
-# shell/e-activity-handler.c:202
-# shell/e-activity-handler.c:202
-# shell/e-activity-handler.c:202
-#: mail/mail-config.glade.h:11
-#, fuzzy
-msgid "Advanced Options"
-msgstr "取消操作"
-
-# calendar/zones.h:35
-# my-evolution/Locations.h:123
-#: mail/mail-config.glade.h:12
-#, fuzzy
-msgid "Afrikaans"
-msgstr "阿肯色州"
-
-# mail/mail-config.glade.h:4
-# mail/mail-config.glade.h:4
-# mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:13
-#, fuzzy
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "当发送加密邮件时总是对自身加密(_L)"
-
-# addressbook/gui/contact-editor/fulladdr.glade.h:4
-# addressbook/gui/contact-editor/fulladdr.glade.h:4
-# my-evolution/Locations.h:45
-#: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "Alerts"
-msgstr "阿尔伯达"
-
-# mail/mail-config.glade.h:10
-# mail/mail-config.glade.h:10
-# mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:15
-#, fuzzy
-msgid "Alwa_ys sign outgoing messages when using this account"
-msgstr "当使用该帐号的时候总是签名发送的邮件(_S)"
+# mail/mail-config.glade.h:8
+# mail/mail-config.glade.h:8
+# mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Accounts"
+msgstr "帐号"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:10
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:11
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-# addressbook/gui/contact-editor/fulladdr.glade.h:15
-# addressbook/gui/contact-editor/fulladdr.glade.h:15
-# my-evolution/Locations.h:121
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "阿里卡"
+# mail/mail-config.glade.h:9
+# mail/mail-config.glade.h:9
+# mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:12
+msgid "Always _encrypt to myself when sending encrypted mail"
+msgstr "当发送加密邮件时总是加密到自身(_E)"
 
-# composer/e-msg-composer-attachment-bar.c:532
-# composer/e-msg-composer-attachment-bar.c:538
-# composer/e-msg-composer-attachment-bar.c:538
-#: mail/mail-config.glade.h:20
-#, fuzzy
-msgid "Attach original message"
-msgstr "把文件附件到邮件"
+# mail/mail-config.glade.h:10
+# mail/mail-config.glade.h:10
+# mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:13
+msgid "Always _sign outgoing messages when using this account"
+msgstr "当使用该帐号的时候总是签名发送的邮件(_S)"
 
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
 # mail/mail-config.glade.h:12
 # mail/mail-config.glade.h:12
 # mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:15
 msgid "Authentication"
 msgstr "身份验证"
 
-# mail/mail-config.glade.h:94
-# mail/mail-config.glade.h:94
-# mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:23
-#, fuzzy
-msgid "Automatically _detect links"
-msgstr "自动检查新邮件(_A)"
-
-#: mail/mail-config.glade.h:24
-msgid "Baltic (ISO-8859-13)"
-msgstr ""
-
-#: mail/mail-config.glade.h:25
-msgid "Baltic (ISO-8859-4)"
-msgstr ""
-
-# widgets/misc/e-charset-picker.c:159
-# widgets/misc/e-charset-picker.c:159
-# widgets/misc/e-charset-picker.c:162
-#: mail/mail-config.glade.h:26
-#, fuzzy
-msgid "C_haracter set:"
-msgstr "未知的字符集：%s"
-
-# calendar/gui/alarm-notify/alarm-notify.glade.h:1
-# ui/evolution-comp-editor.xml.h:1
-# calendar/gui/alarm-notify/alarm-notify.glade.h:1
-# ui/evolution-comp-editor.xml.h:1
-# calendar/gui/alarm-notify/alarm-notify.glade.h:1
-# ui/evolution-comp-editor.xml.h:1
-#: mail/mail-config.glade.h:27
-#, fuzzy
-msgid "C_olors"
-msgstr "关闭(_L)"
+# mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
+msgid "Beep when new mail arrives"
+msgstr "新邮件到达时鸣笛"
 
 # mail/mail-config.glade.h:13
 # mail/mail-config.glade.h:13
 # mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:17
 msgid "Checking for New Mail"
 msgstr "正在检查新邮件"
 
+# mail/mail-config.glade.h:14
+# mail/mail-config.glade.h:14
+# mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
+msgid "Composer"
+msgstr "撰写器"
+
 # composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
 # composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
 # mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:19
 msgid "Composing Messages"
 msgstr "正在撰写邮件"
 
 # mail/mail-config.glade.h:15
 # mail/mail-config.glade.h:15
 # mail/mail-config.glade.h:19
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:20
 msgid "Configuration"
 msgstr "配置"
 
+# mail/mail-config.glade.h:16
+# mail/mail-config.glade.h:16
+# mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:21
+msgid "Confirm when Expunging a folder"
+msgstr "当删除文件夹时进行提示"
+
 # mail/mail-config.glade.h:17
 # mail/mail-config.glade.h:17
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:22
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -18931,580 +18633,431 @@ msgstr ""
 "\n"
 "点击“完成”以便保存您的设置。"
 
-# addressbook/gui/contact-editor/fulladdr.glade.h:18
-# addressbook/gui/contact-editor/fulladdr.glade.h:18
-# my-evolution/Locations.h:181
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "巴里"
-
 # mail/mail-config.glade.h:23
 # mail/mail-config.glade.h:23
 # mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:28
 msgid "De_fault"
 msgstr "默认(_F)"
 
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/folder-browser.h:26
-#: mail/mail-config.glade.h:39
-#, fuzzy
-msgid "Default Behavior"
-msgstr "默认"
+# mail/mail-config.glade.h:24
+# mail/mail-config.glade.h:24
+# mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Default Forward style is: "
+msgstr "默认转发风格为： "
 
 # mail/mail-config.glade.h:25
 # mail/mail-config.glade.h:25
 # mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:40
-#, fuzzy
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:30
+msgid "Default character encoding: "
 msgstr "默认字符编码： "
 
-# mail/mail-ops.c:249
-# mail/mail-ops.c:250
-# mail/mail-ops.c:258
-#: mail/mail-config.glade.h:41
-#, fuzzy
-msgid "Deleting Mail"
-msgstr "正在收取邮件"
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
+msgid "Defaults"
+msgstr "默认"
 
 # mail/mail-config.glade.h:27
 # mail/mail-config.glade.h:27
 # mail/mail-config.glade.h:32
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:33
 msgid "Digital IDs..."
 msgstr "数字标识..."
 
-# camel/camel-filter-driver.c:692
-# camel/camel-filter-driver.c:741
-# camel/camel-filter-driver.c:893
-#: mail/mail-config.glade.h:44
-#, fuzzy
-msgid "Do not quote original message"
-msgstr "无法打开消息"
+# mail/mail-config.glade.h:28
+# mail/mail-config.glade.h:28
+# mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
+msgid "Display"
+msgstr "显示"
+
+# mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
+msgid "Do not notify me when new mail arrives"
+msgstr "新邮件到达时不要提醒我"
 
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "完成"
 
-# mail/mail-config.glade.h:97
-# mail/mail-config.glade.h:97
-# mail/mail-config.glade.h:106
-#: mail/mail-config.glade.h:46
-#, fuzzy
-msgid "Drafts _folder:"
-msgstr "草稿文件夹(_D)："
+# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
+# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
+# mail/mail-config.glade.h:36 shell/e-local-storage.c:173
+#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
+msgid "Drafts"
+msgstr "草稿"
 
 # mail/mail-config.glade.h:31
 # mail/mail-config.glade.h:31
 # mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:38
 msgid "E_nable"
 msgstr "启用(_N)"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
-# my-evolution/metar.c:65
-# my-evolution/metar.c:65
-# my-evolution/metar.c:65
-#: mail/mail-config.glade.h:49
-#, fuzzy
-msgid "Emacs"
-msgstr "东"
-
-# addressbook/gui/component/addressbook.c:805
-# addressbook/gui/component/addressbook.c:805
-# addressbook/gui/component/addressbook.c:838
-#: mail/mail-config.glade.h:50
-#, fuzzy
-msgid "Email Accounts"
-msgstr "电子邮件含有"
-
-# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:99
-# addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:51
-#, fuzzy
-msgid "Email _address:"
-msgstr "电子邮件地址(_E)："
+# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:103
+# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+# widgets/misc/e-filter-bar.h:103
+# mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:96
+# widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "编辑..."
 
-# mail/mail-config.glade.h:100
-# mail/mail-config.glade.h:100
-# mail/mail-config.glade.h:109
-#: mail/mail-config.glade.h:52
-#, fuzzy
-msgid "Empty _trash folders on exit"
-msgstr "退出时清空已删除邮件(_E)"
+# mail/mail-config.glade.h:33
+# mail/mail-config.glade.h:33
+# mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
+msgid "Enabled"
+msgstr "已启用"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:41
 msgid "Execute Command..."
 msgstr "执行命令..."
 
-#: mail/mail-config.glade.h:54
-#, fuzzy
-msgid "Fi_xed -width:"
-msgstr "以之结束"
-
-# mail/folder-browser-ui.c:274
-# mail/folder-browser-ui.c:274
-# mail/folder-browser-ui.c:275
-#: mail/mail-config.glade.h:55
-#, fuzzy
-msgid "Font Properties"
-msgstr "属性"
-
-# mail/mail-ops.c:1191
-# mail/mail-ops.c:1193
-# mail/mail-ops.c:1236
-#: mail/mail-config.glade.h:56
-#, fuzzy
-msgid "Format messages in _HTML"
-msgstr "已转发邮件"
-
 # mail/mail-config.glade.h:34
 # mail/mail-config.glade.h:34
 # mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:42
 msgid "Get Digital ID..."
 msgstr "获取数字标识..."
 
-# mail/mail-config.glade.h:103
-# mail/mail-config.glade.h:103
-# mail/mail-config.glade.h:112
-#: mail/mail-config.glade.h:58
-#, fuzzy
-msgid "Highlight _quotations with"
-msgstr "突出显示引文，使用(_H)"
-
-# calendar/zones.h:358
-# my-evolution/Locations.h:948
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "火奴鲁鲁"
+# mail/mail-config.glade.h:35
+# mail/mail-config.glade.h:35
+# mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
+msgid "HTML signature file:"
+msgstr "HTML 签名文件："
 
 # mail/mail-config.glade.h:36
 # mail/mail-config.glade.h:36
 # mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:44
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "标识"
 
+# mail/mail-config.glade.h:38
+# mail/mail-config.glade.h:38
+# mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
+msgid "In HTML mail"
+msgstr "在 HTML 邮件中"
+
 # mail/mail-config.glade.h:39
 # mail/mail-config.glade.h:39
 # mail/mail-config.glade.h:46
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:47
 msgid "Inline"
 msgstr "嵌入"
 
 # mail/mail-config.glade.h:40
 # mail/mail-config.glade.h:40
 # mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:48
 msgid "Kerberos "
 msgstr "Kerberos"
 
-# ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
-# ui/evolution-contact-list-editor.xml.h:6
-# ui/evolution-signature-editor.xml.h:4
-# ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
-# ui/evolution-contact-list-editor.xml.h:6
-# ui/evolution-signature-editor.xml.h:4
-# ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
-# ui/evolution-contact-list-editor.xml.h:6
-# ui/evolution-signature-editor.xml.h:4
-#: mail/mail-config.glade.h:65
-#, fuzzy
-msgid "Labels and Colors"
-msgstr "保存并关闭"
-
-# ui/evolution-mail-message.xml.h:42
-# ui/evolution-mail-message.xml.h:42
-# ui/evolution-mail-message.xml.h:42
-#: mail/mail-config.glade.h:67
-#, fuzzy
-msgid "Loading Images"
-msgstr "装入图像(_I)"
-
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:48
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:49
 msgid "Mail Configuration"
 msgstr "邮件配置"
 
 # mail/mail-config.glade.h:43
 # mail/mail-config.glade.h:43
 # mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:51
 msgid "Mailbox location"
 msgstr "邮件箱位置"
 
-#: mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Message Composer"
-msgstr "邮件头"
-
-# ui/evolution-mail-message.xml.h:99
-# ui/evolution-mail-message.xml.h:99
-# ui/evolution-mail-message.xml.h:101
-#: mail/mail-config.glade.h:73
-#, fuzzy
-msgid "Message Display"
-msgstr "邮件显示(_M)"
-
-# addressbook/gui/contact-editor/fulladdr.glade.h:138
-# addressbook/gui/contact-editor/fulladdr.glade.h:138
-# addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: mail/mail-config.glade.h:74
-#, fuzzy
-msgid "Microsoft"
-msgstr "密克罗尼西亚"
+# mail/mail-config.glade.h:44
+# mail/mail-config.glade.h:44
+# mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
+msgid "Make this my _default account"
+msgstr "设置为我的默认帐号(_D)"
 
 # mail/mail-config.glade.h:45
 # mail/mail-config.glade.h:45
 # mail/mail-config.glade.h:52
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:53
 msgid "NNTP Server:"
 msgstr "NNTP 服务器："
 
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:53
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:54
 msgid "New Mail Notification"
 msgstr "新邮件提醒"
 
-# my-evolution/my-evolution.glade.h:28
-# my-evolution/my-evolution.glade.h:28
-# my-evolution/my-evolution.glade.h:28
-#: mail/mail-config.glade.h:78
-#, fuzzy
-msgid "News Servers"
-msgstr "新闻来源(_N)"
-
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr ""
+# mail/mail-config.glade.h:46
+# mail/mail-config.glade.h:46
+# mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "News"
+msgstr "新闻"
 
 # mail/mail-config.glade.h:48
 # mail/mail-config.glade.h:48
 # mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:57
 msgid "Optional Information"
 msgstr "可选的信息"
 
-# addressbook/gui/contact-editor/contact-editor.glade.h:23
-# addressbook/gui/contact-editor/contact-editor.glade.h:23
-# addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:82
-#, fuzzy
-msgid "Or_ganization:"
-msgstr "组织(_Z)："
-
 # mail/mail-config.glade.h:50
 # mail/mail-config.glade.h:50
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:59
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 键标识(_K)："
 
 # mail/mail-config.glade.h:53
 # mail/mail-config.glade.h:53
 # mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:62
 msgid "Pick a color"
 msgstr "选取一个颜色"
 
-# mail/mail-config.glade.h:57
-# mail/mail-config.glade.h:57
-# mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "在发送只给出了暗送收件人时进行提示(_B)"
+# mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
+msgid "Play sound file when new mail arrives"
+msgstr "新邮件到达时播放声音文件"
 
 # mail/mail-config.glade.h:54
 # mail/mail-config.glade.h:54
 # mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:64
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-# ui/evolution-addressbook.xml.h:18
-# ui/evolution-addressbook.xml.h:18
-# ui/evolution-addressbook.xml.h:18
-#: mail/mail-config.glade.h:90
-#, fuzzy
-msgid "Printed Fonts"
-msgstr "打印选中的联系人"
+# mail/mail-config.glade.h:55
+# mail/mail-config.glade.h:55
+# mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
+msgid "Prompt when sending HTML messages to contacts that don't want them"
+msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候进行提示"
+
+# mail/mail-config.glade.h:56
+# mail/mail-config.glade.h:56
+# mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
+msgid "Prompt when sending messages with an _empty subject"
+msgstr "在发送空标题的消息时进行提示(_E)"
+
+# mail/mail-config.glade.h:57
+# mail/mail-config.glade.h:57
+# mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
+msgid "Prompt when sending messages with only _Bcc recipients defined"
+msgstr "在发送只给出了暗送收件人时进行提示(_B)"
 
 # mail/mail-config.glade.h:58
 # mail/mail-config.glade.h:58
 # mail/mail-config.glade.h:67
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:68
 msgid "Qmail maildir "
 msgstr "Qmail 邮件目录"
 
-# camel/camel-filter-driver.c:692
-# camel/camel-filter-driver.c:741
-# camel/camel-filter-driver.c:893
-#: mail/mail-config.glade.h:92
-#, fuzzy
-msgid "Quote original message"
-msgstr "无法打开消息"
-
 # mail/mail-config.glade.h:59
 # mail/mail-config.glade.h:59
 # mail/mail-config.glade.h:68
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:69
 msgid "Quoted"
 msgstr "已引用"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 # mail/mail-config.glade.h:60
 # mail/mail-config.glade.h:60
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:70
 msgid "Re_member this password"
 msgstr "记住该密码(_M)"
 
-# composer/e-msg-composer-hdrs.c:364
-# composer/e-msg-composer-hdrs.c:364
-# composer/e-msg-composer-hdrs.c:362
-#: mail/mail-config.glade.h:97
-#, fuzzy
-msgid "Re_ply-To:"
-msgstr "回复到："
-
 # mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 # mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "正在接收电子邮件"
 
+# mail/mail-config.glade.h:62
+# mail/mail-config.glade.h:62
+# mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
+msgid "Receiving Mail"
+msgstr "正在接收邮件"
+
 # mail/mail-config.glade.h:63
 # mail/mail-config.glade.h:63
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:99
-#, fuzzy
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:73
+msgid "Receiving Options"
 msgstr "接收中选项"
 
-# e-util/e-passwords.c:360 mail/mail-session.c:267
-# e-util/e-passwords.c:360 mail/mail-session.c:267
-# e-util/e-passwords.c:360 mail/mail-session.c:269
-#: mail/mail-config.glade.h:100
-#, fuzzy
-msgid "Remember this _password"
-msgstr "记住该密码"
-
 # mail/mail-config.glade.h:64
 # mail/mail-config.glade.h:64
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:74
 msgid "Required Information"
 msgstr "必需的信息"
 
-# mail/mail-config.glade.h:67
-# mail/mail-config.glade.h:67
-# mail/mail-config.glade.h:76
-#: mail/mail-config.glade.h:103
-#, fuzzy
-msgid "S_ecurity"
-msgstr "安全"
-
-# my-evolution/metar.c:137
-# my-evolution/metar.c:137
-# my-evolution/Locations.h:2115
-#: mail/mail-config.glade.h:104
-#, fuzzy
-msgid "Same as text"
-msgstr "骤雨"
-
 # mail/mail-config.glade.h:66
 # mail/mail-config.glade.h:66
 # mail/mail-config.glade.h:75
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:76
 msgid "Secure MIME (S/MIME)"
 msgstr "安全 MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:106
-msgid "Select HTML fixed width font"
-msgstr ""
-
-#: mail/mail-config.glade.h:107
-msgid "Select HTML fixed width font for printing"
-msgstr ""
-
-#: mail/mail-config.glade.h:108
-msgid "Select HTML variable width font"
-msgstr ""
+# mail/mail-config.glade.h:67
+# mail/mail-config.glade.h:67
+# mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
+msgid "Security"
+msgstr "安全"
 
-#: mail/mail-config.glade.h:109
-msgid "Select HTML variable width font for printing"
-msgstr ""
+# mail/mail-config.glade.h:68
+# mail/mail-config.glade.h:68
+# mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
+msgid "Select Filter Log file..."
+msgstr "选择过滤日志文件..."
 
 # mail/mail-config.glade.h:69
 # mail/mail-config.glade.h:69
 # mail/mail-config.glade.h:78
-#: mail/mail-config.glade.h:110
-#, fuzzy
-msgid "Select PGP program"
+#: mail/mail-config.glade.h:79
+msgid "Select PGP binary"
 msgstr "选择 PGP 二进制数"
 
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "签名文件："
-
-# ui/evolution-message-composer.xml.h:5
-# ui/evolution-message-composer.xml.h:5
-# ui/evolution-message-composer.xml.h:5
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "删除签名以外的所有内容"
-
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 # mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "正在发送电子邮件"
 
+# mail/mail-config.glade.h:71
+# mail/mail-config.glade.h:71
+# mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
+msgid "Sending Mail"
+msgstr "正在发送邮件"
+
+# mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+# shell/e-local-storage.c:176
+# mail/mail-config.glade.h:73 mail/message-list.etspec.h:7
+# shell/e-local-storage.c:176
+# mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
+# shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:7
+#: shell/e-local-storage.c:176
+msgid "Sent"
+msgstr "已发送"
+
 # mail/mail-config.glade.h:74
 # mail/mail-config.glade.h:74
 # mail/mail-config.glade.h:83
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:84
 msgid "Sent _messages folder:"
 msgstr "发送邮件文件夹(_M)："
 
 # mail/mail-config.glade.h:75
 # mail/mail-config.glade.h:75
 # mail/mail-config.glade.h:84
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:85
 msgid "Sent and Draft Messages"
 msgstr "已发送和草稿邮件"
 
 # mail/mail-config.glade.h:76
 # mail/mail-config.glade.h:76
 # mail/mail-config.glade.h:85
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:86
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
 # mail/mail-config.glade.h:77
 # mail/mail-config.glade.h:77
 # mail/mail-config.glade.h:86
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:87
 msgid "Server Configuration"
 msgstr "服务器配置"
 
 # mail/mail-config.glade.h:78
 # mail/mail-config.glade.h:78
 # mail/mail-config.glade.h:87
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:88
 msgid "Server _Type: "
 msgstr "服务器类型(_T)："
 
-# shell/e-shortcuts.c:1043
-# shell/e-shortcuts.c:1043
-# shell/e-shortcuts.c:1043
-#: mail/mail-config.glade.h:120
-#, fuzzy
-msgid "Shortcuts _type:"
-msgstr "快捷方式"
-
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1036
-#: mail/mail-config.glade.h:121
-#, fuzzy
-msgid "Signature"
-msgstr "保存签名"
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
+msgid "Signature file:"
+msgstr "签名文件："
 
 # mail/mail-config.glade.h:80
 # mail/mail-config.glade.h:80
 # mail/mail-config.glade.h:89
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:90
 msgid "Source"
 msgstr "来源"
 
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:90
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:91
 msgid "Source Information"
 msgstr "来源信息"
 
+# mail/mail-config.glade.h:82
+# mail/mail-config.glade.h:82
+# mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
+msgid "Sources"
+msgstr "来源"
+
 # addressbook/printing/e-contact-print.glade.h:38
 # addressbook/printing/e-contact-print.glade.h:38
 # mail/mail-config.glade.h:92
-#: mail/mail-config.glade.h:124
-#, fuzzy
-msgid "Specify _filename:"
+#: mail/mail-config.glade.h:93
+msgid "Specify filename:"
 msgstr "指定文件名："
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
-msgstr ""
-
 # mail/mail-config.glade.h:84
 # mail/mail-config.glade.h:84
 # mail/mail-config.glade.h:93
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:94
 msgid "Standard Unix mbox"
 msgstr "标准 Unix mbox"
 
-#: mail/mail-config.glade.h:128
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-
-# mail/mail-config.glade.h:102
-# mail/mail-config.glade.h:102
-# mail/mail-config.glade.h:111
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "HTML 签名(_H)："
-
-# my-evolution/metar.c:63
-# my-evolution/metar.c:63
-# my-evolution/metar.c:63
-#: mail/mail-config.glade.h:132
-#, fuzzy
-msgid "V_ariable-width:"
-msgstr "不定风"
+# mail/mail-config.glade.h:86
+# mail/mail-config.glade.h:86
+# mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
+msgid "Use s_ecure connection (SSL)"
+msgstr "使用安全连接 (SSL)"
 
 # mail/mail-config.glade.h:87
 # mail/mail-config.glade.h:87
 # mail/mail-config.glade.h:96
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:97
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -19514,351 +19067,216 @@ msgstr ""
 "\n"
 "点击 “下一步” 以便开始。"
 
-# my-evolution/metar.c:65
-# my-evolution/metar.c:65
-# my-evolution/metar.c:65
-#: mail/mail-config.glade.h:138
-#, fuzzy
-msgid "XEmacs"
-msgstr "东"
-
 # mail/mail-config.glade.h:91
 # mail/mail-config.glade.h:91
 # mail/mail-config.glade.h:100
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:101
 msgid "_Always load images off the net"
 msgstr "总是离线装入图像(_A)"
 
 # mail/mail-config.glade.h:92
 # mail/mail-config.glade.h:92
 # mail/mail-config.glade.h:101
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:102
 msgid "_Always sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名邮件(_A)"
 
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:103
 msgid "_Authentication Type: "
 msgstr "验证类型(_A)："
 
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:104
 msgid "_Authentication type: "
 msgstr "验证类型(_A)："
 
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:105
 msgid "_Automatically check for new mail"
 msgstr "自动检查新邮件(_A)"
 
-# mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:145
-#, fuzzy
-msgid "_Beep when new mail arrives"
-msgstr "新邮件到达时鸣笛"
-
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:104
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:106
 msgid "_Certificate ID:"
 msgstr "证书 ID(_C)："
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-# mail/mail-config.glade.h:16
-# mail/mail-config.glade.h:16
-# mail/mail-config.glade.h:20
-#: mail/mail-config.glade.h:148
-#, fuzzy
-msgid "_Confirm when expunging a folder"
-msgstr "当删除文件夹时进行提示"
-
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:149
-#, fuzzy
-msgid "_Defaults"
-msgstr "默认"
-
-# mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:151
-#, fuzzy
-msgid "_Do not notify me when new mail arrives"
-msgstr "新邮件到达时不要提醒我"
-
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-# shell/e-shell-importer.c:612
-# shell/e-shell-importer.c:612
-# shell/e-shell-importer.c:623
-#: mail/mail-config.glade.h:154
-#, fuzzy
-msgid "_Filename:"
-msgstr "文件名："
-
-#: mail/mail-config.glade.h:155
-msgid "_Fixed-width:"
-msgstr ""
+# mail/mail-config.glade.h:97
+# mail/mail-config.glade.h:97
+# mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
+msgid "_Drafts folder:"
+msgstr "草稿文件夹(_D)："
 
-# ui/evolution-mail-message.xml.h:32
-# ui/evolution-mail-message.xml.h:32
-# ui/evolution-mail-message.xml.h:32
-#: mail/mail-config.glade.h:156
-#, fuzzy
-msgid "_Forward style:"
-msgstr "转发方式"
+# mail/mail-config.glade.h:100
+# mail/mail-config.glade.h:100
+# mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
+msgid "_Empty trash folders on exit"
+msgstr "退出时清空已删除邮件(_E)"
 
 # mail/mail-config.glade.h:101
 # mail/mail-config.glade.h:101
 # mail/mail-config.glade.h:110
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:112
 msgid "_Full name:"
 msgstr "全名(_F)："
 
-# mail/mail-config.glade.h:38
-# mail/mail-config.glade.h:38
-# mail/mail-config.glade.h:45
-#: mail/mail-config.glade.h:159
-#, fuzzy
-msgid "_HTML Mail"
-msgstr "在 HTML 邮件中"
-
 # mail/mail-config.glade.h:102
 # mail/mail-config.glade.h:102
 # mail/mail-config.glade.h:111
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_HTML Signature:"
+#: mail/mail-config.glade.h:113
+msgid "_HTML signature:"
 msgstr "HTML 签名(_H)："
 
-# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
-# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
-# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:162
-#, fuzzy
-msgid "_Identity"
-msgstr "标识"
+# mail/mail-config.glade.h:103
+# mail/mail-config.glade.h:103
+# mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
+msgid "_Highlight citations with"
+msgstr "突出显示引文，使用(_H)"
 
-# calendar/gui/dialogs/meeting-page.etspec.h:6
-# calendar/gui/e-meeting-time-sel.etspec.h:6
-# calendar/gui/dialogs/meeting-page.etspec.h:6
-# calendar/gui/e-meeting-time-sel.etspec.h:6
-# calendar/gui/dialogs/meeting-page.etspec.h:6
-# calendar/gui/e-meeting-time-sel.etspec.h:6
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "语言"
+# mail/mail-config.glade.h:104
+# mail/mail-config.glade.h:104
+# mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:115
+msgid "_Host:"
+msgstr "主机(_H)："
 
 # mail/mail-config.glade.h:105
 # mail/mail-config.glade.h:105
 # mail/mail-config.glade.h:114
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:116
 msgid "_Load images if sender is in addressbook"
 msgstr "如果发件人在地址簿中就装入图像(_L)"
 
-# mail/mail-config.glade.h:44
-# mail/mail-config.glade.h:44
-# mail/mail-config.glade.h:51
-#: mail/mail-config.glade.h:165
-#, fuzzy
-msgid "_Make this my default account"
-msgstr "设置为我的默认帐号(_D)"
+# mail/mail-config.glade.h:106
+# mail/mail-config.glade.h:106
+# mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
+msgid "_Log filter actions to:"
+msgstr "将过滤动作记录到(_L)："
 
 # mail/mail-config.glade.h:107
 # mail/mail-config.glade.h:107
 # mail/mail-config.glade.h:116
-#: mail/mail-config.glade.h:166
-#, fuzzy
-msgid "_Mark messages as read after"
+#: mail/mail-config.glade.h:118
+msgid "_Mark messages as Read after"
 msgstr "阅读时将邮件标记为已读，延时(_M)"
 
 # mail/mail-config.glade.h:108
 # mail/mail-config.glade.h:108
 # mail/mail-config.glade.h:117
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:119
 msgid "_Name:"
 msgstr "名称(_N)："
 
 # mail/mail-config.glade.h:109
 # mail/mail-config.glade.h:109
 # mail/mail-config.glade.h:118
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:120
 msgid "_Never load images off the net"
 msgstr "从不装入图像"
 
+# mail/mail-config.glade.h:110
+# mail/mail-config.glade.h:110
+# mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:121
+msgid "_Organization:"
+msgstr "组织(_O)："
+
 # mail/mail-config.glade.h:111
 # mail/mail-config.glade.h:111
 # mail/mail-config.glade.h:120
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:122
 msgid "_PGP binary path:"
 msgstr "PGP 二进制路径(_P)："
 
-# mail/mail-config.glade.h:62
-#: mail/mail-config.glade.h:171
-#, fuzzy
-msgid "_Play sound file when new mail arrives"
-msgstr "新邮件到达时播放声音文件"
-
-# mail/mail-config.glade.h:55
-# mail/mail-config.glade.h:55
-# mail/mail-config.glade.h:64
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-"在往不希望接收 HTML 消息的联系人发送 HTML "
-"消息的时候进行提示"
-
-# mail/mail-config.glade.h:56
-# mail/mail-config.glade.h:56
-# mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:173
-#, fuzzy
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr "在发送空标题的消息时进行提示(_E)"
-
-# addressbook/backend/ebook/e-card-simple.c:82
-# addressbook/gui/contact-editor/e-contact-editor.c:1660
-# addressbook/gui/widgets/e-addressbook-view.c:871
-# addressbook/backend/ebook/e-card-simple.c:82
-# addressbook/gui/contact-editor/e-contact-editor.c:1660
-# addressbook/gui/widgets/e-addressbook-view.c:871
-# addressbook/backend/ebook/e-card-simple.c:82
-# addressbook/gui/contact-editor/e-contact-editor.c:1660
-# addressbook/gui/widgets/e-addressbook-view.c:982
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "收音机"
-
-# mail/mail-config.glade.h:62
-# mail/mail-config.glade.h:62
-# mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:175
-#, fuzzy
-msgid "_Receiving Mail"
-msgstr "正在接收邮件"
-
-# ui/evolution-mail-message.xml.h:71
-# ui/evolution-mail-message.xml.h:71
-# ui/evolution-mail-message.xml.h:73
-#: mail/mail-config.glade.h:176
-#, fuzzy
-msgid "_Reply style:"
-msgstr "全部回复"
-
-#: mail/mail-config.glade.h:177
-msgid "_Restore defaults"
-msgstr ""
-
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:178
-#, fuzzy
-msgid "_Script:"
-msgstr "安全(_S)"
+# mail/mail-config.glade.h:112
+# mail/mail-config.glade.h:112
+# mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:123
+msgid "_Path:"
+msgstr "路径(_P)："
 
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "安全(_S)"
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:124
+msgid "_Remember this password"
+msgstr "记住该密码(_R)"
 
-# mail/mail-config.glade.h:71
-# mail/mail-config.glade.h:71
-# mail/mail-config.glade.h:80
-#: mail/mail-config.glade.h:180
-#, fuzzy
-msgid "_Sending Mail"
-msgstr "正在发送邮件"
+# mail/mail-config.glade.h:114
+# mail/mail-config.glade.h:114
+# mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:125
+msgid "_Send mail in HTML format by default."
+msgstr "默认按 HTML 格式发送邮件。(_S)"
 
-# calendar/gui/dialogs/event-page.glade.h:11
-# calendar/gui/e-calendar-table.etspec.h:13
-# calendar/gui/dialogs/event-page.glade.h:11
-# calendar/gui/e-calendar-table.etspec.h:13
-# calendar/gui/dialogs/event-page.glade.h:11
-# calendar/gui/e-calendar-table.etspec.h:13
-#: mail/mail-config.glade.h:181
-#, fuzzy
-msgid "_Show animated images"
-msgstr "按其显示时间"
+# mail/mail-config.glade.h:115
+# mail/mail-config.glade.h:115
+# mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "_Server type: "
+msgstr "服务器类型(_S)："
 
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:182
-#, fuzzy
-msgid "_Signatures"
+#: mail/mail-config.glade.h:127
+msgid "_Signature file:"
 msgstr "签名文件(_S)："
 
-# mail/mail-config.glade.h:102
-# mail/mail-config.glade.h:102
-# mail/mail-config.glade.h:111
-#: mail/mail-config.glade.h:183
-#, fuzzy
-msgid "_Text Signature:"
-msgstr "HTML 签名(_H)："
-
-# mail/mail-config.glade.h:86
-# mail/mail-config.glade.h:86
-# mail/mail-config.glade.h:95
-#: mail/mail-config.glade.h:184
-#, fuzzy
-msgid "_Use secure connection (SSL):"
-msgstr "使用安全连接 (SSL)"
-
-# my-evolution/metar.c:63
-# my-evolution/metar.c:63
-# my-evolution/metar.c:63
-#: mail/mail-config.glade.h:185
-#, fuzzy
-msgid "_Variable-width:"
-msgstr "不定风"
+# mail/mail-config.glade.h:117
+# mail/mail-config.glade.h:117
+# mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:128
+msgid "_Username:"
+msgstr "用户名(_U)："
 
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:127
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:129
 msgid "_every"
 msgstr "每(_E)"
 
-# mail/mail-config.glade.h:2
-# mail/mail-config.glade.h:2
-# mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:187
-#, fuzzy
-msgid "color"
-msgstr " 颜色"
-
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:128
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:130
 msgid "description"
 msgstr "描述"
 
 # mail/mail-config.glade.h:121
 # mail/mail-config.glade.h:121
 # mail/mail-config.glade.h:130
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:132
 msgid "newswindow1"
 msgstr "新闻窗口1"
 
+# mail/mail-config.glade.h:122
+# mail/mail-config.glade.h:122
+# mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:133
+msgid "placeholder"
+msgstr "位置记录器"
+
+# mail/mail-config.glade.h:123
+# mail/mail-config.glade.h:123
+# mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
+msgid "seconds."
+msgstr "秒。"
+
 # mail/mail-crypto.c:59
 # mail/mail-crypto.c:59
 # mail/mail-crypto.c:59
@@ -19925,36 +19343,28 @@ msgstr "无法创建 S/MIME 解码上下文。"
 # mail/mail-display.c:243
 # mail/mail-display.c:242
 # mail/mail-display.c:243
-#: mail/mail-display.c:279
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "保存附件"
 
-# mail/folder-browser.c:297 mail/mail-display.c:298
-# mail/folder-browser.c:297 mail/mail-display.c:297
-# mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/mail-display.c:344
-#, fuzzy, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "无法创建临时目录： %s"
-
 # mail/mail-display.c:350
 # mail/mail-display.c:349
 # mail/mail-display.c:350
-#: mail/mail-display.c:390
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "保存到磁盘..."
 
 # mail/mail-display.c:352
 # mail/mail-display.c:351
 # mail/mail-display.c:352
-#: mail/mail-display.c:391
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "嵌入视图"
 
 # mail/mail-display.c:354
 # mail/mail-display.c:353
 # mail/mail-display.c:354
-#: mail/mail-display.c:392
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
@@ -19962,7 +19372,7 @@ msgstr "在 %s 中打开..."
 # mail/mail-display.c:415
 # mail/mail-display.c:414
 # mail/mail-display.c:415
-#: mail/mail-display.c:452
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "嵌入视图 (通过 %s)"
@@ -19970,56 +19380,56 @@ msgstr "嵌入视图 (通过 %s)"
 # mail/mail-display.c:419
 # mail/mail-display.c:418
 # mail/mail-display.c:419
-#: mail/mail-display.c:456
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "隐藏"
 
 # mail/mail-display.c:440
 # mail/mail-display.c:439
 # mail/mail-display.c:440
-#: mail/mail-display.c:477
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "外部视图"
 
 # mail/mail-display.c:1133
 # mail/mail-display.c:1136
 # mail/mail-display.c:1162
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1162
 msgid "Loading message content"
 msgstr "装入邮件内容"
 
 # mail/mail-display.c:1602
 # mail/mail-display.c:1628
 # mail/mail-display.c:1657
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1657
 msgid "Open Link in Browser"
 msgstr "在浏览器中打开连接"
 
 # mail/mail-display.c:1604
 # mail/mail-display.c:1630
 # mail/mail-display.c:1659
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1659
 msgid "Copy Link Location"
 msgstr "复制连接位置"
 
 # mail/mail-display.c:1607
 # mail/mail-display.c:1633
 # mail/mail-display.c:1662
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1662
 msgid "Save Link as (FIXME)"
 msgstr "连接保存为 (FIXME)"
 
 # mail/mail-display.c:1610
 # mail/mail-display.c:1636
 # mail/mail-display.c:1665
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1665
 msgid "Save Image as..."
 msgstr "图像保存为..."
 
 # mail/mail-format.c:635
 # mail/mail-format.c:640
 # mail/mail-format.c:646
-#: mail/mail-format.c:601
+#: mail/mail-format.c:646
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
@@ -20027,74 +19437,92 @@ msgstr "%s 附件"
 # mail/mail-format.c:680
 # mail/mail-format.c:686
 # mail/mail-format.c:692
-#: mail/mail-format.c:647
+#: mail/mail-format.c:692
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "无法解析 MIME 邮件。显示源文本。"
 
 # mail/mail-format.c:763
 # mail/mail-format.c:769
 # mail/mail-format.c:775
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:775
 msgid "Date"
 msgstr "日期"
 
 # mail/mail-format.c:846
 # mail/mail-format.c:861
 # mail/mail-format.c:867
-#: mail/mail-format.c:822
+#: mail/mail-format.c:867
 msgid "Bad Address"
 msgstr "无效地址"
 
 # mail/mail-format.c:886 mail/message-list.etspec.h:3
 # mail/mail-format.c:904 mail/message-list.etspec.h:3
 # mail/mail-format.c:910 mail/message-list.etspec.h:3
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "发件人"
 
 # mail/mail-format.c:889
 # mail/mail-format.c:908
 # mail/mail-format.c:914
-#: mail/mail-format.c:869
+#: mail/mail-format.c:914
 msgid "Reply-To"
 msgstr "回复至"
 
 # mail/mail-format.c:893 mail/message-list.etspec.h:10
 # mail/mail-format.c:913 mail/message-list.etspec.h:11
 # mail/mail-format.c:919 mail/message-list.etspec.h:11
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:919 mail/message-list.etspec.h:11
 msgid "To"
 msgstr "收件人"
 
 # mail/mail-format.c:897
 # mail/mail-format.c:918
 # mail/mail-format.c:924
-#: mail/mail-format.c:879
+#: mail/mail-format.c:924
 msgid "Cc"
 msgstr "抄送"
 
 # mail/mail-format.c:901
 # mail/mail-format.c:923
 # mail/mail-format.c:929
-#: mail/mail-format.c:884
+#: mail/mail-format.c:929
 msgid "Bcc"
 msgstr "密件抄送"
 
-# importers/elm-importer.c:525 importers/netscape-importer.c:958
-# importers/pine-importer.c:637 mail/component-factory.c:100
-# importers/elm-importer.c:525 importers/netscape-importer.c:958
-# importers/pine-importer.c:637 mail/component-factory.c:100
-# importers/elm-importer.c:525 importers/netscape-importer.c:958
-# importers/pine-importer.c:637 mail/component-factory.c:100
-#: mail/mail-format.c:915
-#, fuzzy
-msgid "Mailer"
-msgstr "邮件"
+# mail/mail-format.c:1813
+# mail/mail-format.c:1749
+# mail/mail-format.c:1768
+#: mail/mail-format.c:1767
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
+
+# mail/mail-format.c:1836
+# mail/mail-format.c:1772
+# mail/mail-format.c:1791
+#: mail/mail-format.c:1790
+msgid "Evolution does not recognize this type of signed message."
+msgstr "Evolution 无法识别该类型的带签名邮件。"
+
+# mail/mail-format.c:1844
+# mail/mail-format.c:1780
+# mail/mail-format.c:1799
+#: mail/mail-format.c:1798
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "该邮件有数字签名，并被证实为可信。"
+
+# mail/mail-format.c:1852
+# mail/mail-format.c:1788
+# mail/mail-format.c:1807
+#: mail/mail-format.c:1806
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "该邮件有数字签名，但不能证实是可信的。"
 
 # mail/mail-format.c:2068
 # mail/mail-format.c:2003
 # mail/mail-format.c:2022
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:2021
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
@@ -20102,7 +19530,7 @@ msgstr "指向 FTP 站点 (%s)"
 # mail/mail-format.c:2082
 # mail/mail-format.c:2017
 # mail/mail-format.c:2036
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2035
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -20110,7 +19538,7 @@ msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 # mail/mail-format.c:2087
 # mail/mail-format.c:2022
 # mail/mail-format.c:2041
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2040
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
@@ -20118,7 +19546,7 @@ msgstr "指向本地文件 (%s)"
 # mail/mail-format.c:2116
 # mail/mail-format.c:2051
 # mail/mail-format.c:2070
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2069
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
@@ -20126,7 +19554,7 @@ msgstr "指向远程数据 (%s)"
 # mail/mail-format.c:2124
 # mail/mail-format.c:2059
 # mail/mail-format.c:2078
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2077
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
@@ -20134,21 +19562,21 @@ msgstr "指向未知的外部数据 (“%s”类型)"
 # mail/mail-format.c:2129
 # mail/mail-format.c:2064
 # mail/mail-format.c:2083
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2082
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
 # mail/mail-local.c:626
 # mail/mail-local.c:626
 # mail/mail-local.c:626
-#: mail/mail-local.c:625
+#: mail/mail-local.c:626
 msgid "Reconfiguring folder"
 msgstr "正在重新配置文件夹"
 
 # mail/mail-local.c:707
 # mail/mail-local.c:707
 # mail/mail-local.c:707
-#: mail/mail-local.c:706
+#: mail/mail-local.c:707
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -20160,7 +19588,7 @@ msgstr ""
 # mail/mail-local.c:763
 # mail/mail-local.c:763
 # mail/mail-local.c:763
-#: mail/mail-local.c:762
+#: mail/mail-local.c:763
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "无法把文件夹元信息保存到 %s： %s"
@@ -20168,7 +19596,7 @@ msgstr "无法把文件夹元信息保存到 %s： %s"
 # mail/mail-local.c:815
 # mail/mail-local.c:815
 # mail/mail-local.c:815
-#: mail/mail-local.c:814
+#: mail/mail-local.c:815
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "无法删除文件夹元信息 %s： %s"
@@ -20176,7 +19604,7 @@ msgstr "无法删除文件夹元信息 %s： %s"
 # mail/mail-local.c:1281
 # mail/mail-local.c:1281
 # mail/mail-local.c:1281
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "将文件夹格式从“%s”改为“%s”"
@@ -20184,7 +19612,7 @@ msgstr "将文件夹格式从“%s”改为“%s”"
 # mail/mail-local.c:1296
 # mail/mail-local.c:1296
 # mail/mail-local.c:1296
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "由于 %s 不是本地文件夹，因此不能重新配置"
@@ -20192,7 +19620,7 @@ msgstr "由于 %s 不是本地文件夹，因此不能重新配置"
 # mail/mail-local.c:1318
 # mail/mail-local.c:1318
 # mail/mail-local.c:1318
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -20203,14 +19631,14 @@ msgstr ""
 # mail/mail-local.c:1407
 # mail/mail-local.c:1407
 # mail/mail-local.c:1407
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "您不能改变远程文件夹的格式。"
 
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1416
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "重新配置 /%s"
@@ -20249,28 +19677,28 @@ msgstr "正在工作"
 # mail/mail-ops.c:86
 # mail/mail-ops.c:87
 # mail/mail-ops.c:87
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:87
 msgid "Filtering Folder"
 msgstr "正在过滤文件夹"
 
 # mail/mail-ops.c:249
 # mail/mail-ops.c:250
 # mail/mail-ops.c:258
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:258
 msgid "Fetching Mail"
 msgstr "正在收取邮件"
 
 # mail/mail-ops.c:489 mail/mail-ops.c:518
 # mail/mail-ops.c:491 mail/mail-ops.c:520
 # mail/mail-ops.c:534 mail/mail-ops.c:563
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:534 mail/mail-ops.c:563
 msgid "However, the message was successfully sent."
 msgstr "可是，邮件已经成功发送。"
 
 # mail/mail-ops.c:554
 # mail/mail-ops.c:556
 # mail/mail-ops.c:599
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:599
 #, c-format
 msgid "Sending \"%s\""
 msgstr "正在发送“%s”"
@@ -20278,7 +19706,7 @@ msgstr "正在发送“%s”"
 # mail/mail-ops.c:674
 # mail/mail-ops.c:676
 # mail/mail-ops.c:719
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:719
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "发送第 %d 个邮件，共 %d 个"
@@ -20286,7 +19714,7 @@ msgstr "发送第 %d 个邮件，共 %d 个"
 # mail/mail-ops.c:693
 # mail/mail-ops.c:695
 # mail/mail-ops.c:738
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "在第 %d 个邮件失败，共 %d 个"
@@ -20294,21 +19722,21 @@ msgstr "在第 %d 个邮件失败，共 %d 个"
 # mail/mail-ops.c:695 mail/mail-send-recv.c:537
 # mail/mail-ops.c:697 mail/mail-send-recv.c:545
 # mail/mail-ops.c:740 mail/mail-send-recv.c:545
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:740 mail/mail-send-recv.c:545
 msgid "Complete."
 msgstr "完成。"
 
 # mail/mail-ops.c:788
 # mail/mail-ops.c:790
 # mail/mail-ops.c:833
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:833
 msgid "Saving message to folder"
 msgstr "把邮件保存到文件夹中"
 
 # mail/mail-ops.c:868
 # mail/mail-ops.c:870
 # mail/mail-ops.c:913
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:913
 #, c-format
 msgid "Moving messages to %s"
 msgstr "把邮件移动到 %s"
@@ -20316,7 +19744,7 @@ msgstr "把邮件移动到 %s"
 # mail/mail-ops.c:868
 # mail/mail-ops.c:870
 # mail/mail-ops.c:913
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:913
 #, c-format
 msgid "Copying messages to %s"
 msgstr "把邮件复制到 %s"
@@ -20324,36 +19752,44 @@ msgstr "把邮件复制到 %s"
 # mail/mail-ops.c:895
 # mail/mail-ops.c:897
 # mail/mail-ops.c:940
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:940
 msgid "Moving"
 msgstr "正在移动"
 
 # mail/mail-ops.c:898
 # mail/mail-ops.c:900
 # mail/mail-ops.c:943
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:943
 msgid "Copying"
 msgstr "正在复制"
 
 # mail/mail-ops.c:1008
 # mail/mail-ops.c:1010
 # mail/mail-ops.c:1053
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1053
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "正在“%s”中扫描文件夹"
 
+# mail/mail-ops.c:1058 shell/e-local-storage.c:178
+# mail/mail-ops.c:1060 shell/e-local-storage.c:178
+# mail/mail-ops.c:1103 shell/e-local-storage.c:178
+#. Fill in the new fields
+#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
+msgid "Trash"
+msgstr "已删除"
+
 # mail/mail-ops.c:1191
 # mail/mail-ops.c:1193
 # mail/mail-ops.c:1236
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1236
 msgid "Forwarded messages"
 msgstr "已转发邮件"
 
 # mail/mail-ops.c:1234
 # mail/mail-ops.c:1236
 # mail/mail-ops.c:1279
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1279
 #, c-format
 msgid "Opening folder %s"
 msgstr "正在打开文件夹 %s"
@@ -20361,7 +19797,7 @@ msgstr "正在打开文件夹 %s"
 # mail/mail-ops.c:1306
 # mail/mail-ops.c:1308
 # mail/mail-ops.c:1351
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1351
 #, c-format
 msgid "Opening store %s"
 msgstr "正在打开存储 %s"
@@ -20369,7 +19805,7 @@ msgstr "正在打开存储 %s"
 # mail/mail-ops.c:1375
 # mail/mail-ops.c:1377
 # mail/mail-ops.c:1420
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1420
 #, c-format
 msgid "Removing folder %s"
 msgstr "正在删除文件夹“%s”"
@@ -20377,7 +19813,7 @@ msgstr "正在删除文件夹“%s”"
 # mail/mail-ops.c:1469
 # mail/mail-ops.c:1471
 # mail/mail-ops.c:1514
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1514
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在存储文件夹“%s”"
@@ -20385,21 +19821,21 @@ msgstr "正在存储文件夹“%s”"
 # mail/mail-ops.c:1520
 # mail/mail-ops.c:1522
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1565
 msgid "Refreshing folder"
 msgstr "正在刷新文件夹"
 
 # mail/mail-ops.c:1556
 # mail/mail-ops.c:1558
 # mail/mail-ops.c:1601
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1601
 msgid "Expunging folder"
 msgstr "正在删除文件夹"
 
 # mail/mail-ops.c:1605
 # mail/mail-ops.c:1607
 # mail/mail-ops.c:1650
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1650
 #, c-format
 msgid "Retrieving message %s"
 msgstr "正在检索邮件 %s"
@@ -20407,7 +19843,7 @@ msgstr "正在检索邮件 %s"
 # mail/mail-ops.c:1672
 # mail/mail-ops.c:1674
 # mail/mail-ops.c:1717
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1717
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "正在检索 %d 个邮件"
@@ -20415,7 +19851,7 @@ msgstr "正在检索 %d 个邮件"
 # mail/mail-ops.c:1758
 # mail/mail-ops.c:1760
 # mail/mail-ops.c:1803
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1803
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "正在保存 %d 个邮件"
@@ -20423,7 +19859,7 @@ msgstr "正在保存 %d 个邮件"
 # mail/mail-ops.c:1870
 # mail/mail-ops.c:1872
 # mail/mail-ops.c:1915
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -20435,7 +19871,7 @@ msgstr ""
 # mail/mail-ops.c:1898
 # mail/mail-ops.c:1900
 # mail/mail-ops.c:1943
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1943
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -20447,14 +19883,14 @@ msgstr ""
 # mail/mail-ops.c:1972
 # mail/mail-ops.c:1974
 # mail/mail-ops.c:2017
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:2017
 msgid "Saving attachment"
 msgstr "正在保存附件"
 
 # mail/mail-ops.c:1988
 # mail/mail-ops.c:1990
 # mail/mail-ops.c:2033
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2033
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -20466,7 +19902,7 @@ msgstr ""
 # mail/mail-ops.c:2019
 # mail/mail-ops.c:2021
 # mail/mail-ops.c:2064
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2064
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据： %s"
@@ -20474,7 +19910,7 @@ msgstr "无法写数据： %s"
 # mail/mail-ops.c:2088
 # mail/mail-ops.c:2090
 # mail/mail-ops.c:2133
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2133
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "断开与 %s 的连接"
@@ -20482,13 +19918,13 @@ msgstr "断开与 %s 的连接"
 # mail/mail-ops.c:2089
 # mail/mail-ops.c:2091
 # mail/mail-ops.c:2134
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2134
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新与 %s 连接"
 
 # mail/mail-ops.c:2233
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2233
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "正在执行 shell 命令：%s"
@@ -20496,7 +19932,7 @@ msgstr "正在执行 shell 命令：%s"
 # mail/mail-search-dialogue.c:113
 # mail/mail-search-dialogue.c:113
 # mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "搜索(_S)"
 
@@ -20559,14 +19995,14 @@ msgstr "匹配："
 # mail/mail-send-recv.c:141
 # mail/mail-send-recv.c:143
 # mail/mail-send-recv.c:143
-#: mail/mail-send-recv.c:141
+#: mail/mail-send-recv.c:143
 msgid "Cancelling..."
 msgstr "正在取消..."
 
 # mail/mail-send-recv.c:245
 # mail/mail-send-recv.c:251
 # mail/mail-send-recv.c:251
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:251
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "服务器： %s，类型： %s"
@@ -20574,7 +20010,7 @@ msgstr "服务器： %s，类型： %s"
 # mail/mail-send-recv.c:247
 # mail/mail-send-recv.c:253
 # mail/mail-send-recv.c:253
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "路径： %s，类型： %s"
@@ -20582,7 +20018,7 @@ msgstr "路径： %s，类型： %s"
 # mail/mail-send-recv.c:249
 # mail/mail-send-recv.c:255
 # mail/mail-send-recv.c:255
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Type: %s"
 msgstr "类型： %s"
@@ -20590,35 +20026,35 @@ msgstr "类型： %s"
 # mail/mail-send-recv.c:286
 # mail/mail-send-recv.c:292
 # mail/mail-send-recv.c:292
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:292
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
 # mail/mail-send-recv.c:288
 # mail/mail-send-recv.c:294
 # mail/mail-send-recv.c:294
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:294
 msgid "Cancel All"
 msgstr "全部取消"
 
 # mail/mail-send-recv.c:348
 # mail/mail-send-recv.c:354
 # mail/mail-send-recv.c:354
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:354
 msgid "Updating..."
 msgstr "正在更新..."
 
 # mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 # mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
 # mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
 msgid "Waiting..."
 msgstr "正在等待..."
 
 # mail/mail-send-recv.c:533
 # mail/mail-send-recv.c:541
 # mail/mail-send-recv.c:541
-#: mail/mail-send-recv.c:534
+#: mail/mail-send-recv.c:541
 msgid "Cancelled."
 msgstr "已取消"
 
@@ -20644,46 +20080,22 @@ msgstr "为 %s 输入密码"
 msgid "Enter Password"
 msgstr "输入密码"
 
-# mail/mail-account-gui.c:962
-# mail/mail-account-gui.c:962
-# mail/mail-account-gui.c:959
-#: mail/mail-signature-editor.c:79
-#, fuzzy, c-format
-msgid "Could not save signature file: %s"
-msgstr "无法保存签名文件。"
-
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1036
-#: mail/mail-signature-editor.c:172
-msgid "Save signature"
-msgstr "保存签名"
-
-# mail/mail-account-gui.c:1045
-# mail/mail-account-gui.c:1045
-# mail/mail-account-gui.c:1042
-#: mail/mail-signature-editor.c:178
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"该签名已经被改变，但还没有存储。\n"
-"\n"
-"您希望保存改动吗？"
+# mail/mail-summary.c:109
+#: mail/mail-summary.c:109
+msgid "Incomplete message written on pipe!"
+msgstr "不完整的消息被写入管道！"
 
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:79
-# mail/mail-config.glade.h:88
-#: mail/mail-signature-editor.c:357
-#, fuzzy
-msgid "Signature name:"
-msgstr "签名文件："
+# my-evolution/e-summary-mail.c:129
+# my-evolution/e-summary-mail.c:129
+# mail/mail-summary.c:467
+#: mail/mail-summary.c:467
+msgid "Mail Summary"
+msgstr "邮件概要"
 
 # mail/mail-tools.c:255
 # mail/mail-tools.c:255
 # mail/mail-tools.c:256
-#: mail/mail-tools.c:257
+#: mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "已转发邮件 - %s"
@@ -20691,14 +20103,14 @@ msgstr "已转发邮件 - %s"
 # mail/mail-tools.c:259
 # mail/mail-tools.c:259
 # mail/mail-tools.c:260
-#: mail/mail-tools.c:261
+#: mail/mail-tools.c:260
 msgid "Forwarded message"
 msgstr "已转发邮件"
 
 # mail/mail-tools.c:393
 # mail/mail-tools.c:393
 # mail/mail-tools.c:394
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:394
 msgid "Forwarded Message"
 msgstr "已转发邮件"
 
@@ -20730,6 +20142,13 @@ msgid ""
 "And have been updated."
 msgstr ""
 
+# mail/mail-vfolder.c:728
+# mail/mail-vfolder.c:728
+# mail/mail-vfolder.c:728
+#: mail/mail-vfolder.c:728
+msgid "VFolders"
+msgstr "虚拟文件夹"
+
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # mail/mail-vfolder.c:785
 # mail/mail-vfolder.c:785
@@ -20762,14 +20181,14 @@ msgstr "新建虚拟文件夹"
 # mail/message-browser.c:212
 # mail/message-browser.c:212
 # mail/message-browser.c:212
-#: mail/message-browser.c:210
+#: mail/message-browser.c:212
 msgid "(No subject)"
 msgstr "(没有主题)"
 
 # mail/message-browser.c:214
 # mail/message-browser.c:214
 # mail/message-browser.c:214
-#: mail/message-browser.c:212
+#: mail/message-browser.c:214
 #, c-format
 msgid "%s - Message"
 msgstr "%s - 邮件"
@@ -20777,225 +20196,129 @@ msgstr "%s - 邮件"
 # mail/message-list.c:639
 # mail/message-list.c:645
 # mail/message-list.c:662
-#: mail/message-list.c:672
+#: mail/message-list.c:662
 msgid "Unseen"
 msgstr "不可见"
 
 # mail/message-list.c:640
 # mail/message-list.c:646
 # mail/message-list.c:663
-#: mail/message-list.c:673
+#: mail/message-list.c:663
 msgid "Seen"
 msgstr "可见"
 
 # mail/message-list.c:641
 # mail/message-list.c:647
 # mail/message-list.c:664
-#: mail/message-list.c:674
+#: mail/message-list.c:664
 msgid "Answered"
 msgstr "已应答"
 
 # mail/message-list.c:642
 # mail/message-list.c:648
 # mail/message-list.c:665
-#: mail/message-list.c:675
+#: mail/message-list.c:665
 msgid "Multiple Unseen Messages"
 msgstr "多个不可见邮件"
 
 # mail/message-list.c:643
 # mail/message-list.c:649
 # mail/message-list.c:666
-#: mail/message-list.c:676
+#: mail/message-list.c:666
 msgid "Multiple Messages"
 msgstr "多个邮件"
 
 # mail/message-list.c:647
 # mail/message-list.c:658
 # mail/message-list.c:675
-#: mail/message-list.c:680
+#: mail/message-list.c:675
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:648
 # mail/message-list.c:659
 # mail/message-list.c:676
-#: mail/message-list.c:681
+#: mail/message-list.c:676
 msgid "Lower"
 msgstr "较低"
 
 # mail/message-list.c:652
 # mail/message-list.c:663
 # mail/message-list.c:680
-#: mail/message-list.c:685
+#: mail/message-list.c:680
 msgid "Higher"
 msgstr "较高"
 
 # mail/message-list.c:653
 # mail/message-list.c:664
 # mail/message-list.c:681
-#: mail/message-list.c:686
+#: mail/message-list.c:681
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:903
 # mail/message-list.c:920
 # mail/message-list.c:937
-#: mail/message-list.c:991
+#: mail/message-list.c:937
 msgid "?"
 msgstr "?"
 
 # mail/message-list.c:910
 # mail/message-list.c:927
 # mail/message-list.c:944
-#: mail/message-list.c:998
+#: mail/message-list.c:944
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:919
 # mail/message-list.c:936
 # mail/message-list.c:953
-#: mail/message-list.c:1007
+#: mail/message-list.c:953
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:931
 # mail/message-list.c:948
 # mail/message-list.c:965
-#: mail/message-list.c:1019
+#: mail/message-list.c:965
 msgid "%a %l:%M %p"
 msgstr "%a %l:%m %p"
 
 # mail/message-list.c:941
 # mail/message-list.c:958
 # mail/message-list.c:975
-#: mail/message-list.c:1029
+#: mail/message-list.c:975
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
 # mail/message-list.c:2334
 # mail/message-list.c:2358
 # mail/message-list.c:2387
-#: mail/message-list.c:2396
+#: mail/message-list.c:2387
 msgid "Generating message list"
 msgstr "正在生成邮件列表"
 
-# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
-# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
-# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
-#: mail/message-list.etspec.h:3
-#, fuzzy
-msgid "Due By"
-msgstr "预定 "
-
-# calendar/gui/dialogs/meeting-page.etspec.h:10
-# calendar/gui/e-calendar-table.etspec.h:15
-# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
-# mail/message-list.etspec.h:8
-# calendar/gui/dialogs/meeting-page.etspec.h:10
-# calendar/gui/e-calendar-table.etspec.h:15
-# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
-# mail/message-list.etspec.h:9
-# calendar/gui/dialogs/meeting-page.etspec.h:10
-# calendar/gui/e-calendar-table.etspec.h:15
-# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:47
-# mail/message-list.etspec.h:9
-#: mail/message-list.etspec.h:4
-#, fuzzy
-msgid "Flag Status"
-msgstr "状态"
-
 # mail/message-list.etspec.h:2
 # mail/message-list.etspec.h:2
 # mail/message-list.etspec.h:2
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "已标志"
 
-#: mail/message-list.etspec.h:6
-msgid "Follow Up Flag"
-msgstr ""
-
 # mail/message-list.etspec.h:4
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:5
-#: mail/message-list.etspec.h:8
+#: mail/message-list.etspec.h:5
 msgid "Received"
 msgstr "已接收"
 
 # mail/message-list.etspec.h:7
 # mail/message-list.etspec.h:8
 # mail/message-list.etspec.h:8
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:8
 msgid "Size"
 msgstr "大小"
 
-# importers/elm-importer.c:525 importers/netscape-importer.c:958
-# importers/pine-importer.c:637 mail/component-factory.c:100
-# importers/elm-importer.c:525 importers/netscape-importer.c:958
-# importers/pine-importer.c:637 mail/component-factory.c:100
-# my-evolution/Locations.h:1355
-#: mail/message-tag-followup.c:57
-#, fuzzy
-msgid "Call"
-msgstr "邮件"
-
-# ui/evolution-calendar.xml.h:15
-# ui/evolution-calendar.xml.h:15
-# ui/evolution-calendar.xml.h:15
-#: mail/message-tag-followup.c:58
-#, fuzzy
-msgid "Do Not Forward"
-msgstr "前进"
-
-#: mail/message-tag-followup.c:59
-msgid "Follow-Up"
-msgstr ""
-
-# mail/mail-config.glade.h:81
-# mail/mail-config.glade.h:81
-# mail/mail-config.glade.h:90
-#: mail/message-tag-followup.c:60
-#, fuzzy
-msgid "For Your Information"
-msgstr "来源信息"
-
-# ui/evolution-mail-message.xml.h:31
-# ui/evolution-mail-message.xml.h:31
-# ui/evolution-mail-message.xml.h:31
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
-msgid "Forward"
-msgstr "转发"
-
-#: mail/message-tag-followup.c:62
-msgid "No Response Necessary"
-msgstr ""
-
-# ui/evolution-mail-message.xml.h:70
-# ui/evolution-mail-message.xml.h:70
-# ui/evolution-mail-message.xml.h:72
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
-msgid "Reply"
-msgstr "回复"
-
-# ui/evolution-mail-message.xml.h:71
-# ui/evolution-mail-message.xml.h:71
-# ui/evolution-mail-message.xml.h:73
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
-msgid "Reply to All"
-msgstr "全部回复"
-
-# calendar/gui/dialogs/recurrence-page.glade.h:6
-# calendar/gui/dialogs/recurrence-page.glade.h:6
-# calendar/gui/dialogs/recurrence-page.glade.h:6
-#: mail/message-tag-followup.c:66
-#, fuzzy
-msgid "Review"
-msgstr "预览"
-
-#: mail/message-tag-followup.c:315
-msgid "Flag to Follow Up"
-msgstr ""
-
 # mail/subscribe-dialog.c:219
 # mail/subscribe-dialog.c:219
 # mail/subscribe-dialog.c:219
@@ -21035,7 +20358,7 @@ msgstr "取消到文件夹“%s”的订阅"
 # mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 # shell/e-storage-set-view.etspec.h:1
 #: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
+#: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "文件夹"
 
@@ -21109,50 +20432,6 @@ msgstr "订阅(_S)"
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
 
-# my-evolution/component-factory.c:44
-# my-evolution/component-factory.c:44
-# my-evolution/component-factory.c:44
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for the Evolution Summary."
-msgstr "含有 Evolution 概要的文件夹"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Evolution Summary component."
-msgstr "Evolution 邮件撰写器。"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
-#, fuzzy
-msgid "Factory for Evolution Summary's configuration control."
-msgstr "Evolution 任务控制车间"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
-#, fuzzy
-msgid "Factory for the Evolution Summary component."
-msgstr "Evolution 实施概要组件车间。"
-
-# my-evolution/e-summary-preferences.c:1502
-# my-evolution/e-summary-preferences.c:1502
-# my-evolution/e-summary-preferences.c:1504
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
-#, fuzzy
-msgid "Summary Preferences"
-msgstr "概要设置"
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
-msgid "This page can be used to customize the appearance of the Summary page."
-msgstr ""
-
 # calendar/gui/e-calendar-table.etspec.h:3
 # calendar/gui/e-calendar-table.etspec.h:3
 # my-evolution/Locations.h:1
@@ -36500,68 +35779,59 @@ msgstr "苏黎世"
 # my-evolution/component-factory.c:44
 # my-evolution/component-factory.c:44
 # my-evolution/component-factory.c:44
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "含有 Evolution 概要的文件夹"
 
+# my-evolution/component-factory.c:153
+# my-evolution/component-factory.c:153
+# my-evolution/component-factory.c:153
+#: my-evolution/component-factory.c:153
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "无法初始化 Evolution 的概要成员。"
+
 # my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 # my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 # my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
-#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "约会"
 
 # my-evolution/e-summary-calendar.c:341
 # my-evolution/e-summary-calendar.c:341
 # my-evolution/e-summary-calendar.c:341
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "没有约会"
 
 # my-evolution/e-summary-calendar.c:377
 # my-evolution/e-summary-calendar.c:377
 # my-evolution/e-summary-calendar.c:375
-#: my-evolution/e-summary-calendar.c:400
+#: my-evolution/e-summary-calendar.c:375
 msgid "%k:%M %d %B"
 msgstr "%B %d %k:%M"
 
 # my-evolution/e-summary-calendar.c:379
 # my-evolution/e-summary-calendar.c:379
 # my-evolution/e-summary-calendar.c:377
-#: my-evolution/e-summary-calendar.c:402
+#: my-evolution/e-summary-calendar.c:377
 msgid "%l:%M %d %B"
 msgstr "%B %d %l:%M"
 
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # my-evolution/e-summary-calendar.c:395
-#: my-evolution/e-summary-calendar.c:420
+#: my-evolution/e-summary-calendar.c:395
 msgid "No description"
 msgstr "无描述"
 
 # my-evolution/e-summary-mail.c:129
 # my-evolution/e-summary-mail.c:129
 # my-evolution/e-summary-mail.c:129
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "邮件概要"
 
-# mail/mail-vfolder.c:728
-# mail/mail-vfolder.c:728
-# mail/mail-vfolder.c:728
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "虚拟文件夹"
-
-# shell/e-local-storage.c:636
-# shell/e-local-storage.c:636
-# shell/e-local-storage.c:636
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
-msgid "Local Folders"
-msgstr "本地文件夹"
-
 # my-evolution/e-summary-preferences.c:80
 # my-evolution/e-summary-weather.c:661
 # my-evolution/e-summary-preferences.c:80
@@ -36573,46 +35843,53 @@ msgstr "本地文件夹"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-preferences.c:81
+#: my-evolution/e-summary-weather.c:606
 msgid "KBOS"
 msgstr "KBOS"
 
 # my-evolution/e-summary-preferences.c:444
 # my-evolution/e-summary-preferences.c:444
 # my-evolution/e-summary-preferences.c:445
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:445
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com 的每日一词"
 
 # my-evolution/e-summary-preferences.c:465
 # my-evolution/e-summary-preferences.c:465
 # my-evolution/e-summary-preferences.c:466
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:466
 msgid "Quotes of the Day"
 msgstr "每日引用"
 
 # my-evolution/e-summary-preferences.c:944
 # my-evolution/e-summary-preferences.c:944
 # my-evolution/e-summary-preferences.c:946
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "添加新闻来源"
 
 # my-evolution/e-summary-preferences.c:952
 # my-evolution/e-summary-preferences.c:952
 # my-evolution/e-summary-preferences.c:954
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "输入您希望添加的新闻来源的 URL"
 
 # my-evolution/e-summary-preferences.c:956
 # my-evolution/e-summary-preferences.c:956
 # my-evolution/e-summary-preferences.c:958
-#: my-evolution/e-summary-preferences.c:732
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "名称："
 
+# my-evolution/e-summary-preferences.c:1502
+# my-evolution/e-summary-preferences.c:1502
+# my-evolution/e-summary-preferences.c:1504
+#: my-evolution/e-summary-preferences.c:1504
+msgid "Summary Settings"
+msgstr "概要设置"
+
 # my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 # my-evolution/e-summary-rdf.c:415
 # my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
@@ -36625,88 +35902,49 @@ msgstr "下载 RDF 错误"
 # my-evolution/e-summary-rdf.c:528
 # my-evolution/e-summary-rdf.c:528
 # my-evolution/e-summary-rdf.c:443
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:443
 msgid "News Feed"
 msgstr "新闻来源"
 
-# my-evolution/Locations.h:1354
-#: my-evolution/e-summary-shown.c:463
-#, fuzzy
-msgid "All"
-msgstr "麦卡伦"
-
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:31
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-#, fuzzy
-msgid "Add ->"
-msgstr "添加(_A)"
-
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "删除(_R)"
-
-# my-evolution/Locations.h:2063
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "香农"
-
 # my-evolution/e-summary-tasks.c:248
 # my-evolution/e-summary-tasks.c:248
 # my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:241
 msgid "No tasks"
 msgstr "没有任务"
 
 # my-evolution/e-summary-tasks.c:287
 # my-evolution/e-summary-tasks.c:287
 # my-evolution/e-summary-tasks.c:281
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:281
 msgid "(No Description)"
 msgstr "(没有描述)"
 
 # my-evolution/e-summary-weather.c:71
 # my-evolution/e-summary-weather.c:71
 # my-evolution/e-summary-weather.c:70
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:70
 msgid "My Weather"
 msgstr "天气"
 
-#: my-evolution/e-summary-weather.c:279
-msgid "There was an error downloading data for"
-msgstr ""
-
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:504
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:504
 msgid "Weather"
 msgstr "天气"
 
+# my-evolution/e-summary-weather.c:722
+# my-evolution/e-summary-weather.c:722
+# my-evolution/e-summary-weather.c:667
+#: my-evolution/e-summary-weather.c:667
+msgid "Regions"
+msgstr "区域"
+
 # my-evolution/e-summary.c:193
 # my-evolution/e-summary.c:193
 # my-evolution/e-summary.c:190
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:190
 msgid "%A, %B %e %Y"
 msgstr "%Y %B %e %A"
 
@@ -36715,21 +35953,21 @@ msgstr "%Y %B %e %A"
 # importers/elm-importer.c:98 importers/netscape-importer.c:109
 # importers/pine-importer.c:103
 # my-evolution/e-summary.c:475
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:475
 msgid "Please wait..."
 msgstr "请等待..."
 
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "打印概要"
 
 # my-evolution/e-summary.c:626
 # my-evolution/e-summary.c:626
 # my-evolution/e-summary.c:612
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:612
 msgid "Printing of Summary failed"
 msgstr "打印概要失败"
 
@@ -36740,6 +35978,58 @@ msgstr "打印概要失败"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "实施概要组件无法初始化 Bonobo。\n"
 
+# my-evolution/metar.c:29
+# my-evolution/metar.c:29
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " 华氏度"
+
+# my-evolution/metar.c:29
+# my-evolution/metar.c:29
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " 摄氏度"
+
+# addressbook/printing/e-contact-print.glade.h:8
+# my-evolution/metar.c:33
+# my-evolution/metar.c:33
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "节"
+
+# my-evolution/metar.c:33
+# my-evolution/metar.c:33
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+# mail/mail-ops.c:895
+# my-evolution/metar.c:38
+# my-evolution/metar.c:38
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "英寸汞柱"
+
+# my-evolution/metar.c:38
+# my-evolution/metar.c:38
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "毫米汞柱"
+
+# mail/mail-callbacks.c:2262
+# my-evolution/metar.c:41
+# my-evolution/metar.c:41
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "英里"
+
+# mail/mail-callbacks.c:2262
+# my-evolution/metar.c:41
+# my-evolution/metar.c:41
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "公里"
+
 # my-evolution/metar.c:44
 # my-evolution/metar.c:44
 # my-evolution/metar.c:44
@@ -38722,207 +38012,276 @@ msgstr "尘卷风"
 msgid "Drifting dust whirls"
 msgstr "阵尘卷风"
 
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:1
+msgid " _Remove"
+msgstr "删除(_R)"
+
 # my-evolution/my-evolution.glade.h:2
 # my-evolution/my-evolution.glade.h:2
 # my-evolution/my-evolution.glade.h:2
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:2
 msgid "Add n_ews feed"
 msgstr "添加新闻来源(_E)"
 
+# my-evolution/my-evolution.glade.h:3
+# my-evolution/my-evolution.glade.h:3
+# my-evolution/my-evolution.glade.h:3
+#: my-evolution/my-evolution.glade.h:3
+msgid "Al_l stations:"
+msgstr "所有站点(_L)："
+
+# my-evolution/my-evolution.glade.h:4
+# my-evolution/my-evolution.glade.h:4
+# my-evolution/my-evolution.glade.h:4
+#: my-evolution/my-evolution.glade.h:4
+msgid "All _folders:"
+msgstr "所有文件夹(_F)"
+
+# my-evolution/my-evolution.glade.h:5
+# my-evolution/my-evolution.glade.h:5
+# my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:5
+msgid "All news _feeds:"
+msgstr "所有新闻来源(_F)："
+
 # my-evolution/my-evolution.glade.h:6
 # my-evolution/my-evolution.glade.h:6
 # my-evolution/my-evolution.glade.h:6
-#: my-evolution/my-evolution.glade.h:2
+#: my-evolution/my-evolution.glade.h:6
 msgid "C_elsius"
 msgstr "摄氏度"
 
 # my-evolution/my-evolution.glade.h:8
 # my-evolution/my-evolution.glade.h:8
 # my-evolution/my-evolution.glade.h:8
-#: my-evolution/my-evolution.glade.h:4
+#: my-evolution/my-evolution.glade.h:8
 msgid "How many days should the calendar display at once?"
 msgstr "日历一次应该显示多少日期？"
 
 # my-evolution/my-evolution.glade.h:9
 # my-evolution/my-evolution.glade.h:9
 # my-evolution/my-evolution.glade.h:9
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:9
 msgid "Ma_x number of items shown:"
 msgstr "显示项目的最大数(_X)："
 
 # my-evolution/my-evolution.glade.h:10
 # my-evolution/my-evolution.glade.h:10
 # my-evolution/my-evolution.glade.h:10
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:10
 msgid "News Feed Settings"
 msgstr "新闻来源设置"
 
 # my-evolution/my-evolution.glade.h:11
 # my-evolution/my-evolution.glade.h:11
 # my-evolution/my-evolution.glade.h:11
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:11
 msgid "One mont_h"
 msgstr "一个月(_H)"
 
 # my-evolution/my-evolution.glade.h:12
 # my-evolution/my-evolution.glade.h:12
 # my-evolution/my-evolution.glade.h:12
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:12
 msgid "One w_eek"
 msgstr "一周(_E)"
 
 # my-evolution/my-evolution.glade.h:13
 # my-evolution/my-evolution.glade.h:13
 # my-evolution/my-evolution.glade.h:13
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:13
 msgid "R_efresh time (seconds):"
 msgstr "刷新时间 (秒)(_E)："
 
 # my-evolution/my-evolution.glade.h:14
 # my-evolution/my-evolution.glade.h:14
 # my-evolution/my-evolution.glade.h:14
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:14
 msgid "Refresh _time (seconds):"
 msgstr "刷新时间 (秒)(_T)："
 
 # my-evolution/my-evolution.glade.h:15
 # my-evolution/my-evolution.glade.h:15
 # my-evolution/my-evolution.glade.h:15
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:15
 msgid "S_how full path for folders"
 msgstr "显示文件夹的完整路径(_H)"
 
 # my-evolution/my-evolution.glade.h:16
 # my-evolution/my-evolution.glade.h:16
 # my-evolution/my-evolution.glade.h:16
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:16
 msgid "Show _all tasks"
 msgstr "显示所有任务(_A)"
 
 # my-evolution/my-evolution.glade.h:17
 # my-evolution/my-evolution.glade.h:17
 # my-evolution/my-evolution.glade.h:17
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:17
 msgid "Show _today's tasks"
 msgstr "显示今天的任务(_T)"
 
 # my-evolution/my-evolution.glade.h:18
 # my-evolution/my-evolution.glade.h:18
 # my-evolution/my-evolution.glade.h:18
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:18
 msgid "Show temperatures in:"
 msgstr "以之显示温度："
 
 # my-evolution/my-evolution.glade.h:19
 # my-evolution/my-evolution.glade.h:19
 # my-evolution/my-evolution.glade.h:19
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:19
 msgid "Tasks "
 msgstr "任务 "
 
 # my-evolution/my-evolution.glade.h:20
 # my-evolution/my-evolution.glade.h:20
 # my-evolution/my-evolution.glade.h:20
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
 msgstr "天气设置"
 
+# my-evolution/my-evolution.glade.h:22
+# my-evolution/my-evolution.glade.h:22
+# my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:22
+msgid "_Display folders:"
+msgstr "显示文件夹(_D)："
+
+# my-evolution/my-evolution.glade.h:23
+# my-evolution/my-evolution.glade.h:23
+# my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:23
+msgid "_Display stations:"
+msgstr "显示站点(_D)："
+
+# my-evolution/my-evolution.glade.h:24
+# my-evolution/my-evolution.glade.h:24
+# my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:24
+msgid "_Displayed feeds:"
+msgstr "已显示的来源："
+
 # my-evolution/my-evolution.glade.h:25
 # my-evolution/my-evolution.glade.h:25
 # my-evolution/my-evolution.glade.h:25
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:25
 msgid "_Fahrenheit"
 msgstr "华氏(_F)"
 
 # my-evolution/my-evolution.glade.h:26
 # my-evolution/my-evolution.glade.h:26
 # my-evolution/my-evolution.glade.h:26
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:26
 msgid "_Five days"
 msgstr "五天(_F)"
 
 # my-evolution/my-evolution.glade.h:27
 # my-evolution/my-evolution.glade.h:27
 # my-evolution/my-evolution.glade.h:27
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:27
 msgid "_Mail"
 msgstr "邮件(_M)"
 
 # my-evolution/my-evolution.glade.h:28
 # my-evolution/my-evolution.glade.h:28
 # my-evolution/my-evolution.glade.h:28
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:28
 msgid "_News Feeds"
 msgstr "新闻来源(_N)"
 
 # my-evolution/my-evolution.glade.h:29
 # my-evolution/my-evolution.glade.h:29
 # my-evolution/my-evolution.glade.h:29
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:29
 msgid "_One day"
 msgstr "一天(_O)"
 
 # my-evolution/my-evolution.glade.h:30
 # my-evolution/my-evolution.glade.h:30
 # my-evolution/my-evolution.glade.h:30
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:30
 msgid "_Schedule"
 msgstr "调度(_S)"
 
 # my-evolution/my-evolution.glade.h:31
 # my-evolution/my-evolution.glade.h:31
 # my-evolution/my-evolution.glade.h:31
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:31
 msgid "_Weather"
 msgstr "天气(_W)"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# notes/GNOME_Evolution_Notes.oaf.in.h:3
+#: notes/GNOME_Evolution_Notes.oaf.in.h:3
+msgid "Factory for the Evolution notes component."
+msgstr "Evolution 便签组件车间。"
 
-# mail/mail-config.glade.h:83
-# mail/mail-config.glade.h:83
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
-#, fuzzy
-msgid "Default Folders"
-msgstr "特殊文件夹"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# notes/GNOME_Evolution_Notes.oaf.in.h:4
+#: notes/GNOME_Evolution_Notes.oaf.in.h:4
+msgid "Factory for the Notes control"
+msgstr "便签控制车间"
 
 # shell/GNOME_Evolution_Shell.oaf.in.h:1
 # shell/GNOME_Evolution_Shell.oaf.in.h:1
 # shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "Evolution shell。"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
-msgstr ""
-
 # shell/e-activity-handler.c:200
 # shell/e-activity-handler.c:200
 # shell/e-activity-handler.c:200
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "显示细节"
 
 # shell/e-activity-handler.c:202
 # shell/e-activity-handler.c:202
 # shell/e-activity-handler.c:202
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "取消操作"
 
+# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "收件箱"
+
+# shell/e-local-storage.c:175
+# shell/e-local-storage.c:175
+# shell/e-local-storage.c:175
+#: shell/e-local-storage.c:175
+msgid "Outbox"
+msgstr "发件箱"
+
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+#: shell/e-local-storage.c:636
+msgid "Local Folders"
+msgstr "本地文件夹"
+
 # shell/e-setup.c:124
 # shell/e-setup.c:124
 # shell/e-setup.c:124
-#: shell/e-setup.c:126
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "安装 Evolution"
 
 # shell/e-setup.c:128
 # shell/e-setup.c:128
 # shell/e-setup.c:128
-#: shell/e-setup.c:130
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -38933,23 +38292,21 @@ msgstr ""
 # shell/e-setup.c:129
 # shell/e-setup.c:129
 # shell/e-setup.c:129
-#: shell/e-setup.c:131
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"请点击“确认”以安装文件，或者点击“取消”以便退出�"
-"�"
+msgstr "请点击“确认”以安装文件，或者点击“取消”以便退出。"
 
 # shell/e-setup.c:169
 # shell/e-setup.c:169
 # shell/e-setup.c:169
-#: shell/e-setup.c:171
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "无法正确地更新文件"
 
 # shell/e-setup.c:192
 # shell/e-setup.c:192
 # shell/e-setup.c:192
-#: shell/e-setup.c:194
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -38963,7 +38320,7 @@ msgstr ""
 # shell/e-setup.c:207
 # shell/e-setup.c:207
 # shell/e-setup.c:207
-#: shell/e-setup.c:209
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -38975,7 +38332,7 @@ msgstr ""
 # camel/camel-session.c:532
 # shell/e-setup.c:280
 # shell/e-setup.c:280
-#: shell/e-setup.c:282
+#: shell/e-setup.c:280
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -38988,7 +38345,7 @@ msgstr ""
 
 # shell/e-setup.c:298
 # shell/e-setup.c:298
-#: shell/e-setup.c:300
+#: shell/e-setup.c:298
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -39001,7 +38358,7 @@ msgstr ""
 
 # shell/e-setup.c:304
 # shell/e-setup.c:304
-#: shell/e-setup.c:306
+#: shell/e-setup.c:304
 #, c-format
 msgid ""
 "File %s\n"
@@ -39015,7 +38372,7 @@ msgstr ""
 # shell/e-setup.c:281
 # shell/e-setup.c:327
 # shell/e-setup.c:327
-#: shell/e-setup.c:329
+#: shell/e-setup.c:327
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -39028,7 +38385,7 @@ msgstr ""
 # shell/e-setup.c:295
 # shell/e-setup.c:341
 # shell/e-setup.c:341
-#: shell/e-setup.c:343
+#: shell/e-setup.c:341
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -39045,7 +38402,7 @@ msgstr ""
 # shell/e-setup.c:320
 # shell/e-setup.c:366
 # shell/e-setup.c:366
-#: shell/e-setup.c:368
+#: shell/e-setup.c:366
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -39055,6 +38412,20 @@ msgstr ""
 "目录“%s”存在，但不是 Evolution 目录。\n"
 "请移走它以便安装 Evolution 用户文件。"
 
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+#: shell/e-shell-about-box.c:40
+msgid "Evolution "
+msgstr "Evolution "
+
+# shell/e-shell-about-box.c:41
+# shell/e-shell-about-box.c:41
+# shell/e-shell-about-box.c:41
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "版权所有 1999，2000，2001 Ximian 公司。"
+
 # shell/e-shell-about-box.c:43
 # shell/e-shell-about-box.c:43
 # shell/e-shell-about-box.c:43
@@ -39062,52 +38433,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "制作团队"
 
-# camel/providers/local/camel-mbox-summary.c:370
-# camel/providers/local/camel-spool-summary.c:497
-# camel/providers/local/camel-mbox-summary.c:370
-# camel/providers/local/camel-spool-summary.c:497
-# camel/providers/local/camel-mbox-summary.c:370
-# camel/providers/local/camel-spool-summary.c:497
-#: shell/e-shell-folder-commands.c:140
-#, fuzzy, c-format
-msgid "Cannot copy folder: %s"
-msgstr "无法检查文件夹： %s： %s"
-
-# shell/e-shell-folder-commands.c:488
-# shell/e-shell-folder-commands.c:488
-# shell/e-shell-folder-commands.c:488
-#: shell/e-shell-folder-commands.c:143
-#, fuzzy, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-"无法重命名文件夹：\n"
-"%s"
-
 # shell/e-shell-folder-commands.c:176
 # shell/e-shell-folder-commands.c:176
 # shell/e-shell-folder-commands.c:176
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "无法把文件夹移动到它本身。"
 
 # shell/e-shell-folder-commands.c:178
 # shell/e-shell-folder-commands.c:178
 # shell/e-shell-folder-commands.c:178
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr "无法把文件夹复制到它本身。"
 
 # shell/e-shell-folder-commands.c:192
 # shell/e-shell-folder-commands.c:192
 # shell/e-shell-folder-commands.c:192
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr "无法把文件夹移动到它子目录。"
 
 # shell/e-shell-folder-commands.c:307
 # shell/e-shell-folder-commands.c:307
 # shell/e-shell-folder-commands.c:307
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "给出一个文件夹以便将文件夹“%s”复制进去："
@@ -39115,14 +38465,14 @@ msgstr "给出一个文件夹以便将文件夹“%s”复制进去："
 # shell/e-shell-folder-commands.c:312
 # shell/e-shell-folder-commands.c:312
 # shell/e-shell-folder-commands.c:312
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr "复制文件夹"
 
 # shell/e-shell-folder-commands.c:354
 # shell/e-shell-folder-commands.c:354
 # shell/e-shell-folder-commands.c:354
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "给出一个文件夹以便将文件夹“%s”移动进去："
@@ -39130,14 +38480,14 @@ msgstr "给出一个文件夹以便将文件夹“%s”移动进去："
 # shell/e-shell-folder-commands.c:359
 # shell/e-shell-folder-commands.c:359
 # shell/e-shell-folder-commands.c:359
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr "移动文件夹"
 
 # shell/e-shell-folder-commands.c:385
 # shell/e-shell-folder-commands.c:385
 # shell/e-shell-folder-commands.c:385
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:385
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -39149,7 +38499,7 @@ msgstr ""
 # shell/e-shell-folder-commands.c:401
 # shell/e-shell-folder-commands.c:401
 # shell/e-shell-folder-commands.c:401
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:401
 #, c-format
 msgid "Delete \"%s\""
 msgstr "删除“%s”"
@@ -39158,7 +38508,7 @@ msgstr "删除“%s”"
 # shell/e-shell-folder-commands.c:411
 # shell/e-shell-folder-commands.c:411
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
+#: shell/e-shell-folder-commands.c:411
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "您确认您要删除文件夹“%s”？"
@@ -39166,7 +38516,7 @@ msgstr "您确认您要删除文件夹“%s”？"
 # shell/e-shell-folder-commands.c:488
 # shell/e-shell-folder-commands.c:488
 # shell/e-shell-folder-commands.c:488
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -39178,7 +38528,7 @@ msgstr ""
 # shell/e-shell-folder-commands.c:537
 # shell/e-shell-folder-commands.c:537
 # shell/e-shell-folder-commands.c:537
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:537
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "把文件夹“%s”重命名为："
@@ -39186,7 +38536,7 @@ msgstr "把文件夹“%s”重命名为："
 # shell/e-shell-folder-commands.c:544
 # shell/e-shell-folder-commands.c:544
 # shell/e-shell-folder-commands.c:544
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:544
 msgid "Rename folder"
 msgstr "重命名文件夹"
 
@@ -39196,7 +38546,7 @@ msgstr "重命名文件夹"
 # shell/e-shell-folder-creation-dialog.c:148
 # shell/e-shell-folder-commands.c:554
 # shell/e-shell-folder-creation-dialog.c:168
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:554
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -39217,7 +38567,7 @@ msgstr ""
 # shell/e-shell-folder-creation-dialog.c:267
 # shell/e-shell-folder-creation-dialog.c:267
 # shell/e-shell-folder-creation-dialog.c:304
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:304
 msgid "Evolution - Create new folder"
 msgstr "Evolution - 创建新文件夹"
 
@@ -39242,7 +38592,7 @@ msgstr "正在新建..."
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(无标题)"
 
@@ -39264,11 +38614,9 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"选择您希望导入到 Evolution "
-"的文件，并从列表中选择文件的类型。\n"
+"选择您希望导入到 Evolution 的文件，并从列表中选择文件的类型。\n"
 "\n"
-"如果您不清楚，可以选择“自动”，Evolution "
-"将试图为您确定类型。"
+"如果您不清楚，可以选择“自动”，Evolution 将试图为您确定类型。"
 
 # shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
 # shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
@@ -39508,8 +38856,8 @@ msgstr "无法启动 Evolution 邮件助手界面\n"
 # shell/e-shell-user-creatable-items-handler.c:495
 # shell/e-shell-user-creatable-items-handler.c:540
 # widgets/misc/e-charset-picker.c:104
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:495
+#: shell/e-shell-user-creatable-items-handler.c:540
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "新建"
@@ -39545,84 +38893,99 @@ msgstr "“.”和“..”是保留文件夹名。"
 # shell/e-shell-view-menu.c:165
 # shell/e-shell-view-menu.c:165
 # shell/e-shell-view-menu.c:165
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "在您的 $PATH 中找不到 Bug buddy。"
 
 # shell/e-shell-view-menu.c:173
 # shell/e-shell-view-menu.c:173
 # shell/e-shell-view-menu.c:173
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "无法运行 Bug buddy。"
 
 # shell/e-shell-view-menu.c:215
 # shell/e-shell-view-menu.c:215
 # shell/e-shell-view-menu.c:215
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:215
 msgid "About Ximian Evolution"
 msgstr "关于 Ximian Evolution"
 
 # shell/e-shell-view-menu.c:424
 # shell/e-shell-view-menu.c:424
 # shell/e-shell-view-menu.c:424
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:424
 msgid "Go to folder..."
 msgstr "转到文件夹..."
 
 # shell/e-shell-view-menu.c:425
 # shell/e-shell-view-menu.c:425
 # shell/e-shell-view-menu.c:425
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:425
 msgid "Select the folder that you want to open"
 msgstr "选择您希望打开的文件夹"
 
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:545
 msgid "Create a new shortcut"
 msgstr "创建新快捷方式"
 
 # shell/e-shell-view-menu.c:546
 # shell/e-shell-view-menu.c:546
 # shell/e-shell-view-menu.c:546
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:546
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "选择您希望快捷方式指向的文件夹："
 
+# shell/e-shell-view-menu.c:577
+# shell/e-shell-view-menu.c:577
+# shell/e-shell-view-menu.c:577
+#: shell/e-shell-view-menu.c:577
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "GNOME Pilot 工具好像并未安装到系统中。"
+
+# shell/e-shell-view-menu.c:585
+# shell/e-shell-view-menu.c:585
+# shell/e-shell-view-menu.c:585
+#: shell/e-shell-view-menu.c:585
+#, c-format
+msgid "Error executing %s."
+msgstr "执行 %s 错误。"
+
 # shell/e-shell-view-menu.c:688
 # shell/e-shell-view-menu.c:688
 # shell/e-shell-view-menu.c:688
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:688
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "离线工作(_W)"
 
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "离线工作"
 
 # shell/e-shell-view.c:214
 # shell/e-shell-view.c:214
 # shell/e-shell-view.c:215
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:215
 msgid "(No folder displayed)"
 msgstr "(未显示文件夹)"
 
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1598
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1598
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -39630,14 +38993,14 @@ msgstr "%s (%d)"
 # shell/e-shell-view.c:1587
 # shell/e-shell-view.c:1587
 # shell/e-shell-view.c:1600
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1600
 msgid "(None)"
 msgstr "(无)"
 
 # shell/e-shell-view.c:1634
 # shell/e-shell-view.c:1634
 # shell/e-shell-view.c:1647
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1647
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -39645,37 +39008,22 @@ msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
 # shell/e-shell-view.c:1641
 # shell/e-shell-view.c:1641
 # shell/e-shell-view.c:1654
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1654
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution 正在离线过程中。"
 
 # shell/e-shell-view.c:1647
 # shell/e-shell-view.c:1647
 # shell/e-shell-view.c:1660
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1660
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
 
-# shell/evolution-shell-component-utils.c:134
-# shell/evolution-shell-component-utils.c:134
-# shell/evolution-shell-component-utils.c:134
-#: shell/e-shell.c:169
-#, fuzzy, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"来自激活系统的错误是：\n"
-"%s"
-
 # shell/e-shell.c:651
 # shell/e-shell.c:651
 # shell/e-shell.c:651
-#: shell/e-shell.c:764
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "无法设置本地存储 -- %s"
@@ -39683,7 +39031,7 @@ msgstr "无法设置本地存储 -- %s"
 # shell/e-shell.c:1659
 # shell/e-shell.c:1659
 # shell/e-shell.c:1660
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1660
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -39694,47 +39042,31 @@ msgstr ""
 " 组件已经意外退出了。为了重新访问数据\n"
 "您需要退出 Evolution 并重新启动。"
 
-# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
-# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
-# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
-# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
-# calendar/gui/e-itip-control.c:788 calendar/gui/e-itip-control.c:807
-# calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:833
-# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:861
-# shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
-# calendar/gui/e-itip-control.c:791 calendar/gui/e-itip-control.c:810
-# calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
-# calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
-# shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "确定"
-
 # shell/e-shell.c:1886
 # shell/e-shell.c:1886
 # shell/e-shell.c:1887
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:1887
 msgid "Invalid arguments"
 msgstr "无效参数"
 
 # shell/e-shell.c:1888
 # shell/e-shell.c:1888
 # shell/e-shell.c:1889
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:1889
 msgid "Cannot register on OAF"
 msgstr "无法注册到 OAF"
 
 # shell/e-shell.c:1890
 # shell/e-shell.c:1890
 # shell/e-shell.c:1891
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:1891
 msgid "Configuration Database not found"
 msgstr "找不到配置数据库"
 
 # shell/e-shell.c:1892 shell/e-storage.c:500
 # shell/e-shell.c:1892 shell/e-storage.c:500
 # shell/e-shell.c:1893 shell/e-storage.c:500
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:1893 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "通用错误"
 
@@ -39935,122 +39267,124 @@ msgstr "从快捷方式栏上删除该快捷方式"
 # shell/e-shortcuts.c:640
 # shell/e-shortcuts.c:640
 # shell/e-shortcuts.c:640
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "保存快捷方式错误。"
 
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "快捷方式"
 
-# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "收件箱"
+# shell/e-storage-set-view.c:658
+# shell/e-storage-set-view.c:658
+# shell/e-storage-set-view.c:658
+#: shell/e-storage-set-view.c:658
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"无法转移文件夹：\n"
+"%s"
 
-# calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-# calendar/gui/e-meeting-model.c:794
-# calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-# calendar/gui/e-meeting-model.c:794
-# my-evolution/Locations.h:432
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "主席"
+# shell/e-storage.c:181 shell/e-storage.c:187
+# shell/e-storage.c:181 shell/e-storage.c:187
+# shell/e-storage.c:181 shell/e-storage.c:187
+#: shell/e-storage.c:181 shell/e-storage.c:187
+msgid "(No name)"
+msgstr "(未命名)"
 
 # shell/e-storage.c:498
 # shell/e-storage.c:498
 # shell/e-storage.c:498
-#: shell/e-storage.c:485
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "无错误"
 
 # shell/e-storage.c:502
 # shell/e-storage.c:502
 # shell/e-storage.c:502
-#: shell/e-storage.c:489
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "已经有一个同名文件夹存在"
 
 # shell/e-storage.c:504
 # shell/e-storage.c:504
 # shell/e-storage.c:504
-#: shell/e-storage.c:491
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "指定的文件夹类型无效"
 
 # shell/e-storage.c:506
 # shell/e-storage.c:506
 # shell/e-storage.c:506
-#: shell/e-storage.c:493
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "输入输出错误"
 
 # shell/e-storage.c:508
 # shell/e-storage.c:508
 # shell/e-storage.c:508
-#: shell/e-storage.c:495
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "没有足够的空间创建文件夹"
 
 # shell/e-storage.c:510
 # shell/e-storage.c:510
 # shell/e-storage.c:510
-#: shell/e-storage.c:497
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr "文件夹不为空"
 
 # shell/e-storage.c:512
 # shell/e-storage.c:512
 # shell/e-storage.c:512
-#: shell/e-storage.c:499
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "找不到指定的文件夹"
 
 # shell/e-storage.c:514
 # shell/e-storage.c:514
 # shell/e-storage.c:514
-#: shell/e-storage.c:501
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "在该存储中没有实现该功能"
 
 # shell/e-storage.c:518
 # shell/e-storage.c:518
 # shell/e-storage.c:518
-#: shell/e-storage.c:505
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "不支持的操作"
 
 # shell/e-storage.c:520
 # shell/e-storage.c:520
 # shell/e-storage.c:520
-#: shell/e-storage.c:507
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "在该存储中不支持指定的类型"
 
 # shell/e-storage.c:522
 # shell/e-storage.c:522
 # shell/e-storage.c:522
-#: shell/e-storage.c:509
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "无法修改或删除指定的文件夹"
 
 # shell/e-storage.c:524
 # shell/e-storage.c:524
 # shell/e-storage.c:524
-#: shell/e-storage.c:511
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "无法使文件夹成为它的子目录的子目录"
 
 # shell/e-storage.c:526
 # shell/e-storage.c:526
 # shell/e-storage.c:526
-#: shell/e-storage.c:513
+#: shell/e-storage.c:526
 msgid "Cannot create a folder with that name"
 msgstr "无法以那个名字创建文件夹"
 
@@ -40066,13 +39400,10 @@ msgstr "%s (...)"
 # shell/e-task-widget.c:196
 # shell/e-task-widget.c:196
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
-#: shell/evolution-folder-selector-button.c:84
-msgid "<click here to select a folder>"
-msgstr "<点击这里以便选择文件夹>"
-
 # shell/evolution-shell-component-utils.c:124
 # shell/evolution-shell-component-utils.c:124
 # shell/evolution-shell-component-utils.c:124
@@ -40122,112 +39453,112 @@ msgstr ""
 # shell/evolution-shell-component.c:1009
 # shell/evolution-shell-component.c:1009
 # shell/evolution-shell-component.c:1022
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1022
 msgid "CORBA error"
 msgstr "CORBA 错误"
 
 # shell/evolution-shell-component.c:1011
 # shell/evolution-shell-component.c:1011
 # shell/evolution-shell-component.c:1024
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1024
 msgid "Interrupted"
 msgstr "被中断"
 
 # shell/evolution-shell-component.c:1013
 # shell/evolution-shell-component.c:1013
 # shell/evolution-shell-component.c:1026
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1026
 msgid "Invalid argument"
 msgstr "无效参数"
 
 # shell/evolution-shell-component.c:1015
 # shell/evolution-shell-component.c:1015
 # shell/evolution-shell-component.c:1028
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1028
 msgid "Already has an owner"
 msgstr "已经有所有者了"
 
 # shell/evolution-shell-component.c:1017
 # shell/evolution-shell-component.c:1017
 # shell/evolution-shell-component.c:1030
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1030
 msgid "No owner"
 msgstr "无所有者"
 
 # shell/evolution-shell-component.c:1019
 # shell/evolution-shell-component.c:1019
 # shell/evolution-shell-component.c:1032
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1032
 msgid "Not found"
 msgstr "没找到"
 
 # shell/evolution-shell-component.c:1021
 # shell/evolution-shell-component.c:1021
 # shell/evolution-shell-component.c:1034
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1034
 msgid "Unsupported type"
 msgstr "不支持的类型"
 
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1036
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1036
 msgid "Unsupported schema"
 msgstr "不支持的方案"
 
 # shell/evolution-shell-component.c:1025
 # shell/evolution-shell-component.c:1025
 # shell/evolution-shell-component.c:1038
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1038
 msgid "Unsupported operation"
 msgstr "不支持的操作"
 
 # shell/evolution-shell-component.c:1027
 # shell/evolution-shell-component.c:1027
 # shell/evolution-shell-component.c:1040
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1040
 msgid "Internal error"
 msgstr "内部错误"
 
 # shell/evolution-shell-component.c:1031
 # shell/evolution-shell-component.c:1031
 # shell/evolution-shell-component.c:1044
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1044
 msgid "Exists"
 msgstr "存在"
 
 # shell/evolution-shell-component.c:1033
 # shell/evolution-shell-component.c:1033
 # shell/evolution-shell-component.c:1046
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1046
 msgid "Invalid URI"
 msgstr "无效 URI"
 
 # shell/evolution-shell-component.c:1037
 # shell/evolution-shell-component.c:1037
 # shell/evolution-shell-component.c:1050
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1050
 msgid "Has subfolders"
 msgstr "含有子文件夹"
 
 # shell/evolution-shell-component.c:1039
 # shell/evolution-shell-component.c:1039
 # shell/evolution-shell-component.c:1052
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1052
 msgid "No space left"
 msgstr "没有剩余空间"
 
 # shell/evolution-shell-component.c:1041
 # shell/evolution-shell-component.c:1041
 # shell/evolution-shell-component.c:1054
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1054
 msgid "Old owner has died"
 msgstr "原所有者已死"
 
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:627
 # shell/evolution-test-component.c:41
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:41
 msgid "Test type"
 msgstr "测试类型"
 
@@ -40433,28 +39764,28 @@ msgstr "Evolution 可以从下列文件中导入数据："
 # data/evolution.desktop.in.h:1 shell/main.c:83
 # shell/main.c:83
 # shell/main.c:83
-#: shell/main.c:89
+#: shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
 # shell/main.c:89
 # shell/main.c:89
 # shell/main.c:89
-#: shell/main.c:95
+#: shell/main.c:89
 msgid "Evolution is now exiting ..."
 msgstr "Evolution 正在退出 ..."
 
 # shell/main.c:210
 # shell/main.c:210
 # shell/main.c:210
-#: shell/main.c:227
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "无法访问 Ximian Evolution shell。"
 
 # shell/main.c:219
 # shell/main.c:219
 # shell/main.c:219
-#: shell/main.c:236
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "无法初始化 Ximian Evolution shell： %s"
@@ -40462,44 +39793,21 @@ msgstr "无法初始化 Ximian Evolution shell： %s"
 # shell/main.c:289
 # shell/main.c:289
 # shell/main.c:289
-#: shell/main.c:317
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "禁用启动屏幕"
 
-# importers/netscape-importer.c:897
-# importers/netscape-importer.c:897
-# importers/netscape-importer.c:897
-#: shell/main.c:318
-#, fuzzy
-msgid "Start in offline mode"
-msgstr "开始导入"
-
-# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
-# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
-# shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/main.c:319
-#, fuzzy
-msgid "Start in online mode"
-msgstr "启动智能导入器"
-
 # shell/main.c:290
 # shell/main.c:290
 # shell/main.c:290
-#: shell/main.c:320
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有成员的调试输出发送到一个文件中。"
 
-#: shell/main.c:338
-#, c-format
-msgid ""
-"%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
-msgstr ""
-
 # shell/main.c:332
 # shell/main.c:332
 # shell/main.c:332
-#: shell/main.c:368
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "无法初始化 Bonobo 成员系统。"
 
@@ -40539,152 +39847,134 @@ msgstr "输出文件"
 msgid "No filename provided."
 msgstr "没有提供文件名。"
 
-# ui/evolution-mail-message.xml.h:7
-# ui/evolution-mail-message.xml.h:7
-# ui/evolution-mail-message.xml.h:7
-#: ui/evolution-addressbook.xml.h:3
-#, fuzzy
-msgid "Copy Contact(s) to Another Folder..."
-msgstr "把选中的消息复制到其它文件夹"
-
 # ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 # ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 # ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "复制选中内容"
 
-# mail/folder-browser.c:1467
-# mail/folder-browser.c:1476
-# mail/folder-browser.c:1477
-#: ui/evolution-addressbook.xml.h:5
-#, fuzzy
-msgid "Copy to Folder..."
-msgstr "复制到文件夹..."
-
 # ui/evolution-addressbook.xml.h:4
 # ui/evolution-addressbook.xml.h:4
 # ui/evolution-addressbook.xml.h:4
-#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "创建新的联系人"
 
 # ui/evolution-addressbook.xml.h:5
 # ui/evolution-addressbook.xml.h:5
 # ui/evolution-addressbook.xml.h:5
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:5
 msgid "Create new contact list"
 msgstr "创建新的联系人列表"
 
 # ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 # ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 # ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "剪切选中内容"
 
 # ui/evolution-addressbook.xml.h:9
 # ui/evolution-addressbook.xml.h:9
 # ui/evolution-addressbook.xml.h:9
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "删除选中的联系人"
 
-# ui/evolution-mail-message.xml.h:53
-# ui/evolution-mail-message.xml.h:53
-# ui/evolution-mail-message.xml.h:53
-#: ui/evolution-addressbook.xml.h:13
-#, fuzzy
-msgid "Move Contact(s) to Another Folder..."
-msgstr "把选中的邮件移动到其它文件夹"
-
-# mail/folder-browser.c:1466
-# mail/folder-browser.c:1475
-# mail/folder-browser.c:1476
-#: ui/evolution-addressbook.xml.h:14
-#, fuzzy
-msgid "Move to Folder..."
-msgstr "移动到文件夹(_M)..."
+# ui/evolution-addressbook.xml.h:12
+# ui/evolution-addressbook.xml.h:12
+# ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:12
+msgid "New List"
+msgstr "新列表"
 
 # ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 # ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 # ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
 # ui/evolution-addressbook.xml.h:15
 # ui/evolution-addressbook.xml.h:15
 # ui/evolution-addressbook.xml.h:15
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "预览将要打印的联系人"
 
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-addressbook.xml.h:18
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "打印选中的联系人"
 
 # ui/evolution-addressbook.xml.h:20
 # ui/evolution-addressbook.xml.h:20
 # ui/evolution-addressbook.xml.h:20
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "把选中的联系人保存为 VCard。"
 
 # ui/evolution-addressbook.xml.h:21
 # ui/evolution-addressbook.xml.h:21
 # ui/evolution-addressbook.xml.h:21
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "全选"
 
 # ui/evolution-addressbook.xml.h:22
 # ui/evolution-addressbook.xml.h:22
 # ui/evolution-addressbook.xml.h:22
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "选中所有的联系人"
 
+# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "给联系人发邮件(_M)..."
+
 # ui/evolution-addressbook.xml.h:24
 # ui/evolution-addressbook.xml.h:24
 # ui/evolution-addressbook.xml.h:24
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send a mess to the selected contacts."
 msgstr "给选定的联系人发邮件。"
 
 # ui/evolution-addressbook.xml.h:25
 # ui/evolution-addressbook.xml.h:25
 # ui/evolution-addressbook.xml.h:25
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send message to contact"
 msgstr "给联系人发邮件"
 
 # ui/evolution-addressbook.xml.h:26
 # ui/evolution-addressbook.xml.h:26
 # ui/evolution-addressbook.xml.h:26
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send selected contacts to another person."
 msgstr "把选中的联系人发送给其他人。"
 
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "停止"
 
 # ui/evolution-addressbook.xml.h:28
 # ui/evolution-addressbook.xml.h:28
 # ui/evolution-addressbook.xml.h:28
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "停止载入"
 
 # ui/evolution-addressbook.xml.h:29
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "查看当前联系人"
 
@@ -40706,16 +39996,29 @@ msgstr "查看当前联系人"
 # ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 # ui/evolution-mail-message.xml.h:93 ui/evolution-mail-messagedisplay.xml.h:4
 # ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:16
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:93 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:16
 msgid "_Actions"
 msgstr "动作(_A)"
 
+# ui/evolution-addressbook.xml.h:30
+# ui/evolution-addressbook.xml.h:30
+# ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Addressbook Sources..."
+msgstr "地址簿来源(_A)..."
+
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "联系人(_C)"
+
 # ui/evolution-addressbook.xml.h:32
 # ui/evolution-addressbook.xml.h:32
 # ui/evolution-addressbook.xml.h:33
@@ -40726,173 +40029,249 @@ msgstr "联系人列表(_C)"
 # ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 # ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 # ui/evolution-addressbook.xml.h:36 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:36 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "转发联系人(_F)..."
 
-# mail/folder-browser.c:1466
-# mail/folder-browser.c:1475
-# mail/folder-browser.c:1476
-#: ui/evolution-addressbook.xml.h:38
-msgid "_Move to Folder..."
-msgstr "移动到文件夹(_M)..."
+# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
+# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
+# ui/my-evolution.xml.h:7
+# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
+# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
+# ui/my-evolution.xml.h:7
+# ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
+# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
+# ui/my-evolution.xml.h:7
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
+#: ui/my-evolution.xml.h:7
+msgid "_Print..."
+msgstr "打印(_P)..."
 
 # ui/evolution-addressbook.xml.h:38
 # ui/evolution-addressbook.xml.h:38
 # ui/evolution-addressbook.xml.h:40
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Save as VCard"
 msgstr "另存为 VCard(_S)"
 
 # ui/evolution-addressbook.xml.h:39
 # ui/evolution-addressbook.xml.h:39
 # ui/evolution-addressbook.xml.h:41
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Search for Contacts"
 msgstr "搜索联系人(_S)"
 
 # ui/evolution-addressbook.xml.h:40
 # ui/evolution-addressbook.xml.h:40
 # ui/evolution-addressbook.xml.h:42
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "全选(_S)"
 
-# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-addressbook.xml.h:45
-#, fuzzy
-msgid "_Send Message to Contact..."
-msgstr "给联系人发邮件(_M)..."
+# ui/evolution-calendar.xml.h:2
+# ui/evolution-calendar.xml.h:2
+# ui/evolution-calendar.xml.h:2
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr "配置日历的设置"
+
+# ui/evolution-calendar.xml.h:4
+# ui/evolution-calendar.xml.h:4
+# ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a New All Day _Event"
+msgstr "创建一个新的全天事件(_E)"
+
+# ui/evolution-calendar.xml.h:5
+# ui/evolution-calendar.xml.h:5
+# ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
+#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
+msgid "Create a New _Task"
+msgstr "创建新任务(_T)"
+
+# ui/evolution-calendar.xml.h:6
+# ui/evolution-calendar.xml.h:6
+# ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a _New Appointment"
+msgstr "创建新约会(_N)"
+
+# ui/evolution-calendar.xml.h:9
+# ui/evolution-calendar.xml.h:9
+# ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
+msgid "Create an event for the whole day"
+msgstr "为一整天创建一个事件"
 
 # ui/evolution-calendar.xml.h:11
 # ui/evolution-calendar.xml.h:11
 # ui/evolution-calendar.xml.h:11
-#: ui/evolution-calendar.xml.h:4
+#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "天"
 
 # ui/evolution-calendar.xml.h:12
 # ui/evolution-calendar.xml.h:12
 # ui/evolution-calendar.xml.h:12
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:12
 msgid "Delete the appointment"
 msgstr "删除约会"
 
 # ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
 # ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
 # ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
 msgid "Go To"
 msgstr "转到"
 
 # ui/evolution-calendar.xml.h:14
 # ui/evolution-calendar.xml.h:14
 # ui/evolution-calendar.xml.h:14
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back"
 msgstr "退回"
 
 # ui/evolution-calendar.xml.h:15
 # ui/evolution-calendar.xml.h:15
 # ui/evolution-calendar.xml.h:15
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward"
 msgstr "前进"
 
 # ui/evolution-calendar.xml.h:16
 # ui/evolution-calendar.xml.h:16
 # ui/evolution-calendar.xml.h:16
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "转到日期(_D)"
 
 # ui/evolution-calendar.xml.h:18
 # ui/evolution-calendar.xml.h:18
 # ui/evolution-calendar.xml.h:18
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "转到指定日期"
 
 # ui/evolution-calendar.xml.h:19
 # ui/evolution-calendar.xml.h:19
 # ui/evolution-calendar.xml.h:19
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to today"
 msgstr "转到今天"
 
 # ui/evolution-calendar.xml.h:20
 # ui/evolution-calendar.xml.h:20
 # ui/evolution-calendar.xml.h:20
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "月"
 
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
+msgid "New Appointment"
+msgstr "新建约会"
+
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
+msgid "New Task"
+msgstr "新建任务"
+
 # ui/evolution-calendar.xml.h:24
 # ui/evolution-calendar.xml.h:24
 # ui/evolution-calendar.xml.h:24
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "预览将要打印的日历"
 
 # ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 # ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 # ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 msgid "Print Pre_view"
 msgstr "打印预览(_V)"
 
 # ui/evolution-calendar.xml.h:26
 # ui/evolution-calendar.xml.h:26
 # ui/evolution-calendar.xml.h:26
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this calendar"
 msgstr "打印该日历"
 
 # ui/evolution-calendar.xml.h:27
 # ui/evolution-calendar.xml.h:27
 # ui/evolution-calendar.xml.h:27
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr "为该日历发布忙闲信息"
 
 # ui/evolution-calendar.xml.h:28
 # ui/evolution-calendar.xml.h:28
 # ui/evolution-calendar.xml.h:28
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "显示一天"
 
 # ui/evolution-calendar.xml.h:29
 # ui/evolution-calendar.xml.h:29
 # ui/evolution-calendar.xml.h:29
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "显示一个月"
 
 # ui/evolution-calendar.xml.h:30
 # ui/evolution-calendar.xml.h:30
 # ui/evolution-calendar.xml.h:30
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "显示一周"
 
 # ui/evolution-calendar.xml.h:31
 # ui/evolution-calendar.xml.h:31
 # ui/evolution-calendar.xml.h:31
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "显示工作周"
 
 # ui/evolution-calendar.xml.h:32
 # ui/evolution-calendar.xml.h:32
 # ui/evolution-calendar.xml.h:32
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "周"
 
+# ui/evolution-calendar.xml.h:35
+# ui/evolution-calendar.xml.h:35
+# ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:35
+msgid "_Appointment..."
+msgstr "约会(_A)..."
+
+# ui/evolution-calendar.xml.h:36
+# ui/evolution-calendar.xml.h:36
+# ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:36
+msgid "_Calendar Settings..."
+msgstr "日历设置(_C)..."
+
+# ui/evolution-calendar.xml.h:42
+# ui/evolution-calendar.xml.h:42
+# ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:42
+msgid "_Publish Free/Busy Information"
+msgstr "发布忙闲信息(_P)"
+
+# ui/evolution-calendar.xml.h:43
+# ui/evolution-calendar.xml.h:43
+# ui/evolution-calendar.xml.h:43
+#: ui/evolution-calendar.xml.h:43
+msgid "_Task..."
+msgstr "任务(_T)..."
+
 # ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 # ui/evolution-contact-list-editor.xml.h:1
 # ui/evolution-mail-messagedisplay.xml.h:1
@@ -40955,6 +40334,13 @@ msgstr "预览被打印项"
 msgid "Print this item"
 msgstr "打印该项"
 
+# ui/evolution-comp-editor.xml.h:11
+# ui/evolution-comp-editor.xml.h:11
+# ui/evolution-comp-editor.xml.h:11
+#: ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "打印..."
+
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
@@ -40962,20 +40348,10 @@ msgstr "打印该项"
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 msgid "Save"
 msgstr "保存"
 
-# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-# widgets/misc/e-filter-bar.h:101
-# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-# widgets/misc/e-filter-bar.h:101
-# calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-# widgets/misc/e-filter-bar.h:101
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
-msgstr "另存为..."
-
 # ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 # ui/evolution-contact-list-editor.xml.h:6
 # ui/evolution-signature-editor.xml.h:4
@@ -40987,7 +40363,7 @@ msgstr "另存为..."
 # ui/evolution-signature-editor.xml.h:4
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "保存并关闭"
 
@@ -41027,8 +40403,8 @@ msgstr "把该项保存到磁盘"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "文件(_F)"
 
@@ -41061,13 +40437,6 @@ msgstr "另存为(_A)..."
 msgid "Save the contact and close the dialog box"
 msgstr "保存联系人并关闭对话框"
 
-# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "给联系人发邮件(_M)..."
-
 # ui/evolution-contact-editor.xml.h:15
 # ui/evolution-contact-list-editor.xml.h:12
 # ui/evolution-message-composer.xml.h:53
@@ -41083,7 +40452,7 @@ msgstr "给联系人发邮件(_M)..."
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "保存(_S)"
 
@@ -41185,13 +40554,6 @@ msgstr "为此项调度会议"
 msgid "Customise My Evolution"
 msgstr "定制我的 Evolution"
 
-# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
-# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
-# calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "取消"
-
 # ui/evolution-mail-global.xml.h:2
 # ui/evolution-mail-global.xml.h:2
 # ui/evolution-mail-global.xml.h:2
@@ -41206,94 +40568,143 @@ msgstr "取消当前邮件操作"
 msgid "Compose _New Message"
 msgstr "撰写新邮件(_N)"
 
+# ui/evolution-mail-global.xml.h:4
+# ui/evolution-mail-global.xml.h:4
+# ui/evolution-mail-global.xml.h:4
+#: ui/evolution-mail-global.xml.h:4
+msgid "Create or edit mail accounts and other preferences"
+msgstr "创建或编辑邮件帐号和其它属性"
+
 # ui/evolution-mail-global.xml.h:5
 # ui/evolution-mail-global.xml.h:5
 # ui/evolution-mail-global.xml.h:5
-#: ui/evolution-mail-global.xml.h:4
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "创建或编辑过滤新邮件的规则"
 
 # ui/evolution-mail-global.xml.h:6
 # ui/evolution-mail-global.xml.h:6
 # ui/evolution-mail-global.xml.h:6
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "创建或编辑虚拟文件夹定义"
 
 # ui/evolution-mail-global.xml.h:7
 # ui/evolution-mail-global.xml.h:7
 # ui/evolution-mail-global.xml.h:7
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "清空已删除邮件(_T)"
 
 # ui/evolution-mail-global.xml.h:8
 # ui/evolution-mail-global.xml.h:8
 # ui/evolution-mail-global.xml.h:8
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "丢弃密码(_P)"
 
 # ui/evolution-mail-global.xml.h:9
 # ui/evolution-mail-global.xml.h:9
 # ui/evolution-mail-global.xml.h:9
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "保存的密码被丢弃，所以将再次提示您输入密码"
 
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:10
+msgid "New Message"
+msgstr "新建邮件"
+
 # ui/evolution-mail-global.xml.h:11
 # ui/evolution-mail-global.xml.h:11
 # ui/evolution-mail-global.xml.h:11
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "打开窗口以书写邮件"
 
 # ui/evolution-mail-global.xml.h:12
 # ui/evolution-mail-global.xml.h:12
 # ui/evolution-mail-global.xml.h:12
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "永久删除所有文件夹中的所有已删除的邮件"
 
+# ui/evolution-mail-global.xml.h:13
+# ui/evolution-mail-global.xml.h:13
+# ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:13
+msgid "Send / Receive"
+msgstr "发送和接收"
+
+# ui/evolution-mail-global.xml.h:14
+# ui/evolution-mail-global.xml.h:14
+# ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send queued mail and retrieve new mail"
+msgstr "发送编队的邮件并检索新邮件"
+
 # ui/evolution-mail-global.xml.h:15
 # ui/evolution-mail-global.xml.h:15
 # ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr "显示邮件预览窗口"
 
 # ui/evolution-mail-global.xml.h:16
 # ui/evolution-mail-global.xml.h:16
 # ui/evolution-mail-global.xml.h:16
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "订阅 或 取消订阅远程服务器上的文件夹"
 
 # ui/evolution-mail-global.xml.h:17
 # ui/evolution-mail-global.xml.h:17
 # ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "虚拟文件夹编辑器(_E)..."
 
 # ui/evolution-mail-global.xml.h:19
 # ui/evolution-mail-global.xml.h:19
 # ui/evolution-mail-global.xml.h:19
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "邮件过滤(_F)..."
 
+# ui/evolution-mail-global.xml.h:20
+# ui/evolution-mail-global.xml.h:20
+# ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "邮件(_M)"
+
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "邮件设置(_M)..."
+
 # ui/evolution-mail-global.xml.h:22
 # ui/evolution-mail-global.xml.h:22
 # ui/evolution-mail-global.xml.h:22
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "预览窗口(_P)"
 
+# ui/evolution-mail-global.xml.h:23
+# ui/evolution-mail-global.xml.h:23
+# ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "发送和接收(_S)"
+
 # ui/evolution-mail-global.xml.h:24
 # ui/evolution-mail-global.xml.h:24
 # ui/evolution-mail-global.xml.h:24
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:24
 msgid "_Subscribe to Folders..."
 msgstr "订阅到文件夹(_S)..."
 
@@ -41455,14 +40866,14 @@ msgstr "按线索编排的邮件列表"
 # ui/evolution-mail-list.xml.h:26
 # ui/evolution-mail-list.xml.h:26
 # ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:20
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:20
 msgid "_Expunge"
 msgstr "删除(_E)"
 
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 msgid "_Folder"
 msgstr "文件夹(_F)"
 
@@ -41487,268 +40898,255 @@ msgstr "属性(_P)"
 msgid "_Threaded Message List"
 msgstr "按线索编排的邮件列表(_T)"
 
-# mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
-# mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
-# mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-mail-message.xml.h:1
-#, fuzzy
-msgid "A_dd Sender to Addressbook"
-msgstr "将发件人添加到地址簿"
-
-# mail/folder-browser.c:1476
-# mail/folder-browser.c:1485
-# mail/folder-browser.c:1486
-#: ui/evolution-mail-message.xml.h:2
-#, fuzzy
-msgid "A_pply Filters"
-msgstr "应用过滤规则"
-
-# mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
-# mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
-# mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-mail-message.xml.h:3
-#, fuzzy
-msgid "Add Sender to Addressbook"
-msgstr "将发件人添加到地址簿"
-
 # ui/evolution-mail-message.xml.h:2
 # ui/evolution-mail-message.xml.h:2
 # ui/evolution-mail-message.xml.h:2
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:2
 msgid "Apply filter rules to the selected messages"
 msgstr "应用过滤规则到选中的邮件"
 
 # ui/evolution-mail-message.xml.h:3
 # ui/evolution-mail-message.xml.h:3
 # ui/evolution-mail-message.xml.h:3
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:3
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "为选中邮件的所有收件人撰写回复"
 
 # ui/evolution-mail-message.xml.h:4
 # ui/evolution-mail-message.xml.h:4
 # ui/evolution-mail-message.xml.h:4
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "为选中邮件的邮件列表撰写回复"
 
 # ui/evolution-mail-message.xml.h:5
 # ui/evolution-mail-message.xml.h:5
 # ui/evolution-mail-message.xml.h:5
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to the sender of the selected message"
 msgstr "为选中邮件的发件人撰写回复"
 
 # ui/evolution-mail-message.xml.h:7
 # ui/evolution-mail-message.xml.h:7
 # ui/evolution-mail-message.xml.h:7
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:7
 msgid "Copy selected messages to another folder"
 msgstr "把选中的消息复制到其它文件夹"
 
 # ui/evolution-mail-message.xml.h:8
 # ui/evolution-mail-message.xml.h:8
 # ui/evolution-mail-message.xml.h:8
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create _Virtual Folder From Message"
 msgstr "从邮件创建虚拟文件夹(_V)"
 
 # ui/evolution-mail-message.xml.h:9
 # ui/evolution-mail-message.xml.h:9
 # ui/evolution-mail-message.xml.h:9
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages from this sender"
 msgstr "为来自该发件人的邮件创建邮件过滤规则"
 
 # ui/evolution-mail-message.xml.h:10
 # ui/evolution-mail-message.xml.h:10
 # ui/evolution-mail-message.xml.h:10
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to these recipients"
 msgstr "为发送给这些收件人的邮件创建邮件过滤规则"
 
 # ui/evolution-mail-message.xml.h:11
 # ui/evolution-mail-message.xml.h:11
 # ui/evolution-mail-message.xml.h:11
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "为该邮件列表创建邮件过滤规则"
 
 # ui/evolution-mail-message.xml.h:12
 # ui/evolution-mail-message.xml.h:12
 # ui/evolution-mail-message.xml.h:12
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages with this subject"
 msgstr "为该标题创建邮件过滤规则"
 
 # ui/evolution-mail-message.xml.h:13
 # ui/evolution-mail-message.xml.h:13
 # ui/evolution-mail-message.xml.h:13
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for these recipients"
 msgstr "为这些收件人创建虚拟文件夹"
 
 # ui/evolution-mail-message.xml.h:14
 # ui/evolution-mail-message.xml.h:14
 # ui/evolution-mail-message.xml.h:14
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this mailing list"
 msgstr "为该邮件列表创建虚拟文件夹"
 
 # ui/evolution-mail-message.xml.h:15
 # ui/evolution-mail-message.xml.h:15
 # ui/evolution-mail-message.xml.h:15
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this sender"
 msgstr "为该发件人创建虚拟文件夹"
 
 # ui/evolution-mail-message.xml.h:16
 # ui/evolution-mail-message.xml.h:16
 # ui/evolution-mail-message.xml.h:16
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this subject"
 msgstr "为该主题创建虚拟文件夹"
 
 # ui/evolution-mail-message.xml.h:17
 # ui/evolution-mail-message.xml.h:17
 # ui/evolution-mail-message.xml.h:17
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 msgid "Decrease the text size"
 msgstr "缩减文本大小"
 
 # ui/evolution-mail-message.xml.h:19
 # ui/evolution-mail-message.xml.h:19
 # ui/evolution-mail-message.xml.h:19
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next important message"
 msgstr "显示下一个重要邮件"
 
 # ui/evolution-mail-message.xml.h:20
 # ui/evolution-mail-message.xml.h:20
 # ui/evolution-mail-message.xml.h:20
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next message"
 msgstr "显示下一个邮件"
 
 # ui/evolution-mail-message.xml.h:21
 # ui/evolution-mail-message.xml.h:21
 # ui/evolution-mail-message.xml.h:21
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread message"
 msgstr "显示下一个未读文件"
 
 # ui/evolution-mail-message.xml.h:22
 # ui/evolution-mail-message.xml.h:22
 # ui/evolution-mail-message.xml.h:22
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next unread thread"
 msgstr "显示下一个未阅读的线索"
 
 # ui/evolution-mail-message.xml.h:23
 # ui/evolution-mail-message.xml.h:23
 # ui/evolution-mail-message.xml.h:23
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous important message"
 msgstr "显示上一个重要邮件"
 
 # ui/evolution-mail-message.xml.h:24
 # ui/evolution-mail-message.xml.h:24
 # ui/evolution-mail-message.xml.h:24
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous message"
 msgstr "显示上一个邮件"
 
 # ui/evolution-mail-message.xml.h:25
 # ui/evolution-mail-message.xml.h:25
 # ui/evolution-mail-message.xml.h:25
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous unread message"
 msgstr "显示上一个未读邮件"
 
-# ui/evolution-mail-message.xml.h:31
-# ui/evolution-mail-message.xml.h:31
-# ui/evolution-mail-message.xml.h:31
-#: ui/evolution-mail-message.xml.h:28
-#, fuzzy
-msgid "F_orward"
-msgstr "转发"
-
 # ui/evolution-mail-message.xml.h:26
 # ui/evolution-mail-message.xml.h:26
 # ui/evolution-mail-message.xml.h:26
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Mailing _List..."
 msgstr "过滤邮件列表(_L)..."
 
 # ui/evolution-mail-message.xml.h:27
 # ui/evolution-mail-message.xml.h:27
 # ui/evolution-mail-message.xml.h:27
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on Se_nder..."
 msgstr "过滤发件人(_N)..."
 
 # ui/evolution-mail-message.xml.h:28
 # ui/evolution-mail-message.xml.h:28
 # ui/evolution-mail-message.xml.h:28
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on _Recipients..."
 msgstr "过滤收件人(_R)..."
 
 # ui/evolution-mail-message.xml.h:29
 # ui/evolution-mail-message.xml.h:29
 # ui/evolution-mail-message.xml.h:29
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on _Subject..."
 msgstr "过滤标题(_S)..."
 
-# ui/evolution-mail-message.xml.h:51
-# ui/evolution-mail-message.xml.h:51
-# ui/evolution-mail-message.xml.h:51
-#: ui/evolution-mail-message.xml.h:33
-#, fuzzy
-msgid "Flag selected message(s) for follow-up"
-msgstr "为选定的邮件做删除标记"
-
-# addressbook/gui/contact-editor/contact-editor.glade.h:15
-# addressbook/gui/contact-editor/contact-editor.glade.h:15
-# addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ui/evolution-mail-message.xml.h:34
-#, fuzzy
-msgid "Follow _Up..."
-msgstr "全名(_N)..."
-
 # ui/evolution-mail-message.xml.h:30
 # ui/evolution-mail-message.xml.h:30
 # ui/evolution-mail-message.xml.h:30
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:30
 msgid "Force images in HTML mail to be loaded"
 msgstr "强制装入 HTML 邮件中的图像"
 
+# ui/evolution-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:31
+msgid "Forward"
+msgstr "转发"
+
+# ui/evolution-mail-message.xml.h:32
+# ui/evolution-mail-message.xml.h:32
+# ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:32
+msgid "Forward As"
+msgstr "转发方式"
+
+# ui/evolution-mail-message.xml.h:33
+# ui/evolution-mail-message.xml.h:33
+# ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:33
+msgid "Forward _Attached"
+msgstr "附件方式(_A)"
+
+# ui/evolution-mail-message.xml.h:34
+# ui/evolution-mail-message.xml.h:34
+# ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward _Inline"
+msgstr "内文方式(_I)"
+
+# ui/evolution-mail-message.xml.h:35
+# ui/evolution-mail-message.xml.h:35
+# ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward _Quoted"
+msgstr "引用方式(_Q)"
+
 # ui/evolution-mail-message.xml.h:36
 # ui/evolution-mail-message.xml.h:36
 # ui/evolution-mail-message.xml.h:36
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message in the body of a new message"
 msgstr "在新邮件体中转发选定的邮件"
 
 # ui/evolution-mail-message.xml.h:37
 # ui/evolution-mail-message.xml.h:37
 # ui/evolution-mail-message.xml.h:37
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message quoted like a reply"
 msgstr "以类似于回复的引用方式转发选定的邮件"
 
 # ui/evolution-mail-message.xml.h:38
 # ui/evolution-mail-message.xml.h:38
 # ui/evolution-mail-message.xml.h:38
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone"
 msgstr "把选定的邮件转发给某人"
 
 # ui/evolution-mail-message.xml.h:39
 # ui/evolution-mail-message.xml.h:39
 # ui/evolution-mail-message.xml.h:39
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone as an attachment"
 msgstr "把选定的邮件作为附件转发给某人"
 
@@ -41773,13 +41171,6 @@ msgstr "装入图像(_I)"
 msgid "Mark as I_mportant"
 msgstr "标记为重要(_M)"
 
-# mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
-# mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
-# mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-#: ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
-msgstr "标记为未读(_N)"
-
 # ui/evolution-mail-message.xml.h:46
 # ui/evolution-mail-message.xml.h:46
 # ui/evolution-mail-message.xml.h:46
@@ -41791,32 +41182,28 @@ msgstr "标记为不重要(_O)"
 # ui/evolution-mail-message.xml.h:47
 # ui/evolution-mail-message.xml.h:47
 #: ui/evolution-mail-message.xml.h:47
-#, fuzzy
-msgid "Mark the selected message(s) as having been read"
+msgid "Mark the selected messages as having been read"
 msgstr "把选定的邮件标记为已读"
 
 # ui/evolution-mail-message.xml.h:48
 # ui/evolution-mail-message.xml.h:48
 # ui/evolution-mail-message.xml.h:48
 #: ui/evolution-mail-message.xml.h:48
-#, fuzzy
-msgid "Mark the selected message(s) as important"
+msgid "Mark the selected messages as important"
 msgstr "报选定的邮件标记为重要邮件"
 
 # ui/evolution-mail-message.xml.h:49
 # ui/evolution-mail-message.xml.h:49
 # ui/evolution-mail-message.xml.h:49
 #: ui/evolution-mail-message.xml.h:49
-#, fuzzy
-msgid "Mark the selected message(s) as not having been read"
+msgid "Mark the selected messages as not having been read"
 msgstr "把选定的邮件标记为未读"
 
 # ui/evolution-mail-message.xml.h:50
 # ui/evolution-mail-message.xml.h:50
 # ui/evolution-mail-message.xml.h:50
 #: ui/evolution-mail-message.xml.h:50
-#, fuzzy
-msgid "Mark the selected message(s) as unimportant"
+msgid "Mark the selected messages as unimportant"
 msgstr "把选定的邮件标记为不重要邮件"
 
 # ui/evolution-mail-message.xml.h:51
@@ -41837,8 +41224,7 @@ msgstr "移动"
 # ui/evolution-mail-message.xml.h:53
 # ui/evolution-mail-message.xml.h:53
 #: ui/evolution-mail-message.xml.h:53
-#, fuzzy
-msgid "Move selected message(s) to another folder"
+msgid "Move selected messages to another folder"
 msgstr "把选中的邮件移动到其它文件夹"
 
 # ui/evolution-mail-message.xml.h:54
@@ -41852,261 +41238,266 @@ msgstr "下一个"
 # ui/evolution-mail-message.xml.h:55
 # ui/evolution-mail-message.xml.h:55
 #: ui/evolution-mail-message.xml.h:55
-#, fuzzy
-msgid "Next _Important Message"
+msgid "Next Important Message"
 msgstr "下一个重要邮件"
 
+# ui/evolution-mail-message.xml.h:56
+# ui/evolution-mail-message.xml.h:56
+# ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:56
+msgid "Next Message"
+msgstr "下一个邮件"
+
 # ui/evolution-mail-message.xml.h:57
 # ui/evolution-mail-message.xml.h:57
 # ui/evolution-mail-message.xml.h:57
-#: ui/evolution-mail-message.xml.h:56
-#, fuzzy
-msgid "Next _Thread"
+#: ui/evolution-mail-message.xml.h:57
+msgid "Next Thread"
 msgstr "下一个线索"
 
 # ui/evolution-mail-message.xml.h:58
 # ui/evolution-mail-message.xml.h:58
 # ui/evolution-mail-message.xml.h:58
-#: ui/evolution-mail-message.xml.h:57
-#, fuzzy
-msgid "Next _Unread Message"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Next Unread Message"
 msgstr "下一个未读邮件"
 
 # ui/evolution-mail-message.xml.h:59
 # ui/evolution-mail-message.xml.h:59
 # ui/evolution-mail-message.xml.h:59
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in a new window"
 msgstr "在新窗口中打开选中的邮件"
 
 # ui/evolution-mail-message.xml.h:60
 # ui/evolution-mail-message.xml.h:60
 # ui/evolution-mail-message.xml.h:60
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:60
 msgid "Open the selected message in the composer to re-send it"
 msgstr "在邮件撰写器中打开选中的邮件以便重发"
 
 # ui/evolution-mail-message.xml.h:61
 # ui/evolution-mail-message.xml.h:61
 # ui/evolution-mail-message.xml.h:61
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:61
 msgid "Original Si_ze"
 msgstr "原大小(_Z)"
 
-# ui/evolution-mail-message.xml.h:66
-# ui/evolution-mail-message.xml.h:66
-# ui/evolution-mail-message.xml.h:66
-#: ui/evolution-mail-message.xml.h:61
-#, fuzzy
-msgid "P_revious Unread Message"
-msgstr "上一个未读邮件"
-
-# ui/evolution-mail-message.xml.h:64
-# ui/evolution-mail-message.xml.h:64
-# ui/evolution-mail-message.xml.h:64
-#: ui/evolution-mail-message.xml.h:62
-#, fuzzy
-msgid "Pr_evious Important Message"
-msgstr "上一个重要邮件"
-
 # ui/evolution-mail-message.xml.h:62
 # ui/evolution-mail-message.xml.h:62
 # ui/evolution-mail-message.xml.h:62
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:62
 msgid "Preview the message to be printed"
 msgstr "预览需打印的邮件"
 
 # ui/evolution-mail-message.xml.h:63
 # ui/evolution-mail-message.xml.h:63
 # ui/evolution-mail-message.xml.h:63
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous"
 msgstr "上一个"
 
+# ui/evolution-mail-message.xml.h:64
+# ui/evolution-mail-message.xml.h:64
+# ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:64
+msgid "Previous Important Message"
+msgstr "上一个重要邮件"
+
+# ui/evolution-mail-message.xml.h:65
+# ui/evolution-mail-message.xml.h:65
+# ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:65
+msgid "Previous Message"
+msgstr "上一个邮件"
+
+# ui/evolution-mail-message.xml.h:66
+# ui/evolution-mail-message.xml.h:66
+# ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:66
+msgid "Previous Unread Message"
+msgstr "上一个未读邮件"
+
 # ui/evolution-mail-message.xml.h:69
 # ui/evolution-mail-message.xml.h:69
 # ui/evolution-mail-message.xml.h:69
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "打印该邮件"
 
 # ui/evolution-mail-message.xml.h:70
-#: ui/evolution-mail-message.xml.h:68
-#, fuzzy
-msgid "Re_direct"
+#: ui/evolution-mail-message.xml.h:70
+msgid "Redirect"
 msgstr "转发"
 
 # ui/evolution-mail-message.xml.h:38
 # ui/evolution-mail-message.xml.h:38
 # ui/evolution-mail-message.xml.h:71
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "将选定的消息转发(退回)给某人"
 
+# ui/evolution-mail-message.xml.h:70
+# ui/evolution-mail-message.xml.h:70
+# ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:72
+msgid "Reply"
+msgstr "回复"
+
+# ui/evolution-mail-message.xml.h:71
+# ui/evolution-mail-message.xml.h:71
+# ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reply to All"
+msgstr "全部回复"
+
 # ui/evolution-mail-message.xml.h:74
 # ui/evolution-mail-message.xml.h:74
 # ui/evolution-mail-message.xml.h:76
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "把文件重新设置为原来的大小"
 
 # ui/evolution-mail-message.xml.h:75
 # ui/evolution-mail-message.xml.h:75
 # ui/evolution-mail-message.xml.h:77
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "搜索邮件(_E)"
 
 # ui/evolution-mail-message.xml.h:76
 # ui/evolution-mail-message.xml.h:76
 # ui/evolution-mail-message.xml.h:78
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "更小(_M)"
 
 # ui/evolution-mail-message.xml.h:77
 # ui/evolution-mail-message.xml.h:77
 # ui/evolution-mail-message.xml.h:79
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "把邮件存为文本文件"
 
 # ui/evolution-mail-message.xml.h:78
 # ui/evolution-mail-message.xml.h:78
 # ui/evolution-mail-message.xml.h:80
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "在显示邮件的邮件体中搜索文本"
 
 # ui/evolution-mail-message.xml.h:79
 # ui/evolution-mail-message.xml.h:79
 # ui/evolution-mail-message.xml.h:81
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "设定您当前打印机的页面设置"
 
 # ui/evolution-mail-message.xml.h:80
 # ui/evolution-mail-message.xml.h:80
 # ui/evolution-mail-message.xml.h:82
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "显示电子邮件源代码(_S)"
 
 # ui/evolution-mail-message.xml.h:81
 # ui/evolution-mail-message.xml.h:81
 # ui/evolution-mail-message.xml.h:83
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "显示完整的邮件头(_H)"
 
 # ui/evolution-mail-message.xml.h:82
 # ui/evolution-mail-message.xml.h:82
 # ui/evolution-mail-message.xml.h:84
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "以常用方式显示邮件"
 
 # ui/evolution-mail-message.xml.h:83
 # ui/evolution-mail-message.xml.h:83
 # ui/evolution-mail-message.xml.h:85
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "显示邮件时显示所有邮件头"
 
 # ui/evolution-mail-message.xml.h:84
 # ui/evolution-mail-message.xml.h:84
 # ui/evolution-mail-message.xml.h:86
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "显示邮件的原始邮件源代码"
 
 # ui/evolution-mail-message.xml.h:85
 # ui/evolution-mail-message.xml.h:85
 # ui/evolution-mail-message.xml.h:87
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "文本大小(_Z)"
 
 # ui/evolution-mail-message.xml.h:86
 # ui/evolution-mail-message.xml.h:86
 # ui/evolution-mail-message.xml.h:88
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "反删除选中的邮件"
 
 # ui/evolution-mail-message.xml.h:87
 # ui/evolution-mail-message.xml.h:87
 # ui/evolution-mail-message.xml.h:89
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "关于邮件列表的虚拟文件夹(_L)..."
 
 # ui/evolution-mail-message.xml.h:88
 # ui/evolution-mail-message.xml.h:88
 # ui/evolution-mail-message.xml.h:90
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "关于发件人的虚拟文件夹(_N)..."
 
 # ui/evolution-mail-message.xml.h:89
 # ui/evolution-mail-message.xml.h:89
 # ui/evolution-mail-message.xml.h:91
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "关于收件人的虚拟文件夹(_R)..."
 
 # ui/evolution-mail-message.xml.h:90
 # ui/evolution-mail-message.xml.h:90
 # ui/evolution-mail-message.xml.h:92
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "关于主题的虚拟文件夹(_S)..."
 
-# ui/evolution-message-composer.xml.h:1
-# ui/evolution-message-composer.xml.h:1
-# ui/evolution-message-composer.xml.h:1
-#: ui/evolution-mail-message.xml.h:92
-#, fuzzy
-msgid "_Attached"
-msgstr "附加"
+# ui/evolution-mail-message.xml.h:92
+# ui/evolution-mail-message.xml.h:92
+# ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:94
+msgid "_Apply Filters"
+msgstr "应用过滤规则(_A)"
 
 # ui/evolution-mail-message.xml.h:93
 # ui/evolution-mail-message.xml.h:93
 # ui/evolution-mail-message.xml.h:95
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "复制到文件夹(_C)"
 
 # ui/evolution-mail-message.xml.h:94
 # ui/evolution-mail-message.xml.h:94
 # ui/evolution-mail-message.xml.h:96
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "从邮件创建过滤规则(_C)"
 
 # ui/evolution-mail-message.xml.h:97
 # ui/evolution-mail-message.xml.h:97
 # ui/evolution-mail-message.xml.h:99
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Forward Message"
 msgstr "转发邮件(_F)"
 
-# ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
-# ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
-# ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
-#: ui/evolution-mail-message.xml.h:98
-#, fuzzy
-msgid "_Go To"
-msgstr "转到"
-
-# mail/mail-config.glade.h:39
-# mail/mail-config.glade.h:39
-# mail/mail-config.glade.h:46
-#: ui/evolution-mail-message.xml.h:99
-#, fuzzy
-msgid "_Inline"
-msgstr "嵌入"
-
 # ui/evolution-mail-message.xml.h:98
 # ui/evolution-mail-message.xml.h:98
 # ui/evolution-mail-message.xml.h:100
@@ -42128,61 +41519,31 @@ msgstr "邮件显示(_M)"
 msgid "_Move to Folder"
 msgstr "移动到文件夹(_M)"
 
-# ui/evolution-mail-message.xml.h:56
-# ui/evolution-mail-message.xml.h:56
-# ui/evolution-mail-message.xml.h:56
-#: ui/evolution-mail-message.xml.h:103
-#, fuzzy
-msgid "_Next Message"
-msgstr "下一个邮件"
-
 # ui/evolution-mail-message.xml.h:101
 # ui/evolution-mail-message.xml.h:101
 # ui/evolution-mail-message.xml.h:103
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Normal Display"
 msgstr "普通显示(_N)"
 
 # ui/evolution-mail-message.xml.h:102
 # ui/evolution-mail-message.xml.h:102
 # ui/evolution-mail-message.xml.h:104
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Open Message"
 msgstr "打开邮件(_O)"
 
-# ui/evolution-mail-message.xml.h:65
-# ui/evolution-mail-message.xml.h:65
-# ui/evolution-mail-message.xml.h:65
-#: ui/evolution-mail-message.xml.h:106
-#, fuzzy
-msgid "_Previous Message"
-msgstr "上一个邮件"
-
-# mail/mail-config.glade.h:59
-# mail/mail-config.glade.h:59
-# mail/mail-config.glade.h:68
-#: ui/evolution-mail-message.xml.h:108
-#, fuzzy
-msgid "_Quoted"
-msgstr "已引用"
-
 # ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
 # ui/my-evolution.xml.h:9
 # ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
 # ui/my-evolution.xml.h:9
 # ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
 # ui/my-evolution.xml.h:9
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "工具(_T)"
 
-# mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
-# mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
-# mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-#: ui/evolution-mail-message.xml.h:112
-msgid "_Undelete"
-msgstr "反删除(_U)"
-
 # ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 # ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 # ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
@@ -42204,8 +41565,8 @@ msgstr "关闭该窗口"
 # ui/evolution.xml.h:33
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -42216,7 +41577,7 @@ msgstr "关闭(_C)"
 # ui/evolution-mail-messagedisplay.xml.h:8
 # ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "查看(_V)"
 
@@ -42258,14 +41619,14 @@ msgstr "用您的 S/MIME 加密证书加密该邮件"
 # ui/evolution-message-composer.xml.h:8
 # ui/evolution-message-composer.xml.h:8
 # ui/evolution-message-composer.xml.h:8
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8
 msgid "For_mat"
 msgstr "格式(_M)"
 
 # ui/evolution-message-composer.xml.h:9
 # ui/evolution-message-composer.xml.h:9
 # ui/evolution-message-composer.xml.h:9
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:9
 msgid "H_TML"
 msgstr "HTML(_T)"
 
@@ -42290,16 +41651,6 @@ msgstr "把文件作为文本插入邮件"
 msgid "Insert text file..."
 msgstr "插入文本文件..."
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-# ui/evolution-message-composer.xml.h:13
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-# ui/evolution-message-composer.xml.h:13
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
-# ui/evolution-message-composer.xml.h:13
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "打开"
-
 # ui/evolution-message-composer.xml.h:14
 # ui/evolution-message-composer.xml.h:14
 # ui/evolution-message-composer.xml.h:14
@@ -42363,7 +41714,7 @@ msgstr "保存到文件夹..."
 # ui/evolution-message-composer.xml.h:24
 # ui/evolution-signature-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "保存当前文件"
 
@@ -42406,7 +41757,6 @@ msgstr "以后发送(_L)"
 # ui/evolution-message-composer.xml.h:30
 # ui/evolution-message-composer.xml.h:30
 #: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "以 HTML 格式发送邮件"
 
@@ -42529,7 +41879,7 @@ msgstr "发件人域(_F)"
 # ui/evolution-message-composer.xml.h:50
 # ui/evolution-signature-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -42547,10 +41897,17 @@ msgstr "打开(_O)..."
 msgid "_Reply-To Field"
 msgstr "回复域(_R)"
 
+# ui/evolution-message-composer.xml.h:54
+# ui/evolution-message-composer.xml.h:54
+# ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "安全(_S)"
+
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "帮助(_H)"
 
@@ -42645,63 +42002,68 @@ msgstr "获取最新的任务信息"
 msgid "Re_fresh Task"
 msgstr "刷新任务(_F)"
 
+# ui/evolution-tasks.xml.h:2
+# ui/evolution-tasks.xml.h:2
+# ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr "配置任务试图的设置"
+
 # ui/evolution-tasks.xml.h:4
 # ui/evolution-tasks.xml.h:4
 # ui/evolution-tasks.xml.h:4
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "复制选中的任务"
 
 # ui/evolution-tasks.xml.h:7
 # ui/evolution-tasks.xml.h:7
 # ui/evolution-tasks.xml.h:8
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:8
 msgid "Cut selected task"
 msgstr "剪切选中的任务"
 
 # ui/evolution-tasks.xml.h:9
 # ui/evolution-tasks.xml.h:9
 # ui/evolution-tasks.xml.h:9
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete completed tasks"
 msgstr "删除已完成的任务"
 
 # ui/evolution-tasks.xml.h:9
 # ui/evolution-tasks.xml.h:9
 # ui/evolution-tasks.xml.h:10
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:10
 msgid "Delete selected tasks"
 msgstr "删除选中的任务"
 
 # calendar/gui/e-calendar-table.c:954
 # calendar/gui/e-calendar-table.c:954
 # ui/evolution-tasks.xml.h:11
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:11
 msgid "Mar_k as Complete"
 msgstr "标记为完成(_K)"
 
 # ui/evolution-tasks.xml.h:12
 # ui/evolution-tasks.xml.h:12
 # ui/evolution-tasks.xml.h:14
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:14
 msgid "Paste task from the clipboard"
 msgstr "从剪贴板中粘贴任务"
 
-# ui/evolution-addressbook.xml.h:15
-# ui/evolution-addressbook.xml.h:15
-# ui/evolution-addressbook.xml.h:15
-#: ui/evolution-tasks.xml.h:11
-#, fuzzy
-msgid "Previews the list of tasks to be printed"
-msgstr "预览将要打印的联系人"
+# ui/evolution-tasks.xml.h:13
+# ui/evolution-tasks.xml.h:13
+# ui/evolution-tasks.xml.h:15
+#: ui/evolution-tasks.xml.h:15
+msgid "Tasks Settings..."
+msgstr "任务设置..."
 
-# ui/evolution-mail-message.xml.h:69
-# ui/evolution-mail-message.xml.h:69
-# ui/evolution-mail-message.xml.h:69
-#: ui/evolution-tasks.xml.h:13
-#, fuzzy
-msgid "Print the list of tasks"
-msgstr "打印该邮件"
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:22
+#: ui/evolution-tasks.xml.h:22
+msgid "_Task"
+msgstr "任务(_T)"
 
 # ui/evolution.xml.h:1
 # ui/evolution.xml.h:1
@@ -42815,203 +42177,195 @@ msgstr "在新窗口中打开"
 msgid "Open this folder in an other window"
 msgstr "在另一个窗口中打开该文件夹"
 
-# ui/evolution-mail-global.xml.h:13
-# ui/evolution-mail-global.xml.h:13
-# ui/evolution-mail-global.xml.h:13
-#: ui/evolution.xml.h:21
-msgid "Send / Receive"
-msgstr "发送和接收"
-
-# ui/evolution-mail-global.xml.h:14
-# ui/evolution-mail-global.xml.h:14
-# ui/evolution-mail-global.xml.h:14
-#: ui/evolution.xml.h:22
-#, fuzzy
-msgid "Send queued items and retrieve new items"
-msgstr "发送编队的邮件并检索新邮件"
-
 # ui/evolution.xml.h:21
 # ui/evolution.xml.h:21
 # ui/evolution.xml.h:21
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:21
 msgid "Show information about Ximian Evolution"
 msgstr "显示关于 Ximian Evolution 的信息"
 
 # ui/evolution.xml.h:22
 # ui/evolution.xml.h:22
 # ui/evolution.xml.h:22
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Submit Bug Report"
 msgstr "提交错误报告"
 
 # ui/evolution.xml.h:23
 # ui/evolution.xml.h:23
 # ui/evolution.xml.h:23
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:23
 msgid "Submit _Bug Report"
 msgstr "提交错误报告(_B)"
 
 # ui/evolution.xml.h:24
 # ui/evolution.xml.h:24
 # ui/evolution.xml.h:24
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
 # ui/evolution.xml.h:25
 # ui/evolution.xml.h:25
 # ui/evolution.xml.h:25
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Toggle"
 msgstr "反转"
 
 # ui/evolution.xml.h:26
 # ui/evolution.xml.h:26
 # ui/evolution.xml.h:26
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Toggle whether to show the folder bar"
 msgstr "是否显示文件夹栏"
 
 # ui/evolution.xml.h:27
 # ui/evolution.xml.h:27
 # ui/evolution.xml.h:27
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the shortcut bar"
 msgstr "是否显示快捷方式栏"
 
 # ui/evolution.xml.h:28
 # ui/evolution.xml.h:28
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr "我们是否离线工作。"
 
 # ui/evolution.xml.h:29
 # ui/evolution.xml.h:29
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "View the selected folder"
 msgstr "查看选中的文件夹"
 
 # ui/evolution.xml.h:31
 # ui/evolution.xml.h:31
 # ui/evolution.xml.h:31
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution 常见问题(_F)"
 
 # ui/evolution.xml.h:32
 # ui/evolution.xml.h:32
 # ui/evolution.xml.h:32
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "_About Ximian Evolution..."
 msgstr "关于 Ximian Evolution(_A)..."
 
 # ui/evolution.xml.h:34
 # ui/evolution.xml.h:34
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
 # ui/evolution.xml.h:38
 # ui/evolution.xml.h:38
 # ui/evolution.xml.h:38
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:38
 msgid "_Folder Bar"
 msgstr "文件夹工具栏(_F)"
 
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:39
 msgid "_Go to Folder..."
 msgstr "转到文件夹(_G)..."
 
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:41
 msgid "_Import..."
 msgstr "正在导入(_I)..."
 
 # ui/evolution.xml.h:42
 # ui/evolution.xml.h:42
 # ui/evolution.xml.h:42
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:42
 msgid "_Move..."
 msgstr "移动(_M)..."
 
 # ui/evolution.xml.h:43
 # ui/evolution.xml.h:43
 # ui/evolution.xml.h:43
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:43
 msgid "_New"
 msgstr "新建(_N)"
 
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:44
 msgid "_New Folder"
 msgstr "新建文件夹(_N)"
 
 # ui/evolution.xml.h:45
 # ui/evolution.xml.h:45
 # ui/evolution.xml.h:45
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:45
 msgid "_Pilot Settings..."
 msgstr "Pilot 设置(_P)..."
 
 # ui/evolution.xml.h:46
 # ui/evolution.xml.h:46
 # ui/evolution.xml.h:46
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
-# ui/evolution-mail-global.xml.h:23
-# ui/evolution-mail-global.xml.h:23
-# ui/evolution-mail-global.xml.h:23
-#: ui/evolution.xml.h:52
-msgid "_Send / Receive"
-msgstr "发送和接收(_S)"
-
 # ui/evolution.xml.h:47
 # ui/evolution.xml.h:47
 # ui/evolution.xml.h:47
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "快捷方式(_S)"
 
 # ui/evolution.xml.h:48
 # ui/evolution.xml.h:48
 # ui/evolution.xml.h:48
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "快捷方式栏(_S)"
 
+# ui/my-evolution.xml.h:1
+# ui/my-evolution.xml.h:1
+# ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for the summary"
+msgstr "改变关于概要的设置"
+
 # ui/my-evolution.xml.h:4
 # ui/my-evolution.xml.h:4
 # ui/my-evolution.xml.h:4
-#: ui/my-evolution.xml.h:3
+#: ui/my-evolution.xml.h:4
 msgid "Print summary"
 msgstr "打印概要"
 
 # ui/my-evolution.xml.h:5
 # ui/my-evolution.xml.h:5
 # ui/my-evolution.xml.h:5
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:5
 msgid "Reload"
 msgstr "重新载入"
 
 # ui/my-evolution.xml.h:6
 # ui/my-evolution.xml.h:6
 # ui/my-evolution.xml.h:6
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:6
 msgid "Reload the view"
 msgstr "重新载入视图"
 
+# ui/my-evolution.xml.h:8
+# ui/my-evolution.xml.h:8
+# ui/my-evolution.xml.h:8
+#: ui/my-evolution.xml.h:8
+msgid "_Summary Settings..."
+msgstr "概要设置(_S)..."
+
 # views/addressbook/galview.xml.h:1
 # views/addressbook/galview.xml.h:1
 # views/addressbook/galview.xml.h:1
@@ -43033,43 +42387,31 @@ msgstr "按公司"
 msgid "Phone List"
 msgstr "电话列表"
 
-# mail/mail-account-gui.c:837
-# mail/mail-account-gui.c:837
-# mail/mail-account-gui.c:834
-#: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As Sent Folder"
-msgstr "选择文件夹"
-
-#: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr ""
-
 # views/mail/galview.xml.h:1
 # views/mail/galview.xml.h:1
 # views/mail/galview.xml.h:1
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:1
 msgid "By Sender"
 msgstr "按发件人"
 
 # views/mail/galview.xml.h:2
 # views/mail/galview.xml.h:2
 # views/mail/galview.xml.h:2
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:2
 msgid "By Status"
 msgstr "按状态"
 
 # views/mail/galview.xml.h:3
 # views/mail/galview.xml.h:3
 # views/mail/galview.xml.h:3
-#: views/mail/galview.xml.h:5
+#: views/mail/galview.xml.h:3
 msgid "By Subject"
 msgstr "按主题"
 
 # views/mail/galview.xml.h:4
 # views/mail/galview.xml.h:4
 # views/mail/galview.xml.h:4
-#: views/mail/galview.xml.h:6
+#: views/mail/galview.xml.h:4
 msgid "Messages"
 msgstr "邮件"
 
@@ -43124,27 +42466,14 @@ msgstr ""
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "当前视图(_C)"
 
-# widgets/menus/gal-view-menus.c:195
-# widgets/menus/gal-view-menus.c:195
-# widgets/menus/gal-view-menus.c:195
-#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
-#, fuzzy
-msgid "Custom View"
-msgstr "当前视图(_C)"
-
-#: widgets/menus/gal-view-menus.c:333
-msgid "Save Custom View"
-msgstr ""
-
 # widgets/menus/gal-view-menus.c:222
 # widgets/menus/gal-view-menus.c:222
 # widgets/menus/gal-view-menus.c:222
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "定义视图"
 
@@ -43300,7 +42629,7 @@ msgstr "可视"
 # widgets/misc/e-charset-picker.c:159
 # widgets/misc/e-charset-picker.c:159
 # widgets/misc/e-charset-picker.c:162
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:162
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "未知的字符集：%s"
@@ -43308,21 +42637,21 @@ msgstr "未知的字符集：%s"
 # widgets/misc/e-charset-picker.c:201
 # widgets/misc/e-charset-picker.c:201
 # widgets/misc/e-charset-picker.c:204
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:204
 msgid "Enter the character set to use"
 msgstr "输入要使用的字符集"
 
 # widgets/misc/e-charset-picker.c:276
 # widgets/misc/e-charset-picker.c:276
 # widgets/misc/e-charset-picker.c:279
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:279
 msgid "Other..."
 msgstr "其它..."
 
 # widgets/misc/e-charset-picker.c:395
 # widgets/misc/e-charset-picker.c:395
 # widgets/misc/e-charset-picker.c:398
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:398
 msgid "Character Encoding"
 msgstr "字符编码"
 
@@ -43336,33 +42665,39 @@ msgstr "..."
 # widgets/misc/e-filter-bar.c:152
 # widgets/misc/e-filter-bar.c:153
 # widgets/misc/e-filter-bar.c:153
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:153
 msgid "Search Editor"
 msgstr "搜索编辑器"
 
 # widgets/misc/e-filter-bar.c:168
 # widgets/misc/e-filter-bar.c:169
 # widgets/misc/e-filter-bar.c:169
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:169
 msgid "Save Search"
 msgstr "保存搜索"
 
 # widgets/misc/e-filter-bar.c:168
-# widgets/misc/e-filter-bar.c:169
-# widgets/misc/e-filter-bar.c:169
-#: widgets/misc/e-filter-bar.h:97
-#, fuzzy
-msgid "_Save Search..."
-msgstr "保存搜索"
-
-# widgets/misc/e-filter-bar.c:168
 # widgets/misc/e-filter-bar.h:94
 # widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:98
-#, fuzzy
-msgid "_Edit Saved Searches..."
+#: widgets/misc/e-filter-bar.h:94
+msgid "Add to Saved Searches"
 msgstr "添加到被保存搜索"
 
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# widgets/misc/e-filter-bar.h:95
+# widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:95
+msgid "Clear"
+msgstr "清除"
+
+# widgets/misc/e-filter-bar.h:102
+# widgets/misc/e-filter-bar.h:102
+# widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "全部显示"
+
 # widgets/misc/e-messagebox.c:152
 # widgets/misc/e-messagebox.c:152
 # widgets/misc/e-messagebox.c:152
@@ -43370,16 +42705,6 @@ msgstr "添加到被保存搜索"
 msgid "Information"
 msgstr "信息"
 
-# widgets/misc/e-messagebox.c:166
-# widgets/misc/e-messagebox.c:166
-# executive-summary/test-service/rdf-summary.c:512
-# executive-summary/test-service/rdf-summary.c:549
-# executive-summary/test-service/rdf-summary.c:594
-# widgets/misc/e-messagebox.c:166
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "错误"
-
 # widgets/misc/e-messagebox.c:173
 # widgets/misc/e-messagebox.c:173
 # widgets/misc/e-messagebox.c:173
@@ -43402,35 +42727,17 @@ msgstr "邮件"
 msgid "Don't show this message again."
 msgstr "不再显示该邮件。"
 
-# widgets/misc/e-search-bar.c:460
-# widgets/misc/e-search-bar.c:460
-# widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:477
-#, fuzzy
-msgid "_Find Now"
-msgstr "立即查找"
-
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-# widgets/misc/e-filter-bar.h:95
-# widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:478
-#, fuzzy
-msgid "_Clear"
-msgstr "清除"
-
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-# widgets/misc/e-filter-bar.h:95
-# widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:835
-msgid "Clear"
-msgstr "清除"
+# widgets/misc/e-search-bar.c:334
+# widgets/misc/e-search-bar.c:334
+# widgets/misc/e-search-bar.c:334
+#: widgets/misc/e-search-bar.c:334
+msgid "Sear_ch"
+msgstr "搜索(_C)"
 
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "立即查找"
 
@@ -43477,1588 +42784,6 @@ msgstr "init_corba()： 无法初始化 GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo()： 无法初始化 Bonobo"
 
-# addressbook/backend/pas/pas-backend-ldap.c:483
-# addressbook/backend/pas/pas-backend-ldap.c:483
-# addressbook/backend/pas/pas-backend-ldap.c:486
-#~ msgid "Connecting to LDAP server..."
-#~ msgstr "正在连接 LDAP 服务器..."
-
-# addressbook/backend/pas/pas-backend-ldap.c:509
-# addressbook/backend/pas/pas-backend-ldap.c:509
-# addressbook/backend/pas/pas-backend-ldap.c:512
-#~ msgid "Waiting for connection to LDAP server..."
-#~ msgstr "正在等待与 LDAP 服务器的连接..."
-
-# addressbook/gui/component/addressbook-component.c:526
-# addressbook/gui/component/addressbook-component.c:526
-# addressbook/gui/component/addressbook-component.c:527
-#~ msgid "New _Contact"
-#~ msgstr "新建联系人(_C)"
-
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:530
-#~ msgid "New Contact _List"
-#~ msgstr "新建联系人列表(_L)"
-
-# addressbook/gui/component/addressbook-config.c:186
-# addressbook/gui/component/addressbook-config.c:186
-# addressbook/gui/component/addressbook-config.c:223
-#~ msgid "Edit Addressbook"
-#~ msgstr "编辑地址簿"
-
-# camel/providers/smtp/camel-smtp-transport.c:222
-# camel/providers/smtp/camel-smtp-transport.c:222
-# addressbook/gui/component/addressbook-config.glade.h:3
-#~ msgid "A_uthenticate with server using:"
-#~ msgstr "以之与服务器进行认证(_U)："
-
-# addressbook/gui/component/addressbook-config.glade.h:2
-# addressbook/gui/component/addressbook-config.glade.h:2
-# addressbook/gui/component/addressbook-config.glade.h:4
-#~ msgid "Account Name"
-#~ msgstr "帐号名"
-
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/component/addressbook-config.glade.h:5
-#~ msgid "Add Addressbook"
-#~ msgstr "添加地址簿"
-
-# addressbook/gui/component/addressbook-config.glade.h:5
-# addressbook/gui/component/addressbook-config.glade.h:5
-# addressbook/gui/component/addressbook-config.glade.h:7
-#~ msgid "Advanced"
-#~ msgstr "高级"
-
-# addressbook/gui/component/addressbook-config.glade.h:6
-# addressbook/gui/component/addressbook-config.glade.h:6
-# addressbook/gui/component/addressbook-config.glade.h:8
-#~ msgid "Base"
-#~ msgstr "起点"
-
-# addressbook/gui/component/addressbook-config.glade.h:26
-# addressbook/gui/component/addressbook-config.glade.h:26
-# addressbook/gui/component/addressbook-config.glade.h:10
-#~ msgid "Check this if the server requires you to authenticate."
-#~ msgstr "如果服务器需要您进行认证就监查它。"
-
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:14
-#~ msgid ""
-#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
-#~ "server"
-#~ msgstr ""
-#~ "Evolution 将使用该识别姓名 (DN) 在服务器上对您进行认证"
-
-# addressbook/gui/component/addressbook-config.glade.h:14
-# addressbook/gui/component/addressbook-config.glade.h:14
-# addressbook/gui/component/addressbook-config.glade.h:19
-#~ msgid "Server Name"
-#~ msgstr "服务器名"
-
-# addressbook/gui/component/addressbook-config.glade.h:16
-# addressbook/gui/component/addressbook-config.glade.h:16
-# addressbook/gui/component/addressbook-config.glade.h:21
-#~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr "为添加地址簿，需要以下信息。  "
-
-# addressbook/gui/component/addressbook-config.glade.h:17
-# addressbook/gui/component/addressbook-config.glade.h:17
-# addressbook/gui/component/addressbook-config.glade.h:22
-#~ msgid "This information is not required for most ldap servers. "
-#~ msgstr "大部分 LDAP 服务器都不需要该信息。"
-
-# addressbook/gui/component/addressbook-config.glade.h:18
-# addressbook/gui/component/addressbook-config.glade.h:18
-# addressbook/gui/component/addressbook-config.glade.h:23
-#~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
-#~ msgstr ""
-#~ "您的 LDAP "
-#~ "服务器用该信息来确定在搜索中使用那个节点。详情请咨�"
-#~ "�您的服务器管理员。"
-
-# Addressbook/gui/component/addressbook-config.glade.h:19
-# addressbook/gui/component/addressbook-config.glade.h:19
-# addressbook/gui/component/addressbook-config.glade.h:24
-#~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
-#~ msgstr ""
-#~ "这是您在 LDAP "
-#~ "服务器上进行的所有搜索的基本节点。详情请咨询您的服�"
-#~ "�器管理员。"
-
-# addressbook/gui/component/addressbook-config.glade.h:20
-# addressbook/gui/component/addressbook-config.glade.h:20
-# addressbook/gui/component/addressbook-config.glade.h:27
-#~ msgid "This is the name of the server where your addressbook is located."
-#~ msgstr "这是您的地址簿所在的服务器的名称。"
-
-# addressbook/gui/component/addressbook-config.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:28
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "这是您的 LDAP 服务器所使用的端口。"
-
-# addressbook/gui/component/addressbook-storage.c:167
-# addressbook/gui/component/addressbook-storage.c:167
-# addressbook/gui/component/addressbook-storage.c:168
-#~ msgid "Other Contacts"
-#~ msgstr "其他联系人"
-
-# addressbook/gui/component/addressbook.c:804
-# addressbook/gui/component/addressbook.c:804
-# addressbook/gui/component/addressbook.c:837
-#~ msgid "Name contains"
-#~ msgstr "名称含有"
-
-# shell/e-shell-view.c:1587
-# addressbook/gui/component/e-address-popup.c:178
-# addressbook/gui/component/e-address-popup.c:178
-#~ msgid "(none)"
-#~ msgstr "(无)"
-
-# addressbook/gui/component/select-names/select-names.glade.h:1
-# addressbook/gui/component/select-names/select-names.glade.h:1
-# addressbook/gui/component/select-names/select-names.glade.h:1
-#~ msgid "C_ontaining:"
-#~ msgstr "含有(_O)："
-
-# addressbook/gui/component/select-names/select-names.glade.h:5
-# addressbook/gui/component/select-names/select-names.glade.h:5
-# addressbook/gui/component/select-names/select-names.glade.h:4
-#~ msgid "Show contacts matching the following criteria:"
-#~ msgstr "显示符合以下条件的联系人："
-
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr "您确定要删除该联系人吗？"
-
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-#~ msgid "Starting:"
-#~ msgstr "开始："
-
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-#~ msgid "Ending:"
-#~ msgstr "结束："
-
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#~ msgid "Create a new appointment"
-#~ msgstr "创建新约会"
-
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:6
-#~ msgid "Create a new task"
-#~ msgstr "创建新任务"
-
-# calendar/gui/component-factory.c:649
-# calendar/gui/component-factory.c:649
-# calendar/gui/component-factory.c:649
-#~ msgid "New _Task"
-#~ msgstr "新建任务(_T)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "用默认提醒器创建新约会(_R)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#~ msgid "First day of wee_k:"
-#~ msgstr "每周的第一天(_K)："
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#~ msgid "_Other"
-#~ msgstr "其它(_O)"
-
-# calendar/gui/dialogs/meeting-page.etspec.h:2
-# calendar/gui/e-meeting-time-sel.etspec.h:2
-# calendar/gui/dialogs/meeting-page.etspec.h:2
-# calendar/gui/e-meeting-time-sel.etspec.h:2
-# calendar/gui/dialogs/meeting-page.etspec.h:2
-# calendar/gui/e-meeting-time-sel.etspec.h:2
-#~ msgid "Click here to add an attendee"
-#~ msgstr "点击此处添加出席者"
-
-# calendar/gui/e-calendar-table.c:427
-# calendar/gui/e-calendar-table.c:427
-# calendar/gui/e-calendar-table.c:428
-#~ msgid "0%"
-#~ msgstr "0%"
-
-# calendar/gui/e-calendar-table.c:428
-# calendar/gui/e-calendar-table.c:428
-# calendar/gui/e-calendar-table.c:429
-#~ msgid "10%"
-#~ msgstr "10%"
-
-# calendar/gui/e-calendar-table.c:429
-# calendar/gui/e-calendar-table.c:429
-# calendar/gui/e-calendar-table.c:430
-#~ msgid "20%"
-#~ msgstr "20%"
-
-# calendar/gui/e-calendar-table.c:430
-# calendar/gui/e-calendar-table.c:430
-# calendar/gui/e-calendar-table.c:431
-#~ msgid "30%"
-#~ msgstr "30%"
-
-# calendar/gui/e-calendar-table.c:431
-# calendar/gui/e-calendar-table.c:431
-# calendar/gui/e-calendar-table.c:432
-#~ msgid "40%"
-#~ msgstr "40%"
-
-# calendar/gui/e-calendar-table.c:432
-# calendar/gui/e-calendar-table.c:432
-# calendar/gui/e-calendar-table.c:433
-#~ msgid "50%"
-#~ msgstr "50%"
-
-# calendar/gui/e-calendar-table.c:433
-# calendar/gui/e-calendar-table.c:433
-# calendar/gui/e-calendar-table.c:434
-#~ msgid "60%"
-#~ msgstr "60%"
-
-# calendar/gui/e-calendar-table.c:434
-# calendar/gui/e-calendar-table.c:434
-# calendar/gui/e-calendar-table.c:435
-#~ msgid "70%"
-#~ msgstr "70%"
-
-# calendar/gui/e-calendar-table.c:435
-# calendar/gui/e-calendar-table.c:435
-# calendar/gui/e-calendar-table.c:436
-#~ msgid "80%"
-#~ msgstr "80%"
-
-# calendar/gui/e-calendar-table.c:436
-# calendar/gui/e-calendar-table.c:436
-# calendar/gui/e-calendar-table.c:437
-#~ msgid "90%"
-#~ msgstr "90%"
-
-# calendar/gui/e-calendar-table.c:437
-# calendar/gui/e-calendar-table.c:437
-# calendar/gui/e-calendar-table.c:438
-#~ msgid "100%"
-#~ msgstr "100%"
-
-# calendar/gui/e-calendar-table.c:956
-# calendar/gui/e-calendar-table.c:956
-# calendar/gui/e-calendar-table.c:975
-#~ msgid "_Delete this Task"
-#~ msgstr "删除该任务(_D)"
-
-# calendar/gui/e-itip-control.c:532
-# calendar/gui/e-itip-control.c:532
-# calendar/gui/e-itip-control.c:535
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "会议开始：<b>"
-
-# calendar/gui/e-itip-control.c:537
-# calendar/gui/e-itip-control.c:537
-# calendar/gui/e-itip-control.c:540
-#~ msgid "Task begins: <b>"
-#~ msgstr "任务开始：<b>"
-
-# calendar/gui/e-itip-control.c:542
-# calendar/gui/e-itip-control.c:542
-# calendar/gui/e-itip-control.c:545
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "忙闲信息开始于：<b>"
-
-# calendar/gui/e-itip-control.c:546
-# calendar/gui/e-itip-control.c:546
-# calendar/gui/e-itip-control.c:549
-#~ msgid "Begins: <b>"
-#~ msgstr "开始时间：<b>"
-
-# calendar/gui/e-itip-control.c:558
-# calendar/gui/e-itip-control.c:558
-# calendar/gui/e-itip-control.c:561
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "会议结束时间：<b>"
-
-# calendar/gui/e-itip-control.c:561
-# calendar/gui/e-itip-control.c:561
-# calendar/gui/e-itip-control.c:564
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "忙闲信息结束于：<b>"
-
-# calendar/gui/e-itip-control.c:565
-# calendar/gui/e-itip-control.c:565
-# calendar/gui/e-itip-control.c:568
-#~ msgid "Ends: <b>"
-#~ msgstr "结束于：<b>"
-
-# calendar/gui/e-itip-control.c:579
-# calendar/gui/e-itip-control.c:579
-# calendar/gui/e-itip-control.c:582
-#~ msgid "Task Completed: <b>"
-#~ msgstr "任务完成率：<b>"
-
-# calendar/gui/e-itip-control.c:589
-# calendar/gui/e-itip-control.c:589
-# calendar/gui/e-itip-control.c:592
-#~ msgid "Task Due: <b>"
-#~ msgstr "任务到期时间：<b>"
-
-# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
-# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
-# calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#~ msgid "iCalendar Information"
-#~ msgstr "iCalendar 信息"
-
-# calendar/gui/e-itip-control.c:641
-# calendar/gui/e-itip-control.c:641
-# calendar/gui/e-itip-control.c:644
-#~ msgid "iCalendar Error"
-#~ msgstr "iCalendar 错误"
-
-# calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
-# calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
-# calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-#~ msgid "An unknown person"
-#~ msgstr "未知的人"
-
-# calendar/gui/e-itip-control.c:729
-# calendar/gui/e-itip-control.c:729
-# calendar/gui/e-itip-control.c:732
-#~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr ""
-#~ "<br> 请查看下列信息，并从下面的菜单中选择一个动作。"
-
-# calendar/gui/e-itip-control.c:745
-# calendar/gui/e-itip-control.c:745
-# calendar/gui/e-itip-control.c:748
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>无</i>"
-
-# calendar/gui/dialogs/task-details-page.glade.h:15
-# calendar/gui/dialogs/task-details-page.glade.h:15
-# calendar/gui/dialogs/task-details-page.glade.h:15
-#~ msgid "Status:"
-#~ msgstr "状态："
-
-# calendar/gui/e-itip-control.c:804
-# calendar/gui/e-itip-control.c:804
-# calendar/gui/e-itip-control.c:807
-#~ msgid "Tentatively Accepted"
-#~ msgstr "暂时接受"
-
-# calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:802
-# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
-# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
-# calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:802
-# calendar/gui/e-itip-control.c:818 calendar/gui/e-itip-control.c:831
-# calendar/gui/e-itip-control.c:845 calendar/gui/e-itip-control.c:859
-# calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
-# calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
-# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
-#~ msgid "Choose an action:"
-#~ msgstr "选择一项活动："
-
-# calendar/gui/e-itip-control.c:787
-# calendar/gui/e-itip-control.c:787
-# calendar/gui/e-itip-control.c:790
-#~ msgid "Update"
-#~ msgstr "更新"
-
-# calendar/gui/e-itip-control.c:803
-# calendar/gui/e-itip-control.c:803
-# calendar/gui/e-itip-control.c:806
-#~ msgid "Accept"
-#~ msgstr "接受"
-
-# calendar/gui/e-itip-control.c:804
-# calendar/gui/e-itip-control.c:804
-# calendar/gui/e-itip-control.c:807
-#~ msgid "Tentatively accept"
-#~ msgstr "暂时接受"
-
-# calendar/gui/e-itip-control.c:805
-# calendar/gui/e-itip-control.c:805
-# calendar/gui/e-itip-control.c:808
-#~ msgid "Decline"
-#~ msgstr "否决"
-
-# calendar/gui/e-itip-control.c:819
-# calendar/gui/e-itip-control.c:819
-# calendar/gui/e-itip-control.c:822
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "发送忙闲信息"
-
-# calendar/gui/e-itip-control.c:832
-# calendar/gui/e-itip-control.c:832
-# calendar/gui/e-itip-control.c:835
-#~ msgid "Update respondent status"
-#~ msgstr "更新应答者状态"
-
-# calendar/gui/e-itip-control.c:846
-# calendar/gui/e-itip-control.c:846
-# calendar/gui/e-itip-control.c:848
-#~ msgid "Send Latest Information"
-#~ msgstr "发送最新的信息"
-
-# calendar/gui/e-itip-control.c:875
-# calendar/gui/e-itip-control.c:875
-# calendar/gui/e-itip-control.c:909
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> 发布了会议信息。"
-
-# calendar/gui/e-itip-control.c:876
-# calendar/gui/e-itip-control.c:876
-# calendar/gui/e-itip-control.c:910
-#~ msgid "Meeting Information"
-#~ msgstr "会议信息"
-
-# calendar/gui/e-itip-control.c:880
-# calendar/gui/e-itip-control.c:880
-# calendar/gui/e-itip-control.c:914
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> 请求您参加一个会议。"
-
-# calendar/gui/e-itip-control.c:881
-# calendar/gui/e-itip-control.c:881
-# calendar/gui/e-itip-control.c:915
-#~ msgid "Meeting Proposal"
-#~ msgstr "会议建议"
-
-# calendar/gui/e-itip-control.c:885
-# calendar/gui/e-itip-control.c:885
-# calendar/gui/e-itip-control.c:919
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> 希望加入到已存的会议。"
-
-# calendar/gui/e-itip-control.c:886
-# calendar/gui/e-itip-control.c:886
-# calendar/gui/e-itip-control.c:920
-#~ msgid "Meeting Update"
-#~ msgstr "会议更新"
-
-# calendar/gui/e-itip-control.c:890
-# calendar/gui/e-itip-control.c:890
-# calendar/gui/e-itip-control.c:924
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> 想收到最新的会议信息。"
-
-# calendar/gui/e-itip-control.c:891
-# calendar/gui/e-itip-control.c:891
-# calendar/gui/e-itip-control.c:925
-#~ msgid "Meeting Update Request"
-#~ msgstr "会议更新请求"
-
-# calendar/gui/e-itip-control.c:895
-# calendar/gui/e-itip-control.c:895
-# calendar/gui/e-itip-control.c:948
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> 已回复一个会议请求。"
-
-# calendar/gui/e-itip-control.c:896
-# calendar/gui/e-itip-control.c:896
-# calendar/gui/e-itip-control.c:949
-#~ msgid "Meeting Reply"
-#~ msgstr "会议答复"
-
-# calendar/gui/e-itip-control.c:900
-# calendar/gui/e-itip-control.c:900
-# calendar/gui/e-itip-control.c:953
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> 取消了一个会议。"
-
-# calendar/gui/e-itip-control.c:901
-# calendar/gui/e-itip-control.c:901
-# calendar/gui/e-itip-control.c:954
-#~ msgid "Meeting Cancellation"
-#~ msgstr "会议取消"
-
-# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
-# calendar/gui/e-itip-control.c:990
-# calendar/gui/e-itip-control.c:905 calendar/gui/e-itip-control.c:955
-# calendar/gui/e-itip-control.c:990
-# calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
-# calendar/gui/e-itip-control.c:1064
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> 发送了一个无法理解的信息。"
-
-# calendar/gui/e-itip-control.c:906
-# calendar/gui/e-itip-control.c:906
-# calendar/gui/e-itip-control.c:959
-#~ msgid "Bad Meeting Message"
-#~ msgstr "错误的会议信息"
-
-# calendar/gui/e-itip-control.c:925
-# calendar/gui/e-itip-control.c:925
-# calendar/gui/e-itip-control.c:979
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> 发布了任务信息。"
-
-# calendar/gui/e-itip-control.c:926
-# calendar/gui/e-itip-control.c:926
-# calendar/gui/e-itip-control.c:980
-#~ msgid "Task Information"
-#~ msgstr "任务信息"
-
-# calendar/gui/e-itip-control.c:930
-# calendar/gui/e-itip-control.c:930
-# calendar/gui/e-itip-control.c:984
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> 请求您完成一个任务。"
-
-# calendar/gui/e-itip-control.c:931
-# calendar/gui/e-itip-control.c:931
-# calendar/gui/e-itip-control.c:985
-#~ msgid "Task Proposal"
-#~ msgstr "任务建议"
-
-# calendar/gui/e-itip-control.c:935
-# calendar/gui/e-itip-control.c:935
-# calendar/gui/e-itip-control.c:989
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s<b> 希望加入到已存在的任务。"
-
-# calendar/gui/e-itip-control.c:936
-# calendar/gui/e-itip-control.c:936
-# calendar/gui/e-itip-control.c:990
-#~ msgid "Task Update"
-#~ msgstr "任务更新"
-
-# calendar/gui/e-itip-control.c:940
-# calendar/gui/e-itip-control.c:940
-# calendar/gui/e-itip-control.c:994
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> 希望获取最新的任务信息。"
-
-# calendar/gui/e-itip-control.c:941
-# calendar/gui/e-itip-control.c:941
-# calendar/gui/e-itip-control.c:995
-#~ msgid "Task Update Request"
-#~ msgstr "任务更新请求"
-
-# calendar/gui/e-itip-control.c:945
-# calendar/gui/e-itip-control.c:945
-# calendar/gui/e-itip-control.c:1019
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> 已经回复了任务委派。"
-
-# calendar/gui/e-itip-control.c:946
-# calendar/gui/e-itip-control.c:946
-# calendar/gui/e-itip-control.c:1020
-#~ msgid "Task Reply"
-#~ msgstr "任务回复"
-
-# calendar/gui/e-itip-control.c:950
-# calendar/gui/e-itip-control.c:950
-# calendar/gui/e-itip-control.c:1024
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> 取消了任务。"
-
-# calendar/gui/e-itip-control.c:951
-# calendar/gui/e-itip-control.c:951
-# calendar/gui/e-itip-control.c:1025
-#~ msgid "Task Cancellation"
-#~ msgstr "任务取消"
-
-# calendar/gui/e-itip-control.c:956
-# calendar/gui/e-itip-control.c:956
-# calendar/gui/e-itip-control.c:1030
-#~ msgid "Bad Task Message"
-#~ msgstr "错误的任务邮件"
-
-# calendar/gui/e-itip-control.c:975
-# calendar/gui/e-itip-control.c:975
-# calendar/gui/e-itip-control.c:1049
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> 发布了忙闲信息。"
-
-# calendar/gui/e-itip-control.c:976
-# calendar/gui/e-itip-control.c:976
-# calendar/gui/e-itip-control.c:1050
-#~ msgid "Free/Busy Information"
-#~ msgstr "忙闲信息"
-
-# calendar/gui/e-itip-control.c:980
-# calendar/gui/e-itip-control.c:980
-# calendar/gui/e-itip-control.c:1054
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> 请求您的忙闲信息。"
-
-# calendar/gui/e-itip-control.c:981
-# calendar/gui/e-itip-control.c:981
-# calendar/gui/e-itip-control.c:1055
-#~ msgid "Free/Busy Request"
-#~ msgstr "忙闲请求"
-
-# calendar/gui/e-itip-control.c:985
-# calendar/gui/e-itip-control.c:985
-# calendar/gui/e-itip-control.c:1059
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> 应答了忙闲请求。"
-
-# calendar/gui/e-itip-control.c:986
-# calendar/gui/e-itip-control.c:986
-# calendar/gui/e-itip-control.c:1060
-#~ msgid "Free/Busy Reply"
-#~ msgstr "忙闲应答"
-
-# calendar/gui/e-itip-control.c:991
-# calendar/gui/e-itip-control.c:991
-# calendar/gui/e-itip-control.c:1065
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "错误的忙闲信息"
-
-# calendar/gui/e-itip-control.c:1083
-# calendar/gui/e-itip-control.c:1083
-# calendar/gui/e-itip-control.c:1157
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "邮件只含有不支持的请求。"
-
-# calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
-# calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
-# calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "附件中没有有效的日程信息"
-
-# calendar/gui/e-itip-control.c:1142
-# calendar/gui/e-itip-control.c:1142
-# calendar/gui/e-itip-control.c:1216
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "附件中没有可查看的日程项目"
-
-# calendar/gui/e-itip-control.c:1581
-# calendar/gui/e-itip-control.c:1581
-# calendar/gui/e-itip-control.c:1648
-#~ msgid "Unable to find any of your identities in the attendees list!\n"
-#~ msgstr "无法在参与者列表中找到您的任何身份！\n"
-
-# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#~ msgid "Event information"
-#~ msgstr "事件信息"
-
-# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-#~ msgid "Task information"
-#~ msgstr "任务信息"
-
-# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#~ msgid "Journal information"
-#~ msgstr "日志信息"
-
-# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#~ msgid "Free/Busy information"
-#~ msgstr "忙闲信息"
-
-# calendar/gui/itip-utils.c:321
-# calendar/gui/itip-utils.c:321
-# calendar/gui/itip-utils.c:321
-#~ msgid "Calendar information"
-#~ msgstr "日历信息"
-
-# calendar/gui/itip-utils.c:370
-# calendar/gui/itip-utils.c:370
-# calendar/gui/itip-utils.c:370
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "忙闲信息 (%s 到 %s)"
-
-# calendar/gui/itip-utils.c:382
-# calendar/gui/itip-utils.c:382
-# calendar/gui/itip-utils.c:382
-#~ msgid "iCalendar information"
-#~ msgstr "iCalendar 信息"
-
-# calendar/gui/print.c:2205
-# calendar/gui/print.c:2205
-# calendar/gui/print.c:2205
-#~ msgid "Task"
-#~ msgstr "任务"
-
-# calendar/gui/print.c:2262
-# calendar/gui/print.c:2262
-# calendar/gui/print.c:2262
-#~ msgid "Status: %s"
-#~ msgstr "状态：%s"
-
-# calendar/gui/print.c:2294
-# calendar/gui/print.c:2294
-# calendar/gui/print.c:2294
-#~ msgid "Percent Complete: %i"
-#~ msgstr "完成率：%i"
-
-# calendar/gui/print.c:2306
-# calendar/gui/print.c:2306
-# calendar/gui/print.c:2306
-#~ msgid "URL: %s"
-#~ msgstr "URL：%s"
-
-# calendar/gui/print.c:2320
-# calendar/gui/print.c:2320
-# calendar/gui/print.c:2320
-#~ msgid "Categories: %s"
-#~ msgstr "类别：%s"
-
-# calendar/gui/print.c:2331
-# calendar/gui/print.c:2331
-# calendar/gui/print.c:2331
-#~ msgid "Contacts: "
-#~ msgstr "联系人："
-
-# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-#~ msgid "Invalid type in body-contains, expecting string"
-#~ msgstr "邮件体内容中的无效类型，应该是字符串"
-
-# addressbook/gui/widgets/e-addressbook-util.c:76
-# addressbook/gui/widgets/e-addressbook-util.c:76
-# camel/camel-pkcs7-context.c:213
-#~ msgid "Error hashing password."
-#~ msgstr "杂凑口令出错。"
-
-# shell/evolution-shell-component.c:1013
-# shell/evolution-shell-component.c:1013
-# camel/camel-pkcs7-context.c:222
-#~ msgid "Invalid password."
-#~ msgstr "非法口令。"
-
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-pkcs7-context.c:329
-#~ msgid "Could not sign: certificate not found for \"%s\"."
-#~ msgstr "无法签名：找不到“%s”的证书。"
-
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-pkcs7-context.c:378
-#~ msgid "Could not clearsign: certificate not found for \"%s\"."
-#~ msgstr "无法清除签名：找不到“%s”的证书。"
-
-# camel/camel-pkcs7-context.c:567
-#~ msgid "Could not encrypt: failed to create enveloped data."
-#~ msgstr "无法加密：创建封装数据失败。"
-
-# mail/mail-crypto.c:113
-# mail/mail-crypto.c:113
-# camel/camel-pkcs7-context.c:590
-#~ msgid "Could not encrypt: failed to create encryption context."
-#~ msgstr "无法加密：创建加密上下文失败。"
-
-# camel/providers/pop3/camel-pop3-store.c:214
-# camel/providers/pop3/camel-pop3-store.c:214
-# camel/camel-pkcs7-context.c:620
-#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
-#~ msgstr "无法加密数据：非法用户键：“%s”。"
-
-# mail/mail-account-gui.c:962
-# mail/mail-account-gui.c:962
-# camel/camel-pkcs7-context.c:626
-#~ msgid "Could not encrypt: encoding failed."
-#~ msgstr "无法加密：编码失败。"
-
-# camel/camel-pkcs7-context.c:677
-#~ msgid "Failed to decrypt: Unknown"
-#~ msgstr "无法解密：未知"
-
-# camel/providers/nntp/camel-nntp-auth.c:44
-# camel/providers/nntp/camel-nntp-auth.c:44
-# camel/providers/nntp/camel-nntp-auth.c:44
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "请为 %s@%s 输入 NNTP 密码"
-
-# camel/providers/nntp/camel-nntp-auth.c:64
-# camel/providers/nntp/camel-nntp-auth.c:64
-# camel/providers/nntp/camel-nntp-auth.c:64
-#~ msgid "Server rejected username"
-#~ msgstr "服务器拒绝的用户名"
-
-# camel/providers/nntp/camel-nntp-auth.c:70
-# camel/providers/nntp/camel-nntp-auth.c:70
-# camel/providers/nntp/camel-nntp-auth.c:70
-#~ msgid "Failed to send username to server"
-#~ msgstr "将用户名发送到服务器失败"
-
-# camel/providers/nntp/camel-nntp-auth.c:79
-# camel/providers/nntp/camel-nntp-auth.c:79
-# camel/providers/nntp/camel-nntp-auth.c:79
-#~ msgid "Server rejected username/password"
-#~ msgstr "服务器拒绝的 用户名/密码"
-
-# camel/providers/nntp/camel-nntp-folder.c:112
-#~ msgid "Internal error: uid in invalid format: %s"
-#~ msgstr "内部错误：非法格式的 uid：%s"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:45
-# camel/providers/nntp/camel-nntp-grouplist.c:45
-# camel/providers/nntp/camel-nntp-grouplist.c:45
-#~ msgid "Could not get group list from server."
-#~ msgstr "无法从服务器获取组列表。"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:98
-# camel/providers/nntp/camel-nntp-grouplist.c:107
-# camel/providers/nntp/camel-nntp-grouplist.c:98
-# camel/providers/nntp/camel-nntp-grouplist.c:107
-# camel/providers/nntp/camel-nntp-grouplist.c:98
-# camel/providers/nntp/camel-nntp-grouplist.c:107
-#~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr "无法为 %s 装入组列表文件： %s"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:158
-# camel/providers/nntp/camel-nntp-grouplist.c:158
-# camel/providers/nntp/camel-nntp-grouplist.c:158
-#~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr "无法为 %s 保存组列表文件： %s"
-
-# camel/providers/sendmail/camel-sendmail-transport.c:193
-# camel/providers/sendmail/camel-sendmail-transport.c:193
-# camel/providers/sendmail/camel-sendmail-transport.c:194
-#~ msgid "Could not find 'From' address in message"
-#~ msgstr "无法在邮件中找到“收件人”地址"
-
-# camel/providers/smtp/camel-smtp-transport.c:581
-# camel/providers/smtp/camel-smtp-transport.c:581
-# camel/providers/smtp/camel-smtp-transport.c:591
-#~ msgid "Cannot send message: sender address not defined."
-#~ msgstr "无法发送邮件： 发件人地址无定义。"
-
-# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-# executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#~ msgid "Evolution component for the executive summary."
-#~ msgstr "进行概括的 Evolution 组件。"
-
-# my-evolution/component-factory.c:153
-# my-evolution/component-factory.c:153
-# executive-summary/component/component-factory.c:151
-#~ msgid "Cannot initialize Evolution's Executive Summary component."
-#~ msgstr "无法初始化 Evolution 的实施概要组件。"
-
-# shell/e-shell-importer.c:617
-# shell/e-shell-importer.c:617
-# executive-summary/component/e-summary-callbacks.c:125
-#~ msgid "Select a service"
-#~ msgstr "选择一个服务"
-
-# executive-summary/component/e-summary-callbacks.c:289
-#~ msgid ""
-#~ "You can select a different HTML page for the background of the Executive "
-#~ "Summary.\n"
-#~ "\n"
-#~ "Just leave it blank for the default"
-#~ msgstr ""
-#~ "您可以为实施概要背景选择一个不同的 HTML 页面。\n"
-#~ "\n"
-#~ "若需默认值使其保持为空即可"
-
-# executive-summary/component/e-summary-url.c:69
-# executive-summary/component/e-summary-url.c:74
-# executive-summary/component/e-summary-url.c:81
-#~ msgid "Open %s with the default GNOME application"
-#~ msgstr "以默认 GNOME 应用程序打开 %s"
-
-# executive-summary/component/e-summary-url.c:70
-#~ msgid "Open %s with the default GNOME web browser"
-#~ msgstr "以默认 GNOME 网络浏览器打开 %s"
-
-# calendar/gui/dialogs/alarm-page.c:381
-# calendar/gui/dialogs/alarm-page.c:381
-# executive-summary/component/e-summary-url.c:71
-#~ msgid "Send an email to %s"
-#~ msgstr "给 %s 发送一封电子邮件"
-
-# calendar/gui/print.c:2306
-# calendar/gui/print.c:2306
-# executive-summary/component/e-summary-url.c:73
-#~ msgid "Run %s"
-#~ msgstr "运行 %s"
-
-# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-# ui/evolution-contact-list-editor.xml.h:1
-# ui/evolution-mail-messagedisplay.xml.h:1
-# ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-# ui/evolution.xml.h:4
-# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-# ui/evolution-contact-list-editor.xml.h:1
-# ui/evolution-mail-messagedisplay.xml.h:1
-# ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-# ui/evolution.xml.h:4
-# executive-summary/component/e-summary-url.c:75
-#~ msgid "Close %s"
-#~ msgstr "关闭 %s"
-
-# ui/evolution.xml.h:17
-# ui/evolution.xml.h:17
-# executive-summary/component/e-summary-url.c:76
-#~ msgid "Move %s to the left"
-#~ msgstr "将 %s 移动到左边"
-
-# executive-summary/component/e-summary-url.c:77
-#~ msgid "Move %s to the right"
-#~ msgstr "将 %s 移动到右边"
-
-# executive-summary/component/e-summary-url.c:78
-#~ msgid "Move %s into the previous row"
-#~ msgstr "将 %s 移动岛上一行"
-
-# executive-summary/component/e-summary-url.c:79
-#~ msgid "Move %s into the next row"
-#~ msgstr "将 %s 移动到下一行"
-
-# addressbook/printing/e-contact-print.glade.h:25
-# addressbook/printing/e-contact-print.glade.h:25
-# executive-summary/component/e-summary-url.c:553
-#~ msgid "page"
-#~ msgstr "页面"
-
-# shell/e-shell-folder-commands.c:488
-# shell/e-shell-folder-commands.c:488
-# executive-summary/component/e-summary.c:925
-#~ msgid ""
-#~ "Cannot open the HTML file:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "无法打开 HTML 文件：\n"
-#~ "%s"
-
-# shell/e-shell-importer.c:474
-# shell/e-shell-importer.c:474
-# executive-summary/component/e-summary.c:939
-#~ msgid ""
-#~ "Error reading data:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "读入数据错误：\n"
-#~ "%s"
-
-# executive-summary/component/e-summary.c:957
-#~ msgid "File does not have a place for the services.\n"
-#~ msgstr "文件中没有服务空间。\n"
-
-# executive-summary/component/main.c:61
-#~ msgid ""
-#~ "Executive summary component could not initialize Bonobo.\n"
-#~ "If there was a warning message about the RootPOA, it probably means\n"
-#~ "you compiled Bonobo against GOAD instead of OAF."
-#~ msgstr ""
-#~ "实施概要组件无法初始化 Bonobo。\n"
-#~ "如果出现关于 RootPOA 的警告信息，可能表明\n"
-#~ "您是与 GOAD 而不是 OAF 一起编译的 Bonobo。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-#~ msgid "Factory for the RDF summary."
-#~ msgstr "RDF 概要车间。"
-
-# calendar/gui/e-calendar-table.etspec.h:16
-# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
-# calendar/gui/e-calendar-table.etspec.h:16
-# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
-# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#~ msgid "RDF Summary"
-#~ msgstr "RDF 概要"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#~ msgid "Factory for the test bonobo component."
-#~ msgstr "测试 bonobo 组件车间。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#~ msgid "Factory for the test component."
-#~ msgstr "测试组件车间。"
-
-# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-#~ msgid "Test bonobo service"
-#~ msgstr "测试 bonobo 服务"
-
-# widgets/misc/e-charset-picker.c:58
-# widgets/misc/e-charset-picker.c:58
-# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#~ msgid "Test service"
-#~ msgstr "测试服务"
-
-# executive-summary/test-service/rdf-summary.c:775
-#~ msgid "Update automatically"
-#~ msgstr "自动更新"
-
-# calendar/gui/e-itip-control.c:787
-# calendar/gui/e-itip-control.c:787
-# executive-summary/test-service/rdf-summary.c:785
-#~ msgid "Update now"
-#~ msgstr "现在更新"
-
-# calendar/gui/e-meeting-time-sel.c:515
-# calendar/gui/e-meeting-time-sel.c:518
-# executive-summary/test-service/rdf-summary.c:795
-#~ msgid "Update every "
-#~ msgstr "更新间隔 "
-
-#~ msgid "Enter folder URI"
-#~ msgstr "输入文件夹 URI"
-
-# calendar/gui/e-itip-control.c:986
-# calendar/gui/e-itip-control.c:986
-# mail/message-list.etspec.h:4
-#~ msgid "Needs Reply"
-#~ msgstr "需要回复"
-
-# mail/component-factory.c:101
-# mail/component-factory.c:101
-# mail/component-factory.c:101
-#~ msgid "Mail storage folder (internal)"
-#~ msgstr "邮件存储文件夹 (内部)"
-
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "无法连接到存储： %s"
-
-# mail/component-factory.c:951
-# mail/component-factory.c:951
-# mail/component-factory.c:955
-#~ msgid "New _Mail Message"
-#~ msgstr "新建邮件(_M)"
-
-# mail/folder-browser.c:1049
-# mail/folder-browser.c:1054
-# mail/folder-browser.c:1055
-#~ msgid "Create vFolder from Search"
-#~ msgstr "根据搜索创建虚拟文件夹"
-
-# calendar/gui/e-itip-control.c:896
-# calendar/gui/e-itip-control.c:896
-# mail/folder-browser.c:1471
-#~ msgid "Mark as Needing Reply"
-#~ msgstr "标记为需要回复"
-
-# calendar/gui/e-itip-control.c:896
-# calendar/gui/e-itip-control.c:896
-# mail/folder-browser.c:1472
-#~ msgid "Mark as Not Needing Reply"
-#~ msgstr "标记为不需要回复"
-
-# mail/folder-browser.c:1628
-# mail/folder-browser.c:1656
-# mail/folder-browser.c:1657
-#~ msgid "Filter on Mailing List"
-#~ msgstr "过滤邮件列表"
-
-# mail/local-config.glade.h:3
-# mail/local-config.glade.h:3
-# mail/local-config.glade.h:3
-#~ msgid "Indexing:"
-#~ msgstr "正在建立索引："
-
-# mail/local-config.glade.h:4
-# mail/local-config.glade.h:4
-# mail/local-config.glade.h:4
-#~ msgid "Mailbox Format"
-#~ msgstr "邮件箱格式"
-
-# mail/mail-accounts.c:149
-# mail/mail-accounts.c:149
-# mail/mail-accounts.c:149
-#~ msgid " (default)"
-#~ msgstr "(默认)"
-
-# mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-# mail/mail-accounts.c:798 mail/mail-config.glade.h:42
-# mail/mail-accounts.c:824 mail/mail-config.glade.h:49
-#~ msgid "Mail Settings"
-#~ msgstr "邮件设置"
-
-# mail/mail-autofilter.c:215
-# mail/mail-autofilter.c:217
-# mail/mail-autofilter.c:217
-#~ msgid "Subject is %s"
-#~ msgstr "主题是 %s"
-
-# mail/mail-autofilter.c:231
-# mail/mail-autofilter.c:233
-# mail/mail-autofilter.c:233
-#~ msgid "Mail from %s"
-#~ msgstr "邮件来自 %s"
-
-# mail/mail-autofilter.c:287
-# mail/mail-autofilter.c:289
-# mail/mail-autofilter.c:289
-#~ msgid "%s mailing list"
-#~ msgstr "%s 邮件列表"
-
-# mail/mail-config.c:1871
-# mail/mail-config.c:1913
-# mail/mail-config.c:2006
-#~ msgid "%s: Inbox"
-#~ msgstr "%s：收件箱"
-
-# mail/mail-config.glade.h:5
-# mail/mail-config.glade.h:5
-# mail/mail-config.glade.h:5
-#~ msgid "Account"
-#~ msgstr "帐号"
-
-# mail/mail-config.glade.h:9
-# mail/mail-config.glade.h:9
-# mail/mail-config.glade.h:9
-#~ msgid "Always _encrypt to myself when sending encrypted mail"
-#~ msgstr "当发送加密邮件时总是加密到自身(_E)"
-
-# mail/mail-config.glade.h:14
-# mail/mail-config.glade.h:14
-# mail/mail-config.glade.h:17
-#~ msgid "Composer"
-#~ msgstr "撰写器"
-
-# mail/mail-config.glade.h:24
-# mail/mail-config.glade.h:24
-# mail/mail-config.glade.h:28
-#~ msgid "Default Forward style is: "
-#~ msgstr "默认转发风格为： "
-
-# mail/mail-config.glade.h:28
-# mail/mail-config.glade.h:28
-# mail/mail-config.glade.h:33
-#~ msgid "Display"
-#~ msgstr "显示"
-
-# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-# mail/mail-config.glade.h:36 shell/e-local-storage.c:173
-#~ msgid "Drafts"
-#~ msgstr "草稿"
-
-# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:103
-# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-# widgets/misc/e-filter-bar.h:103
-# mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:96
-# widgets/misc/e-filter-bar.h:103
-#~ msgid "Edit..."
-#~ msgstr "编辑..."
-
-# mail/mail-config.glade.h:35
-# mail/mail-config.glade.h:35
-# mail/mail-config.glade.h:42
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML 签名文件："
-
-# mail/mail-config.glade.h:46
-# mail/mail-config.glade.h:46
-# mail/mail-config.glade.h:54
-#~ msgid "News"
-#~ msgstr "新闻"
-
-# mail/mail-config.glade.h:68
-# mail/mail-config.glade.h:68
-# mail/mail-config.glade.h:77
-#~ msgid "Select Filter Log file..."
-#~ msgstr "选择过滤日志文件..."
-
-# mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-# shell/e-local-storage.c:176
-# mail/mail-config.glade.h:73 mail/message-list.etspec.h:7
-# shell/e-local-storage.c:176
-# mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
-# shell/e-local-storage.c:176
-#~ msgid "Sent"
-#~ msgstr "已发送"
-
-# mail/mail-config.glade.h:82
-# mail/mail-config.glade.h:82
-# mail/mail-config.glade.h:91
-#~ msgid "Sources"
-#~ msgstr "来源"
-
-# mail/mail-config.glade.h:106
-# mail/mail-config.glade.h:106
-# mail/mail-config.glade.h:115
-#~ msgid "_Log filter actions to:"
-#~ msgstr "将过滤动作记录到(_L)："
-
-# mail/mail-config.glade.h:110
-# mail/mail-config.glade.h:110
-# mail/mail-config.glade.h:119
-#~ msgid "_Organization:"
-#~ msgstr "组织(_O)："
-
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:122
-#~ msgid "_Remember this password"
-#~ msgstr "记住该密码(_R)"
-
-# mail/mail-config.glade.h:114
-# mail/mail-config.glade.h:114
-# mail/mail-config.glade.h:123
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "默认按 HTML 格式发送邮件。(_S)"
-
-# mail/mail-config.glade.h:115
-# mail/mail-config.glade.h:115
-# mail/mail-config.glade.h:124
-#~ msgid "_Server type: "
-#~ msgstr "服务器类型(_S)："
-
-# mail/mail-config.glade.h:122
-# mail/mail-config.glade.h:122
-# mail/mail-config.glade.h:131
-#~ msgid "placeholder"
-#~ msgstr "位置记录器"
-
-# mail/mail-config.glade.h:123
-# mail/mail-config.glade.h:123
-# mail/mail-config.glade.h:132
-#~ msgid "seconds."
-#~ msgstr "秒。"
-
-# mail/mail-format.c:1813
-# mail/mail-format.c:1749
-# mail/mail-format.c:1768
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
-
-# mail/mail-format.c:1836
-# mail/mail-format.c:1772
-# mail/mail-format.c:1791
-#~ msgid "Evolution does not recognize this type of signed message."
-#~ msgstr "Evolution 无法识别该类型的带签名邮件。"
-
-# mail/mail-format.c:1844
-# mail/mail-format.c:1780
-# mail/mail-format.c:1799
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "该邮件有数字签名，并被证实为可信。"
-
-# mail/mail-format.c:1852
-# mail/mail-format.c:1788
-# mail/mail-format.c:1807
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr "该邮件有数字签名，但不能证实是可信的。"
-
-# mail/mail-summary.c:109
-#~ msgid "Incomplete message written on pipe!"
-#~ msgstr "不完整的消息被写入管道！"
-
-# my-evolution/e-summary-mail.c:129
-# my-evolution/e-summary-mail.c:129
-# mail/mail-summary.c:467
-#~ msgid "Mail Summary"
-#~ msgstr "邮件概要"
-
-# my-evolution/component-factory.c:153
-# my-evolution/component-factory.c:153
-# my-evolution/component-factory.c:153
-#~ msgid "Cannot initialize Evolution's Summary component."
-#~ msgstr "无法初始化 Evolution 的概要成员。"
-
-# my-evolution/e-summary-weather.c:722
-# my-evolution/e-summary-weather.c:722
-# my-evolution/e-summary-weather.c:667
-#~ msgid "Regions"
-#~ msgstr "区域"
-
-# my-evolution/metar.c:29
-# my-evolution/metar.c:29
-#~ msgid " F"
-#~ msgstr " 华氏度"
-
-# my-evolution/metar.c:29
-# my-evolution/metar.c:29
-#~ msgid " C"
-#~ msgstr " 摄氏度"
-
-# addressbook/printing/e-contact-print.glade.h:8
-# my-evolution/metar.c:33
-# my-evolution/metar.c:33
-#~ msgid "knots"
-#~ msgstr "节"
-
-# my-evolution/metar.c:33
-# my-evolution/metar.c:33
-#~ msgid "kph"
-#~ msgstr "kph"
-
-# mail/mail-ops.c:895
-# my-evolution/metar.c:38
-# my-evolution/metar.c:38
-#~ msgid "inHg"
-#~ msgstr "英寸汞柱"
-
-# my-evolution/metar.c:38
-# my-evolution/metar.c:38
-#~ msgid "mmHg"
-#~ msgstr "毫米汞柱"
-
-# mail/mail-callbacks.c:2262
-# my-evolution/metar.c:41
-# my-evolution/metar.c:41
-#~ msgid "miles"
-#~ msgstr "英里"
-
-# mail/mail-callbacks.c:2262
-# my-evolution/metar.c:41
-# my-evolution/metar.c:41
-#~ msgid "kilometers"
-#~ msgstr "公里"
-
-# my-evolution/my-evolution.glade.h:3
-# my-evolution/my-evolution.glade.h:3
-# my-evolution/my-evolution.glade.h:3
-#~ msgid "Al_l stations:"
-#~ msgstr "所有站点(_L)："
-
-# my-evolution/my-evolution.glade.h:4
-# my-evolution/my-evolution.glade.h:4
-# my-evolution/my-evolution.glade.h:4
-#~ msgid "All _folders:"
-#~ msgstr "所有文件夹(_F)"
-
-# my-evolution/my-evolution.glade.h:5
-# my-evolution/my-evolution.glade.h:5
-# my-evolution/my-evolution.glade.h:5
-#~ msgid "All news _feeds:"
-#~ msgstr "所有新闻来源(_F)："
-
-# my-evolution/my-evolution.glade.h:22
-# my-evolution/my-evolution.glade.h:22
-# my-evolution/my-evolution.glade.h:22
-#~ msgid "_Display folders:"
-#~ msgstr "显示文件夹(_D)："
-
-# my-evolution/my-evolution.glade.h:23
-# my-evolution/my-evolution.glade.h:23
-# my-evolution/my-evolution.glade.h:23
-#~ msgid "_Display stations:"
-#~ msgstr "显示站点(_D)："
-
-# my-evolution/my-evolution.glade.h:24
-# my-evolution/my-evolution.glade.h:24
-# my-evolution/my-evolution.glade.h:24
-#~ msgid "_Displayed feeds:"
-#~ msgstr "已显示的来源："
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# notes/GNOME_Evolution_Notes.oaf.in.h:3
-#~ msgid "Factory for the Evolution notes component."
-#~ msgstr "Evolution 便签组件车间。"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# notes/GNOME_Evolution_Notes.oaf.in.h:4
-#~ msgid "Factory for the Notes control"
-#~ msgstr "便签控制车间"
-
-# shell/e-local-storage.c:175
-# shell/e-local-storage.c:175
-# shell/e-local-storage.c:175
-#~ msgid "Outbox"
-#~ msgstr "发件箱"
-
-# shell/e-shell-about-box.c:40
-# shell/e-shell-about-box.c:40
-# shell/e-shell-about-box.c:40
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
-# shell/e-shell-about-box.c:41
-# shell/e-shell-about-box.c:41
-# shell/e-shell-about-box.c:41
-#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-#~ msgstr "版权所有 1999，2000，2001 Ximian 公司。"
-
-# shell/e-storage-set-view.c:658
-# shell/e-storage-set-view.c:658
-# shell/e-storage-set-view.c:658
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "无法转移文件夹：\n"
-#~ "%s"
-
-# shell/e-storage.c:181 shell/e-storage.c:187
-# shell/e-storage.c:181 shell/e-storage.c:187
-# shell/e-storage.c:181 shell/e-storage.c:187
-#~ msgid "(No name)"
-#~ msgstr "(未命名)"
-
-# ui/evolution-addressbook.xml.h:12
-# ui/evolution-addressbook.xml.h:12
-# ui/evolution-addressbook.xml.h:12
-#~ msgid "New List"
-#~ msgstr "新列表"
-
-# ui/evolution-calendar.xml.h:2
-# ui/evolution-calendar.xml.h:2
-# ui/evolution-calendar.xml.h:2
-#~ msgid "Configure the calendar's settings"
-#~ msgstr "配置日历的设置"
-
-# ui/evolution-calendar.xml.h:4
-# ui/evolution-calendar.xml.h:4
-# ui/evolution-calendar.xml.h:4
-#~ msgid "Create a New All Day _Event"
-#~ msgstr "创建一个新的全天事件(_E)"
-
-# ui/evolution-calendar.xml.h:5
-# ui/evolution-calendar.xml.h:5
-# ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-#~ msgid "Create a New _Task"
-#~ msgstr "创建新任务(_T)"
-
-# ui/evolution-calendar.xml.h:6
-# ui/evolution-calendar.xml.h:6
-# ui/evolution-calendar.xml.h:6
-#~ msgid "Create a _New Appointment"
-#~ msgstr "创建新约会(_N)"
-
-# ui/evolution-calendar.xml.h:9
-# ui/evolution-calendar.xml.h:9
-# ui/evolution-calendar.xml.h:9
-#~ msgid "Create an event for the whole day"
-#~ msgstr "为一整天创建一个事件"
-
-# ui/evolution-calendar.xml.h:35
-# ui/evolution-calendar.xml.h:35
-# ui/evolution-calendar.xml.h:35
-#~ msgid "_Appointment..."
-#~ msgstr "约会(_A)..."
-
-# ui/evolution-calendar.xml.h:36
-# ui/evolution-calendar.xml.h:36
-# ui/evolution-calendar.xml.h:36
-#~ msgid "_Calendar Settings..."
-#~ msgstr "日历设置(_C)..."
-
-# ui/evolution-calendar.xml.h:43
-# ui/evolution-calendar.xml.h:43
-# ui/evolution-calendar.xml.h:43
-#~ msgid "_Task..."
-#~ msgstr "任务(_T)..."
-
-# ui/evolution-mail-global.xml.h:4
-# ui/evolution-mail-global.xml.h:4
-# ui/evolution-mail-global.xml.h:4
-#~ msgid "Create or edit mail accounts and other preferences"
-#~ msgstr "创建或编辑邮件帐号和其它属性"
-
-# ui/evolution-mail-global.xml.h:10
-# ui/evolution-mail-global.xml.h:10
-# ui/evolution-mail-global.xml.h:10
-#~ msgid "New Message"
-#~ msgstr "新建邮件"
-
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-#~ msgid "_Mail Settings..."
-#~ msgstr "邮件设置(_M)..."
-
-# ui/evolution-mail-message.xml.h:33
-# ui/evolution-mail-message.xml.h:33
-# ui/evolution-mail-message.xml.h:33
-#~ msgid "Forward _Attached"
-#~ msgstr "附件方式(_A)"
-
-# ui/evolution-mail-message.xml.h:34
-# ui/evolution-mail-message.xml.h:34
-# ui/evolution-mail-message.xml.h:34
-#~ msgid "Forward _Inline"
-#~ msgstr "内文方式(_I)"
-
-# ui/evolution-mail-message.xml.h:35
-# ui/evolution-mail-message.xml.h:35
-# ui/evolution-mail-message.xml.h:35
-#~ msgid "Forward _Quoted"
-#~ msgstr "引用方式(_Q)"
-
-# ui/evolution-mail-message.xml.h:92
-# ui/evolution-mail-message.xml.h:92
-# ui/evolution-mail-message.xml.h:94
-#~ msgid "_Apply Filters"
-#~ msgstr "应用过滤规则(_A)"
-
-# ui/evolution-tasks.xml.h:2
-# ui/evolution-tasks.xml.h:2
-# ui/evolution-tasks.xml.h:2
-#~ msgid "Configure the task view's settings"
-#~ msgstr "配置任务试图的设置"
-
-# ui/evolution-tasks.xml.h:13
-# ui/evolution-tasks.xml.h:13
-# ui/evolution-tasks.xml.h:15
-#~ msgid "Tasks Settings..."
-#~ msgstr "任务设置..."
-
-# ui/my-evolution.xml.h:1
-# ui/my-evolution.xml.h:1
-# ui/my-evolution.xml.h:1
-#~ msgid "Change the settings for the summary"
-#~ msgstr "改变关于概要的设置"
-
-# ui/my-evolution.xml.h:8
-# ui/my-evolution.xml.h:8
-# ui/my-evolution.xml.h:8
-#~ msgid "_Summary Settings..."
-#~ msgstr "概要设置(_S)..."
-
-# widgets/misc/e-filter-bar.h:102
-# widgets/misc/e-filter-bar.h:102
-# widgets/misc/e-filter-bar.h:102
-#~ msgid "Show All"
-#~ msgstr "全部显示"
-
-# widgets/misc/e-search-bar.c:334
-# widgets/misc/e-search-bar.c:334
-# widgets/misc/e-search-bar.c:334
-#~ msgid "Sear_ch"
-#~ msgstr "搜索(_C)"
-
 # addressbook/backend/ebook/e-card.c:3712
 # addressbook/backend/ebook/e-card.c:3712
 # addressbook/backend/ebook/e-card.c:3712
@@ -45429,7 +43154,8 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 # camel/providers/pop3/camel-pop3-provider.c:91
 # camel/providers/pop3/camel-pop3-provider.c:91
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "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:198
@@ -45444,6 +43170,16 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "无法连接到服务器： %s"
 
+# camel/providers/pop3/camel-pop3-store.c:377
+# camel/providers/pop3/camel-pop3-store.c:377
+# camel/providers/pop3/camel-pop3-store.c:377
+#~ msgid ""
+#~ "Unable to connect to POP server.\n"
+#~ "Error sending username: %s"
+#~ msgstr ""
+#~ "无法连接到 POP 服务器。\n"
+#~ "发送用户名错误： %s"
+
 # camel/providers/pop3/camel-pop3-store.c:380
 # camel/providers/pop3/camel-pop3-store.c:417
 # camel/providers/pop3/camel-pop3-store.c:380
@@ -45459,6 +43195,12 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Unexpected response from POP server: %s"
 #~ msgstr "来自 POP 服务器的意外应答： %s"
 
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:108
+#~ msgid "_Email Address:"
+#~ msgstr "电子邮件地址(_E)："
+
 # addressbook/gui/component/select-names/select-names.glade.h:2
 # addressbook/gui/component/select-names/select-names.glade.h:2
 #~ msgid "Co_ntacts:"
@@ -45566,6 +43308,11 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "该消息含有无效的收件人："
 
+# mail/mail-config.glade.h:83
+# mail/mail-config.glade.h:83
+#~ msgid "Special Folders"
+#~ msgstr "特殊文件夹"
+
 # my-evolution/e-summary-weather.c:348
 # my-evolution/e-summary-weather.c:348
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9947dc0a0f..56c02c9629 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.16.99\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2001-11-06 16:44-0500\n"
 "PO-Revision-Date: 2001-09-10 09:55+0800\n"
 "Last-Translator: Joe Man <trmetal@yahoo.com.hk>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -38,25 +38,24 @@ msgstr "匯入 VCard 檔案到 Evolution。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:699
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:849
 msgid "File As"
 msgstr "歸檔為"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "名稱"
 
 # addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "Email"
 msgstr "電子郵件"
 
 # addressbook/contact-editor/e-contact-editor.c:1257
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1651
 msgid "Primary"
 msgstr "首要的"
 
@@ -69,8 +68,8 @@ msgstr "首要的"
 # addressbook/gui/widgets/e-addressbook-view.c:733
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
-#: addressbook/gui/widgets/e-addressbook-view.c:369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Assistant"
 msgstr "助理"
 
@@ -78,9 +77,8 @@ msgstr "助理"
 # addressbook/contact-editor/e-contact-editor.c:1310
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1637
+#: addressbook/gui/contact-editor/e-contact-editor.c:1704
 msgid "Business"
 msgstr "商務電話"
 
@@ -92,13 +90,13 @@ msgstr "商務電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1246
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1640
 msgid "Callback"
 msgstr "回撥電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1642
 msgid "Company"
 msgstr "公司電話"
 
@@ -113,15 +111,14 @@ msgstr "公司電話"
 # addressbook/contact-editor/e-contact-editor.c:1311
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1643
+#: addressbook/gui/contact-editor/e-contact-editor.c:1705
 msgid "Home"
 msgstr "住家電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Organization"
 msgstr "團體"
 
@@ -132,23 +129,21 @@ msgstr "團體"
 
 # addressbook/contact-editor/e-contact-editor.c:1253
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1647
 msgid "Mobile"
 msgstr "行動電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1641
 msgid "Car"
 msgstr "汽車電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1245
 # addressbook/gui/widgets/e-addressbook-view.c:713
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/contact-editor/e-contact-editor.c:1639
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Business Fax"
 msgstr "商務傅真"
 
@@ -161,14 +156,14 @@ msgstr "商務傅真"
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
-#: addressbook/gui/widgets/e-addressbook-view.c:350
+#: addressbook/gui/contact-editor/e-contact-editor.c:1645
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Home Fax"
 msgstr "住家傳真"
 
 # addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1638
 msgid "Business 2"
 msgstr "商務電話 2"
 
@@ -179,15 +174,15 @@ msgstr "商務電話 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1250
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1644
 msgid "Home 2"
 msgstr "住家電話 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1252
 # addressbook/gui/widgets/e-addressbook-view.c:717
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
-#: addressbook/gui/widgets/e-addressbook-view.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:1646
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -195,46 +190,47 @@ msgstr "ISDN"
 # addressbook/contact-editor/e-contact-editor.c:1312
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1648
+#: addressbook/gui/contact-editor/e-contact-editor.c:1706
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "其它電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:1649
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Other Fax"
 msgstr "其它傳真"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:1650
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Pager"
 msgstr "呼叫器"
 
 # addressbook/contact-editor/e-contact-editor.c:1258
 # addressbook/gui/widgets/e-addressbook-view.c:721
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/contact-editor/e-contact-editor.c:1652
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Radio"
 msgstr "無線電電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1259
 # addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/contact-editor/e-contact-editor.c:1653
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Telex"
 msgstr "電報"
 
 # addressbook/gui/widgets/e-addressbook-view.c:723
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "TTY"
 msgstr "TTY"
 
@@ -242,8 +238,8 @@ msgstr "TTY"
 # addressbook/gui/widgets/e-addressbook-view.c:725
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
-#: addressbook/gui/widgets/e-addressbook-view.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:1679
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Email 2"
 msgstr "電子郵件 2"
 
@@ -251,14 +247,14 @@ msgstr "電子郵件 2"
 # addressbook/gui/widgets/e-addressbook-view.c:726
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
-#: addressbook/gui/widgets/e-addressbook-view.c:362
+#: addressbook/gui/contact-editor/e-contact-editor.c:1680
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Email 3"
 msgstr "電子郵件 3"
 
 # addressbook/gui/widgets/e-addressbook-view.c:727
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Web Site"
 msgstr "網址"
 
@@ -268,7 +264,7 @@ msgstr "Url"
 
 # addressbook/gui/widgets/e-addressbook-view.c:728
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:364
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Department"
 msgstr "部門"
 
@@ -278,7 +274,7 @@ msgstr "部門"
 
 # addressbook/gui/widgets/e-addressbook-view.c:729
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Office"
 msgstr "辦公室"
 
@@ -289,13 +285,13 @@ msgstr "辦公室"
 
 # addressbook/gui/widgets/e-addressbook-view.c:730
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Title"
 msgstr "頭銜"
 
 # addressbook/gui/widgets/e-addressbook-view.c:731
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:367
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Profession"
 msgstr "專業"
 
@@ -305,7 +301,7 @@ msgstr "專業"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:368
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Manager"
 msgstr "主管"
 
@@ -320,7 +316,7 @@ msgstr "助理"
 
 # addressbook/gui/widgets/e-addressbook-view.c:734
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -331,13 +327,13 @@ msgstr "暱稱"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Spouse"
 msgstr "配偶"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:372
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Note"
 msgstr "備註"
 
@@ -354,7 +350,7 @@ msgstr ""
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:373
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Free-busy URL"
 msgstr "空閒-忙碌 URL"
 
@@ -389,18 +385,339 @@ msgid "Family Name"
 msgstr "姓"
 
 # addressbook/gui/widgets/alphabet.glade.h:25
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:788
 #, c-format
 msgid "%x"
 msgstr "%x"
 
+# addressbook/backend/ebook/e-card.c:3314
+#: addressbook/backend/ebook/e-card.c:3712
+msgid "Card: "
+msgstr "名片："
+
+# addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3714
+msgid ""
+"\n"
+"Name: "
+msgstr ""
+"\n"
+"名字："
+
+# addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3715
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+"\n"
+"  前置：     "
+
+# addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3716
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+"\n"
+"  姓：       "
+
+# addressbook/backend/ebook/e-card.c:3319
+#: addressbook/backend/ebook/e-card.c:3717
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+"\n"
+"  額外的： "
+
+# addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3718
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+"\n"
+"  姓氏：     "
+
+# addressbook/backend/ebook/e-card.c:3321
+#: addressbook/backend/ebook/e-card.c:3719
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr ""
+"\n"
+"  後置：     "
+
+# addressbook/backend/ebook/e-card.c:3335
+#: addressbook/backend/ebook/e-card.c:3733
+msgid ""
+"\n"
+"Birth Date: "
+msgstr ""
+"\n"
+"出生日期："
+
+# addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3744
+msgid ""
+"\n"
+"Address:"
+msgstr ""
+"\n"
+"地址："
+
+# addressbook/backend/ebook/e-card.c:3348
+#: addressbook/backend/ebook/e-card.c:3746
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+"\n"
+"  信箱：  "
+
+# addressbook/backend/ebook/e-card.c:3349
+#: addressbook/backend/ebook/e-card.c:3747
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+"\n"
+"  內線：         "
+
+# addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3748
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+"\n"
+"  街：      "
+
+# addressbook/backend/ebook/e-card.c:3351
+#: addressbook/backend/ebook/e-card.c:3749
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+"\n"
+"  縣/市：        "
+
+# addressbook/backend/ebook/e-card.c:3352
+#: addressbook/backend/ebook/e-card.c:3750
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+"\n"
+"  地區：      "
+
+# addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3751
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
+"\n"
+"  郵遞區號： "
+
+# addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3752
+msgid ""
+"\n"
+"  Country:     "
+msgstr ""
+"\n"
+"  國家：     "
+
+# addressbook/backend/ebook/e-card.c:3367
+#: addressbook/backend/ebook/e-card.c:3765
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+"\n"
+"送遞標籤： "
+
+# addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3777
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+"\n"
+"電話：\n"
+
+# addressbook/backend/ebook/e-card.c:3382
+#: addressbook/backend/ebook/e-card.c:3780
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+"\n"
+"電話："
+
+# addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3804
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr ""
+"\n"
+"電子郵件：\n"
+
+# addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3807
+msgid ""
+"\n"
+"E-mail:"
+msgstr ""
+"\n"
+"電子郵件："
+
+# addressbook/backend/ebook/e-card.c:3428
+#: addressbook/backend/ebook/e-card.c:3826
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+"\n"
+"寄件者: "
+
+# addressbook/backend/ebook/e-card.c:3434
+#: addressbook/backend/ebook/e-card.c:3832
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+"\n"
+"時區： "
+
+# addressbook/backend/ebook/e-card.c:3442
+#: addressbook/backend/ebook/e-card.c:3840
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+"\n"
+"經緯："
+
+# addressbook/backend/ebook/e-card.c:3446
+#: addressbook/backend/ebook/e-card.c:3844
+msgid ""
+"\n"
+"Business Role: "
+msgstr ""
+"\n"
+"業務職位： "
+
+# addressbook/backend/ebook/e-card.c:3458
+#: addressbook/backend/ebook/e-card.c:3856
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+"\n"
+"團體： "
+
+# addressbook/backend/ebook/e-card.c:3459
+#: addressbook/backend/ebook/e-card.c:3857
+msgid ""
+"\n"
+"  Name:  "
+msgstr ""
+"\n"
+"  名稱：  "
+
+# addressbook/backend/ebook/e-card.c:3460
+#: addressbook/backend/ebook/e-card.c:3858
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+"\n"
+"  單位：  "
+
+# addressbook/backend/ebook/e-card.c:3461
+#: addressbook/backend/ebook/e-card.c:3859
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+"\n"
+"  單位2： "
+
+# addressbook/backend/ebook/e-card.c:3462
+#: addressbook/backend/ebook/e-card.c:3860
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+"\n"
+"  單位3： "
+
+# addressbook/backend/ebook/e-card.c:3463
+#: addressbook/backend/ebook/e-card.c:3861
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+"\n"
+"  單位4： "
+
+# addressbook/backend/ebook/e-card.c:3467
+#: addressbook/backend/ebook/e-card.c:3865
+msgid ""
+"\n"
+"Categories: "
+msgstr ""
+"\n"
+"類別： "
+
+# addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3866
+msgid ""
+"\n"
+"Comment: "
+msgstr ""
+"\n"
+"備註： "
+
+# addressbook/backend/ebook/e-card.c:3481
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3879
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+"\n"
+"唯一字串： "
+
+# addressbook/backend/ebook/e-card.c:3484
+#: addressbook/backend/ebook/e-card.c:3882
+msgid ""
+"\n"
+"Public Key: "
+msgstr ""
+"\n"
+"公鑰： "
+
 # addressbook/backend/ebook/e-card.c:3745
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card.c:4235
 msgid "Multiple VCards"
 msgstr "多重 VCard"
 
 # addressbook/backend/ebook/e-card.c:3753
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:4243
 #, c-format
 msgid "VCard for %s"
 msgstr "給 %s 的 VCard"
@@ -418,13 +735,12 @@ msgstr "給 %s 的 VCard"
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1533
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1727
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
-#: tools/evolution-addressbook-abuse.c:132
+#: calendar/conduits/calendar/calendar-conduit.c:1449
+#: calendar/conduits/todo/todo-conduit.c:1128
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
@@ -432,22 +748,22 @@ msgstr "不能初始化 Bonobo"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2212
 #, fuzzy
 msgid "Searching..."
 msgstr "尋找"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:261
 #, fuzzy
 msgid "Loading..."
 msgstr "正在等待..."
 
 # camel/camel-folder-search.c:338
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:270
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
@@ -456,80 +772,85 @@ msgstr ""
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:475
+#, fuzzy
+msgid "Connecting to LDAP server..."
+msgstr "正在連線至伺服器..."
+
+# camel/providers/imap/camel-imap-store.c:531
+#: addressbook/backend/pas/pas-backend-ldap.c:485
+#, fuzzy
+msgid "Unable to connect to LDAP server."
+msgstr ""
+"無法驗證進入 IMAP 伺服器。\n"
+"%s\n"
+"\n"
+
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#: addressbook/backend/pas/pas-backend-ldap.c:501
+#, fuzzy
+msgid "Waiting for connection to LDAP server..."
+msgstr "正在連線至伺服器..."
+
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#: addressbook/backend/pas/pas-backend-ldap.c:870
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "正在連線至伺服器..."
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:971
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "移除名片..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1080
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
-msgid "Restarting search."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2157
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-# executive-summary/component/e-summary.c:940
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
-#, fuzzy
-msgid "Error performing search"
-msgstr "移除名片時發生錯誤"
-
-# camel/camel-url.c:289
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
-#, fuzzy
-msgid "Could not parse query string"
-msgstr "不能分析 URL `%s'"
-
-# mail/mail-config.glade.h:29
-#: addressbook/conduit/address-conduit.c:293
-#, fuzzy
-msgid "Default Sync Address:"
-msgstr "電子郵件地址："
+#: addressbook/backend/pas/pas-backend-ldap.c:2162
+msgid "Restarting search."
+msgstr ""
 
 # addressbook/conduit/address-conduit.c:201
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:294
 msgid "Cursor could not be loaded\n"
 msgstr "不能載入滑鼠遊標\n"
 
 # addressbook/conduit/address-conduit.c:214
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:307
 msgid "EBook not loaded\n"
 msgstr "尚未載入 EBook\n"
 
 # addressbook/conduit/address-conduit.c:654
 # calendar/conduits/calendar/calendar-conduit.c:731
 # calendar/conduits/todo/todo-conduit.c:545
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1089
+#: calendar/conduits/calendar/calendar-conduit.c:981
+#: calendar/conduits/todo/todo-conduit.c:692
 msgid "Could not start wombat server"
 msgstr "不能啟動 wombat 服務"
 
 # addressbook/conduit/address-conduit.c:655
 # calendar/conduits/calendar/calendar-conduit.c:732
 # calendar/conduits/todo/todo-conduit.c:546
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1090
+#: calendar/conduits/calendar/calendar-conduit.c:982
+#: calendar/conduits/todo/todo-conduit.c:693
 msgid "Could not start wombat"
 msgstr "不能啟動 wombat"
 
 # addressbook/conduit/address-conduit.c:687
 # addressbook/conduit/address-conduit.c:690
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1120
+#: addressbook/conduit/address-conduit.c:1123
 msgid "Could not read pilot's Address application block"
 msgstr "不能讀取 pilot 通訊錄程式區塊"
 
@@ -548,117 +869,259 @@ msgstr "用於顯示地址的 Bonobo 控制."
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "顯示目錄服務的 Bonobo 控制例子."
 
-# addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "目錄服務來源"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "顯示 Evolution 目錄服務迷你名片之控制項."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Directory Servers"
-msgstr ""
-
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution 目錄服務迷你名片檢視"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Evolution component for handling contacts."
 msgstr "用作處理連絡人的 Evolution 元件。"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Factory for the Addressbook Minicard control"
 msgstr "目錄服務迷你名片控制項工廠"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Addressbook's address displayer"
 msgstr "目錄服務地址顯示器工廠"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook's address popup"
 msgstr "目錄服務地址彈出選單工廠"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr ""
-
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the sample Addressbook control"
 msgstr "簡易目錄服務控制項工廠"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
-msgid "This page can be used to configure access to LDAP directory servers"
-msgstr ""
-
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:71
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+#: shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "連絡人"
 
 # mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:71
 msgid "Folder containing contact information"
 msgstr "資料夾包含連絡人資訊"
 
 # addressbook/gui/component/addressbook-config.c:148
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP Server"
 msgstr "NNTP 伺服器："
 
 # mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "資料夾包含連絡人資訊"
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:526
+#: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "新增連絡人"
 
-# ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:562
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "連絡人(_C)"
+# ui/evolution-addressbook.xml.h:7
+#: addressbook/gui/component/addressbook-component.c:526
+msgid "New _Contact"
+msgstr "新增連絡人(_C)"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New Contact List"
 msgstr "新增連絡人清單"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:565
-#, fuzzy
-msgid "Contact _List"
-msgstr "連絡人清單(_C)"
+#: addressbook/gui/component/addressbook-component.c:527
+msgid "New Contact _List"
+msgstr "新增連絡人清單"
+
+# addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:186
+msgid "Edit Addressbook"
+msgstr "編輯目錄服務"
+
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "389"
+msgstr "389"
+
+# mail/mail-config.glade.h:3
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Account Name"
+msgstr "帳號"
+
+# addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Add Addressbook"
+msgstr "新增目錄服務"
+
+# addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "Addressbook Sources"
+msgstr "目錄服務來源"
+
+# widgets/misc/e-filter-bar.h:97
+# widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook-config.glade.h:5
+msgid "Advanced"
+msgstr "進階"
+
+# addressbook/gui/component/addressbook-config.c:177
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "Base"
+msgstr "基礎項目"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "基本"
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+# addressbook/gui/widgets/e-addressbook-view.c:616
+# calendar/gui/e-meeting-dialog.glade.h:8
+# calendar/gui/event-editor-dialog.glade.h:9
+# mail/mail-config.glade.h:23
+# mail/message-browser.c:202
+# ui/evolution-addressbook.xml.h:3
+# ui/evolution-event-editor.xml.h:17
+# ui/evolution-mail.xml.h:22
+# ui/evolution-task-editor-dialog.xml.h:18
+#: addressbook/gui/component/addressbook-config.glade.h:8
+msgid "De_lete"
+msgstr "刪除(_L)"
+
+# mail/mail-config.glade.h:29
+#: addressbook/gui/component/addressbook-config.glade.h:9
+msgid "Email Address:"
+msgstr "電子郵件地址："
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/component/addressbook-config.glade.h:11
+msgid "One"
+msgstr "一"
+
+# addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.glade.h:12
+msgid "Search _base:"
+msgstr "尋找起點(_B)："
+
+# addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.glade.h:13
+msgid "Search s_cope: "
+msgstr "尋找範圍(_C)："
+
+# addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/addressbook-config.glade.h:14
+msgid "Server Name"
+msgstr "伺服器名稱"
+
+# calendar/gui/print.c:362
+#: addressbook/gui/component/addressbook-config.glade.h:15
+msgid "Sub"
+msgstr "日"
+
+#: addressbook/gui/component/addressbook-config.glade.h:16
+msgid "The information below is required in order to add an addressbook.  "
+msgstr "下列資訊是新增目錄服務所需要的。"
+
+#: addressbook/gui/component/addressbook-config.glade.h:17
+msgid "This information is not required for most ldap servers. "
+msgstr "此資訊大多數的 LDAP 伺服器都不需要。"
+
+#: addressbook/gui/component/addressbook-config.glade.h:18
+msgid ""
+"This information is used by your ldap server to specify which nodes are used "
+"in a search. Contact your server administrator for more information."
+msgstr ""
+"此資訊被您的 LDAP 伺服器用來指出那一個節點正被用於搜尋.連絡您的伺服器管理者以"
+"得到更多資訊。"
+
+#: addressbook/gui/component/addressbook-config.glade.h:19
+msgid ""
+"This is the base node for all your searches on the ldap server. Contact your "
+"server administrator for more information."
+msgstr ""
+"這是您在 LDAP 伺服器上所有搜尋的基礎節點.連絡您的伺服器管理者以得到更多資訊。"
+
+#: addressbook/gui/component/addressbook-config.glade.h:20
+msgid "This is the name of the server where your addressbook is located."
+msgstr "這是您的目錄服務所在之伺服器的名稱。"
+
+#: addressbook/gui/component/addressbook-config.glade.h:21
+msgid "This is the port that your ldap server uses."
+msgstr "這是您的 LDAP 伺服器使用的連接埠。"
+
+#: addressbook/gui/component/addressbook-config.glade.h:22
+msgid ""
+"This name will be used to identify your account. It is for display purposes "
+"only."
+msgstr "此名稱將用於識別您的帳號.僅做為顯示之用。"
+
+# mail/mail-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:23
+msgid "_Account name:"
+msgstr "帳號(_A)："
+
+# addressbook/contact-editor/contact-editor.glade.h:17
+# mail/mail-config.glade.h:84
+#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+msgid "_Add"
+msgstr "新增 (_A)"
+
+# mail/mail-config.glade.h:86
+# ui/evolution-event-editor.xml.h:58
+# ui/evolution-message-composer.xml.h:45
+# ui/evolution-subscribe.xml.h:10
+# ui/evolution-task-editor-dialog.xml.h:70
+# ui/evolution.xml.h:48
+#: addressbook/gui/component/addressbook-config.glade.h:25
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:16
+msgid "_Edit"
+msgstr "編輯 (_E)"
+
+# mail/mail-config.glade.h:73
+#: addressbook/gui/component/addressbook-config.glade.h:26
+msgid "_My server requires authentication"
+msgstr "伺服器要求驗證(_M)"
+
+# addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.glade.h:27
+msgid "_Port:"
+msgstr "通訊埠(_P)："
+
+# calendar/gui/e-itip-control.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:28
+msgid "_Server name:"
+msgstr "伺服器名稱(_S)："
 
 # addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 # addressbook/backend/ebook/load-pine-addressbook.c:22
@@ -670,18 +1133,24 @@ msgstr "連絡人清單(_C)"
 # calendar/conduits/todo/todo-conduit.c:965
 # calendar/gui/alarm-notify/notify-main.c:98
 # calendar/gui/main.c:57
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 msgid "Could not initialize gnome-vfs"
 msgstr "不能始初化 gnome-vfs"
 
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/component/addressbook-storage.c:167
+#, fuzzy
+msgid "Other Contacts"
+msgstr "連絡人"
+
 # addressbook/gui/component/addressbook.c:438
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "不能開啟目錄服務"
 
 # addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -692,7 +1161,7 @@ msgstr ""
 "或者 LDAP 伺服器沒有啟動"
 
 # addressbook/gui/component/addressbook.c:450
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -704,7 +1173,7 @@ msgstr ""
 "及安裝 OpenLDAP，然後再重新編譯 Evolution。\n"
 
 # addressbook/gui/component/addressbook.c:458
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -713,61 +1182,69 @@ msgstr ""
 "您是否擁有存取權限。"
 
 # camel/camel-smime-context.c:194
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:623
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "請輸入 %s 所須的密碼"
 
-#: addressbook/gui/component/addressbook.c:769
-#, fuzzy
-msgid "Name begins with"
-msgstr "以此終結"
+# addressbook/gui/component/addressbook.c:618
+# calendar/gui/gnome-cal.c:233
+#: addressbook/gui/component/addressbook.c:760
+#: calendar/gui/cal-search-bar.c:55
+msgid "Any field contains"
+msgstr "任何欄位包含"
 
-# addressbook/contact-editor/e-contact-editor.c:1285
-# addressbook/gui/widgets/e-addressbook-view.c:725
-#: addressbook/gui/component/addressbook.c:770
-#, fuzzy
-msgid "Email is"
-msgstr "電子郵件 2"
+# addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:761
+msgid "Name contains"
+msgstr "姓名包含"
+
+# addressbook/gui/component/addressbook.c:620
+#: addressbook/gui/component/addressbook.c:762
+msgid "Email contains"
+msgstr "電郵地址包含"
 
 # calendar/gui/e-calendar-table.c:150
-#: addressbook/gui/component/addressbook.c:771
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:763
+#: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "類別為"
 
-# addressbook/gui/component/addressbook.c:618
-# calendar/gui/gnome-cal.c:233
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "任何欄位包含"
-
 # widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "進階..."
 
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1005
+#: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "任何類別"
 
 # addressbook/gui/component/addressbook.c:763
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1045
 msgid "The URI that the Folder Browser will display"
 msgstr "資料夾瀏覽器顯示之URI"
 
+# shell/e-storage.c:178
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(沒有)"
+
 # addressbook/contact-editor/contact-editor.glade.h:14
 # addressbook/contact-editor/e-contact-editor.c:1284
 #: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/e-contact-editor.c:1678
 msgid "Primary Email"
 msgstr "主要電子郵件"
 
@@ -824,709 +1301,6 @@ msgstr "關閉查詢"
 msgid "Enable Queries (Dangerous!)"
 msgstr "啟動查詢(非常危險！)"
 
-# camel/providers/imap/camel-imap-store.c:531
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr ""
-"無法驗證進入 IMAP 伺服器。\n"
-"%s\n"
-"\n"
-
-# camel/providers/imap/camel-imap-store.c:531
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"無法驗證進入 IMAP 伺服器。\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-# camel/camel-sasl-anonymous.c:131
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"無效的不透明追蹤資訊：\n"
-"%s"
-
-# camel/providers/imap/camel-imap-command.c:487
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP 伺服器的回應沒有包含 %s 資訊"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(此一版本的 evolution 並不支援 SSL)"
-
-# calendar/gui/e-calendar-table.c:152
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "完成日期"
-
-# mail/mail-config.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:1
-#, fuzzy
-msgid "  S_how Supported Bases "
-msgstr " 檢查可支援的類別(_C)"
-
-# addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "選項"
-
-# addressbook/gui/component/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "移除(_R)"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1234"
-msgstr ""
-
-# calendar/gui/e-calendar-table.c:377
-#: addressbook/gui/component/ldap-config.glade.h:5
-#, fuzzy
-msgid "1:00"
-msgstr "100%"
-
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:8
-#, fuzzy
-msgid "380"
-msgstr "389"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/ldap-config.glade.h:10
-msgid "5:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:11
-msgid "636"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "Addressbook Sources"
-msgstr "目錄服務來源"
-
-# calendar/gui/e-calendar-table.c:162
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Always"
-msgstr "提醒"
-
-# camel/camel-sasl-anonymous.c:33
-#: addressbook/gui/component/ldap-config.glade.h:16
-#, fuzzy
-msgid "Anonymously"
-msgstr "匿名"
-
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:19
-msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
-"\n"
-"Please click the \"Finish\" button to save the settings you have entered "
-"here."
-msgstr ""
-
-# mail/mail-ops.c:1939
-#: addressbook/gui/component/ldap-config.glade.h:23
-#, fuzzy
-msgid "Connecting"
-msgstr "中斷與 %s 的連線"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr ""
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "DN Customization"
-msgstr "沒有資訊"
-
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
-#: addressbook/gui/component/ldap-config.glade.h:26
-msgid "De_lete"
-msgstr "刪除(_L)"
-
-# composer/e-msg-composer-attachment.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
-msgid "Distinguished _name:"
-msgstr "列出名稱 (_N)："
-
-# mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Email Address:"
-msgstr "電子郵件地址："
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
-msgid "Evolution Attribute"
-msgstr "Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:30
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:31
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-
-# mail/mail-search.c:316
-#: addressbook/gui/component/ldap-config.glade.h:32
-#, fuzzy
-msgid "Finished"
-msgstr "尋找(_I)"
-
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:33
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "一般"
-
-# mail/mail-config.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:34
-#, fuzzy
-msgid "LDAP Attribute"
-msgstr "LDAP 驗證"
-
-# mail/mail-config.glade.h:40
-#: addressbook/gui/component/ldap-config.glade.h:35
-#, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "郵件設定"
-
-# addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
-msgid "Mappings"
-msgstr "邊界"
-
-# calendar/gui/event-editor-dialog.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
-#, fuzzy
-msgid "Never"
-msgstr "每"
-
-#: addressbook/gui/component/ldap-config.glade.h:38
-msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL "
-"(Secure Sockets Layer)\n"
-"and TLS (Transport Layer Security) protocols are used by some servers to "
-"cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses "
-"these protocols."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:179
-#: addressbook/gui/component/ldap-config.glade.h:44
-msgid "One"
-msgstr "一"
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid "R_estore Defaults"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Re_store Defaults"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
-msgid "S_earch scope: "
-msgstr "尋找範圍(_C)："
-
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
-#. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
-#, fuzzy
-msgid "Searching"
-msgstr "尋找"
-
-# ui/evolution-event-editor.xml.h:48
-# ui/evolution-task-editor-dialog.xml.h:57
-#: addressbook/gui/component/ldap-config.glade.h:51
-#, fuzzy
-msgid "Select"
-msgstr "全選"
-
-#: addressbook/gui/component/ldap-config.glade.h:52
-#, fuzzy
-msgid "Selected:"
-msgstr "已刪除"
-
-#: addressbook/gui/component/ldap-config.glade.h:53
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:55
-msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:59
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:62
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:64
-msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
-msgstr ""
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: addressbook/gui/component/ldap-config.glade.h:65
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "來源資訊"
-
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#: addressbook/gui/component/ldap-config.glade.h:66
-#, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "正在連線至伺服器..."
-
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "Step 3: Searching the Directory"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
-msgid "Step 4: Display Name"
-msgstr ""
-
-# calendar/gui/print.c:362
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "Sub"
-msgstr "日"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
-msgid "Supported Search Bases"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:71
-msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:73
-msgid ""
-"The options on this page control how many entries should be included in "
-"your\n"
-"searches, and how long a search should take. Ask your system administrator "
-"if you\n"
-"need to change these options."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:76
-msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:78
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
-"\n"
-"Adding a new LDAP server requires some specialized information\n"
-"about the server. Please contact your system administrator if you \n"
-"need help finding this information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
-"too large will slow down your addressbook."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:91
-#, fuzzy
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
-msgstr "此名稱將用於識別您的帳號.僅做為顯示之用。"
-
-#: addressbook/gui/component/ldap-config.glade.h:93
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:96
-msgid "This option controls how long a search will be run."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:97
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:100
-msgid "U_se SSL/TLS:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid "Using distinguished name (DN)"
-msgstr ""
-
-# addressbook/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/component/ldap-config.glade.h:102
-#, fuzzy
-msgid "Using email address"
-msgstr "這是郵寄地址 (_T)"
-
-#: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
-msgid "Whenever Possible"
-msgstr ""
-
-# addressbook/contact-editor/contact-editor.glade.h:17
-# mail/mail-config.glade.h:84
-#: addressbook/gui/component/ldap-config.glade.h:104
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
-msgid "_Add"
-msgstr "新增 (_A)"
-
-# addressbook/contact-editor/contact-editor.glade.h:17
-# mail/mail-config.glade.h:84
-#: addressbook/gui/component/ldap-config.glade.h:105
-#, fuzzy
-msgid "_Add ->"
-msgstr "新增 (_A)"
-
-#: addressbook/gui/component/ldap-config.glade.h:106
-#, fuzzy
-msgid "_Add Mapping"
-msgstr "新增動作"
-
-#: addressbook/gui/component/ldap-config.glade.h:107
-#, fuzzy
-msgid "_Add to DN"
-msgstr "新增動作"
-
-# calendar/gui/e-calendar-table.c:162
-#: addressbook/gui/component/ldap-config.glade.h:108
-#, fuzzy
-msgid "_Always"
-msgstr "提醒"
-
-# addressbook/contact-editor/contact-editor.glade.h:23
-# mail/folder-browser.c:715
-# mail/mail-config.glade.h:85
-# ui/evolution-event-editor.xml.h:57
-# ui/evolution-mail.xml.h:103
-# ui/evolution-task-editor-dialog.xml.h:69
-# ui/evolution.xml.h:46
-#: addressbook/gui/component/ldap-config.glade.h:109
-#, fuzzy
-msgid "_Delete Mapping"
-msgstr "全部刪除(_D)"
-
-# calendar/gui/calendar-summary.c:622
-# mail/mail-config.glade.h:24
-#: addressbook/gui/component/ldap-config.glade.h:110
-#, fuzzy
-msgid "_Display name:"
-msgstr "顯示(_D)"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Distinguished Name (DN):"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Don't use SSL/TLS"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Download limit:"
-msgstr ""
-
-# mail/mail-config.glade.h:86
-# ui/evolution-event-editor.xml.h:58
-# ui/evolution-message-composer.xml.h:45
-# ui/evolution-subscribe.xml.h:10
-# ui/evolution-task-editor-dialog.xml.h:70
-# ui/evolution.xml.h:48
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
-#: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
-msgid "_Edit"
-msgstr "編輯 (_E)"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:115
-#, fuzzy
-msgid "_Edit Mapping"
-msgstr "編輯約會(_E)"
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: addressbook/gui/component/ldap-config.glade.h:116
-#, fuzzy
-msgid "_Evolution attribute:"
-msgstr "Evolution"
-
-#: addressbook/gui/component/ldap-config.glade.h:117
-msgid "_If necessary "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:118
-msgid "_LDAP attribute:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_LDAP attributes:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:120
-msgid "_Log in method:"
-msgstr ""
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:431
-#: addressbook/gui/component/ldap-config.glade.h:121
-#, fuzzy
-msgid "_More Options >>"
-msgstr "選項(_O)"
-
-# addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/ldap-config.glade.h:122
-#, fuzzy
-msgid "_Port number:"
-msgstr "通訊埠(_P)："
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_Restore Defaults"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:124
-#, fuzzy
-msgid "_Search base:"
-msgstr "尋找起點(_B)："
-
-# calendar/gui/e-itip-control.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "_Server name:"
-msgstr "伺服器名稱(_S)："
-
-# calendar/gui/dialogs/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:126
-#, fuzzy
-msgid "_Timeout (minutes):"
-msgstr "延遲時間 (分鐘)"
-
-# mail/mail-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:127
-#, fuzzy
-msgid "account-druid"
-msgstr "帳號"
-
-# addressbook/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/component/ldap-config.glade.h:128
-#, fuzzy
-msgid "account-editor"
-msgstr "連絡人清單編輯器"
-
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/component/ldap-config.glade.h:129
-#, fuzzy
-msgid "cards"
-msgstr "沒有名片"
-
-# mail/mail-ops.c:1939
-#: addressbook/gui/component/ldap-config.glade.h:130
-#, fuzzy
-msgid "connecting-tab"
-msgstr "中斷與 %s 的連線"
-
-#: addressbook/gui/component/ldap-config.glade.h:131
-msgid "dn-customization-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "edit_server_window_simple"
-msgstr ""
-
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:133
-#, fuzzy
-msgid "general-tab"
-msgstr "一般"
-
-#: addressbook/gui/component/ldap-config.glade.h:134
-msgid "mappings-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "objectclasses-tab"
-msgstr ""
-
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:136
-#, fuzzy
-msgid "searching-tab"
-msgstr "尋找"
-
 # addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
@@ -1542,9 +1316,9 @@ msgstr "目錄服務名稱選擇介面工廠"
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:777
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "移除"
 
@@ -1580,13 +1354,7 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "未命名的連絡人"
 
-# addressbook/gui/component/addressbook.c:619
-#: addressbook/gui/component/select-names/e-select-names.c:600
-#, fuzzy
-msgid "Find contact in"
-msgstr "寄件者包含"
-
-#: addressbook/gui/component/select-names/e-select-names.c:716
+#: addressbook/gui/component/select-names/e-select-names.c:524
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1596,7 +1364,7 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:724
+#: addressbook/gui/component/select-names/e-select-names.c:532
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -1604,131 +1372,109 @@ msgid ""
 "correct this problem."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:806
+#: addressbook/gui/component/select-names/e-select-names.c:608
 msgid "Select Contacts from Addressbook"
 msgstr "從目錄服務選擇連絡人"
 
-# addressbook/gui/component/select-names/select-names.glade.h:3
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Select Names"
-msgstr "選擇名稱"
+msgid "C_ontaining:"
+msgstr "包含(_O)："
 
-# addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
-msgid "Selected Contacts:"
-msgstr "刪除連絡人？"
+msgid "Co_ntacts:"
+msgstr "連絡人(_N)："
 
-# ui/evolution-addressbook.xml.h:17
+# mail/mail-search.c:316
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
-msgid "Show Contacts"
-msgstr "連絡人"
+msgid "F_ind"
+msgstr "尋找(_I)"
 
+# addressbook/gui/component/select-names/select-names.glade.h:3
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid ""
-"Type a name into the entry, or\n"
-"select one from the list below:"
-msgstr ""
+msgid "Select Names"
+msgstr "選擇名稱"
 
-# ui/evolution.xml.h:57
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "移動(_M)..."
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+msgid "Show contacts matching the following criteria:"
+msgstr "顯示符合下列條件的連絡人："
 
 # calendar/gui/e-tasks.c:155
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Category:"
 msgstr "類別 (_C)："
 
 # ui/evolution-mail.xml.h:106
 # ui/evolution.xml.h:50
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "資料夾 (_F)："
 
-# addressbook/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#, fuzzy
-msgid "A_ssistant's name:"
-msgstr "助理名稱 (_A)："
-
-# addressbook/contact-editor/contact-editor.glade.h:18
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
-#, fuzzy
-msgid "Add_ress..."
-msgstr "地址 (_A)..."
+# addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "_Message Recipients:"
+msgstr "收件者(_M)："
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "週年紀念 (_V)："
 
-# addressbook/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
-#, fuzzy
-msgid "Birthda_y:"
-msgstr "生日 (_B)："
+# addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "B_usiness"
+msgstr "商務 (_U)"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:24
-# calendar/gui/event-editor-dialog.glade.h:29
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#, fuzzy
-msgid "C_ontacts..."
-msgstr "連絡人 (_C)..."
+# addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "Business _Fax"
+msgstr "商務傳真 (_F)"
 
 # addressbook/contact-editor/contact-editor.glade.h:6
 # calendar/gui/dialogs/task-editor-dialog.glade.h:3
 # calendar/gui/event-editor-dialog.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "類別 (_T)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Collaboration"
 msgstr ""
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1285
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
-# addressbook/contact-editor/contact-editor.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#, fuzzy
-msgid "D_epartment:"
-msgstr "部門 (_D)："
-
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 #: calendar/gui/dialogs/task-editor.c:183
 msgid "Details"
 msgstr "詳細資料"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #, fuzzy
 msgid "F_ree/Busy URL:"
 msgstr "空閒-忙碌 URL"
 
 # addressbook/contact-editor/contact-editor.glade.h:9
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File A_s:"
 msgstr "歸檔為(_S)："
 
-# addressbook/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-#, fuzzy
-msgid "Full _Name..."
-msgstr "全名 (_F)..."
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+msgid "General"
+msgstr "一般"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
@@ -1736,48 +1482,58 @@ msgid ""
 msgstr ""
 
 # addressbook/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "新增電話種類"
 
 # addressbook/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "備註 (_T)："
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr "團體(_Z)："
 
-# addressbook/contact-editor/contact-editor.glade.h:32
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
-#, fuzzy
-msgid "P_rofession:"
-msgstr "專業(_P)："
-
 # addressbook/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "電話種類"
 
-# addressbook/contact-editor/contact-editor.glade.h:33
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "S_pouse:"
-msgstr "配偶(_S)："
-
-# addressbook/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#, fuzzy
-msgid "This is the _mailing address"
-msgstr "這是郵寄地址 (_T)"
-
 # addressbook/contact-editor/contact-editor.glade.h:15
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "允許接收 HTML 格式的電子郵件"
 
+# addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "_Address..."
+msgstr "地址 (_A)..."
+
+# addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+msgid "_Assistant's name:"
+msgstr "助理名稱 (_A)："
+
+# addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+msgid "_Birthday:"
+msgstr "生日 (_B)："
+
+# addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Business"
+msgstr "商務 (_B)"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:24
+# calendar/gui/event-editor-dialog.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "連絡人 (_C)..."
+
 # addressbook/contact-editor/contact-editor.glade.h:23
 # mail/folder-browser.c:715
 # mail/mail-config.glade.h:85
@@ -1785,947 +1541,991 @@ msgstr "允許接收 HTML 格式的電子郵件"
 # ui/evolution-mail.xml.h:103
 # ui/evolution-task-editor-dialog.xml.h:69
 # ui/evolution.xml.h:46
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
+#: mail/folder-browser.c:1505 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "刪除 (_D)"
 
+# addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Department:"
+msgstr "部門 (_D)："
+
+# addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Full Name..."
+msgstr "全名 (_F)..."
+
+# addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Home"
+msgstr "住家 (_H)"
+
 # addressbook/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "職稱 (_J)："
 
 # addressbook/contact-editor/contact-editor.glade.h:28
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "主管名稱(_M)："
 
+# addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Mobile"
+msgstr "行動電話(_M)"
+
 # addressbook/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "暱稱(_N)："
 
 # addressbook/contact-editor/contact-editor.glade.h:31
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "辦公室(_O)："
 
+# addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+msgid "_Profession:"
+msgstr "專業(_P)："
+
 # calendar/gui/print.c:1156
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Public Calendar URL:"
 msgstr "列印行事曆"
 
-# addressbook/contact-editor/contact-editor.glade.h:16
+# addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "_Spouse:"
+msgstr "配偶(_S)："
+
+# addressbook/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "_This is the mailing address"
+msgstr "這是郵寄地址 (_T)"
+
+# addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Web 網址(_W)："
 
-# mail/mail-search.c:138
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
-msgid "United States"
-msgstr "美國"
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"您確定要刪除\n"
+"這個連絡人？"
+
+# addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+msgid "Delete Contact?"
+msgstr "刪除連絡人？"
+
+# addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:755
+msgid "This contact belongs to these categories:"
+msgstr "此連絡人屬於這些類別："
+
+# addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1654
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+# camel/providers/local/camel-local-store.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:2276
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "不能找到欄位 `%s' 之界面工具"
+
+# addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "快速新增連絡人"
+
+# addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "編輯全部"
+
+# addressbook/contact-editor/e-contact-quick-add.c:276
+# addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+msgid "Full Name"
+msgstr "全名"
+
+# addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "E-mail"
+msgstr "電子郵件"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#, fuzzy
+msgid "list"
+msgstr "靄"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s 已經存在\n"
+"您是否要複寫它?"
+
+# addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "地址 2(_2)："
 
 # addressbook/contact-editor/e-contact-editor.c:1242
 # addressbook/gui/widgets/e-addressbook-view.c:733
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Afghanistan"
 msgstr "阿富汗"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:42
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Albania"
 msgstr "阿爾巴尼亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
-#: my-evolution/Locations.h:54
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Algeria"
 msgstr "阿爾及利亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "American Samoa"
 msgstr "美屬薩摩亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "Andorra"
 msgstr "安道爾"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "Angola"
 msgstr "安哥拉"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "Anguilla"
 msgstr "安圭拉島"
 
 # shell/e-shell-importer.c:490
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "Antarctica"
 msgstr "南極洲"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "Antigua And Barbuda"
 msgstr "安地卡及巴布達"
 
 # addressbook/printing/e-contact-print.glade.h:24
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
-#: my-evolution/Locations.h:120
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/fulladdr.glade.h:12
 msgid "Armenia"
 msgstr "亞美尼亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/fulladdr.glade.h:13
 msgid "Aruba"
 msgstr "阿盧巴島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
-#: my-evolution/Locations.h:154
+#: addressbook/gui/contact-editor/fulladdr.glade.h:14
 msgid "Australia"
 msgstr "澳大利亞"
 
 # calendar/gui/goto-dialog.glade.h:2
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
-#: my-evolution/Locations.h:155
+#: addressbook/gui/contact-editor/fulladdr.glade.h:15
 msgid "Austria"
 msgstr "奧地利"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/fulladdr.glade.h:16
 msgid "Azerbaijan"
 msgstr "亞賽拜然"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
-#: my-evolution/Locations.h:161
+#: addressbook/gui/contact-editor/fulladdr.glade.h:17
 msgid "Bahamas"
 msgstr "巴哈馬"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
-#: my-evolution/Locations.h:164
+#: addressbook/gui/contact-editor/fulladdr.glade.h:18
 msgid "Bahrain"
 msgstr "巴林"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/fulladdr.glade.h:19
 msgid "Bangladesh"
 msgstr "孟加拉"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/fulladdr.glade.h:20
 msgid "Barbados"
 msgstr "巴貝多"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/fulladdr.glade.h:21
 msgid "Belarus"
 msgstr "白俄羅斯"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
-#: my-evolution/Locations.h:216
+#: addressbook/gui/contact-editor/fulladdr.glade.h:22
 msgid "Belgium"
 msgstr "比利時"
 
 # addressbook/printing/e-contact-print.glade.h:36
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
-#: my-evolution/Locations.h:218
+#: addressbook/gui/contact-editor/fulladdr.glade.h:23
 msgid "Belize"
 msgstr "貝里斯"
 
 # mail/mail-send-recv.c:306
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/fulladdr.glade.h:24
 msgid "Benin"
 msgstr "貝南"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/fulladdr.glade.h:25
 msgid "Bermuda"
 msgstr "百慕達"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/fulladdr.glade.h:26
 msgid "Bhutan"
 msgstr "不丹"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
-#: my-evolution/Locations.h:270
+#: addressbook/gui/contact-editor/fulladdr.glade.h:27
 msgid "Bolivia"
 msgstr "玻利維亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/fulladdr.glade.h:28
 msgid "Bosnia And Herzegowina"
 msgstr "波士尼亞-赫芝格維納"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/fulladdr.glade.h:29
 msgid "Botswana"
 msgstr "波札那"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/fulladdr.glade.h:30
 msgid "Bouvet Island"
 msgstr "波維特島"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
-#: my-evolution/Locations.h:294
+#: addressbook/gui/contact-editor/fulladdr.glade.h:31
 msgid "Brazil"
 msgstr "巴西"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/fulladdr.glade.h:32
 msgid "British Indian Ocean Territory"
 msgstr "英屬印度洋地區"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/fulladdr.glade.h:33
+msgid "British Virgin Islands"
+msgstr "英屬維爾京群島"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:34
 msgid "Brunei Darussalam"
 msgstr "汶萊"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
-#: my-evolution/Locations.h:320
+#: addressbook/gui/contact-editor/fulladdr.glade.h:35
 msgid "Bulgaria"
 msgstr "保加利亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/fulladdr.glade.h:36
 msgid "Burkina Faso"
 msgstr "布吉納法索"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/fulladdr.glade.h:37
 msgid "Burundi"
 msgstr "浦隆地"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/fulladdr.glade.h:38
 msgid "Cambodia"
 msgstr "柬埔寨王國"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/fulladdr.glade.h:39
 msgid "Cameroon"
 msgstr "喀麥隆"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
-#: my-evolution/Locations.h:354
+#: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
 msgstr "加拿大"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/fulladdr.glade.h:41
 msgid "Cape Verde"
 msgstr "維德角島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
-#: my-evolution/Locations.h:389
+#: addressbook/gui/contact-editor/fulladdr.glade.h:42
 msgid "Cayman Islands"
 msgstr "開曼群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/fulladdr.glade.h:43
 msgid "Central African Republic"
 msgstr "中非"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/fulladdr.glade.h:44
 msgid "Chad"
 msgstr "查德"
 
+# addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:45
+msgid "Check Address"
+msgstr "檢查地址"
+
 # addressbook/gui/component/addressbook-config.c:150
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
-#: my-evolution/Locations.h:438
+#: addressbook/gui/contact-editor/fulladdr.glade.h:46
 msgid "Chile"
 msgstr "智利"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/fulladdr.glade.h:47
 msgid "China"
 msgstr "中國"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
-#: my-evolution/Locations.h:451
+#: addressbook/gui/contact-editor/fulladdr.glade.h:48
 msgid "Christmas Island"
 msgstr "聖誕島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/fulladdr.glade.h:49
 msgid "Cocos (Keeling) Islands"
 msgstr "可可斯群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
-#: my-evolution/Locations.h:483
+#: addressbook/gui/contact-editor/fulladdr.glade.h:50
 msgid "Colombia"
 msgstr "哥倫比亞"
 
 # ui/evolution-mail.xml.h:5
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/fulladdr.glade.h:51
 msgid "Comoros"
 msgstr "葛摩"
 
 # mail/mail-ops.c:917
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/fulladdr.glade.h:52
 msgid "Congo"
 msgstr "剛果共和國"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/fulladdr.glade.h:53
 msgid "Cook Islands"
 msgstr "科克群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
-#: my-evolution/Locations.h:517
+#: addressbook/gui/contact-editor/fulladdr.glade.h:54
 msgid "Costa Rica"
 msgstr "哥斯大黎加"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/fulladdr.glade.h:55
 msgid "Cote d'Ivoire"
 msgstr "象牙海岸"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
-#: my-evolution/Locations.h:528
+# addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:56
+msgid "Countr_y:"
+msgstr "國家 (_Y)："
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:57
 msgid "Croatia"
 msgstr "克羅埃西亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
-#: my-evolution/Locations.h:532
+#: addressbook/gui/contact-editor/fulladdr.glade.h:58
 msgid "Cuba"
 msgstr "古巴"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
-#: my-evolution/Locations.h:545
+#: addressbook/gui/contact-editor/fulladdr.glade.h:59
 msgid "Cyprus"
 msgstr "賽普勒斯"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
-#: my-evolution/Locations.h:546
+#: addressbook/gui/contact-editor/fulladdr.glade.h:60
 msgid "Czech Republic"
 msgstr "捷克"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
-#: my-evolution/Locations.h:580
+#: addressbook/gui/contact-editor/fulladdr.glade.h:61
 msgid "Denmark"
 msgstr "丹麥"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/fulladdr.glade.h:62
 msgid "Djibouti"
 msgstr "吉布地"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/fulladdr.glade.h:63
 msgid "Dominica"
 msgstr "多明尼克"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
-#: my-evolution/Locations.h:608
+#: addressbook/gui/contact-editor/fulladdr.glade.h:64
 msgid "Dominican Republic"
 msgstr "多明尼加"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/fulladdr.glade.h:65
 msgid "East Timor"
 msgstr "帝汶"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
-#: my-evolution/Locations.h:641
+#: addressbook/gui/contact-editor/fulladdr.glade.h:66
 msgid "Ecuador"
 msgstr "厄瓜多"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
-#: my-evolution/Locations.h:650
+#: addressbook/gui/contact-editor/fulladdr.glade.h:67
 msgid "Egypt"
 msgstr "埃及"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
-#: my-evolution/Locations.h:666
+#: addressbook/gui/contact-editor/fulladdr.glade.h:68
 msgid "El Salvador"
 msgstr "薩爾瓦多"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/fulladdr.glade.h:69
 msgid "Equatorial Guinea"
 msgstr "赤道幾內亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/fulladdr.glade.h:70
 msgid "Eritrea"
 msgstr "厄利垂亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
-#: my-evolution/Locations.h:684
+#: addressbook/gui/contact-editor/fulladdr.glade.h:71
 msgid "Estonia"
 msgstr "愛沙尼亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/fulladdr.glade.h:72
 msgid "Ethiopia"
 msgstr "依索比亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/fulladdr.glade.h:73
 msgid "Falkland Islands"
 msgstr "福克蘭群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/fulladdr.glade.h:74
 msgid "Faroe Islands"
 msgstr "法羅群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/fulladdr.glade.h:75
 msgid "Fiji"
 msgstr "斐濟群島"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
-#: my-evolution/Locations.h:716
+#: addressbook/gui/contact-editor/fulladdr.glade.h:76
 msgid "Finland"
 msgstr "芬蘭"
 
 # ui/evolution-mail.xml.h:2
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
-#: my-evolution/Locations.h:766
+#: addressbook/gui/contact-editor/fulladdr.glade.h:77
 msgid "France"
 msgstr "法國"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/fulladdr.glade.h:78
 msgid "French Guiana"
 msgstr "法屬圭亞那"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/fulladdr.glade.h:79
 msgid "French Polynesia"
 msgstr "法屬玻里尼西亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/fulladdr.glade.h:80
 msgid "French Southern Territories"
 msgstr "法屬南部屬地"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/fulladdr.glade.h:81
 msgid "Gabon"
 msgstr "加彭"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/fulladdr.glade.h:82
 msgid "Gambia"
 msgstr "甘比亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
-#: my-evolution/Locations.h:811
+#: addressbook/gui/contact-editor/fulladdr.glade.h:83
 msgid "Georgia"
 msgstr "喬治亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
-#: my-evolution/Locations.h:812
+#: addressbook/gui/contact-editor/fulladdr.glade.h:84
 msgid "Germany"
 msgstr "德國"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/fulladdr.glade.h:85
 msgid "Ghana"
 msgstr "迦納"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
-#: my-evolution/Locations.h:815
+#: addressbook/gui/contact-editor/fulladdr.glade.h:86
 msgid "Gibraltar"
 msgstr "直布羅陀"
 
 # ui/evolution-calendar.xml.h:36
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
-#: my-evolution/Locations.h:846
+#: addressbook/gui/contact-editor/fulladdr.glade.h:87
 msgid "Greece"
 msgstr "希臘"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/fulladdr.glade.h:88
 msgid "Greenland"
 msgstr "格陵蘭"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/fulladdr.glade.h:89
 msgid "Grenada"
 msgstr "格瑞那達"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/fulladdr.glade.h:90
 msgid "Guadeloupe"
 msgstr "瓜德魯普島"
 
 # calendar/gui/e-day-view.c:570
 # calendar/gui/e-week-view.c:300
 # calendar/gui/print.c:617
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/fulladdr.glade.h:91
 msgid "Guam"
 msgstr "關島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
-#: my-evolution/Locations.h:867
+#: addressbook/gui/contact-editor/fulladdr.glade.h:92
 msgid "Guatemala"
 msgstr "瓜地馬拉"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/fulladdr.glade.h:93
 msgid "Guinea"
 msgstr "幾內亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/fulladdr.glade.h:94
 msgid "Guinea-bissau"
 msgstr "幾內亞比索"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/fulladdr.glade.h:95
 msgid "Guyana"
 msgstr "蓋亞納"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
-#: my-evolution/Locations.h:888
+#: addressbook/gui/contact-editor/fulladdr.glade.h:96
 msgid "Haiti"
 msgstr "海地"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/fulladdr.glade.h:97
 msgid "Heard And McDonald Islands"
 msgstr "赫德及麥當勞群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/fulladdr.glade.h:98
 msgid "Holy See"
 msgstr "教廷"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
-#: my-evolution/Locations.h:945
+#: addressbook/gui/contact-editor/fulladdr.glade.h:99
 msgid "Honduras"
 msgstr "宏都拉斯"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
-#: my-evolution/Locations.h:946
+#: addressbook/gui/contact-editor/fulladdr.glade.h:100
 msgid "Hong Kong"
 msgstr "香港"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 # calendar/gui/event-editor.c:481
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
-#: my-evolution/Locations.h:966
+#: addressbook/gui/contact-editor/fulladdr.glade.h:101
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
-#: my-evolution/Locations.h:978
+#: addressbook/gui/contact-editor/fulladdr.glade.h:102
 msgid "Iceland"
 msgstr "冰島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
-#: my-evolution/Locations.h:991
+#: addressbook/gui/contact-editor/fulladdr.glade.h:103
 msgid "India"
 msgstr "印度"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/fulladdr.glade.h:104
 msgid "Indonesia"
 msgstr "印尼"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
-#: my-evolution/Locations.h:1007
+#: addressbook/gui/contact-editor/fulladdr.glade.h:105
 msgid "Ireland"
 msgstr "愛爾蘭"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/fulladdr.glade.h:106
 msgid "Israel"
 msgstr "以色列"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
-#: my-evolution/Locations.h:1016
+#: addressbook/gui/contact-editor/fulladdr.glade.h:107
 msgid "Italy"
 msgstr "義大利"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
-#: my-evolution/Locations.h:1031
+#: addressbook/gui/contact-editor/fulladdr.glade.h:108
 msgid "Jamaica"
 msgstr "牙買加"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
-#: my-evolution/Locations.h:1035
+#: addressbook/gui/contact-editor/fulladdr.glade.h:109
 msgid "Japan"
 msgstr "日本"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
-#: my-evolution/Locations.h:1046
+#: addressbook/gui/contact-editor/fulladdr.glade.h:110
 msgid "Jordan"
 msgstr "約旦"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/fulladdr.glade.h:111
 msgid "Kazakhstan"
 msgstr "哈薩克"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/fulladdr.glade.h:112
 msgid "Kenya"
 msgstr "肯亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:113
 msgid "Kiribati"
 msgstr "吉里巴斯"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
-#, fuzzy
-msgid "Korea, Republic Of"
-msgstr "韓國"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
-#: my-evolution/Locations.h:1146
+#: addressbook/gui/contact-editor/fulladdr.glade.h:114
 msgid "Kuwait"
 msgstr "科威特"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:115
 msgid "Kyrgyzstan"
 msgstr "吉爾吉斯"
 
 # mail/message-list.c:685
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/fulladdr.glade.h:116
 msgid "Laos"
 msgstr "寮國"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
+#: addressbook/gui/contact-editor/fulladdr.glade.h:117
 msgid "Latvia"
 msgstr "拉脫維亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: addressbook/gui/contact-editor/fulladdr.glade.h:118
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
 # mail/message-list.c:685
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/fulladdr.glade.h:119
 msgid "Lesotho"
 msgstr "賴索托"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: addressbook/gui/contact-editor/fulladdr.glade.h:120
 msgid "Liberia"
 msgstr "賴比瑞亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/fulladdr.glade.h:121
 msgid "Liechtenstein"
 msgstr "列支敦斯登"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: addressbook/gui/contact-editor/fulladdr.glade.h:122
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: addressbook/gui/contact-editor/fulladdr.glade.h:123
 msgid "Luxembourg"
 msgstr "盧森堡"
 
 # calendar/gui/goto-dialog.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/fulladdr.glade.h:124
 msgid "Macau"
 msgstr "澳門"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/fulladdr.glade.h:125
 msgid "Macedonia"
 msgstr "馬其頓"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/fulladdr.glade.h:126
 msgid "Madagascar"
 msgstr "馬達加斯加"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/fulladdr.glade.h:127
 msgid "Malawi"
 msgstr "馬拉威"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/fulladdr.glade.h:128
 msgid "Malaysia"
 msgstr "馬來西亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/fulladdr.glade.h:129
 msgid "Maldives"
 msgstr "馬爾地夫"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/fulladdr.glade.h:130
 msgid "Mali"
 msgstr "馬利"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: addressbook/gui/contact-editor/fulladdr.glade.h:131
 msgid "Malta"
 msgstr "馬爾他"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/fulladdr.glade.h:132
 msgid "Marshall Islands"
 msgstr "馬紹爾群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/fulladdr.glade.h:133
 msgid "Martinique"
 msgstr "法屬馬丁尼克"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/fulladdr.glade.h:134
 msgid "Mauritania"
 msgstr "茅利塔尼亞"
 
 # addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/fulladdr.glade.h:135
 msgid "Mauritius"
 msgstr "模里西斯"
 
 # calendar/gui/goto-dialog.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/fulladdr.glade.h:136
 msgid "Mayotte"
 msgstr "美亞特"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: addressbook/gui/contact-editor/fulladdr.glade.h:137
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/fulladdr.glade.h:138
 msgid "Micronesia"
 msgstr "密克羅尼西亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Moldova, Republic Of"
-msgstr ""
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/event-editor.c:475
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/fulladdr.glade.h:139
 msgid "Monaco"
 msgstr "摩納哥"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/fulladdr.glade.h:140
 msgid "Mongolia"
 msgstr "蒙古"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/fulladdr.glade.h:141
 msgid "Montserrat"
 msgstr "蒙瑟拉特島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: addressbook/gui/contact-editor/fulladdr.glade.h:142
 msgid "Morocco"
 msgstr "摩洛哥"
 
 # addressbook/contact-editor/e-contact-editor.c:1253
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/fulladdr.glade.h:143
 msgid "Mozambique"
 msgstr "莫三比克"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/fulladdr.glade.h:144
 msgid "Myanmar"
 msgstr "緬甸"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/fulladdr.glade.h:145
 msgid "Namibia"
 msgstr "納米比亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/fulladdr.glade.h:146
 msgid "Nauru"
 msgstr "諾魯"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/fulladdr.glade.h:147
 msgid "Nepal"
 msgstr "尼泊爾"
 
 # addressbook/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: addressbook/gui/contact-editor/fulladdr.glade.h:148
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/fulladdr.glade.h:149
 msgid "Netherlands Antilles"
 msgstr "荷屬安地列斯"
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/fulladdr.glade.h:150
 msgid "New Caledonia"
 msgstr "新喀里多尼亞島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: addressbook/gui/contact-editor/fulladdr.glade.h:151
 msgid "New Zealand"
 msgstr "紐西蘭"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: addressbook/gui/contact-editor/fulladdr.glade.h:152
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
 # mail/message-list.c:690
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/fulladdr.glade.h:153
 msgid "Niger"
 msgstr "尼日"
 
 # mail/message-list.c:690
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/fulladdr.glade.h:154
 msgid "Nigeria"
 msgstr "奈及利亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/fulladdr.glade.h:155
 msgid "Niue"
 msgstr "紐威島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: addressbook/gui/contact-editor/fulladdr.glade.h:156
 msgid "Norfolk Island"
 msgstr "諾福克群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/fulladdr.glade.h:157
 msgid "Northern Mariana Islands"
 msgstr "北馬里亞納群島"
 
 # widgets/misc/e-cell-date-edit.c:221
 # widgets/misc/e-dateedit.c:418
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: addressbook/gui/contact-editor/fulladdr.glade.h:158
 msgid "Norway"
 msgstr "挪威"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: addressbook/gui/contact-editor/fulladdr.glade.h:159
 msgid "Oman"
 msgstr "阿曼"
 
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: addressbook/gui/contact-editor/fulladdr.glade.h:160
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/fulladdr.glade.h:161
 msgid "Palau"
 msgstr "帛琉群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/fulladdr.glade.h:162
 #, fuzzy
 msgid "Palestinian Territory"
 msgstr "英屬印度洋地區"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: addressbook/gui/contact-editor/fulladdr.glade.h:163
 msgid "Panama"
 msgstr "巴拿馬"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/fulladdr.glade.h:164
 msgid "Papua New Guinea"
 msgstr "巴布亞紐幾內亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: addressbook/gui/contact-editor/fulladdr.glade.h:165
 msgid "Paraguay"
 msgstr "巴拉圭"
 
 # addressbook/printing/e-contact-print.glade.h:27
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: addressbook/gui/contact-editor/fulladdr.glade.h:166
 msgid "Peru"
 msgstr "秘魯"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/fulladdr.glade.h:167
 msgid "Philippines"
 msgstr "菲律賓"
 
 # ui/evolution-calendar.xml.h:25
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/fulladdr.glade.h:168
 msgid "Pitcairn"
 msgstr "皮特康"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: addressbook/gui/contact-editor/fulladdr.glade.h:169
 msgid "Poland"
 msgstr "波蘭"
 
 # addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: addressbook/gui/contact-editor/fulladdr.glade.h:170
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: addressbook/gui/contact-editor/fulladdr.glade.h:171
 msgid "Puerto Rico"
 msgstr "波多黎各"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: addressbook/gui/contact-editor/fulladdr.glade.h:172
 msgid "Qatar"
 msgstr "卡達"
 
+#: addressbook/gui/contact-editor/fulladdr.glade.h:173
+msgid "Republic Of Korea"
+msgstr "韓國"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:174
+msgid "Republic Of Moldova"
+msgstr "摩爾多瓦"
+
 # addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/fulladdr.glade.h:175
 msgid "Reunion"
 msgstr "留尼旺"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: addressbook/gui/contact-editor/fulladdr.glade.h:176
 msgid "Romania"
 msgstr "羅馬尼亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/fulladdr.glade.h:177
 msgid "Russian Federation"
 msgstr "俄羅斯"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/fulladdr.glade.h:178
 msgid "Rwanda"
 msgstr "盧安達"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/fulladdr.glade.h:179
 msgid "Saint Kitts And Nevis"
 msgstr "聖克里斯多福"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/fulladdr.glade.h:180
 msgid "Saint Lucia"
 msgstr "聖露西亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/fulladdr.glade.h:181
 msgid "Saint Vincent And The Grena-dines"
 msgstr "聖文森"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/fulladdr.glade.h:182
 msgid "Samoa"
 msgstr "薩摩亞群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/fulladdr.glade.h:183
 msgid "San Marino"
 msgstr "聖馬利諾"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/fulladdr.glade.h:184
 msgid "Sao Tome And Principe"
 msgstr "聖多美及普林西比"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: addressbook/gui/contact-editor/fulladdr.glade.h:185
 msgid "Saudi Arabia"
 msgstr "沙烏地阿拉伯"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/fulladdr.glade.h:186
 msgid "Senegal"
 msgstr "塞內加爾"
 
 # calendar/gui/e-meeting-dialog.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/fulladdr.glade.h:187
 msgid "Seychelles"
 msgstr "塞席爾"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/fulladdr.glade.h:188
 msgid "Sierra Leone"
 msgstr "獅子山"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: addressbook/gui/contact-editor/fulladdr.glade.h:189
 msgid "Singapore"
 msgstr "新加坡"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: addressbook/gui/contact-editor/fulladdr.glade.h:190
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: addressbook/gui/contact-editor/fulladdr.glade.h:191
 msgid "Slovenia"
 msgstr "斯洛凡尼亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/fulladdr.glade.h:192
 msgid "Solomon Islands"
 msgstr "索羅門群島"
 
@@ -2735,120 +2535,108 @@ msgstr "索羅門群島"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/fulladdr.glade.h:193
 msgid "Somalia"
 msgstr "索馬利亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: addressbook/gui/contact-editor/fulladdr.glade.h:194
 msgid "South Africa"
 msgstr "南非"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/fulladdr.glade.h:195
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "南喬治亞及南桑威奇群島"
 
 # ui/evolution-message-composer.xml.h:26
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: addressbook/gui/contact-editor/fulladdr.glade.h:196
 msgid "Spain"
 msgstr "西班牙"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/fulladdr.glade.h:197
 msgid "Sri Lanka"
 msgstr "斯里蘭卡"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/fulladdr.glade.h:198
 msgid "St. Helena"
 msgstr "聖赫勒拿島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/fulladdr.glade.h:199
 msgid "St. Pierre And Miquelon"
 msgstr "聖匹及密啟倫群島"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/fulladdr.glade.h:200
 msgid "Sudan"
 msgstr "蘇丹"
 
 # addressbook/gui/widgets/e-addressbook-view.c:734
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: addressbook/gui/contact-editor/fulladdr.glade.h:201
 msgid "Suriname"
 msgstr "蘇利南"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/fulladdr.glade.h:202
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "斯瓦巴及尖棉島"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/fulladdr.glade.h:203
 msgid "Swaziland"
 msgstr "史瓦濟蘭"
 
 # mail/message-list.c:678
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/fulladdr.glade.h:204
 msgid "Sweden"
 msgstr "瑞典"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: addressbook/gui/contact-editor/fulladdr.glade.h:205
 msgid "Switzerland"
 msgstr "瑞士"
 
 # addressbook/contact-editor/e-contact-editor.c:1258
 # addressbook/gui/widgets/e-addressbook-view.c:721
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: addressbook/gui/contact-editor/fulladdr.glade.h:206
 msgid "Taiwan"
 msgstr "臺灣"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/fulladdr.glade.h:207
 msgid "Tajikistan"
 msgstr "塔吉克"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#, fuzzy
-msgid "Tanzania, United Republic Of"
-msgstr "坦尚尼亞"
-
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/fulladdr.glade.h:208
 msgid "Thailand"
 msgstr "泰國"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/fulladdr.glade.h:209
 msgid "Togo"
 msgstr "多哥"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/fulladdr.glade.h:210
 msgid "Tokelau"
 msgstr "托克勞群島"
 
 # ui/evolution-calendar.xml.h:34
 # widgets/misc/e-cell-date-edit.c:229
 # widgets/misc/e-dateedit.c:424
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/fulladdr.glade.h:211
 msgid "Tonga"
 msgstr "東加"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/fulladdr.glade.h:212
 msgid "Trinidad And Tobago"
 msgstr "千里達"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/fulladdr.glade.h:213
 msgid "Tunisia"
 msgstr "突尼西亞"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: addressbook/gui/contact-editor/fulladdr.glade.h:214
 msgid "Turkey"
 msgstr "土耳其"
 
@@ -2857,217 +2645,120 @@ msgstr "土耳其"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/fulladdr.glade.h:215
 msgid "Turkmenistan"
 msgstr "土庫曼"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/fulladdr.glade.h:216
 msgid "Turks And Caicos Islands"
 msgstr "土克斯及開科斯群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/fulladdr.glade.h:217
 msgid "Tuvalu"
 msgstr "吐瓦魯"
 
+#: addressbook/gui/contact-editor/fulladdr.glade.h:218
+msgid "U.S. Virgin Islands"
+msgstr "美屬維爾京群島"
+
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/fulladdr.glade.h:219
 msgid "Uganda"
 msgstr "烏干達"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: addressbook/gui/contact-editor/fulladdr.glade.h:220
 msgid "Ukraine"
 msgstr "烏克蘭"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/fulladdr.glade.h:221
 msgid "United Arab Emirates"
 msgstr "阿拉伯聯合大公國"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: addressbook/gui/contact-editor/fulladdr.glade.h:222
 msgid "United Kingdom"
 msgstr "英國"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/fulladdr.glade.h:223
+msgid "United Republic Of Tanzania"
+msgstr "坦尚尼亞"
+
+# mail/mail-search.c:138
+#: addressbook/gui/contact-editor/fulladdr.glade.h:224
+msgid "United States"
+msgstr "美國"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:225
 msgid "United States Minor Outlying Islands"
 msgstr "美屬邊疆群島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: addressbook/gui/contact-editor/fulladdr.glade.h:226
 msgid "Uruguay"
 msgstr "烏拉圭"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/fulladdr.glade.h:227
 msgid "Uzbekistan"
 msgstr "烏茲別克"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/fulladdr.glade.h:228
 msgid "Vanuatu"
 msgstr "萬那杜"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: addressbook/gui/contact-editor/fulladdr.glade.h:229
 msgid "Venezuela"
 msgstr "委內瑞拉"
 
 # addressbook/gui/component/select-names/select-names.glade.h:3
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: addressbook/gui/contact-editor/fulladdr.glade.h:230
 msgid "Viet Nam"
 msgstr "越南"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#, fuzzy
-msgid "Virgin Islands, British"
-msgstr "美屬維爾京群島"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#, fuzzy
-msgid "Virgin Islands, U.S."
-msgstr "美屬維爾京群島"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/fulladdr.glade.h:231
 msgid "Wallis And Futuna Islands"
 msgstr "沃里斯與伏塔那島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/fulladdr.glade.h:232
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
 # mail/message-list.c:678
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: addressbook/gui/contact-editor/fulladdr.glade.h:233
 msgid "Yemen"
 msgstr "葉門"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: addressbook/gui/contact-editor/fulladdr.glade.h:234
 msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/fulladdr.glade.h:235
 msgid "Zambia"
 msgstr "尚比亞"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "Zimbabwe"
 msgstr "辛巴威"
 
-# addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "刪除連絡人？"
-
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
-#, fuzzy
-msgid "Category editor not available."
-msgstr "沒有描述。"
-
-# addressbook/contact-editor/e-contact-editor.c:603
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
-msgid "This contact belongs to these categories:"
-msgstr "此連絡人屬於這些類別："
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
-#, fuzzy
-msgid "Save Contact as VCard"
-msgstr "儲存成 VCard 檔案格式"
-
-# addressbook/contact-editor/e-contact-editor.c:1260
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-# camel/providers/local/camel-local-store.c:279
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "不能找到欄位 `%s' 之界面工具"
-
-# addressbook/contact-editor/e-contact-quick-add.c:233
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "快速新增連絡人"
-
-# addressbook/contact-editor/e-contact-quick-add.c:235
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "編輯全部"
-
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:336
-msgid "Full Name"
-msgstr "全名"
-
-# addressbook/contact-editor/e-contact-quick-add.c:282
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-msgid "E-mail"
-msgstr "電子郵件"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
-msgid "card.vcf"
-msgstr ""
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
-#, fuzzy
-msgid "list"
-msgstr "靄"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s 已經存在\n"
-"您是否要複寫它?"
-
-# addressbook/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "地址 2(_2)："
-
-# addressbook/contact-editor/fulladdr.glade.h:3
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Check Address"
-msgstr "檢查地址"
-
-# addressbook/contact-editor/fulladdr.glade.h:4
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "國家 (_Y)："
-
 # addressbook/contact-editor/fulladdr.glade.h:7
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:237
 msgid "_Address:"
 msgstr "地址 (_A)："
 
 # addressbook/contact-editor/fulladdr.glade.h:8
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_City:"
 msgstr "縣/市 (_C)："
 
 # addressbook/contact-editor/fulladdr.glade.h:9
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_PO Box:"
 msgstr "郵箱 (_P)："
 
 # addressbook/contact-editor/fulladdr.glade.h:10
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_State/Province:"
 msgstr "州/省 (_S)："
 
 # addressbook/contact-editor/fulladdr.glade.h:11
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:241
 msgid "_ZIP Code:"
 msgstr "郵遞區號 (_Z)"
 
@@ -3190,19 +2881,10 @@ msgstr "連絡人清單編輯器"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
 msgid "Contact List Editor"
 msgstr "連絡人清單編輯器"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
-#, fuzzy
-msgid "Save List as VCard"
-msgstr "儲存成 VCard 檔案格式"
-
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "不管怎樣都新增"
@@ -3254,7 +2936,7 @@ msgstr ""
 
 # widgets/misc/e-filter-bar.c:239
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr "進階尋找"
 
@@ -3269,72 +2951,142 @@ msgstr "尋找"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/e-addressbook-model.c:137
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 msgid "No cards"
 msgstr "沒有名片"
 
 # ui/evolution-calendar.xml.h:25
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 msgid "1 card"
 msgstr "1 張名片"
 
 # calendar/gui/event-editor.c:1563
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, c-format
 msgid "%d cards"
 msgstr " %d 張名片"
 
-# shell/e-shell-importer.c:384
-#: addressbook/gui/widgets/e-addressbook-model.c:370
-#, fuzzy
-msgid "Error getting book view"
-msgstr "啟動 %s 時發生錯誤"
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+# addressbook/gui/widgets/e-addressbook-view.c:551
+# addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:1405
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard"
+msgstr "儲存成 VCard 檔案格式"
+
+# calendar/gui/e-day-view.c:3162
+# calendar/gui/e-week-view.c:3292
+# ui/evolution-calendar.xml.h:19
+# ui/evolution-message-composer.xml.h:11
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "開啟"
+
+# ui/evolution-mail.xml.h:35
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "連絡人轉寄"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+# addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:735
+msgid "Send Message to Contact"
+msgstr "傳送郵件給連絡人"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+# addressbook/gui/widgets/e-addressbook-view.c:614
+# mail/message-browser.c:199
+# ui/evolution-addressbook.xml.h:9
+# ui/evolution-calendar.xml.h:23
+# ui/evolution-mail.xml.h:65
+# ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
+#: ui/my-evolution.xml.h:2
+msgid "Print"
+msgstr "列印"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+# addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:738
+msgid "Print Envelope"
+msgstr "列印信封"
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+# addressbook/gui/widgets/e-addressbook-view.c:616
+# calendar/gui/e-meeting-dialog.glade.h:8
+# calendar/gui/event-editor-dialog.glade.h:9
+# mail/mail-config.glade.h:23
+# mail/message-browser.c:202
+# ui/evolution-addressbook.xml.h:3
+# ui/evolution-event-editor.xml.h:17
+# ui/evolution-mail.xml.h:22
+# ui/evolution-task-editor-dialog.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
+#: ui/evolution-tasks.xml.h:8
+msgid "Delete"
+msgstr "刪除"
 
 # shell/e-shell-importer.c:404
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:1007
 msgid "Success"
 msgstr "成功"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:35
 msgid "Repository offline"
 msgstr "資料庫離線"
 
 # shell/e-storage.c:475
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:1035
 msgid "Permission denied"
 msgstr "權限不足"
 
 # calendar/gui/calendar-commands.c:266
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Card not found"
 msgstr "找不到名片"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card ID already exists"
 msgstr "名片 ID 已經存在"
 
 # shell/e-storage.c:477
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
@@ -3344,347 +3096,141 @@ msgstr "通訊協定不支援"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
+#: camel/camel-service.c:607 camel/camel-service.c:643
 msgid "Cancelled"
 msgstr "已取消"
 
 # shell/e-storage.c:467
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Other error"
 msgstr "其它錯誤"
 
 # calendar/gui/dialogs/save-comp.c:51
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:57
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "您是否須要儲存？"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Error adding card"
 msgstr "新增名片時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:85
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:95
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Error removing card"
 msgstr "移除名片時發生錯誤"
 
-# calendar/gui/calendar-summary.c:622
-# mail/mail-config.glade.h:24
-#: addressbook/gui/widgets/e-addressbook-util.c:204
-#, fuzzy
-msgid "Display Cards?"
-msgstr "顯示"
-
-# calendar/gui/calendar-summary.c:622
-# mail/mail-config.glade.h:24
-#: addressbook/gui/widgets/e-addressbook-util.c:205
-#, fuzzy
-msgid "Display Cards"
-msgstr "顯示"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-#, c-format
-msgid ""
-"You have requested that %d cards be cards. This will cause %d new windows to "
-"be\n"
-"displayed on your screen. Do you really want to display all of these cards?"
-msgstr ""
-
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/e-addressbook-util.c:344
-#, fuzzy
-msgid "Move card to"
-msgstr "沒有名片"
-
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/e-addressbook-util.c:346
-#, fuzzy
-msgid "Copy card to"
-msgstr "沒有名片"
-
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/e-addressbook-util.c:349
-#, fuzzy
-msgid "Move cards to"
-msgstr "沒有名片"
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:378
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/e-addressbook-util.c:351
-#, fuzzy
-msgid "Copy cards to"
-msgstr "沒有名片"
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:383
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
 # addressbook/gui/widgets/e-addressbook-view.c:698
-#: addressbook/gui/widgets/e-addressbook-view.c:334
+#: addressbook/gui/widgets/e-addressbook-view.c:848
 msgid "* Click here to add a contact *"
 msgstr "* 按這裏新增連絡人 *"
 
 # addressbook/gui/widgets/e-addressbook-view.c:702
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Primary Phone"
 msgstr "主要電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:703
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Assistant Phone"
 msgstr "助理電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:704
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Business Phone"
 msgstr "商務電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:705
-#: addressbook/gui/widgets/e-addressbook-view.c:341
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Callback Phone"
 msgstr "回撥電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:706
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Company Phone"
 msgstr "公司電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:707
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Home Phone"
 msgstr "住家電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:709
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Business Address"
 msgstr "商務地址"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
-#: addressbook/gui/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Home Address"
 msgstr "住家地址"
 
 # addressbook/gui/widgets/e-addressbook-view.c:711
-#: addressbook/gui/widgets/e-addressbook-view.c:347
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Mobile Phone"
 msgstr "行動電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:712
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Car Phone"
 msgstr "汽車電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:715
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Phone 2"
 msgstr "商務電話 2"
 
 # addressbook/gui/widgets/e-addressbook-view.c:716
-#: addressbook/gui/widgets/e-addressbook-view.c:352
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Phone 2"
 msgstr "住家電話 2"
 
 # addressbook/gui/widgets/e-addressbook-view.c:718
-#: addressbook/gui/widgets/e-addressbook-view.c:354
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Other Phone"
 msgstr "其它電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:724
-#: addressbook/gui/widgets/e-addressbook-view.c:360
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Other Address"
 msgstr "其它地址"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
-#: ui/evolution-addressbook.xml.h:21
-msgid "Save as VCard"
-msgstr "儲存成 VCard 檔案格式"
-
-# ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/widgets/e-addressbook-view.c:875
-#, fuzzy
-msgid "New Contact..."
-msgstr "新增連絡人"
-
-# ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/widgets/e-addressbook-view.c:876
-#, fuzzy
-msgid "New Contact List..."
-msgstr "新增連絡人清單"
-
-# ui/evolution.xml.h:52
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#, fuzzy
-msgid "Go to Folder..."
-msgstr "移至資料夾(_G)..."
-
-# shell/e-shell-importer.c:363
-#: addressbook/gui/widgets/e-addressbook-view.c:880
-#, fuzzy
-msgid "Import..."
-msgstr "匯入..."
-
-# ui/evolution-addressbook.xml.h:19
-#: addressbook/gui/widgets/e-addressbook-view.c:882
-#, fuzzy
-msgid "Search for Contacts..."
-msgstr "尋找連絡人(_S)"
-
-# ui/evolution-addressbook.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:883
-#, fuzzy
-msgid "Addressbook Sources..."
-msgstr "目錄服務來源(_A)..."
-
-# ui/evolution-mail.xml.h:110
-#: addressbook/gui/widgets/e-addressbook-view.c:885
-#, fuzzy
-msgid "Pilot Settings..."
-msgstr "郵件設定(_M)..."
-
-# ui/evolution-mail.xml.h:35
-#: addressbook/gui/widgets/e-addressbook-view.c:889
-#: ui/evolution-addressbook.xml.h:12
-msgid "Forward Contact"
-msgstr "連絡人轉寄"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
-#: addressbook/gui/widgets/e-addressbook-view.c:890
-msgid "Send Message to Contact"
-msgstr "傳送郵件給連絡人"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-# addressbook/gui/widgets/e-addressbook-view.c:614
-# mail/message-browser.c:199
-# ui/evolution-addressbook.xml.h:9
-# ui/evolution-calendar.xml.h:23
-# ui/evolution-mail.xml.h:65
-# ui/evolution-tasks.xml.h:4
-#: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
-#: ui/my-evolution.xml.h:1
-msgid "Print"
-msgstr "列印"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-# addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/gui/widgets/e-addressbook-view.c:893
-msgid "Print Envelope"
-msgstr "列印信封"
-
-# mail/folder-browser.c:713
-#: addressbook/gui/widgets/e-addressbook-view.c:897
-#, fuzzy
-msgid "Copy to folder..."
-msgstr "復製至資料夾(_C)..."
-
-# mail/folder-browser.c:711
-#: addressbook/gui/widgets/e-addressbook-view.c:898
-#, fuzzy
-msgid "Move to folder..."
-msgstr "移至資料夾(_M)..."
-
-# ui/evolution-event-editor.xml.h:15
-# ui/evolution-task-editor-dialog.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:901
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "剪下"
-
-# ui/evolution-event-editor.xml.h:13
-# ui/evolution-mail.xml.h:8
-# ui/evolution-task-editor-dialog.xml.h:14
-#: addressbook/gui/widgets/e-addressbook-view.c:902
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "複製"
-
-# ui/evolution-event-editor.xml.h:30
-# ui/evolution-task-editor-dialog.xml.h:33
-#: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
-msgid "Paste"
-msgstr "貼上"
-
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
-msgid "Delete"
-msgstr "刪除"
-
-# widgets/menus/gal-view-menus.c:176
-#: addressbook/gui/widgets/e-addressbook-view.c:907
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
-#, fuzzy
-msgid "Current View"
-msgstr "目前檢視(_C)"
-
-#. Minicard view stuff
-#. Translators: put here a list of labels you want to see on buttons in
-#. addressbook. You may use any character to separate labels but it must
-#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
-msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-
-#. Translators: put here a list of characters that correspond to buttons
-#. in addressbook. You may use any character to separate labels but it
-#. must also be placed at the begining ot the string.
-#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
-msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3700,12 +3246,11 @@ msgid "Save in addressbook"
 msgstr "存入目錄服務"
 
 # addressbook/gui/widgets/e-minicard-view.c:216
-#: addressbook/gui/widgets/e-minicard-view.c:140
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard-view.c:150
 msgid ""
 "\n"
 "\n"
-"There are no items to show in this view.\n"
+"There are no items to show in this view\n"
 "\n"
 "Double-click here to create a new Contact."
 msgstr ""
@@ -3715,43 +3260,11 @@ msgstr ""
 "\n"
 "雙擊這裏新增連絡人。"
 
-# addressbook/gui/widgets/e-minicard-view.c:216
-#: addressbook/gui/widgets/e-minicard-view.c:143
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"沒有項目可供這種檢視方式顯示\n"
-"\n"
-"雙擊這裏新增連絡人。"
-
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "名片檢視模式"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-# addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "列印信封"
-
-# ui/evolution-calendar.xml.h:25
-#: addressbook/printing/e-contact-print.c:1115
-msgid "Print cards"
-msgstr "列印名片"
-
-# ui/evolution-calendar.xml.h:25
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
-msgid "Print card"
-msgstr "列印名片"
-
 # addressbook/printing/e-contact-print.glade.h:1
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3839,7 +3352,6 @@ msgstr "包含："
 
 # addressbook/printing/e-contact-print.glade.h:18
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "橫向"
 
@@ -3871,13 +3383,11 @@ msgstr "選項"
 
 # addressbook/printing/e-contact-print.glade.h:24
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "紙張方向"
 
 # addressbook/printing/e-contact-print.glade.h:25
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "頁"
 
@@ -3897,9 +3407,7 @@ msgid "Paper source:"
 msgstr "紙張來源："
 
 # addressbook/printing/e-contact-print.glade.h:29
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "縱向"
 
@@ -3968,8 +3476,26 @@ msgstr "寬："
 msgid "_Font..."
 msgstr "字型(_F)..."
 
+# ui/evolution-calendar.xml.h:25
+#: addressbook/printing/e-contact-print.c:1111
+msgid "Print cards"
+msgstr "列印名片"
+
+# ui/evolution-calendar.xml.h:25
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
+msgid "Print card"
+msgstr "列印名片"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+# addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "列印信封"
+
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1202
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "編輯約會(_E)"
@@ -3979,8 +3505,9 @@ msgstr "編輯約會(_E)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:10
 # calendar/gui/e-calendar-table.c:345
 # mail/message-list.c:689
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
 msgid "High"
 msgstr "高"
 
@@ -3990,9 +3517,10 @@ msgstr "高"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
 msgid "Normal"
 msgstr "普通"
 
@@ -4001,8 +3529,9 @@ msgstr "普通"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:12
 # calendar/gui/e-calendar-table.c:347
 # mail/message-list.c:687
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
 msgid "Low"
 msgstr "低"
 
@@ -4010,35 +3539,30 @@ msgstr "低"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
+#: calendar/cal-util/cal-util.c:518
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:408
 msgid "Undefined"
 msgstr "未指定"
 
 # calendar/conduits/calendar/calendar-conduit.c:687
 # calendar/conduits/todo/todo-conduit.c:501
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "與行事曆伺服器通訊時發生錯誤"
 
 # calendar/conduits/calendar/calendar-conduit.c:786
 # calendar/conduits/calendar/calendar-conduit.c:789
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/calendar/calendar-conduit.c:1300
+#: calendar/conduits/calendar/calendar-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:1078
 msgid "Could not read pilot's Calendar application block"
 msgstr "不能讀取 pilot 行事曆程式區塊"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/conduits/todo/todo-conduit.c:206
-#, fuzzy
-msgid "Default Priority:"
-msgstr "優先順序(_P)："
-
 # calendar/conduits/todo/todo-conduit.c:600
 # calendar/conduits/todo/todo-conduit.c:603
-#: calendar/conduits/todo/todo-conduit.c:951
-#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:754
+#: calendar/conduits/todo/todo-conduit.c:757
 msgid "Could not read pilot's ToDo application block"
 msgstr "不能讀取 pilot 待辦事項程式區塊"
 
@@ -4053,68 +3577,52 @@ msgstr "一個可以顯示行事曆的 Bonobo 控制項例子"
 msgid "A sample Bonobo control which displays an calendar."
 msgstr "一個可以顯示行事曆的 Bonobo 控制項例子"
 
-# ui/evolution-mail.xml.h:110
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "行事曆與工作設定"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Calendar."
-msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
-
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Evolution 行事曆執行摘要元件."
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution 行事曆 iTip/iMip 檢視器"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "用作處理行事曆的 Evolution 元件。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr "行事曆摘要元件工廠."
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "用作產生行事曆 iTip 檢視控制項的元件工廠。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "用作產生行事曆控制項例子的元件工廠。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "集中式行事曆元件編輯器對話視窗工廠。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "建立元件編輯器工廠。"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
-msgid "This page can be used to configure Calendar and Task preferences"
-msgstr ""
-
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -4125,12 +3633,31 @@ msgstr "聲音提醒服務"
 msgid "Factory for the alarm notification service"
 msgstr "聲音提醒服務的元件工廠"
 
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "設定"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr ""
+
 # calendar/gui/event-editor-dialog.glade.h:30
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 #, fuzzy
 msgid "invalid time"
 msgstr "結束時間 (_E)："
 
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 # calendar/gui/e-calendar-table.c:162
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, fuzzy, c-format
@@ -4166,11 +3693,11 @@ msgid "_Edit appointment"
 msgstr "編輯約會(_E)"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:670
 msgid "No description available."
 msgstr "沒有描述。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:730
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4178,35 +3705,20 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-# widgets/misc/e-messagebox.c:159
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "警告"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:781
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger.\n"
+"This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
 
-# importers/elm-importer.c:528
-# importers/netscape-importer.c:807
-# importers/pine-importer.c:668
-#: calendar/gui/alarm-notify/alarm-queue.c:772
-#, fuzzy
-msgid "Do not ask me about this program again."
-msgstr "不要再顯示這個訊息。"
-
 # calendar/gui/alarm-notify/notify-main.c:93
 # calendar/gui/main.c:52
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 msgid "Could not initialize GNOME"
 msgstr "不能初始化 GNOME"
 
@@ -4221,29 +3733,10 @@ msgstr "不能建立聲音提醒服務元件工廠"
 msgid "Could not create the alarm notify service factory"
 msgstr "不能建立聲音提醒服務元件工廠"
 
-# calendar/gui/gnome-cal.c:234
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "主旨包含"
-
-# calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "描述包含"
-
-# calendar/gui/gnome-cal.c:236
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "備註包含"
-
-#: calendar/gui/cal-search-bar.c:386
-msgid "Unmatched"
-msgstr "沒有相符資料"
-
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:446
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
@@ -4252,22 +3745,22 @@ msgstr "%A %d %B %Y"
 # calendar/gui/e-week-view-main-item.c:334
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 # calendar/gui/print.c:1093
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:458
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
+#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
@@ -4275,13 +3768,13 @@ msgstr "%d %B %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:474
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
 msgid "%d %B"
 msgstr "%d %B"
 
 # calendar/gui/calendar-commands.c:468
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:805
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "不能建立行事曆檢視。  請檢查 ORBit 和 OAF 的設定。"
@@ -4289,21 +3782,23 @@ msgstr "不能建立行事曆檢視。  請檢查 ORBit 和 OAF 的設定。"
 # calendar/gui/calendar-model.c:363
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
+#: calendar/gui/e-calendar-table.c:384
 msgid "Private"
 msgstr "私人"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
+#: calendar/gui/e-calendar-table.c:385
 msgid "Confidential"
 msgstr "機密"
 
 # calendar/gui/calendar-model.c:360
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 msgid "Public"
 msgstr "公開"
 
@@ -4328,13 +3823,15 @@ msgid "W"
 msgstr "W"
 
 # ui/evolution-calendar.xml.h:36
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
+#: calendar/gui/e-calendar-table.c:457
 msgid "Free"
 msgstr "空閒"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-meeting-time-sel.c:427
+#: shell/evolution-shell-component.c:1029
 msgid "Busy"
 msgstr "忙碌"
 
@@ -4342,8 +3839,9 @@ msgstr "忙碌"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr "未開始"
 
@@ -4351,8 +3849,9 @@ msgstr "未開始"
 # calendar/gui/calendar-model.c:1178
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr "進行中"
 
@@ -4360,14 +3859,15 @@ msgstr "進行中"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
 msgid "Completed"
 msgstr "已完成"
 
 # calendar/gui/calendar-model.c:970
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1048
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4392,38 +3892,48 @@ msgstr ""
 # widgets/misc/e-dateedit.c:1341
 # widgets/misc/e-dateedit.c:1456
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1485
+#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
+#: mail/mail-config.glade.h:47
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
+#: widgets/misc/e-dateedit.c:1487 widgets/misc/e-dateedit.c:1602
 msgid "None"
 msgstr "無"
 
 # calendar/gui/calendar-model.c:1576
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1705
 msgid "Recurring"
 msgstr "循環模式"
 
 # calendar/gui/calendar-model.c:1578
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1707
 msgid "Assigned"
 msgstr "已指定"
 
 # calendar/gui/calendar-model.c:1584
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
+#: calendar/gui/e-meeting-model.c:776
 msgid "Yes"
 msgstr "是"
 
 # calendar/gui/calendar-model.c:1584
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
+#: calendar/gui/e-meeting-model.c:777
 msgid "No"
 msgstr "否"
 
+# addressbook/gui/search/e-addressbook-search-dialog.c:158
+# mail/mail-search.c:242
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+#, fuzzy
+msgid "Searching"
+msgstr "尋找"
+
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
@@ -4444,100 +3954,78 @@ msgstr "週檢視"
 msgid "Month View"
 msgstr "月檢視"
 
+# calendar/gui/gnome-cal.c:234
+#: calendar/gui/cal-search-bar.c:56
+msgid "Summary contains"
+msgstr "主旨包含"
+
+# calendar/gui/gnome-cal.c:235
+#: calendar/gui/cal-search-bar.c:57
+msgid "Description contains"
+msgstr "描述包含"
+
+# calendar/gui/gnome-cal.c:236
+#: calendar/gui/cal-search-bar.c:58
+msgid "Comment contains"
+msgstr "備註包含"
+
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
+msgid "Unmatched"
+msgstr "沒有相符資料"
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "行事曆"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "資料夾包含約會與事件"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "工作"
 
 # mail/folder-browser.c:871
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "資料夾包含待辦事項"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: calendar/gui/component-factory.c:695
-#, fuzzy
-msgid "New meeting"
-msgstr "新聞發送伺服器設定"
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: calendar/gui/component-factory.c:695
-#, fuzzy
-msgid "_Meeting"
-msgstr "會議"
-
-# ui/evolution-tasks.xml.h:3
-#: calendar/gui/component-factory.c:699
-#, fuzzy
-msgid "New task"
-msgstr "新增工作"
-
-# ui/evolution-tasks.xml.h:9
-#: calendar/gui/component-factory.c:699
-msgid "_Task"
-msgstr "工作(_T)"
-
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:703
-#, fuzzy
-msgid "New All Day Appointment"
-msgstr "新增約會"
+# ui/evolution-calendar.xml.h:5
+#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+msgid "Create a new appointment"
+msgstr "建立一個新的約會"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:703
-#, fuzzy
-msgid "All _Day Appointment"
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
+msgid "New _Appointment"
 msgstr "新增約會(_A)"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:707
-#, fuzzy
-msgid "New appointment"
-msgstr "新增約會"
-
-# calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/component-factory.c:707
-#, fuzzy
-msgid "_Appointment"
-msgstr "約會"
+# ui/evolution-tasks.xml.h:2
+#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+#: ui/evolution-tasks.xml.h:5
+msgid "Create a new task"
+msgstr "建立一個新的工作"
 
-# calendar/gui/gnome-cal.c:840
-#: calendar/gui/control-factory.c:123
-#, fuzzy, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "不能開啟 `%s' 內的資料夾"
+# ui/evolution-tasks.xml.h:3
+#: calendar/gui/component-factory.c:649
+msgid "New _Task"
+msgstr "新增工作(_T)"
 
 # calendar/gui/control-factory.c:126
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "行事曆將顯示此 URI "
 
-#: calendar/gui/control-factory.c:174
-msgid "The type of view to show"
-msgstr ""
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
@@ -4735,12 +4223,12 @@ msgstr "約會結束後"
 msgid "%s at the end of the appointment"
 msgstr "約會結束後"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:453
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:458
+#: calendar/gui/dialogs/alarm-page.c:459
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -4766,7 +4254,7 @@ msgstr "提醒"
 # calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "摘要："
 
@@ -4776,12 +4264,13 @@ msgid "_Options..."
 msgstr "選項(_O)..."
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "之後"
 
 # calendar/gui/event-editor-dialog.glade.h:34
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "之前"
 
@@ -4803,7 +4292,7 @@ msgstr "時"
 
 # calendar/gui/event-editor-dialog.glade.h:42
 # mail/mail-config.glade.h:87
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "分"
 
@@ -4850,215 +4339,221 @@ msgstr "過期的工作色彩"
 msgid "Color for tasks due today"
 msgstr "今天到期的工作色彩"
 
-# ui/evolution-calendar.xml.h:7
+# ui/evolution-calendar.xml.h:5
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Create new appointments with a default _reminder"
+msgstr "以預設提醒建立新的約會(_R)"
+
+# ui/evolution-calendar.xml.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "天"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "First day of wee_k:"
+msgstr "每週的第一天(_K)："
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/event-editor.c:479
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Friday"
 msgstr "星期五"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "小時"
 
 # executive-summary/test-service/rdf-summary.c:806
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "分"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/event-editor.c:475
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.c:959
 msgid "Monday"
 msgstr "星期一"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "O_verdue tasks:"
+msgstr "過期的工作(_V)："
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/event-editor.c:480
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Saturday"
 msgstr "星期六"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
-msgstr ""
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Show appointment _end times in week and month views"
+msgstr "在週及月的檢視內顯示約會的結束時間(_E)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Sta_rt of day:"
 msgstr "工作開始時間(_R)："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Su_n"
 msgstr "週日(_N)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 # calendar/gui/event-editor.c:481
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Sunday"
 msgstr "星期日"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#, fuzzy
-msgid "T_asks due today:"
-msgstr "今天到期的工作(_K)："
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "週四(_H)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "T_ue"
 msgstr "週二(_U)"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
-msgid "Task List"
-msgstr "工作清單(_T)"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Tas_ks due today:"
+msgstr "今天到期的工作(_K)："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 # calendar/gui/event-editor.c:478
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Thursday"
 msgstr "星期四"
 
 # addressbook/gui/widgets/e-addressbook-view.c:730
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time"
 msgstr "時間"
 
 # addressbook/backend/ebook/e-card.c:3434
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time _zone:"
 msgstr "時區(_Z)： "
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Time di_visions:"
+msgstr "時間間隔(_V)："
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Time format:"
 msgstr "時間格式："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 # calendar/gui/event-editor.c:476
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Tuesday"
 msgstr "星期二"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 # calendar/gui/event-editor.c:477
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Wednesday"
 msgstr "星期三"
 
 # ui/evolution-calendar.xml.h:35
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: ui/evolution-calendar.xml.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "工作週"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小時 (上午/下午)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_24 hour"
 msgstr "_24 小時"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "顯示(_D)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_End of day:"
 msgstr "工作結束時間(_E)："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Fri"
 msgstr "週五(_F)"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_General"
 msgstr "一般(_G)"
 
 # ui/evolution-mail.xml.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Mon"
 msgstr "週一(_M)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#, fuzzy
-msgid "_Overdue tasks:"
-msgstr "過期的工作(_V)："
+# addressbook/contact-editor/e-contact-editor.c:1254
+# addressbook/contact-editor/e-contact-editor.c:1312
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+msgid "_Other"
+msgstr "其它(_O)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Sat"
 msgstr "週六(_S)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#, fuzzy
-msgid "_Show appointment end times in week and month views"
-msgstr "在週及月的檢視內顯示約會的結束時間(_E)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#, fuzzy
-msgid "_Time divisions:"
-msgstr "時間間隔(_V)："
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "_Task List"
+msgstr "工作清單(_T)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Wed"
 msgstr "週三(_W)"
 
 # calendar/gui/event-editor.c:1612
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "before the start of the appointment"
 msgstr "約會開始前"
 
@@ -5098,9 +4593,7 @@ msgstr "這個日誌項目已刪除。"
 #: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  "
-"您已經做了些變更。放棄這些變更並且關閉這個編輯器？"
+msgstr "%s  您已經做了些變更。放棄這些變更並且關閉這個編輯器？"
 
 #: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
@@ -5122,16 +4615,14 @@ msgstr "這個日誌項目已變更。"
 #: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s "
-"您已經做了些變更。放棄這些變更並且更新這個編輯器？"
+msgstr "%s 您已經做了些變更。放棄這些變更並且更新這個編輯器？"
 
 #: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s   您沒有做任何變更，更新這個編輯器？"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 msgid " to "
 msgstr "到"
 
@@ -5139,7 +4630,7 @@ msgstr "到"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (已完成)"
 
@@ -5147,33 +4638,33 @@ msgstr " (已完成)"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "已完成"
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr "(期限)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 # calendar/gui/e-calendar-table.c:155
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 msgid "Due "
 msgstr "期限"
 
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:303
 #, fuzzy
 msgid "Could not update object!"
 msgstr "不能正確地更新檔案"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:676
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:681
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
@@ -5181,29 +4672,47 @@ msgstr "約會 - %s"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:684
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:687
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日誌項目 - %s"
 
 # calendar/gui/e-calendar-table.c:159
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:701
 msgid "No summary"
 msgstr "沒有摘要"
 
-# composer/e-msg-composer.c:774
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
-msgid "Save as..."
+# mail/mail-callbacks.c:1140
+# mail/mail-display.c:92
+#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1891
+#: mail/mail-display.c:102
+msgid "Overwrite file?"
+msgstr "覆蓋檔案？"
+
+# mail/mail-callbacks.c:1144
+# mail/mail-display.c:96
+#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1898
+#: mail/mail-display.c:106
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"同一名稱的檔案已經存在。\n"
+"是否複蓋該檔案？"
+
+# widgets/misc/e-filter-bar.h:94
+# widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
 msgstr "另存新檔..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1270
 msgid "Unable to obtain current version!"
 msgstr "無法取得目前的版本！"
 
@@ -5274,7 +4783,7 @@ msgid "Enter Delegate"
 msgstr "輸入代表"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 msgid "Appointment"
 msgstr "約會"
 
@@ -5290,8 +4799,7 @@ msgstr "週期性"
 
 # ui/evolution-event-editor.xml.h:46
 #: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:352
 #, fuzzy
 msgid "Scheduling"
 msgstr "會議排程(_M)"
@@ -5299,8 +4807,7 @@ msgstr "會議排程(_M)"
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
 #: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:355
 msgid "Meeting"
 msgstr "會議"
 
@@ -5343,74 +4850,59 @@ msgstr "日期及時間"
 msgid "F_ree"
 msgstr "空閒(_R)"
 
-# addressbook/backend/ebook/e-card.c:3442
-#: calendar/gui/dialogs/event-page.glade.h:8
-#, fuzzy
-msgid "L_ocation:"
-msgstr ""
-"\n"
-"經緯："
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:15
 # calendar/gui/event-editor-dialog.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:8
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "私人 (_V)"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:17
 # calendar/gui/event-editor-dialog.glade.h:17
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "公開 (_B)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "顯示時間為"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:19
 # calendar/gui/event-editor-dialog.glade.h:27
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "主旨 (_M)："
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:24
-# calendar/gui/event-editor-dialog.glade.h:29
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "連絡人 (_C)..."
-
 # calendar/gui/event-editor-dialog.glade.h:30
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "_End time:"
 msgstr "結束時間 (_E)："
 
 # calendar/gui/event-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Start time:"
 msgstr "開始時間 (_S)："
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:422
 #, fuzzy
 msgid "An organizer is required."
 msgstr "必須指定一個召集人。"
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:623
 msgid "That person is already attending the meeting!"
 msgstr "此人已經出席本會議!"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:698
 msgid "_Delegate To..."
 msgstr "委派給(_D)..."
 
@@ -5420,61 +4912,68 @@ msgstr "委派給(_D)..."
 msgid "Attendee"
 msgstr "到會者"
 
-# calendar/gui/e-calendar-table.c:152
+# calendar/gui/e-calendar-table.c:163
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "按這裡新增到會者"
+
+# calendar/gui/e-calendar-table.c:152
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "普通名稱"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "委任自"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "委派給"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "語言"
 
 # calendar/gui/goto-dialog.glade.h:12
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "會員"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:798
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "角色"
 
 # calendar/gui/e-meeting-dialog.glade.h:23
 # mail/message-list.c:1081
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "狀況"
 
 # mail/mail-config.glade.h:78
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "類別"
@@ -5492,7 +4991,7 @@ msgstr "變更會議召集人(_C)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:411
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:445
 msgid "_Invite Others..."
 msgstr "邀請其他人(_I)..."
 
@@ -5501,114 +5000,33 @@ msgstr "邀請其他人(_I)..."
 msgid "_Other Organizer"
 msgstr "其他會議召集人(_O)"
 
-# calendar/gui/print.c:300
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-#, fuzzy
-msgid "st"
-msgstr "1日"
-
-# calendar/gui/print.c:300
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-#, fuzzy
-msgid "nd"
-msgstr "2日"
-
-# calendar/gui/print.c:300
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-#, fuzzy
-msgid "rd"
-msgstr "3日"
-
-# calendar/gui/event-editor.c:608
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
-msgstr " "
-
 # calendar/gui/event-editor.c:871
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:571
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
 # calendar/gui/event-editor.c:449
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "於"
 
-# addressbook/contact-editor/fullname.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.c:1062
-#, fuzzy
-msgid "first"
-msgstr "靄"
-
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
-msgid "second"
-msgstr "秒"
-
-# addressbook/contact-editor/e-contact-editor.c:1254
-# addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/dialogs/recurrence-page.c:1064
-#, fuzzy
-msgid "third"
-msgstr "其它電話"
-
-# addressbook/gui/widgets/e-addressbook-view.c:736
-#: calendar/gui/dialogs/recurrence-page.c:1065
-#, fuzzy
-msgid "fourth"
-msgstr "北"
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.c:1066
-#, fuzzy
-msgid "last"
-msgstr "靄"
-
-# addressbook/contact-editor/e-contact-editor.c:1255
-# addressbook/gui/widgets/e-addressbook-view.c:719
-#: calendar/gui/dialogs/recurrence-page.c:1092
-#, fuzzy
-msgid "Other Date"
-msgstr "其它傳真"
-
 # calendar/gui/event-editor.c:474
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 msgid "day"
 msgstr "每天"
 
 # calendar/gui/event-editor.c:601
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "on the"
 msgstr "在第"
 
+# calendar/gui/event-editor.c:608
+#: calendar/gui/dialogs/recurrence-page.c:1096
+msgid "th"
+msgstr " "
+
 # calendar/gui/event-editor.c:754
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1269
 msgid "occurrences"
 msgstr "出現"
 
@@ -5691,24 +5109,18 @@ msgstr "每週"
 msgid "year(s)"
 msgstr "每年"
 
-#: calendar/gui/dialogs/send-comp.c:56
-#, fuzzy
-msgid "The meeting information has been created. Send it?"
-msgstr "會議資訊已變更。是否傳送更新後的資訊？"
-
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:55
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "會議資訊已變更。是否傳送更新後的資訊？"
 
-#: calendar/gui/dialogs/send-comp.c:66
-#, fuzzy
-msgid "The task assignment information has been created. Send it?"
-msgstr "工作資訊已變更。是否傳送更新後的資訊？"
-
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The task information has changed. Send an updated version?"
 msgstr "工作資訊已變更。是否傳送更新後的資訊？"
 
+#: calendar/gui/dialogs/send-comp.c:65
+msgid "The journal entry has changed. Send an updated version?"
+msgstr "日誌項目已變更。是否傳送更新後的資訊？"
+
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -5728,7 +5140,7 @@ msgstr "進度"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:21
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:966
 msgid "URL:"
 msgstr "網址："
 
@@ -5742,23 +5154,19 @@ msgstr "優先順序(_P)："
 msgid "_Status:"
 msgstr "狀態(_S)："
 
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "基本"
-
 # calendar/gui/calendar-model.c:1578
 #: calendar/gui/dialogs/task-editor.c:190
 #: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:322
 msgid "Assignment"
 msgstr "指派工作"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "描述："
 
@@ -5772,103 +5180,173 @@ msgstr "開始日期(_R)："
 msgid "_Due Date:"
 msgstr "到期日(_D)："
 
+# calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-calendar-table.c:427
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+# calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:428
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+# calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:429
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+# calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:430
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+# calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:431
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+# calendar/gui/e-calendar-table.c:372
+#: calendar/gui/e-calendar-table.c:432
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+# calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:433
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+# calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:434
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+# calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:435
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+# calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:436
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+# calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:437
+#, c-format
+msgid "100%"
+msgstr "100%"
+
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "刪除選定的連絡人"
 
 # mail/folder-browser.c:686
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1484
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "開啟(_O)"
 
-# composer/e-msg-composer.c:774
-#: calendar/gui/e-calendar-table.c:973
-#, fuzzy
-msgid "_Save as..."
-msgstr "另存新檔..."
-
-# ui/evolution-addressbook.xml.h:18
-# ui/evolution-calendar.xml.h:42
-# ui/evolution-contact-editor.xml.h:15
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
-msgid "_Print..."
-msgstr "列印(_P)..."
-
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-task-editor-dialog.xml.h:7
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪下(_U)"
 
 # ui/evolution-event-editor.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:67
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3406 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "複製(_C)"
 
 # ui/evolution-event-editor.xml.h:68
 # ui/evolution-task-editor-dialog.xml.h:81
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
+#: calendar/gui/e-week-view.c:3408 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-# calendar/gui/calendar-model.c:1578
-#: calendar/gui/e-calendar-table.c:984
-#, fuzzy
-msgid "_Assign Task"
-msgstr "指派工作"
-
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-calendar-table.c:985
-#, fuzzy
-msgid "_Forward as iCalendar"
-msgstr "以 i_Calendar 轉寄"
-
 # calendar/gui/e-calendar-table.c:707
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "標示完成(_M)"
 
+# calendar/gui/e-calendar-table.c:708
+# ui/evolution-task-editor-dialog.xml.h:19
+#: calendar/gui/e-calendar-table.c:954
+msgid "_Delete this Task"
+msgstr "刪除這個工作(_D)"
+
 # calendar/gui/e-calendar-table.c:713
-#: calendar/gui/e-calendar-table.c:987
-#, fuzzy
-msgid "_Mark Selected Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:957
+msgid "_Mark Tasks as Complete"
 msgstr "標示為已完成的工作(_M)"
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
+#: calendar/gui/e-week-view.c:3889
 msgid "Updating objects"
 msgstr ""
 
 # calendar/gui/e-calendar-table.c:163
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1224
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "請按這裡新增新的工作"
 
+# calendar/gui/calendar-model.c:794
+# e-util/e-time-utils.c:278
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+# calendar/gui/calendar-model.c:797
+# e-util/e-time-utils.c:287
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+# calendar/gui/calendar-model.c:802
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"日期必須依此格式輸入：\n"
+"\n"
+"%s"
+
 # calendar/gui/e-calendar-table.c:162
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
@@ -5876,91 +5354,64 @@ msgstr "提醒"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:723
+#: camel/camel-filter-driver.c:837
 msgid "Complete"
 msgstr "完成"
 
 # calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "完成日期"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 # calendar/gui/e-calendar-table.c:155
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "到期日"
 
 # calendar/gui/e-calendar-table.c:153
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "結束日期"
 
 # calendar/gui/e-calendar-table.c:156
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "經緯"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 # calendar/gui/e-calendar-table.c:158
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "優先順序"
 
 # calendar/gui/e-calendar-table.c:154
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "開始日期"
 
 # calendar/gui/e-calendar-table.c:159
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
 msgid "Summary"
 msgstr "摘要"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "工作排序"
 
 # calendar/gui/e-calendar-table.c:161
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "網址 URL"
 
-# calendar/gui/calendar-model.c:794
-# e-util/e-time-utils.c:278
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:357
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
-
-# calendar/gui/calendar-model.c:797
-# e-util/e-time-utils.c:287
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:366
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-# calendar/gui/calendar-model.c:802
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"日期必須依此格式輸入：\n"
-"\n"
-"%s"
-
 # calendar/gui/e-day-view-time-item.c:519
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
@@ -5972,8 +5423,8 @@ msgstr "間隔 %02i 分鐘"
 # calendar/gui/e-week-view-main-item.c:325
 #. 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:284 calendar/gui/e-day-view.c:1413
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1387
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5982,7 +5433,7 @@ msgstr "%A %d %B"
 # calendar/gui/e-week-view-main-item.c:348
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
@@ -5991,7 +5442,8 @@ msgstr "%d %b"
 # calendar/gui/e-week-view.c:300
 # calendar/gui/print.c:617
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:768
 msgid "am"
 msgstr "上午"
 
@@ -5999,192 +5451,426 @@ msgstr "上午"
 # calendar/gui/e-week-view.c:303
 # calendar/gui/print.c:616
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
+#: calendar/gui/print.c:770
 msgid "pm"
 msgstr "下午"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
-#: calendar/gui/e-day-view.c:3549
-msgid "New _Appointment"
-msgstr "新增約會(_A)"
-
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
 msgid "New All Day _Event"
 msgstr "新增全天要事(_E)"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
-#, fuzzy
-msgid "New Meeting"
-msgstr "會議"
-
-# ui/evolution-tasks.xml.h:3
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
-msgid "New Task"
-msgstr "新增工作"
-
-# ui/evolution-contact-editor.xml.h:7
-# ui/evolution-event-editor.xml.h:38
-# ui/evolution-task-editor-dialog.xml.h:41
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "列印..."
-
 # ui/evolution-calendar.xml.h:12
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
-#: ui/evolution-calendar.xml.h:10
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "今日(_T)"
 
 # calendar/gui/e-day-view.c:3155
 # calendar/gui/e-week-view.c:3286
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
 msgid "_Go to Date..."
 msgstr "到指定日期(_G)..."
 
-# mail/mail-config.glade.h:61
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
-#: ui/evolution-calendar.xml.h:31
-msgid "_Publish Free/Busy Information"
-msgstr "發佈 空閒/忙碌 資訊(_P)"
-
-# mail/mail-config.glade.h:40
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
-#, fuzzy
-msgid "_Configure..."
-msgstr "郵件設定"
-
-# mail/mail-config.glade.h:40
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
-#, fuzzy
-msgid "_Configure Pilot..."
-msgstr "郵件設定"
-
-# mail/folder-browser.c:690
-# ui/evolution-calendar.xml.h:43
-# ui/evolution-mail.xml.h:118
-# ui/evolution-tasks.xml.h:8
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
-msgid "_Save As..."
-msgstr "另存新檔(_S)..."
-
-# ui/evolution-event-editor.xml.h:46
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
-#, fuzzy
-msgid "_Schedule Meeting..."
-msgstr "會議排程(_M)"
-
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
-#, fuzzy
-msgid "_Forward as iCalendar..."
-msgstr "以 i_Calendar 轉寄"
+# calendar/gui/e-day-view.c:3164
+# calendar/gui/e-week-view.c:3294
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
+msgid "_Delete this Appointment"
+msgstr "刪除這個約會(_D)"
 
 # calendar/gui/e-day-view.c:3175
 # calendar/gui/e-week-view.c:3309
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#: calendar/gui/e-itip-control.c:524
+msgid "Meeting begins: <b>"
 msgstr ""
 
-# camel/camel-filter-driver.c:871
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
-#, fuzzy, c-format
-msgid "Error executing %s."
-msgstr "執行過濾器發生錯誤： %s: %s"
+#: calendar/gui/e-itip-control.c:529
+msgid "Task begins: <b>"
+msgstr ""
 
-# calendar/gui/calendar-model.c:369
-# calendar/gui/event-editor.c:1601
-# calendar/gui/event-editor.c:1628
-# camel/providers/smtp/camel-smtp-transport.c:221
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
-msgid "Unknown"
-msgstr "不明"
+# mail/mail-config.glade.h:61
+#: calendar/gui/e-itip-control.c:534
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "空閒/忙碌 資訊"
+
+#: calendar/gui/e-itip-control.c:538
+msgid "Begins: <b>"
+msgstr ""
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:631
+#: calendar/gui/e-itip-control.c:550
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "會議結束時間(_E)："
+
+# mail/mail-config.glade.h:61
+#: calendar/gui/e-itip-control.c:553
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "空閒/忙碌 資訊"
+
+#: calendar/gui/e-itip-control.c:557
+msgid "Ends: <b>"
+msgstr ""
+
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-itip-control.c:571
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (已完成)"
+
+#: calendar/gui/e-itip-control.c:581
+msgid "Task Due: <b>"
+msgstr ""
+
+# data/evolution.keys.in.h:2
+#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "行事曆資訊"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#. Title
+#: calendar/gui/e-itip-control.c:633
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "行事曆"
+
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#, fuzzy
+msgid "An unknown person"
+msgstr "不明的寄件者"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:721
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:737
+msgid "<i>None</i>"
+msgstr ""
+
+# shell/e-shell-importer.c:545
+# shell/importer/import.glade.h:5
+#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#, fuzzy
+msgid "Choose an action:"
+msgstr "選擇一個動作"
+
+#: calendar/gui/e-itip-control.c:779
+#, fuzzy
+msgid "Update"
+msgstr "工作更新"
+
+# widgets/misc/e-cell-date-edit.c:245
+#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "確認"
+
+#: calendar/gui/e-itip-control.c:795
+#, fuzzy
+msgid "Accept"
+msgstr "接受"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: calendar/gui/e-itip-control.c:796
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "暫訂"
+
+#: calendar/gui/e-itip-control.c:797
+#, fuzzy
+msgid "Decline"
+msgstr "婉拒"
+
+# mail/mail-config.glade.h:61
+#: calendar/gui/e-itip-control.c:811
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "空閒/忙碌 資訊"
+
+#: calendar/gui/e-itip-control.c:824
+msgid "Update respondent status"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:152
+#: calendar/gui/e-itip-control.c:838
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "工作資訊"
+
+# ui/evolution-mail.xml.h:2
+#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "取消"
+
+#: calendar/gui/e-itip-control.c:867
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> 已經發佈會議資訊。"
+
+# data/evolution.keys.in.h:2
+#: calendar/gui/e-itip-control.c:868
+msgid "Meeting Information"
+msgstr "會議資訊"
+
+#: calendar/gui/e-itip-control.c:872
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> 請求您出席此次會議。"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: calendar/gui/e-itip-control.c:873
+msgid "Meeting Proposal"
+msgstr "會議提案"
+
+#: calendar/gui/e-itip-control.c:877
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> 希望加入一個既存的會議。"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:631
+#: calendar/gui/e-itip-control.c:878
+msgid "Meeting Update"
+msgstr "會議更新"
 
-#: calendar/gui/e-itip-control.c:1564
+#: calendar/gui/e-itip-control.c:882
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> 希望收到最新的會議資訊。"
+
+#: calendar/gui/e-itip-control.c:883
+msgid "Meeting Update Request"
+msgstr "會議更新請求"
+
+#: calendar/gui/e-itip-control.c:887
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> 已經答覆了會議請求。"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: calendar/gui/e-itip-control.c:888
+msgid "Meeting Reply"
+msgstr "會議答覆"
+
+#: calendar/gui/e-itip-control.c:892
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> 已經消取會議。"
+
+# shell/e-shell-importer.c:545
+# shell/importer/import.glade.h:5
+#: calendar/gui/e-itip-control.c:893
+msgid "Meeting Cancellation"
+msgstr "會議取消"
+
+#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:982
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
+
+# mail/mail-search.c:268
+#: calendar/gui/e-itip-control.c:898
+msgid "Bad Meeting Message"
+msgstr "不正確的會議訊息"
+
+#: calendar/gui/e-itip-control.c:917
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> 已經發佈了工作資訊。"
+
+# widgets/misc/e-messagebox.c:152
+#: calendar/gui/e-itip-control.c:918
+msgid "Task Information"
+msgstr "工作資訊"
+
+#: calendar/gui/e-itip-control.c:922
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> 要求您進行工作。"
+
+#: calendar/gui/e-itip-control.c:923
+msgid "Task Proposal"
+msgstr "工作計畫"
+
+#: calendar/gui/e-itip-control.c:927
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> 希望加入一項既存的工作。"
+
+#: calendar/gui/e-itip-control.c:928
+msgid "Task Update"
+msgstr "工作更新"
+
+#: calendar/gui/e-itip-control.c:932
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> 希望收到最新的工作資訊。"
+
+#: calendar/gui/e-itip-control.c:933
+msgid "Task Update Request"
+msgstr "工作更新請求"
+
+#: calendar/gui/e-itip-control.c:937
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> 已經回覆指派的工作。"
+
+# mail/message-browser.c:188
+# ui/evolution-mail.xml.h:70
+#: calendar/gui/e-itip-control.c:938
+msgid "Task Reply"
+msgstr "工作回覆"
+
+#: calendar/gui/e-itip-control.c:942
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> 已經取消工作。"
+
+#: calendar/gui/e-itip-control.c:943
+msgid "Task Cancellation"
+msgstr "工作取消"
+
+# calendar/gui/e-itip-control.glade.h:4
+#: calendar/gui/e-itip-control.c:948
+msgid "Bad Task Message"
+msgstr "不正確的工作訊息"
+
+#: calendar/gui/e-itip-control.c:967
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> 已經發佈 空閒/忙碌 資訊。"
+
+# mail/mail-config.glade.h:61
+#: calendar/gui/e-itip-control.c:968
+msgid "Free/Busy Information"
+msgstr "空閒/忙碌 資訊"
+
+#: calendar/gui/e-itip-control.c:972
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> 請求您的 空閒/忙碌 資訊。"
+
+# addressbook/gui/widgets/e-addressbook-view.c:737
+#: calendar/gui/e-itip-control.c:973
+msgid "Free/Busy Request"
+msgstr "空閒/忙碌 請求"
+
+#: calendar/gui/e-itip-control.c:977
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> 已經答覆 空閒/忙碌 請求。"
+
+# addressbook/gui/widgets/e-addressbook-view.c:737
+#: calendar/gui/e-itip-control.c:978
+msgid "Free/Busy Reply"
+msgstr "空閒/忙碌 回覆"
+
+# mail/mail-callbacks.c:1407
+#: calendar/gui/e-itip-control.c:983
+msgid "Bad Free/Busy Message"
+msgstr "不正確的 空閒/忙碌 訊息"
+
+# camel/providers/local/camel-mbox-folder.c:368
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "資料夾好像已經損毀並且不能復原。"
+
+#: calendar/gui/e-itip-control.c:1071
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "這個郵件只包含密件副本收件者。"
+
+#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1130
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "不能傳送這個項目！\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1231
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
-msgid "Attendee status can not be updated because the item no longer exists"
+#: calendar/gui/e-itip-control.c:1276
+msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
-msgid "This response is not from a current attendee.  Add as an attendee?"
+#: calendar/gui/e-itip-control.c:1284
+msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
-msgid "Attendee status could not be updated because of an invalid status!\n"
+#: calendar/gui/e-itip-control.c:1286
+msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
-#, fuzzy
-msgid "Attendee status could not be updated!\n"
-msgstr "不能傳送這個項目！\n"
-
-#: calendar/gui/e-itip-control.c:1640
-msgid "Attendee status updated\n"
+#: calendar/gui/e-itip-control.c:1288
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
+# calendar/gui/e-itip-control.c:470
+#: calendar/gui/e-itip-control.c:1316
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "無法將項目從您的行事曆檔案移除！\n"
+
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1318
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
 msgid "The item could not be sent!\n"
 msgstr "不能傳送這個項目！\n"
 
-# mail/mail-account-gui.c:682
-#: calendar/gui/e-itip-control.c:1861
-#, fuzzy
-msgid "Select Calendar Folder"
-msgstr "選擇資料夾"
-
-# mail/mail-account-gui.c:682
-#: calendar/gui/e-itip-control.c:1868
-#, fuzzy
-msgid "Select Tasks Folder"
-msgstr "選擇資料夾"
+#: calendar/gui/e-itip-control.c:1568
+msgid "Unable to find any of your identities in the attendees list!\n"
+msgstr ""
 
 # calendar/gui/e-itip-control.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:2
@@ -6234,83 +5920,104 @@ msgid "date-start"
 msgstr "開始日期"
 
 # addressbook/gui/widgets/e-addressbook-view.c:712
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:94
 msgid "Chair Persons"
 msgstr "主席"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
 msgid "Required Participants"
 msgstr "出席者"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:96
 msgid "Optional Participants"
 msgstr "列席者"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:97
 msgid "Non-Participants"
 msgstr "缺席者"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
 msgid "Individual"
 msgstr "個人"
 
 # shell/e-shortcuts-view.c:137
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:745
 msgid "Group"
 msgstr "組別"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:746
 msgid "Resource"
 msgstr "資源"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:747
 msgid "Room"
 msgstr "會議室"
 
+# calendar/gui/calendar-model.c:369
+# calendar/gui/event-editor.c:1601
+# calendar/gui/event-editor.c:1628
+# camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
+#: calendar/gui/e-meeting-model.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
+msgid "Unknown"
+msgstr "不明"
+
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:760
 msgid "Chair"
 msgstr "主席"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
 msgid "Required Participant"
 msgstr "出席者"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:762
 msgid "Optional Participant"
 msgstr "列席者"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:763
 msgid "Non-Participant"
 msgstr "缺席者"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
 msgid "Needs Action"
 msgstr "需要動作"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:790
 msgid "Accepted"
 msgstr "接受"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-model.c:791
 msgid "Declined"
 msgstr "婉拒"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:426
 msgid "Tentative"
 msgstr "暫訂"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:793
 msgid "Delegated"
 msgstr "已委派"
 
@@ -6318,7 +6025,7 @@ msgstr "已委派"
 # calendar/gui/calendar-model.c:1178
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
 msgid "In Process"
 msgstr "進行中"
 
@@ -6326,8 +6033,8 @@ msgstr "進行中"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel-item.c:471
+#: calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -6336,8 +6043,8 @@ msgstr "%A, %B %d, %Y"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2113 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -6349,149 +6056,125 @@ msgstr "%a %m/%d/%Y"
 # widgets/misc/e-dateedit.c:1465
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
+#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1611
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:428
 msgid "Out of Office"
 msgstr "不在辦公室"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:429
 msgid "No Information"
 msgstr "沒有資訊"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:431
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:465
 msgid "_Options"
 msgstr "選項(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:448
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:482
 msgid "Show _Only Working Hours"
 msgstr "只顯示工作時間(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:461
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Zoomed Out"
 msgstr "顯示縮小(_Z)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:479
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:513
 msgid "_Update Free/Busy"
 msgstr "更新空閒/忙碌(_U)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:497
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:531
 msgid "_<<"
 msgstr "_<<"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:514
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:528
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:562
 msgid ">_>"
 msgstr ">_>"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:545
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:579
 msgid "_All People and Resources"
 msgstr "所有人員與資源(_A)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:558
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "All _People and One Resource"
 msgstr "所有與會者與一項資源(_P)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:571
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "_Required People"
 msgstr "需要與會者(_R)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:584
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "Required People and _One Resource"
 msgstr "需要與會者與一項資源(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:607
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:641
 msgid "Meeting _start time:"
 msgstr "會議開始時間(_S)："
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:660
 msgid "Meeting _end time:"
 msgstr "會議結束時間(_E)："
 
 # mail/mail-ops.c:1262
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:328
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟貯藏 %s"
 
 # calendar/gui/e-tasks.c:298
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:355
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "不能載入 `%s' 裡的工作"
 
 # calendar/gui/e-tasks.c:310
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:367
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "不支援用作載入 `%s'  必須的方法"
 
-# calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-tasks.c:543
-#, fuzzy
-msgid "Completing tasks..."
-msgstr "完成日期"
-
-# calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-tasks.c:566
-#, fuzzy
-msgid "Deleting selected objects..."
-msgstr "刪除選定的連絡人"
-
-# mail/mail-ops.c:1449
-#: calendar/gui/e-tasks.c:659
-#, fuzzy
-msgid "Expunging"
-msgstr "刪除資料夾"
-
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
-# calendar/gui/e-day-view.c:3164
-# calendar/gui/e-week-view.c:3294
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "刪除這個約會(_D)"
-
 # calendar/gui/gnome-cal.c:840
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1499
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "不能開啟 `%s' 內的資料夾"
 
 # calendar/gui/gnome-cal.c:851
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1510
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "不支援用作開啟 `%s'  必須的方法"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1865
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "開啟資料夾 %s"
@@ -6566,227 +6249,227 @@ msgstr "10月"
 msgid "September"
 msgstr "9月"
 
-#: calendar/gui/itip-utils.c:220
-msgid "At least one attendee is necessary"
+#: calendar/gui/itip-utils.c:243
+msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:570
 msgid "You must be an attendee of the event."
 msgstr ""
 
 # calendar/gui/alarm-notify/notify-main.c:108
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
 msgid "Could not create the component editor factory"
 msgstr "不能建立元件編輯器工廠"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:425
 msgid "1st"
 msgstr "1日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:425
 msgid "2nd"
 msgstr "2日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:425
 msgid "3rd"
 msgstr "3日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:425
 msgid "4th"
 msgstr "4日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:425
 msgid "5th"
 msgstr "5日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:426
 msgid "6th"
 msgstr "6日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:426
 msgid "7th"
 msgstr "7日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:426
 msgid "8th"
 msgstr "8日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:426
 msgid "9th"
 msgstr "9日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:426
 msgid "10th"
 msgstr "10日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:427
 msgid "11th"
 msgstr "11日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:427
 msgid "12th"
 msgstr "12日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:427
 msgid "13th"
 msgstr "13日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:427
 msgid "14th"
 msgstr "14日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:458
+#: calendar/gui/print.c:427
 msgid "15th"
 msgstr "15日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:428
 msgid "16th"
 msgstr "16日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:428
 msgid "17th"
 msgstr "17日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:428
 msgid "18th"
 msgstr "18日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:428
 msgid "19th"
 msgstr "19日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:459
+#: calendar/gui/print.c:428
 msgid "20th"
 msgstr "20日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:429
 msgid "21st"
 msgstr "21日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:429
 msgid "22nd"
 msgstr "22日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:429
 msgid "23rd"
 msgstr "23日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:429
 msgid "24th"
 msgstr "24日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:460
+#: calendar/gui/print.c:429
 msgid "25th"
 msgstr "25日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:430
 msgid "26th"
 msgstr "26日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:430
 msgid "27th"
 msgstr "27日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:430
 msgid "28th"
 msgstr "28日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:430
 msgid "29th"
 msgstr "29日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:461
+#: calendar/gui/print.c:430
 msgid "30th"
 msgstr "30日"
 
 # calendar/gui/print.c:306
-#: calendar/gui/print.c:462
+#: calendar/gui/print.c:431
 msgid "31st"
 msgstr "31日"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:498
 msgid "Su"
 msgstr "日"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:498
 msgid "Mo"
 msgstr "一"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:498
 msgid "Tu"
 msgstr "二"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:498
 msgid "We"
 msgstr "三"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:499
 msgid "Th"
 msgstr "四"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:499
 msgid "Fr"
 msgstr "五"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:499
 msgid "Sa"
 msgstr "六"
 
 # calendar/gui/print.c:1078
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1819
 msgid "Selected day (%a %b %d %Y)"
 msgstr "選擇的日期(%a %b %d %Y)"
 
 # calendar/gui/print.c:1092
 # calendar/gui/print.c:1096
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
 # calendar/gui/print.c:1093
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1845
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
@@ -6794,31 +6477,77 @@ msgstr "%a %d %Y"
 # calendar/gui/print.c:1097
 # calendar/gui/print.c:1099
 # calendar/gui/print.c:1100
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1852
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
 # calendar/gui/print.c:1104
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1856
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "選擇的週(%s - %s)"
 
 # calendar/gui/print.c:1112
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1864
 msgid "Selected month (%b %Y)"
 msgstr "選擇的月(%b %Y)"
 
 # calendar/gui/print.c:1119
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1871
 msgid "Selected year (%Y)"
 msgstr "選擇的年(%Y)"
 
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:2205
+#, fuzzy
+msgid "Task"
+msgstr "工作"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/print.c:2262
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "狀態(_S)："
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/print.c:2280
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "優先順序(_P)："
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: calendar/gui/print.c:2294
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "完成日期："
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "網址："
+
+# addressbook/backend/ebook/e-card.c:3467
+#: calendar/gui/print.c:2320
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"類別： "
+
+# ui/evolution-addressbook.xml.h:17
+#: calendar/gui/print.c:2331
+#, fuzzy
+msgid "Contacts: "
+msgstr "連絡人(_N)："
+
 # calendar/gui/print.c:1156
-#: calendar/gui/print.c:2430
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "列印行事曆"
 
@@ -6826,72 +6555,43 @@ msgstr "列印行事曆"
 # mail/mail-callbacks.c:1447
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2352 my-evolution/e-summary.c:614
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "預覽列印"
 
 # ui/evolution-contact-editor.xml.h:6
 # ui/evolution-event-editor.xml.h:37
 # ui/evolution-task-editor-dialog.xml.h:40
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "列印項目"
 
 # ui/evolution-event-editor.xml.h:36
 # ui/evolution-task-editor-dialog.xml.h:39
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "列印設定"
 
-# calendar/gui/calendar-commands.c:468
-#: calendar/gui/tasks-control-factory.c:75
-#, fuzzy
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr "不能建立行事曆檢視。  請檢查 ORBit 和 OAF 的設定。"
-
 # calendar/gui/tasks-control.c:108
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "工作資料夾顯示的 URI"
 
-#: calendar/gui/tasks-control.c:456
+# calendar/gui/calendar-commands.c:468
+#: calendar/gui/tasks-control-factory.c:75
 #, fuzzy
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"這個動作會永久地清除所有標示為刪除的郵件。如果您要�"
-"�續，您將不能復原這些郵件。\n"
-"\n"
-"確定清除這些郵件？"
-
-# importers/elm-importer.c:528
-# importers/netscape-importer.c:807
-# importers/pine-importer.c:668
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
-msgid "Do not ask me again."
-msgstr "不要再顯示這個訊息。"
-
-# ui/evolution-calendar.xml.h:25
-#: calendar/gui/tasks-control.c:612
-#, fuzzy
-msgid "Print Tasks"
-msgstr "列印名片"
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr "不能建立行事曆檢視。  請檢查 ORBit 和 OAF 的設定。"
 
 # calendar/gui/tasks-migrate.c:106
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
-msgstr ""
-"Evolution 會將行事曆資料夾內的工作轉移至新的工作資料夾"
+msgstr "Evolution 會將行事曆資料夾內的工作轉移至新的工作資料夾"
 
 # calendar/gui/tasks-migrate.c:109
 #: calendar/gui/tasks-migrate.c:108
@@ -6901,8 +6601,7 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolution "
-"嘗試將行事曆資料夾內的工作轉移至新的工作資料夾。\n"
+"Evolution 嘗試將行事曆資料夾內的工作轉移至新的工作資料夾。\n"
 "某些工作不能轉移，也許將來再嘗試這個程序。"
 
 # calendar/gui/tasks-migrate.c:121
@@ -6911,9 +6610,7 @@ msgstr ""
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
-msgstr ""
-"不能開啟 "
-"`%s'；沒有項目可由行事曆資料夾轉移至工作資料夾。"
+msgstr "不能開啟 `%s'；沒有項目可由行事曆資料夾轉移至工作資料夾。"
 
 # calendar/gui/tasks-migrate.c:134
 #: calendar/gui/tasks-migrate.c:133
@@ -6922,9 +6619,7 @@ msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
-"不支援用作載入 `%s' "
-"必需的方法；沒有項目可由行事曆資料夾轉移至工作資料�"
-"�。"
+"不支援用作載入 `%s' 必需的方法；沒有項目可由行事曆資料夾轉移至工作資料夾。"
 
 # calendar/gui/weekday-picker.c:315
 # calendar/gui/weekday-picker.c:410
@@ -6932,1842 +6627,141 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "日一二三四五六"
 
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
-#, fuzzy
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "匯入 VCard 檔案到 Evolution 的元件工廠。"
-
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-#, fuzzy
-msgid "Imports iCalendar files into Evolution"
-msgstr "匯入 VCard 檔案到 Evolution。"
-
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
-#, fuzzy
-msgid "Imports vCalendar files into Evolution"
-msgstr "匯入 VCard 檔案到 Evolution。"
-
-# calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:638
-#, fuzzy
-msgid "Calendar Events"
-msgstr "行事曆訊息"
-
-# importers/pine-importer.c:705
-#: calendar/importers/icalendar-importer.c:663
-#, fuzzy
-msgid ""
-"Evolution has found Gnome Calendar files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution 找到 Pine 格式的郵件檔案。\n"
-"您是否要將它們匯入至 Evolution？"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: calendar/importers/icalendar-importer.c:670
-#, fuzzy
-msgid "Gnome Calendar"
-msgstr "行事曆"
-
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:234
 msgid "time-now expects 0 arguments"
 msgstr "time-now 要求 0 個參數"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:258
 msgid "make-time expects 1 argument"
 msgstr "make-time 要求 1 個參數"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:263
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time 要求參數 1 為字串"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:271
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time 參數 1 必須為 ISO 8601 日期/時間字串"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:300
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day 要求 2 個參數"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:305
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day 要求參數 1 為 time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:312
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day 要求參數 2 為整數"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:339
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin 要求 1 個參數"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:344
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin 要求參數 1 為 time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:371
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end 要求 1 個參數"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:376
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end 要求參數 1 為 time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:412
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype 要求 0 個參數"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:508
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? 要求 2 個參數"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:513
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? 要求參數 1 為 time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:520
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? 要求參數 2 為 time_t"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:650
 msgid "contains? expects 2 arguments"
 msgstr "contains? 要求 2 個參數"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:655
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? 要求參數 1 為字串"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:662
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? 要求參數 2 為字串"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:679
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
-msgstr ""
-"contains? 要求參數 1 為 \"any\", \"summary\", \"description\" "
-"其中之一"
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
+msgstr "contains? 要求參數 1 為 \"any\", \"summary\", \"description\" 其中之一"
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:721
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? 要求至少 1 個參數"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:733
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
-"has-categories? 要求所有的參數為字串或僅有的一個為布林值 "
-"false(#f) 的參數"
+"has-categories? 要求所有的參數為字串或僅有的一個為布林值 false(#f) 的參數"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:821
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? 要求 0 個參數"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:866
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "is-completed? 要求 0 個參數"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:871
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "time-day-begin 要求參數 1 為 time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1159
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "搜尋表示出的值結果不能為布林值"
 
-#.
-#. * These are the timezone names from the Olson timezone data.
-#. * We only place them here so gettext picks them up for translation.
-#. * Don't include in any C files.
-#.
-#: calendar/zones.h:7
-msgid "Africa/Abidjan"
-msgstr ""
-
-#: calendar/zones.h:8
-msgid "Africa/Accra"
-msgstr ""
-
-#: calendar/zones.h:9
-msgid "Africa/Addis_Ababa"
-msgstr ""
-
-#: calendar/zones.h:10
-msgid "Africa/Algiers"
-msgstr ""
-
-#: calendar/zones.h:11
-msgid "Africa/Asmera"
-msgstr ""
-
-#: calendar/zones.h:12
-msgid "Africa/Bamako"
-msgstr ""
-
-#: calendar/zones.h:13
-msgid "Africa/Bangui"
-msgstr ""
-
-#: calendar/zones.h:14
-msgid "Africa/Banjul"
-msgstr ""
-
-#: calendar/zones.h:15
-msgid "Africa/Bissau"
-msgstr ""
-
-#: calendar/zones.h:16
-msgid "Africa/Blantyre"
-msgstr ""
-
-#: calendar/zones.h:17
-msgid "Africa/Brazzaville"
-msgstr ""
-
-#: calendar/zones.h:18
-msgid "Africa/Bujumbura"
-msgstr ""
-
-#: calendar/zones.h:19
-msgid "Africa/Cairo"
-msgstr ""
-
-#: calendar/zones.h:20
-msgid "Africa/Casablanca"
-msgstr ""
-
-#: calendar/zones.h:21
-msgid "Africa/Ceuta"
-msgstr ""
-
-#: calendar/zones.h:22
-msgid "Africa/Conakry"
-msgstr ""
-
-#: calendar/zones.h:23
-msgid "Africa/Dakar"
-msgstr ""
-
-#: calendar/zones.h:24
-msgid "Africa/Dar_es_Salaam"
-msgstr ""
-
-#: calendar/zones.h:25
-#, fuzzy
-msgid "Africa/Djibouti"
-msgstr "吉布地"
-
-#: calendar/zones.h:26
-msgid "Africa/Douala"
-msgstr ""
-
-#: calendar/zones.h:27
-msgid "Africa/El_Aaiun"
-msgstr ""
-
-#: calendar/zones.h:28
-msgid "Africa/Freetown"
-msgstr ""
-
-#: calendar/zones.h:29
-msgid "Africa/Gaborone"
-msgstr ""
-
-#: calendar/zones.h:30
-msgid "Africa/Harare"
-msgstr ""
-
-#: calendar/zones.h:31
-msgid "Africa/Johannesburg"
-msgstr ""
-
-#: calendar/zones.h:32
-msgid "Africa/Kampala"
-msgstr ""
-
-#: calendar/zones.h:33
-msgid "Africa/Khartoum"
-msgstr ""
-
-#: calendar/zones.h:34
-msgid "Africa/Kigali"
-msgstr ""
-
-#: calendar/zones.h:35
-msgid "Africa/Kinshasa"
-msgstr ""
-
-#: calendar/zones.h:36
-msgid "Africa/Lagos"
-msgstr ""
-
-#: calendar/zones.h:37
-msgid "Africa/Libreville"
-msgstr ""
-
-#: calendar/zones.h:38
-msgid "Africa/Lome"
-msgstr ""
-
-#: calendar/zones.h:39
-msgid "Africa/Luanda"
-msgstr ""
-
-#: calendar/zones.h:40
-msgid "Africa/Lubumbashi"
-msgstr ""
-
-#: calendar/zones.h:41
-msgid "Africa/Lusaka"
-msgstr ""
-
-#: calendar/zones.h:42
-msgid "Africa/Malabo"
-msgstr ""
-
-#: calendar/zones.h:43
-msgid "Africa/Maputo"
-msgstr ""
-
-#: calendar/zones.h:44
-msgid "Africa/Maseru"
-msgstr ""
-
-#: calendar/zones.h:45
-msgid "Africa/Mbabane"
-msgstr ""
-
-#: calendar/zones.h:46
-msgid "Africa/Mogadishu"
-msgstr ""
-
-#: calendar/zones.h:47
-msgid "Africa/Monrovia"
-msgstr ""
-
-#: calendar/zones.h:48
-msgid "Africa/Nairobi"
-msgstr ""
-
-#: calendar/zones.h:49
-msgid "Africa/Ndjamena"
-msgstr ""
-
-#: calendar/zones.h:50
-msgid "Africa/Niamey"
-msgstr ""
-
-#: calendar/zones.h:51
-msgid "Africa/Nouakchott"
-msgstr ""
-
-#: calendar/zones.h:52
-msgid "Africa/Ouagadougou"
-msgstr ""
-
-#: calendar/zones.h:53
-msgid "Africa/Porto-Novo"
-msgstr ""
-
-#: calendar/zones.h:54
-msgid "Africa/Sao_Tome"
-msgstr ""
-
-#: calendar/zones.h:55
-msgid "Africa/Timbuktu"
-msgstr ""
-
-#: calendar/zones.h:56
-msgid "Africa/Tripoli"
-msgstr ""
-
-#: calendar/zones.h:57
-msgid "Africa/Tunis"
-msgstr ""
-
-#: calendar/zones.h:58
-msgid "Africa/Windhoek"
-msgstr ""
-
-#: calendar/zones.h:59
-#, fuzzy
-msgid "America/Adak"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:60
-#, fuzzy
-msgid "America/Anchorage"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:61
-#, fuzzy
-msgid "America/Anguilla"
-msgstr "安圭拉島"
-
-#: calendar/zones.h:62
-#, fuzzy
-msgid "America/Antigua"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:63
-#, fuzzy
-msgid "America/Araguaina"
-msgstr "尼加拉瓜"
-
-#: calendar/zones.h:64
-msgid "America/Aruba"
-msgstr ""
-
-#: calendar/zones.h:65
-#, fuzzy
-msgid "America/Asuncion"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:66
-#, fuzzy
-msgid "America/Barbados"
-msgstr "巴貝多"
-
-#: calendar/zones.h:67
-msgid "America/Belem"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:36
-#: calendar/zones.h:68
-#, fuzzy
-msgid "America/Belize"
-msgstr "貝里斯"
-
-#: calendar/zones.h:69
-msgid "America/Boa_Vista"
-msgstr ""
-
-#: calendar/zones.h:70
-#, fuzzy
-msgid "America/Bogota"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:71
-msgid "America/Boise"
-msgstr ""
-
-#: calendar/zones.h:72
-msgid "America/Buenos_Aires"
-msgstr ""
-
-#: calendar/zones.h:73
-msgid "America/Cambridge_Bay"
-msgstr ""
-
-#: calendar/zones.h:74
-msgid "America/Cancun"
-msgstr ""
-
-#: calendar/zones.h:75
-#, fuzzy
-msgid "America/Caracas"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:76
-#, fuzzy
-msgid "America/Catamarca"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:77
-msgid "America/Cayenne"
-msgstr ""
-
-#: calendar/zones.h:78
-#, fuzzy
-msgid "America/Cayman"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:79
-#, fuzzy
-msgid "America/Chicago"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:80
-msgid "America/Chihuahua"
-msgstr ""
-
-#: calendar/zones.h:81
-#, fuzzy
-msgid "America/Cordoba"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:82
-#, fuzzy
-msgid "America/Costa_Rica"
-msgstr "哥斯大黎加"
-
-#: calendar/zones.h:83
-#, fuzzy
-msgid "America/Cuiaba"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:84
-#, fuzzy
-msgid "America/Curacao"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:85
-msgid "America/Danmarkshavn"
-msgstr ""
-
-#: calendar/zones.h:86
-#, fuzzy
-msgid "America/Dawson"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:87
-msgid "America/Dawson_Creek"
-msgstr ""
-
-#: calendar/zones.h:88
-msgid "America/Denver"
-msgstr ""
-
-#: calendar/zones.h:89
-msgid "America/Detroit"
-msgstr ""
-
-#: calendar/zones.h:90
-#, fuzzy
-msgid "America/Dominica"
-msgstr "多明尼克"
-
-#: calendar/zones.h:91
-#, fuzzy
-msgid "America/Edmonton"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:92
-msgid "America/Eirunepe"
-msgstr ""
-
-#: calendar/zones.h:93
-#, fuzzy
-msgid "America/El_Salvador"
-msgstr "薩爾瓦多"
-
-#: calendar/zones.h:94
-msgid "America/Fortaleza"
-msgstr ""
-
-#: calendar/zones.h:95
-msgid "America/Glace_Bay"
-msgstr ""
-
-#: calendar/zones.h:96
-#, fuzzy
-msgid "America/Godthab"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:97
-msgid "America/Goose_Bay"
-msgstr ""
-
-#: calendar/zones.h:98
-msgid "America/Grand_Turk"
-msgstr ""
-
-#: calendar/zones.h:99
-#, fuzzy
-msgid "America/Grenada"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:100
-#, fuzzy
-msgid "America/Guadeloupe"
-msgstr "瓜德魯普島"
-
-#: calendar/zones.h:101
-#, fuzzy
-msgid "America/Guatemala"
-msgstr "瓜地馬拉"
-
-#: calendar/zones.h:102
-msgid "America/Guayaquil"
-msgstr ""
-
-#: calendar/zones.h:103
-#, fuzzy
-msgid "America/Guyana"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:104
-#, fuzzy
-msgid "America/Halifax"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:105
-#, fuzzy
-msgid "America/Havana"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:106
-msgid "America/Hermosillo"
-msgstr ""
-
-#: calendar/zones.h:107
-msgid "America/Indiana/Indianapolis"
-msgstr ""
-
-#: calendar/zones.h:108
-msgid "America/Indiana/Knox"
-msgstr ""
-
-#: calendar/zones.h:109
-msgid "America/Indiana/Marengo"
-msgstr ""
-
-#: calendar/zones.h:110
-msgid "America/Indiana/Vevay"
-msgstr ""
-
-#: calendar/zones.h:111
-msgid "America/Indianapolis"
-msgstr ""
-
-#: calendar/zones.h:112
-msgid "America/Inuvik"
-msgstr ""
-
-#: calendar/zones.h:113
-msgid "America/Iqaluit"
-msgstr ""
-
-#: calendar/zones.h:114
-#, fuzzy
-msgid "America/Jamaica"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:115
-msgid "America/Jujuy"
-msgstr ""
-
-#: calendar/zones.h:116
-#, fuzzy
-msgid "America/Juneau"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:117
-msgid "America/Kentucky/Louisville"
-msgstr ""
-
-#: calendar/zones.h:118
-msgid "America/Kentucky/Monticello"
-msgstr ""
-
-#: calendar/zones.h:119
-#, fuzzy
-msgid "America/La_Paz"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:120
-#, fuzzy
-msgid "America/Lima"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:121
-msgid "America/Los_Angeles"
-msgstr ""
-
-#: calendar/zones.h:122
-msgid "America/Louisville"
-msgstr ""
-
-#: calendar/zones.h:123
-#, fuzzy
-msgid "America/Maceio"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:124
-#, fuzzy
-msgid "America/Managua"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:125
-#, fuzzy
-msgid "America/Manaus"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:126
-#, fuzzy
-msgid "America/Martinique"
-msgstr "法屬馬丁尼克"
-
-#: calendar/zones.h:127
-#, fuzzy
-msgid "America/Mazatlan"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:128
-#, fuzzy
-msgid "America/Mendoza"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:129
-msgid "America/Menominee"
-msgstr ""
-
-#: calendar/zones.h:130
-msgid "America/Merida"
-msgstr ""
-
-#: calendar/zones.h:131
-msgid "America/Mexico_City"
-msgstr ""
-
-#: calendar/zones.h:132
-msgid "America/Miquelon"
-msgstr ""
-
-#: calendar/zones.h:133
-msgid "America/Monterrey"
-msgstr ""
-
-#: calendar/zones.h:134
-msgid "America/Montevideo"
-msgstr ""
-
-#: calendar/zones.h:135
-#, fuzzy
-msgid "America/Montreal"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:136
-#, fuzzy
-msgid "America/Montserrat"
-msgstr "蒙瑟拉特島"
-
-#: calendar/zones.h:137
-#, fuzzy
-msgid "America/Nassau"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:138
-msgid "America/New_York"
-msgstr ""
-
-#: calendar/zones.h:139
-msgid "America/Nipigon"
-msgstr ""
-
-#: calendar/zones.h:140
-#, fuzzy
-msgid "America/Nome"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:141
-#, fuzzy
-msgid "America/Noronha"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:142
-msgid "America/North_Dakota/Center"
-msgstr ""
-
-#: calendar/zones.h:143
-#, fuzzy
-msgid "America/Panama"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:144
-msgid "America/Pangnirtung"
-msgstr ""
-
-#: calendar/zones.h:145
-#, fuzzy
-msgid "America/Paramaribo"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:146
-msgid "America/Phoenix"
-msgstr ""
-
-#: calendar/zones.h:147
-msgid "America/Port-au-Prince"
-msgstr ""
-
-#: calendar/zones.h:148
-msgid "America/Port_of_Spain"
-msgstr ""
-
-#: calendar/zones.h:149
-msgid "America/Porto_Velho"
-msgstr ""
-
-#: calendar/zones.h:150
-#, fuzzy
-msgid "America/Puerto_Rico"
-msgstr "波多黎各"
-
-#: calendar/zones.h:151
-msgid "America/Rainy_River"
-msgstr ""
-
-#: calendar/zones.h:152
-msgid "America/Rankin_Inlet"
-msgstr ""
-
-#: calendar/zones.h:153
-msgid "America/Recife"
-msgstr ""
-
-#: calendar/zones.h:154
-#, fuzzy
-msgid "America/Regina"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:155
-msgid "America/Rio_Branco"
-msgstr ""
-
-#: calendar/zones.h:156
-#, fuzzy
-msgid "America/Rosario"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:157
-#, fuzzy
-msgid "America/Santiago"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:158
-#, fuzzy
-msgid "America/Santo_Domingo"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:159
-#, fuzzy
-msgid "America/Sao_Paulo"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:160
-msgid "America/Scoresbysund"
-msgstr ""
-
-#: calendar/zones.h:161
-#, fuzzy
-msgid "America/Shiprock"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:162
-#, fuzzy
-msgid "America/St_Johns"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:163
-msgid "America/St_Kitts"
-msgstr ""
-
-#: calendar/zones.h:164
-#, fuzzy
-msgid "America/St_Lucia"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:165
-#, fuzzy
-msgid "America/St_Thomas"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:166
-msgid "America/St_Vincent"
-msgstr ""
-
-#: calendar/zones.h:167
-msgid "America/Swift_Current"
-msgstr ""
-
-#: calendar/zones.h:168
-msgid "America/Tegucigalpa"
-msgstr ""
-
-#: calendar/zones.h:169
-msgid "America/Thule"
-msgstr ""
-
-#: calendar/zones.h:170
-msgid "America/Thunder_Bay"
-msgstr ""
-
-#: calendar/zones.h:171
-#, fuzzy
-msgid "America/Tijuana"
-msgstr "亞賽拜然"
-
-#: calendar/zones.h:172
-#, fuzzy
-msgid "America/Tortola"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:173
-msgid "America/Vancouver"
-msgstr ""
-
-#: calendar/zones.h:174
-msgid "America/Whitehorse"
-msgstr ""
-
-#: calendar/zones.h:175
-msgid "America/Winnipeg"
-msgstr ""
-
-#: calendar/zones.h:176
-#, fuzzy
-msgid "America/Yakutat"
-msgstr "美屬薩摩亞"
-
-#: calendar/zones.h:177
-msgid "America/Yellowknife"
-msgstr ""
-
-# shell/e-shell-importer.c:490
-#: calendar/zones.h:178
-#, fuzzy
-msgid "Antarctica/Casey"
-msgstr "南極洲"
-
-# shell/e-shell-importer.c:490
-#: calendar/zones.h:179
-#, fuzzy
-msgid "Antarctica/Davis"
-msgstr "南極洲"
-
-#: calendar/zones.h:180
-msgid "Antarctica/DumontDUrville"
-msgstr ""
-
-# shell/e-shell-importer.c:490
-#: calendar/zones.h:181
-#, fuzzy
-msgid "Antarctica/Mawson"
-msgstr "南極洲"
-
-# shell/e-shell-importer.c:490
-#: calendar/zones.h:182
-#, fuzzy
-msgid "Antarctica/McMurdo"
-msgstr "南極洲"
-
-# shell/e-shell-importer.c:490
-#: calendar/zones.h:183
-#, fuzzy
-msgid "Antarctica/Palmer"
-msgstr "南極洲"
-
-# shell/e-shell-importer.c:490
-#: calendar/zones.h:184
-#, fuzzy
-msgid "Antarctica/South_Pole"
-msgstr "南極洲"
-
-# shell/e-shell-importer.c:490
-#: calendar/zones.h:185
-#, fuzzy
-msgid "Antarctica/Syowa"
-msgstr "南極洲"
-
-# shell/e-shell-importer.c:490
-#: calendar/zones.h:186
-#, fuzzy
-msgid "Antarctica/Vostok"
-msgstr "南極洲"
-
-#: calendar/zones.h:187
-msgid "Arctic/Longyearbyen"
-msgstr ""
-
-#: calendar/zones.h:188
-msgid "Asia/Aden"
-msgstr ""
-
-#: calendar/zones.h:189
-msgid "Asia/Almaty"
-msgstr ""
-
-#: calendar/zones.h:190
-msgid "Asia/Amman"
-msgstr ""
-
-#: calendar/zones.h:191
-msgid "Asia/Anadyr"
-msgstr ""
-
-#: calendar/zones.h:192
-msgid "Asia/Aqtau"
-msgstr ""
-
-#: calendar/zones.h:193
-msgid "Asia/Aqtobe"
-msgstr ""
-
-#: calendar/zones.h:194
-msgid "Asia/Ashgabat"
-msgstr ""
-
-#: calendar/zones.h:195
-msgid "Asia/Baghdad"
-msgstr ""
-
-#: calendar/zones.h:196
-#, fuzzy
-msgid "Asia/Bahrain"
-msgstr "巴林"
-
-#: calendar/zones.h:197
-msgid "Asia/Baku"
-msgstr ""
-
-#: calendar/zones.h:198
-msgid "Asia/Bangkok"
-msgstr ""
-
-#: calendar/zones.h:199
-msgid "Asia/Beirut"
-msgstr ""
-
-#: calendar/zones.h:200
-msgid "Asia/Bishkek"
-msgstr ""
-
-#: calendar/zones.h:201
-msgid "Asia/Brunei"
-msgstr ""
-
-#: calendar/zones.h:202
-msgid "Asia/Calcutta"
-msgstr ""
-
-#: calendar/zones.h:203
-msgid "Asia/Choibalsan"
-msgstr ""
-
-#: calendar/zones.h:204
-msgid "Asia/Chongqing"
-msgstr ""
-
-#: calendar/zones.h:205
-#, fuzzy
-msgid "Asia/Colombo"
-msgstr "哥倫比亞"
-
-#: calendar/zones.h:206
-msgid "Asia/Damascus"
-msgstr ""
-
-#: calendar/zones.h:207
-msgid "Asia/Dhaka"
-msgstr ""
-
-#: calendar/zones.h:208
-msgid "Asia/Dili"
-msgstr ""
-
-#: calendar/zones.h:209
-msgid "Asia/Dubai"
-msgstr ""
-
-#: calendar/zones.h:210
-msgid "Asia/Dushanbe"
-msgstr ""
-
-#: calendar/zones.h:211
-msgid "Asia/Gaza"
-msgstr ""
-
-#: calendar/zones.h:212
-msgid "Asia/Harbin"
-msgstr ""
-
-#: calendar/zones.h:213
-#, fuzzy
-msgid "Asia/Hong_Kong"
-msgstr "香港"
-
-#: calendar/zones.h:214
-msgid "Asia/Hovd"
-msgstr ""
-
-#: calendar/zones.h:215
-msgid "Asia/Irkutsk"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1242
-# addressbook/gui/widgets/e-addressbook-view.c:733
-#: calendar/zones.h:216
-#, fuzzy
-msgid "Asia/Istanbul"
-msgstr "助理"
-
-#: calendar/zones.h:217
-msgid "Asia/Jakarta"
-msgstr ""
-
-#: calendar/zones.h:218
-msgid "Asia/Jayapura"
-msgstr ""
-
-#: calendar/zones.h:219
-msgid "Asia/Jerusalem"
-msgstr ""
-
-#: calendar/zones.h:220
-msgid "Asia/Kabul"
-msgstr ""
-
-#: calendar/zones.h:221
-msgid "Asia/Kamchatka"
-msgstr ""
-
-#: calendar/zones.h:222
-msgid "Asia/Karachi"
-msgstr ""
-
-#: calendar/zones.h:223
-msgid "Asia/Kashgar"
-msgstr ""
-
-#: calendar/zones.h:224
-msgid "Asia/Katmandu"
-msgstr ""
-
-#: calendar/zones.h:225
-msgid "Asia/Krasnoyarsk"
-msgstr ""
-
-#: calendar/zones.h:226
-msgid "Asia/Kuala_Lumpur"
-msgstr ""
-
-#: calendar/zones.h:227
-msgid "Asia/Kuching"
-msgstr ""
-
-#: calendar/zones.h:228
-#, fuzzy
-msgid "Asia/Kuwait"
-msgstr "科威特"
-
-#: calendar/zones.h:229
-msgid "Asia/Macao"
-msgstr ""
-
-#: calendar/zones.h:230
-msgid "Asia/Magadan"
-msgstr ""
-
-#: calendar/zones.h:231
-msgid "Asia/Manila"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1242
-# addressbook/gui/widgets/e-addressbook-view.c:733
-#: calendar/zones.h:232
-#, fuzzy
-msgid "Asia/Muscat"
-msgstr "助理"
-
-#: calendar/zones.h:233
-msgid "Asia/Nicosia"
-msgstr ""
-
-#: calendar/zones.h:234
-msgid "Asia/Novosibirsk"
-msgstr ""
-
-# calendar/gui/calendar-model.c:1578
-#: calendar/zones.h:235
-#, fuzzy
-msgid "Asia/Omsk"
-msgstr "指派工作"
-
-#: calendar/zones.h:236
-msgid "Asia/Phnom_Penh"
-msgstr ""
-
-#: calendar/zones.h:237
-msgid "Asia/Pontianak"
-msgstr ""
-
-#: calendar/zones.h:238
-msgid "Asia/Pyongyang"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#: calendar/zones.h:239
-#, fuzzy
-msgid "Asia/Qatar"
-msgstr "卡達"
-
-#: calendar/zones.h:240
-msgid "Asia/Rangoon"
-msgstr ""
-
-#: calendar/zones.h:241
-msgid "Asia/Riyadh"
-msgstr ""
-
-#: calendar/zones.h:242
-msgid "Asia/Saigon"
-msgstr ""
-
-#: calendar/zones.h:243
-msgid "Asia/Sakhalin"
-msgstr ""
-
-#: calendar/zones.h:244
-msgid "Asia/Samarkand"
-msgstr ""
-
-#: calendar/zones.h:245
-msgid "Asia/Seoul"
-msgstr ""
-
-#: calendar/zones.h:246
-msgid "Asia/Shanghai"
-msgstr ""
-
-#: calendar/zones.h:247
-#, fuzzy
-msgid "Asia/Singapore"
-msgstr "新加坡"
-
-#: calendar/zones.h:248
-msgid "Asia/Taipei"
-msgstr ""
-
-#: calendar/zones.h:249
-msgid "Asia/Tashkent"
-msgstr ""
-
-#: calendar/zones.h:250
-msgid "Asia/Tbilisi"
-msgstr ""
-
-#: calendar/zones.h:251
-msgid "Asia/Tehran"
-msgstr ""
-
-#: calendar/zones.h:252
-msgid "Asia/Thimphu"
-msgstr ""
-
-#: calendar/zones.h:253
-msgid "Asia/Tokyo"
-msgstr ""
-
-#: calendar/zones.h:254
-msgid "Asia/Ujung_Pandang"
-msgstr ""
-
-#: calendar/zones.h:255
-msgid "Asia/Ulaanbaatar"
-msgstr ""
-
-#: calendar/zones.h:256
-msgid "Asia/Urumqi"
-msgstr ""
-
-#: calendar/zones.h:257
-msgid "Asia/Vientiane"
-msgstr ""
-
-#: calendar/zones.h:258
-msgid "Asia/Vladivostok"
-msgstr ""
-
-#: calendar/zones.h:259
-msgid "Asia/Yakutsk"
-msgstr ""
-
-#: calendar/zones.h:260
-msgid "Asia/Yekaterinburg"
-msgstr ""
-
-#: calendar/zones.h:261
-msgid "Asia/Yerevan"
-msgstr ""
-
-#: calendar/zones.h:262
-msgid "Atlantic/Azores"
-msgstr ""
-
-#: calendar/zones.h:263
-#, fuzzy
-msgid "Atlantic/Bermuda"
-msgstr "百慕達"
-
-#: calendar/zones.h:264
-msgid "Atlantic/Canary"
-msgstr ""
-
-#: calendar/zones.h:265
-#, fuzzy
-msgid "Atlantic/Cape_Verde"
-msgstr "維德角島"
-
-#: calendar/zones.h:266
-msgid "Atlantic/Faeroe"
-msgstr ""
-
-#: calendar/zones.h:267
-msgid "Atlantic/Jan_Mayen"
-msgstr ""
-
-#: calendar/zones.h:268
-msgid "Atlantic/Madeira"
-msgstr ""
-
-#: calendar/zones.h:269
-msgid "Atlantic/Reykjavik"
-msgstr ""
-
-#: calendar/zones.h:270
-msgid "Atlantic/South_Georgia"
-msgstr ""
-
-#: calendar/zones.h:271
-msgid "Atlantic/St_Helena"
-msgstr ""
-
-#: calendar/zones.h:272
-msgid "Atlantic/Stanley"
-msgstr ""
-
-#: calendar/zones.h:273
-#, fuzzy
-msgid "Australia/Adelaide"
-msgstr "澳大利亞"
-
-#: calendar/zones.h:274
-#, fuzzy
-msgid "Australia/Brisbane"
-msgstr "澳大利亞"
-
-#: calendar/zones.h:275
-#, fuzzy
-msgid "Australia/Broken_Hill"
-msgstr "澳大利亞"
-
-#: calendar/zones.h:276
-#, fuzzy
-msgid "Australia/Darwin"
-msgstr "澳大利亞"
-
-#: calendar/zones.h:277
-#, fuzzy
-msgid "Australia/Hobart"
-msgstr "澳大利亞"
-
-#: calendar/zones.h:278
-#, fuzzy
-msgid "Australia/Lindeman"
-msgstr "澳大利亞"
-
-#: calendar/zones.h:279
-#, fuzzy
-msgid "Australia/Lord_Howe"
-msgstr "澳大利亞"
-
-#: calendar/zones.h:280
-#, fuzzy
-msgid "Australia/Melbourne"
-msgstr "澳大利亞"
-
-#: calendar/zones.h:281
-#, fuzzy
-msgid "Australia/Perth"
-msgstr "澳大利亞"
-
-#: calendar/zones.h:282
-#, fuzzy
-msgid "Australia/Sydney"
-msgstr "澳大利亞"
-
-#: calendar/zones.h:283
-msgid "Europe/Amsterdam"
-msgstr ""
-
-#: calendar/zones.h:284
-#, fuzzy
-msgid "Europe/Andorra"
-msgstr "安道爾"
-
-# mail/folder-browser-factory.c:198
-# ui/evolution-event-editor.xml.h:39
-# ui/evolution-task-editor-dialog.xml.h:42
-#: calendar/zones.h:285
-#, fuzzy
-msgid "Europe/Athens"
-msgstr "內容"
-
-#: calendar/zones.h:286
-msgid "Europe/Belfast"
-msgstr ""
-
-#: calendar/zones.h:287
-msgid "Europe/Belgrade"
-msgstr ""
-
-#: calendar/zones.h:288
-msgid "Europe/Berlin"
-msgstr ""
-
-#: calendar/zones.h:289
-msgid "Europe/Bratislava"
-msgstr ""
-
-#: calendar/zones.h:290
-msgid "Europe/Brussels"
-msgstr ""
-
-#: calendar/zones.h:291
-msgid "Europe/Bucharest"
-msgstr ""
-
-#: calendar/zones.h:292
-msgid "Europe/Budapest"
-msgstr ""
-
-#: calendar/zones.h:293
-msgid "Europe/Chisinau"
-msgstr ""
-
-#: calendar/zones.h:294
-msgid "Europe/Copenhagen"
-msgstr ""
-
-#: calendar/zones.h:295
-msgid "Europe/Dublin"
-msgstr ""
-
-#: calendar/zones.h:296
-#, fuzzy
-msgid "Europe/Gibraltar"
-msgstr "直布羅陀"
-
-#: calendar/zones.h:297
-msgid "Europe/Helsinki"
-msgstr ""
-
-#: calendar/zones.h:298
-msgid "Europe/Istanbul"
-msgstr ""
-
-#: calendar/zones.h:299
-msgid "Europe/Kaliningrad"
-msgstr ""
-
-#: calendar/zones.h:300
-msgid "Europe/Kiev"
-msgstr ""
-
-#: calendar/zones.h:301
-msgid "Europe/Lisbon"
-msgstr ""
-
-#: calendar/zones.h:302
-msgid "Europe/Ljubljana"
-msgstr ""
-
-#: calendar/zones.h:303
-msgid "Europe/London"
-msgstr ""
-
-#: calendar/zones.h:304
-#, fuzzy
-msgid "Europe/Luxembourg"
-msgstr "盧森堡"
-
-#: calendar/zones.h:305
-msgid "Europe/Madrid"
-msgstr ""
-
-#: calendar/zones.h:306
-msgid "Europe/Malta"
-msgstr ""
-
-#: calendar/zones.h:307
-msgid "Europe/Minsk"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-# calendar/gui/event-editor.c:475
-#: calendar/zones.h:308
-#, fuzzy
-msgid "Europe/Monaco"
-msgstr "摩納哥"
-
-#: calendar/zones.h:309
-msgid "Europe/Moscow"
-msgstr ""
-
-#: calendar/zones.h:310
-msgid "Europe/Nicosia"
-msgstr ""
-
-#: calendar/zones.h:311
-msgid "Europe/Oslo"
-msgstr ""
-
-# mail/folder-browser-factory.c:198
-# ui/evolution-event-editor.xml.h:39
-# ui/evolution-task-editor-dialog.xml.h:42
-#: calendar/zones.h:312
-#, fuzzy
-msgid "Europe/Paris"
-msgstr "內容"
-
-#: calendar/zones.h:313
-msgid "Europe/Prague"
-msgstr ""
-
-#: calendar/zones.h:314
-msgid "Europe/Riga"
-msgstr ""
-
-#: calendar/zones.h:315
-msgid "Europe/Rome"
-msgstr ""
-
-#: calendar/zones.h:316
-msgid "Europe/Samara"
-msgstr ""
-
-#: calendar/zones.h:317
-#, fuzzy
-msgid "Europe/San_Marino"
-msgstr "聖馬利諾"
-
-#: calendar/zones.h:318
-msgid "Europe/Sarajevo"
-msgstr ""
-
-#: calendar/zones.h:319
-msgid "Europe/Simferopol"
-msgstr ""
-
-#: calendar/zones.h:320
-msgid "Europe/Skopje"
-msgstr ""
-
-#: calendar/zones.h:321
-msgid "Europe/Sofia"
-msgstr ""
-
-#: calendar/zones.h:322
-msgid "Europe/Stockholm"
-msgstr ""
-
-#: calendar/zones.h:323
-msgid "Europe/Tallinn"
-msgstr ""
-
-#: calendar/zones.h:324
-msgid "Europe/Tirane"
-msgstr ""
-
-#: calendar/zones.h:325
-msgid "Europe/Uzhgorod"
-msgstr ""
-
-#: calendar/zones.h:326
-msgid "Europe/Vaduz"
-msgstr ""
-
-#: calendar/zones.h:327
-msgid "Europe/Vatican"
-msgstr ""
-
-#: calendar/zones.h:328
-msgid "Europe/Vienna"
-msgstr ""
-
-#: calendar/zones.h:329
-msgid "Europe/Vilnius"
-msgstr ""
-
-#: calendar/zones.h:330
-msgid "Europe/Warsaw"
-msgstr ""
-
-#: calendar/zones.h:331
-msgid "Europe/Zagreb"
-msgstr ""
-
-#: calendar/zones.h:332
-msgid "Europe/Zaporozhye"
-msgstr ""
-
-#: calendar/zones.h:333
-msgid "Europe/Zurich"
-msgstr ""
-
-#: calendar/zones.h:334
-msgid "Indian/Antananarivo"
-msgstr ""
-
-#: calendar/zones.h:335
-msgid "Indian/Chagos"
-msgstr ""
-
-#: calendar/zones.h:336
-msgid "Indian/Christmas"
-msgstr ""
-
-#: calendar/zones.h:337
-msgid "Indian/Cocos"
-msgstr ""
-
-# ui/evolution-mail.xml.h:5
-#: calendar/zones.h:338
-#, fuzzy
-msgid "Indian/Comoro"
-msgstr "葛摩"
-
-#: calendar/zones.h:339
-msgid "Indian/Kerguelen"
-msgstr ""
-
-#: calendar/zones.h:340
-#, fuzzy
-msgid "Indian/Mahe"
-msgstr "印度"
-
-#: calendar/zones.h:341
-#, fuzzy
-msgid "Indian/Maldives"
-msgstr "馬爾地夫"
-
-# addressbook/printing/e-contact-print.glade.h:21
-#: calendar/zones.h:342
-#, fuzzy
-msgid "Indian/Mauritius"
-msgstr "模里西斯"
-
-# calendar/gui/goto-dialog.glade.h:11
-#: calendar/zones.h:343
-#, fuzzy
-msgid "Indian/Mayotte"
-msgstr "美亞特"
-
-# addressbook/printing/e-contact-print.glade.h:34
-#: calendar/zones.h:344
-#, fuzzy
-msgid "Indian/Reunion"
-msgstr "留尼旺"
-
-#: calendar/zones.h:345
-msgid "Pacific/Apia"
-msgstr ""
-
-#: calendar/zones.h:346
-msgid "Pacific/Auckland"
-msgstr ""
-
-#: calendar/zones.h:347
-msgid "Pacific/Chatham"
-msgstr ""
-
-#: calendar/zones.h:348
-msgid "Pacific/Easter"
-msgstr ""
-
-#: calendar/zones.h:349
-msgid "Pacific/Efate"
-msgstr ""
-
-#: calendar/zones.h:350
-msgid "Pacific/Enderbury"
-msgstr ""
-
-#: calendar/zones.h:351
-msgid "Pacific/Fakaofo"
-msgstr ""
-
-#: calendar/zones.h:352
-msgid "Pacific/Fiji"
-msgstr ""
-
-#: calendar/zones.h:353
-msgid "Pacific/Funafuti"
-msgstr ""
-
-#: calendar/zones.h:354
-msgid "Pacific/Galapagos"
-msgstr ""
-
-#: calendar/zones.h:355
-msgid "Pacific/Gambier"
-msgstr ""
-
-#: calendar/zones.h:356
-msgid "Pacific/Guadalcanal"
-msgstr ""
-
-#: calendar/zones.h:357
-msgid "Pacific/Guam"
-msgstr ""
-
-#: calendar/zones.h:358
-msgid "Pacific/Honolulu"
-msgstr ""
-
-#: calendar/zones.h:359
-msgid "Pacific/Johnston"
-msgstr ""
-
-#: calendar/zones.h:360
-msgid "Pacific/Kiritimati"
-msgstr ""
-
-#: calendar/zones.h:361
-msgid "Pacific/Kosrae"
-msgstr ""
-
-#: calendar/zones.h:362
-msgid "Pacific/Kwajalein"
-msgstr ""
-
-#: calendar/zones.h:363
-msgid "Pacific/Majuro"
-msgstr ""
-
-#: calendar/zones.h:364
-msgid "Pacific/Marquesas"
-msgstr ""
-
-#: calendar/zones.h:365
-msgid "Pacific/Midway"
-msgstr ""
-
-#: calendar/zones.h:366
-msgid "Pacific/Nauru"
-msgstr ""
-
-#: calendar/zones.h:367
-msgid "Pacific/Niue"
-msgstr ""
-
-#: calendar/zones.h:368
-msgid "Pacific/Norfolk"
-msgstr ""
-
-#: calendar/zones.h:369
-msgid "Pacific/Noumea"
-msgstr ""
-
-#: calendar/zones.h:370
-msgid "Pacific/Pago_Pago"
-msgstr ""
-
-#: calendar/zones.h:371
-msgid "Pacific/Palau"
-msgstr ""
-
-# ui/evolution-calendar.xml.h:25
-#: calendar/zones.h:372
-#, fuzzy
-msgid "Pacific/Pitcairn"
-msgstr "皮特康"
-
-#: calendar/zones.h:373
-msgid "Pacific/Ponape"
-msgstr ""
-
-#: calendar/zones.h:374
-msgid "Pacific/Port_Moresby"
-msgstr ""
-
-#: calendar/zones.h:375
-msgid "Pacific/Rarotonga"
-msgstr ""
-
-#: calendar/zones.h:376
-msgid "Pacific/Saipan"
-msgstr ""
-
-#: calendar/zones.h:377
-msgid "Pacific/Tahiti"
-msgstr ""
-
-#: calendar/zones.h:378
-msgid "Pacific/Tarawa"
-msgstr ""
-
-#: calendar/zones.h:379
-msgid "Pacific/Tongatapu"
-msgstr ""
-
-#: calendar/zones.h:380
-msgid "Pacific/Truk"
-msgstr ""
-
-#: calendar/zones.h:381
-msgid "Pacific/Wake"
-msgstr ""
-
-#: calendar/zones.h:382
-msgid "Pacific/Wallis"
-msgstr ""
-
-#: calendar/zones.h:383
-msgid "Pacific/Yap"
-msgstr ""
-
 # camel/camel-cipher-context.c:171
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "此加密器不支援加簽"
 
 # camel/camel-cipher-context.c:211
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "此加密器不支援明確簽章"
 
 # camel/camel-cipher-context.c:251
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "此加密器不支援驗證加簽"
 
 # camel/camel-cipher-context.c:294
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "此加密器不支援加密"
 
 # camel/camel-cipher-context.c:336
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "此加密器不支援解密"
 
-# mail/mail-ops.c:1728
-#: camel/camel-data-cache.c:169
-#, fuzzy
-msgid "Unable to create cache path"
-msgstr ""
-"無法建立輸出檔案：%s\n"
-" %s"
-
-# camel/providers/imap/camel-imap-message-cache.c:150
-#: camel/camel-data-cache.c:441
-#, fuzzy, c-format
-msgid "Could not remove cache entry: %s: %s"
-msgstr "不能開啟快取目錄：%s"
-
 #: camel/camel-disco-diary.c:180
 #, c-format
 msgid ""
@@ -8801,84 +6795,102 @@ msgstr "您必須於線上工作才能完成此操作"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:553 camel/camel-filter-driver.c:562
 msgid "Syncing folders"
 msgstr "同步處理資料夾"
 
-# camel/camel-filter-driver.c:866
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "分析過濾器發生錯誤： %s: %s"
-
-# camel/camel-filter-driver.c:871
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "執行過濾器發生錯誤： %s: %s"
-
 # camel/camel-filter-driver.c:643
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:664
 msgid "Unable to open spool folder"
 msgstr "無法開啟 spool 資料夾"
 
 # camel/camel-filter-driver.c:652
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:673
 msgid "Unable to process spool folder"
 msgstr "無法處理 spool 資料夾"
 
 # camel/camel-filter-driver.c:666
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:688
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "接收郵件 %d (%d%%)"
 
 # camel/camel-filter-driver.c:671
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:692
 msgid "Cannot open message"
 msgstr "不能開啟郵件"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
 #, c-format
 msgid "Failed on message %d"
 msgstr "在第 %d 封郵件發生錯誤"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:748
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:789
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在接收第 %d / %d 封郵件"
 
 # camel/camel-filter-driver.c:753
 # camel/camel-filter-driver.c:771
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d / %d 封郵件失敗"
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
-#: camel/camel-filter-search.c:126
-#, fuzzy
-msgid "Failed to retrieve message"
-msgstr "解密郵件失敗。"
+# camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:921
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "分析過濾器發生錯誤： %s: %s"
+
+# camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:927
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "執行過濾器發生錯誤： %s: %s"
 
 # camel/camel-filter-search.c:439
 # camel/camel-filter-search.c:445
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤： %s: %s"
 
+#: camel/camel-folder.c:471
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+# camel/camel-folder-search.c:338
+#: camel/camel-folder.c:1040
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"執行搜尋詞句時發生錯誤：%s：\n"
+"%s"
+
+#: camel/camel-folder.c:1080
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+# mail/mail-ops.c:898
+#: camel/camel-folder.c:1262
+#, fuzzy
+msgid "Moving messages"
+msgstr "將郵件移到 %s"
+
 # camel/camel-folder-search.c:328
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:332
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8888,7 +6900,7 @@ msgstr ""
 "%s"
 
 # camel/camel-folder-search.c:338
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:342
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8899,39 +6911,21 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 msgid "(match-all) requires a single bool result"
 msgstr "(符合-全部) 需要單一布林值結果"
 
 # camel/camel-folder-search.c:559
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "在不明的檔頭內執行查詢：%s"
 
-#: camel/camel-folder.c:469
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-# camel/camel-folder-search.c:338
-#: camel/camel-folder.c:1038
-#, fuzzy, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-"執行搜尋詞句時發生錯誤：%s：\n"
-"%s"
-
-#: camel/camel-folder.c:1078
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-# mail/mail-ops.c:898
-#: camel/camel-folder.c:1260
-#, fuzzy
-msgid "Moving messages"
-msgstr "將郵件移到 %s"
+# camel/camel-folder-search.c:670
+# camel/camel-folder-search.c:714
+#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
+msgid "Invalid type in body-contains, expecting string"
+msgstr "錯誤的類型於 body-contains，需要字串"
 
 # camel/camel-movemail.c:306
 #: camel/camel-lock-client.c:111
@@ -9050,25 +7044,25 @@ msgid "Error copying mail temp file: %s"
 msgstr "複製郵件暫存檔案時發生錯誤：%s"
 
 # camel/camel-pgp-context.c:190
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "請輸入 %2$s 所須的 %1$s 密碼"
 
 # camel/camel-pgp-context.c:193
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "請輸入您的 %s 密碼"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:621
+#: camel/camel-pgp-context.c:561
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "無法傳送郵件：沒有提供收件者。"
 
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
+#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "無法傳送郵件：寄件者的地址無效。"
@@ -9078,19 +7072,19 @@ msgstr "無法傳送郵件：寄件者的地址無效。"
 # camel/camel-pgp-context.c:879
 # camel/camel-pgp-context.c:1064
 # camel/camel-pgp-context.c:1276
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
+#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "不能建立導管至 GPG/PGP：%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:795
+#: camel/camel-pgp-context.c:741
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "無法傳送郵件：沒有提供收件者。"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:987
+#: camel/camel-pgp-context.c:939
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "無法傳送郵件：沒有提供收件者。"
@@ -9100,25 +7094,25 @@ msgstr "無法傳送郵件：沒有提供收件者。"
 # camel/camel-pgp-context.c:879
 # camel/camel-pgp-context.c:1064
 # camel/camel-pgp-context.c:1276
-#: camel/camel-pgp-context.c:993
+#: camel/camel-pgp-context.c:945
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "不能建立導管至 GPG/PGP：%s"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-pgp-context.c:1004
+#: camel/camel-pgp-context.c:956
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "不能建立暫存檔案：%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:1177
+#: camel/camel-pgp-context.c:1129
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "無法傳送郵件：沒有提供收件者。"
 
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: camel/camel-pgp-context.c:1187
+#: camel/camel-pgp-context.c:1139
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "無法傳送郵件：寄件者的地址無效。"
@@ -9128,24 +7122,24 @@ msgstr "無法傳送郵件：寄件者的地址無效。"
 # camel/camel-pgp-context.c:879
 # camel/camel-pgp-context.c:1064
 # camel/camel-pgp-context.c:1276
-#: camel/camel-pgp-context.c:1194
+#: camel/camel-pgp-context.c:1146
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "不能建立導管至 GPG/PGP：%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:1203
+#: camel/camel-pgp-context.c:1155
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "無法傳送郵件：沒有提供收件者。"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:1372
+#: camel/camel-pgp-context.c:1323
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "無法傳送郵件：沒有提供收件者。"
 
-#: camel/camel-pgp-context.c:1380
+#: camel/camel-pgp-context.c:1331
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
@@ -9154,60 +7148,56 @@ msgstr ""
 # camel/camel-pgp-context.c:879
 # camel/camel-pgp-context.c:1064
 # camel/camel-pgp-context.c:1276
-#: camel/camel-pgp-context.c:1387
+#: camel/camel-pgp-context.c:1338
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "不能建立導管至 GPG/PGP：%s"
 
-#: camel/camel-pgp-mime.c:354
-msgid "This is a digitally signed message part"
-msgstr ""
-
 # camel/camel-provider.c:131
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:130
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "不能載入模組 %s： 此系統不支援載入模組。"
 
 # camel/camel-provider.c:140
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "不能載入 %s：%s"
 
 # camel/camel-provider.c:148
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "不能載入 %s：模組內沒有初始碼。"
 
 # camel/camel-remote-store.c:191
-#: camel/camel-remote-store.c:199
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s server %s"
 msgstr "%s 伺服器 %s"
 
 # camel/camel-remote-store.c:195
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:207
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "用於 %3$s 上之 %2$s 的 %1$s 服務"
 
 # camel/camel-remote-store.c:252
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
+#: camel/camel-remote-store.c:264
 msgid "Connection cancelled"
 msgstr "連線已取消"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/camel-remote-store.c:267
+#: camel/providers/smtp/camel-smtp-transport.c:270
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "不能連線至 %s (埠號 %d)： %s"
 
 # camel/camel-remote-store.c:256
-#: camel/camel-remote-store.c:258
+#: camel/camel-remote-store.c:268
 msgid "(unknown host)"
 msgstr "(不明的主機)"
 
@@ -9215,16 +7205,14 @@ msgstr "(不明的主機)"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:481
+#: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "行動已取消"
 
 # camel/camel-remote-store.c:476
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
+#: camel/camel-remote-store.c:484
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "伺服器突然中斷連線"
@@ -9286,9 +7274,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"這個選項將會使用 CRAM-MD5 "
-"加密的密碼連線至伺服器，若發現該伺服器支援這種服務�"
-"�"
+"這個選項將會使用 CRAM-MD5 加密的密碼連線至伺服器，若發現該伺服器支援這種服"
+"務。"
 
 # camel/camel-sasl-digest-md5.c:43
 #: camel/camel-sasl-digest-md5.c:43
@@ -9301,9 +7288,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"這個選項將會使用 DIGEST-MD5 "
-"加密的密碼連線至伺服器，若發現該伺服器支援這種服務�"
-"�"
+"這個選項將會使用 DIGEST-MD5 加密的密碼連線至伺服器，若發現該伺服器支援這種服"
+"務。"
 
 # camel/camel-sasl-digest-md5.c:810
 #: camel/camel-sasl-digest-md5.c:810
@@ -9364,8 +7350,7 @@ msgstr "來自伺服器的不良許可回應。"
 
 # camel/camel-sasl-login.c:32
 #: camel/camel-sasl-login.c:32
-#, fuzzy
-msgid "Login"
+msgid "NT Login"
 msgstr "NT 登錄"
 
 # camel/camel-sasl-login.c:34
@@ -9379,18 +7364,6 @@ msgstr "這個選項將會使用普通的密碼連線至伺服器。"
 msgid "Unknown authentication state."
 msgstr "不詳的驗証狀況。"
 
-#: camel/camel-sasl-ntlm.c:31
-msgid "NTLM / SPA"
-msgstr ""
-
-# camel/camel-sasl-kerberos4.c:42
-#: camel/camel-sasl-ntlm.c:33
-#, fuzzy
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
-msgstr "這個選項將會使用 Kerberos 4 驗證連線至伺服器。"
-
 # addressbook/gui/component/addressbook-config.c:165
 # camel/camel-sasl-plain.c:32
 # camel/providers/imap/camel-imap-provider.c:80
@@ -9398,8 +7371,8 @@ msgstr "這個選項將會使用 Kerberos 4 驗證連線至伺服器。"
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "密碼"
 
@@ -9449,47 +7422,29 @@ msgid "URL '%s' needs a path component"
 msgstr "URL '%s' 須要 path 元件"
 
 # camel/camel-service.c:548
-#: camel/camel-service.c:617
+#: camel/camel-service.c:611
 #, c-format
 msgid "Resolving: %s"
 msgstr "解析：%s"
 
 # camel/camel-service.c:575
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:638
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "搜尋名稱失敗： %s"
 
 # camel/camel-service.c:600
-#: camel/camel-service.c:673
+#: camel/camel-service.c:663
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "搜尋主機失敗： %s ：找不到主機"
 
 # camel/camel-service.c:602
-#: camel/camel-service.c:675
+#: camel/camel-service.c:665
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "搜尋主機失敗： %s ：不明原因"
 
-# camel/camel-service.c:548
-#: camel/camel-service.c:725
-#, fuzzy
-msgid "Resolving address"
-msgstr "解析：%s"
-
-# camel/camel-service.c:600
-#: camel/camel-service.c:787
-#, fuzzy
-msgid "Host lookup failed: host not found"
-msgstr "搜尋主機失敗： %s ：找不到主機"
-
-# camel/camel-service.c:602
-#: camel/camel-service.c:790
-#, fuzzy
-msgid "Host lookup failed: unknown reason"
-msgstr "搜尋主機失敗： %s ：不明原因"
-
 # camel/camel-session.c:68
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
@@ -9502,13 +7457,13 @@ msgstr "使讀取郵件如同於其他資料夾查詢"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:346 camel/camel-session.c:415
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "沒有可處理通訊協定 `%s' 的服務可用"
 
 # camel/camel-session.c:479
-#: camel/camel-session.c:536
+#: camel/camel-session.c:532
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9561,19 +7516,19 @@ msgid "Failed to verify certificates."
 msgstr "驗證證書失敗。"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:222
+#: camel/camel-store.c:220
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "無法建立資料夾鎖定 %s ： %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:284
+#: camel/camel-store.c:280
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "無法建立資料夾鎖定 %s ： %s"
 
 # camel/camel-tcp-stream-openssl.c:423
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:536
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -9584,7 +7539,8 @@ msgstr ""
 
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
-#: camel/camel-tcp-stream-openssl.c:619
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9599,42 +7555,25 @@ msgstr ""
 "\n"
 "您無論如何都要接受嗎？"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+# camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-ssl.c:412
 #, c-format
 msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
-msgstr ""
-
-#: camel/camel-tcp-stream-ssl.c:497
-msgid "GOOD"
-msgstr ""
-
-#: camel/camel-tcp-stream-ssl.c:497
-msgid "BAD"
-msgstr ""
-
-# camel/camel-tcp-stream-openssl.c:428
-# camel/camel-tcp-stream-ssl.c:364
-#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
-#, fuzzy, c-format
-msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
-msgstr ""
-"來自 %s 的不良證書：\n"
-"\n"
-"%s\n"
-"\n"
-"您無論如何都要接受嗎？"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"電子郵件: %s\n"
+"通用名稱: %s\n"
+"組織單位: %s\n"
+"組織: %s\n"
+"地區: %s\n"
+"州: %s\n"
+"國家: %s"
 
 # camel/camel-url.c:289
 #: camel/camel-url.c:288
@@ -9649,14 +7588,14 @@ msgid "No such message %s in %s"
 msgstr "%2$s 沒有 %1$s 這個郵件"
 
 # camel/camel-vee-folder.c:546
-#: camel/camel-vee-folder.c:753
+#: camel/camel-vee-folder.c:749
 #, c-format
 msgid "No such message: %s"
 msgstr "沒有這個郵件： %s"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:258
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
@@ -9665,7 +7604,7 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:293
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
@@ -9673,13 +7612,13 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:306
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "無法將資料夾：%s 重新命名"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:314
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能將資料夾 %s 重新命名為 %s： %s"
@@ -9690,91 +7629,91 @@ msgid "You cannot copy messages from this trash folder."
 msgstr "您不能從垃圾桶資料夾內複製郵件。"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:329
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "從 IMAP 伺服器傳回不當的回應： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:339
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/imap/camel-imap-command.c:295
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:394
 msgid "Server response ended too soon."
 msgstr "伺服器太早傳回結束的回應。"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:586
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP 伺服器的回應沒有包含 %s 資訊"
 
 # camel/providers/imap/camel-imap-command.c:524
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:622
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "從 IMAP 伺服器傳回不當的 OK 回應： %s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:194
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "不能建立目錄 %s： %s"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:213
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "不能載入給 %s 的摘要"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:277
 msgid "Folder was destroyed and recreated on server."
 msgstr "資料夾已破壞並在伺服器上重建。"
 
 # mail/mail-ops.c:1649
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:461
 msgid "Scanning for changed messages"
 msgstr "掃描變更過的郵件"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1562
+#: camel/providers/imap/camel-imap-folder.c:1974
 msgid "This message is not currently available"
 msgstr "這封郵件目前仍未可用"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1713
+#: camel/providers/imap/camel-imap-folder.c:1794
 msgid "Fetching summary information for new messages"
 msgstr "正取得新郵件的摘要資訊"
 
 # mail/mail-ops.c:992
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:1719
 msgid "Scanning for new messages"
 msgstr "掃描新郵件"
 
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2011
 msgid "Could not find message body in FETCH response."
 msgstr "在 FETCH 的回應內找不到郵件的內文。"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:154
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "不能開啟快取目錄：%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:256
+#: camel/providers/imap/camel-imap-message-cache.c:313
+#: camel/providers/imap/camel-imap-message-cache.c:344
+#: camel/providers/imap/camel-imap-message-cache.c:376
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "解密郵件失敗。"
@@ -9792,7 +7731,7 @@ msgstr "檢查所有資料夾裡的新郵件"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
 msgid "Folders"
 msgstr "資料夾"
 
@@ -9840,7 +7779,7 @@ msgstr "IMAP 伺服器 %s 不支援所要求的驗證類別 %s"
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
 #: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/smtp/camel-smtp-transport.c:386
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支援驗證類別 %s"
@@ -9854,12 +7793,12 @@ msgstr "%s 請輸入 %s@%s 的 IMAP 密碼"
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/smtp/camel-smtp-transport.c:430
 msgid "You didn't enter a password."
 msgstr "您沒有輸入密碼。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:594
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9872,141 +7811,121 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:897
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "母資料夾並不允許包含子資料夾"
 
 # camel/providers/local/camel-local-provider.c:39
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:42
 msgid "MH-format mail directories"
 msgstr "MH-format 郵件目錄"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:43
 msgid "For storing local mail in MH-like mail directories."
 msgstr "用於儲存本地端郵件至 MH-like 郵件目錄。"
 
 # mail/mail-config.glade.h:76
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:52
 msgid "Local delivery"
 msgstr "本地端寄送"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "用於自標準 mbox 格式排程器接收本地端郵件。"
 
 # camel/providers/imap/camel-imap-provider.c:57
-#: camel/providers/local/camel-local-provider.c:76
-#: camel/providers/local/camel-local-provider.c:94
+#: camel/providers/local/camel-local-provider.c:62
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "將過濾器套用於此伺服器上 INBOX 裡的新郵件"
 
 # camel/providers/local/camel-local-provider.c:39
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:68
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "MH-format 郵件目錄"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:69
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "用於儲存本地端郵件至 qmail maildir 目錄。"
 
 # mail/mail-config.glade.h:77
-#: camel/providers/local/camel-local-provider.c:100
+#: camel/providers/local/camel-local-provider.c:80
 msgid "Standard Unix mbox spools"
 msgstr "標準 Unix mbox 排程器"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/local/camel-local-provider.c:101
+#: camel/providers/local/camel-local-provider.c:81
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "用於讀取及儲存本地諯郵件於標準 mbox 排程器檔案。"
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:117
-msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
-
 # camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:138
+#: camel/providers/local/camel-local-store.c:227
 #: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "儲存根目錄 %s 不是絕對路徑"
 
 # camel/providers/local/camel-local-store.c:134
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "儲存根目錄 %s 不是合法的目錄"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:169
+#: camel/providers/local/camel-local-store.c:235
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "無法取得資料夾：%s：%s"
 
 # camel/providers/local/camel-local-store.c:173
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:184
 msgid "Local stores do not have an inbox"
 msgstr "本地端的存儲沒有收件匣"
 
 # camel/providers/local/camel-local-store.c:183
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:196
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地端郵件檔案 %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "不能將資料夾 %s 重新命名為 %s： %s"
 
-# camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-local-store.c:358
-#, fuzzy, c-format
-msgid "Could not rename '%s': %s"
-msgstr "無法將資料夾：%s 重新命名"
-
 # camel/providers/local/camel-local-store.c:279
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:374
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "不能刪除資料夾摘要檔案 `%s'： %s"
 
 # camel/providers/local/camel-local-store.c:289
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:384
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "不能刪除資料夾索引檔案 `%s'： %s"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:367
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "不能載入給 %s 的摘要"
 
 # camel/providers/local/camel-local-summary.c:404
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:423
+#: camel/providers/local/camel-spool-summary.c:1157
 msgid "Unable to add message to summary: unknown reason"
 msgstr "無法新增郵件到摘要資訊：不明的原因"
 
@@ -10039,7 +7958,7 @@ msgstr "無法將郵件儲存到 maildir 資料夾： %s： %s"
 #: camel/providers/local/camel-mh-folder.c:198
 #: camel/providers/local/camel-mh-folder.c:207
 #: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-spool-folder.c:579
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10054,7 +7973,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:209
 #: camel/providers/local/camel-mbox-folder.c:331
 #: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-spool-folder.c:579
 msgid "No such message"
 msgstr "沒有這封郵件"
 
@@ -10067,7 +7986,7 @@ msgstr "無效的郵件內文"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-maildir-store.c:105
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -10080,8 +7999,8 @@ msgstr ""
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:100
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -10089,7 +8008,7 @@ msgstr "資料夾 `%s' 不存在。"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-maildir-store.c:117
+#: camel/providers/local/camel-maildir-store.c:116
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -10100,7 +8019,7 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-maildir-store.c:122
-#: camel/providers/local/camel-maildir-store.c:132
+#: camel/providers/local/camel-maildir-store.c:131
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' 不是一個 maildir 目錄。"
@@ -10108,72 +8027,43 @@ msgstr "`%s' 不是一個 maildir 目錄。"
 # camel/providers/local/camel-maildir-store.c:151
 # camel/providers/local/camel-maildir-store.c:188
 # camel/providers/local/camel-mh-store.c:127
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:203
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "無法刪除資料夾 `%s'：%s"
 
 # camel/providers/local/camel-maildir-store.c:152
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:167
 msgid "not a maildir directory"
 msgstr "不是一個 maildir 目錄"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:331
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "無法掃描資料夾 `%s'：%s"
 
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "無法開啟 maildir 目錄路徑：%s: %s"
 
-# camel/providers/imap/camel-imap-provider.c:43
-# mail/mail-config.glade.h:13
-#: camel/providers/local/camel-maildir-summary.c:525
-#, fuzzy
-msgid "Checking folder consistency"
-msgstr "檢查新郵件"
-
-# mail/mail-ops.c:992
-#: camel/providers/local/camel-maildir-summary.c:629
-#, fuzzy
-msgid "Checking for new messages"
-msgstr "掃描新郵件"
-
-# camel/camel-filter-driver.c:690
-# camel/camel-filter-driver.c:788
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
-#, fuzzy
-msgid "Storing folder"
-msgstr "同步處理資料夾"
-
 # camel/providers/local/camel-mbox-folder.c:152
 #: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-spool-folder.c:274
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "無法建立資料夾鎖定 %s ： %s"
 
 # camel/providers/local/camel-mbox-folder.c:203
 #: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-spool-folder.c:456
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "無法開啟 mailbox：%s： %s\n"
@@ -10199,9 +8089,9 @@ msgstr "無法將郵件儲存到 mbox 檔案： %s： %s"
 #: camel/providers/local/camel-mbox-folder.c:347
 #: camel/providers/local/camel-mbox-folder.c:379
 #: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:639
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -10212,18 +8102,18 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-folder.c:368
 #: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-spool-folder.c:628
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "資料夾好像已經損毀並且不能復原。"
 
 # camel/providers/local/camel-mbox-folder.c:381
 #: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-spool-folder.c:640
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "郵件結構錯誤：損毀的 mailbox ？"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:93
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -10233,7 +8123,7 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:109
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -10244,16 +8134,16 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:118
+#: camel/providers/local/camel-mbox-store.c:145
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' 不是一個合法的檔案。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:137
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -10263,15 +8153,29 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:152
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "資料夾 `%s' 內仍有檔案。所以不刪除。"
 
+# camel/camel-filter-driver.c:690
+# camel/camel-filter-driver.c:788
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:378
+#: camel/providers/local/camel-spool-summary.c:643
+#: camel/providers/local/camel-spool-summary.c:935
+#, fuzzy
+msgid "Storing folder"
+msgstr "同步處理資料夾"
+
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-spool-summary.c:383
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
@@ -10279,24 +8183,24 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-spool-summary.c:425
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "靠近位於資料夾 %2$s 裡 %1$ld 發生嚴重的郵件分析錯誤"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-spool-summary.c:497
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "無法取得資料夾：%s：%s"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:648
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
@@ -10304,8 +8208,8 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-summary.c:524
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:519
+#: camel/providers/local/camel-spool-summary.c:672
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "無法開啟暫存 mailbox：%s"
@@ -10314,56 +8218,56 @@ msgstr "無法開啟暫存 mailbox：%s"
 # camel/providers/local/camel-mbox-summary.c:557
 # camel/providers/local/camel-mbox-summary.c:746
 # camel/providers/local/camel-mbox-summary.c:754
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
+#: camel/providers/local/camel-mbox-summary.c:544
+#: camel/providers/local/camel-mbox-summary.c:552
+#: camel/providers/local/camel-mbox-summary.c:741
+#: camel/providers/local/camel-mbox-summary.c:749
+#: camel/providers/local/camel-spool-summary.c:697
+#: camel/providers/local/camel-spool-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:978
+#: camel/providers/local/camel-spool-summary.c:986
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "摘要與資料夾不協調，即使經過同步"
 
 # camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-spool-summary.c:749
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "寫入暫存郵箱時發生錯誤：%s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-spool-summary.c:771
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "寫入暫存郵箱失敗：%s：%s"
 
 # camel/providers/local/camel-mbox-summary.c:635
 # camel/providers/local/camel-mbox-summary.c:804
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:630
+#: camel/providers/local/camel-mbox-summary.c:799
+#: camel/providers/local/camel-spool-summary.c:1036
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "不能關閉來源資料夾 %s ： %s"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "無法關閉暫存資料夾： %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:650
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "無法將資料夾：%s 重新命名"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:873
+#: camel/providers/local/camel-spool-summary.c:544
+#: camel/providers/local/camel-spool-summary.c:1110
 #, c-format
 msgid "Unknown error: %s"
 msgstr "不明的錯誤：%s"
@@ -10386,13 +8290,13 @@ msgid "`%s' is not a directory."
 msgstr "`%s' 不是一個目錄。"
 
 # camel/providers/local/camel-mh-summary.c:218
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:218
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "無法開啟 MH 目錄路徑：%s：%s"
 
 # camel/providers/local/camel-mbox-folder.c:259
-#: camel/providers/local/camel-spool-folder.c:515
+#: camel/providers/local/camel-spool-folder.c:512
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "無法將郵件增加到 spool 檔案： %s： %s"
@@ -10408,7 +8312,6 @@ msgstr "排程器 `%s' 不存在或不是一個合法的檔案"
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
 #: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "資料夾 `%s/%s' 不存在。"
@@ -10419,34 +8322,32 @@ msgstr "資料夾 `%s/%s' 不存在。"
 msgid "Spool mail file %s"
 msgstr "排程郵件檔案 %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:209
 msgid "Spool folders cannot be renamed"
 msgstr "排程資料夾不能重新命名"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be deleted"
 msgstr "排程資料夾不能刪除"
 
 # camel/camel-movemail.c:158
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:788
+#: camel/providers/local/camel-spool-summary.c:797
+#: camel/providers/local/camel-spool-summary.c:806
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "無法與暫存資料夾同步 %s：%s"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:821
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "無法與排程資料夾同步 %s：%s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:851
+#: camel/providers/local/camel-spool-summary.c:869
+#: camel/providers/local/camel-spool-summary.c:881
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -10456,27 +8357,56 @@ msgstr ""
 "資料夾可能損毀，複製儲存於 `%s'"
 
 # camel/camel-provider.c:140
-#: camel/providers/local/camel-spool-summary.c:950
+#: camel/providers/local/camel-spool-summary.c:940
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "不能載入 %s：%s"
 
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "排程器 `%s' 不存在或不是一個合法的檔案"
+# camel/providers/nntp/camel-nntp-auth.c:45
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "請輸入 %s@%s 的 NNTP 密碼"
 
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
+# camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr "伺服器拒絕的使用者名稱"
 
-# mail/mail-autofilter.c:70
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "郵件送到 %s"
+# camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:70
+msgid "Failed to send username to server"
+msgstr "傳送使用者名稱到伺服器失敗"
+
+# camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr "伺服器拒絕的使用者名稱/密碼"
+
+# camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:115
+#, c-format
+msgid "Message %s not found."
+msgstr "找不到郵件 %s"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr "無法從伺服器取得群組清單"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:94
+# camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:98
+#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr "無法載入 %s： %s 的群組清單檔案"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr "無法儲存 %s： %s 的群組清單檔案"
 
 # camel/providers/nntp/camel-nntp-provider.c:42
 #: camel/providers/nntp/camel-nntp-provider.c:41
@@ -10488,243 +8418,182 @@ msgstr "USENET 新聞"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "這是讀取與發信至 USERNET 新聞群組的供應者。"
 
+# camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:230
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr "無法開啟新聞伺服器：%s 的目錄"
+
 # camel/providers/nntp/camel-nntp-store.c:286
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:296
 #, c-format
 msgid "USENET News via %s"
 msgstr "經由 %s 的 USENET 新聞"
 
 # camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:303
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "這個選項將會使用純文字的密碼驗證 NNTP 伺服器"
 
-# camel/providers/imap/camel-imap-store.c:803
-# mail/mail-local.c:334
-#: camel/providers/nntp/camel-nntp-summary.c:234
-#, fuzzy, c-format
-msgid "No such folder: %s"
-msgstr "沒有這個資料夾 %s"
-
-# camel/camel-movemail.c:306
-#: camel/providers/nntp/camel-nntp-summary.c:238
-#, fuzzy, c-format
-msgid "Could not get group: %s"
-msgstr "不能建立導管：%s"
-
-# camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/nntp/camel-nntp-summary.c:344
-#, fuzzy, c-format
-msgid "NNTP Command failed: %s"
-msgstr "IMAP 指令失敗： %s"
-
-# mail/mail-ops.c:992
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
-#, fuzzy, c-format
-msgid "%s: Scanning new messages"
-msgstr "掃描新郵件"
-
-# camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/nntp/camel-nntp-summary.c:520
-#, fuzzy, c-format
-msgid "Unknown server response: %s"
-msgstr "不明的錯誤：%s"
-
-# ui/evolution-mail.xml.h:2
-#: camel/providers/nntp/camel-nntp-summary.c:566
-#, fuzzy
-msgid "Use cancel"
-msgstr "取消"
-
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/nntp/camel-nntp-summary.c:568
-#, fuzzy, c-format
-msgid "Operation failed: %s"
-msgstr "行動已取消"
+# camel/providers/nntp/camel-nntp-store.c:325
+# camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:333
+#: camel/providers/nntp/camel-nntp-store.c:495
+#, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
+msgstr "不能夠開啟或建立給 %s： %s 的 .newsrc 檔案"
 
 # camel/providers/pop3/camel-pop3-folder.c:149
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:175
 msgid "Retrieving POP summary"
 msgstr "取回 POP 的摘要"
 
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
-#, fuzzy
-msgid "User cancelled"
-msgstr "行動已取消"
+# camel/providers/pop3/camel-pop3-folder.c:155
+#: camel/providers/pop3/camel-pop3-folder.c:181
+#, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "無法檢查於 POP 伺服器的新郵件：%s "
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: camel/providers/pop3/camel-pop3-folder.c:287
-#, fuzzy, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "無法取得資料夾：%s：%s"
+# camel/providers/pop3/camel-pop3-folder.c:199
+#: camel/providers/pop3/camel-pop3-folder.c:228
+msgid "Could not open folder: message listing was incomplete."
+msgstr "無法開啟資料夾：不完整的郵件清單。"
 
 # mail/message-browser.c:199
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:252
 msgid "Expunging deleted messages"
 msgstr "清空刪除的郵件"
 
+# camel/providers/pop3/camel-pop3-folder.c:303
+#: camel/providers/pop3/camel-pop3-folder.c:328
+#, c-format
+msgid "Could not fetch message: %s"
+msgstr "不能接收郵件：%s"
+
+# camel/providers/pop3/camel-pop3-folder.c:320
+#: camel/providers/pop3/camel-pop3-folder.c:344
+#, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr "無法從 POP 伺服器接收郵件 %s： %s"
+
 # camel/providers/pop3/camel-pop3-folder.c:292
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:367
 #, c-format
 msgid "No message with uid %s"
 msgstr "沒有郵件具有這個 uid %s"
 
 # camel/providers/pop3/camel-pop3-folder.c:296
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:371
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "接收 POP 郵件 %d"
 
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:217
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-# camel/providers/local/camel-mh-folder.c:194
-# camel/providers/local/camel-mh-folder.c:202
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
-#, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-"無法取得郵件： %s\n"
-" %s"
-
-# camel/camel-sasl-login.c:127
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#, fuzzy
-msgid "Unknown reason"
-msgstr "不明的降水"
-
 # camel/providers/pop3/camel-pop3-provider.c:37
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message storage"
 msgstr "郵件儲存空間"
 
 # camel/providers/pop3/camel-pop3-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:40
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Leave messages on server"
 msgstr "在伺服器保留郵件備份"
 
 # camel/providers/pop3/camel-pop3-provider.c:41
-#: camel/providers/pop3/camel-pop3-provider.c:43
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "刪除 %s 天後的郵件"
 
 # camel/providers/pop3/camel-pop3-provider.c:48
 # mail/mail-config.glade.h:51
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/pop3/camel-pop3-provider.c:54
+#: camel/providers/pop3/camel-pop3-provider.c:52
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "用於連線到 POP 伺服器並下載郵件。"
 
 # camel/providers/pop3/camel-pop3-provider.c:69
-#: camel/providers/pop3/camel-pop3-provider.c:71
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"這個選項將會使用純文字的密碼連線到 POP "
-"伺服器。一般的 POP 伺服器只會支援這種方式。"
+"這個選項將會使用純文字的密碼連線到 POP 伺服器。一般的 POP 伺服器只會支援這種"
+"方式。"
 
 # camel/providers/pop3/camel-pop3-provider.c:79
-#: camel/providers/pop3/camel-pop3-provider.c:81
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"這個選項將會使用加密的密碼經由 APOP 通訊協定連線到 POP "
-"伺服器。不過就算伺服器聲稱能夠支援，但對於所有使用�"
-"�來講都未必一定可行。"
+"這個選項將會使用加密的密碼經由 APOP 通訊協定連線到 POP 伺服器。不過就算伺服器"
+"聲稱能夠支援，但對於所有使用者來講都未必一定可行。"
 
-# camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
-#, fuzzy, c-format
-msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr ""
-"不能夠連線到 POP 伺服器。\n"
-"傳送使用者名稱時發生錯誤：%s"
+# camel/providers/pop3/camel-pop3-provider.c:91
+#: camel/providers/pop3/camel-pop3-provider.c:91
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr "這將會使用 Kerberos 4 的驗證方法連線到 POP  伺服器。"
 
-# shell/e-storage.c:477
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "行動不支援"
+# camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:198
+#, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr "無法驗證登入 KPOP 伺服器：%s"
 
-# camel/camel-sasl-anonymous.c:110
-# camel/camel-sasl-plain.c:87
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "驗証失敗。"
+# camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr "不能夠連線到伺服器：%s"
 
 # camel/providers/pop3/camel-pop3-store.c:322
-#: camel/providers/pop3/camel-pop3-store.c:348
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+#: camel/providers/pop3/camel-pop3-store.c:321
+#, c-format
+msgid "Could not connect to POP server on %s."
 msgstr "不能夠連線到 %s 上的 POP 伺服器。"
 
-# camel/providers/pop3/camel-pop3-store.c:409
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+# camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:360
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr "%s 請輸入給 %s@%s 的 POP3 密碼"
+
+# camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/pop3/camel-pop3-store.c:378
+#, c-format
 msgid ""
 "Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Error sending username: %s"
 msgstr ""
 "不能夠連線到 POP 伺服器。\n"
-"對於所要求的驗證機制沒有支援。"
+"傳送使用者名稱時發生錯誤：%s"
 
-# camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/pop3/camel-pop3-store.c:405
-#, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
-msgstr "IMAP 指令失敗： %s"
+# camel/providers/pop3/camel-pop3-store.c:382
+# camel/providers/pop3/camel-pop3-store.c:419
+#: camel/providers/pop3/camel-pop3-store.c:381
+#: camel/providers/pop3/camel-pop3-store.c:418
+msgid "(Unknown)"
+msgstr "(不明)"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
-msgid "SASL Protocol error"
+# camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/pop3/camel-pop3-store.c:408
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
 msgstr ""
-
-# shell/e-storage.c:467
-#: camel/providers/pop3/camel-pop3-store.c:431
-#, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "輸出/入錯誤"
-
-# camel/providers/pop3/camel-pop3-store.c:361
-#: camel/providers/pop3/camel-pop3-store.c:452
-#, fuzzy, c-format
-msgid "%sPlease enter the POP password for %s@%s"
-msgstr "%s 請輸入給 %s@%s 的 POP3 密碼"
+"不能夠連線到 POP 伺服器。\n"
+"對於所要求的驗證機制沒有支援。"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:416
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -10734,15 +8603,21 @@ msgstr ""
 "傳送密碼時發生錯誤：%s"
 
 # camel/providers/pop3/camel-pop3-store.c:484
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "沒有這個資料夾 `%s'。"
 
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/pop3/camel-pop3-store.c:566
+#, fuzzy, c-format
+msgid "Unexpected response from POP server: %s"
+msgstr "從 IMAP 伺服器傳回不當的回應： %s"
+
 # camel/providers/sendmail/camel-sendmail-provider.c:37
 # mail/mail-config.glade.h:67
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10751,246 +8626,215 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
-"將遞送的郵件交給本地端系統上的 \"sendmail\" 程式處理。"
-
-# camel/camel-url.c:289
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
-#, fuzzy
-msgid "Could not parse recipient list"
-msgstr "不能分析 URL `%s'"
+msgstr "將遞送的郵件交給本地端系統上的 \"sendmail\" 程式處理。"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:107
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "不能建立導管到 \"sendmail\" 程式：  %s：郵件無法傳送"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:124
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "無法另外再啟動一個 sendmail 行程： %s：郵件無法傳送"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:150
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
 #, c-format
 msgid "Could not send message: %s"
 msgstr "郵件無法傳送： %s"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:163
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail 回傳關閉訊息 %s：郵件無法傳送"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:170
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "不能執行 %s： 郵件無法傳送。"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:175
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail 由於狀況 %d 關閉： 郵件無法傳送。"
 
+# camel/providers/sendmail/camel-sendmail-transport.c:194
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
+msgid "Could not find 'From' address in message"
+msgstr "在郵件內找不到寄件者的電郵地址"
+
 # camel/providers/sendmail/camel-sendmail-transport.c:247
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 msgid "sendmail"
 msgstr "sendmail"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:249
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "Mail delivery via the sendmail program"
 msgstr "經由 sendmail 程式傳送郵件"
 
 # camel/providers/smtp/camel-smtp-provider.c:38
 # mail/mail-config.glade.h:62
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
 # camel/providers/smtp/camel-smtp-provider.c:40
 #: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr ""
-"使用 SMTP 通訊協定連線到遠端的 mailhub 來傳送郵件。\n"
+msgstr "使用 SMTP 通訊協定連線到遠端的 mailhub 來傳送郵件。\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:168
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error, command unrecognized"
 msgstr "語法錯誤，不認識的指令"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error in parameters or arguments"
 msgstr "參數內的語法錯誤"
 
 # camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command not implemented"
 msgstr "指令沒有實作"
 
 # camel/providers/smtp/camel-smtp-transport.c:174
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Command parameter not implemented"
 msgstr "指令的參數沒有實作"
 
 # camel/providers/smtp/camel-smtp-transport.c:176
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "System status, or system help reply"
 msgstr "系統狀況，或者是系統的求助說明回應"
 
 # camel/providers/smtp/camel-smtp-transport.c:178
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Help message"
 msgstr "求助說明訊息"
 
 # camel/providers/smtp/camel-smtp-transport.c:180
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service ready"
 msgstr "服務已就緒"
 
 # camel/providers/smtp/camel-smtp-transport.c:182
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service closing transmission channel"
 msgstr "此服務將傳輸通道關閉"
 
 # camel/providers/smtp/camel-smtp-transport.c:184
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service not available, closing transmission channel"
 msgstr "此服務仍未可用，傳輸通道關閉"
 
 # camel/providers/smtp/camel-smtp-transport.c:186
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action okay, completed"
 msgstr " 所要求的郵件動作已成功完成"
 
 # camel/providers/smtp/camel-smtp-transport.c:188
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "User not local; will forward to <forward-path>"
 msgstr "不是本地端的使用者；將會轉寄至 <轉寄路徑>"
 
 # camel/providers/smtp/camel-smtp-transport.c:190
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "所要求的郵件動作無法執行：郵箱仍未可用"
 
 # camel/providers/smtp/camel-smtp-transport.c:192
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "所要求的動作無法執行：郵箱仍未可用"
 
 # camel/providers/smtp/camel-smtp-transport.c:194
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action aborted: error in processing"
 msgstr "所要求的動作已放棄：正在處理錯誤"
 
 # camel/providers/smtp/camel-smtp-transport.c:196
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "User not local; please try <forward-path>"
 msgstr "不是本地端的使用者；請嘗試使用 <轉寄路徑>"
 
 # camel/providers/smtp/camel-smtp-transport.c:198
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: insufficient system storage"
 msgstr "所要求的動作無法執行：系統的儲存空間不足"
 
 # camel/providers/smtp/camel-smtp-transport.c:200
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "所要求的郵件動作已放棄：超出可供儲存空間的限制"
 
 # camel/providers/smtp/camel-smtp-transport.c:202
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "所要求的動作已放棄：不允許的郵箱名稱"
 
 # camel/providers/smtp/camel-smtp-transport.c:204
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "請開始輸入郵件的資料；<CRLF>.<CRLF> 結束撰寫郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Transaction failed"
 msgstr "執行失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:210
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "A password transition is needed"
 msgstr "需要密碼傳送"
 
 # camel/providers/smtp/camel-smtp-transport.c:212
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication mechanism is too weak"
 msgstr "驗證機制太弱了"
 
 # camel/providers/smtp/camel-smtp-transport.c:214
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Encryption required for requested authentication mechanism"
 msgstr "所要求的驗證機制必須要加密處理"
 
 # camel/providers/smtp/camel-smtp-transport.c:216
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Temporary authentication failure"
 msgstr "臨時驗證失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication required"
 msgstr "要求驗證"
 
 # camel/providers/smtp/camel-smtp-transport.c:313
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:314
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "傳回 Welcome 發生錯誤：%s： 可能是非嚴重的錯誤"
 
-# camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
-#, fuzzy, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr ""
-"不能夠連線到 POP 伺服器。\n"
-"傳送使用者名稱時發生錯誤：%s"
-
-# camel/providers/local/camel-mbox-folder.c:368
-#: camel/providers/smtp/camel-smtp-transport.c:336
-#, fuzzy
-msgid "server does not appear to support SSL"
-msgstr "資料夾好像已經損毀並且不能復原。"
-
-# camel/providers/smtp/camel-smtp-transport.c:743
-# camel/providers/smtp/camel-smtp-transport.c:755
-#: camel/providers/smtp/camel-smtp-transport.c:350
-#, fuzzy, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "AUTH 的要求逾時：%s"
-
-# camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:365
-#, fuzzy
-msgid "STARTTLS response error"
-msgstr "傳回 RSET 的回應錯誤： %s"
-
 # camel/providers/smtp/camel-smtp-transport.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:458
+#: camel/providers/smtp/camel-smtp-transport.c:376
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP 伺服器 %s 不支援所要求的驗證類別 %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:395
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:415
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s 請輸入 %s@%s 的 SMTP 密碼"
 
 # camel/providers/smtp/camel-smtp-transport.c:418
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:438
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -11002,160 +8846,156 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 伺服器 %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:556
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "經由 %s 傳送 SMTP 郵件"
 
+# camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:581
+msgid "Cannot send message: sender address not defined."
+msgstr "無法傳送郵件：沒有提供寄件者。"
+
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:588
 msgid "Cannot send message: sender address not valid."
 msgstr "無法傳送郵件：寄件者的地址無效。"
 
 # mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
 msgid "Sending message"
 msgstr "傳送郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:604
 msgid "Cannot send message: no recipients defined."
 msgstr "無法傳送郵件：沒有提供收件者。"
 
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/providers/smtp/camel-smtp-transport.c:688
-#, fuzzy
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "無法傳送郵件：沒有提供收件者。"
-
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:684
 msgid "SMTP Greeting"
 msgstr "SMTP 迎接"
 
 # camel/providers/smtp/camel-smtp-transport.c:676
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:706
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO 的要求逾時：%s： 非嚴重的錯誤"
 
 # camel/providers/smtp/camel-smtp-transport.c:695
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:726
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "傳回 HELO 的回應錯誤：%s： 非嚴重的錯誤"
 
 # mail/mail-config.glade.h:10
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:758
 msgid "SMTP Authentication"
 msgstr "SMTP 驗證"
 
 # camel/providers/smtp/camel-smtp-transport.c:728
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Error creating SASL authentication object."
 msgstr "建立 SASL 驗證物件時發生錯誤。"
 
 # camel/providers/smtp/camel-smtp-transport.c:743
 # camel/providers/smtp/camel-smtp-transport.c:755
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:779
+#: camel/providers/smtp/camel-smtp-transport.c:791
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH 的要求逾時：%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:764
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:800
 msgid "AUTH request failed."
 msgstr "AUTH 要求失敗。"
 
 # camel/providers/smtp/camel-smtp-transport.c:809
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Bad authentication response from server.\n"
 msgstr "從伺服器傳回不正確驗證的回應。\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:835
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:874
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM 的要求逾時：%s：郵件無法傳送"
 
 # camel/providers/smtp/camel-smtp-transport.c:854
-#: camel/providers/smtp/camel-smtp-transport.c:1081
-#, fuzzy
-msgid "MAIL FROM response error"
+#: camel/providers/smtp/camel-smtp-transport.c:893
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "傳回 MAIL FROM 的回應錯誤：%s： 郵件無法傳送"
 
 # camel/providers/smtp/camel-smtp-transport.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO 的要求逾時：%s：郵件無法傳送"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+# camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, c-format
-msgid "RCPT TO <%s> failed"
-msgstr ""
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "傳回 RCPT TO 的回應錯誤：%s： 郵件無法傳送"
 
 # camel/providers/smtp/camel-smtp-transport.c:929
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:971
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 的要求逾時：%s：郵件無法傳送"
 
-# camel/providers/smtp/camel-smtp-transport.c:1043
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
-#, fuzzy
-msgid "DATA response error"
-msgstr "傳回 RSET 的回應錯誤： %s"
+# camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:990
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr "傳回 DATA 的回應錯誤：%s： 郵件無法傳送"
 
 # camel/providers/smtp/camel-smtp-transport.c:963
 # camel/providers/smtp/camel-smtp-transport.c:981
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1030
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA 傳送逾時：郵件傳送中止：%s：郵件無法傳送"
 
-# camel/camel-sasl-kerberos4.c:218
-# camel/providers/imap/camel-imap-store.c:433
-#: camel/providers/smtp/camel-smtp-transport.c:1243
-#, fuzzy
-msgid "DATA termination response error"
-msgstr "來自伺服器的不良許可回應。"
+# camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1067
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr "傳回 DATA 的回應錯誤：郵件傳送中止：%s： 郵件無法傳送"
 
 # camel/providers/smtp/camel-smtp-transport.c:1024
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1091
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 的要求逾時：%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:1280
-#, fuzzy
-msgid "RSET response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1110
+#, c-format
+msgid "RSET response error: %s"
 msgstr "傳回 RSET 的回應錯誤： %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1066
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT 的要求逾時： %s：非嚴重的錯誤"
 
-# camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:1317
-#, fuzzy
-msgid "QUIT response error"
-msgstr "傳回 RSET 的回應錯誤： %s"
+# camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1152
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
+msgstr "傳回 QUIT 的回應錯誤： %s：非嚴重的錯誤"
 
 # composer/e-msg-composer-attachment-bar.c:95
 #: composer/e-msg-composer-attachment-bar.c:101
@@ -11189,22 +9029,22 @@ msgstr "%.1fG"
 # composer/e-msg-composer-attachment-bar.c:332
 # mail/mail-display.c:122
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "附件"
 
 # composer/e-msg-composer-attachment-bar.c:469
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "移除已選擇的附加檔案"
 
 # composer/e-msg-composer-attachment-bar.c:500
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "新增附件..."
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "附加檔案至郵件"
 
@@ -11239,12 +9079,12 @@ msgid "MIME type:"
 msgstr "MIME 類別："
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr "建議自動顯示附件"
 
 # composer/e-msg-composer-hdrs.c:324
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "按這裡新增目錄服務"
 
@@ -11252,7 +9092,7 @@ msgstr "按這裡新增目錄服務"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "寄件者："
 
@@ -11260,7 +9100,7 @@ msgstr "寄件者："
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "回覆地址："
 
@@ -11268,37 +9108,37 @@ msgstr "回覆地址："
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "主旨："
 
 # composer/e-msg-composer-hdrs.c:386
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "收件者："
 
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "輸入郵件的收件者"
 
 # composer/e-msg-composer-hdrs.c:390
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "副本："
 
 # composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
 # composer/e-msg-composer-hdrs.c:394
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "密件副本："
 
 # composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -11306,13 +9146,13 @@ msgstr "輸入郵件密件副本的收件者"
 
 # composer/e-msg-composer-attachment-bar.c:421
 # ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:267
+#: composer/e-msg-composer-select-file.c:228
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "附加檔案"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11321,40 +9161,54 @@ msgstr ""
 "讀取檔案時發生錯誤 %s：\n"
 "%s"
 
+# composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:879
+msgid "Save as..."
+msgstr "另存新檔..."
+
 # widgets/misc/e-messagebox.c:159
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:888
 msgid "Warning!"
 msgstr "警告！"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:892
 msgid "File exists, overwrite?"
 msgstr "檔案已存在，覆蓋它？"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:914
 #, c-format
 msgid "Error saving file: %s"
 msgstr "儲存檔案時發生錯誤：%s"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:933
 #, c-format
 msgid "Error loading file: %s"
 msgstr "載入檔案時發生錯誤：%s"
 
+# composer/e-msg-composer.c:877
+#: composer/e-msg-composer.c:1004
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"無法開啟這個帳號的草稿資料夾。\n"
+"是否使用預設的草稿資料夾？"
+
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1054
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "存取檔案時發生錯誤：%s"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1062
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1069
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11364,7 +9218,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11374,7 +9228,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1085
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11384,7 +9238,7 @@ msgstr ""
 " %s"
 
 # importers/pine-importer.c:705
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1187
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11393,7 +9247,7 @@ msgstr ""
 "是否嘗試將它復原？"
 
 # composer/e-msg-composer.c:941
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1341
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -11404,34 +9258,34 @@ msgstr ""
 "是否先將變更儲存？"
 
 # mail/mail-ops.c:1154
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1348
 msgid "Warning: Modified Message"
 msgstr "警告：變更過的郵件"
 
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1371
 msgid "Open file"
 msgstr "開啟檔案"
 
 # ui/evolution-message-composer.xml.h:49
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1520
 msgid "Insert File"
 msgstr "插入檔案"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1895 composer/e-msg-composer.c:2336
 msgid "Compose a message"
 msgstr "編輯郵件"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2353
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
 # composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2376
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11441,7 +9295,7 @@ msgstr ""
 "郵件元件內設定任何身份證明。"
 
 # composer/evolution-composer.c:355
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:367
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -11450,21 +9304,21 @@ msgstr ""
 "郵件元件內設定任何身份證明。"
 
 # composer/evolution-composer.c:370
-#: composer/evolution-composer.c:391
+#: composer/evolution-composer.c:382
 msgid "Cannot initialize Evolution's composer."
 msgstr "不能初始化 Evolution 的郵件編輯器。"
 
-# data/evolution.desktop.in.h:2
-#: data/evolution.desktop.in.h:1
-msgid "The Evolution groupware suite"
-msgstr "Evolution 群組套件"
-
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
+#: data/evolution.desktop.in.h:1 shell/main.c:83
+msgid "Evolution"
+msgstr "Evolution"
+
+# data/evolution.desktop.in.h:2
 #: data/evolution.desktop.in.h:2
-msgid "Ximian Evolution"
-msgstr "Ximian Evolution"
+msgid "The Evolution groupware suite"
+msgstr "Evolution 群組套件"
 
 # data/evolution.keys.in.h:1
 #: data/evolution.keys.in.h:1
@@ -11512,38 +9366,17 @@ msgstr "主旨包含"
 msgid "Subject does not contain"
 msgstr "主旨不包含"
 
-# mail/mail-callbacks.c:1144
-# mail/mail-display.c:96
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
-#: mail/mail-display.c:122
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"同一名稱的檔案已經存在。\n"
-"是否複蓋該檔案？"
-
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
 #. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
 msgid "Remember this password"
 msgstr "記下這個密碼"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
-#: e-util/e-pilot-settings.c:96
-msgid "Sync Private Records:"
-msgstr ""
-
-# calendar/gui/e-calendar-table.c:150
-#: e-util/e-pilot-settings.c:105
-#, fuzzy
-msgid "Sync Categories:"
-msgstr "類別"
-
 # e-util/e-time-utils.c:283
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
@@ -11645,7 +9478,7 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1647
+#: widgets/misc/e-dateedit.c:1419 widgets/misc/e-dateedit.c:1646
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -11655,7 +9488,7 @@ msgstr "%I:%M %p"
 # widgets/misc/e-dateedit.c:1497
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1643
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11700,7 +9533,11 @@ msgstr "小時"
 msgid "minute"
 msgstr "分"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86
+msgid "second"
+msgstr "秒"
+
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "秒"
 
@@ -11778,7 +9615,7 @@ msgid "ago"
 msgstr "前"
 
 # mail/message-list.c:977
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:939
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -11791,15 +9628,15 @@ msgid "Filter Rules"
 msgstr "規則"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:487
 msgid "Then"
 msgstr "然後"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:501
 msgid "Add action"
 msgstr "新增動作"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:156
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -11809,11 +9646,19 @@ msgstr ""
 "請回頭指定一個有效的資料夾作為接收郵件之用。"
 
 # mail/mail-account-gui.c:682
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:837
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
+#: filter/filter-folder.c:267
+msgid "Enter folder URI"
+msgstr "請輸入資料夾的 URI"
+
+#: filter/filter-folder.c:314
+msgid "<click here to select a folder>"
+msgstr "<按這裏選擇資料夾>"
+
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -11823,50 +9668,43 @@ msgstr ""
 "正規表示式內有錯誤 '%s'：\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "測試"
 
-# ui/evolution.xml.h:3
-#: filter/filter-rule.c:217
-#, fuzzy
-msgid "You must name this filter."
-msgstr "更改這個資料夾的名稱"
-
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:708
 msgid "Rule name: "
 msgstr "規則名稱："
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:712
 msgid "Untitled"
 msgstr "未命名"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:729
 msgid "If"
 msgstr "如果"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:747
 msgid "Execute actions"
 msgstr "執行動作"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "if all criteria are met"
 msgstr "如果全部條件符合"
 
-#: filter/filter-rule.c:769
-#, fuzzy
-msgid "if any criterion are met"
+#: filter/filter-rule.c:756
+msgid "if any criteria are met"
 msgstr "如果任何條件符合"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:767
 msgid "Add criterion"
 msgstr "新增條件"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:852
 msgid "incoming"
 msgstr "內送"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:852
 msgid "outgoing"
 msgstr "外寄"
 
@@ -11910,12 +9748,6 @@ msgstr "包括全部本地端及可用的遠端資料夾"
 msgid "with all local folders"
 msgstr "包括全部本地端的資料夾"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-#, fuzzy
-msgid "Adjust Score"
-msgstr "指定目標"
-
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "指定色彩"
@@ -11928,12 +9760,6 @@ msgstr "指定目標"
 msgid "Attachments"
 msgstr "附加檔案"
 
-# addressbook/printing/e-contact-print.glade.h:36
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "Beep"
-msgstr "貝里斯"
-
 #: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "包含"
@@ -11987,160 +9813,148 @@ msgid "ends with"
 msgstr "以此終結"
 
 #: filter/libfilter-i18n.h:21
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:22
 msgid "exists"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "詞句"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
-#: mail/mail-config.glade.h:62
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "重要"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "是"
 
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "是之後的"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "是之前的"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "有標幟的"
-
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "大於"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "小於"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "不是"
 
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "有標幟的"
-
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "郵件列表"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "郵件內容"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "郵件檔頭"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:32
+msgid "Message was received"
+msgstr "已接收的郵件"
+
+#: filter/libfilter-i18n.h:33
+msgid "Message was sent"
+msgstr "已傳送的郵件"
+
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-# calendar/gui/event-editor-dialog.glade.h:14
-# calendar/gui/event-editor.c:1588
-#: filter/libfilter-i18n.h:39
-#, fuzzy
-msgid "Play Sound"
-msgstr "播放音效："
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "到期或之後"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "到期或之前"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "閱讀"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "收件者"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "正規表示式相配"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "回覆"
 
 # mail/message-list.c:1081
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "目標"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1398
 msgid "Sender"
 msgstr "寄件者"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "設定狀態"
 
 # addressbook/printing/e-contact-print.glade.h:36
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "類似"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "來源帳號"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "指定檔頭"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "以此開始"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "停止處理"
 
 # mail/mail-format.c:767
 # mail/message-list.c:1082
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "主旨"
 
+#: filter/libfilter-i18n.h:52
+msgid "was after"
+msgstr "是之後的"
+
+#: filter/libfilter-i18n.h:53
+msgid "was before"
+msgstr "是之前的"
+
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "規則"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:278
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:344
 msgid "Edit Rule"
 msgstr "編輯規則"
 
@@ -12148,13 +9962,7 @@ msgstr "編輯規則"
 msgid "Score Rules"
 msgstr "目標規則"
 
-# ui/evolution.xml.h:3
-#: filter/vfolder-rule.c:204
-#, fuzzy
-msgid "You must name this vfolder."
-msgstr "更改這個資料夾的名稱"
-
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:205
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "噢。您需要指定至少一個資料夾做為來源。"
@@ -12165,26 +9973,26 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution 正在匯入您舊有的 Elm 郵件"
 
 # shell/e-shell-importer.c:363
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "匯入..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "請稍候"
 
 # shell/e-shell-importer.c:371
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
-#: importers/pine-importer.c:365
+#: importers/elm-importer.c:170 importers/netscape-importer.c:692
+#: importers/pine-importer.c:368
 #, c-format
 msgid "Importing %s as %s"
 msgstr "匯入 %s 為 %s"
 
 # mail/mail-ops.c:599
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
-#: importers/pine-importer.c:471
+#: importers/elm-importer.c:376 importers/netscape-importer.c:785
+#: importers/pine-importer.c:474
 #, c-format
 msgid "Scanning %s"
 msgstr "掃描 %s"
@@ -12192,13 +10000,13 @@ msgstr "掃描 %s"
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/elm-importer.c:527 importers/netscape-importer.c:958
+#: importers/pine-importer.c:637 mail/component-factory.c:100
 msgid "Mail"
 msgstr "郵件"
 
 # importers/elm-importer.c:561
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:547
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -12206,17 +10014,17 @@ msgstr ""
 "Evolution 找到 Elm 格式的郵件檔案\n"
 "您是否要將它們匯入至 Evolution？"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:576
 msgid "Elm"
 msgstr ""
 
 # importers/pine-importer.c:661
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "目錄服務"
 
 # importers/netscape-importer.c:847
-#: importers/evolution-gnomecard-importer.c:246
+#: importers/evolution-gnomecard-importer.c:247
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12224,86 +10032,27 @@ msgstr ""
 "Evolution 找到 GnomeCard 檔案。\n"
 "您是否要將它們匯入至 Evolution？"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: importers/netscape-importer.c:70
-#, fuzzy, c-format
-msgid "Priority Filter \"%s\""
-msgstr "優先順序(_P)："
-
-#: importers/netscape-importer.c:653
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-
-#: importers/netscape-importer.c:677
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-
-#: importers/netscape-importer.c:694
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:106
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
 
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
-#: importers/netscape-importer.c:1865
-#, fuzzy
-msgid "Trash"
-msgstr "土耳其文"
-
-# camel/providers/local/camel-local-store.c:183
-#: importers/netscape-importer.c:2021
-#, fuzzy
-msgid "Scanning mail filters"
-msgstr "本地端郵件檔案 %s"
-
 # camel/providers/imap/camel-imap-folder.c:364
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:888 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "掃描目錄"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:897
 msgid "Starting import"
 msgstr "開始匯入"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:963
 msgid "Settings"
 msgstr "設定"
 
-#: importers/netscape-importer.c:2131
-#, fuzzy
-msgid "Mail Filters"
-msgstr "編輯規則"
-
 # importers/netscape-importer.c:847
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:984
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12336,111 +10085,55 @@ msgstr ""
 msgid "Pine"
 msgstr "列印"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
-
 # mail/GNOME_Evolution_Mail.oaf.in.h:1
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
 msgstr "用作處理郵件的 Evolution 元件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
 msgid "Evolution mail composer."
 msgstr "Evolution 郵件編輯器。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
 msgid "Evolution mail executive summary component."
 msgstr "Evolution 郵件功能總管元件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
 msgid "Evolution mail folder display component."
 msgstr "Evolution 郵件資料夾顯示元件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
 msgid "Evolution mail folder factory component."
 msgstr "Evolution 郵件資料夾元件工廠。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Factory for the Evolution composer."
 msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:8
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Factory for the Mail Summary component."
 msgstr "用作生產 Evolution 郵件摘要元件的元件工廠。"
 
-# calendar/gui/event-editor-dialog.glade.h:13
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-#, fuzzy
-msgid "Font Preferences"
-msgstr "非週期性約會(_N)"
-
-# mail/mail-config.glade.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
-#, fuzzy
-msgid "Mail Accounts"
-msgstr "帳號"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
-msgid "Mail Preferences"
-msgstr ""
-
 # mail/GNOME_Evolution_Mail.oaf.in.h:9
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Mail configuration interface"
 msgstr "郵件組態介面"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
-msgid "This Page can be used to configure the Fonts"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
-msgid "This page can be used to configure E-Mail Accounts"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19
-msgid "This page can be used to configure Mailer preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "This page can be used to configure the Composer"
-msgstr ""
-
 # mail/folder-browser.c:871
-#: mail/component-factory.c:101
+#: mail/component-factory.c:100
 msgid "Folder containing mail"
 msgstr "資料夾包含郵件"
 
+#: mail/component-factory.c:101
+msgid "Mail storage folder (internal)"
+msgstr "郵件儲存資料夾(內部的)"
+
 #: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "虛擬垃圾桶"
@@ -12449,7 +10142,13 @@ msgstr "虛擬垃圾桶"
 msgid "Virtual Trash folder"
 msgstr "虛擬垃圾桶資料夾"
 
-#: mail/component-factory.c:118
+# camel/providers/pop3/camel-pop3-store.c:215
+#: mail/component-factory.c:129
+#, fuzzy, c-format
+msgid "Cannot connect to store: %s"
+msgstr "不能夠連線到伺服器：%s"
+
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "此資料夾不能包含郵件。"
 
@@ -12457,67 +10156,55 @@ msgstr "此資料夾不能包含郵件。"
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: mail/component-factory.c:403
+#: mail/component-factory.c:432
 msgid "Properties..."
 msgstr "內容..."
 
 # ui/evolution-mail.xml.h:4
-#: mail/component-factory.c:403
+#: mail/component-factory.c:432
 msgid "Change this folder's properties"
 msgstr "變更這個資料夾的內容"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:805
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-# mail/mail-callbacks.c:202
-#: mail/component-factory.c:925
-msgid "You have not set a mail transport method"
-msgstr "您沒有設定郵件傳送方法"
-
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:967
+#: mail/component-factory.c:973
 msgid "New Mail Message"
 msgstr "新增郵件"
 
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
-msgid "_Mail Message"
-msgstr "郵件訊息(_M)"
+#: mail/component-factory.c:973
+msgid "New _Mail Message"
+msgstr "新增郵件(_M)"
 
 # mail/component-factory.c:337
-#: mail/component-factory.c:994
+#: mail/component-factory.c:997
 msgid "Cannot initialize Evolution's mail component."
 msgstr "不能初始化 Evolution 的 mail 元件。"
 
 # mail/component-factory.c:337
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "不能初始化 Evolution 的 mail 元件。"
 
 # mail/component-factory.c:337
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1012
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "不能初始化 Evolution 的 mail 元件。"
 
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
-#, fuzzy
-msgid "Connecting..."
-msgstr "正在連線至伺服器..."
-
 # mail/component-factory.c:410
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1228
 msgid "Cannot register storage with shell"
 msgstr "不能以此 shell 註冊儲存空間"
 
 # mail/folder-browser-factory.c:196
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" 的內容"
@@ -12525,242 +10212,222 @@ msgstr "\"%s\" 的內容"
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "內容"
 
 # mail/mail-display.c:236
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:297 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "不能建立暫存目錄： %s"
 
 # calendar/gui/event-editor.c:1558
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d new"
 msgstr "%d 新的"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:771 mail/folder-browser.c:776
+#: mail/folder-browser.c:798
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d hidden"
 msgstr "%d 隱藏"
 
-#: mail/folder-browser.c:767
-#, c-format
-msgid "%d visible"
-msgstr ""
-
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d selected"
 msgstr "%d 已刪除"
 
 # calendar/gui/event-editor.c:1558
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:800
 #, c-format
 msgid "%d unsent"
 msgstr "%d 未傳送"
 
 # calendar/gui/event-editor.c:1558
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:802
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d 未傳送"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:804
 #, c-format
 msgid "%d total"
 msgstr "%d 全部"
 
-# ui/evolution-mail.xml.h:10
-#: mail/folder-browser.c:1088
-#, fuzzy
-msgid "Create _Virtual Folder From Search..."
-msgstr "從郵件建立虛擬資料夾(_V)"
+# ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1086
+msgid "Create vFolder from Search"
+msgstr "自搜尋建立虛擬資料夾"
 
 # mail/folder-browser.c:653
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1467
 msgid "VFolder on _Subject"
 msgstr "從主旨建立虛擬資料夾(_S)"
 
 # mail/folder-browser.c:656
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1468
 msgid "VFolder on Se_nder"
 msgstr "從寄件者建立虛擬資料夾(_N)"
 
 # mail/folder-browser.c:659
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1469
 msgid "VFolder on _Recipients"
 msgstr "從收件者建立虛擬資料夾(_R)"
 
 # mail/folder-browser.c:662
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1470
 msgid "VFolder on Mailing _List"
 msgstr "從郵件清單建立虛擬資料夾(_L)"
 
 # mail/folder-browser.c:668
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1474
 msgid "Filter on Sub_ject"
 msgstr "從主旨建立規則(_J)"
 
 # mail/folder-browser.c:671
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1475
 msgid "Filter on Sen_der"
 msgstr "從寄件者建立規則(_D)"
 
 # mail/folder-browser.c:674
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1476
 msgid "Filter on Re_cipients"
 msgstr "收件者規則(_C)"
 
 # mail/folder-browser.c:677
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1477
 msgid "Filter on _Mailing List"
 msgstr "從郵件清單建立規則(_M)"
 
 # ui/evolution-mail.xml.h:66
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1485 ui/evolution-mail-message.xml.h:95
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
+# mail/folder-browser.c:690
+# ui/evolution-calendar.xml.h:43
+# ui/evolution-mail.xml.h:118
+# ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1486 ui/evolution-mail-message.xml.h:104
+msgid "_Save As..."
+msgstr "另存新檔(_S)..."
+
 # mail/folder-browser.c:692
 # ui/evolution-event-editor.xml.h:69
 # ui/evolution-task-editor-dialog.xml.h:82
 # ui/evolution-tasks.xml.h:7
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1487
 msgid "_Print"
 msgstr "列印(_P)"
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1491 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1492 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "回覆至清單(_A)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1493 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
 # mail/folder-browser.c:701
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1494
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: mail/folder-browser.c:1622
-msgid "Follo_w Up..."
-msgstr ""
-
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
-#: mail/folder-browser.c:1623
-#, fuzzy
-msgid "Fla_g Completed"
-msgstr "已完成"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: mail/folder-browser.c:1624
-#, fuzzy
-msgid "Cl_ear Flag"
-msgstr "清除"
-
 # mail/folder-browser.c:704
-#. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1496 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1629
-#, fuzzy
-msgid "Mark as _Unread"
+#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:44
+msgid "Mark as U_nread"
 msgstr "標示成未閱讀(_n)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1498
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1631
-#, fuzzy
-msgid "_Mark as Unimportant"
+#: mail/folder-browser.c:1499
+msgid "Mark as Unim_portant"
 msgstr "標示成不重要(_I)"
 
-# mail/folder-browser.c:717
-# ui/evolution-mail.xml.h:121
-#: mail/folder-browser.c:1636
-#, fuzzy
-msgid "U_ndelete"
-msgstr "復原(_U)"
-
 # mail/folder-browser.c:711
-#: mail/folder-browser.c:1640
-#, fuzzy
-msgid "Mo_ve to Folder..."
+#: mail/folder-browser.c:1503
+msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)..."
 
 # mail/folder-browser.c:713
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1504
 msgid "_Copy to Folder..."
 msgstr "復製至資料夾(_C)..."
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
+# mail/folder-browser.c:717
+# ui/evolution-mail.xml.h:121
+#: mail/folder-browser.c:1506 ui/evolution-mail-message.xml.h:106
+msgid "_Undelete"
+msgstr "復原(_U)"
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/folder-browser.c:1649
-#, fuzzy
-msgid "Add Sender to Address_book"
+#: mail/folder-browser.c:1510
+msgid "Add Sender to Address Book"
 msgstr "新增傳送者到目錄服務"
 
 # mail/folder-browser.c:727
-#: mail/folder-browser.c:1653
-#, fuzzy
-msgid "Appl_y Filters"
+#: mail/folder-browser.c:1513
+msgid "Apply Filters"
 msgstr "套用過濾器"
 
 # mail/folder-browser.c:731
-#: mail/folder-browser.c:1657
-#, fuzzy
-msgid "Crea_te Rule From Message"
+#: mail/folder-browser.c:1515
+msgid "Create Ru_le From Message"
 msgstr "從郵件建立規則(_L)"
 
+# mail/folder-browser.c:870
+#: mail/folder-browser.c:1665
+msgid "Filter on Mailing List"
+msgstr "郵件清單的規則"
+
 # mail/folder-browser.c:871
-#: mail/folder-browser.c:1936
-#, fuzzy
-msgid "VFolder on M_ailing List"
+#: mail/folder-browser.c:1666
+msgid "VFolder on Mailing List"
 msgstr "郵件清單的虛擬資料夾"
 
 # mail/folder-browser.c:873
-#: mail/folder-browser.c:1938
-#, fuzzy, c-format
-msgid "Filter on _Mailing List (%s)"
+#: mail/folder-browser.c:1668
+#, c-format
+msgid "Filter on Mailing List (%s)"
 msgstr "郵件清單的過濾器 (%s)"
 
 # mail/folder-browser.c:874
-#: mail/folder-browser.c:1939
-#, fuzzy, c-format
-msgid "VFolder on M_ailing List (%s)"
+#: mail/folder-browser.c:1669
+#, c-format
+msgid "VFolder on Mailing List (%s)"
 msgstr "郵件清單的虛擬資料夾 (%s)"
 
+# mail/mail-config.glade.h:21
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "預設值(_F)"
+
 # data/evolution.keys.in.h:2
 #: mail/folder-info.c:64
 msgid "Getting Folder Information"
@@ -12786,23 +10453,32 @@ msgstr "用作匯入 Outlook Express 4 郵件到 Evolution 的元件工廠"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "匯入  Outlook Express 4 的檔案到 Evolution。"
 
-# mail/local-config.glade.h:1
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "內文包含"
+
+# mail/local-config.glade.h:1
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "目前儲存格式："
 
-#: mail/local-config.glade.h:2
-#, fuzzy
-msgid "Index body contents"
-msgstr "內文包含"
+#: mail/local-config.glade.h:3
+msgid "Indexing:"
+msgstr ""
+
+# mail/local-config.glade.h:2
+#: mail/local-config.glade.h:4
+msgid "Mailbox Format"
+msgstr "信箱格式"
 
 # mail/local-config.glade.h:3
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "新儲存格式："
 
 # mail/local-config.glade.h:4
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -12813,17 +10489,17 @@ msgstr ""
 "所以請小心使用這個功能。"
 
 # mail/local-config.glade.h:7
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "maildir"
 
 # mail/local-config.glade.h:8
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "mbox"
 
 # mail/local-config.glade.h:9
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
@@ -12844,101 +10520,109 @@ msgstr "Evolution 新聞編輯器"
 msgid "Evolution Account Editor"
 msgstr "Evolution 帳號編輯器"
 
-# addressbook/gui/component/addressbook-config.c:401
-# mail/mail-config.glade.h:33
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
-msgid "_Host:"
-msgstr "主機(_H)："
-
-# mail/mail-config.glade.h:80
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+# mail/mail-crypto.c:59
+#: mail/mail-account-gui.c:962
 #, fuzzy
-msgid "User_name:"
-msgstr "使用者名稱(_U)："
-
-# addressbook/gui/component/addressbook-config.c:520
-# mail/mail-config.glade.h:53
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
-msgid "_Path:"
-msgstr "路徑(_P)："
+msgid "Could not save signature file."
+msgstr "無法建立一個 PGP 簽名文本。"
 
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "無線電電話"
+# mail/mail-config.glade.h:74
+#: mail/mail-account-gui.c:1039
+msgid "Save signature"
+msgstr "儲存簽名檔"
 
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
+# composer/e-msg-composer.c:941
+#: mail/mail-account-gui.c:1045
 msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
+"這個簽名檔已變更但仍未儲存。\n"
+"\n"
+"您是否要儲存變更？"
 
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1654
 msgid "You may not create two accounts with the same name."
 msgstr "您不能用相同的名稱建立兩個帳號。"
 
+# mail/mail-accounts.c:121
+# mail/mail-accounts.c:165
+#: mail/mail-accounts.c:149
+msgid " (default)"
+msgstr "(預設)"
+
+# mail/mail-accounts.c:197
+#: mail/mail-accounts.c:194
+msgid "Disable"
+msgstr "停用"
+
+# mail/mail-accounts.c:199
+# mail/mail-config.glade.h:30
+#: mail/mail-accounts.c:196
+msgid "Enable"
+msgstr "啟用"
+
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:293
 msgid "Are you sure you want to delete this account?"
 msgstr "您確定要刪除這個帳號？"
 
 # shell/e-shortcuts-view.c:265
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:297
 msgid "Don't delete"
 msgstr "不要刪除"
 
 # mail/mail-config.glade.h:41
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:300
 msgid "Really delete account?"
 msgstr "確定刪除帳號？"
 
-# mail/mail-accounts.c:197
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
-msgid "Disable"
-msgstr "停用"
-
-# mail/mail-accounts.c:199
-# mail/mail-config.glade.h:30
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
-msgid "Enable"
-msgstr "啟用"
-
 # mail/mail-accounts.c:418
 # mail/mail-accounts.c:422
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
 msgid "Are you sure you want to delete this news account?"
 msgstr "您確定要刪除這個新聞帳號？"
 
-# mail/mail-accounts.c:199
-# mail/mail-config.glade.h:30
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
-msgid "Enabled"
-msgstr "已啟用"
+# ui/evolution-mail.xml.h:110
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:790 mail/mail-config.glade.h:42
+msgid "Mail Settings"
+msgstr "郵件設定"
 
-# mail/mail-config.glade.h:5
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
-#, fuzzy
-msgid "Account name"
-msgstr "帳號(_A)："
+# mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:71
+#, c-format
+msgid "Mail to %s"
+msgstr "郵件送到 %s"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
-#, fuzzy
-msgid "Protocol"
-msgstr "波多黎各"
+# mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:214
+#, c-format
+msgid "Subject is %s"
+msgstr "主旨是 %s"
+
+# mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:230
+#, c-format
+msgid "Mail from %s"
+msgstr "郵件來自 %s "
+
+# mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:286
+#, c-format
+msgid "%s mailing list"
+msgstr "%s 郵件列表"
 
 # mail/mail-autofilter.c:335
 # mail/mail-autofilter.c:356
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
 
 # mail/mail-callbacks.c:93
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12951,7 +10635,7 @@ msgstr ""
 "是否現在設定？"
 
 # mail/mail-callbacks.c:146
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12960,7 +10644,7 @@ msgstr ""
 "才可以開始撰寫郵件。"
 
 # mail/mail-callbacks.c:158
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12968,8 +10652,13 @@ msgstr ""
 "您必須要先設定一個傳送郵件服務\n"
 "才可以開始撰寫郵件。"
 
+# mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:230
+msgid "You have not set a mail transport method"
+msgstr "您沒有設定郵件傳送方法"
+
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -12977,13 +10666,13 @@ msgstr ""
 
 # calendar/gui/event-editor-dialog.glade.h:23
 # calendar/gui/event-editor.c:1594
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "傳送電子郵件"
 
 # mail/mail-callbacks.c:235
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12991,19 +10680,18 @@ msgstr ""
 "郵件上沒有主旨。\n"
 "是否仍然將郵件送出？"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
-"因為您送信的連絡人清單設定為隱藏清單的地址，這個郵�"
-"�只會包含密件副本收件者。"
+"因為您送信的連絡人清單設定為隱藏清單的地址，這個郵件只會包含密件副本收件者。"
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:370
 msgid "This message contains only Bcc recipients."
 msgstr "這個郵件只包含密件副本收件者。"
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -13012,53 +10700,49 @@ msgstr ""
 "郵件伺服器加入明顯的檔頭時可能會洩露出收件者。\n"
 "無論如何都要傳送嗎？"
 
+#: mail/mail-callbacks.c:469
+#, fuzzy
+msgid "This message contains invalid recipients:"
+msgstr "這個郵件只包含密件副本收件者。"
+
 # mail/mail-callbacks.c:308
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:504
 msgid "You must specify recipients in order to send this message."
 msgstr "您必須指定收件者才可送出郵件。"
 
 # mail/mail-callbacks.c:351
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:600
 msgid "You must configure an account before you can send this email."
 msgstr "您必須要先設定一個帳號才可以傳送這封郵件。"
 
-# composer/e-msg-composer.c:877
-#: mail/mail-callbacks.c:623
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"無法開啟這個帳號的草稿資料夾。\n"
-"是否使用預設的草稿資料夾？"
-
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:838
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:843
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
 
 # mail/mail-callbacks.c:850
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1275 mail/message-browser.c:130
 msgid "Move message(s) to"
 msgstr "將郵件移至"
 
 # mail/mail-callbacks.c:852
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1277 mail/message-browser.c:132
 msgid "Copy message(s) to"
 msgstr "將郵件複製到"
 
 # mail/mail-callbacks.c:1017
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:1747
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "您確定要編輯全部 %d 封郵件？"
 
 # mail/mail-callbacks.c:1039
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:1772
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -13067,7 +10751,7 @@ msgstr ""
 "草稿資料夾內的郵件。"
 
 # mail/mail-callbacks.c:1073
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:1811
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -13076,58 +10760,52 @@ msgstr ""
 "內的郵件重傳。"
 
 # mail/mail-callbacks.c:1085
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:1825
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "您確定要重新傳送全部 %d 封郵件？"
 
 # mail/mail-callbacks.c:1106
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:1851
 msgid "No Message Selected"
 msgstr "沒有選定郵件"
 
-# mail/mail-callbacks.c:1140
-# mail/mail-display.c:92
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
-msgid "Overwrite file?"
-msgstr "覆蓋檔案？"
-
 # mail/mail-callbacks.c:1188
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:1945
 msgid "Save Message As..."
 msgstr "另存郵件..."
 
 # mail/mail-callbacks.c:1190
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:1947
 msgid "Save Messages As..."
 msgstr "另存郵件..."
 
-# ui/evolution-mail.xml.h:23
-#: mail/mail-callbacks.c:2366
-#, fuzzy
-msgid "Go to next folder with unread messages?"
-msgstr "顯示下一封未閱讀的郵件"
-
-#: mail/mail-callbacks.c:2373
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
+# widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2116 widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "警告"
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2123
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"這個動作會永久地清除所有標示為刪除的郵件。如果您要�"
-"�續，您將不能復原這些郵件。\n"
+"這個動作會永久地清除所有標示為刪除的郵件。如果您要繼續，您將不能復原這些郵"
+"件。\n"
 "\n"
 "確定清除這些郵件？"
 
+# importers/elm-importer.c:528
+# importers/netscape-importer.c:807
+# importers/pine-importer.c:668
+#: mail/mail-callbacks.c:2130
+msgid "Do not ask me again."
+msgstr "不要再顯示這個訊息。"
+
 # mail/mail-callbacks.c:1349
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2238
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13138,32 +10816,22 @@ msgstr ""
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2250
 msgid "Filters"
 msgstr "過濾器"
 
-# camel/camel-filter-driver.c:748
-#: mail/mail-callbacks.c:2783
-#, fuzzy, c-format
-msgid "Page %d of %d"
-msgstr "正在接收第 %d / %d 封郵件"
-
 # mail/mail-callbacks.c:1407
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2313
 msgid "Print Message"
 msgstr "列印郵件"
 
-#: mail/mail-callbacks.c:2863
-msgid "US-Letter"
-msgstr ""
-
 # mail/mail-callbacks.c:1454
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2359
 msgid "Printing of message failed"
 msgstr "列印郵件失敗"
 
 # mail/mail-callbacks.c:1549
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:2461
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "您確定要用新視窗開啟全部 %d 封郵件？"
@@ -13175,8 +10843,7 @@ msgid ""
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
-"請在下面輸入您的名稱及電郵地址。\"可選擇\" "
-"的欄位不一定要填，\n"
+"請在下面輸入您的名稱及電郵地址。\"可選擇\" 的欄位不一定要填，\n"
 "除非您希望在送出的郵件內包含這些資訊。"
 
 # mail/mail-config-druid.c:101
@@ -13186,8 +10853,7 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"請輸入以下關於您的收件伺服器的資料。如果您不清楚，�"
-"�聯絡您的系統\n"
+"請輸入以下關於您的收件伺服器的資料。如果您不清楚，請聯絡您的系統\n"
 "管理員或網路服務供應商。"
 
 #: mail/mail-config-druid.c:150
@@ -13201,8 +10867,7 @@ msgid ""
 "sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"請輸入以下關於您的寄件伺服器的資料。如果您不清楚，�"
-"�聯絡您的系統\n"
+"請輸入以下關於您的寄件伺服器的資料。如果您不清楚，請聯絡您的系統\n"
 "管理員或網路服務供應商。"
 
 # mail/mail-config-druid.c:107
@@ -13216,48 +10881,24 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"您差不多已完成郵件設定。您提供的身份證明，收件伺服�"
-"�及\n"
+"您差不多已完成郵件設定。您提供的身份證明，收件伺服器及\n"
 "寄送郵件傳送方式將會整理為一個 Evolution 郵件帳號。\n"
 "現請在下面的空白處為這個帳號輸入一個名稱。\n"
 "這個名稱僅用作顯示用途。"
 
 # mail/mail-config-druid.c:445
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:599
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-# mail/mail-mt.c:516
-# mail/mail-mt.c:545
-# mail/mail-mt.c:880
-#. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
-#, fuzzy
-msgid "Work"
-msgstr "正在工作"
-
-#. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
-msgid "Personal"
-msgstr ""
-
-# mail/mail-format.c:762
-# mail/message-list.c:1083
-#. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
-#, fuzzy
-msgid "To Do"
-msgstr "多哥"
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "之後"
+# mail/mail-config.glade.h:3
+#: mail/mail-config.c:316
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "帳號"
 
-#: mail/mail-config.c:2458
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -13265,197 +10906,113 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#: mail/mail-config.c:2719
+# mail/local-config.glade.h:8
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1654
+#, c-format
+msgid "%s: Inbox"
+msgstr "%s: Inbox"
+
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr "檢查服務"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:1967 mail/mail-config.c:1971
 msgid "Connecting to server..."
 msgstr "正在連線至伺服器..."
 
-# addressbook/gui/component/addressbook-storage.c:99
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "未命名的連絡人"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
-#: mail/mail-config.glade.h:1
-#, fuzzy
-msgid " "
-msgstr ", "
-
-# mail/mail-config.glade.h:86
-# ui/evolution-event-editor.xml.h:58
-# ui/evolution-message-composer.xml.h:45
-# ui/evolution-subscribe.xml.h:10
-# ui/evolution-task-editor-dialog.xml.h:70
-# ui/evolution.xml.h:48
-#: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "編輯 (_E)"
-
-# 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:58
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "新增"
-
 # mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " _Check for supported types "
 msgstr " 檢查可支援的類別(_C)"
 
-#: mail/mail-config.glade.h:5
-#, fuzzy
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr "(此一版本的 evolution 並不支援 SSL)"
+# mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:2
+msgid " color"
+msgstr " 色彩"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(此一版本的 evolution 並不支援 SSL)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "當傳送加密郵件時永遠自我加密"
 
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:8
-#, fuzzy
-msgid "Account Editor"
+#: mail/mail-config.glade.h:5
+msgid "Account"
 msgstr "帳號"
 
 # mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "帳號資訊"
 
 # mail/mail-config.glade.h:5
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "帳號總管"
 
-# calendar/gui/e-itip-control.c:883
-#: mail/mail-config.glade.h:11
-#, fuzzy
-msgid "Advanced Options"
-msgstr "取消行動"
-
-#: mail/mail-config.glade.h:12
-msgid "Afrikaans"
-msgstr ""
+# mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
+msgid "Accounts"
+msgstr "帳號"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:9
 #, fuzzy
-msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr "當傳送加密郵件時永遠自我加密"
 
-# calendar/gui/e-calendar-table.c:162
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Alerts"
-msgstr "提醒"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
-msgid "Alwa_ys sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr "當使用這個帳號時永遠在寄送的郵件上加簽"
 
-#: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr ""
-
-#: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr ""
-
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
-msgstr ""
-
-# composer/e-msg-composer-attachment-bar.c:501
-#: mail/mail-config.glade.h:20
-#, fuzzy
-msgid "Attach original message"
-msgstr "附加檔案至郵件"
-
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
 # mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "驗證"
 
-# mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:23
-#, fuzzy
-msgid "Automatically _detect links"
-msgstr "自動檢查新郵件每隔(_A)"
-
-#: mail/mail-config.glade.h:24
-msgid "Baltic (ISO-8859-13)"
-msgstr ""
-
-#: mail/mail-config.glade.h:25
-msgid "Baltic (ISO-8859-4)"
-msgstr ""
-
-# mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:26
-#, fuzzy
-msgid "C_haracter set:"
-msgstr "不明的編碼：%s"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:1
-# ui/evolution-contact-editor.xml.h:1
-# ui/evolution-event-editor.xml.h:10
-# ui/evolution-message-composer.xml.h:3
-# ui/evolution-subscribe.xml.h:2
-# ui/evolution-task-editor-dialog.xml.h:11
-# ui/evolution.xml.h:5
-#: mail/mail-config.glade.h:27
-#, fuzzy
-msgid "C_olors"
-msgstr "關閉 (_L)"
-
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
 
-# composer/e-msg-composer.c:1526
-# composer/e-msg-composer.c:1871
-#: mail/mail-config.glade.h:29
-#, fuzzy
-msgid "Composing Messages"
-msgstr "編輯郵件"
+# mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
+msgid "Composer"
+msgstr "編輯器"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "郵件設定"
 
+# mail/mail-ops.c:1449
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "刪除資料夾"
+
 # mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13471,440 +11028,294 @@ msgstr ""
 "\n"
 "請按 \"完成\" 來儲存您的設定。"
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "預設值(_F)"
 
-# mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:39
-#, fuzzy
-msgid "Default Behavior"
-msgstr "預設值(_F)"
+# mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
+msgid "Default Forward style is: "
+msgstr "預設的轉寄樣式為："
 
 # mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:40
-#, fuzzy
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:25
+msgid "Default character encoding: "
 msgstr "預設編碼："
 
-# mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:41
-#, fuzzy
-msgid "Deleting Mail"
-msgstr "接收郵件"
-
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr "數位 ID..."
 
-# camel/camel-filter-driver.c:671
-#: mail/mail-config.glade.h:44
-#, fuzzy
-msgid "Do not quote original message"
-msgstr "不能開啟郵件"
+# calendar/gui/calendar-summary.c:622
+# mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:28
+msgid "Display"
+msgstr "顯示"
 
 # mail/mail-config.glade.h:25
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "完成"
 
-# mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:46
-#, fuzzy
-msgid "Drafts _folder:"
-msgstr "草稿匣："
+# mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
+msgid "Drafts"
+msgstr "草稿"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr "啟用(_E)"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
-#: mail/mail-config.glade.h:49
-#, fuzzy
-msgid "Emacs"
-msgstr "東"
-
-# addressbook/gui/component/addressbook.c:620
-#: mail/mail-config.glade.h:50
-#, fuzzy
-msgid "Email Accounts"
-msgstr "電郵地址包含"
-
-# mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:51
-#, fuzzy
-msgid "Email _address:"
-msgstr "電子郵件地址："
-
-#: mail/mail-config.glade.h:52
-#, fuzzy
-msgid "Empty _trash folders on exit"
-msgstr "離開時清空垃圾桶資料夾(_E)"
-
-#: mail/mail-config.glade.h:53
-#, fuzzy
-msgid "Execute Command..."
-msgstr "執行動作"
-
-#: mail/mail-config.glade.h:54
-#, fuzzy
-msgid "Fi_xed -width:"
-msgstr "以此終結"
-
-# mail/folder-browser-factory.c:198
-# ui/evolution-event-editor.xml.h:39
-# ui/evolution-task-editor-dialog.xml.h:42
-#: mail/mail-config.glade.h:55
-#, fuzzy
-msgid "Font Properties"
-msgstr "內容"
+# widgets/misc/e-filter-bar.h:96
+# widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "編輯..."
 
-# mail/mail-ops.c:1154
-#: mail/mail-config.glade.h:56
-#, fuzzy
-msgid "Format messages in _HTML"
-msgstr "已轉寄的郵件"
+# mail/mail-accounts.c:199
+# mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:33
+msgid "Enabled"
+msgstr "已啟用"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr "取得數位 ID..."
 
-#: mail/mail-config.glade.h:58
-#, fuzzy
-msgid "Highlight _quotations with"
-msgstr "強調引文(_H)"
-
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "吐瓦魯"
+# mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:35
+msgid "HTML signature file:"
+msgstr "HTML 簽名檔："
 
 # mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "身份"
 
+# mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
+msgid "In HTML mail"
+msgstr "HTML 格式郵件"
+
 # mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "正常"
 
 # mail/mail-config.glade.h:38
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-# ui/evolution-contact-editor.xml.h:9
-# ui/evolution-event-editor.xml.h:42
-# ui/evolution-task-editor-dialog.xml.h:52
-#: mail/mail-config.glade.h:65
-#, fuzzy
-msgid "Labels and Colors"
-msgstr "儲存後關閉"
-
-# ui/evolution-mail.xml.h:46
-#: mail/mail-config.glade.h:67
-#, fuzzy
-msgid "Loading Images"
-msgstr "載入圖片(_I)"
-
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "郵件設定"
 
 # mail/local-config.glade.h:2
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "信箱位置"
 
-#: mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Message Composer"
-msgstr "郵件檔頭"
-
-# views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:73
-#, fuzzy
-msgid "Message Display"
-msgstr "檢視郵件(_M)"
-
-#: mail/mail-config.glade.h:74
-#, fuzzy
-msgid "Microsoft"
-msgstr "密克羅尼西亞"
+# mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
+msgid "Make this my _default account"
+msgstr "設為預設帳號(_D)"
 
 # addressbook/gui/component/addressbook-config.c:148
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "NNTP 伺服器："
 
-# mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:77
-#, fuzzy
-msgid "New Mail Notification"
-msgstr "郵件設定"
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: mail/mail-config.glade.h:78
-#, fuzzy
-msgid "News Servers"
-msgstr "新聞發送伺服器(_N)"
-
-#: mail/mail-config.glade.h:80
-msgid "On Screen fonts"
-msgstr ""
+# mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
+msgid "News"
+msgstr "新聞"
 
 # mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "選用的資訊"
 
-# addressbook/gui/widgets/e-addressbook-view.c:708
-#: mail/mail-config.glade.h:82
-#, fuzzy
-msgid "Or_ganization:"
-msgstr "團體(_Z)："
-
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:50
 #, fuzzy
-msgid "PGP/GPG _Key ID:"
+msgid "PGP _Key ID:"
 msgstr "PGP 鑰匙 ID："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 # mail/mail-config.glade.h:54
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "選取顏色"
 
+#: mail/mail-config.glade.h:54
+msgid "Pretty Good Privacy"
+msgstr "相當高的隱私"
+
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_B)"
+msgid "Prompt when sending HTML messages to contacts that don't want them"
+msgstr "當傳送沒有主旨的郵件時顯示提示(_E)"
 
-#: mail/mail-config.glade.h:89
-#, fuzzy
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "相當高的隱私"
+# ui/evolution-mail.xml.h:14
+#: mail/mail-config.glade.h:56
+msgid "Prompt when sending messages with an _empty subject"
+msgstr "當傳送沒有主旨的郵件時顯示提示(_E)"
 
-# ui/evolution-addressbook.xml.h:11
-#: mail/mail-config.glade.h:90
-#, fuzzy
-msgid "Printed Fonts"
-msgstr "列印選定的連絡人"
+# ui/evolution-mail.xml.h:14
+#: mail/mail-config.glade.h:57
+msgid "Prompt when sending messages with only _Bcc recipients defined"
+msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_B)"
 
 # mail/mail-config.glade.h:55
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-# camel/camel-filter-driver.c:671
-#: mail/mail-config.glade.h:92
-#, fuzzy
-msgid "Quote original message"
-msgstr "不能開啟郵件"
-
 # mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr "引用"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Re_member this password"
 msgstr "記下這個密碼"
 
-# composer/e-msg-composer-hdrs.c:361
-#: mail/mail-config.glade.h:97
-#, fuzzy
-msgid "Re_ply-To:"
-msgstr "回覆地址："
-
 # mail/mail-config.glade.h:57
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "接收郵件"
 
+# mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:62
+msgid "Receiving Mail"
+msgstr "接收郵件"
+
 # mail/mail-config.glade.h:59
-#: mail/mail-config.glade.h:99
-#, fuzzy
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:63
+msgid "Receiving Options"
 msgstr "接收郵件選項"
 
-# addressbook/gui/component/addressbook-config.c:352
-# mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:100
-#, fuzzy
-msgid "Remember this _password"
-msgstr "記下這個密碼"
-
 # mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "所須資訊"
 
-# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:103
-#, fuzzy
-msgid "S_ecurity"
-msgstr "安全性"
-
-#: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
-msgid "Secure MIME (S/MIME)"
+#: mail/mail-config.glade.h:66
+msgid "Secure MIME"
 msgstr "安全的 MIME"
 
-#: mail/mail-config.glade.h:106
-msgid "Select HTML fixed width font"
-msgstr ""
-
-#: mail/mail-config.glade.h:107
-msgid "Select HTML fixed width font for printing"
-msgstr ""
-
-#: mail/mail-config.glade.h:108
-msgid "Select HTML variable width font"
-msgstr ""
+# ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:67
+msgid "Security"
+msgstr "安全性"
 
-#: mail/mail-config.glade.h:109
-msgid "Select HTML variable width font for printing"
-msgstr ""
+# shell/e-shell-importer.c:545
+# shell/importer/import.glade.h:5
+#: mail/mail-config.glade.h:68
+msgid "Select Filter Log file..."
+msgstr "選擇過濾器記錄檔..."
 
 # mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:110
-#, fuzzy
-msgid "Select PGP program"
+#: mail/mail-config.glade.h:69
+msgid "Select PGP binary"
 msgstr "選擇 PGP 二元檔"
 
-# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "簽名檔："
-
-# calendar/gui/e-day-view.c:3179
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "刪除簽名檔以外的全部事件"
-
 # mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "傳送郵件"
 
+# mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:71
+msgid "Sending Mail"
+msgstr "傳送郵件"
+
+# mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:176
+msgid "Sent"
+msgstr "傳送"
+
 # mail/mail-config.glade.h:70
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "傳送郵件資料夾："
 
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "傳送與草稿郵件"
 
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求驗證(_A)"
 
 # mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "伺服器設定"
 
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Server _Type: "
 msgstr "伺服器類別："
 
-# ui/evolution.xml.h:62
-#: mail/mail-config.glade.h:120
-#, fuzzy
-msgid "Shortcuts _type:"
-msgstr "功能"
-
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:121
-#, fuzzy
-msgid "Signature"
-msgstr "儲存簽名檔"
+#: mail/mail-config.glade.h:79
+msgid "Signature file:"
+msgstr "簽名檔："
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "來源"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "來源資訊"
 
-# addressbook/printing/e-contact-print.glade.h:38
-#: mail/mail-config.glade.h:124
-#, fuzzy
-msgid "Specify _filename:"
-msgstr "樣式名稱："
+# mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:82
+msgid "Sources"
+msgstr "來源"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
-msgstr ""
+# mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:83
+msgid "Special Folders"
+msgstr "特別資料夾"
 
 # mail/mail-config.glade.h:77
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "標準 Unix mbox"
 
-#: mail/mail-config.glade.h:128
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-
-# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML 簽名檔："
-
-# mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:132
+# mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "V_ariable-width:"
-msgstr "變數"
+msgid "Use s_ecure connection (SSL)"
+msgstr "使用安全連結 (_SSL)"
 
 # mail/mail-config.glade.h:81
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:87
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13914,257 +11325,160 @@ msgstr ""
 "\n"
 "按 \"下一步\" 開始。"
 
-#: mail/mail-config.glade.h:138
-#, fuzzy
-msgid "XEmacs"
-msgstr "東"
-
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr "永遠自網路下載圖片(_A)"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "_Always sign outgoing messages when using this account"
 msgstr "當使用這個帳號時永遠在寄送的郵件上加簽"
 
 # mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "驗證類別："
 
-# mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:143
-#, fuzzy
-msgid "_Authentication type: "
-msgstr "驗證類別："
-
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "自動檢查新郵件每隔(_A)"
 
-#: mail/mail-config.glade.h:145
-msgid "_Beep when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "證書 ID："
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-# mail/mail-ops.c:1449
-#: mail/mail-config.glade.h:148
-#, fuzzy
-msgid "_Confirm when expunging a folder"
-msgstr "刪除資料夾"
-
-# mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:149
-#, fuzzy
-msgid "_Defaults"
-msgstr "預設值(_F)"
-
-#: mail/mail-config.glade.h:151
-msgid "_Do not notify me when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-# shell/e-shell-importer.c:540
-#: mail/mail-config.glade.h:154
+# mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:97
 #, fuzzy
-msgid "_Filename:"
-msgstr "檔案名稱："
+msgid "_Drafts folder:"
+msgstr "草稿匣："
 
-#: mail/mail-config.glade.h:155
-msgid "_Fixed-width:"
-msgstr ""
+# mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:99
+msgid "_Email Address:"
+msgstr "電子郵件地址(_E)："
 
-# ui/evolution-mail.xml.h:34
-#: mail/mail-config.glade.h:156
-#, fuzzy
-msgid "_Forward style:"
-msgstr "轉寄方式"
+#: mail/mail-config.glade.h:100
+msgid "_Empty trash folders on exit"
+msgstr "離開時清空垃圾桶資料夾(_E)"
 
 # mail/mail-config.glade.h:31
-#: mail/mail-config.glade.h:157
-#, fuzzy
-msgid "_Full name:"
+#: mail/mail-config.glade.h:101
+msgid "_Full Name:"
 msgstr "全名(_F)："
 
-# mail/mail-config.glade.h:36
-#: mail/mail-config.glade.h:159
-#, fuzzy
-msgid "_HTML Mail"
-msgstr "HTML 格式郵件"
-
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr "_HTML 簽名檔："
 
-# mail/mail-config.glade.h:35
-#: mail/mail-config.glade.h:162
-#, fuzzy
-msgid "_Identity"
-msgstr "身份"
+#: mail/mail-config.glade.h:103
+msgid "_Highlight citations with"
+msgstr "強調引文(_H)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "語言"
+# addressbook/gui/component/addressbook-config.c:401
+# mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:104
+msgid "_Host:"
+msgstr "主機(_H)："
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr "如果寄件者在目錄服務中就載入圖片(_L)"
 
-# mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:165
-#, fuzzy
-msgid "_Make this my default account"
-msgstr "設為預設帳號(_D)"
+#: mail/mail-config.glade.h:106
+msgid "_Log filter actions to:"
+msgstr "記錄過濾器動作至(_L)："
 
 # ui/evolution-mail.xml.h:51
-#: mail/mail-config.glade.h:166
-#, fuzzy
-msgid "_Mark messages as read after"
+#: mail/mail-config.glade.h:107
+msgid "_Mark messages as Read after"
 msgstr "標示郵件為已閱讀(_M)"
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
 msgstr "名稱(_N)："
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr "永遠不自網路下載圖片(_N)"
 
+# addressbook/gui/widgets/e-addressbook-view.c:708
+#: mail/mail-config.glade.h:110
+msgid "_Organization:"
+msgstr "團體(_O)："
+
 # mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr "_PGP 二元碼路徑："
 
-#: mail/mail-config.glade.h:171
-msgid "_Play sound file when new mail arrives"
-msgstr ""
-
-# ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr "當傳送沒有主旨的郵件時顯示提示(_E)"
-
-# ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:173
-#, fuzzy
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr "當傳送沒有主旨的郵件時顯示提示(_E)"
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "無線電電話"
-
-# mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:175
-#, fuzzy
-msgid "_Receiving Mail"
-msgstr "接收郵件"
-
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
-#: mail/mail-config.glade.h:176
-#, fuzzy
-msgid "_Reply style:"
-msgstr "全部回覆"
-
-#: mail/mail-config.glade.h:177
-msgid "_Restore defaults"
-msgstr ""
-
-# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:178
-#, fuzzy
-msgid "_Script:"
-msgstr "安全(_S)"
-
-# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "安全(_S)"
+# addressbook/gui/component/addressbook-config.c:520
+# mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:112
+msgid "_Path:"
+msgstr "路徑(_P)："
 
-# mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:180
-#, fuzzy
-msgid "_Sending Mail"
-msgstr "傳送郵件"
+# addressbook/gui/component/addressbook-config.c:352
+# mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:113
+msgid "_Remember this password"
+msgstr "記下這個密碼(_R)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: mail/mail-config.glade.h:181
-#, fuzzy
-msgid "_Show animated images"
-msgstr "顯示時間為"
+# mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:114
+msgid "_Send mail in HTML format by default."
+msgstr "預設使用 HTML 格式傳送郵件(_S)"
 
-# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:182
+# mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:115
 #, fuzzy
-msgid "_Signatures"
-msgstr "_HTML 簽名檔："
+msgid "_Server Type: "
+msgstr "伺服器類別："
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:183
-#, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML 簽名檔："
-
-# mail/mail-config.glade.h:79
-#: mail/mail-config.glade.h:184
-#, fuzzy
-msgid "_Use secure connection (SSL):"
-msgstr "使用安全連結 (_SSL)"
+#: mail/mail-config.glade.h:116
+msgid "_Signature file:"
+msgstr "簽名檔(_S)："
 
-# mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:185
-#, fuzzy
-msgid "_Variable-width:"
-msgstr "變數"
+# mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:117
+msgid "_Username:"
+msgstr "使用者名稱(_U)："
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "_every"
 msgstr "每"
 
-# mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:187
-#, fuzzy
-msgid "color"
-msgstr " 色彩"
-
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:119
 msgid "description"
 msgstr "描述"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr "新聞視窗 1"
 
+#: mail/mail-config.glade.h:122
+msgid "placeholder"
+msgstr "空間管理員"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+# mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:123
+msgid "seconds."
+msgstr "秒"
+
 # mail/mail-crypto.c:59
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
@@ -14211,174 +11525,181 @@ msgid "Could not create a S/MIME decode context."
 msgstr "無法建立一個 S/MIME 解密文本。"
 
 # mail/mail-display.c:196
-#: mail/mail-display.c:279
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "儲存附加檔案"
 
-# mail/mail-tools.c:145
-#: mail/mail-display.c:344
-#, fuzzy, c-format
-msgid "Could not create temporary file '%s': %s"
-msgstr "無法建立暫存 mbox `%s'：%s"
-
 # mail/mail-display.c:297
-#: mail/mail-display.c:390
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "儲存至磁碟..."
 
 # mail/mail-display.c:301
-#: mail/mail-display.c:391
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "檢視 Inline"
 
 # mail/mail-display.c:299
-#: mail/mail-display.c:392
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
 
 # mail/mail-display.c:359
-#: mail/mail-display.c:452
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "檢視 Inline (透過 %s)"
 
 # mail/mail-display.c:363
-#: mail/mail-display.c:456
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "隱藏"
 
 # mail/mail-display.c:336
-#: mail/mail-display.c:477
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "外部檢視器"
 
 # mail/mail-display.c:962
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1133
 msgid "Loading message content"
 msgstr "正在載入郵件內文"
 
 # mail/mail-display.c:1256
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1592
 msgid "Open Link in Browser"
 msgstr "在瀏覽器內開啟連結"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1594
 msgid "Copy Link Location"
 msgstr "複製連結位址"
 
 # ui/evolution-message-composer.xml.h:21
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1597
 msgid "Save Link as (FIXME)"
 msgstr "另存目標(FIXME)"
 
 # mail/mail-callbacks.c:1188
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1600
 msgid "Save Image as..."
 msgstr "另存圖片..."
 
 # mail/mail-format.c:527
-#: mail/mail-format.c:601
+#: mail/mail-format.c:635
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附加檔案"
 
 # mail/mail-format.c:573
-#: mail/mail-format.c:647
+#: mail/mail-format.c:680
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "不能解析 MIME 格式的郵件。只好顯示原始檔。"
 
 # mail/mail-format.c:640
 # mail/message-list.c:1082
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:763
 msgid "Date"
 msgstr "日期"
 
 # mail/mail-config.glade.h:29
-#: mail/mail-format.c:822
+#: mail/mail-format.c:846
 msgid "Bad Address"
 msgstr "不正確的電郵地址"
 
 # mail/mail-format.c:756
 # mail/message-list.c:1082
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "寄件者"
 
 # mail/mail-format.c:759
-#: mail/mail-format.c:869
+#: mail/mail-format.c:889
 msgid "Reply-To"
 msgstr "回覆"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:893 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "收件者"
 
 # mail/mail-format.c:765
-#: mail/mail-format.c:879
+#: mail/mail-format.c:897
 msgid "Cc"
 msgstr "副本"
 
 # composer/e-msg-composer-hdrs.c:394
-#: mail/mail-format.c:884
+#: mail/mail-format.c:901
 #, fuzzy
 msgid "Bcc"
 msgstr "密件副本："
 
-# addressbook/backend/ebook/e-card.c:3428
-#: mail/mail-format.c:915
+# mail/mail-format.c:1153
+#: mail/mail-format.c:1812
 #, fuzzy
-msgid "Mailer"
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "這封是加入了數位簽名的郵件，已証實無訛"
+
+#: mail/mail-format.c:1835
+msgid "Evolution does not recognize this type of signed message."
 msgstr ""
-"\n"
-"寄件者: "
+
+# mail/mail-format.c:1153
+#: mail/mail-format.c:1843
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "這封是加入了數位簽名的郵件，已証實無訛"
+
+# mail/mail-format.c:1161
+#: mail/mail-format.c:1851
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
 
 # mail/mail-format.c:1787
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:2067
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
 # mail/mail-format.c:1799
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2081
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 \"%s\" 有效的指示"
 
 # mail/mail-format.c:1803
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2086
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2115
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
 # mail/mail-format.c:1837
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2123
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (\"%s\" 類型)"
 
 # mail/mail-format.c:1842
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2128
 msgid "Malformed external-body part."
 msgstr "變形的外加本文部分。"
 
 # mail/mail-local.c:812
-#: mail/mail-local.c:625
+#: mail/mail-local.c:626
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-local.c:922
-#: mail/mail-local.c:706
+#: mail/mail-local.c:707
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -14388,14 +11709,14 @@ msgstr ""
 "再也無法開啟這個資料夾： %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: mail/mail-local.c:762
+#: mail/mail-local.c:763
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "無法建立資料夾鎖定 %s ： %s"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-local.c:814
+#: mail/mail-local.c:815
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -14403,18 +11724,18 @@ msgstr ""
 "%s"
 
 # mail/mail-local.c:785
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1281
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "將資料夾 \"%s\" 格式變更為 \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1296
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
 # mail/mail-local.c:961
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1318
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -14423,12 +11744,12 @@ msgstr ""
 "您可能需要手動修復它。"
 
 # camel/camel-vtrash-folder.c:109
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1407
 msgid "You cannot change the format of a non-local folder."
 msgstr "您不能變更非本地端資料夾的格式。"
 
 # executive-summary/component/e-summary-url.c:80
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1416
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "重新設定 %s"
@@ -14461,138 +11782,149 @@ msgid "Working"
 msgstr "正在工作"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "過濾資料夾"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:249
 msgid "Fetching Mail"
 msgstr "接收郵件"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:492 mail/mail-ops.c:521
 msgid "However, the message was successfully sent."
 msgstr ""
 
 # mail/mail-ops.c:599
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:557
 #, c-format
 msgid "Sending \"%s\""
 msgstr "傳送 \"%s\""
 
 # mail/mail-ops.c:718
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:677
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送 %2$d 封郵件中的第 %1$d 封"
 
 # mail/mail-ops.c:737
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:696
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "在處理 %2$d 封郵件中的第 %1$d 封時失敗"
 
 # mail/mail-ops.c:739
 # mail/mail-send-recv.c:475
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "完成。"
 
 # mail/mail-ops.c:825
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:791
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Moving messages to %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:871
 #, c-format
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
 # mail/mail-ops.c:914
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:898
 msgid "Moving"
 msgstr "移動"
 
 # mail/mail-ops.c:917
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:901
 msgid "Copying"
 msgstr "複製"
 
 # mail/mail-ops.c:992
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1011
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描 \"%s\" 內的資料夾"
 
+# camel/camel-store.c:378
+# mail/mail-ops.c:1007
+# mail/mail-ops.c:1014
+# mail/mail-ops.c:1032
+# mail/mail-ops.c:1033
+#. Fill in the new fields
+#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
+#, fuzzy
+msgid "Trash"
+msgstr "土耳其文"
+
 # mail/mail-ops.c:1154
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1194
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1237
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:1262
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1378
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1472
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "建立資料夾 %s"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-ops.c:1449
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1559
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
 # mail/mail-ops.c:1498
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1675
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "取回郵件 %d 封郵件"
 
 # mail/mail-ops.c:1649
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1761
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "儲存郵件 %d 封郵件"
 
 # mail/mail-ops.c:1728
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1873
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14602,7 +11934,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1901
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14612,12 +11944,12 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1829
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1975
 msgid "Saving attachment"
 msgstr "儲存附件"
 
 # mail/mail-ops.c:1844
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:1991
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14627,30 +11959,25 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1872
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2022
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2091
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2092
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "中斷與 %s 的連線"
 
-#: mail/mail-ops.c:2237
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
 # mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "尋找(_S)"
 
@@ -14700,56 +12027,56 @@ msgid "Cancelling..."
 msgstr "正在取消..."
 
 # mail/mail-config.glade.h:72
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "伺服器類別："
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:40
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "類型："
 
 # mail/mail-send-recv.c:233
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:286
 msgid "Send & Receive Mail"
 msgstr "傳送與接收郵件"
 
 # ui/evolution-mail.xml.h:2
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "取消"
 
 # mail/mail-send-recv.c:285
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "正在更新..."
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "正在等待..."
 
 # mail/mail-send-recv.c:471
-#: mail/mail-send-recv.c:534
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "已取消。"
 
 # mail/mail-session.c:161
-#: mail/mail-session.c:222
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr "使用者取消動作。"
 
 # camel/camel-smime-context.c:194
-#: mail/mail-session.c:321
+#: mail/mail-session.c:310
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所須的密碼"
@@ -14760,52 +12087,24 @@ msgstr "請輸入 %s 所須的密碼"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: mail/mail-session.c:324
+#: mail/mail-session.c:313
 #, fuzzy
 msgid "Enter Password"
 msgstr "密碼"
 
-# mail/mail-crypto.c:59
-#: mail/mail-signature-editor.c:79
-#, fuzzy, c-format
-msgid "Could not save signature file: %s"
-msgstr "無法建立一個 PGP 簽名文本。"
-
-# mail/mail-config.glade.h:74
-#: mail/mail-signature-editor.c:172
-msgid "Save signature"
-msgstr "儲存簽名檔"
-
-# composer/e-msg-composer.c:941
-#: mail/mail-signature-editor.c:178
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"這個簽名檔已變更但仍未儲存。\n"
-"\n"
-"您是否要儲存變更？"
-
-# mail/mail-config.glade.h:74
-#: mail/mail-signature-editor.c:357
-#, fuzzy
-msgid "Signature name:"
-msgstr "簽名檔："
-
 # mail/mail-tools.c:219
-#: mail/mail-tools.c:257
+#: mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "轉寄的郵件 - %s"
 
 # mail/mail-ops.c:1154
-#: mail/mail-tools.c:261
+#: mail/mail-tools.c:259
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
 # mail/mail-ops.c:1154
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:393
 msgid "Forwarded Message"
 msgstr "轉寄的郵件"
 
@@ -14822,7 +12121,7 @@ msgstr "建立資料夾 %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "掃描 \"%s\" 內的資料夾"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:414
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -14833,198 +12132,126 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:723
 #, fuzzy
-msgid "vFolders"
+msgid "VFolders"
 msgstr "資料夾"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:816
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "編輯虛擬資料夾"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:832
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
 # mail/mail-vfolder.c:438
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:886
 msgid "New VFolder"
 msgstr "新增虛擬資料夾"
 
 # views/mail/galview.xml.h:3
-#: mail/message-browser.c:210
+#: mail/message-browser.c:212
 msgid "(No subject)"
 msgstr "(沒有主旨)"
 
 # widgets/misc/e-messagebox.c:180
-#: mail/message-browser.c:212
+#: mail/message-browser.c:214
 #, c-format
 msgid "%s - Message"
 msgstr "%s - 郵件"
 
 # mail/message-list.c:677
-#: mail/message-list.c:672
+#: mail/message-list.c:639
 msgid "Unseen"
 msgstr "未閱讀"
 
 # mail/message-list.c:678
-#: mail/message-list.c:673
+#: mail/message-list.c:640
 msgid "Seen"
 msgstr "已閱讀"
 
 # mail/message-list.c:679
-#: mail/message-list.c:674
+#: mail/message-list.c:641
 msgid "Answered"
 msgstr "已回覆"
 
 # mail/message-list.c:680
-#: mail/message-list.c:675
+#: mail/message-list.c:642
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
 # mail/message-list.c:681
-#: mail/message-list.c:676
+#: mail/message-list.c:643
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
 # mail/message-list.c:685
-#: mail/message-list.c:680
+#: mail/message-list.c:647
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:686
-#: mail/message-list.c:681
+#: mail/message-list.c:648
 msgid "Lower"
 msgstr "低"
 
 # mail/message-list.c:690
-#: mail/message-list.c:685
+#: mail/message-list.c:652
 msgid "Higher"
 msgstr "高"
 
 # mail/message-list.c:691
-#: mail/message-list.c:686
+#: mail/message-list.c:653
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:941
-#: mail/message-list.c:991
+#: mail/message-list.c:903
 msgid "?"
 msgstr "？"
 
 # mail/message-list.c:948
-#: mail/message-list.c:998
+#: mail/message-list.c:910
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:957
-#: mail/message-list.c:1007
+#: mail/message-list.c:919
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:969
-#: mail/message-list.c:1019
+#: mail/message-list.c:931
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:979
-#: mail/message-list.c:1029
+#: mail/message-list.c:941
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # mail/mail-local.c:905
-#: mail/message-list.c:2396
+#: mail/message-list.c:2334
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
-#: mail/message-list.etspec.h:3
-#, fuzzy
-msgid "Due By"
-msgstr "期限"
-
-# calendar/gui/e-meeting-dialog.glade.h:23
-# mail/message-list.c:1081
-#: mail/message-list.etspec.h:4
-#, fuzzy
-msgid "Flag Status"
-msgstr "狀況"
-
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "有標幟的"
 
-#: mail/message-list.etspec.h:6
-msgid "Follow Up Flag"
-msgstr ""
-
 # mail/mail-send-recv.c:236
-#: mail/message-list.etspec.h:8
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "已接收"
 
 # addressbook/printing/e-contact-print.glade.h:36
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "大小"
 
-# addressbook/contact-editor/e-contact-editor.c:1246
-#: mail/message-tag-followup.c:57
-#, fuzzy
-msgid "Call"
-msgstr "回撥電話"
-
-# ui/evolution-calendar.xml.h:10
-#: mail/message-tag-followup.c:58
-#, fuzzy
-msgid "Do Not Forward"
-msgstr "向前"
-
-#: mail/message-tag-followup.c:59
-msgid "Follow-Up"
-msgstr ""
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: mail/message-tag-followup.c:60
-#, fuzzy
-msgid "For Your Information"
-msgstr "來源資訊"
-
-# mail/message-browser.c:194
-# ui/evolution-mail.xml.h:33
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
-msgid "Forward"
-msgstr "轉寄"
-
-#: mail/message-tag-followup.c:62
-msgid "No Response Necessary"
-msgstr ""
-
-# mail/message-browser.c:188
-# ui/evolution-mail.xml.h:70
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
-msgid "Reply"
-msgstr "回覆"
-
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
-msgid "Reply to All"
-msgstr "全部回覆"
-
-# calendar/gui/event-editor-dialog.glade.h:15
-#: mail/message-tag-followup.c:66
-#, fuzzy
-msgid "Review"
-msgstr "預覽"
-
-#: mail/message-tag-followup.c:315
-msgid "Flag to Follow Up"
-msgstr ""
-
 # mail/mail-ops.c:992
 #: mail/subscribe-dialog.c:219
 #, c-format
@@ -15052,7 +12279,7 @@ msgstr "取消訂閱至資料夾 \"%s\""
 # mail/subscribe-dialog.c:76
 # shell/e-storage-set-view.c:48
 #: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
+#: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "資料夾"
 
@@ -15102,11958 +12329,36 @@ msgstr "訂閱(_S)"
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Configuration control for the Evolution Summary."
-msgstr "資料夾包含 Evolution 摘要"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Evolution Summary component."
-msgstr "Evolution 郵件編輯器。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
-#, fuzzy
-msgid "Factory for Evolution Summary's configuration control."
-msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:8
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
-#, fuzzy
-msgid "Factory for the Evolution Summary component."
-msgstr "用作生產 Evolution 郵件摘要元件的元件工廠。"
-
-# calendar/gui/gnome-cal.c:234
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
-#, fuzzy
-msgid "Summary Preferences"
-msgstr "摘要設定"
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
-msgid "This page can be used to customize the appearance of the Summary page."
-msgstr ""
-
-# calendar/gui/e-calendar-table.c:162
-#: my-evolution/Locations.h:1
-#, fuzzy
-msgid "Aarhus"
-msgstr "提醒"
-
-#: my-evolution/Locations.h:2
-#, fuzzy
-msgid "Abakan"
-msgstr "亞賽拜然"
-
-#: my-evolution/Locations.h:3
-msgid "Abbotsford"
-msgstr ""
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
-#: my-evolution/Locations.h:4
-#, fuzzy
-msgid "Aberdeen"
-msgstr "到會者"
-
-#: my-evolution/Locations.h:5
-#, fuzzy
-msgid "Abha"
-msgstr "阿盧巴島"
-
-# addressbook/gui/widgets/e-addressbook-view.c:711
-#: my-evolution/Locations.h:6
-#, fuzzy
-msgid "Abilene"
-msgstr "行動電話"
-
-#: my-evolution/Locations.h:7
-msgid "Abingdon"
-msgstr ""
-
-#: my-evolution/Locations.h:8
-msgid "Abu Dhabi"
-msgstr ""
-
-#: my-evolution/Locations.h:9
-msgid "Abu Dhabi - Bateen"
-msgstr ""
-
-#: my-evolution/Locations.h:10
-msgid "Acajutla"
-msgstr ""
-
-#: my-evolution/Locations.h:11
-msgid "Acapulco"
-msgstr ""
-
-#: my-evolution/Locations.h:12
-#, fuzzy
-msgid "Acarigua"
-msgstr "尼加拉瓜"
-
-#: my-evolution/Locations.h:13
-msgid "Adak"
-msgstr ""
-
-#: my-evolution/Locations.h:14
-#, fuzzy
-msgid "Adana"
-msgstr "阿爾巴尼亞"
-
-#: my-evolution/Locations.h:15
-msgid "Adana/Incirlik"
-msgstr ""
-
-#: my-evolution/Locations.h:16
-msgid "Adelaide"
-msgstr ""
-
-# mail/message-list.c:678
-#: my-evolution/Locations.h:17
-#, fuzzy
-msgid "Aden"
-msgstr "瑞典"
-
-#: my-evolution/Locations.h:18
-#, fuzzy
-msgid "Adrar"
-msgstr "安道爾"
-
-#: my-evolution/Locations.h:19
-msgid "Aeroparque"
-msgstr ""
-
-#: my-evolution/Locations.h:20
-msgid "Aeropuerto del Norte"
-msgstr ""
-
-# camel/camel-sasl-anonymous.c:33
-#: my-evolution/Locations.h:21
-#, fuzzy
-msgid "Afonsos"
-msgstr "匿名"
-
-#: my-evolution/Locations.h:22
-#, fuzzy
-msgid "Africa"
-msgstr "南非"
-
-#: my-evolution/Locations.h:23
-msgid "Afyon"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:24
-#: my-evolution/Locations.h:24
-#, fuzzy
-msgid "Agen"
-msgstr "阿根廷"
-
-#: my-evolution/Locations.h:25
-#, fuzzy
-msgid "Aguascaliantes"
-msgstr "澳大利亞"
-
-#: my-evolution/Locations.h:26
-msgid "Ahmadabad"
-msgstr ""
-
-#: my-evolution/Locations.h:27
-msgid "Ahwaz"
-msgstr ""
-
-#: my-evolution/Locations.h:28
-msgid "Ainsworth"
-msgstr ""
-
-#: my-evolution/Locations.h:29
-msgid "Air Force"
-msgstr ""
-
-#: my-evolution/Locations.h:30
-msgid "Ajaccio/Campo dell'Oro"
-msgstr ""
-
-#: my-evolution/Locations.h:31
-msgid "Akeno Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:32
-msgid "Akita Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:33
-msgid "Akron"
-msgstr ""
-
-#: my-evolution/Locations.h:34
-msgid "Akrotiri"
-msgstr ""
-
-#: my-evolution/Locations.h:35
-#, fuzzy
-msgid "Alabama"
-msgstr "阿爾巴尼亞"
-
-#: my-evolution/Locations.h:36
-msgid "Al Ahsa"
-msgstr ""
-
-#: my-evolution/Locations.h:37
-msgid "Al Ain"
-msgstr ""
-
-#: my-evolution/Locations.h:38
-msgid "Alamogordo"
-msgstr ""
-
-# calendar/gui/e-calendar-table.c:162
-#: my-evolution/Locations.h:39
-#, fuzzy
-msgid "Alamosa"
-msgstr "提醒"
-
-# calendar/gui/e-calendar-table.c:162
-#: my-evolution/Locations.h:40
-#, fuzzy
-msgid "Alaska"
-msgstr "提醒"
-
-#: my-evolution/Locations.h:41
-msgid "Al Baha"
-msgstr ""
-
-#: my-evolution/Locations.h:43
-#, fuzzy
-msgid "Albany"
-msgstr "阿爾巴尼亞"
-
-#: my-evolution/Locations.h:44
-#, fuzzy
-msgid "Albenga"
-msgstr "阿爾巴尼亞"
-
-#: my-evolution/Locations.h:45
-#, fuzzy
-msgid "Alberta"
-msgstr "阿爾及利亞"
-
-#: my-evolution/Locations.h:46
-msgid "Alborg"
-msgstr ""
-
-#: my-evolution/Locations.h:47
-msgid "Albuquerque"
-msgstr ""
-
-# shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#: my-evolution/Locations.h:48
-#, fuzzy
-msgid "Alderney"
-msgstr "資料夾名稱："
-
-#: my-evolution/Locations.h:49
-msgid "Alesund"
-msgstr ""
-
-#: my-evolution/Locations.h:50
-#, fuzzy
-msgid "Alexandria"
-msgstr "阿爾巴尼亞"
-
-#: my-evolution/Locations.h:51
-msgid "Alexandria-Esler"
-msgstr ""
-
-#: my-evolution/Locations.h:52
-msgid "Alexandria/Nouzha"
-msgstr ""
-
-#: my-evolution/Locations.h:53
-msgid "Alexandroupolis"
-msgstr ""
-
-#: my-evolution/Locations.h:55
-#, fuzzy
-msgid "Alghero"
-msgstr "阿爾及利亞"
-
-#: my-evolution/Locations.h:56
-#, fuzzy
-msgid "Algona"
-msgstr "安哥拉"
-
-#: my-evolution/Locations.h:57
-msgid "Alicante"
-msgstr ""
-
-#: my-evolution/Locations.h:58
-msgid "Alice"
-msgstr ""
-
-#: my-evolution/Locations.h:59
-msgid "Alice Springs"
-msgstr ""
-
-#: my-evolution/Locations.h:60
-msgid "Al-Jouf"
-msgstr ""
-
-#: my-evolution/Locations.h:61
-msgid "Allentown"
-msgstr ""
-
-# widgets/misc/e-filter-bar.h:97
-# widgets/misc/e-filter-bar.h:104
-#: my-evolution/Locations.h:62
-#, fuzzy
-msgid "Alliance"
-msgstr "進階"
-
-#: my-evolution/Locations.h:63
-#, fuzzy
-msgid "Alma"
-msgstr "安哥拉"
-
-#: my-evolution/Locations.h:64
-#, fuzzy
-msgid "Almeria"
-msgstr "阿爾及利亞"
-
-#: my-evolution/Locations.h:65
-#, fuzzy
-msgid "Alpena"
-msgstr "阿爾巴尼亞"
-
-#: my-evolution/Locations.h:66
-msgid "Al Qaysumah"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:67
-#, fuzzy
-msgid "Alta"
-msgstr "馬爾他"
-
-#: my-evolution/Locations.h:68
-#, fuzzy
-msgid "Altamira"
-msgstr "阿爾巴尼亞"
-
-# ui/evolution.xml.h:41
-#: my-evolution/Locations.h:69
-#, fuzzy
-msgid "Alton"
-msgstr "執行(_A)"
-
-#: my-evolution/Locations.h:70
-msgid "Altoona"
-msgstr ""
-
-# calendar/gui/e-calendar-table.c:162
-#: my-evolution/Locations.h:71
-#, fuzzy
-msgid "Alturas"
-msgstr "提醒"
-
-#: my-evolution/Locations.h:72
-msgid "Altus"
-msgstr ""
-
-#: my-evolution/Locations.h:73
-msgid "Amami Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:74
-msgid "Amapala"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:701
-#: my-evolution/Locations.h:75
-#, fuzzy
-msgid "Amarillo"
-msgstr "電子郵件"
-
-#: my-evolution/Locations.h:76
-msgid "Amasya"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:12
-#: my-evolution/Locations.h:77
-#, fuzzy
-msgid "Ambler"
-msgstr "會員"
-
-#: my-evolution/Locations.h:78
-#, fuzzy
-msgid "Amelia"
-msgstr "亞美尼亞"
-
-#: my-evolution/Locations.h:79
-#, fuzzy
-msgid "Amendola"
-msgstr "安哥拉"
-
-# importers/netscape-importer.c:795
-# mail/mail-callbacks.c:1359
-#: my-evolution/Locations.h:80
-#, fuzzy
-msgid "Ames"
-msgstr "哩"
-
-#: my-evolution/Locations.h:81
-msgid "Amritsar"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:2
-#: my-evolution/Locations.h:82
-#, fuzzy
-msgid "Amsterdam"
-msgstr "奧地利"
-
-#: my-evolution/Locations.h:83
-#, fuzzy
-msgid "Anadyr"
-msgstr "安道爾"
-
-#: my-evolution/Locations.h:84
-msgid "Anaktuvuk"
-msgstr ""
-
-#: my-evolution/Locations.h:85
-#, fuzzy
-msgid "Anapa"
-msgstr "日本"
-
-#: my-evolution/Locations.h:86
-#, fuzzy
-msgid "Anchorage"
-msgstr "安道爾"
-
-#: my-evolution/Locations.h:87
-msgid "Anchorage - Elmendorf AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:88
-#, fuzzy
-msgid "Ancona"
-msgstr "安哥拉"
-
-#: my-evolution/Locations.h:89
-msgid "Andahuayla"
-msgstr ""
-
-#: my-evolution/Locations.h:90
-#, fuzzy
-msgid "Anderson"
-msgstr "雷暴"
-
-#: my-evolution/Locations.h:91
-#, fuzzy
-msgid "Andoya"
-msgstr "安道爾"
-
-#: my-evolution/Locations.h:92
-#, fuzzy
-msgid "Andravida"
-msgstr "個人"
-
-#: my-evolution/Locations.h:93
-msgid "Andrews AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:94
-msgid "Angleton"
-msgstr ""
-
-#: my-evolution/Locations.h:95
-#, fuzzy
-msgid "Aniak"
-msgstr "阿爾巴尼亞"
-
-#: my-evolution/Locations.h:96
-msgid "Ankara/Esenboga"
-msgstr ""
-
-#: my-evolution/Locations.h:97
-msgid "Ankara/Etimesgut"
-msgstr ""
-
-#: my-evolution/Locations.h:98
-msgid "Annaba"
-msgstr ""
-
-#: my-evolution/Locations.h:99
-msgid "Ann Arbor"
-msgstr ""
-
-#: my-evolution/Locations.h:100
-msgid "Annette"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1242
-# addressbook/gui/widgets/e-addressbook-view.c:733
-#: my-evolution/Locations.h:101
-#, fuzzy
-msgid "Anniston"
-msgstr "阿富汗"
-
-#: my-evolution/Locations.h:102
-#, fuzzy
-msgid "Antalya"
-msgstr "義大利"
-
-# shell/e-shell-importer.c:490
-#: my-evolution/Locations.h:103
-#, fuzzy
-msgid "Antartica"
-msgstr "南極洲"
-
-#: my-evolution/Locations.h:104
-#, fuzzy
-msgid "Antigo"
-msgstr "安哥拉"
-
-#: my-evolution/Locations.h:105
-#, fuzzy
-msgid "Antigua"
-msgstr "安圭拉島"
-
-#: my-evolution/Locations.h:106
-#, fuzzy
-msgid "Antigua and Barbuda"
-msgstr "安地卡及巴布達"
-
-# addressbook/contact-editor/e-contact-editor.c:1242
-# addressbook/gui/widgets/e-addressbook-view.c:733
-#: my-evolution/Locations.h:107
-#, fuzzy
-msgid "Antofagasta"
-msgstr "阿富汗"
-
-#: my-evolution/Locations.h:108
-msgid "Antwerpen/Deurne"
-msgstr ""
-
-#: my-evolution/Locations.h:109
-msgid "Aomori Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:110
-#, fuzzy
-msgid "Apalachicola"
-msgstr "空間管理員"
-
-#: my-evolution/Locations.h:111
-msgid "Appleton"
-msgstr ""
-
-#: my-evolution/Locations.h:112
-#, fuzzy
-msgid "Aquadilla"
-msgstr "安圭拉島"
-
-# calendar/gui/goto-dialog.glade.h:10
-#: my-evolution/Locations.h:113
-#, fuzzy
-msgid "Aracaju"
-msgstr "澳門"
-
-#: my-evolution/Locations.h:114
-#, fuzzy
-msgid "Arad"
-msgstr "阿盧巴島"
-
-#: my-evolution/Locations.h:115
-#, fuzzy
-msgid "Arar"
-msgstr "阿盧巴島"
-
-# mail/message-list.c:685
-#: my-evolution/Locations.h:116
-#, fuzzy
-msgid "Araxos"
-msgstr "寮國"
-
-# shell/e-shell-importer.c:490
-#: my-evolution/Locations.h:117
-#, fuzzy
-msgid "Arcata"
-msgstr "南極洲"
-
-#: my-evolution/Locations.h:118
-msgid "Ardmore"
-msgstr ""
-
-#: my-evolution/Locations.h:119
-#, fuzzy
-msgid "Arequipa"
-msgstr "亞美尼亞"
-
-#: my-evolution/Locations.h:121
-#, fuzzy
-msgid "Arica"
-msgstr "阿爾及利亞"
-
-# addressbook/printing/e-contact-print.glade.h:24
-#: my-evolution/Locations.h:122
-#, fuzzy
-msgid "Arizona"
-msgstr "阿根廷"
-
-#: my-evolution/Locations.h:123
-msgid "Arkansas"
-msgstr ""
-
-#: my-evolution/Locations.h:124
-msgid "Arkhangelsk"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:24
-#: my-evolution/Locations.h:125
-#, fuzzy
-msgid "Arlington"
-msgstr "紙張方向"
-
-# addressbook/printing/e-contact-print.glade.h:24
-#: my-evolution/Locations.h:126
-#, fuzzy
-msgid "Artigas"
-msgstr "阿根廷"
-
-#: my-evolution/Locations.h:127
-msgid "Asahikawa Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:128
-msgid "Asahikawa Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:129
-msgid "Ashburnam"
-msgstr ""
-
-#: my-evolution/Locations.h:130
-msgid "Asheville"
-msgstr ""
-
-# calendar/gui/calendar-model.c:1578
-#: my-evolution/Locations.h:131
-#, fuzzy
-msgid "Ashfield"
-msgstr "已指定"
-
-#: my-evolution/Locations.h:132
-msgid "Ashiya Ab"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:133
-#, fuzzy
-msgid "Ashland"
-msgstr "泰國"
-
-# calendar/gui/goto-dialog.glade.h:2
-#: my-evolution/Locations.h:134
-#, fuzzy
-msgid "Asia"
-msgstr "奧地利"
-
-# calendar/gui/e-day-view.c:3162
-# calendar/gui/e-week-view.c:3292
-# ui/evolution-calendar.xml.h:19
-# ui/evolution-message-composer.xml.h:11
-#: my-evolution/Locations.h:135
-#, fuzzy
-msgid "Aspen"
-msgstr "開啟"
-
-# addressbook/contact-editor/e-contact-editor.c:1242
-# addressbook/gui/widgets/e-addressbook-view.c:733
-#: my-evolution/Locations.h:136
-#, fuzzy
-msgid "Asswan"
-msgstr "助理"
-
-# calendar/gui/goto-dialog.glade.h:2
-#: my-evolution/Locations.h:137
-#, fuzzy
-msgid "Astoria"
-msgstr "奧地利"
-
-#: my-evolution/Locations.h:138
-#, fuzzy
-msgid "Astrakhan"
-msgstr "澳大利亞"
-
-# calendar/gui/goto-dialog.glade.h:2
-#: my-evolution/Locations.h:139
-#, fuzzy
-msgid "Asturias"
-msgstr "奧地利"
-
-# addressbook/printing/e-contact-print.glade.h:34
-#: my-evolution/Locations.h:140
-#, fuzzy
-msgid "Asuncion"
-msgstr "留尼旺"
-
-#: my-evolution/Locations.h:141
-#, fuzzy
-msgid "Athens"
-msgstr "附加檔案"
-
-#: my-evolution/Locations.h:142
-#, fuzzy
-msgid "Athinai"
-msgstr "中國"
-
-#: my-evolution/Locations.h:143
-#, fuzzy
-msgid "Atlanta"
-msgstr "阿爾巴尼亞"
-
-# shell/e-shell-importer.c:490
-#: my-evolution/Locations.h:144
-#, fuzzy
-msgid "Atlantic"
-msgstr "自動"
-
-#: my-evolution/Locations.h:145
-msgid "Atlantic City"
-msgstr ""
-
-#: my-evolution/Locations.h:146
-msgid "Atsugi US NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:147
-msgid "Auburn"
-msgstr ""
-
-#: my-evolution/Locations.h:148
-#, fuzzy
-msgid "Auckland"
-msgstr "冰島"
-
-#: my-evolution/Locations.h:149
-msgid "Augsburg"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:2
-#: my-evolution/Locations.h:150
-#, fuzzy
-msgid "Augusta"
-msgstr "8月"
-
-#: my-evolution/Locations.h:151
-#, fuzzy
-msgid "Aurora"
-msgstr "安道爾"
-
-# calendar/gui/goto-dialog.glade.h:2
-#: my-evolution/Locations.h:152
-#, fuzzy
-msgid "Austin"
-msgstr "奧地利"
-
-#: my-evolution/Locations.h:153
-#, fuzzy
-msgid "Australasia"
-msgstr "澳大利亞"
-
-#: my-evolution/Locations.h:156
-msgid "Avalon"
-msgstr ""
-
-#: my-evolution/Locations.h:157
-msgid "Aviano"
-msgstr ""
-
-#: my-evolution/Locations.h:158
-msgid "Ayacucho"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:177
-#: my-evolution/Locations.h:159
-#, fuzzy
-msgid "Bage"
-msgstr "基礎項目"
-
-#: my-evolution/Locations.h:160
-msgid "Bagotville"
-msgstr ""
-
-#: my-evolution/Locations.h:162
-msgid "Bahia Blanca"
-msgstr ""
-
-#: my-evolution/Locations.h:163
-msgid "Bahias de Huatulco"
-msgstr ""
-
-#: my-evolution/Locations.h:165
-msgid "Baker City"
-msgstr ""
-
-#: my-evolution/Locations.h:166
-msgid "Bakersfield"
-msgstr ""
-
-#: my-evolution/Locations.h:167
-msgid "Bale-Mulhouse"
-msgstr ""
-
-#: my-evolution/Locations.h:168
-msgid "Balikesir"
-msgstr ""
-
-#: my-evolution/Locations.h:169
-msgid "Balikesir/Bandirma"
-msgstr ""
-
-# addressbook/gui/component/addressbook.c:620
-#: my-evolution/Locations.h:170
-#, fuzzy
-msgid "Ball Mountain"
-msgstr "電郵地址包含"
-
-#: my-evolution/Locations.h:171
-#, fuzzy
-msgid "Baltimore"
-msgstr "波羅的海文"
-
-#: my-evolution/Locations.h:172
-msgid "Baltimore-Glen Burnie"
-msgstr ""
-
-#: my-evolution/Locations.h:173
-#, fuzzy
-msgid "Banak"
-msgstr "波札那"
-
-#: my-evolution/Locations.h:174
-#, fuzzy
-msgid "Bandarabbass"
-msgstr "巴貝多"
-
-#: my-evolution/Locations.h:175
-#, fuzzy
-msgid "Bangor"
-msgstr "前"
-
-#: my-evolution/Locations.h:176
-#, fuzzy
-msgid "Baracoa"
-msgstr "巴貝多"
-
-#: my-evolution/Locations.h:177
-msgid "Barbers Point"
-msgstr ""
-
-#: my-evolution/Locations.h:178
-#, fuzzy
-msgid "Barcelona"
-msgstr "馬其頓"
-
-#: my-evolution/Locations.h:179
-#, fuzzy
-msgid "Bardufoss"
-msgstr "巴貝多"
-
-#: my-evolution/Locations.h:180
-msgid "Bar Harbor"
-msgstr ""
-
-#: my-evolution/Locations.h:181
-#, fuzzy
-msgid "Bari"
-msgstr "巴林"
-
-#: my-evolution/Locations.h:182
-msgid "Bariloche"
-msgstr ""
-
-#: my-evolution/Locations.h:183
-#, fuzzy
-msgid "Barinas"
-msgstr "巴林"
-
-#: my-evolution/Locations.h:184
-#, fuzzy
-msgid "Barking Sand"
-msgstr "吹沙塵"
-
-# addressbook/gui/component/addressbook-config.c:177
-#: my-evolution/Locations.h:185
-#, fuzzy
-msgid "Barksdale"
-msgstr "基礎項目"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:186
-#, fuzzy
-msgid "Barnaul"
-msgstr "巴西"
-
-#: my-evolution/Locations.h:187
-msgid "Barquisimeto"
-msgstr ""
-
-#: my-evolution/Locations.h:188
-msgid "Barranquilla/Ernestocortissoz"
-msgstr ""
-
-#: my-evolution/Locations.h:189
-msgid "Barrow"
-msgstr ""
-
-#: my-evolution/Locations.h:190
-#, fuzzy
-msgid "Barter Island"
-msgstr "法羅群島"
-
-#: my-evolution/Locations.h:191
-msgid "Bartlesville"
-msgstr ""
-
-#: my-evolution/Locations.h:192
-msgid "Bartow"
-msgstr ""
-
-#: my-evolution/Locations.h:193
-#, fuzzy
-msgid "Bastia"
-msgstr "基本"
-
-#: my-evolution/Locations.h:194
-msgid "Batesville"
-msgstr ""
-
-#: my-evolution/Locations.h:195
-#, fuzzy
-msgid "Batman"
-msgstr "不丹"
-
-#: my-evolution/Locations.h:196
-msgid "Baton Rouge"
-msgstr ""
-
-#: my-evolution/Locations.h:197
-msgid "Battle Creek"
-msgstr ""
-
-# addressbook/gui/component/addressbook.c:619
-#: my-evolution/Locations.h:198
-#, fuzzy
-msgid "Battle Mountain"
-msgstr "姓名包含"
-
-#: my-evolution/Locations.h:199
-#, fuzzy
-msgid "Bauru"
-msgstr "諾魯"
-
-#: my-evolution/Locations.h:200
-#, fuzzy
-msgid "Bayamo"
-msgstr "巴哈馬"
-
-#: my-evolution/Locations.h:201
-msgid "Bayreuth"
-msgstr ""
-
-#: my-evolution/Locations.h:202
-#, fuzzy
-msgid "Beatrice"
-msgstr "波羅的海文"
-
-#: my-evolution/Locations.h:203
-msgid "Beaufort"
-msgstr ""
-
-#: my-evolution/Locations.h:204
-#, fuzzy
-msgid "Beaumont"
-msgstr "月"
-
-#: my-evolution/Locations.h:205
-msgid "Beaumont-Port Arthur"
-msgstr ""
-
-#: my-evolution/Locations.h:206
-msgid "Beauvais-Tille"
-msgstr ""
-
-#: my-evolution/Locations.h:207
-#, fuzzy
-msgid "Beauvechain"
-msgstr "巴林"
-
-# addressbook/printing/e-contact-print.glade.h:36
-#: my-evolution/Locations.h:208
-#, fuzzy
-msgid "Beckley"
-msgstr "貝里斯"
-
-# calendar/gui/event-editor-dialog.glade.h:34
-#: my-evolution/Locations.h:209
-#, fuzzy
-msgid "Bedford"
-msgstr "之前"
-
-# mail/mail-send-recv.c:306
-#: my-evolution/Locations.h:210
-#, fuzzy
-msgid "Beijing"
-msgstr "貝南"
-
-#: my-evolution/Locations.h:211
-#, fuzzy
-msgid "Beirut"
-msgstr "白俄羅斯"
-
-#: my-evolution/Locations.h:212
-msgid "Beja"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:36
-#: my-evolution/Locations.h:213
-#, fuzzy
-msgid "Belem"
-msgstr "貝里斯"
-
-#: my-evolution/Locations.h:214
-msgid "Belfast/Aldergrove"
-msgstr ""
-
-#: my-evolution/Locations.h:215
-msgid "Belfast/Harbour"
-msgstr ""
-
-#: my-evolution/Locations.h:217
-msgid "Belgorod"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:36
-#: my-evolution/Locations.h:219
-#, fuzzy
-msgid "Belleville"
-msgstr "貝里斯"
-
-#: my-evolution/Locations.h:220
-#, fuzzy
-msgid "Bellingham"
-msgstr "吹雹"
-
-#: my-evolution/Locations.h:221
-msgid "Belmar-Farmingdale"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:36
-#: my-evolution/Locations.h:222
-#, fuzzy
-msgid "Belo Horizonte"
-msgstr "貝里斯"
-
-#: my-evolution/Locations.h:223
-msgid "Belo Horizonte Apt"
-msgstr ""
-
-#: my-evolution/Locations.h:224
-msgid "Bemidji"
-msgstr ""
-
-#: my-evolution/Locations.h:225
-#, fuzzy
-msgid "Benbecula"
-msgstr "委內瑞拉"
-
-# mail/mail-send-recv.c:306
-#: my-evolution/Locations.h:226
-#, fuzzy
-msgid "Benina"
-msgstr "貝南"
-
-#: my-evolution/Locations.h:227
-msgid "Benton Harbor"
-msgstr ""
-
-#: my-evolution/Locations.h:228
-msgid "Bentonville"
-msgstr ""
-
-#: my-evolution/Locations.h:229
-#, fuzzy
-msgid "Beograd"
-msgstr "重新載入"
-
-#: my-evolution/Locations.h:230
-msgid "Bergamo"
-msgstr ""
-
-# mail/message-list.c:678
-#: my-evolution/Locations.h:231
-#, fuzzy
-msgid "Bergen"
-msgstr "已閱讀"
-
-#: my-evolution/Locations.h:232
-msgid "Bergstrom AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:233
-msgid "Berlevag"
-msgstr ""
-
-# mail/mail-send-recv.c:306
-#: my-evolution/Locations.h:234
-#, fuzzy
-msgid "Berlin"
-msgstr "貝南"
-
-#: my-evolution/Locations.h:235
-msgid "Berlin-Tegel"
-msgstr ""
-
-#: my-evolution/Locations.h:236
-msgid "Berlin-Tempelhof"
-msgstr ""
-
-# mail/mail-send-recv.c:306
-#: my-evolution/Locations.h:237
-#, fuzzy
-msgid "Bern"
-msgstr "貝南"
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/Locations.h:238
-#, fuzzy
-msgid "Bethel"
-msgstr "天氣"
-
-#: my-evolution/Locations.h:239
-msgid "Bethlehem Airport"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:36
-#: my-evolution/Locations.h:240
-#, fuzzy
-msgid "Bettles"
-msgstr "貝里斯"
-
-# calendar/gui/event-editor-dialog.glade.h:10
-#: my-evolution/Locations.h:241
-#, fuzzy
-msgid "Beverly"
-msgstr "每"
-
-#: my-evolution/Locations.h:242
-msgid "Biarritz-Bayonne"
-msgstr ""
-
-#: my-evolution/Locations.h:243
-msgid "Bicycle Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:244
-msgid "Biggin Hill"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-# addressbook/gui/widgets/e-addressbook-view.c:614
-# mail/message-browser.c:199
-# ui/evolution-addressbook.xml.h:9
-# ui/evolution-calendar.xml.h:23
-# ui/evolution-mail.xml.h:65
-# ui/evolution-tasks.xml.h:4
-#: my-evolution/Locations.h:245
-#, fuzzy
-msgid "Big Piney"
-msgstr "列印"
-
-#: my-evolution/Locations.h:246
-msgid "Big River Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:247
-msgid "Bilbao"
-msgstr ""
-
-#: my-evolution/Locations.h:248
-#, fuzzy
-msgid "Billings"
-msgstr "郵件列表"
-
-#: my-evolution/Locations.h:249
-msgid "Billund"
-msgstr ""
-
-#: my-evolution/Locations.h:250
-msgid "Binghamton"
-msgstr ""
-
-#: my-evolution/Locations.h:251
-msgid "Birmingham"
-msgstr ""
-
-#: my-evolution/Locations.h:252
-msgid "Bisha"
-msgstr ""
-
-#: my-evolution/Locations.h:253
-msgid "Bishop"
-msgstr ""
-
-#: my-evolution/Locations.h:254
-msgid "Bismark"
-msgstr ""
-
-#: my-evolution/Locations.h:255
-msgid "Blackpool"
-msgstr ""
-
-#: my-evolution/Locations.h:256
-msgid "Blagoveschensk"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:35
-#: my-evolution/Locations.h:257
-#, fuzzy
-msgid "Blanding"
-msgstr "網底"
-
-#: my-evolution/Locations.h:258
-#, fuzzy
-msgid "Block Island"
-msgstr "科克群島"
-
-#: my-evolution/Locations.h:259
-msgid "Bloemfontein J. B. M. Hertzog "
-msgstr ""
-
-#: my-evolution/Locations.h:260
-#, fuzzy
-msgid "Bloomington"
-msgstr "吹沙塵"
-
-#: my-evolution/Locations.h:261
-msgid "Blue Canyon"
-msgstr ""
-
-#: my-evolution/Locations.h:262
-msgid "Bluefield"
-msgstr ""
-
-#: my-evolution/Locations.h:263
-msgid "Bluefields"
-msgstr ""
-
-#: my-evolution/Locations.h:264
-msgid "Blythe"
-msgstr ""
-
-#: my-evolution/Locations.h:265
-msgid "Boa Vista"
-msgstr ""
-
-#: my-evolution/Locations.h:266
-msgid "Bocas del Toro"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:4
-#: my-evolution/Locations.h:267
-#, fuzzy
-msgid "Bodo"
-msgstr "內文"
-
-#: my-evolution/Locations.h:268
-msgid "Bogota/Eldorado"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:177
-#: my-evolution/Locations.h:269
-#, fuzzy
-msgid "Boise"
-msgstr "基礎項目"
-
-#: my-evolution/Locations.h:271
-msgid "Bologna"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:272
-#, fuzzy
-msgid "Bolzano"
-msgstr "波蘭"
-
-#: my-evolution/Locations.h:273
-msgid "Bombay/Santacruz"
-msgstr ""
-
-# calendar/gui/calendar-model.c:896
-# calendar/gui/calendar-model.c:1120
-# calendar/gui/calendar-model.c:1174
-# calendar/gui/e-calendar-table.c:322
-# calendar/gui/e-calendar-table.c:397
-# mail/mail-account-gui.c:976
-# mail/mail-accounts.c:120
-# mail/mail-accounts.c:164
-# mail/mail-config.glade.h:46
-# shell/e-shell-view.c:1198
-# widgets/misc/e-cell-date-edit.c:237
-# widgets/misc/e-dateedit.c:432
-# widgets/misc/e-dateedit.c:1341
-# widgets/misc/e-dateedit.c:1456
-#: my-evolution/Locations.h:274
-#, fuzzy
-msgid "Boone"
-msgstr "無"
-
-#: my-evolution/Locations.h:275
-msgid "Bordeaux"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:38
-#: my-evolution/Locations.h:276
-#, fuzzy
-msgid "Borger"
-msgstr "永遠"
-
-#: my-evolution/Locations.h:277
-msgid "Bornholm"
-msgstr ""
-
-#: my-evolution/Locations.h:278
-msgid "Boscombe Down"
-msgstr ""
-
-#: my-evolution/Locations.h:279
-#, fuzzy
-msgid "Bosnia-Herzegovina"
-msgstr "波士尼亞-赫芝格維納"
-
-#: my-evolution/Locations.h:280
-#, fuzzy
-msgid "Boston"
-msgstr "愛沙尼亞"
-
-# mail/subscribe-dialog.c:76
-# shell/e-storage-set-view.c:48
-#: my-evolution/Locations.h:281
-#, fuzzy
-msgid "Boulmer"
-msgstr "資料夾"
-
-# mail/mail-config.glade.h:75
-#: my-evolution/Locations.h:282
-#, fuzzy
-msgid "Bourges"
-msgstr "來源"
-
-#: my-evolution/Locations.h:283
-msgid "Bournemouth"
-msgstr ""
-
-#: my-evolution/Locations.h:284
-#, fuzzy
-msgid "Bowling Green"
-msgstr "吹沙塵"
-
-#: my-evolution/Locations.h:285
-#, fuzzy
-msgid "Bozeman"
-msgstr "韓文"
-
-#: my-evolution/Locations.h:286
-#, fuzzy
-msgid "Bradford"
-msgstr "巴貝多"
-
-#: my-evolution/Locations.h:287
-msgid "Bradshaw Field"
-msgstr ""
-
-#: my-evolution/Locations.h:288
-#, fuzzy
-msgid "Brainerd"
-msgstr "巴林"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:289
-#, fuzzy
-msgid "Brasilia"
-msgstr "巴西"
-
-#: my-evolution/Locations.h:290
-msgid "Brasschaat"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:291
-#, fuzzy
-msgid "Bratislava"
-msgstr "巴西"
-
-# mail/mail-config.glade.h:26
-#: my-evolution/Locations.h:292
-#, fuzzy
-msgid "Bratsk"
-msgstr "草稿"
-
-#: my-evolution/Locations.h:293
-msgid "Braunschweig"
-msgstr ""
-
-# mail/message-list.c:678
-#: my-evolution/Locations.h:295
-#, fuzzy
-msgid "Bremen"
-msgstr "葉門"
-
-#: my-evolution/Locations.h:296
-msgid "Bremerton"
-msgstr ""
-
-#: my-evolution/Locations.h:297
-#, fuzzy
-msgid "Brest"
-msgstr "測試"
-
-#: my-evolution/Locations.h:298
-msgid "Bridgeport"
-msgstr ""
-
-#: my-evolution/Locations.h:299
-#, fuzzy
-msgid "Brindisi"
-msgstr "浦隆地"
-
-#: my-evolution/Locations.h:300
-msgid "Brisbane"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:301
-#, fuzzy
-msgid "Bristol"
-msgstr "巴西"
-
-#: my-evolution/Locations.h:302
-msgid "British Columbia"
-msgstr ""
-
-#: my-evolution/Locations.h:303
-msgid "Brno"
-msgstr ""
-
-#: my-evolution/Locations.h:304
-#, fuzzy
-msgid "Broadus"
-msgstr "巴貝多"
-
-#: my-evolution/Locations.h:305
-#, fuzzy
-msgid "Broken Bow"
-msgstr "裂雲"
-
-#: my-evolution/Locations.h:306
-msgid "Bronnoysund"
-msgstr ""
-
-# mail/mail-mt.c:516
-# mail/mail-mt.c:545
-# mail/mail-mt.c:880
-#: my-evolution/Locations.h:307
-#, fuzzy
-msgid "Brookings"
-msgstr "正在工作"
-
-#: my-evolution/Locations.h:308
-msgid "Brooksville"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:5
-#: my-evolution/Locations.h:309
-#, fuzzy
-msgid "Broome"
-msgstr "下："
-
-#: my-evolution/Locations.h:310
-msgid "Brownsville"
-msgstr ""
-
-#: my-evolution/Locations.h:311
-#, fuzzy
-msgid "Brunswick"
-msgstr "浦隆地"
-
-#: my-evolution/Locations.h:312
-msgid "Brussels-National Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:313
-msgid "Bryansk"
-msgstr ""
-
-# views/addressbook/galview.xml.h:2
-#: my-evolution/Locations.h:314
-#, fuzzy
-msgid "Bryce Canyon"
-msgstr "依公司"
-
-#: my-evolution/Locations.h:315
-msgid "Bucaramanga/Palonegro"
-msgstr ""
-
-#: my-evolution/Locations.h:316
-msgid "Bucuresti"
-msgstr ""
-
-#: my-evolution/Locations.h:317
-msgid "Bucuresti-Otopeni"
-msgstr ""
-
-#: my-evolution/Locations.h:318
-msgid "Budapest"
-msgstr ""
-
-#: my-evolution/Locations.h:319
-msgid "Buffalo"
-msgstr ""
-
-#: my-evolution/Locations.h:321
-msgid "Bullfrog"
-msgstr ""
-
-#: my-evolution/Locations.h:322
-#, fuzzy
-msgid "Burbank"
-msgstr "不丹"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: my-evolution/Locations.h:323
-#, fuzzy
-msgid "Burgas"
-msgstr "商務電話"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: my-evolution/Locations.h:324
-#, fuzzy
-msgid "Burley"
-msgstr "土耳其"
-
-#: my-evolution/Locations.h:325
-msgid "Burlington"
-msgstr ""
-
-#: my-evolution/Locations.h:326
-#, fuzzy
-msgid "Burnet"
-msgstr "浦隆地"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: my-evolution/Locations.h:327
-#, fuzzy
-msgid "Burns"
-msgstr "商務電話"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: my-evolution/Locations.h:328
-#, fuzzy
-msgid "Bursa"
-msgstr "商務電話"
-
-#: my-evolution/Locations.h:329
-msgid "Burwell"
-msgstr ""
-
-#: my-evolution/Locations.h:330
-msgid "Butte"
-msgstr ""
-
-#: my-evolution/Locations.h:331
-msgid "Caen-Carpiquet"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: my-evolution/Locations.h:332
-#, fuzzy
-msgid "Cagliari"
-msgstr "行事曆"
-
-# addressbook/contact-editor/e-contact-editor.c:1247
-#: my-evolution/Locations.h:333
-#, fuzzy
-msgid "Cairns"
-msgstr "主席"
-
-# addressbook/contact-editor/e-contact-editor.c:1247
-#: my-evolution/Locations.h:334
-#, fuzzy
-msgid "Cairo"
-msgstr "主席"
-
-#: my-evolution/Locations.h:335
-msgid "Calabozo"
-msgstr ""
-
-#: my-evolution/Locations.h:336
-msgid "Calcutta/Dum Dum"
-msgstr ""
-
-#: my-evolution/Locations.h:337
-msgid "Caldwell"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: my-evolution/Locations.h:338
-#, fuzzy
-msgid "Calgary"
-msgstr "行事曆"
-
-#: my-evolution/Locations.h:339
-msgid "Cali/Alfonso Bonillaaragon"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: my-evolution/Locations.h:340
-#, fuzzy
-msgid "Caliente"
-msgstr "行事曆"
-
-# ui/evolution-addressbook.xml.h:7
-#: my-evolution/Locations.h:341
-#, fuzzy
-msgid "California"
-msgstr "新喀里多尼亞島"
-
-#: my-evolution/Locations.h:342
-msgid "Calvi-Ste-Catherine"
-msgstr ""
-
-#: my-evolution/Locations.h:343
-#, fuzzy
-msgid "Camaguey"
-msgstr "巴拉圭"
-
-#: my-evolution/Locations.h:344
-msgid "Camarillo"
-msgstr ""
-
-#: my-evolution/Locations.h:345
-msgid "Cambridge"
-msgstr ""
-
-#: my-evolution/Locations.h:346
-#, fuzzy
-msgid "Cameron"
-msgstr "喀麥隆"
-
-# addressbook/contact-editor/e-contact-editor.c:1247
-#: my-evolution/Locations.h:347
-#, fuzzy
-msgid "Camiri"
-msgstr "主席"
-
-# camel/camel-filter-driver.c:694
-# camel/camel-filter-driver.c:793
-#: my-evolution/Locations.h:348
-#, fuzzy
-msgid "Campeche"
-msgstr "完成"
-
-#: my-evolution/Locations.h:349
-#, fuzzy
-msgid "Campinas"
-msgstr "柬埔寨王國"
-
-# ui/evolution-event-editor.xml.h:13
-# ui/evolution-mail.xml.h:8
-# ui/evolution-task-editor-dialog.xml.h:14
-#: my-evolution/Locations.h:350
-#, fuzzy
-msgid "Campo"
-msgstr "公司電話"
-
-#: my-evolution/Locations.h:351
-#, fuzzy
-msgid "Campo Grande"
-msgstr "維德角島"
-
-#: my-evolution/Locations.h:352
-msgid "Camp Stanley/H-207"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:2
-#: my-evolution/Locations.h:353
-#, fuzzy
-msgid "Canaan"
-msgstr "加拿大"
-
-#: my-evolution/Locations.h:355
-msgid "Canarias/Fuerteventura"
-msgstr ""
-
-#: my-evolution/Locations.h:356
-msgid "Canarias/Gran Canaria"
-msgstr ""
-
-#: my-evolution/Locations.h:357
-msgid "Canarias/Hierro"
-msgstr ""
-
-#: my-evolution/Locations.h:358
-msgid "Canarias/Lanzarote"
-msgstr ""
-
-#: my-evolution/Locations.h:359
-msgid "Canarias/La Palma"
-msgstr ""
-
-#: my-evolution/Locations.h:360
-msgid "Canarias/Tenerife Norte"
-msgstr ""
-
-#: my-evolution/Locations.h:361
-msgid "Canarias/Tenerife Sur"
-msgstr ""
-
-#: my-evolution/Locations.h:362
-msgid "Canberra"
-msgstr ""
-
-# ui/evolution-mail.xml.h:2
-#: my-evolution/Locations.h:363
-#, fuzzy
-msgid "Cancun"
-msgstr "取消"
-
-#: my-evolution/Locations.h:364
-msgid "Cannes-Mandelieu"
-msgstr ""
-
-# ui/evolution-mail.xml.h:2
-#: my-evolution/Locations.h:365
-#, fuzzy
-msgid "Cantwell"
-msgstr "取消"
-
-#: my-evolution/Locations.h:366
-#, fuzzy
-msgid "Cape Girardeau"
-msgstr "維德角島"
-
-#: my-evolution/Locations.h:367
-#, fuzzy
-msgid "Cape Hatteras"
-msgstr "維德角島"
-
-# addressbook/printing/e-contact-print.glade.h:28
-#: my-evolution/Locations.h:368
-#, fuzzy
-msgid "Cape Lisburne"
-msgstr "紙張來源："
-
-#: my-evolution/Locations.h:369
-#, fuzzy
-msgid "Cape Newenham"
-msgstr "維德角島"
-
-#: my-evolution/Locations.h:370
-msgid "Cape Romanzoff"
-msgstr ""
-
-#: my-evolution/Locations.h:371
-msgid "Cape Town D. F. Malan "
-msgstr ""
-
-#: my-evolution/Locations.h:372
-msgid "Capitan Corbeta"
-msgstr ""
-
-#: my-evolution/Locations.h:373
-#, fuzzy
-msgid "Capo Mele"
-msgstr "維德角島"
-
-#: my-evolution/Locations.h:374
-msgid "Caracas La Carlota"
-msgstr ""
-
-#: my-evolution/Locations.h:375
-msgid "Caracas Maiquetia"
-msgstr ""
-
-# ui/evolution-mail.xml.h:2
-#: my-evolution/Locations.h:376
-#, fuzzy
-msgid "Caravelas"
-msgstr "取消工作"
-
-#: my-evolution/Locations.h:377
-#, fuzzy
-msgid "Carbondale"
-msgstr "柬埔寨王國"
-
-# addressbook/gui/widgets/gal-view-factory-minicard.c:26
-#: my-evolution/Locations.h:378
-#, fuzzy
-msgid "Cardiff"
-msgstr "名片檢視模式"
-
-# addressbook/contact-editor/e-contact-editor.c:1247
-#: my-evolution/Locations.h:379
-#, fuzzy
-msgid "Caribou"
-msgstr "汽車電話"
-
-# mail/mail-accounts.c:197
-#: my-evolution/Locations.h:380
-#, fuzzy
-msgid "Carlisle"
-msgstr "變數"
-
-# addressbook/contact-editor/e-contact-editor.c:1246
-#: my-evolution/Locations.h:381
-#, fuzzy
-msgid "Carlsbad"
-msgstr "回撥電話"
-
-# addressbook/contact-editor/e-contact-editor.c:1247
-#: my-evolution/Locations.h:382
-#, fuzzy
-msgid "Carroll"
-msgstr "汽車電話"
-
-#: my-evolution/Locations.h:383
-msgid "Cartagena/Rafael Nunez"
-msgstr ""
-
-#: my-evolution/Locations.h:384
-msgid "Casa Granda"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:18
-#: my-evolution/Locations.h:385
-#, fuzzy
-msgid "Cascade"
-msgstr "橫向"
-
-# addressbook/printing/e-contact-print.glade.h:27
-#: my-evolution/Locations.h:386
-#, fuzzy
-msgid "Casper"
-msgstr "使用紙張"
-
-#: my-evolution/Locations.h:387
-#, fuzzy
-msgid "Catacamas"
-msgstr "巴哈馬"
-
-#: my-evolution/Locations.h:388
-#, fuzzy
-msgid "Catania"
-msgstr "克羅埃西亞"
-
-#: my-evolution/Locations.h:390
-msgid "Cayo Largo del Sur"
-msgstr ""
-
-#: my-evolution/Locations.h:391
-msgid "Cazaux"
-msgstr ""
-
-#: my-evolution/Locations.h:392
-msgid "Cecil NAS"
-msgstr ""
-
-# ui/evolution-event-editor.xml.h:8
-# ui/evolution-task-editor-dialog.xml.h:9
-#: my-evolution/Locations.h:393
-#, fuzzy
-msgid "Cedar City"
-msgstr "晴天"
-
-#: my-evolution/Locations.h:394
-msgid "Cedar Rapids"
-msgstr ""
-
-#: my-evolution/Locations.h:395
-msgid "Central and South America"
-msgstr ""
-
-#: my-evolution/Locations.h:396
-#, fuzzy
-msgid "Cervia"
-msgstr "阿爾及利亞"
-
-#: my-evolution/Locations.h:397
-msgid "Chacarita"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1247
-#: my-evolution/Locations.h:398
-#, fuzzy
-msgid "Chadron"
-msgstr "查德"
-
-# addressbook/contact-editor/e-contact-editor.c:1247
-#: my-evolution/Locations.h:399
-#, fuzzy
-msgid "Challis"
-msgstr "主席"
-
-#: my-evolution/Locations.h:400
-#, fuzzy
-msgid "Chamberlain"
-msgstr "喀麥隆"
-
-#: my-evolution/Locations.h:401
-#, fuzzy
-msgid "Chambery"
-msgstr "喀麥隆"
-
-# addressbook/contact-editor/e-contact-editor.c:1248
-#: my-evolution/Locations.h:402
-#, fuzzy
-msgid "Champaign"
-msgstr "公司電話"
-
-# calendar/gui/e-itip-control.glade.h:4
-#: my-evolution/Locations.h:403
-#, fuzzy
-msgid "Chandalar Lake"
-msgstr "行事曆訊息"
-
-# addressbook/contact-editor/e-contact-editor.c:1247
-#: my-evolution/Locations.h:404
-#, fuzzy
-msgid "Chandler"
-msgstr "查德"
-
-#: my-evolution/Locations.h:405
-#, fuzzy
-msgid "Chania"
-msgstr "中國"
-
-# ui/evolution-mail.xml.h:2
-#: my-evolution/Locations.h:406
-#, fuzzy
-msgid "Chanute"
-msgstr "取消"
-
-#: my-evolution/Locations.h:407
-#, fuzzy
-msgid "Chariton"
-msgstr "喀麥隆"
-
-#: my-evolution/Locations.h:408
-msgid "Charleroi-Brussels South"
-msgstr ""
-
-#: my-evolution/Locations.h:409
-msgid "Charles City"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:712
-#: my-evolution/Locations.h:410
-#, fuzzy
-msgid "Charleston"
-msgstr "主席"
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:411
-#, fuzzy
-msgid "Charlotte"
-msgstr "美亞特"
-
-#: my-evolution/Locations.h:412
-msgid "Charlottesville"
-msgstr ""
-
-#: my-evolution/Locations.h:413
-msgid "Chatham"
-msgstr ""
-
-#: my-evolution/Locations.h:414
-msgid "Chattanooga"
-msgstr ""
-
-#: my-evolution/Locations.h:415
-msgid "Cheboksary"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:150
-#: my-evolution/Locations.h:416
-#, fuzzy
-msgid "Cheju"
-msgstr "智利"
-
-#: my-evolution/Locations.h:417
-msgid "Chelyabinsk"
-msgstr ""
-
-#: my-evolution/Locations.h:418
-msgid "Chengdu"
-msgstr ""
-
-#: my-evolution/Locations.h:419
-#, fuzzy
-msgid "Cherbourg"
-msgstr "盧森堡"
-
-# addressbook/gui/widgets/e-addressbook-view.c:718
-#: my-evolution/Locations.h:420
-#, fuzzy
-msgid "Cherry Point"
-msgstr "其它電話"
-
-#: my-evolution/Locations.h:421
-msgid "Chetumal"
-msgstr ""
-
-#: my-evolution/Locations.h:422
-msgid "Cheyenne"
-msgstr ""
-
-#: my-evolution/Locations.h:423
-msgid "Chiang Kai Shek"
-msgstr ""
-
-#: my-evolution/Locations.h:424
-msgid "Chia Tung"
-msgstr ""
-
-#: my-evolution/Locations.h:425
-#, fuzzy
-msgid "Chiayi"
-msgstr "中國"
-
-#: my-evolution/Locations.h:426
-msgid "Chicago-DuPage"
-msgstr ""
-
-#: my-evolution/Locations.h:427
-msgid "Chicago-Lakefront"
-msgstr ""
-
-#: my-evolution/Locations.h:428
-msgid "Chicago-Midway"
-msgstr ""
-
-#: my-evolution/Locations.h:429
-msgid "Chicago-O'Hare"
-msgstr ""
-
-#: my-evolution/Locations.h:430
-msgid "Chichijima"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:150
-#: my-evolution/Locations.h:431
-#, fuzzy
-msgid "Chiclayo"
-msgstr "智利"
-
-# addressbook/gui/component/addressbook-config.c:150
-#: my-evolution/Locations.h:432
-#, fuzzy
-msgid "Chico"
-msgstr "智利"
-
-#: my-evolution/Locations.h:433
-msgid "Chicopee Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:434
-#, fuzzy
-msgid "Chievres"
-msgstr "中文"
-
-#: my-evolution/Locations.h:435
-#, fuzzy
-msgid "Chihhang"
-msgstr "中國"
-
-#: my-evolution/Locations.h:436
-msgid "Chihuahua"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:150
-#: my-evolution/Locations.h:437
-#, fuzzy
-msgid "Childress"
-msgstr "智利"
-
-#: my-evolution/Locations.h:439
-#, fuzzy
-msgid "China Lake"
-msgstr "中國"
-
-#: my-evolution/Locations.h:440
-#, fuzzy
-msgid "Chinandega"
-msgstr "中國"
-
-#: my-evolution/Locations.h:441
-msgid "Chinmem/Shatou"
-msgstr ""
-
-#: my-evolution/Locations.h:442
-#, fuzzy
-msgid "Chino"
-msgstr "中國"
-
-#: my-evolution/Locations.h:443
-msgid "Chippewa County"
-msgstr ""
-
-#: my-evolution/Locations.h:444
-#, fuzzy
-msgid "Chita"
-msgstr "中國"
-
-#: my-evolution/Locations.h:445
-msgid "Chitose Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:446
-msgid "Chitose ASDF"
-msgstr ""
-
-#: my-evolution/Locations.h:447
-msgid "Chofu Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:448
-msgid "Choluteca"
-msgstr ""
-
-#: my-evolution/Locations.h:449
-msgid "Chongju Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:450
-msgid "Christchurch"
-msgstr ""
-
-#: my-evolution/Locations.h:452
-#, fuzzy
-msgid "Chulitna"
-msgstr "中國"
-
-#: my-evolution/Locations.h:453
-msgid "Churchill"
-msgstr ""
-
-#: my-evolution/Locations.h:454
-msgid "Churchill Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:455
-msgid "Cincinnati"
-msgstr ""
-
-#: my-evolution/Locations.h:456
-msgid "Circle City"
-msgstr ""
-
-#: my-evolution/Locations.h:457
-msgid "Ciudad Bolivar"
-msgstr ""
-
-#: my-evolution/Locations.h:458
-msgid "Ciudad del Carmen"
-msgstr ""
-
-#: my-evolution/Locations.h:459
-msgid "Ciudad Juarez"
-msgstr ""
-
-#: my-evolution/Locations.h:460
-msgid "Ciudad Obregon"
-msgstr ""
-
-#: my-evolution/Locations.h:461
-msgid "Ciudad Victoria"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:2
-#: my-evolution/Locations.h:462
-#, fuzzy
-msgid "Clarinda"
-msgstr "加拿大"
-
-#: my-evolution/Locations.h:463
-#, fuzzy
-msgid "Clarion"
-msgstr "喀麥隆"
-
-#: my-evolution/Locations.h:464
-msgid "Clarksburg"
-msgstr ""
-
-#: my-evolution/Locations.h:465
-msgid "Clayton"
-msgstr ""
-
-#: my-evolution/Locations.h:466
-msgid "Clayton Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:467
-msgid "Clermont-Ferrand"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:468
-#, fuzzy
-msgid "Cleveland"
-msgstr "格陵蘭"
-
-#: my-evolution/Locations.h:469
-msgid "Cleveland/Cuyahoga"
-msgstr ""
-
-#: my-evolution/Locations.h:470
-msgid "Cleveland-Lakefront"
-msgstr ""
-
-#: my-evolution/Locations.h:471
-msgid "Clinton"
-msgstr ""
-
-#: my-evolution/Locations.h:472
-msgid "Clovis-Cannon AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:473
-#, fuzzy
-msgid "Cobija"
-msgstr "哥倫比亞"
-
-#: my-evolution/Locations.h:474
-msgid "Cochabamba"
-msgstr ""
-
-#: my-evolution/Locations.h:475
-msgid "Cocoa Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:476
-#, fuzzy
-msgid "Cocos Island"
-msgstr "科克群島"
-
-# addressbook/printing/e-contact-print.glade.h:4
-#: my-evolution/Locations.h:477
-#, fuzzy
-msgid "Cody"
-msgstr "內文"
-
-#: my-evolution/Locations.h:478
-msgid "Coeur d'Alene"
-msgstr ""
-
-# ui/evolution.xml.h:51
-#: my-evolution/Locations.h:479
-#, fuzzy
-msgid "Cold Bay"
-msgstr "資料夾清單(_F)"
-
-#: my-evolution/Locations.h:480
-#, fuzzy
-msgid "Colima"
-msgstr "哥倫比亞"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
-#: my-evolution/Locations.h:481
-#, fuzzy
-msgid "College Station"
-msgstr "所有站臺(_L)："
-
-#: my-evolution/Locations.h:482
-msgid "Colmar-Meyenheim"
-msgstr ""
-
-#: my-evolution/Locations.h:484
-#, fuzzy
-msgid "Colonia"
-msgstr "哥倫比亞"
-
-# ui/evolution-mail.xml.h:5
-#: my-evolution/Locations.h:485
-#, fuzzy
-msgid "Colorado"
-msgstr "葛摩"
-
-#: my-evolution/Locations.h:486
-msgid "Colorado Springs"
-msgstr ""
-
-#: my-evolution/Locations.h:487
-#, fuzzy
-msgid "Columbia"
-msgstr "哥倫比亞"
-
-#: my-evolution/Locations.h:488
-msgid "Columbia-McEntire"
-msgstr ""
-
-#: my-evolution/Locations.h:489
-#, fuzzy
-msgid "Columbus"
-msgstr "哥倫比亞"
-
-#: my-evolution/Locations.h:490
-msgid "Columbus-Fort Benning"
-msgstr ""
-
-#: my-evolution/Locations.h:491
-msgid "Columbus-Gahanna"
-msgstr ""
-
-#: my-evolution/Locations.h:492
-msgid "Columbus-OSU"
-msgstr ""
-
-#: my-evolution/Locations.h:493
-msgid "Columbus-W Point-Starkville"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:150
-#: my-evolution/Locations.h:494
-#, fuzzy
-msgid "Colville"
-msgstr "智利"
-
-#: my-evolution/Locations.h:495
-msgid "Comodoro Rivadavia"
-msgstr ""
-
-# ui/evolution-event-editor.xml.h:13
-# ui/evolution-mail.xml.h:8
-# ui/evolution-task-editor-dialog.xml.h:14
-#: my-evolution/Locations.h:496
-#, fuzzy
-msgid "Comox"
-msgstr "公司電話"
-
-#: my-evolution/Locations.h:497
-msgid "Conceicao Do Araguaia"
-msgstr ""
-
-# calendar/gui/e-itip-control.c:883
-#: my-evolution/Locations.h:498
-#, fuzzy
-msgid "Concepcion"
-msgstr "取消行動"
-
-# mail/mail-ops.c:917
-#: my-evolution/Locations.h:499
-#, fuzzy
-msgid "Concord"
-msgstr "剛果共和國"
-
-#: my-evolution/Locations.h:500
-msgid "Concordia"
-msgstr ""
-
-#: my-evolution/Locations.h:501
-msgid "Connaught"
-msgstr ""
-
-# ui/evolution-addressbook.xml.h:17
-#: my-evolution/Locations.h:502
-#, fuzzy
-msgid "Connecticut"
-msgstr "連絡人"
-
-# mail/mail-ops.c:917
-#: my-evolution/Locations.h:503
-#, fuzzy
-msgid "Conroe"
-msgstr "剛果共和國"
-
-#: my-evolution/Locations.h:504
-#, fuzzy
-msgid "Constantine"
-msgstr "包含(_O)："
-
-#: my-evolution/Locations.h:505
-msgid "Copper Harbor"
-msgstr ""
-
-#: my-evolution/Locations.h:506
-#, fuzzy
-msgid "Cordoba"
-msgstr "哥倫比亞"
-
-#: my-evolution/Locations.h:507
-#, fuzzy
-msgid "Cordova"
-msgstr "約旦"
-
-#: my-evolution/Locations.h:508
-msgid "Cork"
-msgstr ""
-
-# ui/evolution-mail.xml.h:5
-#: my-evolution/Locations.h:509
-#, fuzzy
-msgid "Coro"
-msgstr "葛摩"
-
-# ui/evolution-mail.xml.h:5
-#: my-evolution/Locations.h:510
-#, fuzzy
-msgid "Corona"
-msgstr "葛摩"
-
-#: my-evolution/Locations.h:511
-msgid "Corpus Christi"
-msgstr ""
-
-#: my-evolution/Locations.h:512
-msgid "Corpus Christi NAS"
-msgstr ""
-
-# calendar/gui/event-editor.c:754
-#: my-evolution/Locations.h:513
-#, fuzzy
-msgid "Corrientes"
-msgstr "出現"
-
-#: my-evolution/Locations.h:514
-#, fuzzy
-msgid "Corsicana"
-msgstr "哥斯大黎加"
-
-# addressbook/gui/widgets/e-addressbook-view.c:736
-#: my-evolution/Locations.h:515
-#, fuzzy
-msgid "Cortez"
-msgstr "備註"
-
-#: my-evolution/Locations.h:516
-#, fuzzy
-msgid "Corumba"
-msgstr "古巴"
-
-#: my-evolution/Locations.h:518
-msgid "Cotulla"
-msgstr ""
-
-#: my-evolution/Locations.h:519
-msgid "Council Bluffs"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:4
-#: my-evolution/Locations.h:520
-#, fuzzy
-msgid "Coventry"
-msgstr "國家 (_Y)："
-
-# mail/mail-ops.c:917
-#: my-evolution/Locations.h:521
-#, fuzzy
-msgid "Covington"
-msgstr "剛果共和國"
-
-#: my-evolution/Locations.h:522
-msgid "Cozumel"
-msgstr ""
-
-#: my-evolution/Locations.h:523
-#, fuzzy
-msgid "Craig"
-msgstr "克羅埃西亞"
-
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#: my-evolution/Locations.h:524
-#, fuzzy
-msgid "Cranfield"
-msgstr "已取消"
-
-#: my-evolution/Locations.h:525
-msgid "Crescent City"
-msgstr ""
-
-# widgets/misc/e-messagebox.c:173
-#: my-evolution/Locations.h:526
-#, fuzzy
-msgid "Creston"
-msgstr "問題"
-
-# calendar/gui/event-editor-dialog.glade.h:15
-#: my-evolution/Locations.h:527
-#, fuzzy
-msgid "Crestview"
-msgstr "預覽"
-
-#: my-evolution/Locations.h:529
-msgid "Cross City"
-msgstr ""
-
-#: my-evolution/Locations.h:530
-msgid "Crossville"
-msgstr ""
-
-#: my-evolution/Locations.h:531
-#, fuzzy
-msgid "Crotone"
-msgstr "喀麥隆"
-
-#: my-evolution/Locations.h:533
-#, fuzzy
-msgid "Cuba Awrs"
-msgstr "古巴"
-
-#: my-evolution/Locations.h:534
-msgid "Cuernavaca"
-msgstr ""
-
-#: my-evolution/Locations.h:535
-#, fuzzy
-msgid "Cuiaba"
-msgstr "古巴"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:1
-# ui/evolution-contact-editor.xml.h:1
-# ui/evolution-event-editor.xml.h:10
-# ui/evolution-message-composer.xml.h:3
-# ui/evolution-subscribe.xml.h:2
-# ui/evolution-task-editor-dialog.xml.h:11
-# ui/evolution.xml.h:5
-#: my-evolution/Locations.h:536
-#, fuzzy
-msgid "Culdrose"
-msgstr "關閉"
-
-#: my-evolution/Locations.h:537
-msgid "Culiacan"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:2
-#: my-evolution/Locations.h:538
-#, fuzzy
-msgid "Cumana"
-msgstr "加拿大"
-
-#: my-evolution/Locations.h:539
-msgid "Cumberland"
-msgstr ""
-
-#: my-evolution/Locations.h:540
-#, fuzzy
-msgid "Curitiba"
-msgstr "克羅埃西亞"
-
-#: my-evolution/Locations.h:541
-msgid "Curitiba Apt"
-msgstr ""
-
-# ui/evolution-event-editor.xml.h:15
-# ui/evolution-task-editor-dialog.xml.h:16
-#: my-evolution/Locations.h:542
-#, fuzzy
-msgid "Custer"
-msgstr "剪下"
-
-#: my-evolution/Locations.h:543
-msgid "Cut Bank"
-msgstr ""
-
-#: my-evolution/Locations.h:544
-msgid "Cuzco"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:547
-#, fuzzy
-msgid "Dagali"
-msgstr "馬利"
-
-#: my-evolution/Locations.h:548
-msgid "Daggett"
-msgstr ""
-
-#: my-evolution/Locations.h:549
-msgid "Dalhart"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:550
-#, fuzzy
-msgid "Dalian"
-msgstr "臺灣"
-
-#: my-evolution/Locations.h:551
-msgid "Dallas-Addison"
-msgstr ""
-
-#: my-evolution/Locations.h:552
-msgid "Dallas-Fort Worth"
-msgstr ""
-
-#: my-evolution/Locations.h:553
-msgid "Dallas-Love Field"
-msgstr ""
-
-#: my-evolution/Locations.h:554
-msgid "Dallas-Redbird"
-msgstr ""
-
-#: my-evolution/Locations.h:555
-msgid "Da Nang"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:7
-#: my-evolution/Locations.h:556
-#, fuzzy
-msgid "Danbury"
-msgstr "1月"
-
-#: my-evolution/Locations.h:557
-msgid "Danville"
-msgstr ""
-
-#: my-evolution/Locations.h:558
-msgid "Dar-El-Beida"
-msgstr ""
-
-#: my-evolution/Locations.h:559
-msgid "Davenport"
-msgstr ""
-
-#: my-evolution/Locations.h:560
-msgid "David"
-msgstr ""
-
-#: my-evolution/Locations.h:561
-msgid "Dawadmi"
-msgstr ""
-
-# ui/evolution-calendar.xml.h:7
-#: my-evolution/Locations.h:562
-#, fuzzy
-msgid "Dayton"
-msgstr "天"
-
-#: my-evolution/Locations.h:563
-msgid "Daytona Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:564
-msgid "Dayton-Fairborn"
-msgstr ""
-
-# shell/e-shortcuts-view.c:265
-#: my-evolution/Locations.h:565
-#, fuzzy
-msgid "Dayton-South Airport"
-msgstr "不要匯入"
-
-#: my-evolution/Locations.h:566
-msgid "Dead Horse"
-msgstr ""
-
-#: my-evolution/Locations.h:567
-msgid "Deauville-Saint-Gatien"
-msgstr ""
-
-#: my-evolution/Locations.h:568
-msgid "Decatur"
-msgstr ""
-
-#: my-evolution/Locations.h:569
-msgid "Decimomannu"
-msgstr ""
-
-#: my-evolution/Locations.h:570
-msgid "Decorah"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
-#: my-evolution/Locations.h:571
-#, fuzzy
-msgid "Deelen"
-msgstr "刪除"
-
-#: my-evolution/Locations.h:572
-msgid "Dekalb/Peachtree"
-msgstr ""
-
-#: my-evolution/Locations.h:573
-msgid "Delaware"
-msgstr ""
-
-#: my-evolution/Locations.h:574
-msgid "Del Bajio"
-msgstr ""
-
-#: my-evolution/Locations.h:575
-msgid "Del Rio"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
-#: my-evolution/Locations.h:576
-#, fuzzy
-msgid "Delta"
-msgstr "刪除"
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: my-evolution/Locations.h:577
-#, fuzzy
-msgid "Deming"
-msgstr "會議"
-
-#: my-evolution/Locations.h:578
-msgid "Den Helder/De Kooy"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:34
-#: my-evolution/Locations.h:579
-#, fuzzy
-msgid "Denison"
-msgstr "留尼旺"
-
-#: my-evolution/Locations.h:581
-#, fuzzy
-msgid "Denton"
-msgstr "黎巴嫩"
-
-#: my-evolution/Locations.h:582
-#, fuzzy
-msgid "Denver"
-msgstr "寄件者"
-
-#: my-evolution/Locations.h:583
-msgid "Denver-Aurora"
-msgstr ""
-
-#: my-evolution/Locations.h:584
-msgid "Denver-Broomfield"
-msgstr ""
-
-#: my-evolution/Locations.h:585
-msgid "Denver-Cherry Knolls"
-msgstr ""
-
-#: my-evolution/Locations.h:586
-msgid "Desert Rock"
-msgstr ""
-
-# addressbook/backend/ebook/e-card.c:3434
-#: my-evolution/Locations.h:587
-#, fuzzy
-msgid "Des Moines"
-msgstr "時區"
-
-# widgets/misc/e-messagebox.c:173
-#: my-evolution/Locations.h:588
-#, fuzzy
-msgid "Destin"
-msgstr "問題"
-
-#: my-evolution/Locations.h:589
-msgid "Detroit"
-msgstr ""
-
-#: my-evolution/Locations.h:590
-msgid "Detroit Lakes"
-msgstr ""
-
-#: my-evolution/Locations.h:591
-msgid "Detroit-Taylor"
-msgstr ""
-
-#: my-evolution/Locations.h:592
-msgid "Detroit/Ypsilanti"
-msgstr ""
-
-#: my-evolution/Locations.h:593
-msgid "Devils Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:594
-msgid "Devils Lake (2)"
-msgstr ""
-
-#: my-evolution/Locations.h:595
-#, fuzzy
-msgid "Dhahran"
-msgstr "巴林"
-
-# addressbook/printing/e-contact-print.glade.h:6
-#: my-evolution/Locations.h:596
-#, fuzzy
-msgid "Dickinson"
-msgstr "尺寸："
-
-# mail/mail-config.glade.h:25
-#: my-evolution/Locations.h:597
-#, fuzzy
-msgid "Dijon"
-msgstr "完成"
-
-#: my-evolution/Locations.h:598
-#, fuzzy
-msgid "Dillingham"
-msgstr "漂雹"
-
-# mail/mail-config.glade.h:25
-#: my-evolution/Locations.h:599
-#, fuzzy
-msgid "Dillon"
-msgstr "完成"
-
-# ui/evolution-calendar.xml.h:25
-#: my-evolution/Locations.h:600
-#, fuzzy
-msgid "Dinard"
-msgstr "列印名片"
-
-#: my-evolution/Locations.h:601
-msgid "District of Columbia"
-msgstr ""
-
-#: my-evolution/Locations.h:602
-msgid "Diyarbakir"
-msgstr ""
-
-#: my-evolution/Locations.h:603
-msgid "Dnipropetrovsk"
-msgstr ""
-
-#: my-evolution/Locations.h:604
-msgid "Dobbiaco"
-msgstr ""
-
-#: my-evolution/Locations.h:605
-msgid "Dodge City"
-msgstr ""
-
-#: my-evolution/Locations.h:606
-msgid "Doha"
-msgstr ""
-
-#: my-evolution/Locations.h:607
-#, fuzzy
-msgid "Dole"
-msgstr "角色"
-
-# mail/mail-config.glade.h:25
-#: my-evolution/Locations.h:609
-#, fuzzy
-msgid "Donetsk"
-msgstr "完成"
-
-# ui/evolution-calendar.xml.h:34
-# widgets/misc/e-cell-date-edit.c:229
-# widgets/misc/e-dateedit.c:424
-#: my-evolution/Locations.h:610
-#, fuzzy
-msgid "Dongsha"
-msgstr "東加"
-
-#: my-evolution/Locations.h:611
-msgid "Dongshi"
-msgstr ""
-
-#: my-evolution/Locations.h:612
-#, fuzzy
-msgid "Don Torcuato"
-msgstr "到期或之後"
-
-#: my-evolution/Locations.h:613
-msgid "Dortmund-Wickede"
-msgstr ""
-
-# mail/mail-config.glade.h:25
-#: my-evolution/Locations.h:614
-#, fuzzy
-msgid "Dothan"
-msgstr "完成"
-
-#: my-evolution/Locations.h:615
-msgid "Douglas"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:38
-#: my-evolution/Locations.h:616
-#, fuzzy
-msgid "Dover"
-msgstr "永遠"
-
-#: my-evolution/Locations.h:617
-msgid "Dresden-Klotzsche"
-msgstr ""
-
-#: my-evolution/Locations.h:618
-msgid "Drummond"
-msgstr ""
-
-#: my-evolution/Locations.h:619
-#, fuzzy
-msgid "Dubai"
-msgstr "古巴"
-
-#: my-evolution/Locations.h:620
-msgid "Dubbo"
-msgstr ""
-
-# calendar/gui/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
-#: my-evolution/Locations.h:621
-#, fuzzy
-msgid "Dublin"
-msgstr "公開"
-
-#: my-evolution/Locations.h:622
-msgid "Du Bois"
-msgstr ""
-
-#: my-evolution/Locations.h:623
-msgid "Dubrovnik"
-msgstr ""
-
-#: my-evolution/Locations.h:624
-msgid "Dubuque"
-msgstr ""
-
-# ui/evolution-calendar.xml.h:7
-#: my-evolution/Locations.h:625
-#, fuzzy
-msgid "Dugway"
-msgstr "天"
-
-# mail/mail-config.glade.h:21
-#: my-evolution/Locations.h:626
-#, fuzzy
-msgid "Duluth"
-msgstr "預設值(_F)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
-#: my-evolution/Locations.h:627
-#, fuzzy
-msgid "Dundee"
-msgstr "期限"
-
-#: my-evolution/Locations.h:628
-#, fuzzy
-msgid "Durango"
-msgstr "前"
-
-#: my-evolution/Locations.h:629
-msgid "Durango Awrs"
-msgstr ""
-
-#: my-evolution/Locations.h:630
-msgid "Durazno"
-msgstr ""
-
-#: my-evolution/Locations.h:631
-msgid "Durban Louis Botha "
-msgstr ""
-
-#: my-evolution/Locations.h:632
-#, fuzzy
-msgid "Dusseldorf"
-msgstr "塵暴"
-
-#: my-evolution/Locations.h:633
-msgid "Dutch Harbor"
-msgstr ""
-
-# ui/evolution-event-editor.xml.h:56
-# ui/evolution-message-composer.xml.h:44
-# ui/evolution-task-editor-dialog.xml.h:68
-#: my-evolution/Locations.h:634
-#, fuzzy
-msgid "Dyersburg"
-msgstr "除錯(_D)"
-
-# mail/mail-accounts.c:199
-# mail/mail-config.glade.h:30
-#: my-evolution/Locations.h:635
-#, fuzzy
-msgid "Eagle"
-msgstr "啟用"
-
-#: my-evolution/Locations.h:636
-msgid "Eagle Range"
-msgstr ""
-
-#: my-evolution/Locations.h:637
-msgid "East London"
-msgstr ""
-
-#: my-evolution/Locations.h:638
-msgid "East Midlands"
-msgstr ""
-
-#: my-evolution/Locations.h:639
-#, fuzzy
-msgid "East St Louis"
-msgstr "東南東"
-
-#: my-evolution/Locations.h:640
-msgid "Eau Claire"
-msgstr ""
-
-#: my-evolution/Locations.h:642
-msgid "Edinburgh"
-msgstr ""
-
-#: my-evolution/Locations.h:643
-#, fuzzy
-msgid "Edmonton"
-msgstr "月"
-
-#: my-evolution/Locations.h:644
-msgid "Edmonton/Villeneuve"
-msgstr ""
-
-#: my-evolution/Locations.h:645
-msgid "Eduardo Gomes International"
-msgstr ""
-
-#: my-evolution/Locations.h:646
-msgid "Edwards AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:647
-msgid "Egilsstadir"
-msgstr ""
-
-#: my-evolution/Locations.h:648
-msgid "Eglin"
-msgstr ""
-
-#: my-evolution/Locations.h:649
-msgid "Eglington/Londonderry"
-msgstr ""
-
-#: my-evolution/Locations.h:651
-msgid "Eindhoven"
-msgstr ""
-
-#: my-evolution/Locations.h:652
-msgid "Ekofisk"
-msgstr ""
-
-#: my-evolution/Locations.h:653
-msgid "Elazig"
-msgstr ""
-
-#: my-evolution/Locations.h:654
-msgid "El Centro"
-msgstr ""
-
-#: my-evolution/Locations.h:655
-#, fuzzy
-msgid "El Dorado"
-msgstr "龍捲風"
-
-#: my-evolution/Locations.h:656
-msgid "Elefsis"
-msgstr ""
-
-#: my-evolution/Locations.h:657
-msgid "Elfin Cove"
-msgstr ""
-
-#: my-evolution/Locations.h:658
-msgid "Elizabeth City"
-msgstr ""
-
-#: my-evolution/Locations.h:659
-msgid "Elk City"
-msgstr ""
-
-#: my-evolution/Locations.h:660
-msgid "Elkhart"
-msgstr ""
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: my-evolution/Locations.h:661
-#, fuzzy
-msgid "Elkins"
-msgstr "靄"
-
-#: my-evolution/Locations.h:662
-msgid "Elko"
-msgstr ""
-
-#: my-evolution/Locations.h:663
-#, fuzzy
-msgid "Elmira"
-msgstr "厄利垂亞"
-
-# ui/evolution-calendar.xml.h:15
-#: my-evolution/Locations.h:664
-#, fuzzy
-msgid "El Monte"
-msgstr "月"
-
-#: my-evolution/Locations.h:665
-msgid "El Paso"
-msgstr ""
-
-#: my-evolution/Locations.h:667
-#, fuzzy
-msgid "El Salvador Int."
-msgstr "薩爾瓦多"
-
-#: my-evolution/Locations.h:668
-msgid "Elsenborn"
-msgstr ""
-
-#: my-evolution/Locations.h:669
-msgid "Ely"
-msgstr ""
-
-#: my-evolution/Locations.h:670
-msgid "Emmonak"
-msgstr ""
-
-#: my-evolution/Locations.h:671
-#, fuzzy
-msgid "Emporia"
-msgstr "重要"
-
-#: my-evolution/Locations.h:672
-msgid "Enid"
-msgstr ""
-
-# mail/mail-mt.c:516
-# mail/mail-mt.c:545
-# mail/mail-mt.c:880
-#: my-evolution/Locations.h:673
-#, fuzzy
-msgid "Enid/Woodring"
-msgstr "正在工作"
-
-#: my-evolution/Locations.h:674
-msgid "Enosburg Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:675
-msgid "Ephrata"
-msgstr ""
-
-#: my-evolution/Locations.h:676
-msgid "Ercan"
-msgstr ""
-
-#: my-evolution/Locations.h:677
-#, fuzzy
-msgid "Erie"
-msgstr "厄利垂亞"
-
-#: my-evolution/Locations.h:678
-msgid "Erzurum"
-msgstr ""
-
-#: my-evolution/Locations.h:679
-msgid "Esbjerg"
-msgstr ""
-
-#: my-evolution/Locations.h:680
-msgid "Escanaba"
-msgstr ""
-
-#: my-evolution/Locations.h:681
-msgid "Esfahan"
-msgstr ""
-
-#: my-evolution/Locations.h:682
-msgid "Eskisehir"
-msgstr ""
-
-#: my-evolution/Locations.h:683
-msgid "Estherville"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:9
-#: my-evolution/Locations.h:685
-#, fuzzy
-msgid "Eugene"
-msgstr "6月"
-
-#: my-evolution/Locations.h:686
-#, fuzzy
-msgid "Eureka"
-msgstr "厄利垂亞"
-
-#: my-evolution/Locations.h:687
-msgid "Europe"
-msgstr ""
-
-#: my-evolution/Locations.h:688
-#, fuzzy
-msgid "Evanston"
-msgstr "愛沙尼亞"
-
-#: my-evolution/Locations.h:689
-msgid "Evansville"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:10
-#: my-evolution/Locations.h:690
-#, fuzzy
-msgid "Everett"
-msgstr "每"
-
-#: my-evolution/Locations.h:691
-msgid "Evergreen"
-msgstr ""
-
-#: my-evolution/Locations.h:692
-msgid "Evreux-Fauville"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/Locations.h:693
-#, fuzzy
-msgid "Exeter"
-msgstr "天氣"
-
-#: my-evolution/Locations.h:694
-msgid "Ezeiza"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
-#: my-evolution/Locations.h:695
-#, fuzzy
-msgid "Fagernes"
-msgstr "呼叫器"
-
-#: my-evolution/Locations.h:696
-msgid "Fairbanks"
-msgstr ""
-
-#: my-evolution/Locations.h:697
-msgid "Fairchild"
-msgstr ""
-
-# ui/evolution-message-composer.xml.h:47
-#: my-evolution/Locations.h:698
-#, fuzzy
-msgid "Fairfield"
-msgstr "寄件者(_F)"
-
-# addressbook/printing/e-contact-print.glade.h:8
-#: my-evolution/Locations.h:699
-#, fuzzy
-msgid "Fairmont"
-msgstr "字型"
-
-#: my-evolution/Locations.h:700
-msgid "Fallon"
-msgstr ""
-
-#: my-evolution/Locations.h:701
-msgid "Falls City"
-msgstr ""
-
-#: my-evolution/Locations.h:702
-msgid "Falmouth-Otis AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:703
-msgid "Farbanks/Eielson AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:704
-#, fuzzy
-msgid "Fargo"
-msgstr "前"
-
-# mail/mail-accounts.c:197
-#: my-evolution/Locations.h:705
-#, fuzzy
-msgid "Farmingdale"
-msgstr "變數"
-
-#: my-evolution/Locations.h:706
-#, fuzzy
-msgid "Farmington"
-msgstr "凍龍捲風"
-
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
-#: my-evolution/Locations.h:707
-#, fuzzy
-msgid "Farmville"
-msgstr "姓"
-
-# mail/mail-format.c:756
-# mail/message-list.c:1082
-#: my-evolution/Locations.h:708
-#, fuzzy
-msgid "Faro"
-msgstr "寄件者"
-
-#: my-evolution/Locations.h:709
-msgid "Fayetteville"
-msgstr ""
-
-# ui/evolution-task-editor-dialog.xml.h:24
-#: my-evolution/Locations.h:710
-#, fuzzy
-msgid "Feng Nin"
-msgstr "凍雨"
-
-#: my-evolution/Locations.h:711
-msgid "Fergus Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:712
-msgid "Fernando De Noronha"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:4
-#: my-evolution/Locations.h:713
-#, fuzzy
-msgid "Ferrara"
-msgstr "2月"
-
-# mail/message-list.c:690
-#: my-evolution/Locations.h:714
-#, fuzzy
-msgid "Figari"
-msgstr "奈及利亞"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-# calendar/gui/event-editor.c:479
-#: my-evolution/Locations.h:715
-#, fuzzy
-msgid "Findlay"
-msgstr "星期五"
-
-# ui/evolution-calendar.xml.h:36
-#: my-evolution/Locations.h:717
-#, fuzzy
-msgid "Firenze"
-msgstr "空閒"
-
-#: my-evolution/Locations.h:718
-msgid "Fitchburg"
-msgstr ""
-
-#: my-evolution/Locations.h:719
-msgid "Flagstaff"
-msgstr ""
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: my-evolution/Locations.h:720
-#, fuzzy
-msgid "Flint"
-msgstr "靄"
-
-#: my-evolution/Locations.h:721
-#, fuzzy
-msgid "Flippin"
-msgstr "菲律賓"
-
-# ui/evolution-mail.xml.h:2
-#: my-evolution/Locations.h:722
-#, fuzzy
-msgid "Florence"
-msgstr "法國"
-
-# ui/evolution-calendar.xml.h:36
-#: my-evolution/Locations.h:723
-#, fuzzy
-msgid "Florennes"
-msgstr "空閒"
-
-# addressbook/gui/widgets/e-addressbook-view.c:699
-#: my-evolution/Locations.h:724
-#, fuzzy
-msgid "Flores"
-msgstr "歸檔為"
-
-#: my-evolution/Locations.h:725
-msgid "Florianopolis"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-# calendar/gui/event-editor.c:479
-#: my-evolution/Locations.h:726
-#, fuzzy
-msgid "Florida"
-msgstr "星期五"
-
-# mail/mail-format.c:756
-# mail/message-list.c:1082
-#: my-evolution/Locations.h:727
-#, fuzzy
-msgid "Floro"
-msgstr "寄件者"
-
-#: my-evolution/Locations.h:728
-msgid "Fond Du Lac"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:729
-#, fuzzy
-msgid "Forde/Bringeland"
-msgstr "芬蘭"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: my-evolution/Locations.h:730
-#, fuzzy
-msgid "Forli"
-msgstr "週五(_F)"
-
-# addressbook/printing/e-contact-print.glade.h:10
-#: my-evolution/Locations.h:731
-#, fuzzy
-msgid "Formosa"
-msgstr "格式"
-
-#: my-evolution/Locations.h:732
-msgid "Fortaleza"
-msgstr ""
-
-#: my-evolution/Locations.h:733
-msgid "Fort Belvoir"
-msgstr ""
-
-#: my-evolution/Locations.h:734
-msgid "Fort Benning"
-msgstr ""
-
-#: my-evolution/Locations.h:735
-msgid "Fort Bragg"
-msgstr ""
-
-#: my-evolution/Locations.h:736
-msgid "Fort Campbell"
-msgstr ""
-
-#: my-evolution/Locations.h:737
-msgid "Fort Carson"
-msgstr ""
-
-#: my-evolution/Locations.h:738
-msgid "Fort Collins"
-msgstr ""
-
-#: my-evolution/Locations.h:739
-msgid "Fort Collins/Lovel"
-msgstr ""
-
-#: my-evolution/Locations.h:740
-msgid "Fort Dodge"
-msgstr ""
-
-#: my-evolution/Locations.h:741
-msgid "Fort Drum"
-msgstr ""
-
-# ui/evolution.xml.h:62
-#: my-evolution/Locations.h:742
-#, fuzzy
-msgid "Fort Eustis"
-msgstr "功能"
-
-#: my-evolution/Locations.h:743
-msgid "Fort Greely/Allen AAF"
-msgstr ""
-
-#: my-evolution/Locations.h:744
-msgid "Fort Huachuca"
-msgstr ""
-
-#: my-evolution/Locations.h:745
-msgid "Fort Knox"
-msgstr ""
-
-#: my-evolution/Locations.h:746
-msgid "Fort Lauderdale"
-msgstr ""
-
-#: my-evolution/Locations.h:747
-msgid "Fort Lauderdale (International)"
-msgstr ""
-
-# mail/message-browser.c:194
-# ui/evolution-mail.xml.h:33
-#: my-evolution/Locations.h:748
-#, fuzzy
-msgid "Fort Leonard"
-msgstr "轉寄"
-
-#: my-evolution/Locations.h:749
-msgid "Fort Lewis"
-msgstr ""
-
-#: my-evolution/Locations.h:750
-msgid "Fort Madison"
-msgstr ""
-
-# ui/evolution-mail.xml.h:107
-#: my-evolution/Locations.h:751
-#, fuzzy
-msgid "Fort Meade"
-msgstr "轉寄郵件(_F)"
-
-#: my-evolution/Locations.h:752
-msgid "Fort Myers (Page Field)"
-msgstr ""
-
-#: my-evolution/Locations.h:753
-msgid "Fort Myers (Southwest Florida International)"
-msgstr ""
-
-#: my-evolution/Locations.h:754
-msgid "Fort Polk-Leesville"
-msgstr ""
-
-#: my-evolution/Locations.h:755
-msgid "Fort Riley"
-msgstr ""
-
-#: my-evolution/Locations.h:756
-msgid "Fort Sill"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:10
-#: my-evolution/Locations.h:757
-#, fuzzy
-msgid "Fort Smith"
-msgstr "格式"
-
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
-#: my-evolution/Locations.h:758
-#, fuzzy
-msgid "Fort Stewart"
-msgstr "未開始"
-
-#: my-evolution/Locations.h:759
-msgid "Fort Stockton"
-msgstr ""
-
-# ui/evolution-mail.xml.h:2
-#: my-evolution/Locations.h:760
-#, fuzzy
-msgid "Fort Wayne"
-msgstr "法國"
-
-#: my-evolution/Locations.h:761
-msgid "Fort Worth-Alliance"
-msgstr ""
-
-#: my-evolution/Locations.h:762
-msgid "Fort Worth-Meacham"
-msgstr ""
-
-#: my-evolution/Locations.h:763
-msgid "Fort Worth NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:764
-msgid "Fourchon"
-msgstr ""
-
-#: my-evolution/Locations.h:765
-msgid "Foz Do Iguacu"
-msgstr ""
-
-#: my-evolution/Locations.h:767
-msgid "Frankfort"
-msgstr ""
-
-#: my-evolution/Locations.h:768
-msgid "Frankfurt/Main"
-msgstr ""
-
-# ui/evolution-mail.xml.h:36
-#: my-evolution/Locations.h:769
-#, fuzzy
-msgid "Franklin"
-msgstr "正常轉寄(_I)"
-
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
-#: my-evolution/Locations.h:770
-#, fuzzy
-msgid "Fredericton"
-msgstr "描述"
-
-# ui/evolution-calendar.xml.h:36
-#: my-evolution/Locations.h:771
-#, fuzzy
-msgid "Freeport"
-msgstr "空閒"
-
-#: my-evolution/Locations.h:772
-msgid "Frenchville"
-msgstr ""
-
-#: my-evolution/Locations.h:773
-#, fuzzy
-msgid "Fresno"
-msgstr "凍雪"
-
-#: my-evolution/Locations.h:774
-msgid "Fresno-Chandler"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-# calendar/gui/event-editor.c:479
-#: my-evolution/Locations.h:775
-#, fuzzy
-msgid "Friday Harbor"
-msgstr "星期五"
-
-#: my-evolution/Locations.h:776
-msgid "Friedrichshafen"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: my-evolution/Locations.h:777
-#, fuzzy
-msgid "Frigg"
-msgstr "週五(_F)"
-
-# addressbook/printing/e-contact-print.glade.h:8
-#: my-evolution/Locations.h:778
-#, fuzzy
-msgid "Frontone"
-msgstr "字型"
-
-# addressbook/gui/widgets/e-addressbook-view.c:731
-#: my-evolution/Locations.h:779
-#, fuzzy
-msgid "Frosinone"
-msgstr "專業"
-
-# calendar/gui/goto-dialog.glade.h:4
-#: my-evolution/Locations.h:780
-#, fuzzy
-msgid "Fryeburg"
-msgstr "2月"
-
-#: my-evolution/Locations.h:781
-msgid "Fujairah"
-msgstr ""
-
-#: my-evolution/Locations.h:782
-msgid "Fuji Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:783
-msgid "Fukue Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:784
-msgid "Fukui Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:785
-msgid "Fukuoka Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:786
-msgid "Fullerton"
-msgstr ""
-
-#: my-evolution/Locations.h:787
-msgid "Funchal"
-msgstr ""
-
-#: my-evolution/Locations.h:788
-#, fuzzy
-msgid "FYR Macedonia"
-msgstr "馬其頓"
-
-#: my-evolution/Locations.h:789
-msgid "Gadsden"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:790
-#, fuzzy
-msgid "Gage"
-msgstr "頁"
-
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#: my-evolution/Locations.h:791
-#, fuzzy
-msgid "Gainesville"
-msgstr "已取消"
-
-#: my-evolution/Locations.h:792
-msgid "Galax-Hillsville"
-msgstr ""
-
-#: my-evolution/Locations.h:793
-msgid "Galbraith Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:794
-msgid "Galeao"
-msgstr ""
-
-#: my-evolution/Locations.h:795
-#, fuzzy
-msgid "Galena"
-msgstr "迦納"
-
-#: my-evolution/Locations.h:796
-msgid "Galesburg"
-msgstr ""
-
-#: my-evolution/Locations.h:797
-#, fuzzy
-msgid "Gallup"
-msgstr "瓜德魯普島"
-
-#: my-evolution/Locations.h:798
-msgid "Galveston"
-msgstr ""
-
-#: my-evolution/Locations.h:799
-#, fuzzy
-msgid "Gambell"
-msgstr "甘比亞"
-
-# addressbook/printing/e-contact-print.glade.h:11
-#: my-evolution/Locations.h:800
-#, fuzzy
-msgid "Gander"
-msgstr "頁首"
-
-# mail/mail-config.glade.h:35
-#: my-evolution/Locations.h:801
-#, fuzzy
-msgid "Garden City"
-msgstr "身份"
-
-#: my-evolution/Locations.h:802
-msgid "Gary"
-msgstr ""
-
-# calendar/gui/e-day-view.c:570
-# calendar/gui/e-week-view.c:300
-# calendar/gui/print.c:617
-#: my-evolution/Locations.h:803
-#, fuzzy
-msgid "Gassim"
-msgstr "關島"
-
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: my-evolution/Locations.h:804
-#, fuzzy
-msgid "Gatineau"
-msgstr "幾內亞"
-
-#: my-evolution/Locations.h:805
-msgid "Gaziantep"
-msgstr ""
-
-#: my-evolution/Locations.h:806
-#, fuzzy
-msgid "Gdansk"
-msgstr "天"
-
-# ui/evolution-calendar.xml.h:36
-#: my-evolution/Locations.h:807
-#, fuzzy
-msgid "Geneve"
-msgstr "希臘"
-
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: my-evolution/Locations.h:808
-#, fuzzy
-msgid "Genova"
-msgstr "一般"
-
-#: my-evolution/Locations.h:809
-msgid "George Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:810
-msgid "Georgetown"
-msgstr ""
-
-#: my-evolution/Locations.h:813
-#, fuzzy
-msgid "Ghardaia"
-msgstr "迦納"
-
-#: my-evolution/Locations.h:814
-msgid "Ghedi"
-msgstr ""
-
-#: my-evolution/Locations.h:816
-msgid "Gifu Ab"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:817
-#, fuzzy
-msgid "Gila Bend"
-msgstr "芬蘭"
-
-#: my-evolution/Locations.h:818
-msgid "Gillette"
-msgstr ""
-
-#: my-evolution/Locations.h:819
-msgid "Gilze-Rijen"
-msgstr ""
-
-#: my-evolution/Locations.h:820
-msgid "Gioia del Colle"
-msgstr ""
-
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: my-evolution/Locations.h:821
-#, fuzzy
-msgid "Girona"
-msgstr "幾內亞"
-
-#: my-evolution/Locations.h:822
-#, fuzzy
-msgid "Gizan"
-msgstr "加彭"
-
-#: my-evolution/Locations.h:823
-#, fuzzy
-msgid "Glasgow"
-msgstr "前"
-
-#: my-evolution/Locations.h:824
-#, fuzzy
-msgid "Glendive"
-msgstr "馬爾地夫"
-
-#: my-evolution/Locations.h:825
-msgid "Glens Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:826
-#, fuzzy
-msgid "Goiania"
-msgstr "羅馬尼亞"
-
-#: my-evolution/Locations.h:827
-msgid "Goldsboro"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:828
-#, fuzzy
-msgid "Goodland"
-msgstr "波蘭"
-
-# calendar/gui/goto-dialog.glade.h:6
-#: my-evolution/Locations.h:829
-#, fuzzy
-msgid "Goose Bay"
-msgstr "移至今日"
-
-#: my-evolution/Locations.h:830
-msgid "Goteborg (Landvetter)"
-msgstr ""
-
-#: my-evolution/Locations.h:831
-msgid "Goteborg (Save)"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:2
-#: my-evolution/Locations.h:832
-#, fuzzy
-msgid "Granada"
-msgstr "格瑞那達"
-
-#: my-evolution/Locations.h:833
-msgid "Grand Canyon"
-msgstr ""
-
-#: my-evolution/Locations.h:834
-msgid "Grand Cayman"
-msgstr ""
-
-#: my-evolution/Locations.h:835
-msgid "Grand Forks"
-msgstr ""
-
-#: my-evolution/Locations.h:836
-#, fuzzy
-msgid "Grand Island"
-msgstr "福克蘭群島"
-
-#: my-evolution/Locations.h:837
-msgid "Grand Isle"
-msgstr ""
-
-#: my-evolution/Locations.h:838
-msgid "Grand Junction"
-msgstr ""
-
-#: my-evolution/Locations.h:839
-#, fuzzy
-msgid "Grand Marais"
-msgstr "聖馬利諾"
-
-#: my-evolution/Locations.h:840
-msgid "Grand Rapids"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:15
-#: my-evolution/Locations.h:841
-#, fuzzy
-msgid "Grandview"
-msgstr "預覽"
-
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#: my-evolution/Locations.h:842
-#, fuzzy
-msgid "Grangeville"
-msgstr "已取消"
-
-# mail/mail-config.glade.h:26
-#: my-evolution/Locations.h:843
-#, fuzzy
-msgid "Grants"
-msgstr "草稿"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:844
-#, fuzzy
-msgid "Graz"
-msgstr "巴西"
-
-#: my-evolution/Locations.h:845
-msgid "Great Falls"
-msgstr ""
-
-# ui/evolution-calendar.xml.h:36
-#: my-evolution/Locations.h:847
-#, fuzzy
-msgid "Greeley"
-msgstr "希臘"
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:848
-#, fuzzy
-msgid "Green Bay"
-msgstr "格陵蘭"
-
-#: my-evolution/Locations.h:849
-msgid "Green River"
-msgstr ""
-
-#: my-evolution/Locations.h:850
-msgid "Greensboro"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:851
-#, fuzzy
-msgid "Greenville"
-msgstr "格陵蘭"
-
-#: my-evolution/Locations.h:852
-msgid "Greenville-Spartanburg"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:853
-#, fuzzy
-msgid "Greenwood"
-msgstr "格陵蘭"
-
-#: my-evolution/Locations.h:854
-msgid "Grenoble-Saint-Geoirs"
-msgstr ""
-
-#: my-evolution/Locations.h:855
-msgid "Griffiss AFB"
-msgstr ""
-
-# widgets/misc/e-messagebox.c:159
-#: my-evolution/Locations.h:856
-#, fuzzy
-msgid "Groningen"
-msgstr "警告"
-
-#: my-evolution/Locations.h:857
-msgid "Grosseto"
-msgstr ""
-
-#: my-evolution/Locations.h:858
-msgid "Groton"
-msgstr ""
-
-#: my-evolution/Locations.h:859
-#, fuzzy
-msgid "Guadalajara"
-msgstr "瓜地馬拉"
-
-#: my-evolution/Locations.h:860
-#, fuzzy
-msgid "Guadalupe Pass"
-msgstr "瓜德魯普島"
-
-#: my-evolution/Locations.h:861
-#, fuzzy
-msgid "Guanare"
-msgstr "蓋亞納"
-
-#: my-evolution/Locations.h:862
-msgid "Guangzhou"
-msgstr ""
-
-#: my-evolution/Locations.h:863
-#, fuzzy
-msgid "Guantanamo"
-msgstr "瓜地馬拉"
-
-#: my-evolution/Locations.h:864
-#, fuzzy
-msgid "Guarany"
-msgstr "德國"
-
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: my-evolution/Locations.h:865
-#, fuzzy
-msgid "Guaratingueta"
-msgstr "幾內亞"
-
-#: my-evolution/Locations.h:866
-msgid "Guarulhos"
-msgstr ""
-
-#: my-evolution/Locations.h:868
-msgid "Guayaquil/Simon Bolivar"
-msgstr ""
-
-# calendar/gui/e-day-view.c:570
-# calendar/gui/e-week-view.c:300
-# calendar/gui/print.c:617
-#: my-evolution/Locations.h:869
-#, fuzzy
-msgid "Guaymas"
-msgstr "關島"
-
-#: my-evolution/Locations.h:870
-#, fuzzy
-msgid "Guernsey"
-msgstr "德國"
-
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: my-evolution/Locations.h:871
-#, fuzzy
-msgid "Guidonia"
-msgstr "幾內亞"
-
-#: my-evolution/Locations.h:872
-msgid "Gulfport"
-msgstr ""
-
-#: my-evolution/Locations.h:873
-#, fuzzy
-msgid "Gulkana"
-msgstr "蓋亞納"
-
-#: my-evolution/Locations.h:874
-msgid "Gullfax C"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:34
-#: my-evolution/Locations.h:875
-#, fuzzy
-msgid "Gunnison"
-msgstr "留尼旺"
-
-#: my-evolution/Locations.h:876
-msgid "Gunnison (2)"
-msgstr ""
-
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: my-evolution/Locations.h:877
-#, fuzzy
-msgid "Guriat"
-msgstr "幾內亞"
-
-#: my-evolution/Locations.h:878
-msgid "Gustavus"
-msgstr ""
-
-#: my-evolution/Locations.h:879
-#, fuzzy
-msgid "Guymon"
-msgstr "蓋亞納"
-
-#: my-evolution/Locations.h:880
-#, fuzzy
-msgid "Habana"
-msgstr "阿爾巴尼亞"
-
-#: my-evolution/Locations.h:881
-msgid "Hachijojima Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:882
-msgid "Hachinohe Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:883
-msgid "Hafr Al-Batin"
-msgstr ""
-
-#: my-evolution/Locations.h:884
-msgid "Hagerstown"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
-msgid "Hail"
-msgstr "下冰雹"
-
-#: my-evolution/Locations.h:886
-msgid "Hailey-Sun Valley"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:13
-#: my-evolution/Locations.h:887
-#, fuzzy
-msgid "Haines"
-msgstr "標題"
-
-#: my-evolution/Locations.h:889
-msgid "Hakodate Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:890
-msgid "Halifax"
-msgstr ""
-
-#: my-evolution/Locations.h:891
-msgid "Hamamatsu Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:892
-msgid "Hamburg"
-msgstr ""
-
-#: my-evolution/Locations.h:893
-msgid "Hamburg-Finkenwerder"
-msgstr ""
-
-#: my-evolution/Locations.h:894
-#, fuzzy
-msgid "Hamilton"
-msgstr "雹暴"
-
-#: my-evolution/Locations.h:895
-msgid "Hammerfest"
-msgstr ""
-
-#: my-evolution/Locations.h:896
-msgid "Hampton"
-msgstr ""
-
-#: my-evolution/Locations.h:897
-msgid "Hanamaki Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:898
-msgid "Hancock"
-msgstr ""
-
-#: my-evolution/Locations.h:899
-msgid "Hangzhou"
-msgstr ""
-
-#: my-evolution/Locations.h:900
-msgid "Hanksville"
-msgstr ""
-
-#: my-evolution/Locations.h:901
-msgid "Hannover"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:902
-#, fuzzy
-msgid "Ha Noi"
-msgstr "下冰雹"
-
-#: my-evolution/Locations.h:903
-msgid "Harbor Beach"
-msgstr ""
-
-# widgets/misc/e-messagebox.c:159
-#: my-evolution/Locations.h:904
-#, fuzzy
-msgid "Harlingen"
-msgstr "警告"
-
-#: my-evolution/Locations.h:905
-msgid "Harlowton"
-msgstr ""
-
-#: my-evolution/Locations.h:906
-msgid "Harrisburg"
-msgstr ""
-
-#: my-evolution/Locations.h:907
-msgid "Harrison"
-msgstr ""
-
-#: my-evolution/Locations.h:908
-msgid "Harstad/Narvik/Evenes"
-msgstr ""
-
-#: my-evolution/Locations.h:909
-msgid "Hartford"
-msgstr ""
-
-#: my-evolution/Locations.h:910
-msgid "Hassi-Messaoud"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:13
-#: my-evolution/Locations.h:911
-#, fuzzy
-msgid "Hastings"
-msgstr "標題"
-
-#: my-evolution/Locations.h:912
-msgid "Haugesund"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:11
-#: my-evolution/Locations.h:913
-#, fuzzy
-msgid "Havre"
-msgstr "霾"
-
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
-#: my-evolution/Locations.h:914
-#, fuzzy
-msgid "Hawaii"
-msgstr "海地"
-
-#: my-evolution/Locations.h:915
-msgid "Hawthorne"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:11
-#: my-evolution/Locations.h:916
-#, fuzzy
-msgid "Hayden"
-msgstr "頁首"
-
-#: my-evolution/Locations.h:917
-msgid "Hayes River"
-msgstr ""
-
-#: my-evolution/Locations.h:918
-#, fuzzy
-msgid "Hays"
-msgstr "天"
-
-#: my-evolution/Locations.h:919
-msgid "Hayward"
-msgstr ""
-
-#: my-evolution/Locations.h:920
-msgid "Healy River"
-msgstr ""
-
-#: my-evolution/Locations.h:921
-#, fuzzy
-msgid "Helena"
-msgstr "聖赫勒拿島"
-
-#: my-evolution/Locations.h:922
-msgid "Helsinki"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:11
-#: my-evolution/Locations.h:923
-#, fuzzy
-msgid "Henderson"
-msgstr "頁首"
-
-#: my-evolution/Locations.h:924
-msgid "Hengchun"
-msgstr ""
-
-#: my-evolution/Locations.h:925
-msgid "Hermosillo"
-msgstr ""
-
-#: my-evolution/Locations.h:926
-msgid "Hibbing"
-msgstr ""
-
-#: my-evolution/Locations.h:927
-msgid "Hickory"
-msgstr ""
-
-#: my-evolution/Locations.h:928
-msgid "Hill City"
-msgstr ""
-
-#: my-evolution/Locations.h:929
-#, fuzzy
-msgid "Hillsboro"
-msgstr "雹暴"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:930
-#, fuzzy
-msgid "Hilo"
-msgstr "下冰雹"
-
-#: my-evolution/Locations.h:931
-msgid "Hinesville"
-msgstr ""
-
-#: my-evolution/Locations.h:932
-msgid "Hiroshima Airport"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:401
-# mail/mail-config.glade.h:33
-#: my-evolution/Locations.h:933
-#, fuzzy
-msgid "Hobart"
-msgstr "主機"
-
-# addressbook/gui/component/addressbook-config.c:401
-# mail/mail-config.glade.h:33
-#: my-evolution/Locations.h:934
-#, fuzzy
-msgid "Hobbs"
-msgstr "主機"
-
-#: my-evolution/Locations.h:935
-msgid "Ho Chi Minh"
-msgstr ""
-
-#: my-evolution/Locations.h:936
-msgid "Hodeidah"
-msgstr ""
-
-#: my-evolution/Locations.h:937
-msgid "Hof"
-msgstr ""
-
-#: my-evolution/Locations.h:938
-msgid "Hoffman"
-msgstr ""
-
-#: my-evolution/Locations.h:939
-msgid "Hofu Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:940
-msgid "Hohenems"
-msgstr ""
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: my-evolution/Locations.h:941
-#, fuzzy
-msgid "Holguin"
-msgstr "Evolution"
-
-# addressbook/contact-editor/e-contact-editor.c:1249
-# addressbook/contact-editor/e-contact-editor.c:1311
-#: my-evolution/Locations.h:942
-#, fuzzy
-msgid "Homer"
-msgstr "住家電話"
-
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
-#: my-evolution/Locations.h:943
-#, fuzzy
-msgid "Homestead AFB"
-msgstr "已完成"
-
-#: my-evolution/Locations.h:944
-#, fuzzy
-msgid "Hondo"
-msgstr "龍捲風"
-
-#: my-evolution/Locations.h:947
-msgid "Honningsvag"
-msgstr ""
-
-#: my-evolution/Locations.h:948
-msgid "Honolulu"
-msgstr ""
-
-#: my-evolution/Locations.h:949
-msgid "Hoonah"
-msgstr ""
-
-#: my-evolution/Locations.h:950
-msgid "Hoquiam"
-msgstr ""
-
-#: my-evolution/Locations.h:951
-msgid "Hot Springs"
-msgstr ""
-
-#: my-evolution/Locations.h:952
-msgid "Houghton Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:953
-#, fuzzy
-msgid "Houlton"
-msgstr "外寄"
-
-# addressbook/contact-editor/e-contact-editor.c:1249
-# addressbook/contact-editor/e-contact-editor.c:1311
-#: my-evolution/Locations.h:954
-#, fuzzy
-msgid "Houma"
-msgstr "住家電話"
-
-#: my-evolution/Locations.h:955
-msgid "Houston-Bush"
-msgstr ""
-
-#: my-evolution/Locations.h:956
-msgid "Houston-Clover"
-msgstr ""
-
-#: my-evolution/Locations.h:957
-msgid "Houston-Ellington Field"
-msgstr ""
-
-#: my-evolution/Locations.h:958
-msgid "Houston-Hobby"
-msgstr ""
-
-#: my-evolution/Locations.h:959
-msgid "Houston-Hooks"
-msgstr ""
-
-# ui/evolution-mail.xml.h:34
-#: my-evolution/Locations.h:960
-#, fuzzy
-msgid "Howard AFB"
-msgstr "轉寄方式"
-
-#: my-evolution/Locations.h:961
-msgid "Hsinchu"
-msgstr ""
-
-#: my-evolution/Locations.h:962
-msgid "Huanuco"
-msgstr ""
-
-#: my-evolution/Locations.h:963
-msgid "Huehuetenango"
-msgstr ""
-
-# mail/mail-display.c:363
-#: my-evolution/Locations.h:964
-#, fuzzy
-msgid "Hulien"
-msgstr "隱藏"
-
-#: my-evolution/Locations.h:965
-msgid "Humberside"
-msgstr ""
-
-#: my-evolution/Locations.h:967
-msgid "Huntington"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:45
-#: my-evolution/Locations.h:968
-#, fuzzy
-msgid "Huntsville"
-msgstr "直至"
-
-#: my-evolution/Locations.h:969
-msgid "Hurlburt"
-msgstr ""
-
-#: my-evolution/Locations.h:970
-#, fuzzy
-msgid "Huron"
-msgstr "小時"
-
-#: my-evolution/Locations.h:971
-msgid "Hutchinson"
-msgstr ""
-
-#: my-evolution/Locations.h:972
-msgid "Hyakuri Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:973
-msgid "Hyannis"
-msgstr ""
-
-#: my-evolution/Locations.h:974
-msgid "Hyderabad"
-msgstr ""
-
-#: my-evolution/Locations.h:975
-msgid "Hyeres-Le Palyvestre"
-msgstr ""
-
-#: my-evolution/Locations.h:976
-#, fuzzy
-msgid "Iasi"
-msgstr "基本"
-
-#: my-evolution/Locations.h:977
-#, fuzzy
-msgid "Ibiza"
-msgstr "印度"
-
-#: my-evolution/Locations.h:979
-msgid "Ichikawa"
-msgstr ""
-
-#: my-evolution/Locations.h:980
-#, fuzzy
-msgid "Idaho"
-msgstr "印度"
-
-#: my-evolution/Locations.h:981
-msgid "Idaho Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:982
-msgid "Iguazu"
-msgstr ""
-
-#: my-evolution/Locations.h:983
-msgid "Iki Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:984
-#, fuzzy
-msgid "Ilan"
-msgstr "冰島"
-
-# mail/mail-config.glade.h:37
-#: my-evolution/Locations.h:985
-#, fuzzy
-msgid "Iliamna"
-msgstr "正常"
-
-#: my-evolution/Locations.h:986
-msgid "Illinois"
-msgstr ""
-
-#: my-evolution/Locations.h:987
-#, fuzzy
-msgid "Imperial"
-msgstr "英制(_I)"
-
-#: my-evolution/Locations.h:988
-#, fuzzy
-msgid "Imperial (2)"
-msgstr "英制(_I)"
-
-#: my-evolution/Locations.h:989
-#, fuzzy
-msgid "Imperial Beach"
-msgstr "英制(_I)"
-
-#: my-evolution/Locations.h:990
-#, fuzzy
-msgid "In Amenas"
-msgstr "亞美尼亞"
-
-#: my-evolution/Locations.h:992
-#, fuzzy
-msgid "Indiana"
-msgstr "印度"
-
-#: my-evolution/Locations.h:993
-msgid "Indianapolis"
-msgstr ""
-
-#: my-evolution/Locations.h:994
-msgid "Indian Springs"
-msgstr ""
-
-#: my-evolution/Locations.h:995
-msgid "Innsbruck"
-msgstr ""
-
-#: my-evolution/Locations.h:996
-msgid "International Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:997
-msgid "Intracoastal"
-msgstr ""
-
-# calendar/gui/calendar-model.c:641
-# calendar/gui/calendar-model.c:1178
-# calendar/gui/dialogs/task-editor-dialog.glade.h:11
-# calendar/gui/e-calendar-table.c:420
-#: my-evolution/Locations.h:998
-#, fuzzy
-msgid "Inverness"
-msgstr "進行中"
-
-#: my-evolution/Locations.h:999
-msgid "Inyokern"
-msgstr ""
-
-# widgets/misc/e-cell-date-edit.c:221
-# widgets/misc/e-dateedit.c:418
-#: my-evolution/Locations.h:1000
-#, fuzzy
-msgid "Iowa"
-msgstr "挪威"
-
-#: my-evolution/Locations.h:1001
-msgid "Iowa City"
-msgstr ""
-
-#: my-evolution/Locations.h:1002
-msgid "Iqaluit"
-msgstr ""
-
-#: my-evolution/Locations.h:1003
-msgid "Iquique/Diego Arac"
-msgstr ""
-
-#: my-evolution/Locations.h:1004
-msgid "Iquitos"
-msgstr ""
-
-# widgets/misc/e-messagebox.c:152
-#: my-evolution/Locations.h:1005
-#, fuzzy
-msgid "Iraklion"
-msgstr "資料"
-
-#: my-evolution/Locations.h:1006
-msgid "Iran, Islamic Republic of"
-msgstr ""
-
-# calendar/gui/gnome-cal.c:236
-#: my-evolution/Locations.h:1008
-#, fuzzy
-msgid "Iron Mountain"
-msgstr "備註包含"
-
-#: my-evolution/Locations.h:1009
-msgid "Ironwood"
-msgstr ""
-
-#: my-evolution/Locations.h:1010
-msgid "Iruma Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1011
-msgid "Islamabad"
-msgstr ""
-
-#: my-evolution/Locations.h:1012
-msgid "Isle of Man"
-msgstr ""
-
-#: my-evolution/Locations.h:1013
-msgid "Islip"
-msgstr ""
-
-#: my-evolution/Locations.h:1014
-#, fuzzy
-msgid "Istanbul"
-msgstr "義大利"
-
-#: my-evolution/Locations.h:1015
-msgid "Itaituba"
-msgstr ""
-
-#: my-evolution/Locations.h:1017
-msgid "Ithaca"
-msgstr ""
-
-#: my-evolution/Locations.h:1018
-msgid "Ivano-Frankivsk"
-msgstr ""
-
-#: my-evolution/Locations.h:1019
-msgid "Iwakuni MCAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1020
-msgid "Iwojima"
-msgstr ""
-
-#: my-evolution/Locations.h:1021
-msgid "Ixtapa"
-msgstr ""
-
-#: my-evolution/Locations.h:1022
-msgid "Izmir/Adnan Menderes"
-msgstr ""
-
-#: my-evolution/Locations.h:1023
-msgid "Izmir/Cigli"
-msgstr ""
-
-#: my-evolution/Locations.h:1024
-msgid "Izmit"
-msgstr ""
-
-# importers/elm-importer.c:512
-# importers/netscape-importer.c:780
-# importers/pine-importer.c:646
-# shell/e-shell-importer.c:653
-# shell/importer/import.glade.h:4
-#: my-evolution/Locations.h:1025
-#, fuzzy
-msgid "Izumo Airport"
-msgstr "匯入"
-
-#: my-evolution/Locations.h:1026
-msgid "Jackson"
-msgstr ""
-
-#: my-evolution/Locations.h:1027
-msgid "Jacksonville"
-msgstr ""
-
-#: my-evolution/Locations.h:1028
-msgid "Jacksonville-Craig Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1029
-msgid "Jacksonville NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1030
-msgid "Jaffrey"
-msgstr ""
-
-#: my-evolution/Locations.h:1032
-msgid "Jamestown"
-msgstr ""
-
-#: my-evolution/Locations.h:1033
-#, fuzzy
-msgid "Janesville"
-msgstr "日文"
-
-#: my-evolution/Locations.h:1034
-msgid "Jan Smuts"
-msgstr ""
-
-#: my-evolution/Locations.h:1036
-msgid "Jeddah King Abdul Aziz International Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1037
-msgid "Jefferson City"
-msgstr ""
-
-#: my-evolution/Locations.h:1038
-msgid "Jerez"
-msgstr ""
-
-#: my-evolution/Locations.h:1039
-msgid "Jersey"
-msgstr ""
-
-#: my-evolution/Locations.h:1040
-msgid "Jinotega"
-msgstr ""
-
-#: my-evolution/Locations.h:1041
-msgid "Johan A. Pengel"
-msgstr ""
-
-#: my-evolution/Locations.h:1042
-msgid "Johnstown"
-msgstr ""
-
-#: my-evolution/Locations.h:1043
-msgid "Jonesboro"
-msgstr ""
-
-# mail/mail-mt.c:516
-# mail/mail-mt.c:545
-# mail/mail-mt.c:880
-#: my-evolution/Locations.h:1044
-#, fuzzy
-msgid "Jonkoping"
-msgstr "正在工作"
-
-# mail/mail-ops.c:917
-#: my-evolution/Locations.h:1045
-#, fuzzy
-msgid "Joplin"
-msgstr "複製"
-
-#: my-evolution/Locations.h:1047
-msgid "Juanjui"
-msgstr ""
-
-#: my-evolution/Locations.h:1048
-msgid "Juan Santamaria"
-msgstr ""
-
-#: my-evolution/Locations.h:1049
-#, fuzzy
-msgid "Juigalpa"
-msgstr "日本"
-
-# calendar/gui/goto-dialog.glade.h:8
-#: my-evolution/Locations.h:1050
-#, fuzzy
-msgid "Jujuy"
-msgstr "7月"
-
-# calendar/gui/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
-#: my-evolution/Locations.h:1051
-#, fuzzy
-msgid "Juliaca"
-msgstr "公開"
-
-# addressbook/printing/e-contact-print.glade.h:34
-#: my-evolution/Locations.h:1052
-#, fuzzy
-msgid "Junction"
-msgstr "留尼旺"
-
-# calendar/gui/goto-dialog.glade.h:9
-#: my-evolution/Locations.h:1053
-#, fuzzy
-msgid "Juneau"
-msgstr "6月"
-
-#: my-evolution/Locations.h:1054
-msgid "Kadena Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1055
-msgid "Kagoshima Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1056
-msgid "Kahului"
-msgstr ""
-
-#: my-evolution/Locations.h:1057
-msgid "Kailua-Kona"
-msgstr ""
-
-#: my-evolution/Locations.h:1058
-msgid "Kake"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1059
-#, fuzzy
-msgid "Kalamata"
-msgstr "馬爾他"
-
-#: my-evolution/Locations.h:1060
-msgid "Kalamazoo"
-msgstr ""
-
-#: my-evolution/Locations.h:1061
-msgid "Kalispell"
-msgstr ""
-
-#: my-evolution/Locations.h:1062
-msgid "Kamigoto"
-msgstr ""
-
-#: my-evolution/Locations.h:1063
-msgid "Kaneohe"
-msgstr ""
-
-#: my-evolution/Locations.h:1064
-msgid "Kangshan"
-msgstr ""
-
-#: my-evolution/Locations.h:1065
-msgid "Kanoya Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1066
-msgid "Kansai International Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1067
-msgid "Kansas"
-msgstr ""
-
-#: my-evolution/Locations.h:1068
-msgid "Kansas City"
-msgstr ""
-
-#: my-evolution/Locations.h:1069
-msgid "Kansas City-Gladstone"
-msgstr ""
-
-#: my-evolution/Locations.h:1070
-msgid "Kaohsiung"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:10
-#: my-evolution/Locations.h:1071
-#, fuzzy
-msgid "Karachi"
-msgstr "3月"
-
-#: my-evolution/Locations.h:1072
-#, fuzzy
-msgid "Karup"
-msgstr "諾魯"
-
-#: my-evolution/Locations.h:1073
-msgid "Kassel-Calden"
-msgstr ""
-
-#: my-evolution/Locations.h:1074
-msgid "Kasumigaura Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1075
-msgid "Kasuminome Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1076
-msgid "Katowice"
-msgstr ""
-
-#: my-evolution/Locations.h:1077
-msgid "Kavala"
-msgstr ""
-
-#: my-evolution/Locations.h:1078
-msgid "Kayseri"
-msgstr ""
-
-#: my-evolution/Locations.h:1079
-#, fuzzy
-msgid "Kazan"
-msgstr "哈薩克"
-
-#: my-evolution/Locations.h:1080
-#, fuzzy
-msgid "Kearney"
-msgstr "肯亞"
-
-# mail/message-list.c:678
-#: my-evolution/Locations.h:1081
-#, fuzzy
-msgid "Keene"
-msgstr "已閱讀"
-
-#: my-evolution/Locations.h:1082
-msgid "Kefallinia"
-msgstr ""
-
-#: my-evolution/Locations.h:1083
-msgid "Keflavik"
-msgstr ""
-
-#: my-evolution/Locations.h:1084
-#, fuzzy
-msgid "Kenai"
-msgstr "肯亞"
-
-#: my-evolution/Locations.h:1085
-#, fuzzy
-msgid "Kenosha"
-msgstr "肯亞"
-
-#: my-evolution/Locations.h:1086
-#, fuzzy
-msgid "Kentucky"
-msgstr "肯亞"
-
-#: my-evolution/Locations.h:1087
-msgid "Keokuk"
-msgstr ""
-
-#: my-evolution/Locations.h:1088
-msgid "Kerkira"
-msgstr ""
-
-#: my-evolution/Locations.h:1089
-#, fuzzy
-msgid "Kerman"
-msgstr "德國"
-
-#: my-evolution/Locations.h:1090
-msgid "Ketchikan"
-msgstr ""
-
-#: my-evolution/Locations.h:1091
-#, fuzzy
-msgid "Key West"
-msgstr "西"
-
-#: my-evolution/Locations.h:1092
-msgid "Key West NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1093
-msgid "Khabarovsk"
-msgstr ""
-
-#: my-evolution/Locations.h:1094
-msgid "Khamis Mushait"
-msgstr ""
-
-#: my-evolution/Locations.h:1095
-msgid "Kharkiv"
-msgstr ""
-
-#: my-evolution/Locations.h:1096
-#, fuzzy
-msgid "Kikai Island"
-msgstr "科克群島"
-
-#: my-evolution/Locations.h:1097
-msgid "Killeen"
-msgstr ""
-
-#: my-evolution/Locations.h:1098
-msgid "Killeen-Ft Hood"
-msgstr ""
-
-#: my-evolution/Locations.h:1099
-msgid "Killeen-Gray AAF"
-msgstr ""
-
-#: my-evolution/Locations.h:1100
-msgid "King Khaled International Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1101
-msgid "Kingman"
-msgstr ""
-
-#: my-evolution/Locations.h:1102
-msgid "King Salmon"
-msgstr ""
-
-#: my-evolution/Locations.h:1103
-msgid "Kingston"
-msgstr ""
-
-#: my-evolution/Locations.h:1104
-msgid "Kingsville"
-msgstr ""
-
-#: my-evolution/Locations.h:1105
-msgid "Kinloss"
-msgstr ""
-
-#: my-evolution/Locations.h:1106
-msgid "Kinston"
-msgstr ""
-
-#: my-evolution/Locations.h:1107
-msgid "Kirkenes"
-msgstr ""
-
-#: my-evolution/Locations.h:1108
-msgid "Kirksville"
-msgstr ""
-
-#: my-evolution/Locations.h:1109
-msgid "Kiruna"
-msgstr ""
-
-#: my-evolution/Locations.h:1110
-msgid "Kisarazu Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1111
-msgid "Kishineu"
-msgstr ""
-
-#: my-evolution/Locations.h:1112
-msgid "Kitakyushu Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1113
-msgid "Klagenfurt"
-msgstr ""
-
-#: my-evolution/Locations.h:1114
-msgid "Klamath Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:1115
-msgid "Klawock"
-msgstr ""
-
-#: my-evolution/Locations.h:1116
-msgid "Kleine Brogel"
-msgstr ""
-
-#: my-evolution/Locations.h:1117
-msgid "Kliningrad"
-msgstr ""
-
-#: my-evolution/Locations.h:1118
-msgid "Knoxville"
-msgstr ""
-
-#: my-evolution/Locations.h:1119
-msgid "Knoxville-Downtown"
-msgstr ""
-
-#: my-evolution/Locations.h:1120
-msgid "Kobenhavn/Kastrup"
-msgstr ""
-
-#: my-evolution/Locations.h:1121
-msgid "Kobenhavn/Roskilde"
-msgstr ""
-
-#: my-evolution/Locations.h:1122
-msgid "Kochi Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1123
-msgid "Kodiak"
-msgstr ""
-
-#: my-evolution/Locations.h:1124
-msgid "Kogalniceanu"
-msgstr ""
-
-#: my-evolution/Locations.h:1125
-msgid "Kogalym"
-msgstr ""
-
-#: my-evolution/Locations.h:1126
-msgid "Koksijde"
-msgstr ""
-
-#: my-evolution/Locations.h:1127
-msgid "Kolding/Vandrup"
-msgstr ""
-
-#: my-evolution/Locations.h:1128
-msgid "Koln/Bonn"
-msgstr ""
-
-#: my-evolution/Locations.h:1129
-msgid "Komatsu Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1130
-msgid "Komatsujima Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1131
-#, fuzzy
-msgid "Konya"
-msgstr "肯亞"
-
-#: my-evolution/Locations.h:1132
-msgid "Korea, Democratic People's Republic of"
-msgstr ""
-
-#: my-evolution/Locations.h:1133
-#, fuzzy
-msgid "Korea, Republic of"
-msgstr "捷克"
-
-#: my-evolution/Locations.h:1134
-msgid "Kos"
-msgstr ""
-
-#: my-evolution/Locations.h:1135
-msgid "Kotzebue"
-msgstr ""
-
-#: my-evolution/Locations.h:1136
-#, fuzzy
-msgid "Kozani"
-msgstr "韓文"
-
-#: my-evolution/Locations.h:1137
-msgid "Krakow"
-msgstr ""
-
-#: my-evolution/Locations.h:1138
-msgid "Krasnodar"
-msgstr ""
-
-#: my-evolution/Locations.h:1139
-msgid "Krasnoyarsk"
-msgstr ""
-
-#: my-evolution/Locations.h:1140
-msgid "Kristiansand/Kjevik"
-msgstr ""
-
-#: my-evolution/Locations.h:1141
-msgid "Kristiansund/Kvernberget"
-msgstr ""
-
-#: my-evolution/Locations.h:1142
-msgid "Kryviy Rig/Lozovatka"
-msgstr ""
-
-#: my-evolution/Locations.h:1143
-msgid "Kumamoto Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1144
-#, fuzzy
-msgid "Kunming"
-msgstr "內送"
-
-#: my-evolution/Locations.h:1145
-msgid "Kushiro Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
-msgstr ""
-
-#: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
-msgstr ""
-
-#: my-evolution/Locations.h:1149
-msgid "La Ceiba"
-msgstr ""
-
-#: my-evolution/Locations.h:1150
-#, fuzzy
-msgid "Laconia"
-msgstr "馬其頓"
-
-#: my-evolution/Locations.h:1151
-msgid "La Coruna"
-msgstr ""
-
-# mail/message-list.c:685
-#: my-evolution/Locations.h:1152
-#, fuzzy
-msgid "La Crosse"
-msgstr "寮國"
-
-#: my-evolution/Locations.h:1153
-msgid "La Esperanza"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:1154
-#, fuzzy
-msgid "Lafayette"
-msgstr "美亞特"
-
-#: my-evolution/Locations.h:1155
-msgid "La Grande"
-msgstr ""
-
-#: my-evolution/Locations.h:1156
-#, fuzzy
-msgid "Lahaina"
-msgstr "巴林"
-
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
-#: my-evolution/Locations.h:1157
-#, fuzzy
-msgid "Lahore"
-msgstr "呼叫器"
-
-# mail/message-list.c:685
-#: my-evolution/Locations.h:1158
-#, fuzzy
-msgid "Lajes"
-msgstr "寮國"
-
-#: my-evolution/Locations.h:1159
-msgid "La Junta"
-msgstr ""
-
-#: my-evolution/Locations.h:1160
-msgid "Lake Charles"
-msgstr ""
-
-#: my-evolution/Locations.h:1161
-msgid "Lake Hood"
-msgstr ""
-
-#: my-evolution/Locations.h:1162
-msgid "Lakehurst"
-msgstr ""
-
-#: my-evolution/Locations.h:1163
-#, fuzzy
-msgid "Lakeland"
-msgstr "冰島"
-
-#: my-evolution/Locations.h:1164
-msgid "Lake Tahoe"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:15
-#: my-evolution/Locations.h:1165
-#, fuzzy
-msgid "Lakeview"
-msgstr "預覽"
-
-# addressbook/gui/widgets/e-addressbook-view.c:732
-#: my-evolution/Locations.h:1166
-#, fuzzy
-msgid "Lamar"
-msgstr "緬甸"
-
-# ui/evolution-mail.xml.h:109
-#: my-evolution/Locations.h:1167
-#, fuzzy
-msgid "La Mesa"
-msgstr "郵件訊息(_M)"
-
-#: my-evolution/Locations.h:1168
-#, fuzzy
-msgid "Lamezia"
-msgstr "甘比亞"
-
-#: my-evolution/Locations.h:1169
-#, fuzzy
-msgid "Lamoni"
-msgstr "黎巴嫩"
-
-#: my-evolution/Locations.h:1170
-msgid "Lampedusa"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:732
-#: my-evolution/Locations.h:1171
-#, fuzzy
-msgid "Lanai"
-msgstr "語言"
-
-# addressbook/printing/e-contact-print.glade.h:18
-#: my-evolution/Locations.h:1172
-#, fuzzy
-msgid "Lancaster"
-msgstr "橫向"
-
-# addressbook/printing/e-contact-print.glade.h:11
-#: my-evolution/Locations.h:1173
-#, fuzzy
-msgid "Lander"
-msgstr "頁首"
-
-# addressbook/gui/widgets/e-addressbook-view.c:732
-#: my-evolution/Locations.h:1174
-#, fuzzy
-msgid "Langebaanweg"
-msgstr "語言"
-
-#: my-evolution/Locations.h:1175
-msgid "Langley AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1176
-#, fuzzy
-msgid "Lannion"
-msgstr "黎巴嫩"
-
-# widgets/misc/e-messagebox.c:159
-#: my-evolution/Locations.h:1177
-#, fuzzy
-msgid "Lansing"
-msgstr "警告"
-
-#: my-evolution/Locations.h:1178
-msgid "Lanzhou"
-msgstr ""
-
-#: my-evolution/Locations.h:1179
-msgid "La Paz"
-msgstr ""
-
-#: my-evolution/Locations.h:1180
-msgid "La Paz/Alto"
-msgstr ""
-
-#: my-evolution/Locations.h:1181
-msgid "Laramie"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
-#: my-evolution/Locations.h:1182
-#, fuzzy
-msgid "Laredo"
-msgstr "呼叫器"
-
-#: my-evolution/Locations.h:1183
-#, fuzzy
-msgid "Larnaka"
-msgstr "斯里蘭卡"
-
-#: my-evolution/Locations.h:1184
-#, fuzzy
-msgid "La Romana"
-msgstr "羅馬尼亞"
-
-#: my-evolution/Locations.h:1185
-msgid "Las Americas"
-msgstr ""
-
-#: my-evolution/Locations.h:1186
-msgid "Las Tunas"
-msgstr ""
-
-#: my-evolution/Locations.h:1187
-msgid "Las Vegas"
-msgstr ""
-
-#: my-evolution/Locations.h:1188
-#, fuzzy
-msgid "Latina"
-msgstr "拉脫維亞"
-
-#: my-evolution/Locations.h:1189
-msgid "Latrobe"
-msgstr ""
-
-#: my-evolution/Locations.h:1191
-msgid "Laughlin"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
-#: my-evolution/Locations.h:1192
-#, fuzzy
-msgid "Laurel"
-msgstr "呼叫器"
-
-#: my-evolution/Locations.h:1193
-#, fuzzy
-msgid "La Verne"
-msgstr "維德角島"
-
-#: my-evolution/Locations.h:1194
-msgid "Lawrence"
-msgstr ""
-
-#: my-evolution/Locations.h:1195
-#, fuzzy
-msgid "Lawton"
-msgstr "黎巴嫩"
-
-#: my-evolution/Locations.h:1196
-msgid "Leadville"
-msgstr ""
-
-# mail/message-list.c:685
-#: my-evolution/Locations.h:1197
-#, fuzzy
-msgid "Learmouth"
-msgstr "賴索托"
-
-#: my-evolution/Locations.h:1199
-msgid "Lecce"
-msgstr ""
-
-#: my-evolution/Locations.h:1200
-msgid "Leeds and Bradford"
-msgstr ""
-
-#: my-evolution/Locations.h:1201
-#, fuzzy
-msgid "Leesburg"
-msgstr "盧森堡"
-
-#: my-evolution/Locations.h:1202
-msgid "Leeuwarden"
-msgstr ""
-
-#: my-evolution/Locations.h:1203
-msgid "Le Havre-Octeville"
-msgstr ""
-
-#: my-evolution/Locations.h:1204
-msgid "Leipzig-Schkeuditz"
-msgstr ""
-
-#: my-evolution/Locations.h:1205
-msgid "Leknes"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:1206
-#, fuzzy
-msgid "Le Mans"
-msgstr "主管"
-
-#: my-evolution/Locations.h:1207
-#, fuzzy
-msgid "Le Marine"
-msgstr "法屬馬丁尼克"
-
-#: my-evolution/Locations.h:1208
-#, fuzzy
-msgid "Lemmon"
-msgstr "黎巴嫩"
-
-# addressbook/gui/component/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
-#: my-evolution/Locations.h:1209
-#, fuzzy
-msgid "Lemoore"
-msgstr "移除"
-
-#: my-evolution/Locations.h:1210
-msgid "Leticia/Vasquez Cobo"
-msgstr ""
-
-#: my-evolution/Locations.h:1211
-msgid "Le Touquet"
-msgstr ""
-
-#: my-evolution/Locations.h:1212
-#, fuzzy
-msgid "Leuchars"
-msgstr "年"
-
-#: my-evolution/Locations.h:1213
-#, fuzzy
-msgid "Lewisburg"
-msgstr "盧森堡"
-
-# mail/message-list.c:685
-#: my-evolution/Locations.h:1214
-#, fuzzy
-msgid "Lewiston"
-msgstr "賴索托"
-
-# mail/message-list.c:685
-#: my-evolution/Locations.h:1215
-#, fuzzy
-msgid "Lewistown"
-msgstr "賴索托"
-
-#: my-evolution/Locations.h:1216
-#, fuzzy
-msgid "Lexington"
-msgstr "黎巴嫩"
-
-#: my-evolution/Locations.h:1217
-#, fuzzy
-msgid "Liberal"
-msgstr "賴比瑞亞"
-
-#: my-evolution/Locations.h:1219
-#, fuzzy
-msgid "Libya"
-msgstr "賴比瑞亞"
-
-#: my-evolution/Locations.h:1220
-msgid "Lichtenburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1221
-msgid "Lidgerwood"
-msgstr ""
-
-# mail/message-list.c:690
-#: my-evolution/Locations.h:1222
-#, fuzzy
-msgid "Liege"
-msgstr "尼日"
-
-#: my-evolution/Locations.h:1223
-#, fuzzy
-msgid "Lihue"
-msgstr "紐威島"
-
-#: my-evolution/Locations.h:1224
-msgid "Lille-Lesquin"
-msgstr ""
-
-#: my-evolution/Locations.h:1225
-msgid "Lima-Callao"
-msgstr ""
-
-# mail/message-list.c:685
-#: my-evolution/Locations.h:1226
-#, fuzzy
-msgid "Limnos"
-msgstr "寮國"
-
-# mail/message-list.c:685
-#: my-evolution/Locations.h:1227
-#, fuzzy
-msgid "Limoges"
-msgstr "最低"
-
-#: my-evolution/Locations.h:1228
-#, fuzzy
-msgid "Limon"
-msgstr "月"
-
-#: my-evolution/Locations.h:1229
-#, fuzzy
-msgid "Lincoln"
-msgstr "內送"
-
-#: my-evolution/Locations.h:1230
-msgid "Linz"
-msgstr ""
-
-#: my-evolution/Locations.h:1231
-#, fuzzy
-msgid "Lisboa"
-msgstr "賴比瑞亞"
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: my-evolution/Locations.h:1232
-#, fuzzy
-msgid "Lista"
-msgstr "靄"
-
-#: my-evolution/Locations.h:1233
-#, fuzzy
-msgid "Litchfield"
-msgstr "小冰雹"
-
-#: my-evolution/Locations.h:1235
-msgid "Little Rock"
-msgstr ""
-
-#: my-evolution/Locations.h:1236
-msgid "Little Rock AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1237
-msgid "Livermore"
-msgstr ""
-
-#: my-evolution/Locations.h:1238
-msgid "Liverpool"
-msgstr ""
-
-#: my-evolution/Locations.h:1239
-msgid "Livingston"
-msgstr ""
-
-#: my-evolution/Locations.h:1240
-msgid "Ljubljana"
-msgstr ""
-
-# camel/camel-sasl-login.c:32
-#: my-evolution/Locations.h:1241
-#, fuzzy
-msgid "Logan"
-msgstr "NT 登錄"
-
-#: my-evolution/Locations.h:1242
-msgid "Lolland Falster"
-msgstr ""
-
-# ui/evolution-event-editor.xml.h:13
-# ui/evolution-mail.xml.h:8
-# ui/evolution-task-editor-dialog.xml.h:14
-#: my-evolution/Locations.h:1243
-#, fuzzy
-msgid "Lompoc"
-msgstr "公司電話"
-
-#: my-evolution/Locations.h:1244
-#, fuzzy
-msgid "London"
-msgstr "黎巴嫩"
-
-#: my-evolution/Locations.h:1245
-msgid "London/City"
-msgstr ""
-
-#: my-evolution/Locations.h:1246
-msgid "London/Gatwick"
-msgstr ""
-
-#: my-evolution/Locations.h:1247
-msgid "London/Heathrow"
-msgstr ""
-
-#: my-evolution/Locations.h:1248
-msgid "London/Stansted"
-msgstr ""
-
-#: my-evolution/Locations.h:1249
-#, fuzzy
-msgid "Londrina"
-msgstr "宏都拉斯"
-
-#: my-evolution/Locations.h:1250
-msgid "Lone Rock"
-msgstr ""
-
-#: my-evolution/Locations.h:1251
-msgid "Long Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:1252
-msgid "Longview"
-msgstr ""
-
-#: my-evolution/Locations.h:1253
-msgid "Lorient-Lann-Bihoue"
-msgstr ""
-
-# calendar/gui/e-calendar-table.c:162
-#: my-evolution/Locations.h:1254
-#, fuzzy
-msgid "Los Alamos"
-msgstr "提醒"
-
-#: my-evolution/Locations.h:1255
-msgid "Los Angeles"
-msgstr ""
-
-#: my-evolution/Locations.h:1256
-msgid "Los Mochis"
-msgstr ""
-
-#: my-evolution/Locations.h:1257
-msgid "Lossiemouth"
-msgstr ""
-
-#: my-evolution/Locations.h:1258
-msgid "Louisville"
-msgstr ""
-
-#: my-evolution/Locations.h:1259
-msgid "Louisville-Standiford Field"
-msgstr ""
-
-#: my-evolution/Locations.h:1260
-#, fuzzy
-msgid "Lousiana"
-msgstr "波札那"
-
-#: my-evolution/Locations.h:1261
-msgid "Lovelock"
-msgstr ""
-
-#: my-evolution/Locations.h:1262
-msgid "Lubbock"
-msgstr ""
-
-#: my-evolution/Locations.h:1263
-msgid "Lubeck-Blankensee"
-msgstr ""
-
-#: my-evolution/Locations.h:1264
-msgid "Lufkin"
-msgstr ""
-
-#: my-evolution/Locations.h:1265
-#, fuzzy
-msgid "Lugano"
-msgstr "黎巴嫩"
-
-#: my-evolution/Locations.h:1266
-msgid "Luqa"
-msgstr ""
-
-#: my-evolution/Locations.h:1267
-#, fuzzy
-msgid "Luton"
-msgstr "外寄"
-
-#: my-evolution/Locations.h:1269
-msgid "Luxeuil"
-msgstr ""
-
-#: my-evolution/Locations.h:1270
-#, fuzzy
-msgid "Luxor"
-msgstr "盧森堡"
-
-#: my-evolution/Locations.h:1271
-#, fuzzy
-msgid "Lviv"
-msgstr "拉脫維亞"
-
-#: my-evolution/Locations.h:1272
-msgid "Lynchburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1273
-msgid "Lyneham"
-msgstr ""
-
-#: my-evolution/Locations.h:1274
-msgid "Lyon-Bron"
-msgstr ""
-
-#: my-evolution/Locations.h:1275
-msgid "Lyon-Satolas"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:10
-#: my-evolution/Locations.h:1276
-#, fuzzy
-msgid "Maastricht"
-msgstr "3月"
-
-# calendar/gui/goto-dialog.glade.h:10
-#: my-evolution/Locations.h:1277
-#, fuzzy
-msgid "Macae"
-msgstr "澳門"
-
-# calendar/gui/goto-dialog.glade.h:10
-#: my-evolution/Locations.h:1278
-#, fuzzy
-msgid "Macapa"
-msgstr "澳門"
-
-#: my-evolution/Locations.h:1279
-#, fuzzy
-msgid "Maceio"
-msgstr "馬其頓"
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:1280
-#, fuzzy
-msgid "Macon"
-msgstr "主管"
-
-#: my-evolution/Locations.h:1281
-#, fuzzy
-msgid "Madinah"
-msgstr "馬其頓"
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:1282
-#, fuzzy
-msgid "Madison"
-msgstr "無線電電話"
-
-#: my-evolution/Locations.h:1283
-msgid "Madras/Minambakkam"
-msgstr ""
-
-#: my-evolution/Locations.h:1284
-msgid "Madrid (Barajas)"
-msgstr ""
-
-#: my-evolution/Locations.h:1285
-msgid "Madrid (Cuatro Vientos)"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:2
-#: my-evolution/Locations.h:1286
-#, fuzzy
-msgid "Magadan"
-msgstr "加拿大"
-
-#: my-evolution/Locations.h:1287
-msgid "Magdalena"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:1288
-#, fuzzy
-msgid "Maine"
-msgstr "主管"
-
-#: my-evolution/Locations.h:1289
-msgid "Makhachkala"
-msgstr ""
-
-#: my-evolution/Locations.h:1290
-msgid "Makkah"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:1291
-#, fuzzy
-msgid "Makung"
-msgstr "主管"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1292
-#, fuzzy
-msgid "Malad City"
-msgstr "馬拉威"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1293
-#, fuzzy
-msgid "Malaga"
-msgstr "馬爾他"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1294
-#, fuzzy
-msgid "Malatya"
-msgstr "馬爾他"
-
-#: my-evolution/Locations.h:1295
-msgid "Maldonado/Punta Est"
-msgstr ""
-
-#: my-evolution/Locations.h:1296
-msgid "Malmo/Sturup"
-msgstr ""
-
-#: my-evolution/Locations.h:1298
-msgid "Mammoth Lakes"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:732
-#: my-evolution/Locations.h:1299
-#, fuzzy
-msgid "Managua"
-msgstr "主管"
-
-#: my-evolution/Locations.h:1300
-#, fuzzy
-msgid "Manassas"
-msgstr "馬來西亞"
-
-# calendar/gui/goto-dialog.glade.h:10
-#: my-evolution/Locations.h:1301
-#, fuzzy
-msgid "Manaus"
-msgstr "澳門"
-
-# mail/mail-search.c:319
-#: my-evolution/Locations.h:1302
-#, fuzzy
-msgid "Manchester"
-msgstr "符合的資料："
-
-#: my-evolution/Locations.h:1303
-msgid "Mangilsan Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1304
-msgid "Manhattan"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:1305
-#, fuzzy
-msgid "Manisa"
-msgstr "主管"
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: my-evolution/Locations.h:1306
-#, fuzzy
-msgid "Manistee"
-msgstr "靄"
-
-# ui/evolution.xml.h:22
-#: my-evolution/Locations.h:1307
-#, fuzzy
-msgid "Manitoba"
-msgstr "主工具列"
-
-#: my-evolution/Locations.h:1308
-msgid "Manitowoc"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-# calendar/gui/event-editor.c:475
-#: my-evolution/Locations.h:1309
-#, fuzzy
-msgid "Mankato"
-msgstr "摩納哥"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1310
-#, fuzzy
-msgid "Mansfield"
-msgstr "郵件"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1311
-#, fuzzy
-msgid "Manta"
-msgstr "馬爾他"
-
-#: my-evolution/Locations.h:1312
-msgid "Manzanillo"
-msgstr ""
-
-#: my-evolution/Locations.h:1313
-#, fuzzy
-msgid "Maraba"
-msgstr "茅利塔尼亞"
-
-#: my-evolution/Locations.h:1314
-msgid "Maracaibo-La Chinita"
-msgstr ""
-
-#: my-evolution/Locations.h:1315
-msgid "Maracay-B.A.Sucre"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:10
-#: my-evolution/Locations.h:1316
-#, fuzzy
-msgid "Marathon"
-msgstr "3月"
-
-#: my-evolution/Locations.h:1317
-msgid "Mar Del Plata"
-msgstr ""
-
-#: my-evolution/Locations.h:1318
-#, fuzzy
-msgid "Margarita"
-msgstr "茅利塔尼亞"
-
-#: my-evolution/Locations.h:1319
-#, fuzzy
-msgid "Marianna"
-msgstr "茅利塔尼亞"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1320
-#, fuzzy
-msgid "Marib"
-msgstr "馬利"
-
-#: my-evolution/Locations.h:1321
-msgid "Maribor"
-msgstr ""
-
-#: my-evolution/Locations.h:1322
-#, fuzzy
-msgid "Marietta"
-msgstr "茅利塔尼亞"
-
-#: my-evolution/Locations.h:1323
-msgid "Marino di Ravenna"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:21
-#: my-evolution/Locations.h:1324
-#, fuzzy
-msgid "Marion"
-msgstr "邊界"
-
-#: my-evolution/Locations.h:1325
-msgid "Marion-Wytheville"
-msgstr ""
-
-#: my-evolution/Locations.h:1326
-#, fuzzy
-msgid "Marquette"
-msgstr "法屬馬丁尼克"
-
-#: my-evolution/Locations.h:1327
-msgid "Marseille-Provence"
-msgstr ""
-
-#: my-evolution/Locations.h:1328
-msgid "Marseilles"
-msgstr ""
-
-#: my-evolution/Locations.h:1329
-#, fuzzy
-msgid "Marshall"
-msgstr "馬紹爾群島"
-
-#: my-evolution/Locations.h:1330
-#, fuzzy
-msgid "Marshalltown"
-msgstr "馬紹爾群島"
-
-#: my-evolution/Locations.h:1331
-msgid "Marshfield"
-msgstr ""
-
-#: my-evolution/Locations.h:1332
-#, fuzzy
-msgid "Marte"
-msgstr "法屬馬丁尼克"
-
-# mail/folder-browser.c:706
-#: my-evolution/Locations.h:1333
-#, fuzzy
-msgid "Marthas Vineyard"
-msgstr "標示成未閱讀(_n)"
-
-#: my-evolution/Locations.h:1334
-#, fuzzy
-msgid "Martinsburg"
-msgstr "法屬馬丁尼克"
-
-#: my-evolution/Locations.h:1335
-#, fuzzy
-msgid "Martinsville"
-msgstr "法屬馬丁尼克"
-
-#: my-evolution/Locations.h:1336
-#, fuzzy
-msgid "Maryland"
-msgstr "愛爾蘭"
-
-#: my-evolution/Locations.h:1337
-msgid "Marysville"
-msgstr ""
-
-#: my-evolution/Locations.h:1338
-msgid "Marysville-Beale AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1339
-msgid "Mashhad"
-msgstr ""
-
-#: my-evolution/Locations.h:1340
-#, fuzzy
-msgid "Masirah"
-msgstr "馬來西亞"
-
-#: my-evolution/Locations.h:1341
-msgid "Mason City"
-msgstr ""
-
-#: my-evolution/Locations.h:1342
-msgid "Massachusetts"
-msgstr ""
-
-#: my-evolution/Locations.h:1343
-#, fuzzy
-msgid "Massena"
-msgstr "馬其頓"
-
-# ui/evolution-mail.xml.h:5
-#: my-evolution/Locations.h:1344
-#, fuzzy
-msgid "Matamoros"
-msgstr "葛摩"
-
-#: my-evolution/Locations.h:1345
-msgid "Matsumoto Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1346
-msgid "Matsushima Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1347
-msgid "Matsuyama Airport"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:1348
-#, fuzzy
-msgid "Mattoon"
-msgstr "主管"
-
-# addressbook/gui/widgets/e-addressbook-view.c:732
-#: my-evolution/Locations.h:1349
-#, fuzzy
-msgid "Mayaguez"
-msgstr "主管"
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:1350
-#, fuzzy
-msgid "Mayport"
-msgstr "美亞特"
-
-#: my-evolution/Locations.h:1351
-#, fuzzy
-msgid "Mazatlan"
-msgstr "哈薩克"
-
-# calendar/gui/goto-dialog.glade.h:10
-#: my-evolution/Locations.h:1352
-#, fuzzy
-msgid "Mazu"
-msgstr "澳門"
-
-#: my-evolution/Locations.h:1353
-msgid "McAlester"
-msgstr ""
-
-#: my-evolution/Locations.h:1354
-msgid "McAllen"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1355
-#, fuzzy
-msgid "McCall"
-msgstr "馬利"
-
-# calendar/gui/goto-dialog.glade.h:10
-#: my-evolution/Locations.h:1356
-#, fuzzy
-msgid "McCarthy"
-msgstr "3月"
-
-#: my-evolution/Locations.h:1357
-#, fuzzy
-msgid "McClellan"
-msgstr "冰島"
-
-# ui/evolution-event-editor.xml.h:13
-# ui/evolution-mail.xml.h:8
-# ui/evolution-task-editor-dialog.xml.h:14
-#: my-evolution/Locations.h:1358
-#, fuzzy
-msgid "McComb"
-msgstr "公司電話"
-
-#: my-evolution/Locations.h:1359
-msgid "McCook"
-msgstr ""
-
-#: my-evolution/Locations.h:1360
-msgid "McGrath"
-msgstr ""
-
-#: my-evolution/Locations.h:1361
-msgid "Mc Gregor"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:10
-#: my-evolution/Locations.h:1362
-#, fuzzy
-msgid "Meacham"
-msgstr "澳門"
-
-# calendar/gui/event-editor-dialog.glade.h:34
-#: my-evolution/Locations.h:1363
-#, fuzzy
-msgid "Medford"
-msgstr "之前"
-
-#: my-evolution/Locations.h:1364
-msgid "Medicine Lodge"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:1365
-#, fuzzy
-msgid "Mehamn"
-msgstr "主管"
-
-#: my-evolution/Locations.h:1366
-msgid "Mekoryuk"
-msgstr ""
-
-#: my-evolution/Locations.h:1367
-msgid "Melbourne"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1368
-#, fuzzy
-msgid "Melfa"
-msgstr "馬爾他"
-
-#: my-evolution/Locations.h:1369
-msgid "Melilla"
-msgstr ""
-
-#: my-evolution/Locations.h:1370
-msgid "Memambetsu Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1371
-msgid "Memphis"
-msgstr ""
-
-#: my-evolution/Locations.h:1372
-msgid "Memphis-NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1373
-#, fuzzy
-msgid "Mendoza"
-msgstr "馬其頓"
-
-#: my-evolution/Locations.h:1374
-msgid "Mene Grande"
-msgstr ""
-
-#: my-evolution/Locations.h:1375
-msgid "Menominee"
-msgstr ""
-
-#: my-evolution/Locations.h:1376
-msgid "Menorca"
-msgstr ""
-
-#: my-evolution/Locations.h:1377
-msgid "Merced"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-# calendar/gui/event-editor.c:479
-#: my-evolution/Locations.h:1378
-#, fuzzy
-msgid "Merida"
-msgstr "星期五"
-
-#: my-evolution/Locations.h:1379
-msgid "Meridian"
-msgstr ""
-
-#: my-evolution/Locations.h:1380
-msgid "Meridian-Lauderdale"
-msgstr ""
-
-# ui/evolution-message-composer.xml.h:47
-#: my-evolution/Locations.h:1381
-#, fuzzy
-msgid "Merril Field"
-msgstr "寄件者(_F)"
-
-#: my-evolution/Locations.h:1382
-msgid "Mersa Matruh"
-msgstr ""
-
-#: my-evolution/Locations.h:1383
-msgid "Mesa-Falcon Field"
-msgstr ""
-
-#: my-evolution/Locations.h:1384
-msgid "Metabaru Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1385
-msgid "Metz-Frescaty"
-msgstr ""
-
-#: my-evolution/Locations.h:1386
-#, fuzzy
-msgid "Mexicali"
-msgstr "墨西哥"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1388
-#, fuzzy
-msgid "Miami"
-msgstr "馬利"
-
-#: my-evolution/Locations.h:1389
-msgid "Miami-Kendall"
-msgstr ""
-
-#: my-evolution/Locations.h:1390
-msgid "Miami-Opa Locka"
-msgstr ""
-
-#: my-evolution/Locations.h:1391
-msgid "Michigan"
-msgstr ""
-
-# addressbook/contact-editor/fullname.glade.h:15
-#: my-evolution/Locations.h:1392
-#, fuzzy
-msgid "Middle East"
-msgstr "中名(_M)："
-
-#: my-evolution/Locations.h:1393
-#, fuzzy
-msgid "Middleton Island"
-msgstr "索羅門群島"
-
-# addressbook/contact-editor/fullname.glade.h:15
-#: my-evolution/Locations.h:1394
-#, fuzzy
-msgid "Middletown"
-msgstr "中名(_M)："
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:1395
-#, fuzzy
-msgid "Midland"
-msgstr "芬蘭"
-
-#: my-evolution/Locations.h:1396
-msgid "Miho Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1397
-msgid "Milano/Linate"
-msgstr ""
-
-#: my-evolution/Locations.h:1398
-msgid "Milano/Malpensa"
-msgstr ""
-
-# shell/e-shell-importer.c:555
-#: my-evolution/Locations.h:1399
-#, fuzzy
-msgid "Miles City"
-msgstr "檔案類別："
-
-# calendar/gui/event-editor-dialog.glade.h:37
-#: my-evolution/Locations.h:1400
-#, fuzzy
-msgid "Milford"
-msgstr "發生"
-
-#: my-evolution/Locations.h:1401
-msgid "Millinocket"
-msgstr ""
-
-#: my-evolution/Locations.h:1402
-msgid "Millville"
-msgstr ""
-
-# mail/mail-autofilter.c:70
-#: my-evolution/Locations.h:1403
-#, fuzzy
-msgid "Milton"
-msgstr "郵件送到 %s"
-
-#: my-evolution/Locations.h:1404
-msgid "Milwaukee"
-msgstr ""
-
-#: my-evolution/Locations.h:1405
-msgid "Milwaukee-Timmerman"
-msgstr ""
-
-#: my-evolution/Locations.h:1406
-msgid "Minamitorishima"
-msgstr ""
-
-#: my-evolution/Locations.h:1407
-#, fuzzy
-msgid "Minatitlan"
-msgstr "茅利塔尼亞"
-
-#: my-evolution/Locations.h:1408
-#, fuzzy
-msgid "Minchumina"
-msgstr "內送"
-
-#: my-evolution/Locations.h:1409
-msgid "Mineralnye Vody"
-msgstr ""
-
-#: my-evolution/Locations.h:1410
-msgid "Mineral Wells"
-msgstr ""
-
-#: my-evolution/Locations.h:1411
-msgid "Minneapolis"
-msgstr ""
-
-#: my-evolution/Locations.h:1412
-msgid "Minneapolis [2]"
-msgstr ""
-
-#: my-evolution/Locations.h:1413
-msgid "Minneapolis [3]"
-msgstr ""
-
-#: my-evolution/Locations.h:1414
-#, fuzzy
-msgid "Minnesota"
-msgstr "密克羅尼西亞"
-
-#: my-evolution/Locations.h:1415
-msgid "Minocqua"
-msgstr ""
-
-#: my-evolution/Locations.h:1416
-#, fuzzy
-msgid "Minot"
-msgstr "不是"
-
-#: my-evolution/Locations.h:1417
-msgid "Minot AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1418
-msgid "Misawa Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1419
-msgid "Mississippi"
-msgstr ""
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: my-evolution/Locations.h:1420
-#, fuzzy
-msgid "Missoula"
-msgstr "Miss"
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: my-evolution/Locations.h:1421
-#, fuzzy
-msgid "Missouri"
-msgstr "Miss"
-
-# mail/mail-search.c:319
-#: my-evolution/Locations.h:1422
-#, fuzzy
-msgid "Mitchell"
-msgstr "符合的資料："
-
-#: my-evolution/Locations.h:1423
-#, fuzzy
-msgid "Mitilini"
-msgstr "郵件列表"
-
-#: my-evolution/Locations.h:1424
-msgid "Miyakejima Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1425
-msgid "Miyazaki Airport"
-msgstr ""
-
-# calendar/gui/print.c:362
-#: my-evolution/Locations.h:1426
-#, fuzzy
-msgid "Moa"
-msgstr "一"
-
-# addressbook/gui/widgets/e-addressbook-view.c:711
-#: my-evolution/Locations.h:1427
-#, fuzzy
-msgid "Mobile Downtown"
-msgstr "行動電話"
-
-#: my-evolution/Locations.h:1428
-msgid "Mobile Regional Airport"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1253
-#: my-evolution/Locations.h:1429
-#, fuzzy
-msgid "Mobridge"
-msgstr "行動電話"
-
-#: my-evolution/Locations.h:1430
-#, fuzzy
-msgid "Modesto"
-msgstr "中霧"
-
-#: my-evolution/Locations.h:1431
-msgid "Mo I Rana"
-msgstr ""
-
-# ui/evolution-mail.xml.h:55
-#: my-evolution/Locations.h:1432
-#, fuzzy
-msgid "Mojave"
-msgstr "移動"
-
-# addressbook/contact-editor/e-contact-editor.c:1253
-#: my-evolution/Locations.h:1433
-#, fuzzy
-msgid "Molde"
-msgstr "行動電話"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-# calendar/gui/event-editor.c:475
-#: my-evolution/Locations.h:1434
-#, fuzzy
-msgid "Moldova"
-msgstr "星期一"
-
-#: my-evolution/Locations.h:1435
-msgid "Moline-Quad Cities"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1436
-#, fuzzy
-msgid "Molokai"
-msgstr "馬拉威"
-
-#: my-evolution/Locations.h:1437
-msgid "Mombetsu Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1438
-msgid "Monchengladbach"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-# calendar/gui/event-editor.c:475
-#: my-evolution/Locations.h:1439
-#, fuzzy
-msgid "Monclova"
-msgstr "摩納哥"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-# calendar/gui/event-editor.c:475
-#: my-evolution/Locations.h:1440
-#, fuzzy
-msgid "Moncton"
-msgstr "摩納哥"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-# calendar/gui/event-editor.c:475
-#: my-evolution/Locations.h:1441
-#, fuzzy
-msgid "Monida"
-msgstr "星期一"
-
-#: my-evolution/Locations.h:1442
-msgid "Monpellier-Mediterrannee"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-# calendar/gui/event-editor.c:475
-#: my-evolution/Locations.h:1443
-#, fuzzy
-msgid "Monroe"
-msgstr "摩納哥"
-
-# addressbook/gui/widgets/e-addressbook-view.c:732
-#: my-evolution/Locations.h:1444
-#, fuzzy
-msgid "Montague"
-msgstr "主管"
-
-#: my-evolution/Locations.h:1445
-#, fuzzy
-msgid "Montana"
-msgstr "波札那"
-
-#: my-evolution/Locations.h:1446
-msgid "Mont-de-Marsan"
-msgstr ""
-
-#: my-evolution/Locations.h:1447
-msgid "Monte Argentario"
-msgstr ""
-
-#: my-evolution/Locations.h:1448
-#, fuzzy
-msgid "Monte Bisbino"
-msgstr "中雪"
-
-#: my-evolution/Locations.h:1449
-msgid "Monte Calamita"
-msgstr ""
-
-# ui/evolution-calendar.xml.h:15
-#: my-evolution/Locations.h:1450
-#, fuzzy
-msgid "Monte Cimone"
-msgstr "月檢視"
-
-#: my-evolution/Locations.h:1451
-#, fuzzy
-msgid "Montego Bay"
-msgstr "蒙古"
-
-#: my-evolution/Locations.h:1452
-msgid "Monte Malanotte"
-msgstr ""
-
-#: my-evolution/Locations.h:1453
-#, fuzzy
-msgid "Monterey"
-msgstr "蒙瑟拉特島"
-
-#: my-evolution/Locations.h:1454
-#, fuzzy
-msgid "Monterrey"
-msgstr "蒙瑟拉特島"
-
-#: my-evolution/Locations.h:1455
-msgid "Monte Scuro"
-msgstr ""
-
-#: my-evolution/Locations.h:1456
-msgid "Monte Terminillo"
-msgstr ""
-
-#: my-evolution/Locations.h:1457
-msgid "Montevideo/Carrasco"
-msgstr ""
-
-#: my-evolution/Locations.h:1458
-#, fuzzy
-msgid "Montgomery"
-msgstr "蒙瑟拉特島"
-
-#: my-evolution/Locations.h:1459
-msgid "Montgomery-Maxwell AFB"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-# calendar/gui/event-editor.c:475
-#: my-evolution/Locations.h:1460
-#, fuzzy
-msgid "Monticello"
-msgstr "摩納哥"
-
-#: my-evolution/Locations.h:1461
-#, fuzzy
-msgid "Montpelier"
-msgstr "蒙瑟拉特島"
-
-#: my-evolution/Locations.h:1462
-msgid "Montreal Dorval"
-msgstr ""
-
-#: my-evolution/Locations.h:1463
-msgid "Montreal Mirabel"
-msgstr ""
-
-#: my-evolution/Locations.h:1464
-msgid "Montreal Saint-Hubert"
-msgstr ""
-
-#: my-evolution/Locations.h:1465
-#, fuzzy
-msgid "Montrose"
-msgstr "蒙瑟拉特島"
-
-#: my-evolution/Locations.h:1466
-msgid "Montrose (2)"
-msgstr ""
-
-#: my-evolution/Locations.h:1467
-#, fuzzy
-msgid "Morelia"
-msgstr "蒙古"
-
-# addressbook/gui/widgets/e-addressbook-view.c:708
-#: my-evolution/Locations.h:1468
-#, fuzzy
-msgid "Morgantown"
-msgstr "團體"
-
-# addressbook/contact-editor/e-contact-editor.c:1257
-#: my-evolution/Locations.h:1469
-#, fuzzy
-msgid "Moriarty"
-msgstr "首要的"
-
-#: my-evolution/Locations.h:1471
-msgid "Morristown"
-msgstr ""
-
-#: my-evolution/Locations.h:1472
-msgid "Moscow Domodedovo"
-msgstr ""
-
-#: my-evolution/Locations.h:1473
-msgid "Moscow Sheremetyevo"
-msgstr ""
-
-#: my-evolution/Locations.h:1474
-msgid "Moses Lake"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1253
-#: my-evolution/Locations.h:1475
-#, fuzzy
-msgid "Mosinee"
-msgstr "行動電話"
-
-#: my-evolution/Locations.h:1476
-msgid "Mosjoen"
-msgstr ""
-
-#: my-evolution/Locations.h:1477
-msgid "Moultrie"
-msgstr ""
-
-#: my-evolution/Locations.h:1478
-msgid "Mountain Home"
-msgstr ""
-
-# ui/evolution-calendar.xml.h:15
-#: my-evolution/Locations.h:1479
-#, fuzzy
-msgid "Mountain View"
-msgstr "月檢視"
-
-#: my-evolution/Locations.h:1480
-msgid "Mount Clemens"
-msgstr ""
-
-#: my-evolution/Locations.h:1481
-msgid "Mount Holly"
-msgstr ""
-
-#: my-evolution/Locations.h:1482
-#, fuzzy
-msgid "Mount Shasta"
-msgstr "東南"
-
-# ui/evolution-calendar.xml.h:15
-#: my-evolution/Locations.h:1483
-#, fuzzy
-msgid "Mount Vernon"
-msgstr "月檢視"
-
-#: my-evolution/Locations.h:1484
-msgid "Mount Wilson"
-msgstr ""
-
-#: my-evolution/Locations.h:1485
-msgid "Mt Washington"
-msgstr ""
-
-#: my-evolution/Locations.h:1486
-msgid "Mugla/Dalaman"
-msgstr ""
-
-#: my-evolution/Locations.h:1487
-msgid "Muir"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:1488
-#, fuzzy
-msgid "Mullan"
-msgstr "主管"
-
-#: my-evolution/Locations.h:1489
-msgid "Mullen"
-msgstr ""
-
-#: my-evolution/Locations.h:1490
-msgid "Munchen"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:9
-#: my-evolution/Locations.h:1491
-#, fuzzy
-msgid "Muncie"
-msgstr "6月"
-
-#: my-evolution/Locations.h:1492
-msgid "Munster/Osnabruck"
-msgstr ""
-
-#: my-evolution/Locations.h:1493
-#, fuzzy
-msgid "Murcia"
-msgstr "茅利塔尼亞"
-
-#: my-evolution/Locations.h:1494
-msgid "Murmansk"
-msgstr ""
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: my-evolution/Locations.h:1495
-#, fuzzy
-msgid "Mus"
-msgstr "商務電話"
-
-#: my-evolution/Locations.h:1496
-#, fuzzy
-msgid "Muscatine"
-msgstr "法屬馬丁尼克"
-
-#: my-evolution/Locations.h:1497
-msgid "Muscle Shoals"
-msgstr ""
-
-#: my-evolution/Locations.h:1498
-msgid "Muskegon"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:8
-#: my-evolution/Locations.h:1499
-#, fuzzy
-msgid "Mykonos"
-msgstr "節"
-
-#: my-evolution/Locations.h:1500
-msgid "Myrtle Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:1501
-msgid "Nabesna/Devil Mt."
-msgstr ""
-
-#: my-evolution/Locations.h:1502
-msgid "Nacogdoches"
-msgstr ""
-
-#: my-evolution/Locations.h:1503
-msgid "Nagasaki Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1504
-msgid "Nagoya Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1505
-msgid "Nagpur Sonegaon"
-msgstr ""
-
-#: my-evolution/Locations.h:1506
-msgid "Naha Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1507
-#, fuzzy
-msgid "Najran"
-msgstr "巴林"
-
-#: my-evolution/Locations.h:1508
-msgid "Nakashibetsu Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1509
-msgid "Nalchik"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.glade.h:5
-#: my-evolution/Locations.h:1510
-#, fuzzy
-msgid "Namsos"
-msgstr "名稱"
-
-#: my-evolution/Locations.h:1511
-msgid "Nancy-Essey"
-msgstr ""
-
-#: my-evolution/Locations.h:1512
-msgid "Nancy-Ochey"
-msgstr ""
-
-#: my-evolution/Locations.h:1513
-msgid "Nankishirahama Airport"
-msgstr ""
-
-# widgets/misc/e-messagebox.c:159
-#: my-evolution/Locations.h:1514
-#, fuzzy
-msgid "Nanning"
-msgstr "警告"
-
-#: my-evolution/Locations.h:1515
-msgid "Nantes Adlantique"
-msgstr ""
-
-#: my-evolution/Locations.h:1516
-msgid "Nantucket"
-msgstr ""
-
-#: my-evolution/Locations.h:1517
-#, fuzzy
-msgid "Napa"
-msgstr "日本"
-
-# addressbook/gui/component/addressbook-config.glade.h:5
-#: my-evolution/Locations.h:1518
-#, fuzzy
-msgid "Naples"
-msgstr "名稱"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1519
-#, fuzzy
-msgid "Napoli"
-msgstr "馬利"
-
-# addressbook/gui/widgets/e-addressbook-view.c:734
-#: my-evolution/Locations.h:1520
-#, fuzzy
-msgid "Narvik"
-msgstr "暱稱"
-
-#: my-evolution/Locations.h:1521
-msgid "Nasa Shuttle"
-msgstr ""
-
-#: my-evolution/Locations.h:1522
-msgid "Nashua"
-msgstr ""
-
-#: my-evolution/Locations.h:1523
-msgid "Nashville"
-msgstr ""
-
-#: my-evolution/Locations.h:1524
-msgid "Nassau"
-msgstr ""
-
-#: my-evolution/Locations.h:1525
-#, fuzzy
-msgid "Natal"
-msgstr "義大利"
-
-# mail/mail-search.c:319
-#: my-evolution/Locations.h:1526
-#, fuzzy
-msgid "Natchez"
-msgstr "符合的資料："
-
-#: my-evolution/Locations.h:1527
-msgid "Nawabshah"
-msgstr ""
-
-# ui/evolution-tasks.xml.h:3
-#: my-evolution/Locations.h:1528
-#, fuzzy
-msgid "Nebraska"
-msgstr "新增工作"
-
-#: my-evolution/Locations.h:1529
-msgid "Needles"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:2
-#: my-evolution/Locations.h:1530
-#, fuzzy
-msgid "Nenana"
-msgstr "格瑞那達"
-
-#: my-evolution/Locations.h:1532
-msgid "Neuquen"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:2
-#: my-evolution/Locations.h:1533
-#, fuzzy
-msgid "Nevada"
-msgstr "格瑞那達"
-
-# ui/evolution-tasks.xml.h:3
-#: my-evolution/Locations.h:1534
-#, fuzzy
-msgid "Newark"
-msgstr "新增工作"
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: my-evolution/Locations.h:1535
-#, fuzzy
-msgid "New Bedford"
-msgstr "新聞發送伺服器"
-
-#: my-evolution/Locations.h:1536
-#, fuzzy
-msgid "New Bern"
-msgstr "紐西蘭"
-
-#: my-evolution/Locations.h:1537
-msgid "New Braunfels"
-msgstr ""
-
-#: my-evolution/Locations.h:1538
-msgid "New Brunswick"
-msgstr ""
-
-#: my-evolution/Locations.h:1539
-msgid "Newburgh"
-msgstr ""
-
-# mail/mail-config.glade.h:45
-#: my-evolution/Locations.h:1540
-#, fuzzy
-msgid "Newcastle"
-msgstr "新聞"
-
-#: my-evolution/Locations.h:1541
-#, fuzzy
-msgid "New Delhi/Palam"
-msgstr "紐西蘭"
-
-#: my-evolution/Locations.h:1542
-#, fuzzy
-msgid "Newfoundland"
-msgstr "紐西蘭"
-
-#: my-evolution/Locations.h:1543
-msgid "New Hampshire"
-msgstr ""
-
-# ui/evolution-addressbook.xml.h:7
-#: my-evolution/Locations.h:1544
-#, fuzzy
-msgid "New Haven"
-msgstr "新喀里多尼亞島"
-
-# ui/evolution-addressbook.xml.h:7
-#: my-evolution/Locations.h:1545
-#, fuzzy
-msgid "New Iberia"
-msgstr "新喀里多尼亞島"
-
-# widgets/misc/e-messagebox.c:180
-#: my-evolution/Locations.h:1546
-#, fuzzy
-msgid "New Jersey"
-msgstr "新郵件"
-
-#: my-evolution/Locations.h:1547
-#, fuzzy
-msgid "New Mexico"
-msgstr "墨西哥"
-
-# addressbook/contact-editor/contact-editor.glade.h:12
-#: my-evolution/Locations.h:1548
-#, fuzzy
-msgid "New Orleans"
-msgstr "荷蘭"
-
-#: my-evolution/Locations.h:1549
-msgid "New Orleans-Lakefront"
-msgstr ""
-
-#: my-evolution/Locations.h:1550
-msgid "New Orleans NAS"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:736
-#: my-evolution/Locations.h:1551
-#, fuzzy
-msgid "Newport"
-msgstr "北"
-
-#: my-evolution/Locations.h:1552
-msgid "Newport News"
-msgstr ""
-
-#: my-evolution/Locations.h:1553
-msgid "New Port Richey"
-msgstr ""
-
-# mail/mail-vfolder.c:438
-#: my-evolution/Locations.h:1554
-#, fuzzy
-msgid "New River"
-msgstr "新增虛擬資料夾"
-
-#: my-evolution/Locations.h:1555
-msgid "New Tokyo International Airport"
-msgstr ""
-
-# 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:58
-#: my-evolution/Locations.h:1556
-#, fuzzy
-msgid "Newton"
-msgstr "新增"
-
-# mail/mail-vfolder.c:438
-#: my-evolution/Locations.h:1557
-#, fuzzy
-msgid "New York"
-msgstr "新增虛擬資料夾"
-
-#: my-evolution/Locations.h:1558
-msgid "New York-JFK Arpt"
-msgstr ""
-
-#: my-evolution/Locations.h:1559
-msgid "New York-La Guardia"
-msgstr ""
-
-#: my-evolution/Locations.h:1561
-msgid "Niagara Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:1563
-msgid "Nice-Cote d'Azur"
-msgstr ""
-
-#: my-evolution/Locations.h:1564
-msgid "Niigata Airport"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:6
-#: my-evolution/Locations.h:1565
-#, fuzzy
-msgid "Nimes-Garons"
-msgstr "尺寸："
-
-# ui/evolution-message-composer.xml.h:26
-#: my-evolution/Locations.h:1566
-#, fuzzy
-msgid "Nipawin"
-msgstr "西班牙"
-
-#: my-evolution/Locations.h:1567
-#, fuzzy
-msgid "Nis"
-msgstr "是"
-
-#: my-evolution/Locations.h:1568
-msgid "Nizhny Novgorod"
-msgstr ""
-
-#: my-evolution/Locations.h:1569
-msgid "N Las Vegas"
-msgstr ""
-
-#: my-evolution/Locations.h:1570
-msgid "N Myrtle Beach"
-msgstr ""
-
-# calendar/gui/calendar-model.c:499
-# calendar/gui/calendar-model.c:1068
-# calendar/gui/calendar-model.c:1574
-# calendar/gui/dialogs/task-editor-dialog.glade.h:13
-# calendar/gui/e-calendar-table.c:346
-# mail/message-list.c:688
-#: my-evolution/Locations.h:1571
-#, fuzzy
-msgid "Nogales"
-msgstr "普通"
-
-# addressbook/gui/component/addressbook-config.glade.h:5
-#: my-evolution/Locations.h:1572
-#, fuzzy
-msgid "Nome"
-msgstr "名稱"
-
-#: my-evolution/Locations.h:1573
-#, fuzzy
-msgid "Norfolk"
-msgstr "諾福克群島"
-
-#: my-evolution/Locations.h:1575
-#, fuzzy
-msgid "Norfolk NAS"
-msgstr "諾福克群島"
-
-# mail/mail-mt.c:516
-# mail/mail-mt.c:545
-# mail/mail-mt.c:880
-#: my-evolution/Locations.h:1576
-#, fuzzy
-msgid "Norrkoping"
-msgstr "正在工作"
-
-# addressbook/contact-editor/contact-editor.glade.h:12
-#: my-evolution/Locations.h:1577
-#, fuzzy
-msgid "North Adams"
-msgstr "東北"
-
-# addressbook/gui/widgets/e-addressbook-view.c:736
-#: my-evolution/Locations.h:1578
-#, fuzzy
-msgid "North Bend"
-msgstr "北"
-
-#: my-evolution/Locations.h:1579
-msgid "North Carolina"
-msgstr ""
-
-# widgets/misc/e-cell-date-edit.c:221
-# widgets/misc/e-dateedit.c:418
-#: my-evolution/Locations.h:1580
-#, fuzzy
-msgid "North Conway"
-msgstr "挪威"
-
-# addressbook/contact-editor/contact-editor.glade.h:12
-#: my-evolution/Locations.h:1581
-#, fuzzy
-msgid "North Dakota"
-msgstr "東北"
-
-#: my-evolution/Locations.h:1582
-msgid "Northeast Philadelphia"
-msgstr ""
-
-#: my-evolution/Locations.h:1583
-msgid "North Kingstown"
-msgstr ""
-
-# addressbook/contact-editor/contact-editor.glade.h:12
-#: my-evolution/Locations.h:1584
-#, fuzzy
-msgid "North Platte"
-msgstr "東北"
-
-# widgets/misc/e-cell-date-edit.c:221
-# widgets/misc/e-dateedit.c:418
-#: my-evolution/Locations.h:1585
-#, fuzzy
-msgid "Northway"
-msgstr "挪威"
-
-#: my-evolution/Locations.h:1586
-#, fuzzy
-msgid "Northwest Territories"
-msgstr "法屬南部屬地"
-
-# addressbook/gui/widgets/e-addressbook-view.c:736
-#: my-evolution/Locations.h:1588
-#, fuzzy
-msgid "Norwich"
-msgstr "北"
-
-# widgets/misc/e-cell-date-edit.c:221
-# widgets/misc/e-dateedit.c:418
-#: my-evolution/Locations.h:1589
-#, fuzzy
-msgid "Norwood"
-msgstr "挪威"
-
-# addressbook/gui/widgets/e-addressbook-view.c:736
-#: my-evolution/Locations.h:1590
-#, fuzzy
-msgid "Notodden"
-msgstr "備註"
-
-#: my-evolution/Locations.h:1591
-msgid "Novara/Cameri"
-msgstr ""
-
-#: my-evolution/Locations.h:1592
-msgid "Nova Scotia"
-msgstr ""
-
-#: my-evolution/Locations.h:1593
-msgid "Novosibirsk"
-msgstr ""
-
-#: my-evolution/Locations.h:1594
-msgid "Nueva Gerona"
-msgstr ""
-
-#: my-evolution/Locations.h:1595
-msgid "Nueva Ocotepeque"
-msgstr ""
-
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
-#: my-evolution/Locations.h:1596
-#, fuzzy
-msgid "Nuevo Laredo"
-msgstr "未開始"
-
-#: my-evolution/Locations.h:1597
-msgid "Nurnberg"
-msgstr ""
-
-#: my-evolution/Locations.h:1598
-msgid "Nyutabaru Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1599
-msgid "Oahu"
-msgstr ""
-
-#: my-evolution/Locations.h:1600
-msgid "Oak Harbor"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:1601
-#, fuzzy
-msgid "Oakland"
-msgstr "泰國"
-
-#: my-evolution/Locations.h:1602
-#, fuzzy
-msgid "Oaxaca"
-msgstr "牙買加"
-
-#: my-evolution/Locations.h:1603
-msgid "Oberpfaffenhofen"
-msgstr ""
-
-#: my-evolution/Locations.h:1604
-msgid "Obihiro Airport"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1605
-#, fuzzy
-msgid "Ocala"
-msgstr "馬爾他"
-
-#: my-evolution/Locations.h:1606
-#, fuzzy
-msgid "Oceanside"
-msgstr "冰島"
-
-# addressbook/gui/component/addressbook-config.c:179
-#: my-evolution/Locations.h:1607
-#, fuzzy
-msgid "Odense"
-msgstr "一"
-
-#: my-evolution/Locations.h:1608
-msgid "Odesa"
-msgstr ""
-
-# calendar/gui/e-day-view.c:3162
-# calendar/gui/e-week-view.c:3292
-# ui/evolution-calendar.xml.h:19
-# ui/evolution-message-composer.xml.h:11
-#: my-evolution/Locations.h:1609
-#, fuzzy
-msgid "Oelwen"
-msgstr "開啟"
-
-# calendar/gui/e-day-view.c:3162
-# calendar/gui/e-week-view.c:3292
-# ui/evolution-calendar.xml.h:19
-# ui/evolution-message-composer.xml.h:11
-#: my-evolution/Locations.h:1610
-#, fuzzy
-msgid "Ogden"
-msgstr "開啟"
-
-#: my-evolution/Locations.h:1611
-msgid "Ogden-Hill AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1612
-msgid "Ogdensburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1613
-msgid "Ohio"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1254
-# addressbook/contact-editor/e-contact-editor.c:1312
-#: my-evolution/Locations.h:1614
-#, fuzzy
-msgid "Ohrid"
-msgstr "其它電話"
-
-#: my-evolution/Locations.h:1615
-msgid "Oita Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1616
-#, fuzzy
-msgid "Ojika Island"
-msgstr "科克群島"
-
-#: my-evolution/Locations.h:1617
-msgid "Okayama Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1618
-msgid "Oki Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1619
-msgid "Okinoerabu"
-msgstr ""
-
-#: my-evolution/Locations.h:1620
-msgid "Oklahoma"
-msgstr ""
-
-#: my-evolution/Locations.h:1621
-msgid "Oklahoma City"
-msgstr ""
-
-#: my-evolution/Locations.h:1622
-msgid "Oklahoma City-Bethany"
-msgstr ""
-
-#: my-evolution/Locations.h:1623
-msgid "Oklahoma City-Midwest City"
-msgstr ""
-
-#: my-evolution/Locations.h:1624
-#, fuzzy
-msgid "Okushiri Island"
-msgstr "英屬維爾京群島"
-
-# addressbook/contact-editor/e-contact-editor.c:1254
-# addressbook/contact-editor/e-contact-editor.c:1312
-#: my-evolution/Locations.h:1625
-#, fuzzy
-msgid "Olathe"
-msgstr "其它電話"
-
-#: my-evolution/Locations.h:1626
-msgid "Olathe/Ind."
-msgstr ""
-
-#: my-evolution/Locations.h:1627
-#, fuzzy
-msgid "Olbia"
-msgstr "阿爾巴尼亞"
-
-#: my-evolution/Locations.h:1628
-msgid "Olympia"
-msgstr ""
-
-#: my-evolution/Locations.h:1629
-#, fuzzy
-msgid "Omaha"
-msgstr "阿曼"
-
-#: my-evolution/Locations.h:1630
-msgid "Omaha-Bellevue"
-msgstr ""
-
-#: my-evolution/Locations.h:1631
-#, fuzzy
-msgid "Omak"
-msgstr "阿曼"
-
-#: my-evolution/Locations.h:1633
-msgid "Ominato Ab"
-msgstr ""
-
-# calendar/gui/alarm-notify/alarm-queue.c:890
-# calendar/gui/alarm-notify/alarm-queue.c:945
-#: my-evolution/Locations.h:1634
-#, fuzzy
-msgid "Omsk"
-msgstr "確定"
-
-#: my-evolution/Locations.h:1635
-msgid "O'Neill"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:24
-#: my-evolution/Locations.h:1636
-#, fuzzy
-msgid "Ontario"
-msgstr "紙張方向"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
-#: my-evolution/Locations.h:1637
-#, fuzzy
-msgid "Oostende"
-msgstr "到會者"
-
-#: my-evolution/Locations.h:1638
-#, fuzzy
-msgid "Oran"
-msgstr "阿曼"
-
-#: my-evolution/Locations.h:1639
-msgid "Oran/Es Senia"
-msgstr ""
-
-# addressbook/backend/ebook/e-card.c:3458
-#: my-evolution/Locations.h:1640
-#, fuzzy
-msgid "Orange"
-msgstr "團體"
-
-#: my-evolution/Locations.h:1641
-msgid "Orange City"
-msgstr ""
-
-#: my-evolution/Locations.h:1642
-msgid "Ord-Sharp"
-msgstr ""
-
-# addressbook/backend/ebook/e-card.c:3458
-#: my-evolution/Locations.h:1643
-#, fuzzy
-msgid "Oregon"
-msgstr "團體"
-
-#: my-evolution/Locations.h:1644
-msgid "Orenburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1645
-#, fuzzy
-msgid "Orland"
-msgstr "愛爾蘭"
-
-#: my-evolution/Locations.h:1646
-#, fuzzy
-msgid "Orlando"
-msgstr "愛爾蘭"
-
-#: my-evolution/Locations.h:1647
-msgid "Orlando (Orlando International)"
-msgstr ""
-
-#: my-evolution/Locations.h:1648
-msgid "Orsta-Volda"
-msgstr ""
-
-# executive-summary/test-service/rdf-summary.c:512
-# executive-summary/test-service/rdf-summary.c:549
-# executive-summary/test-service/rdf-summary.c:594
-# widgets/misc/e-messagebox.c:166
-#: my-evolution/Locations.h:1649
-#, fuzzy
-msgid "Oruro"
-msgstr "錯誤"
-
-#: my-evolution/Locations.h:1650
-msgid "Osaka International Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1651
-msgid "Osan Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1652
-#, fuzzy
-msgid "Oscoda"
-msgstr "秒"
-
-#: my-evolution/Locations.h:1653
-msgid "Oseberg A"
-msgstr ""
-
-#: my-evolution/Locations.h:1654
-msgid "Oshima Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1655
-msgid "Oshkosh"
-msgstr ""
-
-#: my-evolution/Locations.h:1656
-msgid "Oslo/Gardenmoen"
-msgstr ""
-
-#: my-evolution/Locations.h:1657
-#, fuzzy
-msgid "Ostrava"
-msgstr "澳大利亞"
-
-#: my-evolution/Locations.h:1658
-msgid "Ottawa"
-msgstr ""
-
-#: my-evolution/Locations.h:1659
-msgid "Ottumwa"
-msgstr ""
-
-#: my-evolution/Locations.h:1660
-msgid "Owensboro"
-msgstr ""
-
-#: my-evolution/Locations.h:1661
-#, fuzzy
-msgid "Owyhee"
-msgstr "週"
-
-# calendar/gui/event-editor-dialog.glade.h:37
-#: my-evolution/Locations.h:1662
-#, fuzzy
-msgid "Oxford"
-msgstr "發生"
-
-#: my-evolution/Locations.h:1663
-msgid "Oxnard"
-msgstr ""
-
-#: my-evolution/Locations.h:1664
-msgid "Ozark"
-msgstr ""
-
-#: my-evolution/Locations.h:1665
-msgid "Ozuki Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1666
-msgid "Paderborn-Haxterberg"
-msgstr ""
-
-#: my-evolution/Locations.h:1667
-msgid "Padova"
-msgstr ""
-
-#: my-evolution/Locations.h:1668
-msgid "Paducah"
-msgstr ""
-
-#: my-evolution/Locations.h:1669
-msgid "Paekado"
-msgstr ""
-
-#: my-evolution/Locations.h:1670
-msgid "Paengnyongdo Ab"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
-#, fuzzy
-msgid "Paganella"
-msgstr "頁"
-
-#: my-evolution/Locations.h:1674
-msgid "Pa Kuei/Bakuai"
-msgstr ""
-
-#: my-evolution/Locations.h:1675
-#, fuzzy
-msgid "Palacios"
-msgstr "帛琉群島"
-
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
-#: my-evolution/Locations.h:1676
-#, fuzzy
-msgid "Palermo"
-msgstr "呼叫器"
-
-#: my-evolution/Locations.h:1677
-msgid "Palma de Mallorca"
-msgstr ""
-
-#: my-evolution/Locations.h:1678
-#, fuzzy
-msgid "Palmdale"
-msgstr "帛琉群島"
-
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
-#: my-evolution/Locations.h:1679
-#, fuzzy
-msgid "Palmer"
-msgstr "呼叫器"
-
-# ui/evolution-mail.xml.h:110
-#: my-evolution/Locations.h:1680
-#, fuzzy
-msgid "Palm Springs"
-msgstr "郵件設定"
-
-#: my-evolution/Locations.h:1681
-msgid "Palo Alto"
-msgstr ""
-
-#: my-evolution/Locations.h:1682
-#, fuzzy
-msgid "Pamplona"
-msgstr "帛琉群島"
-
-# addressbook/contact-editor/fulladdr.glade.h:2
-#: my-evolution/Locations.h:1684
-#, fuzzy
-msgid "Panama City"
-msgstr "巴拿馬"
-
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#: my-evolution/Locations.h:1685
-#, fuzzy
-msgid "Pantelleria"
-msgstr "已取消"
-
-#: my-evolution/Locations.h:1686
-#, fuzzy
-msgid "Papa"
-msgstr "日本"
-
-# mail/message-list.c:685
-#: my-evolution/Locations.h:1687
-#, fuzzy
-msgid "Paphos"
-msgstr "寮國"
-
-# addressbook/contact-editor/e-contact-editor.c:1257
-#: my-evolution/Locations.h:1689
-#, fuzzy
-msgid "Paris"
-msgstr "首要的"
-
-#: my-evolution/Locations.h:1690
-msgid "Paris/Charles De Gaulle"
-msgstr ""
-
-#: my-evolution/Locations.h:1691
-msgid "Paris/Le Bourget"
-msgstr ""
-
-#: my-evolution/Locations.h:1692
-#, fuzzy
-msgid "Paris/Orly"
-msgstr "局部有飛沫"
-
-#: my-evolution/Locations.h:1693
-msgid "Parkersburg"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
-#: my-evolution/Locations.h:1694
-#, fuzzy
-msgid "Pasco"
-msgstr "密碼"
-
-#: my-evolution/Locations.h:1695
-msgid "Paso De Los Libres"
-msgstr ""
-
-#: my-evolution/Locations.h:1696
-msgid "Paso Robles"
-msgstr ""
-
-#: my-evolution/Locations.h:1697
-msgid "Passo dei Giovi"
-msgstr ""
-
-#: my-evolution/Locations.h:1698
-msgid "Passo della Cisa"
-msgstr ""
-
-#: my-evolution/Locations.h:1699
-msgid "Passo Resia"
-msgstr ""
-
-#: my-evolution/Locations.h:1700
-msgid "Passo Rolle"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:2
-#: my-evolution/Locations.h:1701
-#, fuzzy
-msgid "Patna"
-msgstr "巴拿馬"
-
-#: my-evolution/Locations.h:1702
-msgid "Patterson"
-msgstr ""
-
-#: my-evolution/Locations.h:1703
-msgid "Patuxent River"
-msgstr ""
-
-#: my-evolution/Locations.h:1704
-msgid "Pau/Pyrenees"
-msgstr ""
-
-#: my-evolution/Locations.h:1705
-msgid "Paxson"
-msgstr ""
-
-#: my-evolution/Locations.h:1706
-#, fuzzy
-msgid "Paysandu"
-msgstr "大沙塵"
-
-# calendar/gui/event-editor-dialog.glade.h:14
-# calendar/gui/event-editor.c:1588
-#: my-evolution/Locations.h:1707
-#, fuzzy
-msgid "Payson"
-msgstr "播放音效："
-
-# widgets/misc/e-messagebox.c:173
-#: my-evolution/Locations.h:1708
-#, fuzzy
-msgid "Pellston"
-msgstr "問題"
-
-#: my-evolution/Locations.h:1709
-#, fuzzy
-msgid "Pelotas"
-msgstr "重新載入"
-
-# addressbook/printing/e-contact-print.glade.h:34
-#: my-evolution/Locations.h:1710
-#, fuzzy
-msgid "Pendleton"
-msgstr "選擇："
-
-#: my-evolution/Locations.h:1711
-msgid "Pennsylvania"
-msgstr ""
-
-#: my-evolution/Locations.h:1712
-msgid "Penn Yan"
-msgstr ""
-
-#: my-evolution/Locations.h:1713
-msgid "Pensacola"
-msgstr ""
-
-#: my-evolution/Locations.h:1714
-msgid "Pensacola NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1715
-msgid "People's Republic of China"
-msgstr ""
-
-#: my-evolution/Locations.h:1716
-#, fuzzy
-msgid "Peoria"
-msgstr "喬治亞"
-
-#: my-evolution/Locations.h:1717
-msgid "Pequot Lakes"
-msgstr ""
-
-#: my-evolution/Locations.h:1718
-msgid "Pereira/Matecana"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1257
-#: my-evolution/Locations.h:1719
-#, fuzzy
-msgid "Perm"
-msgstr "首要的"
-
-#: my-evolution/Locations.h:1720
-msgid "Perpignan-Rivesaltes"
-msgstr ""
-
-#: my-evolution/Locations.h:1721
-msgid "Perry-Foley"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:27
-#: my-evolution/Locations.h:1722
-#, fuzzy
-msgid "Perth"
-msgstr "秘魯"
-
-# addressbook/printing/e-contact-print.glade.h:27
-#: my-evolution/Locations.h:1724
-#, fuzzy
-msgid "Perugia"
-msgstr "秘魯"
-
-#: my-evolution/Locations.h:1725
-msgid "Pescara"
-msgstr ""
-
-#: my-evolution/Locations.h:1726
-msgid "Petersburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1727
-msgid "Petropavlovsk-Kamchatsky"
-msgstr ""
-
-#: my-evolution/Locations.h:1728
-msgid "Petrozavodsk"
-msgstr ""
-
-#: my-evolution/Locations.h:1729
-msgid "Philadelphia"
-msgstr ""
-
-#: my-evolution/Locations.h:1730
-#, fuzzy
-msgid "Philip"
-msgstr "菲律賓"
-
-#: my-evolution/Locations.h:1731
-#, fuzzy
-msgid "Philipsburg"
-msgstr "菲律賓"
-
-#: my-evolution/Locations.h:1732
-#, fuzzy
-msgid "Phillips"
-msgstr "菲律賓"
-
-#: my-evolution/Locations.h:1733
-msgid "Phoenix"
-msgstr ""
-
-#: my-evolution/Locations.h:1734
-msgid "Phoenix-Deer Valley"
-msgstr ""
-
-#: my-evolution/Locations.h:1735
-msgid "Phoenix-Goodyear"
-msgstr ""
-
-#: my-evolution/Locations.h:1736
-msgid "Phoenix-Luke AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1737
-msgid "Piacenza"
-msgstr ""
-
-#: my-evolution/Locations.h:1738
-msgid "Pian Rosa"
-msgstr ""
-
-#: my-evolution/Locations.h:1739
-msgid "Piedras Negras"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:27
-#: my-evolution/Locations.h:1740
-#, fuzzy
-msgid "Pierre"
-msgstr "秘魯"
-
-#: my-evolution/Locations.h:1741
-msgid "Pietersburg"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:15
-#: my-evolution/Locations.h:1742
-#, fuzzy
-msgid "Pikeville"
-msgstr "預覽"
-
-# importers/pine-importer.c:723
-#: my-evolution/Locations.h:1743
-#, fuzzy
-msgid "Pine Bluff"
-msgstr "Pine 郵件"
-
-#: my-evolution/Locations.h:1744
-msgid "Pingtung North"
-msgstr ""
-
-#: my-evolution/Locations.h:1745
-msgid "Pingtung South"
-msgstr ""
-
-#: my-evolution/Locations.h:1746
-msgid "Pirassununga"
-msgstr ""
-
-# ui/evolution-event-editor.xml.h:30
-# ui/evolution-task-editor-dialog.xml.h:33
-#: my-evolution/Locations.h:1747
-#, fuzzy
-msgid "Pisa"
-msgstr "巴基斯坦"
-
-#: my-evolution/Locations.h:1748
-msgid "Pisco"
-msgstr ""
-
-#: my-evolution/Locations.h:1749
-msgid "Pittsburgh"
-msgstr ""
-
-#: my-evolution/Locations.h:1750
-msgid "Pittsburgh-West Mifflin"
-msgstr ""
-
-#: my-evolution/Locations.h:1751
-msgid "Plattsburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1752
-msgid "Plovdiv"
-msgstr ""
-
-#: my-evolution/Locations.h:1753
-#, fuzzy
-msgid "Plymouth"
-msgstr "月"
-
-#: my-evolution/Locations.h:1754
-msgid "Pocatello"
-msgstr ""
-
-#: my-evolution/Locations.h:1755
-msgid "Pocos De Caldas"
-msgstr ""
-
-#: my-evolution/Locations.h:1756
-msgid "Podgorica"
-msgstr ""
-
-#: my-evolution/Locations.h:1757
-#, fuzzy
-msgid "Podgorica Titograd"
-msgstr "局部有龍捲風"
-
-#: my-evolution/Locations.h:1758
-msgid "Pohang Ab"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-# addressbook/gui/widgets/e-addressbook-view.c:615
-#: my-evolution/Locations.h:1759
-#, fuzzy
-msgid "Point Hope"
-msgstr "列印信封"
-
-# calendar/gui/e-calendar-table.c:159
-#: my-evolution/Locations.h:1760
-#, fuzzy
-msgid "Point Lay"
-msgstr "列印摘要"
-
-# mail/mail-callbacks.c:1407
-#: my-evolution/Locations.h:1761
-#, fuzzy
-msgid "Point Mugu"
-msgstr "列印郵件"
-
-#: my-evolution/Locations.h:1762
-msgid "Point Piedras Blanca"
-msgstr ""
-
-# mail/folder-browser-factory.c:198
-# ui/evolution-event-editor.xml.h:39
-# ui/evolution-task-editor-dialog.xml.h:42
-#: my-evolution/Locations.h:1763
-#, fuzzy
-msgid "Poitiers"
-msgstr "內容"
-
-#: my-evolution/Locations.h:1765
-msgid "Pompano Beach"
-msgstr ""
-
-# views/addressbook/galview.xml.h:3
-#: my-evolution/Locations.h:1766
-#, fuzzy
-msgid "Ponca City"
-msgstr "電話清單"
-
-# calendar/gui/calendar-model.c:896
-# calendar/gui/calendar-model.c:1120
-# calendar/gui/calendar-model.c:1174
-# calendar/gui/e-calendar-table.c:322
-# calendar/gui/e-calendar-table.c:397
-# mail/mail-account-gui.c:976
-# mail/mail-accounts.c:120
-# mail/mail-accounts.c:164
-# mail/mail-config.glade.h:46
-# shell/e-shell-view.c:1198
-# widgets/misc/e-cell-date-edit.c:237
-# widgets/misc/e-dateedit.c:432
-# widgets/misc/e-dateedit.c:1341
-# widgets/misc/e-dateedit.c:1456
-#: my-evolution/Locations.h:1767
-#, fuzzy
-msgid "Ponce"
-msgstr "無"
-
-#: my-evolution/Locations.h:1768
-msgid "Ponta Pora"
-msgstr ""
-
-# ui/evolution-addressbook.xml.h:17
-#: my-evolution/Locations.h:1769
-#, fuzzy
-msgid "Pontiac"
-msgstr "連絡人"
-
-#: my-evolution/Locations.h:1770
-msgid "Pope AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1771
-msgid "Poplar Bluff"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:1772
-#, fuzzy
-msgid "Poprad"
-msgstr "波蘭"
-
-# calendar/gui/print.c:1156
-#: my-evolution/Locations.h:1773
-#, fuzzy
-msgid "Port Alexander"
-msgstr "列印行事曆"
-
-#: my-evolution/Locations.h:1774
-msgid "Port Alsworth"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-# addressbook/gui/widgets/e-addressbook-view.c:615
-#: my-evolution/Locations.h:1775
-#, fuzzy
-msgid "Port Angeles"
-msgstr "列印信封"
-
-#: my-evolution/Locations.h:1776
-msgid "Port-Au-Prince"
-msgstr ""
-
-#: my-evolution/Locations.h:1777
-msgid "Port Elizabeth"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:15
-#: my-evolution/Locations.h:1778
-#, fuzzy
-msgid "Porterville"
-msgstr "預覽"
-
-# ui/evolution-calendar.xml.h:25
-#: my-evolution/Locations.h:1779
-#, fuzzy
-msgid "Port Hardy"
-msgstr "列印名片"
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:1780
-#, fuzzy
-msgid "Port Hedland"
-msgstr "波蘭"
-
-#: my-evolution/Locations.h:1781
-msgid "Port Heiden"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:1782
-#, fuzzy
-msgid "Portland"
-msgstr "波蘭"
-
-# addressbook/gui/component/addressbook-config.c:409
-#: my-evolution/Locations.h:1783
-#, fuzzy
-msgid "Porto"
-msgstr "通訊埠(_P)："
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:16
-#: my-evolution/Locations.h:1784
-#, fuzzy
-msgid "Porto Alegre"
-msgstr "進度"
-
-#: my-evolution/Locations.h:1785
-msgid "Porto Alegre Apt"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:29
-#: my-evolution/Locations.h:1786
-#, fuzzy
-msgid "Portoroz"
-msgstr "縱向"
-
-# addressbook/printing/e-contact-print.glade.h:29
-#: my-evolution/Locations.h:1787
-#, fuzzy
-msgid "Porto Santo"
-msgstr "縱向"
-
-#: my-evolution/Locations.h:1788
-msgid "Porto Velho"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:29
-#: my-evolution/Locations.h:1789
-#, fuzzy
-msgid "Port Said"
-msgstr "縱向"
-
-#: my-evolution/Locations.h:1790
-msgid "Portsmouth"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:1792
-#, fuzzy
-msgid "Posadas"
-msgstr "波蘭"
-
-#: my-evolution/Locations.h:1793
-msgid "Potosi"
-msgstr ""
-
-#: my-evolution/Locations.h:1794
-msgid "Poughkeepsie"
-msgstr ""
-
-#: my-evolution/Locations.h:1795
-msgid "Pownal"
-msgstr ""
-
-#: my-evolution/Locations.h:1796
-#, fuzzy
-msgid "Poza Rica"
-msgstr "哥斯大黎加"
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:1797
-#, fuzzy
-msgid "Poznan"
-msgstr "波蘭"
-
-#: my-evolution/Locations.h:1798
-#, fuzzy
-msgid "Praha"
-msgstr "巴拉圭"
-
-#: my-evolution/Locations.h:1799
-#, fuzzy
-msgid "Pratica di Mare"
-msgstr "局部毛毛雨"
-
-#: my-evolution/Locations.h:1800
-msgid "Prescott"
-msgstr ""
-
-# calendar/gui/print.c:1321
-# mail/mail-callbacks.c:1447
-# ui/evolution-addressbook.xml.h:10
-# ui/evolution-calendar.xml.h:24
-#: my-evolution/Locations.h:1801
-#, fuzzy
-msgid "Presidente Prudente"
-msgstr "預覽列印"
-
-#: my-evolution/Locations.h:1802
-msgid "Presque Isle"
-msgstr ""
-
-#: my-evolution/Locations.h:1803
-msgid "Prestwick"
-msgstr ""
-
-#: my-evolution/Locations.h:1804
-#, fuzzy
-msgid "Pretoria"
-msgstr "喬治亞"
-
-# calendar/gui/event-editor-dialog.glade.h:15
-#: my-evolution/Locations.h:1805
-#, fuzzy
-msgid "Preveza"
-msgstr "預覽"
-
-# ui/evolution-calendar.xml.h:25
-#: my-evolution/Locations.h:1806
-#, fuzzy
-msgid "Price-Carbon"
-msgstr "皮特康"
-
-# camel/providers/smtp/camel-smtp-transport.c:206
-#: my-evolution/Locations.h:1807
-#, fuzzy
-msgid "Pristina"
-msgstr "繁體"
-
-# addressbook/contact-editor/fulladdr.glade.h:10
-#: my-evolution/Locations.h:1808
-#, fuzzy
-msgid "Providence"
-msgstr "州/省 (_S)："
-
-# calendar/gui/event-editor-dialog.glade.h:15
-#: my-evolution/Locations.h:1809
-#, fuzzy
-msgid "Provincetown"
-msgstr "預覽"
-
-#: my-evolution/Locations.h:1810
-#, fuzzy
-msgid "Provo"
-msgstr "專業"
-
-#: my-evolution/Locations.h:1811
-msgid "Pskov"
-msgstr ""
-
-#: my-evolution/Locations.h:1812
-#, fuzzy
-msgid "Pucallpa"
-msgstr "帛琉群島"
-
-#: my-evolution/Locations.h:1813
-msgid "Pudahuel"
-msgstr ""
-
-# calendar/gui/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
-#: my-evolution/Locations.h:1814
-#, fuzzy
-msgid "Puebla"
-msgstr "公開"
-
-# calendar/gui/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
-#: my-evolution/Locations.h:1815
-#, fuzzy
-msgid "Pueblo"
-msgstr "公開"
-
-#: my-evolution/Locations.h:1816
-#, fuzzy
-msgid "Puerto Barrios"
-msgstr "波多黎各"
-
-#: my-evolution/Locations.h:1817
-msgid "Puerto Cabezas"
-msgstr ""
-
-#: my-evolution/Locations.h:1818
-#, fuzzy
-msgid "Puerto Escondido"
-msgstr "波多黎各"
-
-#: my-evolution/Locations.h:1819
-#, fuzzy
-msgid "Puerto Lempira"
-msgstr "波多黎各"
-
-#: my-evolution/Locations.h:1820
-#, fuzzy
-msgid "Puerto Limon"
-msgstr "波多黎各"
-
-#: my-evolution/Locations.h:1821
-#, fuzzy
-msgid "Puerto Maldonado"
-msgstr "局部有龍捲風"
-
-#: my-evolution/Locations.h:1822
-#, fuzzy
-msgid "Puerto Montt"
-msgstr "波多黎各"
-
-#: my-evolution/Locations.h:1823
-#, fuzzy
-msgid "Puerto Plata"
-msgstr "波多黎各"
-
-# calendar/gui/e-calendar-table.c:159
-#: my-evolution/Locations.h:1825
-#, fuzzy
-msgid "Puerto Suarez"
-msgstr "列印摘要"
-
-#: my-evolution/Locations.h:1826
-msgid "Puerto Vallarta"
-msgstr ""
-
-#: my-evolution/Locations.h:1827
-#, fuzzy
-msgid "Pula"
-msgstr "帛琉群島"
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:1828
-#, fuzzy
-msgid "Pullman"
-msgstr "波蘭"
-
-#: my-evolution/Locations.h:1829
-msgid "Punta Arenas"
-msgstr ""
-
-# calendar/gui/print.c:1156
-#: my-evolution/Locations.h:1830
-#, fuzzy
-msgid "Punta Cana"
-msgstr "列印行事曆"
-
-#: my-evolution/Locations.h:1831
-msgid "Punta Gorda"
-msgstr ""
-
-#: my-evolution/Locations.h:1832
-msgid "Puntilla Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:1833
-msgid "Pusan/Kimhae"
-msgstr ""
-
-#: my-evolution/Locations.h:1834
-msgid "Pyongtaek Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1835
-msgid "Pyongyang"
-msgstr ""
-
-# widgets/misc/e-messagebox.c:173
-#: my-evolution/Locations.h:1837
-#, fuzzy
-msgid "Quantico"
-msgstr "問題"
-
-# mail/mail-format.c:767
-# mail/message-list.c:1082
-#: my-evolution/Locations.h:1838
-#, fuzzy
-msgid "Quebec"
-msgstr "主旨"
-
-#: my-evolution/Locations.h:1839
-msgid "Quebec City"
-msgstr ""
-
-#: my-evolution/Locations.h:1840
-msgid "Queretaro"
-msgstr ""
-
-#: my-evolution/Locations.h:1841
-msgid "Quillayute"
-msgstr ""
-
-#: my-evolution/Locations.h:1842
-#, fuzzy
-msgid "Quimper"
-msgstr "英制(_I)"
-
-#: my-evolution/Locations.h:1843
-msgid "Quincy"
-msgstr ""
-
-#: my-evolution/Locations.h:1844
-msgid "Quito/Mariscal Sucre"
-msgstr ""
-
-#: my-evolution/Locations.h:1845
-msgid "Rabat"
-msgstr ""
-
-#: my-evolution/Locations.h:1846
-msgid "Raduzhny"
-msgstr ""
-
-#: my-evolution/Locations.h:1847
-msgid "Rafha"
-msgstr ""
-
-#: my-evolution/Locations.h:1848
-msgid "Raleigh-Durham"
-msgstr ""
-
-#: my-evolution/Locations.h:1849
-msgid "Randolph AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1850
-#, fuzzy
-msgid "Rapid City"
-msgstr "回覆"
-
-#: my-evolution/Locations.h:1851
-msgid "Rapid City-Ellsworth AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1852
-msgid "Ras Al Khaimah"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:1853
-#, fuzzy
-msgid "Rawlins"
-msgstr "下雨"
-
-# addressbook/printing/e-contact-print.glade.h:13
-#: my-evolution/Locations.h:1854
-#, fuzzy
-msgid "Reading"
-msgstr "標題"
-
-#: my-evolution/Locations.h:1855
-#, fuzzy
-msgid "Rebun Island"
-msgstr "波維特島"
-
-# mail/mail-send-recv.c:236
-#: my-evolution/Locations.h:1856
-#, fuzzy
-msgid "Recife"
-msgstr "已接收"
-
-#: my-evolution/Locations.h:1857
-msgid "Red Bluff"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:13
-#: my-evolution/Locations.h:1858
-#, fuzzy
-msgid "Redding"
-msgstr "標題"
-
-#: my-evolution/Locations.h:1859
-#, fuzzy
-msgid "Redig"
-msgstr "閱讀"
-
-# calendar/gui/event-editor-dialog.glade.h:20
-#: my-evolution/Locations.h:1860
-#, fuzzy
-msgid "Redmond"
-msgstr "提醒"
-
-#: my-evolution/Locations.h:1861
-msgid "Red Oak"
-msgstr ""
-
-#: my-evolution/Locations.h:1862
-msgid "Redwood Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:1863
-msgid "Reggio Calabria"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:34
-#: my-evolution/Locations.h:1864
-#, fuzzy
-msgid "Regina"
-msgstr "地區"
-
-#: my-evolution/Locations.h:1865
-msgid "Reims-Champagne"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-# calendar/gui/event-editor-dialog.glade.h:21
-#: my-evolution/Locations.h:1866
-#, fuzzy
-msgid "Rennes"
-msgstr "提醒"
-
-# addressbook/printing/e-contact-print.glade.h:34
-#: my-evolution/Locations.h:1867
-#, fuzzy
-msgid "Reno"
-msgstr "留尼旺"
-
-# addressbook/printing/e-contact-print.glade.h:34
-#: my-evolution/Locations.h:1868
-#, fuzzy
-msgid "Renton"
-msgstr "留尼旺"
-
-#: my-evolution/Locations.h:1869
-msgid "Resistencia"
-msgstr ""
-
-#: my-evolution/Locations.h:1870
-#, fuzzy
-msgid "Reus"
-msgstr "規則"
-
-#: my-evolution/Locations.h:1871
-#, fuzzy
-msgid "Reyes"
-msgstr "年"
-
-#: my-evolution/Locations.h:1872
-msgid "Reykjavik"
-msgstr ""
-
-#: my-evolution/Locations.h:1873
-#, fuzzy
-msgid "Reynosa"
-msgstr "重新載入"
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:1874
-#, fuzzy
-msgid "Rhinelander"
-msgstr "芬蘭"
-
-#: my-evolution/Locations.h:1875
-#, fuzzy
-msgid "Rhode Island"
-msgstr "波維特島"
-
-#: my-evolution/Locations.h:1876
-#, fuzzy
-msgid "Riberalta"
-msgstr "直布羅陀"
-
-#: my-evolution/Locations.h:1877
-msgid "Richmond"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:734
-#: my-evolution/Locations.h:1878
-#, fuzzy
-msgid "Rickenbacker"
-msgstr "暱稱"
-
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
-#: my-evolution/Locations.h:1879
-#, fuzzy
-msgid "Rieti"
-msgstr "海地"
-
-#: my-evolution/Locations.h:1880
-#, fuzzy
-msgid "Rifle"
-msgstr "角色"
-
-# addressbook/printing/e-contact-print.glade.h:33
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "右："
-
-#: my-evolution/Locations.h:1882
-#, fuzzy
-msgid "Rijeka"
-msgstr "閱讀"
-
-#: my-evolution/Locations.h:1883
-#, fuzzy
-msgid "Rimini"
-msgstr "羅馬尼亞"
-
-#: my-evolution/Locations.h:1884
-msgid "Rio De Janeiro"
-msgstr ""
-
-#: my-evolution/Locations.h:1885
-msgid "Rio Gallegos"
-msgstr ""
-
-#: my-evolution/Locations.h:1886
-msgid "Rio Grande"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:1887
-#, fuzzy
-msgid "Rioja"
-msgstr "無線電電話"
-
-#: my-evolution/Locations.h:1888
-#, fuzzy
-msgid "Rio / Jacarepagua"
-msgstr "尼加拉瓜"
-
-#: my-evolution/Locations.h:1889
-msgid "Rionegro/J.M.Cordova"
-msgstr ""
-
-#: my-evolution/Locations.h:1890
-#, fuzzy
-msgid "Rishiri Island"
-msgstr "英屬維爾京群島"
-
-#: my-evolution/Locations.h:1891
-msgid "Rivas"
-msgstr ""
-
-#: my-evolution/Locations.h:1892
-#, fuzzy
-msgid "Rivera"
-msgstr "賴比瑞亞"
-
-#: my-evolution/Locations.h:1893
-msgid "Riverside"
-msgstr ""
-
-#: my-evolution/Locations.h:1894
-msgid "Riverside/March AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1895
-msgid "Riverton"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-# addressbook/gui/widgets/e-addressbook-view.c:614
-# mail/message-browser.c:199
-# ui/evolution-addressbook.xml.h:9
-# ui/evolution-calendar.xml.h:23
-# ui/evolution-mail.xml.h:65
-# ui/evolution-tasks.xml.h:4
-#: my-evolution/Locations.h:1896
-#, fuzzy
-msgid "Rivne"
-msgstr "列印"
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: my-evolution/Locations.h:1897
-#, fuzzy
-msgid "Rivolto"
-msgstr "Evolution"
-
-#: my-evolution/Locations.h:1898
-#, fuzzy
-msgid "Riyadh"
-msgstr "閱讀"
-
-#: my-evolution/Locations.h:1899
-msgid "Roanoke"
-msgstr ""
-
-#: my-evolution/Locations.h:1900
-#, fuzzy
-msgid "Roatan"
-msgstr "克羅埃西亞"
-
-# calendar/gui/event-editor-dialog.glade.h:34
-#: my-evolution/Locations.h:1901
-#, fuzzy
-msgid "Robore"
-msgstr "之前"
-
-#: my-evolution/Locations.h:1902
-msgid "Rochester"
-msgstr ""
-
-#: my-evolution/Locations.h:1903
-msgid "Rockford"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:1904
-#, fuzzy
-msgid "Rockland"
-msgstr "波蘭"
-
-#: my-evolution/Locations.h:1905
-msgid "Rockport"
-msgstr ""
-
-#: my-evolution/Locations.h:1906
-msgid "Rock Springs"
-msgstr ""
-
-#: my-evolution/Locations.h:1907
-msgid "Rocky Mount"
-msgstr ""
-
-#: my-evolution/Locations.h:1908
-#, fuzzy
-msgid "Rodos"
-msgstr "會議室"
-
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#: my-evolution/Locations.h:1909
-#, fuzzy
-msgid "Rogers"
-msgstr "資料夾"
-
-#: my-evolution/Locations.h:1910
-#, fuzzy
-msgid "Roma/Ciampino"
-msgstr "羅馬尼亞"
-
-#: my-evolution/Locations.h:1911
-msgid "Roma/Fiumicino"
-msgstr ""
-
-#: my-evolution/Locations.h:1913
-msgid "Roma/Urbe"
-msgstr ""
-
-#: my-evolution/Locations.h:1914
-msgid "Rome-Russell"
-msgstr ""
-
-#: my-evolution/Locations.h:1915
-msgid "Ronchi de' Legionari"
-msgstr ""
-
-#: my-evolution/Locations.h:1916
-msgid "Ronneby"
-msgstr ""
-
-#: my-evolution/Locations.h:1917
-msgid "Roosevelt"
-msgstr ""
-
-# ui/evolution-mail.xml.h:5
-#: my-evolution/Locations.h:1918
-#, fuzzy
-msgid "Roros"
-msgstr "葛摩"
-
-#: my-evolution/Locations.h:1919
-msgid "Rorvik/Ryum"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:1920
-#, fuzzy
-msgid "Rosario"
-msgstr "無線電電話"
-
-#: my-evolution/Locations.h:1921
-msgid "Roseburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1922
-#, fuzzy
-msgid "Roseglen"
-msgstr "角色"
-
-# addressbook/gui/component/addressbook-config.c:401
-# mail/mail-config.glade.h:33
-#: my-evolution/Locations.h:1923
-#, fuzzy
-msgid "Rost"
-msgstr "主機"
-
-#: my-evolution/Locations.h:1924
-msgid "Rostov-Na-Donu"
-msgstr ""
-
-#: my-evolution/Locations.h:1925
-msgid "Roswell"
-msgstr ""
-
-#: my-evolution/Locations.h:1926
-msgid "Rotterdam"
-msgstr ""
-
-#: my-evolution/Locations.h:1927
-msgid "Rouen-Valle de Seine"
-msgstr ""
-
-#: my-evolution/Locations.h:1928
-msgid "Ruidoso-Sierra Blanca"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:18
-#: my-evolution/Locations.h:1929
-#, fuzzy
-msgid "Rurrenabaque"
-msgstr "週期性"
-
-#: my-evolution/Locations.h:1930
-msgid "Russell"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:2
-#: my-evolution/Locations.h:1931
-#, fuzzy
-msgid "Russia"
-msgstr "奧地利"
-
-#: my-evolution/Locations.h:1932
-#, fuzzy
-msgid "Rutland"
-msgstr "不丹"
-
-#: my-evolution/Locations.h:1933
-msgid "Rygge"
-msgstr ""
-
-#: my-evolution/Locations.h:1934
-msgid "Rzeszow"
-msgstr ""
-
-#: my-evolution/Locations.h:1935
-msgid "Saarbrucken"
-msgstr ""
-
-#: my-evolution/Locations.h:1936
-msgid "Sabine Pass"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:728
-#: my-evolution/Locations.h:1937
-#, fuzzy
-msgid "Sacramento"
-msgstr "部門"
-
-#: my-evolution/Locations.h:1938
-msgid "Sacramento-Woodland"
-msgstr ""
-
-#: my-evolution/Locations.h:1939
-msgid "Safford-Municipal Airport"
-msgstr ""
-
-# ui/evolution-message-composer.xml.h:26
-#: my-evolution/Locations.h:1940
-#, fuzzy
-msgid "Saginaw"
-msgstr "西班牙"
-
-#: my-evolution/Locations.h:1941
-msgid "Saint Anthony"
-msgstr ""
-
-#: my-evolution/Locations.h:1942
-msgid "Saint-Brieuc-Armor"
-msgstr ""
-
-#: my-evolution/Locations.h:1943
-msgid "Saint-Dizier-Robinson"
-msgstr ""
-
-#: my-evolution/Locations.h:1944
-msgid "Saint-Etienne-Boutheon"
-msgstr ""
-
-#: my-evolution/Locations.h:1945
-#, fuzzy
-msgid "Saint Mary's"
-msgstr "聖馬利諾"
-
-#: my-evolution/Locations.h:1946
-#, fuzzy
-msgid "Saint Mawgan"
-msgstr "聖馬利諾"
-
-#: my-evolution/Locations.h:1947
-msgid "Saint-Nazaire-Montoir"
-msgstr ""
-
-#: my-evolution/Locations.h:1948
-#, fuzzy
-msgid "Saint Paul"
-msgstr "聖露西亞"
-
-# ui/evolution-message-composer.xml.h:26
-#: my-evolution/Locations.h:1949
-#, fuzzy
-msgid "Saiq"
-msgstr "西班牙"
-
-#: my-evolution/Locations.h:1950
-#, fuzzy
-msgid "Salalah"
-msgstr "颮"
-
-# ui/evolution-event-editor.xml.h:40
-# ui/evolution-message-composer.xml.h:17
-# ui/evolution-task-editor-dialog.xml.h:50
-# widgets/misc/e-filter-bar.c:241
-#: my-evolution/Locations.h:1951
-#, fuzzy
-msgid "Salem"
-msgstr "儲存"
-
-# calendar/gui/calendar-model.c:499
-# calendar/gui/calendar-model.c:1068
-# calendar/gui/calendar-model.c:1574
-# calendar/gui/dialogs/task-editor-dialog.glade.h:13
-# calendar/gui/e-calendar-table.c:346
-# mail/message-list.c:688
-#: my-evolution/Locations.h:1952
-#, fuzzy
-msgid "Salida"
-msgstr "索馬利亞"
-
-#: my-evolution/Locations.h:1953
-msgid "Salida-Harriet"
-msgstr ""
-
-# calendar/gui/calendar-model.c:499
-# calendar/gui/calendar-model.c:1068
-# calendar/gui/calendar-model.c:1574
-# calendar/gui/dialogs/task-editor-dialog.glade.h:13
-# calendar/gui/e-calendar-table.c:346
-# mail/message-list.c:688
-#: my-evolution/Locations.h:1954
-#, fuzzy
-msgid "Salina"
-msgstr "索馬利亞"
-
-# calendar/gui/calendar-model.c:499
-# calendar/gui/calendar-model.c:1068
-# calendar/gui/calendar-model.c:1574
-# calendar/gui/dialogs/task-editor-dialog.glade.h:13
-# calendar/gui/e-calendar-table.c:346
-# mail/message-list.c:688
-#: my-evolution/Locations.h:1955
-#, fuzzy
-msgid "Salinas"
-msgstr "索馬利亞"
-
-#: my-evolution/Locations.h:1956
-msgid "Salisbury"
-msgstr ""
-
-#: my-evolution/Locations.h:1957
-#, fuzzy
-msgid "Salmon"
-msgstr "薩摩亞群島"
-
-#: my-evolution/Locations.h:1958
-msgid "Salmon (2)"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:1959
-#, fuzzy
-msgid "Salta"
-msgstr "馬爾他"
-
-#: my-evolution/Locations.h:1960
-msgid "Saltillo"
-msgstr ""
-
-#: my-evolution/Locations.h:1961
-msgid "Salt Lake City"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: my-evolution/Locations.h:1962
-#, fuzzy
-msgid "Salto"
-msgstr "週六(_S)"
-
-#: my-evolution/Locations.h:1963
-msgid "Salt point"
-msgstr ""
-
-#: my-evolution/Locations.h:1964
-#, fuzzy
-msgid "Salvador"
-msgstr "薩爾瓦多"
-
-#: my-evolution/Locations.h:1965
-msgid "Salzburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1966
-#, fuzzy
-msgid "Samara"
-msgstr "薩摩亞群島"
-
-#: my-evolution/Locations.h:1967
-#, fuzzy
-msgid "Samos"
-msgstr "薩摩亞群島"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: my-evolution/Locations.h:1968
-#, fuzzy
-msgid "Samsun"
-msgstr "週日(_N)"
-
-# ui/evolution-message-composer.xml.h:26
-#: my-evolution/Locations.h:1969
-#, fuzzy
-msgid "Sana'A"
-msgstr "沙塵"
-
-#: my-evolution/Locations.h:1970
-msgid "San Andres Isla/Sesquicentenario"
-msgstr ""
-
-#: my-evolution/Locations.h:1971
-#, fuzzy
-msgid "San Angelo"
-msgstr "聖馬利諾"
-
-#: my-evolution/Locations.h:1972
-msgid "San Antonio"
-msgstr ""
-
-#: my-evolution/Locations.h:1973
-msgid "San Antonio Del Tachira"
-msgstr ""
-
-#: my-evolution/Locations.h:1974
-msgid "San Antonio-Kelly AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1975
-msgid "San Antonio-Stinson"
-msgstr ""
-
-#: my-evolution/Locations.h:1976
-#, fuzzy
-msgid "San Carlos"
-msgstr "聖馬利諾"
-
-# ui/evolution-message-composer.xml.h:26
-#: my-evolution/Locations.h:1977
-#, fuzzy
-msgid "Sandane"
-msgstr "沙塵"
-
-#: my-evolution/Locations.h:1978
-#, fuzzy
-msgid "Sandberg"
-msgstr "寄件者"
-
-#: my-evolution/Locations.h:1979
-#, fuzzy
-msgid "Sanderson"
-msgstr "寄件者"
-
-#: my-evolution/Locations.h:1980
-#, fuzzy
-msgid "San Diego"
-msgstr "聖馬利諾"
-
-#: my-evolution/Locations.h:1981
-msgid "San Diego-Brown"
-msgstr ""
-
-#: my-evolution/Locations.h:1982
-msgid "San Diego-Miramar"
-msgstr ""
-
-#: my-evolution/Locations.h:1983
-msgid "San Diego-Montgomery"
-msgstr ""
-
-#: my-evolution/Locations.h:1984
-msgid "San Diego-North Island"
-msgstr ""
-
-#: my-evolution/Locations.h:1985
-msgid "San Diego-Santee"
-msgstr ""
-
-#: my-evolution/Locations.h:1986
-msgid "Sandnessjoen/Stokka"
-msgstr ""
-
-#: my-evolution/Locations.h:1987
-#, fuzzy
-msgid "Sand Point"
-msgstr "聖馬利諾"
-
-#: my-evolution/Locations.h:1988
-msgid "San Fernando De Apure"
-msgstr ""
-
-# ui/evolution-message-composer.xml.h:26
-#: my-evolution/Locations.h:1989
-#, fuzzy
-msgid "Sanford"
-msgstr "沙塵"
-
-#: my-evolution/Locations.h:1990
-#, fuzzy
-msgid "San Francisco"
-msgstr "聖馬利諾"
-
-# addressbook/printing/e-contact-print.glade.h:35
-#: my-evolution/Locations.h:1991
-#, fuzzy
-msgid "Sangju"
-msgstr "網底"
-
-#: my-evolution/Locations.h:1992
-msgid "San Ignacio De Velasco"
-msgstr ""
-
-#: my-evolution/Locations.h:1993
-#, fuzzy
-msgid "San Joaquin"
-msgstr "聖馬利諾"
-
-# ui/evolution-contact-editor.xml.h:9
-# ui/evolution-event-editor.xml.h:42
-# ui/evolution-task-editor-dialog.xml.h:52
-#: my-evolution/Locations.h:1994
-#, fuzzy
-msgid "San Jose"
-msgstr "儲存後關閉"
-
-#: my-evolution/Locations.h:1995
-msgid "San Jose De Chiquitos"
-msgstr ""
-
-#: my-evolution/Locations.h:1996
-msgid "San Jose del Cabo"
-msgstr ""
-
-#: my-evolution/Locations.h:1997
-msgid "San Jose-Santa Clara"
-msgstr ""
-
-#: my-evolution/Locations.h:1998
-#, fuzzy
-msgid "San Juan"
-msgstr "聖馬利諾"
-
-#: my-evolution/Locations.h:1999
-msgid "Sankt-Peterburg"
-msgstr ""
-
-# calendar/gui/calendar-model.c:499
-# calendar/gui/calendar-model.c:1068
-# calendar/gui/calendar-model.c:1574
-# calendar/gui/dialogs/task-editor-dialog.glade.h:13
-# calendar/gui/e-calendar-table.c:346
-# mail/message-list.c:688
-#: my-evolution/Locations.h:2000
-#, fuzzy
-msgid "Sanliurfa"
-msgstr "索馬利亞"
-
-#: my-evolution/Locations.h:2001
-msgid "San Luis Obispo"
-msgstr ""
-
-#: my-evolution/Locations.h:2002
-msgid "San Luis Potosi"
-msgstr ""
-
-#: my-evolution/Locations.h:2003
-#, fuzzy
-msgid "San Miguel"
-msgstr "聖馬利諾"
-
-#: my-evolution/Locations.h:2004
-#, fuzzy
-msgid "San Nicholas Island"
-msgstr "諾福克群島"
-
-#: my-evolution/Locations.h:2005
-#, fuzzy
-msgid "San Salvador"
-msgstr "薩爾瓦多"
-
-#: my-evolution/Locations.h:2006
-#, fuzzy
-msgid "San Sebastian"
-msgstr "聖馬利諾"
-
-#: my-evolution/Locations.h:2007
-#, fuzzy
-msgid "Santa Ana"
-msgstr "聖露西亞"
-
-#: my-evolution/Locations.h:2008
-msgid "Santa Barbara"
-msgstr ""
-
-#: my-evolution/Locations.h:2009
-msgid "Santa Cruz"
-msgstr ""
-
-#: my-evolution/Locations.h:2010
-msgid "Santa Fe"
-msgstr ""
-
-#: my-evolution/Locations.h:2011
-#, fuzzy
-msgid "Santa Maria"
-msgstr "聖馬利諾"
-
-#: my-evolution/Locations.h:2012
-msgid "Santa Marta/Simon Bolivar"
-msgstr ""
-
-#: my-evolution/Locations.h:2013
-#, fuzzy
-msgid "Santa Monica"
-msgstr "聖露西亞"
-
-#: my-evolution/Locations.h:2014
-#, fuzzy
-msgid "Santander"
-msgstr "寄件者"
-
-#: my-evolution/Locations.h:2015
-#, fuzzy
-msgid "Santarem"
-msgstr "沙暴"
-
-#: my-evolution/Locations.h:2016
-msgid "Santa Rosa"
-msgstr ""
-
-#: my-evolution/Locations.h:2017
-msgid "Santa Rosa de Copan"
-msgstr ""
-
-#: my-evolution/Locations.h:2018
-#, fuzzy
-msgid "Santiago"
-msgstr "聖露西亞"
-
-#: my-evolution/Locations.h:2019
-msgid "Santiago de Cuba"
-msgstr ""
-
-#: my-evolution/Locations.h:2020
-msgid "Santiago Del Estero"
-msgstr ""
-
-#: my-evolution/Locations.h:2021
-#, fuzzy
-msgid "Santorini"
-msgstr "沙暴"
-
-# calendar/gui/e-meeting-dialog.glade.h:23
-# mail/message-list.c:1081
-#: my-evolution/Locations.h:2022
-#, fuzzy
-msgid "Santos"
-msgstr "狀況"
-
-#: my-evolution/Locations.h:2023
-msgid "Sao Jose Dos Campo"
-msgstr ""
-
-#: my-evolution/Locations.h:2024
-#, fuzzy
-msgid "Sao Luiz"
-msgstr "聖露西亞"
-
-#: my-evolution/Locations.h:2025
-msgid "Sao Paulo"
-msgstr ""
-
-#: my-evolution/Locations.h:2026
-msgid "Sapporo Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2027
-msgid "Sarajevo"
-msgstr ""
-
-#: my-evolution/Locations.h:2028
-msgid "Saranac Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:2029
-#, fuzzy
-msgid "Sarasota"
-msgstr "薩摩亞群島"
-
-#: my-evolution/Locations.h:2030
-msgid "Saratov"
-msgstr ""
-
-#: my-evolution/Locations.h:2031
-#, fuzzy
-msgid "Sarzana"
-msgstr "斯里蘭卡"
-
-#: my-evolution/Locations.h:2032
-msgid "Saskatchewan"
-msgstr ""
-
-#: my-evolution/Locations.h:2033
-msgid "Saskatoon"
-msgstr ""
-
-#: my-evolution/Locations.h:2034
-msgid "Sauce Viejo"
-msgstr ""
-
-#: my-evolution/Locations.h:2036
-msgid "Sault Ste Marie"
-msgstr ""
-
-#: my-evolution/Locations.h:2037
-msgid "Savannah"
-msgstr ""
-
-#: my-evolution/Locations.h:2038
-msgid "Savannah-Hunter AAF"
-msgstr ""
-
-#: my-evolution/Locations.h:2039
-msgid "Sawyer AFB"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: my-evolution/Locations.h:2040
-#, fuzzy
-msgid "Sayun"
-msgstr "週日(_N)"
-
-# calendar/gui/e-meeting-dialog.glade.h:23
-# mail/message-list.c:1081
-#: my-evolution/Locations.h:2041
-#, fuzzy
-msgid "Scatsta"
-msgstr "狀況"
-
-#: my-evolution/Locations.h:2042
-msgid "Schaffen"
-msgstr ""
-
-#: my-evolution/Locations.h:2043
-msgid "Schenectady"
-msgstr ""
-
-#: my-evolution/Locations.h:2044
-msgid "Scilly Isles"
-msgstr ""
-
-#: my-evolution/Locations.h:2045
-msgid "Scottsbluff"
-msgstr ""
-
-#: my-evolution/Locations.h:2046
-msgid "Scottsdale"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:708
-#: my-evolution/Locations.h:2047
-#, fuzzy
-msgid "Scranton"
-msgstr "團體"
-
-#: my-evolution/Locations.h:2048
-msgid "Seattle"
-msgstr ""
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: my-evolution/Locations.h:2049
-#, fuzzy
-msgid "Seattle-Boeing"
-msgstr "設定"
-
-# calendar/gui/calendar-model.c:499
-# calendar/gui/calendar-model.c:1068
-# calendar/gui/calendar-model.c:1574
-# calendar/gui/dialogs/task-editor-dialog.glade.h:13
-# calendar/gui/e-calendar-table.c:346
-# mail/message-list.c:688
-#: my-evolution/Locations.h:2050
-#, fuzzy
-msgid "Sedalia"
-msgstr "索馬利亞"
-
-# mail/message-list.c:678
-#: my-evolution/Locations.h:2051
-#, fuzzy
-msgid "Seeb"
-msgstr "已閱讀"
-
-#: my-evolution/Locations.h:2052
-msgid "Selanik"
-msgstr ""
-
-#: my-evolution/Locations.h:2053
-#, fuzzy
-msgid "Sendai Airport"
-msgstr "開始匯入"
-
-#: my-evolution/Locations.h:2054
-msgid "Seoul E Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2055
-msgid "Seoul/Kimp'O International Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:2056
-msgid "Seoul/Yongdungp'O Rokaf Wc"
-msgstr ""
-
-#: my-evolution/Locations.h:2057
-msgid "Sept-Iles"
-msgstr ""
-
-#: my-evolution/Locations.h:2058
-msgid "Seul Choix Pt"
-msgstr ""
-
-#: my-evolution/Locations.h:2059
-msgid "Sevilla"
-msgstr ""
-
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
-#: my-evolution/Locations.h:2060
-#, fuzzy
-msgid "Seward"
-msgstr "尋找"
-
-#: my-evolution/Locations.h:2061
-msgid "Sexton Summit"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:35
-#: my-evolution/Locations.h:2062
-#, fuzzy
-msgid "Shanghai"
-msgstr "網底"
-
-#: my-evolution/Locations.h:2063
-msgid "Shannon"
-msgstr ""
-
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
-#: my-evolution/Locations.h:2064
-#, fuzzy
-msgid "Sharjah"
-msgstr "尋找"
-
-#: my-evolution/Locations.h:2065
-msgid "Sharm El Sheikhintl"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-# calendar/gui/event-editor.c:480
-#: my-evolution/Locations.h:2066
-#, fuzzy
-msgid "Sharurah"
-msgstr "星期六"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-# calendar/gui/event-editor.c:480
-#: my-evolution/Locations.h:2067
-#, fuzzy
-msgid "Shawbury"
-msgstr "星期六"
-
-# calendar/gui/e-calendar-table.c:154
-#: my-evolution/Locations.h:2068
-#, fuzzy
-msgid "Shearwater"
-msgstr "開始日期"
-
-#: my-evolution/Locations.h:2069
-msgid "Sheboygan"
-msgstr ""
-
-# mail/message-list.c:678
-#: my-evolution/Locations.h:2070
-#, fuzzy
-msgid "Sheldon"
-msgstr "瑞典"
-
-#: my-evolution/Locations.h:2071
-msgid "Shelter Cove"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:34
-#: my-evolution/Locations.h:2072
-#, fuzzy
-msgid "Shelton"
-msgstr "選擇："
-
-#: my-evolution/Locations.h:2073
-msgid "Shenandoah"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: my-evolution/Locations.h:2074
-#, fuzzy
-msgid "Sheridan"
-msgstr "蘇丹"
-
-#: my-evolution/Locations.h:2075
-msgid "Sherman-Denison"
-msgstr ""
-
-#: my-evolution/Locations.h:2076
-msgid "Shimofusa Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2077
-msgid "Shingle Point"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:36
-#: my-evolution/Locations.h:2078
-#, fuzzy
-msgid "Shiraz"
-msgstr "大小"
-
-#: my-evolution/Locations.h:2079
-msgid "Shishmaref"
-msgstr ""
-
-#: my-evolution/Locations.h:2080
-msgid "Shizuhama Ab"
-msgstr ""
-
-# mail/message-list.c:1081
-#: my-evolution/Locations.h:2081
-#, fuzzy
-msgid "Shoreham"
-msgstr "目標"
-
-#: my-evolution/Locations.h:2082
-#, fuzzy
-msgid "Show Low"
-msgstr "淺雪"
-
-#: my-evolution/Locations.h:2083
-msgid "Shreveport Downtown"
-msgstr ""
-
-#: my-evolution/Locations.h:2084
-msgid "Shreveport Regional"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-# addressbook/gui/widgets/e-addressbook-view.c:614
-# mail/message-browser.c:199
-# ui/evolution-addressbook.xml.h:9
-# ui/evolution-calendar.xml.h:23
-# ui/evolution-mail.xml.h:65
-# ui/evolution-tasks.xml.h:4
-#: my-evolution/Locations.h:2085
-#, fuzzy
-msgid "Sidney"
-msgstr "列印"
-
-#: my-evolution/Locations.h:2086
-msgid "Sigonella"
-msgstr ""
-
-#: my-evolution/Locations.h:2087
-msgid "Siloam Springs"
-msgstr ""
-
-# ui/evolution-message-composer.xml.h:54
-#: my-evolution/Locations.h:2088
-#, fuzzy
-msgid "Silver City"
-msgstr "安全性"
-
-# camel/providers/sendmail/camel-sendmail-provider.c:37
-# mail/mail-config.glade.h:67
-#: my-evolution/Locations.h:2089
-#, fuzzy
-msgid "Sindal"
-msgstr "Sendmail"
-
-#: my-evolution/Locations.h:2091
-msgid "Sioux City"
-msgstr ""
-
-#: my-evolution/Locations.h:2092
-msgid "Sioux Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:2093
-msgid "Sitka"
-msgstr ""
-
-#: my-evolution/Locations.h:2094
-msgid "Sivas"
-msgstr ""
-
-#: my-evolution/Locations.h:2095
-msgid "Sivrihisar"
-msgstr ""
-
-#: my-evolution/Locations.h:2096
-msgid "Skagway"
-msgstr ""
-
-#: my-evolution/Locations.h:2097
-msgid "Skiathos"
-msgstr ""
-
-#: my-evolution/Locations.h:2098
-msgid "Skien/Geiteryggen"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:36
-#: my-evolution/Locations.h:2099
-#, fuzzy
-msgid "Skive"
-msgstr "大小"
-
-# ui/evolution-addressbook.xml.h:12
-#: my-evolution/Locations.h:2100
-#, fuzzy
-msgid "Skopje"
-msgstr "停止"
-
-# mail/mail-config.glade.h:68
-#: my-evolution/Locations.h:2101
-#, fuzzy
-msgid "Skwentna"
-msgstr "傳送"
-
-#: my-evolution/Locations.h:2102
-#, fuzzy
-msgid "Slana"
-msgstr "阿爾巴尼亞"
-
-# executive-summary/test-service/rdf-summary.c:806
-#: my-evolution/Locations.h:2105
-#, fuzzy
-msgid "Smithers"
-msgstr "分"
-
-#: my-evolution/Locations.h:2106
-msgid "Smyrna"
-msgstr ""
-
-#: my-evolution/Locations.h:2107
-#, fuzzy
-msgid "Snowshoe Lake"
-msgstr "陣雪"
-
-# ui/evolution-calendar.xml.h:15
-#: my-evolution/Locations.h:2108
-#, fuzzy
-msgid "Sochi"
-msgstr "南"
-
-# mail/message-list.c:1081
-#: my-evolution/Locations.h:2109
-#, fuzzy
-msgid "Socorro"
-msgstr "目標"
-
-# mail/message-list.c:1081
-#: my-evolution/Locations.h:2110
-#, fuzzy
-msgid "Socotra"
-msgstr "目標"
-
-#: my-evolution/Locations.h:2111
-#, fuzzy
-msgid "Soda Springs"
-msgstr "米雪"
-
-# calendar/gui/calendar-model.c:499
-# calendar/gui/calendar-model.c:1068
-# calendar/gui/calendar-model.c:1574
-# calendar/gui/dialogs/task-editor-dialog.glade.h:13
-# calendar/gui/e-calendar-table.c:346
-# mail/message-list.c:688
-#: my-evolution/Locations.h:2112
-#, fuzzy
-msgid "Sofia"
-msgstr "索馬利亞"
-
-# camel/providers/sendmail/camel-sendmail-provider.c:37
-# mail/mail-config.glade.h:67
-#: my-evolution/Locations.h:2113
-#, fuzzy
-msgid "Sogndal"
-msgstr "Sendmail"
-
-#: my-evolution/Locations.h:2114
-#, fuzzy
-msgid "Soldotna"
-msgstr "斯洛凡尼亞"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: my-evolution/Locations.h:2115
-#, fuzzy
-msgid "Somerset"
-msgstr "陣雨"
-
-#: my-evolution/Locations.h:2116
-#, fuzzy
-msgid "Sonderborg"
-msgstr "寄件者"
-
-#: my-evolution/Locations.h:2117
-msgid "Songmu Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2118
-msgid "Sorkjosen"
-msgstr ""
-
-#: my-evolution/Locations.h:2120
-#, fuzzy
-msgid "Southampton"
-msgstr "東南"
-
-# ui/evolution-calendar.xml.h:15
-#: my-evolution/Locations.h:2121
-#, fuzzy
-msgid "South Bend"
-msgstr "南"
-
-#: my-evolution/Locations.h:2122
-#, fuzzy
-msgid "South Carolina"
-msgstr "南非"
-
-#: my-evolution/Locations.h:2123
-#, fuzzy
-msgid "South Dakota"
-msgstr "東南"
-
-# ui/evolution-calendar.xml.h:15
-#: my-evolution/Locations.h:2124
-#, fuzzy
-msgid "Southend"
-msgstr "南"
-
-#: my-evolution/Locations.h:2125
-#, fuzzy
-msgid "South Marsh Island"
-msgstr "馬紹爾群島"
-
-#: my-evolution/Locations.h:2126
-msgid "South Timbalier"
-msgstr ""
-
-#: my-evolution/Locations.h:2128
-msgid "Sparrevohn"
-msgstr ""
-
-#: my-evolution/Locations.h:2129
-#, fuzzy
-msgid "Spencer"
-msgstr "寄件者"
-
-#: my-evolution/Locations.h:2130
-msgid "Spickard"
-msgstr ""
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: my-evolution/Locations.h:2131
-#, fuzzy
-msgid "Split"
-msgstr "靄"
-
-# ui/evolution-message-composer.xml.h:26
-#: my-evolution/Locations.h:2132
-#, fuzzy
-msgid "Spokane"
-msgstr "西班牙"
-
-#: my-evolution/Locations.h:2133
-msgid "Spokane-Parkwater"
-msgstr ""
-
-#: my-evolution/Locations.h:2134
-msgid "Springbok"
-msgstr ""
-
-#: my-evolution/Locations.h:2135
-#, fuzzy
-msgid "Springfield"
-msgstr "簡體"
-
-#: my-evolution/Locations.h:2136
-msgid "Stampede Pass"
-msgstr ""
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: my-evolution/Locations.h:2137
-#, fuzzy
-msgid "State College"
-msgstr "完成日期："
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: my-evolution/Locations.h:2138
-#, fuzzy
-msgid "Stauning"
-msgstr "設定"
-
-#: my-evolution/Locations.h:2139
-msgid "Staunton"
-msgstr ""
-
-#: my-evolution/Locations.h:2140
-msgid "Stavanger/Sola"
-msgstr ""
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: my-evolution/Locations.h:2141
-#, fuzzy
-msgid "Staverton"
-msgstr "設定"
-
-# ui/evolution-addressbook.xml.h:12
-#: my-evolution/Locations.h:2142
-#, fuzzy
-msgid "Stavropol"
-msgstr "停止"
-
-#: my-evolution/Locations.h:2143
-msgid "St Cloud"
-msgstr ""
-
-#: my-evolution/Locations.h:2144
-msgid "Steamboat Springs"
-msgstr ""
-
-# calendar/gui/e-meeting-dialog.glade.h:21
-#: my-evolution/Locations.h:2145
-#, fuzzy
-msgid "Stephenville"
-msgstr "塞席爾"
-
-#: my-evolution/Locations.h:2146
-#, fuzzy
-msgid "St. George"
-msgstr "聖赫勒拿島"
-
-#: my-evolution/Locations.h:2147
-msgid "Stillwater"
-msgstr ""
-
-#: my-evolution/Locations.h:2148
-msgid "St. John's"
-msgstr ""
-
-#: my-evolution/Locations.h:2149
-msgid "St Johnsbury"
-msgstr ""
-
-# ui/evolution-addressbook.xml.h:12
-#: my-evolution/Locations.h:2150
-#, fuzzy
-msgid "St Joseph"
-msgstr "停止"
-
-#: my-evolution/Locations.h:2151
-#, fuzzy
-msgid "St Louis"
-msgstr "聖露西亞"
-
-#: my-evolution/Locations.h:2152
-msgid "St Louis-Spirit"
-msgstr ""
-
-#: my-evolution/Locations.h:2153
-msgid "Stockholm (Arlanda)"
-msgstr ""
-
-#: my-evolution/Locations.h:2154
-msgid "Stockholm (Bromma)"
-msgstr ""
-
-#: my-evolution/Locations.h:2155
-msgid "Stockton"
-msgstr ""
-
-#: my-evolution/Locations.h:2156
-msgid "Stokmarknes/Skagen"
-msgstr ""
-
-#: my-evolution/Locations.h:2157
-msgid "Stord/Sorstokken"
-msgstr ""
-
-#: my-evolution/Locations.h:2158
-#, fuzzy
-msgid "Storm Lake"
-msgstr "斯里蘭卡"
-
-# widgets/misc/e-cell-date-edit.c:221
-# widgets/misc/e-dateedit.c:418
-#: my-evolution/Locations.h:2159
-#, fuzzy
-msgid "Stornoway"
-msgstr "挪威"
-
-# calendar/gui/e-meeting-dialog.glade.h:23
-# mail/message-list.c:1081
-#: my-evolution/Locations.h:2160
-#, fuzzy
-msgid "St Paul"
-msgstr "狀況"
-
-#: my-evolution/Locations.h:2161
-msgid "St Petersburg"
-msgstr ""
-
-#: my-evolution/Locations.h:2162
-msgid "St Petersburg / Clearwater"
-msgstr ""
-
-#: my-evolution/Locations.h:2163
-msgid "Strasbourg"
-msgstr ""
-
-#: my-evolution/Locations.h:2164
-msgid "Strevell"
-msgstr ""
-
-#: my-evolution/Locations.h:2165
-#, fuzzy
-msgid "St Simon's Island"
-msgstr "索羅門群島"
-
-#: my-evolution/Locations.h:2166
-msgid "Stumpy Point"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-# calendar/gui/event-editor.c:480
-#: my-evolution/Locations.h:2167
-#, fuzzy
-msgid "Sturgeon Bay"
-msgstr "星期六"
-
-#: my-evolution/Locations.h:2168
-msgid "Stuttgart"
-msgstr ""
-
-# mail/message-list.c:1081
-#: my-evolution/Locations.h:2169
-#, fuzzy
-msgid "Sucre"
-msgstr "目標"
-
-#: my-evolution/Locations.h:2170
-#, fuzzy
-msgid "Sumburgh"
-msgstr "盧森堡"
-
-# calendar/gui/e-calendar-table.c:159
-#: my-evolution/Locations.h:2171
-#, fuzzy
-msgid "Sumter"
-msgstr "摘要"
-
-#: my-evolution/Locations.h:2172
-msgid "Sumter (2)"
-msgstr ""
-
-#: my-evolution/Locations.h:2173
-msgid "Sundsvall-Harnosand"
-msgstr ""
-
-#: my-evolution/Locations.h:2174
-msgid "Sungshan/Taipei"
-msgstr ""
-
-#: my-evolution/Locations.h:2175
-msgid "Superior"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: my-evolution/Locations.h:2177
-#, fuzzy
-msgid "Sutton"
-msgstr "週日(_N)"
-
-#: my-evolution/Locations.h:2178
-msgid "Suwon Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2179
-msgid "Svalbard"
-msgstr ""
-
-#: my-evolution/Locations.h:2180
-msgid "Svolvaer/Helle"
-msgstr ""
-
-#: my-evolution/Locations.h:2182
-msgid "Swift Current"
-msgstr ""
-
-#: my-evolution/Locations.h:2184
-msgid "Sydney"
-msgstr ""
-
-#: my-evolution/Locations.h:2185
-msgid "Syktyvkar"
-msgstr ""
-
-#: my-evolution/Locations.h:2186
-msgid "Sympheropol"
-msgstr ""
-
-#: my-evolution/Locations.h:2187
-msgid "Syracuse"
-msgstr ""
-
-#: my-evolution/Locations.h:2188
-msgid "Szczecin"
-msgstr ""
-
-#: my-evolution/Locations.h:2189
-msgid "Szombathely"
-msgstr ""
-
-# camel/providers/smtp/camel-smtp-transport.c:206
-#: my-evolution/Locations.h:2190
-#, fuzzy
-msgid "Tabatinga"
-msgstr "繁體"
-
-#: my-evolution/Locations.h:2191
-msgid "Tabriz"
-msgstr ""
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: my-evolution/Locations.h:2192
-#, fuzzy
-msgid "Tabuk"
-msgstr "工作"
-
-#: my-evolution/Locations.h:2193
-msgid "Tachikawa Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2194
-#, fuzzy
-msgid "Tacna"
-msgstr "迦納"
-
-#: my-evolution/Locations.h:2195
-msgid "Tacoma"
-msgstr ""
-
-#: my-evolution/Locations.h:2196
-msgid "Tacoma-Lakewood"
-msgstr ""
-
-#: my-evolution/Locations.h:2197
-msgid "Tacuarembo"
-msgstr ""
-
-#: my-evolution/Locations.h:2198
-msgid "Taegu"
-msgstr ""
-
-#: my-evolution/Locations.h:2199
-msgid "Taegu Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2200
-#, fuzzy
-msgid "Taejon"
-msgstr "然後"
-
-#: my-evolution/Locations.h:2201
-msgid "Tahoe Valley"
-msgstr ""
-
-#: my-evolution/Locations.h:2202
-msgid "Taichung"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2203
-#, fuzzy
-msgid "Taif"
-msgstr "臺灣"
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2204
-#, fuzzy
-msgid "Tainan"
-msgstr "臺灣"
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2206
-#, fuzzy
-msgid "Taiyuan"
-msgstr "臺灣"
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2207
-#, fuzzy
-msgid "Taiz"
-msgstr "臺灣"
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2208
-#, fuzzy
-msgid "Tajima"
-msgstr "臺灣"
-
-#: my-evolution/Locations.h:2209
-msgid "Takamatsu Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:2210
-msgid "Talara"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "臺灣"
-
-#: my-evolution/Locations.h:2212
-msgid "Talkeetna"
-msgstr ""
-
-#: my-evolution/Locations.h:2213
-msgid "Tallahassee"
-msgstr ""
-
-#: my-evolution/Locations.h:2214
-msgid "Tamanrasset"
-msgstr ""
-
-#: my-evolution/Locations.h:2215
-msgid "Tamanrasset/Aguenna"
-msgstr ""
-
-#: my-evolution/Locations.h:2216
-#, fuzzy
-msgid "Tampa"
-msgstr "日本"
-
-#: my-evolution/Locations.h:2217
-msgid "Tampa-Macdill AFB"
-msgstr ""
-
-# addressbook/printing/e-contact-print.glade.h:27
-#: my-evolution/Locations.h:2218
-#, fuzzy
-msgid "Tampere"
-msgstr "使用紙張"
-
-#: my-evolution/Locations.h:2219
-msgid "Tampico"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:2
-#: my-evolution/Locations.h:2220
-#, fuzzy
-msgid "Tanana"
-msgstr "加拿大"
-
-#: my-evolution/Locations.h:2221
-msgid "Tanegashima Airport"
-msgstr ""
-
-# mail/message-list.c:685
-#: my-evolution/Locations.h:2222
-#, fuzzy
-msgid "Taos"
-msgstr "寮國"
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2223
-#, fuzzy
-msgid "Taoyuan"
-msgstr "臺灣"
-
-#: my-evolution/Locations.h:2224
-msgid "Tapachula"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2225
-#, fuzzy
-msgid "Taranto"
-msgstr "臺灣"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: my-evolution/Locations.h:2226
-#, fuzzy
-msgid "Tarbes"
-msgstr "工作"
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2227
-#, fuzzy
-msgid "Tarija"
-msgstr "臺灣"
-
-#: my-evolution/Locations.h:2228
-msgid "Tarvisio"
-msgstr ""
-
-# camel/providers/smtp/camel-smtp-transport.c:206
-#: my-evolution/Locations.h:2229
-#, fuzzy
-msgid "Tatalina"
-msgstr "繁體"
-
-#: my-evolution/Locations.h:2230
-msgid "Tateyama Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2231
-msgid "Taunton"
-msgstr ""
-
-#: my-evolution/Locations.h:2232
-msgid "Tebessa"
-msgstr ""
-
-#: my-evolution/Locations.h:2233
-msgid "Tees-Side"
-msgstr ""
-
-#: my-evolution/Locations.h:2234
-msgid "Tegucigalpa"
-msgstr ""
-
-#: my-evolution/Locations.h:2235
-msgid "Tehran-Mehrabad"
-msgstr ""
-
-#: my-evolution/Locations.h:2236
-#, fuzzy
-msgid "Tela"
-msgstr "托克勞群島"
-
-# addressbook/contact-editor/e-contact-editor.c:1259
-# addressbook/gui/widgets/e-addressbook-view.c:722
-#: my-evolution/Locations.h:2237
-#, fuzzy
-msgid "Temple"
-msgstr "電報"
-
-#: my-evolution/Locations.h:2238
-msgid "Tennessee"
-msgstr ""
-
-#: my-evolution/Locations.h:2239
-msgid "Tepic"
-msgstr ""
-
-#: my-evolution/Locations.h:2240
-msgid "Teresina"
-msgstr ""
-
-#: my-evolution/Locations.h:2241
-msgid "Terre Haute"
-msgstr ""
-
-#: my-evolution/Locations.h:2242
-msgid "Terrell"
-msgstr ""
-
-#: my-evolution/Locations.h:2243
-msgid "Teterboro"
-msgstr ""
-
-#: my-evolution/Locations.h:2244
-msgid "Texarkana"
-msgstr ""
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: my-evolution/Locations.h:2245
-#, fuzzy
-msgid "Texas"
-msgstr "工作"
-
-# calendar/gui/e-meeting-dialog.glade.h:21
-#: my-evolution/Locations.h:2246
-#, fuzzy
-msgid "The Dalles"
-msgstr "塞席爾"
-
-#: my-evolution/Locations.h:2247
-msgid "Thessaloniki"
-msgstr ""
-
-#: my-evolution/Locations.h:2248
-msgid "Thief River Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:2249
-msgid "Thiruvananthapuram"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:730
-#: my-evolution/Locations.h:2250
-#, fuzzy
-msgid "Thisted"
-msgstr "頭銜"
-
-#: my-evolution/Locations.h:2251
-msgid "Thompson Falls"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-# calendar/gui/event-editor.c:478
-#: my-evolution/Locations.h:2252
-#, fuzzy
-msgid "Thumrait"
-msgstr "星期四"
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2253
-#, fuzzy
-msgid "Tianjin"
-msgstr "臺灣"
-
-#: my-evolution/Locations.h:2254
-#, fuzzy
-msgid "Tijuana"
-msgstr "立陶宛"
-
-#: my-evolution/Locations.h:2255
-msgid "Timisoara"
-msgstr ""
-
-#: my-evolution/Locations.h:2256
-msgid "Tin City"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2257
-#, fuzzy
-msgid "Tirana"
-msgstr "臺灣"
-
-# ui/evolution-calendar.xml.h:36
-#: my-evolution/Locations.h:2258
-#, fuzzy
-msgid "Tiree"
-msgstr "空閒"
-
-#: my-evolution/Locations.h:2259
-msgid "Tirgu Mures"
-msgstr ""
-
-#: my-evolution/Locations.h:2260
-msgid "Tiruchchirapalli"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:730
-#: my-evolution/Locations.h:2261
-#, fuzzy
-msgid "Titusville"
-msgstr "頭銜"
-
-# calendar/gui/calendar-model.c:363
-# calendar/gui/calendar-model.c:900
-# calendar/gui/e-calendar-table.c:324
-#: my-evolution/Locations.h:2262
-#, fuzzy
-msgid "Tivat"
-msgstr "私人"
-
-#: my-evolution/Locations.h:2263
-msgid "Tlemcen Zenata"
-msgstr ""
-
-#: my-evolution/Locations.h:2264
-msgid "Tobias Bolanos"
-msgstr ""
-
-#: my-evolution/Locations.h:2265
-msgid "Tocumen"
-msgstr ""
-
-#: my-evolution/Locations.h:2266
-msgid "Togiak Village"
-msgstr ""
-
-#: my-evolution/Locations.h:2267
-msgid "Tokachi GSDF"
-msgstr ""
-
-#: my-evolution/Locations.h:2268
-#, fuzzy
-msgid "Tokunoshima Island"
-msgstr "聖誕島"
-
-#: my-evolution/Locations.h:2269
-msgid "Tokushima Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2270
-msgid "Tokyo Heliport"
-msgstr ""
-
-#: my-evolution/Locations.h:2271
-msgid "Tokyo International Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:2272
-msgid "Tokyo New International Airport"
-msgstr ""
-
-# ui/evolution.xml.h:31
-#: my-evolution/Locations.h:2273
-#, fuzzy
-msgid "Toledo"
-msgstr "切換"
-
-#: my-evolution/Locations.h:2274
-#, fuzzy
-msgid "Toluca"
-msgstr "托克勞群島"
-
-# ui/evolution-calendar.xml.h:34
-# widgets/misc/e-cell-date-edit.c:229
-# widgets/misc/e-dateedit.c:424
-#: my-evolution/Locations.h:2275
-#, fuzzy
-msgid "Tonopah"
-msgstr "東加"
-
-#: my-evolution/Locations.h:2276
-#, fuzzy
-msgid "Topeka"
-msgstr "托克勞群島"
-
-#: my-evolution/Locations.h:2277
-msgid "Topeka-Forbes Field"
-msgstr ""
-
-#: my-evolution/Locations.h:2278
-msgid "Torino/Bric Della Croce"
-msgstr ""
-
-#: my-evolution/Locations.h:2279
-msgid "Torino/Caselle"
-msgstr ""
-
-#: my-evolution/Locations.h:2280
-#, fuzzy
-msgid "Toronto"
-msgstr "龍捲風"
-
-# addressbook/printing/e-contact-print.glade.h:39
-#: my-evolution/Locations.h:2281
-#, fuzzy
-msgid "Torp"
-msgstr "上："
-
-# ui/evolution-mail.xml.h:2
-#: my-evolution/Locations.h:2282
-#, fuzzy
-msgid "Torrance"
-msgstr "法國"
-
-#: my-evolution/Locations.h:2283
-#, fuzzy
-msgid "Torreon"
-msgstr "韓文"
-
-#: my-evolution/Locations.h:2284
-#, fuzzy
-msgid "Tottori Airport"
-msgstr "開始匯入"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:1
-# ui/evolution-contact-editor.xml.h:1
-# ui/evolution-event-editor.xml.h:10
-# ui/evolution-message-composer.xml.h:3
-# ui/evolution-subscribe.xml.h:2
-# ui/evolution-task-editor-dialog.xml.h:11
-# ui/evolution.xml.h:5
-#: my-evolution/Locations.h:2285
-#, fuzzy
-msgid "Toulouse"
-msgstr "關閉"
-
-#: my-evolution/Locations.h:2286
-msgid "Toul-Rosieres"
-msgstr ""
-
-#: my-evolution/Locations.h:2287
-msgid "Tours-St-Symphorien"
-msgstr ""
-
-#: my-evolution/Locations.h:2288
-msgid "Toussus-Le Noble"
-msgstr ""
-
-#: my-evolution/Locations.h:2289
-msgid "Townsville"
-msgstr ""
-
-#: my-evolution/Locations.h:2290
-msgid "Toyama Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:2291
-#, fuzzy
-msgid "Trabzon"
-msgstr "加彭"
-
-#: my-evolution/Locations.h:2292
-#, fuzzy
-msgid "Trapani"
-msgstr "日本"
-
-#: my-evolution/Locations.h:2293
-msgid "Traverse City"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1259
-# addressbook/gui/widgets/e-addressbook-view.c:722
-#: my-evolution/Locations.h:2294
-#, fuzzy
-msgid "Trelew"
-msgstr "電報"
-
-# addressbook/printing/e-contact-print.glade.h:24
-#: my-evolution/Locations.h:2295
-#, fuzzy
-msgid "Trenton"
-msgstr "紙張方向"
-
-# mail/message-browser.c:207
-# ui/evolution-event-editor.xml.h:33
-# ui/evolution-mail.xml.h:64
-# ui/evolution-task-editor-dialog.xml.h:36
-#: my-evolution/Locations.h:2296
-#, fuzzy
-msgid "Trevico"
-msgstr "上一步"
-
-#: my-evolution/Locations.h:2297
-msgid "Treviso/Istrana"
-msgstr ""
-
-#: my-evolution/Locations.h:2298
-msgid "Treviso/S.Angelo"
-msgstr ""
-
-#: my-evolution/Locations.h:2299
-#, fuzzy
-msgid "Trieste"
-msgstr "測試"
-
-#: my-evolution/Locations.h:2300
-#, fuzzy
-msgid "Trinidad"
-msgstr "龍捲風"
-
-#: my-evolution/Locations.h:2301
-msgid "Tripoli"
-msgstr ""
-
-#: my-evolution/Locations.h:2302
-msgid "Tromso/Langnes"
-msgstr ""
-
-#: my-evolution/Locations.h:2303
-msgid "Trondheim/Vaernes"
-msgstr ""
-
-#: my-evolution/Locations.h:2304
-msgid "Troutdale"
-msgstr ""
-
-#: my-evolution/Locations.h:2305
-msgid "Troyes/Barberey"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: my-evolution/Locations.h:2306
-#, fuzzy
-msgid "Truckee"
-msgstr "土耳其"
-
-#: my-evolution/Locations.h:2307
-msgid "Truth or Consequences"
-msgstr ""
-
-#: my-evolution/Locations.h:2308
-msgid "Tsuiki Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2309
-msgid "Tsushima Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:2310
-msgid "Tucson"
-msgstr ""
-
-#: my-evolution/Locations.h:2311
-msgid "Tucson-Davis AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:2312
-msgid "Tucuman"
-msgstr ""
-
-#: my-evolution/Locations.h:2313
-msgid "Tucumcari"
-msgstr ""
-
-#: my-evolution/Locations.h:2314
-msgid "Tucurui"
-msgstr ""
-
-#: my-evolution/Locations.h:2315
-msgid "Tulancingo"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-# calendar/gui/event-editor.c:476
-#: my-evolution/Locations.h:2316
-#, fuzzy
-msgid "Tulcea"
-msgstr "星期二"
-
-#: my-evolution/Locations.h:2317
-#, fuzzy
-msgid "Tulsa"
-msgstr "突尼西亞"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: my-evolution/Locations.h:2318
-#, fuzzy
-msgid "Tupelo"
-msgstr "週二(_U)"
-
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
-#: my-evolution/Locations.h:2319
-#, fuzzy
-msgid "Turaif"
-msgstr "土耳其文"
-
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
-#: my-evolution/Locations.h:2320
-#, fuzzy
-msgid "Turin"
-msgstr "土耳其文"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: my-evolution/Locations.h:2322
-#, fuzzy
-msgid "Turku"
-msgstr "土耳其"
-
-#: my-evolution/Locations.h:2323
-msgid "Tuscaloosa"
-msgstr ""
-
-#: my-evolution/Locations.h:2324
-msgid "Tuxtla Gutierrez"
-msgstr ""
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: my-evolution/Locations.h:2325
-#, fuzzy
-msgid "Twenthe"
-msgstr "暫訂"
-
-#: my-evolution/Locations.h:2326
-msgid "Twentynine Palms"
-msgstr ""
-
-#: my-evolution/Locations.h:2327
-msgid "Twin Falls"
-msgstr ""
-
-# mail/mail-config.glade.h:78
-#: my-evolution/Locations.h:2328
-#, fuzzy
-msgid "Tyler"
-msgstr "類別"
-
-#: my-evolution/Locations.h:2329
-msgid "Tyndall AFB"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: my-evolution/Locations.h:2330
-#, fuzzy
-msgid "Tyumen"
-msgstr "週二(_U)"
-
-#: my-evolution/Locations.h:2331
-msgid "Uberaba"
-msgstr ""
-
-#: my-evolution/Locations.h:2332
-msgid "Ufa"
-msgstr ""
-
-#: my-evolution/Locations.h:2333
-msgid "Ukiah"
-msgstr ""
-
-#: my-evolution/Locations.h:2335
-msgid "Ulan-Ude"
-msgstr ""
-
-#: my-evolution/Locations.h:2336
-msgid "Ulsan"
-msgstr ""
-
-#: my-evolution/Locations.h:2337
-msgid "Ulyanovsk"
-msgstr ""
-
-#: my-evolution/Locations.h:2338
-msgid "Umea"
-msgstr ""
-
-#: my-evolution/Locations.h:2339
-msgid "Umiat"
-msgstr ""
-
-#: my-evolution/Locations.h:2340
-msgid "Unalakleet"
-msgstr ""
-
-#: my-evolution/Locations.h:2341
-#, fuzzy
-msgid "United Arab Emirates "
-msgstr "阿拉伯聯合大公國"
-
-# mail/message-list.c:677
-#: my-evolution/Locations.h:2344
-#, fuzzy
-msgid "Unst"
-msgstr "未閱讀"
-
-#: my-evolution/Locations.h:2345
-msgid "Upington"
-msgstr ""
-
-#: my-evolution/Locations.h:2346
-#, fuzzy
-msgid "Uruapan"
-msgstr "日本"
-
-#: my-evolution/Locations.h:2347
-#, fuzzy
-msgid "Uruguaiana"
-msgstr "烏拉圭"
-
-#: my-evolution/Locations.h:2349
-msgid "Urumqi"
-msgstr ""
-
-# calendar/gui/event-editor.c:608
-#: my-evolution/Locations.h:2350
-#, fuzzy
-msgid "Utah"
-msgstr " "
-
-#: my-evolution/Locations.h:2351
-msgid "Utica"
-msgstr ""
-
-#: my-evolution/Locations.h:2352
-msgid "Utrecht/Soesterberg"
-msgstr ""
-
-#: my-evolution/Locations.h:2353
-msgid "Utsunomiya Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2354
-msgid "Uzhgorod"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: my-evolution/Locations.h:2355
-#, fuzzy
-msgid "Vadso"
-msgstr "無線電電話"
-
-# mail/mail-accounts.c:197
-#: my-evolution/Locations.h:2356
-#, fuzzy
-msgid "Vaerlose"
-msgstr "變數"
-
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
-#: my-evolution/Locations.h:2357
-#, fuzzy
-msgid "Vagar"
-msgstr "呼叫器"
-
-#: my-evolution/Locations.h:2358
-msgid "Valdez 2"
-msgstr ""
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: my-evolution/Locations.h:2359
-#, fuzzy
-msgid "Valdosta"
-msgstr "馬爾他"
-
-#: my-evolution/Locations.h:2360
-msgid "Valdosta-Moody AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:2361
-#, fuzzy
-msgid "Valencia"
-msgstr "斯洛凡尼亞"
-
-# mail/mail-display.c:301
-#: my-evolution/Locations.h:2362
-#, fuzzy
-msgid "Valentine"
-msgstr "檢視 Inline"
-
-#: my-evolution/Locations.h:2363
-msgid "Valera*"
-msgstr ""
-
-#: my-evolution/Locations.h:2364
-msgid "Valkenburg"
-msgstr ""
-
-#: my-evolution/Locations.h:2365
-msgid "Valley"
-msgstr ""
-
-#: my-evolution/Locations.h:2366
-msgid "Valparaiso"
-msgstr ""
-
-#: my-evolution/Locations.h:2367
-msgid "Valparaiso-Eglin AFB"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:11
-#: my-evolution/Locations.h:2368
-#, fuzzy
-msgid "Van"
-msgstr "主管"
-
-#: my-evolution/Locations.h:2369
-msgid "Vancouver"
-msgstr ""
-
-# ui/evolution-mail.xml.h:2
-#: my-evolution/Locations.h:2370
-#, fuzzy
-msgid "Vandel"
-msgstr "取消"
-
-#: my-evolution/Locations.h:2371
-msgid "Vandenberg AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:2372
-msgid "Vandenberg Range"
-msgstr ""
-
-#: my-evolution/Locations.h:2373
-msgid "Van Nuys"
-msgstr ""
-
-#: my-evolution/Locations.h:2374
-#, fuzzy
-msgid "Varadero"
-msgstr "巴貝多"
-
-#: my-evolution/Locations.h:2375
-msgid "Varanasi/Babatpur"
-msgstr ""
-
-#: my-evolution/Locations.h:2376
-#, fuzzy
-msgid "Varna"
-msgstr "萬那杜"
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/Locations.h:2377
-#, fuzzy
-msgid "Vasteras"
-msgstr "之後"
-
-#: my-evolution/Locations.h:2378
-msgid "Vaxjo"
-msgstr ""
-
-#: my-evolution/Locations.h:2379
-#, fuzzy
-msgid "Venezia"
-msgstr "委內瑞拉"
-
-#: my-evolution/Locations.h:2381
-#, fuzzy
-msgid "Venice"
-msgstr "Unicode"
-
-#: my-evolution/Locations.h:2382
-msgid "Veracruz"
-msgstr ""
-
-#: my-evolution/Locations.h:2383
-msgid "Vermillion"
-msgstr ""
-
-#: my-evolution/Locations.h:2384
-#, fuzzy
-msgid "Vermont"
-msgstr "月"
-
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: my-evolution/Locations.h:2385
-#, fuzzy
-msgid "Vernal"
-msgstr "一般"
-
-#: my-evolution/Locations.h:2386
-msgid "Vero Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:2387
-#, fuzzy
-msgid "Vicenza"
-msgstr "委內瑞拉"
-
-#: my-evolution/Locations.h:2388
-msgid "Vichy-Charmeil"
-msgstr ""
-
-#: my-evolution/Locations.h:2389
-msgid "Vichy-Rolla"
-msgstr ""
-
-#: my-evolution/Locations.h:2390
-msgid "Vicksburg"
-msgstr ""
-
-#: my-evolution/Locations.h:2391
-msgid "Victoria"
-msgstr ""
-
-#: my-evolution/Locations.h:2393
-msgid "Vigo"
-msgstr ""
-
-# shell/e-shell-importer.c:540
-#: my-evolution/Locations.h:2394
-#, fuzzy
-msgid "Vilhena"
-msgstr "檔案名稱："
-
-#: my-evolution/Locations.h:2395
-msgid "Villacoublay"
-msgstr ""
-
-#: my-evolution/Locations.h:2396
-msgid "Villafranca"
-msgstr ""
-
-#: my-evolution/Locations.h:2397
-msgid "Villahermosa"
-msgstr ""
-
-#: my-evolution/Locations.h:2398
-msgid "Villamontes"
-msgstr ""
-
-#: my-evolution/Locations.h:2399
-msgid "Villa Reynolds"
-msgstr ""
-
-#: my-evolution/Locations.h:2400
-msgid "Vilnius"
-msgstr ""
-
-#: my-evolution/Locations.h:2401
-msgid "Virginia"
-msgstr ""
-
-#: my-evolution/Locations.h:2402
-msgid "Virginia Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:2403
-msgid "Virginia Tech Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:2404
-msgid "Viru-Viru"
-msgstr ""
-
-#: my-evolution/Locations.h:2405
-#, fuzzy
-msgid "Visalia"
-msgstr "澳大利亞"
-
-#: my-evolution/Locations.h:2406
-msgid "Visby"
-msgstr ""
-
-#: my-evolution/Locations.h:2407
-msgid "Viterbo"
-msgstr ""
-
-#: my-evolution/Locations.h:2408
-msgid "Vitoria"
-msgstr ""
-
-#: my-evolution/Locations.h:2409
-msgid "Vladikavkaz"
-msgstr ""
-
-#: my-evolution/Locations.h:2410
-msgid "Vladivostok"
-msgstr ""
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:2411
-#, fuzzy
-msgid "Vlieland"
-msgstr "芬蘭"
-
-#: my-evolution/Locations.h:2412
-msgid "Vojens/Skrydstrup"
-msgstr ""
-
-#: my-evolution/Locations.h:2413
-msgid "Volgograd"
-msgstr ""
-
-#: my-evolution/Locations.h:2414
-#, fuzzy
-msgid "Volkel"
-msgstr "托克勞群島"
-
-# ui/evolution-message-composer.xml.h:47
-#: my-evolution/Locations.h:2415
-#, fuzzy
-msgid "Volk Field"
-msgstr "寄件者(_F)"
-
-#: my-evolution/Locations.h:2416
-msgid "Voronezh"
-msgstr ""
-
-#: my-evolution/Locations.h:2417
-#, fuzzy
-msgid "Voslau"
-msgstr "托克勞群島"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-# calendar/gui/event-editor.c:475
-#: my-evolution/Locations.h:2418
-#, fuzzy
-msgid "Waco"
-msgstr "摩納哥"
-
-#: my-evolution/Locations.h:2419
-msgid "Wadi Al Dawasser Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:2420
-msgid "Wainwright"
-msgstr ""
-
-#: my-evolution/Locations.h:2421
-msgid "Wakefield"
-msgstr ""
-
-#: my-evolution/Locations.h:2422
-msgid "Wakkanai Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:2423
-msgid "Walla Walla"
-msgstr ""
-
-#: my-evolution/Locations.h:2424
-#, fuzzy
-msgid "Wallops Island"
-msgstr "福克蘭群島"
-
-#: my-evolution/Locations.h:2425
-msgid "Walnut Ridge"
-msgstr ""
-
-# widgets/misc/e-messagebox.c:159
-#: my-evolution/Locations.h:2426
-#, fuzzy
-msgid "Warner Robins"
-msgstr "警告"
-
-#: my-evolution/Locations.h:2427
-msgid "Warroad"
-msgstr ""
-
-#: my-evolution/Locations.h:2428
-msgid "Warszawa"
-msgstr ""
-
-#: my-evolution/Locations.h:2429
-msgid "Washington"
-msgstr ""
-
-#: my-evolution/Locations.h:2430
-msgid "Washington/Dulles"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/Locations.h:2431
-#, fuzzy
-msgid "Waterbury"
-msgstr "天氣"
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/Locations.h:2432
-#, fuzzy
-msgid "Waterloo"
-msgstr "天氣"
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/Locations.h:2433
-#, fuzzy
-msgid "Watertown"
-msgstr "天氣"
-
-# calendar/gui/e-calendar-table.c:150
-#: my-evolution/Locations.h:2434
-#, fuzzy
-msgid "Waterville"
-msgstr "類別"
-
-#: my-evolution/Locations.h:2435
-msgid "Waukesha"
-msgstr ""
-
-#: my-evolution/Locations.h:2436
-#, fuzzy
-msgid "Wausau"
-msgstr "萬那杜"
-
-#: my-evolution/Locations.h:2437
-msgid "Waycross"
-msgstr ""
-
-#: my-evolution/Locations.h:2438
-msgid "Waynesboro"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:727
-#: my-evolution/Locations.h:2439
-#, fuzzy
-msgid "Webster City"
-msgstr "網址"
-
-# calendar/gui/print.c:362
-#: my-evolution/Locations.h:2440
-#, fuzzy
-msgid "Wejh"
-msgstr "三"
-
-#: my-evolution/Locations.h:2441
-msgid "Wellington"
-msgstr ""
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/Locations.h:2442
-#, fuzzy
-msgid "Wenatchee"
-msgstr "天氣"
-
-#: my-evolution/Locations.h:2443
-#, fuzzy
-msgid "Wendover"
-msgstr "寄件者"
-
-#: my-evolution/Locations.h:2444
-msgid "West Atlanta"
-msgstr ""
-
-#: my-evolution/Locations.h:2445
-#, fuzzy
-msgid "West Burke"
-msgstr "西歐字母"
-
-# addressbook/contact-editor/contact-editor.glade.h:12
-#: my-evolution/Locations.h:2446
-#, fuzzy
-msgid "Westerland"
-msgstr "荷蘭"
-
-#: my-evolution/Locations.h:2447
-#, fuzzy
-msgid "Westfield"
-msgstr "西"
-
-#: my-evolution/Locations.h:2448
-msgid "Westhampton"
-msgstr ""
-
-#: my-evolution/Locations.h:2449
-msgid "West Palm Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:2450
-msgid "West Virginia"
-msgstr ""
-
-#: my-evolution/Locations.h:2451
-msgid "West Yellowstone"
-msgstr ""
-
-#: my-evolution/Locations.h:2452
-msgid "West Yellowstone (2)"
-msgstr ""
-
-# ui/evolution-event-editor.xml.h:46
-#: my-evolution/Locations.h:2453
-#, fuzzy
-msgid "Wheeling"
-msgstr "會議排程(_M)"
-
-#: my-evolution/Locations.h:2454
-#, fuzzy
-msgid "Whidbey Island"
-msgstr "聖誕島"
-
-#: my-evolution/Locations.h:2455
-msgid "Whitefield"
-msgstr ""
-
-#: my-evolution/Locations.h:2456
-msgid "White Plains"
-msgstr ""
-
-#: my-evolution/Locations.h:2457
-msgid "White Sulphur"
-msgstr ""
-
-#: my-evolution/Locations.h:2458
-msgid "Whittier"
-msgstr ""
-
-#: my-evolution/Locations.h:2459
-msgid "Wichita"
-msgstr ""
-
-#: my-evolution/Locations.h:2460
-msgid "Wichita Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:2461
-msgid "Wichita-Jabara"
-msgstr ""
-
-#: my-evolution/Locations.h:2462
-msgid "Wichita-McConnell AFB"
-msgstr ""
-
-# addressbook/gui/widgets/e-addressbook-view.c:734
-#: my-evolution/Locations.h:2463
-#, fuzzy
-msgid "Wick"
-msgstr "暱稱"
-
-# calendar/gui/print.c:362
-#: my-evolution/Locations.h:2464
-#, fuzzy
-msgid "Wien"
-msgstr "三"
-
-#: my-evolution/Locations.h:2465
-msgid "Wildwood"
-msgstr ""
-
-#: my-evolution/Locations.h:2466
-msgid "Wilkes - Barre"
-msgstr ""
-
-#: my-evolution/Locations.h:2467
-msgid "Williams Field"
-msgstr ""
-
-#: my-evolution/Locations.h:2468
-msgid "Williamsport"
-msgstr ""
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: my-evolution/Locations.h:2469
-#, fuzzy
-msgid "Williston"
-msgstr "靄"
-
-#: my-evolution/Locations.h:2470
-msgid "Willoughby"
-msgstr ""
-
-#: my-evolution/Locations.h:2471
-msgid "Willow Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:2472
-msgid "Wilmington"
-msgstr ""
-
-#: my-evolution/Locations.h:2473
-#, fuzzy
-msgid "Winchester"
-msgstr "列支敦斯登"
-
-#: my-evolution/Locations.h:2474
-#, fuzzy
-msgid "Windsor"
-msgstr "沙暴"
-
-#: my-evolution/Locations.h:2475
-msgid "Windsor Locks"
-msgstr ""
-
-#: my-evolution/Locations.h:2476
-msgid "Wink"
-msgstr ""
-
-#: my-evolution/Locations.h:2477
-msgid "Winnemucca"
-msgstr ""
-
-#: my-evolution/Locations.h:2478
-msgid "Winnipeg"
-msgstr ""
-
-#: my-evolution/Locations.h:2479
-#, fuzzy
-msgid "Winslow"
-msgstr "現在"
-
-#: my-evolution/Locations.h:2480
-msgid "Winston-Salem"
-msgstr ""
-
-#: my-evolution/Locations.h:2481
-msgid "Winter Haven"
-msgstr ""
-
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
-#: my-evolution/Locations.h:2482
-#, fuzzy
-msgid "Winter Park"
-msgstr "密碼"
-
-#: my-evolution/Locations.h:2483
-msgid "Wiscasset"
-msgstr ""
-
-#: my-evolution/Locations.h:2484
-#, fuzzy
-msgid "Wisconsin"
-msgstr "密克羅尼西亞"
-
-#: my-evolution/Locations.h:2485
-msgid "Wisconsin Rapids"
-msgstr ""
-
-# calendar/gui/print.c:362
-#: my-evolution/Locations.h:2486
-#, fuzzy
-msgid "Wise"
-msgstr "三"
-
-#: my-evolution/Locations.h:2487
-msgid "Woensdrecht"
-msgstr ""
-
-#: my-evolution/Locations.h:2488
-msgid "Wolf Point"
-msgstr ""
-
-#: my-evolution/Locations.h:2489
-#, fuzzy
-msgid "Woong Cheon"
-msgstr "香港"
-
-# addressbook/printing/e-contact-print.glade.h:9
-#: my-evolution/Locations.h:2490
-#, fuzzy
-msgid "Wooster"
-msgstr "頁尾："
-
-# calendar/gui/event-editor-dialog.glade.h:38
-#: my-evolution/Locations.h:2491
-#, fuzzy
-msgid "Worcester"
-msgstr "永遠"
-
-# addressbook/contact-editor/fulladdr.glade.h:5
-#: my-evolution/Locations.h:2492
-#, fuzzy
-msgid "Worland"
-msgstr "波蘭"
-
-# mail/mail-mt.c:516
-# mail/mail-mt.c:545
-# mail/mail-mt.c:880
-#: my-evolution/Locations.h:2493
-#, fuzzy
-msgid "Worthington"
-msgstr "正在工作"
-
-#: my-evolution/Locations.h:2494
-msgid "Wrangell"
-msgstr ""
-
-#: my-evolution/Locations.h:2495
-msgid "Wrightstown / Mcguire AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:2496
-msgid "Wuchia Observatory"
-msgstr ""
-
-# mail/mail-mt.c:516
-# mail/mail-mt.c:545
-# mail/mail-mt.c:880
-#: my-evolution/Locations.h:2497
-#, fuzzy
-msgid "Wyoming"
-msgstr "正在工作"
-
-# addressbook/gui/component/addressbook-config.glade.h:5
-#: my-evolution/Locations.h:2498
-#, fuzzy
-msgid "Xiamen"
-msgstr "名稱"
-
-#: my-evolution/Locations.h:2499
-msgid "Yacuiba"
-msgstr ""
-
-#: my-evolution/Locations.h:2500
-msgid "Yakima"
-msgstr ""
-
-#: my-evolution/Locations.h:2501
-msgid "Yakushima"
-msgstr ""
-
-#: my-evolution/Locations.h:2502
-msgid "Yakutat"
-msgstr ""
-
-#: my-evolution/Locations.h:2503
-msgid "Yakutsk"
-msgstr ""
-
-#: my-evolution/Locations.h:2504
-msgid "Yamagata Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:2505
-msgid "Yamaguchi Ube Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:2506
-msgid "Yankton"
-msgstr ""
-
-# shell/e-shortcuts-view.c:265
-#: my-evolution/Locations.h:2507
-#, fuzzy
-msgid "Yao Airport"
-msgstr "不要匯入"
-
-#: my-evolution/Locations.h:2508
-msgid "Yechon Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2509
-msgid "Yekaterinburg"
-msgstr ""
+msgid "Evolution component for the executive summary."
+msgstr "用作處理摘要的 Evolution 元件。"
 
-#: my-evolution/Locations.h:2510
-msgid "Yellowknife"
-msgstr ""
-
-#: my-evolution/Locations.h:2511
-msgid "Yellowstone"
-msgstr ""
-
-# mail/message-list.c:678
-#: my-evolution/Locations.h:2513
-#, fuzzy
-msgid "Yenbo"
-msgstr "葉門"
-
-#: my-evolution/Locations.h:2514
-msgid "Yeoju Range"
-msgstr ""
-
-#: my-evolution/Locations.h:2515
-msgid "Yeonpyeungdo"
-msgstr ""
-
-#: my-evolution/Locations.h:2516
-msgid "Yeovilton"
-msgstr ""
-
-#: my-evolution/Locations.h:2517
-msgid "Yokosuka Fwf"
-msgstr ""
-
-#: my-evolution/Locations.h:2518
-msgid "Yokota Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:2519
-msgid "Yongsan/H-208 Hp"
-msgstr ""
-
-#: my-evolution/Locations.h:2520
-msgid "Yoro"
-msgstr ""
-
-#: my-evolution/Locations.h:2521
-msgid "Yosu"
-msgstr ""
-
-#: my-evolution/Locations.h:2522
-msgid "Youngstown"
-msgstr ""
-
-#: my-evolution/Locations.h:2523
-msgid "Ypsilanti"
-msgstr ""
-
-#: my-evolution/Locations.h:2525
-msgid "Yukon"
-msgstr ""
-
-#: my-evolution/Locations.h:2526
-msgid "Yuma MCAS"
-msgstr ""
-
-#: my-evolution/Locations.h:2527
-msgid "Yurimaguas"
-msgstr ""
-
-#: my-evolution/Locations.h:2528
-msgid "Yuzhno-Sakhalinsk"
-msgstr ""
-
-#: my-evolution/Locations.h:2529
-msgid "Zacatecas"
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: my-evolution/Locations.h:2530
-#, fuzzy
-msgid "Zadar"
-msgstr "行事曆"
-
-# addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:2531
-#, fuzzy
-msgid "Zagreb"
-msgstr "頁"
-
-#: my-evolution/Locations.h:2532
-msgid "Zakinthos"
-msgstr ""
-
-#: my-evolution/Locations.h:2533
-msgid "Zama Airfield"
-msgstr ""
-
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#: my-evolution/Locations.h:2534
-#, fuzzy
-msgid "Zanesville"
-msgstr "已取消"
-
-#: my-evolution/Locations.h:2535
-#, fuzzy
-msgid "Zaragoza"
-msgstr "巴拉圭"
-
-#: my-evolution/Locations.h:2536
-msgid "Zell Am See"
-msgstr ""
-
-#: my-evolution/Locations.h:2537
-msgid "Zuni Pueblo"
-msgstr ""
-
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
-#: my-evolution/Locations.h:2538
-#, fuzzy
-msgid "Zurich"
-msgstr "土耳其文"
-
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:44
 msgid "Folder containing the Evolution Summary"
 msgstr "資料夾包含 Evolution 摘要"
 
+# mail/component-factory.c:337
+#: my-evolution/component-factory.c:153
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "不能初始化 Evolution 的 mail 元件。"
+
 # calendar/gui/event-editor-dialog.glade.h:3
-#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 msgid "Appointments"
 msgstr "約會"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:341
 msgid "No appointments"
 msgstr "無約會"
 
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: my-evolution/e-summary-calendar.c:400
+#: my-evolution/e-summary-calendar.c:377
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%k%M %d %B"
@@ -27061,119 +12366,74 @@ msgstr "%k%M %d %B"
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: my-evolution/e-summary-calendar.c:402
+#: my-evolution/e-summary-calendar.c:379
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
-#: my-evolution/e-summary-calendar.c:420
-#, fuzzy
-msgid "No description"
-msgstr "描述"
-
 # calendar/gui/e-calendar-table.c:159
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:129
 msgid "Mail summary"
 msgstr "郵件摘要"
 
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-#, fuzzy
-msgid "VFolders"
-msgstr "資料夾"
-
-# mail/mail-config.glade.h:76
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
-#, fuzzy
-msgid "Local Folders"
-msgstr "特別資料夾"
-
 #. translators: Put a list of codes for locations you want to see in
 #. My Evolution by default here. You can find the list of all
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:661
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:444
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com 每日一字"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:467
 msgid "Quotes of the Day"
 msgstr "每日一文"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:946
 msgid "Add a news feed"
 msgstr "新增新聞發送伺服器"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:954
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "輸入您希望新增新聞發送伺服器網址"
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: my-evolution/e-summary-preferences.c:732
+#: my-evolution/e-summary-preferences.c:958
 msgid "Name:"
 msgstr "名稱："
 
+# calendar/gui/gnome-cal.c:234
+#: my-evolution/e-summary-preferences.c:1504
+msgid "Summary Settings"
+msgstr "摘要設定"
+
 # shell/e-shell-importer.c:404
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>下載 RDF 時發生錯誤</b>"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:528
 msgid "News Feed"
 msgstr "新聞發送伺服器"
 
-#: my-evolution/e-summary-shown.c:463
-msgid "All"
-msgstr ""
-
-# addressbook/contact-editor/contact-editor.glade.h:17
-# mail/mail-config.glade.h:84
-#. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-#, fuzzy
-msgid "Add ->"
-msgstr "新增 (_A)"
-
-# addressbook/gui/component/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "移除(_R)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "陣雨"
-
 # ui/evolution-tasks.xml.h:3
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:248
 msgid "No tasks"
 msgstr "無工作"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:287
 #, fuzzy
 msgid "(No Description)"
 msgstr "描述："
@@ -27182,42 +12442,79 @@ msgstr "描述："
 msgid "My Weather"
 msgstr "我的天氣"
 
-#: my-evolution/e-summary-weather.c:279
-#, fuzzy
-msgid "There was an error downloading data for"
-msgstr "下載新聞發送伺服器時發生錯誤"
+#: my-evolution/e-summary-weather.c:348
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr "<dd><b>無法連繫天氣伺服器</b></dd>"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:559
 msgid "Weather"
 msgstr "天氣"
 
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/e-summary-weather.c:722
+msgid "Regions"
+msgstr "地區"
+
 # widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:488
-#, fuzzy
-msgid "Please wait..."
-msgstr "請稍候"
-
 # calendar/gui/e-calendar-table.c:159
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "列印摘要"
 
 # mail/mail-callbacks.c:1454
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:621
 msgid "Printing of Summary failed"
 msgstr "列印摘要失敗"
 
 # wombat/wombat.c:198
-#: my-evolution/main.c:65
+#: my-evolution/main.c:66
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "執行摘要元件不能初始化 Bonobo。\n"
 
+#: my-evolution/metar.c:29
+msgid "蚌"
+msgstr "蚌"
+
+#: my-evolution/metar.c:29
+msgid "蚓"
+msgstr "蚓"
+
+# addressbook/printing/e-contact-print.glade.h:8
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "節"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+# mail/mail-ops.c:914
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+# importers/netscape-importer.c:795
+# mail/mail-callbacks.c:1359
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "哩"
+
+# importers/netscape-importer.c:795
+# mail/mail-callbacks.c:1359
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "公里"
+
 # ui/evolution-event-editor.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:9
 #: my-evolution/metar.c:44
@@ -27631,6 +12928,14 @@ msgstr "漂冰粒"
 msgid "Freezing ice pellets"
 msgstr "凍冰粒"
 
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#. HAIL
+#: my-evolution/metar.c:217
+msgid "Hail"
+msgstr "下冰雹"
+
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "附近地區冰雹"
@@ -28405,155 +13710,195 @@ msgstr "吹塵旋"
 msgid "Drifting dust whirls"
 msgstr "漂塵旋"
 
-# mail/message-list.c:679
+# addressbook/gui/component/select-names/e-select-names-popup.c:161
+# composer/e-msg-composer-attachment-bar.c:468
+# shell/e-shortcuts-view.c:265
+# shell/e-shortcuts-view.c:388
 #: my-evolution/my-evolution.glade.h:1
+msgid " _Remove"
+msgstr "移除(_R)"
+
+# mail/message-list.c:679
+#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "Add n_ews feed"
 msgstr "新增新聞發送伺服器(_N)"
 
-#: my-evolution/my-evolution.glade.h:2
-msgid "C_elsius"
-msgstr ""
+# widgets/meeting-time-sel/e-meeting-time-sel.c:744
+#: my-evolution/my-evolution.glade.h:3
+msgid "Al_l stations:"
+msgstr "所有站臺(_L)："
 
+# shell/e-shell-importer.c:601
 #: my-evolution/my-evolution.glade.h:4
+msgid "All _folders:"
+msgstr "全部資料夾(_A)："
+
+# mail/message-list.c:679
+#: my-evolution/my-evolution.glade.h:5
+msgid "All news _feeds:"
+msgstr "所有新聞發送伺服器(_F)："
+
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
 msgid "How many days should the calendar display at once?"
 msgstr "行事曆每次顯示多少天？"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:9
 msgid "Ma_x number of items shown:"
 msgstr "最多可顯示的項目個數(_X)："
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:10
 msgid "News Feed Settings"
 msgstr "新聞發送伺服器設定"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:11
 msgid "One mont_h"
 msgstr "一個月(_H)"
 
 # calendar/gui/event-editor.c:1550
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:12
 msgid "One w_eek"
 msgstr "一週(_E)"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:13
 msgid "R_efresh time (seconds):"
 msgstr "重新整理時間(秒)(_E)："
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:14
 msgid "Refresh _time (seconds):"
 msgstr "重新整理時間(秒)(_T)："
 
 # addressbook/printing/e-contact-print.glade.h:11
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:15
 msgid "S_how full path for folders"
 msgstr "顯示資料夾的完整路徑(_H)"
 
 # widgets/misc/e-filter-bar.h:95
 # widgets/misc/e-filter-bar.h:102
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:16
 msgid "Show _all tasks"
 msgstr "顯示全部工作(_A)"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:17
 msgid "Show _today's tasks"
 msgstr "顯示今天的工作(_T)"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:18
 msgid "Show temperatures in:"
 msgstr ""
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:19
 msgid "Tasks "
 msgstr "工作"
 
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:20
 msgid "Weather settings"
 msgstr "天氣設定"
 
-#: my-evolution/my-evolution.glade.h:17
+# ui/evolution.xml.h:14
+#: my-evolution/my-evolution.glade.h:22
+msgid "_Display folders:"
+msgstr "顯示資料夾(_D)："
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: my-evolution/my-evolution.glade.h:23
+msgid "_Display stations:"
+msgstr "顯示站臺(_D)："
+
+# calendar/gui/calendar-summary.c:622
+# mail/mail-config.glade.h:24
+#: my-evolution/my-evolution.glade.h:24
+msgid "_Displayed feeds:"
+msgstr "顯示新聞發送伺服器(_D)："
+
+#: my-evolution/my-evolution.glade.h:25
 msgid "_Fahrenheit"
 msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/event-editor.c:479
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:26
 msgid "_Five days"
 msgstr "五天(_F)"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:27
 msgid "_Mail"
 msgstr "郵件(_M)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:28
 msgid "_News Feeds"
 msgstr "新聞發送伺服器(_N)"
 
 # calendar/gui/event-editor.c:1545
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:29
 msgid "_One day"
 msgstr "一天(_O)"
 
 # calendar/gui/e-meeting-dialog.glade.h:21
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:30
 msgid "_Schedule"
 msgstr "行程表(_S)"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:31
 msgid "_Weather"
 msgstr "天氣(_W)"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
-
-# mail/mail-config.glade.h:76
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
-#, fuzzy
-msgid "Default Folders"
-msgstr "特別資料夾"
-
 # shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "Evolution shell。"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
-msgstr ""
-
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "顯示詳細資料"
 
 # calendar/gui/e-itip-control.c:883
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "取消行動"
 
+# mail/local-config.glade.h:8
+#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:175
+msgid "Outbox"
+msgstr ""
+
+# mail/mail-config.glade.h:76
+#: shell/e-local-storage.c:636
+#, fuzzy
+msgid "Local Folders"
+msgstr "特別資料夾"
+
 # shell/e-setup.c:118
 # shell/e-setup.c:191
-#: shell/e-setup.c:126
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "安裝 Evolution"
 
 # shell/e-setup.c:122
-#: shell/e-setup.c:130
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -28562,17 +13907,17 @@ msgstr ""
 "到您的 Evolution 個人目錄"
 
 # shell/e-setup.c:123
-#: shell/e-setup.c:131
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "請按 \"確認\" 安裝檔案，或按 \"取消\" 離開。"
 
 # shell/e-setup.c:163
-#: shell/e-setup.c:171
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "不能正確地更新檔案"
 
 # shell/e-setup.c:215
-#: shell/e-setup.c:194
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -28584,7 +13929,7 @@ msgstr ""
 "錯誤：%s"
 
 # composer/e-msg-composer.c:1165
-#: shell/e-setup.c:209
+#: shell/e-setup.c:207
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -28593,35 +13938,8 @@ msgstr ""
 "複製資料夾到 `%s' 時\n"
 "發生錯誤。"
 
-# camel/camel-session.c:479
-#: shell/e-setup.c:282
-#, fuzzy, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"不能建立目錄 %s：\n"
-"%s"
-
-#: shell/e-setup.c:300
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-
-#: shell/e-setup.c:306
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-
 # shell/e-setup.c:255
-#: shell/e-setup.c:329
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -28632,7 +13950,7 @@ msgstr ""
 "請移動這個檔案到其它地方\n"
 "以便 Evolution 能夠安裝使用者檔案。"
 
-#: shell/e-setup.c:343
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -28647,7 +13965,7 @@ msgstr ""
 "您是否要移除這個目錄？"
 
 # shell/e-setup.c:267
-#: shell/e-setup.c:368
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -28658,63 +13976,60 @@ msgstr ""
 "請移動這個目錄到其它地方\n"
 "以便 Evolution 能夠安裝使用者檔案。"
 
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "Evolution"
+
+# shell/e-shell-view-menu.c:230
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "版權 1999, 2000, 2001 Ximian, Inc."
+
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: shell/e-shell-folder-commands.c:140
-#, fuzzy, c-format
-msgid "Cannot copy folder: %s"
-msgstr "無法取得資料夾：%s：%s"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:143
-#, fuzzy, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-"無法刪除資料夾：\n"
-"%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "無法自行移開資料夾。"
 
 # shell/e-setup.c:230
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr "無法自行複製資料夾。"
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr "不能將資料夾移至其子資料夾之中。"
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "指定要複製資料夾 \"%s\" 進去的資料夾："
 
 # ui/evolution.xml.h:7
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr "複製資料夾"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "指定要移動資料夾 \"%s\"進去的資料夾："
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr "移動資料夾"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:385
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -28734,21 +14049,21 @@ msgstr ""
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:401
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "刪除"
 
 # calendar/gui/dialogs/delete-comp.c:93
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
+#: shell/e-shell-folder-commands.c:411
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "您確定要刪除這個資料夾 '%s'？"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -28759,27 +14074,27 @@ msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:536
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "重新命名資料夾 '%s'"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "重新命名資料夾 '%s'"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: shell/e-shell-folder-commands.c:566
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "指定的資料夾名稱不合法： %s"
 
 # shell/e-shell-folder-creation-dialog.c:99
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -28789,7 +14104,7 @@ msgstr ""
 "%s"
 
 # shell/e-shell-folder-creation-dialog.c:263
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Evolution - 新增資料夾"
 
@@ -28803,13 +14118,13 @@ msgstr ""
 "所要求的動作。"
 
 # shell/e-shell-folder-selection-dialog.c:328
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "新增..."
 
 # shell/e-shell-folder-title-bar.c:459
 # shell/e-shell-folder-title-bar.c:460
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(未命名)"
 
@@ -28826,13 +14141,11 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"選取要匯入 Evolution "
-"的檔案，並且在清單內選定檔案類別。\n"
+"選取要匯入 Evolution 的檔案，並且在清單內選定檔案類別。\n"
 "\n"
-"若您不清楚檔案類別，請選擇 \"自動\"。Evolution "
-"會嘗試找出適當的處理方法。"
+"若您不清楚檔案類別，請選擇 \"自動\"。Evolution 會嘗試找出適當的處理方法。"
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:757
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -28864,26 +14177,17 @@ msgstr ""
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:397
 #, c-format
 msgid "File %s does not exist"
 msgstr "檔案 %s 不存在"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
-#, fuzzy
-msgid "Evolution Error"
-msgstr "Evolution"
-
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
 # shell/e-shell-importer.c:353
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -28893,12 +14197,12 @@ msgstr ""
 "%s"
 
 # shell/e-shell-importer.c:363
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "匯入"
 
 # shell/e-shell-importer.c:371
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -28908,19 +14212,19 @@ msgstr ""
 "正在啟動 %s"
 
 # shell/e-shell-importer.c:384
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "啟動 %s 時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "載入 %s 時發生錯誤"
 
 # shell/e-shell-importer.c:419
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -28930,37 +14234,37 @@ msgstr ""
 "正在匯入項目 1。"
 
 # shell/e-shell-importer.c:490
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "自動"
 
 # shell/e-shell-importer.c:540
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "檔案名稱："
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
 # shell/e-shell-importer.c:555
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "檔案類別："
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
 msgstr ""
 
 # ui/evolution.xml.h:21
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:656
 #, fuzzy
 msgid "Import a single file"
 msgstr "匯入外部檔案格式"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -28968,23 +14272,23 @@ msgstr ""
 "請稍候...\n"
 "正在掃描現存的設定"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
 msgid "Starting Intelligent Importers"
 msgstr "啟動智慧型匯入服務"
 
 # composer/e-msg-composer-hdrs.c:355
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "寄件者："
 
 # shell/e-shell-importer.c:601
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1014
 msgid "Select folder"
 msgstr "選擇資料夾"
 
 # shell/e-shell-importer.c:602
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1015
 msgid "Select a destination folder for importing this data"
 msgstr "選擇目的資料夾用作匯入這些資料"
 
@@ -28993,7 +14297,7 @@ msgstr "選擇目的資料夾用作匯入這些資料"
 # importers/pine-importer.c:646
 # shell/e-shell-importer.c:653
 # shell/importer/import.glade.h:4
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "匯入"
 
@@ -29018,16 +14322,6 @@ msgstr ""
 "無法啟動 Evolution Mailer 精靈界面\n"
 "%s"
 
-# 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:58
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
-#: widgets/misc/e-charset-picker.c:104
-msgid "New"
-msgstr "新增"
-
 # camel/camel-pgp-context.c:1073
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
@@ -29047,103 +14341,103 @@ msgid "'.' and '..' are reserved folder names."
 msgstr "'.' 和 '..' 是資料夾保留名稱。"
 
 # shell/e-shell-view-menu.c:179
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "經由 $PATH 所指定的路徑也找不到 Bug buddy 程式。"
 
 # shell/e-shell-view-menu.c:185
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "無法執行 Bug buddy。"
 
 # ui/evolution.xml.h:1
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:215
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "關於 Ximian Evolution..."
 
 # shell/e-shell-view-menu.c:410
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "移至資料夾..."
 
 # shell/e-shell-view-menu.c:411
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr "選擇您想開啟的資料夾"
 
 # shell/e-shortcuts-view.c:292
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
 msgstr "新增一個捷徑"
 
 # shell/e-shell-view-menu.c:411
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "選擇您想捷徑對應到的資料夾："
 
+#: shell/e-shell-view-menu.c:562
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+# camel/camel-filter-driver.c:871
+#: shell/e-shell-view-menu.c:570
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "執行過濾器發生錯誤： %s: %s"
+
 # shell/e-shell-view-menu.c:590
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:672
 #, fuzzy
 msgid "_Work Online"
 msgstr "線上工作"
 
 # ui/evolution.xml.h:66
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
 # ui/evolution.xml.h:39
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "離線工作"
 
 # shell/e-shell-view.c:149
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:214
 msgid "(No folder displayed)"
 msgstr "(沒有資料夾顯示)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1574
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
 # shell/e-storage.c:178
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1576
 msgid "(None)"
 msgstr "(沒有)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1623
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution 目前為線上工作。按這裡改為離線工作。"
+msgstr "Ximian Evolution 目前為線上工作。按這裡改為離線工作。"
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1630
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution 現正離線中。"
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
-
-#: shell/e-shell.c:169
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
+msgstr "Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
 
 # shell/e-shell.c:392
-#: shell/e-shell.c:764
+#: shell/e-shell.c:651
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "無法設定本地端的儲存空間 -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -29151,27 +14445,22 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-# widgets/misc/e-cell-date-edit.c:245
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "確認"
-
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "無效的參數"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
 # shell/e-storage.c:461
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -29319,84 +14608,91 @@ msgid "Remove this shortcut from the shortcut bar"
 msgstr "將功能項目從功能列移除"
 
 # shell/e-shortcuts.c:381
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "儲存功能項目時發生錯誤。"
 
 # ui/evolution.xml.h:62
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
 msgstr "功能"
 
-# mail/local-config.glade.h:8
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: shell/e-storage-set-view.c:658
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
 msgstr ""
+"無法刪除資料夾：\n"
+"%s"
+
+# shell/e-storage.c:178
+#: shell/e-storage.c:181 shell/e-storage.c:187
+msgid "(No name)"
+msgstr "(沒有名稱)"
 
 # shell/e-storage.c:459
-#: shell/e-storage.c:485
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "沒有錯誤"
 
 # shell/e-storage.c:463
-#: shell/e-storage.c:489
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "相同名稱的資料夾已經存在"
 
 # shell/e-storage.c:465
-#: shell/e-storage.c:491
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "所指定的資料夾類別是無效的"
 
 # shell/e-storage.c:467
-#: shell/e-storage.c:493
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "輸出/入錯誤"
 
 # shell/e-storage.c:469
-#: shell/e-storage.c:495
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "沒有足夠空間去建立資料夾"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:510
 msgid "The folder is not empty"
 msgstr ""
 
 # shell/e-storage.c:471
-#: shell/e-storage.c:499
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "找不到指定的資料夾"
 
 # shell/e-storage.c:473
-#: shell/e-storage.c:501
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "這個儲存空間的功能仍未實作"
 
 # shell/e-storage.c:477
-#: shell/e-storage.c:505
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "行動不支援"
 
 # shell/e-storage.c:479
-#: shell/e-storage.c:507
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "這個儲存空間不支援所指定的類別"
 
 # shell/e-storage.c:471
-#: shell/e-storage.c:509
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
 msgstr "指定的資料夾不能編輯或移動"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "不能把資料夾置於其子資料夾之下"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: shell/e-storage.c:513
+#: shell/e-storage.c:526
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "無法建立資料夾鎖定 %s ： %s"
@@ -29411,59 +14707,28 @@ msgstr "%s (...)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
-#: shell/evolution-folder-selector-button.c:84
-msgid "<click here to select a folder>"
-msgstr "<按這裏選擇資料夾>"
-
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#: shell/evolution-shell-component-utils.c:124
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr "不明的錯誤"
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 # shell/e-storage.c:467
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1009
 #, fuzzy
 msgid "CORBA error"
 msgstr "輸出/入錯誤"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1011
 msgid "Interrupted"
 msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1013
 #, fuzzy
 msgid "Invalid argument"
 msgstr "無效的參數"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1015
 msgid "Already has an owner"
 msgstr ""
 
@@ -29481,72 +14746,94 @@ msgstr ""
 # widgets/misc/e-dateedit.c:432
 # widgets/misc/e-dateedit.c:1341
 # widgets/misc/e-dateedit.c:1456
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1017
 #, fuzzy
 msgid "No owner"
 msgstr "無"
 
 # calendar/gui/calendar-commands.c:266
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1019
 #, fuzzy
 msgid "Not found"
 msgstr "找不到名片"
 
 # mail/mail-config.glade.h:1
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1021
 #, fuzzy
 msgid "Unsupported type"
 msgstr " 檢查可支援的類別(_C)"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1023
 msgid "Unsupported schema"
 msgstr ""
 
 # mail/mail-session.c:161
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1025
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "使用者取消動作。"
 
 # shell/e-storage.c:467
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1027
 #, fuzzy
 msgid "Internal error"
 msgstr "其它錯誤"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1031
 #, fuzzy
 msgid "Exists"
 msgstr "存在"
 
 # mail/mail-config.glade.h:37
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1033
 #, fuzzy
 msgid "Invalid URI"
 msgstr "不合法"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1037
 #, fuzzy
 msgid "Has subfolders"
 msgstr "沒有這個資料夾 %s"
 
 # mail/mail-callbacks.c:1106
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1039
 #, fuzzy
 msgid "No space left"
 msgstr "沒有選定郵件"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1041
 msgid "Old owner has died"
 msgstr ""
 
-# shell/e-shell-importer.c:555
-#: shell/evolution-test-component.c:47
-#, fuzzy
-msgid "Test type"
-msgstr "檔案類別："
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "不明的錯誤"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
 
 # shell/e-shell-offline-handler.c:554
 #: shell/glade/e-active-connection-dialog.glade.h:1
@@ -29691,346 +14978,381 @@ msgstr "不要再顯示這個訊息"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution 可以自下列檔案匯入資料："
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: shell/main.c:89
-msgid "Evolution"
-msgstr "Evolution"
-
 # ui/evolution.xml.h:17
-#: shell/main.c:95
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolution 視窗(_W)"
 
 # shell/main.c:138
-#: shell/main.c:227
+#: shell/main.c:210
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "無法存取 Ximian Evolution shell。"
 
 # shell/main.c:138
-#: shell/main.c:236
+#: shell/main.c:219
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "無法初始化 Ximian Evolution shell： %s"
 
 # shell/main.c:184
-#: shell/main.c:317
+#: shell/main.c:289
 msgid "Disable splash screen"
 msgstr "停用顯著效果螢幕"
 
-#: shell/main.c:318
-#, fuzzy
-msgid "Start in offline mode"
-msgstr "開始匯入"
-
-#: shell/main.c:319
-#, fuzzy
-msgid "Start in online mode"
-msgstr "啟動智慧型匯入服務"
-
 # shell/main.c:185
-#: shell/main.c:320
+#: shell/main.c:290
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
-#: shell/main.c:338
-#, c-format
-msgid ""
-"%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
-msgstr ""
-
 # shell/main.c:217
-#: shell/main.c:368
+#: shell/main.c:332
 msgid "Cannot initialize the Bonobo component system."
 msgstr "無法初始化 Bonobo 元件系統。"
 
 # composer/e-msg-composer.c:805
-#: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
 msgstr "載入檔案時發生錯誤：%s"
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr ""
+
 # ui/evolution-message-composer.xml.h:49
-#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "插入檔案"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr ""
-
 # camel/camel-pgp-context.c:1073
 #: tools/evolution-addressbook-import.c:80
 #, fuzzy
 msgid "No filename provided."
 msgstr "沒有指定資料夾名稱。"
 
-# ui/evolution-mail.xml.h:9
-#: ui/evolution-addressbook.xml.h:3
-#, fuzzy
-msgid "Copy Contact(s) to Another Folder..."
-msgstr "複製已選定的郵件到另一個資料夾"
+# ui/evolution-event-editor.xml.h:13
+# ui/evolution-mail.xml.h:8
+# ui/evolution-task-editor-dialog.xml.h:14
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
+#: ui/evolution-tasks.xml.h:3
+msgid "Copy"
+msgstr "複製"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "複製選定範圍"
 
-# mail/folder-browser.c:713
-#: ui/evolution-addressbook.xml.h:5
-#, fuzzy
-msgid "Copy to Folder..."
-msgstr "復製至資料夾(_C)..."
-
 # ui/evolution-addressbook.xml.h:2
-#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "新增連絡人"
 
 # ui/evolution-addressbook.xml.h:2
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:5
 msgid "Create new contact list"
 msgstr "新增連絡人清單"
 
+# ui/evolution-event-editor.xml.h:15
+# ui/evolution-task-editor-dialog.xml.h:16
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
+msgid "Cut"
+msgstr "剪下"
+
 # ui/evolution-event-editor.xml.h:16
 # ui/evolution-task-editor-dialog.xml.h:17
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 msgid "Cut the selection"
 msgstr "剪下選定範圍"
 
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "刪除選定的連絡人"
 
-# ui/evolution-mail.xml.h:56
-#: ui/evolution-addressbook.xml.h:13
-#, fuzzy
-msgid "Move Contact(s) to Another Folder..."
-msgstr "將選定的郵件移至另一個資料夾"
+# mail/mail-config.glade.h:45
+#: ui/evolution-addressbook.xml.h:12
+msgid "New List"
+msgstr "新增清單"
 
-# mail/folder-browser.c:711
-#: ui/evolution-addressbook.xml.h:14
-#, fuzzy
-msgid "Move to Folder..."
-msgstr "移至資料夾(_M)..."
+# ui/evolution-event-editor.xml.h:30
+# ui/evolution-task-editor-dialog.xml.h:33
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "貼上"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
 msgstr "貼上剪貼板"
 
 # ui/evolution-calendar.xml.h:22
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "預覽將要列印的連絡人"
 
 # ui/evolution-addressbook.xml.h:11
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "列印選定的連絡人"
 
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "將選定的連絡人儲存為 VCard。"
 
 # ui/evolution-event-editor.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:57
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "全選"
 
 # ui/evolution-addressbook.xml.h:15
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "選擇全部連絡人"
 
+# ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "傳送郵件給連絡人(_M)..."
+
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send a mess to the selected contacts."
 msgstr "傳送郵件給選定的連絡人。"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send message to contact"
 msgstr "傳送郵件給連絡人"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
 # addressbook/gui/widgets/e-addressbook-view.c:612
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send selected contacts to another person."
 msgstr "傅送選定連絡人給其他使用者。"
 
 # ui/evolution-addressbook.xml.h:12
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "停止"
 
 # ui/evolution-addressbook.xml.h:13
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "停止載入"
 
-#: ui/evolution-addressbook.xml.h:30
-#, fuzzy
-msgid "View the current contact"
-msgstr "目前時間"
-
 # ui/evolution.xml.h:41
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "執行(_A)"
 
+# ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:30
+msgid "_Addressbook Sources..."
+msgstr "目錄服務來源(_A)..."
+
+# ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:31
+msgid "_Contact"
+msgstr "連絡人(_C)"
+
 # ui/evolution-addressbook.xml.h:17
-#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Contact List"
 msgstr "連絡人清單(_C)"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:24
 # calendar/gui/event-editor-dialog.glade.h:29
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "連絡人轉寄(_F)..."
 
-# mail/folder-browser.c:711
-#: ui/evolution-addressbook.xml.h:38
-msgid "_Move to Folder..."
-msgstr "移至資料夾(_M)..."
+# ui/evolution-addressbook.xml.h:18
+# ui/evolution-calendar.xml.h:42
+# ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
+#: ui/my-evolution.xml.h:7
+msgid "_Print..."
+msgstr "列印(_P)..."
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Save as VCard"
 msgstr "儲存成 VCard 檔案格式(_S)"
 
 # ui/evolution-addressbook.xml.h:19
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Search for Contacts"
 msgstr "尋找連絡人(_S)"
 
 # ui/evolution-event-editor.xml.h:72
 # ui/evolution-task-editor-dialog.xml.h:86
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Select All"
 msgstr "全選(_S)"
 
-# ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-addressbook.xml.h:45
-#, fuzzy
-msgid "_Send Message to Contact..."
-msgstr "傳送郵件給連絡人(_M)..."
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr "組態行事曆的設定值"
 
-# ui/evolution-calendar.xml.h:7
+# ui/evolution-calendar.xml.h:4
 #: ui/evolution-calendar.xml.h:4
+msgid "Create a New All Day _Event"
+msgstr "新增一個全天要事(_E)"
+
+# ui/evolution-tasks.xml.h:2
+#: ui/evolution-calendar.xml.h:5
+msgid "Create a New _Task"
+msgstr "建立一個新的工作(_T)"
+
+# ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a _New Appointment"
+msgstr "新增一個約會(_N)"
+
+#: ui/evolution-calendar.xml.h:9
+msgid "Create an event for the whole day"
+msgstr "建立一個整天的事件"
+
+# ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "天"
 
 # ui/evolution-event-editor.xml.h:18
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:12
 msgid "Delete the appointment"
 msgstr "刪除這個約會"
 
 # ui/evolution-calendar.xml.h:8
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "移至"
 
 # ui/evolution-calendar.xml.h:9
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:14
 msgid "Go back"
 msgstr "向後"
 
 # ui/evolution-calendar.xml.h:10
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:15
 msgid "Go forward"
 msgstr "向前"
 
 # ui/evolution-calendar.xml.h:11
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to _Date"
 msgstr "移至日期(_D)"
 
 # ui/evolution-calendar.xml.h:13
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:18
 msgid "Go to a specific date"
 msgstr "移至指定日期"
 
 # calendar/gui/e-day-view.c:3153
 # calendar/gui/e-week-view.c:3284
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:19
 msgid "Go to today"
 msgstr "移至今日"
 
 # ui/evolution-calendar.xml.h:15
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:20
 msgid "Month"
 msgstr "月"
 
+# calendar/gui/e-day-view.c:3146
+# ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:21
+msgid "New Appointment"
+msgstr "新增約會"
+
+# ui/evolution-tasks.xml.h:3
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+msgid "New Task"
+msgstr "新增工作"
+
 # ui/evolution-calendar.xml.h:22
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:24
 msgid "Previews the calendar to be printed"
 msgstr "預覽將要列印的行事曆內容"
 
 # ui/evolution-event-editor.xml.h:34
 # ui/evolution-task-editor-dialog.xml.h:37
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
 
 # ui/evolution-calendar.xml.h:26
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:26
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:27
 msgid "Publish Free/Busy information for this calendar"
 msgstr "發佈此行事曆的 空閒/忙碌 資訊"
 
 # ui/evolution-calendar.xml.h:30
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "顯示一天"
 
 # ui/evolution-calendar.xml.h:31
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "顯示一個月"
 
 # ui/evolution-calendar.xml.h:32
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "顯示一週"
 
 # ui/evolution-calendar.xml.h:33
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "顯示工作週"
 
 # ui/evolution-calendar.xml.h:36
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "週"
 
+# ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:35
+msgid "_Appointment..."
+msgstr "約會(_A)..."
+
+# ui/evolution-mail.xml.h:110
+#: ui/evolution-calendar.xml.h:36
+msgid "_Calendar Settings..."
+msgstr "行事曆設定(_C)..."
+
+# mail/mail-config.glade.h:61
+#: ui/evolution-calendar.xml.h:42
+msgid "_Publish Free/Busy Information"
+msgstr "發佈 空閒/忙碌 資訊(_P)"
+
+# ui/evolution-tasks.xml.h:9
+#: ui/evolution-calendar.xml.h:43
+msgid "_Task..."
+msgstr "工作(_T)..."
+
 # calendar/gui/dialogs/alarm-notify.glade.h:1
 # ui/evolution-contact-editor.xml.h:1
 # ui/evolution-event-editor.xml.h:10
@@ -30075,27 +15397,28 @@ msgstr "預覽須要列印的項目"
 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-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "列印..."
+
 # ui/evolution-event-editor.xml.h:40
 # ui/evolution-message-composer.xml.h:17
 # ui/evolution-task-editor-dialog.xml.h:50
 # widgets/misc/e-filter-bar.c:241
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "儲存"
 
-# widgets/misc/e-filter-bar.h:94
-# widgets/misc/e-filter-bar.h:101
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
-msgstr "另存新檔..."
-
 # ui/evolution-contact-editor.xml.h:9
 # ui/evolution-event-editor.xml.h:42
 # ui/evolution-task-editor-dialog.xml.h:52
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save and Close"
 msgstr "儲存後關閉"
 
@@ -30118,8 +15441,8 @@ msgstr "儲存這個項目到磁碟"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "檔案(_F)"
 
@@ -30133,7 +15456,7 @@ msgstr "列印信封(_V)..."
 # ui/evolution-message-composer.xml.h:19
 # ui/evolution-task-editor-dialog.xml.h:51
 #: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "另存新檔(_A)..."
@@ -30143,11 +15466,6 @@ msgstr "另存新檔(_A)..."
 msgid "Save the contact and close the dialog box"
 msgstr "儲存連絡人並關閉對話盒"
 
-# ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "傳送郵件給連絡人(_M)..."
-
 # ui/evolution-contact-editor.xml.h:16
 # ui/evolution-event-editor.xml.h:71
 # ui/evolution-message-composer.xml.h:53
@@ -30155,7 +15473,7 @@ msgstr "傳送郵件給連絡人(_M)..."
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -30231,11 +15549,6 @@ msgstr "為這個項目安排一個會議"
 msgid "Customise My Evolution"
 msgstr "自訂我的 Evolution"
 
-# ui/evolution-mail.xml.h:2
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "取消"
-
 # ui/evolution-mail.xml.h:3
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -30247,68 +15560,103 @@ msgstr "取消目前郵件所作的行動"
 msgid "Compose _New Message"
 msgstr "撰寫新郵件(_N)"
 
-# ui/evolution-mail.xml.h:20
+# ui/evolution-mail.xml.h:19
 #: ui/evolution-mail-global.xml.h:4
+msgid "Create or edit mail accounts and other preferences"
+msgstr "建立或編輯郵件帳號及其它設定"
+
+# ui/evolution-mail.xml.h:20
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
 # ui/evolution-mail.xml.h:21
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit virtual folder definitions"
 msgstr "建立或編輯虛擬資料夾的定義"
 
 # ui/evolution-mail.xml.h:25
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "清空垃圾桶(_T)"
 
 # ui/evolution-mail.xml.h:31
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget _Passwords"
 msgstr "重新輸入密碼 _P)"
 
 # ui/evolution-mail.xml.h:32
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "刪除已記錄的密碼以便可再重新輸入"
 
+# widgets/misc/e-messagebox.c:180
+#: ui/evolution-mail-global.xml.h:10
+msgid "New Message"
+msgstr "新郵件"
+
 # ui/evolution-mail.xml.h:58
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
 # ui/evolution-mail.xml.h:61
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的全部已刪除的郵件"
 
+# ui/evolution-mail.xml.h:81
+#: ui/evolution-mail-global.xml.h:13
+msgid "Send / Receive"
+msgstr "傳送 / 接收"
+
+# ui/evolution-mail.xml.h:82
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send queued mail and retrieve new mail"
+msgstr "傳送待送的郵件及接收新郵件"
+
 # ui/evolution-mail.xml.h:86
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr "顯示郵件預覽視窗"
 
 # ui/evolution-mail.xml.h:90
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "訂閱或取消訂閱在遠端伺服器的資料夾"
 
 # ui/evolution-mail.xml.h:99
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:17
 msgid "Virtual Folder _Editor..."
 msgstr "虛擬資料夾編輯器(_E)..."
 
 # ui/evolution-mail.xml.h:105
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "過濾器(_F)..."
 
+# ui/evolution-mail.xml.h:109
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "郵件訊息(_M)"
+
+# ui/evolution-mail.xml.h:110
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "郵件設定(_M)..."
+
 # calendar/gui/event-editor-dialog.glade.h:15
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "預覽面版(_P)"
 
+# ui/evolution-mail.xml.h:119
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "傳送 / 接收 (_S)"
+
 # mail/subscribe-dialog.c:271
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:24
 msgid "_Subscribe to Folders..."
 msgstr "訂閱至資料夾(_S)..."
 
@@ -30427,13 +15775,13 @@ msgid "Threaded Message list"
 msgstr "相關郵件清單"
 
 # ui/evolution-mail.xml.h:104
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+#: ui/evolution-mail-list.xml.h:26
 msgid "_Expunge"
 msgstr "刪除(_E)"
 
 # ui/evolution-mail.xml.h:106
 # ui/evolution.xml.h:50
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 msgid "_Folder"
 msgstr "資料 (_F)"
 
@@ -30456,259 +15804,240 @@ msgstr "內容(_P)..."
 msgid "_Threaded Message List"
 msgstr "相關郵件清單(_T)"
 
-# addressbook/gui/component/addressbook-config.c:662
-#: ui/evolution-mail-message.xml.h:1
-#, fuzzy
-msgid "A_dd Sender to Addressbook"
-msgstr "新增傳送者到目錄服務"
-
-# mail/folder-browser.c:727
-#: ui/evolution-mail-message.xml.h:2
-#, fuzzy
-msgid "A_pply Filters"
-msgstr "套用過濾器"
-
-# addressbook/gui/component/addressbook-config.c:662
-#: ui/evolution-mail-message.xml.h:3
-#, fuzzy
-msgid "Add Sender to Addressbook"
-msgstr "新增傳送者到目錄服務"
-
 # ui/evolution-mail.xml.h:1
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:1
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的郵件"
 
 # ui/evolution-mail.xml.h:6
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "撰寫回郵給所選定的郵件的全部收件者"
 
 # ui/evolution-mail.xml.h:7
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:3
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "撰寫回郵給所選定郵件的郵件清單"
 
 # ui/evolution-mail.xml.h:7
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
 # ui/evolution-mail.xml.h:9
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
 # ui/evolution-mail.xml.h:10
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "從郵件建立虛擬資料夾(_V)"
 
 # ui/evolution-mail.xml.h:11
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
 # ui/evolution-mail.xml.h:12
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
 # ui/evolution-mail.xml.h:13
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個郵件清單建立過濾器規則"
 
 # ui/evolution-mail.xml.h:14
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
 # ui/evolution-mail.xml.h:15
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
 msgstr "為這些收件者建立一個虛擬資料夾"
 
 # ui/evolution-mail.xml.h:16
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
 msgstr "為這個郵件清單建立一個虛擬資料夾"
 
 # ui/evolution-mail.xml.h:17
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
 msgstr "為這個寄件者建立一個虛擬資料夾"
 
 # ui/evolution-mail.xml.h:18
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
 msgstr "為這個主旨建立一個虛擬資料夾"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:16
 msgid "Decrease the text size"
 msgstr ""
 
 # ui/evolution-mail.xml.h:23
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr "顯示下一封未閱讀的相關郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
-# mail/message-browser.c:194
-# ui/evolution-mail.xml.h:33
-#: ui/evolution-mail-message.xml.h:28
-#, fuzzy
-msgid "F_orward"
-msgstr "轉寄"
-
 # ui/evolution-mail.xml.h:26
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr "郵件清單規則(_L)..."
 
 # ui/evolution-mail.xml.h:27
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Se_nder..."
 msgstr "寄件者規則(_N)..."
 
 # ui/evolution-mail.xml.h:28
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Recipients..."
 msgstr "收件者規則(_R)..."
 
 # ui/evolution-mail.xml.h:29
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on _Subject..."
 msgstr "主旨規則(_S)..."
 
-# ui/evolution-mail.xml.h:54
-#: ui/evolution-mail-message.xml.h:33
-#, fuzzy
-msgid "Flag selected message(s) for follow-up"
-msgstr "將選定的郵件標示成要刪除"
-
-#: ui/evolution-mail-message.xml.h:34
-msgid "Follow _Up..."
-msgstr ""
-
 # ui/evolution-mail.xml.h:30
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML 格式的郵件時強迫載入圖片"
 
+# mail/message-browser.c:194
+# ui/evolution-mail.xml.h:33
+#: ui/evolution-mail-message.xml.h:30
+msgid "Forward"
+msgstr "轉寄"
+
+# ui/evolution-mail.xml.h:34
+#: ui/evolution-mail-message.xml.h:31
+msgid "Forward As"
+msgstr "轉寄方式"
+
+# ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:32
+msgid "Forward _Attached"
+msgstr "轉寄附加檔案(_A)"
+
+# ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:33
+msgid "Forward _Inline"
+msgstr "正常轉寄(_I)"
+
+# ui/evolution-mail.xml.h:37
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward _Quoted"
+msgstr "轉寄引文(_Q)"
+
 # ui/evolution-mail.xml.h:38
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
 # ui/evolution-mail.xml.h:39
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr "將須要轉寄的郵件以回覆郵件方式寄出"
 
 # ui/evolution-mail.xml.h:40
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
 # ui/evolution-mail.xml.h:41
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附加檔案形式轉寄給某人"
 
 # ui/evolution-message-composer.xml.h:10
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Increase the text size"
 msgstr "插入純文字檔案..."
 
 # ui/evolution-mail.xml.h:46
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "載入圖片(_I)"
 
 # ui/evolution-mail.xml.h:50
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as I_mportant"
 msgstr "標示成重要(_M)"
 
 # mail/folder-browser.c:706
 #: ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
-msgstr "標示成未閱讀(_n)"
-
-# mail/folder-browser.c:706
-#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "標示成不重要(_O)"
 
 # ui/evolution-mail.xml.h:52
-#: ui/evolution-mail-message.xml.h:47
-#, fuzzy
-msgid "Mark the selected message(s) as having been read"
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as having been read"
 msgstr "將選定的郵件標示成已閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ui/evolution-mail-message.xml.h:48
-#, fuzzy
-msgid "Mark the selected message(s) as important"
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mark the selected messages as important"
 msgstr "將選定的郵件標示成重要"
 
 # ui/evolution-mail.xml.h:53
-#: ui/evolution-mail-message.xml.h:49
-#, fuzzy
-msgid "Mark the selected message(s) as not having been read"
+#: ui/evolution-mail-message.xml.h:48
+msgid "Mark the selected messages as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ui/evolution-mail-message.xml.h:50
-#, fuzzy
-msgid "Mark the selected message(s) as unimportant"
+#: ui/evolution-mail-message.xml.h:49
+msgid "Mark the selected messages as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
 # ui/evolution-mail.xml.h:54
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
 # ui/evolution-mail.xml.h:55
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "移動"
 
 # ui/evolution-mail.xml.h:56
-#: ui/evolution-mail-message.xml.h:53
-#, fuzzy
-msgid "Move selected message(s) to another folder"
+#: ui/evolution-mail-message.xml.h:52
+msgid "Move selected messages to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
 # mail/message-browser.c:210
@@ -30716,25 +16045,27 @@ msgstr "將選定的郵件移至另一個資料夾"
 # ui/evolution-event-editor.xml.h:29
 # ui/evolution-mail.xml.h:57
 # ui/evolution-task-editor-dialog.xml.h:32
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "下一步"
 
 # ui/evolution-mail.xml.h:23
-#: ui/evolution-mail-message.xml.h:55
-#, fuzzy
-msgid "Next _Important Message"
+#: ui/evolution-mail-message.xml.h:54
+msgid "Next Important Message"
 msgstr "下一封重要郵件"
 
+# widgets/misc/e-messagebox.c:180
+#: ui/evolution-mail-message.xml.h:55
+msgid "Next Message"
+msgstr "下一封郵件"
+
 #: ui/evolution-mail-message.xml.h:56
-#, fuzzy
-msgid "Next _Thread"
+msgid "Next Thread"
 msgstr "下一封相關郵件"
 
 # mail/mail-search.c:138
 #: ui/evolution-mail-message.xml.h:57
-#, fuzzy
-msgid "Next _Unread Message"
+msgid "Next Unread Message"
 msgstr "下一封未閱讀的郵件"
 
 # ui/evolution-mail.xml.h:59
@@ -30751,21 +16082,9 @@ msgstr "開啟選定的郵件然後重傳"
 msgid "Original Si_ze"
 msgstr ""
 
-# ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:61
-#, fuzzy
-msgid "P_revious Unread Message"
-msgstr "上一封未閱讀的郵件"
-
-# ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:62
-#, fuzzy
-msgid "Pr_evious Important Message"
-msgstr "上一封重要郵件"
-
 # ui/evolution-addressbook.xml.h:8
 # ui/evolution-mail.xml.h:63
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:61
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
@@ -30773,205 +16092,186 @@ msgstr "預覽需要列印的郵件"
 # ui/evolution-event-editor.xml.h:33
 # ui/evolution-mail.xml.h:64
 # ui/evolution-task-editor-dialog.xml.h:36
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "上一步"
 
+# ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:63
+msgid "Previous Important Message"
+msgstr "上一封重要郵件"
+
 # mail/mail-callbacks.c:1407
-#: ui/evolution-mail-message.xml.h:67
-msgid "Print this message"
-msgstr "列印郵件"
+#: ui/evolution-mail-message.xml.h:64
+msgid "Previous Message"
+msgstr "上一封郵件"
+
+# ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:65
+msgid "Previous Unread Message"
+msgstr "上一封未閱讀的郵件"
 
+# mail/mail-callbacks.c:1407
 #: ui/evolution-mail-message.xml.h:68
-msgid "Re_direct"
-msgstr ""
+msgid "Print this message"
+msgstr "列印郵件"
 
-# ui/evolution-mail.xml.h:40
+# mail/message-browser.c:188
+# ui/evolution-mail.xml.h:70
 #: ui/evolution-mail-message.xml.h:69
-#, fuzzy
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "將選定的郵件轉寄給某人"
+msgid "Reply"
+msgstr "回覆"
 
-#: ui/evolution-mail-message.xml.h:74
+# mail/message-browser.c:191
+# ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
+msgid "Reply to All"
+msgstr "全部回覆"
+
+#: ui/evolution-mail-message.xml.h:73
 msgid "Reset the text to its original size"
 msgstr ""
 
 # ui/evolution-mail.xml.h:73
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:74
 msgid "S_earch Message..."
 msgstr "尋找郵件(_E)..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_maller"
 msgstr ""
 
 # ui/evolution-mail.xml.h:74
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr "另存郵件成文字檔案"
 
 # ui/evolution-mail.xml.h:75
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
 # ui/evolution-event-editor.xml.h:50
 # ui/evolution-task-editor-dialog.xml.h:59
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr "設定目前印表機的版面設定"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
 msgstr "顯示郵件原始檔(_S)"
 
 # addressbook/printing/e-contact-print.glade.h:11
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr "顯示全部檔頭(_H)"
 
 # ui/evolution-mail.xml.h:86
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr "使用正常模式顯示郵件"
 
 # ui/evolution-mail.xml.h:87
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
 # ui/evolution-mail.xml.h:89
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:84
 msgid "Text Si_ze"
 msgstr ""
 
 # ui/evolution-mail.xml.h:94
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr "復原選定的郵件"
 
 # ui/evolution-mail.xml.h:95
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr "郵件列表虛擬資料夾(_L)..."
 
 # ui/evolution-mail.xml.h:96
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr "寄件者虛擬資料夾(_N)..."
 
 # ui/evolution-mail.xml.h:97
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr "收件者虛擬資料夾(_R)..."
 
 # ui/evolution-mail.xml.h:98
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr "主旨虛擬資料夾(_S)..."
 
-# ui/evolution-message-composer.xml.h:1
-#: ui/evolution-mail-message.xml.h:92
-#, fuzzy
-msgid "_Attached"
-msgstr "附加"
+# ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:91
+msgid "_Apply Filters"
+msgstr "套用過濾器規則(_A)"
 
 # ui/evolution-mail.xml.h:101
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
 # ui/evolution-mail.xml.h:102
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "建立郵件規則(_C)"
 
 # ui/evolution-mail.xml.h:107
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr "轉寄郵件(_F)"
 
-# ui/evolution-calendar.xml.h:8
-#: ui/evolution-mail-message.xml.h:98
-#, fuzzy
-msgid "_Go To"
-msgstr "移至"
-
-# mail/mail-config.glade.h:37
-#: ui/evolution-mail-message.xml.h:99
-#, fuzzy
-msgid "_Inline"
-msgstr "正常"
-
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Larger"
 msgstr "呼叫器"
 
 # views/mail/galview.xml.h:4
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
 msgstr "檢視郵件(_M)"
 
 # ui/evolution-mail.xml.h:112
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
-# widgets/misc/e-messagebox.c:180
-#: ui/evolution-mail-message.xml.h:103
-#, fuzzy
-msgid "_Next Message"
-msgstr "下一封郵件"
-
 # calendar/gui/calendar-model.c:499
 # calendar/gui/calendar-model.c:1068
 # calendar/gui/calendar-model.c:1574
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
 msgstr "標準顯示(_N)"
 
 # ui/evolution-mail.xml.h:114
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr "開啟郵件(_O)"
 
-# mail/mail-callbacks.c:1407
-#: ui/evolution-mail-message.xml.h:106
-#, fuzzy
-msgid "_Previous Message"
-msgstr "上一封郵件"
-
-# mail/mail-config.glade.h:56
-#: ui/evolution-mail-message.xml.h:108
-#, fuzzy
-msgid "_Quoted"
-msgstr "引用"
-
 # ui/evolution-addressbook.xml.h:20
 # ui/evolution-calendar.xml.h:44
 # ui/evolution-event-editor.xml.h:74
 # ui/evolution-task-editor-dialog.xml.h:88
 # ui/evolution.xml.h:64
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "工具(_T)"
 
-# mail/folder-browser.c:717
-# ui/evolution-mail.xml.h:121
-#: ui/evolution-mail-message.xml.h:112
-msgid "_Undelete"
-msgstr "復原(_U)"
-
 # ui/evolution.xml.h:6
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
@@ -30983,8 +16283,8 @@ msgstr "關閉這個視窗"
 # ui/evolution.xml.h:43
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -30993,7 +16293,7 @@ msgstr "關閉(_C)"
 # ui/evolution-task-editor-dialog.xml.h:90
 # ui/evolution.xml.h:65
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "檢視(_V)"
 
@@ -31024,13 +16324,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "使用您的 S/MIME 加密證書將這封郵件加密"
 
 # addressbook/printing/e-contact-print.glade.h:10
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:8
 #, fuzzy
 msgid "For_mat"
 msgstr "格式"
 
 # ui/evolution-message-composer.xml.h:8
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "H_TML"
 msgstr "HTML"
@@ -31050,14 +16350,6 @@ msgstr "將檔案以純文字格式附加到郵件"
 msgid "Insert text file..."
 msgstr "插入純文字檔案..."
 
-# calendar/gui/e-day-view.c:3162
-# calendar/gui/e-week-view.c:3292
-# ui/evolution-calendar.xml.h:19
-# ui/evolution-message-composer.xml.h:11
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "開啟"
-
 # ui/evolution-message-composer.xml.h:12
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
@@ -31103,7 +16395,7 @@ msgstr "儲存至資料夾..."
 # ui/evolution-message-composer.xml.h:23
 # ui/evolution-task-editor-dialog.xml.h:53
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:5
 msgid "Save the current file"
 msgstr "儲存目前檔案"
 
@@ -31134,7 +16426,6 @@ msgstr "稍後傳送(_L)"
 
 # ui/evolution-message-composer.xml.h:29
 #: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "使用 HTML 格式傳送郵件"
 
@@ -31228,7 +16519,7 @@ msgstr "寄件者(_F)"
 
 # ui/evolution-message-composer.xml.h:49
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -31242,11 +16533,16 @@ msgstr "開啟(_O)..."
 msgid "_Reply-To Field"
 msgstr "回覆(_R)"
 
+# ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "安全(_S)"
+
 # ui/evolution-event-editor.xml.h:60
 # ui/evolution-message-composer.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:72
 # ui/evolution.xml.h:53
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "說明(_H)"
 
@@ -31313,50 +16609,41 @@ msgstr "取得最新的工作資訊"
 msgid "Re_fresh Task"
 msgstr "重整工作(_F)"
 
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr "組態工作檢視的設定值"
+
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Copy selected task"
 msgstr "複製選定的工作"
 
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:7
 msgid "Cut selected task"
 msgstr "剪下選定的工作"
 
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-tasks.xml.h:6
-#, fuzzy
-msgid "Delete completed tasks"
-msgstr "刪除選定的工作"
-
-# calendar/gui/e-calendar-table.c:714
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
 
-# calendar/gui/e-calendar-table.c:707
-#: ui/evolution-tasks.xml.h:8
-#, fuzzy
-msgid "Mar_k as Complete"
-msgstr "標示完成(_M)"
-
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "貼上剪貼板上的工作"
 
-# ui/evolution-calendar.xml.h:22
-#: ui/evolution-tasks.xml.h:11
-#, fuzzy
-msgid "Previews the list of tasks to be printed"
-msgstr "預覽將要列印的連絡人"
-
-# mail/mail-callbacks.c:1407
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
 #: ui/evolution-tasks.xml.h:13
-#, fuzzy
-msgid "Print the list of tasks"
-msgstr "列印郵件"
+msgid "Tasks Settings..."
+msgstr "工作設定..."
+
+# ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:18
+msgid "_Task"
+msgstr "工作(_T)"
 
 # ui/evolution.xml.h:1
 #: ui/evolution.xml.h:1
@@ -31437,95 +16724,84 @@ msgstr "在新視窗開啟"
 msgid "Open this folder in an other window"
 msgstr "使用新視窗開啟這個資料夾"
 
-# ui/evolution-mail.xml.h:81
-#: ui/evolution.xml.h:21
-msgid "Send / Receive"
-msgstr "傳送 / 接收"
-
-# ui/evolution-mail.xml.h:82
-#: ui/evolution.xml.h:22
-#, fuzzy
-msgid "Send queued items and retrieve new items"
-msgstr "傳送待送的郵件及接收新郵件"
-
 # ui/evolution.xml.h:27
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:21
 msgid "Show information about Ximian Evolution"
 msgstr "顯示關於 Ximian Evolution 的資訊"
 
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:23
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
 # ui/evolution.xml.h:30
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
 # ui/evolution.xml.h:31
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Toggle"
 msgstr "切換"
 
 # ui/evolution.xml.h:32
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Toggle whether to show the folder bar"
 msgstr "切換資料夾清單的顯示狀態"
 
 # ui/evolution.xml.h:33
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the shortcut bar"
 msgstr "切換資料功能列的顯示狀態"
 
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 # ui/evolution.xml.h:38
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "View the selected folder"
 msgstr "檢視選定的資料夾"
 
 # ui/evolution.xml.h:16
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
 # ui/evolution.xml.h:40
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "_About Ximian Evolution..."
 msgstr "關於 Ximian Evolution(_A)..."
 
 # ui/evolution.xml.h:45
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
 # ui/evolution.xml.h:51
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:38
 msgid "_Folder Bar"
 msgstr "資料夾清單(_F)"
 
 # ui/evolution.xml.h:52
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:39
 msgid "_Go to Folder..."
 msgstr "移至資料夾(_G)..."
 
 # shell/e-shell-importer.c:363
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_Import..."
 msgstr "匯入..."
 
 # ui/evolution.xml.h:57
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:42
 msgid "_Move..."
 msgstr "移動(_M)..."
 
@@ -31533,54 +16809,59 @@ msgstr "移動(_M)..."
 # ui/evolution-event-editor.xml.h:66
 # ui/evolution-task-editor-dialog.xml.h:79
 # ui/evolution.xml.h:58
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:43
 msgid "_New"
 msgstr "新增(_N)"
 
 # ui/evolution.xml.h:59
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:44
 msgid "_New Folder"
 msgstr "新增資料夾(_N)"
 
 # ui/evolution-mail.xml.h:110
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "郵件設定(_M)..."
 
 # ui/evolution.xml.h:61
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
-# ui/evolution-mail.xml.h:119
-#: ui/evolution.xml.h:52
-msgid "_Send / Receive"
-msgstr "傳送 / 接收 (_S)"
-
 # ui/evolution.xml.h:62
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "功能(_S)"
 
 # ui/evolution.xml.h:62
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "功能列(_S)"
 
+# ui/evolution.xml.h:4
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for the summary"
+msgstr "變更摘要的設定值"
+
 # calendar/gui/e-calendar-table.c:159
-#: ui/my-evolution.xml.h:3
+#: ui/my-evolution.xml.h:4
 msgid "Print summary"
 msgstr "列印摘要"
 
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:5
 msgid "Reload"
 msgstr "重新載入"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:6
 msgid "Reload the view"
 msgstr "重新載入檢視器"
 
+# ui/evolution-mail.xml.h:110
+#: ui/my-evolution.xml.h:8
+msgid "_Summary Settings..."
+msgstr "摘要設定值(_S)..."
+
 # data/evolution.keys.in.h:1
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -31596,33 +16877,23 @@ msgstr "依公司"
 msgid "Phone List"
 msgstr "電話清單"
 
-# mail/mail-account-gui.c:682
-#: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As Sent Folder"
-msgstr "選擇資料夾"
-
-#: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr ""
-
 # views/mail/galview.xml.h:1
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:1
 msgid "By Sender"
 msgstr "依寄件者"
 
 # views/mail/galview.xml.h:2
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:2
 msgid "By Status"
 msgstr "依狀況"
 
 # views/mail/galview.xml.h:3
-#: views/mail/galview.xml.h:5
+#: views/mail/galview.xml.h:3
 msgid "By Subject"
 msgstr "依主旨"
 
 # views/mail/galview.xml.h:4
-#: views/mail/galview.xml.h:6
+#: views/mail/galview.xml.h:4
 msgid "Messages"
 msgstr "郵件"
 
@@ -31631,12 +16902,6 @@ msgstr "郵件"
 msgid "With Category"
 msgstr "依類別"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
-msgid "UTC"
-msgstr ""
-
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -31663,23 +16928,12 @@ msgstr ""
 "  使用滑鼠右鍵縮小地圖。"
 
 # widgets/menus/gal-view-menus.c:176
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "目前檢視(_C)"
 
-# widgets/menus/gal-view-menus.c:176
-#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
-#, fuzzy
-msgid "Custom View"
-msgstr "目前檢視(_C)"
-
-#: widgets/menus/gal-view-menus.c:333
-msgid "Save Custom View"
-msgstr ""
-
 # widgets/menus/gal-view-menus.c:202
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "定義檢視"
 
@@ -31721,36 +16975,32 @@ msgstr "時間格式：%s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "數值必須是由 0 到 100 的數字"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "波羅的海文"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "中歐字母"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "中文"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "斯拉夫文"
 
 # ui/evolution-calendar.xml.h:36
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "希臘文"
 
-#: widgets/misc/e-charset-picker.c:64
-msgid "Hebrew"
-msgstr ""
-
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "日文"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "韓文"
 
@@ -31759,55 +17009,57 @@ msgstr "韓文"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:65
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:66
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:67
 msgid "Western European"
 msgstr "西歐字母"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:84
 msgid "Traditional"
 msgstr "繁體"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 msgid "Simplified"
 msgstr "簡體"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:90
 msgid "Ukrainian"
 msgstr "烏克籣文"
 
-# mail/mail-accounts.c:197
-#: widgets/misc/e-charset-picker.c:95
-#, fuzzy
-msgid "Visual"
-msgstr "停用"
+# 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:58
+#: widgets/misc/e-charset-picker.c:101
+msgid "New"
+msgstr "新增"
 
 # mail/mail-config.glade.h:22
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:159
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "不明的編碼：%s"
 
 # mail/mail-config.glade.h:22
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:201
 msgid "Enter the character set to use"
 msgstr "輸入需要使用的編碼"
 
 # addressbook/contact-editor/e-contact-editor.c:1254
 # addressbook/contact-editor/e-contact-editor.c:1312
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:276
 msgid "Other..."
 msgstr "其它..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:395
 msgid "Character Encoding"
 msgstr "編碼"
 
@@ -31817,27 +17069,32 @@ msgid "..."
 msgstr "..."
 
 # mail/mail-search.c:299
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:152
 msgid "Search Editor"
 msgstr "尋找編輯器"
 
 # widgets/misc/e-filter-bar.c:168
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:168
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
 # widgets/misc/e-filter-bar.c:168
-#: widgets/misc/e-filter-bar.h:97
-#, fuzzy
-msgid "_Save Search..."
-msgstr "儲存搜尋結果"
-
-# widgets/misc/e-filter-bar.c:168
-#: widgets/misc/e-filter-bar.h:98
-#, fuzzy
-msgid "_Edit Saved Searches..."
+#: widgets/misc/e-filter-bar.h:94
+msgid "Add to Saved Searches"
 msgstr "加入儲存的搜尋結果"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: widgets/misc/e-filter-bar.h:95
+msgid "Clear"
+msgstr "清除"
+
+# widgets/misc/e-filter-bar.h:95
+# widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "全部顯示"
+
 # widgets/misc/e-messagebox.c:152
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -31867,27 +17124,13 @@ msgstr "訊息"
 msgid "Don't show this message again."
 msgstr "不要再顯示這個訊息。"
 
-# addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:477
-#, fuzzy
-msgid "_Find Now"
-msgstr "立即搜尋"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:478
-#, fuzzy
-msgid "_Clear"
-msgstr "清除"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:835
-msgid "Clear"
-msgstr "清除"
+# widgets/misc/e-search-bar.c:155
+#: widgets/misc/e-search-bar.c:334
+msgid "Sear_ch"
+msgstr "尋找(_C)"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:460
 msgid "Find Now"
 msgstr "立即搜尋"
 
@@ -31918,1115 +17161,14 @@ msgstr "init_corba()：不能初始化 GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo()：不能初始化 Bonobo"
 
-# addressbook/backend/ebook/e-card.c:3314
-#~ msgid "Card: "
-#~ msgstr "名片："
-
-# addressbook/backend/ebook/e-card.c:3316
-#~ msgid ""
-#~ "\n"
-#~ "Name: "
-#~ msgstr ""
-#~ "\n"
-#~ "名字："
-
-# addressbook/backend/ebook/e-card.c:3317
-#~ msgid ""
-#~ "\n"
-#~ "  Prefix:     "
-#~ msgstr ""
-#~ "\n"
-#~ "  前置：     "
-
-# addressbook/backend/ebook/e-card.c:3318
-#~ msgid ""
-#~ "\n"
-#~ "  Given:      "
-#~ msgstr ""
-#~ "\n"
-#~ "  姓：       "
-
-# addressbook/backend/ebook/e-card.c:3319
-#~ msgid ""
-#~ "\n"
-#~ "  Additional: "
-#~ msgstr ""
-#~ "\n"
-#~ "  額外的： "
-
-# addressbook/backend/ebook/e-card.c:3320
-#~ msgid ""
-#~ "\n"
-#~ "  Family:     "
-#~ msgstr ""
-#~ "\n"
-#~ "  姓氏：     "
-
-# addressbook/backend/ebook/e-card.c:3321
-#~ msgid ""
-#~ "\n"
-#~ "  Suffix:     "
-#~ msgstr ""
-#~ "\n"
-#~ "  後置：     "
-
-# addressbook/backend/ebook/e-card.c:3335
-#~ msgid ""
-#~ "\n"
-#~ "Birth Date: "
-#~ msgstr ""
-#~ "\n"
-#~ "出生日期："
-
-# addressbook/backend/ebook/e-card.c:3346
-#~ msgid ""
-#~ "\n"
-#~ "Address:"
-#~ msgstr ""
-#~ "\n"
-#~ "地址："
-
-# addressbook/backend/ebook/e-card.c:3348
-#~ msgid ""
-#~ "\n"
-#~ "  Postal Box:  "
-#~ msgstr ""
-#~ "\n"
-#~ "  信箱：  "
-
-# addressbook/backend/ebook/e-card.c:3349
-#~ msgid ""
-#~ "\n"
-#~ "  Ext:         "
-#~ msgstr ""
-#~ "\n"
-#~ "  內線：         "
-
-# addressbook/backend/ebook/e-card.c:3350
-#~ msgid ""
-#~ "\n"
-#~ "  Street:      "
-#~ msgstr ""
-#~ "\n"
-#~ "  街：      "
-
-# addressbook/backend/ebook/e-card.c:3351
-#~ msgid ""
-#~ "\n"
-#~ "  City:        "
-#~ msgstr ""
-#~ "\n"
-#~ "  縣/市：        "
-
-# addressbook/backend/ebook/e-card.c:3352
-#~ msgid ""
-#~ "\n"
-#~ "  Region:      "
-#~ msgstr ""
-#~ "\n"
-#~ "  地區：      "
-
-# addressbook/backend/ebook/e-card.c:3353
-#~ msgid ""
-#~ "\n"
-#~ "  Postal Code: "
-#~ msgstr ""
-#~ "\n"
-#~ "  郵遞區號： "
-
-# addressbook/backend/ebook/e-card.c:3354
-#~ msgid ""
-#~ "\n"
-#~ "  Country:     "
-#~ msgstr ""
-#~ "\n"
-#~ "  國家：     "
-
-# addressbook/backend/ebook/e-card.c:3367
-#~ msgid ""
-#~ "\n"
-#~ "Delivery Label: "
-#~ msgstr ""
-#~ "\n"
-#~ "送遞標籤： "
-
-# addressbook/backend/ebook/e-card.c:3379
-#~ msgid ""
-#~ "\n"
-#~ "Telephones:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "電話：\n"
-
-# addressbook/backend/ebook/e-card.c:3382
-#~ msgid ""
-#~ "\n"
-#~ "Telephone:"
-#~ msgstr ""
-#~ "\n"
-#~ "電話："
-
-# addressbook/backend/ebook/e-card.c:3406
-#~ msgid ""
-#~ "\n"
-#~ "E-mail:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "電子郵件：\n"
-
-# addressbook/backend/ebook/e-card.c:3409
-#~ msgid ""
-#~ "\n"
-#~ "E-mail:"
-#~ msgstr ""
-#~ "\n"
-#~ "電子郵件："
-
-# addressbook/backend/ebook/e-card.c:3434
-#~ msgid ""
-#~ "\n"
-#~ "Time Zone: "
-#~ msgstr ""
-#~ "\n"
-#~ "時區： "
-
-# addressbook/backend/ebook/e-card.c:3446
-#~ msgid ""
-#~ "\n"
-#~ "Business Role: "
-#~ msgstr ""
-#~ "\n"
-#~ "業務職位： "
-
-# addressbook/backend/ebook/e-card.c:3458
-#~ msgid ""
-#~ "\n"
-#~ "Org: "
-#~ msgstr ""
-#~ "\n"
-#~ "團體： "
-
-# addressbook/backend/ebook/e-card.c:3459
-#~ msgid ""
-#~ "\n"
-#~ "  Name:  "
-#~ msgstr ""
-#~ "\n"
-#~ "  名稱：  "
-
-# addressbook/backend/ebook/e-card.c:3460
-#~ msgid ""
-#~ "\n"
-#~ "  Unit:  "
-#~ msgstr ""
-#~ "\n"
-#~ "  單位：  "
-
-# addressbook/backend/ebook/e-card.c:3461
-#~ msgid ""
-#~ "\n"
-#~ "  Unit2: "
-#~ msgstr ""
-#~ "\n"
-#~ "  單位2： "
-
-# addressbook/backend/ebook/e-card.c:3462
-#~ msgid ""
-#~ "\n"
-#~ "  Unit3: "
-#~ msgstr ""
-#~ "\n"
-#~ "  單位3： "
-
-# addressbook/backend/ebook/e-card.c:3463
-#~ msgid ""
-#~ "\n"
-#~ "  Unit4: "
-#~ msgstr ""
-#~ "\n"
-#~ "  單位4： "
-
-# addressbook/backend/ebook/e-card.c:3467
-#~ msgid ""
-#~ "\n"
-#~ "Categories: "
-#~ msgstr ""
-#~ "\n"
-#~ "類別： "
-
-# addressbook/backend/ebook/e-card.c:3468
-#~ msgid ""
-#~ "\n"
-#~ "Comment: "
-#~ msgstr ""
-#~ "\n"
-#~ "備註： "
-
-# addressbook/backend/ebook/e-card.c:3481
-#~ msgid ""
-#~ "\n"
-#~ "Unique String: "
-#~ msgstr ""
-#~ "\n"
-#~ "唯一字串： "
-
-# addressbook/backend/ebook/e-card.c:3484
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "公鑰： "
-
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#, fuzzy
-#~ msgid "Connecting to LDAP server..."
-#~ msgstr "正在連線至伺服器..."
-
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#, fuzzy
-#~ msgid "Waiting for connection to LDAP server..."
-#~ msgstr "正在連線至伺服器..."
-
-# ui/evolution-addressbook.xml.h:7
-#~ msgid "New _Contact"
-#~ msgstr "新增連絡人(_C)"
-
-# ui/evolution-addressbook.xml.h:17
-#~ msgid "New Contact _List"
-#~ msgstr "新增連絡人清單"
-
-# addressbook/gui/component/addressbook-config.c:660
-#~ msgid "Edit Addressbook"
-#~ msgstr "編輯目錄服務"
-
-# mail/mail-config.glade.h:3
-#~ msgid "Account Name"
-#~ msgstr "帳號"
-
-# addressbook/gui/component/addressbook-config.c:662
-#~ msgid "Add Addressbook"
-#~ msgstr "新增目錄服務"
-
-# addressbook/gui/component/select-names/select-names.glade.h:3
-#~ msgid "Server Name"
-#~ msgstr "伺服器名稱"
-
-#~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr "下列資訊是新增目錄服務所需要的。"
-
-#~ msgid "This information is not required for most ldap servers. "
-#~ msgstr "此資訊大多數的 LDAP 伺服器都不需要。"
-
-#~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
-#~ msgstr ""
-#~ "此資訊被您的 LDAP "
-#~ "伺服器用來指出那一個節點正被用於搜尋.連絡您的伺服器�"
-#~ "��理者以得到更多資訊。"
-
-#~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
-#~ msgstr ""
-#~ "這是您在 LDAP "
-#~ "伺服器上所有搜尋的基礎節點.連絡您的伺服器管理者以得�"
-#~ "��更多資訊。"
-
-#~ msgid "This is the name of the server where your addressbook is located."
-#~ msgstr "這是您的目錄服務所在之伺服器的名稱。"
-
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "這是您的 LDAP 伺服器使用的連接埠。"
-
-# mail/mail-config.glade.h:73
-#~ msgid "_My server requires authentication"
-#~ msgstr "伺服器要求驗證(_M)"
-
-# ui/evolution-addressbook.xml.h:17
-#, fuzzy
-#~ msgid "Other Contacts"
-#~ msgstr "連絡人"
-
-# shell/e-storage.c:178
-#~ msgid "(none)"
-#~ msgstr "(沒有)"
-
-# ui/evolution-addressbook.xml.h:17
-#~ msgid "Co_ntacts:"
-#~ msgstr "連絡人(_N)："
-
-#~ msgid "Show contacts matching the following criteria:"
-#~ msgstr "顯示符合下列條件的連絡人："
-
-# addressbook/gui/component/select-names/select-names.glade.h:2
-#~ msgid "_Message Recipients:"
-#~ msgstr "收件者(_M)："
-
-# addressbook/contact-editor/contact-editor.glade.h:3
-#~ msgid "B_usiness"
-#~ msgstr "商務 (_U)"
-
-# addressbook/contact-editor/contact-editor.glade.h:4
-#~ msgid "Business _Fax"
-#~ msgstr "商務傳真 (_F)"
-
-# addressbook/contact-editor/contact-editor.glade.h:21
-#~ msgid "_Business"
-#~ msgstr "商務 (_B)"
-
-# addressbook/contact-editor/contact-editor.glade.h:26
-#~ msgid "_Home"
-#~ msgstr "住家 (_H)"
-
-# addressbook/contact-editor/contact-editor.glade.h:29
-#~ msgid "_Mobile"
-#~ msgstr "行動電話(_M)"
-
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "您確定要刪除\n"
-#~ "這個連絡人？"
-
-#~ msgid "Republic Of Moldova"
-#~ msgstr "摩爾多瓦"
-
-# ui/evolution-calendar.xml.h:5
-#~ msgid "Create a new appointment"
-#~ msgstr "建立一個新的約會"
-
-# ui/evolution-tasks.xml.h:2
-#~ msgid "Create a new task"
-#~ msgstr "建立一個新的工作"
-
-# ui/evolution-tasks.xml.h:3
-#~ msgid "New _Task"
-#~ msgstr "新增工作(_T)"
-
-# ui/evolution-calendar.xml.h:5
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "以預設提醒建立新的約會(_R)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#~ msgid "First day of wee_k:"
-#~ msgstr "每週的第一天(_K)："
-
-# addressbook/contact-editor/e-contact-editor.c:1254
-# addressbook/contact-editor/e-contact-editor.c:1312
-#~ msgid "_Other"
-#~ msgstr "其它(_O)"
-
-# calendar/gui/e-calendar-table.c:163
-#~ msgid "Click here to add an attendee"
-#~ msgstr "按這裡新增到會者"
-
-#~ msgid "The journal entry has changed. Send an updated version?"
-#~ msgstr "日誌項目已變更。是否傳送更新後的資訊？"
-
-# calendar/gui/e-calendar-table.c:367
-#~ msgid "0%"
-#~ msgstr "0%"
-
-# calendar/gui/e-calendar-table.c:368
-#~ msgid "10%"
-#~ msgstr "10%"
-
-# calendar/gui/e-calendar-table.c:369
-#~ msgid "20%"
-#~ msgstr "20%"
-
-# calendar/gui/e-calendar-table.c:370
-#~ msgid "30%"
-#~ msgstr "30%"
-
-# calendar/gui/e-calendar-table.c:371
-#~ msgid "40%"
-#~ msgstr "40%"
-
-# calendar/gui/e-calendar-table.c:372
-#~ msgid "50%"
-#~ msgstr "50%"
-
-# calendar/gui/e-calendar-table.c:373
-#~ msgid "60%"
-#~ msgstr "60%"
-
-# calendar/gui/e-calendar-table.c:374
-#~ msgid "70%"
-#~ msgstr "70%"
-
-# calendar/gui/e-calendar-table.c:375
-#~ msgid "80%"
-#~ msgstr "80%"
-
-# calendar/gui/e-calendar-table.c:376
-#~ msgid "90%"
-#~ msgstr "90%"
-
-# calendar/gui/e-calendar-table.c:708
-# ui/evolution-task-editor-dialog.xml.h:19
-#~ msgid "_Delete this Task"
-#~ msgstr "刪除這個工作(_D)"
-
-# mail/mail-config.glade.h:61
-#, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "空閒/忙碌 資訊"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "會議結束時間(_E)："
-
-# mail/mail-config.glade.h:61
-#, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "空閒/忙碌 資訊"
-
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
-#, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr " (已完成)"
-
-# data/evolution.keys.in.h:2
-#, fuzzy
-#~ msgid "iCalendar Information"
-#~ msgstr "行事曆資訊"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#, fuzzy
-#~ msgid "iCalendar Error"
-#~ msgstr "行事曆"
-
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#, fuzzy
-#~ msgid "An unknown person"
-#~ msgstr "不明的寄件者"
-
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
-#, fuzzy
-#~ msgid "Choose an action:"
-#~ msgstr "選擇一個動作"
-
-#, fuzzy
-#~ msgid "Update"
-#~ msgstr "工作更新"
-
-#, fuzzy
-#~ msgid "Accept"
-#~ msgstr "接受"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#, fuzzy
-#~ msgid "Tentatively accept"
-#~ msgstr "暫訂"
-
-#, fuzzy
-#~ msgid "Decline"
-#~ msgstr "婉拒"
-
-# mail/mail-config.glade.h:61
-#, fuzzy
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "空閒/忙碌 資訊"
-
-# widgets/misc/e-messagebox.c:152
-#, fuzzy
-#~ msgid "Send Latest Information"
-#~ msgstr "工作資訊"
-
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> 已經發佈會議資訊。"
-
-# data/evolution.keys.in.h:2
-#~ msgid "Meeting Information"
-#~ msgstr "會議資訊"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> 請求您出席此次會議。"
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#~ msgid "Meeting Proposal"
-#~ msgstr "會議提案"
-
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> 希望加入一個既存的會議。"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#~ msgid "Meeting Update"
-#~ msgstr "會議更新"
-
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> 希望收到最新的會議資訊。"
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "會議更新請求"
-
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> 已經答覆了會議請求。"
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#~ msgid "Meeting Reply"
-#~ msgstr "會議答覆"
-
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> 已經消取會議。"
-
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
-#~ msgid "Meeting Cancellation"
-#~ msgstr "會議取消"
-
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
-
-# mail/mail-search.c:268
-#~ msgid "Bad Meeting Message"
-#~ msgstr "不正確的會議訊息"
-
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> 已經發佈了工作資訊。"
-
-# widgets/misc/e-messagebox.c:152
-#~ msgid "Task Information"
-#~ msgstr "工作資訊"
-
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> 要求您進行工作。"
-
-#~ msgid "Task Proposal"
-#~ msgstr "工作計畫"
-
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> 希望加入一項既存的工作。"
-
-#~ msgid "Task Update"
-#~ msgstr "工作更新"
-
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> 希望收到最新的工作資訊。"
-
-#~ msgid "Task Update Request"
-#~ msgstr "工作更新請求"
-
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> 已經回覆指派的工作。"
-
-# mail/message-browser.c:188
-# ui/evolution-mail.xml.h:70
-#~ msgid "Task Reply"
-#~ msgstr "工作回覆"
-
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> 已經取消工作。"
-
-#~ msgid "Task Cancellation"
-#~ msgstr "工作取消"
-
-# calendar/gui/e-itip-control.glade.h:4
-#~ msgid "Bad Task Message"
-#~ msgstr "不正確的工作訊息"
-
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> 已經發佈 空閒/忙碌 資訊。"
-
-# mail/mail-config.glade.h:61
-#~ msgid "Free/Busy Information"
-#~ msgstr "空閒/忙碌 資訊"
-
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> 請求您的 空閒/忙碌 資訊。"
-
-# addressbook/gui/widgets/e-addressbook-view.c:737
-#~ msgid "Free/Busy Request"
-#~ msgstr "空閒/忙碌 請求"
-
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> 已經答覆 空閒/忙碌 請求。"
-
-# addressbook/gui/widgets/e-addressbook-view.c:737
-#~ msgid "Free/Busy Reply"
-#~ msgstr "空閒/忙碌 回覆"
-
-# mail/mail-callbacks.c:1407
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "不正確的 空閒/忙碌 訊息"
-
-#, fuzzy
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "這個郵件只包含密件副本收件者。"
-
-# calendar/gui/e-itip-control.c:470
-#~ msgid "I couldn't remove the item from your calendar file!\n"
-#~ msgstr "無法將項目從您的行事曆檔案移除！\n"
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#, fuzzy
-#~ msgid "Status: %s"
-#~ msgstr "狀態(_S)："
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#, fuzzy
-#~ msgid "Percent Complete: %i"
-#~ msgstr "完成日期："
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#, fuzzy
-#~ msgid "URL: %s"
-#~ msgstr "網址："
-
-# addressbook/backend/ebook/e-card.c:3467
-#, fuzzy
-#~ msgid "Categories: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "類別： "
-
-# ui/evolution-addressbook.xml.h:17
-#, fuzzy
-#~ msgid "Contacts: "
-#~ msgstr "連絡人(_N)："
-
-# camel/camel-folder-search.c:670
-# camel/camel-folder-search.c:714
-#~ msgid "Invalid type in body-contains, expecting string"
-#~ msgstr "錯誤的類型於 body-contains，需要字串"
-
-# camel/camel-tcp-stream-ssl.c:348
-#~ msgid ""
-#~ "EMail: %s\n"
-#~ "Common Name: %s\n"
-#~ "Organization Unit: %s\n"
-#~ "Organization: %s\n"
-#~ "Locality: %s\n"
-#~ "State: %s\n"
-#~ "Country: %s"
-#~ msgstr ""
-#~ "電子郵件: %s\n"
-#~ "通用名稱: %s\n"
-#~ "組織單位: %s\n"
-#~ "組織: %s\n"
-#~ "地區: %s\n"
-#~ "州: %s\n"
-#~ "國家: %s"
-
-# camel/providers/nntp/camel-nntp-auth.c:45
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "請輸入 %s@%s 的 NNTP 密碼"
-
-# camel/providers/nntp/camel-nntp-auth.c:66
-#~ msgid "Server rejected username"
-#~ msgstr "伺服器拒絕的使用者名稱"
-
-# camel/providers/nntp/camel-nntp-auth.c:72
-#~ msgid "Failed to send username to server"
-#~ msgstr "傳送使用者名稱到伺服器失敗"
-
-# camel/providers/nntp/camel-nntp-auth.c:81
-#~ msgid "Server rejected username/password"
-#~ msgstr "伺服器拒絕的使用者名稱/密碼"
-
-# camel/providers/nntp/camel-nntp-folder.c:115
-#~ msgid "Message %s not found."
-#~ msgstr "找不到郵件 %s"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:45
-#~ msgid "Could not get group list from server."
-#~ msgstr "無法從伺服器取得群組清單"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:94
-# camel/providers/nntp/camel-nntp-grouplist.c:103
-#~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr "無法載入 %s： %s 的群組清單檔案"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:153
-#~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr "無法儲存 %s： %s 的群組清單檔案"
-
-# camel/providers/nntp/camel-nntp-store.c:224
-#~ msgid "Could not open directory for news server: %s"
-#~ msgstr "無法開啟新聞伺服器：%s 的目錄"
-
-# camel/providers/nntp/camel-nntp-store.c:325
-# camel/providers/nntp/camel-nntp-store.c:488
-#~ msgid "Unable to open or create .newsrc file for %s: %s"
-#~ msgstr "不能夠開啟或建立給 %s： %s 的 .newsrc 檔案"
-
-# camel/providers/pop3/camel-pop3-folder.c:155
-#~ msgid "Could not check POP server for new messages: %s"
-#~ msgstr "無法檢查於 POP 伺服器的新郵件：%s "
-
-# camel/providers/pop3/camel-pop3-folder.c:199
-#~ msgid "Could not open folder: message listing was incomplete."
-#~ msgstr "無法開啟資料夾：不完整的郵件清單。"
-
-# camel/providers/pop3/camel-pop3-folder.c:303
-#~ msgid "Could not fetch message: %s"
-#~ msgstr "不能接收郵件：%s"
-
-# camel/providers/pop3/camel-pop3-folder.c:320
-#~ msgid "Could not retrieve message from POP server %s: %s"
-#~ msgstr "無法從 POP 伺服器接收郵件 %s： %s"
-
-# camel/providers/pop3/camel-pop3-provider.c:91
-#~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
-#~ msgstr ""
-#~ "這將會使用 Kerberos 4 的驗證方法連線到 POP  伺服器。"
-
-# camel/providers/pop3/camel-pop3-store.c:199
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "無法驗證登入 KPOP 伺服器：%s"
-
-# camel/providers/pop3/camel-pop3-store.c:215
-#~ msgid "Could not connect to server: %s"
-#~ msgstr "不能夠連線到伺服器：%s"
-
-# camel/providers/pop3/camel-pop3-store.c:382
-# camel/providers/pop3/camel-pop3-store.c:419
-#~ msgid "(Unknown)"
-#~ msgstr "(不明)"
-
-# camel/providers/imap/camel-imap-command.c:232
-#, fuzzy
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "從 IMAP 伺服器傳回不當的回應： %s"
-
-# camel/providers/sendmail/camel-sendmail-transport.c:194
-#~ msgid "Could not find 'From' address in message"
-#~ msgstr "在郵件內找不到寄件者的電郵地址"
-
-# camel/providers/smtp/camel-smtp-transport.c:561
-#~ msgid "Cannot send message: sender address not defined."
-#~ msgstr "無法傳送郵件：沒有提供寄件者。"
-
-# camel/providers/smtp/camel-smtp-transport.c:898
-#~ msgid "RCPT TO response error: %s: mail not sent"
-#~ msgstr "傳回 RCPT TO 的回應錯誤：%s： 郵件無法傳送"
-
-# camel/providers/smtp/camel-smtp-transport.c:948
-#~ msgid "DATA response error: %s: mail not sent"
-#~ msgstr "傳回 DATA 的回應錯誤：%s： 郵件無法傳送"
-
-# camel/providers/smtp/camel-smtp-transport.c:1000
-#~ msgid "DATA response error: message termination: %s: mail not sent"
-#~ msgstr ""
-#~ "傳回 DATA 的回應錯誤：郵件傳送中止：%s： 郵件無法傳送"
-
-# camel/providers/smtp/camel-smtp-transport.c:1085
-#~ msgid "QUIT response error: %s: non-fatal"
-#~ msgstr "傳回 QUIT 的回應錯誤： %s：非嚴重的錯誤"
-
-#~ msgid "Enter folder URI"
-#~ msgstr "請輸入資料夾的 URI"
-
-#~ msgid "Message was received"
-#~ msgstr "已接收的郵件"
-
-#~ msgid "Message was sent"
-#~ msgstr "已傳送的郵件"
-
-#~ msgid "on or before"
-#~ msgstr "到期或之前"
-
-#~ msgid "Mail storage folder (internal)"
-#~ msgstr "郵件儲存資料夾(內部的)"
-
-# camel/providers/pop3/camel-pop3-store.c:215
-#, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "不能夠連線到伺服器：%s"
-
-# ui/evolution-mail.xml.h:109
-#~ msgid "New _Mail Message"
-#~ msgstr "新增郵件(_M)"
-
-# ui/evolution-mail.xml.h:102
-#~ msgid "Create vFolder from Search"
-#~ msgstr "自搜尋建立虛擬資料夾"
-
-# mail/folder-browser.c:870
-#~ msgid "Filter on Mailing List"
-#~ msgstr "郵件清單的規則"
-
-# mail/local-config.glade.h:2
-#~ msgid "Mailbox Format"
-#~ msgstr "信箱格式"
-
-# mail/mail-accounts.c:121
-# mail/mail-accounts.c:165
-#~ msgid " (default)"
-#~ msgstr "(預設)"
-
-# mail/mail-autofilter.c:213
-#~ msgid "Subject is %s"
-#~ msgstr "主旨是 %s"
-
-# mail/mail-autofilter.c:229
-#~ msgid "Mail from %s"
-#~ msgstr "郵件來自 %s "
-
-# mail/mail-autofilter.c:285
-#~ msgid "%s mailing list"
-#~ msgstr "%s 郵件列表"
-
-#, fuzzy
-#~ msgid "This message contains invalid recipients:"
-#~ msgstr "這個郵件只包含密件副本收件者。"
-
-# mail/local-config.glade.h:8
-#~ msgid "%s: Inbox"
-#~ msgstr "%s: Inbox"
-
-# mail/mail-config.glade.h:3
-#~ msgid "Account"
-#~ msgstr "帳號"
-
-#, fuzzy
-#~ msgid "Always _encrypt to myself when sending encrypted mail"
-#~ msgstr "當傳送加密郵件時永遠自我加密"
-
-# mail/mail-config.glade.h:14
-#~ msgid "Composer"
-#~ msgstr "編輯器"
-
-# mail/mail-config.glade.h:22
-#~ msgid "Default Forward style is: "
-#~ msgstr "預設的轉寄樣式為："
-
-# widgets/misc/e-filter-bar.h:96
-# widgets/misc/e-filter-bar.h:103
-#~ msgid "Edit..."
-#~ msgstr "編輯..."
-
-# mail/mail-config.glade.h:74
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML 簽名檔："
-
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
-#~ msgid "Select Filter Log file..."
-#~ msgstr "選擇過濾器記錄檔..."
-
-# mail/mail-config.glade.h:29
-#~ msgid "_Email Address:"
-#~ msgstr "電子郵件地址(_E)："
-
-#~ msgid "_Log filter actions to:"
-#~ msgstr "記錄過濾器動作至(_L)："
-
-# addressbook/gui/widgets/e-addressbook-view.c:708
-#~ msgid "_Organization:"
-#~ msgstr "團體(_O)："
-
-# addressbook/gui/component/addressbook-config.c:352
-# mail/mail-config.glade.h:60
-#~ msgid "_Remember this password"
-#~ msgstr "記下這個密碼(_R)"
-
-# mail/mail-config.glade.h:64
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "預設使用 HTML 格式傳送郵件(_S)"
-
-# mail/mail-config.glade.h:72
-#, fuzzy
-#~ msgid "_Server Type: "
-#~ msgstr "伺服器類別："
-
-# mail/mail-config.glade.h:74
-#~ msgid "_Signature file:"
-#~ msgstr "簽名檔(_S)："
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-# mail/mail-config.glade.h:88
-#~ msgid "seconds."
-#~ msgstr "秒"
-
-# mail/mail-format.c:1153
-#, fuzzy
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr "這封是加入了數位簽名的郵件，已証實無訛"
-
-# mail/mail-format.c:1153
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "這封是加入了數位簽名的郵件，已証實無訛"
-
-# mail/mail-format.c:1161
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#~ msgid "Evolution component for the executive summary."
-#~ msgstr "用作處理摘要的 Evolution 元件。"
-
-# mail/component-factory.c:337
-#, fuzzy
-#~ msgid "Cannot initialize Evolution's Summary component."
-#~ msgstr "不能初始化 Evolution 的 mail 元件。"
-
-#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
-#~ msgstr "<dd><b>無法連繫天氣伺服器</b></dd>"
-
-#~ msgid "蚌"
-#~ msgstr "蚌"
-
-#~ msgid "蚓"
-#~ msgstr "蚓"
-
-#~ msgid "kph"
-#~ msgstr "kph"
-
-# mail/mail-ops.c:914
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-# importers/netscape-importer.c:795
-# mail/mail-callbacks.c:1359
-#~ msgid "kilometers"
-#~ msgstr "公里"
-
-# shell/e-shell-importer.c:601
-#~ msgid "All _folders:"
-#~ msgstr "全部資料夾(_A)："
-
-# mail/message-list.c:679
-#~ msgid "All news _feeds:"
-#~ msgstr "所有新聞發送伺服器(_F)："
-
-# ui/evolution.xml.h:14
-#~ msgid "_Display folders:"
-#~ msgstr "顯示資料夾(_D)："
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#~ msgid "_Display stations:"
-#~ msgstr "顯示站臺(_D)："
-
-# calendar/gui/calendar-summary.c:622
-# mail/mail-config.glade.h:24
-#~ msgid "_Displayed feeds:"
-#~ msgstr "顯示新聞發送伺服器(_D)："
-
-# shell/e-shell-view-menu.c:230
-#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-#~ msgstr "版權 1999, 2000, 2001 Ximian, Inc."
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法刪除資料夾：\n"
-#~ "%s"
-
-# shell/e-storage.c:178
-#~ msgid "(No name)"
-#~ msgstr "(沒有名稱)"
-
-# mail/mail-config.glade.h:45
-#~ msgid "New List"
-#~ msgstr "新增清單"
-
-#~ msgid "Configure the calendar's settings"
-#~ msgstr "組態行事曆的設定值"
-
-# ui/evolution-calendar.xml.h:4
-#~ msgid "Create a New All Day _Event"
-#~ msgstr "新增一個全天要事(_E)"
-
-# ui/evolution-tasks.xml.h:2
-#~ msgid "Create a New _Task"
-#~ msgstr "建立一個新的工作(_T)"
-
-# ui/evolution-calendar.xml.h:5
-#~ msgid "Create a _New Appointment"
-#~ msgstr "新增一個約會(_N)"
-
-#~ msgid "Create an event for the whole day"
-#~ msgstr "建立一個整天的事件"
-
-# ui/evolution-calendar.xml.h:37
-#~ msgid "_Appointment..."
-#~ msgstr "約會(_A)..."
-
-# ui/evolution-mail.xml.h:110
-#~ msgid "_Calendar Settings..."
-#~ msgstr "行事曆設定(_C)..."
-
-# ui/evolution-tasks.xml.h:9
-#~ msgid "_Task..."
-#~ msgstr "工作(_T)..."
-
-# ui/evolution-mail.xml.h:19
-#~ msgid "Create or edit mail accounts and other preferences"
-#~ msgstr "建立或編輯郵件帳號及其它設定"
-
-# ui/evolution-mail.xml.h:110
-#~ msgid "_Mail Settings..."
-#~ msgstr "郵件設定(_M)..."
-
-# ui/evolution-mail.xml.h:35
-#~ msgid "Forward _Attached"
-#~ msgstr "轉寄附加檔案(_A)"
-
-# ui/evolution-mail.xml.h:37
-#~ msgid "Forward _Quoted"
-#~ msgstr "轉寄引文(_Q)"
-
-# ui/evolution-mail.xml.h:100
-#~ msgid "_Apply Filters"
-#~ msgstr "套用過濾器規則(_A)"
-
-#~ msgid "Configure the task view's settings"
-#~ msgstr "組態工作檢視的設定值"
-
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#~ msgid "Tasks Settings..."
-#~ msgstr "工作設定..."
-
-# ui/evolution.xml.h:4
-#~ msgid "Change the settings for the summary"
-#~ msgstr "變更摘要的設定值"
-
-# ui/evolution-mail.xml.h:110
-#~ msgid "_Summary Settings..."
-#~ msgstr "摘要設定值(_S)..."
-
-# widgets/misc/e-filter-bar.h:95
-# widgets/misc/e-filter-bar.h:102
-#~ msgid "Show All"
-#~ msgstr "全部顯示"
-
-# widgets/misc/e-search-bar.c:155
-#~ msgid "Sear_ch"
-#~ msgstr "尋找(_C)"
-
 # camel/camel-smime-context.c:194
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "請輸入您的的電子郵件地址與密碼以存取 %s"
 
+# mail/mail-config.glade.h:10
+#~ msgid "LDAP Authentication"
+#~ msgstr "LDAP 驗證"
+
 # addressbook/gui/component/addressbook-config.c:165
 # camel/camel-sasl-plain.c:32
 # camel/providers/imap/camel-imap-provider.c:80
@@ -33090,12 +17232,16 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Snooze"
 #~ msgstr "延期"
 
+# calendar/gui/alarm-notify/alarm-queue.c:890
+# calendar/gui/alarm-notify/alarm-queue.c:945
+#~ msgid "Ok"
+#~ msgstr "確定"
+
 # calendar/gui/alarm-notify/notify-main.c:56
 #~ msgid ""
-#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-#~ "know."
-#~ msgstr ""
-#~ "您應該會想知道的...。  這是 %s。  現在的 Unix 時間是 %ld。"
+#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
+#~ "to know."
+#~ msgstr "您應該會想知道的...。  這是 %s。  現在的 Unix 時間是 %ld。"
 
 # addressbook/gui/widgets/alphabet.glade.h:5
 #~ msgid "%d"
@@ -33227,6 +17373,10 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Elm mail"
 #~ msgstr "Elm 郵件"
 
+# importers/pine-importer.c:723
+#~ msgid "Pine mail"
+#~ msgstr "Pine 郵件"
+
 # mail/mail-callbacks.c:756
 #~ msgid "Forwarded message:\n"
 #~ msgstr "已轉寄的郵件：\n"
@@ -33278,14 +17428,21 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Synchronizing '%s'"
 #~ msgstr "同步處理 '%s'"
 
+# mail/mail-tools.c:145
+#~ msgid "Couldn't create temporary mbox `%s': %s"
+#~ msgstr "無法建立暫存 mbox `%s'：%s"
+
 # mail/component-factory.c:337
 #~ msgid "Cannot initialize Evolution's Executive Summary component."
 #~ msgstr "不能初始化 Evolution 的執行摘要元件。"
 
 #~ msgid "KBOS:ZSAM:EGAA"
 #~ msgstr ""
-#~ "RCFS:RCTP:RCKU:RCQS:RCBS:RCLM:RCNO:RCFN:RCKW:RCPO:RCYU:RCMS:RCAY:RCKH:RCQC:RC"
-#~ "FG:RCUK:RCSQ:RCDC:RCSS:RCLG:RCNN:RCGM:RCMQ:VHHH:WSSS"
+#~ "RCFS:RCTP:RCKU:RCQS:RCBS:RCLM:RCNO:RCFN:RCKW:RCPO:RCYU:RCMS:RCAY:RCKH:"
+#~ "RCQC:RCFG:RCUK:RCSQ:RCDC:RCSS:RCLG:RCNN:RCGM:RCMQ:VHHH:WSSS"
+
+#~ msgid "There was an error downloading news feed"
+#~ msgstr "下載新聞發送伺服器時發生錯誤"
 
 #~ msgid "Smoke w/ thunders"
 #~ msgstr "帶雷的煙"
@@ -33297,6 +17454,9 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Units: "
 #~ msgstr "單位：  "
 
+#~ msgid "_imperial"
+#~ msgstr "英制(_I)"
+
 #~ msgid "m_etric"
 #~ msgstr "公制(_E)"
 
@@ -33316,6 +17476,12 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Cannot initialize the Evolution Mailer Wizard interface"
 #~ msgstr "無法初始化 Evolution Mailer 精靈界面"
 
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#~ msgid "Ximian Evolution"
+#~ msgstr "Ximian Evolution"
+
 # shell/e-shell-view-menu.c:232
 #~ msgid ""
 #~ "Ximian Evolution is a suite of groupware applications\n"
@@ -33406,6 +17572,12 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "F_ormat"
 #~ msgstr "格式(_O)"
 
+# ui/evolution-event-editor.xml.h:56
+# ui/evolution-message-composer.xml.h:44
+# ui/evolution-task-editor-dialog.xml.h:68
+#~ msgid "_Debug"
+#~ msgstr "除錯(_D)"
+
 # ui/evolution.xml.h:54
 #~ msgid "_Import File..."
 #~ msgstr "匯入檔案(_I)..."