aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Jian <lark@src.gnome.org>2001-10-30 20:33:30 +0800
committerWang Jian <lark@src.gnome.org>2001-10-30 20:33:30 +0800
commit99ece02b9d27da540b5e66dcb808695ee182bca8 (patch)
tree916f45c85da29498fd48a8efb81c981be7ad4637
parent5677e9e40bca5000e2b27df6f8a9c953115676a0 (diff)
downloadgsoc2013-evolution-99ece02b9d27da540b5e66dcb808695ee182bca8.tar.gz
gsoc2013-evolution-99ece02b9d27da540b5e66dcb808695ee182bca8.tar.zst
gsoc2013-evolution-99ece02b9d27da540b5e66dcb808695ee182bca8.zip
*** empty log message ***
svn path=/trunk/; revision=14452
-rw-r--r--po/ChangeLog5
-rw-r--r--po/zh_CN.po4198
2 files changed, 2097 insertions, 2106 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index a869d3fba9..bd88d5f6c2 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-30 Wang Jian <lark@linux.net.cn>
+
+ * zh_CN.po: Updated Simplified Chinese translation by
+ Wang Li <charlesw1234@163.com>.
+
2001-10-29 Abel Cheung <maddog@linux.org.hk>
* zh_TW.po: Strip extra \r at end of each line, so that
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 104b7069b3..e7611a74b4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,14 +4,24 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.13\n"
-"POT-Creation-Date: 2001-10-21 16:17+0800\n"
-"PO-Revision-Date: 2001-10-21 14:39+0800\n"
+"POT-Creation-Date: 2001-10-28 08:09+0800\n"
+"PO-Revision-Date: 2001-10-28 10:05+0800\n"
"Last-Translator: Wang Li <charlesw1234@163.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=gb2312\n"
"Content-Transfer-Encoding: 8bit\n"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import LDIF files into Evolution."
+msgstr "将 VCard 文件导入 Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports LDIF files into Evolution."
+msgstr "将 VCard 文件导入 Evolution"
+
#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
msgid "Factory to import VCard files into Evolution."
msgstr ""
@@ -21,7 +31,7 @@ msgid "Imports VCard files into Evolution."
msgstr "将 VCard 文件导入 Evolution"
#: addressbook/backend/ebook/e-card-simple.c:59
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:850
msgid "File As"
msgstr ""
@@ -30,12 +40,12 @@ msgid "Name"
msgstr "名称"
#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:852
msgid "Email"
msgstr "电子邮件"
#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
msgid "Primary"
msgstr ""
@@ -45,15 +55,15 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:63
#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1587
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/gui/widgets/e-addressbook-view.c:884
msgid "Assistant"
msgstr "助手"
#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1588
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/e-contact-editor.c:1590
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
msgid "Business"
msgstr "商业"
@@ -63,12 +73,12 @@ msgid "Bus"
msgstr "商业"
#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/gui/contact-editor/e-contact-editor.c:1593
msgid "Callback"
msgstr "反馈"
#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/gui/contact-editor/e-contact-editor.c:1595
msgid "Company"
msgstr "公司"
@@ -78,13 +88,13 @@ msgstr "公司"
#: addressbook/backend/ebook/e-card-simple.c:67
#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
msgid "Home"
msgstr "家庭"
#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:859
msgid "Organization"
msgstr "组织"
@@ -93,18 +103,18 @@ msgid "Org"
msgstr "组织"
#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/gui/contact-editor/e-contact-editor.c:1600
msgid "Mobile"
msgstr "手机"
#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/gui/contact-editor/e-contact-editor.c:1594
msgid "Car"
msgstr "汽车"
#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1590
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/contact-editor/e-contact-editor.c:1592
+#: addressbook/gui/widgets/e-addressbook-view.c:864
msgid "Business Fax"
msgstr "商业传真"
@@ -113,13 +123,13 @@ msgid "Bus Fax"
msgstr "商业传真"
#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/gui/widgets/e-addressbook-view.c:865
msgid "Home Fax"
msgstr "家庭传真"
#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1589
+#: addressbook/gui/contact-editor/e-contact-editor.c:1591
msgid "Business 2"
msgstr "商业 2"
@@ -128,69 +138,69 @@ msgid "Bus 2"
msgstr "商业 2"
#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/gui/contact-editor/e-contact-editor.c:1597
msgid "Home 2"
msgstr "家庭 2"
#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/gui/widgets/e-addressbook-view.c:868
msgid "ISDN"
msgstr "ISDN"
#: addressbook/backend/ebook/e-card-simple.c:78
#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
-#: mail/mail-config.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor.c:1601
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: mail/mail-config.glade.h:49
msgid "Other"
msgstr "其他"
#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/gui/widgets/e-addressbook-view.c:870
msgid "Other Fax"
msgstr "其他传真"
#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
+#: addressbook/gui/widgets/e-addressbook-view.c:871
msgid "Pager"
msgstr "传呼机"
#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/widgets/e-addressbook-view.c:872
msgid "Radio"
msgstr "收音机"
#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/contact-editor/e-contact-editor.c:1606
+#: addressbook/gui/widgets/e-addressbook-view.c:873
msgid "Telex"
msgstr "电传"
#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:874
msgid "TTY"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/component/e-address-popup.c:475
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
+#: addressbook/gui/widgets/e-addressbook-view.c:876
msgid "Email 2"
msgstr "电子邮件 2"
#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/component/e-address-popup.c:485
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
+#: addressbook/gui/widgets/e-addressbook-view.c:877
msgid "Email 3"
msgstr "电子邮件 3"
#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:878
msgid "Web Site"
msgstr "网站"
@@ -199,7 +209,7 @@ msgid "Url"
msgstr "Url"
#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:879
msgid "Department"
msgstr "部门"
@@ -208,7 +218,7 @@ msgid "Dep"
msgstr "部门"
#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:880
msgid "Office"
msgstr "办公室"
@@ -217,12 +227,12 @@ msgid "Off"
msgstr "办公室"
#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:881
msgid "Title"
msgstr "头衔"
#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: addressbook/gui/widgets/e-addressbook-view.c:882
msgid "Profession"
msgstr "职业"
@@ -231,7 +241,7 @@ msgid "Prof"
msgstr "职业"
#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:911
+#: addressbook/gui/widgets/e-addressbook-view.c:883
msgid "Manager"
msgstr "经理"
@@ -244,7 +254,7 @@ msgid "Ass"
msgstr "助手"
#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:885
msgid "Nickname"
msgstr "绰号"
@@ -253,12 +263,12 @@ msgid "Nick"
msgstr "绰号"
#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:886
msgid "Spouse"
msgstr "配偶"
#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: addressbook/gui/widgets/e-addressbook-view.c:887
msgid "Note"
msgstr ""
@@ -271,7 +281,7 @@ msgid "CALUri"
msgstr "日历 URI"
#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:888
msgid "Free-busy URL"
msgstr "忙闲 URL"
@@ -567,11 +577,13 @@ 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:33
-#: addressbook/conduit/address-conduit.c:1433
-#: addressbook/gui/component/addressbook-factory.c:49
-#: calendar/conduits/calendar/calendar-conduit.c:1384
-#: calendar/conduits/todo/todo-conduit.c:1064
-#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1509
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1424
+#: calendar/conduits/todo/todo-conduit.c:1126
+#: 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"
msgstr "无法初始化 Bonobo"
@@ -621,28 +633,28 @@ msgstr "正在接收 LDAP 的搜索结果..."
msgid "Restarting search."
msgstr "开始搜索,"
-#: addressbook/conduit/address-conduit.c:241
+#: addressbook/conduit/address-conduit.c:284
msgid "Cursor could not be loaded\n"
msgstr "无法装入光标\n"
-#: addressbook/conduit/address-conduit.c:254
+#: addressbook/conduit/address-conduit.c:297
msgid "EBook not loaded\n"
msgstr "没有装入 EBook\n"
-#: addressbook/conduit/address-conduit.c:997
-#: calendar/conduits/calendar/calendar-conduit.c:940
-#: calendar/conduits/todo/todo-conduit.c:639
+#: addressbook/conduit/address-conduit.c:1066
+#: calendar/conduits/calendar/calendar-conduit.c:966
+#: calendar/conduits/todo/todo-conduit.c:691
msgid "Could not start wombat server"
msgstr "无法启动 wombat 服务器"
-#: addressbook/conduit/address-conduit.c:998
-#: calendar/conduits/calendar/calendar-conduit.c:941
-#: calendar/conduits/todo/todo-conduit.c:640
+#: addressbook/conduit/address-conduit.c:1067
+#: calendar/conduits/calendar/calendar-conduit.c:967
+#: calendar/conduits/todo/todo-conduit.c:692
msgid "Could not start wombat"
msgstr "无法启动 wombat"
-#: addressbook/conduit/address-conduit.c:1028
-#: addressbook/conduit/address-conduit.c:1031
+#: addressbook/conduit/address-conduit.c:1097
+#: addressbook/conduit/address-conduit.c:1100
msgid "Could not read pilot's Address application block"
msgstr "无法读入操作员的地址应用程序块"
@@ -686,40 +698,40 @@ msgstr ""
msgid "Factory for the sample Addressbook control"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:289
-#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:71
+#: calendar/gui/dialogs/comp-editor-util.c:300
+#: calendar/gui/dialogs/comp-editor-util.c:356 shell/e-shortcuts.c:1061
msgid "Contacts"
msgstr "联系人"
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:71
msgid "Folder containing contact information"
msgstr "含有联系人信息的文件夹"
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
msgid "LDAP Server"
msgstr "LDAP 服务器"
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:73
msgid "LDAP server containing contact information"
msgstr "含有联系人信息的 LDAP 服务器"
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
#: ui/evolution-addressbook.xml.h:11
msgid "New Contact"
msgstr "新联系人"
-#: addressbook/gui/component/addressbook-component.c:420
+#: addressbook/gui/component/addressbook-component.c:526
msgid "New _Contact"
-msgstr "(_c)新联系人"
+msgstr "新联系人(C)"
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
msgid "New Contact List"
msgstr "新联系人列表"
-#: addressbook/gui/component/addressbook-component.c:421
+#: addressbook/gui/component/addressbook-component.c:527
msgid "New Contact _List"
-msgstr "(_l)新联系人列表"
+msgstr "新联系人列表(L)"
#: addressbook/gui/component/addressbook-config.c:186
msgid "Edit Addressbook"
@@ -750,13 +762,13 @@ msgid "Base"
msgstr "基础"
#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:179
+#: calendar/gui/dialogs/task-editor.c:178
msgid "Basic"
msgstr "基本的"
#: addressbook/gui/component/addressbook-config.glade.h:8
msgid "De_lete"
-msgstr "(_l)删除"
+msgstr "删除(L)"
#: addressbook/gui/component/addressbook-config.glade.h:9
msgid "Email Address:"
@@ -777,7 +789,7 @@ msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:13
msgid "Search s_cope: "
-msgstr "(_c)搜索范围:"
+msgstr "搜索范围(C):"
#: addressbook/gui/component/addressbook-config.glade.h:14
msgid "Server Name"
@@ -826,18 +838,18 @@ msgstr "这一名称将用于识别您的账号。它只用于显示。"
#: addressbook/gui/component/addressbook-config.glade.h:23
msgid "_Account name:"
-msgstr "(_a)账号名:"
+msgstr "账号名(A):"
#: 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:91 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
msgid "_Add"
-msgstr "(_a)添加"
+msgstr "添加(A)"
#: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
+#: 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
@@ -858,11 +870,16 @@ msgstr "(_p)端口:"
msgid "_Server name:"
msgstr "(_s)服务器名:"
-#: addressbook/gui/component/addressbook.c:464
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:105
+msgid "Could not initialize gnome-vfs"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:465
msgid "Unable to open addressbook"
msgstr "无法打开地址本"
-#: addressbook/gui/component/addressbook.c:473
+#: addressbook/gui/component/addressbook.c:474
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
@@ -872,7 +889,7 @@ msgstr ""
"您输入了错误的 URI,或是是因为\n"
" LDAP 服务器已经关闭"
-#: addressbook/gui/component/addressbook.c:478
+#: addressbook/gui/component/addressbook.c:479
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -884,7 +901,7 @@ msgstr ""
"您必须在从以下连接处获取了程序的\n"
" CVS 源代码之后编译程序。\n"
-#: addressbook/gui/component/addressbook.c:486
+#: addressbook/gui/component/addressbook.c:487
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
@@ -892,89 +909,89 @@ msgstr ""
"我们无法打开该地址本。 请检查路径是否存在\n"
"以及您是否有足够的权限访问它。"
-#: addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/addressbook.c:620
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "为 %s (用户 %s)输入口令"
-#: addressbook/gui/component/addressbook.c:724
-#: calendar/gui/cal-search-bar.c:55
+#: addressbook/gui/component/addressbook.c:757
+#: calendar/gui/cal-search-bar.c:54
msgid "Any field contains"
msgstr "任何域含有"
-#: addressbook/gui/component/addressbook.c:725
+#: addressbook/gui/component/addressbook.c:758
msgid "Name contains"
msgstr "名称含有"
-#: addressbook/gui/component/addressbook.c:726
+#: addressbook/gui/component/addressbook.c:759
msgid "Email contains"
msgstr "电子邮件含有"
-#: addressbook/gui/component/addressbook.c:727
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:760
+#: calendar/gui/cal-search-bar.c:58
msgid "Category is"
msgstr ""
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:728 widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:761 widgets/misc/e-filter-bar.h:104
msgid "Advanced..."
msgstr "高级..."
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:959
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1002
+#: calendar/gui/cal-search-bar.c:411
msgid "Any Category"
msgstr ""
-#: addressbook/gui/component/addressbook.c:999
+#: addressbook/gui/component/addressbook.c:1042
msgid "The URI that the Folder Browser will display"
msgstr "文件夹浏览器将显示的 URI"
-#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/component/e-address-popup.c:465
#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
+#: addressbook/gui/contact-editor/e-contact-editor.c:1631
msgid "Primary Email"
msgstr "常用电子邮件"
-#: addressbook/gui/component/e-address-popup.c:579
+#: addressbook/gui/component/e-address-popup.c:578
msgid "Select an Action"
msgstr "选择一项活动"
-#: addressbook/gui/component/e-address-popup.c:585
+#: addressbook/gui/component/e-address-popup.c:584
#, c-format
msgid "Create a new contact \"%s\""
msgstr "创建新联系人“%s”"
-#: addressbook/gui/component/e-address-popup.c:597
+#: addressbook/gui/component/e-address-popup.c:596
#, c-format
msgid "Add address to existing contact \"%s\""
msgstr "为现有的联系人“%s”添加地址"
-#: addressbook/gui/component/e-address-popup.c:860
+#: addressbook/gui/component/e-address-popup.c:882
msgid "Querying Addressbook..."
msgstr "查询地址本..."
-#: addressbook/gui/component/e-address-popup.c:935
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:307
+#: addressbook/gui/component/e-address-popup.c:958
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
msgid "Edit Contact Info"
msgstr "编辑联系人信息"
-#: addressbook/gui/component/e-address-popup.c:964
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:486
+#: addressbook/gui/component/e-address-popup.c:988
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
msgid "Add to Contacts"
msgstr "添加到联系人"
-#: addressbook/gui/component/e-address-popup.c:1007
+#: addressbook/gui/component/e-address-popup.c:1031
msgid "Merge E-Mail Address"
msgstr "合并电子邮件地址"
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
msgid "Disable Queries"
msgstr "关闭查询"
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/component/e-address-widget.c:364
msgid "Enable Queries (Dangerous!)"
msgstr "开启查询(危险!)"
@@ -984,41 +1001,41 @@ msgstr "Evolution 的地址本名称选择界面。"
#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
+msgstr "地址本名称选择界面车间"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:766
+#: addressbook/gui/component/select-names/e-select-names-popup.c:163
+#: addressbook/gui/component/select-names/e-select-names.c:765
#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:180
msgid "Remove"
msgstr "删除"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:178
msgid "Remove All"
msgstr "全部删除"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:203
+#: addressbook/gui/component/select-names/e-select-names-popup.c:202
msgid "Send HTML Mail?"
msgstr "发送 HTML 邮件?"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#: addressbook/gui/component/select-names/e-select-names-popup.c:405
msgid "Edit Contact List"
msgstr "编辑联系人列表"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:423
msgid "Unnamed Contact List"
msgstr "未命名的联系人列表"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#: addressbook/gui/component/select-names/e-select-names-popup.c:440
#, c-format
msgid "(%d not shown)"
msgstr "(%d 未显示)"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:507
+#: addressbook/gui/component/select-names/e-select-names-popup.c:506
msgid "Unnamed Contact"
msgstr "未命名的联系人"
-#: addressbook/gui/component/select-names/e-select-names.c:524
+#: addressbook/gui/component/select-names/e-select-names.c:523
msgid ""
"Evolution is unable to get the addressbook local storage.\n"
"This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1027,8 +1044,14 @@ msgid ""
"detailed description of the circumstances under which this error\n"
"occurred. Thank you."
msgstr ""
+"Evolution 无法获取本地地址本空间。\n"
+"这可能是由 evolution 的地址本组件崩溃导致的。\n"
+"为了帮助我们更好地理解并最终解决该问题,\n"
+"请把对产生该错误环境的详细情况作为电子邮件发送给\n"
+" Jon Trowbridge <trow@ximian.com>。\n"
+"谢谢。"
-#: addressbook/gui/component/select-names/e-select-names.c:602
+#: addressbook/gui/component/select-names/e-select-names.c:601
msgid "Select Contacts from Addressbook"
msgstr "从地址本中选择联系人"
@@ -1088,12 +1111,12 @@ msgstr ""
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1236
+#: addressbook/gui/contact-editor/e-contact-editor.c:1238
msgid "Contact Editor"
msgstr "联系人编辑器"
#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:183
msgid "Details"
msgstr "细节"
@@ -1160,8 +1183,8 @@ msgstr "(_c)联系人..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:25
#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:698 filter/filter.glade.h:8
-#: mail/folder-browser.c:1451 mail/mail-config.glade.h:95
+#: calendar/gui/dialogs/meeting-page.c:701 filter/filter.glade.h:8
+#: mail/folder-browser.c:1465 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"
@@ -1223,46 +1246,46 @@ msgstr "(_w)网页地址:"
msgid "Delete Contact?"
msgstr "删除联系人?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:754
+#: addressbook/gui/contact-editor/e-contact-editor.c:753
msgid "This contact belongs to these categories:"
msgstr "该联系人属于这些范畴:"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/gui/contact-editor/e-contact-editor.c:1607
msgid "TTY/TDD"
msgstr "TTY/TDD"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2227
+#: addressbook/gui/contact-editor/e-contact-editor.c:2229
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "无法为域找到构件:‘%s’"
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
msgid "Contact Quick-Add"
msgstr "快速添加联系人"
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
msgid "Edit Full"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/widgets/e-addressbook-view.c:851
msgid "Full Name"
msgstr "全名"
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
msgid "E-mail"
msgstr "电子邮件"
#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:92
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
msgid "card.vcf"
msgstr "card.vcf"
-#: addressbook/gui/contact-editor/e-contact-save-as.c:156
+#: addressbook/gui/contact-editor/e-contact-save-as.c:170
msgid "list"
msgstr "列表"
-#: addressbook/gui/contact-editor/e-contact-save-as.c:188
+#: addressbook/gui/contact-editor/e-contact-save-as.c:201
#, c-format
msgid ""
"%s already exists\n"
@@ -2313,23 +2336,23 @@ msgstr ""
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
msgid "Type an email address or drag a contact into the list below:"
-msgstr ""
+msgstr "输入电子邮件地址或者把联系人拖放到下面的列表:"
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
msgid "_Hide addresses when sending mail to this list"
-msgstr ""
+msgstr "在往该列表发送邮件时隐藏地址(H)"
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
msgid "_Remove"
-msgstr ""
+msgstr "删除(R)"
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
msgid "contact-list-editor"
msgstr "联系人列表编辑器"
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:229
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
@@ -2340,7 +2363,7 @@ msgstr "强制添加"
#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
msgid "Duplicate Contact Detected"
-msgstr ""
+msgstr "复制检测到的联系人"
#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
msgid "New Contact:"
@@ -2378,13 +2401,13 @@ msgstr ""
"改变后的电子邮件或姓名已经在本文件夹中存在了。\n"
"您一定要添加吗?"
-#: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: widgets/misc/e-filter-bar.c:234
msgid "Advanced Search"
msgstr "高级搜索"
-#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/mail-search.c:263
msgid "Search"
msgstr "搜索"
@@ -2403,9 +2426,9 @@ msgstr "%d 张卡片"
#: 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:700
-#: addressbook/gui/widgets/e-addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1434
+#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:1406
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "保存为 VCard"
@@ -2416,18 +2439,18 @@ msgid "Open"
msgstr "打开"
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:763
+#: addressbook/gui/widgets/e-addressbook-view.c:735
#: 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:764
+#: addressbook/gui/widgets/e-addressbook-view.c:736
msgid "Send Message to Contact"
msgstr "给联系人发邮件"
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:765
+#: addressbook/gui/widgets/e-addressbook-view.c:737
#: 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
@@ -2435,13 +2458,13 @@ msgid "Print"
msgstr "打印"
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:767
+#: addressbook/gui/widgets/e-addressbook-view.c:739
msgid "Print Envelope"
msgstr "打印信封"
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:769 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:741 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 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
@@ -2449,80 +2472,79 @@ msgid "Delete"
msgstr "删除"
#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
-#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-addressbook-util.c:67
+#: addressbook/gui/widgets/e-minicard.c:475
msgid "Error modifying card"
msgstr "修改卡片错误"
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: shell/evolution-shell-component.c:944
+#: addressbook/gui/widgets/e-addressbook-util.c:33
+#: shell/evolution-shell-component.c:971
msgid "Success"
msgstr "成功"
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1785
-#: shell/e-storage.c:529 shell/evolution-shell-component.c:981
+#: 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:1008
msgid "Unknown error"
msgstr "未知的错误"
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:35
msgid "Repository offline"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:517
-#: shell/evolution-shell-component.c:972
+#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:999
msgid "Permission denied"
msgstr "没有权限"
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
msgid "Card not found"
msgstr "找不到卡片"
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
msgid "Card ID already exists"
msgstr "卡片 ID 已经存在"
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:39
msgid "Protocol not supported"
msgstr "不支持的协议"
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1270
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:608
-#: camel/camel-service.c:644
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: calendar/gui/calendar-model.c:755 calendar/gui/calendar-model.c:1200
+#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:607
+#: camel/camel-service.c:643
msgid "Cancelled"
msgstr "已经取消"
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
msgid "Other error"
msgstr "其它错误"
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:58
msgid "Error adding list"
msgstr "添加列表错误"
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:58
msgid "Error adding card"
msgstr "添加卡片错误"
-#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-addressbook-util.c:67
msgid "Error modifying list"
msgstr "修改列表错误"
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
msgid "Error removing list"
msgstr "删除列表错误"
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1307
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
msgid "Error removing card"
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:407
+#: addressbook/gui/widgets/e-addressbook-view.c:379
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 ""
@@ -2530,67 +2552,67 @@ msgstr ""
#. 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:412
+#: addressbook/gui/widgets/e-addressbook-view.c:384
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 ""
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/gui/widgets/e-addressbook-view.c:849
msgid "* Click here to add a contact *"
msgstr "* 点击此处以便添加联系人 *"
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:853
msgid "Primary Phone"
msgstr "主要电话"
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:854
msgid "Assistant Phone"
msgstr "辅助电话"
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:855
msgid "Business Phone"
msgstr "商务电话"
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:856
msgid "Callback Phone"
msgstr "反馈电话"
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:857
msgid "Company Phone"
msgstr "公司电话"
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:858
msgid "Home Phone"
msgstr "家庭电话"
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:860
msgid "Business Address"
msgstr "商务地址"
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:861
msgid "Home Address"
msgstr "家庭地址"
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:862
msgid "Mobile Phone"
msgstr "手机"
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:863
msgid "Car Phone"
msgstr "汽车电话"
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:866
msgid "Business Phone 2"
msgstr "商务电话 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:867
msgid "Home Phone 2"
msgstr "家庭电话 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:869
msgid "Other Phone"
msgstr "其他电话"
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:875
msgid "Other Address"
msgstr "其他地址"
@@ -2607,7 +2629,7 @@ msgstr "以及另外一张卡片。"
msgid "Save in addressbook"
msgstr "保存在地址本中"
-#: addressbook/gui/widgets/e-minicard-view.c:151
+#: addressbook/gui/widgets/e-minicard-view.c:150
msgid ""
"\n"
"\n"
@@ -2615,10 +2637,15 @@ msgid ""
"\n"
"Double-click here to create a new Contact."
msgstr ""
+"\n"
+"\n"
+"本视图中没有可显示的项\n"
+"\n"
+"在这里双击以创建新联系人。"
#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
msgid "Card View"
-msgstr ""
+msgstr "卡片视图"
#: addressbook/printing/e-contact-print.glade.h:1
msgid "10 pt. Tahoma"
@@ -2646,7 +2673,7 @@ msgstr ""
#: addressbook/printing/e-contact-print.glade.h:7
msgid "F_ont..."
-msgstr ""
+msgstr "字体(O)..."
#: addressbook/printing/e-contact-print.glade.h:8
msgid "Fonts"
@@ -2690,11 +2717,11 @@ msgstr ""
#: addressbook/printing/e-contact-print.glade.h:18
msgid "Landscape"
-msgstr ""
+msgstr "横向"
#: addressbook/printing/e-contact-print.glade.h:19
msgid "Left:"
-msgstr ""
+msgstr "左:"
#: addressbook/printing/e-contact-print.glade.h:20
msgid "Letter tabs on side"
@@ -2702,55 +2729,55 @@ msgstr ""
#: addressbook/printing/e-contact-print.glade.h:21
msgid "Margins"
-msgstr ""
+msgstr "边界"
#: addressbook/printing/e-contact-print.glade.h:22
msgid "Number of columns:"
-msgstr ""
+msgstr "列数:"
#: addressbook/printing/e-contact-print.glade.h:23
msgid "Options"
-msgstr ""
+msgstr "选项"
#: addressbook/printing/e-contact-print.glade.h:24
msgid "Orientation"
-msgstr ""
+msgstr "方向"
#: addressbook/printing/e-contact-print.glade.h:25
msgid "Page"
-msgstr ""
+msgstr "页面"
#: addressbook/printing/e-contact-print.glade.h:26
msgid "Page Setup:"
-msgstr ""
+msgstr "页面设置:"
#: addressbook/printing/e-contact-print.glade.h:27
msgid "Paper"
-msgstr ""
+msgstr "纸张"
#: addressbook/printing/e-contact-print.glade.h:28
msgid "Paper source:"
-msgstr ""
+msgstr "纸张来源:"
#: addressbook/printing/e-contact-print.glade.h:29
msgid "Portrait"
-msgstr ""
+msgstr "纵向"
#: addressbook/printing/e-contact-print.glade.h:30
msgid "Preview:"
-msgstr ""
+msgstr "预览"
#: addressbook/printing/e-contact-print.glade.h:31
msgid "Print using gray shading"
-msgstr ""
+msgstr "用灰度阴影打印"
#: addressbook/printing/e-contact-print.glade.h:32
msgid "Reverse on even pages"
-msgstr ""
+msgstr "编历偶数页"
#: addressbook/printing/e-contact-print.glade.h:33
msgid "Right:"
-msgstr ""
+msgstr "右:"
#: addressbook/printing/e-contact-print.glade.h:34
msgid "Sections:"
@@ -2762,15 +2789,15 @@ msgstr ""
#: addressbook/printing/e-contact-print.glade.h:36
msgid "Size:"
-msgstr ""
+msgstr "大小:"
#: addressbook/printing/e-contact-print.glade.h:37
msgid "Start on a new page"
-msgstr ""
+msgstr "从新页开始"
#: addressbook/printing/e-contact-print.glade.h:38
msgid "Style name:"
-msgstr ""
+msgstr "风格名:"
#: addressbook/printing/e-contact-print.glade.h:39
msgid "Top:"
@@ -2778,118 +2805,129 @@ msgstr ""
#: addressbook/printing/e-contact-print.glade.h:40
msgid "Type:"
-msgstr ""
+msgstr "类型:"
#: addressbook/printing/e-contact-print.glade.h:41
msgid "Width:"
-msgstr ""
+msgstr "宽度:"
#: addressbook/printing/e-contact-print.glade.h:42
msgid "_Font..."
-msgstr ""
+msgstr "字体(F)..."
-#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1111
msgid "Print cards"
-msgstr ""
+msgstr "打印卡片"
-#: addressbook/printing/e-contact-print.c:1172
-#: addressbook/printing/e-contact-print.c:1194
+#: addressbook/printing/e-contact-print.c:1171
+#: addressbook/printing/e-contact-print.c:1193
msgid "Print card"
-msgstr ""
+msgstr "打印卡片"
-#: addressbook/printing/e-contact-print-envelope.c:216
-#: addressbook/printing/e-contact-print-envelope.c:237
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
msgid "Print envelope"
-msgstr ""
+msgstr "打印信封"
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/cal-util/cal-util.c:424 calendar/cal-util/cal-util.c:446
+#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:651
msgid "High"
msgstr "高"
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/cal-util/cal-util.c:426 calendar/cal-util/cal-util.c:448
+#: calendar/gui/calendar-model.c:1700
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:650
msgid "Normal"
msgstr "中"
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/cal-util/cal-util.c:428 calendar/cal-util/cal-util.c:450
+#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:649
msgid "Low"
msgstr "低"
#. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:444
#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
msgid "Undefined"
msgstr "未定义"
-#: calendar/conduits/calendar/calendar-conduit.c:896
-#: calendar/conduits/todo/todo-conduit.c:594
+#: calendar/conduits/calendar/calendar-conduit.c:922
+#: calendar/conduits/todo/todo-conduit.c:646
msgid "Error while communicating with calendar server"
msgstr "在与日历服务器通讯时发生错误"
-#: calendar/conduits/calendar/calendar-conduit.c:1018
-#: calendar/conduits/calendar/calendar-conduit.c:1021
+#: calendar/conduits/calendar/calendar-conduit.c:1051
+#: calendar/conduits/calendar/calendar-conduit.c:1054
msgid "Could not read pilot's Calendar application block"
msgstr ""
-#: calendar/conduits/todo/todo-conduit.c:698
-#: calendar/conduits/todo/todo-conduit.c:701
+#: calendar/conduits/todo/todo-conduit.c:753
+#: calendar/conduits/todo/todo-conduit.c:756
msgid "Could not read pilot's ToDo application block"
msgstr ""
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#, fuzzy
+msgid "A Bonobo control which displays a task list."
msgstr "显示日历的示例 Bonobo 控制。"
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr ""
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "显示日历的示例 Bonobo 控制。"
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+msgid "Evolution calendar executive summary component."
msgstr ""
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr ""
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution 日历 iTip/iMip 查看器"
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr ""
+msgid "Evolution component for handling the calendar."
+msgstr "处理日历的 Evolution 组件。"
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the calendar iTip view control"
-msgstr ""
+msgid "Factory for the Calendar Summary component."
+msgstr "日历概要组件车间。"
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
+msgid "Factory for the Evolution Tasks control"
+msgstr "Evolution 任务控制车间"
#: 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
+msgid "Factory for the sample Calendar control"
+msgstr "日历控制示例车间"
+
+#: 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:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
msgid "Factory to create a component editor factory"
-msgstr ""
+msgstr "创建组件编辑车间的车间"
#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
msgid "Alarm notification service"
-msgstr ""
+msgstr "报警提示服务"
#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
msgid "Factory for the alarm notification service"
-msgstr ""
+msgstr "报警提示服务车间"
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:350
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr ""
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#, fuzzy
+msgid "invalid time"
+msgstr "非法参数"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#, fuzzy, c-format
+msgid "Alarm on %s"
+msgstr "%s 的 VCard"
#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
#: ui/evolution-comp-editor.xml.h:1
@@ -2898,21 +2936,21 @@ msgstr "(_l)关闭"
#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
msgid "Snoo_ze"
-msgstr ""
+msgstr "午睡(Z)"
#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
msgid "Snooze time (minutes)"
-msgstr ""
+msgstr "午睡时间(分钟)"
#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
msgid "_Edit appointment"
-msgstr ""
+msgstr "编辑约会(_E)"
-#: calendar/gui/alarm-notify/alarm-queue.c:663
+#: calendar/gui/alarm-notify/alarm-queue.c:670
msgid "No description available."
-msgstr ""
+msgstr "没有描述。"
-#: calendar/gui/alarm-notify/alarm-queue.c:723
+#: 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"
@@ -2920,7 +2958,7 @@ msgid ""
"a normal reminder dialog box instead."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:774
+#: calendar/gui/alarm-notify/alarm-queue.c:781
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger.\n"
@@ -2931,305 +2969,272 @@ msgid ""
"Are you sure you want to run this program?"
msgstr ""
-#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
msgid "Could not initialize GNOME"
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr ""
+msgstr "无法初始化 GNOME"
-#: calendar/gui/alarm-notify/notify-main.c:182
+#: calendar/gui/alarm-notify/notify-main.c:181
#, fuzzy
msgid "Could not create the alarm notify service"
msgstr "无法启动 wombat 服务器"
-#: calendar/gui/alarm-notify/notify-main.c:187
+#: calendar/gui/alarm-notify/notify-main.c:186
msgid "Could not create the alarm notify service factory"
-msgstr ""
+msgstr "无法创建报警提示服务车间"
-#: calendar/gui/calendar-commands.c:439
+#: calendar/gui/calendar-commands.c:438
msgid "%A %d %B %Y"
-msgstr ""
+msgstr "%Y %B %d %A"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:441 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 ""
+msgstr "%b %d %a"
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-commands.c:448
+#: calendar/gui/calendar-commands.c:450
msgid "%a %d %b %Y"
-msgstr ""
+msgstr "%Y %b %d %a"
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
-#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:474 calendar/gui/calendar-commands.c:476
msgid "%d %B %Y"
-msgstr ""
+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:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
+#: calendar/gui/calendar-commands.c:466
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
msgid "%d %B"
-msgstr ""
+msgstr "%B %d"
-#: calendar/gui/calendar-commands.c:677
+#: calendar/gui/calendar-commands.c:676
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
-msgstr ""
+msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
-#: calendar/gui/calendar-model.c:410 calendar/gui/calendar-model.c:1017
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:416 calendar/gui/calendar-model.c:997
msgid "Private"
-msgstr ""
+msgstr "保密"
-#: calendar/gui/calendar-model.c:413 calendar/gui/calendar-model.c:1019
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:419 calendar/gui/calendar-model.c:999
msgid "Confidential"
-msgstr ""
+msgstr "机密"
-#: calendar/gui/calendar-model.c:416 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:422
msgid "Public"
-msgstr ""
+msgstr "公开"
-#: calendar/gui/calendar-model.c:509
+#: calendar/gui/calendar-model.c:528
msgid "N"
-msgstr ""
+msgstr "北"
-#: calendar/gui/calendar-model.c:509
+#: calendar/gui/calendar-model.c:528
msgid "S"
-msgstr ""
+msgstr "南"
-#: calendar/gui/calendar-model.c:511
+#: calendar/gui/calendar-model.c:530
msgid "E"
-msgstr ""
+msgstr "东"
-#: calendar/gui/calendar-model.c:511
+#: calendar/gui/calendar-model.c:530
msgid "W"
-msgstr ""
+msgstr "西"
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1216
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:595 calendar/gui/calendar-model.c:1150
msgid "Free"
-msgstr ""
+msgstr "放假"
-#: calendar/gui/calendar-model.c:579 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:401 shell/evolution-shell-component.c:966
+#: calendar/gui/calendar-model.c:597 calendar/gui/e-meeting-time-sel.c:409
+#: shell/evolution-shell-component.c:993
msgid "Busy"
-msgstr ""
+msgstr "繁忙"
-#: calendar/gui/calendar-model.c:728 calendar/gui/calendar-model.c:1264
+#: calendar/gui/calendar-model.c:746 calendar/gui/calendar-model.c:1194
#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
msgid "Not Started"
-msgstr ""
+msgstr "尚未开始"
-#: calendar/gui/calendar-model.c:731 calendar/gui/calendar-model.c:1266
+#: calendar/gui/calendar-model.c:749 calendar/gui/calendar-model.c:1196
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
msgid "In Progress"
-msgstr ""
+msgstr "正在进行中"
-#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:752 calendar/gui/calendar-model.c:1198
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:336
+#: calendar/gui/e-meeting-model.c:315 calendar/gui/e-meeting-model.c:338
msgid "Completed"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:931 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:934 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
+msgstr "已完成"
-#: calendar/gui/calendar-model.c:939
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:1103
+#: calendar/gui/calendar-model.c:1055
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
"45.436845,125.862501"
msgstr ""
-
-#: calendar/gui/calendar-model.c:1143
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
+"地理位置必须以此格式输入:\n"
+"\n"
+"45.436845,125.862501"
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1262 calendar/gui/dialogs/meeting-page.c:321
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1448
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: calendar/gui/calendar-model.c:1192 calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
-#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:452
+#: widgets/misc/e-dateedit.c:1452 widgets/misc/e-dateedit.c:1567
msgid "None"
-msgstr ""
+msgstr "无"
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1702
msgid "Recurring"
-msgstr ""
+msgstr "正在重复"
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1704
msgid "Assigned"
-msgstr ""
+msgstr "已分派"
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:295 calendar/gui/e-meeting-model.c:521
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:297 calendar/gui/e-meeting-model.c:523
msgid "Yes"
-msgstr ""
+msgstr "是"
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:297
-#: calendar/gui/e-meeting-model.c:718
+#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:299
msgid "No"
-msgstr ""
+msgstr "否"
#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:2010 calendar/gui/e-day-view.c:1674
-#: calendar/gui/e-week-view.c:1181
+#: calendar/gui/calendar-model.c:2009 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
#, fuzzy
msgid "Searching"
msgstr "搜索..."
-#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
msgid "Day View"
-msgstr ""
+msgstr "日视图"
-#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
msgid "Work Week View"
-msgstr ""
+msgstr "周工作视图"
-#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
msgid "Week View"
-msgstr ""
+msgstr "周视图"
-#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
msgid "Month View"
-msgstr ""
+msgstr "月视图"
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:55
msgid "Summary contains"
-msgstr ""
+msgstr "概要含有"
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:56
msgid "Description contains"
-msgstr ""
+msgstr "描述含有"
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:57
msgid "Comment contains"
-msgstr ""
+msgstr "注释含有"
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:415
msgid "Unmatched"
-msgstr ""
+msgstr "未匹配"
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
-#: shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+#: shell/e-shortcuts.c:1055
msgid "Calendar"
-msgstr ""
+msgstr "日历"
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:64
msgid "Folder containing appointments and events"
-msgstr ""
+msgstr "文件夹含有约会和事件"
-#: calendar/gui/component-factory.c:69 my-evolution/e-summary-tasks.c:235
-#: my-evolution/e-summary-tasks.c:251 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 my-evolution/e-summary-tasks.c:245
+#: my-evolution/e-summary-tasks.c:261 shell/e-shortcuts.c:1058
#: views/tasks/galview.xml.h:1
msgid "Tasks"
-msgstr ""
+msgstr "任务"
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:69
msgid "Folder containing to-do items"
-msgstr ""
+msgstr "文件夹含有 to-do 项"
#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
msgid "Create a new appointment"
-msgstr ""
+msgstr "创建新约会"
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3440
+#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
msgid "New _Appointment"
-msgstr ""
+msgstr "新约会(A)"
#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
#: ui/evolution-tasks.xml.h:5
msgid "Create a new task"
-msgstr ""
+msgstr "创建新任务"
#: calendar/gui/component-factory.c:649
msgid "New _Task"
-msgstr ""
+msgstr "新任务(T)"
-#: calendar/gui/control-factory.c:128
+#: calendar/gui/control-factory.c:127
msgid "The URI that the calendar will display"
-msgstr ""
+msgstr "日历将显示的 URI"
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:358
msgid "Audio Alarm Options"
-msgstr ""
+msgstr "音频报警选项"
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:367
msgid "Message Alarm Options"
-msgstr ""
+msgstr "消息报警选项"
-#: calendar/gui/dialogs/alarm-options.c:377
+#: calendar/gui/dialogs/alarm-options.c:376
msgid "Mail Alarm Options"
-msgstr ""
+msgstr "邮件报警选项"
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:385
msgid "Program Alarm Options"
-msgstr ""
+msgstr "程序报警选项"
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:394
msgid "Unknown Alarm Options"
-msgstr ""
+msgstr "未知报警选项"
#: calendar/gui/dialogs/alarm-options.glade.h:1
msgid "Alarm Repeat"
-msgstr ""
+msgstr "报警重复"
#: calendar/gui/dialogs/alarm-options.glade.h:2
msgid "Message to Display"
-msgstr ""
+msgstr "要显示的消息"
#: calendar/gui/dialogs/alarm-options.glade.h:3
msgid "Play sound:"
-msgstr ""
+msgstr "播放声音:"
#: calendar/gui/dialogs/alarm-options.glade.h:4
msgid "Repeat the alarm"
-msgstr ""
+msgstr "重复报警"
#: calendar/gui/dialogs/alarm-options.glade.h:5
msgid "Run program:"
-msgstr ""
+msgstr "运行程序:"
#: calendar/gui/dialogs/alarm-options.glade.h:6
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 ""
+msgstr "这是电子邮件提示器,但 Evolution 尚不支持这类提示器。您无法为该提示器编辑选项。"
#: calendar/gui/dialogs/alarm-options.glade.h:7
msgid "With these arguments:"
-msgstr ""
+msgstr "使用这些参数:"
#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
msgid "days"
@@ -3241,121 +3246,116 @@ msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
msgid "hours"
-msgstr ""
+msgstr "小时"
#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
msgid "minutes"
-msgstr ""
+msgstr "分钟"
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:309
#, c-format
msgid "%d days"
-msgstr ""
+msgstr "%d 天"
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:312
msgid "1 day"
-msgstr ""
+msgstr "1 天"
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:317
#, c-format
msgid "%d weeks"
-msgstr ""
+msgstr "%d 周"
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:320
msgid "1 week"
-msgstr ""
+msgstr "1 周"
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:325
#, c-format
msgid "%d hours"
-msgstr ""
+msgstr "%d 小时"
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:328
msgid "1 hour"
-msgstr ""
+msgstr "1 小时"
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:333
#, c-format
msgid "%d minutes"
-msgstr ""
+msgstr "%d 分钟"
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:336
msgid "1 minute"
-msgstr ""
+msgstr "1 分钟"
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:341
#, c-format
msgid "%d seconds"
-msgstr ""
+msgstr "%d 秒"
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:344
msgid "1 second"
-msgstr ""
+msgstr "1 秒"
-#: calendar/gui/dialogs/alarm-page.c:371
+#: calendar/gui/dialogs/alarm-page.c:373
#: calendar/gui/dialogs/alarm-page.glade.h:4
msgid "Play a sound"
-msgstr ""
+msgstr "播放声音"
-#: calendar/gui/dialogs/alarm-page.c:375
+#: calendar/gui/dialogs/alarm-page.c:377
#: calendar/gui/dialogs/alarm-page.glade.h:3
msgid "Display a message"
-msgstr ""
+msgstr "显示消息"
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:381
msgid "Send an email"
-msgstr ""
+msgstr "发送电子邮件"
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:385
#: calendar/gui/dialogs/alarm-page.glade.h:6
msgid "Run a program"
-msgstr ""
+msgstr "运行程序"
-#: calendar/gui/dialogs/alarm-page.c:389
+#: calendar/gui/dialogs/alarm-page.c:391
msgid "Unknown action to be performed"
-msgstr ""
+msgstr "执行未知的动作"
-#: calendar/gui/dialogs/alarm-page.c:401
+#: calendar/gui/dialogs/alarm-page.c:403
#, c-format
msgid "%s %s before the start of the appointment"
-msgstr ""
+msgstr "在约会开始之前 %s %s"
-#: calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/dialogs/alarm-page.c:406
#, c-format
msgid "%s %s after the start of the appointment"
-msgstr ""
+msgstr "在约会开始之后 %s %s"
-#: calendar/gui/dialogs/alarm-page.c:409
+#: calendar/gui/dialogs/alarm-page.c:411
#, c-format
msgid "%s at the start of the appointment"
-msgstr ""
+msgstr "在约会开始时 %s"
-#: calendar/gui/dialogs/alarm-page.c:418
+#: calendar/gui/dialogs/alarm-page.c:420
#, c-format
msgid "%s %s before the end of the appointment"
-msgstr ""
+msgstr "在约会结束之前 %s %s"
-#: calendar/gui/dialogs/alarm-page.c:421
+#: calendar/gui/dialogs/alarm-page.c:423
#, c-format
msgid "%s %s after the end of the appointment"
-msgstr ""
+msgstr "在约会结束之后 %s %s"
-#: calendar/gui/dialogs/alarm-page.c:426
+#: calendar/gui/dialogs/alarm-page.c:428
#, c-format
msgid "%s at the end of the appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:437
-#, c-format
-msgid "%s at an unknown time"
-msgstr ""
+msgstr "在约会结束时 %s"
-#: calendar/gui/dialogs/alarm-page.c:443
+#: calendar/gui/dialogs/alarm-page.c:453
#, c-format
msgid "%s at %s"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:450
+#: calendar/gui/dialogs/alarm-page.c:459
#, c-format
msgid "%s for an unknown trigger type"
msgstr ""
@@ -3372,83 +3372,83 @@ msgstr ""
#: calendar/gui/dialogs/alarm-page.glade.h:5
msgid "Reminders"
-msgstr ""
+msgstr "提示器"
#: calendar/gui/dialogs/alarm-page.glade.h:7
#: calendar/gui/dialogs/recurrence-page.glade.h:8
#: calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
-msgstr ""
+msgstr "概要:"
#: calendar/gui/dialogs/alarm-page.glade.h:10
msgid "_Options..."
-msgstr ""
+msgstr "选项(O)..."
#. Automatically generated. Do not edit.
#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:2
msgid "after"
-msgstr ""
+msgstr "之后"
#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
msgid "before"
-msgstr ""
+msgstr "之前"
#: calendar/gui/dialogs/alarm-page.glade.h:13
#: calendar/gui/dialogs/recurrence-page.glade.h:14
msgid "day(s)"
-msgstr ""
+msgstr "天"
#: calendar/gui/dialogs/alarm-page.glade.h:14
msgid "end of appointment"
-msgstr ""
+msgstr "约会结束"
#: calendar/gui/dialogs/alarm-page.glade.h:15
msgid "hour(s)"
-msgstr ""
+msgstr "小时"
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:116
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
msgid "minute(s)"
-msgstr ""
+msgstr "分钟"
#: calendar/gui/dialogs/alarm-page.glade.h:17
msgid "start of appointment"
-msgstr ""
+msgstr "约会开始"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
msgid "05 minutes"
-msgstr ""
+msgstr "05 分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
msgid "10 minutes"
-msgstr ""
+msgstr "10 分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
msgid "15 minutes"
-msgstr ""
+msgstr "15 分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
msgid "30 minutes"
-msgstr ""
+msgstr "30 分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
msgid "60 minutes"
-msgstr ""
+msgstr "60 分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
msgid "Calendar and Tasks Settings"
-msgstr ""
+msgstr "日历和任务设置"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
msgid "Color for overdue tasks"
-msgstr ""
+msgstr "延误任务颜色"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
msgid "Color for tasks due today"
-msgstr ""
+msgstr "今日任务颜色"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
msgid "Create new appointments with a default _reminder"
-msgstr ""
+msgstr "用缺省提醒器创建新约会(R)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
msgid "Days"
@@ -3456,80 +3456,80 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
msgid "First day of wee_k:"
-msgstr ""
+msgstr "周的第一天(K):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:963
msgid "Friday"
-msgstr ""
+msgstr "星期五"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
msgid "Hours"
-msgstr ""
+msgstr "小时"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
msgid "Minutes"
-msgstr ""
+msgstr "分钟"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:959
msgid "Monday"
-msgstr ""
+msgstr "星期一"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
msgid "O_verdue tasks:"
-msgstr ""
+msgstr "延误任务(V):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:964
msgid "Saturday"
-msgstr ""
+msgstr "星期六"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
msgid "Show appointment _end times in week and month views"
-msgstr ""
+msgstr "在周视图和月视图中显示约会结束时间(E)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
msgid "Show week _numbers in date navigator"
-msgstr ""
+msgstr "在日期浏览器中显示周数(N)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
msgid "Sta_rt of day:"
-msgstr ""
+msgstr "天的开始(R):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
msgid "Su_n"
-msgstr ""
+msgstr "星期日(N)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
msgid "Sunday"
-msgstr ""
+msgstr "星期日"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
msgid "T_hu"
-msgstr ""
+msgstr "星期四(H)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
msgid "T_ue"
-msgstr ""
+msgstr "星期二(U)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
msgid "Tas_ks due today:"
-msgstr ""
+msgstr "今天的任务(K):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:962
msgid "Thursday"
-msgstr ""
+msgstr "星期四"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
msgid "Time"
-msgstr ""
+msgstr "时间"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
msgid "Time _zone:"
-msgstr ""
+msgstr "时区(Z):"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
msgid "Time di_visions:"
@@ -3537,282 +3537,288 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
msgid "Time format:"
-msgstr ""
+msgstr "时间格式:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:960
msgid "Tuesday"
-msgstr ""
+msgstr "星期二"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:961
msgid "Wednesday"
-msgstr ""
+msgstr "星期三"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
#: ui/evolution-calendar.xml.h:33
msgid "Work Week"
-msgstr ""
+msgstr "工作周"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
msgid "_12 hour (AM/PM)"
-msgstr ""
+msgstr "12 小时 (AM/PM) (1)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
msgid "_24 hour"
-msgstr ""
+msgstr "24 小时(2)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
msgid "_Ask for confirmation when deleting items"
-msgstr ""
+msgstr "删除项时提示确认(A)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
msgid "_Compress weekends in month view"
-msgstr ""
+msgstr "不在月视图中显示周末(_C)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
msgid "_Display"
-msgstr ""
+msgstr "显示(D)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
msgid "_End of day:"
-msgstr ""
+msgstr "天的结束(E)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
msgid "_Fri"
-msgstr ""
+msgstr "星期五(F)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
msgid "_General"
-msgstr ""
+msgstr "常规(G)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
msgid "_Hide completed tasks after"
-msgstr ""
+msgstr "随后隐藏已完成的任务(H)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
msgid "_Mon"
-msgstr ""
+msgstr "星期一(M)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
msgid "_Other"
-msgstr ""
+msgstr "其它(O)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
msgid "_Sat"
-msgstr ""
+msgstr "星期六(S)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
msgid "_Task List"
-msgstr ""
+msgstr "任务列表(T)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
msgid "_Wed"
-msgstr ""
+msgstr "星期三(W)"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
msgid "before the start of the appointment"
-msgstr ""
+msgstr "在约会开始以前"
-#: calendar/gui/dialogs/cancel-comp.c:52
+#: calendar/gui/dialogs/cancel-comp.c:51
msgid "The meeting status has changed. Send an updated version?"
-msgstr ""
+msgstr "会见状态已经改变。发送更新后的版本?"
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr ""
+msgstr "您确信您希望取消并删除该会见?"
-#: calendar/gui/dialogs/cancel-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:62
msgid "Are you sure you want to cancel and delete this task?"
-msgstr ""
+msgstr "您确信您希望取消并删除该任务?"
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:67
msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
+msgstr "您确信您希望取消并删除该日志条目?"
-#: calendar/gui/dialogs/changed-comp.c:60
+#: calendar/gui/dialogs/changed-comp.c:59
msgid "This event has been deleted."
-msgstr ""
+msgstr "该事件已经被删除。"
-#: calendar/gui/dialogs/changed-comp.c:64
+#: calendar/gui/dialogs/changed-comp.c:63
msgid "This task has been deleted."
-msgstr ""
+msgstr "该任务已经被删除。"
-#: calendar/gui/dialogs/changed-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:67
msgid "This journal entry has been deleted."
-msgstr ""
+msgstr "该日志条目已经被删除。"
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:76
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
-msgstr ""
+msgstr "%s 您已经做了修改。忘记这些修改并关闭编辑器?"
-#: calendar/gui/dialogs/changed-comp.c:79
+#: calendar/gui/dialogs/changed-comp.c:78
#, c-format
msgid "%s You have made no changes, close the editor?"
-msgstr ""
+msgstr "%s 您还没有进行修改,关闭编辑器?"
-#: calendar/gui/dialogs/changed-comp.c:84
+#: calendar/gui/dialogs/changed-comp.c:83
msgid "This event has been changed."
-msgstr ""
+msgstr "该时间已经被改变。"
-#: calendar/gui/dialogs/changed-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:87
msgid "This task has been changed."
-msgstr ""
+msgstr "该任务已经被改变。"
-#: calendar/gui/dialogs/changed-comp.c:92
+#: calendar/gui/dialogs/changed-comp.c:91
msgid "This journal entry has been changed."
-msgstr ""
+msgstr "该日志条目已经被改变。"
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:100
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
-msgstr ""
+msgstr "%s 您已经做出了修改。忘记这些修改并更新编辑器?"
-#: calendar/gui/dialogs/changed-comp.c:103
+#: calendar/gui/dialogs/changed-comp.c:102
#, c-format
msgid "%s You have made no changes, update the editor?"
-msgstr ""
+msgstr "%s 您还没有进行修改,更新编辑器?"
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2163
msgid " to "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:182 calendar/gui/print.c:2167
msgid " (Completed "
-msgstr ""
+msgstr " (完成 "
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:184 calendar/gui/print.c:2169
msgid "Completed "
-msgstr ""
+msgstr "已完成"
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:189 calendar/gui/print.c:2174
msgid " (Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2176
msgid "Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:631
+#: calendar/gui/dialogs/comp-editor.c:303
+msgid "Could not update object!"
+msgstr "无法更新对象!"
+
+#: calendar/gui/dialogs/comp-editor.c:671
msgid "Edit Appointment"
-msgstr ""
+msgstr "编辑约会"
-#: calendar/gui/dialogs/comp-editor.c:636
+#: calendar/gui/dialogs/comp-editor.c:676
#, c-format
msgid "Appointment - %s"
-msgstr ""
+msgstr "约会 - %s"
-#: calendar/gui/dialogs/comp-editor.c:639
+#: calendar/gui/dialogs/comp-editor.c:679
#, c-format
msgid "Task - %s"
-msgstr ""
+msgstr "任务 - %s"
-#: calendar/gui/dialogs/comp-editor.c:642
+#: calendar/gui/dialogs/comp-editor.c:682
#, c-format
msgid "Journal entry - %s"
-msgstr ""
+msgstr "日志条目 - %s"
-#: calendar/gui/dialogs/comp-editor.c:656
+#: calendar/gui/dialogs/comp-editor.c:696
msgid "No summary"
-msgstr ""
+msgstr "没有概要"
-#: calendar/gui/dialogs/comp-editor.c:1006 mail/mail-callbacks.c:1789
-#: mail/mail-display.c:101
+#: calendar/gui/dialogs/comp-editor.c:1046 mail/mail-callbacks.c:1845
+#: mail/mail-display.c:102
msgid "Overwrite file?"
-msgstr ""
+msgstr "覆盖文件?"
-#: calendar/gui/dialogs/comp-editor.c:1010 mail/mail-callbacks.c:1796
-#: mail/mail-display.c:105
+#: calendar/gui/dialogs/comp-editor.c:1050 mail/mail-callbacks.c:1852
+#: mail/mail-display.c:106
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
msgstr ""
+"指定名称的文件已经存在。\n"
+"覆盖它?"
-#: calendar/gui/dialogs/comp-editor.c:1073 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1094 ui/evolution-comp-editor.xml.h:13
#: widgets/misc/e-filter-bar.h:101
msgid "Save As..."
-msgstr ""
+msgstr "另存为..."
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1249
msgid "Unable to obtain current version!"
-msgstr ""
+msgstr "无法获取当前版本!"
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:97
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
+msgstr "您确信您希望删除约会 ‘%s’?"
-#: calendar/gui/dialogs/delete-comp.c:94
+#: calendar/gui/dialogs/delete-comp.c:100
msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
+msgstr "您确信您希望删除该无标题约会?"
-#: calendar/gui/dialogs/delete-comp.c:100
+#: calendar/gui/dialogs/delete-comp.c:106
#, c-format
msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
+msgstr "您确信您希望删除任务‘%s’?"
-#: calendar/gui/dialogs/delete-comp.c:103
+#: calendar/gui/dialogs/delete-comp.c:109
msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
+msgstr "您确信您希望删除该无标题任务?"
-#: calendar/gui/dialogs/delete-comp.c:109
+#: calendar/gui/dialogs/delete-comp.c:115
#, c-format
msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
+msgstr "您确信您希望删除日志条目‘%s’?"
-#: calendar/gui/dialogs/delete-comp.c:112
+#: calendar/gui/dialogs/delete-comp.c:118
msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
+msgstr "您确信您希望删除该无标题日志条目?"
-#: calendar/gui/dialogs/delete-comp.c:127
+#: calendar/gui/dialogs/delete-comp.c:133
#, c-format
msgid "Are you sure you want to delete %d appointments?"
-msgstr ""
+msgstr "您确信您希望删除 %d 个约会?"
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:138
#, c-format
msgid "Are you sure you want to delete %d tasks?"
-msgstr ""
+msgstr "您确信您希望删除 %d 个任务?"
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:143
#, c-format
msgid "Are you sure you want to delete %d journal entries?"
-msgstr ""
+msgstr "您确信您希望删除 %d 个日志条目?"
#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
msgid "Addressbook..."
-msgstr ""
+msgstr "地址本..."
#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
msgid "Delegate To:"
-msgstr ""
+msgstr "授权给:"
#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
msgid "Enter Delegate"
-msgstr ""
+msgstr "输入代表"
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:185
msgid "Appointment"
-msgstr ""
+msgstr "约会"
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:190
msgid "Reminder"
-msgstr ""
+msgstr "提醒"
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:195
msgid "Recurrence"
-msgstr ""
+msgstr "再次发生"
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:202
+#: calendar/gui/dialogs/event-editor.c:354
msgid "Scheduling"
-msgstr ""
+msgstr "正在调度"
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:358
+#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:357
msgid "Meeting"
-msgstr ""
+msgstr "会见"
#: calendar/gui/dialogs/event-page.glade.h:1
msgid "A_ll day event"
@@ -3820,7 +3826,7 @@ msgstr ""
#: calendar/gui/dialogs/event-page.glade.h:2
msgid "B_usy"
-msgstr ""
+msgstr "忙(U)"
#: calendar/gui/dialogs/event-page.glade.h:4
#: calendar/gui/dialogs/task-page.glade.h:2
@@ -3829,27 +3835,28 @@ msgid "Classification"
msgstr ""
#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
msgid "Con_fidential"
-msgstr ""
+msgstr "机密的(F)"
#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
msgid "Date & Time"
-msgstr ""
+msgstr "日期及时间"
#: calendar/gui/dialogs/event-page.glade.h:7
msgid "F_ree"
msgstr ""
#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
msgid "Pri_vate"
-msgstr ""
+msgstr "保密的(V)"
#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
msgid "Pu_blic"
-msgstr ""
+msgstr "公开的(B)"
#: calendar/gui/dialogs/event-page.glade.h:10
#: calendar/gui/e-calendar-table.etspec.h:12
@@ -3857,34 +3864,34 @@ msgid "Show Time As"
msgstr ""
#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
msgid "Su_mmary:"
-msgstr ""
+msgstr "概要(U):"
#: calendar/gui/dialogs/event-page.glade.h:13
msgid "_End time:"
-msgstr ""
+msgstr "结束时间(E):"
#: calendar/gui/dialogs/event-page.glade.h:14
msgid "_Start time:"
-msgstr ""
+msgstr "开始时间(S):"
-#: calendar/gui/dialogs/meeting-page.c:432
+#: calendar/gui/dialogs/meeting-page.c:423
msgid "An organizer is required."
-msgstr ""
+msgstr "需要一名组织者。"
-#: calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:623
msgid "That person is already attending the meeting!"
-msgstr ""
+msgstr "那个人已经参加了会议!"
-#: calendar/gui/dialogs/meeting-page.c:693
+#: calendar/gui/dialogs/meeting-page.c:696
msgid "_Delegate To..."
-msgstr ""
+msgstr "授权于(D)..."
#: calendar/gui/dialogs/meeting-page.etspec.h:1
#: calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
-msgstr ""
+msgstr "出席者"
#: calendar/gui/dialogs/meeting-page.etspec.h:2
#: calendar/gui/e-meeting-time-sel.etspec.h:2
@@ -3894,85 +3901,85 @@ msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:3
#: calendar/gui/e-meeting-time-sel.etspec.h:3
msgid "Delegated From"
-msgstr ""
+msgstr "来自...的代表"
#: calendar/gui/dialogs/meeting-page.etspec.h:4
#: calendar/gui/e-meeting-time-sel.etspec.h:4
msgid "Delegated To"
-msgstr ""
+msgstr "授权于"
#: calendar/gui/dialogs/meeting-page.etspec.h:5
#: calendar/gui/e-meeting-time-sel.etspec.h:5
msgid "Language"
-msgstr ""
+msgstr "语言"
#: calendar/gui/dialogs/meeting-page.etspec.h:6
#: calendar/gui/e-meeting-time-sel.etspec.h:6
msgid "Member"
-msgstr ""
+msgstr "成员"
#: calendar/gui/dialogs/meeting-page.etspec.h:7
#: calendar/gui/e-meeting-time-sel.etspec.h:7
msgid "RSVP"
-msgstr ""
+msgstr "RSVP"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "Role"
-msgstr ""
+msgstr "角色"
#: 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:49
#: mail/message-list.etspec.h:8
msgid "Status"
-msgstr ""
+msgstr "状态"
#: 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 mail/mail-config.glade.h:86
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/mail-config.glade.h:85
#: shell/glade/e-active-connection-dialog.glade.h:5
msgid "Type"
-msgstr ""
+msgstr "类型"
#: calendar/gui/dialogs/meeting-page.glade.h:2
#: calendar/gui/e-itip-control.glade.h:9
msgid "Organizer:"
-msgstr ""
+msgstr "组织者:"
#: calendar/gui/dialogs/meeting-page.glade.h:3
msgid "_Change Organizer"
-msgstr ""
+msgstr "改变组织者(C)"
#: calendar/gui/dialogs/meeting-page.glade.h:4
msgid "_Invite Others"
-msgstr ""
+msgstr "邀请其他人(I)"
#: calendar/gui/dialogs/meeting-page.glade.h:5
msgid "_Other Organizer"
-msgstr ""
+msgstr "其他组织者(O)"
-#: calendar/gui/dialogs/recurrence-page.c:572
+#: calendar/gui/dialogs/recurrence-page.c:571
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:926
+#: calendar/gui/dialogs/recurrence-page.c:932
msgid "on"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:952 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:1082
+#: calendar/gui/dialogs/recurrence-page.c:1088
msgid "on the"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1090
+#: calendar/gui/dialogs/recurrence-page.c:1096
msgid "th"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1263
+#: calendar/gui/dialogs/recurrence-page.c:1269
msgid "occurrences"
msgstr ""
@@ -3990,7 +3997,7 @@ msgstr ""
#: calendar/gui/dialogs/recurrence-page.glade.h:6
msgid "Preview"
-msgstr ""
+msgstr "预览"
#: calendar/gui/dialogs/recurrence-page.glade.h:7
msgid "Recurrence Rule"
@@ -4036,324 +4043,300 @@ msgstr ""
msgid "year(s)"
msgstr ""
-#: calendar/gui/dialogs/save-comp.c:51
+#: calendar/gui/dialogs/save-comp.c:50
msgid "Do you want to save changes?"
-msgstr ""
+msgstr "您希望保存修改吗?"
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:55
msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
+msgstr "会议信息已经改变。发送更新版本?"
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
msgid "The task information has changed. Send an updated version?"
-msgstr ""
+msgstr "任务信息已经改变。发送更新版本?"
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:65
msgid "The journal entry has changed. Send an updated version?"
-msgstr ""
+msgstr "日志条目已经改变。发送更新版本?"
#: calendar/gui/dialogs/task-details-page.glade.h:2
#: calendar/gui/e-calendar-table.etspec.h:2
#, no-c-format
msgid "% Complete"
-msgstr ""
+msgstr "% 完成"
#: calendar/gui/dialogs/task-details-page.glade.h:5
msgid "Date Completed:"
-msgstr ""
+msgstr "完成日期:"
#: calendar/gui/dialogs/task-details-page.glade.h:11
msgid "Progress"
-msgstr ""
+msgstr "进度"
#: calendar/gui/dialogs/task-details-page.glade.h:12
#: my-evolution/e-summary-preferences.c:950
msgid "URL:"
-msgstr ""
+msgstr "URL:"
#: calendar/gui/dialogs/task-details-page.glade.h:14
msgid "_Priority:"
-msgstr ""
+msgstr "优先级(P):"
#: calendar/gui/dialogs/task-details-page.glade.h:15
msgid "_Status:"
-msgstr ""
+msgstr "状态(S):"
-#: calendar/gui/dialogs/task-editor.c:191
-#: calendar/gui/dialogs/task-editor.c:320
+#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-editor.c:229
+#: calendar/gui/dialogs/task-editor.c:324
msgid "Assignment"
msgstr ""
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:27
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
msgid "Description:"
-msgstr ""
+msgstr "描述:"
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
msgid "Sta_rt Date:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr ""
+msgstr "开始日期(R):"
#: calendar/gui/dialogs/task-page.glade.h:11
msgid "_Due Date:"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:407
-#, c-format
-msgid "0%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:408
-#, c-format
-msgid "10%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:409
-#, c-format
-msgid "20%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:410
-#, c-format
-msgid "30%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:411
-#, c-format
-msgid "40%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:412
-#, c-format
-msgid "50%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:413
-#, c-format
-msgid "60%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:414
-#, c-format
-msgid "70%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:415
-#, c-format
-msgid "80%"
-msgstr ""
+msgstr "预定日期(D):"
-#: calendar/gui/e-calendar-table.c:416
-#, c-format
-msgid "90%"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:417
-#, c-format
-msgid "100%"
-msgstr ""
+#: 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 "删除选中的联系人"
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3461
-#: calendar/gui/e-week-view.c:3313 mail/folder-browser.c:1430
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3363 mail/folder-browser.c:1444
+#: shell/e-shortcuts-view.c:384
msgid "_Open"
-msgstr ""
+msgstr "打开(O)"
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3470
-#: calendar/gui/e-week-view.c:3322 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:3372 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
-msgstr ""
+msgstr "剪切(U)"
-#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3472
-#: calendar/gui/e-week-view.c:3324 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3374 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 ""
+msgstr "复制(C)"
-#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3447
-#: calendar/gui/e-day-view.c:3474 calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-week-view.c:3326 ui/evolution-addressbook.xml.h:36
+#: 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:3350
+#: calendar/gui/e-week-view.c:3376 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 ""
+msgstr "粘贴(P)"
-#: calendar/gui/e-calendar-table.c:927
+#: calendar/gui/e-calendar-table.c:952
msgid "_Mark as Complete"
-msgstr ""
+msgstr "标记为完成(M)"
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
msgid "_Delete this Task"
-msgstr ""
+msgstr "删除该任务(D)"
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
msgid "_Mark Tasks as Complete"
-msgstr ""
+msgstr "把任务标记为完成(M)"
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
msgid "_Delete Selected Tasks"
-msgstr ""
+msgstr "删除选定的任务(D)"
-#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:6998
+#: calendar/gui/e-week-view.c:3857
+msgid "Updating objects"
+msgstr "更新对象"
+
+#: calendar/gui/e-calendar-table.c:1224
msgid "Click to add a task"
+msgstr "点击以添加任务"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:119 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:354
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%Y年%m月%d日 %a %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:122 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:363
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y年%m月%d日 %a %I:%M%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:127
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
msgstr ""
+"日期必须按照以下格式输入:\n"
+"\n"
+"%s"
#: calendar/gui/e-calendar-table.etspec.h:3
msgid "Alarms"
-msgstr ""
+msgstr "报警"
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:721
-#: camel/camel-filter-driver.c:837
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:720
+#: camel/camel-filter-driver.c:836
msgid "Complete"
-msgstr ""
+msgstr "完成"
#: calendar/gui/e-calendar-table.etspec.h:7
msgid "Completion Date"
-msgstr ""
+msgstr "完成日期"
#: calendar/gui/e-calendar-table.etspec.h:8
msgid "Due Date"
-msgstr ""
+msgstr "约定日期"
#: calendar/gui/e-calendar-table.etspec.h:9
msgid "End Date"
-msgstr ""
+msgstr "结束日期"
#: calendar/gui/e-calendar-table.etspec.h:10
msgid "Geographical Position"
-msgstr ""
+msgstr "地理位置"
#: calendar/gui/e-calendar-table.etspec.h:11
msgid "Priority"
-msgstr ""
+msgstr "优先级"
#: calendar/gui/e-calendar-table.etspec.h:13
msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
#. FIXME: Inbox shortcut should point to something else for
#. people who won't care about using /Local Folders/Inbox
#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1455
+#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1460
msgid "Summary"
-msgstr ""
+msgstr "概要"
#: calendar/gui/e-calendar-table.etspec.h:16
msgid "Task sort"
-msgstr ""
+msgstr "任务排序"
#: calendar/gui/e-calendar-table.etspec.h:18
msgid "URL"
-msgstr ""
+msgstr "URL"
-#: calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:518
#, c-format
msgid "%02i minute divisions"
msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1387
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
+#: 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 ""
+msgstr "%B %d %A"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
-#: calendar/gui/e-week-view-main-item.c:348
+#: 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 ""
+msgstr "%b %d"
#. String to use in 12-hour time format for times in the morning.
#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
msgid "am"
-msgstr ""
+msgstr "am"
#. String to use in 12-hour time format for times in the afternoon.
#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
msgid "pm"
-msgstr ""
+msgstr "pm"
-#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3345
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-day-view.c:3452 calendar/gui/e-week-view.c:3305
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3355
#: ui/evolution-calendar.xml.h:17
msgid "Go to _Today"
-msgstr ""
+msgstr "转移到今天(T)"
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3307
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3357
msgid "_Go to Date..."
-msgstr ""
+msgstr "转移到日期(G)..."
-#: calendar/gui/e-day-view.c:3463 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3365
msgid "_Delete this Appointment"
-msgstr ""
+msgstr "删除该约会(D)"
-#: calendar/gui/e-day-view.c:3482 calendar/gui/e-week-view.c:3340
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3390
msgid "Make this Occurrence _Movable"
-msgstr ""
+msgstr "使该事件可移动(M)"
-#: calendar/gui/e-day-view.c:3484 calendar/gui/e-week-view.c:3342
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3392
msgid "Delete this _Occurrence"
-msgstr ""
+msgstr "删除该时间(O)"
-#: calendar/gui/e-day-view.c:3486 calendar/gui/e-week-view.c:3344
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3394
msgid "Delete _All Occurrences"
-msgstr ""
+msgstr "删除所有事件(A)"
-#: calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1183
msgid "Calendar file could not be updated!\n"
-msgstr ""
+msgstr "无法更新日历文件!\n"
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1185
msgid "Update complete\n"
-msgstr ""
+msgstr "更新完成\n"
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1230
msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
+msgstr "因为非法状态而无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1238
msgid "Attendee status ould not be updated!\n"
-msgstr ""
+msgstr "无法更新参与者状态!\n"
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1240
msgid "Attendee status updated\n"
-msgstr ""
+msgstr "更新参与者状态\n"
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1242
msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
+msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1270
msgid "I couldn't remove the item from your calendar file!\n"
-msgstr ""
+msgstr "我无法从您的日历文件删除条目!\n"
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1272
msgid "Removal Complete"
-msgstr ""
+msgstr "删除完成"
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1304 calendar/gui/e-itip-control.c:1338
msgid "Item sent!\n"
-msgstr ""
+msgstr "项目已发送!\n"
-#: calendar/gui/e-itip-control.c:1205 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1306 calendar/gui/e-itip-control.c:1342
msgid "The item could not be sent!\n"
-msgstr ""
+msgstr "无法发送项目!\n"
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1506
msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+msgstr "无法在参与者列表中找到您的任何身份!\n"
#: calendar/gui/e-itip-control.glade.h:2
#, no-c-format
@@ -4366,106 +4349,96 @@ msgstr ""
#: calendar/gui/e-itip-control.glade.h:4
msgid "Calendar Message"
-msgstr ""
+msgstr "日历消息"
#: calendar/gui/e-itip-control.glade.h:5
msgid "Date:"
-msgstr ""
+msgstr "日期:"
#: calendar/gui/e-itip-control.glade.h:7
msgid "Loading Calendar"
-msgstr ""
+msgstr "正在装入日历"
#: calendar/gui/e-itip-control.glade.h:8
msgid "Loading calendar..."
-msgstr ""
+msgstr "正在装入日历..."
#: calendar/gui/e-itip-control.glade.h:10
msgid "Server Message:"
-msgstr ""
+msgstr "服务器消息:"
#: calendar/gui/e-itip-control.glade.h:12
msgid "date-end"
-msgstr ""
+msgstr "日期-结束"
#: calendar/gui/e-itip-control.glade.h:13
msgid "date-start"
-msgstr ""
+msgstr "日期-开始"
-#: calendar/gui/e-meeting-model.c:216 calendar/gui/e-meeting-model.c:233
-#: calendar/gui/e-meeting-model.c:517 calendar/gui/e-meeting-model.c:685
+#: calendar/gui/e-meeting-model.c:218 calendar/gui/e-meeting-model.c:235
+#: calendar/gui/e-meeting-model.c:519
msgid "Individual"
-msgstr ""
+msgstr "个人"
-#: calendar/gui/e-meeting-model.c:218 calendar/gui/e-meeting-model.c:235
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:220 calendar/gui/e-meeting-model.c:237
msgid "Group"
-msgstr ""
+msgstr "组"
-#: calendar/gui/e-meeting-model.c:220 calendar/gui/e-meeting-model.c:237
-#: calendar/gui/e-meeting-model.c:687
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:239
msgid "Resource"
-msgstr ""
+msgstr "资源"
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:239
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:224 calendar/gui/e-meeting-model.c:241
msgid "Room"
-msgstr ""
+msgstr "房间"
-#: calendar/gui/e-meeting-model.c:241 calendar/gui/e-meeting-model.c:276
-#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:689
-#: calendar/gui/e-meeting-model.c:705
-#: camel/providers/smtp/camel-smtp-transport.c:223
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: calendar/gui/e-meeting-model.c:243 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:343
+#: 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 ""
+msgstr "未知"
-#: calendar/gui/e-meeting-model.c:251 calendar/gui/e-meeting-model.c:268
-#: calendar/gui/e-meeting-model.c:701
+#: calendar/gui/e-meeting-model.c:253 calendar/gui/e-meeting-model.c:270
msgid "Chair"
-msgstr ""
+msgstr "主席"
-#: calendar/gui/e-meeting-model.c:253 calendar/gui/e-meeting-model.c:270
-#: calendar/gui/e-meeting-model.c:519 calendar/gui/e-meeting-model.c:702
+#: calendar/gui/e-meeting-model.c:255 calendar/gui/e-meeting-model.c:272
+#: calendar/gui/e-meeting-model.c:521
msgid "Required Participant"
-msgstr ""
+msgstr "必需的参与者"
-#: calendar/gui/e-meeting-model.c:255 calendar/gui/e-meeting-model.c:272
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:274
msgid "Optional Participant"
-msgstr ""
+msgstr "可选的参与者"
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:274
-#: calendar/gui/e-meeting-model.c:704
+#: calendar/gui/e-meeting-model.c:259 calendar/gui/e-meeting-model.c:276
msgid "Non-Participant"
-msgstr ""
+msgstr "不参加"
-#: calendar/gui/e-meeting-model.c:303 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:527 calendar/gui/e-meeting-model.c:730
+#: calendar/gui/e-meeting-model.c:305 calendar/gui/e-meeting-model.c:328
+#: calendar/gui/e-meeting-model.c:529
msgid "Needs Action"
-msgstr ""
+msgstr "需要动作"
-#: calendar/gui/e-meeting-model.c:305 calendar/gui/e-meeting-model.c:328
-#: calendar/gui/e-meeting-model.c:731
+#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
msgid "Accepted"
-msgstr ""
+msgstr "接受"
-#: calendar/gui/e-meeting-model.c:307 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:732
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:332
msgid "Declined"
-msgstr ""
+msgstr "否决"
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:332
-#: calendar/gui/e-meeting-model.c:733 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:334
+#: calendar/gui/e-meeting-time-sel.c:408
msgid "Tentative"
msgstr ""
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:334
-#: calendar/gui/e-meeting-model.c:734
+#: calendar/gui/e-meeting-model.c:313 calendar/gui/e-meeting-model.c:336
msgid "Delegated"
msgstr ""
-#: calendar/gui/e-meeting-model.c:315 calendar/gui/e-meeting-model.c:338
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-meeting-model.c:340
msgid "In Process"
msgstr ""
@@ -4476,422 +4449,427 @@ msgstr ""
#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1417
#: calendar/gui/e-meeting-model.c:1464
msgid "Required Participants"
-msgstr ""
+msgstr "必需的参与者"
#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1466
msgid "Optional Participants"
-msgstr ""
+msgstr "可选的参与者"
#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1468
msgid "Non-Participants"
-msgstr ""
+msgstr "不参加"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:473
-#: calendar/gui/e-meeting-time-sel.c:1944
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:2023
msgid "%A, %B %d, %Y"
-msgstr ""
+msgstr "%Y年%B月%d日 %A"
#. 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:477
-#: calendar/gui/e-meeting-time-sel.c:1972 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:2053 e-util/e-time-utils.c:186
#: e-util/e-time-utils.c:345
msgid "%a %m/%d/%Y"
-msgstr ""
+msgstr "%Y年%m月%d日 %a"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:481 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1576
msgid "%m/%d/%Y"
-msgstr ""
+msgstr "%Y年%m月%d日"
-#: calendar/gui/e-meeting-time-sel.c:402
+#: calendar/gui/e-meeting-time-sel.c:410
msgid "Out of Office"
-msgstr ""
+msgstr "办公室以外"
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:411
msgid "No Information"
-msgstr ""
+msgstr "没有信息"
-#: calendar/gui/e-meeting-time-sel.c:419
+#: calendar/gui/e-meeting-time-sel.c:427
msgid "_Invite Others..."
-msgstr ""
+msgstr "邀请其他人(I)..."
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:447
msgid "_Options"
-msgstr ""
+msgstr "选项(O)"
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:464
msgid "Show _Only Working Hours"
-msgstr ""
+msgstr "只显示工作小时(O)"
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:477
msgid "Show _Zoomed Out"
-msgstr ""
+msgstr "显示缩放的输出(Z)"
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:495
msgid "_Update Free/Busy"
-msgstr ""
+msgstr "更新忙/闲(U)"
-#: calendar/gui/e-meeting-time-sel.c:505
+#: calendar/gui/e-meeting-time-sel.c:513
msgid "_<<"
-msgstr ""
+msgstr "_<<"
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:530
msgid "_Autopick"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:544
msgid ">_>"
-msgstr ""
+msgstr ">_>"
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:561
msgid "_All People and Resources"
-msgstr ""
+msgstr "所有人和资源(A)"
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:574
msgid "All _People and One Resource"
-msgstr ""
+msgstr "所有人和一个资源(P)"
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:587
msgid "_Required People"
-msgstr ""
+msgstr "必需的人(R)"
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:600
msgid "Required People and _One Resource"
-msgstr ""
+msgstr "必需的人和一个资源(O)"
-#: calendar/gui/e-meeting-time-sel.c:615
+#: calendar/gui/e-meeting-time-sel.c:623
msgid "Meeting _start time:"
-msgstr ""
+msgstr "会议开始时间(S):"
-#: calendar/gui/e-meeting-time-sel.c:634
+#: calendar/gui/e-meeting-time-sel.c:642
msgid "Meeting _end time:"
-msgstr ""
+msgstr "会议结束时间(E):"
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:328
#, c-format
msgid "Opening tasks at %s"
-msgstr ""
+msgstr "在 %s 打开任务"
-#: calendar/gui/e-tasks.c:356
+#: calendar/gui/e-tasks.c:355
#, c-format
msgid "Could not load the tasks in `%s'"
-msgstr ""
+msgstr "无法从‘%s’中装入任务"
-#: calendar/gui/e-tasks.c:368
+#: calendar/gui/e-tasks.c:367
#, c-format
msgid "The method required to load `%s' is not supported"
-msgstr ""
+msgstr "不支持装入‘%s’必需的方法"
-#: calendar/gui/e-week-view.c:3293 calendar/gui/e-week-view.c:3331
+#: calendar/gui/e-week-view.c:3343 calendar/gui/e-week-view.c:3381
msgid "New _Appointment..."
-msgstr ""
+msgstr "新约会(A)"
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1315
#, c-format
msgid "Could not open the folder in `%s'"
-msgstr ""
+msgstr "无法打开‘%s’中的文件夹"
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1326
#, c-format
msgid "The method required to open `%s' is not supported"
-msgstr ""
+msgstr "不支持打开‘%s’必需的方法"
-#: calendar/gui/gnome-cal.c:1678
+#: calendar/gui/gnome-cal.c:1681
#, c-format
msgid "Opening calendar at %s"
-msgstr ""
+msgstr "从 %s 打开日历"
#: calendar/gui/goto-dialog.glade.h:1
msgid "April"
-msgstr ""
+msgstr "四月"
#: calendar/gui/goto-dialog.glade.h:2
msgid "August"
-msgstr ""
+msgstr "八月"
#: calendar/gui/goto-dialog.glade.h:3
msgid "December"
-msgstr ""
+msgstr "十二月"
#: calendar/gui/goto-dialog.glade.h:4
msgid "February"
-msgstr ""
+msgstr "二月"
#: calendar/gui/goto-dialog.glade.h:5
msgid "Go To Date"
-msgstr ""
+msgstr "转移到日期"
#: calendar/gui/goto-dialog.glade.h:6
msgid "Go To Today"
-msgstr ""
+msgstr "转移到今天"
#: calendar/gui/goto-dialog.glade.h:7
msgid "January"
-msgstr ""
+msgstr "一月"
#: calendar/gui/goto-dialog.glade.h:8
msgid "July"
-msgstr ""
+msgstr "七月"
#: calendar/gui/goto-dialog.glade.h:9
msgid "June"
-msgstr ""
+msgstr "六月"
#: calendar/gui/goto-dialog.glade.h:10
msgid "March"
-msgstr ""
+msgstr "三月"
#: calendar/gui/goto-dialog.glade.h:11
msgid "May"
-msgstr ""
+msgstr "五月"
#: calendar/gui/goto-dialog.glade.h:12
msgid "November"
-msgstr ""
+msgstr "十一月"
#: calendar/gui/goto-dialog.glade.h:13
msgid "October"
-msgstr ""
+msgstr "十月"
#: calendar/gui/goto-dialog.glade.h:14
msgid "September"
-msgstr ""
+msgstr "九月"
-#: calendar/gui/itip-utils.c:244
+#: calendar/gui/itip-utils.c:243
msgid "Atleast one attendee is necessary"
-msgstr ""
+msgstr "需要至少一个参加者"
-#: calendar/gui/itip-utils.c:275
+#: calendar/gui/itip-utils.c:274
msgid "An organizer must be set."
-msgstr ""
+msgstr "必须设定组织者。"
-#: calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:570
msgid "You must be an attendee of the event."
-msgstr ""
+msgstr "您必须是事件的参与者。"
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:91
msgid "Could not create the component editor factory"
-msgstr ""
+msgstr "无法创建组件编辑器车间"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
msgid "1st"
-msgstr ""
+msgstr "一号"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
msgid "2nd"
-msgstr ""
+msgstr "二号"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
msgid "3rd"
-msgstr ""
+msgstr "三号"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
msgid "4th"
-msgstr ""
+msgstr "四号"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:425
msgid "5th"
-msgstr ""
+msgstr "五号"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
msgid "6th"
-msgstr ""
+msgstr "六号"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
msgid "7th"
-msgstr ""
+msgstr "七号"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
msgid "8th"
-msgstr ""
+msgstr "八号"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
msgid "9th"
-msgstr ""
+msgstr "九号"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:426
msgid "10th"
-msgstr ""
+msgstr "十号"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
msgid "11th"
-msgstr ""
+msgstr "十一号"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
msgid "12th"
-msgstr ""
+msgstr "十二号"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
msgid "13th"
-msgstr ""
+msgstr "十三号"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
msgid "14th"
-msgstr ""
+msgstr "十四号"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:427
msgid "15th"
-msgstr ""
+msgstr "十五号"
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
msgid "16th"
-msgstr ""
+msgstr "十六号"
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
msgid "17th"
-msgstr ""
+msgstr "十七号"
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
msgid "18th"
-msgstr ""
+msgstr "十八号"
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
msgid "19th"
-msgstr ""
+msgstr "十九号"
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:428
msgid "20th"
-msgstr ""
+msgstr "二十号"
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
msgid "21st"
-msgstr ""
+msgstr "二十一号"
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
msgid "22nd"
-msgstr ""
+msgstr "二十二号"
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
msgid "23rd"
-msgstr ""
+msgstr "二十三号"
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
msgid "24th"
-msgstr ""
+msgstr "二十四号"
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:429
msgid "25th"
-msgstr ""
+msgstr "二十五号"
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
msgid "26th"
-msgstr ""
+msgstr "二十六号"
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
msgid "27th"
-msgstr ""
+msgstr "二十七号"
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
msgid "28th"
-msgstr ""
+msgstr "二十八号"
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
msgid "29th"
-msgstr ""
+msgstr "二十九号"
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:430
msgid "30th"
-msgstr ""
+msgstr "三十号"
-#: calendar/gui/print.c:432
+#: calendar/gui/print.c:431
msgid "31st"
-msgstr ""
+msgstr "三十一号"
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
msgid "Su"
-msgstr ""
+msgstr "日"
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
msgid "Mo"
-msgstr ""
+msgstr "一"
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
msgid "Tu"
-msgstr ""
+msgstr "二"
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:498
msgid "We"
-msgstr ""
+msgstr "三"
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
msgid "Th"
-msgstr ""
+msgstr "四"
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
msgid "Fr"
-msgstr ""
+msgstr "五"
-#: calendar/gui/print.c:500
+#: calendar/gui/print.c:499
msgid "Sa"
-msgstr ""
+msgstr "六"
#. Day
-#: calendar/gui/print.c:1831
+#: calendar/gui/print.c:1830
msgid "Selected day (%a %b %d %Y)"
-msgstr ""
+msgstr "选中的日期 (%Y年%b月%d日 %a)"
-#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
+#: calendar/gui/print.c:1849 calendar/gui/print.c:1853
msgid "%a %b %d"
-msgstr ""
+msgstr "%b月%d日 %a"
-#: calendar/gui/print.c:1851
+#: calendar/gui/print.c:1850
msgid "%a %d %Y"
-msgstr ""
+msgstr "%Y年%d日 %a"
-#: calendar/gui/print.c:1855 calendar/gui/print.c:1857
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1854 calendar/gui/print.c:1856
+#: calendar/gui/print.c:1857
msgid "%a %b %d %Y"
-msgstr ""
+msgstr "%Y年%b月%d日 %a"
-#: calendar/gui/print.c:1862
+#: calendar/gui/print.c:1861
#, c-format
msgid "Selected week (%s - %s)"
-msgstr ""
+msgstr "选中的周 (%s - %s)"
#. Month
-#: calendar/gui/print.c:1870
+#: calendar/gui/print.c:1869
msgid "Selected month (%b %Y)"
-msgstr ""
+msgstr "选中的月 (%Y年%b月)"
#. Year
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1876
msgid "Selected year (%Y)"
-msgstr ""
+msgstr "选中的年 (%Y年)"
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2385
msgid "Print Calendar"
-msgstr ""
+msgstr "打印日历"
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2218 my-evolution/e-summary.c:607
+#: calendar/gui/print.c:2476 calendar/gui/print.c:2568
+#: mail/mail-callbacks.c:2306 my-evolution/e-summary.c:614
#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
msgid "Print Preview"
-msgstr ""
+msgstr "打印预览"
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2505
msgid "Print Item"
-msgstr ""
+msgstr "打印项"
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2586
msgid "Print Setup"
-msgstr ""
+msgstr "打印设置"
-#: calendar/gui/tasks-control.c:127
+#: calendar/gui/tasks-control.c:126
msgid "The URI of the tasks folder to display"
-msgstr ""
+msgstr "要显示的任务文件夹的 URI"
+
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"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 ""
-#: calendar/gui/tasks-migrate.c:109
+#: calendar/gui/tasks-migrate.c:108
msgid ""
"Evolution has tried to take the tasks that were in your calendar folder and "
"migrate them to the new tasks folder.\n"
@@ -4899,125 +4877,125 @@ msgid ""
"again in the future."
msgstr ""
-#: calendar/gui/tasks-migrate.c:121
+#: calendar/gui/tasks-migrate.c:120
#, c-format
msgid ""
"Could not open `%s'; no items from the calendar folder will be migrated to "
"the tasks folder."
msgstr ""
-#: calendar/gui/tasks-migrate.c:134
+#: calendar/gui/tasks-migrate.c:133
#, c-format
msgid ""
"The method required to load `%s' is not supported; no items from the "
"calendar folder will be migrated to the tasks folder."
msgstr ""
-#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
+#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
msgid "SMTWTFS"
msgstr ""
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:234
msgid "time-now expects 0 arguments"
-msgstr ""
+msgstr "time-now 需要 0 个参数"
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:258
msgid "make-time expects 1 argument"
-msgstr ""
+msgstr "make-time 需要 1 个参数"
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:263
msgid "make-time expects argument 1 to be a string"
-msgstr ""
+msgstr "make-time 的第一个参数应该是字符串"
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:271
msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
+msgstr "make-time 的第一个参数必须是 ISO 8601 日期/时间字符串"
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:300
msgid "time-add-day expects 2 arguments"
-msgstr ""
+msgstr "time-add-day 需要 2 个参数"
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:305
msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
+msgstr "time-add-day 的第一个参数应该是 time_t"
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:312
msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
+msgstr "time-add-day 的第二个参数应该是整数"
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:339
msgid "time-day-begin expects 1 argument"
-msgstr ""
+msgstr "time-day-begin 需要 1 个参数"
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:344
msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr ""
+msgstr "time-day-begin 的第一个参数应该是 time_t"
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:371
msgid "time-day-end expects 1 argument"
-msgstr ""
+msgstr "time-day-end 需要一个参数"
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:376
msgid "time-day-end expects argument 1 to be a time_t"
-msgstr ""
+msgstr "time-day-end 的第一个参数应该是 time_t"
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:412
msgid "get-vtype expects 0 arguments"
-msgstr ""
+msgstr "get-vtype 需要 0 个参数"
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:508
msgid "occur-in-time-range? expects 2 arguments"
-msgstr ""
+msgstr "occur-in-time-range? 需要两个参数"
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:513
msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr ""
+msgstr "occur-in-time-range? 的第一个参数应该是 time_t"
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:520
msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr ""
+msgstr "occur-in-time-rang? 的第二个参数应该是 time_t"
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:650
msgid "contains? expects 2 arguments"
-msgstr ""
+msgstr "contains? 需要 2 个参数"
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:655
msgid "contains? expects argument 1 to be a string"
-msgstr ""
+msgstr "contains? 的第一个参数应该是字符串"
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:662
msgid "contains? expects argument 2 to be a string"
-msgstr ""
+msgstr "contains? 的第二个参数应该是字符串"
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:679
msgid ""
"contains? expects argument 1 to be one of \"any\", \"summary\", "
"\"description\""
-msgstr ""
+msgstr "contains? 的第一个参数必须是“任意”、“概要”、“描述”之一"
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:721
msgid "has-categories? expects at least 1 argument"
-msgstr ""
+msgstr "has-categories? 至少需要 1 个参数"
-#: calendar/pcs/query.c:730
+#: 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 ""
+msgstr "has-categories? 的所有参数都应该为字符串或者它唯一的参数为布尔假 (#f)"
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:821
msgid "is-completed? expects 0 arguments"
-msgstr ""
+msgstr "is-completed? 需要 0 个参数"
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:866
msgid "completed-before? expects 1 argument"
-msgstr ""
+msgstr "completed-before? 需要 1 个参数"
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:871
msgid "completed-before? expects argument 1 to be a time_t"
-msgstr ""
+msgstr "completed-before? 的第一个参数应该是 time_t"
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1159
msgid "Evaluation of the search expression did not yield a boolean value"
msgstr ""
@@ -5041,7 +5019,7 @@ msgstr ""
msgid "Decryption is not supported by this cipher"
msgstr ""
-#: camel/camel-disco-diary.c:181
+#: camel/camel-disco-diary.c:180
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -5049,7 +5027,7 @@ msgid ""
"reconnect to the network."
msgstr ""
-#: camel/camel-disco-diary.c:244
+#: camel/camel-disco-diary.c:243
#, c-format
msgid ""
"Could not open `%s':\n"
@@ -5057,7 +5035,7 @@ msgid ""
"Changes made to this folder will not be resynchronized."
msgstr ""
-#: camel/camel-disco-diary.c:278
+#: camel/camel-disco-diary.c:277
msgid "Resynchronizing with server"
msgstr ""
@@ -5065,94 +5043,94 @@ msgstr ""
msgid "You must be working online to complete this operation"
msgstr ""
-#: camel/camel-filter-driver.c:552 camel/camel-filter-driver.c:561
+#: camel/camel-filter-driver.c:551 camel/camel-filter-driver.c:560
msgid "Syncing folders"
msgstr ""
-#: camel/camel-filter-driver.c:662
+#: camel/camel-filter-driver.c:661
msgid "Unable to open spool folder"
msgstr ""
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:670
msgid "Unable to process spool folder"
msgstr ""
-#: camel/camel-filter-driver.c:686
+#: camel/camel-filter-driver.c:685
msgid "Getting message %d (%d%%)"
msgstr ""
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
+#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:702
#, c-format
msgid "Failed on message %d"
msgstr ""
-#: camel/camel-filter-driver.c:691
+#: camel/camel-filter-driver.c:690
msgid "Cannot open message"
msgstr ""
-#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:716 camel/camel-filter-driver.c:831
msgid "Syncing folder"
msgstr ""
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:788
#, c-format
msgid "Getting message %d of %d"
msgstr ""
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:793 camel/camel-filter-driver.c:811
#, c-format
msgid "Failed at message %d of %d"
msgstr ""
-#: camel/camel-filter-driver.c:921
+#: camel/camel-filter-driver.c:920
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-driver.c:927
+#: camel/camel-filter-driver.c:926
#, c-format
msgid "Error executing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-search.c:495 camel/camel-filter-search.c:502
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr ""
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:471
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr ""
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1040
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr ""
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1080
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr ""
-#: camel/camel-folder.c:1269
+#: camel/camel-folder.c:1262
msgid "Moving messages"
msgstr ""
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:332
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
"%s"
msgstr ""
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:342
#, c-format
msgid ""
"Error executing search expression: %s:\n"
"%s"
msgstr ""
-#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
+#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
msgid "(match-all) requires a single bool result"
msgstr ""
@@ -5165,97 +5143,97 @@ msgstr ""
msgid "Invalid type in body-contains, expecting string"
msgstr ""
-#: camel/camel-lock-client.c:110
+#: camel/camel-lock-client.c:109
#, c-format
msgid "Cannot build locking helper pipe: %s"
msgstr ""
-#: camel/camel-lock-client.c:123
+#: camel/camel-lock-client.c:122
#, c-format
msgid "Cannot fork locking helper: %s"
msgstr ""
-#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#: camel/camel-lock-client.c:198 camel/camel-lock-client.c:221
#, c-format
msgid "Could not lock '%s': protocol error with lock-helper"
msgstr ""
-#: camel/camel-lock-client.c:212
+#: camel/camel-lock-client.c:211
#, c-format
msgid "Could not lock '%s'"
msgstr ""
#. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111
+#: camel/camel-lock.c:91 camel/camel-lock.c:110
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr ""
-#: camel/camel-lock.c:151
+#: camel/camel-lock.c:150
#, c-format
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr ""
-#: camel/camel-lock.c:205
+#: camel/camel-lock.c:204
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr ""
-#: camel/camel-lock.c:267
+#: camel/camel-lock.c:266
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr ""
-#: camel/camel-movemail.c:108
+#: camel/camel-movemail.c:107
#, c-format
msgid "Could not check mail file %s: %s"
msgstr ""
-#: camel/camel-movemail.c:122
+#: camel/camel-movemail.c:121
#, c-format
msgid "Could not open mail file %s: %s"
msgstr ""
-#: camel/camel-movemail.c:130
+#: camel/camel-movemail.c:129
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr ""
-#: camel/camel-movemail.c:159
+#: camel/camel-movemail.c:158
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr ""
-#: camel/camel-movemail.c:189
+#: camel/camel-movemail.c:188
#, c-format
msgid "Could not create pipe: %s"
msgstr ""
-#: camel/camel-movemail.c:201
+#: camel/camel-movemail.c:200
#, c-format
msgid "Could not fork: %s"
msgstr ""
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
#, c-format
msgid "Movemail program failed: %s"
msgstr ""
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:239
msgid "(Unknown error)"
msgstr ""
-#: camel/camel-movemail.c:263
+#: camel/camel-movemail.c:262
#, c-format
msgid "Error reading mail file: %s"
msgstr ""
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:273
#, c-format
msgid "Error writing mail temp file: %s"
msgstr ""
-#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
#, c-format
msgid "Error copying mail temp file: %s"
msgstr ""
@@ -5331,17 +5309,17 @@ msgstr ""
msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
-#: 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 ""
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:139
#, c-format
msgid "Could not load %s: %s"
msgstr ""
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:147
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr ""
@@ -5361,7 +5339,7 @@ msgid "Connection cancelled"
msgstr ""
#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/smtp/camel-smtp-transport.c:270
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr ""
@@ -5474,7 +5452,7 @@ msgid ""
msgstr ""
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:497
msgid "Bad authentication response from server."
msgstr ""
@@ -5491,8 +5469,8 @@ msgid "Unknown authentication state."
msgstr ""
#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/nntp/camel-nntp-store.c:301
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
msgid "Password"
msgstr ""
@@ -5521,55 +5499,55 @@ msgstr ""
msgid "Regular expression compilation failed: %s: %s"
msgstr ""
-#: camel/camel-service.c:158
+#: camel/camel-service.c:157
#, c-format
msgid "URL '%s' needs a username component"
msgstr ""
-#: camel/camel-service.c:166
+#: camel/camel-service.c:165
#, c-format
msgid "URL '%s' needs a host component"
msgstr ""
-#: camel/camel-service.c:174
+#: camel/camel-service.c:173
#, c-format
msgid "URL '%s' needs a path component"
msgstr ""
-#: camel/camel-service.c:612
+#: camel/camel-service.c:611
#, c-format
msgid "Resolving: %s"
msgstr ""
-#: camel/camel-service.c:639
+#: camel/camel-service.c:638
#, c-format
msgid "Failure in name lookup: %s"
msgstr ""
-#: camel/camel-service.c:664
+#: camel/camel-service.c:663
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr ""
-#: camel/camel-service.c:666
+#: camel/camel-service.c:665
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr ""
-#: camel/camel-session.c:76
+#: camel/camel-session.c:75
msgid "Virtual folder email provider"
msgstr ""
-#: camel/camel-session.c:78
+#: camel/camel-session.c:77
msgid "For reading mail as a query of another set of folders"
msgstr ""
-#: camel/camel-session.c:347 camel/camel-session.c:416
+#: camel/camel-session.c:346 camel/camel-session.c:415
#, c-format
msgid "No provider available for protocol `%s'"
msgstr ""
-#: camel/camel-session.c:533
+#: camel/camel-session.c:532
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -5617,7 +5595,7 @@ msgstr ""
msgid "Cannot get folder: Invalid operation on this store"
msgstr ""
-#: camel/camel-store.c:279
+#: camel/camel-store.c:278
msgid "Cannot create folder: Invalid operation on this store"
msgstr ""
@@ -5651,37 +5629,37 @@ msgid ""
"Country: %s"
msgstr ""
-#: camel/camel-url.c:289
+#: camel/camel-url.c:288
#, c-format
msgid "Could not parse URL `%s'"
msgstr ""
-#: camel/camel-vee-folder.c:586
+#: camel/camel-vee-folder.c:588
#, c-format
msgid "No such message %s in %s"
msgstr ""
-#: camel/camel-vee-folder.c:747
+#: camel/camel-vee-folder.c:749
#, c-format
msgid "No such message: %s"
msgstr ""
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:251
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr ""
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:286
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr ""
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:299
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr ""
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:307
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr ""
@@ -5714,57 +5692,57 @@ msgstr ""
msgid "Unexpected OK response from IMAP server: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:190
#, c-format
msgid "Could not create directory %s: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:209
#, c-format
msgid "Could not load summary for %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:273
msgid "Folder was destroyed and recreated on server."
msgstr ""
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:435
msgid "Scanning for changed messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1536
+#: camel/providers/imap/camel-imap-folder.c:1945
msgid "This message is not currently available"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1684
+#: camel/providers/imap/camel-imap-folder.c:1765
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1690
msgid "Scanning for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:1982
msgid "Could not find message body in FETCH response."
msgstr ""
-#: 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 ""
-#: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:300
-#: camel/providers/imap/camel-imap-message-cache.c:331
-#: camel/providers/imap/camel-imap-message-cache.c:363
+#: camel/providers/imap/camel-imap-message-cache.c:242
+#: camel/providers/imap/camel-imap-message-cache.c:299
+#: camel/providers/imap/camel-imap-message-cache.c:330
+#: camel/providers/imap/camel-imap-message-cache.c:362
#, c-format
msgid "Failed to cache message %s: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43
msgid "Checking for new mail"
msgstr ""
@@ -5772,7 +5750,7 @@ msgstr ""
msgid "Check for new messages in all folders"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:837
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:839
msgid "Folders"
msgstr ""
@@ -5804,28 +5782,28 @@ msgstr ""
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:520
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/imap/camel-imap-store.c:530
+#: camel/providers/smtp/camel-smtp-transport.c:386
#, c-format
msgid "No support for authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:554
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:431
+#: camel/providers/imap/camel-imap-store.c:569
+#: camel/providers/smtp/camel-smtp-transport.c:430
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:595
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -5833,177 +5811,177 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:894
#, c-format
msgid "No such folder %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1182
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:42
msgid "MH-format mail directories"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:43
msgid "For storing local mail in MH-like mail directories."
msgstr ""
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:52
msgid "Local delivery"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:53
msgid "For retrieving local mail from standard mbox formated spools."
msgstr ""
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:62
msgid "Apply filters to new messages in INBOX"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:68
msgid "Maildir-format mail directories"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:69
msgid "For storing local mail in maildir directories."
msgstr ""
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:80
msgid "Standard Unix mbox spools"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:82
+#: 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-store.c:132
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:131
+#: camel/providers/local/camel-spool-store.c:109
#, c-format
msgid "Store root %s is not an absolute path"
msgstr ""
-#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:138
#, c-format
msgid "Store root %s is not a regular directory"
msgstr ""
-#: camel/providers/local/camel-local-store.c:147
-#: camel/providers/local/camel-local-store.c:163
+#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:162
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:177
msgid "Local stores do not have an inbox"
msgstr ""
-#: camel/providers/local/camel-local-store.c:190
+#: camel/providers/local/camel-local-store.c:189
#, c-format
msgid "Local mail file %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:246
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:288
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:299
+#: camel/providers/local/camel-local-store.c:298
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:366
#, c-format
msgid "Could not save summary: %s: %s"
msgstr ""
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1158
+#: camel/providers/local/camel-local-summary.c:422
+#: camel/providers/local/camel-spool-summary.c:1157
msgid "Unable to add message to summary: unknown reason"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:182
+#: camel/providers/local/camel-maildir-folder.c:181
msgid "Maildir append message cancelled"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:184
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-maildir-folder.c:222
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-mh-folder.c:208
-#: camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:229
+#: 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
#, c-format
msgid ""
"Cannot get message: %s\n"
" %s"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:210
-#: camel/providers/local/camel-mbox-folder.c:332
-#: camel/providers/local/camel-mh-folder.c:199
-#: camel/providers/local/camel-spool-folder.c:580
+#: 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:579
msgid "No such message"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mh-folder.c:216
msgid "Invalid message contents"
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:90
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:89
#, c-format
msgid ""
"Could not open folder `%s':\n"
"%s"
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:97
+#: 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."
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-mh-store.c:102
#, c-format
msgid ""
"Could not create folder `%s':\n"
"%s"
msgstr ""
-#: 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 ""
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:127
+#: 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 ""
-#: 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:330
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr ""
@@ -6014,179 +5992,182 @@ msgstr ""
msgid "Cannot open maildir directory path: %s: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:151
+#: camel/providers/local/camel-spool-folder.c:274
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-mbox-folder.c:208
+#: camel/providers/local/camel-spool-folder.c:456
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:265
msgid "Mail append cancelled"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:268
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:393
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:392
+#: camel/providers/local/camel-spool-folder.c:595
+#: camel/providers/local/camel-spool-folder.c:627
+#: camel/providers/local/camel-spool-folder.c:640
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
" %s"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-spool-folder.c:628
msgid "The folder appears to be irrecoverably corrupted."
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:393
+#: camel/providers/local/camel-spool-folder.c:641
msgid "Message construction failed: Corrupt mailbox?"
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:94
+#: camel/providers/local/camel-mbox-store.c:93
#, c-format
msgid ""
"Could not open file `%s':\n"
"%s"
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:109
#, c-format
msgid ""
"Could not create file `%s':\n"
"%s"
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: 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 ""
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
+#: 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"
"%s"
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:152
#, c-format
msgid "Folder `%s' is not empty. Not deleted."
msgstr ""
#. 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:249
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:936
+#: 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:254
+#: 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"
-#: camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-spool-summary.c:426
+#: 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 ""
-#: camel/providers/local/camel-mbox-summary.c:371
+#: 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"
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
-#: camel/providers/local/camel-spool-summary.c:649
+#: 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"
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-spool-summary.c:673
+#: 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"
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
-#: camel/providers/local/camel-spool-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:979
-#: camel/providers/local/camel-spool-summary.c:987
+#: 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:596
-#: camel/providers/local/camel-spool-summary.c:750
+#: 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 ""
-#: camel/providers/local/camel-mbox-summary.c:613
-#: camel/providers/local/camel-spool-summary.c:772
+#: 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 ""
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
-#: camel/providers/local/camel-spool-summary.c:1037
+#: 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 ""
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:639
#, c-format
msgid "Could not close temp folder: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:650
#, c-format
msgid "Could not rename folder: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:874
-#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1111
+#: 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 ""
-#: camel/providers/local/camel-mh-folder.c:173
+#: camel/providers/local/camel-mh-folder.c:172
#, fuzzy
msgid "MH append message cancelled"
msgstr "给联系人发邮件"
-#: camel/providers/local/camel-mh-folder.c:176
+#: camel/providers/local/camel-mh-folder.c:175
#, c-format
msgid "Cannot append message to mh folder: %s: %s"
msgstr ""
-#: camel/providers/local/camel-mh-store.c:110
+#: camel/providers/local/camel-mh-store.c:109
#, c-format
msgid "`%s' is not a directory."
msgstr ""
@@ -6196,451 +6177,435 @@ msgstr ""
msgid "Cannot open MH directory path: %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:512
#, c-format
msgid "Cannot append message to spool file: %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:115
#, c-format
msgid "Spool `%s' does not exist or is not a regular file"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:142
+#: camel/providers/local/camel-spool-store.c:141
#, c-format
msgid "Folder `%s/%s' does not exist."
msgstr ""
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:163
#, c-format
msgid "Spool mail file %s"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:209
msgid "Spool folders cannot be renamed"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:217
msgid "Spool folders cannot be deleted"
msgstr ""
-#. 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-spool-summary.c:379
-msgid "Summarising folder"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spool-summary.c:789
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
+#: 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 ""
-#: camel/providers/local/camel-spool-summary.c:822
+#: camel/providers/local/camel-spool-summary.c:821
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-summary.c:852
-#: camel/providers/local/camel-spool-summary.c:870
-#: camel/providers/local/camel-spool-summary.c:882
+#: 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"
"Folder may be corrupt, copy saved in `%s'"
msgstr ""
-#: camel/providers/local/camel-spool-summary.c:941
+#: camel/providers/local/camel-spool-summary.c:940
#, c-format
msgid "Could not file: %s: %s"
msgstr ""
-#: 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 ""
-#: camel/providers/nntp/camel-nntp-auth.c:65
+#: camel/providers/nntp/camel-nntp-auth.c:64
msgid "Server rejected username"
msgstr ""
-#: camel/providers/nntp/camel-nntp-auth.c:71
+#: camel/providers/nntp/camel-nntp-auth.c:70
msgid "Failed to send username to server"
msgstr ""
-#: camel/providers/nntp/camel-nntp-auth.c:80
+#: camel/providers/nntp/camel-nntp-auth.c:79
msgid "Server rejected username/password"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:116
+#: camel/providers/nntp/camel-nntp-folder.c:115
#, c-format
msgid "Message %s not found."
msgstr ""
-#: camel/providers/nntp/camel-nntp-grouplist.c:46
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
msgid "Could not get group list from server."
msgstr ""
-#: camel/providers/nntp/camel-nntp-grouplist.c:99
-#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#: 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 ""
-#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#: camel/providers/nntp/camel-nntp-grouplist.c:158
#, c-format
msgid "Unable to save grouplist file for %s: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: camel/providers/nntp/camel-nntp-provider.c:41
msgid "USENET news"
msgstr ""
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: camel/providers/nntp/camel-nntp-provider.c:43
msgid "This is a provider for reading from and posting toUSENET newsgroups."
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:230
#, c-format
msgid "Could not open directory for news server: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:297
+#: camel/providers/nntp/camel-nntp-store.c:296
#, c-format
msgid "USENET News via %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:304
+#: camel/providers/nntp/camel-nntp-store.c:303
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:496
+#: 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 ""
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:175
msgid "Retrieving POP summary"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:181
#, c-format
msgid "Could not check POP server for new messages: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:228
msgid "Could not open folder: message listing was incomplete."
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:252
msgid "Expunging deleted messages"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:328
#, c-format
msgid "Could not fetch message: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:344
#, c-format
msgid "Could not retrieve message from POP server %s: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:367
#, c-format
msgid "No message with uid %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:371
#, c-format
msgid "Retrieving POP message %d"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:37
+#: 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:38
msgid "Leave messages on server"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:42
+#: camel/providers/pop3/camel-pop3-provider.c:41
#, c-format
msgid "Delete after %s day(s)"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
msgid "POP"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:53
+#: camel/providers/pop3/camel-pop3-provider.c:52
msgid "For connecting to and downloading mail from POP servers."
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:70
+#: 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 ""
-#: camel/providers/pop3/camel-pop3-provider.c:80
+#: 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 ""
-#: camel/providers/pop3/camel-pop3-provider.c:92
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:321
#, c-format
msgid "Could not connect to POP server on %s."
msgstr ""
-#: 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 ""
-#: 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"
"Error sending username: %s"
msgstr ""
-#: 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:409
+#: camel/providers/pop3/camel-pop3-store.c:408
msgid ""
"Unable to connect to POP server.\n"
"No support for requested authentication mechanism."
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:416
#, c-format
msgid ""
"Unable to connect to POP server.\n"
"Error sending password: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:484
+#: camel/providers/pop3/camel-pop3-store.c:483
#, c-format
msgid "No such folder `%s'."
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:567
+#: camel/providers/pop3/camel-pop3-store.c:566
#, c-format
msgid "Unexpected response from POP server: %s"
msgstr ""
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:73
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:72
msgid "Sendmail"
msgstr ""
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
msgid ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
msgstr ""
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:106
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr ""
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:123
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr ""
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:149
#, c-format
msgid "Could not send message: %s"
msgstr ""
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:162
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr ""
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:169
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr ""
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:174
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr ""
-#: 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:246
msgid "sendmail"
msgstr ""
-#: camel/providers/sendmail/camel-sendmail-transport.c:249
+#: camel/providers/sendmail/camel-sendmail-transport.c:248
msgid "Mail delivery via the sendmail program"
msgstr ""
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
msgid "SMTP"
msgstr ""
-#: 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 ""
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:169
msgid "Syntax error, command unrecognized"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:171
msgid "Syntax error in parameters or arguments"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
msgid "Command not implemented"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
msgid "Command parameter not implemented"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
msgid "System status, or system help reply"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
msgid "Help message"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
msgid "Service ready"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
msgid "Service closing transmission channel"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
msgid "Service not available, closing transmission channel"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
msgid "Requested mail action okay, completed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: 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:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
msgid "Requested mail action not taken: mailbox unavailable"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
msgid "Requested action not taken: mailbox unavailable"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
msgid "Requested action aborted: error in processing"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
msgid "User not local; please try <forward-path>"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
msgid "Requested action not taken: insufficient system storage"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: 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:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
msgid "Transaction failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
msgid "A password transition is needed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:213
msgid "Authentication mechanism is too weak"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
msgid "Encryption required for requested authentication mechanism"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
msgid "Temporary authentication failure"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
msgid "Authentication required"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:315
+#: camel/providers/smtp/camel-smtp-transport.c:314
#, c-format
msgid "Welcome response error: %s: possibly non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:376
#, c-format
msgid "SMTP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:416
+#: camel/providers/smtp/camel-smtp-transport.c:415
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:439
+#: camel/providers/smtp/camel-smtp-transport.c:438
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -6648,125 +6613,125 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:555
+#: camel/providers/smtp/camel-smtp-transport.c:554
#, c-format
msgid "SMTP server %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:556
#, c-format
msgid "SMTP mail delivery via %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:581
msgid "Cannot send message: sender address not defined."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:589
+#: camel/providers/smtp/camel-smtp-transport.c:588
msgid "Cannot send message: sender address not valid."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
msgid "Sending message"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:605
+#: camel/providers/smtp/camel-smtp-transport.c:604
msgid "Cannot send message: no recipients defined."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:684
msgid "SMTP Greeting"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:706
#, c-format
msgid "HELO request timed out: %s: non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:727
+#: camel/providers/smtp/camel-smtp-transport.c:726
#, c-format
msgid "HELO response error: %s: non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:759
+#: camel/providers/smtp/camel-smtp-transport.c:758
msgid "SMTP Authentication"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:764
msgid "Error creating SASL authentication object."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:780
-#: camel/providers/smtp/camel-smtp-transport.c:792
+#: 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 ""
-#: camel/providers/smtp/camel-smtp-transport.c:801
+#: camel/providers/smtp/camel-smtp-transport.c:800
msgid "AUTH request failed."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:849
+#: camel/providers/smtp/camel-smtp-transport.c:848
msgid "Bad authentication response from server.\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:874
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:893
#, c-format
msgid "MAIL FROM response error: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:919
+#: camel/providers/smtp/camel-smtp-transport.c:918
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:937
#, c-format
msgid "RCPT TO response error: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:971
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:990
#, c-format
msgid "DATA response error: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1031
-#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: 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 ""
-#: camel/providers/smtp/camel-smtp-transport.c:1068
+#: camel/providers/smtp/camel-smtp-transport.c:1067
#, c-format
msgid "DATA response error: message termination: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1092
+#: camel/providers/smtp/camel-smtp-transport.c:1091
#, c-format
msgid "RSET request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1110
#, c-format
msgid "RSET response error: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1134
+#: camel/providers/smtp/camel-smtp-transport.c:1133
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1152
#, c-format
msgid "QUIT response error: %s: non-fatal"
msgstr ""
@@ -6796,7 +6761,7 @@ msgid "%.1fG"
msgstr ""
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:135
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
msgid "attachment"
msgstr ""
@@ -6840,52 +6805,52 @@ msgstr ""
msgid "Suggest automatic display of attachment"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:324
+#: composer/e-msg-composer-hdrs.c:327
msgid "Click here for the address book"
msgstr ""
#.
#. * From:
#.
-#: composer/e-msg-composer-hdrs.c:355
+#: composer/e-msg-composer-hdrs.c:358
msgid "From:"
msgstr ""
#.
#. * Reply-To:
#.
-#: composer/e-msg-composer-hdrs.c:361
+#: composer/e-msg-composer-hdrs.c:364
msgid "Reply-To:"
msgstr ""
#.
#. * Subject:
#.
-#: composer/e-msg-composer-hdrs.c:372
+#: composer/e-msg-composer-hdrs.c:375
msgid "Subject:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:389
msgid "To:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:387
+#: 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:393
msgid "Cc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:391
+#: 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:397
msgid "Bcc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:395
+#: 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."
@@ -6896,107 +6861,107 @@ msgstr ""
msgid "Attach a file"
msgstr ""
-#: composer/e-msg-composer.c:678
+#: composer/e-msg-composer.c:664
#, c-format
msgid ""
"Error while reading file %s:\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:861
+#: composer/e-msg-composer.c:847
msgid "Save as..."
msgstr ""
-#: composer/e-msg-composer.c:870
+#: composer/e-msg-composer.c:856
msgid "Warning!"
msgstr ""
-#: composer/e-msg-composer.c:874
+#: composer/e-msg-composer.c:860
msgid "File exists, overwrite?"
msgstr ""
-#: composer/e-msg-composer.c:896
+#: composer/e-msg-composer.c:882
#, c-format
msgid "Error saving file: %s"
msgstr ""
-#: composer/e-msg-composer.c:915
+#: composer/e-msg-composer.c:901
#, c-format
msgid "Error loading file: %s"
msgstr ""
-#: composer/e-msg-composer.c:986
+#: composer/e-msg-composer.c:972
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
msgstr ""
-#: composer/e-msg-composer.c:1039
+#: composer/e-msg-composer.c:1025
#, c-format
msgid "Error accessing file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1033
msgid "Unable to retrieve message from editor"
msgstr ""
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1040
#, c-format
msgid ""
"Unable to seek on file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1047
#, c-format
msgid ""
"Unable to truncate file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1070
+#: composer/e-msg-composer.c:1056
#, c-format
msgid ""
"Error autosaving message: %s\n"
" %s"
msgstr ""
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1158
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
msgstr ""
-#: composer/e-msg-composer.c:1323
+#: composer/e-msg-composer.c:1309
msgid ""
"This message has not been sent.\n"
"\n"
"Do you wish to save your changes?"
msgstr ""
-#: composer/e-msg-composer.c:1330
+#: composer/e-msg-composer.c:1316
msgid "Warning: Modified Message"
msgstr ""
-#: composer/e-msg-composer.c:1353
+#: composer/e-msg-composer.c:1339
msgid "Open file"
msgstr ""
-#: composer/e-msg-composer.c:1502
+#: composer/e-msg-composer.c:1488
msgid "Insert File"
msgstr ""
-#: composer/e-msg-composer.c:1877 composer/e-msg-composer.c:2315
+#: composer/e-msg-composer.c:1863 composer/e-msg-composer.c:2303
msgid "Compose a message"
msgstr ""
-#: composer/e-msg-composer.c:2332
+#: composer/e-msg-composer.c:2320
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
msgstr ""
-#: composer/e-msg-composer.c:2355
+#: composer/e-msg-composer.c:2343
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -7012,7 +6977,7 @@ msgstr ""
msgid "Cannot initialize Evolution's composer."
msgstr ""
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
msgid "Evolution"
msgstr ""
@@ -7060,6 +7025,15 @@ msgstr ""
msgid "Subject does not contain"
msgstr ""
+#. Remember the password?
+#: e-util/e-passwords.c:347 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "记住该密码"
+
+#: e-util/e-passwords.c:349 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+msgstr "在本会话中记住该密码"
+
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:359
@@ -7131,13 +7105,13 @@ msgstr ""
#. strptime format for time of day, without seconds,
#. in 12-hour format.
#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
+#: widgets/misc/e-dateedit.c:1384 widgets/misc/e-dateedit.c:1611
msgid "%I:%M %p"
msgstr ""
#. strptime format for time of day, without seconds 24-hour format.
#: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
+#: widgets/misc/e-dateedit.c:1381 widgets/misc/e-dateedit.c:1608
msgid "%H:%M"
msgstr ""
@@ -7276,8 +7250,8 @@ msgid ""
"Please go back and specify a valid folder to deliver mail to."
msgstr ""
-#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
-#: mail/mail-account-gui.c:824
+#: filter/filter-folder.c:233 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:834
msgid "Select Folder"
msgstr ""
@@ -7525,7 +7499,7 @@ msgstr ""
msgid "Score"
msgstr ""
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1340
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1352
msgid "Sender"
msgstr ""
@@ -7557,7 +7531,7 @@ msgstr ""
msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:927
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
#: mail/message-list.etspec.h:9
msgid "Subject"
msgstr ""
@@ -7570,15 +7544,15 @@ msgstr ""
msgid "was before"
msgstr ""
-#: filter/rule-editor.c:148
+#: filter/rule-editor.c:160
msgid "Rules"
msgstr ""
-#: filter/rule-editor.c:241
+#: filter/rule-editor.c:256
msgid "Add Rule"
msgstr ""
-#: filter/rule-editor.c:302
+#: filter/rule-editor.c:321
msgid "Edit Rule"
msgstr ""
@@ -7586,98 +7560,98 @@ msgstr ""
msgid "Score Rules"
msgstr ""
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:205
msgid "You need to to specify at least one folder as a source."
msgstr ""
-#: importers/elm-importer.c:96
+#: importers/elm-importer.c:95
msgid "Evolution is importing your old Elm mail"
msgstr ""
-#: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:102
+#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/pine-importer.c:101
msgid "Importing..."
msgstr ""
-#: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:104
+#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/pine-importer.c:103
msgid "Please wait"
msgstr ""
-#: importers/elm-importer.c:171 importers/netscape-importer.c:708
-#: importers/pine-importer.c:369
+#: importers/elm-importer.c:170 importers/netscape-importer.c:707
+#: importers/pine-importer.c:368
#, c-format
msgid "Importing %s as %s"
msgstr ""
-#: importers/elm-importer.c:377 importers/netscape-importer.c:801
-#: importers/pine-importer.c:506
+#: importers/elm-importer.c:376 importers/netscape-importer.c:800
+#: importers/pine-importer.c:505
#, c-format
msgid "Scanning %s"
msgstr ""
-#: importers/elm-importer.c:528 importers/netscape-importer.c:974
-#: importers/pine-importer.c:669 mail/component-factory.c:96
+#: importers/elm-importer.c:527 importers/netscape-importer.c:973
+#: importers/pine-importer.c:668 mail/component-factory.c:96
msgid "Mail"
msgstr ""
-#: importers/elm-importer.c:548
+#: importers/elm-importer.c:547
msgid ""
"Evolution has found Elm mail files\n"
"Would you like to import them into Evolution?"
msgstr ""
-#: importers/elm-importer.c:577
+#: importers/elm-importer.c:576
msgid "Elm"
msgstr ""
-#: importers/evolution-gnomecard-importer.c:230
+#: importers/evolution-gnomecard-importer.c:229
msgid "GnomeCard:"
msgstr ""
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
+#: importers/evolution-gnomecard-importer.c:230 importers/pine-importer.c:673
msgid "Addressbook"
msgstr ""
-#: importers/evolution-gnomecard-importer.c:250
+#: importers/evolution-gnomecard-importer.c:249
msgid ""
"Evolution has found GnomeCard files.\n"
"Would you like them to be imported into Evolution?"
msgstr ""
-#: importers/netscape-importer.c:107
+#: importers/netscape-importer.c:106
msgid "Evolution is importing your old Netscape data"
msgstr ""
-#: importers/netscape-importer.c:904 importers/pine-importer.c:602
+#: importers/netscape-importer.c:903 importers/pine-importer.c:601
msgid "Scanning directory"
msgstr ""
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:912
msgid "Starting import"
msgstr ""
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:978
msgid "Settings"
msgstr ""
-#: importers/netscape-importer.c:1000
+#: importers/netscape-importer.c:999
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
msgstr ""
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:100
msgid "Evolution is importing your old Pine data"
msgstr ""
-#: importers/pine-importer.c:695
+#: importers/pine-importer.c:694
msgid ""
"Evolution has found Pine mail files.\n"
"Would you like to import them into Evolution?"
msgstr ""
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:722
msgid "Pine"
msgstr ""
@@ -7738,211 +7712,211 @@ msgstr ""
msgid "This folder cannot contain messages."
msgstr ""
-#: mail/component-factory.c:375
+#: mail/component-factory.c:377
msgid "Properties..."
msgstr ""
-#: mail/component-factory.c:375
+#: mail/component-factory.c:377
msgid "Change this folder's properties"
msgstr ""
-#: mail/component-factory.c:731
+#: mail/component-factory.c:751
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
msgstr ""
-#: mail/component-factory.c:873
+#: mail/component-factory.c:919
msgid "New Mail Message"
msgstr ""
-#: mail/component-factory.c:873
+#: mail/component-factory.c:919
msgid "New _Mail Message"
msgstr ""
-#: mail/component-factory.c:897
+#: mail/component-factory.c:943
msgid "Cannot initialize Evolution's mail component."
msgstr ""
-#: mail/component-factory.c:906
+#: mail/component-factory.c:952
msgid "Cannot initialize Evolution's mail config component."
msgstr ""
-#: mail/component-factory.c:912
+#: mail/component-factory.c:958
msgid "Cannot initialize Evolution's folder info component."
msgstr ""
-#: mail/component-factory.c:1077
+#: mail/component-factory.c:1157
msgid "Cannot register storage with shell"
msgstr ""
-#: mail/folder-browser-ui.c:270
+#: mail/folder-browser-ui.c:271
#, c-format
msgid "Properties for \"%s\""
msgstr ""
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:273
msgid "Properties"
msgstr ""
-#: mail/folder-browser.c:275 mail/mail-display.c:301
+#: mail/folder-browser.c:292 mail/mail-display.c:298
#, c-format
msgid "Could not create temporary directory: %s"
msgstr ""
-#: mail/folder-browser.c:747
+#: mail/folder-browser.c:764
#, c-format
msgid "%d new"
msgstr ""
-#: mail/folder-browser.c:750 mail/folder-browser.c:755
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:767 mail/folder-browser.c:772
+#: mail/folder-browser.c:794
msgid ", "
msgstr ""
-#: mail/folder-browser.c:751
+#: mail/folder-browser.c:768
#, c-format
msgid "%d hidden"
msgstr ""
-#: mail/folder-browser.c:756
+#: mail/folder-browser.c:773
#, c-format
msgid "%d selected"
msgstr ""
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:796
#, c-format
msgid "%d unsent"
msgstr ""
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:798
#, c-format
msgid "%d sent"
msgstr ""
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:800
#, c-format
msgid "%d total"
msgstr ""
-#: mail/folder-browser.c:1032
+#: mail/folder-browser.c:1046
msgid "Create vFolder from Search"
msgstr ""
-#: mail/folder-browser.c:1413
+#: mail/folder-browser.c:1427
msgid "VFolder on _Subject"
msgstr ""
-#: mail/folder-browser.c:1414
+#: mail/folder-browser.c:1428
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1429
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1430
msgid "VFolder on Mailing _List"
msgstr ""
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1434
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1435
msgid "Filter on Sen_der"
msgstr ""
-#: mail/folder-browser.c:1422
+#: mail/folder-browser.c:1436
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/folder-browser.c:1423
+#: mail/folder-browser.c:1437
msgid "Filter on _Mailing List"
msgstr ""
-#: mail/folder-browser.c:1431 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
msgid "_Edit as New Message..."
msgstr ""
-#: mail/folder-browser.c:1432 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
msgid "_Save As..."
msgstr ""
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1447
msgid "_Print"
msgstr ""
-#: mail/folder-browser.c:1437 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
msgid "_Reply to Sender"
msgstr ""
-#: mail/folder-browser.c:1438 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
msgid "Reply to _List"
msgstr ""
-#: mail/folder-browser.c:1439 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
msgid "Reply to _All"
msgstr ""
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1454
msgid "_Forward"
msgstr ""
-#: mail/folder-browser.c:1442 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
msgid "Mar_k as Read"
msgstr ""
-#: mail/folder-browser.c:1443 ui/evolution-mail-message.xml.h:44
+#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
msgid "Mark as U_nread"
msgstr ""
-#: mail/folder-browser.c:1444
+#: mail/folder-browser.c:1458
msgid "Mark as _Important"
msgstr ""
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1459
msgid "Mark as Unim_portant"
msgstr ""
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1463
msgid "_Move to Folder..."
msgstr ""
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1464
msgid "_Copy to Folder..."
msgstr ""
-#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
msgid "_Undelete"
msgstr ""
-#: mail/folder-browser.c:1456
+#: mail/folder-browser.c:1470
msgid "Add Sender to Address Book"
msgstr ""
-#: mail/folder-browser.c:1459
+#: mail/folder-browser.c:1473
msgid "Apply Filters"
msgstr ""
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1475
msgid "Create Ru_le From Message"
msgstr ""
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1625
msgid "Filter on Mailing List"
msgstr ""
-#: mail/folder-browser.c:1612
+#: mail/folder-browser.c:1626
msgid "VFolder on Mailing List"
msgstr ""
-#: mail/folder-browser.c:1614
+#: mail/folder-browser.c:1628
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr ""
-#: mail/folder-browser.c:1615
+#: mail/folder-browser.c:1629
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr ""
@@ -8020,22 +7994,22 @@ msgstr ""
msgid "Evolution Account Editor"
msgstr ""
-#: mail/mail-account-gui.c:949
+#: mail/mail-account-gui.c:959
msgid "Could not save signature file."
msgstr ""
-#: mail/mail-account-gui.c:1026
+#: mail/mail-account-gui.c:1036
msgid "Save signature"
msgstr ""
-#: mail/mail-account-gui.c:1032
+#: mail/mail-account-gui.c:1042
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
"Do you wish to save your changes?"
msgstr ""
-#: mail/mail-account-gui.c:1617
+#: mail/mail-account-gui.c:1629
msgid "You may not create two accounts with the same name."
msgstr ""
@@ -8051,52 +8025,52 @@ msgstr ""
msgid "Enable"
msgstr ""
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
msgid "Are you sure you want to delete this account?"
msgstr ""
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
msgid "Don't delete"
msgstr ""
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
msgid "Really delete account?"
msgstr ""
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
msgid "Are you sure you want to delete this news account?"
msgstr ""
#. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:44
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
msgid "Mail Settings"
msgstr ""
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:69
#, c-format
msgid "Mail to %s"
msgstr ""
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:212
#, c-format
msgid "Subject is %s"
msgstr ""
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:228
#, c-format
msgid "Mail from %s"
msgstr ""
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:284
#, c-format
msgid "%s mailing list"
msgstr ""
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:334 mail/mail-autofilter.c:355
msgid "Add Filter Rule"
msgstr ""
-#: mail/mail-callbacks.c:140
+#: mail/mail-callbacks.c:137
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -8104,123 +8078,123 @@ msgid ""
"Would you like to configure it now?"
msgstr ""
-#: mail/mail-callbacks.c:192
+#: mail/mail-callbacks.c:186
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
msgstr ""
-#: mail/mail-callbacks.c:207
+#: mail/mail-callbacks.c:200
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
msgstr ""
-#: mail/mail-callbacks.c:236
+#: mail/mail-callbacks.c:230
msgid "You have not set a mail transport method"
msgstr ""
#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:265
msgid ""
"You are sending an HTML-formatted message, but the following recipients do "
"not want HTML-formatted mail:\n"
msgstr ""
-#: mail/mail-callbacks.c:285
+#: mail/mail-callbacks.c:280
msgid "Send anyway?"
msgstr ""
-#: mail/mail-callbacks.c:327
+#: mail/mail-callbacks.c:322
msgid ""
"This message has no subject.\n"
"Really send?"
msgstr ""
-#: mail/mail-callbacks.c:371
+#: 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:375
+#: mail/mail-callbacks.c:370
msgid "This message contains only Bcc recipients."
msgstr ""
-#: mail/mail-callbacks.c:379
+#: mail/mail-callbacks.c:374
msgid ""
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
"Send anyway?"
msgstr ""
-#: mail/mail-callbacks.c:473
+#: mail/mail-callbacks.c:468
msgid "This message contains invalid recipients:"
msgstr ""
-#: mail/mail-callbacks.c:508
+#: mail/mail-callbacks.c:503
msgid "You must specify recipients in order to send this message."
msgstr ""
-#: mail/mail-callbacks.c:604
+#: mail/mail-callbacks.c:599
msgid "You must configure an account before you can send this email."
msgstr ""
-#: mail/mail-callbacks.c:840
+#: mail/mail-callbacks.c:836
msgid "an unknown sender"
msgstr ""
-#: mail/mail-callbacks.c:845
+#: mail/mail-callbacks.c:841
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr ""
-#: mail/mail-callbacks.c:1240
+#: mail/mail-callbacks.c:1239
msgid "Move message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1242
+#: mail/mail-callbacks.c:1241
msgid "Copy message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1657
+#: mail/mail-callbacks.c:1701
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1726
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
msgstr ""
-#: mail/mail-callbacks.c:1715
+#: mail/mail-callbacks.c:1765
msgid ""
"You may only resend messages\n"
"in the Sent folder."
msgstr ""
-#: mail/mail-callbacks.c:1729
+#: mail/mail-callbacks.c:1779
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:1752
+#: mail/mail-callbacks.c:1805
msgid "No Message Selected"
msgstr ""
-#: mail/mail-callbacks.c:1840
+#: mail/mail-callbacks.c:1899
msgid "Save Message As..."
msgstr ""
-#: mail/mail-callbacks.c:1842
+#: mail/mail-callbacks.c:1901
msgid "Save Messages As..."
msgstr ""
-#: mail/mail-callbacks.c:1987 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2070 widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr ""
-#: mail/mail-callbacks.c:1994
+#: mail/mail-callbacks.c:2077
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -8228,30 +8202,30 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/mail-callbacks.c:2001
+#: mail/mail-callbacks.c:2084
msgid "Do not ask me again."
msgstr ""
-#: mail/mail-callbacks.c:2106
+#: mail/mail-callbacks.c:2192
#, c-format
msgid ""
"Error loading filter information:\n"
"%s"
msgstr ""
-#: mail/mail-callbacks.c:2118
+#: mail/mail-callbacks.c:2204
msgid "Filters"
msgstr ""
-#: mail/mail-callbacks.c:2179
+#: mail/mail-callbacks.c:2267
msgid "Print Message"
msgstr ""
-#: mail/mail-callbacks.c:2225
+#: mail/mail-callbacks.c:2313
msgid "Printing of message failed"
msgstr ""
-#: mail/mail-callbacks.c:2316
+#: mail/mail-callbacks.c:2415
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr ""
@@ -8326,58 +8300,58 @@ msgid "(SSL is not supported in this build of evolution)"
msgstr ""
#: mail/mail-config.glade.h:4
-msgid "Account"
+msgid "A_lways encrypt to myself when sending encrypted mail"
msgstr ""
#: mail/mail-config.glade.h:5
-msgid "Account Information"
+msgid "Account"
msgstr ""
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
+#: mail/mail-config.glade.h:6
+msgid "Account Information"
msgstr ""
-#: mail/mail-config.glade.h:7
-msgid "Accounts"
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Account Management"
msgstr ""
#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
+msgid "Accounts"
msgstr ""
#: mail/mail-config.glade.h:9
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _encrypt to myself when sending encrypted mail"
msgstr ""
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
-msgid "Attachment"
+#: mail/mail-config.glade.h:10
+msgid "Always _sign outgoing messages when using this account"
msgstr ""
-#: mail/mail-config.glade.h:11
-msgid "Authentication"
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+msgid "Attachment"
msgstr ""
#: mail/mail-config.glade.h:12
-msgid "Authentication Type: "
+msgid "Authentication"
msgstr ""
#: mail/mail-config.glade.h:13
-msgid "Certificate ID:"
+msgid "Checking for New Mail"
msgstr ""
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
msgid "Composer"
msgstr ""
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
msgid "Configuration"
msgstr ""
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
msgid "Confirm when Expunging a folder"
msgstr ""
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -8387,330 +8361,356 @@ msgid ""
"Click \"Finish\" to save your settings."
msgstr ""
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
msgid "De_fault"
msgstr ""
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
msgid "Default Forward style is: "
msgstr ""
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
msgid "Default character encoding: "
msgstr ""
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
msgid "Digital IDs..."
msgstr ""
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
msgid "Display"
msgstr ""
-#: mail/mail-config.glade.h:30 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:31
+#: mail/mail-config.glade.h:30
msgid "Drafts"
msgstr ""
-#: mail/mail-config.glade.h:32
-msgid "Drafts folder:"
-msgstr ""
-
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:31
msgid "E_nable"
msgstr ""
-#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:103
msgid "Edit..."
msgstr ""
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:33
msgid "Enabled"
msgstr ""
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:34
msgid "Get Digital ID..."
msgstr ""
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:35
msgid "HTML signature file:"
msgstr ""
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:36
msgid "IMAPv4 "
msgstr ""
-#: mail/mail-config.glade.h:39 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:40
+#: mail/mail-config.glade.h:38
msgid "In HTML mail"
msgstr ""
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:39
msgid "Inline"
msgstr ""
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:40
msgid "Kerberos "
msgstr ""
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:41
msgid "Mail Configuration"
msgstr ""
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:43
msgid "Mailbox location"
msgstr ""
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:44
msgid "Make this my _default account"
msgstr ""
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:45
msgid "NNTP Server:"
msgstr ""
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:46
msgid "News"
msgstr ""
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:48
msgid "Optional Information"
msgstr ""
-#: mail/mail-config.glade.h:52
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
msgstr ""
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
msgid "Pick a color"
msgstr ""
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:54
msgid "Pretty Good Privacy"
msgstr ""
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:55
msgid "Prompt when sending HTML messages to contacts that don't want them"
msgstr ""
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
msgid "Prompt when sending messages with an _empty subject"
msgstr ""
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
msgid "Prompt when sending messages with only _Bcc recipients defined"
msgstr ""
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
msgid "Qmail maildir "
msgstr ""
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
msgid "Quoted"
msgstr ""
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "记住该密码"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
msgid "Receiving Email"
msgstr ""
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
msgid "Receiving Mail"
msgstr ""
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
msgid "Receiving Options"
msgstr ""
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
msgid "Required Information"
msgstr ""
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:66
msgid "Secure MIME"
msgstr ""
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
msgid "Security"
msgstr ""
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
msgid "Select Filter Log file..."
msgstr ""
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:69
msgid "Select PGP binary"
msgstr ""
-#: mail/mail-config.glade.h:71 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:72
+#: mail/mail-config.glade.h:71
msgid "Sending Mail"
msgstr ""
-#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
msgid "Sent"
msgstr ""
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "把邮件保存到文件夹中"
+
#: mail/mail-config.glade.h:75
msgid "Sent and Draft Messages"
msgstr ""
#: mail/mail-config.glade.h:76
-msgid "Sent messages folder:"
-msgstr ""
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "(_m)我的服务器需要认证"
#: mail/mail-config.glade.h:77
msgid "Server Configuration"
msgstr ""
#: mail/mail-config.glade.h:78
-msgid "Server Type: "
-msgstr ""
+#, fuzzy
+msgid "Server _Type: "
+msgstr "服务器: %s,类型: %s"
#: mail/mail-config.glade.h:79
-msgid "Server requires _authentication"
-msgstr ""
-
-#: mail/mail-config.glade.h:80
msgid "Signature file:"
msgstr ""
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:80
msgid "Source"
msgstr ""
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
msgid "Source Information"
msgstr ""
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
msgid "Sources"
msgstr ""
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
msgid "Special Folders"
msgstr ""
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
msgid "Standard Unix mbox"
msgstr ""
-#: mail/mail-config.glade.h:87
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:86
+msgid "Use s_ecure connection (SSL)"
msgstr ""
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
"Click \"Next\" to begin. "
msgstr ""
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
msgid "_Always load images off the net"
msgstr ""
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
#: mail/mail-config.glade.h:93
-msgid "_Automatically check for new mail every"
+msgid "_Authentication Type: "
msgstr ""
#: mail/mail-config.glade.h:94
-msgid "_Check for supported types"
+msgid "_Automatically check for new mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:95
+msgid "_Certificate ID:"
msgstr ""
#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "含有子文件夹"
+
+#: mail/mail-config.glade.h:99
msgid "_Email Address:"
msgstr ""
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
msgid "_Empty trash folders on exit"
msgstr ""
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
msgid "_Full Name:"
msgstr ""
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:102
msgid "_HTML Signature:"
msgstr ""
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
msgid "_Highlight citations with"
msgstr ""
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
msgid "_Host:"
msgstr ""
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
msgid "_Load images if sender is in addressbook"
msgstr ""
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
msgid "_Log filter actions to:"
msgstr ""
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
msgid "_Mark messages as Read after"
msgstr ""
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
msgid "_Name:"
msgstr ""
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:109
msgid "_Never load images off the net"
msgstr ""
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:110
msgid "_Organization:"
msgstr ""
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
msgid "_PGP binary path:"
msgstr ""
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
msgid "_Path:"
msgstr ""
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
msgid "_Remember this password"
msgstr ""
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
msgid "_Send mail in HTML format by default."
msgstr ""
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "服务器: %s,类型: %s"
+
+#: mail/mail-config.glade.h:116
msgid "_Signature file:"
msgstr ""
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
msgid "_Username:"
msgstr ""
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
+msgid "_every"
+msgstr ""
+
+#: mail/mail-config.glade.h:119
msgid "description"
msgstr ""
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:121
msgid "newswindow1"
msgstr ""
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:122
msgid "placeholder"
msgstr ""
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:123
msgid "seconds."
msgstr ""
@@ -8750,151 +8750,127 @@ msgstr ""
msgid "Could not create a S/MIME decode context."
msgstr ""
-#: mail/mail-display.c:246
+#: mail/mail-display.c:243
msgid "Save Attachment"
msgstr ""
-#: mail/mail-display.c:353
+#: mail/mail-display.c:350
msgid "Save to Disk..."
msgstr ""
-#: mail/mail-display.c:355
+#: mail/mail-display.c:352
msgid "View Inline"
msgstr ""
-#: mail/mail-display.c:357
+#: mail/mail-display.c:354
#, c-format
msgid "Open in %s..."
msgstr ""
-#: mail/mail-display.c:418
+#: mail/mail-display.c:415
#, c-format
msgid "View Inline (via %s)"
msgstr ""
-#: mail/mail-display.c:422
+#: mail/mail-display.c:419
msgid "Hide"
msgstr ""
-#: mail/mail-display.c:443
+#: mail/mail-display.c:440
msgid "External Viewer"
msgstr ""
-#: mail/mail-display.c:1108
+#: mail/mail-display.c:1133
msgid "Loading message content"
msgstr ""
-#: mail/mail-display.c:1590
+#: mail/mail-display.c:1615
msgid "Open Link in Browser"
msgstr "在浏览器中打开连接"
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1617
msgid "Copy Link Location"
msgstr "复制连接位置"
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1620
msgid "Save Link as (FIXME)"
msgstr "连接保存为 (FIXME)"
-#: mail/mail-display.c:1598
+#: mail/mail-display.c:1623
msgid "Save Image as..."
msgstr "图像保存为..."
-#: mail/mail-format.c:629
+#: mail/mail-format.c:631
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: mail/mail-format.c:682
+#: mail/mail-format.c:676
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 邮件。显示源文本。"
-#: mail/mail-format.c:766
+#: mail/mail-format.c:760
msgid "Date"
msgstr "日期"
-#: mail/mail-format.c:868
+#: mail/mail-format.c:862
msgid "Bad Address"
msgstr "无效地址"
-#: mail/mail-format.c:909 mail/message-list.etspec.h:3
+#: mail/mail-format.c:904 mail/message-list.etspec.h:3
msgid "From"
msgstr "来自"
-#: mail/mail-format.c:912
+#: mail/mail-format.c:907
msgid "Reply-To"
msgstr "回复到"
-#: mail/mail-format.c:916 mail/message-list.etspec.h:10
+#: mail/mail-format.c:911 mail/message-list.etspec.h:10
msgid "To"
msgstr "到"
-#: mail/mail-format.c:920
+#: mail/mail-format.c:915
msgid "Cc"
msgstr "转发"
-#: mail/mail-format.c:924
+#: mail/mail-format.c:919
msgid "Bcc"
msgstr ""
-#: mail/mail-format.c:1371
-msgid "No GPG/PGP program configured."
-msgstr "没有配置 GPG/PGP 程序。"
-
-#: mail/mail-format.c:1387
-msgid "Encrypted message not displayed"
-msgstr "没有显示加密邮件"
-
-#: mail/mail-format.c:1398
-msgid "Encrypted message"
-msgstr "加密邮件"
-
-#: mail/mail-format.c:1399
-msgid "Click icon to decrypt."
-msgstr "点击图标以便解密。"
-
-#: mail/mail-format.c:1454
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1465
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2077
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
-#: mail/mail-format.c:2156
+#: mail/mail-format.c:2091
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:2161
+#: mail/mail-format.c:2096
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2125
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
-#: mail/mail-format.c:2198
+#: mail/mail-format.c:2133
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
-#: mail/mail-format.c:2203
+#: mail/mail-format.c:2138
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:589
+#: mail/mail-local.c:620
msgid "Reconfiguring folder"
msgstr "正在重新配置文件夹"
-#: mail/mail-local.c:670
+#: mail/mail-local.c:701
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
@@ -8903,27 +8879,27 @@ msgstr ""
"无法保存文件夹元信息;您可能不再\n"
"能够打开该文件夹:%s"
-#: mail/mail-local.c:723
+#: mail/mail-local.c:754
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr "无法把文件夹元信息保存到 %s: %s"
-#: mail/mail-local.c:769
+#: mail/mail-local.c:800
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr "无法删除文件夹元信息 %s: %s"
-#: mail/mail-local.c:1136
+#: mail/mail-local.c:1213
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr ""
-#: mail/mail-local.c:1151
+#: mail/mail-local.c:1228
#, c-format
msgid "%s may not be reconfigured because it is not a local folder"
msgstr ""
-#: mail/mail-local.c:1173
+#: mail/mail-local.c:1250
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
@@ -8931,56 +8907,38 @@ msgstr ""
"如果您无法打开该邮件箱,\n"
"那么您可能必需手工修复它。"
-#: mail/mail-local.c:1262
+#: mail/mail-local.c:1339
msgid "You cannot change the format of a non-local folder."
msgstr "您不能改变远程文件夹的格式。"
-#: mail/mail-local.c:1271
+#: mail/mail-local.c:1348
#, c-format
msgid "Reconfigure /%s"
msgstr "重新配置 /%s"
-#: mail/mail-mt.c:224
+#: mail/mail-mt.c:251
#, c-format
msgid ""
"Error while '%s':\n"
"%s"
msgstr ""
-#: mail/mail-mt.c:227
+#: mail/mail-mt.c:254
#, c-format
msgid ""
"Error while performing operation:\n"
"%s"
msgstr ""
-#. Remember the password?
-#: mail/mail-mt.c:553
-msgid "Remember this password"
-msgstr "记住该密码"
-
-#: mail/mail-mt.c:554
-msgid "Remember this password for the remainder of this session"
-msgstr "在本会话中记住该密码"
-
-#: mail/mail-mt.c:611
-#, c-format
-msgid "Enter Password for %s"
-msgstr "为 %s 输入密码"
-
-#: mail/mail-mt.c:614
-msgid "Enter Password"
-msgstr "输入密码"
-
-#: mail/mail-mt.c:1064
+#: mail/mail-mt.c:893
msgid "Working"
msgstr "正在工作"
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:85
msgid "Filtering Folder"
msgstr "正在过滤文件夹"
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:248
msgid "Fetching Mail"
msgstr "正在收取邮件"
@@ -8993,100 +8951,100 @@ msgstr "可是,邮件已经成功发送。"
msgid "Sending \"%s\""
msgstr "正在发送“%s”"
-#: mail/mail-ops.c:675
+#: mail/mail-ops.c:676
#, c-format
msgid "Sending message %d of %d"
msgstr ""
-#: mail/mail-ops.c:694
+#: mail/mail-ops.c:695
#, c-format
msgid "Failed on message %d of %d"
msgstr ""
-#: mail/mail-ops.c:696 mail/mail-send-recv.c:525
+#: mail/mail-ops.c:697 mail/mail-send-recv.c:537
msgid "Complete."
msgstr "完成。"
-#: mail/mail-ops.c:789
+#: mail/mail-ops.c:790
msgid "Saving message to folder"
msgstr "把邮件保存到文件夹中"
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:870
#, c-format
msgid "Moving messages to %s"
msgstr "把邮件移动到 %s"
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:870
#, c-format
msgid "Copying messages to %s"
msgstr "把邮件复制到 %s"
-#: mail/mail-ops.c:891
+#: mail/mail-ops.c:892
#, c-format
msgid "Cannot copy a folder `%s' to itself"
msgstr "无法把文件夹‘%s’复制到它本身"
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:899
msgid "Moving"
msgstr "正在移动"
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:902
msgid "Copying"
msgstr "正在复制"
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1012
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "正在“%s”中扫描文件夹"
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1195
msgid "Forwarded messages"
msgstr "已转发邮件"
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1238
#, c-format
msgid "Opening folder %s"
msgstr "正在打开文件夹 %s"
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1310
#, c-format
msgid "Opening store %s"
msgstr ""
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1379
#, c-format
msgid "Removing folder %s"
msgstr "正在删除文件夹‘%s’"
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1473
#, c-format
msgid "Storing folder '%s'"
msgstr "正在存储文件夹‘%s’"
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1524
msgid "Refreshing folder"
msgstr "正在刷新文件夹"
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1560
msgid "Expunging folder"
msgstr ""
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1609
#, c-format
msgid "Retrieving message %s"
msgstr "正在检索邮件 %s"
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1676
#, c-format
msgid "Retrieving %d message(s)"
msgstr "正在检索 %d 个邮件"
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1762
#, c-format
msgid "Saving %d messsage(s)"
msgstr "正在保存 %d 个邮件"
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1874
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -9095,18 +9053,18 @@ msgstr ""
"无法创建输出文件: %s\n"
" %s"
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1902
#, c-format
msgid ""
"Error saving messages to: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:1976
msgid "Saving attachment"
msgstr "正在保存附件"
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:1992
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -9115,17 +9073,17 @@ msgstr ""
"无法创建输出文件: %s:\n"
" %s"
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2023
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据: %s"
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2092
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2093
#, c-format
msgid "Reconnecting to %s"
msgstr "重新与 %s 连接"
@@ -9134,91 +9092,100 @@ msgstr "重新与 %s 连接"
msgid "_Search"
msgstr "(_s)搜索"
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
msgid "(Untitled Message)"
msgstr ""
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
msgid "Untitled Message"
msgstr ""
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
msgid "Empty Message"
msgstr "空邮件"
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
msgid "Find in Message"
msgstr "在邮件中寻找"
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
msgid "Case Sensitive"
msgstr "大小写敏感"
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
msgid "Search Forward"
msgstr "向前搜索"
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
msgid "Find:"
msgstr "寻找:"
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
msgid "Matches:"
msgstr "匹配:"
-#: mail/mail-send-recv.c:140
+#: mail/mail-send-recv.c:141
msgid "Cancelling..."
msgstr "正在取消..."
-#: mail/mail-send-recv.c:244
+#: mail/mail-send-recv.c:245
#, c-format
msgid "Server: %s, Type: %s"
msgstr "服务器: %s,类型: %s"
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:247
#, c-format
msgid "Path: %s, Type: %s"
msgstr "路径: %s,类型: %s"
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:249
#, c-format
msgid "Type: %s"
msgstr "类型: %s"
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:286
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
msgid "Cancel All"
msgstr "全部取消"
-#: mail/mail-send-recv.c:336
+#: mail/mail-send-recv.c:348
msgid "Updating..."
msgstr "正在更新..."
-#: mail/mail-send-recv.c:337 mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
msgid "Waiting..."
msgstr "正在等待..."
-#: mail/mail-send-recv.c:521
+#: mail/mail-send-recv.c:533
msgid "Cancelled."
msgstr "已取消"
-#: mail/mail-session.c:166
+#: mail/mail-session.c:211
msgid "User canceled operation."
msgstr "用户己取消操作。"
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, c-format
+msgid "Enter Password for %s"
+msgstr "为 %s 输入密码"
+
+#: mail/mail-session.c:313
+msgid "Enter Password"
+msgstr "输入密码"
+
+#: mail/mail-tools.c:248
#, c-format
msgid "Forwarded message - %s"
msgstr "已转发邮件 - %s"
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
msgid "Forwarded message"
msgstr "已转发邮件"
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
msgid "Forwarded Message"
msgstr "已转发邮件"
@@ -9241,24 +9208,24 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-vfolder.c:735
+#: mail/mail-vfolder.c:784
msgid "Edit VFolder"
msgstr "编辑虚拟文件夹"
-#: mail/mail-vfolder.c:750
+#: mail/mail-vfolder.c:799
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr "试图编辑并不存在的虚拟文件夹‘%s’。"
-#: mail/mail-vfolder.c:804
+#: mail/mail-vfolder.c:853
msgid "New VFolder"
msgstr "新建虚拟文件夹"
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
msgid "(No subject)"
msgstr "(没有主题)"
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
#, c-format
msgid "%s - Message"
msgstr ""
@@ -9404,31 +9371,31 @@ msgstr "(_u)退订"
msgid "Evolution component for the executive summary."
msgstr ""
-#: my-evolution/component-factory.c:45
+#: my-evolution/component-factory.c:44
msgid "Folder containing the Evolution Summary"
msgstr "含有 Evolution 概要的文件夹"
-#: my-evolution/component-factory.c:154
+#: my-evolution/component-factory.c:153
msgid "Cannot initialize Evolution's Summary component."
msgstr "无法初始化 Evolution 的概要成员。"
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
msgid "Appointments"
msgstr "约会"
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:341
msgid "No appointments"
msgstr "没有约会"
-#: my-evolution/e-summary-calendar.c:363
+#: my-evolution/e-summary-calendar.c:377
msgid "%k:%M %d %B"
msgstr ""
-#: my-evolution/e-summary-calendar.c:365
+#: my-evolution/e-summary-calendar.c:379
msgid "%l:%M %d %B"
msgstr ""
-#: my-evolution/e-summary-mail.c:130
+#: my-evolution/e-summary-mail.c:129
msgid "Mail summary"
msgstr "邮件概要"
@@ -9436,7 +9403,7 @@ msgstr "邮件概要"
#. see in My Evolution by default. You can find the list of all
#. stations and their codes in Evolution sources
#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-preferences.c:79
msgid "KBOS:ZSAM:EGAA"
msgstr ""
@@ -9460,32 +9427,32 @@ msgstr ""
msgid "Name:"
msgstr ""
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1488
msgid "Summary Settings"
msgstr ""
-#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
#: my-evolution/e-summary-rdf.c:415
msgid "Error downloading RDF"
msgstr ""
-#: my-evolution/e-summary-rdf.c:527
+#: my-evolution/e-summary-rdf.c:528
msgid "News Feed"
msgstr ""
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:246
msgid "No tasks"
msgstr ""
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:285
msgid "(No Description)"
msgstr ""
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:71
msgid "My Weather"
msgstr ""
-#: my-evolution/e-summary-weather.c:349
+#: my-evolution/e-summary-weather.c:348
msgid "<dd><b>The weather server could not be contacted</b></dd>"
msgstr ""
@@ -9497,27 +9464,27 @@ msgstr "天气"
#. see in My Evolution by default. You can find the list of all
#. stations and their codes in Evolution sources
#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:650
+#: my-evolution/e-summary-weather.c:661
msgid "KBOS:EGAA:RJTT"
msgstr ""
-#: my-evolution/e-summary-weather.c:711
+#: my-evolution/e-summary-weather.c:722
msgid "Regions"
msgstr "区域"
-#: my-evolution/e-summary.c:187
+#: my-evolution/e-summary.c:193
msgid "%A, %B %e %Y"
msgstr ""
-#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
msgid "Print Summary"
msgstr "打印概要"
-#: my-evolution/e-summary.c:614
+#: my-evolution/e-summary.c:621
msgid "Printing of Summary failed"
msgstr "打印概要失败"
-#: my-evolution/main.c:67
+#: my-evolution/main.c:66
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr ""
@@ -10673,7 +10640,7 @@ msgid " _Remove"
msgstr "(_r)删除"
#: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
msgstr ""
#: my-evolution/my-evolution.glade.h:3
@@ -10796,11 +10763,11 @@ msgstr "显示细节"
msgid "Cancel Operation"
msgstr "取消操作"
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
msgid "Evolution installation"
msgstr "安装 Evolution"
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
msgid ""
"This new version of Evolution needs to install additional files\n"
"into your personal Evolution directory"
@@ -10808,15 +10775,15 @@ msgstr ""
"该新版本的 Evolution 需要把附件文件\n"
"安装到您的私人 Evolution 目录"
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
msgstr "请点击“确认”以安装文件,或者点击“取消”以便退出。"
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
msgid "Could not update files correctly"
msgstr "无法正确地更新文件"
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -10827,7 +10794,7 @@ msgstr ""
"%s\n"
"错误: %s"
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
#, c-format
msgid ""
"An error occurred in copying files into\n"
@@ -10836,7 +10803,7 @@ msgstr ""
"在把文件复制到‘%s’\n"
"时发生错误。"
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -10844,7 +10811,7 @@ msgid ""
"of the Evolution user files."
msgstr ""
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
msgid ""
"Evolution has detected an old\n"
"Executive-Summary directory.\n"
@@ -10853,7 +10820,7 @@ msgid ""
"Do you want me to remove this directory?"
msgstr ""
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -10861,6 +10828,19 @@ msgid ""
"to allow installation of the Evolution user files."
msgstr ""
+#: shell/e-shell-about-box.c:40
+#, fuzzy
+msgid "Evolution "
+msgstr "(_w)Evolution 窗口"
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
#: shell/e-shell-folder-commands.c:176
msgid "Cannot move a folder over itself."
msgstr ""
@@ -10911,7 +10891,7 @@ msgstr "删除“%s”"
msgid "Are you sure you want to remove the \"%s\" folder?"
msgstr "您确认您要删除文件夹“%s”?"
-#: shell/e-shell-folder-commands.c:456
+#: shell/e-shell-folder-commands.c:488
#, c-format
msgid ""
"Cannot rename folder:\n"
@@ -10920,15 +10900,21 @@ msgstr ""
"无法重命名文件夹:\n"
"%s"
-#: shell/e-shell-folder-commands.c:489
+#: shell/e-shell-folder-commands.c:536
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
-#: shell/e-shell-folder-commands.c:492
+#: shell/e-shell-folder-commands.c:542
msgid "Rename folder"
msgstr "重命名文件夹"
+#: 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:111
#, c-format
msgid ""
@@ -10938,32 +10924,11 @@ msgstr ""
"无法创建指定的文件夹:\n"
"%s"
-#: shell/e-shell-folder-creation-dialog.c:126
-msgid "No folder name specified."
-msgstr "没有指定文件夹名称。"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr "文件夹名称不能含有回车符。"
-
-#: shell/e-shell-folder-creation-dialog.c:137
-msgid "Folder cannot contain the directory separator."
-msgstr "文件夹名称不能含有目录分隔符。"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr "‘.’和‘..’是保留的文件夹名称。"
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "指定的文件夹名称不合法: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
msgid "Evolution - Create new folder"
msgstr "Evolution - 创建新文件夹"
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
msgid ""
"The type of the selected folder is not valid for\n"
"the requested operation."
@@ -10971,19 +10936,19 @@ msgstr ""
"文件夹的类型对于请求的\n"
"操作来说是不合法的。"
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
msgid "New..."
msgstr "正在新建..."
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
msgid "(Untitled)"
msgstr ""
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
msgid "Choose the type of importer to run"
msgstr ""
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -10992,13 +10957,13 @@ msgid ""
"to work it out."
msgstr ""
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
msgid "Please select the information that you would like to import"
msgstr "请选择您希望导入的信息"
#. Importer isn't ready yet.
#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:242
+#: shell/e-shell-importer.c:243
#, c-format
msgid ""
"Importing %s\n"
@@ -11009,7 +10974,7 @@ msgstr ""
"导入没有就绪。\n"
"请 5 秒中以后再试。"
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
#, c-format
msgid ""
"Importing %s\n"
@@ -11018,27 +10983,27 @@ msgstr ""
"正在导入 %s\n"
"正在导入项目 %d。"
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:397
#, c-format
msgid "File %s does not exist"
msgstr "文件 %s 不存在"
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
msgid "You may only import to local folders"
msgstr "您只能导入到本地文件夹"
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
#, c-format
msgid ""
"There is no importer that is able to handle\n"
"%s"
msgstr ""
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
msgid "Importing"
msgstr "正在导入"
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
#, c-format
msgid ""
"Importing %s.\n"
@@ -11047,17 +11012,17 @@ msgstr ""
"正在导入 %s。\n"
"正在起动 %s"
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
#, c-format
msgid "Error starting %s"
msgstr "启动 %s 错误"
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
#, c-format
msgid "Error loading %s"
msgstr "装入 %s 错误"
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
#, c-format
msgid ""
"Importing %s\n"
@@ -11066,31 +11031,31 @@ msgstr ""
"正在导入 %s\n"
"正在导入项目 1。"
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
msgid "Automatic"
msgstr ""
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
msgid "Filename:"
msgstr "文件名:"
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
msgid "Select a file"
msgstr "选择一个文件"
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
msgid "File type:"
msgstr "文件类型:"
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
msgid "Import data and settings from older programs"
msgstr "从老版程序中导入数据和设置"
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:656
msgid "Import a single file"
msgstr "导入单个文件"
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:576
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:576
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -11098,41 +11063,48 @@ msgstr ""
"请等待...\n"
"正在扫描现有设置"
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:579
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:579
msgid "Starting Intelligent Importers"
msgstr "启动只能导入器"
-#: shell/e-shell-importer.c:846 shell/e-shell-startup-wizard.c:700
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:702
#, c-format
msgid "From %s:"
msgstr "从 %s:"
-#: shell/e-shell-importer.c:1009
+#: shell/e-shell-importer.c:1011
msgid "Select folder"
msgstr "选择文件夹"
-#: shell/e-shell-importer.c:1010
+#: shell/e-shell-importer.c:1012
msgid "Select a destination folder for importing this data"
msgstr "为导入的数据选择目标文件夹"
-#: shell/e-shell-importer.c:1122 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:193
msgid "Import"
msgstr "导入"
-#: shell/e-shell-offline-handler.c:560
+#: shell/e-shell-offline-handler.c:572
msgid "Closing connections..."
msgstr "关闭联接..."
-#: shell/e-shell-startup-wizard.c:160 shell/e-shell-startup-wizard.c:169
-#, c-format
+#: shell/e-shell-startup-wizard.c:159
+#, fuzzy, c-format
msgid ""
-"(%s:%d)Could not start the Evolution Mailer Assistant interface\n"
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr ""
+"(%s:%d)无法启动 Evolution 邮件助手界面\n"
"%s"
+
+#: shell/e-shell-startup-wizard.c:169
+#, fuzzy
+msgid "Could not start the Evolution Mailer Assistant interface\n"
msgstr ""
"(%s:%d)无法启动 Evolution 邮件助手界面\n"
"%s"
-#: shell/e-shell-startup-wizard.c:742
+#: shell/e-shell-startup-wizard.c:744
msgid ""
"Please select the information\n"
"that you would like to import"
@@ -11140,11 +11112,11 @@ msgstr ""
"请选择您希望\n"
"导入的信息"
-#: shell/e-shell-view-menu.c:166
+#: 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:174
+#: shell/e-shell-view-menu.c:173
msgid "Bug buddy could not be run."
msgstr "无法运行 Bug buddy。"
@@ -11153,83 +11125,77 @@ msgstr "无法运行 Bug buddy。"
msgid "About Ximian Evolution"
msgstr "关于 Ximian Evolution..."
-#: shell/e-shell-view-menu.c:411
+#: shell/e-shell-view-menu.c:409
msgid "Go to folder..."
msgstr "转移到文件夹..."
-#: shell/e-shell-view-menu.c:412
+#: shell/e-shell-view-menu.c:410
msgid "Select the folder that you want to open"
msgstr "选择您希望打开的文件夹"
-#: shell/e-shell-view-menu.c:532
+#: shell/e-shell-view-menu.c:530
msgid "Create a new shortcut"
msgstr "创建新快捷方式"
-#: shell/e-shell-view-menu.c:533
+#: 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:564
+#: shell/e-shell-view-menu.c:562
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr ""
-#: shell/e-shell-view-menu.c:572
+#: shell/e-shell-view-menu.c:570
#, c-format
msgid "Error executing %s."
msgstr "执行 %s 错误。"
-#: shell/e-shell-view-menu.c:674
-msgid "Work Online"
+#: shell/e-shell-view-menu.c:672
+#, fuzzy
+msgid "_Work Online"
msgstr "在线工作"
-#: shell/e-shell-view-menu.c:687 shell/e-shell-view-menu.c:700
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "(_w)离线工作"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
msgid "Work Offline"
msgstr "离线工作"
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:213
msgid "(No folder displayed)"
msgstr "(未显示文件夹)"
-#: shell/e-shell-view.c:1585
+#: shell/e-shell-view.c:1587
#, c-format
msgid "%s (%d)"
msgstr ""
-#: shell/e-shell-view.c:1587
+#: shell/e-shell-view.c:1589
msgid "(None)"
msgstr ""
-#: shell/e-shell-view.c:1592
-#, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr ""
-
-#: shell/e-shell-view.c:1594
-#, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr ""
-
-#: shell/e-shell-view.c:1634
+#: shell/e-shell-view.c:1636
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
-#: shell/e-shell-view.c:1641
+#: shell/e-shell-view.c:1643
msgid "Ximian Evolution is in the process of going offline."
msgstr "Ximian Evolution 正在离线过程中。"
-#: shell/e-shell-view.c:1647
+#: shell/e-shell-view.c:1649
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
-#: shell/e-shell.c:608
+#: shell/e-shell.c:653
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr ""
-#: shell/e-shell.c:1552
+#: shell/e-shell.c:1659
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -11237,35 +11203,35 @@ msgid ""
"in order to access that data again."
msgstr ""
-#: shell/e-shell.c:1775 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:248
msgid "OK"
msgstr "确定"
-#: shell/e-shell.c:1777
+#: shell/e-shell.c:1886
msgid "Invalid arguments"
msgstr "非法参数"
-#: shell/e-shell.c:1779
+#: shell/e-shell.c:1888
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: shell/e-shell.c:1781
+#: shell/e-shell.c:1890
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
-#: shell/e-shell.c:1783 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
msgid "Generic error"
msgstr "通用错误"
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
msgid "Create new shortcut group"
msgstr "创建新快捷方式组"
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
msgid "Group name:"
msgstr "组名:"
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
#, c-format
msgid ""
"Do you really want to remove group\n"
@@ -11274,115 +11240,115 @@ msgstr ""
"您真的希望从快捷方式条\n"
"上删除‘%s’组吗?"
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
msgid "Don't remove"
msgstr "不要删除"
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
msgid "Rename Shortcut Group"
msgstr "重命名快捷方式组"
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
msgid "Rename selected shortcut group to:"
msgstr "把选中的快捷方式组重命名为:"
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
msgid "_Small Icons"
msgstr "(_s)小图标"
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
msgid "Show the shortcuts as small icons"
msgstr "用小图标显示快捷方式"
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
msgid "_Large Icons"
msgstr "(_l)大图标"
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
msgid "Show the shortcuts as large icons"
msgstr "用大图标显示快捷方式"
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
msgid "_New Group..."
msgstr "(_n)新组..."
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
msgid "Create a new shortcut group"
msgstr "创建新快捷方式组"
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
msgid "_Remove this Group..."
msgstr "(_r)删除该组..."
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
msgid "Remove this shortcut group"
msgstr "删除该快捷方式组"
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
msgid "Re_name this Group..."
msgstr "(_n)重命名该组..."
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:246
msgid "Rename this shortcut group"
msgstr "重命名该快捷方式组"
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
msgid "_Hide the Shortcut Bar"
msgstr "(_h)隐藏快捷方式条"
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
msgid "Hide the shortcut bar"
msgstr "营长快捷方式条"
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:371
msgid "Rename shortcut"
msgstr "重命名快捷方式"
-#: shell/e-shortcuts-view.c:373
+#: shell/e-shortcuts-view.c:372
msgid "Rename selected shortcut to:"
msgstr "把快捷方式重命名为:"
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
msgid "Open the folder linked to this shortcut"
msgstr "打开连接到该快捷方式的文件夹"
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
msgid "Open in New _Window"
msgstr "(_w)在新窗口中打开"
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
msgid "Open the folder linked to this shortcut in a new window"
msgstr "在新窗口中打开连接到该快捷方式的文件夹"
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
msgid "_Rename"
msgstr "(_r)重命名"
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:389
msgid "Rename this shortcut"
msgstr "重命名该快捷方式"
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
msgid "Re_move"
msgstr "(_m)删除"
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
msgid "Remove this shortcut from the shortcut bar"
msgstr "从快捷方式条上删除该快捷方式"
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
msgid "Error saving shortcuts."
msgstr "保存快捷方式错误。"
-#: shell/e-shortcuts.c:1044
+#: shell/e-shortcuts.c:1043
msgid "Shortcuts"
msgstr "快捷方式"
-#: shell/e-shortcuts.c:1053
+#: shell/e-shortcuts.c:1052
msgid "Inbox"
msgstr "收件箱"
-#: shell/e-storage-set-view.c:645
+#: shell/e-storage-set-view.c:644
#, c-format
msgid ""
"Cannot transfer folder:\n"
@@ -11391,134 +11357,134 @@ msgstr ""
"无法转移文件夹:\n"
"%s"
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
msgid "(No name)"
msgstr "(未命名)"
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
msgid "No error"
msgstr "无错误"
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
msgid "A folder with the same name already exists"
msgstr "已经有一个同名文件夹存在"
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
msgid "The specified folder type is not valid"
msgstr "指定的文件夹类型非法"
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
msgid "I/O error"
msgstr "输入输出错误"
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
msgid "Not enough space to create the folder"
msgstr "没有足够的空间创建文件夹"
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
msgid "The folder is not empty"
msgstr "文件夹不为空"
-#: shell/e-storage.c:513
+#: shell/e-storage.c:512
msgid "The specified folder was not found"
msgstr "找不到指定的文件夹"
-#: shell/e-storage.c:515
+#: shell/e-storage.c:514
msgid "Function not implemented in this storage"
msgstr ""
-#: shell/e-storage.c:519
+#: shell/e-storage.c:518
msgid "Operation not supported"
msgstr "不支持的操作"
-#: shell/e-storage.c:521
+#: shell/e-storage.c:520
msgid "The specified type is not supported in this storage"
msgstr ""
-#: shell/e-storage.c:523
+#: shell/e-storage.c:522
msgid "The specified folder cannot be modified or removed"
msgstr "无法修改或删除指定的文件夹"
-#: shell/e-storage.c:525
+#: shell/e-storage.c:524
msgid "Cannot make a folder a child of one of its descendants"
msgstr ""
-#: shell/e-storage.c:527
+#: shell/e-storage.c:526
msgid "Cannot create a folder with that name"
msgstr "无法以那个名字创建文件夹"
-#: shell/e-task-widget.c:192
+#: shell/e-task-widget.c:191
#, c-format
msgid "%s (...)"
msgstr "%s (...)"
-#: shell/e-task-widget.c:197
+#: shell/e-task-widget.c:196
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
-#: shell/evolution-shell-component.c:946
+#: shell/evolution-shell-component.c:973
msgid "CORBA error"
msgstr "CORBA 错误"
-#: shell/evolution-shell-component.c:948
+#: shell/evolution-shell-component.c:975
msgid "Interrupted"
msgstr "被中断"
-#: shell/evolution-shell-component.c:950
+#: shell/evolution-shell-component.c:977
msgid "Invalid argument"
msgstr "非法参数"
-#: shell/evolution-shell-component.c:952
+#: shell/evolution-shell-component.c:979
msgid "Already has an owner"
msgstr "已经有所有者了"
-#: shell/evolution-shell-component.c:954
+#: shell/evolution-shell-component.c:981
msgid "No owner"
msgstr "无所有者"
-#: shell/evolution-shell-component.c:956
+#: shell/evolution-shell-component.c:983
msgid "Not found"
msgstr "没找到"
-#: shell/evolution-shell-component.c:958
+#: shell/evolution-shell-component.c:985
msgid "Unsupported type"
msgstr "不支持的类型"
-#: shell/evolution-shell-component.c:960
+#: shell/evolution-shell-component.c:987
msgid "Unsupported schema"
msgstr "不支持的方案"
-#: shell/evolution-shell-component.c:962
+#: shell/evolution-shell-component.c:989
msgid "Unsupported operation"
msgstr "不支持的操作"
-#: shell/evolution-shell-component.c:964
+#: shell/evolution-shell-component.c:991
msgid "Internal error"
msgstr "内部错误"
-#: shell/evolution-shell-component.c:968
+#: shell/evolution-shell-component.c:995
#, fuzzy
msgid "Exists"
msgstr "(_x)退出"
-#: shell/evolution-shell-component.c:970
+#: shell/evolution-shell-component.c:997
#, fuzzy
msgid "Invalid URI"
msgstr "日历 URI"
-#: shell/evolution-shell-component.c:974
+#: shell/evolution-shell-component.c:1001
msgid "Has subfolders"
msgstr "含有子文件夹"
-#: shell/evolution-shell-component.c:976
+#: shell/evolution-shell-component.c:1003
msgid "No space left"
msgstr "没有剩余空间"
-#: shell/evolution-shell-component.c:978
+#: shell/evolution-shell-component.c:1005
msgid "Old owner has died"
msgstr "原所有者已死"
-#: shell/evolution-shell-component-utils.c:125
+#: shell/evolution-shell-component-utils.c:124
#, c-format
msgid ""
"%s\n"
@@ -11529,7 +11495,7 @@ msgstr ""
"\n"
"未知的错误。"
-#: shell/evolution-shell-component-utils.c:128
+#: shell/evolution-shell-component-utils.c:127
#, c-format
msgid ""
"%s\n"
@@ -11542,7 +11508,7 @@ msgstr ""
"来自成员系统的错误为:\n"
"%s"
-#: shell/evolution-shell-component-utils.c:135
+#: shell/evolution-shell-component-utils.c:134
#, c-format
msgid ""
"%s\n"
@@ -11644,27 +11610,27 @@ msgstr ""
"使用本助手,您将在把外部文件导入到\n"
" Evolution 的全过程得到指导。"
-#: shell/importer/intelligent.c:191
+#: shell/importer/intelligent.c:190
msgid "Importers"
msgstr "导入器"
-#: shell/importer/intelligent.c:197
+#: shell/importer/intelligent.c:196
msgid "Don't import"
msgstr "不要导入"
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:198
msgid "Don't ask me again"
msgstr "不要再问我"
-#: shell/importer/intelligent.c:209
+#: shell/importer/intelligent.c:208
msgid "Evolution can import data from the following files:"
msgstr "Evolution 可以从下列文件中导入数据:"
-#: shell/main.c:86
+#: shell/main.c:89
msgid "Evolution is now exiting ..."
msgstr "Evolution 正在退出 ..."
-#: shell/main.c:190
+#: shell/main.c:193
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -11681,7 +11647,7 @@ msgid ""
"eagerly await your contributions!\n"
msgstr ""
-#: shell/main.c:211
+#: shell/main.c:214
msgid ""
"Thanks\n"
"The Ximian Evolution Team\n"
@@ -11689,27 +11655,46 @@ msgstr ""
"谢谢\n"
"Ximian Evolution 团队\n"
-#: shell/main.c:265
+#: shell/main.c:268
msgid "Cannot access the Ximian Evolution shell."
msgstr "无法访问 Ximian Evolution shell。"
-#: shell/main.c:274
+#: shell/main.c:277
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "无法初始化 Ximian Evolution shell: %s"
-#: shell/main.c:344
+#: shell/main.c:347
msgid "Disable splash screen"
msgstr ""
-#: shell/main.c:345
+#: shell/main.c:348
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: shell/main.c:387
+#: shell/main.c:390
msgid "Cannot initialize the Bonobo component system."
msgstr "无法初始化 Bonobo 成员系统。"
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "编辑地址本"
+
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr ""
+
+#: tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr ""
+
+#: tools/evolution-addressbook-import.c:80
+#, fuzzy
+msgid "No filename provided."
+msgstr "没有指定文件夹名称。"
+
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
#: ui/evolution-tasks.xml.h:3
msgid "Copy"
@@ -11989,7 +11974,7 @@ msgstr "打印..."
#: 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:245
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:236
msgid "Save"
msgstr "保存"
@@ -12695,7 +12680,8 @@ msgid "F_ormat"
msgstr "(_o)格式"
#: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+#, fuzzy
+msgid "H_TML"
msgstr "HTML"
#: ui/evolution-message-composer.xml.h:10
@@ -13088,10 +13074,6 @@ msgstr "(_s)快捷方式"
msgid "_Shortcut Bar"
msgstr "(_s)快捷方式条"
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "(_w)离线工作"
-
#: ui/my-evolution.xml.h:1
msgid "Change the settings for the summary"
msgstr "改变关于概要的设置"
@@ -13163,120 +13145,124 @@ msgid ""
" Use the right mouse button to zoom out."
msgstr ""
-#: widgets/menus/gal-view-menus.c:189
+#: widgets/menus/gal-view-menus.c:195
msgid "_Current View"
msgstr "(_c)当前视图"
-#: widgets/menus/gal-view-menus.c:216
+#: widgets/menus/gal-view-menus.c:222
msgid "Define Views"
msgstr "定义视图"
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:428
+#: widgets/misc/e-calendar-item.c:427
msgid "MTWTFSS"
msgstr ""
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1071
+#: widgets/misc/e-calendar-item.c:1070
msgid "%B %Y"
msgstr ""
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:438
msgid "Now"
msgstr "现在"
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
msgid "Today"
msgstr "今天"
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:741
#, c-format
msgid "The time must be in the format: %s"
msgstr ""
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: 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 ""
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:62
msgid "Greek"
msgstr ""
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:63
msgid "Japanese"
msgstr "日文"
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:64
msgid "Korean"
msgstr "韩语"
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:65
msgid "Turkish"
msgstr ""
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:66
msgid "Unicode"
msgstr "Unicode"
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:67
msgid "Western European"
msgstr "西欧"
-#: widgets/misc/e-charset-picker.c:85
+#: widgets/misc/e-charset-picker.c:84
msgid "Traditional"
msgstr "繁体"
-#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
msgid "Simplified"
msgstr "简体"
-#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:90
msgid "Ukrainian"
msgstr ""
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:101
msgid "New"
msgstr ""
-#: widgets/misc/e-charset-picker.c:160
+#: widgets/misc/e-charset-picker.c:159
#, c-format
msgid "Unknown character set: %s"
msgstr "未知的字符集: %s"
-#: widgets/misc/e-charset-picker.c:202
+#: widgets/misc/e-charset-picker.c:201
msgid "Enter the character set to use"
msgstr "输入要使用的字符集"
-#: widgets/misc/e-charset-picker.c:277
+#: widgets/misc/e-charset-picker.c:276
msgid "Other..."
msgstr "其他..."
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:395
msgid "Character Encoding"
msgstr "字符编码"
-#: widgets/misc/e-clipped-label.c:112
+#: widgets/misc/e-clipped-label.c:111
msgid "..."
msgstr "..."
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:149
msgid "Search Editor"
msgstr "搜索编辑器"
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:165
msgid "Save Search"
msgstr "保存搜索"