aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-04-10 04:37:56 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-04-10 04:37:56 +0800
commitb1a244dcb1f7d42cd018d4e62bd14a314490ac6c (patch)
tree6bcb7b6532712ef99a4460c6929ab47251620151 /po/zh_CN.po
parentb6afda1669f79e75d14a45e38a95079f45fc9701 (diff)
downloadgsoc2013-evolution-b1a244dcb1f7d42cd018d4e62bd14a314490ac6c.tar.gz
gsoc2013-evolution-b1a244dcb1f7d42cd018d4e62bd14a314490ac6c.tar.zst
gsoc2013-evolution-b1a244dcb1f7d42cd018d4e62bd14a314490ac6c.zip
Sync for 1.3.2.
svn path=/trunk/; revision=20794
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po13344
1 files changed, 7336 insertions, 6008 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b24354e8bc..42f3c459ea 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
+"POT-Creation-Date: 2003-04-09 14:07-0400\n"
"PO-Revision-Date: 2002-12-21 17:44+0800\n"
"Last-Translator: Wang Li <charles@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -12,33 +12,37 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr "Evolution 导入 LDIF 文件车间。"
+# shell/importer/import.glade.h:3
+# shell/importer/import.glade.h:3
+# shell/importer/import.glade.h:3
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution 导入器助手"
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
-msgstr "把 LDIF 文件导入 Evolution。"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Evolution 导入 VCard 车间。"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution 邮件撰写器。"
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "将 VCard 文件导入 Evolution"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution 邮件撰写器。"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
# addressbook/backend/ebook/e-card-simple.c:60
# addressbook/gui/widgets/e-addressbook-view.c:849
@@ -47,6 +51,7 @@ msgstr "将 VCard 文件导入 Evolution"
# addressbook/backend/ebook/e-card-simple.c:60
# addressbook/gui/widgets/e-addressbook-view.c:960
#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1301
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
msgid "File As"
msgstr "文件另存为"
@@ -55,8 +60,11 @@ msgstr "文件另存为"
# addressbook/backend/ebook/e-card-simple.c:61
# addressbook/backend/ebook/e-card-simple.c:61
#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1315
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
msgid "Name"
msgstr "姓名"
@@ -67,6 +75,7 @@ msgstr "姓名"
# addressbook/backend/ebook/e-card-simple.c:62
# addressbook/gui/widgets/e-addressbook-view.c:962
#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1342
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
msgid "Email"
msgstr "电子邮件"
@@ -78,7 +87,7 @@ msgstr "电子邮件"
# addressbook/backend/ebook/e-card-simple.c:63
# addressbook/gui/contact-editor/e-contact-editor.c:1659
#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
msgid "Primary"
msgstr "主要"
@@ -103,7 +112,8 @@ msgstr "主要"
# addressbook/gui/widgets/e-addressbook-view.c:994
#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant"
msgstr "助手"
@@ -125,9 +135,9 @@ msgstr "助手"
# addressbook/gui/contact-editor/e-contact-editor.c:1712
#: addressbook/backend/ebook/e-card-simple.c:65
#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
msgid "Business"
msgstr "商务"
@@ -149,7 +159,7 @@ msgstr "商务"
# addressbook/backend/ebook/e-card-simple.c:66
# addressbook/gui/contact-editor/e-contact-editor.c:1648
#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
msgid "Callback"
msgstr "反馈"
@@ -160,7 +170,7 @@ msgstr "反馈"
# addressbook/backend/ebook/e-card-simple.c:67
# addressbook/gui/contact-editor/e-contact-editor.c:1650
#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
msgid "Company"
msgstr "公司"
@@ -189,8 +199,8 @@ msgstr "公司"
#: addressbook/backend/ebook/e-card-simple.c:68
#: addressbook/backend/ebook/e-card-simple.c:71
#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
msgid "Home"
msgstr "家庭"
@@ -201,6 +211,7 @@ msgstr "家庭"
# addressbook/backend/ebook/e-card-simple.c:69
# addressbook/gui/widgets/e-addressbook-view.c:969
#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1362
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
msgid "Organization"
msgstr "组织"
@@ -223,7 +234,7 @@ msgstr "组织"
# addressbook/gui/contact-editor/e-contact-editor.c:1655
#: addressbook/backend/ebook/e-card-simple.c:72
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
msgid "Mobile"
msgstr "手机"
@@ -234,7 +245,7 @@ msgstr "手机"
# addressbook/backend/ebook/e-card-simple.c:73
# addressbook/gui/contact-editor/e-contact-editor.c:1649
#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
msgid "Car"
msgstr "汽车"
@@ -251,8 +262,8 @@ msgstr "汽车"
# addressbook/gui/contact-editor/e-contact-editor.c:1647
# addressbook/gui/widgets/e-addressbook-view.c:974
#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
msgid "Business Fax"
msgstr "商务传真"
@@ -274,7 +285,7 @@ msgstr "商务传真"
# addressbook/gui/contact-editor/e-contact-editor.c:1653
# addressbook/gui/widgets/e-addressbook-view.c:975
#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
msgid "Home Fax"
msgstr "家庭传真"
@@ -286,7 +297,7 @@ msgstr "家庭传真"
# addressbook/backend/ebook/e-card-simple.c:76
# addressbook/gui/contact-editor/e-contact-editor.c:1646
#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
msgid "Business 2"
msgstr "商务 2"
@@ -304,7 +315,7 @@ msgstr "商务 2"
# addressbook/backend/ebook/e-card-simple.c:77
# addressbook/gui/contact-editor/e-contact-editor.c:1652
#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
msgid "Home 2"
msgstr "家庭 2"
@@ -318,7 +329,7 @@ msgstr "家庭 2"
# addressbook/gui/contact-editor/e-contact-editor.c:1654
# addressbook/gui/widgets/e-addressbook-view.c:978
#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
msgid "ISDN"
msgstr "ISDN"
@@ -340,8 +351,8 @@ msgstr "ISDN"
# mail/mail-config.glade.h:57
#: addressbook/backend/ebook/e-card-simple.c:79
#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1807
msgid "Other"
msgstr "其它"
@@ -355,7 +366,7 @@ msgstr "其它"
# addressbook/gui/contact-editor/e-contact-editor.c:1657
# addressbook/gui/widgets/e-addressbook-view.c:980
#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
msgid "Other Fax"
msgstr "其它传真"
@@ -370,7 +381,7 @@ msgstr "其它传真"
# addressbook/gui/contact-editor/e-contact-editor.c:1658
# addressbook/gui/widgets/e-addressbook-view.c:981
#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
msgid "Pager"
msgstr "传呼机"
@@ -385,7 +396,7 @@ msgstr "传呼机"
# addressbook/gui/contact-editor/e-contact-editor.c:1660
# addressbook/gui/widgets/e-addressbook-view.c:982
#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
msgid "Radio"
msgstr "收音机"
@@ -400,7 +411,7 @@ msgstr "收音机"
# addressbook/gui/contact-editor/e-contact-editor.c:1661
# addressbook/gui/widgets/e-addressbook-view.c:983
#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
msgid "Telex"
msgstr "电传"
@@ -429,8 +440,8 @@ msgstr "TTY"
# addressbook/gui/contact-editor/e-contact-editor.c:1687
# addressbook/gui/widgets/e-addressbook-view.c:986
#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:488
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Email 2"
msgstr "电子邮件 2"
@@ -448,8 +459,8 @@ msgstr "电子邮件 2"
# addressbook/gui/contact-editor/e-contact-editor.c:1688
# addressbook/gui/widgets/e-addressbook-view.c:987
#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:498
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
msgid "Email 3"
msgstr "电子邮件 3"
@@ -497,6 +508,7 @@ msgstr "部门"
# addressbook/backend/ebook/e-card-simple.c:90
# addressbook/gui/widgets/e-addressbook-view.c:990
#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1376
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
msgid "Office"
msgstr "办公室"
@@ -515,6 +527,7 @@ msgstr "办公室"
# addressbook/backend/ebook/e-card-simple.c:91
# addressbook/gui/widgets/e-addressbook-view.c:991
#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1383
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
msgid "Title"
msgstr "头衔"
@@ -544,6 +557,7 @@ msgstr "职业"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/gui/widgets/e-addressbook-view.c:993
#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1397
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
msgid "Manager"
msgstr "经理"
@@ -569,6 +583,7 @@ msgstr "助手"
# addressbook/backend/ebook/e-card-simple.c:95
# addressbook/gui/widgets/e-addressbook-view.c:995
#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1411
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
msgid "Nickname"
msgstr "绰号"
@@ -587,6 +602,7 @@ msgstr "绰号"
# addressbook/backend/ebook/e-card-simple.c:96
# addressbook/gui/widgets/e-addressbook-view.c:996
#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1418
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
msgid "Spouse"
msgstr "配偶"
@@ -598,6 +614,7 @@ msgstr "配偶"
# addressbook/backend/ebook/e-card-simple.c:97
# addressbook/gui/widgets/e-addressbook-view.c:997
#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1459
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
msgid "Note"
msgstr "注释"
@@ -606,6 +623,7 @@ msgstr "注释"
# addressbook/backend/ebook/e-card-simple.c:98
# addressbook/backend/ebook/e-card-simple.c:98
#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1438
msgid "Calendar URI"
msgstr "日历 URI"
@@ -634,24 +652,40 @@ msgstr "忙闲 URL"
msgid "FBUrl"
msgstr "忙闲 URL"
+#: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Default server calendar"
+msgstr ""
+
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "icsCalendar"
+msgstr "日历"
+
# addressbook/backend/ebook/e-card-simple.c:100
# addressbook/backend/ebook/e-card-simple.c:100
# addressbook/backend/ebook/e-card-simple.c:100
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1425
msgid "Anniversary"
msgstr "周年纪念日"
# addressbook/backend/ebook/e-card-simple.c:100
# addressbook/backend/ebook/e-card-simple.c:100
# addressbook/backend/ebook/e-card-simple.c:100
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
msgid "Anniv"
msgstr "周年纪念日"
# addressbook/backend/ebook/e-card-simple.c:101
# addressbook/backend/ebook/e-card-simple.c:101
# addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
msgid "Birth Date"
msgstr "生日"
@@ -661,7 +695,8 @@ msgstr "生日"
# calendar/gui/e-calendar-table.etspec.h:4
# addressbook/backend/ebook/e-card-simple.c:104
# calendar/gui/e-calendar-table.etspec.h:4
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1473
#: calendar/gui/e-calendar-table.etspec.h:4
msgid "Categories"
msgstr "类别"
@@ -669,14 +704,25 @@ msgstr "类别"
# addressbook/backend/ebook/e-card-simple.c:105
# addressbook/backend/ebook/e-card-simple.c:105
# addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
msgid "Family Name"
msgstr "姓"
+# addressbook/backend/ebook/e-card-simple.c:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+# addressbook/backend/ebook/e-card-simple.c:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+# addressbook/backend/ebook/e-card-simple.c:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+#: addressbook/backend/ebook/e-card-simple.c:335
+#, fuzzy
+msgid "ECard"
+msgstr "汽车"
+
# addressbook/backend/ebook/e-card-simple.c:788
# addressbook/backend/ebook/e-card-simple.c:788
# addressbook/backend/ebook/e-card-simple.c:788
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:832
#, c-format
msgid "%x"
msgstr "%x"
@@ -684,25 +730,193 @@ msgstr "%x"
# addressbook/gui/component/select-names/e-select-names-popup.c:423
# addressbook/gui/component/select-names/e-select-names-popup.c:423
# addressbook/gui/component/select-names/e-select-names-popup.c:423
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:893
#: addressbook/backend/ebook/e-destination.c:706
msgid "Unnamed List"
msgstr "未命名的列表"
-# addressbook/backend/ebook/e-card.c:4235
-# addressbook/backend/ebook/e-card.c:4235
-# addressbook/backend/ebook/e-card.c:4235
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "多个 VCard"
+# addressbook/gui/contact-editor/e-contact-quick-add.c:326
+# addressbook/gui/widgets/e-addressbook-view.c:850
+# addressbook/gui/contact-editor/e-contact-quick-add.c:326
+# addressbook/gui/widgets/e-addressbook-view.c:850
+# addressbook/gui/contact-editor/e-contact-quick-add.c:326
+# addressbook/gui/widgets/e-addressbook-view.c:961
+#: addressbook/backend/ebook/e-card.c:1308
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "全名"
-# addressbook/backend/ebook/e-card.c:4243
-# addressbook/backend/ebook/e-card.c:4243
-# addressbook/backend/ebook/e-card.c:4243
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "%s 的 VCard"
+# addressbook/gui/contact-editor/fulladdr.glade.h:237
+# addressbook/gui/contact-editor/fulladdr.glade.h:237
+# addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/backend/ebook/e-card.c:1321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#, fuzzy
+msgid "Address"
+msgstr "地址(_A):"
+
+# views/addressbook/galview.xml.h:1
+# views/addressbook/galview.xml.h:1
+# views/addressbook/galview.xml.h:1
+#: addressbook/backend/ebook/e-card.c:1328
+#, fuzzy
+msgid "Address Label"
+msgstr "地址卡片"
+
+# mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+# mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+# my-evolution/Locations.h:1767
+#: addressbook/backend/ebook/e-card.c:1335
+#, fuzzy
+msgid "Phone"
+msgstr "庞塞"
+
+# addressbook/backend/ebook/e-card-simple.c:101
+# addressbook/backend/ebook/e-card-simple.c:101
+# addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1349
+#, fuzzy
+msgid "Birth date"
+msgstr "生日"
+
+# calendar/gui/e-calendar-table.etspec.h:19
+# calendar/gui/e-calendar-table.etspec.h:19
+# calendar/gui/e-calendar-table.etspec.h:19
+#: addressbook/backend/ebook/e-card.c:1355
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+# addressbook/backend/ebook/e-card-simple.c:69
+# addressbook/gui/widgets/e-addressbook-view.c:858
+# addressbook/backend/ebook/e-card-simple.c:69
+# addressbook/gui/widgets/e-addressbook-view.c:858
+# addressbook/backend/ebook/e-card-simple.c:69
+# addressbook/gui/widgets/e-addressbook-view.c:969
+#: addressbook/backend/ebook/e-card.c:1369
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "组织"
+
+# calendar/gui/dialogs/meeting-page.etspec.h:9
+# calendar/gui/e-meeting-time-sel.etspec.h:9
+# calendar/gui/dialogs/meeting-page.etspec.h:9
+# calendar/gui/e-meeting-time-sel.etspec.h:9
+# calendar/gui/dialogs/meeting-page.etspec.h:9
+# calendar/gui/e-meeting-time-sel.etspec.h:9
+#: addressbook/backend/ebook/e-card.c:1390
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "角色"
+
+# importers/elm-importer.c:525 importers/netscape-importer.c:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+# importers/elm-importer.c:525 importers/netscape-importer.c:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+# importers/elm-importer.c:525 importers/netscape-importer.c:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+#: addressbook/backend/ebook/e-card.c:1431 mail/mail-format.c:935
+#, fuzzy
+msgid "Mailer"
+msgstr "邮件"
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:13
+# addressbook/gui/contact-editor/contact-editor.glade.h:13
+# addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/backend/ebook/e-card.c:1445
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "忙闲 URL(_R):"
+
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: addressbook/backend/ebook/e-card.c:1452
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "日历"
+
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+#: addressbook/backend/ebook/e-card.c:1466
+#, fuzzy
+msgid "Related Contacts"
+msgstr "已选中的联系人:"
+
+# addressbook/gui/component/addressbook.c:806
+# calendar/gui/cal-search-bar.c:59
+# addressbook/gui/component/addressbook.c:806
+# calendar/gui/cal-search-bar.c:59
+# addressbook/gui/component/addressbook.c:839
+# calendar/gui/cal-search-bar.c:59
+#: addressbook/backend/ebook/e-card.c:1480
+#, fuzzy
+msgid "Category List"
+msgstr "类别为"
+
+#: addressbook/backend/ebook/e-card.c:1487
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1494
+msgid "Wants HTML set"
+msgstr ""
+
+# my-evolution/metar.c:262
+# my-evolution/metar.c:262
+# my-evolution/Locations.h:1232
+#: addressbook/backend/ebook/e-card.c:1501
+#, fuzzy
+msgid "List"
+msgstr "霭"
+
+# addressbook/gui/widgets/e-addressbook-view.c:874
+# addressbook/gui/widgets/e-addressbook-view.c:874
+# addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/backend/ebook/e-card.c:1508
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "其它地址"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:5
+# calendar/zones.h:156
+# my-evolution/Locations.h:81
+#: addressbook/backend/ebook/e-card.c:1515
+#, fuzzy
+msgid "Arbitrary"
+msgstr "阿姆利则"
+
+# addressbook/gui/contact-editor/fullname.glade.h:4
+# addressbook/gui/contact-editor/fullname.glade.h:4
+# addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/backend/ebook/e-card.c:1522
+#, fuzzy
+msgid "ID"
+msgstr "I"
+
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
+# addressbook/gui/widgets/e-addressbook-view.c:843
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
+#: addressbook/backend/ebook/e-card.c:1529
+#, fuzzy
+msgid "Last Use"
+msgstr "粘贴"
+
+# mail/message-list.etspec.h:5
+# mail/message-list.etspec.h:6
+# mail/message-list.etspec.h:6
+#: addressbook/backend/ebook/e-card.c:1540
+#, fuzzy
+msgid "Use Score"
+msgstr "分数"
# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
# addressbook/backend/ebook/load-pine-addressbook.c:22
@@ -738,18 +952,9 @@ msgstr "%s 的 VCard"
# tools/evolution-addressbook-abuse.c:132
# tools/evolution-addressbook-export.c:60
# tools/evolution-addressbook-import.c:86
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
msgid "Could not initialize Bonobo"
msgstr "无法初始化 Bonobo"
@@ -759,51 +964,65 @@ msgstr "无法初始化 Bonobo"
# addressbook/backend/pas/pas-backend-ldap.c:2269
# addressbook/backend/pas/pas-backend-file.c:259
# addressbook/backend/pas/pas-backend-ldap.c:2272
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
msgid "Searching..."
msgstr "搜索..."
# addressbook/backend/pas/pas-backend-file.c:261
# addressbook/backend/pas/pas-backend-file.c:261
# addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
msgid "Loading..."
msgstr "装入..."
+# addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+#, fuzzy
+msgid "Using Distinguished Name (DN)"
+msgstr "使用已识别的姓名 (DN)"
+
+# addressbook/gui/component/addressbook-config.glade.h:9
+# addressbook/gui/component/addressbook-config.glade.h:9
+# addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+#, fuzzy
+msgid "Using Email Address"
+msgstr "使用电子邮件地址"
+
# addressbook/backend/pas/pas-backend-ldap.c:483
# addressbook/backend/pas/pas-backend-ldap.c:483
# addressbook/backend/pas/pas-backend-ldap.c:486
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:748
msgid "Reconnecting to LDAP server..."
msgstr "正在重新连接 LDAP 服务器..."
# addressbook/backend/pas/pas-backend-ldap.c:912
# addressbook/backend/pas/pas-backend-ldap.c:912
# addressbook/backend/pas/pas-backend-ldap.c:915
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
msgid "Adding card to LDAP server..."
msgstr "正在将卡片添加到 LDAP 服务器..."
# addressbook/backend/pas/pas-backend-ldap.c:1013
# addressbook/backend/pas/pas-backend-ldap.c:1013
# addressbook/backend/pas/pas-backend-ldap.c:1016
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
msgid "Removing card from LDAP server..."
msgstr "正在从 LDAP 服务器删除卡片..."
# addressbook/backend/pas/pas-backend-ldap.c:1123
# addressbook/backend/pas/pas-backend-ldap.c:1123
# addressbook/backend/pas/pas-backend-ldap.c:1126
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
msgid "Modifying card from LDAP server..."
msgstr "正在修改 LDAP 服务器上的卡片..."
# addressbook/backend/pas/pas-backend-ldap.c:2214
# addressbook/backend/pas/pas-backend-ldap.c:2214
# addressbook/backend/pas/pas-backend-ldap.c:2217
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
msgid "Receiving LDAP search results..."
msgstr "正在接收 LDAP 的搜索结果..."
@@ -813,28 +1032,28 @@ msgstr "正在接收 LDAP 的搜索结果..."
# addressbook/gui/widgets/e-addressbook-view.c:1278
# addressbook/gui/widgets/e-addressbook-util.c:95
# addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
msgid "Error performing search"
msgstr "执行搜索错误"
# mail/mail-config.glade.h:99
# mail/mail-config.glade.h:99
# mail/mail-config.glade.h:108
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:294
msgid "Default Sync Address:"
msgstr "默认的同步地址:"
# addressbook/conduit/address-conduit.c:294
# addressbook/conduit/address-conduit.c:294
# addressbook/conduit/address-conduit.c:426
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:537
msgid "Cursor could not be loaded\n"
msgstr "无法装入光标\n"
# addressbook/conduit/address-conduit.c:307
# addressbook/conduit/address-conduit.c:307
# addressbook/conduit/address-conduit.c:439
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:550
msgid "EBook not loaded\n"
msgstr "没有装入 EBook\n"
@@ -847,9 +1066,9 @@ msgstr "没有装入 EBook\n"
# addressbook/conduit/address-conduit.c:1220
# calendar/conduits/calendar/calendar-conduit.c:1203
# calendar/conduits/todo/todo-conduit.c:824
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: addressbook/conduit/address-conduit.c:1376
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
msgid "Could not start wombat server"
msgstr "无法启动 wombat 服务器"
@@ -862,9 +1081,9 @@ msgstr "无法启动 wombat 服务器"
# addressbook/conduit/address-conduit.c:1221
# calendar/conduits/calendar/calendar-conduit.c:1204
# calendar/conduits/todo/todo-conduit.c:825
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: addressbook/conduit/address-conduit.c:1377
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
msgid "Could not start wombat"
msgstr "无法启动 wombat"
@@ -874,97 +1093,74 @@ msgstr "无法启动 wombat"
# addressbook/conduit/address-conduit.c:1128
# addressbook/conduit/address-conduit.c:1251
# addressbook/conduit/address-conduit.c:1254
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
+#: addressbook/conduit/address-conduit.c:1407
+#: addressbook/conduit/address-conduit.c:1410
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "用于地址对话框的 Bonobo 控制。"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "用于显示一条地址的 Bonobo 控制。"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-# notes/GNOME_Evolution_Notes.oaf.in.h:1
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "显示地址簿的 Bonobo 控制示例。"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Configuration control for the Evolution Addressbook Storages."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
msgid "Configure access to LDAP directory servers here"
msgstr ""
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "显示 Evolution 地址簿小卡片的控制。"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
msgid "Directory Servers"
msgstr "目录服务器"
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution 地址簿小卡片显示器"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Evolution component for handling contacts."
-msgstr "处理联系人的 Evolution 成员。"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "地址簿小卡片控制车间"
+# addressbook/gui/component/addressbook-config.c:186
+# addressbook/gui/component/addressbook-config.c:186
+# addressbook/gui/component/addressbook-config.c:223
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "编辑地址簿"
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "地址簿地址显示器车间"
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution 的地址簿名称选择界面。"
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
msgstr "地址簿地址对话框车间"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr "关于 Evolution 地址本的配置控制车间"
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 地址簿小卡片显示器"
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "示例地址簿控制车间"
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 地址簿小卡片显示器"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution 地址簿小卡片显示器"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution 地址簿小卡片显示器"
# addressbook/gui/component/addressbook-component.c:71
# calendar/gui/dialogs/comp-editor-util.c:310
@@ -978,33 +1174,33 @@ msgstr "示例地址簿控制车间"
# calendar/gui/dialogs/comp-editor-util.c:310
# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
# shell/e-shortcuts.c:1061
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
msgid "Contacts"
msgstr "联系人"
# addressbook/gui/component/addressbook-component.c:71
# addressbook/gui/component/addressbook-component.c:71
# addressbook/gui/component/addressbook-component.c:71
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
msgid "Folder containing contact information"
msgstr "含有联系人信息的文件夹"
# addressbook/gui/component/addressbook-component.c:73
# addressbook/gui/component/addressbook-component.c:73
# addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
msgid "LDAP Server"
msgstr "LDAP 服务器"
# addressbook/gui/component/addressbook-component.c:73
# addressbook/gui/component/addressbook-component.c:73
# addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
msgid "LDAP server containing contact information"
msgstr "含有联系人信息的 LDAP 服务器"
@@ -1020,14 +1216,14 @@ msgstr "含有联系人信息的 LDAP 服务器"
# calendar/gui/dialogs/comp-editor-util.c:310
# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
# shell/e-shortcuts.c:1061
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
msgid "Public Contacts"
msgstr "公共联系人"
# addressbook/gui/component/addressbook-component.c:71
# addressbook/gui/component/addressbook-component.c:71
# addressbook/gui/component/addressbook-component.c:71
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
msgid "Public folder containing contact information"
msgstr "公共文件夹含有联系人信息"
@@ -1037,135 +1233,117 @@ msgstr "公共文件夹含有联系人信息"
# ui/evolution-addressbook.xml.h:11
# addressbook/gui/component/addressbook-component.c:527
# ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
msgid "New Contact"
msgstr "新建联系人"
# ui/evolution-addressbook.xml.h:31
# ui/evolution-addressbook.xml.h:31
# ui/evolution-addressbook.xml.h:32
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
msgid "_Contact"
msgstr "联系人(_C)"
# ui/evolution-addressbook.xml.h:4
# ui/evolution-addressbook.xml.h:4
# ui/evolution-addressbook.xml.h:4
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
msgid "Create a new contact"
msgstr "创建一个新联系人"
# addressbook/gui/component/addressbook-component.c:527
# addressbook/gui/component/addressbook-component.c:527
# addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
msgid "New Contact List"
msgstr "新建联系人列表"
# ui/evolution-addressbook.xml.h:32
# ui/evolution-addressbook.xml.h:32
# ui/evolution-addressbook.xml.h:33
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
msgid "Contact _List"
msgstr "联系人列表(_L)"
# ui/evolution-addressbook.xml.h:5
# ui/evolution-addressbook.xml.h:5
# ui/evolution-addressbook.xml.h:5
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
# addressbook/backend/pas/pas-backend-ldap.c:493
# addressbook/backend/pas/pas-backend-ldap.c:493
# addressbook/backend/pas/pas-backend-ldap.c:496
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
msgid "Failed to connect to LDAP server"
msgstr "连接 LDAP 服务器失败"
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
msgid "Failed to authenticate with LDAP server"
msgstr "LDAP 服务器认证失败"
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
msgid "Could not perform query on Root DSE"
msgstr "无法在根 DSE 上执行查询"
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
msgid "The server responded with no supported search bases"
msgstr "服务器响应为没有支持的搜索起点"
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1193
msgid "This server does not support LDAPv3 schema information"
msgstr "该服务器不支持 LDAPv3 schema 信息"
# mail/mail-callbacks.c:2250
# mail/mail-callbacks.c:2369
# mail/mail-callbacks.c:2405
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1215
msgid "Error retrieving schema information"
msgstr "检索 schema 信息错误"
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:610
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1223
msgid "Server did not respond with valid schema information"
msgstr "服务器没有响应有效的 schema 信息"
-# mail/mail-config.glade.h:3
-# mail/mail-config.glade.h:3
-# mail/mail-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "在本次 Evolution 创建中未打开 LDAP 支持"
-
# addressbook/gui/component/addressbook-config.glade.h:2
# addressbook/gui/component/addressbook-config.glade.h:2
# addressbook/gui/component/addressbook-config.glade.h:4
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1637
msgid "Account Name"
msgstr "帐号名"
# addressbook/gui/component/addressbook-config.glade.h:14
# addressbook/gui/component/addressbook-config.glade.h:14
# addressbook/gui/component/addressbook-config.glade.h:19
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1639
msgid "Server Name"
msgstr "服务器名"
-# addressbook/gui/component/addressbook-factory.c:70
-# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-# addressbook/gui/component/addressbook-factory.c:70
-# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-# addressbook/gui/component/addressbook-factory.c:70
-# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-msgid "Could not initialize gnome-vfs"
-msgstr "无法创始化 gnome-vfs"
+# mail/mail-config.glade.h:3
+# mail/mail-config.glade.h:3
+# mail/mail-config.glade.h:3
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "在本次 Evolution 创建中未打开 LDAP 支持"
# addressbook/gui/component/addressbook-storage.c:167
# addressbook/gui/component/addressbook-storage.c:167
# addressbook/gui/component/addressbook-storage.c:168
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
msgid "Other Contacts"
msgstr "其他联系人"
-# addressbook/gui/component/addressbook.c:485
-# addressbook/gui/component/addressbook.c:485
-# addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "无法打开地址簿"
-
# addressbook/gui/component/addressbook.c:507
# addressbook/gui/component/addressbook.c:507
# addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
@@ -1176,7 +1354,7 @@ msgstr ""
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:508
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
@@ -1189,7 +1367,7 @@ msgstr ""
# addressbook/gui/component/addressbook.c:499
# addressbook/gui/component/addressbook.c:499
# addressbook/gui/component/addressbook.c:513
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -1204,7 +1382,7 @@ msgstr ""
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:494
# addressbook/gui/component/addressbook.c:508
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the server\n"
@@ -1214,15 +1392,21 @@ msgstr ""
"您输入了错误的 URI,也可能是因为\n"
"服务器已经关闭。"
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+# addressbook/gui/component/addressbook.c:485
+# addressbook/gui/component/addressbook.c:485
+# addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr "无法打开地址簿"
+
+#: addressbook/gui/component/addressbook.c:622
msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
@@ -1230,17 +1414,17 @@ msgstr "认证失败。\n"
# addressbook/gui/component/addressbook.c:640
# addressbook/gui/component/addressbook.c:655
# addressbook/gui/component/addressbook.c:658
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%s为 %s 输入口令 (用户 %s)"
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
msgid "Name begins with"
msgstr "姓名以此开头"
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
msgid "Email begins with"
msgstr "邮件以此开头"
@@ -1250,7 +1434,7 @@ msgstr "邮件以此开头"
# calendar/gui/cal-search-bar.c:59
# addressbook/gui/component/addressbook.c:839
# calendar/gui/cal-search-bar.c:59
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
#: calendar/gui/cal-search-bar.c:53
msgid "Category is"
msgstr "类别为"
@@ -1262,7 +1446,7 @@ msgstr "类别为"
# addressbook/gui/component/addressbook.c:836
# calendar/gui/cal-search-bar.c:55
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr "任何域含有"
@@ -1272,11 +1456,11 @@ msgstr "任何域含有"
# widgets/misc/e-filter-bar.h:104
# addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
# widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
msgid "Advanced..."
msgstr "高级..."
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -1284,7 +1468,7 @@ msgid ""
"the directory server preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -1292,15 +1476,15 @@ msgid ""
"preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
msgid "The backend for this addressbook was unable to parse this query."
msgstr "该地址本的后端无法解析该查询。"
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
msgid "The backend for this addressbook refused to perform this query."
msgstr "该地址本的后端拒绝执行该查询。"
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
msgid "This query did not complete successfully."
msgstr "该查询尚未成功完成。"
@@ -1311,15 +1495,15 @@ msgstr "该查询尚未成功完成。"
# addressbook/gui/component/addressbook.c:1067
# calendar/gui/cal-search-bar.c:412
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:354
msgid "Any Category"
msgstr "任何类别"
# addressbook/gui/component/addressbook.c:1107
# addressbook/gui/component/addressbook.c:1107
# addressbook/gui/component/addressbook.c:1150
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
msgid "The URI that the Folder Browser will display"
msgstr "文件夹浏览器将显示的 URI"
@@ -1331,7 +1515,7 @@ msgstr "文件夹浏览器将显示的 URI"
#. * addresses (and *only* the e-mail addresses) associated with an existing
#. * card.
#.
-#: addressbook/gui/component/e-address-popup.c:178
+#: addressbook/gui/component/e-address-popup.c:184
msgid "(none)"
msgstr "(无)"
@@ -1344,23 +1528,23 @@ msgstr "(无)"
# addressbook/gui/component/e-address-popup.c:474
# addressbook/gui/contact-editor/contact-editor.glade.h:26
# addressbook/gui/contact-editor/e-contact-editor.c:1686
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:478
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1777
msgid "Primary Email"
msgstr "常用电子邮件"
# addressbook/gui/component/e-address-popup.c:587
# addressbook/gui/component/e-address-popup.c:587
# addressbook/gui/component/e-address-popup.c:587
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:614
msgid "Select an Action"
msgstr "选择一项活动"
# addressbook/gui/component/e-address-popup.c:593
# addressbook/gui/component/e-address-popup.c:593
# addressbook/gui/component/e-address-popup.c:593
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:622
#, c-format
msgid "Create a new contact \"%s\""
msgstr "创建新联系人“%s”"
@@ -1368,7 +1552,7 @@ msgstr "创建新联系人“%s”"
# addressbook/gui/component/e-address-popup.c:605
# addressbook/gui/component/e-address-popup.c:605
# addressbook/gui/component/e-address-popup.c:605
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:638
#, c-format
msgid "Add address to existing contact \"%s\""
msgstr "为现有的联系人“%s”添加地址"
@@ -1376,7 +1560,7 @@ msgstr "为现有的联系人“%s”添加地址"
# addressbook/gui/component/e-address-popup.c:891
# addressbook/gui/component/e-address-popup.c:891
# addressbook/gui/component/e-address-popup.c:891
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:914
msgid "Querying Addressbook..."
msgstr "查询地址簿..."
@@ -1389,9 +1573,8 @@ msgstr "查询地址簿..."
# addressbook/gui/component/e-address-popup.c:973
# addressbook/gui/component/e-address-widget.c:387
# addressbook/gui/component/select-names/e-select-names-popup.c:306
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
msgid "Edit Contact Info"
msgstr "编辑联系人信息"
@@ -1404,137 +1587,119 @@ msgstr "编辑联系人信息"
# addressbook/gui/component/e-address-popup.c:1003
# addressbook/gui/component/e-address-widget.c:423
# addressbook/gui/component/select-names/e-select-names-popup.c:485
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:324
msgid "Add to Contacts"
msgstr "添加到联系人"
# addressbook/gui/component/e-address-popup.c:1046
# addressbook/gui/component/e-address-popup.c:1046
# addressbook/gui/component/e-address-popup.c:1046
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1052
msgid "Merge E-Mail Address"
msgstr "合并电子邮件地址"
# addressbook/gui/component/e-address-widget.c:364
# addressbook/gui/component/e-address-widget.c:364
# addressbook/gui/component/e-address-widget.c:364
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
msgid "Disable Queries"
msgstr "关闭查询"
# addressbook/gui/component/e-address-widget.c:364
# addressbook/gui/component/e-address-widget.c:364
# addressbook/gui/component/e-address-widget.c:364
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
msgid "Enable Queries (Dangerous!)"
msgstr "开启查询(危险!)"
+#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr ""
+
# mail/mail-config.glade.h:1
# mail/mail-config.glade.h:1
# mail/mail-config.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:3
msgid " S_how Supported Bases "
msgstr " 显示支持的数据库(_H) "
-#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "1234"
-msgstr "1234"
+#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
+msgstr ""
# calendar/gui/e-calendar-table.c:437
# calendar/gui/e-calendar-table.c:437
# addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "1:00"
msgstr "1:00"
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "2:30"
msgstr "2:30"
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
msgid "3268"
msgstr "3268"
-# calendar/gui/e-calendar-table.c:435
-# calendar/gui/e-calendar-table.c:435
-# calendar/gui/e-calendar-table.c:436
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "380"
-msgstr "380"
-
# addressbook/gui/component/addressbook-config.glade.h:1
# addressbook/gui/component/addressbook-config.glade.h:1
# addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:8
msgid "389"
msgstr "389"
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:9
msgid "5:00"
msgstr "5:00"
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:10
msgid "636"
msgstr "636"
-#: addressbook/gui/component/ldap-config.glade.h:10
-msgid "666"
-msgstr "666"
-
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+# addressbook/gui/component/addressbook-component.c:73
+# addressbook/gui/component/addressbook-component.c:73
+# addressbook/gui/component/addressbook-component.c:73
#: addressbook/gui/component/ldap-config.glade.h:11
-msgid "<- _Remove"
-msgstr "<- 删除(_R)"
-
-# addressbook/printing/e-contact-print.glade.h:23
-# addressbook/printing/e-contact-print.glade.h:23
-# addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/gui/component/ldap-config.glade.h:12
-msgid "<< Fewer Options"
-msgstr "<< 简洁选项"
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add (or Edit) Attribute Mappings"
-msgstr "增加 (或编辑) 属性映射"
+#, fuzzy
+msgid "Add LDAP Server"
+msgstr "LDAP 服务器"
# addressbook/gui/component/addressbook-config.glade.h:4
# addressbook/gui/component/addressbook-config.glade.h:4
# addressbook/gui/component/addressbook-config.glade.h:6
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:12
msgid "Addressbook Sources"
msgstr "地址簿资源"
# addressbook/gui/contact-editor/fulladdr.glade.h:3
# addressbook/gui/contact-editor/fulladdr.glade.h:3
# my-evolution/Locations.h:43
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:61
+#: mail/mail-config.glade.h:16
msgid "Always"
msgstr "总是"
# camel/camel-sasl-anonymous.c:33
# camel/camel-sasl-anonymous.c:33
# camel/camel-sasl-anonymous.c:33
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14
msgid "Anonymously"
msgstr "匿名地"
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr "相关的 LDAP 属性"
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr "属性"
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:15
msgid ""
"Congratulations, you are finished setting up this LDAP server. You\n"
"are now ready to access this directory.\n"
@@ -1546,58 +1711,48 @@ msgstr ""
# ui/evolution-addressbook.xml.h:31
# ui/evolution-addressbook.xml.h:31
# my-evolution/Locations.h:502
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
msgid "Connecting"
msgstr "正在连接"
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr "对应的 Evolution 属性"
-
-# calendar/gui/e-meeting-time-sel.c:431
-# calendar/gui/e-meeting-time-sel.c:434
-# calendar/gui/e-meeting-time-sel.c:434
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "DN Customization"
-msgstr "定制已识别姓名"
-
# addressbook/gui/component/addressbook-config.glade.h:8
# addressbook/gui/component/addressbook-config.glade.h:8
# addressbook/gui/component/addressbook-config.glade.h:11
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:20
msgid "De_lete"
msgstr "删除(_L)"
# addressbook/gui/component/addressbook-config.glade.h:32
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:21
msgid "Distinguished _name:"
msgstr "已识别的姓名(_D):"
+# addressbook/gui/component/addressbook-component.c:73
+# addressbook/gui/component/addressbook-component.c:73
+# addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid "Edit LDAP Server"
+msgstr "LDAP 服务器"
+
# mail/mail-config.glade.h:99
# mail/mail-config.glade.h:99
# mail/mail-config.glade.h:108
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:23
msgid "Email Address:"
msgstr "电子邮件地址:"
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid "Evolution Attribute"
-msgstr "Evolution 属性"
-
# addressbook/gui/component/addressbook-config.glade.h:10
# addressbook/gui/component/addressbook-config.glade.h:10
# addressbook/gui/component/addressbook-config.glade.h:15
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:24
msgid "Evolution will use this DN to authenticate you with the server"
msgstr "Evolution 将使用该已识别的名字在服务器上对您进行认证"
# addressbook/gui/component/addressbook-config.glade.h:10
# addressbook/gui/component/addressbook-config.glade.h:10
# addressbook/gui/component/addressbook-config.glade.h:15
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:25
msgid ""
"Evolution will use this email address to authenticate you with the server"
msgstr "Evolution 将使用该电子邮件地址在服务器上对您进行认证"
@@ -1605,45 +1760,34 @@ msgstr "Evolution 将使用该电子邮件地址在服务器上对您进行认
# addressbook/gui/component/select-names/select-names.glade.h:3
# addressbook/gui/component/select-names/select-names.glade.h:3
# addressbook/gui/component/select-names/select-names.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:26
msgid "Finished"
msgstr "已完成"
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:27
#: addressbook/gui/contact-editor/contact-editor.glade.h:16
msgid "General"
msgstr "常规"
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr "LDAP 属性"
-
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:19
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:28
msgid "LDAP Configuration Assistant"
msgstr "LDAP 配置助手"
-# addressbook/printing/e-contact-print.glade.h:21
-# addressbook/printing/e-contact-print.glade.h:21
-# addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Mappings"
-msgstr "正在映射"
-
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:127
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:29 mail/mail-account-gui.c:63
+#: mail/mail-config.glade.h:77
msgid "Never"
msgstr "从不"
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid ""
"Now, you must specify how you want to connect to the LDAP server. The SSL "
"(Secure Sockets Layer)\n"
@@ -1653,55 +1797,17 @@ msgid ""
"these protocols."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:41
-msgid "Objectclasses"
-msgstr "对象类"
-
-#: addressbook/gui/component/ldap-config.glade.h:42
-msgid "Objectclasses Used in Evolution:"
-msgstr "在 Evolution 中使用的对象类:"
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Objectclasses Used on Server:"
-msgstr "用在服务器上的对象类:"
-
# addressbook/gui/component/addressbook-config.glade.h:11
# addressbook/gui/component/addressbook-config.glade.h:11
# addressbook/gui/component/addressbook-config.glade.h:16
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:33
msgid "One"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Please select an Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "R_estore Defaults"
-msgstr "恢复默认值(_E)"
-
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Re_store Defaults"
-msgstr "恢复默认值(_S)"
-
# addressbook/gui/component/addressbook-config.glade.h:13
# addressbook/gui/component/addressbook-config.glade.h:13
# addressbook/gui/component/addressbook-config.glade.h:18
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:34
msgid "S_earch scope: "
msgstr "搜索范围(_E):"
@@ -1712,24 +1818,17 @@ msgstr "搜索范围(_E):"
# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
# calendar/gui/e-week-view.c:1188
#. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:35
+#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1683
+#: calendar/gui/e-week-view.c:1233
msgid "Searching"
msgstr "搜索"
-# ui/evolution-addressbook.xml.h:21
-# ui/evolution-addressbook.xml.h:21
-# ui/evolution-addressbook.xml.h:21
-#: addressbook/gui/component/ldap-config.glade.h:53
-msgid "Select"
-msgstr "选择"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:36
msgid "Selected:"
msgstr "已选择:"
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:37
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if\n"
@@ -1738,7 +1837,7 @@ msgstr ""
"选中该选项意味着 Evolution 只在您的 LDAP 服务器支持\n"
"SSL 或 TLS 时才连接到您的 LDAP 服务器。"
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:39
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a \n"
@@ -1749,7 +1848,7 @@ msgid ""
"secure."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:43
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This \n"
@@ -1758,21 +1857,14 @@ msgid ""
"exploits. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:46
msgid ""
"Selecting this option will let you change Evolution's default settings for "
"LDAP\n"
"searches, and for creating and editing contacts. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid ""
"Specifying a display name is the last required step in configuring an LDAP "
"server."
@@ -1781,40 +1873,40 @@ msgstr ""
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:90
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "Step 1: Server Information"
msgstr "第一步:服务器信息"
# mail/mail-config.c:2184 mail/mail-config.c:2188
# mail/mail-config.c:2233 mail/mail-config.c:2237
# mail/mail-config.c:2326 mail/mail-config.c:2330
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:50
msgid "Step 2: Connecting to Server"
msgstr "第二步:连接服务器"
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "Step 3: Searching the Directory"
msgstr "第三步:搜索目录"
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:52
msgid "Step 4: Display Name"
msgstr "第四步:显示姓名"
# addressbook/gui/component/addressbook-config.glade.h:15
# addressbook/gui/component/addressbook-config.glade.h:15
# addressbook/gui/component/addressbook-config.glade.h:20
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:53
msgid "Sub"
msgstr ""
# shell/evolution-shell-component.c:1023
# shell/evolution-shell-component.c:1023
# shell/evolution-shell-component.c:1036
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:54
msgid "Supported Search Bases"
msgstr "支持的搜索起点"
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:55
msgid ""
"The first step in configuring an LDAP server is to provide its name, and "
"your log in\n"
@@ -1822,7 +1914,7 @@ msgid ""
"information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:57
msgid ""
"The options on this page control how many entries should be included in "
"your\n"
@@ -1831,7 +1923,7 @@ msgid ""
"need to change these options."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:60
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -1839,17 +1931,17 @@ msgid ""
"directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:62
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
"directory tree. A search scope of \"sub\" will include all entries below "
"your search base.\n"
"A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:66
msgid ""
"This assistant will help you to access online directory services\n"
"using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1859,14 +1951,14 @@ msgid ""
"need help finding this information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:72
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr "这是您的 LDAP 服务器的完整名字。例如,“ldap.mycompany.com”。"
# addressbook/gui/component/addressbook-config.glade.h:25
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:73
msgid ""
"This is the maximum number of entries to download. Setting this number to "
"be \n"
@@ -1876,7 +1968,7 @@ msgstr ""
"得太大将导致地址本变慢。"
# addressbook/gui/component/addressbook-config.glade.h:26
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:75
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1888,7 +1980,7 @@ msgstr ""
# addressbook/gui/component/addressbook-config.glade.h:22
# addressbook/gui/component/addressbook-config.glade.h:22
# addressbook/gui/component/addressbook-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:76
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list.\n"
@@ -1897,7 +1989,7 @@ msgstr ""
"这是该服务器在 Evolution 文件夹列表中显示的名子。\n"
"它只用于显示。"
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:78
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -1905,37 +1997,28 @@ msgid ""
"what port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:81
msgid "This option controls how long a search will be run."
msgstr "该选项控制搜索将运行多长时间。"
-#: addressbook/gui/component/ldap-config.glade.h:101
-msgid ""
-"To add an attribute to the DN, select it from the list and click the \"Add "
-"Attribute\" button.\n"
-"Any values that you add to the DN will become required values for any new "
-"contacts\n"
-"that you add to the directory on the LDAP server. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:82
msgid "U_se SSL/TLS:"
msgstr "使用 SSL/TLS (_S):"
# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:83
msgid "Using distinguished name (DN)"
msgstr "使用已识别的姓名 (DN)"
# addressbook/gui/component/addressbook-config.glade.h:9
# addressbook/gui/component/addressbook-config.glade.h:9
# addressbook/gui/component/addressbook-config.glade.h:13
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:84
msgid "Using email address"
msgstr "使用电子邮件地址"
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:85 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:132
msgid "Whenever Possible"
msgstr ""
@@ -1954,73 +2037,23 @@ msgstr ""
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
msgid "_Add"
msgstr "添加(_A)"
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:31
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/ldap-config.glade.h:109
-msgid "_Add ->"
-msgstr "添加(_A) ->"
-
-#: addressbook/gui/component/ldap-config.glade.h:110
-msgid "_Add Mapping"
-msgstr "添加映射(_A)"
-
-#: addressbook/gui/component/ldap-config.glade.h:111
-msgid "_Add to DN"
-msgstr "添加到已识别的名字(_A)"
-
-# calendar/gui/e-calendar-table.etspec.h:3
-# calendar/gui/e-calendar-table.etspec.h:3
-# calendar/gui/e-calendar-table.etspec.h:3
-#: addressbook/gui/component/ldap-config.glade.h:112
-msgid "_Always"
-msgstr "总是(_A)"
-
-# ui/evolution-message-composer.xml.h:46
-# ui/evolution-message-composer.xml.h:46
-# ui/evolution-message-composer.xml.h:46
-#: addressbook/gui/component/ldap-config.glade.h:113
-msgid "_Delete Mapping"
-msgstr "删除映射(_D)"
-
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:87
msgid "_Display name:"
msgstr "显示姓名(_D):"
-# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/ldap-config.glade.h:115
-msgid "_Distinguished Name (DN):"
-msgstr "已识别姓名 (DN)(_D):"
-
-#: addressbook/gui/component/ldap-config.glade.h:116
-msgid "_Don't use SSL/TLS"
-msgstr "不使用 SSL/TLS(_D)"
-
# addressbook/gui/component/addressbook-config.glade.h:33
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:88
msgid "_Download limit:"
msgstr "下载上限(_D):"
@@ -2042,7 +2075,7 @@ msgstr "下载上限(_D):"
# ui/evolution-message-composer.xml.h:47
# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
# ui/evolution-tasks.xml.h:19
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:89 filter/filter.glade.h:16
#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
#: ui/evolution-mail-messagedisplay.xml.h:6
@@ -2052,153 +2085,83 @@ msgstr "下载上限(_D):"
msgid "_Edit"
msgstr "编辑(_E)"
-# calendar/gui/alarm-notify/alarm-notify.glade.h:4
-# calendar/gui/alarm-notify/alarm-notify.glade.h:4
-# calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:119
-msgid "_Edit Mapping"
-msgstr "编辑映射(_E)"
-
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: addressbook/gui/component/ldap-config.glade.h:120
-msgid "_Evolution attribute:"
-msgstr "Evolution 属性(_E):"
-
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_If necessary "
-msgstr "如果必要(_I) "
-
-#: addressbook/gui/component/ldap-config.glade.h:122
-msgid "_LDAP attribute:"
-msgstr "LDAP 属性(_L):"
-
-#: addressbook/gui/component/ldap-config.glade.h:123
-msgid "_LDAP attributes:"
-msgstr "LDAP 属性(_L):"
-
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:90
msgid "_Log in method:"
msgstr ""
-# calendar/gui/e-meeting-time-sel.c:467
-# calendar/gui/e-meeting-time-sel.c:470
-# calendar/gui/e-meeting-time-sel.c:470
-#: addressbook/gui/component/ldap-config.glade.h:125
-msgid "_More Options >>"
-msgstr "更多选项(_M) >>"
-
# addressbook/gui/component/addressbook-config.glade.h:27
# addressbook/gui/component/addressbook-config.glade.h:27
# addressbook/gui/component/addressbook-config.glade.h:36
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:91
msgid "_Port number:"
msgstr "端口号(_P):"
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: addressbook/gui/component/ldap-config.glade.h:127
-msgid "_Restore Defaults"
-msgstr "恢复默认值(_R)"
-
# addressbook/gui/component/addressbook-config.glade.h:12
# addressbook/gui/component/addressbook-config.glade.h:12
# addressbook/gui/component/addressbook-config.glade.h:17
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:92
msgid "_Search base:"
msgstr "搜索起点(_S):"
# addressbook/gui/component/addressbook-config.glade.h:28
# addressbook/gui/component/addressbook-config.glade.h:28
# addressbook/gui/component/addressbook-config.glade.h:37
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:93
msgid "_Server name:"
msgstr "服务器名(_S):"
# calendar/gui/alarm-notify/alarm-notify.glade.h:3
# calendar/gui/alarm-notify/alarm-notify.glade.h:3
# calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:94
msgid "_Timeout (minutes):"
msgstr "超时(分钟)(_T):"
-# mail/mail-config.c:326
-# mail/mail-config.c:329
-# mail/mail-config.c:354
-#: addressbook/gui/component/ldap-config.glade.h:131
-#, fuzzy
-msgid "account-druid"
-msgstr "帐号 %d"
-
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#: addressbook/gui/component/ldap-config.glade.h:132
-msgid "account-editor"
-msgstr "账号编辑器"
-
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:95
msgid "cards"
msgstr "卡片"
# mail/mail-ops.c:2089
# mail/mail-ops.c:2091
# mail/mail-ops.c:2134
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:96
msgid "connecting-tab"
msgstr "连接-页"
-#: addressbook/gui/component/ldap-config.glade.h:135
-msgid "dn-customization-tab"
-msgstr "已识别姓名-定制-页"
-
-#: addressbook/gui/component/ldap-config.glade.h:136
-msgid "edit_server_window_simple"
-msgstr ""
-
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:97
msgid "general-tab"
msgstr "常规-页"
-#: addressbook/gui/component/ldap-config.glade.h:138
-msgid "mappings-tab"
-msgstr "映射-页"
-
-#: addressbook/gui/component/ldap-config.glade.h:139
-msgid "objectclasses-tab"
-msgstr "对象类-页"
-
# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1675
# calendar/gui/e-week-view.c:1182
# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
# calendar/gui/e-week-view.c:1184
# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
# calendar/gui/e-week-view.c:1188
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:98
msgid "searching-tab"
msgstr "搜索-页"
# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
msgstr "Evolution 的地址簿名称选择界面。"
-# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "地址簿名称选择界面车间"
+# addressbook/gui/component/select-names/e-select-names-popup.c:178
+# addressbook/gui/component/select-names/e-select-names-popup.c:178
+# addressbook/gui/component/select-names/e-select-names-popup.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
+msgstr "全部删除"
# addressbook/gui/component/select-names/e-select-names-popup.c:163
# addressbook/gui/component/select-names/e-select-names.c:777
@@ -2210,82 +2173,91 @@ msgstr "地址簿名称选择界面车间"
# addressbook/gui/component/select-names/e-select-names.c:830
# composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
#. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:692
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
msgid "Remove"
msgstr "删除"
-# addressbook/gui/component/select-names/e-select-names-popup.c:178
-# addressbook/gui/component/select-names/e-select-names-popup.c:178
-# addressbook/gui/component/select-names/e-select-names-popup.c:178
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "全部删除"
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact List"
+msgstr "新建联系人列表"
+
+# addressbook/gui/component/e-address-popup.c:973
+# addressbook/gui/component/e-address-widget.c:387
+# addressbook/gui/component/select-names/e-select-names-popup.c:306
+# addressbook/gui/component/e-address-popup.c:973
+# addressbook/gui/component/e-address-widget.c:387
+# addressbook/gui/component/select-names/e-select-names-popup.c:306
+# addressbook/gui/component/e-address-popup.c:973
+# addressbook/gui/component/e-address-widget.c:387
+# addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#, fuzzy
+msgid "View Contact Info"
+msgstr "编辑联系人信息"
# addressbook/gui/component/select-names/e-select-names-popup.c:202
# addressbook/gui/component/select-names/e-select-names-popup.c:202
# addressbook/gui/component/select-names/e-select-names-popup.c:202
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
+#: addressbook/gui/component/select-names/e-select-names-popup.c:225
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
msgid "Send HTML Mail?"
msgstr "发送 HTML 邮件?"
-# addressbook/gui/component/select-names/e-select-names-popup.c:405
-# addressbook/gui/component/select-names/e-select-names-popup.c:405
-# addressbook/gui/component/select-names/e-select-names-popup.c:405
-#: 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:423
-# addressbook/gui/component/select-names/e-select-names-popup.c:423
-# addressbook/gui/component/select-names/e-select-names-popup.c:423
-#: 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:440
-# addressbook/gui/component/select-names/e-select-names-popup.c:440
-# addressbook/gui/component/select-names/e-select-names-popup.c:440
-#: 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:506
# addressbook/gui/component/select-names/e-select-names-popup.c:506
# addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:350
msgid "Unnamed Contact"
msgstr "未命名的联系人"
+# mail/mail-config.glade.h:80
+# mail/mail-config.glade.h:80
+# mail/mail-config.glade.h:89
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "来源"
+
# addressbook/gui/component/select-names/e-select-names.c:608
# addressbook/gui/component/select-names/e-select-names.c:608
# addressbook/gui/component/select-names/e-select-names.c:671
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names.c:505
msgid "Select Contacts from Addressbook"
msgstr "从地址簿中选择联系人"
# default_user/searches.xml.h:6
# default_user/searches.xml.h:6
# default_user/searches.xml.h:6
-#: addressbook/gui/component/select-names/e-select-names.c:564
+#: addressbook/gui/component/select-names/e-select-names.c:648
msgid "Find contact in"
msgstr "在其中寻找联系人"
+# mail/mail-search.c:343
+# mail/mail-search.c:343
+# mail/mail-search.c:343
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Find"
+msgstr "寻找:"
+
# addressbook/gui/component/select-names/select-names.glade.h:4
# addressbook/gui/component/select-names/select-names.glade.h:4
# addressbook/gui/component/select-names/select-names.glade.h:3
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:3
msgid "Select Names"
msgstr "选择姓名"
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
msgid "Selected Contacts:"
msgstr "已选中的联系人:"
@@ -2301,11 +2273,11 @@ msgstr "已选中的联系人:"
# calendar/gui/dialogs/comp-editor-util.c:310
# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
# shell/e-shortcuts.c:1061
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
msgid "Show Contacts"
msgstr "显示联系人"
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
msgid ""
"Type a name into the entry, or\n"
"select one from the list below:"
@@ -2316,52 +2288,45 @@ msgstr ""
# addressbook/gui/component/select-names/select-names.glade.h:6
# addressbook/gui/component/select-names/select-names.glade.h:6
# addressbook/gui/component/select-names/select-names.glade.h:5
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
msgid "_Category:"
msgstr "类别(_C):"
# addressbook/gui/component/select-names/select-names.glade.h:7
# addressbook/gui/component/select-names/select-names.glade.h:7
# addressbook/gui/component/select-names/select-names.glade.h:6
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
msgid "_Folder:"
msgstr "文件夹(_F):"
# addressbook/gui/contact-editor/contact-editor.glade.h:1
# addressbook/gui/contact-editor/contact-editor.glade.h:1
# addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
msgid "A_ssistant's name:"
msgstr "助手姓名(_S):"
# addressbook/gui/contact-editor/contact-editor.glade.h:2
# addressbook/gui/contact-editor/contact-editor.glade.h:2
# addressbook/gui/contact-editor/contact-editor.glade.h:2
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
msgid "Add_ress..."
msgstr "地址(_R)..."
# addressbook/gui/contact-editor/contact-editor.glade.h:3
# addressbook/gui/contact-editor/contact-editor.glade.h:3
# addressbook/gui/contact-editor/contact-editor.glade.h:3
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
msgid "Anni_versary:"
msgstr "周年(_V):"
# addressbook/gui/contact-editor/contact-editor.glade.h:4
# addressbook/gui/contact-editor/contact-editor.glade.h:4
# addressbook/gui/contact-editor/contact-editor.glade.h:4
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
msgid "Birthda_y:"
msgstr "生日(_Y):"
-# addressbook/gui/contact-editor/contact-editor.glade.h:7
-# addressbook/gui/contact-editor/contact-editor.glade.h:7
-# addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "联系人(_O)..."
-
# addressbook/gui/contact-editor/contact-editor.glade.h:8
# calendar/gui/dialogs/event-page.glade.h:3
# calendar/gui/dialogs/task-page.glade.h:1
@@ -2372,7 +2337,7 @@ msgstr "联系人(_O)..."
# calendar/gui/dialogs/event-page.glade.h:3
# calendar/gui/dialogs/task-page.glade.h:1
#: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
#: calendar/gui/dialogs/task-page.glade.h:1
msgid "Ca_tegories..."
msgstr "类别(_T)..."
@@ -2392,7 +2357,7 @@ msgstr "合作"
# addressbook/gui/contact-editor/e-contact-editor.c:1293
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1335
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -2410,7 +2375,7 @@ msgstr "部门(_E):"
# addressbook/gui/contact-editor/contact-editor.glade.h:12
# calendar/gui/dialogs/task-editor.c:183
#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
msgid "Details"
msgstr "细节"
@@ -2473,31 +2438,24 @@ msgstr "组织(_Z):"
msgid "P_rofession:"
msgstr "职业(_R):"
-# addressbook/gui/contact-editor/contact-editor.glade.h:25
-# addressbook/gui/contact-editor/contact-editor.glade.h:25
-# addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "电话类型"
-
# addressbook/gui/contact-editor/contact-editor.glade.h:27
# addressbook/gui/contact-editor/contact-editor.glade.h:27
# addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "S_pouse:"
msgstr "配偶(_P):"
# addressbook/gui/contact-editor/contact-editor.glade.h:28
# addressbook/gui/contact-editor/contact-editor.glade.h:28
# addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "This is the _mailing address"
msgstr "这是邮件地址(_M)"
# addressbook/gui/contact-editor/contact-editor.glade.h:29
# addressbook/gui/contact-editor/contact-editor.glade.h:29
# addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
msgid "Wants to receive _HTML mail"
msgstr "愿意接收 HTML 邮件(_H)"
@@ -2519,73 +2477,90 @@ msgstr "愿意接收 HTML 邮件(_H)"
# mail/folder-browser.c:1478 mail/mail-config.glade.h:105
# ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
# ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:700 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3579
+#: filter/filter.glade.h:15 mail/folder-browser.c:1783
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:46
msgid "_Delete"
msgstr "删除(_D)"
# addressbook/gui/contact-editor/contact-editor.glade.h:32
# addressbook/gui/contact-editor/contact-editor.glade.h:32
# addressbook/gui/contact-editor/contact-editor.glade.h:32
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "_Job title:"
msgstr "职称(_J):"
# addressbook/gui/contact-editor/contact-editor.glade.h:33
# addressbook/gui/contact-editor/contact-editor.glade.h:33
# addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "_Manager's Name:"
msgstr "经理姓名(_M):"
# addressbook/gui/contact-editor/contact-editor.glade.h:34
# addressbook/gui/contact-editor/contact-editor.glade.h:34
# addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "_Nickname:"
msgstr "绰号(_N):"
# addressbook/gui/contact-editor/contact-editor.glade.h:35
# addressbook/gui/contact-editor/contact-editor.glade.h:35
# addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
msgid "_Office:"
msgstr "办公室(_O):"
# addressbook/gui/contact-editor/contact-editor.glade.h:36
# addressbook/gui/contact-editor/contact-editor.glade.h:36
# addressbook/gui/contact-editor/contact-editor.glade.h:36
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_Public Calendar URL:"
msgstr "公开日历 URL(_P):"
# addressbook/gui/contact-editor/contact-editor.glade.h:37
# addressbook/gui/contact-editor/contact-editor.glade.h:37
# addressbook/gui/contact-editor/contact-editor.glade.h:37
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "_Web page address:"
msgstr "网页地址(_W):"
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:183
+#, fuzzy
+msgid "Editable"
+msgstr "启用"
+
# addressbook/gui/contact-editor/fulladdr.glade.h:224
# addressbook/gui/contact-editor/fulladdr.glade.h:224
# addressbook/gui/contact-editor/e-contact-editor-address.c:128
# my-evolution/Locations.h:2343
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
msgid "United States"
msgstr "美国"
# addressbook/gui/contact-editor/fulladdr.glade.h:2
# addressbook/gui/contact-editor/fulladdr.glade.h:2
# addressbook/gui/contact-editor/e-contact-editor-address.c:129
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
msgid "Afghanistan"
msgstr "阿富汗"
@@ -2593,7 +2568,7 @@ msgstr "阿富汗"
# addressbook/gui/contact-editor/fulladdr.glade.h:3
# addressbook/gui/contact-editor/e-contact-editor-address.c:130
# my-evolution/Locations.h:42
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
#: my-evolution/Locations.h:42
msgid "Albania"
msgstr "阿尔巴尼亚"
@@ -2602,7 +2577,7 @@ msgstr "阿尔巴尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:4
# addressbook/gui/contact-editor/e-contact-editor-address.c:131
# my-evolution/Locations.h:54
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
#: my-evolution/Locations.h:54
msgid "Algeria"
msgstr "阿尔及利亚"
@@ -2610,42 +2585,42 @@ msgstr "阿尔及利亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# addressbook/gui/contact-editor/e-contact-editor-address.c:132
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
msgid "American Samoa"
msgstr "美洲萨摩亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:6
# addressbook/gui/contact-editor/fulladdr.glade.h:6
# addressbook/gui/contact-editor/e-contact-editor-address.c:133
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
msgid "Andorra"
msgstr "安道尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:7
# addressbook/gui/contact-editor/fulladdr.glade.h:7
# addressbook/gui/contact-editor/e-contact-editor-address.c:134
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
msgid "Angola"
msgstr "安哥拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:8
# addressbook/gui/contact-editor/fulladdr.glade.h:8
# addressbook/gui/contact-editor/e-contact-editor-address.c:135
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
msgid "Anguilla"
msgstr "安圭拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:9
# addressbook/gui/contact-editor/fulladdr.glade.h:9
# addressbook/gui/contact-editor/e-contact-editor-address.c:136
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
msgid "Antarctica"
msgstr "南极洲"
# addressbook/gui/contact-editor/fulladdr.glade.h:10
# addressbook/gui/contact-editor/fulladdr.glade.h:10
# addressbook/gui/contact-editor/e-contact-editor-address.c:137
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
msgid "Antigua And Barbuda"
msgstr "安提瓜和巴布达"
@@ -2653,7 +2628,7 @@ msgstr "安提瓜和巴布达"
# addressbook/gui/contact-editor/fulladdr.glade.h:11
# addressbook/gui/contact-editor/e-contact-editor-address.c:138
# my-evolution/Locations.h:120
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
#: my-evolution/Locations.h:120
msgid "Argentina"
msgstr "阿根廷"
@@ -2661,14 +2636,14 @@ msgstr "阿根廷"
# addressbook/gui/contact-editor/fulladdr.glade.h:12
# addressbook/gui/contact-editor/fulladdr.glade.h:12
# addressbook/gui/contact-editor/e-contact-editor-address.c:139
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
msgid "Armenia"
msgstr "亚美尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:13
# addressbook/gui/contact-editor/fulladdr.glade.h:13
# addressbook/gui/contact-editor/e-contact-editor-address.c:140
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
msgid "Aruba"
msgstr "阿鲁巴岛"
@@ -2676,7 +2651,7 @@ msgstr "阿鲁巴岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# addressbook/gui/contact-editor/e-contact-editor-address.c:141
# my-evolution/Locations.h:154
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
#: my-evolution/Locations.h:154
msgid "Australia"
msgstr "澳大利亚"
@@ -2685,7 +2660,7 @@ msgstr "澳大利亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:15
# addressbook/gui/contact-editor/e-contact-editor-address.c:142
# my-evolution/Locations.h:155
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
#: my-evolution/Locations.h:155
msgid "Austria"
msgstr "奥地利"
@@ -2693,7 +2668,7 @@ msgstr "奥地利"
# addressbook/gui/contact-editor/fulladdr.glade.h:16
# addressbook/gui/contact-editor/fulladdr.glade.h:16
# addressbook/gui/contact-editor/e-contact-editor-address.c:143
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
msgid "Azerbaijan"
msgstr "阿塞拜疆"
@@ -2701,7 +2676,7 @@ msgstr "阿塞拜疆"
# addressbook/gui/contact-editor/fulladdr.glade.h:17
# addressbook/gui/contact-editor/e-contact-editor-address.c:144
# my-evolution/Locations.h:161
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
#: my-evolution/Locations.h:161
msgid "Bahamas"
msgstr "巴哈马群岛"
@@ -2710,7 +2685,7 @@ msgstr "巴哈马群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:18
# addressbook/gui/contact-editor/e-contact-editor-address.c:145
# my-evolution/Locations.h:164
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
#: my-evolution/Locations.h:164
msgid "Bahrain"
msgstr "巴林岛"
@@ -2718,21 +2693,21 @@ msgstr "巴林岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:19
# addressbook/gui/contact-editor/fulladdr.glade.h:19
# addressbook/gui/contact-editor/e-contact-editor-address.c:146
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
msgid "Bangladesh"
msgstr "孟加拉国"
# addressbook/gui/contact-editor/fulladdr.glade.h:20
# addressbook/gui/contact-editor/fulladdr.glade.h:20
# addressbook/gui/contact-editor/e-contact-editor-address.c:147
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
msgid "Barbados"
msgstr "巴巴多斯岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:21
# addressbook/gui/contact-editor/fulladdr.glade.h:21
# addressbook/gui/contact-editor/e-contact-editor-address.c:148
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
msgid "Belarus"
msgstr "白俄罗斯"
@@ -2740,7 +2715,7 @@ msgstr "白俄罗斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:22
# addressbook/gui/contact-editor/e-contact-editor-address.c:149
# my-evolution/Locations.h:216
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
#: my-evolution/Locations.h:216
msgid "Belgium"
msgstr "比利时"
@@ -2749,7 +2724,7 @@ msgstr "比利时"
# addressbook/gui/contact-editor/fulladdr.glade.h:23
# addressbook/gui/contact-editor/e-contact-editor-address.c:150
# my-evolution/Locations.h:218
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
#: my-evolution/Locations.h:218
msgid "Belize"
msgstr "伯利兹"
@@ -2757,21 +2732,21 @@ msgstr "伯利兹"
# addressbook/gui/contact-editor/fulladdr.glade.h:24
# addressbook/gui/contact-editor/fulladdr.glade.h:24
# addressbook/gui/contact-editor/e-contact-editor-address.c:151
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
msgid "Benin"
msgstr "贝宁"
# addressbook/gui/contact-editor/fulladdr.glade.h:25
# addressbook/gui/contact-editor/fulladdr.glade.h:25
# addressbook/gui/contact-editor/e-contact-editor-address.c:152
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
msgid "Bermuda"
msgstr "百慕大群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:26
# addressbook/gui/contact-editor/fulladdr.glade.h:26
# addressbook/gui/contact-editor/e-contact-editor-address.c:153
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
msgid "Bhutan"
msgstr "不丹"
@@ -2779,7 +2754,7 @@ msgstr "不丹"
# addressbook/gui/contact-editor/fulladdr.glade.h:27
# addressbook/gui/contact-editor/e-contact-editor-address.c:154
# my-evolution/Locations.h:270
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
#: my-evolution/Locations.h:270
msgid "Bolivia"
msgstr "玻利维亚"
@@ -2787,21 +2762,21 @@ msgstr "玻利维亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:28
# addressbook/gui/contact-editor/fulladdr.glade.h:28
# addressbook/gui/contact-editor/e-contact-editor-address.c:155
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
msgid "Bosnia And Herzegowina"
msgstr "波斯尼亚和黑赛哥维纳"
# addressbook/gui/contact-editor/fulladdr.glade.h:29
# addressbook/gui/contact-editor/fulladdr.glade.h:29
# addressbook/gui/contact-editor/e-contact-editor-address.c:156
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
msgid "Botswana"
msgstr "博茨瓦纳"
# addressbook/gui/contact-editor/fulladdr.glade.h:30
# addressbook/gui/contact-editor/fulladdr.glade.h:30
# addressbook/gui/contact-editor/e-contact-editor-address.c:157
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
msgid "Bouvet Island"
msgstr "布维岛"
@@ -2809,7 +2784,7 @@ msgstr "布维岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:31
# addressbook/gui/contact-editor/e-contact-editor-address.c:158
# my-evolution/Locations.h:294
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
#: my-evolution/Locations.h:294
msgid "Brazil"
msgstr "巴西"
@@ -2817,14 +2792,14 @@ msgstr "巴西"
# addressbook/gui/contact-editor/fulladdr.glade.h:32
# addressbook/gui/contact-editor/fulladdr.glade.h:32
# addressbook/gui/contact-editor/e-contact-editor-address.c:159
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
msgid "British Indian Ocean Territory"
msgstr "英属印度洋地区"
# addressbook/gui/contact-editor/fulladdr.glade.h:34
# addressbook/gui/contact-editor/fulladdr.glade.h:34
# addressbook/gui/contact-editor/e-contact-editor-address.c:160
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
msgid "Brunei Darussalam"
msgstr "文莱 德鲁萨兰"
@@ -2832,7 +2807,7 @@ msgstr "文莱 德鲁萨兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:35
# addressbook/gui/contact-editor/e-contact-editor-address.c:161
# my-evolution/Locations.h:320
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
#: my-evolution/Locations.h:320
msgid "Bulgaria"
msgstr "保加利亚"
@@ -2840,28 +2815,28 @@ msgstr "保加利亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:36
# addressbook/gui/contact-editor/fulladdr.glade.h:36
# addressbook/gui/contact-editor/e-contact-editor-address.c:162
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
msgid "Burkina Faso"
msgstr "布基纳法索"
# addressbook/gui/contact-editor/fulladdr.glade.h:37
# addressbook/gui/contact-editor/fulladdr.glade.h:37
# addressbook/gui/contact-editor/e-contact-editor-address.c:163
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
msgid "Burundi"
msgstr "布隆迪"
# addressbook/gui/contact-editor/fulladdr.glade.h:38
# addressbook/gui/contact-editor/fulladdr.glade.h:38
# addressbook/gui/contact-editor/e-contact-editor-address.c:164
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
msgid "Cambodia"
msgstr "柬埔寨"
# addressbook/gui/contact-editor/fulladdr.glade.h:39
# addressbook/gui/contact-editor/fulladdr.glade.h:39
# addressbook/gui/contact-editor/e-contact-editor-address.c:165
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
msgid "Cameroon"
msgstr "喀麦隆"
@@ -2869,7 +2844,7 @@ msgstr "喀麦隆"
# addressbook/gui/contact-editor/fulladdr.glade.h:40
# addressbook/gui/contact-editor/e-contact-editor-address.c:166
# my-evolution/Locations.h:354
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
#: my-evolution/Locations.h:354
msgid "Canada"
msgstr "加拿大"
@@ -2877,7 +2852,7 @@ msgstr "加拿大"
# addressbook/gui/contact-editor/fulladdr.glade.h:41
# addressbook/gui/contact-editor/fulladdr.glade.h:41
# addressbook/gui/contact-editor/e-contact-editor-address.c:167
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
msgid "Cape Verde"
msgstr "佛得角"
@@ -2885,7 +2860,7 @@ msgstr "佛得角"
# addressbook/gui/contact-editor/fulladdr.glade.h:42
# addressbook/gui/contact-editor/e-contact-editor-address.c:168
# my-evolution/Locations.h:389
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
#: my-evolution/Locations.h:389
msgid "Cayman Islands"
msgstr "开曼群岛"
@@ -2893,14 +2868,14 @@ msgstr "开曼群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:43
# addressbook/gui/contact-editor/fulladdr.glade.h:43
# addressbook/gui/contact-editor/e-contact-editor-address.c:169
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
msgid "Central African Republic"
msgstr "中非共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:44
# addressbook/gui/contact-editor/fulladdr.glade.h:44
# addressbook/gui/contact-editor/e-contact-editor-address.c:170
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
msgid "Chad"
msgstr "乍得"
@@ -2908,7 +2883,7 @@ msgstr "乍得"
# addressbook/gui/contact-editor/fulladdr.glade.h:46
# addressbook/gui/contact-editor/e-contact-editor-address.c:171
# my-evolution/Locations.h:438
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
#: my-evolution/Locations.h:438
msgid "Chile"
msgstr "智利"
@@ -2916,7 +2891,7 @@ msgstr "智利"
# addressbook/gui/contact-editor/fulladdr.glade.h:47
# addressbook/gui/contact-editor/fulladdr.glade.h:47
# addressbook/gui/contact-editor/e-contact-editor-address.c:172
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
msgid "China"
msgstr "中国"
@@ -2924,7 +2899,7 @@ msgstr "中国"
# addressbook/gui/contact-editor/fulladdr.glade.h:48
# addressbook/gui/contact-editor/e-contact-editor-address.c:173
# my-evolution/Locations.h:451
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
#: my-evolution/Locations.h:451
msgid "Christmas Island"
msgstr "圣诞岛"
@@ -2932,7 +2907,7 @@ msgstr "圣诞岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:49
# addressbook/gui/contact-editor/fulladdr.glade.h:49
# addressbook/gui/contact-editor/e-contact-editor-address.c:174
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
msgid "Cocos (Keeling) Islands"
msgstr "科科斯群岛"
@@ -2940,7 +2915,7 @@ msgstr "科科斯群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:50
# addressbook/gui/contact-editor/e-contact-editor-address.c:175
# my-evolution/Locations.h:483
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
#: my-evolution/Locations.h:483
msgid "Colombia"
msgstr "哥伦比亚"
@@ -2948,7 +2923,7 @@ msgstr "哥伦比亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:51
# addressbook/gui/contact-editor/fulladdr.glade.h:51
# addressbook/gui/contact-editor/e-contact-editor-address.c:176
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
msgid "Comoros"
msgstr "科摩罗群岛"
@@ -2956,15 +2931,15 @@ msgstr "科摩罗群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:52
# addressbook/gui/contact-editor/e-contact-editor-address.c:177
# addressbook/gui/contact-editor/e-contact-editor-address.c:178
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
msgid "Congo"
msgstr "刚果"
# addressbook/gui/contact-editor/fulladdr.glade.h:53
# addressbook/gui/contact-editor/fulladdr.glade.h:53
# addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
msgid "Cook Islands"
msgstr "库克群岛"
@@ -2972,7 +2947,7 @@ msgstr "库克群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:54
# addressbook/gui/contact-editor/e-contact-editor-address.c:180
# my-evolution/Locations.h:517
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
#: my-evolution/Locations.h:517
msgid "Costa Rica"
msgstr "哥斯达黎加"
@@ -2980,7 +2955,7 @@ msgstr "哥斯达黎加"
# addressbook/gui/contact-editor/fulladdr.glade.h:55
# addressbook/gui/contact-editor/fulladdr.glade.h:55
# addressbook/gui/contact-editor/e-contact-editor-address.c:181
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
msgid "Cote d'Ivoire"
msgstr "科特迪瓦"
@@ -2988,7 +2963,7 @@ msgstr "科特迪瓦"
# addressbook/gui/contact-editor/fulladdr.glade.h:57
# addressbook/gui/contact-editor/e-contact-editor-address.c:182
# my-evolution/Locations.h:528
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
#: my-evolution/Locations.h:528
msgid "Croatia"
msgstr "克罗地亚"
@@ -2997,7 +2972,7 @@ msgstr "克罗地亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:58
# addressbook/gui/contact-editor/e-contact-editor-address.c:183
# my-evolution/Locations.h:532
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
#: my-evolution/Locations.h:532
msgid "Cuba"
msgstr "古巴"
@@ -3006,7 +2981,7 @@ msgstr "古巴"
# addressbook/gui/contact-editor/fulladdr.glade.h:59
# addressbook/gui/contact-editor/e-contact-editor-address.c:184
# my-evolution/Locations.h:545
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
#: my-evolution/Locations.h:545
msgid "Cyprus"
msgstr "塞浦路斯"
@@ -3015,7 +2990,7 @@ msgstr "塞浦路斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:60
# addressbook/gui/contact-editor/e-contact-editor-address.c:185
# my-evolution/Locations.h:546
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
#: my-evolution/Locations.h:546
msgid "Czech Republic"
msgstr "捷克共和国"
@@ -3024,7 +2999,7 @@ msgstr "捷克共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:61
# addressbook/gui/contact-editor/e-contact-editor-address.c:186
# my-evolution/Locations.h:580
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
#: my-evolution/Locations.h:580
msgid "Denmark"
msgstr "丹麦"
@@ -3032,14 +3007,14 @@ msgstr "丹麦"
# addressbook/gui/contact-editor/fulladdr.glade.h:62
# addressbook/gui/contact-editor/fulladdr.glade.h:62
# addressbook/gui/contact-editor/e-contact-editor-address.c:187
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
msgid "Djibouti"
msgstr "吉布提群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:63
# addressbook/gui/contact-editor/fulladdr.glade.h:63
# addressbook/gui/contact-editor/e-contact-editor-address.c:188
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
msgid "Dominica"
msgstr "多米尼加"
@@ -3047,7 +3022,7 @@ msgstr "多米尼加"
# addressbook/gui/contact-editor/fulladdr.glade.h:64
# addressbook/gui/contact-editor/e-contact-editor-address.c:189
# my-evolution/Locations.h:608
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
#: my-evolution/Locations.h:608
msgid "Dominican Republic"
msgstr "多米尼加共和国"
@@ -3055,7 +3030,7 @@ msgstr "多米尼加共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:65
# addressbook/gui/contact-editor/fulladdr.glade.h:65
# addressbook/gui/contact-editor/e-contact-editor-address.c:190
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
msgid "East Timor"
msgstr "东帝汶"
@@ -3063,7 +3038,7 @@ msgstr "东帝汶"
# addressbook/gui/contact-editor/fulladdr.glade.h:66
# addressbook/gui/contact-editor/e-contact-editor-address.c:191
# my-evolution/Locations.h:641
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
#: my-evolution/Locations.h:641
msgid "Ecuador"
msgstr "厄瓜多尔"
@@ -3072,7 +3047,7 @@ msgstr "厄瓜多尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:67
# addressbook/gui/contact-editor/e-contact-editor-address.c:192
# my-evolution/Locations.h:650
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
#: my-evolution/Locations.h:650
msgid "Egypt"
msgstr "埃及"
@@ -3081,7 +3056,7 @@ msgstr "埃及"
# addressbook/gui/contact-editor/fulladdr.glade.h:68
# addressbook/gui/contact-editor/e-contact-editor-address.c:193
# my-evolution/Locations.h:666
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
#: my-evolution/Locations.h:666
msgid "El Salvador"
msgstr "萨尔瓦多"
@@ -3089,14 +3064,14 @@ msgstr "萨尔瓦多"
# addressbook/gui/contact-editor/fulladdr.glade.h:69
# addressbook/gui/contact-editor/fulladdr.glade.h:69
# addressbook/gui/contact-editor/e-contact-editor-address.c:194
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
msgid "Equatorial Guinea"
msgstr "赤道几内亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:70
# addressbook/gui/contact-editor/fulladdr.glade.h:70
# addressbook/gui/contact-editor/e-contact-editor-address.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
msgid "Eritrea"
msgstr "厄立特里亚"
@@ -3104,7 +3079,7 @@ msgstr "厄立特里亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:71
# addressbook/gui/contact-editor/e-contact-editor-address.c:196
# my-evolution/Locations.h:684
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
#: my-evolution/Locations.h:684
msgid "Estonia"
msgstr "爱沙尼亚"
@@ -3112,28 +3087,28 @@ msgstr "爱沙尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:72
# addressbook/gui/contact-editor/fulladdr.glade.h:72
# addressbook/gui/contact-editor/e-contact-editor-address.c:197
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
msgid "Ethiopia"
msgstr "埃塞俄比亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:73
# addressbook/gui/contact-editor/fulladdr.glade.h:73
# addressbook/gui/contact-editor/e-contact-editor-address.c:198
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
msgid "Falkland Islands"
msgstr "福克兰群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:74
# addressbook/gui/contact-editor/fulladdr.glade.h:74
# addressbook/gui/contact-editor/e-contact-editor-address.c:199
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
msgid "Faroe Islands"
msgstr "法罗群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:75
# addressbook/gui/contact-editor/fulladdr.glade.h:75
# addressbook/gui/contact-editor/e-contact-editor-address.c:200
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
msgid "Fiji"
msgstr "斐济"
@@ -3141,7 +3116,7 @@ msgstr "斐济"
# addressbook/gui/contact-editor/fulladdr.glade.h:76
# addressbook/gui/contact-editor/e-contact-editor-address.c:201
# my-evolution/Locations.h:716
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
#: my-evolution/Locations.h:716
msgid "Finland"
msgstr "芬兰"
@@ -3150,7 +3125,7 @@ msgstr "芬兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:77
# addressbook/gui/contact-editor/e-contact-editor-address.c:202
# my-evolution/Locations.h:766
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
#: my-evolution/Locations.h:766
msgid "France"
msgstr "法国"
@@ -3158,35 +3133,35 @@ msgstr "法国"
# addressbook/gui/contact-editor/fulladdr.glade.h:78
# addressbook/gui/contact-editor/fulladdr.glade.h:78
# addressbook/gui/contact-editor/e-contact-editor-address.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
msgid "French Guiana"
msgstr "法属圭亚那"
# addressbook/gui/contact-editor/fulladdr.glade.h:79
# addressbook/gui/contact-editor/fulladdr.glade.h:79
# addressbook/gui/contact-editor/e-contact-editor-address.c:204
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
msgid "French Polynesia"
msgstr "法属波利尼西亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:80
# addressbook/gui/contact-editor/fulladdr.glade.h:80
# addressbook/gui/contact-editor/e-contact-editor-address.c:205
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
msgid "French Southern Territories"
msgstr "法属南部地区"
# addressbook/gui/contact-editor/fulladdr.glade.h:81
# addressbook/gui/contact-editor/fulladdr.glade.h:81
# addressbook/gui/contact-editor/e-contact-editor-address.c:206
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
msgid "Gabon"
msgstr "加蓬"
# addressbook/gui/contact-editor/fulladdr.glade.h:82
# addressbook/gui/contact-editor/fulladdr.glade.h:82
# addressbook/gui/contact-editor/e-contact-editor-address.c:207
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
msgid "Gambia"
msgstr "冈比亚"
@@ -3194,7 +3169,7 @@ msgstr "冈比亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:83
# addressbook/gui/contact-editor/e-contact-editor-address.c:208
# my-evolution/Locations.h:811
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
#: my-evolution/Locations.h:811
msgid "Georgia"
msgstr "格鲁吉亚"
@@ -3203,7 +3178,7 @@ msgstr "格鲁吉亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:84
# addressbook/gui/contact-editor/e-contact-editor-address.c:209
# my-evolution/Locations.h:812
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
#: my-evolution/Locations.h:812
msgid "Germany"
msgstr "德国"
@@ -3211,7 +3186,7 @@ msgstr "德国"
# addressbook/gui/contact-editor/fulladdr.glade.h:85
# addressbook/gui/contact-editor/fulladdr.glade.h:85
# addressbook/gui/contact-editor/e-contact-editor-address.c:210
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
msgid "Ghana"
msgstr "加纳"
@@ -3219,7 +3194,7 @@ msgstr "加纳"
# addressbook/gui/contact-editor/fulladdr.glade.h:86
# addressbook/gui/contact-editor/e-contact-editor-address.c:211
# my-evolution/Locations.h:815
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
#: my-evolution/Locations.h:815
msgid "Gibraltar"
msgstr "直布罗陀"
@@ -3228,7 +3203,7 @@ msgstr "直布罗陀"
# addressbook/gui/contact-editor/fulladdr.glade.h:87
# addressbook/gui/contact-editor/e-contact-editor-address.c:212
# my-evolution/Locations.h:846
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
#: my-evolution/Locations.h:846
msgid "Greece"
msgstr "希腊"
@@ -3236,28 +3211,28 @@ msgstr "希腊"
# addressbook/gui/contact-editor/fulladdr.glade.h:88
# addressbook/gui/contact-editor/fulladdr.glade.h:88
# addressbook/gui/contact-editor/e-contact-editor-address.c:213
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
msgid "Greenland"
msgstr "格陵兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# addressbook/gui/contact-editor/e-contact-editor-address.c:214
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
msgid "Grenada"
msgstr "格林纳达"
# addressbook/gui/contact-editor/fulladdr.glade.h:90
# addressbook/gui/contact-editor/fulladdr.glade.h:90
# addressbook/gui/contact-editor/e-contact-editor-address.c:215
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
msgid "Guadeloupe"
msgstr "瓜德罗普岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:91
# addressbook/gui/contact-editor/fulladdr.glade.h:91
# addressbook/gui/contact-editor/e-contact-editor-address.c:216
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
msgid "Guam"
msgstr "关岛"
@@ -3265,7 +3240,7 @@ msgstr "关岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:92
# addressbook/gui/contact-editor/e-contact-editor-address.c:217
# my-evolution/Locations.h:867
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
#: my-evolution/Locations.h:867
msgid "Guatemala"
msgstr "危地马拉"
@@ -3273,21 +3248,21 @@ msgstr "危地马拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:93
# addressbook/gui/contact-editor/fulladdr.glade.h:93
# addressbook/gui/contact-editor/e-contact-editor-address.c:218
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
msgid "Guinea"
msgstr "几内亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:94
# addressbook/gui/contact-editor/fulladdr.glade.h:94
# addressbook/gui/contact-editor/e-contact-editor-address.c:219
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
msgid "Guinea-bissau"
msgstr "几内亚比绍"
# addressbook/gui/contact-editor/fulladdr.glade.h:95
# addressbook/gui/contact-editor/fulladdr.glade.h:95
# addressbook/gui/contact-editor/e-contact-editor-address.c:220
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
msgid "Guyana"
msgstr "圭亚那"
@@ -3295,7 +3270,7 @@ msgstr "圭亚那"
# addressbook/gui/contact-editor/fulladdr.glade.h:96
# addressbook/gui/contact-editor/e-contact-editor-address.c:221
# my-evolution/Locations.h:888
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
#: my-evolution/Locations.h:888
msgid "Haiti"
msgstr "海地"
@@ -3303,14 +3278,14 @@ msgstr "海地"
# addressbook/gui/contact-editor/fulladdr.glade.h:97
# addressbook/gui/contact-editor/fulladdr.glade.h:97
# addressbook/gui/contact-editor/e-contact-editor-address.c:222
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
msgid "Heard And McDonald Islands"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:98
# addressbook/gui/contact-editor/fulladdr.glade.h:98
# addressbook/gui/contact-editor/e-contact-editor-address.c:223
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
msgid "Holy See"
msgstr "圣座"
@@ -3318,7 +3293,7 @@ msgstr "圣座"
# addressbook/gui/contact-editor/fulladdr.glade.h:99
# addressbook/gui/contact-editor/e-contact-editor-address.c:224
# my-evolution/Locations.h:945
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
#: my-evolution/Locations.h:945
msgid "Honduras"
msgstr "洪都拉斯"
@@ -3327,7 +3302,7 @@ msgstr "洪都拉斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:100
# addressbook/gui/contact-editor/e-contact-editor-address.c:225
# my-evolution/Locations.h:946
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
#: my-evolution/Locations.h:946
msgid "Hong Kong"
msgstr "香港"
@@ -3336,7 +3311,7 @@ msgstr "香港"
# addressbook/gui/contact-editor/fulladdr.glade.h:101
# addressbook/gui/contact-editor/e-contact-editor-address.c:226
# my-evolution/Locations.h:966
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
#: my-evolution/Locations.h:966
msgid "Hungary"
msgstr "匈牙利"
@@ -3345,7 +3320,7 @@ msgstr "匈牙利"
# addressbook/gui/contact-editor/fulladdr.glade.h:102
# addressbook/gui/contact-editor/e-contact-editor-address.c:227
# my-evolution/Locations.h:978
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
#: my-evolution/Locations.h:978
msgid "Iceland"
msgstr "冰岛"
@@ -3354,7 +3329,7 @@ msgstr "冰岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:103
# addressbook/gui/contact-editor/e-contact-editor-address.c:228
# my-evolution/Locations.h:991
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
#: my-evolution/Locations.h:991
msgid "India"
msgstr "印度"
@@ -3362,7 +3337,7 @@ msgstr "印度"
# addressbook/gui/contact-editor/fulladdr.glade.h:104
# addressbook/gui/contact-editor/fulladdr.glade.h:104
# addressbook/gui/contact-editor/e-contact-editor-address.c:229
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
msgid "Indonesia"
msgstr "印度尼西亚"
@@ -3370,7 +3345,7 @@ msgstr "印度尼西亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# addressbook/gui/contact-editor/e-contact-editor-address.c:230
# my-evolution/Locations.h:1007
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
#: my-evolution/Locations.h:1007
msgid "Ireland"
msgstr "爱尔兰"
@@ -3378,7 +3353,7 @@ msgstr "爱尔兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:106
# addressbook/gui/contact-editor/fulladdr.glade.h:106
# addressbook/gui/contact-editor/e-contact-editor-address.c:231
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
msgid "Israel"
msgstr "以色列"
@@ -3386,7 +3361,7 @@ msgstr "以色列"
# addressbook/gui/contact-editor/fulladdr.glade.h:107
# addressbook/gui/contact-editor/e-contact-editor-address.c:232
# my-evolution/Locations.h:1016
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
#: my-evolution/Locations.h:1016
msgid "Italy"
msgstr "意大利"
@@ -3395,7 +3370,7 @@ msgstr "意大利"
# addressbook/gui/contact-editor/fulladdr.glade.h:108
# addressbook/gui/contact-editor/e-contact-editor-address.c:233
# my-evolution/Locations.h:1031
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
#: my-evolution/Locations.h:1031
msgid "Jamaica"
msgstr "牙买加"
@@ -3404,7 +3379,7 @@ msgstr "牙买加"
# addressbook/gui/contact-editor/fulladdr.glade.h:109
# addressbook/gui/contact-editor/e-contact-editor-address.c:234
# my-evolution/Locations.h:1035
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
#: my-evolution/Locations.h:1035
msgid "Japan"
msgstr "日本"
@@ -3413,7 +3388,7 @@ msgstr "日本"
# addressbook/gui/contact-editor/fulladdr.glade.h:110
# addressbook/gui/contact-editor/e-contact-editor-address.c:235
# my-evolution/Locations.h:1046
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
#: my-evolution/Locations.h:1046
msgid "Jordan"
msgstr "约旦"
@@ -3421,28 +3396,28 @@ msgstr "约旦"
# addressbook/gui/contact-editor/fulladdr.glade.h:111
# addressbook/gui/contact-editor/fulladdr.glade.h:111
# addressbook/gui/contact-editor/e-contact-editor-address.c:236
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
msgid "Kazakhstan"
msgstr "哈萨克斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:112
# addressbook/gui/contact-editor/fulladdr.glade.h:112
# addressbook/gui/contact-editor/e-contact-editor-address.c:237
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
msgid "Kenya"
msgstr "肯尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:113
# addressbook/gui/contact-editor/fulladdr.glade.h:113
# addressbook/gui/contact-editor/e-contact-editor-address.c:238
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
msgid "Kiribati"
msgstr "基里巴斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:60
# addressbook/gui/contact-editor/fulladdr.glade.h:60
# addressbook/gui/contact-editor/e-contact-editor-address.c:239
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
msgid "Korea, Republic Of"
msgstr "大韩民国"
@@ -3450,7 +3425,7 @@ msgstr "大韩民国"
# addressbook/gui/contact-editor/fulladdr.glade.h:114
# addressbook/gui/contact-editor/e-contact-editor-address.c:240
# my-evolution/Locations.h:1146
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
#: my-evolution/Locations.h:1146
msgid "Kuwait"
msgstr "科威特"
@@ -3458,14 +3433,14 @@ msgstr "科威特"
# addressbook/gui/contact-editor/fulladdr.glade.h:115
# addressbook/gui/contact-editor/fulladdr.glade.h:115
# addressbook/gui/contact-editor/e-contact-editor-address.c:241
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
msgid "Kyrgyzstan"
msgstr "吉尔吉斯斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# addressbook/gui/contact-editor/e-contact-editor-address.c:242
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
msgid "Laos"
msgstr "老挝"
@@ -3473,7 +3448,7 @@ msgstr "老挝"
# addressbook/gui/contact-editor/fulladdr.glade.h:117
# addressbook/gui/contact-editor/e-contact-editor-address.c:243
# my-evolution/Locations.h:1190
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
msgid "Latvia"
msgstr "拉脱维亚"
@@ -3481,7 +3456,7 @@ msgstr "拉脱维亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:118
# addressbook/gui/contact-editor/e-contact-editor-address.c:244
# my-evolution/Locations.h:1198
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
#: my-evolution/Locations.h:1197
msgid "Lebanon"
msgstr "黎巴嫩"
@@ -3489,7 +3464,7 @@ msgstr "黎巴嫩"
# addressbook/gui/contact-editor/fulladdr.glade.h:119
# addressbook/gui/contact-editor/fulladdr.glade.h:119
# addressbook/gui/contact-editor/e-contact-editor-address.c:245
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
msgid "Lesotho"
msgstr "莱索托"
@@ -3497,7 +3472,7 @@ msgstr "莱索托"
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# addressbook/gui/contact-editor/e-contact-editor-address.c:246
# my-evolution/Locations.h:1218
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
#: my-evolution/Locations.h:1217
msgid "Liberia"
msgstr "利比里亚"
@@ -3505,7 +3480,7 @@ msgstr "利比里亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:121
# addressbook/gui/contact-editor/fulladdr.glade.h:121
# addressbook/gui/contact-editor/e-contact-editor-address.c:247
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
msgid "Liechtenstein"
msgstr "列支敦士登"
@@ -3513,7 +3488,7 @@ msgstr "列支敦士登"
# addressbook/gui/contact-editor/fulladdr.glade.h:122
# addressbook/gui/contact-editor/e-contact-editor-address.c:248
# my-evolution/Locations.h:1234
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
#: my-evolution/Locations.h:1233
msgid "Lithuania"
msgstr "立陶宛"
@@ -3522,7 +3497,7 @@ msgstr "立陶宛"
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# addressbook/gui/contact-editor/e-contact-editor-address.c:249
# my-evolution/Locations.h:1268
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
#: my-evolution/Locations.h:1267
msgid "Luxembourg"
msgstr "卢森堡"
@@ -3530,49 +3505,49 @@ msgstr "卢森堡"
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# addressbook/gui/contact-editor/e-contact-editor-address.c:250
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
msgid "Macau"
msgstr "澳门"
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# addressbook/gui/contact-editor/e-contact-editor-address.c:251
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
msgid "Macedonia"
msgstr "马其顿"
# addressbook/gui/contact-editor/fulladdr.glade.h:126
# addressbook/gui/contact-editor/fulladdr.glade.h:126
# addressbook/gui/contact-editor/e-contact-editor-address.c:252
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
msgid "Madagascar"
msgstr "马达加斯加"
# addressbook/gui/contact-editor/fulladdr.glade.h:127
# addressbook/gui/contact-editor/fulladdr.glade.h:127
# addressbook/gui/contact-editor/e-contact-editor-address.c:253
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
msgid "Malawi"
msgstr "马拉维"
# addressbook/gui/contact-editor/fulladdr.glade.h:128
# addressbook/gui/contact-editor/fulladdr.glade.h:128
# addressbook/gui/contact-editor/e-contact-editor-address.c:254
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
msgid "Malaysia"
msgstr "马来西亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:129
# addressbook/gui/contact-editor/fulladdr.glade.h:129
# addressbook/gui/contact-editor/e-contact-editor-address.c:255
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
msgid "Maldives"
msgstr "马尔代夫"
# addressbook/gui/contact-editor/fulladdr.glade.h:130
# addressbook/gui/contact-editor/fulladdr.glade.h:130
# addressbook/gui/contact-editor/e-contact-editor-address.c:256
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
msgid "Mali"
msgstr "马里"
@@ -3580,7 +3555,7 @@ msgstr "马里"
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# addressbook/gui/contact-editor/e-contact-editor-address.c:257
# my-evolution/Locations.h:1297
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
#: my-evolution/Locations.h:1296
msgid "Malta"
msgstr "马耳他"
@@ -3588,35 +3563,35 @@ msgstr "马耳他"
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/e-contact-editor-address.c:258
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
msgid "Marshall Islands"
msgstr "马绍尔群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# addressbook/gui/contact-editor/e-contact-editor-address.c:259
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
msgid "Martinique"
msgstr "马提尼可岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/e-contact-editor-address.c:260
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
msgid "Mauritania"
msgstr "毛里塔尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:135
# addressbook/gui/contact-editor/fulladdr.glade.h:135
# addressbook/gui/contact-editor/e-contact-editor-address.c:261
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
msgid "Mauritius"
msgstr "毛里求斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:136
# addressbook/gui/contact-editor/fulladdr.glade.h:136
# addressbook/gui/contact-editor/e-contact-editor-address.c:262
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
msgid "Mayotte"
msgstr "马约特岛"
@@ -3624,43 +3599,43 @@ msgstr "马约特岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:137
# addressbook/gui/contact-editor/e-contact-editor-address.c:263
# my-evolution/Locations.h:1387
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
msgid "Mexico"
msgstr "墨西哥"
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
msgid "Micronesia"
msgstr "密克罗尼西亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:60
# addressbook/gui/contact-editor/fulladdr.glade.h:60
# addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
msgid "Moldova, Republic Of"
msgstr "摩尔多瓦共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/e-contact-editor-address.c:266
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
msgid "Monaco"
msgstr "摩纳哥"
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# addressbook/gui/contact-editor/e-contact-editor-address.c:267
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
msgid "Mongolia"
msgstr "蒙古"
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/e-contact-editor-address.c:268
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
msgid "Montserrat"
msgstr "蒙特塞拉特群岛"
@@ -3668,43 +3643,43 @@ msgstr "蒙特塞拉特群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:142
# addressbook/gui/contact-editor/e-contact-editor-address.c:269
# my-evolution/Locations.h:1470
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
msgid "Morocco"
msgstr "摩洛哥"
# addressbook/gui/contact-editor/fulladdr.glade.h:143
# addressbook/gui/contact-editor/fulladdr.glade.h:143
# addressbook/gui/contact-editor/e-contact-editor-address.c:270
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
msgid "Mozambique"
msgstr "莫桑比克"
# addressbook/gui/contact-editor/fulladdr.glade.h:144
# addressbook/gui/contact-editor/fulladdr.glade.h:144
# addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
msgid "Myanmar"
msgstr "缅甸"
# addressbook/gui/contact-editor/fulladdr.glade.h:145
# addressbook/gui/contact-editor/fulladdr.glade.h:145
# addressbook/gui/contact-editor/e-contact-editor-address.c:272
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
msgid "Namibia"
msgstr "纳米比亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:146
# addressbook/gui/contact-editor/fulladdr.glade.h:146
# addressbook/gui/contact-editor/e-contact-editor-address.c:273
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
msgid "Nauru"
msgstr "瑙鲁"
# addressbook/gui/contact-editor/fulladdr.glade.h:147
# addressbook/gui/contact-editor/fulladdr.glade.h:147
# addressbook/gui/contact-editor/e-contact-editor-address.c:274
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
msgid "Nepal"
msgstr "尼泊尔"
@@ -3712,22 +3687,22 @@ msgstr "尼泊尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:148
# addressbook/gui/contact-editor/e-contact-editor-address.c:275
# my-evolution/Locations.h:1531
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
msgid "Netherlands"
msgstr "荷兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:149
# addressbook/gui/contact-editor/fulladdr.glade.h:149
# addressbook/gui/contact-editor/e-contact-editor-address.c:276
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
msgid "Netherlands Antilles"
msgstr "荷属安的列斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
msgid "New Caledonia"
msgstr "新喀里多尼亚"
@@ -3735,8 +3710,8 @@ msgstr "新喀里多尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# addressbook/gui/contact-editor/e-contact-editor-address.c:278
# my-evolution/Locations.h:1560
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
msgid "New Zealand"
msgstr "新西兰"
@@ -3744,29 +3719,29 @@ msgstr "新西兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:152
# addressbook/gui/contact-editor/e-contact-editor-address.c:279
# my-evolution/Locations.h:1562
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
msgid "Nicaragua"
msgstr "尼加拉瓜"
# addressbook/gui/contact-editor/fulladdr.glade.h:153
# addressbook/gui/contact-editor/fulladdr.glade.h:153
# addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
msgid "Niger"
msgstr "尼日尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:154
# addressbook/gui/contact-editor/fulladdr.glade.h:154
# addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
msgid "Nigeria"
msgstr "尼日利亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:155
# addressbook/gui/contact-editor/fulladdr.glade.h:155
# addressbook/gui/contact-editor/e-contact-editor-address.c:282
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
msgid "Niue"
msgstr "纽埃岛"
@@ -3774,15 +3749,15 @@ msgstr "纽埃岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# addressbook/gui/contact-editor/e-contact-editor-address.c:283
# my-evolution/Locations.h:1574
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
msgid "Norfolk Island"
msgstr "诺福克岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:157
# addressbook/gui/contact-editor/fulladdr.glade.h:157
# addressbook/gui/contact-editor/e-contact-editor-address.c:284
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
msgid "Northern Mariana Islands"
msgstr "北马里亚那群岛"
@@ -3790,8 +3765,8 @@ msgstr "北马里亚那群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# addressbook/gui/contact-editor/e-contact-editor-address.c:285
# my-evolution/Locations.h:1587
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
msgid "Norway"
msgstr "挪威"
@@ -3799,8 +3774,8 @@ msgstr "挪威"
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# addressbook/gui/contact-editor/e-contact-editor-address.c:286
# my-evolution/Locations.h:1632
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
msgid "Oman"
msgstr "阿曼"
@@ -3808,22 +3783,22 @@ msgstr "阿曼"
# addressbook/gui/contact-editor/fulladdr.glade.h:160
# addressbook/gui/contact-editor/e-contact-editor-address.c:287
# my-evolution/Locations.h:1673
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
msgid "Pakistan"
msgstr "巴基斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
msgid "Palau"
msgstr "帕劳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:162
# addressbook/gui/contact-editor/fulladdr.glade.h:162
# addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
msgid "Palestinian Territory"
msgstr "巴勒斯坦地区"
@@ -3831,15 +3806,15 @@ msgstr "巴勒斯坦地区"
# addressbook/gui/contact-editor/fulladdr.glade.h:163
# addressbook/gui/contact-editor/e-contact-editor-address.c:290
# my-evolution/Locations.h:1683
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
msgid "Panama"
msgstr "巴拿马"
# addressbook/gui/contact-editor/fulladdr.glade.h:164
# addressbook/gui/contact-editor/fulladdr.glade.h:164
# addressbook/gui/contact-editor/e-contact-editor-address.c:291
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
msgid "Papua New Guinea"
msgstr "巴布亚新几内亚"
@@ -3847,8 +3822,8 @@ msgstr "巴布亚新几内亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:165
# addressbook/gui/contact-editor/e-contact-editor-address.c:292
# my-evolution/Locations.h:1688
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
msgid "Paraguay"
msgstr "巴拉圭"
@@ -3856,22 +3831,22 @@ msgstr "巴拉圭"
# addressbook/gui/contact-editor/fulladdr.glade.h:166
# addressbook/gui/contact-editor/e-contact-editor-address.c:293
# my-evolution/Locations.h:1723
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
msgid "Peru"
msgstr "秘鲁"
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
msgid "Philippines"
msgstr "菲利宾"
# addressbook/gui/contact-editor/fulladdr.glade.h:168
# addressbook/gui/contact-editor/fulladdr.glade.h:168
# addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
msgid "Pitcairn"
msgstr "皮特克恩岛"
@@ -3879,8 +3854,8 @@ msgstr "皮特克恩岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/e-contact-editor-address.c:296
# my-evolution/Locations.h:1764
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
msgid "Poland"
msgstr "波兰"
@@ -3888,8 +3863,8 @@ msgstr "波兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:170
# addressbook/gui/contact-editor/e-contact-editor-address.c:297
# my-evolution/Locations.h:1791
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
msgid "Portugal"
msgstr "葡萄牙"
@@ -3897,8 +3872,8 @@ msgstr "葡萄牙"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/e-contact-editor-address.c:298
# my-evolution/Locations.h:1824
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
msgid "Puerto Rico"
msgstr "波多黎各"
@@ -3906,15 +3881,15 @@ msgstr "波多黎各"
# addressbook/gui/contact-editor/fulladdr.glade.h:172
# addressbook/gui/contact-editor/e-contact-editor-address.c:299
# my-evolution/Locations.h:1836
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
msgid "Qatar"
msgstr "卡塔尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
msgid "Reunion"
msgstr "留尼汪"
@@ -3922,64 +3897,64 @@ msgstr "留尼汪"
# addressbook/gui/contact-editor/fulladdr.glade.h:176
# addressbook/gui/contact-editor/e-contact-editor-address.c:301
# my-evolution/Locations.h:1912
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
msgid "Romania"
msgstr "罗马尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:177
# addressbook/gui/contact-editor/fulladdr.glade.h:177
# addressbook/gui/contact-editor/e-contact-editor-address.c:302
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
msgid "Russian Federation"
msgstr "俄罗斯联邦"
# addressbook/gui/contact-editor/fulladdr.glade.h:178
# addressbook/gui/contact-editor/fulladdr.glade.h:178
# addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
msgid "Rwanda"
msgstr "卢旺达"
# addressbook/gui/contact-editor/fulladdr.glade.h:179
# addressbook/gui/contact-editor/fulladdr.glade.h:179
# addressbook/gui/contact-editor/e-contact-editor-address.c:304
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
msgid "Saint Kitts And Nevis"
msgstr "圣基德和吉维斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/e-contact-editor-address.c:305
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
msgid "Saint Lucia"
msgstr "圣卢西亚岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:181
# addressbook/gui/contact-editor/fulladdr.glade.h:181
# addressbook/gui/contact-editor/e-contact-editor-address.c:306
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
msgid "Saint Vincent And The Grena-dines"
msgstr "圣文森特和格林纳达"
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/e-contact-editor-address.c:307
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
msgid "Samoa"
msgstr "萨摩亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/e-contact-editor-address.c:308
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
msgid "San Marino"
msgstr "圣马力诺"
# addressbook/gui/contact-editor/fulladdr.glade.h:184
# addressbook/gui/contact-editor/fulladdr.glade.h:184
# addressbook/gui/contact-editor/e-contact-editor-address.c:309
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
msgid "Sao Tome And Principe"
msgstr "圣多美和普林西比"
@@ -3987,29 +3962,29 @@ msgstr "圣多美和普林西比"
# addressbook/gui/contact-editor/fulladdr.glade.h:185
# addressbook/gui/contact-editor/e-contact-editor-address.c:310
# my-evolution/Locations.h:2035
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
msgid "Saudi Arabia"
msgstr "沙特阿拉伯"
# addressbook/gui/contact-editor/fulladdr.glade.h:186
# addressbook/gui/contact-editor/fulladdr.glade.h:186
# addressbook/gui/contact-editor/e-contact-editor-address.c:311
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
msgid "Senegal"
msgstr "塞内加尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
msgid "Seychelles"
msgstr "塞舌尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:188
# addressbook/gui/contact-editor/fulladdr.glade.h:188
# addressbook/gui/contact-editor/e-contact-editor-address.c:313
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
msgid "Sierra Leone"
msgstr "塞拉利昂"
@@ -4017,8 +3992,8 @@ msgstr "塞拉利昂"
# addressbook/gui/contact-editor/fulladdr.glade.h:189
# addressbook/gui/contact-editor/e-contact-editor-address.c:314
# my-evolution/Locations.h:2090
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
msgid "Singapore"
msgstr "新加坡"
@@ -4026,8 +4001,8 @@ msgstr "新加坡"
# addressbook/gui/contact-editor/fulladdr.glade.h:190
# addressbook/gui/contact-editor/e-contact-editor-address.c:315
# my-evolution/Locations.h:2103
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
msgid "Slovakia"
msgstr "斯洛伐克"
@@ -4035,22 +4010,22 @@ msgstr "斯洛伐克"
# addressbook/gui/contact-editor/fulladdr.glade.h:191
# addressbook/gui/contact-editor/e-contact-editor-address.c:316
# my-evolution/Locations.h:2104
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
msgid "Slovenia"
msgstr "斯洛文尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
msgid "Solomon Islands"
msgstr "所罗门群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
msgid "Somalia"
msgstr "索马里"
@@ -4058,15 +4033,15 @@ msgstr "索马里"
# addressbook/gui/contact-editor/fulladdr.glade.h:194
# addressbook/gui/contact-editor/e-contact-editor-address.c:319
# my-evolution/Locations.h:2119
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
msgid "South Africa"
msgstr "南非"
# addressbook/gui/contact-editor/fulladdr.glade.h:195
# addressbook/gui/contact-editor/fulladdr.glade.h:195
# addressbook/gui/contact-editor/e-contact-editor-address.c:320
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
msgid "South Georgia And The South Sandwich Islands"
msgstr "南乔治亚和南三文治群岛"
@@ -4074,36 +4049,36 @@ msgstr "南乔治亚和南三文治群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:196
# addressbook/gui/contact-editor/e-contact-editor-address.c:321
# my-evolution/Locations.h:2127
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
msgid "Spain"
msgstr "西班牙"
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# addressbook/gui/contact-editor/e-contact-editor-address.c:322
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
msgid "Sri Lanka"
msgstr "斯里兰卡"
# addressbook/gui/contact-editor/fulladdr.glade.h:198
# addressbook/gui/contact-editor/fulladdr.glade.h:198
# addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
msgid "St. Helena"
msgstr "圣赫勒拿岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:199
# addressbook/gui/contact-editor/fulladdr.glade.h:199
# addressbook/gui/contact-editor/e-contact-editor-address.c:324
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
msgid "St. Pierre And Miquelon"
msgstr "圣皮埃尔和麦克伦群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:200
# addressbook/gui/contact-editor/fulladdr.glade.h:200
# addressbook/gui/contact-editor/e-contact-editor-address.c:325
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
msgid "Sudan"
msgstr "苏丹"
@@ -4111,22 +4086,22 @@ msgstr "苏丹"
# addressbook/gui/contact-editor/fulladdr.glade.h:201
# addressbook/gui/contact-editor/e-contact-editor-address.c:326
# my-evolution/Locations.h:2176
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
msgid "Suriname"
msgstr "苏里南"
# addressbook/gui/contact-editor/fulladdr.glade.h:202
# addressbook/gui/contact-editor/fulladdr.glade.h:202
# addressbook/gui/contact-editor/e-contact-editor-address.c:327
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
msgid "Svalbard And Jan Mayen Islands"
msgstr "斯瓦巴和尖棉群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:203
# addressbook/gui/contact-editor/fulladdr.glade.h:203
# addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
msgid "Swaziland"
msgstr "斯威士兰"
@@ -4134,8 +4109,8 @@ msgstr "斯威士兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:204
# addressbook/gui/contact-editor/e-contact-editor-address.c:329
# my-evolution/Locations.h:2181
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
msgid "Sweden"
msgstr "瑞典"
@@ -4143,8 +4118,8 @@ msgstr "瑞典"
# addressbook/gui/contact-editor/fulladdr.glade.h:205
# addressbook/gui/contact-editor/e-contact-editor-address.c:330
# my-evolution/Locations.h:2183
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
msgid "Switzerland"
msgstr "瑞士"
@@ -4152,64 +4127,64 @@ msgstr "瑞士"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/e-contact-editor-address.c:331
# my-evolution/Locations.h:2205
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
msgid "Taiwan"
msgstr "台湾"
# addressbook/gui/contact-editor/fulladdr.glade.h:207
# addressbook/gui/contact-editor/fulladdr.glade.h:207
# addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
msgid "Tajikistan"
msgstr "塔吉克斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:223
# addressbook/gui/contact-editor/fulladdr.glade.h:223
# addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
msgid "Tanzania, United Republic Of"
msgstr "坦桑尼亚联邦共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:208
# addressbook/gui/contact-editor/fulladdr.glade.h:208
# addressbook/gui/contact-editor/e-contact-editor-address.c:334
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
msgid "Thailand"
msgstr "泰国"
# addressbook/gui/contact-editor/fulladdr.glade.h:209
# addressbook/gui/contact-editor/fulladdr.glade.h:209
# addressbook/gui/contact-editor/e-contact-editor-address.c:335
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
msgid "Togo"
msgstr "多哥"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/e-contact-editor-address.c:336
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
msgid "Tokelau"
msgstr "托克劳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# addressbook/gui/contact-editor/e-contact-editor-address.c:337
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
msgid "Tonga"
msgstr "汤加"
# addressbook/gui/contact-editor/fulladdr.glade.h:212
# addressbook/gui/contact-editor/fulladdr.glade.h:212
# addressbook/gui/contact-editor/e-contact-editor-address.c:338
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
msgid "Trinidad And Tobago"
msgstr "特里尼达和多巴哥"
# addressbook/gui/contact-editor/fulladdr.glade.h:213
# addressbook/gui/contact-editor/fulladdr.glade.h:213
# addressbook/gui/contact-editor/e-contact-editor-address.c:339
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
msgid "Tunisia"
msgstr "突尼斯"
@@ -4217,36 +4192,36 @@ msgstr "突尼斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:214
# addressbook/gui/contact-editor/e-contact-editor-address.c:340
# my-evolution/Locations.h:2321
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
msgid "Turkey"
msgstr "土耳其"
# addressbook/gui/contact-editor/fulladdr.glade.h:215
# addressbook/gui/contact-editor/fulladdr.glade.h:215
# addressbook/gui/contact-editor/e-contact-editor-address.c:341
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
msgid "Turkmenistan"
msgstr "土库曼斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:216
# addressbook/gui/contact-editor/fulladdr.glade.h:216
# addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
msgid "Turks And Caicos Islands"
msgstr "特克斯和凯科斯群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:217
# addressbook/gui/contact-editor/fulladdr.glade.h:217
# addressbook/gui/contact-editor/e-contact-editor-address.c:343
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
msgid "Tuvalu"
msgstr "图瓦卢"
# addressbook/gui/contact-editor/fulladdr.glade.h:219
# addressbook/gui/contact-editor/fulladdr.glade.h:219
# addressbook/gui/contact-editor/e-contact-editor-address.c:344
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
msgid "Uganda"
msgstr "乌干达"
@@ -4254,15 +4229,15 @@ msgstr "乌干达"
# addressbook/gui/contact-editor/fulladdr.glade.h:220
# addressbook/gui/contact-editor/e-contact-editor-address.c:345
# my-evolution/Locations.h:2334
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
msgid "Ukraine"
msgstr "乌克兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:221
# addressbook/gui/contact-editor/fulladdr.glade.h:221
# addressbook/gui/contact-editor/e-contact-editor-address.c:346
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
msgid "United Arab Emirates"
msgstr "阿拉伯联合酋长国"
@@ -4270,15 +4245,15 @@ msgstr "阿拉伯联合酋长国"
# addressbook/gui/contact-editor/fulladdr.glade.h:222
# addressbook/gui/contact-editor/e-contact-editor-address.c:347
# my-evolution/Locations.h:2342
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
msgid "United Kingdom"
msgstr "英国"
# addressbook/gui/contact-editor/fulladdr.glade.h:225
# addressbook/gui/contact-editor/fulladdr.glade.h:225
# addressbook/gui/contact-editor/e-contact-editor-address.c:348
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
msgid "United States Minor Outlying Islands"
msgstr "美国小型外岛"
@@ -4286,22 +4261,22 @@ msgstr "美国小型外岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:226
# addressbook/gui/contact-editor/e-contact-editor-address.c:349
# my-evolution/Locations.h:2348
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
msgid "Uruguay"
msgstr "乌拉圭"
# addressbook/gui/contact-editor/fulladdr.glade.h:227
# addressbook/gui/contact-editor/fulladdr.glade.h:227
# addressbook/gui/contact-editor/e-contact-editor-address.c:350
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
msgid "Uzbekistan"
msgstr "乌兹别克斯坦"
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
msgid "Vanuatu"
msgstr "努瓦阿图"
@@ -4309,8 +4284,8 @@ msgstr "努瓦阿图"
# addressbook/gui/contact-editor/fulladdr.glade.h:229
# addressbook/gui/contact-editor/e-contact-editor-address.c:352
# my-evolution/Locations.h:2380
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
msgid "Venezuela"
msgstr "委内瑞拉"
@@ -4318,36 +4293,36 @@ msgstr "委内瑞拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:230
# addressbook/gui/contact-editor/e-contact-editor-address.c:353
# my-evolution/Locations.h:2392
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
msgid "Viet Nam"
msgstr "越南"
# addressbook/gui/contact-editor/fulladdr.glade.h:218
# addressbook/gui/contact-editor/fulladdr.glade.h:218
# addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
msgid "Virgin Islands, British"
msgstr "英属处女群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:218
# addressbook/gui/contact-editor/fulladdr.glade.h:218
# addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
msgid "Virgin Islands, U.S."
msgstr "美属处女群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:231
# addressbook/gui/contact-editor/fulladdr.glade.h:231
# addressbook/gui/contact-editor/e-contact-editor-address.c:356
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
msgid "Wallis And Futuna Islands"
msgstr "瓦利斯和富图纳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:232
# addressbook/gui/contact-editor/fulladdr.glade.h:232
# addressbook/gui/contact-editor/e-contact-editor-address.c:357
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
msgid "Western Sahara"
msgstr "西撒哈拉"
@@ -4355,8 +4330,8 @@ msgstr "西撒哈拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:233
# addressbook/gui/contact-editor/e-contact-editor-address.c:358
# my-evolution/Locations.h:2512
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
msgid "Yemen"
msgstr "也门"
@@ -4364,73 +4339,124 @@ msgstr "也门"
# addressbook/gui/contact-editor/fulladdr.glade.h:234
# addressbook/gui/contact-editor/e-contact-editor-address.c:359
# my-evolution/Locations.h:2524
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
msgid "Yugoslavia"
msgstr "南斯拉夫"
# addressbook/gui/contact-editor/fulladdr.glade.h:235
# addressbook/gui/contact-editor/fulladdr.glade.h:235
# addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
msgid "Zambia"
msgstr "赞比亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:236
# addressbook/gui/contact-editor/fulladdr.glade.h:236
# addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
msgid "Zimbabwe"
msgstr "津巴布韦"
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "您确定要删除该联系人吗?"
+# addressbook/printing/e-contact-print.glade.h:4
+# addressbook/printing/e-contact-print.glade.h:4
+# my-evolution/Locations.h:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:459
+#, fuzzy
+msgid "Book"
+msgstr "邮件体"
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "删除联系人?"
+# addressbook/backend/ebook/e-card-simple.c:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+# addressbook/backend/ebook/e-card-simple.c:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+# addressbook/backend/ebook/e-card-simple.c:73
+# addressbook/gui/contact-editor/e-contact-editor.c:1649
+#: addressbook/gui/contact-editor/e-contact-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
+#, fuzzy
+msgid "Card"
+msgstr "汽车"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:170
+msgid "Is New Card"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:49
+# ui/evolution-message-composer.xml.h:49
+# my-evolution/Locations.h:1381
+#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#, fuzzy
+msgid "Writable Fields"
+msgstr "发件人域(_F)"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:44
+# addressbook/gui/contact-editor/fulladdr.glade.h:44
+# addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Changed"
+msgstr "乍得"
# addressbook/gui/contact-editor/e-contact-editor.c:757
# addressbook/gui/contact-editor/e-contact-editor.c:757
# addressbook/gui/contact-editor/e-contact-editor.c:757
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:828
msgid "Category editor not available."
msgstr "类别编辑器不可用。"
# addressbook/gui/contact-editor/e-contact-editor.c:764
# addressbook/gui/contact-editor/e-contact-editor.c:764
# addressbook/gui/contact-editor/e-contact-editor.c:764
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:836
msgid "This contact belongs to these categories:"
msgstr "该联系人属于这些范畴:"
# addressbook/gui/contact-editor/e-contact-editor.c:978
# addressbook/gui/contact-editor/e-contact-editor.c:978
# addressbook/gui/contact-editor/e-contact-editor.c:978
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1010
msgid "Save Contact as VCard"
msgstr "将联系人保存为 VCard"
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1056
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "您确定要删除该联系人吗?"
+
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1059
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "您确定要删除该联系人吗?"
+
# addressbook/gui/contact-editor/e-contact-editor.c:1662
# addressbook/gui/contact-editor/e-contact-editor.c:1662
# addressbook/gui/contact-editor/e-contact-editor.c:1662
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
msgid "TTY/TDD"
msgstr "TTY/TDD"
# addressbook/gui/contact-editor/e-contact-editor.c:2287
# addressbook/gui/contact-editor/e-contact-editor.c:2287
# addressbook/gui/contact-editor/e-contact-editor.c:2309
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2362
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "无法为域找到构件:“%s”"
@@ -4438,54 +4464,51 @@ msgstr "无法为域找到构件:“%s”"
# addressbook/gui/contact-editor/e-contact-quick-add.c:298
# addressbook/gui/contact-editor/e-contact-quick-add.c:298
# addressbook/gui/contact-editor/e-contact-quick-add.c:298
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
msgid "Contact Quick-Add"
msgstr "快速添加联系人"
# addressbook/gui/contact-editor/e-contact-quick-add.c:300
# addressbook/gui/contact-editor/e-contact-quick-add.c:300
# addressbook/gui/contact-editor/e-contact-quick-add.c:300
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
msgid "Edit Full"
msgstr "完全编辑"
-# addressbook/gui/contact-editor/e-contact-quick-add.c:326
-# addressbook/gui/widgets/e-addressbook-view.c:850
-# addressbook/gui/contact-editor/e-contact-quick-add.c:326
-# addressbook/gui/widgets/e-addressbook-view.c:850
-# addressbook/gui/contact-editor/e-contact-quick-add.c:326
-# addressbook/gui/widgets/e-addressbook-view.c:961
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "全名"
-
# addressbook/gui/contact-editor/e-contact-quick-add.c:332
# addressbook/gui/contact-editor/e-contact-quick-add.c:332
# addressbook/gui/contact-editor/e-contact-quick-add.c:332
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
msgid "E-mail"
msgstr "电子邮件"
+# composer/e-msg-composer.c:978
+# composer/e-msg-composer.c:982
+# composer/e-msg-composer.c:947
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "保存文件错误: %s"
+
# addressbook/gui/contact-editor/e-contact-save-as.c:106
# addressbook/gui/contact-editor/e-contact-save-as.c:106
# addressbook/gui/contact-editor/e-contact-save-as.c:106
#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
msgid "card.vcf"
msgstr "card.vcf"
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
msgid "list"
msgstr "列表"
# addressbook/gui/contact-editor/e-contact-save-as.c:201
# addressbook/gui/contact-editor/e-contact-save-as.c:201
# addressbook/gui/contact-editor/e-contact-save-as.c:201
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
#, c-format
msgid ""
"%s already exists\n"
@@ -4494,224 +4517,216 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr "覆盖确认"
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string. It's not used."
-msgstr ""
-
# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
# mail/mail-display.c:102
# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
# mail/mail-display.c:102
# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
# mail/mail-display.c:101
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
msgid "Overwrite"
msgstr "覆盖"
# addressbook/gui/contact-editor/fulladdr.glade.h:1
# addressbook/gui/contact-editor/fulladdr.glade.h:1
# addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
msgid "Address _2:"
msgstr "地址 2(_2):"
# addressbook/gui/contact-editor/fulladdr.glade.h:45
# addressbook/gui/contact-editor/fulladdr.glade.h:45
# addressbook/gui/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
msgid "Check Address"
msgstr "检查地址"
# addressbook/gui/contact-editor/fulladdr.glade.h:56
# addressbook/gui/contact-editor/fulladdr.glade.h:56
# addressbook/gui/contact-editor/fulladdr.glade.h:3
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
msgid "Countr_y:"
msgstr "国家(_Y):"
# addressbook/gui/contact-editor/fulladdr.glade.h:237
# addressbook/gui/contact-editor/fulladdr.glade.h:237
# addressbook/gui/contact-editor/fulladdr.glade.h:4
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
msgid "_Address:"
msgstr "地址(_A):"
# addressbook/gui/contact-editor/fulladdr.glade.h:238
# addressbook/gui/contact-editor/fulladdr.glade.h:238
# addressbook/gui/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
msgid "_City:"
msgstr "城市(_C):"
# addressbook/gui/contact-editor/fulladdr.glade.h:239
# addressbook/gui/contact-editor/fulladdr.glade.h:239
# addressbook/gui/contact-editor/fulladdr.glade.h:6
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
msgid "_PO Box:"
msgstr "邮局邮箱(_P):"
# addressbook/gui/contact-editor/fulladdr.glade.h:240
# addressbook/gui/contact-editor/fulladdr.glade.h:240
# addressbook/gui/contact-editor/fulladdr.glade.h:7
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
msgid "_State/Province:"
msgstr "州/省(_S):"
# addressbook/gui/contact-editor/fulladdr.glade.h:241
# addressbook/gui/contact-editor/fulladdr.glade.h:241
# addressbook/gui/contact-editor/fulladdr.glade.h:8
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
msgid "_ZIP Code:"
msgstr "邮政编码(_Z):"
# addressbook/gui/contact-editor/fullname.glade.h:1
# addressbook/gui/contact-editor/fullname.glade.h:1
# addressbook/gui/contact-editor/fullname.glade.h:1
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
msgid "Check Full Name"
msgstr "检查全名"
# addressbook/gui/contact-editor/fullname.glade.h:2
# addressbook/gui/contact-editor/fullname.glade.h:2
# addressbook/gui/contact-editor/fullname.glade.h:2
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
msgid "Dr."
msgstr "博士"
# addressbook/gui/contact-editor/fullname.glade.h:3
# addressbook/gui/contact-editor/fullname.glade.h:3
# addressbook/gui/contact-editor/fullname.glade.h:3
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
msgid "Esq."
msgstr "先生"
# addressbook/gui/contact-editor/fullname.glade.h:4
# addressbook/gui/contact-editor/fullname.glade.h:4
# addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
msgid "I"
msgstr "I"
# addressbook/gui/contact-editor/fullname.glade.h:5
# addressbook/gui/contact-editor/fullname.glade.h:5
# addressbook/gui/contact-editor/fullname.glade.h:5
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
msgid "II"
msgstr "II"
# addressbook/gui/contact-editor/fullname.glade.h:6
# addressbook/gui/contact-editor/fullname.glade.h:6
# addressbook/gui/contact-editor/fullname.glade.h:6
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
msgid "III"
msgstr "III"
# addressbook/gui/contact-editor/fullname.glade.h:7
# addressbook/gui/contact-editor/fullname.glade.h:7
# addressbook/gui/contact-editor/fullname.glade.h:7
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
msgid "Jr."
msgstr "晚辈"
# addressbook/gui/contact-editor/fullname.glade.h:8
# addressbook/gui/contact-editor/fullname.glade.h:8
# addressbook/gui/contact-editor/fullname.glade.h:8
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
msgid "Miss"
msgstr "小姐"
# addressbook/gui/contact-editor/fullname.glade.h:9
# addressbook/gui/contact-editor/fullname.glade.h:9
# addressbook/gui/contact-editor/fullname.glade.h:9
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
msgid "Mr."
msgstr "先生"
# addressbook/gui/contact-editor/fullname.glade.h:10
# addressbook/gui/contact-editor/fullname.glade.h:10
# addressbook/gui/contact-editor/fullname.glade.h:10
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
msgid "Mrs."
msgstr "夫人"
# addressbook/gui/contact-editor/fullname.glade.h:11
# addressbook/gui/contact-editor/fullname.glade.h:11
# addressbook/gui/contact-editor/fullname.glade.h:11
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
msgid "Ms."
msgstr "女士"
# addressbook/gui/contact-editor/fullname.glade.h:12
# addressbook/gui/contact-editor/fullname.glade.h:12
# addressbook/gui/contact-editor/fullname.glade.h:12
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
msgid "Sr."
msgstr "长辈"
# addressbook/gui/contact-editor/fullname.glade.h:13
# addressbook/gui/contact-editor/fullname.glade.h:13
# addressbook/gui/contact-editor/fullname.glade.h:13
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
msgid "_First:"
msgstr "名(_F):"
# addressbook/gui/contact-editor/fullname.glade.h:14
# addressbook/gui/contact-editor/fullname.glade.h:14
# addressbook/gui/contact-editor/fullname.glade.h:14
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
msgid "_Last:"
msgstr "姓(_L):"
# addressbook/gui/contact-editor/fullname.glade.h:15
# addressbook/gui/contact-editor/fullname.glade.h:15
# addressbook/gui/contact-editor/fullname.glade.h:15
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
msgid "_Middle:"
msgstr "中间名(_M):"
# addressbook/gui/contact-editor/fullname.glade.h:16
# addressbook/gui/contact-editor/fullname.glade.h:16
# addressbook/gui/contact-editor/fullname.glade.h:16
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
msgid "_Suffix:"
msgstr "后缀(_S):"
# addressbook/gui/contact-editor/fullname.glade.h:17
# addressbook/gui/contact-editor/fullname.glade.h:17
# addressbook/gui/contact-editor/fullname.glade.h:17
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
msgid "_Title:"
msgstr "头衔(_T):"
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
msgid "List _name:"
msgstr "列举姓名(_N):"
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
msgid "Members"
msgstr "成员"
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
msgid "Type an email address or drag a contact into the list below:"
msgstr "输入电子邮件地址或者把联系人拖放到下面的列表:"
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
msgid "_Hide addresses when sending mail to this list"
msgstr "在往该列表发送邮件时隐藏地址(_H)"
@@ -4721,7 +4736,7 @@ msgstr "在往该列表发送邮件时隐藏地址(_H)"
# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
msgid "_Remove"
msgstr "删除(_R)"
@@ -4729,22 +4744,30 @@ msgstr "删除(_R)"
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
msgid "contact-list-editor"
msgstr "联系人列表编辑器"
+# ui/evolution-addressbook.xml.h:12
+# ui/evolution-addressbook.xml.h:12
+# ui/evolution-addressbook.xml.h:12
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#, fuzzy
+msgid "Is New List"
+msgstr "新列表"
+
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
# addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
msgid "Save List as VCard"
msgstr "将列表保存为 VCard"
@@ -4845,52 +4868,66 @@ msgstr ""
# widgets/misc/e-filter-bar.c:238
# addressbook/gui/search/e-addressbook-search-dialog.c:145
# widgets/misc/e-filter-bar.c:238
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:153
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: widgets/misc/e-filter-bar.c:148
msgid "Advanced Search"
msgstr "高级搜索"
-# addressbook/gui/search/e-addressbook-search-dialog.c:151
-# mail/mail-search.c:263
-# addressbook/gui/search/e-addressbook-search-dialog.c:151
-# mail/mail-search.c:263
-# addressbook/gui/search/e-addressbook-search-dialog.c:151
-# mail/mail-search.c:263
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "搜索"
-
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
msgid "No cards"
msgstr "没有卡片"
# addressbook/gui/widgets/e-addressbook-model.c:130
# addressbook/gui/widgets/e-addressbook-model.c:130
# addressbook/gui/widgets/e-addressbook-model.c:130
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
msgid "1 card"
msgstr "1 张卡片"
# addressbook/gui/widgets/e-addressbook-model.c:133
# addressbook/gui/widgets/e-addressbook-model.c:133
# addressbook/gui/widgets/e-addressbook-model.c:133
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
#, c-format
msgid "%d cards"
msgstr "%d 张卡片"
+# addressbook/gui/contact-editor/fulladdr.glade.h:84
+# addressbook/gui/contact-editor/fulladdr.glade.h:84
+# my-evolution/Locations.h:870
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:466
+#, fuzzy
+msgid "Query"
+msgstr "格恩西岛"
+
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:466
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:457
#, fuzzy
msgid "Error getting book view"
msgstr "启动 %s 错误"
+# addressbook/backend/ebook/e-card-simple.c:72
+# addressbook/gui/contact-editor/contact-editor.glade.h:20
+# addressbook/gui/contact-editor/e-contact-editor.c:1655
+# addressbook/backend/ebook/e-card-simple.c:72
+# addressbook/gui/contact-editor/contact-editor.glade.h:20
+# addressbook/gui/contact-editor/e-contact-editor.c:1655
+# my-evolution/Locations.h:1433
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#, fuzzy
+msgid "Model"
+msgstr "手机"
+
# addressbook/gui/widgets/e-addressbook-table-adapter.c:140
# addressbook/gui/widgets/e-addressbook-util.c:85
# addressbook/gui/widgets/e-minicard.c:475
@@ -4901,8 +4938,8 @@ msgstr "启动 %s 错误"
# addressbook/gui/widgets/e-addressbook-util.c:85
# addressbook/gui/widgets/e-minicard.c:475
#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:531
msgid "Error modifying card"
msgstr "修改卡片错误"
@@ -4912,8 +4949,8 @@ msgstr "修改卡片错误"
# shell/evolution-shell-component.c:1007
# addressbook/gui/widgets/e-addressbook-util.c:33
# shell/evolution-shell-component.c:1020
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1178
msgid "Success"
msgstr "成功"
@@ -4929,18 +4966,19 @@ msgstr "成功"
# camel/providers/imap/camel-imap-command.c:275
# camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
# shell/e-storage.c:528 shell/evolution-shell-component.c:1057
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
#: camel/providers/imap/camel-imap-command.c:309
#: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:529 shell/e-shell.c:2075
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1217
msgid "Unknown error"
msgstr "未知的错误"
# addressbook/gui/widgets/e-addressbook-util.c:35
# addressbook/gui/widgets/e-addressbook-util.c:35
# addressbook/gui/widgets/e-addressbook-util.c:35
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
msgid "Repository offline"
msgstr "仓库离线"
@@ -4950,29 +4988,29 @@ msgstr "仓库离线"
# shell/evolution-shell-component.c:1035
# addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
# shell/evolution-shell-component.c:1048
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1208
msgid "Permission denied"
msgstr "没有权限"
# addressbook/gui/widgets/e-addressbook-util.c:37
# addressbook/gui/widgets/e-addressbook-util.c:37
# addressbook/gui/widgets/e-addressbook-util.c:37
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
msgid "Card not found"
msgstr "找不到卡片"
# addressbook/gui/widgets/e-addressbook-util.c:38
# addressbook/gui/widgets/e-addressbook-util.c:38
# addressbook/gui/widgets/e-addressbook-util.c:38
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
msgid "Card ID already exists"
msgstr "卡片 ID 已经存在"
# addressbook/gui/widgets/e-addressbook-util.c:39
# addressbook/gui/widgets/e-addressbook-util.c:39
# addressbook/gui/widgets/e-addressbook-util.c:39
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
msgid "Protocol not supported"
msgstr "不支持的协议"
@@ -4991,46 +5029,46 @@ msgstr "不支持的协议"
# calendar/gui/dialogs/task-details-page.glade.h:3
# calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
# camel/camel-service.c:610 camel/camel-service.c:646
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
-#: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
+#: camel/camel-service.c:849 camel/camel-service.c:892
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
msgid "Cancelled"
msgstr "已经取消"
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
msgid "Authentication Failed"
msgstr "认证失败"
# camel/providers/smtp/camel-smtp-transport.c:222
# camel/providers/smtp/camel-smtp-transport.c:222
# camel/providers/smtp/camel-smtp-transport.c:223
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
msgid "Authentication Required"
msgstr "必须认证"
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
msgid "TLS not Available"
msgstr "TLS 不可用"
# shell/e-shell-importer.c:397
# shell/e-shell-importer.c:397
# shell/e-shell-importer.c:409
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
msgid "Addressbook does not exist"
msgstr "地址本不存在"
# addressbook/gui/widgets/e-addressbook-util.c:41
# addressbook/gui/widgets/e-addressbook-util.c:41
# addressbook/gui/widgets/e-addressbook-util.c:41
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
msgid "Other error"
msgstr "其它错误"
@@ -5040,37 +5078,47 @@ msgstr "其它错误"
# calendar/gui/dialogs/save-comp.c:50
# addressbook/gui/widgets/e-addressbook-util.c:57
# calendar/gui/dialogs/save-comp.c:50
-#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: addressbook/gui/widgets/e-addressbook-util.c:75
#: calendar/gui/dialogs/save-comp.c:50
msgid "Do you want to save changes?"
msgstr "您希望保存修改吗?"
+# addressbook/printing/e-contact-print.c:1171
+# addressbook/printing/e-contact-print.c:1193
+# addressbook/printing/e-contact-print.c:1171
+# addressbook/printing/e-contact-print.c:1193
+# my-evolution/Locations.h:600
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+#, fuzzy
+msgid "_Discard"
+msgstr "打印卡片"
+
# addressbook/gui/widgets/e-addressbook-util.c:76
# addressbook/gui/widgets/e-addressbook-util.c:76
# addressbook/gui/widgets/e-addressbook-util.c:76
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:96
msgid "Error adding list"
msgstr "添加列表错误"
# addressbook/gui/widgets/e-addressbook-util.c:76
# addressbook/gui/widgets/e-addressbook-util.c:76
# addressbook/gui/widgets/e-addressbook-util.c:76
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
msgid "Error adding card"
msgstr "添加卡片错误"
# addressbook/gui/widgets/e-addressbook-util.c:85
# addressbook/gui/widgets/e-addressbook-util.c:85
# addressbook/gui/widgets/e-addressbook-util.c:85
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
msgid "Error modifying list"
msgstr "修改列表错误"
# addressbook/gui/widgets/e-addressbook-util.c:95
# addressbook/gui/widgets/e-addressbook-util.c:95
# addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
msgid "Error removing list"
msgstr "删除列表错误"
@@ -5080,28 +5128,13 @@ msgstr "删除列表错误"
# addressbook/gui/widgets/e-addressbook-view.c:1278
# addressbook/gui/widgets/e-addressbook-util.c:95
# addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
msgid "Error removing card"
msgstr "删除卡片错误"
-# mail/mail-config.glade.h:28
-# mail/mail-config.glade.h:28
-# addressbook/gui/widgets/e-addressbook-util.c:202
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-msgid "Display Cards?"
-msgstr "显示卡片?"
-
-# mail/mail-config.glade.h:28
-# mail/mail-config.glade.h:28
-# addressbook/gui/widgets/e-addressbook-util.c:203
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-msgid "Display Cards"
-msgstr "显示卡片"
-
# addressbook/gui/widgets/e-addressbook-util.c:207
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:197
#, fuzzy, c-format
msgid ""
"Opening %d cards will open %d new windows as well.\n"
@@ -5113,36 +5146,71 @@ msgstr ""
# mail/mail-callbacks.c:1281 mail/message-browser.c:130
# mail/mail-callbacks.c:1376 mail/message-browser.c:130
# mail/mail-callbacks.c:1411 mail/message-browser.c:130
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
msgid "Move card to"
msgstr "将卡片移动到"
# ui/evolution-tasks.xml.h:4
# ui/evolution-tasks.xml.h:4
# ui/evolution-tasks.xml.h:4
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
msgid "Copy card to"
msgstr "将卡片复制到"
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
msgid "Move cards to"
msgstr "将卡片移动到"
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
# addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
msgid "Copy cards to"
msgstr "将卡片复制到"
+# addressbook/backend/ebook/e-card.c:4235
+# addressbook/backend/ebook/e-card.c:4235
+# addressbook/backend/ebook/e-card.c:4235
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "多个 VCard"
+
+# addressbook/backend/ebook/e-card.c:4243
+# addressbook/backend/ebook/e-card.c:4243
+# addressbook/backend/ebook/e-card.c:4243
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "%s 的 VCard"
+
+# calendar/gui/dialogs/meeting-page.etspec.h:11
+# calendar/gui/e-calendar-table.etspec.h:18
+# calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+# shell/glade/e-active-connection-dialog.glade.h:5
+# calendar/gui/dialogs/meeting-page.etspec.h:11
+# calendar/gui/e-calendar-table.etspec.h:18
+# calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+# shell/glade/e-active-connection-dialog.glade.h:5
+# calendar/gui/dialogs/meeting-page.etspec.h:11
+# calendar/gui/e-calendar-table.etspec.h:18
+# calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:94
+# shell/glade/e-active-connection-dialog.glade.h:5
+#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "类型"
+
# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:394
#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:577
msgid "Addressbook"
msgstr "地址簿"
@@ -5164,9 +5232,9 @@ msgstr "地址簿"
# addressbook/gui/widgets/e-addressbook-view.c:834
# addressbook/gui/widgets/e-addressbook-view.c:1516
# ui/evolution-addressbook.xml.h:19
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "保存为 VCard"
@@ -5177,49 +5245,49 @@ msgstr "保存为 VCard"
# ui/evolution-addressbook.xml.h:11
# addressbook/gui/component/addressbook-component.c:527
# ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
msgid "New Contact..."
msgstr "新建联系人..."
# addressbook/gui/component/addressbook-component.c:527
# addressbook/gui/component/addressbook-component.c:527
# addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
msgid "New Contact List..."
msgstr "新建联系人列表..."
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
msgid "Go to Folder..."
msgstr "转到文件夹..."
# ui/evolution.xml.h:41
# ui/evolution.xml.h:41
# ui/evolution.xml.h:41
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
msgid "Import..."
msgstr "正在导入..."
# ui/evolution-addressbook.xml.h:39
# ui/evolution-addressbook.xml.h:39
# ui/evolution-addressbook.xml.h:41
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
msgid "Search for Contacts..."
msgstr "搜索联系人..."
# ui/evolution-addressbook.xml.h:30
# ui/evolution-addressbook.xml.h:30
# ui/evolution-addressbook.xml.h:31
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
msgid "Addressbook Sources..."
msgstr "地址簿来源..."
# ui/evolution.xml.h:45
# ui/evolution.xml.h:45
# ui/evolution.xml.h:45
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
msgid "Pilot Settings..."
msgstr "Pilot 设置..."
@@ -5232,7 +5300,7 @@ msgstr "Pilot 设置..."
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
# addressbook/gui/widgets/e-addressbook-view.c:835
# ui/evolution-addressbook.xml.h:10
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:885
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "转发联系人"
@@ -5243,7 +5311,7 @@ msgstr "转发联系人"
# addressbook/gui/widgets/e-addressbook-view.c:735
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
# addressbook/gui/widgets/e-addressbook-view.c:836
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
msgid "Send Message to Contact"
msgstr "给联系人发邮件"
@@ -5262,7 +5330,7 @@ msgstr "给联系人发邮件"
# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
# ui/my-evolution.xml.h:2
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
#: ui/my-evolution.xml.h:1
@@ -5275,21 +5343,21 @@ msgstr "打印"
# addressbook/gui/widgets/e-addressbook-view.c:738
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
# addressbook/gui/widgets/e-addressbook-view.c:839
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
msgid "Print Envelope"
msgstr "打印信封"
# mail/folder-browser.c:1467
# mail/folder-browser.c:1476
# mail/folder-browser.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
msgid "Copy to folder..."
msgstr "复制到文件夹..."
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
msgid "Move to folder..."
msgstr "移动到文件夹..."
@@ -5298,7 +5366,7 @@ msgstr "移动到文件夹..."
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
# addressbook/gui/widgets/e-addressbook-view.c:841
# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:897
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "剪切"
@@ -5311,7 +5379,7 @@ msgstr "剪切"
# addressbook/gui/widgets/e-addressbook-view.c:842
# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
# ui/evolution-tasks.xml.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:898
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
@@ -5322,7 +5390,7 @@ msgstr "复制"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
# addressbook/gui/widgets/e-addressbook-view.c:843
# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:899
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
msgid "Paste"
msgstr "粘贴"
@@ -5344,10 +5412,9 @@ msgstr "粘贴"
# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:234 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:20
msgid "Delete"
msgstr "删除"
@@ -5355,8 +5422,8 @@ msgstr "删除"
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3683 calendar/gui/e-week-view.c:3544
msgid "Current View"
msgstr "当前视图"
@@ -5367,7 +5434,7 @@ 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:867
+#: addressbook/gui/widgets/e-addressbook-view.c:938
msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
@@ -5378,11 +5445,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
#. 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:872
+#: addressbook/gui/widgets/e-addressbook-view.c:943
msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -5498,7 +5565,7 @@ msgstr "主要电话"
# addressbook/gui/widgets/e-minicard-control.c:185
# addressbook/gui/widgets/e-minicard-control.c:185
# addressbook/gui/widgets/e-minicard-control.c:185
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
#, c-format
msgid "and %d other cards."
msgstr "以及另外 %d 张卡片。"
@@ -5506,21 +5573,80 @@ msgstr "以及另外 %d 张卡片。"
# addressbook/gui/widgets/e-minicard-control.c:187
# addressbook/gui/widgets/e-minicard-control.c:187
# addressbook/gui/widgets/e-minicard-control.c:187
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
msgid "and one other card."
msgstr "以及另外一张卡片。"
# addressbook/gui/widgets/e-minicard-control.c:316
# addressbook/gui/widgets/e-minicard-control.c:316
# addressbook/gui/widgets/e-minicard-control.c:316
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
msgid "Save in addressbook"
msgstr "保存在地址簿中"
+# addressbook/printing/e-contact-print.glade.h:41
+# addressbook/printing/e-contact-print.glade.h:41
+# addressbook/printing/e-contact-print.glade.h:41
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+#, fuzzy
+msgid "Width"
+msgstr "宽度:"
+
+# addressbook/printing/e-contact-print.glade.h:15
+# addressbook/printing/e-contact-print.glade.h:15
+# addressbook/printing/e-contact-print.glade.h:15
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+#, fuzzy
+msgid "Height"
+msgstr "高度:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:49
+# ui/evolution-message-composer.xml.h:49
+# my-evolution/Locations.h:698
+#: addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
+msgid "Field"
+msgstr "发件人域(_F)"
+
+# addressbook/backend/ebook/e-card-simple.c:105
+# addressbook/backend/ebook/e-card-simple.c:105
+# addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "姓"
+
+# ui/evolution-mail-message.xml.h:85
+# ui/evolution-mail-message.xml.h:85
+# ui/evolution-mail-message.xml.h:87
+#: addressbook/gui/widgets/e-minicard-label.c:150
+#, fuzzy
+msgid "Text Model"
+msgstr "文本大小(_Z)"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:50
+# addressbook/gui/contact-editor/fulladdr.glade.h:50
+# my-evolution/Locations.h:487
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#, fuzzy
+msgid "Column Width"
+msgstr "哥伦比亚"
+
# addressbook/gui/widgets/e-minicard-view.c:150
# addressbook/gui/widgets/e-minicard-view.c:150
# addressbook/gui/widgets/e-minicard-view.c:150
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-view.c:141
msgid ""
"\n"
"\n"
@@ -5537,35 +5663,67 @@ msgstr ""
# addressbook/gui/widgets/e-minicard-view.c:150
# addressbook/gui/widgets/e-minicard-view.c:150
# addressbook/gui/widgets/e-minicard-view.c:150
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
msgid ""
"\n"
"\n"
"There are no items to show in this view."
-msgstr "\n\n本视图中没有可显示的项。"
+msgstr ""
+"\n"
+"\n"
+"本视图中没有可显示的项。"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:6
+# addressbook/gui/contact-editor/fulladdr.glade.h:6
+# my-evolution/Locations.h:18
+#: addressbook/gui/widgets/e-minicard-view.c:452
+#, fuzzy
+msgid "Adapter"
+msgstr "安道尔"
+
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "已选择:"
+
+# calendar/gui/e-calendar-table.etspec.h:17
+# calendar/gui/e-calendar-table.etspec.h:17
+# calendar/gui/e-calendar-table.etspec.h:17
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "任务排序"
# addressbook/gui/widgets/gal-view-factory-minicard.c:26
# addressbook/gui/widgets/gal-view-factory-minicard.c:26
# addressbook/gui/widgets/gal-view-factory-minicard.c:26
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
msgid "Card View"
msgstr "卡片视图"
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "周视图"
+
# addressbook/printing/e-contact-print-envelope.c:215
# addressbook/printing/e-contact-print-envelope.c:236
# addressbook/printing/e-contact-print-envelope.c:215
# addressbook/printing/e-contact-print-envelope.c:236
# addressbook/printing/e-contact-print-envelope.c:215
# addressbook/printing/e-contact-print-envelope.c:236
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
msgid "Print envelope"
msgstr "打印信封"
# addressbook/printing/e-contact-print.c:1111
# addressbook/printing/e-contact-print.c:1111
# addressbook/printing/e-contact-print.c:1115
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
msgid "Print cards"
msgstr "打印卡片"
@@ -5575,8 +5733,8 @@ msgstr "打印卡片"
# addressbook/printing/e-contact-print.c:1193
# addressbook/printing/e-contact-print.c:1175
# addressbook/printing/e-contact-print.c:1197
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
msgid "Print card"
msgstr "打印卡片"
@@ -5703,7 +5861,6 @@ msgstr "包含:"
# addressbook/printing/e-contact-print.glade.h:18
# addressbook/printing/e-contact-print.glade.h:18
#: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
msgid "Landscape"
msgstr "横向"
@@ -5738,7 +5895,7 @@ msgstr "列数:"
# addressbook/printing/e-contact-print.glade.h:23
# addressbook/printing/e-contact-print.glade.h:23
# addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
msgid "Options"
msgstr "选项"
@@ -5746,7 +5903,6 @@ msgstr "选项"
# addressbook/printing/e-contact-print.glade.h:24
# addressbook/printing/e-contact-print.glade.h:24
#: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
msgid "Orientation"
msgstr "方向"
@@ -5755,7 +5911,7 @@ msgstr "方向"
# addressbook/printing/e-contact-print.glade.h:25
# my-evolution/Locations.h:1672
#: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
msgid "Page"
msgstr "页面"
@@ -5783,9 +5939,7 @@ msgstr "纸张来源:"
# addressbook/printing/e-contact-print.glade.h:29
# addressbook/printing/e-contact-print.glade.h:29
# addressbook/printing/e-contact-print.glade.h:29
-#. Portrait
#: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
msgid "Portrait"
msgstr "纵向"
@@ -5887,6 +6041,223 @@ msgstr "字体(_F)..."
msgid "Untitled appointment"
msgstr "无标题约会"
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "一号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "二号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "三号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "四号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "五号"
+
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "六号"
+
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "七号"
+
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "八号"
+
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "九号"
+
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+# calendar/gui/print.c:426
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "十号"
+
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "十一号"
+
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "十二号"
+
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "十三号"
+
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "十四号"
+
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+# calendar/gui/print.c:427
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "十五号"
+
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "十六号"
+
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "十七号"
+
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "十八号"
+
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "十九号"
+
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+# calendar/gui/print.c:428
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "二十号"
+
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "二十一号"
+
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "二十二号"
+
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "二十三号"
+
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "二十四号"
+
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+# calendar/gui/print.c:429
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "二十五号"
+
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "二十六号"
+
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "二十七号"
+
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "二十八号"
+
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "二十九号"
+
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+# calendar/gui/print.c:430
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "三十号"
+
+# calendar/gui/print.c:431
+# calendar/gui/print.c:431
+# calendar/gui/print.c:431
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "三十一号"
+
# calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
# calendar/gui/dialogs/task-details-page.glade.h:6
# calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
@@ -5896,9 +6267,9 @@ msgstr "无标题约会"
# calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
# calendar/gui/dialogs/task-details-page.glade.h:6
# calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
msgid "High"
msgstr "高"
@@ -5914,10 +6285,10 @@ msgstr "高"
# calendar/gui/calendar-model.c:1711
# calendar/gui/dialogs/task-details-page.glade.h:9
# calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
+#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
msgid "Normal"
msgstr "中"
@@ -5930,9 +6301,9 @@ msgstr "中"
# calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
# calendar/gui/dialogs/task-details-page.glade.h:8
# calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
msgid "Low"
msgstr "低"
@@ -5946,13 +6317,13 @@ msgstr "低"
# calendar/gui/dialogs/task-details-page.glade.h:13
# calendar/gui/e-calendar-table.c:409
#. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/cal-util/cal-util.c:570
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
msgid "Undefined"
msgstr "未定义"
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:206
msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
@@ -5962,8 +6333,8 @@ msgstr "分割多日事件:"
# calendar/conduits/todo/todo-conduit.c:649
# calendar/conduits/calendar/calendar-conduit.c:1150
# calendar/conduits/todo/todo-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
msgid "Error while communicating with calendar server"
msgstr "在与日历服务器通讯时发生错误"
@@ -5973,8 +6344,8 @@ msgstr "在与日历服务器通讯时发生错误"
# calendar/conduits/calendar/calendar-conduit.c:1175
# calendar/conduits/calendar/calendar-conduit.c:1297
# calendar/conduits/calendar/calendar-conduit.c:1300
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
@@ -5991,138 +6362,118 @@ msgstr "默认优先级:"
# calendar/conduits/todo/todo-conduit.c:759
# calendar/conduits/todo/todo-conduit.c:886
# calendar/conduits/todo/todo-conduit.c:889
-#: calendar/conduits/todo/todo-conduit.c:951
#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
msgid "Could not read pilot's ToDo application block"
msgstr "无法读入 Pilot ToDo 应用程序块"
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
-msgstr "显示任务列表的 Bonobo 控制。"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "显示日历的示例 Bonobo 控制。"
-
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
msgid "Calendar and Tasks"
msgstr "日历和任务"
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Configuration control for the Evolution Calendar."
-msgstr "关于 Evolution 日历的配置控制。"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
msgid "Configure your timezone, Calendar and Task List here "
msgstr "在此配置您的时区、日历和任务列表 "
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution 日历 iTip/iMip 查看器"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "日历和任务"
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Evolution component for handling the calendar."
-msgstr "处理日历的 Evolution 组件。"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution 日历实施概要组件。"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Evolution Tasks control"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
msgstr "Evolution 任务控制车间"
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "日历 iTip 视图控制车间"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "日历控制示例车间"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 日历 iTip/iMip 查看器"
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to centralize calendar component editor dialogs"
-msgstr "日历组件编辑器对话框集中车间"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution 日历 iTip/iMip 查看器"
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr "创建组件编辑车间的车间"
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 新闻编辑器"
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "提醒服务"
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution 新闻编辑器"
# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
msgstr "提醒服务车间"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
msgid "Starting:"
msgstr "开始:"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
# calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
msgid "Ending:"
msgstr "结束:"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:231
# calendar/gui/alarm-notify/alarm-notify-dialog.c:231
# calendar/gui/alarm-notify/alarm-notify-dialog.c:231
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
msgid "invalid time"
msgstr "无效时间"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
msgid "Evolution Alarm"
msgstr "Evolution 提醒"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
#, c-format
msgid "Alarm on %s"
msgstr "在 %s 时提醒"
@@ -6162,14 +6513,25 @@ msgstr "编辑约会(_E)"
# calendar/gui/alarm-notify/alarm-queue.c:670
# calendar/gui/alarm-notify/alarm-queue.c:670
# calendar/gui/alarm-notify/alarm-queue.c:675
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:774
msgid "No description available."
msgstr "没有描述。"
+# mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
+# mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
+# calendar/gui/alarm-notify/alarm-queue.c:753
+# calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
+# widgets/misc/e-messagebox.c:159
+#: calendar/gui/alarm-notify/alarm-queue.c:845
+#: calendar/gui/alarm-notify/alarm-queue.c:869
+#: calendar/gui/tasks-control.c:463 widgets/misc/e-messagebox.c:161
+msgid "Warning"
+msgstr "警告"
+
# calendar/gui/alarm-notify/alarm-queue.c:730
# calendar/gui/alarm-notify/alarm-queue.c:730
# calendar/gui/alarm-notify/alarm-queue.c:735
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:849
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -6181,21 +6543,10 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-# mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
-# mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
-# calendar/gui/alarm-notify/alarm-queue.c:753
-# calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
-# widgets/misc/e-messagebox.c:159
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "警告"
-
# calendar/gui/alarm-notify/alarm-queue.c:781
# calendar/gui/alarm-notify/alarm-queue.c:781
# calendar/gui/alarm-notify/alarm-queue.c:758
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:875
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -6214,21 +6565,24 @@ msgstr ""
# mail/mail-callbacks.c:2142
# mail/mail-callbacks.c:2261
# calendar/gui/alarm-notify/alarm-queue.c:772
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:889
msgid "Do not ask me about this program again."
msgstr "不要再次询问该问题。"
-# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "无法初始化 GNOME"
+# addressbook/gui/component/addressbook-factory.c:70
+# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+# addressbook/gui/component/addressbook-factory.c:70
+# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+# addressbook/gui/component/addressbook-factory.c:70
+# calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "无法创始化 gnome-vfs"
# calendar/gui/alarm-notify/notify-main.c:186
# calendar/gui/alarm-notify/notify-main.c:186
# calendar/gui/alarm-notify/notify-main.c:186
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:180
msgid "Could not create the alarm notify service factory"
msgstr "无法创建提醒服务车间"
@@ -6256,14 +6610,14 @@ msgstr "注释含有"
# calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1072
# calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1074
# calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
msgid "Unmatched"
msgstr "未匹配"
# calendar/gui/calendar-commands.c:446
# calendar/gui/calendar-commands.c:446
# calendar/gui/calendar-commands.c:446
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
msgid "%A %d %B %Y"
msgstr "%Y %B %d %A"
@@ -6275,8 +6629,8 @@ msgstr "%Y %B %d %A"
# calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:264
+#: calendar/gui/e-day-view.c:1393 calendar/gui/e-week-view-main-item.c:325
msgid "%a %d %b"
msgstr "%b %d %a"
@@ -6286,8 +6640,8 @@ msgstr "%b %d %a"
# calendar/gui/calendar-commands.c:458
# calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
# calendar/gui/calendar-commands.c:458
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
msgid "%a %d %b %Y"
msgstr "%Y %b %d %a"
@@ -6297,8 +6651,8 @@ msgstr "%Y %b %d %a"
# calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
# calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
# calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
msgid "%d %B %Y"
msgstr "%Y %B %d"
@@ -6311,8 +6665,8 @@ msgstr "%Y %B %d"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1513
msgid "%d %B"
msgstr "%B %d"
@@ -6324,14 +6678,187 @@ msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "日历"
+
+# calendar/gui/component-factory.c:64
+# calendar/gui/component-factory.c:64
+# calendar/gui/component-factory.c:64
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "文件夹含有约会和事件"
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+# addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: calendar/gui/calendar-component.c:75
+msgid "Public Calendar"
+msgstr "公共日历"
+
+# calendar/gui/component-factory.c:64
+# calendar/gui/component-factory.c:64
+# calendar/gui/component-factory.c:64
+#: calendar/gui/calendar-component.c:76
+msgid "Public folder containing appointments and events"
+msgstr "公共文件夹含有约会和事件"
+
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:518
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
+#: my-evolution/e-summary-tasks.c:328 my-evolution/e-summary-tasks.c:339
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "任务"
+
+# calendar/gui/component-factory.c:69
+# calendar/gui/component-factory.c:69
+# calendar/gui/component-factory.c:69
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "文件夹含有 to-do 项"
+
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1115
+#: calendar/gui/calendar-component.c:85
+msgid "Public Tasks"
+msgstr "公共任务"
+
+# calendar/gui/component-factory.c:69
+# calendar/gui/component-factory.c:69
+# calendar/gui/component-factory.c:69
+#: calendar/gui/calendar-component.c:86
+#, fuzzy
+msgid "Public folder containing to-do items"
+msgstr "文件夹含有 to-do 项"
+
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "新建约会"
+
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "约会(_A)"
+
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "创建新约会"
+
+# my-evolution/my-evolution.glade.h:10
+# my-evolution/my-evolution.glade.h:10
+# my-evolution/my-evolution.glade.h:10
+#: calendar/gui/calendar-component.c:735
+msgid "New meeting"
+msgstr "新闻会议"
+
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+#: calendar/gui/calendar-component.c:735
+msgid "_Meeting"
+msgstr "会议(_M)"
+
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:6
+#: calendar/gui/calendar-component.c:736
+msgid "Create a new meeting request"
+msgstr "创建一条新任务请求"
+
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
+#: calendar/gui/calendar-component.c:740
+msgid "New task"
+msgstr "新建任务"
+
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:22
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "任务(_T)"
+
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:6
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "创建新任务"
+
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+#: calendar/gui/calendar-component.c:745
+msgid "New All Day Appointment"
+msgstr "新建全天约会"
+
+# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
+# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
+# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
+#: calendar/gui/calendar-component.c:745
+msgid "All _Day Appointment"
+msgstr "全天约会(_D)"
+
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#: calendar/gui/calendar-component.c:746
+msgid "Create a new all-day appointment"
+msgstr "创建一个新的全天约会创建新约会"
+
# calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
# calendar/gui/e-calendar-table.c:384
# calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
# calendar/gui/e-calendar-table.c:384
# calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
# calendar/gui/e-calendar-table.c:385
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:959
+#: calendar/gui/e-calendar-table.c:372
msgid "Private"
msgstr "保密"
@@ -6341,43 +6868,43 @@ msgstr "保密"
# calendar/gui/e-calendar-table.c:385
# calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
# calendar/gui/e-calendar-table.c:386
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:961
+#: calendar/gui/e-calendar-table.c:373
msgid "Confidential"
msgstr "机密"
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
msgid "Public"
msgstr "公开"
# calendar/gui/calendar-model.c:536
# calendar/gui/calendar-model.c:536
# calendar/gui/calendar-model.c:536
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
msgid "N"
msgstr "北"
# calendar/gui/calendar-model.c:536
# calendar/gui/calendar-model.c:536
# calendar/gui/calendar-model.c:536
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
msgid "S"
msgstr "南"
# calendar/gui/calendar-model.c:538
# calendar/gui/calendar-model.c:538
# calendar/gui/calendar-model.c:538
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
msgid "E"
msgstr "东"
# calendar/gui/calendar-model.c:538
# calendar/gui/calendar-model.c:538
# calendar/gui/calendar-model.c:538
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
msgid "W"
msgstr "西"
@@ -6387,8 +6914,8 @@ msgstr "西"
# calendar/gui/e-calendar-table.c:457
# calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
# calendar/gui/e-calendar-table.c:458
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1129
+#: calendar/gui/e-calendar-table.c:445
msgid "Free"
msgstr "放假"
@@ -6401,9 +6928,9 @@ msgstr "放假"
# calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
# calendar/gui/e-meeting-time-sel.c:432
# shell/evolution-shell-component.c:1042
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:407
+#: shell/evolution-shell-component.c:1202
msgid "Busy"
msgstr "繁忙"
@@ -6416,9 +6943,9 @@ msgstr "繁忙"
# calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
# calendar/gui/dialogs/task-details-page.glade.h:10
# calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1173
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
msgid "Not Started"
msgstr "尚未开始"
@@ -6431,9 +6958,9 @@ msgstr "尚未开始"
# calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
# calendar/gui/dialogs/task-details-page.glade.h:7
# calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1175
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
msgid "In Progress"
msgstr "正在进行中"
@@ -6449,17 +6976,17 @@ msgstr "正在进行中"
# calendar/gui/dialogs/task-details-page.glade.h:4
# calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1177
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
msgid "Completed"
msgstr "已完成"
# calendar/gui/calendar-model.c:1052
# calendar/gui/calendar-model.c:1052
# calendar/gui/calendar-model.c:1052
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1031
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -6491,28 +7018,28 @@ msgstr ""
# widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
# widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
+#: calendar/gui/calendar-model.c:1171 calendar/gui/dialogs/meeting-page.c:322
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2054
+#: mail/folder-browser.c:1745 mail/mail-account-gui.c:1253
+#: mail/mail-account-gui.c:1685 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:79
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
msgid "None"
msgstr "无"
# calendar/gui/calendar-model.c:1713
# calendar/gui/calendar-model.c:1713
# calendar/gui/calendar-model.c:1713
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1706
msgid "Recurring"
msgstr "正在重复"
# calendar/gui/calendar-model.c:1715
# calendar/gui/calendar-model.c:1715
# calendar/gui/calendar-model.c:1715
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1708
msgid "Assigned"
msgstr "已分派"
@@ -6525,9 +7052,9 @@ msgstr "已分派"
# calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
# calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
# calendar/gui/e-meeting-model.c:810
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:544
+#: calendar/gui/e-meeting-model.c:838
msgid "Yes"
msgstr "是"
@@ -6537,215 +7064,69 @@ msgstr "是"
# calendar/gui/e-meeting-model.c:811
# calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
# calendar/gui/e-meeting-model.c:811
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
+#: calendar/gui/calendar-model.c:1714 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:839
msgid "No"
msgstr "否"
# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
msgid "Day View"
msgstr "日视图"
# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
msgid "Work Week View"
msgstr "周工作视图"
# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
msgid "Week View"
msgstr "周视图"
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
msgid "Month View"
msgstr "月视图"
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
-msgid "Calendar"
-msgstr "日历"
-
-# calendar/gui/component-factory.c:64
-# calendar/gui/component-factory.c:64
-# calendar/gui/component-factory.c:64
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "文件夹含有约会和事件"
-
-# addressbook/gui/contact-editor/contact-editor.glade.h:36
-# addressbook/gui/contact-editor/contact-editor.glade.h:36
-# addressbook/gui/contact-editor/contact-editor.glade.h:36
-#: calendar/gui/component-factory.c:76
-msgid "Public Calendar"
-msgstr "公共日历"
-
-# calendar/gui/component-factory.c:64
-# calendar/gui/component-factory.c:64
-# calendar/gui/component-factory.c:64
-#: calendar/gui/component-factory.c:77
-msgid "Public folder containing appointments and events"
-msgstr "公共文件夹含有约会和事件"
-
-# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
-# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
-# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
-# views/tasks/galview.xml.h:1
-# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
-# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
-# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
-# views/tasks/galview.xml.h:1
-# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
-# my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
-# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
-# views/tasks/galview.xml.h:1
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
-msgid "Tasks"
-msgstr "任务"
-
-# calendar/gui/component-factory.c:69
-# calendar/gui/component-factory.c:69
-# calendar/gui/component-factory.c:69
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "文件夹含有 to-do 项"
-
-# addressbook/printing/e-contact-print.c:1111
-# addressbook/printing/e-contact-print.c:1111
-# addressbook/printing/e-contact-print.c:1115
-#: calendar/gui/component-factory.c:86
-msgid "Public Tasks"
-msgstr "公共任务"
-
-# calendar/gui/component-factory.c:69
-# calendar/gui/component-factory.c:69
-# calendar/gui/component-factory.c:69
-#: calendar/gui/component-factory.c:87
+# calendar/conduits/calendar/calendar-conduit.c:937
+# calendar/conduits/todo/todo-conduit.c:649
+# calendar/conduits/calendar/calendar-conduit.c:1034
+# calendar/conduits/todo/todo-conduit.c:649
+# calendar/conduits/calendar/calendar-conduit.c:1150
+# calendar/conduits/todo/todo-conduit.c:770
+#: calendar/gui/comp-editor-factory.c:456
#, fuzzy
-msgid "Public folder containing to-do items"
-msgstr "文件夹含有 to-do 项"
-
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:750
-msgid "New appointment"
-msgstr "新建约会"
-
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/component-factory.c:750
-msgid "_Appointment"
-msgstr "约会(_A)"
-
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "创建新约会"
-
-# my-evolution/my-evolution.glade.h:10
-# my-evolution/my-evolution.glade.h:10
-# my-evolution/my-evolution.glade.h:10
-#: calendar/gui/component-factory.c:755
-msgid "New meeting"
-msgstr "新闻会议"
-
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-# calendar/gui/dialogs/event-editor.c:207
-# calendar/gui/dialogs/event-editor.c:263
-# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/component-factory.c:755
-msgid "_Meeting"
-msgstr "会议(_M)"
-
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:6
-#: calendar/gui/component-factory.c:756
-msgid "Create a new meeting request"
-msgstr "创建一条新任务请求"
-
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/component-factory.c:760
-msgid "New task"
-msgstr "新建任务"
-
-# ui/evolution-tasks.xml.h:18
-# ui/evolution-tasks.xml.h:18
-# ui/evolution-tasks.xml.h:22
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "任务(_T)"
-
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:6
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "创建新任务"
-
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:765
-msgid "New All Day Appointment"
-msgstr "新建全天约会"
+msgid "Error while opening the calendar"
+msgstr "在与日历服务器通讯时发生错误"
-# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
-# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/component-factory.c:765
-msgid "All _Day Appointment"
-msgstr "全天约会(_D)"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#: calendar/gui/component-factory.c:766
-msgid "Create a new all-day appointment"
-msgstr "创建一个新的全天约会创建新约会"
+# addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+# shell/evolution-shell-component.c:1035
+# addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+# shell/evolution-shell-component.c:1035
+# addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
+# shell/evolution-shell-component.c:1048
+#: calendar/gui/comp-editor-factory.c:473
+#, fuzzy
+msgid "Permission denied to open the calendar"
+msgstr "没有权限"
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
#, c-format
msgid "Could not open the folder in '%s'"
msgstr "无法在“%s”中打开文件夹"
@@ -6753,71 +7134,60 @@ msgstr "无法在“%s”中打开文件夹"
# calendar/gui/control-factory.c:127
# calendar/gui/control-factory.c:127
# calendar/gui/control-factory.c:127
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:165
msgid "The URI that the calendar will display"
msgstr "日历将显示的 URI"
# ui/evolution.xml.h:3
# ui/evolution.xml.h:3
# executive-summary/component/e-summary-url.c:72
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:172
msgid "The type of view to show"
msgstr "要显示的视图"
# calendar/gui/dialogs/alarm-options.c:359
# calendar/gui/dialogs/alarm-options.c:359
# calendar/gui/dialogs/alarm-options.c:359
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:420
msgid "Audio Alarm Options"
msgstr "音频提醒选项"
# calendar/gui/dialogs/alarm-options.c:368
# calendar/gui/dialogs/alarm-options.c:368
# calendar/gui/dialogs/alarm-options.c:368
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:429
msgid "Message Alarm Options"
msgstr "消息提醒选项"
# calendar/gui/dialogs/alarm-options.c:377
# calendar/gui/dialogs/alarm-options.c:377
# calendar/gui/dialogs/alarm-options.c:377
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:438
+#, fuzzy
+msgid "Email Alarm Options"
msgstr "邮件提醒选项"
# calendar/gui/dialogs/alarm-options.c:386
# calendar/gui/dialogs/alarm-options.c:386
# calendar/gui/dialogs/alarm-options.c:386
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:447
msgid "Program Alarm Options"
msgstr "程序提醒选项"
# calendar/gui/dialogs/alarm-options.c:395
# calendar/gui/dialogs/alarm-options.c:395
# calendar/gui/dialogs/alarm-options.c:395
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:456
msgid "Unknown Alarm Options"
msgstr "未知提醒选项"
# calendar/gui/dialogs/alarm-options.glade.h:1
# calendar/gui/dialogs/alarm-options.glade.h:1
# calendar/gui/dialogs/alarm-options.glade.h:1
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
msgid "Alarm Repeat"
msgstr "提醒重复"
-# calendar/gui/dialogs/alarm-options.glade.h:6
-# calendar/gui/dialogs/alarm-options.glade.h:6
-# calendar/gui/dialogs/alarm-options.glade.h:6
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-#, fuzzy
-msgid ""
-"Evolution does not yet support email notification for reminders. You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-"这是电子邮件提示器,但 Evolution 尚不支持这类提示器。您无法为该提示器编辑选"
-"项。"
-
# calendar/gui/dialogs/alarm-options.glade.h:2
# calendar/gui/dialogs/alarm-options.glade.h:2
# calendar/gui/dialogs/alarm-options.glade.h:2
@@ -6825,54 +7195,70 @@ msgstr ""
msgid "Message to Display"
msgstr "要显示的消息"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Message to Send"
+msgstr "邮件体"
+
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:5
msgid "Play sound:"
msgstr "播放声音:"
# calendar/gui/dialogs/alarm-options.glade.h:4
# calendar/gui/dialogs/alarm-options.glade.h:4
# calendar/gui/dialogs/alarm-options.glade.h:4
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
msgid "Repeat the alarm"
msgstr "重复提醒"
# calendar/gui/dialogs/alarm-options.glade.h:5
# calendar/gui/dialogs/alarm-options.glade.h:5
# calendar/gui/dialogs/alarm-options.glade.h:5
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
msgid "Run program:"
msgstr "运行程序:"
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
+msgid "Send To:"
+msgstr "发送"
+
# calendar/gui/dialogs/alarm-options.glade.h:7
# calendar/gui/dialogs/alarm-options.glade.h:7
# calendar/gui/dialogs/alarm-options.glade.h:7
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:9
msgid "With these arguments:"
msgstr "使用这些参数:"
# calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
# calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
# calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
-#: filter/filter.glade.h:20
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:20
msgid "days"
msgstr "天数"
+#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
# calendar/gui/dialogs/alarm-options.glade.h:9
# calendar/gui/dialogs/alarm-options.glade.h:9
# calendar/gui/dialogs/alarm-options.glade.h:9
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:12
msgid "extra times every"
msgstr "每个额外时间"
# calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
# calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
# calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
-#: filter/filter.glade.h:21
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:21
msgid "hours"
msgstr "小时"
@@ -6880,197 +7266,10 @@ msgstr "小时"
# calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
# calendar/gui/dialogs/alarm-options.glade.h:11
# executive-summary/test-service/rdf-summary.c:806
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
-#: filter/filter.glade.h:22
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:22
msgid "minutes"
msgstr "分钟"
-# calendar/gui/dialogs/alarm-page.c:309
-# calendar/gui/dialogs/alarm-page.c:309
-# calendar/gui/dialogs/alarm-page.c:309
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d 天"
-
-# calendar/gui/dialogs/alarm-page.c:312
-# calendar/gui/dialogs/alarm-page.c:312
-# calendar/gui/dialogs/alarm-page.c:312
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 天"
-
-# calendar/gui/dialogs/alarm-page.c:317
-# calendar/gui/dialogs/alarm-page.c:317
-# calendar/gui/dialogs/alarm-page.c:317
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d 周"
-
-# calendar/gui/dialogs/alarm-page.c:320
-# calendar/gui/dialogs/alarm-page.c:320
-# calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 周"
-
-# calendar/gui/dialogs/alarm-page.c:325
-# calendar/gui/dialogs/alarm-page.c:325
-# calendar/gui/dialogs/alarm-page.c:325
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d 小时"
-
-# calendar/gui/dialogs/alarm-page.c:328
-# calendar/gui/dialogs/alarm-page.c:328
-# calendar/gui/dialogs/alarm-page.c:328
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 小时"
-
-# calendar/gui/dialogs/alarm-page.c:333
-# calendar/gui/dialogs/alarm-page.c:333
-# calendar/gui/dialogs/alarm-page.c:333
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d 分钟"
-
-# calendar/gui/dialogs/alarm-page.c:336
-# calendar/gui/dialogs/alarm-page.c:336
-# calendar/gui/dialogs/alarm-page.c:336
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "1 分钟"
-
-# calendar/gui/dialogs/alarm-page.c:341
-# calendar/gui/dialogs/alarm-page.c:341
-# calendar/gui/dialogs/alarm-page.c:341
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d 秒"
-
-# calendar/gui/dialogs/alarm-page.c:344
-# calendar/gui/dialogs/alarm-page.c:344
-# calendar/gui/dialogs/alarm-page.c:344
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "1 秒"
-
-# calendar/gui/dialogs/alarm-page.c:373
-# calendar/gui/dialogs/alarm-page.glade.h:4
-# calendar/gui/dialogs/alarm-page.c:373
-# calendar/gui/dialogs/alarm-page.glade.h:4
-# calendar/gui/dialogs/alarm-page.c:373
-# calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "播放声音"
-
-# calendar/gui/dialogs/alarm-page.c:377
-# calendar/gui/dialogs/alarm-page.glade.h:3
-# calendar/gui/dialogs/alarm-page.c:377
-# calendar/gui/dialogs/alarm-page.glade.h:3
-# calendar/gui/dialogs/alarm-page.c:377
-# calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "显示消息"
-
-# calendar/gui/dialogs/alarm-page.c:381
-# calendar/gui/dialogs/alarm-page.c:381
-# calendar/gui/dialogs/alarm-page.c:381
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "发送电子邮件"
-
-# calendar/gui/dialogs/alarm-page.c:385
-# calendar/gui/dialogs/alarm-page.glade.h:6
-# calendar/gui/dialogs/alarm-page.c:385
-# calendar/gui/dialogs/alarm-page.glade.h:6
-# calendar/gui/dialogs/alarm-page.c:385
-# calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "运行程序"
-
-# calendar/gui/dialogs/alarm-page.c:391
-# calendar/gui/dialogs/alarm-page.c:391
-# calendar/gui/dialogs/alarm-page.c:391
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "执行未知的动作"
-
-# calendar/gui/dialogs/alarm-page.c:403
-# calendar/gui/dialogs/alarm-page.c:403
-# calendar/gui/dialogs/alarm-page.c:403
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "在约会开始之前 %s %s"
-
-# calendar/gui/dialogs/alarm-page.c:406
-# calendar/gui/dialogs/alarm-page.c:406
-# calendar/gui/dialogs/alarm-page.c:406
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "在约会开始之后 %s %s"
-
-# calendar/gui/dialogs/alarm-page.c:411
-# calendar/gui/dialogs/alarm-page.c:411
-# calendar/gui/dialogs/alarm-page.c:411
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "在约会开始时 %s"
-
-# calendar/gui/dialogs/alarm-page.c:420
-# calendar/gui/dialogs/alarm-page.c:420
-# calendar/gui/dialogs/alarm-page.c:420
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "在约会结束之前 %s %s"
-
-# calendar/gui/dialogs/alarm-page.c:423
-# calendar/gui/dialogs/alarm-page.c:423
-# calendar/gui/dialogs/alarm-page.c:423
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "在约会结束之后 %s %s"
-
-# calendar/gui/dialogs/alarm-page.c:428
-# calendar/gui/dialogs/alarm-page.c:428
-# calendar/gui/dialogs/alarm-page.c:428
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "在约会结束时 %s"
-
-# calendar/gui/dialogs/alarm-page.c:453
-# calendar/gui/dialogs/alarm-page.c:453
-# calendar/gui/dialogs/alarm-page.c:452
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
-msgstr "在 %2$s 时 %1$s"
-
-# calendar/gui/dialogs/alarm-page.c:459
-# calendar/gui/dialogs/alarm-page.c:459
-# calendar/gui/dialogs/alarm-page.c:458
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s 为未知触发类型"
-
# calendar/gui/dialogs/alarm-page.glade.h:1
# calendar/gui/dialogs/recurrence-page.glade.h:2
# calendar/gui/dialogs/alarm-page.glade.h:1
@@ -7093,6 +7292,26 @@ msgstr "基本"
msgid "Date/Time:"
msgstr "日期/时间:"
+# calendar/gui/dialogs/alarm-page.c:377
+# calendar/gui/dialogs/alarm-page.glade.h:3
+# calendar/gui/dialogs/alarm-page.c:377
+# calendar/gui/dialogs/alarm-page.glade.h:3
+# calendar/gui/dialogs/alarm-page.c:377
+# calendar/gui/dialogs/alarm-page.glade.h:3
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "显示消息"
+
+# calendar/gui/dialogs/alarm-page.c:373
+# calendar/gui/dialogs/alarm-page.glade.h:4
+# calendar/gui/dialogs/alarm-page.c:373
+# calendar/gui/dialogs/alarm-page.glade.h:4
+# calendar/gui/dialogs/alarm-page.c:373
+# calendar/gui/dialogs/alarm-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "播放声音"
+
# calendar/gui/dialogs/alarm-page.glade.h:5
# calendar/gui/dialogs/alarm-page.glade.h:5
# calendar/gui/dialogs/alarm-page.glade.h:5
@@ -7100,6 +7319,24 @@ msgstr "日期/时间:"
msgid "Reminders"
msgstr "提示器"
+# calendar/gui/dialogs/alarm-page.c:385
+# calendar/gui/dialogs/alarm-page.glade.h:6
+# calendar/gui/dialogs/alarm-page.c:385
+# calendar/gui/dialogs/alarm-page.glade.h:6
+# calendar/gui/dialogs/alarm-page.c:385
+# calendar/gui/dialogs/alarm-page.glade.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "运行程序"
+
+# calendar/gui/dialogs/alarm-page.c:381
+# calendar/gui/dialogs/alarm-page.c:381
+# calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an Email"
+msgstr "发送电子邮件"
+
# calendar/gui/dialogs/alarm-page.glade.h:7
# calendar/gui/dialogs/recurrence-page.glade.h:8
# calendar/gui/e-itip-control.c:745 calendar/gui/e-itip-control.glade.h:11
@@ -7109,30 +7346,30 @@ msgstr "提示器"
# calendar/gui/dialogs/alarm-page.glade.h:7
# calendar/gui/dialogs/recurrence-page.glade.h:8
# calendar/gui/e-itip-control.c:748 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:8
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "概要:"
# calendar/gui/dialogs/alarm-page.glade.h:10
# calendar/gui/dialogs/alarm-page.glade.h:10
# calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
msgid "_Options..."
msgstr "选项(_O)..."
# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
# calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
msgid "after"
msgstr "之后"
# calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
# calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
# calendar/gui/dialogs/alarm-page.glade.h:12
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
msgid "before"
msgstr "之前"
@@ -7142,7 +7379,7 @@ msgstr "之前"
# calendar/gui/dialogs/recurrence-page.glade.h:14
# calendar/gui/dialogs/alarm-page.glade.h:13
# calendar/gui/dialogs/recurrence-page.glade.h:14
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
#: calendar/gui/dialogs/recurrence-page.glade.h:14
msgid "day(s)"
msgstr "天"
@@ -7150,28 +7387,28 @@ msgstr "天"
# calendar/gui/dialogs/alarm-page.glade.h:14
# calendar/gui/dialogs/alarm-page.glade.h:14
# calendar/gui/dialogs/alarm-page.glade.h:14
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
msgid "end of appointment"
msgstr "约会结束"
# calendar/gui/dialogs/alarm-page.glade.h:15
# calendar/gui/dialogs/alarm-page.glade.h:15
# calendar/gui/dialogs/alarm-page.glade.h:15
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
msgid "hour(s)"
msgstr "小时"
# calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
# calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
# calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:129
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:181
msgid "minute(s)"
msgstr "分钟"
# calendar/gui/dialogs/alarm-page.glade.h:17
# calendar/gui/dialogs/alarm-page.glade.h:17
# calendar/gui/dialogs/alarm-page.glade.h:17
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
msgid "start of appointment"
msgstr "约会开始"
@@ -7213,7 +7450,7 @@ msgstr "60 分钟"
# addressbook/gui/contact-editor/fulladdr.glade.h:4
# addressbook/gui/contact-editor/fulladdr.glade.h:4
# my-evolution/Locations.h:45
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
msgid "Alerts"
msgstr "警告"
@@ -7256,7 +7493,8 @@ msgstr "天数"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
# calendar/gui/dialogs/recurrence-page.c:963
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
msgid "Friday"
msgstr "星期五"
@@ -7281,7 +7519,8 @@ msgstr "分钟"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
# calendar/gui/dialogs/recurrence-page.c:959
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
msgid "Monday"
msgstr "星期一"
@@ -7299,7 +7538,8 @@ msgstr "星期日(_U)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
msgid "Saturday"
msgstr "星期六"
@@ -7321,7 +7561,8 @@ msgstr "在日期浏览器中显示周数(_N)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
# calendar/gui/dialogs/recurrence-page.c:965
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
msgid "Sunday"
msgstr "星期日"
@@ -7353,7 +7594,8 @@ msgstr "任务列表"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
# calendar/gui/dialogs/recurrence-page.c:962
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
msgid "Thursday"
msgstr "星期四"
@@ -7385,7 +7627,8 @@ msgstr "时间格式:"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
# calendar/gui/dialogs/recurrence-page.c:960
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
msgid "Tuesday"
msgstr "星期二"
@@ -7400,7 +7643,8 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
# calendar/gui/dialogs/recurrence-page.c:961
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
msgid "Wednesday"
msgstr "星期三"
@@ -7472,7 +7716,7 @@ msgstr "星期五(_F)"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:154
msgid "_General"
msgstr "常规(_G)"
@@ -7539,7 +7783,7 @@ msgstr "星期三(_W)"
msgid "before every appointment"
msgstr "在每次约会前"
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:58
msgid ""
"The event being deleted is a meeting, would you like to send a cancellation "
"notice?"
@@ -7548,11 +7792,11 @@ msgstr "被删除的事件是一个会议,您是否发送一条取消通告?
# calendar/gui/dialogs/cancel-comp.c:57
# calendar/gui/dialogs/cancel-comp.c:57
# calendar/gui/dialogs/cancel-comp.c:57
-#: calendar/gui/dialogs/cancel-comp.c:59
+#: calendar/gui/dialogs/cancel-comp.c:61
msgid "Are you sure you want to cancel and delete this meeting?"
msgstr "您确信您希望取消并删除该会见?"
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:67
msgid ""
"The task being deleted is assigned, would you like to send a cancellation "
"notice?"
@@ -7561,11 +7805,11 @@ msgstr "被删除的任务已被指派,您是否要发送一条取消通告?
# calendar/gui/dialogs/cancel-comp.c:62
# calendar/gui/dialogs/cancel-comp.c:62
# calendar/gui/dialogs/cancel-comp.c:62
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:70
msgid "Are you sure you want to cancel and delete this task?"
msgstr "您确信您希望取消并删除该任务?"
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:76
msgid ""
"The journal entry being deleted is published, would you like to send a "
"cancellation notice?"
@@ -7574,35 +7818,35 @@ msgstr ""
# calendar/gui/dialogs/cancel-comp.c:67
# calendar/gui/dialogs/cancel-comp.c:67
# calendar/gui/dialogs/cancel-comp.c:67
-#: calendar/gui/dialogs/cancel-comp.c:77
+#: calendar/gui/dialogs/cancel-comp.c:79
msgid "Are you sure you want to cancel and delete this journal entry?"
msgstr "您确信您希望取消并删除该日志条目?"
# calendar/gui/dialogs/changed-comp.c:59
# calendar/gui/dialogs/changed-comp.c:59
# calendar/gui/dialogs/changed-comp.c:59
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
msgid "This event has been deleted."
msgstr "该事件已经被删除。"
# calendar/gui/dialogs/changed-comp.c:63
# calendar/gui/dialogs/changed-comp.c:63
# calendar/gui/dialogs/changed-comp.c:63
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
msgid "This task has been deleted."
msgstr "该任务已经被删除。"
# calendar/gui/dialogs/changed-comp.c:67
# calendar/gui/dialogs/changed-comp.c:67
# calendar/gui/dialogs/changed-comp.c:67
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
msgid "This journal entry has been deleted."
msgstr "该日志条目已经被删除。"
# calendar/gui/dialogs/changed-comp.c:76
# calendar/gui/dialogs/changed-comp.c:76
# calendar/gui/dialogs/changed-comp.c:76
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
msgstr "%s 您已经做了修改。忘记这些修改并关闭编辑器?"
@@ -7610,7 +7854,7 @@ msgstr "%s 您已经做了修改。忘记这些修改并关闭编辑器?"
# calendar/gui/dialogs/changed-comp.c:78
# calendar/gui/dialogs/changed-comp.c:78
# calendar/gui/dialogs/changed-comp.c:78
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
#, c-format
msgid "%s You have made no changes, close the editor?"
msgstr "%s 您还没有进行修改,关闭编辑器?"
@@ -7618,28 +7862,28 @@ msgstr "%s 您还没有进行修改,关闭编辑器?"
# calendar/gui/dialogs/changed-comp.c:83
# calendar/gui/dialogs/changed-comp.c:83
# calendar/gui/dialogs/changed-comp.c:83
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
msgid "This event has been changed."
msgstr "该时间已经被改变。"
# calendar/gui/dialogs/changed-comp.c:87
# calendar/gui/dialogs/changed-comp.c:87
# calendar/gui/dialogs/changed-comp.c:87
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
msgid "This task has been changed."
msgstr "该任务已经被改变。"
# calendar/gui/dialogs/changed-comp.c:91
# calendar/gui/dialogs/changed-comp.c:91
# calendar/gui/dialogs/changed-comp.c:91
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
msgid "This journal entry has been changed."
msgstr "该日志条目已经被改变。"
# calendar/gui/dialogs/changed-comp.c:100
# calendar/gui/dialogs/changed-comp.c:100
# calendar/gui/dialogs/changed-comp.c:100
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
msgstr "%s 您已经做出了修改。忘记这些修改并更新编辑器?"
@@ -7647,79 +7891,93 @@ msgstr "%s 您已经做出了修改。忘记这些修改并更新编辑器?"
# calendar/gui/dialogs/changed-comp.c:102
# calendar/gui/dialogs/changed-comp.c:102
# calendar/gui/dialogs/changed-comp.c:102
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
#, c-format
msgid "%s You have made no changes, update the editor?"
msgstr "%s 您还没有进行修改,更新编辑器?"
+# camel/providers/local/camel-mbox-summary.c:873
+# camel/providers/local/camel-spool-summary.c:544
+# camel/providers/local/camel-spool-summary.c:1110
+# camel/providers/local/camel-mbox-summary.c:873
+# camel/providers/local/camel-spool-summary.c:544
+# camel/providers/local/camel-spool-summary.c:1110
+# camel/providers/local/camel-mbox-summary.c:873
+# camel/providers/local/camel-spool-summary.c:544
+# camel/providers/local/camel-spool-summary.c:1110
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "未知的错误: %s"
+
# calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
# calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
# calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
msgid " to "
msgstr " 到 "
# calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
# calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
# calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
msgid " (Completed "
msgstr " (完成 "
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
msgid "Completed "
msgstr "已完成 "
# calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
# calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
# calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
msgid " (Due "
msgstr " (预定 "
# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
msgid "Due "
msgstr "预定 "
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:328
msgid "Could not update invalid object"
msgstr "无法更新无效对象"
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:331
msgid "Object not found, not updated"
msgstr "找不到对象,未更新"
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:334
msgid "You don't have permissions to update this object"
msgstr "您没有更新该对象的权限"
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:303
# calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:337
msgid "Could not update object"
msgstr "无法更新对象"
# calendar/gui/dialogs/comp-editor.c:678
# calendar/gui/dialogs/comp-editor.c:678
# calendar/gui/dialogs/comp-editor.c:692
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:787
msgid "Edit Appointment"
msgstr "编辑约会"
# calendar/gui/dialogs/comp-editor.c:683
# calendar/gui/dialogs/comp-editor.c:683
# calendar/gui/dialogs/comp-editor.c:697
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:792
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
@@ -7727,7 +7985,7 @@ msgstr "约会 - %s"
# calendar/gui/dialogs/comp-editor.c:686
# calendar/gui/dialogs/comp-editor.c:686
# calendar/gui/dialogs/comp-editor.c:700
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:795
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
@@ -7735,7 +7993,7 @@ msgstr "任务 - %s"
# calendar/gui/dialogs/comp-editor.c:689
# calendar/gui/dialogs/comp-editor.c:689
# calendar/gui/dialogs/comp-editor.c:703
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:798
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
@@ -7743,30 +8001,29 @@ msgstr "日志条目 - %s"
# calendar/gui/dialogs/comp-editor.c:703
# calendar/gui/dialogs/comp-editor.c:703
# calendar/gui/dialogs/comp-editor.c:717
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:809
msgid "No summary"
msgstr "没有概要"
# composer/e-msg-composer.c:943
# composer/e-msg-composer.c:947
# composer/e-msg-composer.c:912
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1230
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3941
+#: calendar/gui/e-week-view.c:3780 composer/e-msg-composer.c:1162
msgid "Save as..."
msgstr "另存为..."
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1331
+#: calendar/gui/dialogs/comp-editor.c:1355
+#: calendar/gui/dialogs/comp-editor.c:1379
+msgid "Changes made to this item may be discarded if an update arrives"
msgstr ""
# calendar/gui/dialogs/comp-editor.c:1272
# calendar/gui/dialogs/comp-editor.c:1272
# calendar/gui/dialogs/comp-editor.c:1277
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1406
msgid "Unable to obtain current version!"
msgstr "无法获取当前版本!"
@@ -7863,21 +8120,21 @@ msgstr "输入代表"
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
msgid "Appointment"
msgstr "约会"
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
msgid "Reminder"
msgstr "提醒"
# calendar/gui/dialogs/event-editor.c:195
# calendar/gui/dialogs/event-editor.c:195
# calendar/gui/dialogs/event-editor.c:195
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
msgid "Recurrence"
msgstr "再次发生"
@@ -7890,9 +8147,9 @@ msgstr "再次发生"
# calendar/gui/dialogs/event-editor.c:202
# calendar/gui/dialogs/event-editor.c:260
# calendar/gui/dialogs/event-editor.c:363
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:434
msgid "Scheduling"
msgstr "正在调度"
@@ -7905,23 +8162,47 @@ msgstr "正在调度"
# calendar/gui/dialogs/event-editor.c:207
# calendar/gui/dialogs/event-editor.c:263
# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:437 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr "会见"
+# calendar/gui/e-calendar-table.etspec.h:14
+# calendar/gui/e-calendar-table.etspec.h:14
+# calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:554
+#, fuzzy
+msgid "Start date is wrong"
+msgstr "开始日期"
+
+#: calendar/gui/dialogs/event-page.c:610
+msgid "End date is wrong"
+msgstr ""
+
+# calendar/gui/dialogs/event-page.glade.h:15
+# calendar/gui/dialogs/event-page.glade.h:15
+# calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.c:633
+#, fuzzy
+msgid "Start time is wrong"
+msgstr "开始时间(_S):"
+
+#: calendar/gui/dialogs/event-page.c:640
+msgid "End time is wrong"
+msgstr ""
+
# calendar/gui/dialogs/event-page.glade.h:1
# calendar/gui/dialogs/event-page.glade.h:1
# calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:2
msgid "A_ll day event"
msgstr "全天事务(_L)"
# calendar/gui/dialogs/event-page.glade.h:2
# calendar/gui/dialogs/event-page.glade.h:2
# calendar/gui/dialogs/event-page.glade.h:2
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
msgid "B_usy"
msgstr "忙(_U)"
@@ -7934,7 +8215,7 @@ msgstr "忙(_U)"
# calendar/gui/dialogs/event-page.glade.h:4
# calendar/gui/dialogs/task-page.glade.h:2
# calendar/gui/e-calendar-table.etspec.h:5
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
#: calendar/gui/dialogs/task-page.glade.h:2
#: calendar/gui/e-calendar-table.etspec.h:5
msgid "Classification"
@@ -7946,7 +8227,7 @@ msgstr "分类"
# calendar/gui/dialogs/task-page.glade.h:3
# calendar/gui/dialogs/event-page.glade.h:5
# calendar/gui/dialogs/task-page.glade.h:3
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
#: calendar/gui/dialogs/task-page.glade.h:3
msgid "Con_fidential"
msgstr "机密的(_F)"
@@ -7957,7 +8238,7 @@ msgstr "机密的(_F)"
# calendar/gui/dialogs/task-page.glade.h:4
# calendar/gui/dialogs/event-page.glade.h:6
# calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
#: calendar/gui/dialogs/task-page.glade.h:4
msgid "Date & Time"
msgstr "日期及时间"
@@ -7965,14 +8246,14 @@ msgstr "日期及时间"
# calendar/gui/dialogs/event-page.glade.h:7
# calendar/gui/dialogs/event-page.glade.h:7
# calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
msgid "F_ree"
msgstr "闲(_R)"
# calendar/gui/dialogs/event-page.glade.h:8
# calendar/gui/dialogs/event-page.glade.h:8
# calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
msgid "L_ocation:"
msgstr "地理位置(_O):"
@@ -7982,7 +8263,7 @@ msgstr "地理位置(_O):"
# calendar/gui/dialogs/task-page.glade.h:6
# calendar/gui/dialogs/event-page.glade.h:9
# calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
#: calendar/gui/dialogs/task-page.glade.h:6
msgid "Pri_vate"
msgstr "保密的(_V)"
@@ -7993,7 +8274,7 @@ msgstr "保密的(_V)"
# calendar/gui/dialogs/task-page.glade.h:7
# calendar/gui/dialogs/event-page.glade.h:10
# calendar/gui/dialogs/task-page.glade.h:7
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
#: calendar/gui/dialogs/task-page.glade.h:7
msgid "Pu_blic"
msgstr "公开的(_B)"
@@ -8004,7 +8285,7 @@ msgstr "公开的(_B)"
# calendar/gui/e-calendar-table.etspec.h:13
# calendar/gui/dialogs/event-page.glade.h:11
# calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
#: calendar/gui/e-calendar-table.etspec.h:13
msgid "Show Time As"
msgstr "按其显示时间"
@@ -8015,22 +8296,11 @@ msgstr "按其显示时间"
# calendar/gui/dialogs/task-page.glade.h:9
# calendar/gui/dialogs/event-page.glade.h:12
# calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
#: calendar/gui/dialogs/task-page.glade.h:9
msgid "Su_mmary:"
msgstr "概要(_U):"
-# calendar/gui/dialogs/event-page.glade.h:13
-# calendar/gui/dialogs/task-page.glade.h:10
-# calendar/gui/dialogs/event-page.glade.h:13
-# calendar/gui/dialogs/task-page.glade.h:10
-# calendar/gui/dialogs/event-page.glade.h:13
-# calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "联系人(_C)..."
-
# calendar/gui/dialogs/event-page.glade.h:14
# calendar/gui/dialogs/event-page.glade.h:14
# calendar/gui/dialogs/event-page.glade.h:14
@@ -8045,31 +8315,35 @@ msgstr "结束时间(_E):"
msgid "_Start time:"
msgstr "开始时间(_S):"
+#: calendar/gui/dialogs/meeting-page.c:425
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
# calendar/gui/dialogs/meeting-page.c:425
# calendar/gui/dialogs/meeting-page.c:425
# calendar/gui/dialogs/meeting-page.c:425
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:431
msgid "An organizer is required."
msgstr "需要一名组织者。"
# calendar/gui/dialogs/meeting-page.c:446
# calendar/gui/dialogs/meeting-page.c:446
# calendar/gui/dialogs/meeting-page.c:446
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:446
msgid "At least one attendee is required."
msgstr "需要至少一个参加者。"
# calendar/gui/dialogs/meeting-page.c:626
# calendar/gui/dialogs/meeting-page.c:626
# calendar/gui/dialogs/meeting-page.c:626
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:616
msgid "That person is already attending the meeting!"
msgstr "那个人已经参加了会议!"
# calendar/gui/dialogs/meeting-page.c:701
# calendar/gui/dialogs/meeting-page.c:701
# calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:696
msgid "_Delegate To..."
msgstr "授权于(_D)..."
@@ -8160,22 +8434,11 @@ msgstr "成员"
# calendar/gui/e-itip-control.c:809
# calendar/gui/e-meeting-time-sel.etspec.h:8
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1177
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
-# calendar/gui/dialogs/meeting-page.etspec.h:9
-# calendar/gui/e-meeting-time-sel.etspec.h:9
-# calendar/gui/dialogs/meeting-page.etspec.h:9
-# calendar/gui/e-meeting-time-sel.etspec.h:9
-# calendar/gui/dialogs/meeting-page.etspec.h:9
-# calendar/gui/e-meeting-time-sel.etspec.h:9
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "角色"
-
# calendar/gui/dialogs/meeting-page.etspec.h:10
# calendar/gui/e-calendar-table.etspec.h:15
# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
@@ -8195,25 +8458,6 @@ msgstr "角色"
msgid "Status"
msgstr "状态"
-# calendar/gui/dialogs/meeting-page.etspec.h:11
-# calendar/gui/e-calendar-table.etspec.h:18
-# calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
-# shell/glade/e-active-connection-dialog.glade.h:5
-# calendar/gui/dialogs/meeting-page.etspec.h:11
-# calendar/gui/e-calendar-table.etspec.h:18
-# calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
-# shell/glade/e-active-connection-dialog.glade.h:5
-# calendar/gui/dialogs/meeting-page.etspec.h:11
-# calendar/gui/e-calendar-table.etspec.h:18
-# calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:94
-# shell/glade/e-active-connection-dialog.glade.h:5
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "类型"
-
# calendar/gui/dialogs/meeting-page.glade.h:2
# calendar/gui/e-itip-control.glade.h:9
# calendar/gui/dialogs/meeting-page.glade.h:2
@@ -8239,91 +8483,69 @@ msgstr "改变组织者(_C)"
# calendar/gui/dialogs/meeting-page.glade.h:4
# calendar/gui/e-meeting-time-sel.c:450
#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:425
msgid "_Invite Others..."
msgstr "邀请其他人(_I)..."
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-msgid "st"
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
msgstr ""
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-msgid "nd"
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
msgstr ""
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-msgid "rd"
-msgstr ""
-
-# calendar/gui/dialogs/recurrence-page.c:1096
-# calendar/gui/dialogs/recurrence-page.c:1096
-# calendar/gui/dialogs/recurrence-page.c:1096
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
msgstr ""
+# addressbook/gui/contact-editor/fulladdr.glade.h:231
+# addressbook/gui/contact-editor/fulladdr.glade.h:231
+# addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: calendar/gui/dialogs/recur-comp.c:75
+#, fuzzy
+msgid "This and Future Instances"
+msgstr "瓦利斯和富图纳群岛"
+
+# my-evolution/my-evolution.glade.h:3
+# my-evolution/my-evolution.glade.h:3
+# my-evolution/my-evolution.glade.h:3
+#: calendar/gui/dialogs/recur-comp.c:77
+#, fuzzy
+msgid "All Instances"
+msgstr "所有站点(_L):"
+
# calendar/gui/dialogs/recurrence-page.c:571
# calendar/gui/dialogs/recurrence-page.c:571
# calendar/gui/dialogs/recurrence-page.c:571
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:532
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "该约会含有 Evolution 无法编辑的循环。"
-#: calendar/gui/dialogs/recurrence-page.c:898
-msgid "Recurrent date is wrong"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
msgstr ""
# calendar/gui/dialogs/recurrence-page.c:932
# calendar/gui/dialogs/recurrence-page.c:932
# calendar/gui/dialogs/recurrence-page.c:932
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
msgid "on"
msgstr "在"
# my-evolution/metar.c:262
# my-evolution/metar.c:262
# my-evolution/metar.c:262
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
msgid "first"
msgstr "第一"
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978
msgid "second"
msgstr "第二"
@@ -8338,21 +8560,21 @@ msgstr "第二"
# addressbook/gui/contact-editor/e-contact-editor.c:1714
# mail/mail-config.glade.h:49
# my-evolution/Locations.h:1614
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
msgid "third"
msgstr "第三"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/metar.c:64
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
msgid "fourth"
msgstr "第四"
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
msgid "last"
msgstr "最后"
@@ -8365,28 +8587,28 @@ msgstr "最后"
# addressbook/backend/ebook/e-card-simple.c:80
# addressbook/gui/contact-editor/e-contact-editor.c:1657
# addressbook/gui/widgets/e-addressbook-view.c:980
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
msgid "Other Date"
msgstr "其它日期"
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
# calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032
msgid "day"
msgstr "天"
# calendar/gui/dialogs/recurrence-page.c:1088
# calendar/gui/dialogs/recurrence-page.c:1088
# calendar/gui/dialogs/recurrence-page.c:1088
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
msgid "on the"
msgstr "在"
# calendar/gui/dialogs/recurrence-page.c:1269
# calendar/gui/dialogs/recurrence-page.c:1269
# calendar/gui/dialogs/recurrence-page.c:1269
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
msgid "occurrences"
msgstr "循环"
@@ -8498,31 +8720,39 @@ msgstr "年"
# calendar/gui/dialogs/send-comp.c:55
# calendar/gui/dialogs/send-comp.c:55
# calendar/gui/dialogs/send-comp.c:56
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
msgid "The meeting information has been created. Send it?"
msgstr "会议信息已创建。发送该信息?"
# calendar/gui/dialogs/send-comp.c:55
# calendar/gui/dialogs/send-comp.c:55
# calendar/gui/dialogs/send-comp.c:59
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:61
msgid "The meeting information has changed. Send an updated version?"
msgstr "会议信息已经改变。发送更新版本?"
# calendar/gui/dialogs/send-comp.c:60
# calendar/gui/dialogs/send-comp.c:60
# calendar/gui/dialogs/send-comp.c:66
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:68
msgid "The task assignment information has been created. Send it?"
msgstr "任务分配信息已创建。发送该信息?"
# calendar/gui/dialogs/send-comp.c:60
# calendar/gui/dialogs/send-comp.c:60
# calendar/gui/dialogs/send-comp.c:70
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:72
msgid "The task information has changed. Send an updated version?"
msgstr "任务信息已经改变。发送更新版本?"
+# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/task-details-page.c:397
+#, fuzzy
+msgid "Completed date is wrong"
+msgstr "已完成 "
+
# calendar/gui/dialogs/task-details-page.glade.h:2
# calendar/gui/e-calendar-table.etspec.h:2
# calendar/gui/dialogs/task-details-page.glade.h:2
@@ -8542,22 +8772,10 @@ msgstr "% 完成"
msgid "Date Completed:"
msgstr "完成日期:"
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
-msgid "Needs Action"
-msgstr "需要动作"
-
# calendar/gui/dialogs/task-details-page.glade.h:11
# calendar/gui/dialogs/task-details-page.glade.h:11
# calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
msgid "Progress"
msgstr "进度"
@@ -8567,22 +8785,22 @@ msgstr "进度"
# my-evolution/e-summary-preferences.c:964
# calendar/gui/dialogs/task-details-page.glade.h:12
# my-evolution/e-summary-preferences.c:966
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
msgid "URL:"
msgstr "URL:"
# calendar/gui/dialogs/task-details-page.glade.h:14
# calendar/gui/dialogs/task-details-page.glade.h:14
# calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
msgid "_Priority:"
msgstr "优先级(_P):"
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
msgid "_Status:"
msgstr "状态(_S):"
@@ -8592,7 +8810,7 @@ msgstr "状态(_S):"
# calendar/gui/dialogs/task-editor.c:178
# addressbook/gui/component/addressbook-config.glade.h:9
# calendar/gui/dialogs/task-editor.c:178
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
msgid "Basic"
msgstr "基本"
@@ -8605,12 +8823,16 @@ msgstr "基本"
# calendar/gui/dialogs/task-editor.c:190
# calendar/gui/dialogs/task-editor.c:227
# calendar/gui/dialogs/task-editor.c:322
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
msgid "Assignment"
msgstr "分派"
+#: calendar/gui/dialogs/task-page.c:527
+msgid "Due date is wrong"
+msgstr ""
+
# calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:754
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
@@ -8620,9 +8842,9 @@ msgstr "分派"
# calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
# calendar/gui/e-itip-control.glade.h:6
# composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1105
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
msgid "Description:"
msgstr "描述:"
@@ -8633,6 +8855,16 @@ msgstr "描述:"
msgid "Sta_rt Date:"
msgstr "开始日期(_R):"
+# calendar/gui/dialogs/event-page.glade.h:13
+# calendar/gui/dialogs/task-page.glade.h:10
+# calendar/gui/dialogs/event-page.glade.h:13
+# calendar/gui/dialogs/task-page.glade.h:10
+# calendar/gui/dialogs/event-page.glade.h:13
+# calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "联系人(_C)..."
+
# calendar/gui/dialogs/task-page.glade.h:11
# calendar/gui/dialogs/task-page.glade.h:11
# calendar/gui/dialogs/task-page.glade.h:11
@@ -8640,10 +8872,163 @@ msgstr "开始日期(_R):"
msgid "_Due Date:"
msgstr "到期日期(_D):"
+# calendar/gui/dialogs/alarm-page.c:309
+# calendar/gui/dialogs/alarm-page.c:309
+# calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d 天"
+
+# calendar/gui/dialogs/alarm-page.c:312
+# calendar/gui/dialogs/alarm-page.c:312
+# calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 天"
+
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d 周"
+
+# calendar/gui/dialogs/alarm-page.c:320
+# calendar/gui/dialogs/alarm-page.c:320
+# calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 周"
+
+# calendar/gui/dialogs/alarm-page.c:325
+# calendar/gui/dialogs/alarm-page.c:325
+# calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d 小时"
+
+# calendar/gui/dialogs/alarm-page.c:328
+# calendar/gui/dialogs/alarm-page.c:328
+# calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 小时"
+
+# calendar/gui/dialogs/alarm-page.c:333
+# calendar/gui/dialogs/alarm-page.c:333
+# calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d 分钟"
+
+# calendar/gui/dialogs/alarm-page.c:336
+# calendar/gui/dialogs/alarm-page.c:336
+# calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 分钟"
+
+# calendar/gui/dialogs/alarm-page.c:341
+# calendar/gui/dialogs/alarm-page.c:341
+# calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d 秒"
+
+# calendar/gui/dialogs/alarm-page.c:344
+# calendar/gui/dialogs/alarm-page.c:344
+# calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 秒"
+
+# calendar/gui/dialogs/alarm-page.c:381
+# calendar/gui/dialogs/alarm-page.c:381
+# calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "发送电子邮件"
+
+# calendar/gui/dialogs/alarm-page.c:391
+# calendar/gui/dialogs/alarm-page.c:391
+# calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "执行未知的动作"
+
+# calendar/gui/dialogs/alarm-page.c:403
+# calendar/gui/dialogs/alarm-page.c:403
+# calendar/gui/dialogs/alarm-page.c:403
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "在约会开始之前 %s %s"
+
+# calendar/gui/dialogs/alarm-page.c:406
+# calendar/gui/dialogs/alarm-page.c:406
+# calendar/gui/dialogs/alarm-page.c:406
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "在约会开始之后 %s %s"
+
+# calendar/gui/dialogs/alarm-page.c:411
+# calendar/gui/dialogs/alarm-page.c:411
+# calendar/gui/dialogs/alarm-page.c:411
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "在约会开始时 %s"
+
+# calendar/gui/dialogs/alarm-page.c:420
+# calendar/gui/dialogs/alarm-page.c:420
+# calendar/gui/dialogs/alarm-page.c:420
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "在约会结束之前 %s %s"
+
+# calendar/gui/dialogs/alarm-page.c:423
+# calendar/gui/dialogs/alarm-page.c:423
+# calendar/gui/dialogs/alarm-page.c:423
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "在约会结束之后 %s %s"
+
+# calendar/gui/dialogs/alarm-page.c:428
+# calendar/gui/dialogs/alarm-page.c:428
+# calendar/gui/dialogs/alarm-page.c:428
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "在约会结束时 %s"
+
+# calendar/gui/dialogs/alarm-page.c:453
+# calendar/gui/dialogs/alarm-page.c:453
+# calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "在 %2$s 时 %1$s"
+
+# calendar/gui/dialogs/alarm-page.c:459
+# calendar/gui/dialogs/alarm-page.c:459
+# calendar/gui/dialogs/alarm-page.c:458
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s 为未知触发类型"
+
# calendar/gui/e-calendar-table.c:427
# calendar/gui/e-calendar-table.c:427
# calendar/gui/e-calendar-table.c:428
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-calendar-table.c:415
#, c-format
msgid "0%"
msgstr "0%"
@@ -8651,7 +9036,7 @@ msgstr "0%"
# calendar/gui/e-calendar-table.c:428
# calendar/gui/e-calendar-table.c:428
# calendar/gui/e-calendar-table.c:429
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:416
#, c-format
msgid "10%"
msgstr "10%"
@@ -8659,7 +9044,7 @@ msgstr "10%"
# calendar/gui/e-calendar-table.c:429
# calendar/gui/e-calendar-table.c:429
# calendar/gui/e-calendar-table.c:430
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:417
#, c-format
msgid "20%"
msgstr "20%"
@@ -8667,7 +9052,7 @@ msgstr "20%"
# calendar/gui/e-calendar-table.c:430
# calendar/gui/e-calendar-table.c:430
# calendar/gui/e-calendar-table.c:431
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:418
#, c-format
msgid "30%"
msgstr "30%"
@@ -8675,7 +9060,7 @@ msgstr "30%"
# calendar/gui/e-calendar-table.c:431
# calendar/gui/e-calendar-table.c:431
# calendar/gui/e-calendar-table.c:432
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:419
#, c-format
msgid "40%"
msgstr "40%"
@@ -8683,7 +9068,7 @@ msgstr "40%"
# calendar/gui/e-calendar-table.c:432
# calendar/gui/e-calendar-table.c:432
# calendar/gui/e-calendar-table.c:433
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:420
#, c-format
msgid "50%"
msgstr "50%"
@@ -8691,7 +9076,7 @@ msgstr "50%"
# calendar/gui/e-calendar-table.c:433
# calendar/gui/e-calendar-table.c:433
# calendar/gui/e-calendar-table.c:434
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:421
#, c-format
msgid "60%"
msgstr "60%"
@@ -8699,7 +9084,7 @@ msgstr "60%"
# calendar/gui/e-calendar-table.c:434
# calendar/gui/e-calendar-table.c:434
# calendar/gui/e-calendar-table.c:435
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:422
#, c-format
msgid "70%"
msgstr "70%"
@@ -8707,7 +9092,7 @@ msgstr "70%"
# calendar/gui/e-calendar-table.c:435
# calendar/gui/e-calendar-table.c:435
# calendar/gui/e-calendar-table.c:436
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:423
#, c-format
msgid "80%"
msgstr "80%"
@@ -8715,7 +9100,7 @@ msgstr "80%"
# calendar/gui/e-calendar-table.c:436
# calendar/gui/e-calendar-table.c:436
# calendar/gui/e-calendar-table.c:437
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:424
#, c-format
msgid "90%"
msgstr "90%"
@@ -8723,7 +9108,7 @@ msgstr "90%"
# calendar/gui/e-calendar-table.c:437
# calendar/gui/e-calendar-table.c:437
# calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-calendar-table.c:425
#, c-format
msgid "100%"
msgstr "100%"
@@ -8734,8 +9119,8 @@ msgstr "100%"
# calendar/gui/e-week-view.c:1824
# calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
# calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2838
+#: calendar/gui/e-week-view.c:1910
msgid "Deleting selected objects"
msgstr "删除选中的对象"
@@ -8748,16 +9133,16 @@ msgstr "删除选中的对象"
# calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
# calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
# shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-week-view.c:3561 mail/folder-browser.c:1756
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr "打开(_O)"
# composer/e-msg-composer.c:943
# composer/e-msg-composer.c:947
# composer/e-msg-composer.c:912
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
msgid "_Save as..."
msgstr "另存为(_S)..."
@@ -8770,8 +9155,8 @@ msgstr "另存为(_S)..."
# ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
# ui/my-evolution.xml.h:7
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-week-view.c:3536 calendar/gui/e-week-view.c:3563
#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
@@ -8787,8 +9172,8 @@ msgstr "打印(_P)..."
# calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
# calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
# ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3712
+#: calendar/gui/e-week-view.c:3568 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
@@ -8805,8 +9190,8 @@ msgstr "剪切(_U)"
# calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
# ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
# ui/evolution-tasks.xml.h:17
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3713
+#: calendar/gui/e-week-view.c:3569 ui/evolution-addressbook.xml.h:30
#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:15
msgid "_Copy"
@@ -8827,9 +9212,9 @@ msgstr "复制(_C)"
# calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
# ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
# ui/evolution-tasks.xml.h:21
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3678
+#: calendar/gui/e-day-view.c:3714 calendar/gui/e-week-view.c:3540
+#: calendar/gui/e-week-view.c:3570 ui/evolution-addressbook.xml.h:37
#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:19
msgid "_Paste"
@@ -8838,35 +9223,35 @@ msgstr "粘贴(_P)"
# ui/evolution-task-editor.xml.h:1
# ui/evolution-task-editor.xml.h:1
# ui/evolution-task-editor.xml.h:1
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
msgid "_Assign Task"
msgstr "委派任务(_A)"
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
# calendar/gui/e-calendar-table.c:954
# calendar/gui/e-calendar-table.c:954
# calendar/gui/e-calendar-table.c:973
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
# calendar/gui/e-calendar-table.c:959
# calendar/gui/e-calendar-table.c:959
# calendar/gui/e-calendar-table.c:978
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
# calendar/gui/e-calendar-table.c:961
# calendar/gui/e-calendar-table.c:961
# calendar/gui/e-calendar-table.c:980
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
msgid "_Delete Selected Tasks"
msgstr "删除选定的任务(_D)"
@@ -8876,8 +9261,8 @@ msgstr "删除选定的任务(_D)"
# calendar/gui/e-week-view.c:3924
# calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
# calendar/gui/e-week-view.c:3928
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1244 calendar/gui/e-day-view.c:7635
+#: calendar/gui/e-week-view.c:4269
msgid "Updating objects"
msgstr "更新对象"
@@ -8887,7 +9272,7 @@ msgstr "更新对象"
# calendar/gui/e-calendar-table.etspec.h:6
# calendar/gui/e-calendar-table.c:1247
# calendar/gui/e-calendar-table.etspec.h:6
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1327
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr "点击以添加任务"
@@ -8905,8 +9290,8 @@ msgstr "提醒"
# camel/camel-filter-driver.c:886
# calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
# camel/camel-filter-driver.c:1026
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
msgid "Complete"
msgstr "完成"
@@ -8962,8 +9347,8 @@ msgstr "开始日期"
# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
#: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:56 shell/e-shell.c:750
+#: shell/e-shortcuts.c:1082
msgid "Summary"
msgstr "概要"
@@ -8974,13 +9359,6 @@ msgstr "概要"
msgid "Task sort"
msgstr "任务排序"
-# calendar/gui/e-calendar-table.etspec.h:19
-# calendar/gui/e-calendar-table.etspec.h:19
-# calendar/gui/e-calendar-table.etspec.h:19
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
# calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
# e-util/e-time-utils.c:357
# calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
@@ -8988,8 +9366,8 @@ msgstr "URL"
# calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
# e-util/e-time-utils.c:357
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y年%m月%d日 %a %H:%M:%S"
@@ -9000,8 +9378,8 @@ msgstr "%Y年%m月%d日 %a %H:%M:%S"
# calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
# e-util/e-time-utils.c:366
#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y年%m月%d日 %a %I:%M%S %p"
@@ -9022,7 +9400,7 @@ msgstr ""
# calendar/gui/e-day-view-time-item.c:518
# calendar/gui/e-day-view-time-item.c:518
# calendar/gui/e-day-view-time-item.c:518
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:529
#, c-format
msgid "%02i minute divisions"
msgstr "%02i 分钟分割"
@@ -9035,8 +9413,8 @@ msgstr "%02i 分钟分割"
# calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:260 calendar/gui/e-day-view.c:1376
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1529
msgid "%A %d %B"
msgstr "%B %d %A"
@@ -9048,8 +9426,8 @@ msgstr "%B %d %A"
# calendar/gui/e-week-view-main-item.c:347
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:268 calendar/gui/e-day-view.c:1409
+#: calendar/gui/e-week-view-main-item.c:339
msgid "%d %b"
msgstr "%b %d"
@@ -9060,8 +9438,8 @@ msgstr "%b %d"
# calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
# calendar/gui/print.c:768
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
msgid "am"
msgstr "上午"
@@ -9072,22 +9450,22 @@ msgstr "上午"
# calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
# calendar/gui/print.c:770
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
msgid "pm"
msgstr "下午"
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3662
msgid "New _Appointment"
msgstr "新建约会(_A)"
# calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
# calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3410
# calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3664 calendar/gui/e-week-view.c:3530
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
@@ -9100,21 +9478,21 @@ msgstr "新建全天事件(_E)"
# calendar/gui/dialogs/event-editor.c:207
# calendar/gui/dialogs/event-editor.c:263
# calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3666 calendar/gui/e-week-view.c:3531
msgid "New Meeting"
msgstr "新会议"
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3668 calendar/gui/e-week-view.c:3532
msgid "New Task"
msgstr "新建任务"
# ui/evolution-comp-editor.xml.h:11
# ui/evolution-comp-editor.xml.h:11
# ui/evolution-comp-editor.xml.h:11
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3673 ui/evolution-comp-editor.xml.h:11
msgid "Print..."
msgstr "打印..."
@@ -9124,7 +9502,7 @@ msgstr "打印..."
# ui/evolution-calendar.xml.h:17
# calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
# ui/evolution-calendar.xml.h:17
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3685 calendar/gui/e-week-view.c:3546
#: ui/evolution-calendar.xml.h:10
msgid "Go to _Today"
msgstr "转到今天(_T)"
@@ -9132,14 +9510,14 @@ msgstr "转到今天(_T)"
# calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
# calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3422
# calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3687 calendar/gui/e-week-view.c:3547
msgid "_Go to Date..."
msgstr "转到日期(_G)..."
# ui/evolution-calendar.xml.h:42
# ui/evolution-calendar.xml.h:42
# ui/evolution-calendar.xml.h:42
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3692 calendar/gui/e-week-view.c:3551
#: ui/evolution-calendar.xml.h:31
msgid "_Publish Free/Busy Information"
msgstr "发布忙闲信息(_P)"
@@ -9147,80 +9525,185 @@ msgstr "发布忙闲信息(_P)"
# ui/evolution-mail-global.xml.h:21
# ui/evolution-mail-global.xml.h:21
# ui/evolution-mail-global.xml.h:21
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
-#: ui/evolution.xml.h:62
+#: calendar/gui/e-day-view.c:3697 calendar/gui/e-week-view.c:3555
+#: ui/evolution.xml.h:60
msgid "_Settings..."
msgstr "设置(_S)..."
# mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
# mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3562
+#: mail/folder-browser.c:1758 ui/evolution-mail-message.xml.h:112
msgid "_Save As..."
msgstr "另存为(_S)..."
# ui/evolution-event-editor.xml.h:7
# ui/evolution-event-editor.xml.h:7
# ui/evolution-event-editor.xml.h:7
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3718 calendar/gui/e-week-view.c:3574
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3575
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
# calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
# calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3455
# calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3580
msgid "Make this Occurrence _Movable"
msgstr "使该事件可移动(_M)"
# calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
# calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3457
# calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3581
msgid "Delete this _Occurrence"
msgstr "删除该时间(_O)"
# calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
# calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
# calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3582
msgid "Delete _All Occurrences"
msgstr "删除所有事件(_A)"
-#: calendar/gui/e-itip-control.c:615
+# calendar/gui/dialogs/recurrence-page.glade.h:13
+# calendar/gui/dialogs/recurrence-page.glade.h:13
+# calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Yes. (Complex Recurrence)"
+msgstr "简单循环(_S)"
+
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/e-itip-control.c:716
+#, fuzzy
+msgid "Every day"
+msgstr "每"
+
+# calendar/gui/dialogs/alarm-page.c:309
+# calendar/gui/dialogs/alarm-page.c:309
+# calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/e-itip-control.c:718
+#, fuzzy, c-format
+msgid "Every %d days"
+msgstr "%d 天"
+
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/e-itip-control.c:724
+#, fuzzy
+msgid "Every week"
+msgstr "每"
+
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/e-itip-control.c:726
+#, fuzzy, c-format
+msgid "Every %d weeks"
+msgstr "%d 周"
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Every week on "
+msgstr ""
+
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/e-itip-control.c:731
+#, fuzzy, c-format
+msgid "Every %d weeks on "
+msgstr "%d 周"
+
+# my-evolution/metar.c:322
+# my-evolution/metar.c:322
+# my-evolution/metar.c:322
+#: calendar/gui/e-itip-control.c:739
+#, fuzzy
+msgid " and "
+msgstr "沙尘"
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+# my-evolution/my-evolution.glade.h:11
+# my-evolution/my-evolution.glade.h:11
+# my-evolution/my-evolution.glade.h:11
+#: calendar/gui/e-itip-control.c:764
+#, fuzzy
+msgid "every month"
+msgstr "一个月(_H)"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+# calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/e-itip-control.c:775
+#, fuzzy
+msgid "Every year"
+msgstr "每"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
msgid "<b>Starts:</b> "
msgstr ""
# calendar/gui/e-itip-control.c:565
# calendar/gui/e-itip-control.c:565
# calendar/gui/e-itip-control.c:568
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
msgid "<b>Ends:</b> "
msgstr "<b>结束:</b>"
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
# calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
msgid "<b>Completed:</b> "
msgstr "<b>已完成:</b> "
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
msgid "<b>Due:</b> "
msgstr ""
# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
# calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
# calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
msgid "iCalendar Information"
msgstr "iCalendar 信息"
@@ -9228,15 +9711,15 @@ msgstr "iCalendar 信息"
# calendar/gui/e-itip-control.c:641
# calendar/gui/e-itip-control.c:644
#. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
msgid "iCalendar Error"
msgstr "iCalendar 错误"
# calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
# calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
# calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
msgid "An unknown person"
msgstr "未知的人"
@@ -9244,7 +9727,7 @@ msgstr "未知的人"
# calendar/gui/e-itip-control.c:729
# calendar/gui/e-itip-control.c:732
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:1033
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -9253,21 +9736,21 @@ msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作
# calendar/gui/e-itip-control.c:745
# calendar/gui/e-itip-control.c:745
# calendar/gui/e-itip-control.c:748
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
msgid "<i>None</i>"
msgstr "<i>无</i>"
# calendar/gui/dialogs/event-page.glade.h:8
# calendar/gui/dialogs/event-page.glade.h:8
# calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1059
msgid "Location:"
msgstr "位置:"
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
# calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1073
msgid "Status:"
msgstr "状态:"
@@ -9277,16 +9760,16 @@ msgstr "状态:"
# calendar/gui/e-meeting-model.c:824
# calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
# calendar/gui/e-meeting-model.c:824
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:414
msgid "Accepted"
msgstr "接受"
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/itip-utils.c:417
msgid "Tentatively Accepted"
msgstr "暂时接受"
@@ -9296,9 +9779,9 @@ msgstr "暂时接受"
# calendar/gui/e-meeting-model.c:825
# calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
# calendar/gui/e-meeting-model.c:825
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:1086 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:853
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
msgid "Declined"
msgstr "否决"
@@ -9321,14 +9804,15 @@ msgstr "否决"
# camel/providers/smtp/camel-smtp-transport.c:171
# camel/providers/smtp/camel-smtp-transport.c:226
# widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:810
+#: calendar/gui/e-meeting-model.c:826 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1584 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:345
+#: mail/mail-display.c:950 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
msgid "Unknown"
msgstr "未知"
@@ -9341,16 +9825,16 @@ msgstr "未知"
# calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
# calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
# calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225 calendar/gui/e-itip-control.c:1238
msgid "Choose an action:"
msgstr "选择一项活动:"
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:790
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1146
msgid "Update"
msgstr "更新"
@@ -9366,67 +9850,67 @@ msgstr "更新"
# calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
# calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
# shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: shell/e-shell.c:2065 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "确定"
# calendar/gui/e-itip-control.c:803
# calendar/gui/e-itip-control.c:803
# calendar/gui/e-itip-control.c:806
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1174
msgid "Accept"
msgstr "接受"
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:804
# calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1175
msgid "Tentatively accept"
msgstr "暂时接受"
# calendar/gui/e-itip-control.c:805
# calendar/gui/e-itip-control.c:805
# calendar/gui/e-itip-control.c:808
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1176
msgid "Decline"
msgstr "否决"
# calendar/gui/e-itip-control.c:819
# calendar/gui/e-itip-control.c:819
# calendar/gui/e-itip-control.c:822
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1200
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
# calendar/gui/e-itip-control.c:832
# calendar/gui/e-itip-control.c:832
# calendar/gui/e-itip-control.c:835
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1213
msgid "Update respondent status"
msgstr "更新应答者状态"
# calendar/gui/e-itip-control.c:846
# calendar/gui/e-itip-control.c:846
# calendar/gui/e-itip-control.c:848
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1226
msgid "Send Latest Information"
msgstr "发送最新的信息"
# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
# calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1239 calendar/gui/itip-utils.c:434
+#: shell/evolution-shell-component.c:1180 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
# calendar/gui/e-itip-control.c:875
# calendar/gui/e-itip-control.c:875
# calendar/gui/e-itip-control.c:909
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1320
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
@@ -9434,14 +9918,14 @@ msgstr "<b>%s</b> 发布了会议信息。"
# calendar/gui/e-itip-control.c:876
# calendar/gui/e-itip-control.c:876
# calendar/gui/e-itip-control.c:910
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1321
msgid "Meeting Information"
msgstr "会议信息"
# calendar/gui/e-itip-control.c:880
# calendar/gui/e-itip-control.c:880
# calendar/gui/e-itip-control.c:914
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1326
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> 请求 %s 参加一个会议。"
@@ -9449,7 +9933,7 @@ msgstr "<b>%s</b> 请求 %s 参加一个会议。"
# calendar/gui/e-itip-control.c:880
# calendar/gui/e-itip-control.c:880
# calendar/gui/e-itip-control.c:914
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1328
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
@@ -9457,14 +9941,14 @@ msgstr "<b>%s</b> 请求您参加一个会议。"
# calendar/gui/e-itip-control.c:881
# calendar/gui/e-itip-control.c:881
# calendar/gui/e-itip-control.c:915
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1329
msgid "Meeting Proposal"
msgstr "会议建议"
# calendar/gui/e-itip-control.c:885
# calendar/gui/e-itip-control.c:885
# calendar/gui/e-itip-control.c:919
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1333
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> 希望加入到已存的会议。"
@@ -9472,14 +9956,14 @@ msgstr "<b>%s</b> 希望加入到已存的会议。"
# calendar/gui/e-itip-control.c:886
# calendar/gui/e-itip-control.c:886
# calendar/gui/e-itip-control.c:920
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1334
msgid "Meeting Update"
msgstr "会议更新"
# calendar/gui/e-itip-control.c:890
# calendar/gui/e-itip-control.c:890
# calendar/gui/e-itip-control.c:924
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1338
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 想收到最新的会议信息。"
@@ -9487,14 +9971,14 @@ msgstr "<b>%s</b> 想收到最新的会议信息。"
# calendar/gui/e-itip-control.c:891
# calendar/gui/e-itip-control.c:891
# calendar/gui/e-itip-control.c:925
-#: calendar/gui/e-itip-control.c:1120
+#: calendar/gui/e-itip-control.c:1339
msgid "Meeting Update Request"
msgstr "会议更新请求"
# calendar/gui/e-itip-control.c:895
# calendar/gui/e-itip-control.c:895
# calendar/gui/e-itip-control.c:948
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1346
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
@@ -9502,14 +9986,14 @@ msgstr "<b>%s</b> 已回复一个会议请求。"
# calendar/gui/e-itip-control.c:896
# calendar/gui/e-itip-control.c:896
# calendar/gui/e-itip-control.c:949
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1347
msgid "Meeting Reply"
msgstr "会议答复"
# calendar/gui/e-itip-control.c:900
# calendar/gui/e-itip-control.c:900
# calendar/gui/e-itip-control.c:953
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1354
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
@@ -9517,7 +10001,7 @@ msgstr "<b>%s</b> 取消了一个会议。"
# calendar/gui/e-itip-control.c:901
# calendar/gui/e-itip-control.c:901
# calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:1136
+#: calendar/gui/e-itip-control.c:1355
msgid "Meeting Cancellation"
msgstr "会议取消"
@@ -9527,8 +10011,8 @@ msgstr "会议取消"
# calendar/gui/e-itip-control.c:990
# calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
# calendar/gui/e-itip-control.c:1064
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1362 calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1464
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信息。"
@@ -9536,14 +10020,14 @@ msgstr "<b>%s</b> 发送了一个无法理解的信息。"
# calendar/gui/e-itip-control.c:906
# calendar/gui/e-itip-control.c:906
# calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:1144
+#: calendar/gui/e-itip-control.c:1363
msgid "Bad Meeting Message"
msgstr "错误的会议信息"
# calendar/gui/e-itip-control.c:925
# calendar/gui/e-itip-control.c:925
# calendar/gui/e-itip-control.c:979
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1387
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
@@ -9551,14 +10035,14 @@ msgstr "<b>%s</b> 发布了任务信息。"
# calendar/gui/e-itip-control.c:926
# calendar/gui/e-itip-control.c:926
# calendar/gui/e-itip-control.c:980
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1388
msgid "Task Information"
msgstr "任务信息"
# calendar/gui/e-itip-control.c:930
# calendar/gui/e-itip-control.c:930
# calendar/gui/e-itip-control.c:984
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1393
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
@@ -9566,7 +10050,7 @@ msgstr "<b>%s</b> 请求 %s 完成一个任务。"
# calendar/gui/e-itip-control.c:930
# calendar/gui/e-itip-control.c:930
# calendar/gui/e-itip-control.c:984
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1395
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
@@ -9574,14 +10058,14 @@ msgstr "<b>%s</b> 请求您完成一个任务。"
# calendar/gui/e-itip-control.c:931
# calendar/gui/e-itip-control.c:931
# calendar/gui/e-itip-control.c:985
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1396
msgid "Task Proposal"
msgstr "任务建议"
# calendar/gui/e-itip-control.c:935
# calendar/gui/e-itip-control.c:935
# calendar/gui/e-itip-control.c:989
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1400
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s<b> 希望加入到已存在的任务。"
@@ -9589,14 +10073,14 @@ msgstr "<b>%s<b> 希望加入到已存在的任务。"
# calendar/gui/e-itip-control.c:936
# calendar/gui/e-itip-control.c:936
# calendar/gui/e-itip-control.c:990
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1401
msgid "Task Update"
msgstr "任务更新"
# calendar/gui/e-itip-control.c:940
# calendar/gui/e-itip-control.c:940
# calendar/gui/e-itip-control.c:994
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1405
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
@@ -9604,14 +10088,14 @@ msgstr "<b>%s</b> 希望获取最新的任务信息。"
# calendar/gui/e-itip-control.c:941
# calendar/gui/e-itip-control.c:941
# calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1406
msgid "Task Update Request"
msgstr "任务更新请求"
# calendar/gui/e-itip-control.c:945
# calendar/gui/e-itip-control.c:945
# calendar/gui/e-itip-control.c:1019
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1413
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务委派。"
@@ -9619,14 +10103,14 @@ msgstr "<b>%s</b> 已经回复了任务委派。"
# calendar/gui/e-itip-control.c:946
# calendar/gui/e-itip-control.c:946
# calendar/gui/e-itip-control.c:1020
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1414
msgid "Task Reply"
msgstr "任务回复"
# calendar/gui/e-itip-control.c:950
# calendar/gui/e-itip-control.c:950
# calendar/gui/e-itip-control.c:1024
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1421
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> 取消了任务。"
@@ -9634,21 +10118,21 @@ msgstr "<b>%s</b> 取消了任务。"
# calendar/gui/e-itip-control.c:951
# calendar/gui/e-itip-control.c:951
# calendar/gui/e-itip-control.c:1025
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1422
msgid "Task Cancellation"
msgstr "任务取消"
# calendar/gui/e-itip-control.c:956
# calendar/gui/e-itip-control.c:956
# calendar/gui/e-itip-control.c:1030
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1430
msgid "Bad Task Message"
msgstr "错误的任务邮件"
# calendar/gui/e-itip-control.c:975
# calendar/gui/e-itip-control.c:975
# calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1449
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
@@ -9656,14 +10140,14 @@ msgstr "<b>%s</b> 发布了忙闲信息。"
# calendar/gui/e-itip-control.c:976
# calendar/gui/e-itip-control.c:976
# calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1450
msgid "Free/Busy Information"
msgstr "忙闲信息"
# calendar/gui/e-itip-control.c:980
# calendar/gui/e-itip-control.c:980
# calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1454
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
@@ -9671,14 +10155,14 @@ msgstr "<b>%s</b> 请求您的忙闲信息。"
# calendar/gui/e-itip-control.c:981
# calendar/gui/e-itip-control.c:981
# calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1455
msgid "Free/Busy Request"
msgstr "忙闲请求"
# calendar/gui/e-itip-control.c:985
# calendar/gui/e-itip-control.c:985
# calendar/gui/e-itip-control.c:1059
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1459
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
@@ -9686,152 +10170,152 @@ msgstr "<b>%s</b> 应答了忙闲请求。"
# calendar/gui/e-itip-control.c:986
# calendar/gui/e-itip-control.c:986
# calendar/gui/e-itip-control.c:1060
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1460
msgid "Free/Busy Reply"
msgstr "忙闲应答"
# calendar/gui/e-itip-control.c:991
# calendar/gui/e-itip-control.c:991
# calendar/gui/e-itip-control.c:1065
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1465
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信息"
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1541
msgid "The message does not appear to be properly formed"
msgstr "邮件的格式可能不正确"
# calendar/gui/e-itip-control.c:1083
# calendar/gui/e-itip-control.c:1083
# calendar/gui/e-itip-control.c:1157
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1604
msgid "The message contains only unsupported requests."
msgstr "邮件只含有不支持的请求。"
# calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
# calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
# calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1635 calendar/gui/e-itip-control.c:1641
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日程信息"
# calendar/gui/e-itip-control.c:1142
# calendar/gui/e-itip-control.c:1142
# calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1666
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日程项目"
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1907 calendar/gui/e-itip-control.c:1999
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1910 calendar/gui/e-itip-control.c:2002
msgid "There was an error on the CORBA system\n"
msgstr ""
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:2005
msgid "Object could not be found\n"
msgstr "找不到对象\n"
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1916
msgid "You do not have the right permissions to update the calendar\n"
msgstr "您没有适当的权限更新日历\n"
# calendar/gui/e-itip-control.c:1243
# calendar/gui/e-itip-control.c:1243
# calendar/gui/e-itip-control.c:1317
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1919
msgid "Update complete\n"
msgstr "更新完成\n"
# calendar/gui/e-itip-control.c:1241
# calendar/gui/e-itip-control.c:1241
# calendar/gui/e-itip-control.c:1315
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1922
msgid "Calendar file could not be updated!\n"
msgstr "无法更新日历文件!\n"
# calendar/gui/e-itip-control.c:1300
# calendar/gui/e-itip-control.c:1300
# calendar/gui/e-itip-control.c:1374
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2017
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新参与者状态"
-#: calendar/gui/e-itip-control.c:1727
+#: calendar/gui/e-itip-control.c:1972
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
# calendar/gui/e-itip-control.c:1288
# calendar/gui/e-itip-control.c:1288
# calendar/gui/e-itip-control.c:1362
-#: calendar/gui/e-itip-control.c:1739
+#: calendar/gui/e-itip-control.c:1984
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新参与者状态!\n"
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:2008
msgid "You don't have the right permissions to update the calendar\n"
msgstr "您没有适当的权限打开日历\n"
# calendar/gui/e-itip-control.c:1298
# calendar/gui/e-itip-control.c:1298
# calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2011
msgid "Attendee status updated\n"
msgstr "更新参与者状态\n"
# calendar/gui/e-itip-control.c:1296
# calendar/gui/e-itip-control.c:1296
# calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2014
msgid "Attendee status could not be updated!\n"
msgstr "无法更新参与者状态!\n"
# calendar/gui/e-itip-control.c:1328
# calendar/gui/e-itip-control.c:1328
# calendar/gui/e-itip-control.c:1402
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2049
msgid "Removal Complete"
msgstr "删除完成"
# calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
# calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
# calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:2079 calendar/gui/e-itip-control.c:2129
msgid "Item sent!\n"
msgstr "项目已发送!\n"
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
# calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:2081 calendar/gui/e-itip-control.c:2133
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2206
msgid "Select Calendar Folder"
msgstr "选择日历文件夹"
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2213
msgid "Select Tasks Folder"
msgstr "选择任务文件夹"
@@ -9902,21 +10386,21 @@ msgstr "日期-开始"
# calendar/gui/e-meeting-model.c:95
# calendar/gui/e-meeting-model.c:95
# calendar/gui/e-meeting-model.c:95
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
msgid "Chair Persons"
msgstr "主席人员"
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1550
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
# calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1695
msgid "Required Participants"
msgstr "必需的参与者"
# calendar/gui/e-meeting-model.c:97
# calendar/gui/e-meeting-model.c:97
# calendar/gui/e-meeting-model.c:97
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
msgid "Optional Participants"
msgstr "可选的参与者"
@@ -9926,7 +10410,7 @@ msgstr "可选的参与者"
# calendar/gui/e-meeting-model.c:780
# calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
# calendar/gui/e-meeting-model.c:780
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
msgid "Resources"
msgstr "资源"
@@ -9936,8 +10420,8 @@ msgstr "资源"
# calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
# calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
# calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:806
msgid "Individual"
msgstr "个人"
@@ -9947,8 +10431,8 @@ msgstr "个人"
# calendar/gui/e-meeting-model.c:779
# calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
# calendar/gui/e-meeting-model.c:779
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:807
msgid "Group"
msgstr "组"
@@ -9958,8 +10442,8 @@ msgstr "组"
# calendar/gui/e-meeting-model.c:780
# calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
# calendar/gui/e-meeting-model.c:780
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:808
msgid "Resource"
msgstr "资源"
@@ -9969,8 +10453,8 @@ msgstr "资源"
# calendar/gui/e-meeting-model.c:781
# calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
# calendar/gui/e-meeting-model.c:781
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:809
msgid "Room"
msgstr "房间"
@@ -9980,8 +10464,8 @@ msgstr "房间"
# calendar/gui/e-meeting-model.c:794
# calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
# calendar/gui/e-meeting-model.c:794
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:822
msgid "Chair"
msgstr "主席"
@@ -9991,8 +10475,8 @@ msgstr "主席"
# calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
# calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
# calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
msgid "Required Participant"
msgstr "必需的参与者"
@@ -10002,8 +10486,8 @@ msgstr "必需的参与者"
# calendar/gui/e-meeting-model.c:796
# calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
# calendar/gui/e-meeting-model.c:796
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:824
msgid "Optional Participant"
msgstr "可选的参与者"
@@ -10013,19 +10497,30 @@ msgstr "可选的参与者"
# calendar/gui/e-meeting-model.c:797
# calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
# calendar/gui/e-meeting-model.c:797
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:825
msgid "Non-Participant"
msgstr "不参加"
+# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:550 calendar/gui/e-meeting-model.c:851
+msgid "Needs Action"
+msgstr "需要动作"
+
# calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:428
# calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
# calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:854 calendar/gui/e-meeting-time-sel.c:406
msgid "Tentative"
msgstr "暂时的"
@@ -10035,15 +10530,15 @@ msgstr "暂时的"
# calendar/gui/e-meeting-model.c:827
# calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
# calendar/gui/e-meeting-model.c:827
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:855
msgid "Delegated"
msgstr "被委任的"
# calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
# calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
# calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
msgid "In Process"
msgstr "正在处理"
@@ -10055,8 +10550,8 @@ msgstr "正在处理"
# calendar/gui/e-meeting-time-sel.c:2102
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2092
msgid "%A, %B %d, %Y"
msgstr "%Y年%B月%d日 %A"
@@ -10071,9 +10566,9 @@ msgstr "%Y年%B月%d日 %A"
# e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2125 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
msgid "%a %m/%d/%Y"
msgstr "%Y年%m月%d日 %a"
@@ -10085,120 +10580,120 @@ msgstr "%Y年%m月%d日 %a"
# e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
msgid "%m/%d/%Y"
msgstr "%Y年%m月%d日"
# calendar/gui/e-meeting-time-sel.c:430
# calendar/gui/e-meeting-time-sel.c:433
# calendar/gui/e-meeting-time-sel.c:433
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:408 designs/OOA/ooa.glade.h:11
msgid "Out of Office"
msgstr "办公室以外"
# calendar/gui/e-meeting-time-sel.c:431
# calendar/gui/e-meeting-time-sel.c:434
# calendar/gui/e-meeting-time-sel.c:434
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:409
msgid "No Information"
msgstr "没有信息"
# calendar/gui/e-meeting-time-sel.c:467
# calendar/gui/e-meeting-time-sel.c:470
# calendar/gui/e-meeting-time-sel.c:470
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:447
msgid "_Options"
msgstr "选项(_O)"
# calendar/gui/e-meeting-time-sel.c:484
# calendar/gui/e-meeting-time-sel.c:487
# calendar/gui/e-meeting-time-sel.c:487
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:467
msgid "Show _Only Working Hours"
msgstr "只显示工作小时(_O)"
# calendar/gui/e-meeting-time-sel.c:497
# calendar/gui/e-meeting-time-sel.c:500
# calendar/gui/e-meeting-time-sel.c:500
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:481
msgid "Show _Zoomed Out"
msgstr "显示缩放的输出(_Z)"
# calendar/gui/e-meeting-time-sel.c:515
# calendar/gui/e-meeting-time-sel.c:518
# calendar/gui/e-meeting-time-sel.c:518
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:499
msgid "_Update Free/Busy"
msgstr "更新忙闲(_U)"
# calendar/gui/e-meeting-time-sel.c:533
# calendar/gui/e-meeting-time-sel.c:536
# calendar/gui/e-meeting-time-sel.c:536
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:517
msgid "_<<"
msgstr "_<<"
# calendar/gui/e-meeting-time-sel.c:550
# calendar/gui/e-meeting-time-sel.c:553
# calendar/gui/e-meeting-time-sel.c:553
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:534
msgid "_Autopick"
msgstr "自动获取(_A)"
# calendar/gui/e-meeting-time-sel.c:564
# calendar/gui/e-meeting-time-sel.c:567
# calendar/gui/e-meeting-time-sel.c:567
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:548
msgid ">_>"
msgstr ">_>"
# calendar/gui/e-meeting-time-sel.c:581
# calendar/gui/e-meeting-time-sel.c:584
# calendar/gui/e-meeting-time-sel.c:584
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:567
msgid "_All People and Resources"
msgstr "所有人和资源(_A)"
# calendar/gui/e-meeting-time-sel.c:594
# calendar/gui/e-meeting-time-sel.c:597
# calendar/gui/e-meeting-time-sel.c:597
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:580
msgid "All _People and One Resource"
msgstr "所有人和一个资源(_P)"
# calendar/gui/e-meeting-time-sel.c:607
# calendar/gui/e-meeting-time-sel.c:610
# calendar/gui/e-meeting-time-sel.c:610
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:593
msgid "_Required People"
msgstr "必需的人(_R)"
# calendar/gui/e-meeting-time-sel.c:620
# calendar/gui/e-meeting-time-sel.c:623
# calendar/gui/e-meeting-time-sel.c:623
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:606
msgid "Required People and _One Resource"
msgstr "必需的人和一个资源(_O)"
# calendar/gui/e-meeting-time-sel.c:643
# calendar/gui/e-meeting-time-sel.c:646
# calendar/gui/e-meeting-time-sel.c:646
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:629
msgid "Meeting _start time:"
msgstr "会议开始时间(_S):"
# calendar/gui/e-meeting-time-sel.c:662
# calendar/gui/e-meeting-time-sel.c:665
# calendar/gui/e-meeting-time-sel.c:665
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:648
msgid "Meeting _end time:"
msgstr "会议结束时间(_E):"
# calendar/gui/e-tasks.c:328
# calendar/gui/e-tasks.c:328
# calendar/gui/e-tasks.c:342
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
#: calendar/gui/gnome-cal.c:2024
#, c-format
msgid "Opening tasks at %s"
@@ -10207,7 +10702,7 @@ msgstr "在 %s 打开任务"
# calendar/gui/e-tasks.c:355
# calendar/gui/e-tasks.c:355
# calendar/gui/e-tasks.c:367
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr "无法从“%s”中装入任务"
@@ -10215,7 +10710,7 @@ msgstr "无法从“%s”中装入任务"
# calendar/gui/e-tasks.c:367
# calendar/gui/e-tasks.c:367
# calendar/gui/e-tasks.c:379
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:401
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr "不支持装入“%s”必需的方法"
@@ -10223,7 +10718,7 @@ msgstr "不支持装入“%s”必需的方法"
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
#, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr "您没有适当的权限打开“%s”中的文件夹"
@@ -10231,7 +10726,7 @@ msgstr "您没有适当的权限打开“%s”中的文件夹"
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:466
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
#, c-format
msgid ""
"Error on %s:\n"
@@ -10243,7 +10738,7 @@ msgstr ""
# calendar/gui/e-calendar-table.etspec.h:8
# calendar/gui/e-calendar-table.etspec.h:8
# calendar/gui/e-calendar-table.etspec.h:8
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
msgid "Completing tasks..."
msgstr "正在完成的日期..."
@@ -10253,28 +10748,28 @@ msgstr "正在完成的日期..."
# calendar/gui/e-week-view.c:1824
# calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
# calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
# mail/mail-ops.c:1556
# mail/mail-ops.c:1558
# calendar/gui/e-tasks.c:629
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
msgid "Expunging"
msgstr "正在删除"
# calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
# calendar/gui/e-week-view.c:3408 calendar/gui/e-week-view.c:3446
# calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3529
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1499
# calendar/gui/gnome-cal.c:1493
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "无法打开“%s”中的文件夹"
@@ -10282,7 +10777,7 @@ msgstr "无法打开“%s”中的文件夹"
# calendar/gui/gnome-cal.c:1510
# calendar/gui/gnome-cal.c:1510
# calendar/gui/gnome-cal.c:1504
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1517
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "不支持打开“%s”必需的方法"
@@ -10290,13 +10785,12 @@ msgstr "不支持打开“%s”必需的方法"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
# calendar/gui/alarm-notify/alarm-notify-dialog.c:371
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
+#: calendar/gui/gnome-cal.c:1563
#, c-format
msgid "Adding alarms for %s"
msgstr "添加关于 %s 的提醒"
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
#, c-format
msgid ""
"The calendar backend for\n"
@@ -10304,7 +10798,7 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1764
#, c-format
msgid ""
"The task backend for\n"
@@ -10315,7 +10809,7 @@ msgstr ""
# calendar/gui/gnome-cal.c:1865
# calendar/gui/gnome-cal.c:1865
# calendar/gui/gnome-cal.c:1859
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
#, c-format
msgid "Opening calendar at %s"
msgstr "从 %s 打开日历"
@@ -10428,74 +10922,75 @@ msgstr "九月"
# calendar/gui/itip-utils.c:274
# calendar/gui/itip-utils.c:274
# calendar/gui/itip-utils.c:274
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:263 calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:343
msgid "An organizer must be set."
msgstr "必须设定组织者。"
# calendar/gui/itip-utils.c:243
# calendar/gui/itip-utils.c:243
# calendar/gui/itip-utils.c:243
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:298
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
# calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:386 calendar/gui/itip-utils.c:495
msgid "Event information"
msgstr "事件信息"
# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
# calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:497
msgid "Task information"
msgstr "任务信息"
# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
# calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
msgid "Journal information"
msgstr "日志信息"
# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
# calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:519
msgid "Free/Busy information"
msgstr "忙闲信息"
# calendar/gui/itip-utils.c:321
# calendar/gui/itip-utils.c:321
# calendar/gui/itip-utils.c:321
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:394
msgid "Calendar information"
msgstr "日历信息"
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:787
# calendar/gui/e-itip-control.c:790
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:430
msgid "Updated"
msgstr "更新"
# ui/evolution-subscribe.xml.h:3
# ui/evolution-subscribe.xml.h:3
# ui/evolution-subscribe.xml.h:3
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:438
msgid "Refresh"
msgstr "刷新"
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:442
msgid "Counter-proposal"
msgstr ""
# calendar/gui/itip-utils.c:370
# calendar/gui/itip-utils.c:370
# calendar/gui/itip-utils.c:370
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:513
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
@@ -10503,325 +10998,63 @@ msgstr "忙闲信息 (%s 到 %s)"
# calendar/gui/itip-utils.c:382
# calendar/gui/itip-utils.c:382
# calendar/gui/itip-utils.c:382
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:525
msgid "iCalendar information"
msgstr "iCalendar 信息"
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:573
# calendar/gui/itip-utils.c:581
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:669
msgid "You must be an attendee of the event."
msgstr "您必须是事件的参与者。"
-# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-# addressbook/backend/ebook/load-pine-addressbook.c:22
-# addressbook/backend/ebook/test-client-list.c:23
-# addressbook/backend/ebook/test-client.c:33
-# addressbook/conduit/address-conduit.c:1533
-# addressbook/gui/component/addressbook-factory.c:50
-# calendar/conduits/calendar/calendar-conduit.c:1449
-# calendar/conduits/todo/todo-conduit.c:1130
-# 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
-# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-# addressbook/backend/ebook/load-pine-addressbook.c:22
-# addressbook/backend/ebook/test-client-list.c:23
-# addressbook/backend/ebook/test-client.c:33
-# addressbook/conduit/address-conduit.c:1538
-# addressbook/gui/component/addressbook-factory.c:50
-# calendar/conduits/calendar/calendar-conduit.c:1546
-# calendar/conduits/todo/todo-conduit.c:1130
-# 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
-# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-# addressbook/backend/ebook/load-pine-addressbook.c:22
-# addressbook/backend/ebook/test-client-list.c:23
-# addressbook/backend/ebook/test-client.c:33
-# addressbook/conduit/address-conduit.c:1721
-# addressbook/gui/component/addressbook-factory.c:50
-# calendar/conduits/calendar/calendar-conduit.c:1727
-# calendar/conduits/todo/todo-conduit.c:1316
-# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
-# tools/evolution-addressbook-abuse.c:132
-# tools/evolution-addressbook-export.c:60
-# tools/evolution-addressbook-import.c:86
-#: calendar/gui/main.c:70
-msgid "Could not activate Bonobo"
-msgstr "无法激活 Bonobo"
-
-# calendar/gui/main.c:91
-# calendar/gui/main.c:91
-# calendar/gui/main.c:91
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr "无法创建组件编辑器车间"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr "一号"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr "二号"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr "三号"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr "四号"
-
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-# calendar/gui/print.c:425
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr "五号"
-
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr "六号"
-
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr "七号"
-
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr "八号"
-
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr "九号"
-
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-# calendar/gui/print.c:426
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr "十号"
-
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr "十一号"
-
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr "十二号"
-
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr "十三号"
-
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr "十四号"
-
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-# calendar/gui/print.c:427
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr "十五号"
-
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr "十六号"
-
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr "十七号"
-
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr "十八号"
-
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr "十九号"
-
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-# calendar/gui/print.c:428
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr "二十号"
-
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr "二十一号"
-
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr "二十二号"
-
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr "二十三号"
-
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr "二十四号"
-
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-# calendar/gui/print.c:429
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr "二十五号"
-
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr "二十六号"
-
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr "二十七号"
-
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr "二十八号"
-
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr "二十九号"
-
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-# calendar/gui/print.c:430
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr "三十号"
-
-# calendar/gui/print.c:431
-# calendar/gui/print.c:431
-# calendar/gui/print.c:431
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "三十一号"
-
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
msgid "Su"
msgstr "日"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
msgid "Mo"
msgstr "一"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
msgid "Tu"
msgstr "二"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# calendar/gui/print.c:498
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
msgid "We"
msgstr "三"
# calendar/gui/print.c:499
# calendar/gui/print.c:499
# calendar/gui/print.c:499
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
msgid "Th"
msgstr "四"
# calendar/gui/print.c:499
# calendar/gui/print.c:499
# calendar/gui/print.c:499
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
msgid "Fr"
msgstr "五"
# calendar/gui/print.c:499
# calendar/gui/print.c:499
# calendar/gui/print.c:499
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
msgid "Sa"
msgstr "六"
@@ -10829,21 +11062,21 @@ msgstr "六"
# calendar/gui/print.c:1819
# calendar/gui/print.c:1819
#. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
msgid "Selected day (%a %b %d %Y)"
msgstr "选中的日期 (%Y年%b月%d日 %a)"
# calendar/gui/print.c:1844 calendar/gui/print.c:1848
# calendar/gui/print.c:1844 calendar/gui/print.c:1848
# calendar/gui/print.c:1844 calendar/gui/print.c:1848
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
msgid "%a %b %d"
msgstr "%b月%d日 %a"
# calendar/gui/print.c:1845
# calendar/gui/print.c:1845
# calendar/gui/print.c:1845
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
msgid "%a %d %Y"
msgstr "%Y年%d日 %a"
@@ -10853,15 +11086,15 @@ msgstr "%Y年%d日 %a"
# calendar/gui/print.c:1852
# calendar/gui/print.c:1849 calendar/gui/print.c:1851
# calendar/gui/print.c:1852
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
msgid "%a %b %d %Y"
msgstr "%Y年%b月%d日 %a"
# calendar/gui/print.c:1856
# calendar/gui/print.c:1856
# calendar/gui/print.c:1856
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
#, c-format
msgid "Selected week (%s - %s)"
msgstr "选中的周 (%s - %s)"
@@ -10870,7 +11103,7 @@ msgstr "选中的周 (%s - %s)"
# calendar/gui/print.c:1864
# calendar/gui/print.c:1864
#. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
msgid "Selected month (%b %Y)"
msgstr "选中的月 (%Y年%b月)"
@@ -10878,21 +11111,21 @@ msgstr "选中的月 (%Y年%b月)"
# calendar/gui/print.c:1871
# calendar/gui/print.c:1871
#. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
msgid "Selected year (%Y)"
msgstr "选中的年 (%Y年)"
# calendar/gui/print.c:2205
# calendar/gui/print.c:2205
# calendar/gui/print.c:2205
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
msgid "Task"
msgstr "任务"
# calendar/gui/print.c:2262
# calendar/gui/print.c:2262
# calendar/gui/print.c:2262
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
#, c-format
msgid "Status: %s"
msgstr "状态:%s"
@@ -10900,7 +11133,7 @@ msgstr "状态:%s"
# calendar/gui/print.c:2280
# calendar/gui/print.c:2280
# calendar/gui/print.c:2280
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
#, c-format
msgid "Priority: %s"
msgstr "优先级:%s"
@@ -10908,7 +11141,7 @@ msgstr "优先级:%s"
# calendar/gui/print.c:2294
# calendar/gui/print.c:2294
# calendar/gui/print.c:2294
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率:%i"
@@ -10916,7 +11149,7 @@ msgstr "完成率:%i"
# calendar/gui/print.c:2306
# calendar/gui/print.c:2306
# calendar/gui/print.c:2306
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2370
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
@@ -10924,7 +11157,7 @@ msgstr "URL:%s"
# calendar/gui/print.c:2320
# calendar/gui/print.c:2320
# calendar/gui/print.c:2320
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
#, c-format
msgid "Categories: %s"
msgstr "类别:%s"
@@ -10932,17 +11165,10 @@ msgstr "类别:%s"
# calendar/gui/print.c:2331
# calendar/gui/print.c:2331
# calendar/gui/print.c:2331
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
msgid "Contacts: "
msgstr "联系人:"
-# calendar/gui/print.c:2386
-# calendar/gui/print.c:2386
-# calendar/gui/print.c:2386
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "打印日历"
-
# calendar/gui/print.c:2477 calendar/gui/print.c:2569
# mail/mail-callbacks.c:2364 my-evolution/e-summary.c:619
# ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
@@ -10952,45 +11178,37 @@ msgstr "打印日历"
# calendar/gui/print.c:2477 calendar/gui/print.c:2569
# mail/mail-callbacks.c:2597 my-evolution/e-summary.c:605
# ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:586 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:616
msgid "Print Preview"
msgstr "打印预览"
# calendar/gui/print.c:2506
# calendar/gui/print.c:2506
# calendar/gui/print.c:2506
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
msgid "Print Item"
msgstr "打印项"
# calendar/gui/print.c:2587
# calendar/gui/print.c:2587
# calendar/gui/print.c:2587
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
msgid "Print Setup"
msgstr "打印设置"
-# calendar/gui/tasks-control-factory.c:75
-# calendar/gui/tasks-control-factory.c:75
-# calendar/gui/tasks-control-factory.c:75
-#: 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-control.c:126
# calendar/gui/tasks-control.c:126
# calendar/gui/tasks-control.c:137
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
msgid "The URI of the tasks folder to display"
msgstr "要显示的任务文件夹的 URI"
# mail/mail-callbacks.c:2135
# mail/mail-callbacks.c:2254
# calendar/gui/tasks-control.c:434
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:472
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -11004,138 +11222,78 @@ msgstr ""
# mail/mail-callbacks.c:2142
# mail/mail-callbacks.c:2261
# calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:479
msgid "Do not ask me again."
msgstr "不要再次询问。"
# addressbook/printing/e-contact-print.c:1111
# addressbook/printing/e-contact-print.c:1111
# addressbook/printing/e-contact-print.c:1115
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:615
msgid "Print Tasks"
msgstr "打印任务"
-# calendar/gui/tasks-migrate.c:105
-# calendar/gui/tasks-migrate.c:105
-# calendar/gui/tasks-migrate.c:105
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"Evolution 已经获得了您日历文件夹中的任务并自动将它们迁移到了新任务文件夹。"
-
-# calendar/gui/tasks-migrate.c:108
-# calendar/gui/tasks-migrate.c:108
-# calendar/gui/tasks-migrate.c:108
-#: 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"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"Evolution 已经试图从您的日志文件夹中获取任务并把它们迁移到新任务文件夹。\n"
-"有些任务无法迁移,所以该过程应在将来再次尝试。"
-
-# calendar/gui/tasks-migrate.c:120
-# calendar/gui/tasks-migrate.c:120
-# calendar/gui/tasks-migrate.c:120
-#: 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 "无法打开“%s”;不会从日志文件夹迁移项目到任务文件夹。"
-
-# calendar/gui/tasks-migrate.c:133
-# calendar/gui/tasks-migrate.c:133
-# calendar/gui/tasks-migrate.c:133
-#: 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 "不支持用于装入“%s”的方法;不会从日志文件夹迁移项目到任务文件夹。"
-
# calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
# calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
# calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:388
msgid "SMTWTFS"
msgstr "SMTWTFS"
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr "将 iCalendar 文件导入 Evolution 的车间"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar intelligent importer"
+msgstr "Evolution 日历 iTip/iMip 查看器"
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-msgid "Imports iCalendar files into Evolution"
-msgstr "将 iCalendar 文件导入 Evolution"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution iCalendar importer"
+msgstr "Evolution 日历 iTip/iMip 查看器"
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr "将 vCalendar 文件导入 Evolution"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#, fuzzy
+msgid "Evolution vCalendar importer"
+msgstr "Evolution 日历 iTip/iMip 查看器"
-# camel/providers/local/camel-mbox-folder.c:347
-# camel/providers/local/camel-mbox-folder.c:379
-# camel/providers/local/camel-mbox-folder.c:391
-# camel/providers/local/camel-spool-folder.c:595
-# camel/providers/local/camel-spool-folder.c:627
-# camel/providers/local/camel-spool-folder.c:639
-# camel/providers/local/camel-mbox-folder.c:347
-# camel/providers/local/camel-mbox-folder.c:379
-# camel/providers/local/camel-mbox-folder.c:391
-# camel/providers/local/camel-spool-folder.c:595
-# camel/providers/local/camel-spool-folder.c:627
-# camel/providers/local/camel-spool-folder.c:639
-# camel/providers/local/camel-mbox-folder.c:347
-# camel/providers/local/camel-mbox-folder.c:379
-# camel/providers/local/camel-mbox-folder.c:391
-# camel/providers/local/camel-spool-folder.c:595
-# camel/providers/local/camel-spool-folder.c:627
-# camel/providers/local/camel-spool-folder.c:639
-#: calendar/importers/icalendar-importer.c:168
-#, c-format
-msgid "Can't get storage list from registry: %s"
-msgstr "无法从注册表获取存储列表:%s"
+# calendar/gui/e-itip-control.glade.h:4
+# calendar/gui/e-itip-control.glade.h:4
+# calendar/gui/e-itip-control.glade.h:4
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#, fuzzy
+msgid "iCalendar files (.ics)"
+msgstr "日历消息"
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-#: calendar/importers/icalendar-importer.c:180
-#, c-format
-msgid "Can't call getFolderAtPath on storage: %s"
-msgstr "无法对存储调用 getFolderAtPath:%s"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
+msgstr ""
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:404
msgid "Reminder!!"
msgstr "提醒!!"
# calendar/gui/e-itip-control.glade.h:4
# calendar/gui/e-itip-control.glade.h:4
# calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:638
msgid "Calendar Events"
msgstr "日历事件"
# importers/pine-importer.c:663
# importers/pine-importer.c:663
# importers/pine-importer.c:663
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:663
msgid ""
"Evolution has found Gnome Calendar files.\n"
"Would you like to import them into Evolution?"
@@ -11149,10 +11307,14 @@ msgstr ""
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:670
msgid "Gnome Calendar"
msgstr "Gnome 日历"
+#: calendar/pcs/cal-backend-file.c:311
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
# calendar/pcs/query.c:246
# calendar/pcs/query.c:246
# calendar/pcs/query.c:246
@@ -13745,42 +13907,58 @@ msgstr ""
# camel/camel-cipher-context.c:171
# camel/camel-cipher-context.c:169
# camel/camel-cipher-context.c:169
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
msgid "Signing is not supported by this cipher"
msgstr "该密码不支持签名"
# camel/camel-cipher-context.c:251
# camel/camel-cipher-context.c:249
# camel/camel-cipher-context.c:249
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
msgid "Verifying is not supported by this cipher"
msgstr "该密码不支持验证"
# camel/camel-cipher-context.c:294
# camel/camel-cipher-context.c:292
# camel/camel-cipher-context.c:292
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
msgid "Encryption is not supported by this cipher"
msgstr "该密码不支持加密"
# camel/camel-cipher-context.c:336
# camel/camel-cipher-context.c:334
# camel/camel-cipher-context.c:334
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
msgid "Decryption is not supported by this cipher"
msgstr "该密码不支持解密"
+# camel/camel-cipher-context.c:336
+# camel/camel-cipher-context.c:334
+# camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:342
+#, fuzzy
+msgid "You may not import keys with this cipher"
+msgstr "该密码不支持解密"
+
+# camel/camel-cipher-context.c:336
+# camel/camel-cipher-context.c:334
+# camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:374
+#, fuzzy
+msgid "You may not export keys with this cipher"
+msgstr "该密码不支持解密"
+
# mail/mail-ops.c:1870
# mail/mail-ops.c:1872
# camel/camel-data-cache.c:159
-#: camel/camel-data-cache.c:169
+#: camel/camel-data-cache.c:133
msgid "Unable to create cache path"
msgstr "无法创建缓冲路径"
# camel/providers/imap/camel-imap-message-cache.c:154
# camel/providers/imap/camel-imap-message-cache.c:154
# camel/camel-data-cache.c:426
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:370
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "无法删除缓冲条目:%s:%s"
@@ -13835,17 +14013,61 @@ msgstr "正在存储文件夹“%s”"
msgid "You must be working online to complete this operation"
msgstr "您必需在线工作以便完成该操作"
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-process.c:48
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "缓冲邮件 %s 失败: %s"
+
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#: camel/camel-process.c:92
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "缓冲邮件 %s 失败: %s"
+
+# camel/providers/imap/camel-imap-folder.c:194
+# camel/providers/imap/camel-imap-folder.c:194
+# camel/providers/imap/camel-imap-folder.c:197
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "无法阅读来自 %s 的欢迎信息:%s"
+
# camel/camel-filter-driver.c:553 camel/camel-filter-driver.c:562
# camel/camel-filter-driver.c:602 camel/camel-filter-driver.c:611
# camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
msgid "Syncing folders"
msgstr "同步文件夹"
# camel/camel-filter-driver.c:921
# camel/camel-filter-driver.c:970
# camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解析过滤规则错误: %s: %s"
@@ -13853,7 +14075,7 @@ msgstr "解析过滤规则错误: %s: %s"
# camel/camel-filter-driver.c:927
# camel/camel-filter-driver.c:976
# camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "执行过滤规则错误: %s: %s"
@@ -13861,21 +14083,21 @@ msgstr "执行过滤规则错误: %s: %s"
# camel/camel-filter-driver.c:664
# camel/camel-filter-driver.c:713
# camel/camel-filter-driver.c:865
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
msgid "Unable to open spool folder"
msgstr "无法打开脱机文件夹"
# camel/camel-filter-driver.c:673
# camel/camel-filter-driver.c:722
# camel/camel-filter-driver.c:874
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
msgid "Unable to process spool folder"
msgstr "无法处理脱机文件夹"
# camel/camel-filter-driver.c:688
# camel/camel-filter-driver.c:737
# camel/camel-filter-driver.c:889
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "获取邮件 %d (%d%%)"
@@ -13883,14 +14105,14 @@ msgstr "获取邮件 %d (%d%%)"
# camel/camel-filter-driver.c:692
# camel/camel-filter-driver.c:741
# camel/camel-filter-driver.c:893
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
msgid "Cannot open message"
msgstr "无法打开消息"
# camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
# camel/camel-filter-driver.c:742 camel/camel-filter-driver.c:754
# camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
#, c-format
msgid "Failed on message %d"
msgstr "在消息 %d 失败"
@@ -13898,14 +14120,14 @@ msgstr "在消息 %d 失败"
# camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
# camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
# camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
msgid "Syncing folder"
msgstr "正在同步文件夹"
# camel/camel-filter-driver.c:789
# camel/camel-filter-driver.c:838
# camel/camel-filter-driver.c:988
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
#, c-format
msgid "Getting message %d of %d"
msgstr "正在获取第 %d 个消息,共 %d 个"
@@ -13913,7 +14135,7 @@ msgstr "正在获取第 %d 个消息,共 %d 个"
# camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
# camel/camel-filter-driver.c:843 camel/camel-filter-driver.c:861
# camel/camel-filter-driver.c:1003
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
#, c-format
msgid "Failed at message %d of %d"
msgstr "在第 %d 个消息失败,共 %d 个"
@@ -13921,14 +14143,14 @@ msgstr "在第 %d 个消息失败,共 %d 个"
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
# camel/camel-filter-search.c:126
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
msgid "Failed to retrieve message"
msgstr "检索消息失败。"
# shell/e-shell.c:1886
# shell/e-shell.c:1886
# shell/e-shell.c:1887
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
#, fuzzy
msgid "Invalid arguments to (system-flag)"
msgstr "无效参数"
@@ -13936,49 +14158,15 @@ msgstr "无效参数"
# shell/e-shell.c:1886
# shell/e-shell.c:1886
# shell/e-shell.c:1887
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
#, fuzzy
msgid "Invalid arguments to (user-tag)"
msgstr "无效参数"
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-filter-search.c:514
-#, fuzzy, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "缓冲邮件 %s 失败: %s"
-
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-# camel/providers/imap/camel-imap-message-cache.c:256
-# camel/providers/imap/camel-imap-message-cache.c:313
-# camel/providers/imap/camel-imap-message-cache.c:344
-# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-filter-search.c:550
-#, fuzzy, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "缓冲邮件 %s 失败: %s"
-
# camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
# camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
# camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "执行过滤规则搜索错误: %s: %s"
@@ -13986,7 +14174,7 @@ msgstr "执行过滤规则搜索错误: %s: %s"
# camel/camel-folder-search.c:332
# camel/camel-folder-search.c:332
# camel/camel-folder-search.c:332
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -13998,7 +14186,7 @@ msgstr ""
# camel/camel-folder-search.c:342
# camel/camel-folder-search.c:342
# camel/camel-folder-search.c:342
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -14010,14 +14198,14 @@ msgstr ""
# camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
# camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
# camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
msgid "(match-all) requires a single bool result"
msgstr "(match-all) 需要一个布尔结果"
# camel/camel-folder-search.c:638
# camel/camel-folder-search.c:638
# camel/camel-folder-search.c:638
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
#, c-format
msgid "Performing query on unknown header: %s"
msgstr "正在对未知的头进行查询: %s"
@@ -14060,7 +14248,7 @@ msgstr "正在移动邮件"
msgid "Copying messages"
msgstr "正在复制邮件"
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -14068,15 +14256,15 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
msgid "Failed to parse gpg userid hint."
msgstr ""
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
msgid "Failed to parse gpg passphrase request."
msgstr ""
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -14086,20 +14274,20 @@ msgstr ""
# mail/mail-send-recv.c:533
# mail/mail-send-recv.c:541
# mail/mail-send-recv.c:541
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1249
+#: camel/camel-gpg-context.c:1356 camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1488 mail/mail-send-recv.c:565
msgid "Cancelled."
msgstr "已取消"
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr ""
# camel/providers/pop3/camel-pop3-store.c:563
# camel/providers/pop3/camel-pop3-store.c:563
# camel/providers/pop3/camel-pop3-store.c:563
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
#, fuzzy, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "来自 POP 服务器的意外应答: %s"
@@ -14107,14 +14295,14 @@ msgstr "来自 POP 服务器的意外应答: %s"
# tools/evolution-addressbook-import.c:80
# tools/evolution-addressbook-import.c:80
# tools/evolution-addressbook-import.c:80
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
msgid "No data provided"
msgstr "未提供数据"
# camel/camel-pgp-context.c:1169
# camel/camel-pgp-context.c:1169
# camel/camel-pgp-context.c:1169
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
#, fuzzy
msgid "Failed to encrypt: No valid recipients specified."
msgstr "无法加密该邮件: 没有指明收件人"
@@ -14131,10 +14319,10 @@ msgstr "无法加密该邮件: 没有指明收件人"
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-gpg-context.c:1082
+#: camel/camel-gpg-context.c:1125
#, fuzzy, c-format
msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
"\n"
"%.*s"
msgstr "缓冲邮件 %s 失败: %s"
@@ -14151,15 +14339,16 @@ msgstr "缓冲邮件 %s 失败: %s"
# camel/providers/imap/camel-imap-message-cache.c:313
# camel/providers/imap/camel-imap-message-cache.c:344
# camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-gpg-context.c:1088
+#: camel/camel-gpg-context.c:1131
#, fuzzy, c-format
-msgid "Failed to GPG %s message: %s\n"
+msgid "Failed to GPG %s: %s\n"
msgstr "缓冲邮件 %s 失败: %s"
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
-#: camel/camel-gpg-context.c:1197
+#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1533
+#: camel/camel-gpg-context.c:1583
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "执行 gpg 失败:%s"
@@ -14167,16 +14356,16 @@ msgstr "执行 gpg 失败:%s"
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1348
+#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1452
+#: camel/camel-gpg-context.c:1479 camel/camel-gpg-context.c:1509
msgid "Failed to execute gpg."
msgstr "执行 gpg 失败。"
# camel/camel-pgp-context.c:970
# camel/camel-pgp-context.c:970
# camel/camel-pgp-context.c:970
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1333
#, fuzzy, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "无法验证该邮件:无法创建临时文件: %s"
@@ -14216,8 +14405,7 @@ msgstr "无法锁定“%s”"
# camel/camel-lock.c:91 camel/camel-lock.c:110
# camel/camel-lock.c:91 camel/camel-lock.c:110
# camel/camel-lock.c:91 camel/camel-lock.c:110
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "无法为 %s 创建锁定文件: %s"
@@ -14225,7 +14413,7 @@ msgstr "无法为 %s 创建锁定文件: %s"
# camel/camel-lock.c:150
# camel/camel-lock.c:150
# camel/camel-lock.c:150
-#: camel/camel-lock.c:152
+#: camel/camel-lock.c:154
#, c-format
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
@@ -14233,7 +14421,7 @@ msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
# camel/camel-lock.c:204
# camel/camel-lock.c:204
# camel/camel-lock.c:204
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "用 fcntl(2) 获取锁失败: %s"
@@ -14241,7 +14429,7 @@ msgstr "用 fcntl(2) 获取锁失败: %s"
# camel/camel-lock.c:266
# camel/camel-lock.c:266
# camel/camel-lock.c:266
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "用 flock(2) 获取锁失败: %s"
@@ -14257,7 +14445,7 @@ msgstr "无法检查邮件文件 %s: %s"
# camel/camel-movemail.c:121
# camel/camel-movemail.c:121
# camel/camel-movemail.c:121
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
#, c-format
msgid "Could not open mail file %s: %s"
msgstr "无法打开邮件文件 %s: %s"
@@ -14265,7 +14453,7 @@ msgstr "无法打开邮件文件 %s: %s"
# camel/camel-movemail.c:129
# camel/camel-movemail.c:129
# camel/camel-movemail.c:129
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "无法打开临时邮件文件 %s: %s"
@@ -14273,7 +14461,7 @@ msgstr "无法打开临时邮件文件 %s: %s"
# camel/camel-movemail.c:158
# camel/camel-movemail.c:158
# camel/camel-movemail.c:158
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr "将邮件存储到临时文件 %s 失败: %s"
@@ -14281,7 +14469,7 @@ msgstr "将邮件存储到临时文件 %s 失败: %s"
# camel/camel-movemail.c:188
# camel/camel-movemail.c:188
# camel/camel-movemail.c:188
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
#, c-format
msgid "Could not create pipe: %s"
msgstr "无法创建管道: %s"
@@ -14289,7 +14477,7 @@ msgstr "无法创建管道: %s"
# camel/camel-movemail.c:200
# camel/camel-movemail.c:200
# camel/camel-movemail.c:200
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
#, c-format
msgid "Could not fork: %s"
msgstr "无法创建进程:%s"
@@ -14297,7 +14485,7 @@ msgstr "无法创建进程:%s"
# camel/camel-movemail.c:238
# camel/camel-movemail.c:238
# camel/camel-movemail.c:238
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
#, c-format
msgid "Movemail program failed: %s"
msgstr "移动邮件程序失败: %s"
@@ -14305,14 +14493,14 @@ msgstr "移动邮件程序失败: %s"
# camel/camel-movemail.c:239
# camel/camel-movemail.c:239
# camel/camel-movemail.c:239
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
msgid "(Unknown error)"
msgstr "(未知的错误)"
# camel/camel-movemail.c:262
# camel/camel-movemail.c:262
# camel/camel-movemail.c:262
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
#, c-format
msgid "Error reading mail file: %s"
msgstr "阅读邮件文件错误: %s"
@@ -14320,7 +14508,7 @@ msgstr "阅读邮件文件错误: %s"
# camel/camel-movemail.c:273
# camel/camel-movemail.c:273
# camel/camel-movemail.c:273
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "写入邮件临时文件错误: %s"
@@ -14328,7 +14516,7 @@ msgstr "写入邮件临时文件错误: %s"
# camel/camel-movemail.c:466 camel/camel-movemail.c:533
# camel/camel-movemail.c:466 camel/camel-movemail.c:533
# camel/camel-movemail.c:466 camel/camel-movemail.c:533
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
#, c-format
msgid "Error copying mail temp file: %s"
msgstr "复制邮件临时文件错误: %s"
@@ -14349,21 +14537,21 @@ msgstr "解密 MIME 部分失败:解析错误"
# camel/camel-pgp-mime.c:310
# camel/camel-pgp-mime.c:310
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
msgid "This is a digitally signed message part"
msgstr "这是消息的数字签名部分"
# addressbook/gui/widgets/e-addressbook-util.c:41
# addressbook/gui/widgets/e-addressbook-util.c:41
# addressbook/gui/widgets/e-addressbook-util.c:41
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
msgid "parse error"
msgstr "解析错误"
# camel/camel-provider.c:130
# camel/camel-provider.c:130
# camel/camel-provider.c:130
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
msgstr "无法装入 %s: 本系统不支持模块装入。"
@@ -14371,7 +14559,7 @@ msgstr "无法装入 %s: 本系统不支持模块装入。"
# camel/camel-provider.c:139
# camel/camel-provider.c:139
# camel/camel-provider.c:139
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
#, c-format
msgid "Could not load %s: %s"
msgstr "无法装入 %s: %s"
@@ -14379,7 +14567,7 @@ msgstr "无法装入 %s: %s"
# camel/camel-provider.c:147
# camel/camel-provider.c:147
# camel/camel-provider.c:147
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "无法装入 %s: 模块中没有初始化代码。"
@@ -14460,14 +14648,14 @@ msgstr "如果服务器支持的话,该选项将用安全 CRAM-MD5 密码连
# camel/camel-sasl-digest-md5.c:43
# camel/camel-sasl-digest-md5.c:43
# camel/camel-sasl-digest-md5.c:43
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
# camel/camel-sasl-digest-md5.c:45
# camel/camel-sasl-digest-md5.c:45
# camel/camel-sasl-digest-md5.c:45
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
@@ -14476,63 +14664,163 @@ msgstr "如果服务器支持的话,该选项将用安全 DIGEST-MD5 密码连
# camel/camel-sasl-digest-md5.c:810
# camel/camel-sasl-digest-md5.c:810
# camel/camel-sasl-digest-md5.c:810
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
msgid "Server challenge too long (>2048 octets)\n"
msgstr "服务器质询过长 (>2048张八开纸)\n"
# camel/camel-sasl-digest-md5.c:819
# camel/camel-sasl-digest-md5.c:819
# camel/camel-sasl-digest-md5.c:819
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
msgid "Server challenge invalid\n"
msgstr "服务器质询无效\n"
# camel/camel-sasl-digest-md5.c:825
# camel/camel-sasl-digest-md5.c:825
# camel/camel-sasl-digest-md5.c:825
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
msgstr "服务器质询含有无效的“品质保护”标志\n"
# camel/camel-sasl-digest-md5.c:847
# camel/camel-sasl-digest-md5.c:847
# camel/camel-sasl-digest-md5.c:847
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
msgid "Server response did not contain authorization data\n"
msgstr "服务器应答不含有认证数据\n"
# camel/camel-sasl-digest-md5.c:865
# camel/camel-sasl-digest-md5.c:865
# camel/camel-sasl-digest-md5.c:865
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
msgid "Server response contained incomplete authorization data\n"
msgstr "服务器应达含有不完整的认证数据\n"
# camel/camel-sasl-digest-md5.c:875
# camel/camel-sasl-digest-md5.c:875
# camel/camel-sasl-digest-md5.c:875
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
msgid "Server response does not match\n"
msgstr "服务器应答不匹配\n"
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
+msgstr ""
+
+# camel/camel-sasl-kerberos4.c:42
+# camel/camel-sasl-kerberos4.c:42
+# camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-gssapi.c:50
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr "该选项将用 Kerberos 4 认证连接到服务器。"
+
+#: camel/camel-sasl-gssapi.c:148
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
+msgstr ""
+
+# camel/camel-sasl-kerberos4.c:218
+# camel/providers/imap/camel-imap-store.c:495
+# camel/camel-sasl-kerberos4.c:218
+# camel/providers/imap/camel-imap-store.c:495
+# camel/camel-sasl-kerberos4.c:218
+# camel/providers/imap/camel-imap-store.c:495
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr "来自服务器的无效认证应答。"
+
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/camel-sasl-gssapi.c:213
+#, fuzzy, c-format
+msgid "Failed to resolve host `%s': %s"
+msgstr "缓冲邮件 %s 失败: %s"
+
+# shell/evolution-shell-component.c:1021
+# shell/evolution-shell-component.c:1021
+# shell/evolution-shell-component.c:1034
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "不支持的类型"
+
# camel/camel-sasl-kerberos4.c:40
# camel/camel-sasl-kerberos4.c:40
# camel/camel-sasl-kerberos4.c:40
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:41
msgid "Kerberos 4"
msgstr "Kerberos 4"
# camel/camel-sasl-kerberos4.c:42
# camel/camel-sasl-kerberos4.c:42
# camel/camel-sasl-kerberos4.c:42
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
msgid "This option will connect to the server using Kerberos 4 authentication."
msgstr "该选项将用 Kerberos 4 认证连接到服务器。"
# camel/camel-sasl-kerberos4.c:161
# camel/camel-sasl-kerberos4.c:161
# camel/camel-sasl-kerberos4.c:161
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
#, c-format
msgid ""
"Could not get Kerberos ticket:\n"
@@ -14541,17 +14829,6 @@ msgstr ""
"无法获取 Kerberos 标签:\n"
"%s"
-# camel/camel-sasl-kerberos4.c:218
-# camel/providers/imap/camel-imap-store.c:495
-# camel/camel-sasl-kerberos4.c:218
-# camel/providers/imap/camel-imap-store.c:495
-# camel/camel-sasl-kerberos4.c:218
-# camel/providers/imap/camel-imap-store.c:495
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "来自服务器的无效认证应答。"
-
# camel/camel-sasl-login.c:32
# camel/camel-sasl-login.c:32
# my-evolution/Locations.h:1241
@@ -14628,7 +14905,7 @@ msgstr "以非 pop 源进行 SMTP 之前的 POP 授权"
# camel/camel-search-private.c:113
# camel/camel-search-private.c:113
# camel/camel-search-private.c:113
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "常规表达式编译失败: %s: %s"
@@ -14660,7 +14937,7 @@ msgstr "URL “%s” 需要路径组件"
# camel/camel-service.c:611
# camel/camel-service.c:614
# camel/camel-service.c:614
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
#, c-format
msgid "Resolving: %s"
msgstr "正在解析: %s"
@@ -14668,7 +14945,7 @@ msgstr "正在解析: %s"
# camel/camel-service.c:638
# camel/camel-service.c:641
# camel/camel-service.c:641
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:887
#, c-format
msgid "Failure in name lookup: %s"
msgstr "域名寻找失败: %s"
@@ -14676,7 +14953,7 @@ msgstr "域名寻找失败: %s"
# camel/camel-service.c:663
# camel/camel-service.c:666
# camel/camel-service.c:666
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "主机寻找失败: %s: 没有找到主机"
@@ -14684,7 +14961,7 @@ msgstr "主机寻找失败: %s: 没有找到主机"
# camel/camel-service.c:665
# camel/camel-service.c:668
# camel/camel-service.c:668
-#: camel/camel-service.c:801
+#: camel/camel-service.c:803
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "主机寻找失败: %s: 未知的原因"
@@ -14692,21 +14969,21 @@ msgstr "主机寻找失败: %s: 未知的原因"
# camel/camel-service.c:611
# camel/camel-service.c:614
# camel/camel-service.c:614
-#: camel/camel-service.c:851
+#: camel/camel-service.c:853
msgid "Resolving address"
msgstr "正在解析地址"
# camel/camel-service.c:663
# camel/camel-service.c:666
# camel/camel-service.c:666
-#: camel/camel-service.c:913
+#: camel/camel-service.c:915
msgid "Host lookup failed: host not found"
msgstr "主机寻找失败:没有找到主机"
# camel/camel-service.c:665
# camel/camel-service.c:668
# camel/camel-service.c:668
-#: camel/camel-service.c:916
+#: camel/camel-service.c:918
msgid "Host lookup failed: unknown reason"
msgstr "主机寻找失败:未知的原因"
@@ -14727,7 +15004,7 @@ msgstr "关于将读入邮件作为对另一组文件夹的查询"
# camel/camel-session.c:346 camel/camel-session.c:415
# camel/camel-session.c:346 camel/camel-session.c:415
# camel/camel-session.c:346 camel/camel-session.c:415
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
#, c-format
msgid "No provider available for protocol `%s'"
msgstr "协议“%s”没有可用的提供者"
@@ -14735,7 +15012,7 @@ msgstr "协议“%s”没有可用的提供者"
# camel/camel-session.c:532
# camel/camel-session.c:532
# camel/camel-session.c:532
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -14747,7 +15024,7 @@ msgstr ""
# camel/camel-smime-context.c:173
# camel/camel-smime-context.c:173
# camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
#, c-format
msgid "Please enter your password for %s"
msgstr "情您为 %s 输入密码"
@@ -14755,14 +15032,14 @@ msgstr "情您为 %s 输入密码"
# camel/camel-smime-context.c:203
# camel/camel-smime-context.c:203
# camel/camel-smime-context.c:203
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
msgid "Please indicate the nickname of a certificate to sign with."
msgstr "请指出要签署的证书的绰号。"
# camel/camel-smime-context.c:209
# camel/camel-smime-context.c:209
# camel/camel-smime-context.c:209
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
#, c-format
msgid "The signature certificate for \"%s\" does not exist."
msgstr "为“%s”提供的签名证书不存在。"
@@ -14770,7 +15047,7 @@ msgstr "为“%s”提供的签名证书不存在。"
# camel/camel-smime-context.c:249
# camel/camel-smime-context.c:249
# camel/camel-smime-context.c:249
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
#, c-format
msgid "The encryption certificate for \"%s\" does not exist."
msgstr "为“%s”提供的加密证书不存在。"
@@ -14781,8 +15058,8 @@ msgstr "为“%s”提供的加密证书不存在。"
# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
#, c-format
msgid "Failed to find certificate for \"%s\"."
msgstr "为“%s”寻找证书失败。"
@@ -14790,190 +15067,190 @@ msgstr "为“%s”寻找证书失败。"
# camel/camel-smime-context.c:556
# camel/camel-smime-context.c:556
# camel/camel-smime-context.c:556
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
msgid "Failed to find a common bulk algorithm."
msgstr "寻找普通主体算法失败。"
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
msgid "Failed to decode message."
msgstr "解码邮件失败。"
# camel/camel-smime-context.c:855
# camel/camel-smime-context.c:855
# camel/camel-smime-context.c:855
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
msgid "Failed to verify certificates."
msgstr "验证证书失败。"
# camel/camel-store.c:220
# camel/camel-store.c:220
# camel/camel-store.c:220
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
msgid "Cannot get folder: Invalid operation on this store"
msgstr "无法获取文件夹: 对该存储的无效操作"
# camel/camel-store.c:282
# camel/camel-store.c:282
# camel/camel-store.c:282
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
msgid "Cannot create folder: Invalid operation on this store"
msgstr "无法创建文件夹: 对该存储的无效操作"
# camel/camel-smime-context.c:855
# camel/camel-smime-context.c:855
# camel/camel-smime-context.c:855
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
msgid "Unable to get issuer's certificate"
msgstr "无法获取发行者的证书"
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
msgid "Unable to get Certificate Revocation List"
msgstr ""
# camel/camel-smime-context.c:855
# camel/camel-smime-context.c:855
# camel/camel-smime-context.c:855
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
msgid "Unable to decrypt certificate signature"
msgstr "无法解密认证签名"
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
msgid "Unable to decrypt Certificate Revocation List signature"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
msgid "Unable to decode issuer's public key"
msgstr "无法对发行者的公钥进行解码"
# mail/mail-account-gui.c:962
# mail/mail-account-gui.c:962
# mail/mail-account-gui.c:959
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
msgid "Certificate signature failure"
msgstr "证书签名失败"
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
msgid "Certificate Revocation List signature failure"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
msgid "Certificate not yet valid"
msgstr "证书尚且无效"
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:104
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
msgid "Certificate has expired"
msgstr "证书已过期"
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
msgid "CRL not yet valid"
msgstr "CRL 尚且无效"
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
msgid "CRL has expired"
msgstr "CRL 已过期"
# shell/e-shell-importer.c:474
# shell/e-shell-importer.c:474
# shell/e-shell-importer.c:485
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
msgid "Error in CRL"
msgstr "CRL 错误"
# calendar/gui/e-meeting-time-sel.c:430
# calendar/gui/e-meeting-time-sel.c:433
# calendar/gui/e-meeting-time-sel.c:433
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
msgid "Out of memory"
msgstr "内存耗尽"
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
msgid "Zero-depth self-signed certificate"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
msgid "Self-signed certificate in chain"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
msgid "Unable to get issuer's certificate locally"
msgstr "无法在本地获取发行者的证书"
# camel/camel-smime-context.c:855
# camel/camel-smime-context.c:855
# camel/camel-smime-context.c:855
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
#, fuzzy
msgid "Unable to verify leaf signature"
msgstr "验证证书失败。"
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
msgid "Certificate chain too long"
msgstr "证书链过长"
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:104
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
msgid "Certificate Revoked"
msgstr "证书已撤销"
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
msgid "Invalid Certificate Authority (CA)"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
msgid "Path length exceeded"
msgstr "超长的路径长度"
# shell/evolution-shell-component.c:1013
# shell/evolution-shell-component.c:1013
# shell/evolution-shell-component.c:1026
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
msgid "Invalid purpose"
msgstr "无效目的"
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:104
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
msgid "Certificate untrusted"
msgstr "不信任的证书"
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:104
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
msgid "Certificate rejected"
msgstr "已拒绝的证书"
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
msgid "Subject/Issuer mismatch"
msgstr "主题/发行者不匹配"
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
msgid "AKID/SKID mismatch"
msgstr "AKID/SKID 不匹配"
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
msgid "AKID/Issuer serial mismatch"
msgstr "AKID/发行者序列号不匹配"
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
msgid "Key usage does not support certificate signing"
msgstr "密钥不支持证书签名"
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
msgid "Error in application verification"
msgstr "应用程序验证错误"
# camel/camel-tcp-stream-ssl.c:438
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
#, c-format
msgid ""
"Issuer: %s\n"
@@ -14987,19 +15264,19 @@ msgstr ""
"签名: %s"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
msgid "GOOD"
msgstr "好"
# camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
msgid "BAD"
msgstr "坏"
# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
# camel/camel-tcp-stream-openssl.c:524
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
#, c-format
msgid ""
"Bad certificate from %s:\n"
@@ -15022,7 +15299,7 @@ msgstr ""
# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
# camel/camel-tcp-stream-ssl.c:447
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:833
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -15037,14 +15314,14 @@ msgstr ""
"\n"
"您希望接受吗?"
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:877
#, c-format
msgid ""
"Certificate problem: %s\n"
"Issuer: %s"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:929
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -15054,7 +15331,7 @@ msgstr ""
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:104
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:947
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -15066,7 +15343,7 @@ msgstr ""
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:95
# mail/mail-config.glade.h:104
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:964
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -15078,7 +15355,7 @@ msgstr ""
# camel/camel-url.c:288
# camel/camel-url.c:288
# camel/camel-url.c:288
-#: camel/camel-url.c:288
+#: camel/camel-url.c:290
#, c-format
msgid "Could not parse URL `%s'"
msgstr "无法解析 URL “%s”"
@@ -15102,14 +15379,14 @@ msgstr "在 %2$s 中没有消息 %1$s"
# camel/providers/imap/camel-imap-provider.c:45
# camel/providers/imap/camel-imap-provider.c:45
# camel/providers/imap/camel-imap-provider.c:45
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "无法将消息移动或复制到虚拟文件夹中"
# camel/camel-vee-store.c:258
# camel/camel-vee-store.c:258
# camel/camel-vee-store.c:258
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:261
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "无法删除文件夹: %s: 无效操作"
@@ -15117,7 +15394,7 @@ msgstr "无法删除文件夹: %s: 无效操作"
# camel/camel-vee-store.c:293
# camel/camel-vee-store.c:293
# camel/camel-vee-store.c:293
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:280
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "无法删除文件夹: %s: 没有该文件夹"
@@ -15125,7 +15402,7 @@ msgstr "无法删除文件夹: %s: 没有该文件夹"
# camel/camel-vee-store.c:306
# camel/camel-vee-store.c:306
# camel/camel-vee-store.c:306
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:293
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹: %s: 无效操作"
@@ -15133,7 +15410,7 @@ msgstr "无法重命名文件夹: %s: 无效操作"
# camel/camel-vee-store.c:314
# camel/camel-vee-store.c:314
# camel/camel-vee-store.c:314
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:301
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "无法重命名文件夹: %s: 没有该文件夹"
@@ -15152,8 +15429,8 @@ msgstr "无法重命名文件夹: %s: 没有该文件夹"
# camel/providers/imap/camel-imap-command.c:409
#: camel/providers/imap/camel-imap-command.c:224
#: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-store.c:2642
msgid "Operation cancelled"
msgstr "操作已取消"
@@ -15164,7 +15441,7 @@ msgstr "操作已取消"
# camel/camel-remote-store.c:484
# camel/providers/imap/camel-imap-command.c:274
#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2645
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接: %s"
@@ -15201,14 +15478,14 @@ msgstr "IMAP 命令失败: %s"
# camel/providers/imap/camel-imap-command.c:417
# camel/providers/imap/camel-imap-command.c:417
# camel/providers/imap/camel-imap-command.c:417
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
msgid "Server response ended too soon."
msgstr "服务器应答结束太快。"
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:608
# camel/providers/imap/camel-imap-command.c:610
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:655
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP 服务器应答不含有 %s 信息"
@@ -15216,7 +15493,7 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
# camel/providers/imap/camel-imap-command.c:644
# camel/providers/imap/camel-imap-command.c:644
# camel/providers/imap/camel-imap-command.c:646
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:691
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "来自 IMAP 服务器意外的 OK 应答: %s"
@@ -15224,7 +15501,7 @@ msgstr "来自 IMAP 服务器意外的 OK 应答: %s"
# camel/providers/imap/camel-imap-folder.c:194
# camel/providers/imap/camel-imap-folder.c:194
# camel/providers/imap/camel-imap-folder.c:197
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
#, c-format
msgid "Could not create directory %s: %s"
msgstr "无法创建目录 %s: %s"
@@ -15232,7 +15509,7 @@ msgstr "无法创建目录 %s: %s"
# camel/providers/imap/camel-imap-folder.c:213
# camel/providers/imap/camel-imap-folder.c:213
# camel/providers/imap/camel-imap-folder.c:216
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
#, c-format
msgid "Could not load summary for %s"
msgstr "无法为 %s 装入概要"
@@ -15240,7 +15517,7 @@ msgstr "无法为 %s 装入概要"
# camel/providers/imap/camel-imap-folder.c:277
# camel/providers/imap/camel-imap-folder.c:277
# camel/providers/imap/camel-imap-folder.c:282
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
msgid "Folder was destroyed and recreated on server."
msgstr "文件夹已被删除并在服务器上重建了。"
@@ -15248,14 +15525,14 @@ msgstr "文件夹已被删除并在服务器上重建了。"
# camel/providers/imap/camel-imap-folder.c:461
# camel/providers/imap/camel-imap-folder.c:466
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
msgid "Scanning for changed messages"
msgstr "正在扫描改变了的邮件"
# camel/camel-smime-context.c:810
# camel/camel-smime-context.c:810
# camel/camel-filter-search.c:126
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "无法检索邮件:%s"
@@ -15284,14 +15561,14 @@ msgstr "无法检索邮件:%s"
# camel/providers/local/camel-mh-folder.c:207
# camel/providers/local/camel-mh-folder.c:215
# camel/providers/local/camel-spool-folder.c:579
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -15312,9 +15589,9 @@ msgstr ""
# camel/providers/local/camel-mbox-folder.c:331
# camel/providers/local/camel-mh-folder.c:198
# camel/providers/local/camel-spool-folder.c:579
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
#: camel/providers/local/camel-mh-folder.c:201
msgid "No such message"
msgstr "没有该邮件"
@@ -15325,8 +15602,8 @@ msgstr "没有该邮件"
# camel/providers/imap/camel-imap-folder.c:2001
# camel/providers/imap/camel-imap-folder.c:1632
# camel/providers/imap/camel-imap-folder.c:2108
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
msgid "This message is not currently available"
msgstr "该邮件目前不可用"
@@ -15336,15 +15613,15 @@ msgstr "该邮件目前不可用"
# camel/providers/imap/camel-imap-folder.c:1821
# camel/providers/imap/camel-imap-folder.c:1787
# camel/providers/imap/camel-imap-folder.c:1861
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
msgid "Fetching summary information for new messages"
msgstr "从新邮件中获取概要信息"
# camel/providers/imap/camel-imap-folder.c:2038
# camel/providers/imap/camel-imap-folder.c:2038
# camel/providers/imap/camel-imap-folder.c:2145
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到邮件体。"
@@ -15410,7 +15687,7 @@ msgstr "在所有文件夹中检查新邮件"
# camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
# camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
# camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:832
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1176
msgid "Folders"
msgstr "文件夹"
@@ -15467,7 +15744,7 @@ msgstr "IMAP 服务器上的邮件的读写。"
# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
#: camel/providers/imap/camel-imap-provider.c:80
#: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
msgid "Password"
msgstr "密码"
@@ -15497,10 +15774,10 @@ msgstr "%s 为 %s 服务,在 %s"
# camel/camel-remote-store.c:264
# camel/camel-remote-store.c:264
# camel/camel-remote-store.c:264
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
#: camel/providers/nntp/camel-nntp-store.c:130
#: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
msgid "Connection cancelled"
msgstr "连接已取消"
@@ -15510,9 +15787,9 @@ msgstr "连接已取消"
# camel/providers/smtp/camel-smtp-transport.c:273
# camel/camel-remote-store.c:267
# camel/providers/smtp/camel-smtp-transport.c:276
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:274
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr "无法连接到 %s (端口 %d): %s"
@@ -15520,8 +15797,8 @@ msgstr "无法连接到 %s (端口 %d): %s"
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
@@ -15529,23 +15806,23 @@ msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
# shell/e-storage.c:518
# shell/e-storage.c:518
# shell/e-storage.c:518
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
msgid "SSL/TLS extension not supported."
msgstr "不支持 SSL/TLS 扩展。"
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
msgid "SSL negotiations failed"
msgstr "SSL 协商失败"
# camel/providers/imap/camel-imap-store.c:518
# camel/providers/imap/camel-imap-store.c:518
# camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -15556,8 +15833,8 @@ msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
# camel/providers/smtp/camel-smtp-transport.c:389
# camel/providers/imap/camel-imap-store.c:528
# camel/providers/smtp/camel-smtp-transport.c:393
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:484
#, c-format
msgid "No support for authentication type %s"
msgstr "不支持验证类型 %s"
@@ -15565,7 +15842,7 @@ msgstr "不支持验证类型 %s"
# camel/providers/imap/camel-imap-store.c:552
# camel/providers/imap/camel-imap-store.c:552
# camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -15576,15 +15853,14 @@ msgstr "%s请为 %s@%s 输入 IMAP 密码"
# camel/providers/smtp/camel-smtp-transport.c:430
# camel/providers/imap/camel-imap-store.c:567
# camel/providers/smtp/camel-smtp-transport.c:434
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
msgid "You didn't enter a password."
msgstr "您没有输入密码。"
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
# camel/providers/imap/camel-imap-store.c:596
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -15598,8 +15874,8 @@ msgstr ""
# camel/providers/imap/camel-imap-store.c:899
# camel/providers/imap/camel-imap-store.c:899
# camel/providers/imap/camel-imap-store.c:900
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
@@ -15607,7 +15883,7 @@ msgstr "没有文件夹 %s"
# shell/e-shell-utils.c:121
# shell/e-shell-utils.c:121
# shell/e-shell-utils.c:121
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1839
#, fuzzy, c-format
msgid ""
"The folder name \"%s\" is invalid because it containes the character \"%c\""
@@ -15622,7 +15898,7 @@ msgstr "文件夹名不能含有回车符。"
# camel/providers/local/camel-mbox-summary.c:873
# camel/providers/local/camel-spool-summary.c:544
# camel/providers/local/camel-spool-summary.c:1110
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
#, c-format
msgid "Unknown parent folder: %s"
msgstr "未知的父文件夹:%s"
@@ -15630,7 +15906,7 @@ msgstr "未知的父文件夹:%s"
# camel/providers/imap/camel-imap-store.c:1274
# camel/providers/imap/camel-imap-store.c:1274
# camel/providers/imap/camel-imap-store.c:1275
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1887
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
@@ -15754,8 +16030,8 @@ msgstr "在标准邮件箱文件中读取和存储本地邮件。"
# camel/providers/local/camel-local-store.c:227
# camel/providers/local/camel-spool-store.c:109
#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:116
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "存储根目录 %s 不是绝对路径"
@@ -15779,7 +16055,7 @@ msgstr "存储根目录 %s 不是普通目录"
# camel/providers/local/camel-local-store.c:235
#: camel/providers/local/camel-local-store.c:155
#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "无法获取文件夹: %s: %s"
@@ -15787,14 +16063,14 @@ msgstr "无法获取文件夹: %s: %s"
# camel/providers/local/camel-local-store.c:184
# camel/providers/local/camel-local-store.c:184
# camel/providers/local/camel-local-store.c:184
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
msgid "Local stores do not have an inbox"
msgstr "本地存储没有收件箱"
# camel/providers/local/camel-local-store.c:196
# camel/providers/local/camel-local-store.c:196
# camel/providers/local/camel-local-store.c:196
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
#, c-format
msgid "Local mail file %s"
msgstr "本地邮件文件 %s"
@@ -15802,7 +16078,7 @@ msgstr "本地邮件文件 %s"
# camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
# camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
# camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "无法将文件夹 %s 改名为 %s: %s"
@@ -15810,7 +16086,7 @@ msgstr "无法将文件夹 %s 改名为 %s: %s"
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
#, c-format
msgid "Could not rename '%s': %s"
msgstr "无法重命名“%s”:%s"
@@ -15818,7 +16094,7 @@ msgstr "无法重命名“%s”:%s"
# camel/providers/local/camel-local-store.c:374
# camel/providers/local/camel-local-store.c:374
# camel/providers/local/camel-local-store.c:374
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr "无法删除文件夹概要文件 “%s”: %s"
@@ -15826,7 +16102,7 @@ msgstr "无法删除文件夹概要文件 “%s”: %s"
# camel/providers/local/camel-local-store.c:384
# camel/providers/local/camel-local-store.c:384
# camel/providers/local/camel-local-store.c:384
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr "无法删除文件夹索引文件 “%s”: %s"
@@ -15845,7 +16121,7 @@ msgstr "无法保存概要: %s: %s"
# camel/providers/local/camel-spool-summary.c:1157
# camel/providers/local/camel-local-summary.c:423
# camel/providers/local/camel-spool-summary.c:1157
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
msgid "Unable to add message to summary: unknown reason"
msgstr "无法将邮件添加到概要中: 未知的原因"
@@ -15870,8 +16146,8 @@ msgstr "无法将邮件附加到邮件目录文件夹: %s: %s"
# camel/providers/local/camel-mh-folder.c:216
# camel/providers/local/camel-maildir-folder.c:231
# camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
msgid "Invalid message contents"
msgstr "无效的邮件内容"
@@ -15883,7 +16159,7 @@ msgstr "无效的邮件内容"
# camel/providers/local/camel-mh-store.c:89
#: camel/providers/local/camel-maildir-store.c:106
#: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:163
#, c-format
msgid ""
"Could not open folder `%s':\n"
@@ -15904,7 +16180,7 @@ msgstr ""
#: camel/providers/local/camel-maildir-store.c:110
#: camel/providers/local/camel-mbox-store.c:101
#: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:167
#, c-format
msgid "Folder `%s' does not exist."
msgstr "文件夹“%s”不存在。"
@@ -15917,7 +16193,7 @@ msgstr "文件夹“%s”不存在。"
# camel/providers/local/camel-mh-store.c:102
#: camel/providers/local/camel-maildir-store.c:117
#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:172
#, c-format
msgid ""
"Could not create folder `%s':\n"
@@ -15944,7 +16220,7 @@ msgstr "“%s”不是邮件目录。"
# camel/providers/local/camel-maildir-store.c:203
# camel/providers/local/camel-mh-store.c:126
#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
#: camel/providers/local/camel-mh-store.c:252
#, c-format
msgid "Could not delete folder `%s': %s"
@@ -15953,7 +16229,7 @@ msgstr "无法删除文件夹“%s”: %s"
# camel/providers/local/camel-maildir-store.c:167
# camel/providers/local/camel-maildir-store.c:167
# camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
msgid "not a maildir directory"
msgstr "不是邮件目录"
@@ -15961,8 +16237,8 @@ msgstr "不是邮件目录"
# camel/providers/local/camel-maildir-store.c:331
# camel/providers/local/camel-maildir-store.c:331
#: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:286
+#: camel/providers/local/camel-spool-store.c:316
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr "无法扫描文件夹“%s”: %s"
@@ -15973,8 +16249,8 @@ msgstr "无法扫描文件夹“%s”: %s"
# camel/providers/local/camel-maildir-summary.c:526
# camel/providers/local/camel-maildir-summary.c:405
# camel/providers/local/camel-maildir-summary.c:526
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "无法打开邮件目录路径: %s: %s"
@@ -15982,14 +16258,14 @@ msgstr "无法打开邮件目录路径: %s: %s"
# camel/providers/imap/camel-imap-provider.c:43
# camel/providers/imap/camel-imap-provider.c:43
# camel/providers/imap/camel-imap-provider.c:43
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
msgid "Checking folder consistency"
msgstr "正在检查文件夹一致性"
# camel/providers/imap/camel-imap-folder.c:1746
# camel/providers/imap/camel-imap-folder.c:1746
# camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
msgid "Checking for new messages"
msgstr "正在检查新邮件"
@@ -16011,11 +16287,11 @@ msgstr "正在检查新邮件"
# camel/providers/local/camel-spool-summary.c:378
# camel/providers/local/camel-spool-summary.c:643
# camel/providers/local/camel-spool-summary.c:935
-#: camel/providers/local/camel-maildir-summary.c:729
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:510
+#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-spool-summary.c:137
msgid "Storing folder"
msgstr "正在存储文件夹"
@@ -16025,8 +16301,8 @@ msgstr "正在存储文件夹"
# camel/providers/local/camel-spool-folder.c:274
# camel/providers/local/camel-mbox-folder.c:151
# camel/providers/local/camel-spool-folder.c:274
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "无法在 %s 创建文件夹锁: %s"
@@ -16037,7 +16313,7 @@ msgstr "无法在 %s 创建文件夹锁: %s"
# camel/providers/local/camel-spool-folder.c:456
# camel/providers/local/camel-mbox-folder.c:208
# camel/providers/local/camel-spool-folder.c:456
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "无法打开邮件箱: %s: %s\n"
@@ -16045,14 +16321,14 @@ msgstr "无法打开邮件箱: %s: %s\n"
# camel/providers/local/camel-mbox-folder.c:265
# camel/providers/local/camel-mbox-folder.c:265
# camel/providers/local/camel-mbox-folder.c:265
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
msgid "Mail append cancelled"
msgstr "邮件附加取消"
# camel/providers/local/camel-mbox-folder.c:268
# camel/providers/local/camel-mbox-folder.c:268
# camel/providers/local/camel-mbox-folder.c:268
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr "无法将邮件附加到邮件箱文件: %s: %s"
@@ -16075,9 +16351,9 @@ msgstr "无法将邮件附加到邮件箱文件: %s: %s"
# camel/providers/local/camel-spool-folder.c:595
# camel/providers/local/camel-spool-folder.c:627
# camel/providers/local/camel-spool-folder.c:639
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -16092,7 +16368,7 @@ msgstr ""
# camel/providers/local/camel-spool-folder.c:628
# camel/providers/local/camel-mbox-folder.c:380
# camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
msgid "The folder appears to be irrecoverably corrupted."
msgstr "文件夹好像已经被不可恢复地破坏了。"
@@ -16102,7 +16378,7 @@ msgstr "文件夹好像已经被不可恢复地破坏了。"
# camel/providers/local/camel-spool-folder.c:640
# camel/providers/local/camel-mbox-folder.c:392
# camel/providers/local/camel-spool-folder.c:640
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
msgid "Message construction failed: Corrupt mailbox?"
msgstr "邮件构造失败:邮件箱已损坏?"
@@ -16172,7 +16448,7 @@ msgstr "文件夹“%s”非空。没有删除。"
# camel/providers/local/camel-spool-summary.c:383
# camel/providers/local/camel-mbox-summary.c:253
# camel/providers/local/camel-spool-summary.c:383
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:343
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "无法打开文件夹: %s: %s"
@@ -16183,7 +16459,7 @@ msgstr "无法打开文件夹: %s: %s"
# camel/providers/local/camel-spool-summary.c:425
# camel/providers/local/camel-mbox-summary.c:295
# camel/providers/local/camel-spool-summary.c:425
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:391
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
@@ -16194,7 +16470,7 @@ msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
# camel/providers/local/camel-spool-summary.c:497
# camel/providers/local/camel-mbox-summary.c:370
# camel/providers/local/camel-spool-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:453
+#: camel/providers/local/camel-mbox-summary.c:447
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "无法检查文件夹: %s: %s"
@@ -16208,9 +16484,9 @@ msgstr "无法检查文件夹: %s: %s"
# camel/providers/local/camel-mbox-summary.c:502
# camel/providers/local/camel-mbox-summary.c:703
# camel/providers/local/camel-spool-summary.c:648
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-spool-summary.c:142
#, c-format
msgid "Could not open file: %s: %s"
msgstr "无法打开文件: %s: %s"
@@ -16221,8 +16497,8 @@ msgstr "无法打开文件: %s: %s"
# camel/providers/local/camel-spool-summary.c:672
# camel/providers/local/camel-mbox-summary.c:519
# camel/providers/local/camel-spool-summary.c:672
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-spool-summary.c:162
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "无法打开临时邮件箱: %s"
@@ -16236,8 +16512,8 @@ msgstr "无法打开临时邮件箱: %s"
# camel/providers/local/camel-mbox-summary.c:630
# camel/providers/local/camel-mbox-summary.c:799
# camel/providers/local/camel-spool-summary.c:1036
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:702
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "无法关闭来源文件夹 %s: %s"
@@ -16245,7 +16521,7 @@ msgstr "无法关闭来源文件夹 %s: %s"
# camel/providers/local/camel-mbox-summary.c:639
# camel/providers/local/camel-mbox-summary.c:639
# camel/providers/local/camel-mbox-summary.c:639
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:549
#, c-format
msgid "Could not close temp folder: %s"
msgstr "无法关闭临时文件夹: %s"
@@ -16253,7 +16529,7 @@ msgstr "无法关闭临时文件夹: %s"
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:560
#, c-format
msgid "Could not rename folder: %s"
msgstr "无法重命名文件夹: %s"
@@ -16282,10 +16558,10 @@ msgstr "无法重命名文件夹: %s"
# camel/providers/local/camel-spool-summary.c:705
# camel/providers/local/camel-spool-summary.c:978
# camel/providers/local/camel-spool-summary.c:986
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
-#: camel/providers/local/camel-mbox-summary.c:913
-#: camel/providers/local/camel-mbox-summary.c:921
+#: camel/providers/local/camel-mbox-summary.c:644
+#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
msgid "Summary and folder mismatch, even after a sync"
msgstr "即使同步后,概要和文件夹仍然不匹配"
@@ -16298,8 +16574,8 @@ msgstr "即使同步后,概要和文件夹仍然不匹配"
# camel/providers/local/camel-mbox-summary.c:873
# camel/providers/local/camel-spool-summary.c:544
# camel/providers/local/camel-spool-summary.c:1110
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-spool-summary.c:334
#, c-format
msgid "Unknown error: %s"
msgstr "未知的错误: %s"
@@ -16307,7 +16583,7 @@ msgstr "未知的错误: %s"
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:812
#, c-format
msgid "Could not store folder: %s"
msgstr "无法存储文件夹:%s"
@@ -16318,8 +16594,8 @@ msgstr "无法存储文件夹:%s"
# camel/providers/local/camel-spool-summary.c:749
# camel/providers/local/camel-mbox-summary.c:595
# camel/providers/local/camel-spool-summary.c:749
-#: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr "写入临时文件夹错误: %s"
@@ -16330,7 +16606,7 @@ msgstr "写入临时文件夹错误: %s"
# camel/providers/local/camel-spool-summary.c:771
# camel/providers/local/camel-mbox-summary.c:612
# camel/providers/local/camel-spool-summary.c:771
-#: camel/providers/local/camel-mbox-summary.c:993
+#: camel/providers/local/camel-mbox-summary.c:923
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr "写入临时文件夹失败: %s: %s"
@@ -16361,7 +16637,7 @@ msgstr "“%s”不是目录"
# camel/providers/local/camel-mh-summary.c:218
# camel/providers/local/camel-mh-summary.c:218
# camel/providers/local/camel-mh-summary.c:218
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "无法打开 MH 目录: %s: %s"
@@ -16369,7 +16645,7 @@ msgstr "无法打开 MH 目录: %s: %s"
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
#, c-format
msgid "Spool `%s' cannot be opened: %s"
msgstr "无法打开脱机文件“%s”:%s"
@@ -16377,7 +16653,7 @@ msgstr "无法打开脱机文件“%s”:%s"
# camel/providers/local/camel-local-store.c:145
# camel/providers/local/camel-local-store.c:145
# camel/providers/local/camel-local-store.c:145
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
#, c-format
msgid "Spool `%s' is not a regular file or directory"
msgstr "脱机文件“%s”不是普通文件或目录"
@@ -16385,7 +16661,7 @@ msgstr "脱机文件“%s”不是普通文件或目录"
# camel/providers/local/camel-spool-store.c:141
# camel/providers/local/camel-spool-store.c:141
# camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:153
#, c-format
msgid "Folder `%s/%s' does not exist."
msgstr "文件夹“%s/%s”不存在。"
@@ -16396,19 +16672,19 @@ msgstr "文件夹“%s/%s”不存在。"
# camel/providers/local/camel-mbox-store.c:145
# camel/providers/local/camel-mbox-store.c:118
# camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:180
#, c-format
msgid "`%s' is not a mailbox file."
msgstr "“%s”不是邮件箱文件。"
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:197
msgid "Store does not support an INBOX"
msgstr "存储并不支持收件箱"
# camel/providers/local/camel-spool-store.c:163
# camel/providers/local/camel-spool-store.c:163
# camel/providers/local/camel-spool-store.c:163
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
#, c-format
msgid "Spool mail file %s"
msgstr "脱机邮件文件 %s"
@@ -16416,7 +16692,7 @@ msgstr "脱机邮件文件 %s"
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:209
#, c-format
msgid "Spool folder tree %s"
msgstr "脱机文件夹树 %s"
@@ -16424,14 +16700,14 @@ msgstr "脱机文件夹树 %s"
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
# camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:217
msgid "Spool folders cannot be renamed"
msgstr "脱机文件夹无法改名"
# camel/providers/local/camel-spool-store.c:217
# camel/providers/local/camel-spool-store.c:217
# camel/providers/local/camel-spool-store.c:217
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:225
msgid "Spool folders cannot be deleted"
msgstr "脱机文件夹无法删除"
@@ -16444,9 +16720,9 @@ msgstr "脱机文件夹无法删除"
# camel/providers/local/camel-spool-summary.c:788
# camel/providers/local/camel-spool-summary.c:797
# camel/providers/local/camel-spool-summary.c:806
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
#, c-format
msgid "Could not sync temporary folder %s: %s"
msgstr "无法同步临时文件夹 %s: %s"
@@ -16454,7 +16730,7 @@ msgstr "无法同步临时文件夹 %s: %s"
# camel/providers/local/camel-spool-summary.c:821
# camel/providers/local/camel-spool-summary.c:821
# camel/providers/local/camel-spool-summary.c:821
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:211
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr "无法同步脱机文件夹 %s: %s"
@@ -16468,8 +16744,8 @@ msgstr "无法同步脱机文件夹 %s: %s"
# camel/providers/local/camel-spool-summary.c:851
# camel/providers/local/camel-spool-summary.c:869
# camel/providers/local/camel-spool-summary.c:881
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
#: camel/providers/local/camel-spool-summary.c:274
#, c-format
msgid ""
@@ -16607,9 +16883,9 @@ msgstr "检索 POP 概要"
# camel/providers/imap/camel-imap-command.c:409
# camel/providers/nntp/camel-nntp-folder.c:157
#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
msgid "User cancelled"
msgstr "用户已取消"
@@ -16631,7 +16907,7 @@ msgstr "用户已取消"
# camel/providers/local/camel-spool-folder.c:579
# camel/providers/nntp/camel-nntp-folder.c:153
# camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "无法获取消息 POP 摘要:%s"
@@ -16639,14 +16915,14 @@ msgstr "无法获取消息 POP 摘要:%s"
# camel/providers/pop3/camel-pop3-folder.c:252
# camel/providers/pop3/camel-pop3-folder.c:252
# camel/providers/pop3/camel-pop3-folder.c:252
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
msgid "Expunging deleted messages"
msgstr "彻底去除已删除的邮件"
# camel/providers/pop3/camel-pop3-folder.c:367
# camel/providers/pop3/camel-pop3-folder.c:367
# camel/providers/pop3/camel-pop3-folder.c:367
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
#, c-format
msgid "No message with uid %s"
msgstr "没有 uid 为 %s 的邮件"
@@ -16656,7 +16932,7 @@ msgstr "没有 uid 为 %s 的邮件"
# camel/providers/pop3/camel-pop3-folder.c:371
#. Sigh, most of the crap in this function is so that the cancel button
#. returns the proper exception code. Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
#, c-format
msgid "Retrieving POP message %d"
msgstr "检索 POP 邮件 %d"
@@ -16679,10 +16955,10 @@ msgstr "检索 POP 邮件 %d"
# camel/providers/local/camel-spool-folder.c:579
# camel/providers/nntp/camel-nntp-folder.c:153
# camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
#, c-format
msgid "Cannot get message %s: %s"
msgstr "无法获取消息 %s:%s"
@@ -16690,7 +16966,7 @@ msgstr "无法获取消息 %s:%s"
# my-evolution/metar.c:247
# my-evolution/metar.c:247
# my-evolution/metar.c:247
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
msgid "Unknown reason"
msgstr "未知原因"
@@ -16719,7 +16995,7 @@ msgstr "%s 天之后删除"
# camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
# camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
# camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:59
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
msgid "POP"
msgstr "POP"
@@ -16759,7 +17035,7 @@ msgstr ""
# camel/providers/smtp/camel-smtp-transport.c:273
# camel/camel-remote-store.c:267
# camel/providers/smtp/camel-smtp-transport.c:276
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
#, c-format
msgid "Could not connect to POP server %s (port %d): %s"
msgstr "无法连接到 POP 服务器 %s (端口 %d):%s"
@@ -16767,9 +17043,9 @@ msgstr "无法连接到 POP 服务器 %s (端口 %d):%s"
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "以安全模式连接到 POP 服务器 %s 失败:%s"
@@ -16777,7 +17053,7 @@ msgstr "以安全模式连接到 POP 服务器 %s 失败:%s"
# camel/providers/pop3/camel-pop3-store.c:321
# camel/providers/pop3/camel-pop3-store.c:321
# camel/providers/pop3/camel-pop3-store.c:321
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
#, c-format
msgid "Could not connect to POP server %s"
msgstr "无法连接到 POP 服务器 %s"
@@ -16785,8 +17061,8 @@ msgstr "无法连接到 POP 服务器 %s"
# camel/providers/pop3/camel-pop3-store.c:407
# camel/providers/pop3/camel-pop3-store.c:407
# camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -16796,12 +17072,12 @@ msgstr "无法连接到 POP 服务器 %s:不支持请求认证机制。"
# camel/providers/imap/camel-imap-command.c:362
# camel/providers/imap/camel-imap-command.c:362
# camel/providers/imap/camel-imap-command.c:362
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
#, c-format
msgid "SASL `%s' Login failed for POP server %s: %s"
msgstr "使用SASL“%s”登录 POP 服务器 %s 失败:%s"
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "无法登录到 POP 服务器 %s:SASL 协议错误"
@@ -16809,7 +17085,7 @@ msgstr "无法登录到 POP 服务器 %s:SASL 协议错误"
# camel/providers/pop3/camel-pop3-store.c:198
# camel/providers/pop3/camel-pop3-store.c:198
# camel/providers/pop3/camel-pop3-store.c:198
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
#, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr "认证到 POP 服务器 %s 失败: %s"
@@ -16817,7 +17093,7 @@ msgstr "认证到 POP 服务器 %s 失败: %s"
# camel/providers/pop3/camel-pop3-store.c:360
# camel/providers/pop3/camel-pop3-store.c:360
# camel/providers/pop3/camel-pop3-store.c:360
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
#, c-format
msgid "%sPlease enter the POP password for %s@%s"
msgstr "%s请为 %s@%s 输入 POP 密码"
@@ -16825,8 +17101,8 @@ msgstr "%s请为 %s@%s 输入 POP 密码"
# camel/providers/pop3/camel-pop3-store.c:415
# camel/providers/pop3/camel-pop3-store.c:415
# camel/providers/pop3/camel-pop3-store.c:415
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -16838,7 +17114,7 @@ msgstr ""
# camel/providers/pop3/camel-pop3-store.c:480
# camel/providers/pop3/camel-pop3-store.c:480
# camel/providers/pop3/camel-pop3-store.c:480
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:625
#, c-format
msgid "No such folder `%s'."
msgstr "没有文件夹“%s”。"
@@ -16850,7 +17126,7 @@ msgstr "没有文件夹“%s”。"
# camel/providers/sendmail/camel-sendmail-provider.c:36
# mail/mail-config.glade.h:81
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
msgid "Sendmail"
msgstr "Sendmail"
@@ -16866,14 +17142,14 @@ msgstr "将邮件传递到本地系统的“sendmail”来发送邮件。"
# camel/camel-url.c:288
# camel/camel-url.c:288
# camel/providers/sendmail/camel-sendmail-transport.c:226
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
msgid "Could not parse recipient list"
msgstr "无法解析收件人列表"
# camel/providers/sendmail/camel-sendmail-transport.c:106
# camel/providers/sendmail/camel-sendmail-transport.c:106
# camel/providers/sendmail/camel-sendmail-transport.c:107
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr "无法创建到 sendmail 的管道: %s: 邮件未发送"
@@ -16881,7 +17157,7 @@ msgstr "无法创建到 sendmail 的管道: %s: 邮件未发送"
# camel/providers/sendmail/camel-sendmail-transport.c:123
# camel/providers/sendmail/camel-sendmail-transport.c:123
# camel/providers/sendmail/camel-sendmail-transport.c:124
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "无法创建 sendmail 进程: %s: 邮件未发送"
@@ -16889,7 +17165,7 @@ msgstr "无法创建 sendmail 进程: %s: 邮件未发送"
# camel/providers/sendmail/camel-sendmail-transport.c:149
# camel/providers/sendmail/camel-sendmail-transport.c:149
# camel/providers/sendmail/camel-sendmail-transport.c:150
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
#, c-format
msgid "Could not send message: %s"
msgstr "无法发送邮件: %s"
@@ -16897,7 +17173,7 @@ msgstr "无法发送邮件: %s"
# camel/providers/sendmail/camel-sendmail-transport.c:162
# camel/providers/sendmail/camel-sendmail-transport.c:162
# camel/providers/sendmail/camel-sendmail-transport.c:163
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail 以信号 %s 退出: 邮件未发送。"
@@ -16905,7 +17181,7 @@ msgstr "sendmail 以信号 %s 退出: 邮件未发送。"
# camel/providers/sendmail/camel-sendmail-transport.c:169
# camel/providers/sendmail/camel-sendmail-transport.c:169
# camel/providers/sendmail/camel-sendmail-transport.c:170
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "无法执行 %s: 邮件未发送。"
@@ -16913,7 +17189,7 @@ msgstr "无法执行 %s: 邮件未发送。"
# camel/providers/sendmail/camel-sendmail-transport.c:174
# camel/providers/sendmail/camel-sendmail-transport.c:174
# camel/providers/sendmail/camel-sendmail-transport.c:175
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail 以状态码 %d 退出: 邮件未发送。"
@@ -16921,21 +17197,21 @@ msgstr "sendmail 以状态码 %d 退出: 邮件未发送。"
# camel/providers/sendmail/camel-sendmail-transport.c:246
# camel/providers/sendmail/camel-sendmail-transport.c:246
# camel/providers/sendmail/camel-sendmail-transport.c:259
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
msgid "sendmail"
msgstr "sendmail"
# camel/providers/sendmail/camel-sendmail-transport.c:248
# camel/providers/sendmail/camel-sendmail-transport.c:248
# camel/providers/sendmail/camel-sendmail-transport.c:261
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
msgid "Mail delivery via the sendmail program"
msgstr "通过 sendmail 程序发送邮件"
# camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
# camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
# camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:74
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
msgid "SMTP"
msgstr "SMTP"
@@ -16949,190 +17225,190 @@ msgstr "通过SMTP连接到远程邮件服务器来发送邮件。\n"
# camel/providers/smtp/camel-smtp-transport.c:172
# camel/providers/smtp/camel-smtp-transport.c:172
# camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:173
msgid "Syntax error, command unrecognized"
msgstr "语法错误,无法识别的命令"
# camel/providers/smtp/camel-smtp-transport.c:174
# camel/providers/smtp/camel-smtp-transport.c:174
# camel/providers/smtp/camel-smtp-transport.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:175
msgid "Syntax error in parameters or arguments"
msgstr "参数语法错误"
# camel/providers/smtp/camel-smtp-transport.c:176
# camel/providers/smtp/camel-smtp-transport.c:176
# camel/providers/smtp/camel-smtp-transport.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:177
msgid "Command not implemented"
msgstr "命令尚未实现"
# camel/providers/smtp/camel-smtp-transport.c:178
# camel/providers/smtp/camel-smtp-transport.c:178
# camel/providers/smtp/camel-smtp-transport.c:179
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:179
msgid "Command parameter not implemented"
msgstr "命令参数尚未实现"
# camel/providers/smtp/camel-smtp-transport.c:180
# camel/providers/smtp/camel-smtp-transport.c:180
# camel/providers/smtp/camel-smtp-transport.c:181
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:181
msgid "System status, or system help reply"
msgstr "系统状态,或系统求助就绪"
# camel/providers/smtp/camel-smtp-transport.c:182
# camel/providers/smtp/camel-smtp-transport.c:182
# camel/providers/smtp/camel-smtp-transport.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:183
msgid "Help message"
msgstr "求助消息"
# camel/providers/smtp/camel-smtp-transport.c:184
# camel/providers/smtp/camel-smtp-transport.c:184
# camel/providers/smtp/camel-smtp-transport.c:185
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:185
msgid "Service ready"
msgstr "服务就绪"
# camel/providers/smtp/camel-smtp-transport.c:186
# camel/providers/smtp/camel-smtp-transport.c:186
# camel/providers/smtp/camel-smtp-transport.c:187
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:187
msgid "Service closing transmission channel"
msgstr "服务正在关闭传输通道"
# camel/providers/smtp/camel-smtp-transport.c:188
# camel/providers/smtp/camel-smtp-transport.c:188
# camel/providers/smtp/camel-smtp-transport.c:189
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:189
msgid "Service not available, closing transmission channel"
msgstr "服务不可用,正在关闭传输通道"
# camel/providers/smtp/camel-smtp-transport.c:190
# camel/providers/smtp/camel-smtp-transport.c:190
# camel/providers/smtp/camel-smtp-transport.c:191
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:191
msgid "Requested mail action okay, completed"
msgstr "邮件动作请求确认,已完成"
# camel/providers/smtp/camel-smtp-transport.c:192
# camel/providers/smtp/camel-smtp-transport.c:192
# camel/providers/smtp/camel-smtp-transport.c:193
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:193
msgid "User not local; will forward to <forward-path>"
msgstr "用户不在本地;将转发到 <转发路径>"
# camel/providers/smtp/camel-smtp-transport.c:194
# camel/providers/smtp/camel-smtp-transport.c:194
# camel/providers/smtp/camel-smtp-transport.c:195
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:195
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "邮件动作请求未发生:邮件箱无效"
# camel/providers/smtp/camel-smtp-transport.c:196
# camel/providers/smtp/camel-smtp-transport.c:196
# camel/providers/smtp/camel-smtp-transport.c:197
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:197
msgid "Requested action not taken: mailbox unavailable"
msgstr "动作请求未发生:邮件箱无效"
# camel/providers/smtp/camel-smtp-transport.c:198
# camel/providers/smtp/camel-smtp-transport.c:198
# camel/providers/smtp/camel-smtp-transport.c:199
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:199
msgid "Requested action aborted: error in processing"
msgstr "动作请求已放弃:处理中出错"
# camel/providers/smtp/camel-smtp-transport.c:200
# camel/providers/smtp/camel-smtp-transport.c:200
# camel/providers/smtp/camel-smtp-transport.c:201
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:201
msgid "User not local; please try <forward-path>"
msgstr "用户不在本地;请尝试 <转发路径>"
# camel/providers/smtp/camel-smtp-transport.c:202
# camel/providers/smtp/camel-smtp-transport.c:202
# camel/providers/smtp/camel-smtp-transport.c:203
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:203
msgid "Requested action not taken: insufficient system storage"
msgstr "动作请求未发生:系统存储空间不足"
# camel/providers/smtp/camel-smtp-transport.c:204
# camel/providers/smtp/camel-smtp-transport.c:204
# camel/providers/smtp/camel-smtp-transport.c:205
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:205
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "邮件动作请求已放弃:超定额德存储分配"
# camel/providers/smtp/camel-smtp-transport.c:206
# camel/providers/smtp/camel-smtp-transport.c:206
# camel/providers/smtp/camel-smtp-transport.c:207
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:207
msgid "Requested action not taken: mailbox name not allowed"
msgstr "动作请求未发生:不允许的邮件箱名称"
# camel/providers/smtp/camel-smtp-transport.c:208
# camel/providers/smtp/camel-smtp-transport.c:208
# camel/providers/smtp/camel-smtp-transport.c:209
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:209
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "开始输入邮件;以 <CRLF>.<CRLF> 结束"
# camel/providers/smtp/camel-smtp-transport.c:210
# camel/providers/smtp/camel-smtp-transport.c:210
# camel/providers/smtp/camel-smtp-transport.c:211
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:211
msgid "Transaction failed"
msgstr "事务失败"
# camel/providers/smtp/camel-smtp-transport.c:214
# camel/providers/smtp/camel-smtp-transport.c:214
# camel/providers/smtp/camel-smtp-transport.c:215
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:215
msgid "A password transition is needed"
msgstr "必须传输密码"
# camel/providers/smtp/camel-smtp-transport.c:216
# camel/providers/smtp/camel-smtp-transport.c:216
# camel/providers/smtp/camel-smtp-transport.c:217
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:217
msgid "Authentication mechanism is too weak"
msgstr "认证机制太弱"
# camel/providers/smtp/camel-smtp-transport.c:218
# camel/providers/smtp/camel-smtp-transport.c:218
# camel/providers/smtp/camel-smtp-transport.c:219
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:219
msgid "Encryption required for requested authentication mechanism"
msgstr "请求的认证机制必须加密"
# camel/providers/smtp/camel-smtp-transport.c:220
# camel/providers/smtp/camel-smtp-transport.c:220
# camel/providers/smtp/camel-smtp-transport.c:221
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:221
msgid "Temporary authentication failure"
msgstr "临时认证失败"
# camel/providers/smtp/camel-smtp-transport.c:222
# camel/providers/smtp/camel-smtp-transport.c:222
# camel/providers/smtp/camel-smtp-transport.c:223
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:223
msgid "Authentication required"
msgstr "必须认证"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:297
msgid "Welcome response error"
msgstr "欢迎应答错误"
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
# camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:380
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr "以安全模式连接 SMTP 服务器 %s 失败:%s"
@@ -17140,14 +17416,14 @@ msgstr "以安全模式连接 SMTP 服务器 %s 失败:%s"
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1064
# calendar/gui/e-itip-control.c:1138
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:342
msgid "server does not appear to support SSL"
msgstr "服务器似乎不支持 SSL"
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:356
#, c-format
msgid "STARTTLS request timed out: %s"
msgstr "STARTTLS 请求超时:%s"
@@ -17155,14 +17431,14 @@ msgstr "STARTTLS 请求超时:%s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1104
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:371
msgid "STARTTLS response error"
msgstr "STARTTLS 响应错误"
# camel/providers/smtp/camel-smtp-transport.c:379
# camel/providers/smtp/camel-smtp-transport.c:379
# camel/providers/smtp/camel-smtp-transport.c:383
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:474
#, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr "SMTP 服务器 %s 不支持请求的认证类型 %s。"
@@ -17170,7 +17446,7 @@ msgstr "SMTP 服务器 %s 不支持请求的认证类型 %s。"
# camel/providers/smtp/camel-smtp-transport.c:417
# camel/providers/smtp/camel-smtp-transport.c:417
# camel/providers/smtp/camel-smtp-transport.c:421
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:512
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -17215,14 +17491,14 @@ msgstr "无法发送邮件: 发件人地址不合法。"
# camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:558
# camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
# camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:613
msgid "Sending message"
msgstr "正在发送邮件"
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:604
# camel/providers/smtp/camel-smtp-transport.c:614
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:704
msgid "Cannot send message: no recipients defined."
msgstr "无法发送邮件: 没有定义收件人。"
@@ -17236,14 +17512,14 @@ msgstr "无法发送消息:一个或多个非法收件人"
# camel/providers/smtp/camel-smtp-transport.c:684
# camel/providers/smtp/camel-smtp-transport.c:684
# camel/providers/smtp/camel-smtp-transport.c:798
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:878
msgid "SMTP Greeting"
msgstr "SMTP 欢迎"
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:924
#, fuzzy, c-format
msgid "HELO request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -17251,7 +17527,7 @@ msgstr "RSET 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:946
#, fuzzy
msgid "HELO response error"
msgstr "RSET 应答错误"
@@ -17259,14 +17535,14 @@ msgstr "RSET 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:758
# camel/providers/smtp/camel-smtp-transport.c:758
# camel/providers/smtp/camel-smtp-transport.c:883
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1012
msgid "SMTP Authentication"
msgstr "SMTP 认证"
# camel/providers/smtp/camel-smtp-transport.c:764
# camel/providers/smtp/camel-smtp-transport.c:764
# camel/providers/smtp/camel-smtp-transport.c:889
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1018
msgid "Error creating SASL authentication object."
msgstr "创建 SASL 认证对象错误。"
@@ -17276,8 +17552,8 @@ msgstr "创建 SASL 认证对象错误。"
# camel/providers/smtp/camel-smtp-transport.c:791
# camel/providers/smtp/camel-smtp-transport.c:904
# camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1047
#, c-format
msgid "AUTH request timed out: %s"
msgstr "AUTH 请求超时: %s"
@@ -17285,21 +17561,21 @@ msgstr "AUTH 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:800
# camel/providers/smtp/camel-smtp-transport.c:800
# camel/providers/smtp/camel-smtp-transport.c:925
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1056
msgid "AUTH request failed."
msgstr "AUTH 请求失败。"
# camel/providers/smtp/camel-smtp-transport.c:848
# camel/providers/smtp/camel-smtp-transport.c:848
# camel/providers/smtp/camel-smtp-transport.c:973
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1117
msgid "Bad authentication response from server.\n"
msgstr "来自服务器的错误认证应答。\n"
# camel/providers/smtp/camel-smtp-transport.c:874
# camel/providers/smtp/camel-smtp-transport.c:874
# camel/providers/smtp/camel-smtp-transport.c:999
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1142
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "MAIL FROM 请求超时: %s: 邮件未发送"
@@ -17307,20 +17583,20 @@ msgstr "MAIL FROM 请求超时: %s: 邮件未发送"
# camel/providers/smtp/camel-smtp-transport.c:893
# camel/providers/smtp/camel-smtp-transport.c:893
# camel/providers/smtp/camel-smtp-transport.c:1013
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1162
msgid "MAIL FROM response error"
msgstr "MAIL FROM 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:918
# camel/providers/smtp/camel-smtp-transport.c:918
# camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1186
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr "RCPT TO 请求超时: %s: 邮件未发送"
# camel/providers/smtp/camel-smtp-transport.c:1054
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1208
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> 失败"
@@ -17328,7 +17604,7 @@ msgstr "RCPT TO <%s> 失败"
# camel/providers/smtp/camel-smtp-transport.c:971
# camel/providers/smtp/camel-smtp-transport.c:971
# camel/providers/smtp/camel-smtp-transport.c:1090
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1247
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "DATA 请求超时: %s: 邮件未发送"
@@ -17339,7 +17615,7 @@ msgstr "DATA 请求超时: %s: 邮件未发送"
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: camel/providers/smtp/camel-smtp-transport.c:1273
+#: camel/providers/smtp/camel-smtp-transport.c:1267
msgid "DATA response error"
msgstr "DATA 应答错误"
@@ -17349,8 +17625,8 @@ msgstr "DATA 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:1048
# camel/providers/smtp/camel-smtp-transport.c:1144
# camel/providers/smtp/camel-smtp-transport.c:1162
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1308
+#: camel/providers/smtp/camel-smtp-transport.c:1331
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr "DATA 发送超时: 消息终止: %s: 邮件未发送"
@@ -17360,14 +17636,14 @@ msgstr "DATA 发送超时: 消息终止: %s: 邮件未发送"
# camel/camel-sasl-kerberos4.c:218
# camel/providers/imap/camel-imap-store.c:495
# camel/providers/smtp/camel-smtp-transport.c:1176
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1351
msgid "DATA termination response error"
msgstr "DATA 终止应答错误"
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1091
# camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1374
#, c-format
msgid "RSET request timed out: %s"
msgstr "RSET 请求超时: %s"
@@ -17375,7 +17651,7 @@ msgstr "RSET 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1394
msgid "RSET response error"
msgstr "RSET 应答错误"
@@ -17385,7 +17661,7 @@ msgstr "RSET 应答错误"
# camel/providers/smtp/camel-smtp-transport.c:791
# camel/providers/smtp/camel-smtp-transport.c:904
# camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1417
#, fuzzy, c-format
msgid "QUIT request timed out: %s"
msgstr "AUTH 请求超时: %s"
@@ -17393,14 +17669,14 @@ msgstr "AUTH 请求超时: %s"
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1110
# camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1437
msgid "QUIT response error"
msgstr "QUIT 应答错误"
# composer/e-msg-composer-attachment-bar.c:110
# composer/e-msg-composer-attachment-bar.c:110
# composer/e-msg-composer-attachment-bar.c:110
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
#, fuzzy, c-format
msgid "%.0fK"
msgstr "%.1fK"
@@ -17408,7 +17684,7 @@ msgstr "%.1fK"
# composer/e-msg-composer-attachment-bar.c:114
# composer/e-msg-composer-attachment-bar.c:114
# composer/e-msg-composer-attachment-bar.c:114
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
#, fuzzy, c-format
msgid "%.0fM"
msgstr "%.1fM"
@@ -17416,7 +17692,7 @@ msgstr "%.1fM"
# composer/e-msg-composer-attachment-bar.c:118
# composer/e-msg-composer-attachment-bar.c:118
# composer/e-msg-composer-attachment-bar.c:118
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:108
#, c-format
msgid "%.0fG"
msgstr "%.0fG"
@@ -17425,28 +17701,28 @@ msgstr "%.0fG"
# composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:136
# composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
msgid "attachment"
msgstr "附件"
# composer/e-msg-composer-attachment-bar.c:500
# composer/e-msg-composer-attachment-bar.c:506
# composer/e-msg-composer-attachment-bar.c:506
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:503
msgid "Remove selected items from the attachment list"
msgstr "从附件列表中删除选定的条目"
# composer/e-msg-composer-attachment-bar.c:531
# composer/e-msg-composer-attachment-bar.c:537
# composer/e-msg-composer-attachment-bar.c:537
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
msgid "Add attachment..."
msgstr "添加附件..."
# composer/e-msg-composer-attachment-bar.c:532
# composer/e-msg-composer-attachment-bar.c:538
# composer/e-msg-composer-attachment-bar.c:538
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
msgid "Attach a file to the message"
msgstr "把文件附件到邮件"
@@ -17456,8 +17732,8 @@ msgstr "把文件附件到邮件"
# composer/e-msg-composer-attachment.c:184
# composer/e-msg-composer-attachment.c:168
# composer/e-msg-composer-attachment.c:184
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
#, c-format
msgid "Cannot attach file %s: %s"
msgstr "无法附加文件 %s: %s"
@@ -17465,7 +17741,7 @@ msgstr "无法附加文件 %s: %s"
# composer/e-msg-composer-attachment.c:176
# composer/e-msg-composer-attachment.c:176
# composer/e-msg-composer-attachment.c:176
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:176
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr "无法附加文件 %s:不是普通文件"
@@ -17498,14 +17774,18 @@ msgstr "MIME 类型:"
# composer/e-msg-composer-attachment.glade.h:5
# composer/e-msg-composer-select-file.c:180
#: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:66
msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
# composer/e-msg-composer-hdrs.c:327
# composer/e-msg-composer-hdrs.c:327
# composer/e-msg-composer-hdrs.c:326
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:479
msgid "Click here for the address book"
msgstr "点击此处以使用地址簿"
@@ -17519,7 +17799,7 @@ msgstr "点击此处以使用地址簿"
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: composer/e-msg-composer-hdrs.c:400
+#: composer/e-msg-composer-hdrs.c:510
msgid "Reply-To:"
msgstr "回复到:"
@@ -17529,7 +17809,7 @@ msgstr "回复到:"
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:516
msgid "From:"
msgstr "发件人:"
@@ -17539,49 +17819,49 @@ msgstr "发件人:"
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:522
msgid "Subject:"
msgstr "主题:"
# composer/e-msg-composer-hdrs.c:389
# composer/e-msg-composer-hdrs.c:389
# composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:531
msgid "To:"
msgstr "收信人:"
# composer/e-msg-composer-hdrs.c:390
# composer/e-msg-composer-hdrs.c:390
# composer/e-msg-composer-hdrs.c:388
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:532
msgid "Enter the recipients of the message"
msgstr "输入邮件的收件人"
# composer/e-msg-composer-hdrs.c:393
# composer/e-msg-composer-hdrs.c:393
# composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:535
msgid "Cc:"
msgstr "抄送:"
# composer/e-msg-composer-hdrs.c:394
# composer/e-msg-composer-hdrs.c:394
# composer/e-msg-composer-hdrs.c:392
-#: composer/e-msg-composer-hdrs.c:436
+#: composer/e-msg-composer-hdrs.c:536
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "输入将接收该邮件副本的收件人地址"
# composer/e-msg-composer-hdrs.c:397
# composer/e-msg-composer-hdrs.c:397
# composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:539
msgid "Bcc:"
msgstr "暗中抄送:"
# composer/e-msg-composer-hdrs.c:398
# composer/e-msg-composer-hdrs.c:398
# composer/e-msg-composer-hdrs.c:396
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:540
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -17593,7 +17873,7 @@ msgstr "输入将接收该邮件副本,但不出现在收件人列表中的收
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:547
#, fuzzy
msgid "Post To:"
msgstr "波尔图"
@@ -17601,7 +17881,7 @@ msgstr "波尔图"
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# my-evolution/e-summary-calendar.c:395
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:549
#, fuzzy
msgid "Posting destination"
msgstr "无描述"
@@ -17612,15 +17892,16 @@ msgstr "无描述"
# ui/evolution-message-composer.xml.h:2
# composer/e-msg-composer-select-file.c:291
# ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
msgstr "附件一个文件"
# mail/mail-crypto.c:59
# mail/mail-crypto.c:59
# mail/mail-crypto.c:59
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:533
#, fuzzy
msgid "Could not create a PGP signature context"
msgstr "无法创建 PGP 签名上下文。"
@@ -17628,7 +17909,7 @@ msgstr "无法创建 PGP 签名上下文。"
# composer/e-msg-composer.c:743
# composer/e-msg-composer.c:747
# composer/e-msg-composer.c:695
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:812
#, c-format
msgid ""
"Error while reading file %s:\n"
@@ -17637,24 +17918,17 @@ msgstr ""
"读入文件 %s 时发声错误:\n"
"%s"
-# composer/e-msg-composer.c:952
-# composer/e-msg-composer.c:956
-# composer/e-msg-composer.c:921
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "警告!"
-
# composer/e-msg-composer.c:956
# composer/e-msg-composer.c:960
# composer/e-msg-composer.c:925
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1175
msgid "File exists, overwrite?"
msgstr "文件存在,覆盖它?"
# composer/e-msg-composer.c:978
# composer/e-msg-composer.c:982
# composer/e-msg-composer.c:947
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1193
#, c-format
msgid "Error saving file: %s"
msgstr "保存文件错误: %s"
@@ -17662,7 +17936,7 @@ msgstr "保存文件错误: %s"
# composer/e-msg-composer.c:997
# composer/e-msg-composer.c:1001
# composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1216
#, c-format
msgid "Error loading file: %s"
msgstr "读入文件错误: %s"
@@ -17670,7 +17944,7 @@ msgstr "读入文件错误: %s"
# composer/e-msg-composer.c:1118
# composer/e-msg-composer.c:1032
# composer/e-msg-composer.c:997
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1254
#, c-format
msgid "Error accessing file: %s"
msgstr "访问文件错误: %s"
@@ -17678,14 +17952,14 @@ msgstr "访问文件错误: %s"
# composer/e-msg-composer.c:1126
# composer/e-msg-composer.c:1040
# composer/e-msg-composer.c:1005
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1262
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器检索邮件"
# composer/e-msg-composer.c:1133
# composer/e-msg-composer.c:1047
# composer/e-msg-composer.c:1012
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1269
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -17697,7 +17971,7 @@ msgstr ""
# composer/e-msg-composer.c:1140
# composer/e-msg-composer.c:1054
# composer/e-msg-composer.c:1019
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1276
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -17706,10 +17980,22 @@ msgstr ""
"无法截断文件: %s\n"
"%s"
+# composer/e-msg-composer.c:1133
+# composer/e-msg-composer.c:1047
+# composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1285
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+"无法搜索文件: %s\n"
+"%s"
+
# composer/e-msg-composer.c:1149
# composer/e-msg-composer.c:1063
# composer/e-msg-composer.c:1028
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1294
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -17721,7 +18007,7 @@ msgstr ""
# composer/e-msg-composer.c:1251
# composer/e-msg-composer.c:1165
# composer/e-msg-composer.c:1130
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1388
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
@@ -17732,7 +18018,7 @@ msgstr ""
# composer/e-msg-composer.c:1405
# composer/e-msg-composer.c:1322
# composer/e-msg-composer.c:1288
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1550
#, fuzzy, c-format
msgid ""
"The message \"%s\" has not been sent.\n"
@@ -17743,42 +18029,47 @@ msgstr ""
"\n"
"您是否希望保存修改?"
+#: composer/e-msg-composer.c:1555
+msgid "_Discard Changes"
+msgstr ""
+
# composer/e-msg-composer.c:1412
# composer/e-msg-composer.c:1329
# composer/e-msg-composer.c:1295
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1559
msgid "Warning: Modified Message"
msgstr "警告: 已改动的邮件"
# composer/e-msg-composer.c:1435
# composer/e-msg-composer.c:1352
# composer/e-msg-composer.c:1318
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1591
msgid "Open file"
msgstr "打开文件"
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:79
# mail/mail-config.glade.h:88
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:2015
msgid "Signature:"
msgstr "签名:"
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1254
msgid "Autogenerated"
msgstr "已自动生成"
# composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
# composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
# composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2234 composer/e-msg-composer.c:2873
+#: composer/e-msg-composer.c:2874
msgid "Compose a message"
msgstr "撰写邮件"
# composer/e-msg-composer.c:2440
# composer/e-msg-composer.c:2380
# composer/e-msg-composer.c:2351
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2905
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
@@ -17789,7 +18080,7 @@ msgstr ""
# composer/e-msg-composer.c:2463 composer/e-msg-composer.c:2518
# composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
# composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2931
#, fuzzy
msgid ""
"Could not create composer window:\n"
@@ -17803,7 +18094,7 @@ msgstr ""
# composer/e-msg-composer.c:2463 composer/e-msg-composer.c:2518
# composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
# composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
-#: composer/e-msg-composer.c:2879
+#: composer/e-msg-composer.c:2991
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
@@ -17811,31 +18102,12 @@ msgstr ""
"无法创见撰写窗口:\n"
"无法激活 HTML 编辑器组件。"
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:4005
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
msgstr "<b>(编写器含有不可编辑的非文本消息体。)<b>"
-# composer/evolution-composer.c:367
-# composer/evolution-composer.c:367
-# composer/evolution-composer.c:367
-#: composer/evolution-composer.c:393
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"无法创建撰写窗口,这是因为您尚未在\n"
-"邮件组件中配置任何标识。"
-
-# composer/evolution-composer.c:382
-# composer/evolution-composer.c:382
-# composer/evolution-composer.c:382
-#: composer/evolution-composer.c:408
-#, fuzzy
-msgid "Cannot initialize the Evolution composer."
-msgstr "无法初始化 Evolution 的撰写器。"
-
# data/evolution.desktop.in.h:2
# data/evolution.desktop.in.h:1
# data/evolution.desktop.in.h:1
@@ -17920,14 +18192,144 @@ msgstr "主题含有"
msgid "Subject does not contain"
msgstr "主题不含有"
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+# calendar/gui/e-meeting-time-sel.c:430
+# calendar/gui/e-meeting-time-sel.c:433
+# calendar/gui/e-meeting-time-sel.c:433
+#: designs/OOA/ooa.glade.h:4
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
+msgstr "办公室以外"
+
+# calendar/gui/dialogs/task-details-page.glade.h:15
+# calendar/gui/dialogs/task-details-page.glade.h:15
+# calendar/gui/dialogs/task-details-page.glade.h:15
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "状态:"
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+# calendar/gui/e-meeting-time-sel.c:430
+# calendar/gui/e-meeting-time-sel.c:433
+# calendar/gui/e-meeting-time-sel.c:433
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "办公室以外"
+
+# calendar/gui/dialogs/meeting-page.etspec.h:10
+# calendar/gui/e-calendar-table.etspec.h:15
+# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
+# mail/message-list.etspec.h:8
+# calendar/gui/dialogs/meeting-page.etspec.h:10
+# calendar/gui/e-calendar-table.etspec.h:15
+# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
+# mail/message-list.etspec.h:9
+# calendar/gui/dialogs/meeting-page.etspec.h:10
+# calendar/gui/e-calendar-table.etspec.h:15
+# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:47
+# mail/message-list.etspec.h:9
+#: designs/OOA/ooa.glade.h:13
+#, fuzzy
+msgid "Yes, Change Status"
+msgstr "标志状态"
+
+#: designs/read_receipts/read.glade.h:1
+msgid " "
+msgstr ""
+
+# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
+#: designs/read_receipts/read.glade.h:2
+#, fuzzy
+msgid "<b>Receiving Email</b>"
+msgstr "正在接收电子邮件"
+
+# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+# mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
+#: designs/read_receipts/read.glade.h:3
+#, fuzzy
+msgid "<b>Sending Email:</b>"
+msgstr "正在发送电子邮件"
+
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+#, fuzzy
+msgid "Read Receipts"
+msgstr "收件人"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
# mail/mail-display.c:106
# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:2034
# mail/mail-display.c:106
# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
# mail/mail-display.c:105
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: e-util/e-dialog-utils.c:247
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -17935,22 +18337,32 @@ msgstr ""
"指定名称的文件已经存在。\n"
"覆盖它?"
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
+# mail/mail-display.c:101
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "覆盖文件?"
+
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:269
-#: e-util/e-passwords.c:363
+#: e-util/e-passwords.c:357
msgid "Remember this password"
msgstr "记住该密码"
# e-util/e-passwords.c:362 mail/mail-session.c:268
# e-util/e-passwords.c:362 mail/mail-session.c:268
# e-util/e-passwords.c:362 mail/mail-session.c:270
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:359
msgid "Remember this password for the remainder of this session"
msgstr "在本会话中记住该密码"
# e-util/e-pilot-settings.c:96
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
msgid "Sync Private Records:"
msgstr "同步私有记录:"
@@ -17959,7 +18371,7 @@ msgstr "同步私有记录:"
# addressbook/backend/ebook/e-card-simple.c:104
# calendar/gui/e-calendar-table.etspec.h:4
# e-util/e-pilot-settings.c:105
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
msgid "Sync Categories:"
msgstr "同步类别:"
@@ -17968,7 +18380,7 @@ msgstr "同步类别:"
# e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y/%m/%d %a %I:%M %p"
@@ -17977,7 +18389,7 @@ msgstr "%Y/%m/%d %a %I:%M %p"
# e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y/%m/%d %a %H:%M"
@@ -17986,7 +18398,7 @@ msgstr "%Y/%m/%d %a %H:%M"
# e-util/e-time-utils.c:178
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:181
msgid "%a %m/%d/%Y %I %p"
msgstr "%Y/%m/%d %a %I %p"
@@ -17995,7 +18407,7 @@ msgstr "%Y/%m/%d %a %I %p"
# e-util/e-time-utils.c:183
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:186
msgid "%a %m/%d/%Y %H"
msgstr "%Y/%m/%d %a %H"
@@ -18003,7 +18415,7 @@ msgstr "%Y/%m/%d %a %H"
# e-util/e-time-utils.c:194
# e-util/e-time-utils.c:194
#. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:197
msgid "%m/%d/%Y %I:%M:%S %p"
msgstr "%Y/%m/%d %I:%M:%S %p"
@@ -18011,7 +18423,7 @@ msgstr "%Y/%m/%d %I:%M:%S %p"
# e-util/e-time-utils.c:198
# e-util/e-time-utils.c:198
#. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:201
msgid "%m/%d/%Y %H:%M:%S"
msgstr "%Y/%m/%d %H:%M:%S"
@@ -18020,7 +18432,7 @@ msgstr "%Y/%m/%d %H:%M:%S"
# e-util/e-time-utils.c:203
#. strptime format of a date and a time, in 12-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:206
msgid "%m/%d/%Y %I:%M %p"
msgstr "%Y/%m/%d %H:%M %p"
@@ -18029,7 +18441,7 @@ msgstr "%Y/%m/%d %H:%M %p"
# e-util/e-time-utils.c:208
#. strptime format of a date and a time, in 24-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:211
msgid "%m/%d/%Y %H:%M"
msgstr "%Y/%m/%d %H:%M"
@@ -18038,7 +18450,7 @@ msgstr "%Y/%m/%d %H:%M"
# e-util/e-time-utils.c:213
#. strptime format of a date and a time, in 12-hour format,
#. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:216
msgid "%m/%d/%Y %I %p"
msgstr "%Y/%m/%d %I %p"
@@ -18047,7 +18459,7 @@ msgstr "%Y/%m/%d %I %p"
# e-util/e-time-utils.c:218
#. strptime format of a date and a time, in 24-hour format,
#. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:221
msgid "%m/%d/%Y %H"
msgstr "%Y/%m/%d %H"
@@ -18055,7 +18467,7 @@ msgstr "%Y/%m/%d %H"
# e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
# e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
#. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
@@ -18063,7 +18475,7 @@ msgstr "%I:%M:%S %p"
# e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
# e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
@@ -18075,8 +18487,8 @@ msgstr "%H:%M:%S"
# widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1647
#. strptime format for time of day, without seconds,
#. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
msgid "%I:%M %p"
msgstr "%I:%M %p"
@@ -18087,8 +18499,8 @@ msgstr "%I:%M %p"
# e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
# widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
msgid "%H:%M"
msgstr "%H:%M"
@@ -18096,57 +18508,116 @@ msgstr "%H:%M"
# e-util/e-time-utils.c:320
# e-util/e-time-utils.c:320
#. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
msgid "%I %p"
msgstr "%I %p"
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:181
-msgid "seconds"
-msgstr "秒"
+# calendar/gui/dialogs/alarm-page.c:344
+# calendar/gui/dialogs/alarm-page.c:344
+# calendar/gui/dialogs/alarm-page.c:344
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "1 second ago"
+msgstr "1 秒"
-#: filter/filter-datespec.c:71
-msgid "minute"
-msgstr "分钟"
+# calendar/gui/dialogs/alarm-page.c:341
+# calendar/gui/dialogs/alarm-page.c:341
+# calendar/gui/dialogs/alarm-page.c:341
+#: filter/filter-datespec.c:65
+#, fuzzy, c-format
+msgid "%d seconds ago"
+msgstr "%d 秒"
-#: filter/filter-datespec.c:72
-msgid "hour"
-msgstr "小时"
+# calendar/gui/dialogs/alarm-page.c:336
+# calendar/gui/dialogs/alarm-page.c:336
+# calendar/gui/dialogs/alarm-page.c:336
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "1 minute ago"
+msgstr "1 分钟"
-#: filter/filter-datespec.c:74
-msgid "week"
-msgstr "周"
+# calendar/gui/dialogs/alarm-page.c:333
+# calendar/gui/dialogs/alarm-page.c:333
+# calendar/gui/dialogs/alarm-page.c:333
+#: filter/filter-datespec.c:66
+#, fuzzy, c-format
+msgid "%d minutes ago"
+msgstr "%d 分钟"
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
-msgid "weeks"
-msgstr "周"
+# calendar/gui/dialogs/alarm-page.c:328
+# calendar/gui/dialogs/alarm-page.c:328
+# calendar/gui/dialogs/alarm-page.c:328
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "1 hour ago"
+msgstr "1 小时"
-#: filter/filter-datespec.c:75
-msgid "month"
-msgstr "月"
+# calendar/gui/dialogs/alarm-page.c:325
+# calendar/gui/dialogs/alarm-page.c:325
+# calendar/gui/dialogs/alarm-page.c:325
+#: filter/filter-datespec.c:67
+#, fuzzy, c-format
+msgid "%d hours ago"
+msgstr "%d 小时"
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
-msgid "months"
+# calendar/gui/dialogs/alarm-page.c:312
+# calendar/gui/dialogs/alarm-page.c:312
+# calendar/gui/dialogs/alarm-page.c:312
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "1 day ago"
+msgstr "1 天"
+
+#: filter/filter-datespec.c:68
+#, fuzzy, c-format
+msgid "%d days ago"
+msgstr " 过去"
+
+# calendar/gui/dialogs/alarm-page.c:320
+# calendar/gui/dialogs/alarm-page.c:320
+# calendar/gui/dialogs/alarm-page.c:320
+#: filter/filter-datespec.c:69
+#, fuzzy
+msgid "1 week ago"
+msgstr "1 周"
+
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+# calendar/gui/dialogs/alarm-page.c:317
+#: filter/filter-datespec.c:69
+#, fuzzy, c-format
+msgid "%d weeks ago"
+msgstr "%d 周"
+
+#: filter/filter-datespec.c:70
+#, fuzzy
+msgid "1 month ago"
msgstr "月"
-#: filter/filter-datespec.c:76
-msgid "year"
-msgstr "年"
+#: filter/filter-datespec.c:70
+#, fuzzy, c-format
+msgid "%d months ago"
+msgstr " 过去"
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
-msgid "years"
-msgstr "年"
+#: filter/filter-datespec.c:71
+msgid "1 year ago"
+msgstr ""
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:71
+#, fuzzy, c-format
+msgid "%d years ago"
+msgstr " 过去"
+
+#: filter/filter-datespec.c:176
#, fuzzy
msgid "You must choose a date."
msgstr "您忘记选择日期了。"
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
msgid "<click here to select a date>"
msgstr "<点击这里以选择日期>"
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
msgid "now"
msgstr "现在"
@@ -18157,37 +18628,31 @@ msgstr "现在"
# calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
# calendar/gui/calendar-commands.c:458
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
+#: filter/filter-datespec.c:285
#, fuzzy
msgid "%d-%b-%Y"
msgstr "%Y %b %d %a"
-#. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
-#, fuzzy, c-format
-msgid "%d %s ago"
-msgstr " 过去"
-
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:406
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
msgid "Filter Rules"
msgstr "过滤规则"
# addressbook/printing/e-contact-print.glade.h:38
# addressbook/printing/e-contact-print.glade.h:38
# mail/mail-config.glade.h:92
-#: filter/filter-file.c:178
+#: filter/filter-file.c:166
#, fuzzy
-msgid "You must specify a file name"
+msgid "You must specify a file name."
msgstr "指定文件名:"
# camel/providers/local/camel-spool-store.c:115
# camel/providers/local/camel-spool-store.c:115
# camel/providers/local/camel-spool-store.c:115
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
#, fuzzy, c-format
msgid "File '%s' does not exist or is not a regular file."
msgstr "脱机文件“%s”不存在或不是普通文件"
@@ -18195,37 +18660,33 @@ msgstr "脱机文件“%s”不存在或不是普通文件"
# ui/evolution-message-composer.xml.h:14
# ui/evolution-message-composer.xml.h:14
# ui/evolution-message-composer.xml.h:14
-#: filter/filter-file.c:307
+#: filter/filter-file.c:298
#, fuzzy
msgid "Choose a file"
msgstr "打开文件"
#. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
msgid "Then"
msgstr "则"
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "添加动作"
-
# addressbook/printing/e-contact-print.glade.h:38
# addressbook/printing/e-contact-print.glade.h:38
# mail/mail-config.glade.h:92
-#: filter/filter-folder.c:149
+#: filter/filter-folder.c:155
#, fuzzy
-msgid "You must specify a folder.\n"
+msgid "You must specify a folder."
msgstr "指定文件名:"
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1503 mail/mail-account-gui.c:1517
msgid "Select Folder"
msgstr "选择文件夹"
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
#, c-format
msgid ""
"Error in regular expression '%s':\n"
@@ -18234,22 +18695,23 @@ msgstr ""
"常规表达式错误 “%s”:\n"
"%s"
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1279
msgid "Important"
msgstr "重要"
# my-evolution/Locations.h:508
#. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
-#: mail/mail-config.glade.h:133
+#: filter/filter-label.c:122 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133 shell/e-config-upgrade.c:1280
#, fuzzy
msgid "Work"
msgstr "科克"
# my-evolution/Locations.h:1795
#. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
+#: shell/e-config-upgrade.c:1281
#, fuzzy
msgid "Personal"
msgstr "波纳尔"
@@ -18258,8 +18720,8 @@ msgstr "波纳尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:209
# addressbook/gui/contact-editor/e-contact-editor-address.c:335
#. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
-#: mail/mail-config.glade.h:124
+#: filter/filter-label.c:124 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124 shell/e-config-upgrade.c:1282
#, fuzzy
msgid "To Do"
msgstr "多哥"
@@ -18268,52 +18730,49 @@ msgstr "多哥"
# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
# calendar/gui/dialogs/alarm-page.glade.h:11
#. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
+#: shell/e-config-upgrade.c:1283
#, fuzzy
msgid "Later"
msgstr "之后"
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
msgid "Test"
msgstr "测试"
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
msgid "You must name this filter."
msgstr "您必须为该过滤规则命名。"
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
msgid "Rule name: "
msgstr "规则名:"
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
msgid "Untitled"
msgstr "无标题"
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
msgid "If"
msgstr "如果"
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
msgid "Execute actions"
msgstr "执行动作"
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
msgid "if all criteria are met"
msgstr "如果满足所有条件"
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
msgid "if any criteria are met"
msgstr "如果满足任一条件"
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "添加条件"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
msgid "incoming"
msgstr "接收"
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
msgid "outgoing"
msgstr "发送"
@@ -18365,7 +18824,7 @@ msgstr ""
"邮件的日期将与您在这里\n"
"指定的日期进行比较。"
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
msgid "Virtual Folders"
msgstr "虚拟文件夹"
@@ -18377,6 +18836,14 @@ msgstr "相对于当前时间的时间"
msgid "ago"
msgstr "过去"
+#: filter/filter.glade.h:23
+msgid "months"
+msgstr "月"
+
+#: filter/filter.glade.h:24 mail/mail-config.glade.h:182
+msgid "seconds"
+msgstr "秒"
+
#: filter/filter.glade.h:25
msgid "specific folders only"
msgstr "仅指定文件夹"
@@ -18394,6 +18861,10 @@ msgstr "您指定的时间"
msgid "vFolder Sources"
msgstr "虚拟文件夹来源"
+#: filter/filter.glade.h:29
+msgid "weeks"
+msgstr "周"
+
#: filter/filter.glade.h:30
msgid "with all active remote folders"
msgstr "以全部活跃远程文件夹"
@@ -18406,6 +18877,10 @@ msgstr "以全部本地和活跃远程文件夹"
msgid "with all local folders"
msgstr "以所有本地文件夹"
+#: filter/filter.glade.h:33
+msgid "years"
+msgstr "年"
+
#. Automatically generated. Do not edit.
#: filter/libfilter-i18n.h:2
#, fuzzy
@@ -18548,7 +19023,7 @@ msgstr "已标志"
# ui/evolution-mail-message.xml.h:98
# ui/evolution-mail-message.xml.h:98
# my-evolution/Locations.h:1192
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1793
#, fuzzy
msgid "Label"
msgstr "劳雷尔"
@@ -18582,7 +19057,7 @@ msgstr "执行 Shell 命令"
msgid "Play Sound"
msgstr "播放声音:"
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
msgid "Read"
msgstr "已读"
@@ -18621,12 +19096,12 @@ msgstr "小于"
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# mail/message-list.etspec.h:6
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
#: mail/message-list.etspec.h:10
msgid "Score"
msgstr "分数"
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1818
msgid "Sender"
msgstr "发件人"
@@ -18666,8 +19141,9 @@ msgstr "停止处理"
# mail/message-list.etspec.h:9
# mail/message-list.etspec.h:10
# mail/message-list.etspec.h:10
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
msgid "Subject"
msgstr "主题"
@@ -18675,39 +19151,50 @@ msgstr "主题"
msgid "Unset Status"
msgstr "未设置状态"
-#: filter/rule-editor.c:180
+#: filter/rule-context.c:661 filter/rule-editor.c:241 filter/rule-editor.c:325
+#: mail/mail-vfolder.c:915
+#, fuzzy, c-format
+msgid "Rule name '%s' is not unique, choose another."
+msgstr "规则名“%s”不唯一,另选一个"
+
+#: filter/rule-editor.c:170
msgid "Rules"
msgstr "规则"
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
-#, c-format
-msgid "Rule name '%s' is not unique, choose another"
-msgstr "规则名“%s”不唯一,另选一个"
-
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:291
msgid "Add Rule"
msgstr "添加规则"
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
msgid "Edit Rule"
msgstr "编辑规则"
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+#, fuzzy
+msgid "Rule name"
+msgstr "规则名:"
+
+#: filter/score-editor.c:114
msgid "Score Rules"
msgstr "计分规则"
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
msgid "You must name this vfolder."
msgstr "您必须为该虚拟文件夹命名。"
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
msgid "You need to to specify at least one folder as a source."
msgstr "您至少需要把一个文件夹指定为源。"
+#: filter/vfolder-rule.c:499
+#, fuzzy
+msgid "VFolder source"
+msgstr "虚拟文件夹来源"
+
# importers/elm-importer.c:95
# importers/elm-importer.c:95
# importers/elm-importer.c:95
-#: importers/elm-importer.c:95
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
msgid "Evolution is importing your old Elm mail"
msgstr "Evolution 正在导入您原来的电子邮件"
@@ -18718,7 +19205,8 @@ msgstr "Evolution 正在导入您原来的电子邮件"
# importers/elm-importer.c:96 importers/netscape-importer.c:107
# importers/pine-importer.c:101
#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
msgid "Importing..."
msgstr "导入..."
@@ -18729,7 +19217,8 @@ msgstr "导入..."
# importers/elm-importer.c:98 importers/netscape-importer.c:109
# importers/pine-importer.c:103
#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
+#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
msgid "Please wait"
msgstr "请等待"
@@ -18740,7 +19229,8 @@ msgstr "请等待"
# importers/elm-importer.c:169 importers/netscape-importer.c:689
# importers/pine-importer.c:365
#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
+#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
#, c-format
msgid "Importing %s as %s"
msgstr "正在按 %2$s 导入 %1$s"
@@ -18752,7 +19242,8 @@ msgstr "正在按 %2$s 导入 %1$s"
# importers/elm-importer.c:375 importers/netscape-importer.c:782
# importers/pine-importer.c:471
#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
+#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
#, c-format
msgid "Scanning %s"
msgstr "正在扫描 %s"
@@ -18764,15 +19255,16 @@ msgstr "正在扫描 %s"
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:116
+#: mail/folder-browser-ui.c:359 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
msgid "Mail"
msgstr "邮件"
# importers/elm-importer.c:545
# importers/elm-importer.c:545
# importers/elm-importer.c:545
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
msgid ""
"Evolution has found Elm mail files\n"
"Would you like to import them into Evolution?"
@@ -18783,7 +19275,7 @@ msgstr ""
# importers/elm-importer.c:574
# importers/elm-importer.c:574
# importers/elm-importer.c:574
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
msgid "Elm"
msgstr "Elm"
@@ -18801,12 +19293,12 @@ msgstr ""
# calendar/gui/print.c:2280
# calendar/gui/print.c:2280
# calendar/gui/print.c:2280
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
#, c-format
msgid "Priority Filter \"%s\""
msgstr "优先级过滤器“%s”"
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
msgid ""
"Some of your Netscape email filters are based on\n"
"email priorities, which are not used in Evolution.\n"
@@ -18821,7 +19313,7 @@ msgid ""
"everything still works as intended."
msgstr ""
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
msgid ""
"Some of your Netscape email filters use\n"
"the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -18829,7 +19321,7 @@ msgid ""
"These filters will be dropped."
msgstr ""
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
msgid ""
"Some of your Netscape email filters test the\n"
"body of emails for (in)equality to a given string,\n"
@@ -18841,7 +19333,7 @@ msgstr ""
# importers/netscape-importer.c:106
# importers/netscape-importer.c:106
# importers/netscape-importer.c:106
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution 正在导入您原来的 Netscape 数据"
@@ -18849,15 +19341,15 @@ msgstr "Evolution 正在导入您原来的 Netscape 数据"
# mail/mail-ops.c:1060 shell/e-local-storage.c:178
# mail/mail-ops.c:1103 shell/e-local-storage.c:178
#. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
msgid "Trash"
msgstr "已删除"
# camel/providers/local/camel-local-store.c:196
# camel/providers/local/camel-local-store.c:196
# camel/providers/local/camel-local-store.c:196
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
#, fuzzy
msgid "Scanning mail filters"
msgstr "本地邮件文件 %s"
@@ -18866,24 +19358,26 @@ msgstr "本地邮件文件 %s"
# importers/netscape-importer.c:888 importers/pine-importer.c:570
# importers/netscape-importer.c:888 importers/pine-importer.c:570
#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
msgid "Scanning directory"
msgstr "正在扫描目录"
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
+#: shell/e-shell-startup-wizard.c:541
msgid "Starting import"
msgstr "开始导入"
# importers/netscape-importer.c:963
# importers/netscape-importer.c:963
# importers/netscape-importer.c:963
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
msgid "Settings"
msgstr "设置"
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
#, fuzzy
msgid "Mail Filters"
msgstr "编辑过滤规则"
@@ -18891,7 +19385,7 @@ msgstr "编辑过滤规则"
# importers/netscape-importer.c:984
# importers/netscape-importer.c:984
# importers/netscape-importer.c:984
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -18902,14 +19396,14 @@ msgstr ""
# importers/pine-importer.c:100
# importers/pine-importer.c:100
# importers/pine-importer.c:100
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
msgid "Evolution is importing your old Pine data"
msgstr "Evolution 正在导入您原来的 Pine 数据"
# importers/pine-importer.c:663
# importers/pine-importer.c:663
# importers/pine-importer.c:663
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
msgid ""
"Evolution has found Pine mail files.\n"
"Would you like to import them into Evolution?"
@@ -18920,59 +19414,27 @@ msgstr ""
# importers/pine-importer.c:691
# importers/pine-importer.c:691
# importers/pine-importer.c:691
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
msgid "Pine"
msgstr "Pine"
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
msgid "Composer Preferences"
msgstr ""
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Configuration control for the Evolution Display Fonts."
-msgstr "Evolution 撰写器车间。"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Configuration control for the Evolution Mail Accounts."
-msgstr "Evolution 任务控制车间"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Configuration control for the Evolution Mailer."
-msgstr "Evolution 撰写器车间。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Configuration control for the Evolution Message Composer."
-msgstr "Evolution 撰写器车间。"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
msgid ""
"Configure mail preferences, including security and message display, here"
msgstr ""
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
msgid "Configure spell-checking, signatures, and the message composer here"
msgstr ""
# mail/GNOME_Evolution_Mail.oaf.in.h:6
# mail/GNOME_Evolution_Mail.oaf.in.h:6
# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
#, fuzzy
msgid "Configure the fonts used by Evolution here"
msgstr "Evolution 撰写器车间。"
@@ -18980,63 +19442,86 @@ msgstr "Evolution 撰写器车间。"
# ui/evolution-mail-global.xml.h:4
# ui/evolution-mail-global.xml.h:4
# ui/evolution-mail-global.xml.h:4
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
msgid "Configure your email accounts here"
msgstr "在这里配置您的电子邮件账号"
-# mail/GNOME_Evolution_Mail.oaf.in.h:1
-# mail/GNOME_Evolution_Mail.oaf.in.h:1
-# mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
-msgid "Evolution component for handling mail."
-msgstr "Evolution 处理邮件组件。"
+# data/evolution.desktop.in.h:1 shell/main.c:83
+# shell/main.c:83
+# shell/main.c:83
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 任务控制车间"
# mail/GNOME_Evolution_Mail.oaf.in.h:2
# mail/GNOME_Evolution_Mail.oaf.in.h:2
# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
-msgid "Evolution mail composer."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
msgstr "Evolution 邮件撰写器。"
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
-msgid "Evolution mail executive summary component."
-msgstr "Evolution 邮件实施概要组件。"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution 邮件撰写器。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 任务控制车间"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:8
+# mail/GNOME_Evolution_Mail.oaf.in.h:8
+# mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "邮件配置界面"
# mail/GNOME_Evolution_Mail.oaf.in.h:4
# mail/GNOME_Evolution_Mail.oaf.in.h:4
# mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
-msgid "Evolution mail folder display component."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail folder viewer"
msgstr "Evolution 邮件文件夹显示组件。"
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Evolution 邮件文件夹车间组件。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Evolution 撰写器车间。"
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Evolution Mail font configuration control"
+msgstr "Evolution 任务控制车间"
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "邮件概要组件车间。"
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 邮件实施概要组件。"
# calendar/gui/dialogs/recurrence-page.glade.h:11
# calendar/gui/dialogs/recurrence-page.glade.h:11
# calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
#, fuzzy
msgid "Font Preferences"
msgstr "没有循环(_N)"
@@ -19044,81 +19529,74 @@ msgstr "没有循环(_N)"
# mail/mail-config.glade.h:8
# mail/mail-config.glade.h:8
# mail/mail-config.glade.h:8
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
msgid "Mail Accounts"
msgstr "邮件帐号"
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
msgid "Mail Preferences"
msgstr "邮件首选项"
-# mail/GNOME_Evolution_Mail.oaf.in.h:8
-# mail/GNOME_Evolution_Mail.oaf.in.h:8
-# mail/GNOME_Evolution_Mail.oaf.in.h:8
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "Mail configuration interface"
-msgstr "邮件配置界面"
-
# mail/component-factory.c:100
# mail/component-factory.c:100
# mail/component-factory.c:100
-#: mail/component-factory.c:102
+#: mail/component-factory.c:116
msgid "Folder containing mail"
msgstr "文件夹含有邮件"
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
msgid "Public Mail"
msgstr "公共邮件"
# mail/component-factory.c:100
# mail/component-factory.c:100
# mail/component-factory.c:100
-#: mail/component-factory.c:103
+#: mail/component-factory.c:117
msgid "Public folder containing mail"
msgstr "公共文件夹含有邮件"
# mail/component-factory.c:102
# mail/component-factory.c:102
# mail/component-factory.c:102
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
msgid "Virtual Trash"
msgstr "虚拟已删除邮件箱"
# mail/component-factory.c:102
# mail/component-factory.c:102
# mail/component-factory.c:102
-#: mail/component-factory.c:104
+#: mail/component-factory.c:118
msgid "Virtual Trash folder"
msgstr "虚拟已删除邮件文件夹"
# mail/component-factory.c:147
# mail/component-factory.c:147
# mail/component-factory.c:147
-#: mail/component-factory.c:132
+#: mail/component-factory.c:146
msgid "This folder cannot contain messages."
msgstr "该文件夹不能含有邮件。"
# mail/component-factory.c:432
# mail/component-factory.c:432
# mail/component-factory.c:432
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
msgid "Properties..."
msgstr "属性..."
# mail/component-factory.c:432
# mail/component-factory.c:432
# mail/component-factory.c:432
-#: mail/component-factory.c:427
+#: mail/component-factory.c:440
msgid "Change this folder's properties"
msgstr "改变该文件夹的属性"
# mail/component-factory.c:783
# mail/component-factory.c:783
# mail/component-factory.c:786
-#: mail/component-factory.c:805
+#: mail/component-factory.c:818
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
@@ -19127,46 +19605,39 @@ msgstr "您的某些邮件设置好像已崩溃,请按顺序检查所有内容
# mail/mail-callbacks.c:230
# mail/mail-callbacks.c:230
# mail/mail-callbacks.c:187
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
msgid "You have not set a mail transport method"
msgstr "您还没有设置邮件传输方法"
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1020
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "您已取消邮件的发送,您仍希望退出吗?"
-# composer/e-msg-composer.c:1412
-# composer/e-msg-composer.c:1329
-# composer/e-msg-composer.c:1295
-#: mail/component-factory.c:998
-msgid "Warning: Unsent Messages"
-msgstr "警告: 未发送的邮件"
-
# mail/component-factory.c:951
# mail/component-factory.c:951
# mail/component-factory.c:955
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
msgid "New Mail Message"
msgstr "新建邮件"
# ui/evolution-mail-global.xml.h:20
# ui/evolution-mail-global.xml.h:20
# ui/evolution-mail-global.xml.h:20
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1060
msgid "_Mail Message"
msgstr "邮件(_M)"
# composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
# composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
# composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1061
msgid "Compose a new mail message"
msgstr "撰写一封新邮件"
# ui/evolution-mail-global.xml.h:10
# ui/evolution-mail-global.xml.h:10
# ui/evolution-mail-global.xml.h:10
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
#, fuzzy
msgid "New Message Post"
msgstr "新建邮件"
@@ -19174,42 +19645,21 @@ msgstr "新建邮件"
# ui/evolution-mail-message.xml.h:65
# ui/evolution-mail-message.xml.h:65
# ui/evolution-mail-message.xml.h:65
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1069
msgid "_Post Message"
msgstr "发送邮件(_P)"
# mail/component-factory.c:951
# mail/component-factory.c:951
# mail/component-factory.c:955
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1070
msgid "Post a new mail message"
msgstr "发送一封新邮件"
-# mail/component-factory.c:975
-# mail/component-factory.c:975
-# mail/component-factory.c:980
-#: mail/component-factory.c:1078
-msgid "Cannot initialize the Evolution mail component."
-msgstr "无法初始化 Evolution 的邮件组件。"
-
-# mail/component-factory.c:984
-# mail/component-factory.c:984
-# mail/component-factory.c:989
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "无法初始化 Evolution 的邮件配置组件。"
-
-# mail/component-factory.c:990
-# mail/component-factory.c:990
-# mail/component-factory.c:995
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "无法初始化 Evolution 的文件夹信息组件。"
-
# mail/mail-config.c:2184 mail/mail-config.c:2188
# mail/mail-config.c:2233 mail/mail-config.c:2237
# mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1353
#, fuzzy
msgid "Connecting..."
msgstr "正在连接服务器..."
@@ -19217,14 +19667,14 @@ msgstr "正在连接服务器..."
# mail/component-factory.c:1206
# mail/component-factory.c:1206
# mail/component-factory.c:1211
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1364
msgid "Cannot register storage with shell"
msgstr "无法用 shell 注册存储"
# mail/folder-browser-ui.c:272
# mail/folder-browser-ui.c:272
# mail/folder-browser-ui.c:273
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:485
#, c-format
msgid "Properties for \"%s\""
msgstr "“%s”的属性"
@@ -19232,14 +19682,14 @@ msgstr "“%s”的属性"
# mail/folder-browser-ui.c:274
# mail/folder-browser-ui.c:274
# mail/folder-browser-ui.c:275
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:487
msgid "Properties"
msgstr "属性"
# mail/folder-browser.c:297 mail/mail-display.c:298
# mail/folder-browser.c:297 mail/mail-display.c:297
# mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:939
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "无法创建临时目录: %s"
@@ -19247,7 +19697,7 @@ msgstr "无法创建临时目录: %s"
# mail/folder-browser.c:731
# mail/folder-browser.c:751
# mail/folder-browser.c:752
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
#, c-format
msgid "%d new"
msgstr "%d 新"
@@ -19258,21 +19708,21 @@ msgstr "%d 新"
# mail/folder-browser.c:765
# mail/folder-browser.c:755 mail/folder-browser.c:763
# mail/folder-browser.c:766
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
msgid ", "
msgstr ", "
# mail/folder-browser.c:735
# mail/folder-browser.c:756
# mail/folder-browser.c:757
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
#, c-format
msgid "%d hidden"
msgstr "隐藏 %d 个"
# mail/folder-browser.c:759
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
#, c-format
msgid "%d visible"
msgstr "%d 个可见"
@@ -19280,7 +19730,7 @@ msgstr "%d 个可见"
# mail/folder-browser.c:740
# mail/folder-browser.c:763
# mail/folder-browser.c:764
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
#, c-format
msgid "%d selected"
msgstr "选择 %d 个"
@@ -19288,7 +19738,7 @@ msgstr "选择 %d 个"
# mail/folder-browser.c:763
# mail/folder-browser.c:768
# mail/folder-browser.c:769
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
#, c-format
msgid "%d unsent"
msgstr "%d 个未发送"
@@ -19296,7 +19746,7 @@ msgstr "%d 个未发送"
# mail/folder-browser.c:765
# mail/folder-browser.c:770
# mail/folder-browser.c:771
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
#, c-format
msgid "%d sent"
msgstr "%d 个已发送"
@@ -19304,7 +19754,7 @@ msgstr "%d 个已发送"
# mail/folder-browser.c:767
# mail/folder-browser.c:772
# mail/folder-browser.c:773
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
#, c-format
msgid "%d total"
msgstr "共 %d 个"
@@ -19312,7 +19762,7 @@ msgstr "共 %d 个"
# ui/evolution-mail-message.xml.h:8
# ui/evolution-mail-message.xml.h:8
# ui/evolution-mail-message.xml.h:8
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1182
#, fuzzy
msgid "Create _Virtual Folder From Search..."
msgstr "从邮件创建虚拟文件夹(_V)"
@@ -19320,102 +19770,102 @@ msgstr "从邮件创建虚拟文件夹(_V)"
# mail/folder-browser.c:1430
# mail/folder-browser.c:1437
# mail/folder-browser.c:1438
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1729
msgid "VFolder on _Subject"
msgstr "关于主题的虚拟文件夹(_S)"
# mail/folder-browser.c:1431
# mail/folder-browser.c:1438
# mail/folder-browser.c:1439
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1730
msgid "VFolder on Se_nder"
msgstr "关于发件人的虚拟文件夹(_N)"
# mail/folder-browser.c:1432
# mail/folder-browser.c:1439
# mail/folder-browser.c:1440
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1731
msgid "VFolder on _Recipients"
msgstr "关于收件人的虚拟文件夹(_R)"
# mail/folder-browser.c:1433
# mail/folder-browser.c:1440
# mail/folder-browser.c:1441
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1732
msgid "VFolder on Mailing _List"
msgstr "关于邮件列表的虚拟文件夹(_L)"
# mail/folder-browser.c:1437
# mail/folder-browser.c:1444
# mail/folder-browser.c:1445
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1736
msgid "Filter on Sub_ject"
msgstr "过滤标题(_J)"
# mail/folder-browser.c:1438
# mail/folder-browser.c:1445
# mail/folder-browser.c:1446
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1737
msgid "Filter on Sen_der"
msgstr "过滤发件人(_D)"
# mail/folder-browser.c:1439
# mail/folder-browser.c:1446
# mail/folder-browser.c:1447
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1738
msgid "Filter on Re_cipients"
msgstr "过滤收件人(_C)"
# mail/folder-browser.c:1440
# mail/folder-browser.c:1447
# mail/folder-browser.c:1448
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1739 mail/folder-browser.c:2063
msgid "Filter on _Mailing List"
msgstr "过滤邮件列表(_M)"
# mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:96
# mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:96
# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:98
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1757
msgid "_Edit as New Message..."
msgstr "作为新邮件进行编辑(_E)..."
# mail/folder-browser.c:1450
# mail/folder-browser.c:1457
# mail/folder-browser.c:1458
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1759
msgid "_Print"
msgstr "打印(_P)"
# mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:104
# mail/folder-browser.c:1461 ui/evolution-mail-message.xml.h:104
# mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1763 ui/evolution-mail-message.xml.h:110
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
# mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:73
# mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:73
# mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:75
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1764 ui/evolution-mail-message.xml.h:75
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
# mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:72
# mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:74
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:74
msgid "Reply to _All"
msgstr "回复所有人(_A)"
# mail/folder-browser.c:1457
# mail/folder-browser.c:1464
# mail/folder-browser.c:1465
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1766
msgid "_Forward"
msgstr "转发(_F)"
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1770
msgid "Follo_w Up..."
msgstr ""
@@ -19431,7 +19881,7 @@ msgstr ""
# calendar/gui/dialogs/task-details-page.glade.h:4
# calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1771
#, fuzzy
msgid "Fla_g Completed"
msgstr "已完成"
@@ -19440,7 +19890,7 @@ msgstr "已完成"
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# widgets/misc/e-filter-bar.h:95
# widgets/misc/e-filter-bar.h:95
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1772
#, fuzzy
msgid "Cl_ear Flag"
msgstr "清除"
@@ -19449,14 +19899,14 @@ msgstr "清除"
# mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:43
# mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
#. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1776 ui/evolution-mail-message.xml.h:43
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
# mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
# mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
# mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1777
#, fuzzy
msgid "Mark as _Unread"
msgstr "标记为未读(_N)"
@@ -19464,14 +19914,14 @@ msgstr "标记为未读(_N)"
# mail/folder-browser.c:1461
# mail/folder-browser.c:1468
# mail/folder-browser.c:1469
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1778
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
# ui/evolution-mail-message.xml.h:46
# ui/evolution-mail-message.xml.h:46
# ui/evolution-mail-message.xml.h:46
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1779
#, fuzzy
msgid "_Mark as Unimportant"
msgstr "标记为不重要(_O)"
@@ -19479,7 +19929,7 @@ msgstr "标记为不重要(_O)"
# mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
# mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
# mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1784
#, fuzzy
msgid "U_ndelete"
msgstr "反删除(_U)"
@@ -19487,7 +19937,7 @@ msgstr "反删除(_U)"
# mail/folder-browser.c:1466
# mail/folder-browser.c:1475
# mail/folder-browser.c:1476
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1788
#, fuzzy
msgid "Mo_ve to Folder..."
msgstr "移动到文件夹(_M)..."
@@ -19495,14 +19945,14 @@ msgstr "移动到文件夹(_M)..."
# mail/folder-browser.c:1467
# mail/folder-browser.c:1476
# mail/folder-browser.c:1477
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1789 ui/evolution-addressbook.xml.h:31
msgid "_Copy to Folder..."
msgstr "复制到文件夹..."
# mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
# mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
# mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1797
#, fuzzy
msgid "Add Sender to Address_book"
msgstr "将发件人添加到地址簿"
@@ -19510,7 +19960,7 @@ msgstr "将发件人添加到地址簿"
# mail/folder-browser.c:1476
# mail/folder-browser.c:1485
# mail/folder-browser.c:1486
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1801
#, fuzzy
msgid "Appl_y Filters"
msgstr "应用过滤规则"
@@ -19518,7 +19968,7 @@ msgstr "应用过滤规则"
# mail/folder-browser.c:1478
# mail/folder-browser.c:1487
# mail/folder-browser.c:1488
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1805
#, fuzzy
msgid "Crea_te Rule From Message"
msgstr "从消息创建规则(_L)"
@@ -19526,7 +19976,7 @@ msgstr "从消息创建规则(_L)"
# mail/folder-browser.c:1629
# mail/folder-browser.c:1657
# mail/folder-browser.c:1658
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2064
#, fuzzy
msgid "VFolder on M_ailing List"
msgstr "关于邮件列表的虚拟文件夹"
@@ -19534,7 +19984,7 @@ msgstr "关于邮件列表的虚拟文件夹"
# mail/folder-browser.c:1631
# mail/folder-browser.c:1659
# mail/folder-browser.c:1660
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2066
#, fuzzy, c-format
msgid "Filter on _Mailing List (%s)"
msgstr "过滤邮件列表 (%s)"
@@ -19542,7 +19992,7 @@ msgstr "过滤邮件列表 (%s)"
# mail/folder-browser.c:1632
# mail/folder-browser.c:1660
# mail/folder-browser.c:1661
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2067
#, fuzzy, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr "关于邮件列表 (%s) 的虚拟文件夹"
@@ -19550,44 +20000,60 @@ msgstr "关于邮件列表 (%s) 的虚拟文件夹"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/folder-browser.h:26
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
msgid "Default"
msgstr "默认"
# mail/folder-info.c:64
# mail/folder-info.c:64
# mail/folder-info.c:64
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
msgid "Getting Folder Information"
msgstr "获取文件夹信息"
-# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr "将邮件箱导入 Evolution 的车间"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution 邮件撰写器。"
-# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr "将邮件箱文件导入到 Evolution"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution 邮件撰写器。"
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "将 Outlook Express 4 的邮件导入 Evolution 的车间"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr ""
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "将 Outlook Express 4 文件导入到 Evolution"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution 邮件撰写器。"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolution 邮件撰写器。"
# mail/local-config.glade.h:2
# mail/local-config.glade.h:2
@@ -19648,7 +20114,7 @@ msgstr "mh"
# mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
# mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
# mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
msgid "You have not filled in all of the required information."
msgstr "您还没有填写所有必须的信息。"
@@ -19656,21 +20122,21 @@ msgstr "您还没有填写所有必须的信息。"
# mail/mail-account-editor.c:160
# mail/mail-account-editor.c:160
#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
msgid "Evolution Account Editor"
msgstr "Evolution 帐号编辑器"
# mail/mail-config.glade.h:104
# mail/mail-config.glade.h:104
# mail/mail-config.glade.h:113
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:156
msgid "_Host:"
msgstr "主机(_H):"
# mail/mail-config.glade.h:117
# mail/mail-config.glade.h:117
# mail/mail-config.glade.h:126
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:127
#, fuzzy
msgid "User_name:"
msgstr "用户名(_U):"
@@ -19678,68 +20144,68 @@ msgstr "用户名(_U):"
# mail/mail-config.glade.h:112
# mail/mail-config.glade.h:112
# mail/mail-config.glade.h:121
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:163
msgid "_Path:"
msgstr "路径(_P):"
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1654
# mail/mail-account-gui.c:1665
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1880
msgid "You may not create two accounts with the same name."
msgstr "您不能以相同的名字创建两个帐号。"
# mail/mail-accounts.c:293
# mail/mail-accounts.c:293
# mail/mail-accounts.c:293
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
msgid "Are you sure you want to delete this account?"
msgstr "您确信您要删除该帐号?"
# mail/mail-accounts.c:297
# mail/mail-accounts.c:297
# mail/mail-accounts.c:297
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
msgid "Don't delete"
msgstr "不要删除"
-# mail/mail-accounts.c:300
-# mail/mail-accounts.c:300
-# mail/mail-accounts.c:300
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "确实删除帐号?"
-
# mail/mail-accounts.c:194
# mail/mail-accounts.c:194
# mail/mail-accounts.c:194
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
msgid "Disable"
msgstr "禁用"
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
# mail/mail-accounts.c:196
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:674 mail/mail-composer-prefs.c:692
msgid "Enable"
msgstr "启用"
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/folder-browser.h:26
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+#, fuzzy
+msgid "[Default]"
+msgstr "默认"
+
# mail/mail-config.glade.h:33
# mail/mail-config.glade.h:33
# mail/mail-config.glade.h:39
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:704 mail/mail-composer-prefs.c:860
msgid "Enabled"
msgstr "已启用"
# addressbook/gui/component/addressbook-config.glade.h:23
# addressbook/gui/component/addressbook-config.glade.h:23
# addressbook/gui/component/addressbook-config.glade.h:30
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
#, fuzzy
msgid "Account name"
msgstr "帐号名(_A):"
@@ -19748,7 +20214,7 @@ msgstr "帐号名(_A):"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/e-contact-editor-address.c:298
# my-evolution/Locations.h:1824
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
#, fuzzy
msgid "Protocol"
msgstr "波多黎各"
@@ -19756,7 +20222,7 @@ msgstr "波多黎各"
# mail/mail-autofilter.c:72
# mail/mail-autofilter.c:72
# mail/mail-autofilter.c:72
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
#, c-format
msgid "Mail to %s"
msgstr "邮寄给 %s"
@@ -19764,7 +20230,7 @@ msgstr "邮寄给 %s"
# mail/mail-autofilter.c:215
# mail/mail-autofilter.c:217
# mail/mail-autofilter.c:217
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
#, c-format
msgid "Subject is %s"
msgstr "主题是 %s"
@@ -19772,7 +20238,7 @@ msgstr "主题是 %s"
# mail/mail-autofilter.c:231
# mail/mail-autofilter.c:233
# mail/mail-autofilter.c:233
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
#, c-format
msgid "Mail from %s"
msgstr "邮件来自 %s"
@@ -19780,7 +20246,7 @@ msgstr "邮件来自 %s"
# mail/mail-autofilter.c:287
# mail/mail-autofilter.c:289
# mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
#, c-format
msgid "%s mailing list"
msgstr "%s 邮件列表"
@@ -19788,15 +20254,15 @@ msgstr "%s 邮件列表"
# mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
# mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
# mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
msgid "The following filter rule(s):\n"
msgstr "下列过滤器规则:\n"
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
#, c-format
msgid ""
"Used the removed folder:\n"
@@ -19804,10 +20270,18 @@ msgid ""
"And have been updated."
msgstr ""
+# widgets/misc/e-messagebox.c:224
+# widgets/misc/e-messagebox.c:224
+# widgets/misc/e-messagebox.c:224
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:100 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "不再显示该邮件。"
+
# mail/mail-callbacks.c:137
# mail/mail-callbacks.c:137
# mail/mail-callbacks.c:94
-#: mail/mail-callbacks.c:154
+#: mail/mail-callbacks.c:189
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -19822,7 +20296,19 @@ msgstr ""
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:186
# mail/mail-callbacks.c:143
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:211
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"在您可以撰写邮件之前\n"
+"您需要配置一个标识。"
+
+# mail/mail-callbacks.c:186
+# mail/mail-callbacks.c:186
+# mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:225
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -19833,7 +20319,7 @@ msgstr ""
# mail/mail-callbacks.c:200
# mail/mail-callbacks.c:200
# mail/mail-callbacks.c:157
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:232
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -19845,7 +20331,7 @@ msgstr ""
# mail/mail-callbacks.c:265
# mail/mail-callbacks.c:222
#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:254
#, fuzzy
msgid ""
"You are sending an HTML-formatted message. Please make sure that\n"
@@ -19855,14 +20341,14 @@ msgstr "您正在发送 HTML 格式的消息,当以下收件人不希望接收
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:280
# mail/mail-callbacks.c:237
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:266
msgid "Send anyway?"
msgstr "仍然发送?"
# mail/mail-callbacks.c:322
# mail/mail-callbacks.c:322
# mail/mail-callbacks.c:279
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:287
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -19873,7 +20359,7 @@ msgstr ""
# mail/mail-callbacks.c:366
# mail/mail-callbacks.c:366
# mail/mail-callbacks.c:323
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:313
msgid ""
"Since the contact list you are sending to is configured to hide the list's "
"addresses, this message will contain only Bcc recipients."
@@ -19884,14 +20370,14 @@ msgstr ""
# mail/mail-callbacks.c:370
# mail/mail-callbacks.c:370
# mail/mail-callbacks.c:327
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:317
msgid "This message contains only Bcc recipients."
msgstr "该邮件只含有密件抄送收件人。"
# mail/mail-callbacks.c:374
# mail/mail-callbacks.c:374
# mail/mail-callbacks.c:331
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:322
msgid ""
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
@@ -19903,14 +20389,14 @@ msgstr ""
# mail/mail-callbacks.c:504
# mail/mail-callbacks.c:504
# mail/mail-callbacks.c:460
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:470
msgid "You must specify recipients in order to send this message."
msgstr "您必须指定收件人以便发送该消息。"
# composer/e-msg-composer.c:1068
# mail/mail-callbacks.c:716
# mail/mail-callbacks.c:668
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:722
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -19921,35 +20407,35 @@ msgstr ""
# mail/mail-callbacks.c:838
# mail/mail-callbacks.c:928
# mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1187
msgid "an unknown sender"
msgstr "未知的发件人"
# mail/mail-callbacks.c:843
# mail/mail-callbacks.c:933
# mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1191
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr "在 %Y-%m-%d %a 的 %H:%M, %%s 写道:"
# mail/mail-callbacks.c:1281 mail/message-browser.c:130
# mail/mail-callbacks.c:1376 mail/message-browser.c:130
# mail/mail-callbacks.c:1411 mail/message-browser.c:130
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1698 mail/message-browser.c:123
msgid "Move message(s) to"
msgstr "将消息移动到"
# mail/mail-callbacks.c:1283 mail/message-browser.c:132
# mail/mail-callbacks.c:1378 mail/message-browser.c:132
# mail/mail-callbacks.c:1413 mail/message-browser.c:132
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:125
msgid "Copy message(s) to"
msgstr "将消息复制到"
# mail/mail-callbacks.c:1759
# mail/mail-callbacks.c:1878
# mail/mail-callbacks.c:1914
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2344
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "您确信您需要编辑所有的 %d 个消息?"
@@ -19957,7 +20443,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息?"
# mail/mail-callbacks.c:1784
# mail/mail-callbacks.c:1903
# mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2360
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -19968,7 +20454,7 @@ msgstr ""
# mail/mail-callbacks.c:1823
# mail/mail-callbacks.c:1942
# mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2393
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -19979,7 +20465,7 @@ msgstr ""
# mail/mail-callbacks.c:1837
# mail/mail-callbacks.c:1956
# mail/mail-callbacks.c:1992
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2403
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "您确信您希望重新发送所有的 %d 个消息?"
@@ -19987,56 +20473,77 @@ msgstr "您确信您希望重新发送所有的 %d 个消息?"
# mail/mail-callbacks.c:1863
# mail/mail-callbacks.c:1982
# mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2424
msgid "No Message Selected"
msgstr "没有选择消息"
-# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
-# mail/mail-display.c:102
-# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
-# mail/mail-display.c:102
-# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
-# mail/mail-display.c:101
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "覆盖文件?"
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# camel/providers/local/camel-spool-folder.c:579
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# camel/providers/local/camel-spool-folder.c:579
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# camel/providers/local/camel-spool-folder.c:579
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"无法获取邮件: %s\n"
+" %s"
+
+# addressbook/gui/contact-editor/e-contact-save-as.c:201
+# addressbook/gui/contact-editor/e-contact-save-as.c:201
+# addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s 已经存在\n"
+"您打算覆盖它吗?"
# mail/mail-callbacks.c:1962
# mail/mail-callbacks.c:2081
# mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2511
msgid "Save Message As..."
msgstr "消息另存为..."
# mail/mail-callbacks.c:1964
# mail/mail-callbacks.c:2083
# mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2513
msgid "Save Messages As..."
msgstr "消息另存为..."
-# ui/evolution-mail-message.xml.h:21
-# ui/evolution-mail-message.xml.h:21
-# ui/evolution-mail-message.xml.h:21
-#: mail/mail-callbacks.c:2655
-msgid "Go to next folder with unread messages?"
-msgstr "转入下一个含有未读消息的文件夹?"
-
-#: mail/mail-callbacks.c:2662
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-"本文件夹里没有更多新消息了。\n"
-"您愿意转入下一个文件夹?"
-
# mail/mail-callbacks.c:2135
# mail/mail-callbacks.c:2254
# mail/mail-callbacks.c:2290
-#: mail/mail-callbacks.c:2905
+#: mail/mail-callbacks.c:2687
+#, fuzzy
msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
"\n"
"Really erase these messages?"
msgstr ""
@@ -20048,7 +20555,7 @@ msgstr ""
# mail/mail-callbacks.c:2250
# mail/mail-callbacks.c:2369
# mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2782
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -20060,14 +20567,14 @@ msgstr ""
# mail/mail-callbacks.c:2262
# mail/mail-callbacks.c:2381
# mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2790
msgid "Filters"
msgstr "过滤规则"
# camel/camel-filter-driver.c:789
# camel/camel-filter-driver.c:838
# mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2831
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
@@ -20075,71 +20582,80 @@ msgstr "第 %d 页,共 %d 页"
# mail/mail-callbacks.c:2325
# mail/mail-callbacks.c:2465
# mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2887
msgid "Print Message"
msgstr "打印消息"
-# mail/mail-callbacks.c:2492
-# mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr "美国信纸"
-
# mail/mail-callbacks.c:2371
# mail/mail-callbacks.c:2531
# mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2954
msgid "Printing of message failed"
msgstr "打印消息失败"
# mail/mail-callbacks.c:2473
# mail/mail-callbacks.c:2697
# mail/mail-callbacks.c:2770
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3147
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息?"
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: mail/mail-composer-prefs.c:227 mail/mail-composer-prefs.c:350
+#: mail/mail-config.c:1290
+msgid "Unnamed"
+msgstr "未命名"
+
+#: mail/mail-composer-prefs.c:335
+#, fuzzy
+msgid "You must specify a valid script name."
+msgstr "请给出有效的脚本名"
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# my-evolution/e-summary-calendar.c:395
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
-msgid " [script]"
+#: mail/mail-composer-prefs.c:393 mail/mail-composer-prefs.c:455
+#, fuzzy
+msgid "[script]"
msgstr " [脚本]"
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
-msgstr "请给出有效的脚本名"
-
-# addressbook/gui/component/select-names/e-select-names-popup.c:506
-# addressbook/gui/component/select-names/e-select-names-popup.c:506
-# addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
-msgid "Unnamed"
-msgstr "未命名"
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+# calendar/gui/dialogs/meeting-page.etspec.h:6
+# calendar/gui/e-meeting-time-sel.etspec.h:6
+#: mail/mail-composer-prefs.c:864
+#, fuzzy
+msgid "Language(s)"
+msgstr "语言"
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:906
msgid "Add script signature"
msgstr "添加脚本签名"
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1036
-#: mail/mail-composer-prefs.c:876
-msgid "Add Signature"
-msgstr "添加签名"
+# mail/mail-config.glade.h:116
+# mail/mail-config.glade.h:116
+# mail/mail-config.glade.h:125
+#: mail/mail-composer-prefs.c:926
+#, fuzzy
+msgid "Signature(s)"
+msgstr "签名(_S)"
+
+# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "标识"
# mail/mail-config-druid.c:146
# mail/mail-config-druid.c:146
# mail/mail-config-druid.c:146
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:382
#, fuzzy
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
@@ -20149,10 +20665,18 @@ msgstr ""
"请在下面输入您的名字和电子邮件地址。“可选”域可以不填写,\n"
"除非您希望在您发送的邮件中含有这些信息。"
+# mail/mail-config.glade.h:62
+# mail/mail-config.glade.h:62
+# mail/mail-config.glade.h:71
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "正在接收邮件(_R)"
+
# mail/mail-config-druid.c:148
# mail/mail-config-druid.c:148
# mail/mail-config-druid.c:148
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:390
#, fuzzy
msgid ""
"Please enter information about your incoming mail server below. If you are "
@@ -20164,14 +20688,22 @@ msgstr ""
# mail/mail-config-druid.c:150
# mail/mail-config-druid.c:150
# mail/mail-config-druid.c:150
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
msgid "Please select among the following options"
msgstr "请从以下选项中选择"
+# mail/mail-config.glade.h:71
+# mail/mail-config.glade.h:71
+# mail/mail-config.glade.h:80
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "正在发送邮件(_S)"
+
# mail/mail-config-druid.c:152
# mail/mail-config-druid.c:152
# mail/mail-config-druid.c:152
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:402
#, fuzzy
msgid ""
"Please enter information about the way you will send mail. If you are not "
@@ -20180,10 +20712,17 @@ msgstr ""
"请输入您发送邮件的方式的信息。如果您不能确定,\n"
"请询问您的系统管理员或互联网服务提供商。"
+# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "帐号管理"
+
# mail/mail-config-druid.c:154
# mail/mail-config-druid.c:154
# mail/mail-config-druid.c:154
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:409
#, fuzzy
msgid ""
"You are almost done with the mail configuration process. The identity, "
@@ -20197,104 +20736,77 @@ msgstr ""
"请在下面输入该帐号的名称。\n"
"该名称仅用于显示。"
-# mail/mail-config-druid.c:599
-# mail/mail-config-druid.c:599
-# mail/mail-config-druid.c:599
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr "Evolution 帐号助手"
-
-# mail/mail-config.c:326
-# mail/mail-config.c:329
-# mail/mail-config.c:354
-#: mail/mail-config.c:622
-#, c-format
-msgid "Account %d"
-msgstr "帐号 %d"
-
# mail/mail-config.c:2113
# mail/mail-config.c:2155
# mail/mail-config.c:2248
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:994
msgid "Checking Service"
msgstr "正在检查服务"
# mail/mail-config.c:2184 mail/mail-config.c:2188
# mail/mail-config.c:2233 mail/mail-config.c:2237
# mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
+#: mail/mail-config.c:1072 mail/mail-config.c:1076
msgid "Connecting to server..."
msgstr "正在连接服务器..."
# mail/mail-config.glade.h:1
# mail/mail-config.glade.h:1
# mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
msgid " _Check for supported types "
msgstr "检查支持的类型(_C) "
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
msgid "(SSL is not supported in this build of Evolution)"
msgstr "(在该版本的 evolution 中不支持SSL)"
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
# mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
msgid "(SSL is not supported in this build of evolution)"
msgstr "(在该版本的 evolution 中不支持SSL)"
# mail/mail-config.glade.h:4
# mail/mail-config.glade.h:4
# mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
msgid "A_lways encrypt to myself when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_L)"
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-
# mail/mail-config.c:326
# mail/mail-config.c:329
# mail/mail-config.c:354
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
msgid "Account Editor"
msgstr "帐号编辑器"
# mail/mail-config.glade.h:6
# mail/mail-config.glade.h:6
# mail/mail-config.glade.h:6
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
msgid "Account Information"
msgstr "帐号信息"
-# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-# mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "帐号管理"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
msgid "Add Sc_ript"
msgstr "添加脚本(_R)"
# mail/mail-account-gui.c:1039
# mail/mail-account-gui.c:1039
# mail/mail-account-gui.c:1036
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
msgid "Add new signature..."
msgstr "添加新签名..."
# mail/mail-config.glade.h:4
# mail/mail-config.glade.h:4
# mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
#, fuzzy
msgid "Al_ways encrypt to myself when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_L)"
@@ -20302,63 +20814,63 @@ msgstr "当发送加密邮件时总是对自身加密(_L)"
# mail/mail-config.glade.h:10
# mail/mail-config.glade.h:10
# mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
#, fuzzy
msgid "Alwa_ys sign outgoing messages when using this account"
msgstr "当使用该帐号的时候总是签名发送的邮件(_S)"
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
msgid "Always _blind carbon-copy (Bcc) to:"
msgstr "总是暗送到(_B):"
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
msgid "Always _carbon-copy (Cc) to:"
msgstr "总是抄送到(_C):"
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
# composer/e-msg-composer-attachment-bar.c:532
# composer/e-msg-composer-attachment-bar.c:538
# composer/e-msg-composer-attachment-bar.c:538
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
msgid "Attach original message"
msgstr "附加原始消息"
# mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
# mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
# mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "附件"
# mail/mail-config.glade.h:12
# mail/mail-config.glade.h:12
# mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
msgid "Authentication"
msgstr "身份验证"
# mail/mail-config.glade.h:94
# mail/mail-config.glade.h:94
# mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
msgid "Automatically _detect links"
msgstr "自动检查连接"
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
msgid "Baltic (ISO-8859-13)"
msgstr ""
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
msgid "Baltic (ISO-8859-4)"
msgstr ""
# widgets/misc/e-charset-picker.c:159
# widgets/misc/e-charset-picker.c:159
# widgets/misc/e-charset-picker.c:162
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
msgid "C_haracter set:"
msgstr "字符集(_H)"
@@ -20368,53 +20880,54 @@ msgstr "字符集(_H)"
# ui/evolution-comp-editor.xml.h:1
# calendar/gui/alarm-notify/alarm-notify.glade.h:1
# ui/evolution-comp-editor.xml.h:1
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
msgid "C_olors"
msgstr "颜色(_O)"
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
# mail/mail-config.glade.h:13
# mail/mail-config.glade.h:13
# mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
msgid "Checking for New Mail"
msgstr "正在检查新邮件"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
msgid "Color for _misspelled words:"
msgstr "给错误拼写的单词上色(_M):"
# composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
# composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
# mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
msgid "Composing Messages"
msgstr "正在撰写邮件"
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:15
# mail/mail-config.glade.h:19
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
msgid "Configuration"
msgstr "配置"
# mail/mail-config.glade.h:17
# mail/mail-config.glade.h:17
# mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
+#, fuzzy
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
"You are now ready to send and receive email \n"
"using Evolution. \n"
"\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
msgstr ""
"祝贺您,您已经完成了邮件配置。\n"
"\n"
@@ -20426,14 +20939,14 @@ msgstr ""
# mail/mail-config.glade.h:23
# mail/mail-config.glade.h:23
# mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
msgid "De_fault"
msgstr "默认(_F)"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/folder-browser.h:26
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
#, fuzzy
msgid "Default Behavior"
msgstr "默认"
@@ -20441,7 +20954,7 @@ msgstr "默认"
# mail/mail-config.glade.h:25
# mail/mail-config.glade.h:25
# mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
#, fuzzy
msgid "Default character _encoding:"
msgstr "默认字符编码: "
@@ -20449,7 +20962,7 @@ msgstr "默认字符编码: "
# mail/mail-ops.c:249
# mail/mail-ops.c:250
# mail/mail-ops.c:258
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
#, fuzzy
msgid "Deleting Mail"
msgstr "正在收取邮件"
@@ -20457,104 +20970,111 @@ msgstr "正在收取邮件"
# mail/mail-config.glade.h:27
# mail/mail-config.glade.h:27
# mail/mail-config.glade.h:32
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
msgid "Digital IDs..."
msgstr "数字标识..."
# camel/camel-filter-driver.c:692
# camel/camel-filter-driver.c:741
# camel/camel-filter-driver.c:893
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
msgid "Do not quote original message"
msgstr "无法引用原始消息"
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(_M)(同 Outlook 兼容)"
# mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
# mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
# mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr "完成"
# mail/mail-config.glade.h:97
# mail/mail-config.glade.h:97
# mail/mail-config.glade.h:106
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
msgid "Drafts _folder:"
msgstr "草稿文件夹(_F):"
# mail/mail-config.glade.h:31
# mail/mail-config.glade.h:31
# mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
msgid "E_nable"
msgstr "启用(_N)"
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/metar.c:65
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
msgid "Emacs"
msgstr "Emacs"
# addressbook/gui/component/addressbook.c:805
# addressbook/gui/component/addressbook.c:805
# addressbook/gui/component/addressbook.c:838
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
msgid "Email Accounts"
msgstr "电子邮件"
# mail/mail-config.glade.h:99
# mail/mail-config.glade.h:99
# addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
msgid "Email _address:"
msgstr "电子邮件地址(_A):"
# mail/mail-config.glade.h:100
# mail/mail-config.glade.h:100
# mail/mail-config.glade.h:109
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
msgid "Empty _trash folders on exit"
msgstr "退出时清空已删除邮件(_T)"
+# mail/mail-config-druid.c:599
+# mail/mail-config-druid.c:599
+# mail/mail-config-druid.c:599
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Evolution 帐号助手"
+
# mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
msgid "Execute Command..."
msgstr "执行命令..."
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
msgid "Fi_xed -width:"
msgstr "固定宽度(_X):"
# mail/folder-browser-ui.c:274
# mail/folder-browser-ui.c:274
# mail/folder-browser-ui.c:275
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
msgid "Font Properties"
msgstr "字体属性"
# mail/mail-ops.c:1191
# mail/mail-ops.c:1193
# mail/mail-ops.c:1236
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
msgid "Format messages in _HTML"
msgstr "用 HTML 格式化邮件(_H)"
# mail/mail-config.glade.h:34
# mail/mail-config.glade.h:34
# mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
msgid "Get Digital ID..."
msgstr "获取数字标识..."
# mail/mail-config.glade.h:103
# mail/mail-config.glade.h:103
# mail/mail-config.glade.h:112
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
#, fuzzy
msgid "Highlight _quotations with"
msgstr "突出显示引文,使用(_H)"
@@ -20562,28 +21082,21 @@ msgstr "突出显示引文,使用(_H)"
# mail/mail-config.glade.h:36
# mail/mail-config.glade.h:36
# mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
msgid "IMAPv4 "
msgstr "IMAPv4"
-# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
-# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
-# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "标识"
-
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:39
# mail/mail-config.glade.h:46
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
msgid "Inline"
msgstr "嵌入"
# mail/mail-config.glade.h:40
# mail/mail-config.glade.h:40
# mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
msgid "Kerberos "
msgstr "Kerberos"
@@ -20596,7 +21109,7 @@ msgstr "Kerberos"
# ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
# ui/evolution-contact-list-editor.xml.h:6
# ui/evolution-signature-editor.xml.h:4
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
#, fuzzy
msgid "Labels and Colors"
msgstr "保存并关闭"
@@ -20604,7 +21117,7 @@ msgstr "保存并关闭"
# ui/evolution-mail-message.xml.h:42
# ui/evolution-mail-message.xml.h:42
# ui/evolution-mail-message.xml.h:42
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
#, fuzzy
msgid "Loading Images"
msgstr "装入图像(_I)"
@@ -20612,21 +21125,21 @@ msgstr "装入图像(_I)"
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:48
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
msgid "Mail Configuration"
msgstr "邮件配置"
# mail/mail-config.glade.h:43
# mail/mail-config.glade.h:43
# mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
msgid "Mailbox location"
msgstr "邮件箱位置"
# views/mail/galview.xml.h:4
# views/mail/galview.xml.h:4
# views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
#, fuzzy
msgid "Message Composer"
msgstr "邮件"
@@ -20634,15 +21147,23 @@ msgstr "邮件"
# ui/evolution-mail-message.xml.h:99
# ui/evolution-mail-message.xml.h:99
# ui/evolution-mail-message.xml.h:101
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
#, fuzzy
msgid "Message Display"
msgstr "邮件显示(_M)"
+# default_user/searches.xml.h:4
+# default_user/searches.xml.h:4
+# default_user/searches.xml.h:4
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Message Fonts"
+msgstr "邮件含有"
+
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:76
#, fuzzy
msgid "Microsoft"
msgstr "密克罗尼西亚"
@@ -20650,52 +21171,48 @@ msgstr "密克罗尼西亚"
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:53
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
msgid "New Mail Notification"
msgstr "新邮件提醒"
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr ""
-#: mail/mail-config.glade.h:79
-msgid "On Screen fonts"
-msgstr ""
-
# mail/mail-config.glade.h:48
# mail/mail-config.glade.h:48
# mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
msgid "Optional Information"
msgstr "可选的信息"
# addressbook/gui/contact-editor/contact-editor.glade.h:23
# addressbook/gui/contact-editor/contact-editor.glade.h:23
# addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
msgid "Or_ganization:"
msgstr "组织(_G):"
# mail/mail-config.glade.h:50
# mail/mail-config.glade.h:50
# mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
# mail/mail-config.glade.h:53
# mail/mail-config.glade.h:53
# mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
msgid "Pick a color"
msgstr "选取一个颜色"
# mail/mail-config.glade.h:57
# mail/mail-config.glade.h:57
# mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
#, fuzzy
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "在发送只给出了暗送收件人时进行提示(_B)"
@@ -20703,14 +21220,14 @@ msgstr "在发送只给出了暗送收件人时进行提示(_B)"
# mail/mail-config.glade.h:54
# mail/mail-config.glade.h:54
# mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "Pretty Good Privacy (PGP/GPG)"
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
# ui/evolution-addressbook.xml.h:18
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
#, fuzzy
msgid "Printed Fonts"
msgstr "打印选中的联系人"
@@ -20718,14 +21235,14 @@ msgstr "打印选中的联系人"
# mail/mail-config.glade.h:58
# mail/mail-config.glade.h:58
# mail/mail-config.glade.h:67
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
msgid "Qmail maildir "
msgstr "Qmail 邮件目录"
# camel/camel-filter-driver.c:692
# camel/camel-filter-driver.c:741
# camel/camel-filter-driver.c:893
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
#, fuzzy
msgid "Quote original message"
msgstr "无法打开消息"
@@ -20733,21 +21250,21 @@ msgstr "无法打开消息"
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:59
# mail/mail-config.glade.h:68
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
msgid "Quoted"
msgstr "已引用"
# mail/mail-config.glade.h:60
# mail/mail-config.glade.h:60
# mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
msgid "Re_member this password"
msgstr "记住该密码(_M)"
# composer/e-msg-composer-hdrs.c:364
# composer/e-msg-composer-hdrs.c:364
# composer/e-msg-composer-hdrs.c:362
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
#, fuzzy
msgid "Re_ply-To:"
msgstr "回复到:"
@@ -20755,14 +21272,14 @@ msgstr "回复到:"
# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
# mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
msgid "Receiving Email"
msgstr "正在接收电子邮件"
# mail/mail-config.glade.h:63
# mail/mail-config.glade.h:63
# mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
#, fuzzy
msgid "Receiving _Options"
msgstr "接收中选项"
@@ -20770,7 +21287,7 @@ msgstr "接收中选项"
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:267
# e-util/e-passwords.c:360 mail/mail-session.c:269
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
#, fuzzy
msgid "Remember this _password"
msgstr "记住该密码"
@@ -20778,14 +21295,14 @@ msgstr "记住该密码"
# mail/mail-config.glade.h:64
# mail/mail-config.glade.h:64
# mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
msgid "Required Information"
msgstr "必需的信息"
# mail/mail-config.glade.h:23
# mail/folder-browser.h:26
# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
#, fuzzy
msgid "Restore Defaults"
msgstr "默认"
@@ -20793,7 +21310,7 @@ msgstr "默认"
# mail/mail-config.glade.h:67
# mail/mail-config.glade.h:67
# mail/mail-config.glade.h:76
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
#, fuzzy
msgid "S_ecurity"
msgstr "安全"
@@ -20801,86 +21318,82 @@ msgstr "安全"
# mail/mail-config.glade.h:66
# mail/mail-config.glade.h:66
# mail/mail-config.glade.h:75
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
msgid "Secure MIME (S/MIME)"
msgstr "安全 MIME (S/MIME)"
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
msgid "Select HTML fixed width font for printing"
msgstr "选择用于打印的 HTML 固定宽度字体"
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
msgid "Select HTML variable width font for printing"
msgstr "选择用于打印的 HTML 变宽度字体"
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
# mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
# mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
msgid "Sending Email"
msgstr "正在发送电子邮件"
# mail/mail-config.glade.h:74
# mail/mail-config.glade.h:74
# mail/mail-config.glade.h:83
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
msgid "Sent _messages folder:"
msgstr "发送邮件文件夹(_M):"
# mail/mail-config.glade.h:75
# mail/mail-config.glade.h:75
# mail/mail-config.glade.h:84
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
msgid "Sent and Draft Messages"
msgstr "已发送和草稿邮件"
# mail/mail-config.glade.h:76
# mail/mail-config.glade.h:76
# mail/mail-config.glade.h:85
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
# mail/mail-config.glade.h:77
# mail/mail-config.glade.h:77
# mail/mail-config.glade.h:86
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
msgid "Server Configuration"
msgstr "服务器配置"
# mail/mail-config.glade.h:78
# mail/mail-config.glade.h:78
# mail/mail-config.glade.h:87
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
msgid "Server _Type: "
msgstr "服务器类型(_T):"
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
msgid "Shortcuts _type:"
msgstr "快捷方式类型(_T):"
# addressbook/printing/e-contact-print.glade.h:38
# addressbook/printing/e-contact-print.glade.h:38
# mail/mail-config.glade.h:92
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
msgid "Specify _filename:"
msgstr "指定文件名(_F):"
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr "拼写检查语言"
-
#: mail/mail-config.glade.h:118
msgid "Spell _Checking"
msgstr "拼写检查(_C)"
@@ -20923,10 +21436,11 @@ msgstr "变宽度(_A):"
# mail/mail-config.glade.h:87
# mail/mail-config.glade.h:96
#: mail/mail-config.glade.h:129
+#, fuzzy
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
msgstr ""
"欢迎使用 Evolution 邮件配置助手。\n"
"\n"
@@ -21033,56 +21547,52 @@ msgstr "新邮件到达时不要提醒我(_D)"
msgid "_Enable"
msgstr "启用(_E)"
-#: mail/mail-config.glade.h:152
-msgid "_Fixed-width:"
-msgstr "固定宽度(_F):"
-
# ui/evolution-mail-message.xml.h:32
# ui/evolution-mail-message.xml.h:32
# ui/evolution-mail-message.xml.h:32
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:152
msgid "_Forward style:"
msgstr "转发方式(_F):"
# mail/mail-config.glade.h:101
# mail/mail-config.glade.h:101
# mail/mail-config.glade.h:110
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
msgid "_Full name:"
msgstr "全名(_F):"
# mail/mail-config.glade.h:38
# mail/mail-config.glade.h:38
# mail/mail-config.glade.h:45
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:155
msgid "_HTML Mail"
msgstr "HTML 邮件(_H)"
# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
msgid "_Identity"
msgstr "标识(_I)"
# mail/mail-config.glade.h:105
# mail/mail-config.glade.h:105
# mail/mail-config.glade.h:114
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
msgid "_Load images if sender is in addressbook"
msgstr "如果发件人在地址簿中就装入图像(_L)"
# mail/mail-config.glade.h:44
# mail/mail-config.glade.h:44
# mail/mail-config.glade.h:51
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
msgid "_Make this my default account"
msgstr "使它成为我的默认帐号(_M)"
# mail/mail-config.glade.h:107
# mail/mail-config.glade.h:107
# mail/mail-config.glade.h:116
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
#, fuzzy
msgid "_Mark messages as read after"
msgstr "阅读时将邮件标记为已读,延时(_M)"
@@ -21090,26 +21600,26 @@ msgstr "阅读时将邮件标记为已读,延时(_M)"
# mail/mail-config.glade.h:108
# mail/mail-config.glade.h:108
# mail/mail-config.glade.h:117
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
msgid "_Name:"
msgstr "名称(_N):"
# mail/mail-config.glade.h:109
# mail/mail-config.glade.h:109
# mail/mail-config.glade.h:118
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:162
msgid "_Never load images off the net"
msgstr "从不离线装入图像(_N)"
# mail/mail-config.glade.h:62
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
msgid "_Play sound file when new mail arrives"
msgstr "新邮件到达时播放声音文件(_P)"
# mail/mail-config.glade.h:55
# mail/mail-config.glade.h:55
# mail/mail-config.glade.h:64
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
#, fuzzy
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候进行提示"
@@ -21117,7 +21627,7 @@ msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候
# mail/mail-config.glade.h:56
# mail/mail-config.glade.h:56
# mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
#, fuzzy
msgid "_Prompt when sending messages with an empty subject line"
msgstr "在发送空标题的消息时进行提示(_E)"
@@ -21125,32 +21635,32 @@ msgstr "在发送空标题的消息时进行提示(_E)"
# mail/mail-config.glade.h:62
# mail/mail-config.glade.h:62
# mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:167
msgid "_Receiving Mail"
msgstr "正在接收邮件(_R)"
# ui/evolution-mail-message.xml.h:71
# ui/evolution-mail-message.xml.h:71
# ui/evolution-mail-message.xml.h:73
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
msgid "_Restore defaults"
msgstr "恢复默认值(_R)"
# ui/evolution-message-composer.xml.h:54
# ui/evolution-message-composer.xml.h:54
# ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
msgid "_Script:"
msgstr "脚本(_S):"
# mail/mail-config.glade.h:71
# mail/mail-config.glade.h:71
# mail/mail-config.glade.h:80
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:171
msgid "_Sending Mail"
msgstr "正在发送邮件(_S)"
@@ -21160,49 +21670,62 @@ msgstr "正在发送邮件(_S)"
# calendar/gui/e-calendar-table.etspec.h:13
# calendar/gui/dialogs/event-page.glade.h:11
# calendar/gui/e-calendar-table.etspec.h:13
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
msgid "_Show animated images"
msgstr "显示动画图像(_S)"
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:116
# mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:173
msgid "_Signatures"
msgstr "签名(_S)"
+# addressbook/gui/contact-editor/fulladdr.glade.h:183
+# addressbook/gui/contact-editor/fulladdr.glade.h:183
+# my-evolution/Locations.h:1987
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Standard Font:"
+msgstr "圣马力诺"
+
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Terminal Font:"
+msgstr "原联系人:"
+
# mail/mail-config.glade.h:86
# mail/mail-config.glade.h:86
# mail/mail-config.glade.h:95
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
msgid "_Use secure connection (SSL):"
msgstr "使用安全连接 (SSL)(_U):"
-# my-evolution/metar.c:63
-# my-evolution/metar.c:63
-# my-evolution/metar.c:63
-#: mail/mail-config.glade.h:176
-msgid "_Variable-width:"
-msgstr "可变宽度(_V):"
+#: mail/mail-config.glade.h:177
+msgid "_Use the same fonts as other applications"
+msgstr ""
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:118
# mail/mail-config.glade.h:127
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
msgid "_every"
msgstr "每(_E)"
# mail/mail-config.glade.h:2
# mail/mail-config.glade.h:2
# mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
msgid "color"
msgstr "颜色"
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:128
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
msgid "description"
msgstr "描述"
@@ -21241,17 +21764,32 @@ msgstr "无法创建 S/MIME 信封上下文。"
msgid "Could not create a S/MIME decode context."
msgstr "无法创建 S/MIME 解码上下文。"
+# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
+# mail/mail-display.c:106
+# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:2034
+# mail/mail-display.c:106
+# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
+# mail/mail-display.c:105
+#: mail/mail-display.c:193
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"指定名称的文件已经存在。\n"
+"覆盖它?"
+
# mail/mail-display.c:243
# mail/mail-display.c:242
# mail/mail-display.c:243
-#: mail/mail-display.c:321
+#: mail/mail-display.c:333
msgid "Save Attachment"
msgstr "保存附件"
# mail/folder-browser.c:297 mail/mail-display.c:298
# mail/folder-browser.c:297 mail/mail-display.c:297
# mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
#, c-format
msgid "Could not create temporary file '%s': %s"
msgstr "无法创建临时文件“%s”: %s"
@@ -21259,21 +21797,21 @@ msgstr "无法创建临时文件“%s”: %s"
# mail/mail-display.c:243
# mail/mail-display.c:242
# mail/mail-display.c:243
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
msgid "Save Attachment..."
msgstr "保存附件..."
# mail/mail-display.c:352
# mail/mail-display.c:351
# mail/mail-display.c:352
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
msgid "View Inline"
msgstr "嵌入视图"
# mail/mail-display.c:354
# mail/mail-display.c:353
# mail/mail-display.c:354
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
@@ -21281,7 +21819,7 @@ msgstr "在 %s 中打开..."
# mail/mail-display.c:415
# mail/mail-display.c:414
# mail/mail-display.c:415
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
#, c-format
msgid "View Inline (via %s)"
msgstr "嵌入视图 (通过 %s)"
@@ -21289,40 +21827,40 @@ msgstr "嵌入视图 (通过 %s)"
# mail/mail-display.c:419
# mail/mail-display.c:418
# mail/mail-display.c:419
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
msgid "Hide"
msgstr "隐藏"
# mail/mail-display.c:440
# mail/mail-display.c:439
# mail/mail-display.c:440
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
msgid "External Viewer"
msgstr "外部视图"
# ui/evolution-mail-message.xml.h:42
# ui/evolution-mail-message.xml.h:42
# ui/evolution-mail-message.xml.h:42
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1365
msgid "Downloading images"
msgstr "正在下载图像"
# mail/mail-display.c:1133
# mail/mail-display.c:1136
# mail/mail-display.c:1162
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1542
msgid "Loading message content"
msgstr "装入邮件内容"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1879
#, fuzzy
msgid "Overdue:"
msgstr "被延误的任务(_V):"
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1883
#, fuzzy
msgid "by %B %d, %Y, %l:%M %P"
msgstr "%b %d %l:%M %p"
@@ -21330,28 +21868,28 @@ msgstr "%b %d %l:%M %p"
# mail/mail-display.c:1602
# mail/mail-display.c:1628
# mail/mail-display.c:1657
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2240
msgid "Open Link in Browser"
msgstr "在浏览器中打开连接"
# mail/mail-display.c:1604
# mail/mail-display.c:1630
# mail/mail-display.c:1659
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2241
msgid "Copy Link Location"
msgstr "复制连接位置"
# mail/mail-display.c:1607
# mail/mail-display.c:1633
# mail/mail-display.c:1662
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2243
msgid "Save Link as (FIXME)"
msgstr "连接保存为 (FIXME)"
# mail/mail-display.c:1610
# mail/mail-display.c:1636
# mail/mail-display.c:1665
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2245
msgid "Save Image as..."
msgstr "图像保存为..."
@@ -21361,7 +21899,7 @@ msgstr "图像保存为..."
# importers/pine-importer.c:471
# importers/elm-importer.c:375 importers/netscape-importer.c:782
# importers/pine-importer.c:471
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
#, fuzzy, c-format
msgid "Pinging %s"
msgstr "正在扫描 %s"
@@ -21369,7 +21907,7 @@ msgstr "正在扫描 %s"
# mail/mail-format.c:635
# mail/mail-format.c:640
# mail/mail-format.c:646
-#: mail/mail-format.c:656
+#: mail/mail-format.c:640
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
@@ -21377,76 +21915,65 @@ msgstr "%s 附件"
# mail/mail-format.c:680
# mail/mail-format.c:686
# mail/mail-format.c:692
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:682 mail/mail-format.c:1339 mail/mail-format.c:1408
+#: mail/mail-format.c:1528 mail/mail-format.c:1652 mail/mail-format.c:1677
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 邮件。显示源文本。"
# mail/mail-format.c:763
# mail/mail-format.c:769
# mail/mail-format.c:775
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:759 mail/message-list.etspec.h:2
msgid "Date"
msgstr "日期"
# mail/mail-format.c:846
# mail/mail-format.c:861
# mail/mail-format.c:867
-#: mail/mail-format.c:870
+#: mail/mail-format.c:845
msgid "Bad Address"
msgstr "无效地址"
# mail/mail-format.c:886 mail/message-list.etspec.h:3
# mail/mail-format.c:904 mail/message-list.etspec.h:3
# mail/mail-format.c:910 mail/message-list.etspec.h:3
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
msgid "From"
msgstr "发件人"
# mail/mail-format.c:889
# mail/mail-format.c:908
# mail/mail-format.c:914
-#: mail/mail-format.c:917
+#: mail/mail-format.c:890
msgid "Reply-To"
msgstr "回复至"
# mail/mail-format.c:893 mail/message-list.etspec.h:10
# mail/mail-format.c:913 mail/message-list.etspec.h:11
# mail/mail-format.c:919 mail/message-list.etspec.h:11
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
msgid "To"
msgstr "收件人"
# mail/mail-format.c:897
# mail/mail-format.c:918
# mail/mail-format.c:924
-#: mail/mail-format.c:927
+#: mail/mail-format.c:900
msgid "Cc"
msgstr "抄送"
# mail/mail-format.c:901
# mail/mail-format.c:923
# mail/mail-format.c:929
-#: mail/mail-format.c:932
+#: mail/mail-format.c:905
msgid "Bcc"
msgstr "密件抄送"
-# importers/elm-importer.c:525 importers/netscape-importer.c:958
-# importers/pine-importer.c:637 mail/component-factory.c:100
-# importers/elm-importer.c:525 importers/netscape-importer.c:958
-# importers/pine-importer.c:637 mail/component-factory.c:100
-# importers/elm-importer.c:525 importers/netscape-importer.c:958
-# importers/pine-importer.c:637 mail/component-factory.c:100
-#: mail/mail-format.c:963
-#, fuzzy
-msgid "Mailer"
-msgstr "邮件"
-
# mail/mail-format.c:1813
# mail/mail-format.c:1749
# mail/mail-format.c:1768
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1451
msgid ""
"This message is digitally signed. Click the lock icon for more information."
msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
@@ -21454,7 +21981,7 @@ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
# mail/mail-crypto.c:84
# mail/mail-crypto.c:84
# mail/mail-crypto.c:84
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1479
#, fuzzy
msgid "Could not create a PGP verfication context"
msgstr "无法创建 PGP 验证上下文。"
@@ -21462,21 +21989,21 @@ msgstr "无法创建 PGP 验证上下文。"
# mail/mail-format.c:1844
# mail/mail-format.c:1780
# mail/mail-format.c:1799
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1487
msgid "This message is digitally signed and has been found to be authentic."
msgstr "该邮件有数字签名,并被证实为可信。"
# mail/mail-format.c:1852
# mail/mail-format.c:1788
# mail/mail-format.c:1807
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:1494
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr "该邮件有数字签名,但不能证实是可信的。"
# mail/mail-format.c:2068
# mail/mail-format.c:2003
# mail/mail-format.c:2022
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1758
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
@@ -21484,7 +22011,7 @@ msgstr "指向 FTP 站点 (%s)"
# mail/mail-format.c:2082
# mail/mail-format.c:2017
# mail/mail-format.c:2036
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1769
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -21492,7 +22019,7 @@ msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
# mail/mail-format.c:2087
# mail/mail-format.c:2022
# mail/mail-format.c:2041
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1772
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
@@ -21500,7 +22027,7 @@ msgstr "指向本地文件 (%s)"
# mail/mail-format.c:2116
# mail/mail-format.c:2051
# mail/mail-format.c:2070
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1799
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
@@ -21508,7 +22035,7 @@ msgstr "指向远程数据 (%s)"
# mail/mail-format.c:2124
# mail/mail-format.c:2059
# mail/mail-format.c:2078
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1805
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
@@ -21516,14 +22043,14 @@ msgstr "指向未知的外部数据 (“%s”类型)"
# mail/mail-format.c:2129
# mail/mail-format.c:2064
# mail/mail-format.c:2083
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1807
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
#, fuzzy, c-format
msgid "Local folders/%s"
msgstr "本地文件夹"
@@ -21531,14 +22058,14 @@ msgstr "本地文件夹"
# mail/mail-local.c:626
# mail/mail-local.c:626
# mail/mail-local.c:626
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
msgid "Reconfiguring folder"
msgstr "正在重新配置文件夹"
# mail/mail-local.c:707
# mail/mail-local.c:707
# mail/mail-local.c:707
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
#, fuzzy, c-format
msgid ""
"Cannot save folder metainfo; you may find you can't\n"
@@ -21550,7 +22077,7 @@ msgstr ""
# mail/mail-local.c:763
# mail/mail-local.c:763
# mail/mail-local.c:763
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr "无法把文件夹元信息保存到 %s: %s"
@@ -21558,7 +22085,7 @@ msgstr "无法把文件夹元信息保存到 %s: %s"
# mail/mail-local.c:815
# mail/mail-local.c:815
# mail/mail-local.c:815
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr "无法删除文件夹元信息 %s: %s"
@@ -21574,7 +22101,7 @@ msgstr "将文件夹格式从“%s”改为“%s”"
# mail/mail-local.c:1318
# mail/mail-local.c:1318
# mail/mail-local.c:1318
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1354
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
@@ -21585,7 +22112,7 @@ msgstr ""
# mail/mail-local.c:1416
# mail/mail-local.c:1416
# mail/mail-local.c:1416
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
#, c-format
msgid "Reconfigure /%s"
msgstr "重新配置 /%s"
@@ -21593,7 +22120,7 @@ msgstr "重新配置 /%s"
# mail/mail-local.c:1407
# mail/mail-local.c:1407
# mail/mail-local.c:1407
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
msgid "You cannot change the format of a non-local folder."
msgstr "您不能改变远程文件夹的格式。"
@@ -21624,35 +22151,35 @@ msgstr ""
# mail/mail-mt.c:901
# mail/mail-mt.c:901
# mail/mail-mt.c:901
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
msgid "Working"
msgstr "正在工作"
# mail/mail-ops.c:86
# mail/mail-ops.c:87
# mail/mail-ops.c:87
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
msgid "Filtering Folder"
msgstr "正在过滤文件夹"
# mail/mail-ops.c:249
# mail/mail-ops.c:250
# mail/mail-ops.c:258
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
msgid "Fetching Mail"
msgstr "正在收取邮件"
# mail/mail-ops.c:489 mail/mail-ops.c:518
# mail/mail-ops.c:491 mail/mail-ops.c:520
# mail/mail-ops.c:534 mail/mail-ops.c:563
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
msgid "However, the message was successfully sent."
msgstr "可是,邮件已经成功发送。"
# mail/mail-ops.c:554
# mail/mail-ops.c:556
# mail/mail-ops.c:599
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
#, c-format
msgid "Sending \"%s\""
msgstr "正在发送“%s”"
@@ -21660,7 +22187,7 @@ msgstr "正在发送“%s”"
# mail/mail-ops.c:674
# mail/mail-ops.c:676
# mail/mail-ops.c:719
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第 %d 个邮件,共 %d 个"
@@ -21668,7 +22195,7 @@ msgstr "发送第 %d 个邮件,共 %d 个"
# mail/mail-ops.c:693
# mail/mail-ops.c:695
# mail/mail-ops.c:738
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
#, c-format
msgid "Failed on message %d of %d"
msgstr "在第 %d 个邮件失败,共 %d 个"
@@ -21676,21 +22203,21 @@ msgstr "在第 %d 个邮件失败,共 %d 个"
# mail/mail-ops.c:695 mail/mail-send-recv.c:537
# mail/mail-ops.c:697 mail/mail-send-recv.c:545
# mail/mail-ops.c:740 mail/mail-send-recv.c:545
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
msgid "Complete."
msgstr "完成。"
# mail/mail-ops.c:788
# mail/mail-ops.c:790
# mail/mail-ops.c:833
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
msgid "Saving message to folder"
msgstr "把邮件保存到文件夹中"
# mail/mail-ops.c:868
# mail/mail-ops.c:870
# mail/mail-ops.c:913
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
#, c-format
msgid "Moving messages to %s"
msgstr "把邮件移动到 %s"
@@ -21698,7 +22225,7 @@ msgstr "把邮件移动到 %s"
# mail/mail-ops.c:868
# mail/mail-ops.c:870
# mail/mail-ops.c:913
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
#, c-format
msgid "Copying messages to %s"
msgstr "把邮件复制到 %s"
@@ -21706,7 +22233,7 @@ msgstr "把邮件复制到 %s"
# mail/mail-ops.c:1008
# mail/mail-ops.c:1010
# mail/mail-ops.c:1053
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "正在“%s”中扫描文件夹"
@@ -21714,14 +22241,14 @@ msgstr "正在“%s”中扫描文件夹"
# mail/mail-ops.c:1191
# mail/mail-ops.c:1193
# mail/mail-ops.c:1236
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
msgid "Forwarded messages"
msgstr "已转发邮件"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
#, c-format
msgid "Opening folder %s"
msgstr "正在打开文件夹 %s"
@@ -21729,7 +22256,7 @@ msgstr "正在打开文件夹 %s"
# mail/mail-ops.c:1306
# mail/mail-ops.c:1308
# mail/mail-ops.c:1351
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
#, c-format
msgid "Opening store %s"
msgstr "正在打开存储 %s"
@@ -21737,7 +22264,7 @@ msgstr "正在打开存储 %s"
# mail/mail-ops.c:1375
# mail/mail-ops.c:1377
# mail/mail-ops.c:1420
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
#, c-format
msgid "Removing folder %s"
msgstr "正在删除文件夹“%s”"
@@ -21745,7 +22272,7 @@ msgstr "正在删除文件夹“%s”"
# mail/mail-ops.c:1469
# mail/mail-ops.c:1471
# mail/mail-ops.c:1514
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
#, c-format
msgid "Storing folder '%s'"
msgstr "正在存储文件夹“%s”"
@@ -21753,21 +22280,21 @@ msgstr "正在存储文件夹“%s”"
# mail/mail-ops.c:1520
# mail/mail-ops.c:1522
# mail/mail-ops.c:1565
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
msgid "Refreshing folder"
msgstr "正在刷新文件夹"
# mail/mail-ops.c:1556
# mail/mail-ops.c:1558
# mail/mail-ops.c:1601
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
msgid "Expunging folder"
msgstr "正在删除文件夹"
# mail/mail-ops.c:1605
# mail/mail-ops.c:1607
# mail/mail-ops.c:1650
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
#, c-format
msgid "Retrieving message %s"
msgstr "正在检索邮件 %s"
@@ -21775,7 +22302,7 @@ msgstr "正在检索邮件 %s"
# mail/mail-ops.c:1672
# mail/mail-ops.c:1674
# mail/mail-ops.c:1717
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
#, c-format
msgid "Retrieving %d message(s)"
msgstr "正在检索 %d 个邮件"
@@ -21783,7 +22310,7 @@ msgstr "正在检索 %d 个邮件"
# mail/mail-ops.c:1758
# mail/mail-ops.c:1760
# mail/mail-ops.c:1803
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
#, c-format
msgid "Saving %d messsage(s)"
msgstr "正在保存 %d 个邮件"
@@ -21791,7 +22318,7 @@ msgstr "正在保存 %d 个邮件"
# mail/mail-ops.c:1870
# mail/mail-ops.c:1872
# mail/mail-ops.c:1915
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1849
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -21803,7 +22330,7 @@ msgstr ""
# mail/mail-ops.c:1898
# mail/mail-ops.c:1900
# mail/mail-ops.c:1943
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1877
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -21815,14 +22342,14 @@ msgstr ""
# mail/mail-ops.c:1972
# mail/mail-ops.c:1974
# mail/mail-ops.c:2017
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1951
msgid "Saving attachment"
msgstr "正在保存附件"
# mail/mail-ops.c:1988
# mail/mail-ops.c:1990
# mail/mail-ops.c:2033
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:1968
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -21834,7 +22361,7 @@ msgstr ""
# mail/mail-ops.c:2019
# mail/mail-ops.c:2021
# mail/mail-ops.c:2064
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:1998
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据: %s"
@@ -21842,7 +22369,7 @@ msgstr "无法写数据: %s"
# mail/mail-ops.c:2088
# mail/mail-ops.c:2090
# mail/mail-ops.c:2133
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
@@ -21850,71 +22377,74 @@ msgstr "断开与 %s 的连接"
# mail/mail-ops.c:2089
# mail/mail-ops.c:2091
# mail/mail-ops.c:2134
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2146
#, c-format
msgid "Reconnecting to %s"
msgstr "重新与 %s 连接"
-# mail/mail-search-dialogue.c:113
-# mail/mail-search-dialogue.c:113
-# mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
-msgid "_Search"
-msgstr "搜索(_S)"
-
# mail/mail-search.c:137
# mail/mail-search.c:137
# mail/mail-search.c:137
-#: mail/mail-search.c:137
+#: mail/mail-search.c:150
msgid "(Untitled Message)"
msgstr "(无标题的消息)"
# mail/mail-search.c:240
# mail/mail-search.c:240
# mail/mail-search.c:240
-#: mail/mail-search.c:240
+#: mail/mail-search.c:232
msgid "Untitled Message"
msgstr "无标题的消息"
# mail/mail-search.c:244
# mail/mail-search.c:244
# mail/mail-search.c:244
-#: mail/mail-search.c:244
+#: mail/mail-search.c:234
msgid "Empty Message"
msgstr "空邮件"
# mail/mail-search.c:291
# mail/mail-search.c:291
# mail/mail-search.c:291
-#: mail/mail-search.c:291
+#: mail/mail-search.c:282
msgid "Find in Message"
msgstr "在邮件中寻找"
+# addressbook/gui/search/e-addressbook-search-dialog.c:151
+# mail/mail-search.c:263
+# addressbook/gui/search/e-addressbook-search-dialog.c:151
+# mail/mail-search.c:263
+# addressbook/gui/search/e-addressbook-search-dialog.c:151
+# mail/mail-search.c:263
+#: mail/mail-search.c:285
+msgid "Search"
+msgstr "搜索"
+
# mail/mail-search.c:321
# mail/mail-search.c:321
# mail/mail-search.c:321
-#: mail/mail-search.c:321
+#: mail/mail-search.c:311
msgid "Case Sensitive"
msgstr "大小写敏感"
# mail/mail-search.c:323
# mail/mail-search.c:323
# mail/mail-search.c:323
-#: mail/mail-search.c:323
+#: mail/mail-search.c:313
msgid "Search Forward"
msgstr "向前搜索"
# mail/mail-search.c:343
# mail/mail-search.c:343
# mail/mail-search.c:343
-#: mail/mail-search.c:343
+#: mail/mail-search.c:333
msgid "Find:"
msgstr "寻找:"
# mail/mail-search.c:346
# mail/mail-search.c:346
# mail/mail-search.c:346
-#: mail/mail-search.c:346
+#: mail/mail-search.c:336
msgid "Matches:"
msgstr "匹配:"
@@ -21928,7 +22458,7 @@ msgstr "正在取消..."
# mail/mail-send-recv.c:245
# mail/mail-send-recv.c:251
# mail/mail-send-recv.c:251
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
#, c-format
msgid "Server: %s, Type: %s"
msgstr "服务器: %s,类型: %s"
@@ -21936,7 +22466,7 @@ msgstr "服务器: %s,类型: %s"
# mail/mail-send-recv.c:247
# mail/mail-send-recv.c:253
# mail/mail-send-recv.c:253
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
#, c-format
msgid "Path: %s, Type: %s"
msgstr "路径: %s,类型: %s"
@@ -21944,7 +22474,7 @@ msgstr "路径: %s,类型: %s"
# mail/mail-send-recv.c:249
# mail/mail-send-recv.c:255
# mail/mail-send-recv.c:255
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
#, c-format
msgid "Type: %s"
msgstr "类型: %s"
@@ -21952,57 +22482,42 @@ msgstr "类型: %s"
# mail/mail-send-recv.c:286
# mail/mail-send-recv.c:292
# mail/mail-send-recv.c:292
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
# mail/mail-send-recv.c:288
# mail/mail-send-recv.c:294
# mail/mail-send-recv.c:294
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
msgid "Cancel All"
msgstr "全部取消"
# mail/mail-send-recv.c:348
# mail/mail-send-recv.c:354
# mail/mail-send-recv.c:354
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
msgid "Updating..."
msgstr "正在更新..."
# mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
# mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
# mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
msgid "Waiting..."
msgstr "正在等待..."
# mail/mail-session.c:220
# mail/mail-session.c:220
# mail/mail-session.c:222
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
msgid "User canceled operation."
msgstr "用户己取消操作。"
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:122
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "记住该密码(_R)"
-
-# e-util/e-passwords.c:362 mail/mail-session.c:268
-# e-util/e-passwords.c:362 mail/mail-session.c:268
-# e-util/e-passwords.c:362 mail/mail-session.c:270
-#: mail/mail-session.c:273
-#, fuzzy
-msgid "_Remember this password for the remainder of this session"
-msgstr "在本会话中记住该密码"
-
# mail/mail-session.c:319
# mail/mail-session.c:319
# mail/mail-session.c:321
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
@@ -22010,29 +22525,37 @@ msgstr "为 %s 输入密码"
# mail/mail-session.c:322
# mail/mail-session.c:322
# mail/mail-session.c:324
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
msgid "Enter Password"
msgstr "输入密码"
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:122
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "记住该密码(_R)"
+
+# e-util/e-passwords.c:362 mail/mail-session.c:268
+# e-util/e-passwords.c:362 mail/mail-session.c:268
+# e-util/e-passwords.c:362 mail/mail-session.c:270
+#: mail/mail-session.c:281
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "在本会话中记住该密码"
+
# mail/mail-account-gui.c:962
# mail/mail-account-gui.c:962
# mail/mail-account-gui.c:959
-#: mail/mail-signature-editor.c:81
+#: mail/mail-signature-editor.c:80
#, fuzzy, c-format
msgid "Could not save signature file: %s"
msgstr "无法保存签名文件。"
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1036
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "保存签名"
-
# mail/mail-account-gui.c:1045
# mail/mail-account-gui.c:1045
# mail/mail-account-gui.c:1042
-#: mail/mail-signature-editor.c:181
+#: mail/mail-signature-editor.c:226
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
@@ -22042,25 +22565,36 @@ msgstr ""
"\n"
"您希望保存改动吗?"
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
+#: mail/mail-signature-editor.c:233
+msgid "Save signature"
+msgstr "保存签名"
+
+#: mail/mail-signature-editor.c:389
msgid "Edit signature"
msgstr "编辑签名"
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:429
msgid "Enter a name for this signature."
msgstr "输入该签名的名字。"
# my-evolution/e-summary-preferences.c:956
# my-evolution/e-summary-preferences.c:956
# my-evolution/e-summary-preferences.c:958
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:432 my-evolution/e-summary-preferences.c:625
msgid "Name:"
msgstr "名称:"
# mail/mail-tools.c:255
# mail/mail-tools.c:255
# mail/mail-tools.c:256
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:269
#, c-format
msgid "Forwarded message - %s"
msgstr "已转发邮件 - %s"
@@ -22068,21 +22602,21 @@ msgstr "已转发邮件 - %s"
# mail/mail-tools.c:259
# mail/mail-tools.c:259
# mail/mail-tools.c:260
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:271
msgid "Forwarded message"
msgstr "已转发邮件"
# mail/mail-tools.c:393
# mail/mail-tools.c:393
# mail/mail-tools.c:394
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:431
msgid "Forwarded Message"
msgstr "已转发邮件"
# mail/mail-vfolder.c:85
# mail/mail-vfolder.c:85
# mail/mail-vfolder.c:85
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
#, c-format
msgid "Setting up vfolder: %s"
msgstr "设置虚拟文件夹: %s"
@@ -22090,7 +22624,7 @@ msgstr "设置虚拟文件夹: %s"
# mail/mail-vfolder.c:203
# mail/mail-vfolder.c:203
# mail/mail-vfolder.c:203
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
#, c-format
msgid "Updating vfolders for uri: %s"
msgstr "为 uri 更新虚拟文件夹: %s"
@@ -22098,7 +22632,7 @@ msgstr "为 uri 更新虚拟文件夹: %s"
# mail/mail-vfolder.c:419
# mail/mail-vfolder.c:419
# mail/mail-vfolder.c:419
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -22110,28 +22644,28 @@ msgstr ""
# mail/mail-vfolder.c:728
# mail/mail-vfolder.c:728
# mail/mail-vfolder.c:728
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777
msgid "VFolders"
msgstr "虚拟文件夹"
# camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
# mail/mail-vfolder.c:785
# mail/mail-vfolder.c:785
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
msgid "vFolders"
msgstr "虚拟文件夹"
# mail/mail-vfolder.c:824
# mail/mail-vfolder.c:825
# mail/mail-vfolder.c:825
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:874
msgid "Edit VFolder"
msgstr "编辑虚拟文件夹"
# mail/mail-vfolder.c:840
# mail/mail-vfolder.c:841
# mail/mail-vfolder.c:841
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:892
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
@@ -22139,21 +22673,21 @@ msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
# mail/mail-vfolder.c:894
# mail/mail-vfolder.c:895
# mail/mail-vfolder.c:895
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:964
msgid "New VFolder"
msgstr "新建虚拟文件夹"
# mail/message-browser.c:212
# mail/message-browser.c:212
# mail/message-browser.c:212
-#: mail/message-browser.c:210
+#: mail/message-browser.c:224
msgid "(No subject)"
msgstr "(没有主题)"
# mail/message-browser.c:214
# mail/message-browser.c:214
# mail/message-browser.c:214
-#: mail/message-browser.c:212
+#: mail/message-browser.c:226
#, c-format
msgid "%s - Message"
msgstr "%s - 邮件"
@@ -22161,109 +22695,109 @@ msgstr "%s - 邮件"
# mail/message-list.c:639
# mail/message-list.c:645
# mail/message-list.c:662
-#: mail/message-list.c:736
+#: mail/message-list.c:740
msgid "Unseen"
msgstr "不可见"
# mail/message-list.c:640
# mail/message-list.c:646
# mail/message-list.c:663
-#: mail/message-list.c:737
+#: mail/message-list.c:741
msgid "Seen"
msgstr "可见"
# mail/message-list.c:641
# mail/message-list.c:647
# mail/message-list.c:664
-#: mail/message-list.c:738
+#: mail/message-list.c:742
msgid "Answered"
msgstr "已应答"
# mail/message-list.c:642
# mail/message-list.c:648
# mail/message-list.c:665
-#: mail/message-list.c:739
+#: mail/message-list.c:743
msgid "Multiple Unseen Messages"
msgstr "多个不可见邮件"
# mail/message-list.c:643
# mail/message-list.c:649
# mail/message-list.c:666
-#: mail/message-list.c:740
+#: mail/message-list.c:744
msgid "Multiple Messages"
msgstr "多个邮件"
# mail/message-list.c:647
# mail/message-list.c:658
# mail/message-list.c:675
-#: mail/message-list.c:744
+#: mail/message-list.c:748
msgid "Lowest"
msgstr "最低"
# mail/message-list.c:648
# mail/message-list.c:659
# mail/message-list.c:676
-#: mail/message-list.c:745
+#: mail/message-list.c:749
msgid "Lower"
msgstr "较低"
# mail/message-list.c:652
# mail/message-list.c:663
# mail/message-list.c:680
-#: mail/message-list.c:749
+#: mail/message-list.c:753
msgid "Higher"
msgstr "较高"
# mail/message-list.c:653
# mail/message-list.c:664
# mail/message-list.c:681
-#: mail/message-list.c:750
+#: mail/message-list.c:754
msgid "Highest"
msgstr "最高"
# mail/message-list.c:903
# mail/message-list.c:920
# mail/message-list.c:937
-#: mail/message-list.c:1066
+#: mail/message-list.c:1080
msgid "?"
msgstr "?"
# mail/message-list.c:910
# mail/message-list.c:927
# mail/message-list.c:944
-#: mail/message-list.c:1073
+#: mail/message-list.c:1087
msgid "Today %l:%M %p"
msgstr "今天 %l:%M %p"
# mail/message-list.c:919
# mail/message-list.c:936
# mail/message-list.c:953
-#: mail/message-list.c:1082
+#: mail/message-list.c:1096
msgid "Yesterday %l:%M %p"
msgstr "昨天 %l:%M %p"
# mail/message-list.c:931
# mail/message-list.c:948
# mail/message-list.c:965
-#: mail/message-list.c:1094
+#: mail/message-list.c:1108
msgid "%a %l:%M %p"
msgstr "%a %l:%m %p"
-#: mail/message-list.c:1102
+#: mail/message-list.c:1116
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
# mail/message-list.c:941
# mail/message-list.c:958
# mail/message-list.c:975
-#: mail/message-list.c:1104
+#: mail/message-list.c:1118
msgid "%b %d %Y"
msgstr "%Y %b %d"
# mail/message-list.c:2334
# mail/message-list.c:2358
# mail/message-list.c:2387
-#: mail/message-list.c:2568
+#: mail/message-list.c:2614
msgid "Generating message list"
msgstr "正在生成邮件列表"
@@ -22328,25 +22862,25 @@ msgstr "大小"
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
# my-evolution/Locations.h:1355
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
msgid "Call"
msgstr "呼叫"
# ui/evolution-mail-message.xml.h:31
# ui/evolution-mail-message.xml.h:31
# ui/evolution-mail-message.xml.h:31
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
msgid "Do Not Forward"
msgstr "不要转发"
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
msgid "Follow-Up"
msgstr ""
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:90
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
#, fuzzy
msgid "For Your Information"
msgstr "来源信息"
@@ -22354,37 +22888,37 @@ msgstr "来源信息"
# ui/evolution-mail-message.xml.h:31
# ui/evolution-mail-message.xml.h:31
# ui/evolution-mail-message.xml.h:31
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
msgid "Forward"
msgstr "转发"
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
msgid "No Response Necessary"
msgstr "不必回复"
# ui/evolution-mail-message.xml.h:70
# ui/evolution-mail-message.xml.h:70
# ui/evolution-mail-message.xml.h:72
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
msgid "Reply"
msgstr "回复"
# ui/evolution-mail-message.xml.h:71
# ui/evolution-mail-message.xml.h:71
# ui/evolution-mail-message.xml.h:73
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
msgid "Reply to All"
msgstr "全部回复"
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
#, fuzzy
msgid "Review"
msgstr "预览"
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
msgid "Flag to Follow Up"
msgstr ""
@@ -22436,7 +22970,7 @@ msgstr "标志(_F):"
# mail/subscribe-dialog.c:219
# mail/subscribe-dialog.c:219
# mail/subscribe-dialog.c:219
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
#, c-format
msgid "Scanning folders under %s on \"%s\""
msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
@@ -22444,7 +22978,7 @@ msgstr "在“%2$s”上的 %1$s 中扫描文件夹"
# mail/subscribe-dialog.c:221
# mail/subscribe-dialog.c:221
# mail/subscribe-dialog.c:221
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:235
#, c-format
msgid "Scanning root-level folders on \"%s\""
msgstr "正在扫描“%s”上的根级文件夹"
@@ -22452,7 +22986,7 @@ msgstr "正在扫描“%s”上的根级文件夹"
# mail/subscribe-dialog.c:318
# mail/subscribe-dialog.c:318
# mail/subscribe-dialog.c:318
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr "订阅到文件夹 “%s”"
@@ -22460,7 +22994,7 @@ msgstr "订阅到文件夹 “%s”"
# mail/subscribe-dialog.c:320
# mail/subscribe-dialog.c:320
# mail/subscribe-dialog.c:320
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr "取消到文件夹“%s”的订阅"
@@ -22471,7 +23005,7 @@ msgstr "取消到文件夹“%s”的订阅"
# shell/e-storage-set-view.etspec.h:1
# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
# shell/e-storage-set-view.etspec.h:1
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1273 mail/subscribe-dialog.etspec.h:1
#: shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr "文件夹"
@@ -22479,39 +23013,24 @@ msgstr "文件夹"
# ui/evolution-message-composer.xml.h:23
# ui/evolution-message-composer.xml.h:23
# ui/evolution-message-composer.xml.h:23
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1389
msgid "Scanning folders..."
msgstr "正在扫描文件夹..."
# mail/subscribe-dialog.c:1520
# mail/subscribe-dialog.c:1520
# mail/subscribe-dialog.c:1520
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1503
msgid "No server has been selected"
msgstr "没有选定服务器"
# mail/subscribe-dialog.c:1581
# mail/subscribe-dialog.c:1581
# mail/subscribe-dialog.c:1581
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1602
msgid "Please select a server."
msgstr "请选择服务器。"
-# mail/subscribe-dialog.glade.h:2
-# mail/subscribe-dialog.glade.h:2
-# mail/subscribe-dialog.glade.h:2
-#: mail/subscribe-dialog.glade.h:1
-msgid "All folders"
-msgstr "所有文件夹"
-
-# calendar/gui/goto-dialog.glade.h:1
-# calendar/gui/goto-dialog.glade.h:1
-# calendar/gui/goto-dialog.glade.h:1
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "Apri file"
-msgstr "四月"
-
# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
# ui/evolution-contact-list-editor.xml.h:1
# ui/evolution-mail-messagedisplay.xml.h:1
@@ -22536,106 +23055,77 @@ msgstr "四月"
msgid "Close"
msgstr "关闭"
-# mail/subscribe-dialog.glade.h:3
-# mail/subscribe-dialog.glade.h:3
-# mail/subscribe-dialog.glade.h:3
-#: mail/subscribe-dialog.glade.h:4
-msgid "Display Options"
-msgstr "显示选项"
-
-# mail/subscribe-dialog.glade.h:4
-# mail/subscribe-dialog.glade.h:4
-# mail/subscribe-dialog.glade.h:4
-#: mail/subscribe-dialog.glade.h:5
-msgid "Folders whose names begin with:"
-msgstr "名称以之开头的文件夹:"
-
# mail/subscribe-dialog.glade.h:5
# mail/subscribe-dialog.glade.h:5
# mail/subscribe-dialog.glade.h:5
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:4
msgid "Manage Subscriptions"
msgstr "管理订阅"
# ui/evolution-subscribe.xml.h:3
# ui/evolution-subscribe.xml.h:3
# ui/evolution-subscribe.xml.h:3
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-subscribe.xml.h:3
msgid "Refresh List"
msgstr "刷新列表"
# shell/e-shell-importer.c:617
# shell/e-shell-importer.c:617
# executive-summary/component/e-summary-callbacks.c:125
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:6
msgid "S_elect server: "
msgstr "选择服务器(_E):"
-# shell/e-shell-importer.c:617
-# shell/e-shell-importer.c:617
-# shell/e-shell-importer.c:628
-#: mail/subscribe-dialog.glade.h:9
-#, fuzzy
-msgid "Salve file"
-msgstr "选择一个文件"
-
# mail/subscribe-dialog.glade.h:7
# mail/subscribe-dialog.glade.h:7
# mail/subscribe-dialog.glade.h:7
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:7
msgid "_Subscribe"
msgstr "订阅(_S)"
# mail/subscribe-dialog.glade.h:8
# mail/subscribe-dialog.glade.h:8
# mail/subscribe-dialog.glade.h:8
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:8
msgid "_Unsubscribe"
msgstr "退订(_U)"
# my-evolution/component-factory.c:44
# my-evolution/component-factory.c:44
# my-evolution/component-factory.c:44
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
#, fuzzy
-msgid "Configuration control for the Evolution Summary."
+msgid "Configure the appearance of the Evolution Summary here"
msgstr "含有 Evolution 概要的文件夹"
-# my-evolution/component-factory.c:44
-# my-evolution/component-factory.c:44
-# my-evolution/component-factory.c:44
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
#, fuzzy
-msgid "Configure the appearance of the Evolution Summary here"
-msgstr "含有 Evolution 概要的文件夹"
+msgid "Evolution Summary"
+msgstr "Evolution 概要组件。"
# mail/GNOME_Evolution_Mail.oaf.in.h:2
# mail/GNOME_Evolution_Mail.oaf.in.h:2
# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
-msgid "Evolution Summary component."
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Summary component"
msgstr "Evolution 概要组件。"
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
#, fuzzy
-msgid "Factory for Evolution Summary's configuration control."
+msgid "Evolution Summary configuration control"
msgstr "Evolution 任务控制车间"
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
-#, fuzzy
-msgid "Factory for the Evolution Summary component."
-msgstr "Evolution 实施概要组件车间。"
-
# my-evolution/e-summary-preferences.c:1502
# my-evolution/e-summary-preferences.c:1502
# my-evolution/e-summary-preferences.c:1504
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
msgid "Summary Preferences"
msgstr "概要首选项"
@@ -28045,7 +28535,7 @@ msgstr ""
# my-evolution/metar.c:217
# my-evolution/Locations.h:885 my-evolution/metar.c:217
#. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
msgid "Hail"
msgstr "冰雹"
@@ -30587,48 +31077,40 @@ msgstr "马里恩"
msgid "Marion-Wytheville"
msgstr "马里恩-Wytheville"
-# addressbook/gui/contact-editor/fulladdr.glade.h:133
-# addressbook/gui/contact-editor/fulladdr.glade.h:133
-# my-evolution/Locations.h:1326
-#: my-evolution/Locations.h:1325
-#, fuzzy
-msgid "Marquette"
-msgstr "马提尼可岛"
-
# my-evolution/Locations.h:1327
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
msgid "Marseille-Provence"
msgstr "马赛-普罗旺斯"
# my-evolution/Locations.h:1328
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
msgid "Marseilles"
msgstr "马赛"
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# my-evolution/Locations.h:1329
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
msgid "Marshall"
msgstr "马绍尔群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# my-evolution/Locations.h:1330
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
#, fuzzy
msgid "Marshalltown"
msgstr "马绍尔群岛"
# my-evolution/Locations.h:1331
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
msgid "Marshfield"
msgstr ""
# mail/mail-format.c:763
# mail/mail-format.c:769
# my-evolution/Locations.h:1332
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
#, fuzzy
msgid "Marte"
msgstr "日期"
@@ -30636,7 +31118,7 @@ msgstr "日期"
# mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
# mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
# my-evolution/Locations.h:1333
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
#, fuzzy
msgid "Marthas Vineyard"
msgstr "标记为未读(_N)"
@@ -30644,7 +31126,7 @@ msgstr "标记为未读(_N)"
# addressbook/printing/e-contact-print.glade.h:21
# addressbook/printing/e-contact-print.glade.h:21
# my-evolution/Locations.h:1334
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
#, fuzzy
msgid "Martinsburg"
msgstr "边界"
@@ -30652,7 +31134,7 @@ msgstr "边界"
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# my-evolution/Locations.h:1335
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
#, fuzzy
msgid "Martinsville"
msgstr "马提尼可岛"
@@ -30660,47 +31142,47 @@ msgstr "马提尼可岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# my-evolution/Locations.h:1336
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
msgid "Maryland"
msgstr "马里兰"
# my-evolution/Locations.h:1337
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
msgid "Marysville"
msgstr ""
# my-evolution/Locations.h:1338
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
msgid "Marysville-Beale AFB"
msgstr ""
# my-evolution/Locations.h:1339
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
msgid "Mashhad"
msgstr "马什哈德"
# calendar/gui/goto-dialog.glade.h:10
# calendar/gui/goto-dialog.glade.h:10
# my-evolution/Locations.h:1340
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
#, fuzzy
msgid "Masirah"
msgstr "三月"
# my-evolution/Locations.h:1341
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
msgid "Mason City"
msgstr "梅森城"
# my-evolution/Locations.h:1342
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
msgid "Massachusetts"
msgstr "麻萨诸塞州"
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# addressbook/gui/contact-editor/fulladdr.glade.h:125
# my-evolution/Locations.h:1343
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
#, fuzzy
msgid "Massena"
msgstr "马其顿"
@@ -30708,29 +31190,29 @@ msgstr "马其顿"
# addressbook/gui/contact-editor/fulladdr.glade.h:51
# addressbook/gui/contact-editor/fulladdr.glade.h:51
# my-evolution/Locations.h:1344
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
msgid "Matamoros"
msgstr "马塔莫罗斯"
# my-evolution/Locations.h:1345
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
msgid "Matsumoto Airport"
msgstr "松本机场"
# my-evolution/Locations.h:1346
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
msgid "Matsushima Ab"
msgstr ""
# my-evolution/Locations.h:1347
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
msgid "Matsuyama Airport"
msgstr "松山机场"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:1348
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
#, fuzzy
msgid "Mattoon"
msgstr "经理"
@@ -30740,7 +31222,7 @@ msgstr "经理"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/gui/widgets/e-addressbook-view.c:882
# my-evolution/Locations.h:1349
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
#, fuzzy
msgid "Mayaguez"
msgstr "经理"
@@ -30748,7 +31230,7 @@ msgstr "经理"
# addressbook/gui/contact-editor/fulladdr.glade.h:136
# addressbook/gui/contact-editor/fulladdr.glade.h:136
# my-evolution/Locations.h:1350
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
#, fuzzy
msgid "Mayport"
msgstr "马约特岛"
@@ -30756,7 +31238,7 @@ msgstr "马约特岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:127
# my-evolution/Locations.h:1351
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
#, fuzzy
msgid "Mazatlan"
msgstr "美洲萨摩亚"
@@ -30764,17 +31246,17 @@ msgstr "美洲萨摩亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# addressbook/gui/contact-editor/fulladdr.glade.h:124
# my-evolution/Locations.h:1352
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
msgid "Mazu"
msgstr "马祖"
# my-evolution/Locations.h:1353
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
msgid "McAlester"
msgstr ""
# my-evolution/Locations.h:1354
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
msgid "McAllen"
msgstr "麦卡伦"
@@ -30783,7 +31265,7 @@ msgstr "麦卡伦"
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
# my-evolution/Locations.h:1355
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
#, fuzzy
msgid "McCall"
msgstr "邮件"
@@ -30791,7 +31273,7 @@ msgstr "邮件"
# calendar/gui/goto-dialog.glade.h:10
# calendar/gui/goto-dialog.glade.h:10
# my-evolution/Locations.h:1356
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
#, fuzzy
msgid "McCarthy"
msgstr "三月"
@@ -30799,37 +31281,37 @@ msgstr "三月"
# addressbook/gui/contact-editor/fulladdr.glade.h:102
# addressbook/gui/contact-editor/fulladdr.glade.h:102
# my-evolution/Locations.h:1357
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
msgid "McClellan"
msgstr "麦克莱伦"
# addressbook/backend/ebook/e-card-simple.c:67
# addressbook/backend/ebook/e-card-simple.c:67
# my-evolution/Locations.h:1358
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
#, fuzzy
msgid "McComb"
msgstr "公司"
# my-evolution/Locations.h:1359
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
msgid "McCook"
msgstr ""
# my-evolution/Locations.h:1360
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
msgid "McGrath"
msgstr ""
# my-evolution/Locations.h:1361
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
msgid "Mc Gregor"
msgstr ""
# calendar/gui/goto-dialog.glade.h:10
# calendar/gui/goto-dialog.glade.h:10
# my-evolution/Locations.h:1362
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
#, fuzzy
msgid "Meacham"
msgstr "三月"
@@ -30837,89 +31319,89 @@ msgstr "三月"
# calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
# calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
# my-evolution/Locations.h:1363
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
#, fuzzy
msgid "Medford"
msgstr "之前"
# my-evolution/Locations.h:1364
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
msgid "Medicine Lodge"
msgstr ""
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:1365
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
#, fuzzy
msgid "Mehamn"
msgstr "经理"
# my-evolution/Locations.h:1366
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
msgid "Mekoryuk"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# calendar/zones.h:280
# my-evolution/Locations.h:1367
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
msgid "Melbourne"
msgstr "墨尔本"
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# my-evolution/Locations.h:1368
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
#, fuzzy
msgid "Melfa"
msgstr "马耳他"
# my-evolution/Locations.h:1369
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
msgid "Melilla"
msgstr "梅利利亚"
# my-evolution/Locations.h:1370
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
msgid "Memambetsu Airport"
msgstr ""
# my-evolution/Locations.h:1371
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
msgid "Memphis"
msgstr "孟斐斯"
# my-evolution/Locations.h:1372
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
msgid "Memphis-NAS"
msgstr "孟斐斯-国家科学院"
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:128
# my-evolution/Locations.h:1373
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
#, fuzzy
msgid "Mendoza"
msgstr "美洲萨摩亚"
# my-evolution/Locations.h:1374
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
msgid "Mene Grande"
msgstr ""
# my-evolution/Locations.h:1375
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
msgid "Menominee"
msgstr ""
# my-evolution/Locations.h:1376
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
msgid "Menorca"
msgstr "米诺卡"
# my-evolution/Locations.h:1377
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
msgid "Merced"
msgstr ""
@@ -30928,53 +31410,53 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
# calendar/gui/dialogs/recurrence-page.c:963
# my-evolution/Locations.h:1378
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
#, fuzzy
msgid "Merida"
msgstr "星期五"
# my-evolution/Locations.h:1379
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
msgid "Meridian"
msgstr ""
# my-evolution/Locations.h:1380
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
msgid "Meridian-Lauderdale"
msgstr ""
# ui/evolution-message-composer.xml.h:49
# ui/evolution-message-composer.xml.h:49
# my-evolution/Locations.h:1381
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
#, fuzzy
msgid "Merril Field"
msgstr "发件人域(_F)"
# my-evolution/Locations.h:1382
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
msgid "Mersa Matruh"
msgstr ""
# my-evolution/Locations.h:1383
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
msgid "Mesa-Falcon Field"
msgstr ""
# my-evolution/Locations.h:1384
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
msgid "Metabaru Ab"
msgstr ""
# my-evolution/Locations.h:1385
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
msgid "Metz-Frescaty"
msgstr "梅斯-Frescaty"
# addressbook/gui/contact-editor/fulladdr.glade.h:137
# addressbook/gui/contact-editor/fulladdr.glade.h:137
# my-evolution/Locations.h:1386
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
msgid "Mexicali"
msgstr "墨西卡利"
@@ -30983,43 +31465,43 @@ msgstr "墨西卡利"
# importers/elm-importer.c:525 importers/netscape-importer.c:958
# importers/pine-importer.c:637 mail/component-factory.c:100
# my-evolution/Locations.h:1388
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
msgid "Miami"
msgstr "迈阿密"
# my-evolution/Locations.h:1389
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
msgid "Miami-Kendall"
msgstr "迈阿密-肯德尔"
# my-evolution/Locations.h:1390
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
msgid "Miami-Opa Locka"
msgstr "迈阿密-Opa Locka"
# my-evolution/Locations.h:1391
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
msgid "Michigan"
msgstr "密歇根州"
# addressbook/gui/contact-editor/fullname.glade.h:15
# addressbook/gui/contact-editor/fullname.glade.h:15
# my-evolution/Locations.h:1392
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
msgid "Middle East"
msgstr "中东"
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# my-evolution/Locations.h:1393
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
msgid "Middleton Island"
msgstr "米德尔顿岛"
# addressbook/gui/contact-editor/fullname.glade.h:15
# addressbook/gui/contact-editor/fullname.glade.h:15
# my-evolution/Locations.h:1394
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
#, fuzzy
msgid "Middletown"
msgstr "中间名(_M):"
@@ -31027,146 +31509,146 @@ msgstr "中间名(_M):"
# addressbook/gui/contact-editor/fulladdr.glade.h:76
# addressbook/gui/contact-editor/fulladdr.glade.h:76
# my-evolution/Locations.h:1395
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
msgid "Midland"
msgstr ""
# my-evolution/Locations.h:1396
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
msgid "Miho Ab"
msgstr ""
# my-evolution/Locations.h:1397
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
msgid "Milano/Linate"
msgstr "米兰/Linate"
# addressbook/gui/contact-editor/fulladdr.glade.h:129
# calendar/zones.h:341
# my-evolution/Locations.h:1398
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
msgid "Milano/Malpensa"
msgstr "米兰/Malpensa"
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:627
# my-evolution/Locations.h:1399
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
msgid "Miles City"
msgstr "迈尔斯城"
# my-evolution/Locations.h:1400
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
msgid "Milford"
msgstr "米尔福德"
# my-evolution/Locations.h:1401
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
msgid "Millinocket"
msgstr ""
# my-evolution/Locations.h:1402
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
msgid "Millville"
msgstr ""
# mail/mail-autofilter.c:72
# mail/mail-autofilter.c:72
# my-evolution/Locations.h:1403
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
msgid "Milton"
msgstr "米尔顿"
# my-evolution/Locations.h:1404
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
msgid "Milwaukee"
msgstr "密尔沃基"
# my-evolution/Locations.h:1405
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
msgid "Milwaukee-Timmerman"
msgstr "密尔沃基-Timmerman"
# my-evolution/Locations.h:1406
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
msgid "Minamitorishima"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# my-evolution/Locations.h:1407
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
#, fuzzy
msgid "Minatitlan"
msgstr "毛里塔尼亚"
# my-evolution/Locations.h:1408
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
#, fuzzy
msgid "Minchumina"
msgstr "接收"
# my-evolution/Locations.h:1409
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
msgid "Mineralnye Vody"
msgstr ""
# my-evolution/Locations.h:1410
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
msgid "Mineral Wells"
msgstr ""
# my-evolution/Locations.h:1411
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
msgid "Minneapolis"
msgstr "明尼阿波利斯"
# my-evolution/Locations.h:1412
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
msgid "Minneapolis [2]"
msgstr "明尼阿波利斯 [2]"
# my-evolution/Locations.h:1413
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
msgid "Minneapolis [3]"
msgstr "明尼阿波利斯 [3]"
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# my-evolution/Locations.h:1414
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
msgid "Minnesota"
msgstr "明尼苏达州"
# my-evolution/Locations.h:1415
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
msgid "Minocqua"
msgstr ""
# my-evolution/Locations.h:1416
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
msgid "Minot"
msgstr "迈诺特"
# my-evolution/Locations.h:1417
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
msgid "Minot AFB"
msgstr "迈诺特空军基地"
# my-evolution/Locations.h:1418
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
msgid "Misawa Ab"
msgstr ""
# my-evolution/Locations.h:1419
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
msgid "Mississippi"
msgstr "密西西比"
# addressbook/gui/contact-editor/fullname.glade.h:8
# addressbook/gui/contact-editor/fullname.glade.h:8
# my-evolution/Locations.h:1420
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
#, fuzzy
msgid "Missoula"
msgstr "小姐"
@@ -31174,37 +31656,37 @@ msgstr "小姐"
# addressbook/gui/contact-editor/fullname.glade.h:8
# addressbook/gui/contact-editor/fullname.glade.h:8
# my-evolution/Locations.h:1421
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
msgid "Missouri"
msgstr "密苏里州"
# mail/mail-search.c:346
# mail/mail-search.c:346
# my-evolution/Locations.h:1422
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
msgid "Mitchell"
msgstr "米切尔"
# my-evolution/Locations.h:1423
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
#, fuzzy
msgid "Mitilini"
msgstr "邮件列表"
# my-evolution/Locations.h:1424
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
msgid "Miyakejima Airport"
msgstr ""
# my-evolution/Locations.h:1425
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
msgid "Miyazaki Airport"
msgstr "宫崎机场"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# my-evolution/Locations.h:1426
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
#, fuzzy
msgid "Moa"
msgstr "一"
@@ -31212,13 +31694,13 @@ msgstr "一"
# addressbook/gui/widgets/e-addressbook-view.c:861
# addressbook/gui/widgets/e-addressbook-view.c:861
# my-evolution/Locations.h:1427
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
#, fuzzy
msgid "Mobile Downtown"
msgstr "手机"
# my-evolution/Locations.h:1428
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
msgid "Mobile Regional Airport"
msgstr ""
@@ -31229,7 +31711,7 @@ msgstr ""
# addressbook/gui/contact-editor/contact-editor.glade.h:20
# addressbook/gui/contact-editor/e-contact-editor.c:1655
# my-evolution/Locations.h:1429
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
#, fuzzy
msgid "Mobridge"
msgstr "手机"
@@ -31237,20 +31719,20 @@ msgstr "手机"
# my-evolution/metar.c:280
# my-evolution/metar.c:280
# my-evolution/Locations.h:1430
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
#, fuzzy
msgid "Modesto"
msgstr "中雾"
# my-evolution/Locations.h:1431
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
msgid "Mo I Rana"
msgstr ""
# ui/evolution-mail-message.xml.h:52
# ui/evolution-mail-message.xml.h:52
# my-evolution/Locations.h:1432
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
msgid "Mojave"
msgstr "莫哈韦"
@@ -31261,7 +31743,7 @@ msgstr "莫哈韦"
# addressbook/gui/contact-editor/contact-editor.glade.h:20
# addressbook/gui/contact-editor/e-contact-editor.c:1655
# my-evolution/Locations.h:1433
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
#, fuzzy
msgid "Molde"
msgstr "手机"
@@ -31271,36 +31753,36 @@ msgstr "手机"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
# calendar/gui/dialogs/recurrence-page.c:959
# my-evolution/Locations.h:1434
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
msgid "Moldova"
msgstr "摩尔多瓦"
# my-evolution/Locations.h:1435
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
msgid "Moline-Quad Cities"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:127
# addressbook/gui/contact-editor/fulladdr.glade.h:127
# my-evolution/Locations.h:1436
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
msgid "Molokai"
msgstr "莫洛凯岛"
# my-evolution/Locations.h:1437
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
msgid "Mombetsu Airport"
msgstr ""
# my-evolution/Locations.h:1438
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
msgid "Monchengladbach"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:1439
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
#, fuzzy
msgid "Monclova"
msgstr "摩纳哥"
@@ -31308,7 +31790,7 @@ msgstr "摩纳哥"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:1440
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
#, fuzzy
msgid "Moncton"
msgstr "摩纳哥"
@@ -31318,20 +31800,20 @@ msgstr "摩纳哥"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
# calendar/gui/dialogs/recurrence-page.c:959
# my-evolution/Locations.h:1441
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
#, fuzzy
msgid "Monida"
msgstr "星期一"
# my-evolution/Locations.h:1442
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
msgid "Monpellier-Mediterrannee"
msgstr "Monpellier-地中海"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:1443
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
msgid "Monroe"
msgstr "门罗"
@@ -31340,7 +31822,7 @@ msgstr "门罗"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/gui/widgets/e-addressbook-view.c:882
# my-evolution/Locations.h:1444
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
#, fuzzy
msgid "Montague"
msgstr "经理"
@@ -31348,37 +31830,37 @@ msgstr "经理"
# ui/evolution-calendar.xml.h:20
# ui/evolution-calendar.xml.h:20
# my-evolution/Locations.h:1445
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
msgid "Montana"
msgstr "蒙大拿"
# my-evolution/Locations.h:1446
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
msgid "Mont-de-Marsan"
msgstr ""
# my-evolution/Locations.h:1447
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
msgid "Monte Argentario"
msgstr ""
# my-evolution/metar.c:160
# my-evolution/metar.c:160
# my-evolution/Locations.h:1448
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
#, fuzzy
msgid "Monte Bisbino"
msgstr "中雪"
# my-evolution/Locations.h:1449
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
msgid "Monte Calamita"
msgstr ""
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# my-evolution/Locations.h:1450
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
#, fuzzy
msgid "Monte Cimone"
msgstr "月视图"
@@ -31386,20 +31868,20 @@ msgstr "月视图"
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# my-evolution/Locations.h:1451
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
#, fuzzy
msgid "Montego Bay"
msgstr "蒙古"
# my-evolution/Locations.h:1452
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
msgid "Monte Malanotte"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# my-evolution/Locations.h:1453
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
#, fuzzy
msgid "Monterey"
msgstr "蒙特塞拉特群岛"
@@ -31407,43 +31889,43 @@ msgstr "蒙特塞拉特群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# my-evolution/Locations.h:1454
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
#, fuzzy
msgid "Monterrey"
msgstr "蒙特塞拉特群岛"
# my-evolution/Locations.h:1455
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
msgid "Monte Scuro"
msgstr ""
# my-evolution/Locations.h:1456
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
msgid "Monte Terminillo"
msgstr ""
# my-evolution/Locations.h:1457
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
msgid "Montevideo/Carrasco"
msgstr "蒙德维的亚/Carrasco"
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# my-evolution/Locations.h:1458
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
#, fuzzy
msgid "Montgomery"
msgstr "蒙特塞拉特群岛"
# my-evolution/Locations.h:1459
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
msgid "Montgomery-Maxwell AFB"
msgstr "蒙哥马利-麦克斯维尔空军基地"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:1460
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
#, fuzzy
msgid "Monticello"
msgstr "摩纳哥"
@@ -31451,42 +31933,42 @@ msgstr "摩纳哥"
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# my-evolution/Locations.h:1461
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
msgid "Montpelier"
msgstr "蒙比利埃"
# my-evolution/Locations.h:1462
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
msgid "Montreal Dorval"
msgstr "蒙特利尔 Dorval"
# my-evolution/Locations.h:1463
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
msgid "Montreal Mirabel"
msgstr "蒙特利尔 米拉贝尔"
# my-evolution/Locations.h:1464
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
msgid "Montreal Saint-Hubert"
msgstr "蒙特利尔 圣休伯特"
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# addressbook/gui/contact-editor/fulladdr.glade.h:141
# my-evolution/Locations.h:1465
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
#, fuzzy
msgid "Montrose"
msgstr "蒙特塞拉特群岛"
# my-evolution/Locations.h:1466
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
msgid "Montrose (2)"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# addressbook/gui/contact-editor/fulladdr.glade.h:140
# my-evolution/Locations.h:1467
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
msgid "Morelia"
msgstr "莫雷利亚"
@@ -31495,7 +31977,7 @@ msgstr "莫雷利亚"
# addressbook/backend/ebook/e-card-simple.c:69
# addressbook/gui/widgets/e-addressbook-view.c:858
# my-evolution/Locations.h:1468
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
#, fuzzy
msgid "Morgantown"
msgstr "组织"
@@ -31505,28 +31987,28 @@ msgstr "组织"
# addressbook/backend/ebook/e-card-simple.c:63
# addressbook/gui/contact-editor/e-contact-editor.c:1659
# my-evolution/Locations.h:1469
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
#, fuzzy
msgid "Moriarty"
msgstr "主要"
# my-evolution/Locations.h:1471
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
msgid "Morristown"
msgstr ""
# my-evolution/Locations.h:1472
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
msgid "Moscow Domodedovo"
msgstr "莫斯科 Domodedovo"
# my-evolution/Locations.h:1473
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
msgid "Moscow Sheremetyevo"
msgstr "莫斯科 Sheremetyevo"
# my-evolution/Locations.h:1474
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
msgid "Moses Lake"
msgstr "摩西湖"
@@ -31537,48 +32019,48 @@ msgstr "摩西湖"
# addressbook/gui/contact-editor/contact-editor.glade.h:20
# addressbook/gui/contact-editor/e-contact-editor.c:1655
# my-evolution/Locations.h:1475
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
#, fuzzy
msgid "Mosinee"
msgstr "手机"
# my-evolution/Locations.h:1476
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
msgid "Mosjoen"
msgstr ""
# my-evolution/Locations.h:1477
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
msgid "Moultrie"
msgstr ""
# my-evolution/Locations.h:1478
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
msgid "Mountain Home"
msgstr ""
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# my-evolution/Locations.h:1479
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
#, fuzzy
msgid "Mountain View"
msgstr "月视图"
# my-evolution/Locations.h:1480
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
msgid "Mount Clemens"
msgstr ""
# my-evolution/Locations.h:1481
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
msgid "Mount Holly"
msgstr ""
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/Locations.h:1482
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
#, fuzzy
msgid "Mount Shasta"
msgstr "东南"
@@ -31586,79 +32068,79 @@ msgstr "东南"
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
# my-evolution/Locations.h:1483
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
#, fuzzy
msgid "Mount Vernon"
msgstr "月视图"
# my-evolution/Locations.h:1484
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
msgid "Mount Wilson"
msgstr ""
# my-evolution/Locations.h:1485
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
msgid "Mt Washington"
msgstr "Mt 华盛顿"
# my-evolution/Locations.h:1486
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
msgid "Mugla/Dalaman"
msgstr ""
# my-evolution/Locations.h:1487
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
msgid "Muir"
msgstr ""
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:1488
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
#, fuzzy
msgid "Mullan"
msgstr "经理"
# my-evolution/Locations.h:1489
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
msgid "Mullen"
msgstr ""
# my-evolution/Locations.h:1490
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
msgid "Munchen"
msgstr ""
# calendar/gui/goto-dialog.glade.h:9
# calendar/gui/goto-dialog.glade.h:9
# my-evolution/Locations.h:1491
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
#, fuzzy
msgid "Muncie"
msgstr "六月"
# my-evolution/Locations.h:1492
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
msgid "Munster/Osnabruck"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# addressbook/gui/contact-editor/fulladdr.glade.h:134
# my-evolution/Locations.h:1493
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
#, fuzzy
msgid "Murcia"
msgstr "毛里塔尼亚"
# my-evolution/Locations.h:1494
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
msgid "Murmansk"
msgstr "摩尔曼斯克"
# addressbook/gui/contact-editor/fullname.glade.h:11
# addressbook/gui/contact-editor/fullname.glade.h:11
# my-evolution/Locations.h:1495
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
#, fuzzy
msgid "Mus"
msgstr "女士"
@@ -31666,126 +32148,126 @@ msgstr "女士"
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# addressbook/gui/contact-editor/fulladdr.glade.h:133
# my-evolution/Locations.h:1496
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
#, fuzzy
msgid "Muscatine"
msgstr "马提尼可岛"
# my-evolution/Locations.h:1497
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
msgid "Muscle Shoals"
msgstr ""
# my-evolution/Locations.h:1498
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
msgid "Muskegon"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:8
# my-evolution/metar.c:33
# my-evolution/Locations.h:1499
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
#, fuzzy
msgid "Mykonos"
msgstr "节"
# my-evolution/Locations.h:1500
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
msgid "Myrtle Beach"
msgstr ""
# my-evolution/Locations.h:1501
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
msgid "Nabesna/Devil Mt."
msgstr ""
# my-evolution/Locations.h:1502
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
msgid "Nacogdoches"
msgstr ""
# my-evolution/Locations.h:1503
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
msgid "Nagasaki Airport"
msgstr "长崎机场"
# my-evolution/Locations.h:1504
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
msgid "Nagoya Airport"
msgstr "名古屋机场"
# my-evolution/Locations.h:1505
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
msgid "Nagpur Sonegaon"
msgstr "那格浦尔 Sonegaon"
# my-evolution/Locations.h:1506
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
msgid "Naha Airport"
msgstr "那霸机场"
# addressbook/gui/contact-editor/fulladdr.glade.h:18
# addressbook/gui/contact-editor/fulladdr.glade.h:18
# my-evolution/Locations.h:1507
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
#, fuzzy
msgid "Najran"
msgstr "巴林岛"
# my-evolution/Locations.h:1508
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
msgid "Nakashibetsu Airport"
msgstr ""
# my-evolution/Locations.h:1509
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
msgid "Nalchik"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# my-evolution/Locations.h:1510
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
#, fuzzy
msgid "Namsos"
msgstr "老挝"
# my-evolution/Locations.h:1511
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
msgid "Nancy-Essey"
msgstr ""
# my-evolution/Locations.h:1512
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
msgid "Nancy-Ochey"
msgstr ""
# my-evolution/Locations.h:1513
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
msgid "Nankishirahama Airport"
msgstr ""
# mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
# mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
# my-evolution/Locations.h:1514
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
msgid "Nanning"
msgstr "南宁"
# my-evolution/Locations.h:1515
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
msgid "Nantes Adlantique"
msgstr "南特 Adlantique"
# my-evolution/Locations.h:1516
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
msgid "Nantucket"
msgstr "楠塔基特"
# addressbook/gui/contact-editor/fulladdr.glade.h:147
# addressbook/gui/contact-editor/fulladdr.glade.h:147
# my-evolution/Locations.h:1517
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
#, fuzzy
msgid "Napa"
msgstr "尼泊尔"
@@ -31793,163 +32275,163 @@ msgstr "尼泊尔"
# mail/mail-config.glade.h:46
# mail/mail-config.glade.h:46
# my-evolution/Locations.h:1518
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
msgid "Naples"
msgstr "那不勒斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:130
# addressbook/gui/contact-editor/fulladdr.glade.h:130
# my-evolution/Locations.h:1519
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
msgid "Napoli"
msgstr "那不勒斯"
# addressbook/backend/ebook/e-card-simple.c:95
# addressbook/backend/ebook/e-card-simple.c:95
# my-evolution/Locations.h:1520
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
msgid "Narvik"
msgstr "纳尔维克"
# my-evolution/Locations.h:1521
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
msgid "Nasa Shuttle"
msgstr ""
# my-evolution/Locations.h:1522
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
msgid "Nashua"
msgstr ""
# my-evolution/Locations.h:1523
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
msgid "Nashville"
msgstr "纳什维尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:137
# my-evolution/Locations.h:1524
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
msgid "Nassau"
msgstr "拿骚"
# addressbook/gui/contact-editor/fulladdr.glade.h:172
# addressbook/gui/contact-editor/fulladdr.glade.h:172
# my-evolution/Locations.h:1525
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
msgid "Natal"
msgstr "纳塔耳"
# mail/mail-search.c:346
# mail/mail-search.c:346
# my-evolution/Locations.h:1526
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
msgid "Natchez"
msgstr "纳齐兹"
# my-evolution/Locations.h:1527
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
msgid "Nawabshah"
msgstr ""
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# my-evolution/Locations.h:1528
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
msgid "Nebraska"
msgstr "内布拉斯加州"
# my-evolution/Locations.h:1529
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
msgid "Needles"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# my-evolution/Locations.h:1530
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
#, fuzzy
msgid "Nenana"
msgstr "格林纳达"
# my-evolution/Locations.h:1532
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
msgid "Neuquen"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# addressbook/gui/contact-editor/fulladdr.glade.h:89
# my-evolution/Locations.h:1533
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
msgid "Nevada"
msgstr "内华达州"
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
# my-evolution/Locations.h:1534
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
msgid "Newark"
msgstr "内瓦克"
# my-evolution/e-summary-rdf.c:528
# my-evolution/e-summary-rdf.c:528
# my-evolution/Locations.h:1535
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
msgid "New Bedford"
msgstr "新贝德福德"
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
# my-evolution/Locations.h:1536
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
msgid "New Bern"
msgstr "新伯尔尼"
# my-evolution/Locations.h:1537
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
msgid "New Braunfels"
msgstr ""
# my-evolution/Locations.h:1538
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
msgid "New Brunswick"
msgstr ""
# my-evolution/Locations.h:1539
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
msgid "Newburgh"
msgstr ""
# mail/mail-config.glade.h:46
# mail/mail-config.glade.h:46
# my-evolution/Locations.h:1540
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
msgid "Newcastle"
msgstr "纽卡斯尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# my-evolution/Locations.h:1541
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
msgid "New Delhi/Palam"
msgstr "新德里/Palam"
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# my-evolution/Locations.h:1542
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
msgid "Newfoundland"
msgstr "纽芬兰"
# my-evolution/Locations.h:1543
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
msgid "New Hampshire"
msgstr "新汉普郡"
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# my-evolution/Locations.h:1544
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
#, fuzzy
msgid "New Haven"
msgstr "新喀里多尼亚"
@@ -31957,144 +32439,144 @@ msgstr "新喀里多尼亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# addressbook/gui/contact-editor/fulladdr.glade.h:150
# my-evolution/Locations.h:1545
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
msgid "New Iberia"
msgstr "新伊比利亚"
# ui/evolution-mail-global.xml.h:10
# ui/evolution-mail-global.xml.h:10
# my-evolution/Locations.h:1546
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
msgid "New Jersey"
msgstr "新泽西州"
# addressbook/gui/contact-editor/fulladdr.glade.h:137
# addressbook/gui/contact-editor/fulladdr.glade.h:137
# my-evolution/Locations.h:1547
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
msgid "New Mexico"
msgstr "新墨西哥州"
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# addressbook/gui/contact-editor/fulladdr.glade.h:151
# my-evolution/Locations.h:1548
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
msgid "New Orleans"
msgstr "新奥尔良"
# my-evolution/Locations.h:1549
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
msgid "New Orleans-Lakefront"
msgstr "新奥尔良-Lakefront"
# my-evolution/Locations.h:1550
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
msgid "New Orleans NAS"
msgstr "新奥尔良国家科学院"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1551
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
#, fuzzy
msgid "Newport"
msgstr "北"
# my-evolution/Locations.h:1552
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
msgid "Newport News"
msgstr ""
# my-evolution/Locations.h:1553
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
msgid "New Port Richey"
msgstr ""
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
# my-evolution/Locations.h:1554
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
#, fuzzy
msgid "New River"
msgstr "新建文件夹(_N)"
# my-evolution/Locations.h:1555
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
msgid "New Tokyo International Airport"
msgstr "东京新国际机场"
# widgets/misc/e-charset-picker.c:101
# widgets/misc/e-charset-picker.c:101
# my-evolution/Locations.h:1556
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
msgid "Newton"
msgstr "牛顿"
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
# my-evolution/Locations.h:1557
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
msgid "New York"
msgstr "纽约"
# my-evolution/Locations.h:1558
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
msgid "New York-JFK Arpt"
msgstr "纽约-JFK Arpt"
# my-evolution/Locations.h:1559
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
msgid "New York-La Guardia"
msgstr "纽约-La Guardia"
# my-evolution/Locations.h:1561
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
msgid "Niagara Falls"
msgstr "尼亚加拉瀑布"
# my-evolution/Locations.h:1563
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
msgid "Nice-Cote d'Azur"
msgstr ""
# my-evolution/Locations.h:1564
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
msgid "Niigata Airport"
msgstr "新滹机场"
# addressbook/printing/e-contact-print.glade.h:6
# addressbook/printing/e-contact-print.glade.h:6
# my-evolution/Locations.h:1565
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
msgid "Nimes-Garons"
msgstr "尼姆-Garons"
# addressbook/gui/contact-editor/fulladdr.glade.h:196
# addressbook/gui/contact-editor/fulladdr.glade.h:196
# my-evolution/Locations.h:1566
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
#, fuzzy
msgid "Nipawin"
msgstr "西班牙"
# my-evolution/Locations.h:1567
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
#, fuzzy
msgid "Nis"
msgstr "是"
# my-evolution/Locations.h:1568
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
msgid "Nizhny Novgorod"
msgstr ""
# my-evolution/Locations.h:1569
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
msgid "N Las Vegas"
msgstr ""
# my-evolution/Locations.h:1570
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
msgid "N Myrtle Beach"
msgstr ""
@@ -32107,7 +32589,7 @@ msgstr ""
# calendar/gui/dialogs/task-details-page.glade.h:9
# calendar/gui/e-calendar-table.c:406 mail/message-list.c:661
# my-evolution/Locations.h:1571
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
#, fuzzy
msgid "Nogales"
msgstr "中"
@@ -32115,28 +32597,28 @@ msgstr "中"
# addressbook/backend/ebook/e-card-simple.c:61
# addressbook/backend/ebook/e-card-simple.c:61
# my-evolution/Locations.h:1572
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
msgid "Nome"
msgstr "诺母"
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# my-evolution/Locations.h:1573
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
msgid "Norfolk"
msgstr "诺福克"
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# my-evolution/Locations.h:1575
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
msgid "Norfolk NAS"
msgstr "诺福克国家科学院"
# mail/mail-mt.c:901
# mail/mail-mt.c:901
# my-evolution/Locations.h:1576
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
#, fuzzy
msgid "Norrkoping"
msgstr "正在工作"
@@ -32144,27 +32626,27 @@ msgstr "正在工作"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1577
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
msgid "North Adams"
msgstr "北亚当斯"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1578
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
#, fuzzy
msgid "North Bend"
msgstr "北"
# my-evolution/Locations.h:1579
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
msgid "North Carolina"
msgstr "北卡罗莱纳州"
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# my-evolution/Locations.h:1580
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
#, fuzzy
msgid "North Conway"
msgstr "挪威"
@@ -32172,31 +32654,31 @@ msgstr "挪威"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1581
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
msgid "North Dakota"
msgstr "北达科他"
# my-evolution/Locations.h:1582
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
msgid "Northeast Philadelphia"
msgstr "东北费城"
# my-evolution/Locations.h:1583
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
msgid "North Kingstown"
msgstr "北金斯敦"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1584
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
msgid "North Platte"
msgstr "北普拉特"
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# my-evolution/Locations.h:1585
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
#, fuzzy
msgid "Northway"
msgstr "挪威"
@@ -32204,7 +32686,7 @@ msgstr "挪威"
# addressbook/gui/contact-editor/fulladdr.glade.h:80
# addressbook/gui/contact-editor/fulladdr.glade.h:80
# my-evolution/Locations.h:1586
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
#, fuzzy
msgid "Northwest Territories"
msgstr "法属南部地区"
@@ -32212,7 +32694,7 @@ msgstr "法属南部地区"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/Locations.h:1588
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
#, fuzzy
msgid "Norwich"
msgstr "北"
@@ -32220,7 +32702,7 @@ msgstr "北"
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# my-evolution/Locations.h:1589
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
#, fuzzy
msgid "Norwood"
msgstr "挪威"
@@ -32230,33 +32712,33 @@ msgstr "挪威"
# addressbook/backend/ebook/e-card-simple.c:97
# addressbook/gui/widgets/e-addressbook-view.c:886
# my-evolution/Locations.h:1590
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
#, fuzzy
msgid "Notodden"
msgstr "注释"
# my-evolution/Locations.h:1591
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
msgid "Novara/Cameri"
msgstr "诺瓦蜡/Cameri"
# my-evolution/Locations.h:1592
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
msgid "Nova Scotia"
msgstr "新斯科舍"
# my-evolution/Locations.h:1593
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
msgid "Novosibirsk"
msgstr "新西伯利亚"
# my-evolution/Locations.h:1594
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
msgid "Nueva Gerona"
msgstr ""
# my-evolution/Locations.h:1595
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
msgid "Nueva Ocotepeque"
msgstr ""
@@ -32267,60 +32749,60 @@ msgstr ""
# calendar/gui/dialogs/task-details-page.glade.h:10
# calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
# my-evolution/Locations.h:1596
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
#, fuzzy
msgid "Nuevo Laredo"
msgstr "尚未开始"
# my-evolution/Locations.h:1597
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
msgid "Nurnberg"
msgstr ""
# my-evolution/Locations.h:1598
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
msgid "Nyutabaru Ab"
msgstr ""
# my-evolution/Locations.h:1599
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
msgid "Oahu"
msgstr "瓦胡岛"
# my-evolution/Locations.h:1600
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
msgid "Oak Harbor"
msgstr "橡树湾"
# addressbook/gui/contact-editor/fulladdr.glade.h:208
# addressbook/gui/contact-editor/fulladdr.glade.h:208
# my-evolution/Locations.h:1601
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
msgid "Oakland"
msgstr "奥克兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:108
# addressbook/gui/contact-editor/fulladdr.glade.h:108
# my-evolution/Locations.h:1602
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
#, fuzzy
msgid "Oaxaca"
msgstr "牙买加"
# my-evolution/Locations.h:1603
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
msgid "Oberpfaffenhofen"
msgstr ""
# my-evolution/Locations.h:1604
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
msgid "Obihiro Airport"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1605
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
#, fuzzy
msgid "Ocala"
msgstr "帕劳群岛"
@@ -32328,7 +32810,7 @@ msgstr "帕劳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:102
# addressbook/gui/contact-editor/fulladdr.glade.h:102
# my-evolution/Locations.h:1606
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
#, fuzzy
msgid "Oceanside"
msgstr "冰岛"
@@ -32338,7 +32820,7 @@ msgstr "冰岛"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
# ui/evolution-message-composer.xml.h:13
# my-evolution/Locations.h:1607
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
msgid "Odense"
msgstr "欧登塞"
@@ -32347,7 +32829,7 @@ msgstr "欧登塞"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
# ui/evolution-message-composer.xml.h:13
# my-evolution/Locations.h:1608
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
#, fuzzy
msgid "Odesa"
msgstr "打开"
@@ -32355,7 +32837,7 @@ msgstr "打开"
# mail/message-list.c:640
# mail/message-list.c:646
# my-evolution/Locations.h:1609
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
#, fuzzy
msgid "Oelwen"
msgstr "可见"
@@ -32365,22 +32847,22 @@ msgstr "可见"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
# ui/evolution-message-composer.xml.h:13
# my-evolution/Locations.h:1610
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
msgid "Ogden"
msgstr "奥格登"
# my-evolution/Locations.h:1611
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
msgid "Ogden-Hill AFB"
msgstr "奥格登山空军基地"
# my-evolution/Locations.h:1612
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
msgid "Ogdensburg"
msgstr ""
# my-evolution/Locations.h:1613
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
msgid "Ohio"
msgstr "俄亥俄州"
@@ -32395,63 +32877,63 @@ msgstr "俄亥俄州"
# addressbook/gui/contact-editor/e-contact-editor.c:1714
# mail/mail-config.glade.h:49
# my-evolution/Locations.h:1614
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
#, fuzzy
msgid "Ohrid"
msgstr "其它"
# my-evolution/Locations.h:1615
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
msgid "Oita Airport"
msgstr "大分机场"
# addressbook/gui/contact-editor/fulladdr.glade.h:53
# addressbook/gui/contact-editor/fulladdr.glade.h:53
# my-evolution/Locations.h:1616
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
#, fuzzy
msgid "Ojika Island"
msgstr "库克群岛"
# my-evolution/Locations.h:1617
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
msgid "Okayama Airport"
msgstr "冈山机场"
# my-evolution/Locations.h:1618
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
msgid "Oki Airport"
msgstr ""
# my-evolution/Locations.h:1619
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
msgid "Okinoerabu"
msgstr ""
# my-evolution/Locations.h:1620
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
msgid "Oklahoma"
msgstr "俄克拉荷马州"
# my-evolution/Locations.h:1621
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
msgid "Oklahoma City"
msgstr "俄克拉荷马城"
# my-evolution/Locations.h:1622
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
msgid "Oklahoma City-Bethany"
msgstr "俄克拉荷马城-Bethany"
# my-evolution/Locations.h:1623
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
msgid "Oklahoma City-Midwest City"
msgstr "俄克拉荷马城-中西部城市"
# addressbook/gui/contact-editor/fulladdr.glade.h:33
# addressbook/gui/contact-editor/fulladdr.glade.h:33
# my-evolution/Locations.h:1624
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
#, fuzzy
msgid "Okushiri Island"
msgstr "不列颠处女群岛"
@@ -32467,68 +32949,68 @@ msgstr "不列颠处女群岛"
# addressbook/gui/contact-editor/e-contact-editor.c:1714
# mail/mail-config.glade.h:49
# my-evolution/Locations.h:1625
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
#, fuzzy
msgid "Olathe"
msgstr "其它"
# my-evolution/Locations.h:1626
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
msgid "Olathe/Ind."
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:3
# addressbook/gui/contact-editor/fulladdr.glade.h:3
# my-evolution/Locations.h:1627
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
#, fuzzy
msgid "Olbia"
msgstr "阿尔巴尼亚"
# my-evolution/Locations.h:1628
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
msgid "Olympia"
msgstr "奥林匹亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# my-evolution/Locations.h:1629
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
msgid "Omaha"
msgstr "奥马哈"
# my-evolution/Locations.h:1630
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
msgid "Omaha-Bellevue"
msgstr "奥马哈-Bellevue"
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# my-evolution/Locations.h:1631
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
#, fuzzy
msgid "Omak"
msgstr "阿曼"
# my-evolution/Locations.h:1633
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
msgid "Ominato Ab"
msgstr ""
# my-evolution/Locations.h:1634
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
msgid "Omsk"
msgstr "鄂木斯克"
# my-evolution/Locations.h:1635
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
msgid "O'Neill"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:24
# addressbook/printing/e-contact-print.glade.h:24
# my-evolution/Locations.h:1636
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
msgid "Ontario"
msgstr "安大略"
@@ -32537,55 +33019,55 @@ msgstr "安大略"
# calendar/gui/dialogs/meeting-page.etspec.h:1
# calendar/gui/e-meeting-time-sel.etspec.h:1
# my-evolution/Locations.h:1637
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
msgid "Oostende"
msgstr "奥斯坦德"
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# addressbook/gui/contact-editor/fulladdr.glade.h:159
# my-evolution/Locations.h:1638
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
msgid "Oran"
msgstr "奥兰"
# my-evolution/Locations.h:1639
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
msgid "Oran/Es Senia"
msgstr "奥兰/Es Senia"
# addressbook/gui/contact-editor/fulladdr.glade.h:77
# addressbook/gui/contact-editor/fulladdr.glade.h:77
# my-evolution/Locations.h:1640
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
msgid "Orange"
msgstr "奥林奇"
# my-evolution/Locations.h:1641
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
msgid "Orange City"
msgstr "奥林奇城"
# my-evolution/Locations.h:1642
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
msgid "Ord-Sharp"
msgstr ""
# addressbook/backend/ebook/e-card-simple.c:69
# addressbook/backend/ebook/e-card-simple.c:69
# my-evolution/Locations.h:1643
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
msgid "Oregon"
msgstr "俄勒冈州"
# my-evolution/Locations.h:1644
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
msgid "Orenburg"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# my-evolution/Locations.h:1645
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
#, fuzzy
msgid "Orland"
msgstr "爱尔兰"
@@ -32593,153 +33075,153 @@ msgstr "爱尔兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# my-evolution/Locations.h:1646
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
msgid "Orlando"
msgstr "奥兰多"
# my-evolution/Locations.h:1647
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
msgid "Orlando (Orlando International)"
msgstr "奥兰多 (奥兰多国际)"
# my-evolution/Locations.h:1648
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
msgid "Orsta-Volda"
msgstr ""
# widgets/misc/e-messagebox.c:166
# widgets/misc/e-messagebox.c:166
# my-evolution/Locations.h:1649
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
msgid "Oruro"
msgstr "奥鲁罗"
# my-evolution/Locations.h:1650
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
msgid "Osaka International Airport"
msgstr "大阪国际机场"
# my-evolution/Locations.h:1651
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
msgid "Osan Ab"
msgstr ""
# my-evolution/Locations.h:1652
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
#, fuzzy
msgid "Oscoda"
msgstr "秒"
# my-evolution/Locations.h:1653
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
msgid "Oseberg A"
msgstr ""
# my-evolution/Locations.h:1654
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
msgid "Oshima Airport"
msgstr ""
# my-evolution/Locations.h:1655
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
msgid "Oshkosh"
msgstr ""
# my-evolution/Locations.h:1656
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
msgid "Oslo/Gardenmoen"
msgstr "奥斯陆/Gardenmoen"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# my-evolution/Locations.h:1657
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
msgid "Ostrava"
msgstr "俄斯特拉发"
# my-evolution/Locations.h:1658
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
msgid "Ottawa"
msgstr "渥太华"
# my-evolution/Locations.h:1659
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
msgid "Ottumwa"
msgstr ""
# my-evolution/Locations.h:1660
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
msgid "Owensboro"
msgstr ""
# my-evolution/Locations.h:1661
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
#, fuzzy
msgid "Owyhee"
msgstr "周"
# my-evolution/Locations.h:1662
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
msgid "Oxford"
msgstr "牛津"
# my-evolution/Locations.h:1663
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
msgid "Oxnard"
msgstr ""
# my-evolution/Locations.h:1664
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
msgid "Ozark"
msgstr "奥扎克"
# my-evolution/Locations.h:1665
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
msgid "Ozuki Ab"
msgstr ""
# my-evolution/Locations.h:1666
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
msgid "Paderborn-Haxterberg"
msgstr "帕德伯恩-Haxterberg"
# my-evolution/Locations.h:1667
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
msgid "Padova"
msgstr "帕多瓦"
# my-evolution/Locations.h:1668
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
msgid "Paducah"
msgstr ""
# my-evolution/Locations.h:1669
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
msgid "Paekado"
msgstr ""
# my-evolution/Locations.h:1670
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
msgid "Paengnyongdo Ab"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:25
# addressbook/printing/e-contact-print.glade.h:25
# my-evolution/Locations.h:1671
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
#, fuzzy
msgid "Paganella"
msgstr "页面"
# my-evolution/Locations.h:1674
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
msgid "Pa Kuei/Bakuai"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1675
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
#, fuzzy
msgid "Palacios"
msgstr "帕劳群岛"
@@ -32747,19 +33229,19 @@ msgstr "帕劳群岛"
# addressbook/printing/e-contact-print.glade.h:27
# addressbook/printing/e-contact-print.glade.h:27
# my-evolution/Locations.h:1676
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
msgid "Palermo"
msgstr "巴勒莫"
# my-evolution/Locations.h:1677
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
msgid "Palma de Mallorca"
msgstr "帕尔马 德 马略卡"
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1678
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
#, fuzzy
msgid "Palmdale"
msgstr "帕劳群岛"
@@ -32771,27 +33253,27 @@ msgstr "帕劳群岛"
# addressbook/gui/contact-editor/e-contact-editor.c:1658
# addressbook/gui/widgets/e-addressbook-view.c:870
# my-evolution/Locations.h:1679
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
msgid "Palmer"
msgstr "帕默"
# mail/mail-accounts.c:783 mail/mail-config.glade.h:42
# mail/mail-accounts.c:798 mail/mail-config.glade.h:42
# my-evolution/Locations.h:1680
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
#, fuzzy
msgid "Palm Springs"
msgstr "邮件设置"
# my-evolution/Locations.h:1681
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
msgid "Palo Alto"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1682
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
#, fuzzy
msgid "Pamplona"
msgstr "帕劳群岛"
@@ -32799,7 +33281,7 @@ msgstr "帕劳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:163
# addressbook/gui/contact-editor/fulladdr.glade.h:163
# my-evolution/Locations.h:1684
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
msgid "Panama City"
msgstr "巴拿马城"
@@ -32814,7 +33296,7 @@ msgstr "巴拿马城"
# calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
# camel/camel-service.c:610 camel/camel-service.c:646
# my-evolution/Locations.h:1685
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
#, fuzzy
msgid "Pantelleria"
msgstr "已经取消"
@@ -32822,7 +33304,7 @@ msgstr "已经取消"
# addressbook/printing/e-contact-print.glade.h:27
# addressbook/printing/e-contact-print.glade.h:27
# my-evolution/Locations.h:1686
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
#, fuzzy
msgid "Papa"
msgstr "纸张"
@@ -32830,7 +33312,7 @@ msgstr "纸张"
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# my-evolution/Locations.h:1687
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
#, fuzzy
msgid "Paphos"
msgstr "老挝"
@@ -32838,29 +33320,29 @@ msgstr "老挝"
# addressbook/printing/e-contact-print.glade.h:21
# addressbook/printing/e-contact-print.glade.h:21
# my-evolution/Locations.h:1689
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
msgid "Paris"
msgstr "巴黎"
# my-evolution/Locations.h:1690
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
msgid "Paris/Charles De Gaulle"
msgstr "巴黎/Charles De Gaulle"
# my-evolution/Locations.h:1691
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
msgid "Paris/Le Bourget"
msgstr "巴黎/Le Bourget"
# my-evolution/metar.c:359
# my-evolution/metar.c:359
# my-evolution/Locations.h:1692
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
msgid "Paris/Orly"
msgstr "巴黎/Orly"
# my-evolution/Locations.h:1693
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
msgid "Parkersburg"
msgstr ""
@@ -32871,72 +33353,72 @@ msgstr ""
# camel/providers/nntp/camel-nntp-store.c:149
# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
# my-evolution/Locations.h:1694
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
#, fuzzy
msgid "Pasco"
msgstr "密码"
# my-evolution/Locations.h:1695
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
msgid "Paso De Los Libres"
msgstr ""
# my-evolution/Locations.h:1696
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
msgid "Paso Robles"
msgstr ""
# my-evolution/Locations.h:1697
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
msgid "Passo dei Giovi"
msgstr ""
# my-evolution/Locations.h:1698
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
msgid "Passo della Cisa"
msgstr ""
# my-evolution/Locations.h:1699
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
msgid "Passo Resia"
msgstr ""
# my-evolution/Locations.h:1700
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
msgid "Passo Rolle"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:163
# addressbook/gui/contact-editor/fulladdr.glade.h:163
# my-evolution/Locations.h:1701
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
msgid "Patna"
msgstr "巴特纳"
# my-evolution/Locations.h:1702
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
msgid "Patterson"
msgstr "帕特森"
# my-evolution/Locations.h:1703
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
msgid "Patuxent River"
msgstr ""
# my-evolution/Locations.h:1704
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
msgid "Pau/Pyrenees"
msgstr "Pau/比利牛斯山脉"
# my-evolution/Locations.h:1705
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
msgid "Paxson"
msgstr ""
# my-evolution/metar.c:326
# my-evolution/metar.c:326
# my-evolution/Locations.h:1706
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
#, fuzzy
msgid "Paysandu"
msgstr "重沙尘"
@@ -32944,7 +33426,7 @@ msgstr "重沙尘"
# calendar/gui/dialogs/alarm-options.glade.h:3
# calendar/gui/dialogs/alarm-options.glade.h:3
# my-evolution/Locations.h:1707
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
#, fuzzy
msgid "Payson"
msgstr "播放声音:"
@@ -32952,7 +33434,7 @@ msgstr "播放声音:"
# widgets/misc/e-messagebox.c:173
# widgets/misc/e-messagebox.c:173
# my-evolution/Locations.h:1708
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
#, fuzzy
msgid "Pellston"
msgstr "问题"
@@ -32960,7 +33442,7 @@ msgstr "问题"
# ui/my-evolution.xml.h:5
# ui/my-evolution.xml.h:5
# my-evolution/Locations.h:1709
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
#, fuzzy
msgid "Pelotas"
msgstr "重新载入"
@@ -32968,124 +33450,124 @@ msgstr "重新载入"
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
# my-evolution/Locations.h:1710
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
#, fuzzy
msgid "Pendleton"
msgstr "选择:"
# my-evolution/Locations.h:1711
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
msgid "Pennsylvania"
msgstr "宾西法尼亚州"
# my-evolution/Locations.h:1712
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
msgid "Penn Yan"
msgstr "佩恩 Yan"
# my-evolution/Locations.h:1713
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
msgid "Pensacola"
msgstr ""
# my-evolution/Locations.h:1714
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
msgid "Pensacola NAS"
msgstr ""
# my-evolution/Locations.h:1715
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
msgid "People's Republic of China"
msgstr "中华人民共和国"
# addressbook/gui/contact-editor/fulladdr.glade.h:83
# addressbook/gui/contact-editor/fulladdr.glade.h:83
# my-evolution/Locations.h:1716
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
#, fuzzy
msgid "Peoria"
msgstr "格鲁吉亚"
# my-evolution/Locations.h:1717
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
msgid "Pequot Lakes"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:127
# my-evolution/Locations.h:1718
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
msgid "Pereira/Matecana"
msgstr "佩雷拉/Matecana"
# addressbook/backend/ebook/e-card-simple.c:63
# addressbook/backend/ebook/e-card-simple.c:63
# my-evolution/Locations.h:1719
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
#, fuzzy
msgid "Perm"
msgstr "主要"
# my-evolution/Locations.h:1720
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
msgid "Perpignan-Rivesaltes"
msgstr ""
# my-evolution/Locations.h:1721
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
msgid "Perry-Foley"
msgstr "佩里-福利"
# addressbook/gui/contact-editor/fulladdr.glade.h:166
# addressbook/gui/contact-editor/fulladdr.glade.h:166
# my-evolution/Locations.h:1722
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
msgid "Perth"
msgstr "珀斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:166
# addressbook/gui/contact-editor/fulladdr.glade.h:166
# my-evolution/Locations.h:1724
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
msgid "Perugia"
msgstr "佩鲁贾"
# my-evolution/Locations.h:1725
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
msgid "Pescara"
msgstr "佩斯卡拉"
# my-evolution/Locations.h:1726
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
msgid "Petersburg"
msgstr "彼得斯堡"
# my-evolution/Locations.h:1727
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
msgid "Petropavlovsk-Kamchatsky"
msgstr ""
# my-evolution/Locations.h:1728
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
msgid "Petrozavodsk"
msgstr "彼得罗扎沃茨克"
# my-evolution/Locations.h:1729
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
msgid "Philadelphia"
msgstr "费城"
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# my-evolution/Locations.h:1730
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
msgid "Philip"
msgstr "菲利普"
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# my-evolution/Locations.h:1731
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
#, fuzzy
msgid "Philipsburg"
msgstr "菲利宾"
@@ -33093,145 +33575,145 @@ msgstr "菲利宾"
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# addressbook/gui/contact-editor/fulladdr.glade.h:167
# my-evolution/Locations.h:1732
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
msgid "Phillips"
msgstr "菲利普"
# calendar/zones.h:146
# my-evolution/Locations.h:1733
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
msgid "Phoenix"
msgstr "凤凰城"
# my-evolution/Locations.h:1734
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
msgid "Phoenix-Deer Valley"
msgstr "凤凰城-鹿谷"
# my-evolution/Locations.h:1735
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
msgid "Phoenix-Goodyear"
msgstr "凤凰城-古德伊尔"
# my-evolution/Locations.h:1736
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
msgid "Phoenix-Luke AFB"
msgstr "凤凰城-卢克空军基地"
# my-evolution/Locations.h:1737
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
msgid "Piacenza"
msgstr ""
# my-evolution/Locations.h:1738
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
msgid "Pian Rosa"
msgstr ""
# my-evolution/Locations.h:1739
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
msgid "Piedras Negras"
msgstr ""
# importers/pine-importer.c:691
# importers/pine-importer.c:691
# my-evolution/Locations.h:1740
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
msgid "Pierre"
msgstr "皮埃尔"
# my-evolution/Locations.h:1741
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
msgid "Pietersburg"
msgstr ""
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
# my-evolution/Locations.h:1742
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
#, fuzzy
msgid "Pikeville"
msgstr "预览"
# my-evolution/Locations.h:1743
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
msgid "Pine Bluff"
msgstr ""
# my-evolution/Locations.h:1744
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
msgid "Pingtung North"
msgstr ""
# my-evolution/Locations.h:1745
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
msgid "Pingtung South"
msgstr ""
# my-evolution/Locations.h:1746
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
msgid "Pirassununga"
msgstr ""
# my-evolution/Locations.h:1747
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
msgid "Pisa"
msgstr "比萨"
# my-evolution/Locations.h:1748
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
msgid "Pisco"
msgstr "皮斯科"
# my-evolution/Locations.h:1749
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
msgid "Pittsburgh"
msgstr "匹兹堡"
# my-evolution/Locations.h:1750
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
msgid "Pittsburgh-West Mifflin"
msgstr "匹兹堡-West Mifflin"
# my-evolution/Locations.h:1751
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
msgid "Plattsburg"
msgstr ""
# my-evolution/Locations.h:1752
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
msgid "Plovdiv"
msgstr "普罗夫迪夫"
# my-evolution/Locations.h:1753
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
msgid "Plymouth"
msgstr "普利茅斯"
# my-evolution/Locations.h:1754
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
msgid "Pocatello"
msgstr ""
# my-evolution/Locations.h:1755
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
msgid "Pocos De Caldas"
msgstr ""
# my-evolution/Locations.h:1756
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
msgid "Podgorica"
msgstr "波德戈里查"
# my-evolution/metar.c:449
# my-evolution/metar.c:449
# my-evolution/Locations.h:1757
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
msgid "Podgorica Titograd"
msgstr "波德戈里查 铁托格勒"
# my-evolution/Locations.h:1758
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
msgid "Pohang Ab"
msgstr ""
@@ -33240,7 +33722,7 @@ msgstr ""
# addressbook/printing/e-contact-print-envelope.c:215
# addressbook/printing/e-contact-print-envelope.c:236
# my-evolution/Locations.h:1759
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
#, fuzzy
msgid "Point Hope"
msgstr "打印信封"
@@ -33248,7 +33730,7 @@ msgstr "打印信封"
# ui/my-evolution.xml.h:4
# ui/my-evolution.xml.h:4
# my-evolution/Locations.h:1760
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
#, fuzzy
msgid "Point Lay"
msgstr "打印概要"
@@ -33256,70 +33738,70 @@ msgstr "打印概要"
# mail/mail-callbacks.c:2325
# mail/mail-callbacks.c:2465
# my-evolution/Locations.h:1761
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
#, fuzzy
msgid "Point Mugu"
msgstr "打印消息"
# my-evolution/Locations.h:1762
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
msgid "Point Piedras Blanca"
msgstr ""
# mail/mail-callbacks.c:2262
# mail/mail-callbacks.c:2381
# my-evolution/Locations.h:1763
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
#, fuzzy
msgid "Poitiers"
msgstr "过滤规则"
# my-evolution/Locations.h:1765
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
msgid "Pompano Beach"
msgstr ""
# views/addressbook/galview.xml.h:3
# views/addressbook/galview.xml.h:3
# my-evolution/Locations.h:1766
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
msgid "Ponca City"
msgstr "彭加城"
# mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
# mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
# my-evolution/Locations.h:1767
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
msgid "Ponce"
msgstr "庞塞"
# my-evolution/Locations.h:1768
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
msgid "Ponta Pora"
msgstr ""
# ui/evolution-addressbook.xml.h:31
# ui/evolution-addressbook.xml.h:31
# my-evolution/Locations.h:1769
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
#, fuzzy
msgid "Pontiac"
msgstr "联系人(_C)"
# my-evolution/Locations.h:1770
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
msgid "Pope AFB"
msgstr ""
# my-evolution/Locations.h:1771
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
msgid "Poplar Bluff"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1772
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
#, fuzzy
msgid "Poprad"
msgstr "波兰"
@@ -33327,12 +33809,12 @@ msgstr "波兰"
# calendar/gui/print.c:2386
# calendar/gui/print.c:2386
# my-evolution/Locations.h:1773
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
msgid "Port Alexander"
msgstr "亚历山大港"
# my-evolution/Locations.h:1774
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
msgid "Port Alsworth"
msgstr ""
@@ -33341,26 +33823,26 @@ msgstr ""
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
# addressbook/gui/widgets/e-addressbook-view.c:738
# my-evolution/Locations.h:1775
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
#, fuzzy
msgid "Port Angeles"
msgstr "打印信封"
# calendar/zones.h:147
# my-evolution/Locations.h:1776
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
msgid "Port-Au-Prince"
msgstr "太子港"
# my-evolution/Locations.h:1777
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
msgid "Port Elizabeth"
msgstr "伊丽莎白港"
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
# my-evolution/Locations.h:1778
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
#, fuzzy
msgid "Porterville"
msgstr "预览"
@@ -33370,54 +33852,54 @@ msgstr "预览"
# addressbook/printing/e-contact-print.c:1171
# addressbook/printing/e-contact-print.c:1193
# my-evolution/Locations.h:1779
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
msgid "Port Hardy"
msgstr "哈代港"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1780
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
#, fuzzy
msgid "Port Hedland"
msgstr "波兰"
# my-evolution/Locations.h:1781
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
msgid "Port Heiden"
msgstr "海顿港"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1782
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
msgid "Portland"
msgstr "波特兰"
# addressbook/gui/component/addressbook-config.glade.h:27
# addressbook/gui/component/addressbook-config.glade.h:27
# my-evolution/Locations.h:1783
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
msgid "Porto"
msgstr "波尔图"
# calendar/gui/dialogs/task-details-page.glade.h:11
# calendar/gui/dialogs/task-details-page.glade.h:11
# my-evolution/Locations.h:1784
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
#, fuzzy
msgid "Porto Alegre"
msgstr "进度"
# my-evolution/Locations.h:1785
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
msgid "Porto Alegre Apt"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:29
# addressbook/printing/e-contact-print.glade.h:29
# my-evolution/Locations.h:1786
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
#, fuzzy
msgid "Portoroz"
msgstr "纵向"
@@ -33425,56 +33907,56 @@ msgstr "纵向"
# addressbook/printing/e-contact-print.glade.h:29
# addressbook/printing/e-contact-print.glade.h:29
# my-evolution/Locations.h:1787
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
#, fuzzy
msgid "Porto Santo"
msgstr "纵向"
# my-evolution/Locations.h:1788
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
msgid "Porto Velho"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:29
# addressbook/printing/e-contact-print.glade.h:29
# my-evolution/Locations.h:1789
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
#, fuzzy
msgid "Port Said"
msgstr "纵向"
# my-evolution/Locations.h:1790
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
msgid "Portsmouth"
msgstr "朴次茅斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1792
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
#, fuzzy
msgid "Posadas"
msgstr "波兰"
# my-evolution/Locations.h:1793
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
msgid "Potosi"
msgstr ""
# my-evolution/Locations.h:1794
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
msgid "Poughkeepsie"
msgstr ""
# my-evolution/Locations.h:1795
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
msgid "Pownal"
msgstr "波纳尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:54
# addressbook/gui/contact-editor/fulladdr.glade.h:54
# my-evolution/Locations.h:1796
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
#, fuzzy
msgid "Poza Rica"
msgstr "哥斯达黎加"
@@ -33482,14 +33964,14 @@ msgstr "哥斯达黎加"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1797
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
msgid "Poznan"
msgstr "波兹南"
# addressbook/gui/contact-editor/fulladdr.glade.h:165
# addressbook/gui/contact-editor/fulladdr.glade.h:165
# my-evolution/Locations.h:1798
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
#, fuzzy
msgid "Praha"
msgstr "巴拉圭"
@@ -33497,13 +33979,13 @@ msgstr "巴拉圭"
# my-evolution/metar.c:134
# my-evolution/metar.c:134
# my-evolution/Locations.h:1799
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
#, fuzzy
msgid "Pratica di Mare"
msgstr "部分细雨"
# my-evolution/Locations.h:1800
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
msgid "Prescott"
msgstr "普雷斯科特"
@@ -33514,31 +33996,31 @@ msgstr "普雷斯科特"
# mail/mail-callbacks.c:2524 my-evolution/e-summary.c:619
# ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
# my-evolution/Locations.h:1801
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
msgid "Presidente Prudente"
msgstr "Presidente 普鲁登斯"
# my-evolution/Locations.h:1802
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
msgid "Presque Isle"
msgstr ""
# my-evolution/Locations.h:1803
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
msgid "Prestwick"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:83
# addressbook/gui/contact-editor/fulladdr.glade.h:83
# my-evolution/Locations.h:1804
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
msgid "Pretoria"
msgstr "比勒陀利亚"
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
# my-evolution/Locations.h:1805
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
#, fuzzy
msgid "Preveza"
msgstr "预览"
@@ -33546,7 +34028,7 @@ msgstr "预览"
# addressbook/gui/contact-editor/fulladdr.glade.h:168
# addressbook/gui/contact-editor/fulladdr.glade.h:168
# my-evolution/Locations.h:1806
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
#, fuzzy
msgid "Price-Carbon"
msgstr "皮特克恩岛"
@@ -33554,7 +34036,7 @@ msgstr "皮特克恩岛"
# widgets/misc/e-charset-picker.c:84
# widgets/misc/e-charset-picker.c:84
# my-evolution/Locations.h:1807
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
#, fuzzy
msgid "Pristina"
msgstr "繁体"
@@ -33562,14 +34044,14 @@ msgstr "繁体"
# addressbook/gui/contact-editor/fulladdr.glade.h:240
# addressbook/gui/contact-editor/fulladdr.glade.h:240
# my-evolution/Locations.h:1808
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
msgid "Providence"
msgstr "普罗维登斯"
# calendar/gui/dialogs/recurrence-page.glade.h:6
# calendar/gui/dialogs/recurrence-page.glade.h:6
# my-evolution/Locations.h:1809
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
#, fuzzy
msgid "Provincetown"
msgstr "预览"
@@ -33577,33 +34059,33 @@ msgstr "预览"
# addressbook/backend/ebook/e-card-simple.c:92
# addressbook/backend/ebook/e-card-simple.c:92
# my-evolution/Locations.h:1810
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
#, fuzzy
msgid "Provo"
msgstr "职业"
# my-evolution/Locations.h:1811
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
msgid "Pskov"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1812
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
#, fuzzy
msgid "Pucallpa"
msgstr "帕劳群岛"
# my-evolution/Locations.h:1813
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
msgid "Pudahuel"
msgstr ""
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# my-evolution/Locations.h:1814
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
#, fuzzy
msgid "Puebla"
msgstr "公开"
@@ -33611,27 +34093,27 @@ msgstr "公开"
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
# my-evolution/Locations.h:1815
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
msgid "Pueblo"
msgstr "普韦布洛"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1816
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
#, fuzzy
msgid "Puerto Barrios"
msgstr "波多黎各"
# my-evolution/Locations.h:1817
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
msgid "Puerto Cabezas"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1818
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
#, fuzzy
msgid "Puerto Escondido"
msgstr "波多黎各"
@@ -33639,7 +34121,7 @@ msgstr "波多黎各"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1819
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
#, fuzzy
msgid "Puerto Lempira"
msgstr "波多黎各"
@@ -33647,7 +34129,7 @@ msgstr "波多黎各"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1820
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
#, fuzzy
msgid "Puerto Limon"
msgstr "波多黎各"
@@ -33655,7 +34137,7 @@ msgstr "波多黎各"
# my-evolution/metar.c:449
# my-evolution/metar.c:449
# my-evolution/Locations.h:1821
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
#, fuzzy
msgid "Puerto Maldonado"
msgstr "局部地区性龙卷风"
@@ -33663,7 +34145,7 @@ msgstr "局部地区性龙卷风"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1822
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
#, fuzzy
msgid "Puerto Montt"
msgstr "波多黎各"
@@ -33671,7 +34153,7 @@ msgstr "波多黎各"
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# addressbook/gui/contact-editor/fulladdr.glade.h:171
# my-evolution/Locations.h:1823
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
#, fuzzy
msgid "Puerto Plata"
msgstr "波多黎各"
@@ -33679,74 +34161,74 @@ msgstr "波多黎各"
# my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
# my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
# my-evolution/Locations.h:1825
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
#, fuzzy
msgid "Puerto Suarez"
msgstr "打印概要"
# my-evolution/Locations.h:1826
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
msgid "Puerto Vallarta"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# addressbook/gui/contact-editor/fulladdr.glade.h:161
# my-evolution/Locations.h:1827
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
msgid "Pula"
msgstr "普拉"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1828
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
#, fuzzy
msgid "Pullman"
msgstr "波兰"
# my-evolution/Locations.h:1829
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
msgid "Punta Arenas"
msgstr ""
# calendar/gui/print.c:2386
# calendar/gui/print.c:2386
# my-evolution/Locations.h:1830
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
#, fuzzy
msgid "Punta Cana"
msgstr "打印日历"
# my-evolution/Locations.h:1831
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
msgid "Punta Gorda"
msgstr ""
# my-evolution/Locations.h:1832
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
msgid "Puntilla Lake"
msgstr ""
# my-evolution/Locations.h:1833
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
msgid "Pusan/Kimhae"
msgstr "釜山/Kimhae"
# my-evolution/Locations.h:1834
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
msgid "Pyongtaek Ab"
msgstr ""
# calendar/zones.h:238
# my-evolution/Locations.h:1835
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
msgid "Pyongyang"
msgstr "平壤"
# widgets/misc/e-messagebox.c:173
# widgets/misc/e-messagebox.c:173
# my-evolution/Locations.h:1837
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
#, fuzzy
msgid "Quantico"
msgstr "问题"
@@ -33754,85 +34236,85 @@ msgstr "问题"
# mail/message-list.etspec.h:9
# mail/message-list.etspec.h:10
# my-evolution/Locations.h:1838
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
msgid "Quebec"
msgstr "魁北克"
# my-evolution/Locations.h:1839
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
msgid "Quebec City"
msgstr "魁北克城"
# my-evolution/Locations.h:1840
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
msgid "Queretaro"
msgstr ""
# my-evolution/Locations.h:1841
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
msgid "Quillayute"
msgstr ""
# my-evolution/Locations.h:1842
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
msgid "Quimper"
msgstr ""
# my-evolution/Locations.h:1843
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
msgid "Quincy"
msgstr "昆西"
# my-evolution/Locations.h:1844
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
msgid "Quito/Mariscal Sucre"
msgstr "基多/Mariscal Sucre"
# my-evolution/Locations.h:1845
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
msgid "Rabat"
msgstr "拉巴特"
# my-evolution/Locations.h:1846
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
msgid "Raduzhny"
msgstr ""
# my-evolution/Locations.h:1847
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
msgid "Rafha"
msgstr ""
# my-evolution/Locations.h:1848
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
msgid "Raleigh-Durham"
msgstr "Raleigh-德拉谟"
# my-evolution/Locations.h:1849
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
msgid "Randolph AFB"
msgstr "伦道夫空军基地"
# my-evolution/Locations.h:1850
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
#, fuzzy
msgid "Rapid City"
msgstr "已回复"
# my-evolution/Locations.h:1851
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
msgid "Rapid City-Ellsworth AFB"
msgstr ""
# my-evolution/Locations.h:1852
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
msgid "Ras Al Khaimah"
msgstr ""
# my-evolution/metar.c:142
# my-evolution/metar.c:142
# my-evolution/Locations.h:1853
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
#, fuzzy
msgid "Rawlins"
msgstr "雨"
@@ -33840,14 +34322,14 @@ msgstr "雨"
# addressbook/printing/e-contact-print.glade.h:13
# addressbook/printing/e-contact-print.glade.h:13
# my-evolution/Locations.h:1854
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
msgid "Reading"
msgstr "雷丁"
# addressbook/gui/contact-editor/fulladdr.glade.h:30
# addressbook/gui/contact-editor/fulladdr.glade.h:30
# my-evolution/Locations.h:1855
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
#, fuzzy
msgid "Rebun Island"
msgstr "布维岛"
@@ -33855,25 +34337,25 @@ msgstr "布维岛"
# mail/message-list.etspec.h:4
# mail/message-list.etspec.h:5
# my-evolution/Locations.h:1856
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
msgid "Recife"
msgstr "累西腓"
# my-evolution/Locations.h:1857
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
msgid "Red Bluff"
msgstr ""
# addressbook/printing/e-contact-print.glade.h:13
# addressbook/printing/e-contact-print.glade.h:13
# my-evolution/Locations.h:1858
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
#, fuzzy
msgid "Redding"
msgstr "标题"
# my-evolution/Locations.h:1859
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
#, fuzzy
msgid "Redig"
msgstr "已读"
@@ -33881,67 +34363,67 @@ msgstr "已读"
# calendar/gui/dialogs/event-editor.c:190
# calendar/gui/dialogs/event-editor.c:190
# my-evolution/Locations.h:1860
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
msgid "Redmond"
msgstr "雷德蒙"
# my-evolution/Locations.h:1861
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
msgid "Red Oak"
msgstr ""
# my-evolution/Locations.h:1862
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
msgid "Redwood Falls"
msgstr ""
# my-evolution/Locations.h:1863
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
msgid "Reggio Calabria"
msgstr "勒佐卡拉布里亚"
# my-evolution/e-summary-weather.c:722
# my-evolution/e-summary-weather.c:722
# my-evolution/Locations.h:1864
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
#, fuzzy
msgid "Regina"
msgstr "区域"
# my-evolution/Locations.h:1865
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
msgid "Reims-Champagne"
msgstr "兰斯-Champagne"
# calendar/gui/dialogs/alarm-page.glade.h:5
# calendar/gui/dialogs/alarm-page.glade.h:5
# my-evolution/Locations.h:1866
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
msgid "Rennes"
msgstr "雷恩"
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# my-evolution/Locations.h:1867
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
msgid "Reno"
msgstr "里诺"
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# addressbook/gui/contact-editor/fulladdr.glade.h:175
# my-evolution/Locations.h:1868
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
#, fuzzy
msgid "Renton"
msgstr "留尼汪"
# my-evolution/Locations.h:1869
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
msgid "Resistencia"
msgstr "雷西斯膝西亚"
# my-evolution/Locations.h:1870
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
#, fuzzy
msgid "Reus"
msgstr "规则"
@@ -33949,28 +34431,28 @@ msgstr "规则"
# ui/evolution-mail-message.xml.h:70
# ui/evolution-mail-message.xml.h:70
# my-evolution/Locations.h:1871
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
#, fuzzy
msgid "Reyes"
msgstr "回复"
# calendar/zones.h:269
# my-evolution/Locations.h:1872
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
msgid "Reykjavik"
msgstr "雷克雅未克"
# ui/my-evolution.xml.h:5
# ui/my-evolution.xml.h:5
# my-evolution/Locations.h:1873
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
msgid "Reynosa"
msgstr "雷萨诺"
# addressbook/gui/contact-editor/fulladdr.glade.h:76
# addressbook/gui/contact-editor/fulladdr.glade.h:76
# my-evolution/Locations.h:1874
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
#, fuzzy
msgid "Rhinelander"
msgstr "芬兰"
@@ -33978,20 +34460,20 @@ msgstr "芬兰"
# addressbook/gui/contact-editor/fulladdr.glade.h:74
# addressbook/gui/contact-editor/fulladdr.glade.h:74
# my-evolution/Locations.h:1875
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
msgid "Rhode Island"
msgstr "罗得岛州"
# addressbook/gui/contact-editor/fulladdr.glade.h:86
# addressbook/gui/contact-editor/fulladdr.glade.h:86
# my-evolution/Locations.h:1876
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
#, fuzzy
msgid "Riberalta"
msgstr "直布罗陀"
# my-evolution/Locations.h:1877
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
msgid "Richmond"
msgstr ""
@@ -34000,7 +34482,7 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:95
# addressbook/gui/widgets/e-addressbook-view.c:884
# my-evolution/Locations.h:1878
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
#, fuzzy
msgid "Rickenbacker"
msgstr "绰号"
@@ -34008,7 +34490,7 @@ msgstr "绰号"
# addressbook/gui/contact-editor/fulladdr.glade.h:96
# addressbook/gui/contact-editor/fulladdr.glade.h:96
# my-evolution/Locations.h:1879
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
#, fuzzy
msgid "Rieti"
msgstr "海地"
@@ -34018,35 +34500,35 @@ msgstr "海地"
# calendar/gui/dialogs/meeting-page.etspec.h:9
# calendar/gui/e-meeting-time-sel.etspec.h:9
# my-evolution/Locations.h:1880
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
#, fuzzy
msgid "Rifle"
msgstr "角色"
# my-evolution/Locations.h:1882
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
msgid "Rijeka"
msgstr "里耶卡"
# addressbook/gui/contact-editor/fulladdr.glade.h:176
# addressbook/gui/contact-editor/fulladdr.glade.h:176
# my-evolution/Locations.h:1883
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
msgid "Rimini"
msgstr "里米尼"
# my-evolution/Locations.h:1884
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
msgid "Rio De Janeiro"
msgstr "里约热内卢"
# my-evolution/Locations.h:1885
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
msgid "Rio Gallegos"
msgstr ""
# my-evolution/Locations.h:1886
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
msgid "Rio Grande"
msgstr "格兰德河"
@@ -34057,63 +34539,63 @@ msgstr "格兰德河"
# addressbook/gui/contact-editor/e-contact-editor.c:1660
# addressbook/gui/widgets/e-addressbook-view.c:871
# my-evolution/Locations.h:1887
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
msgid "Rioja"
msgstr "里奥哈"
# addressbook/gui/contact-editor/fulladdr.glade.h:152
# addressbook/gui/contact-editor/fulladdr.glade.h:152
# my-evolution/Locations.h:1888
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
#, fuzzy
msgid "Rio / Jacarepagua"
msgstr "尼加拉瓜"
# my-evolution/Locations.h:1889
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
msgid "Rionegro/J.M.Cordova"
msgstr "Rionegro/J.M. 科尔多瓦"
# addressbook/gui/contact-editor/fulladdr.glade.h:33
# addressbook/gui/contact-editor/fulladdr.glade.h:33
# my-evolution/Locations.h:1890
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
#, fuzzy
msgid "Rishiri Island"
msgstr "不列颠处女群岛"
# my-evolution/Locations.h:1891
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
msgid "Rivas"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# my-evolution/Locations.h:1892
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
#, fuzzy
msgid "Rivera"
msgstr "利比里亚"
# my-evolution/Locations.h:1893
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
msgid "Riverside"
msgstr ""
# my-evolution/Locations.h:1894
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
msgid "Riverside/March AFB"
msgstr ""
# my-evolution/Locations.h:1895
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
msgid "Riverton"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# addressbook/gui/contact-editor/fulladdr.glade.h:120
# my-evolution/Locations.h:1896
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
#, fuzzy
msgid "Rivne"
msgstr "利比里亚"
@@ -34121,26 +34603,26 @@ msgstr "利比里亚"
# data/evolution.desktop.in.h:1 shell/main.c:83
# shell/main.c:83
# my-evolution/Locations.h:1897
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
#, fuzzy
msgid "Rivolto"
msgstr "Evolution"
# calendar/zones.h:241
# my-evolution/Locations.h:1898
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
msgid "Riyadh"
msgstr "利雅得"
# my-evolution/Locations.h:1899
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
msgid "Roanoke"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:57
# addressbook/gui/contact-editor/fulladdr.glade.h:57
# my-evolution/Locations.h:1900
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
#, fuzzy
msgid "Roatan"
msgstr "克罗地亚"
@@ -34148,41 +34630,41 @@ msgstr "克罗地亚"
# calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
# calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
# my-evolution/Locations.h:1901
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
#, fuzzy
msgid "Robore"
msgstr "之前"
# my-evolution/Locations.h:1902
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
msgid "Rochester"
msgstr ""
# my-evolution/Locations.h:1903
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
msgid "Rockford"
msgstr "罗克福德"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:1904
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
#, fuzzy
msgid "Rockland"
msgstr "波兰"
# my-evolution/Locations.h:1905
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
msgid "Rockport"
msgstr ""
# my-evolution/Locations.h:1906
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
msgid "Rock Springs"
msgstr ""
# my-evolution/Locations.h:1907
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
msgid "Rocky Mount"
msgstr ""
@@ -34191,7 +34673,7 @@ msgstr ""
# calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
# calendar/gui/e-meeting-model.c:781
# my-evolution/Locations.h:1908
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
#, fuzzy
msgid "Rodos"
msgstr "房间"
@@ -34199,44 +34681,44 @@ msgstr "房间"
# camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
# camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
# my-evolution/Locations.h:1909
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
msgid "Rogers"
msgstr "罗杰斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:176
# addressbook/gui/contact-editor/fulladdr.glade.h:176
# my-evolution/Locations.h:1910
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
msgid "Roma/Ciampino"
msgstr "罗马/Ciampino"
# my-evolution/Locations.h:1911
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
msgid "Roma/Fiumicino"
msgstr "罗马/Fiumicino"
# my-evolution/Locations.h:1913
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
msgid "Roma/Urbe"
msgstr "罗马/Urbe"
# my-evolution/Locations.h:1914
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
msgid "Rome-Russell"
msgstr "罗马-拉塞尔"
# my-evolution/Locations.h:1915
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
msgid "Ronchi de' Legionari"
msgstr ""
# my-evolution/Locations.h:1916
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
msgid "Ronneby"
msgstr ""
# my-evolution/Locations.h:1917
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
msgid "Roosevelt"
msgstr "罗斯福"
@@ -34245,13 +34727,13 @@ msgstr "罗斯福"
# calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
# calendar/gui/e-meeting-model.c:781
# my-evolution/Locations.h:1918
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
#, fuzzy
msgid "Roros"
msgstr "房间"
# my-evolution/Locations.h:1919
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
msgid "Rorvik/Ryum"
msgstr ""
@@ -34262,12 +34744,12 @@ msgstr ""
# addressbook/gui/contact-editor/e-contact-editor.c:1660
# addressbook/gui/widgets/e-addressbook-view.c:871
# my-evolution/Locations.h:1920
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
msgid "Rosario"
msgstr "罗萨里奥"
# my-evolution/Locations.h:1921
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
msgid "Roseburg"
msgstr ""
@@ -34276,7 +34758,7 @@ msgstr ""
# calendar/gui/dialogs/meeting-page.etspec.h:9
# calendar/gui/e-meeting-time-sel.etspec.h:9
# my-evolution/Locations.h:1922
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
#, fuzzy
msgid "Roseglen"
msgstr "角色"
@@ -34284,131 +34766,131 @@ msgstr "角色"
# shell/glade/e-active-connection-dialog.glade.h:3
# shell/glade/e-active-connection-dialog.glade.h:3
# my-evolution/Locations.h:1923
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
#, fuzzy
msgid "Rost"
msgstr "主机"
# my-evolution/Locations.h:1924
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
msgid "Rostov-Na-Donu"
msgstr "罗斯托夫-Na-Donu"
# my-evolution/Locations.h:1925
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
msgid "Roswell"
msgstr ""
# my-evolution/Locations.h:1926
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
msgid "Rotterdam"
msgstr "鹿特丹"
# my-evolution/Locations.h:1927
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
msgid "Rouen-Valle de Seine"
msgstr "鲁昂-Valle de Seine"
# my-evolution/Locations.h:1928
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
msgid "Ruidoso-Sierra Blanca"
msgstr ""
# calendar/gui/dialogs/event-editor.c:195
# calendar/gui/dialogs/event-editor.c:195
# my-evolution/Locations.h:1929
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
#, fuzzy
msgid "Rurrenabaque"
msgstr "再次发生"
# my-evolution/Locations.h:1930
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
msgid "Russell"
msgstr "拉塞尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:15
# addressbook/gui/contact-editor/fulladdr.glade.h:15
# my-evolution/Locations.h:1931
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
msgid "Russia"
msgstr "俄罗斯"
# addressbook/gui/contact-editor/fulladdr.glade.h:26
# addressbook/gui/contact-editor/fulladdr.glade.h:26
# my-evolution/Locations.h:1932
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
msgid "Rutland"
msgstr "拉特兰郡"
# my-evolution/Locations.h:1933
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
msgid "Rygge"
msgstr ""
# my-evolution/Locations.h:1934
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
msgid "Rzeszow"
msgstr ""
# my-evolution/Locations.h:1935
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
msgid "Saarbrucken"
msgstr ""
# my-evolution/Locations.h:1936
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
msgid "Sabine Pass"
msgstr ""
# mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
# mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
# my-evolution/Locations.h:1937
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
msgid "Sacramento"
msgstr "萨克拉曼多"
# my-evolution/Locations.h:1938
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
msgid "Sacramento-Woodland"
msgstr "萨克拉曼多-Woodland"
# my-evolution/Locations.h:1939
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
msgid "Safford-Municipal Airport"
msgstr "萨克拉曼多-市政机场"
# addressbook/gui/contact-editor/fulladdr.glade.h:196
# addressbook/gui/contact-editor/fulladdr.glade.h:196
# my-evolution/Locations.h:1940
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
msgid "Saginaw"
msgstr "萨吉诺"
# my-evolution/Locations.h:1941
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
msgid "Saint Anthony"
msgstr "圣安东尼"
# my-evolution/Locations.h:1942
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
msgid "Saint-Brieuc-Armor"
msgstr ""
# my-evolution/Locations.h:1943
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
msgid "Saint-Dizier-Robinson"
msgstr ""
# my-evolution/Locations.h:1944
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
msgid "Saint-Etienne-Boutheon"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1945
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
#, fuzzy
msgid "Saint Mary's"
msgstr "圣马力诺"
@@ -34416,20 +34898,20 @@ msgstr "圣马力诺"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1946
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
#, fuzzy
msgid "Saint Mawgan"
msgstr "圣马力诺"
# my-evolution/Locations.h:1947
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
msgid "Saint-Nazaire-Montoir"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# my-evolution/Locations.h:1948
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
#, fuzzy
msgid "Saint Paul"
msgstr "圣卢西亚岛"
@@ -34437,7 +34919,7 @@ msgstr "圣卢西亚岛"
# calendar/gui/print.c:499
# calendar/gui/print.c:499
# my-evolution/Locations.h:1949
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
#, fuzzy
msgid "Saiq"
msgstr "六"
@@ -34445,7 +34927,7 @@ msgstr "六"
# my-evolution/metar.c:382
# my-evolution/metar.c:382
# my-evolution/Locations.h:1950
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
#, fuzzy
msgid "Salalah"
msgstr "暴风"
@@ -34455,27 +34937,27 @@ msgstr "暴风"
# ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
# ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
# my-evolution/Locations.h:1951
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
msgid "Salem"
msgstr "赛伦"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:1952
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
#, fuzzy
msgid "Salida"
msgstr "索马里"
# my-evolution/Locations.h:1953
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
msgid "Salida-Harriet"
msgstr "Salida-哈里特"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:1954
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
#, fuzzy
msgid "Salina"
msgstr "索马里"
@@ -34483,75 +34965,75 @@ msgstr "索马里"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:1955
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
#, fuzzy
msgid "Salinas"
msgstr "索马里"
# my-evolution/Locations.h:1956
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
msgid "Salisbury"
msgstr "索尔兹伯里"
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# my-evolution/Locations.h:1957
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
#, fuzzy
msgid "Salmon"
msgstr "萨摩亚"
# my-evolution/Locations.h:1958
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
msgid "Salmon (2)"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# my-evolution/Locations.h:1959
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
msgid "Salta"
msgstr "萨尔塔"
# my-evolution/Locations.h:1960
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
msgid "Saltillo"
msgstr "萨尔提略"
# my-evolution/Locations.h:1961
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
msgid "Salt Lake City"
msgstr "盐湖城"
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
# my-evolution/Locations.h:1962
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
#, fuzzy
msgid "Salto"
msgstr "停止"
# my-evolution/Locations.h:1963
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
msgid "Salt point"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:68
# addressbook/gui/contact-editor/fulladdr.glade.h:68
# my-evolution/Locations.h:1964
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
msgid "Salvador"
msgstr "萨尔瓦多"
# my-evolution/Locations.h:1965
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
msgid "Salzburg"
msgstr "萨尔茨堡"
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# my-evolution/Locations.h:1966
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
#, fuzzy
msgid "Samara"
msgstr "萨摩亚"
@@ -34559,14 +35041,14 @@ msgstr "萨摩亚"
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# my-evolution/Locations.h:1967
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
msgid "Samos"
msgstr "萨摩斯"
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:1968
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
#, fuzzy
msgid "Samsun"
msgstr "沙尘"
@@ -34574,60 +35056,60 @@ msgstr "沙尘"
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:1969
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
#, fuzzy
msgid "Sana'A"
msgstr "沙尘"
# my-evolution/Locations.h:1970
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
msgid "San Andres Isla/Sesquicentenario"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1971
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
msgid "San Angelo"
msgstr "圣安吉罗"
# my-evolution/Locations.h:1972
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
msgid "San Antonio"
msgstr "圣安东妮亚"
# my-evolution/Locations.h:1973
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
msgid "San Antonio Del Tachira"
msgstr ""
# my-evolution/Locations.h:1974
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
msgid "San Antonio-Kelly AFB"
msgstr "圣安东妮亚-凯利空军基地"
# my-evolution/Locations.h:1975
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
msgid "San Antonio-Stinson"
msgstr "圣安东妮亚-Stinson"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1976
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
msgid "San Carlos"
msgstr "圣卡洛斯"
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:1977
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
#, fuzzy
msgid "Sandane"
msgstr "沙尘"
# my-evolution/Locations.h:1978
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
#, fuzzy
msgid "Sandberg"
msgstr "发件人"
@@ -34635,7 +35117,7 @@ msgstr "发件人"
# my-evolution/metar.c:397
# my-evolution/metar.c:397
# my-evolution/Locations.h:1979
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
#, fuzzy
msgid "Sanderson"
msgstr "沙暴"
@@ -34643,84 +35125,84 @@ msgstr "沙暴"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1980
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
msgid "San Diego"
msgstr "圣迭哥"
# my-evolution/Locations.h:1981
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
msgid "San Diego-Brown"
msgstr "圣迭哥-Brown"
# my-evolution/Locations.h:1982
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
msgid "San Diego-Miramar"
msgstr "圣迭哥-Miramar"
# my-evolution/Locations.h:1983
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
msgid "San Diego-Montgomery"
msgstr "圣迭哥-Montgomery"
# my-evolution/Locations.h:1984
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
msgid "San Diego-North Island"
msgstr "圣迭哥-北岛"
# my-evolution/Locations.h:1985
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
msgid "San Diego-Santee"
msgstr "圣迭哥-Santee"
# my-evolution/Locations.h:1986
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
msgid "Sandnessjoen/Stokka"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1987
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
#, fuzzy
msgid "Sand Point"
msgstr "圣马力诺"
# my-evolution/Locations.h:1988
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
msgid "San Fernando De Apure"
msgstr ""
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:1989
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
msgid "Sanford"
msgstr "桑福德"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1990
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
msgid "San Francisco"
msgstr "旧金山"
# addressbook/printing/e-contact-print.glade.h:35
# addressbook/printing/e-contact-print.glade.h:35
# my-evolution/Locations.h:1991
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
#, fuzzy
msgid "Sangju"
msgstr "阴影"
# my-evolution/Locations.h:1992
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
msgid "San Ignacio De Velasco"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1993
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
#, fuzzy
msgid "San Joaquin"
msgstr "圣马力诺"
@@ -34732,60 +35214,60 @@ msgstr "圣马力诺"
# ui/evolution-contact-list-editor.xml.h:6
# ui/evolution-signature-editor.xml.h:4
# my-evolution/Locations.h:1994
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
#, fuzzy
msgid "San Jose"
msgstr "保存并关闭"
# my-evolution/Locations.h:1995
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
msgid "San Jose De Chiquitos"
msgstr ""
# my-evolution/Locations.h:1996
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
msgid "San Jose del Cabo"
msgstr ""
# my-evolution/Locations.h:1997
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
msgid "San Jose-Santa Clara"
msgstr "圣何塞-Santa Clara"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:1998
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
msgid "San Juan"
msgstr "圣胡安"
# my-evolution/Locations.h:1999
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
msgid "Sankt-Peterburg"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:2000
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
#, fuzzy
msgid "Sanliurfa"
msgstr "索马里"
# my-evolution/Locations.h:2001
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
msgid "San Luis Obispo"
msgstr ""
# my-evolution/Locations.h:2002
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
msgid "San Luis Potosi"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:2003
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
#, fuzzy
msgid "San Miguel"
msgstr "圣马力诺"
@@ -34793,69 +35275,69 @@ msgstr "圣马力诺"
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# addressbook/gui/contact-editor/fulladdr.glade.h:156
# my-evolution/Locations.h:2004
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
msgid "San Nicholas Island"
msgstr "圣尼古拉斯岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:68
# addressbook/gui/contact-editor/fulladdr.glade.h:68
# my-evolution/Locations.h:2005
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
msgid "San Salvador"
msgstr "圣萨尔瓦多"
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:2006
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
msgid "San Sebastian"
msgstr "圣塞巴斯蒂安"
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# my-evolution/Locations.h:2007
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
#, fuzzy
msgid "Santa Ana"
msgstr "圣卢西亚岛"
# my-evolution/Locations.h:2008
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
msgid "Santa Barbara"
msgstr ""
# my-evolution/Locations.h:2009
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
msgid "Santa Cruz"
msgstr ""
# my-evolution/Locations.h:2010
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
msgid "Santa Fe"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# addressbook/gui/contact-editor/fulladdr.glade.h:183
# my-evolution/Locations.h:2011
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
msgid "Santa Maria"
msgstr "圣玛丽亚"
# my-evolution/Locations.h:2012
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
msgid "Santa Marta/Simon Bolivar"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# my-evolution/Locations.h:2013
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
#, fuzzy
msgid "Santa Monica"
msgstr "圣卢西亚岛"
# my-evolution/Locations.h:2014
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
#, fuzzy
msgid "Santander"
msgstr "发件人"
@@ -34863,42 +35345,42 @@ msgstr "发件人"
# my-evolution/metar.c:397
# my-evolution/metar.c:397
# my-evolution/Locations.h:2015
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
#, fuzzy
msgid "Santarem"
msgstr "沙暴"
# my-evolution/Locations.h:2016
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
msgid "Santa Rosa"
msgstr ""
# my-evolution/Locations.h:2017
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
msgid "Santa Rosa de Copan"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:157
# my-evolution/Locations.h:2018
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
msgid "Santiago"
msgstr "圣地亚哥"
# my-evolution/Locations.h:2019
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
msgid "Santiago de Cuba"
msgstr ""
# my-evolution/Locations.h:2020
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
msgid "Santiago Del Estero"
msgstr ""
# my-evolution/metar.c:397
# my-evolution/metar.c:397
# my-evolution/Locations.h:2021
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
#, fuzzy
msgid "Santorini"
msgstr "沙暴"
@@ -34906,19 +35388,19 @@ msgstr "沙暴"
# my-evolution/metar.c:397
# my-evolution/metar.c:397
# my-evolution/Locations.h:2022
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
msgid "Santos"
msgstr "桑托斯"
# my-evolution/Locations.h:2023
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
msgid "Sao Jose Dos Campo"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# my-evolution/Locations.h:2024
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
#, fuzzy
msgid "Sao Luiz"
msgstr "圣卢西亚岛"
@@ -34926,86 +35408,86 @@ msgstr "圣卢西亚岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:159
# my-evolution/Locations.h:2025
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
#, fuzzy
msgid "Sao Paulo"
msgstr "美洲萨摩亚"
# my-evolution/Locations.h:2026
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
msgid "Sapporo Ab"
msgstr "札幌 Ab"
# calendar/zones.h:318
# my-evolution/Locations.h:2027
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
msgid "Sarajevo"
msgstr "萨拉热窝"
# my-evolution/Locations.h:2028
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
msgid "Saranac Lake"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# my-evolution/Locations.h:2029
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
msgid "Sarasota"
msgstr "萨拉索塔"
# my-evolution/Locations.h:2030
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
msgid "Saratov"
msgstr "萨拉托夫"
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# my-evolution/Locations.h:2031
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
#, fuzzy
msgid "Sarzana"
msgstr "斯里兰卡"
# my-evolution/Locations.h:2032
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
msgid "Saskatchewan"
msgstr "萨斯喀彻温省"
# my-evolution/Locations.h:2033
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
msgid "Saskatoon"
msgstr ""
# my-evolution/Locations.h:2034
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
msgid "Sauce Viejo"
msgstr ""
# my-evolution/Locations.h:2036
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
msgid "Sault Ste Marie"
msgstr ""
# my-evolution/Locations.h:2037
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
msgid "Savannah"
msgstr ""
# my-evolution/Locations.h:2038
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
msgid "Savannah-Hunter AAF"
msgstr ""
# my-evolution/Locations.h:2039
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
msgid "Sawyer AFB"
msgstr ""
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:2040
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
#, fuzzy
msgid "Sayun"
msgstr "沙尘"
@@ -35019,33 +35501,33 @@ msgstr "沙尘"
# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
# mail/message-list.etspec.h:9
# my-evolution/Locations.h:2041
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
#, fuzzy
msgid "Scatsta"
msgstr "状态"
# my-evolution/Locations.h:2042
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
msgid "Schaffen"
msgstr ""
# my-evolution/Locations.h:2043
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
msgid "Schenectady"
msgstr ""
# my-evolution/Locations.h:2044
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
msgid "Scilly Isles"
msgstr ""
# my-evolution/Locations.h:2045
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
msgid "Scottsbluff"
msgstr ""
# my-evolution/Locations.h:2046
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
msgid "Scottsdale"
msgstr ""
@@ -35054,27 +35536,27 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:69
# addressbook/gui/widgets/e-addressbook-view.c:858
# my-evolution/Locations.h:2047
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
msgid "Scranton"
msgstr "斯克兰顿"
# mail/mail-callbacks.c:2492
# my-evolution/Locations.h:2048
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
msgid "Seattle"
msgstr "西雅图"
# importers/netscape-importer.c:963
# importers/netscape-importer.c:963
# my-evolution/Locations.h:2049
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
msgid "Seattle-Boeing"
msgstr "西雅图-Boeing"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:2050
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
#, fuzzy
msgid "Sedalia"
msgstr "索马里"
@@ -35082,50 +35564,50 @@ msgstr "索马里"
# mail/message-list.c:640
# mail/message-list.c:646
# my-evolution/Locations.h:2051
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
#, fuzzy
msgid "Seeb"
msgstr "可见"
# my-evolution/Locations.h:2052
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
msgid "Selanik"
msgstr ""
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
# my-evolution/Locations.h:2053
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
msgid "Sendai Airport"
msgstr "仙台机场"
# my-evolution/Locations.h:2054
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
msgid "Seoul E Ab"
msgstr "汉城 E Ab"
# my-evolution/Locations.h:2055
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
msgid "Seoul/Kimp'O International Airport"
msgstr "汉城/Kimp'O 国际机场"
# my-evolution/Locations.h:2056
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
msgid "Seoul/Yongdungp'O Rokaf Wc"
msgstr "汉城/Yongdungp'O Rokaf Wc"
# my-evolution/Locations.h:2057
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
msgid "Sept-Iles"
msgstr ""
# my-evolution/Locations.h:2058
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
msgid "Seul Choix Pt"
msgstr ""
# my-evolution/Locations.h:2059
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
msgid "Sevilla"
msgstr ""
@@ -35134,23 +35616,23 @@ msgstr ""
# addressbook/gui/search/e-addressbook-search-dialog.c:151
# mail/mail-search.c:263
# my-evolution/Locations.h:2060
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
msgid "Seward"
msgstr "苏厄德"
# my-evolution/Locations.h:2061
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
msgid "Sexton Summit"
msgstr ""
# calendar/zones.h:246
# my-evolution/Locations.h:2062
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
msgid "Shanghai"
msgstr "上海"
# my-evolution/Locations.h:2063
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
msgid "Shannon"
msgstr "香农"
@@ -35159,13 +35641,13 @@ msgstr "香农"
# addressbook/gui/search/e-addressbook-search-dialog.c:151
# mail/mail-search.c:263
# my-evolution/Locations.h:2064
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
#, fuzzy
msgid "Sharjah"
msgstr "搜索"
# my-evolution/Locations.h:2065
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
msgid "Sharm El Sheikhintl"
msgstr ""
@@ -35174,7 +35656,7 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
# my-evolution/Locations.h:2066
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
#, fuzzy
msgid "Sharurah"
msgstr "星期六"
@@ -35184,7 +35666,7 @@ msgstr "星期六"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
# my-evolution/Locations.h:2067
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
#, fuzzy
msgid "Shawbury"
msgstr "星期六"
@@ -35192,83 +35674,83 @@ msgstr "星期六"
# calendar/gui/e-calendar-table.etspec.h:14
# calendar/gui/e-calendar-table.etspec.h:14
# my-evolution/Locations.h:2068
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
#, fuzzy
msgid "Shearwater"
msgstr "开始日期"
# my-evolution/Locations.h:2069
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
msgid "Sheboygan"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:204
# addressbook/gui/contact-editor/fulladdr.glade.h:204
# my-evolution/Locations.h:2070
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
msgid "Sheldon"
msgstr "谢尔登"
# my-evolution/Locations.h:2071
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
msgid "Shelter Cove"
msgstr ""
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
# widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
# my-evolution/Locations.h:2072
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
msgid "Shelton"
msgstr "谢尔顿"
# my-evolution/Locations.h:2073
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
msgid "Shenandoah"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:200
# addressbook/gui/contact-editor/fulladdr.glade.h:200
# my-evolution/Locations.h:2074
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
msgid "Sheridan"
msgstr "谢里丹"
# my-evolution/Locations.h:2075
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
msgid "Sherman-Denison"
msgstr "谢尔曼-Denison"
# my-evolution/Locations.h:2076
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
msgid "Shimofusa Ab"
msgstr ""
# my-evolution/Locations.h:2077
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
msgid "Shingle Point"
msgstr ""
# mail/message-list.etspec.h:7
# mail/message-list.etspec.h:8
# my-evolution/Locations.h:2078
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
msgid "Shiraz"
msgstr "设拉子"
# my-evolution/Locations.h:2079
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
msgid "Shishmaref"
msgstr ""
# my-evolution/Locations.h:2080
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
msgid "Shizuhama Ab"
msgstr ""
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# my-evolution/Locations.h:2081
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
#, fuzzy
msgid "Shoreham"
msgstr "分数"
@@ -35276,42 +35758,42 @@ msgstr "分数"
# my-evolution/metar.c:162
# my-evolution/metar.c:162
# my-evolution/Locations.h:2082
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
#, fuzzy
msgid "Show Low"
msgstr "微雪"
# my-evolution/Locations.h:2083
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
msgid "Shreveport Downtown"
msgstr "什里夫波特市区"
# my-evolution/Locations.h:2084
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
msgid "Shreveport Regional"
msgstr "什里夫波特地区"
# mail/message-list.etspec.h:7
# mail/message-list.etspec.h:8
# my-evolution/Locations.h:2085
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
msgid "Sidney"
msgstr "西德尼"
# my-evolution/Locations.h:2086
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
msgid "Sigonella"
msgstr ""
# my-evolution/Locations.h:2087
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
msgid "Siloam Springs"
msgstr ""
# mail/mail-config.glade.h:67
# mail/mail-config.glade.h:67
# my-evolution/Locations.h:2088
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
#, fuzzy
msgid "Silver City"
msgstr "安全"
@@ -35321,48 +35803,48 @@ msgstr "安全"
# camel/providers/sendmail/camel-sendmail-provider.c:36
# mail/mail-config.glade.h:72
# my-evolution/Locations.h:2089
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
#, fuzzy
msgid "Sindal"
msgstr "Sendmail"
# my-evolution/Locations.h:2091
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
msgid "Sioux City"
msgstr ""
# my-evolution/Locations.h:2092
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
msgid "Sioux Falls"
msgstr ""
# my-evolution/Locations.h:2093
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
msgid "Sitka"
msgstr ""
# my-evolution/Locations.h:2094
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
msgid "Sivas"
msgstr ""
# my-evolution/Locations.h:2095
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
msgid "Sivrihisar"
msgstr ""
# my-evolution/Locations.h:2096
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
msgid "Skagway"
msgstr ""
# my-evolution/Locations.h:2097
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
msgid "Skiathos"
msgstr ""
# my-evolution/Locations.h:2098
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
msgid "Skien/Geiteryggen"
msgstr ""
@@ -35371,14 +35853,14 @@ msgstr ""
# ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
# ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
# my-evolution/Locations.h:2099
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
#, fuzzy
msgid "Skive"
msgstr "保存"
# calendar/zones.h:320
# my-evolution/Locations.h:2100
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
msgid "Skopje"
msgstr "斯科普里"
@@ -35387,7 +35869,7 @@ msgstr "斯科普里"
# mail/mail-config.glade.h:73 mail/message-list.etspec.h:7
# shell/e-local-storage.c:176
# my-evolution/Locations.h:2101
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
#, fuzzy
msgid "Skwentna"
msgstr "已发送"
@@ -35395,7 +35877,7 @@ msgstr "已发送"
# my-evolution/metar.c:322
# my-evolution/metar.c:322
# my-evolution/Locations.h:2102
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
#, fuzzy
msgid "Slana"
msgstr "沙尘"
@@ -35403,20 +35885,20 @@ msgstr "沙尘"
# my-evolution/metar.c:137
# my-evolution/metar.c:137
# my-evolution/Locations.h:2105
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
#, fuzzy
msgid "Smithers"
msgstr "骤雨"
# my-evolution/Locations.h:2106
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
msgid "Smyrna"
msgstr "士麦纳"
# my-evolution/metar.c:167
# my-evolution/metar.c:167
# my-evolution/Locations.h:2107
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
#, fuzzy
msgid "Snowshoe Lake"
msgstr "骤雪"
@@ -35424,14 +35906,14 @@ msgstr "骤雪"
# my-evolution/metar.c:66
# my-evolution/metar.c:66
# my-evolution/Locations.h:2108
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
msgid "Sochi"
msgstr "索契"
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# my-evolution/Locations.h:2109
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
#, fuzzy
msgid "Socorro"
msgstr "分数"
@@ -35439,14 +35921,14 @@ msgstr "分数"
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# my-evolution/Locations.h:2110
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
msgid "Socotra"
msgstr "索科特拉岛"
# my-evolution/metar.c:172
# my-evolution/metar.c:172
# my-evolution/Locations.h:2111
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
#, fuzzy
msgid "Soda Springs"
msgstr "冰雪"
@@ -35454,7 +35936,7 @@ msgstr "冰雪"
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# addressbook/gui/contact-editor/fulladdr.glade.h:193
# my-evolution/Locations.h:2112
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
msgid "Sofia"
msgstr "索非亚"
@@ -35463,7 +35945,7 @@ msgstr "索非亚"
# camel/providers/sendmail/camel-sendmail-provider.c:36
# mail/mail-config.glade.h:72
# my-evolution/Locations.h:2113
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
#, fuzzy
msgid "Sogndal"
msgstr "Sendmail"
@@ -35471,7 +35953,7 @@ msgstr "Sendmail"
# addressbook/gui/contact-editor/fulladdr.glade.h:191
# addressbook/gui/contact-editor/fulladdr.glade.h:191
# my-evolution/Locations.h:2114
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
#, fuzzy
msgid "Soldotna"
msgstr "斯洛文尼亚"
@@ -35479,38 +35961,38 @@ msgstr "斯洛文尼亚"
# my-evolution/metar.c:137
# my-evolution/metar.c:137
# my-evolution/Locations.h:2115
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
#, fuzzy
msgid "Somerset"
msgstr "骤雨"
# my-evolution/Locations.h:2116
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
#, fuzzy
msgid "Sonderborg"
msgstr "发件人"
# my-evolution/Locations.h:2117
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
msgid "Songmu Ab"
msgstr ""
# my-evolution/Locations.h:2118
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
msgid "Sorkjosen"
msgstr ""
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/Locations.h:2120
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
msgid "Southampton"
msgstr "南安普敦"
# my-evolution/metar.c:66
# my-evolution/metar.c:66
# my-evolution/Locations.h:2121
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
#, fuzzy
msgid "South Bend"
msgstr "南"
@@ -35518,21 +36000,21 @@ msgstr "南"
# addressbook/gui/contact-editor/fulladdr.glade.h:194
# addressbook/gui/contact-editor/fulladdr.glade.h:194
# my-evolution/Locations.h:2122
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
msgid "South Carolina"
msgstr "南卡罗莱纳州"
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/Locations.h:2123
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
msgid "South Dakota"
msgstr "南达科塔"
# my-evolution/metar.c:66
# my-evolution/metar.c:66
# my-evolution/Locations.h:2124
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
#, fuzzy
msgid "Southend"
msgstr "南"
@@ -35540,98 +36022,98 @@ msgstr "南"
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# my-evolution/Locations.h:2125
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
#, fuzzy
msgid "South Marsh Island"
msgstr "马绍尔群岛"
# my-evolution/Locations.h:2126
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
msgid "South Timbalier"
msgstr ""
# my-evolution/Locations.h:2128
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
msgid "Sparrevohn"
msgstr ""
# my-evolution/Locations.h:2129
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
msgid "Spencer"
msgstr "斯宾塞"
# my-evolution/Locations.h:2130
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
msgid "Spickard"
msgstr ""
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# my-evolution/Locations.h:2131
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
msgid "Split"
msgstr "斯普利特"
# my-evolution/metar.c:292
# my-evolution/metar.c:292
# my-evolution/Locations.h:2132
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
#, fuzzy
msgid "Spokane"
msgstr "烟霞"
# my-evolution/Locations.h:2133
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
msgid "Spokane-Parkwater"
msgstr ""
# my-evolution/Locations.h:2134
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
msgid "Springbok"
msgstr ""
# widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
# widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
# my-evolution/Locations.h:2135
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
#, fuzzy
msgid "Springfield"
msgstr "简体"
# my-evolution/Locations.h:2136
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
msgid "Stampede Pass"
msgstr ""
# calendar/gui/dialogs/task-details-page.glade.h:5
# calendar/gui/dialogs/task-details-page.glade.h:5
# my-evolution/Locations.h:2137
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
msgid "State College"
msgstr "州立学院"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
# my-evolution/Locations.h:2138
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
#, fuzzy
msgid "Stauning"
msgstr "开始:"
# my-evolution/Locations.h:2139
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
msgid "Staunton"
msgstr "斯托顿"
# my-evolution/Locations.h:2140
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
msgid "Stavanger/Sola"
msgstr "斯塔万格/Sola"
# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
# calendar/gui/alarm-notify/alarm-notify-dialog.c:216
# my-evolution/Locations.h:2141
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
#, fuzzy
msgid "Staverton"
msgstr "开始:"
@@ -35639,25 +36121,25 @@ msgstr "开始:"
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
# my-evolution/Locations.h:2142
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
#, fuzzy
msgid "Stavropol"
msgstr "停止"
# my-evolution/Locations.h:2143
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
msgid "St Cloud"
msgstr ""
# my-evolution/Locations.h:2144
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
msgid "Steamboat Springs"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# my-evolution/Locations.h:2145
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
#, fuzzy
msgid "Stephenville"
msgstr "塞舌尔"
@@ -35665,30 +36147,30 @@ msgstr "塞舌尔"
# addressbook/gui/contact-editor/fulladdr.glade.h:198
# addressbook/gui/contact-editor/fulladdr.glade.h:198
# my-evolution/Locations.h:2146
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
#, fuzzy
msgid "St. George"
msgstr "圣赫勒拿岛"
# my-evolution/Locations.h:2147
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
msgid "Stillwater"
msgstr ""
# my-evolution/Locations.h:2148
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
msgid "St. John's"
msgstr ""
# my-evolution/Locations.h:2149
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
msgid "St Johnsbury"
msgstr ""
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
# my-evolution/Locations.h:2150
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
#, fuzzy
msgid "St Joseph"
msgstr "停止"
@@ -35696,44 +36178,44 @@ msgstr "停止"
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# addressbook/gui/contact-editor/fulladdr.glade.h:180
# my-evolution/Locations.h:2151
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
msgid "St Louis"
msgstr "圣路易斯"
# my-evolution/Locations.h:2152
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
msgid "St Louis-Spirit"
msgstr "圣路易斯-Spirit"
# my-evolution/Locations.h:2153
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
msgid "Stockholm (Arlanda)"
msgstr "斯德哥尔摩 (Arlanda)"
# my-evolution/Locations.h:2154
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
msgid "Stockholm (Bromma)"
msgstr "斯德哥尔摩 (Bromma)"
# my-evolution/Locations.h:2155
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
msgid "Stockton"
msgstr ""
# my-evolution/Locations.h:2156
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
msgid "Stokmarknes/Skagen"
msgstr ""
# my-evolution/Locations.h:2157
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
msgid "Stord/Sorstokken"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# addressbook/gui/contact-editor/fulladdr.glade.h:197
# my-evolution/Locations.h:2158
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
#, fuzzy
msgid "Storm Lake"
msgstr "斯里兰卡"
@@ -35741,7 +36223,7 @@ msgstr "斯里兰卡"
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# addressbook/gui/contact-editor/fulladdr.glade.h:158
# my-evolution/Locations.h:2159
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
#, fuzzy
msgid "Stornoway"
msgstr "挪威"
@@ -35755,39 +36237,39 @@ msgstr "挪威"
# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
# mail/message-list.etspec.h:9
# my-evolution/Locations.h:2160
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
msgid "St Paul"
msgstr "圣保罗"
# my-evolution/Locations.h:2161
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
msgid "St Petersburg"
msgstr "圣彼得堡"
# my-evolution/Locations.h:2162
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
msgid "St Petersburg / Clearwater"
msgstr "圣彼得堡 / Clearwater"
# my-evolution/Locations.h:2163
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
msgid "Strasbourg"
msgstr "斯特拉斯堡"
# my-evolution/Locations.h:2164
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
msgid "Strevell"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# addressbook/gui/contact-editor/fulladdr.glade.h:192
# my-evolution/Locations.h:2165
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
msgid "St Simon's Island"
msgstr "圣西蒙岛"
# my-evolution/Locations.h:2166
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
msgid "Stumpy Point"
msgstr ""
@@ -35796,26 +36278,26 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
# my-evolution/Locations.h:2167
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
msgid "Sturgeon Bay"
msgstr "鲟鱼湾"
# my-evolution/Locations.h:2168
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
msgid "Stuttgart"
msgstr "斯图加特"
# mail/message-list.etspec.h:5
# mail/message-list.etspec.h:6
# my-evolution/Locations.h:2169
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
msgid "Sucre"
msgstr "苏克雷"
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# addressbook/gui/contact-editor/fulladdr.glade.h:123
# my-evolution/Locations.h:2170
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
#, fuzzy
msgid "Sumburgh"
msgstr "卢森堡"
@@ -35827,170 +36309,170 @@ msgstr "卢森堡"
# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
# my-evolution/Locations.h:2171
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
#, fuzzy
msgid "Sumter"
msgstr "概要"
# my-evolution/Locations.h:2172
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
msgid "Sumter (2)"
msgstr ""
# my-evolution/Locations.h:2173
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
msgid "Sundsvall-Harnosand"
msgstr "松兹瓦尔-Harnosand"
# calendar/zones.h:248
# my-evolution/Locations.h:2174
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
msgid "Sungshan/Taipei"
msgstr "Sungshan/台北"
# my-evolution/Locations.h:2175
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
msgid "Superior"
msgstr ""
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
# my-evolution/Locations.h:2177
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
msgid "Sutton"
msgstr "萨顿"
# my-evolution/Locations.h:2178
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
msgid "Suwon Ab"
msgstr ""
# my-evolution/Locations.h:2179
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
msgid "Svalbard"
msgstr "斯瓦尔巴特"
# my-evolution/Locations.h:2180
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
msgid "Svolvaer/Helle"
msgstr ""
# my-evolution/Locations.h:2182
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
msgid "Swift Current"
msgstr ""
# my-evolution/Locations.h:2184
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
msgid "Sydney"
msgstr "悉尼"
# my-evolution/Locations.h:2185
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
msgid "Syktyvkar"
msgstr ""
# ui/evolution-addressbook.xml.h:27
# ui/evolution-addressbook.xml.h:27
# my-evolution/Locations.h:2186
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
#, fuzzy
msgid "Sympheropol"
msgstr "停止"
# my-evolution/Locations.h:2187
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
msgid "Syracuse"
msgstr "锡拉库扎"
# my-evolution/Locations.h:2188
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
msgid "Szczecin"
msgstr "什切青"
# my-evolution/Locations.h:2189
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
msgid "Szombathely"
msgstr ""
# widgets/misc/e-charset-picker.c:84
# widgets/misc/e-charset-picker.c:84
# my-evolution/Locations.h:2190
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
#, fuzzy
msgid "Tabatinga"
msgstr "繁体"
# my-evolution/Locations.h:2191
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
msgid "Tabriz"
msgstr "大不里士"
# calendar/gui/print.c:2205
# calendar/gui/print.c:2205
# my-evolution/Locations.h:2192
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
#, fuzzy
msgid "Tabuk"
msgstr "任务"
# my-evolution/Locations.h:2193
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
msgid "Tachikawa Ab"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# my-evolution/Locations.h:2194
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
#, fuzzy
msgid "Tacna"
msgstr "汤加"
# my-evolution/Locations.h:2195
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
msgid "Tacoma"
msgstr "塔科马"
# my-evolution/Locations.h:2196
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
msgid "Tacoma-Lakewood"
msgstr "塔科马-Lakewood"
# my-evolution/Locations.h:2197
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
msgid "Tacuarembo"
msgstr ""
# my-evolution/Locations.h:2198
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
msgid "Taegu"
msgstr "大丘"
# my-evolution/Locations.h:2199
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
msgid "Taegu Ab"
msgstr "大丘 Ab"
# my-evolution/Locations.h:2200
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
msgid "Taejon"
msgstr "大田"
# my-evolution/Locations.h:2201
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
msgid "Tahoe Valley"
msgstr "塔霍谷"
# my-evolution/Locations.h:2202
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
msgid "Taichung"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2203
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
#, fuzzy
msgid "Taif"
msgstr "台湾"
@@ -35998,111 +36480,111 @@ msgstr "台湾"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2204
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
msgid "Tainan"
msgstr "台南"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2206
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
msgid "Taiyuan"
msgstr "太原"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2207
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
msgid "Taiz"
msgstr "塔伊兹"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2208
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
#, fuzzy
msgid "Tajima"
msgstr "台湾"
# my-evolution/Locations.h:2209
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
msgid "Takamatsu Airport"
msgstr "高松机场"
# my-evolution/Locations.h:2210
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
msgid "Talara"
msgstr ""
# my-evolution/Locations.h:2212
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
msgid "Talkeetna"
msgstr ""
# my-evolution/Locations.h:2213
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
msgid "Tallahassee"
msgstr "塔拉哈西"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2211
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
#, fuzzy
msgid "Tallinn"
msgstr "台湾"
# my-evolution/Locations.h:2214
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
msgid "Tamanrasset"
msgstr ""
# my-evolution/Locations.h:2215
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
msgid "Tamanrasset/Aguenna"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# addressbook/gui/contact-editor/fulladdr.glade.h:182
# my-evolution/Locations.h:2216
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
msgid "Tampa"
msgstr "坦帕"
# my-evolution/Locations.h:2217
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
msgid "Tampa-Macdill AFB"
msgstr "坦帕-Macdill 空军基地"
# addressbook/printing/e-contact-print.glade.h:27
# addressbook/printing/e-contact-print.glade.h:27
# my-evolution/Locations.h:2218
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
msgid "Tampere"
msgstr "坦佩雷"
# my-evolution/Locations.h:2219
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
msgid "Tampico"
msgstr "坦皮科"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2220
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
#, fuzzy
msgid "Tanana"
msgstr "台湾"
# my-evolution/Locations.h:2221
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
msgid "Tanegashima Airport"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# addressbook/gui/contact-editor/fulladdr.glade.h:116
# my-evolution/Locations.h:2222
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
#, fuzzy
msgid "Taos"
msgstr "老挝"
@@ -36110,24 +36592,24 @@ msgstr "老挝"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2223
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
msgid "Taoyuan"
msgstr ""
# my-evolution/Locations.h:2224
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
msgid "Tapachula"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2225
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
msgid "Taranto"
msgstr "塔兰托"
# my-evolution/Locations.h:2226
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
#, fuzzy
msgid "Tarbes"
msgstr "测试"
@@ -36135,59 +36617,59 @@ msgstr "测试"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2227
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
#, fuzzy
msgid "Tarija"
msgstr "台湾"
# my-evolution/Locations.h:2228
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
msgid "Tarvisio"
msgstr ""
# widgets/misc/e-charset-picker.c:84
# widgets/misc/e-charset-picker.c:84
# my-evolution/Locations.h:2229
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
#, fuzzy
msgid "Tatalina"
msgstr "繁体"
# my-evolution/Locations.h:2230
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
msgid "Tateyama Ab"
msgstr ""
# my-evolution/Locations.h:2231
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
msgid "Taunton"
msgstr ""
# my-evolution/Locations.h:2232
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
msgid "Tebessa"
msgstr ""
# my-evolution/Locations.h:2233
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
msgid "Tees-Side"
msgstr ""
# calendar/zones.h:168
# my-evolution/Locations.h:2234
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
msgid "Tegucigalpa"
msgstr "特古西加尔巴"
# my-evolution/Locations.h:2235
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
msgid "Tehran-Mehrabad"
msgstr "德黑兰-Mehrabad"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# my-evolution/Locations.h:2236
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
#, fuzzy
msgid "Tela"
msgstr "托克劳群岛"
@@ -36199,70 +36681,70 @@ msgstr "托克劳群岛"
# addressbook/gui/contact-editor/e-contact-editor.c:1661
# addressbook/gui/widgets/e-addressbook-view.c:872
# my-evolution/Locations.h:2237
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
msgid "Temple"
msgstr "坦普尔"
# my-evolution/Locations.h:2238
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
msgid "Tennessee"
msgstr "田纳西"
# my-evolution/Locations.h:2239
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
msgid "Tepic"
msgstr "特皮克"
# my-evolution/Locations.h:2240
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
msgid "Teresina"
msgstr "特雷西纳"
# my-evolution/Locations.h:2241
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
msgid "Terre Haute"
msgstr ""
# my-evolution/Locations.h:2242
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
msgid "Terrell"
msgstr "特雷尔"
# my-evolution/Locations.h:2243
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
msgid "Teterboro"
msgstr ""
# my-evolution/Locations.h:2244
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
msgid "Texarkana"
msgstr ""
# my-evolution/Locations.h:2245
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
msgid "Texas"
msgstr "德克萨斯州"
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# addressbook/gui/contact-editor/fulladdr.glade.h:187
# my-evolution/Locations.h:2246
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
#, fuzzy
msgid "The Dalles"
msgstr "塞舌尔"
# my-evolution/Locations.h:2247
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
msgid "Thessaloniki"
msgstr "萨洛尼卡"
# my-evolution/Locations.h:2248
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
msgid "Thief River Falls"
msgstr ""
# my-evolution/Locations.h:2249
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
msgid "Thiruvananthapuram"
msgstr ""
@@ -36271,13 +36753,13 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:91
# addressbook/gui/widgets/e-addressbook-view.c:880
# my-evolution/Locations.h:2250
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
#, fuzzy
msgid "Thisted"
msgstr "头衔"
# my-evolution/Locations.h:2251
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
msgid "Thompson Falls"
msgstr "汤普森瀑布"
@@ -36286,7 +36768,7 @@ msgstr "汤普森瀑布"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
# calendar/gui/dialogs/recurrence-page.c:962
# my-evolution/Locations.h:2252
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
#, fuzzy
msgid "Thumrait"
msgstr "星期四"
@@ -36294,31 +36776,31 @@ msgstr "星期四"
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2253
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
msgid "Tianjin"
msgstr "天津"
# addressbook/gui/contact-editor/fulladdr.glade.h:16
# calendar/zones.h:171
# my-evolution/Locations.h:2254
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
msgid "Tijuana"
msgstr "提华纳"
# my-evolution/Locations.h:2255
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
msgid "Timisoara"
msgstr ""
# my-evolution/Locations.h:2256
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
msgid "Tin City"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# addressbook/gui/contact-editor/fulladdr.glade.h:206
# my-evolution/Locations.h:2257
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
#, fuzzy
msgid "Tirana"
msgstr "台湾"
@@ -36326,18 +36808,18 @@ msgstr "台湾"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
# my-evolution/Locations.h:2258
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
#, fuzzy
msgid "Tiree"
msgstr "时间"
# my-evolution/Locations.h:2259
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
msgid "Tirgu Mures"
msgstr ""
# my-evolution/Locations.h:2260
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
msgid "Tiruchchirapalli"
msgstr ""
@@ -36346,7 +36828,7 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:91
# addressbook/gui/widgets/e-addressbook-view.c:880
# my-evolution/Locations.h:2261
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
#, fuzzy
msgid "Titusville"
msgstr "头衔"
@@ -36356,81 +36838,81 @@ msgstr "头衔"
# calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
# calendar/gui/e-calendar-table.c:384
# my-evolution/Locations.h:2262
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
#, fuzzy
msgid "Tivat"
msgstr "保密"
# my-evolution/Locations.h:2263
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
msgid "Tlemcen Zenata"
msgstr ""
# my-evolution/Locations.h:2264
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
msgid "Tobias Bolanos"
msgstr "托拜厄斯 Bolanos"
# my-evolution/Locations.h:2265
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
msgid "Tocumen"
msgstr ""
# my-evolution/Locations.h:2266
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
msgid "Togiak Village"
msgstr ""
# my-evolution/Locations.h:2267
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
msgid "Tokachi GSDF"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:48
# addressbook/gui/contact-editor/fulladdr.glade.h:48
# my-evolution/Locations.h:2268
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
msgid "Tokunoshima Island"
msgstr ""
# my-evolution/Locations.h:2269
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
msgid "Tokushima Ab"
msgstr "德岛 Ab"
# my-evolution/Locations.h:2270
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
msgid "Tokyo Heliport"
msgstr "东京直升机场"
# my-evolution/Locations.h:2271
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
msgid "Tokyo International Airport"
msgstr "东京国际机场"
# my-evolution/Locations.h:2272
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
msgid "Tokyo New International Airport"
msgstr "东京新机场"
# ui/evolution.xml.h:25
# ui/evolution.xml.h:25
# my-evolution/Locations.h:2273
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
msgid "Toledo"
msgstr "托莱多"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# my-evolution/Locations.h:2274
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
msgid "Toluca"
msgstr "托卢卡"
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# addressbook/gui/contact-editor/fulladdr.glade.h:211
# my-evolution/Locations.h:2275
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
#, fuzzy
msgid "Tonopah"
msgstr "汤加"
@@ -36438,36 +36920,36 @@ msgstr "汤加"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# my-evolution/Locations.h:2276
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
msgid "Topeka"
msgstr "托皮卡"
# my-evolution/Locations.h:2277
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
msgid "Topeka-Forbes Field"
msgstr "托皮卡-Forbes Field"
# my-evolution/Locations.h:2278
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
msgid "Torino/Bric Della Croce"
msgstr "托里诺/Bric Della Croce"
# my-evolution/Locations.h:2279
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
msgid "Torino/Caselle"
msgstr "托里诺/Caselle"
# my-evolution/metar.c:442 my-evolution/metar.c:451
# my-evolution/metar.c:442 my-evolution/metar.c:451
# my-evolution/Locations.h:2280
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
msgid "Toronto"
msgstr "多伦多"
# addressbook/printing/e-contact-print.glade.h:39
# addressbook/printing/e-contact-print.glade.h:39
# my-evolution/Locations.h:2281
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
#, fuzzy
msgid "Torp"
msgstr "顶部:"
@@ -36475,14 +36957,14 @@ msgstr "顶部:"
# addressbook/gui/contact-editor/fulladdr.glade.h:77
# addressbook/gui/contact-editor/fulladdr.glade.h:77
# my-evolution/Locations.h:2282
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
msgid "Torrance"
msgstr "托兰斯"
# widgets/misc/e-charset-picker.c:64
# widgets/misc/e-charset-picker.c:64
# my-evolution/Locations.h:2283
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
#, fuzzy
msgid "Torreon"
msgstr "韩语"
@@ -36490,7 +36972,7 @@ msgstr "韩语"
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
# my-evolution/Locations.h:2284
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
#, fuzzy
msgid "Tottori Airport"
msgstr "开始导入"
@@ -36506,39 +36988,39 @@ msgstr "开始导入"
# ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
# ui/evolution.xml.h:4
# my-evolution/Locations.h:2285
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
msgid "Toulouse"
msgstr "图鲁兹"
# my-evolution/Locations.h:2286
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
msgid "Toul-Rosieres"
msgstr ""
# my-evolution/Locations.h:2287
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
msgid "Tours-St-Symphorien"
msgstr "图尔斯-St-Symphorien"
# my-evolution/Locations.h:2288
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
msgid "Toussus-Le Noble"
msgstr ""
# my-evolution/Locations.h:2289
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
msgid "Townsville"
msgstr "汤斯维尔"
# my-evolution/Locations.h:2290
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
msgid "Toyama Airport"
msgstr "富山机场"
# addressbook/gui/contact-editor/fulladdr.glade.h:81
# addressbook/gui/contact-editor/fulladdr.glade.h:81
# my-evolution/Locations.h:2291
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
#, fuzzy
msgid "Trabzon"
msgstr "加蓬"
@@ -36546,12 +37028,12 @@ msgstr "加蓬"
# addressbook/gui/contact-editor/fulladdr.glade.h:109
# addressbook/gui/contact-editor/fulladdr.glade.h:109
# my-evolution/Locations.h:2292
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
msgid "Trapani"
msgstr "特拉帕尼"
# my-evolution/Locations.h:2293
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
msgid "Traverse City"
msgstr ""
@@ -36562,7 +37044,7 @@ msgstr ""
# addressbook/gui/contact-editor/e-contact-editor.c:1661
# addressbook/gui/widgets/e-addressbook-view.c:872
# my-evolution/Locations.h:2294
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
#, fuzzy
msgid "Trelew"
msgstr "电传"
@@ -36570,116 +37052,116 @@ msgstr "电传"
# addressbook/printing/e-contact-print.glade.h:24
# addressbook/printing/e-contact-print.glade.h:24
# my-evolution/Locations.h:2295
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
msgid "Trenton"
msgstr "特伦顿"
# ui/evolution-mail-message.xml.h:63
# ui/evolution-mail-message.xml.h:63
# my-evolution/Locations.h:2296
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
#, fuzzy
msgid "Trevico"
msgstr "上一个"
# my-evolution/Locations.h:2297
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
msgid "Treviso/Istrana"
msgstr ""
# my-evolution/Locations.h:2298
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
msgid "Treviso/S.Angelo"
msgstr ""
# my-evolution/Locations.h:2299
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
msgid "Trieste"
msgstr "的里雅斯特"
# my-evolution/metar.c:442 my-evolution/metar.c:451
# my-evolution/metar.c:442 my-evolution/metar.c:451
# my-evolution/Locations.h:2300
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
msgid "Trinidad"
msgstr "特立尼达"
# calendar/zones.h:56
# my-evolution/Locations.h:2301
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
msgid "Tripoli"
msgstr "的黎波里"
# my-evolution/Locations.h:2302
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
msgid "Tromso/Langnes"
msgstr "特罗姆兹/Langnes"
# my-evolution/Locations.h:2303
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
msgid "Trondheim/Vaernes"
msgstr "特隆赫姆/Vaernes"
# my-evolution/Locations.h:2304
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
msgid "Troutdale"
msgstr ""
# my-evolution/Locations.h:2305
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
msgid "Troyes/Barberey"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:214
# addressbook/gui/contact-editor/fulladdr.glade.h:214
# my-evolution/Locations.h:2306
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
#, fuzzy
msgid "Truckee"
msgstr "土耳其"
# my-evolution/Locations.h:2307
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
msgid "Truth or Consequences"
msgstr ""
# my-evolution/Locations.h:2308
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
msgid "Tsuiki Ab"
msgstr ""
# my-evolution/Locations.h:2309
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
msgid "Tsushima Airport"
msgstr "对马机场"
# my-evolution/Locations.h:2310
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
msgid "Tucson"
msgstr "图森"
# my-evolution/Locations.h:2311
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
msgid "Tucson-Davis AFB"
msgstr "图森-戴维斯空军基地"
# my-evolution/Locations.h:2312
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
msgid "Tucuman"
msgstr ""
# my-evolution/Locations.h:2313
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
msgid "Tucumcari"
msgstr ""
# my-evolution/Locations.h:2314
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
msgid "Tucurui"
msgstr ""
# my-evolution/Locations.h:2315
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
msgid "Tulancingo"
msgstr ""
@@ -36688,7 +37170,7 @@ msgstr ""
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
# calendar/gui/dialogs/recurrence-page.c:960
# my-evolution/Locations.h:2316
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
#, fuzzy
msgid "Tulcea"
msgstr "星期二"
@@ -36698,7 +37180,7 @@ msgstr "星期二"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
# calendar/gui/dialogs/recurrence-page.c:960
# my-evolution/Locations.h:2317
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
msgid "Tulsa"
msgstr "塔尔萨"
@@ -36711,7 +37193,7 @@ msgstr "塔尔萨"
# calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
# shell/glade/e-active-connection-dialog.glade.h:5
# my-evolution/Locations.h:2318
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
#, fuzzy
msgid "Tupelo"
msgstr "类型"
@@ -36719,7 +37201,7 @@ msgstr "类型"
# widgets/misc/e-charset-picker.c:65
# widgets/misc/e-charset-picker.c:65
# my-evolution/Locations.h:2319
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
#, fuzzy
msgid "Turaif"
msgstr "土耳其语"
@@ -36727,24 +37209,24 @@ msgstr "土耳其语"
# widgets/misc/e-charset-picker.c:65
# widgets/misc/e-charset-picker.c:65
# my-evolution/Locations.h:2320
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
msgid "Turin"
msgstr "都灵"
# addressbook/gui/contact-editor/fulladdr.glade.h:214
# addressbook/gui/contact-editor/fulladdr.glade.h:214
# my-evolution/Locations.h:2322
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
msgid "Turku"
msgstr "土尔库"
# my-evolution/Locations.h:2323
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
msgid "Tuscaloosa"
msgstr ""
# my-evolution/Locations.h:2324
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
msgid "Tuxtla Gutierrez"
msgstr ""
@@ -36753,105 +37235,105 @@ msgstr ""
# calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
# calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
# my-evolution/Locations.h:2325
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
#, fuzzy
msgid "Twenthe"
msgstr "暂时的"
# my-evolution/Locations.h:2326
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
msgid "Twentynine Palms"
msgstr ""
# my-evolution/Locations.h:2327
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
msgid "Twin Falls"
msgstr ""
# my-evolution/Locations.h:2328
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
msgid "Tyler"
msgstr "泰勒"
# my-evolution/Locations.h:2329
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
msgid "Tyndall AFB"
msgstr "廷德尔空军基地"
# my-evolution/Locations.h:2330
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
msgid "Tyumen"
msgstr "秋明"
# my-evolution/Locations.h:2331
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
msgid "Uberaba"
msgstr ""
# my-evolution/Locations.h:2332
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
msgid "Ufa"
msgstr ""
# my-evolution/Locations.h:2333
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
msgid "Ukiah"
msgstr ""
# my-evolution/Locations.h:2335
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
msgid "Ulan-Ude"
msgstr ""
# my-evolution/Locations.h:2336
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
msgid "Ulsan"
msgstr ""
# my-evolution/Locations.h:2337
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
msgid "Ulyanovsk"
msgstr "乌里扬诺夫斯克"
# my-evolution/Locations.h:2338
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
msgid "Umea"
msgstr ""
# my-evolution/Locations.h:2339
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
msgid "Umiat"
msgstr ""
# my-evolution/Locations.h:2340
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
msgid "Unalakleet"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:221
# addressbook/gui/contact-editor/fulladdr.glade.h:221
# my-evolution/Locations.h:2341
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
msgid "United Arab Emirates "
msgstr "阿拉伯联合酋长国 "
# mail/message-list.c:639
# mail/message-list.c:645
# my-evolution/Locations.h:2344
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
#, fuzzy
msgid "Unst"
msgstr "不可见"
# my-evolution/Locations.h:2345
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
msgid "Upington"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:109
# addressbook/gui/contact-editor/fulladdr.glade.h:109
# my-evolution/Locations.h:2346
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
#, fuzzy
msgid "Uruapan"
msgstr "日本"
@@ -36859,39 +37341,39 @@ msgstr "日本"
# addressbook/gui/contact-editor/fulladdr.glade.h:226
# addressbook/gui/contact-editor/fulladdr.glade.h:226
# my-evolution/Locations.h:2347
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
msgid "Uruguaiana"
msgstr "乌拉圭亚纳"
# my-evolution/Locations.h:2349
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
msgid "Urumqi"
msgstr ""
# ui/evolution-message-composer.xml.h:1
# ui/evolution-message-composer.xml.h:1
# my-evolution/Locations.h:2350
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
msgid "Utah"
msgstr "犹他州"
# my-evolution/Locations.h:2351
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
msgid "Utica"
msgstr "尤蒂卡"
# my-evolution/Locations.h:2352
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
msgid "Utrecht/Soesterberg"
msgstr "乌德勒支/Soesterberg"
# my-evolution/Locations.h:2353
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
msgid "Utsunomiya Ab"
msgstr "宇都宫 Ab"
# my-evolution/Locations.h:2354
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
msgid "Uzhgorod"
msgstr ""
@@ -36902,7 +37384,7 @@ msgstr ""
# addressbook/gui/contact-editor/e-contact-editor.c:1660
# addressbook/gui/widgets/e-addressbook-view.c:871
# my-evolution/Locations.h:2355
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
#, fuzzy
msgid "Vadso"
msgstr "收音机"
@@ -36910,7 +37392,7 @@ msgstr "收音机"
# my-evolution/metar.c:63
# my-evolution/metar.c:63
# my-evolution/Locations.h:2356
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
#, fuzzy
msgid "Vaerlose"
msgstr "不定风"
@@ -36918,139 +37400,139 @@ msgstr "不定风"
# addressbook/gui/contact-editor/fulladdr.glade.h:172
# addressbook/gui/contact-editor/fulladdr.glade.h:172
# my-evolution/Locations.h:2357
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
msgid "Vagar"
msgstr "瓦尔迪兹"
# my-evolution/Locations.h:2358
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
msgid "Valdez 2"
msgstr "瓦尔迪兹 2"
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# addressbook/gui/contact-editor/fulladdr.glade.h:131
# my-evolution/Locations.h:2359
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
#, fuzzy
msgid "Valdosta"
msgstr "马耳他"
# my-evolution/Locations.h:2360
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
msgid "Valdosta-Moody AFB"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:191
# addressbook/gui/contact-editor/fulladdr.glade.h:191
# my-evolution/Locations.h:2361
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
msgid "Valencia"
msgstr "巴伦西亚"
# calendar/zones.h:257
# my-evolution/Locations.h:2362
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
msgid "Valentine"
msgstr "瓦伦丁"
# my-evolution/Locations.h:2363
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
msgid "Valera*"
msgstr "瓦勒拉"
# my-evolution/Locations.h:2364
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
msgid "Valkenburg"
msgstr ""
# my-evolution/Locations.h:2365
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
msgid "Valley"
msgstr ""
# my-evolution/Locations.h:2366
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
msgid "Valparaiso"
msgstr "瓦尔帕莱索"
# my-evolution/Locations.h:2367
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
msgid "Valparaiso-Eglin AFB"
msgstr "瓦尔帕莱索-Eglin 空军基地"
# addressbook/backend/ebook/e-card-simple.c:93
# addressbook/backend/ebook/e-card-simple.c:93
# my-evolution/Locations.h:2368
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
#, fuzzy
msgid "Van"
msgstr "经理"
# my-evolution/Locations.h:2369
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
msgid "Vancouver"
msgstr "范库弗峰"
# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
# calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
# my-evolution/Locations.h:2370
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
#, fuzzy
msgid "Vandel"
msgstr "取消"
# my-evolution/Locations.h:2371
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
msgid "Vandenberg AFB"
msgstr "范登堡空军基地"
# my-evolution/Locations.h:2372
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
msgid "Vandenberg Range"
msgstr "范登堡山脉"
# my-evolution/Locations.h:2373
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
msgid "Van Nuys"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:20
# addressbook/gui/contact-editor/fulladdr.glade.h:20
# my-evolution/Locations.h:2374
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
#, fuzzy
msgid "Varadero"
msgstr "巴巴多斯岛"
# my-evolution/Locations.h:2375
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
msgid "Varanasi/Babatpur"
msgstr "瓦蜡纳西/Babatpur"
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# my-evolution/Locations.h:2376
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
msgid "Varna"
msgstr "瓦尔纳"
# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
# my-evolution/Locations.h:2377
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
#, fuzzy
msgid "Vasteras"
msgstr "之后"
# my-evolution/Locations.h:2378
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
msgid "Vaxjo"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:229
# addressbook/gui/contact-editor/fulladdr.glade.h:229
# my-evolution/Locations.h:2379
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
#, fuzzy
msgid "Venezia"
msgstr "委内瑞拉"
@@ -37058,186 +37540,186 @@ msgstr "委内瑞拉"
# widgets/misc/e-charset-picker.c:66
# widgets/misc/e-charset-picker.c:66
# my-evolution/Locations.h:2381
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
#, fuzzy
msgid "Venice"
msgstr "Unicode"
# my-evolution/Locations.h:2382
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
msgid "Veracruz"
msgstr "韦拉克鲁斯"
# my-evolution/Locations.h:2383
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
msgid "Vermillion"
msgstr ""
# my-evolution/Locations.h:2384
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
msgid "Vermont"
msgstr "佛蒙特州"
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# addressbook/gui/contact-editor/contact-editor.glade.h:16
# my-evolution/Locations.h:2385
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
#, fuzzy
msgid "Vernal"
msgstr "常规"
# my-evolution/Locations.h:2386
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
msgid "Vero Beach"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:229
# addressbook/gui/contact-editor/fulladdr.glade.h:229
# my-evolution/Locations.h:2387
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
msgid "Vicenza"
msgstr "维琴察"
# my-evolution/Locations.h:2388
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
msgid "Vichy-Charmeil"
msgstr "维希-Charmeil"
# my-evolution/Locations.h:2389
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
msgid "Vichy-Rolla"
msgstr "维希-Rolla"
# my-evolution/Locations.h:2390
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
msgid "Vicksburg"
msgstr ""
# my-evolution/Locations.h:2391
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
msgid "Victoria"
msgstr "维多利亚"
# my-evolution/Locations.h:2393
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
msgid "Vigo"
msgstr "比戈"
# shell/e-shell-importer.c:612
# shell/e-shell-importer.c:612
# my-evolution/Locations.h:2394
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
#, fuzzy
msgid "Vilhena"
msgstr "文件名:"
# my-evolution/Locations.h:2395
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
msgid "Villacoublay"
msgstr ""
# my-evolution/Locations.h:2396
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
msgid "Villafranca"
msgstr ""
# my-evolution/Locations.h:2397
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
msgid "Villahermosa"
msgstr ""
# my-evolution/Locations.h:2398
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
msgid "Villamontes"
msgstr ""
# my-evolution/Locations.h:2399
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
msgid "Villa Reynolds"
msgstr ""
# calendar/zones.h:329
# my-evolution/Locations.h:2400
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
msgid "Vilnius"
msgstr "维尔纽斯"
# my-evolution/Locations.h:2401
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
msgid "Virginia"
msgstr "维吉尼亚"
# my-evolution/Locations.h:2402
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
msgid "Virginia Beach"
msgstr "维吉尼亚海岸"
# my-evolution/Locations.h:2403
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
msgid "Virginia Tech Airport"
msgstr "维吉尼亚 Tech 机场"
# my-evolution/Locations.h:2404
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
msgid "Viru-Viru"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# my-evolution/Locations.h:2405
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
#, fuzzy
msgid "Visalia"
msgstr "澳大利亚"
# my-evolution/Locations.h:2406
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
msgid "Visby"
msgstr "维斯比"
# my-evolution/Locations.h:2407
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
msgid "Viterbo"
msgstr ""
# my-evolution/Locations.h:2408
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
msgid "Vitoria"
msgstr "维多利亚"
# my-evolution/Locations.h:2409
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
msgid "Vladikavkaz"
msgstr ""
# calendar/zones.h:258
# my-evolution/Locations.h:2410
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
msgid "Vladivostok"
msgstr "符拉迪沃斯托克"
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# addressbook/gui/contact-editor/fulladdr.glade.h:105
# my-evolution/Locations.h:2411
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
#, fuzzy
msgid "Vlieland"
msgstr "爱尔兰"
# my-evolution/Locations.h:2412
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
msgid "Vojens/Skrydstrup"
msgstr ""
# my-evolution/Locations.h:2413
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
msgid "Volgograd"
msgstr "伏尔加格勒"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# my-evolution/Locations.h:2414
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
#, fuzzy
msgid "Volkel"
msgstr "托克劳群岛"
@@ -37245,20 +37727,20 @@ msgstr "托克劳群岛"
# ui/evolution-message-composer.xml.h:49
# ui/evolution-message-composer.xml.h:49
# my-evolution/Locations.h:2415
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
#, fuzzy
msgid "Volk Field"
msgstr "发件人域(_F)"
# my-evolution/Locations.h:2416
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
msgid "Voronezh"
msgstr "沃罗涅什"
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# addressbook/gui/contact-editor/fulladdr.glade.h:210
# my-evolution/Locations.h:2417
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
#, fuzzy
msgid "Voslau"
msgstr "托克劳群岛"
@@ -37266,94 +37748,94 @@ msgstr "托克劳群岛"
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# addressbook/gui/contact-editor/fulladdr.glade.h:139
# my-evolution/Locations.h:2418
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
msgid "Waco"
msgstr "韦科"
# my-evolution/Locations.h:2419
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
msgid "Wadi Al Dawasser Airport"
msgstr ""
# my-evolution/Locations.h:2420
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
msgid "Wainwright"
msgstr ""
# my-evolution/Locations.h:2421
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
msgid "Wakefield"
msgstr "韦克菲尔德"
# my-evolution/Locations.h:2422
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
msgid "Wakkanai Airport"
msgstr ""
# my-evolution/Locations.h:2423
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
msgid "Walla Walla"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# addressbook/gui/contact-editor/fulladdr.glade.h:132
# my-evolution/Locations.h:2424
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
#, fuzzy
msgid "Wallops Island"
msgstr "马绍尔群岛"
# my-evolution/Locations.h:2425
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
msgid "Walnut Ridge"
msgstr ""
# mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
# mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
# my-evolution/Locations.h:2426
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
#, fuzzy
msgid "Warner Robins"
msgstr "警告"
# my-evolution/Locations.h:2427
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
msgid "Warroad"
msgstr ""
# my-evolution/Locations.h:2428
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
msgid "Warszawa"
msgstr "华沙"
# my-evolution/Locations.h:2429
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
msgid "Washington"
msgstr "华盛顿"
# my-evolution/Locations.h:2430
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
msgid "Washington/Dulles"
msgstr "华盛顿/杜勒斯"
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/Locations.h:2431
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
msgid "Waterbury"
msgstr "沃特伯里"
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/Locations.h:2432
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
msgid "Waterloo"
msgstr "滑铁卢"
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/Locations.h:2433
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
#, fuzzy
msgid "Watertown"
msgstr "天气"
@@ -37363,31 +37845,31 @@ msgstr "天气"
# addressbook/backend/ebook/e-card-simple.c:104
# calendar/gui/e-calendar-table.etspec.h:4
# my-evolution/Locations.h:2434
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
#, fuzzy
msgid "Waterville"
msgstr "类别"
# my-evolution/Locations.h:2435
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
msgid "Waukesha"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# addressbook/gui/contact-editor/fulladdr.glade.h:228
# my-evolution/Locations.h:2436
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
#, fuzzy
msgid "Wausau"
msgstr "努瓦阿图"
# my-evolution/Locations.h:2437
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
msgid "Waycross"
msgstr ""
# my-evolution/Locations.h:2438
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
msgid "Waynesboro"
msgstr ""
@@ -37396,46 +37878,46 @@ msgstr ""
# addressbook/backend/ebook/e-card-simple.c:88
# addressbook/gui/widgets/e-addressbook-view.c:877
# my-evolution/Locations.h:2439
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
msgid "Webster City"
msgstr "韦伯斯特城"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# my-evolution/Locations.h:2440
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
#, fuzzy
msgid "Wejh"
msgstr "三"
# my-evolution/Locations.h:2441
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
msgid "Wellington"
msgstr "惠灵顿"
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/Locations.h:2442
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
#, fuzzy
msgid "Wenatchee"
msgstr "天气"
# my-evolution/Locations.h:2443
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
#, fuzzy
msgid "Wendover"
msgstr "发件人"
# my-evolution/Locations.h:2444
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
msgid "West Atlanta"
msgstr "西亚特兰大"
# widgets/misc/e-charset-picker.c:67
# widgets/misc/e-charset-picker.c:67
# my-evolution/Locations.h:2445
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
#, fuzzy
msgid "West Burke"
msgstr "西欧"
@@ -37443,7 +37925,7 @@ msgstr "西欧"
# addressbook/gui/contact-editor/fulladdr.glade.h:148
# addressbook/gui/contact-editor/fulladdr.glade.h:148
# my-evolution/Locations.h:2446
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
#, fuzzy
msgid "Westerland"
msgstr "荷兰"
@@ -37451,33 +37933,33 @@ msgstr "荷兰"
# my-evolution/metar.c:67
# my-evolution/metar.c:67
# my-evolution/Locations.h:2447
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
#, fuzzy
msgid "Westfield"
msgstr "西"
# my-evolution/Locations.h:2448
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
msgid "Westhampton"
msgstr ""
# my-evolution/Locations.h:2449
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
msgid "West Palm Beach"
msgstr ""
# my-evolution/Locations.h:2450
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
msgid "West Virginia"
msgstr "西维吉尼亚"
# my-evolution/Locations.h:2451
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
msgid "West Yellowstone"
msgstr "西黄石国家公园"
# my-evolution/Locations.h:2452
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
msgid "West Yellowstone (2)"
msgstr "西黄石国家公园 (2)"
@@ -37488,7 +37970,7 @@ msgstr "西黄石国家公园 (2)"
# calendar/gui/dialogs/event-editor.c:263
# calendar/gui/dialogs/event-editor.c:366
# my-evolution/Locations.h:2453
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
#, fuzzy
msgid "Wheeling"
msgstr "会见"
@@ -37496,55 +37978,55 @@ msgstr "会见"
# addressbook/gui/contact-editor/fulladdr.glade.h:48
# addressbook/gui/contact-editor/fulladdr.glade.h:48
# my-evolution/Locations.h:2454
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
#, fuzzy
msgid "Whidbey Island"
msgstr "圣诞岛"
# my-evolution/Locations.h:2455
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
msgid "Whitefield"
msgstr "怀特菲尔德"
# my-evolution/Locations.h:2456
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
msgid "White Plains"
msgstr ""
# my-evolution/Locations.h:2457
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
msgid "White Sulphur"
msgstr ""
# my-evolution/Locations.h:2458
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
msgid "Whittier"
msgstr "惠蒂尔"
# my-evolution/Locations.h:2459
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
msgid "Wichita"
msgstr ""
# my-evolution/Locations.h:2460
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
msgid "Wichita Falls"
msgstr ""
# my-evolution/Locations.h:2461
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
msgid "Wichita-Jabara"
msgstr ""
# my-evolution/Locations.h:2462
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
msgid "Wichita-McConnell AFB"
msgstr ""
# addressbook/backend/ebook/e-card-simple.c:95
# addressbook/backend/ebook/e-card-simple.c:95
# my-evolution/Locations.h:2463
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
#, fuzzy
msgid "Wick"
msgstr "绰号"
@@ -37552,147 +38034,147 @@ msgstr "绰号"
# calendar/gui/print.c:498
# calendar/gui/print.c:498
# my-evolution/Locations.h:2464
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
msgid "Wien"
msgstr "维也纳"
# my-evolution/Locations.h:2465
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
msgid "Wildwood"
msgstr ""
# my-evolution/Locations.h:2466
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
msgid "Wilkes - Barre"
msgstr "威尔克斯地 - Barre"
# my-evolution/Locations.h:2467
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
msgid "Williams Field"
msgstr ""
# my-evolution/Locations.h:2468
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
msgid "Williamsport"
msgstr ""
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# addressbook/gui/contact-editor/e-contact-save-as.c:170
# my-evolution/Locations.h:2469
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
#, fuzzy
msgid "Williston"
msgstr "列表"
# my-evolution/Locations.h:2470
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
msgid "Willoughby"
msgstr "威洛比"
# my-evolution/Locations.h:2471
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
msgid "Willow Airport"
msgstr ""
# my-evolution/Locations.h:2472
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
msgid "Wilmington"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:121
# addressbook/gui/contact-editor/fulladdr.glade.h:121
# my-evolution/Locations.h:2473
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
msgid "Winchester"
msgstr "温彻斯特"
# my-evolution/metar.c:397
# my-evolution/metar.c:397
# my-evolution/Locations.h:2474
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
msgid "Windsor"
msgstr "温莎"
# my-evolution/Locations.h:2475
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
msgid "Windsor Locks"
msgstr ""
# my-evolution/Locations.h:2476
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
msgid "Wink"
msgstr ""
# my-evolution/Locations.h:2477
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
msgid "Winnemucca"
msgstr ""
# calendar/zones.h:175
# my-evolution/Locations.h:2478
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
msgid "Winnipeg"
msgstr "温尼伯"
# my-evolution/Locations.h:2479
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
msgid "Winslow"
msgstr "温斯洛"
# my-evolution/Locations.h:2480
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
msgid "Winston-Salem"
msgstr "温斯顿-塞伦"
# my-evolution/Locations.h:2481
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
msgid "Winter Haven"
msgstr ""
# mail/mail-session.c:322
# mail/mail-session.c:322
# my-evolution/Locations.h:2482
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
msgid "Winter Park"
msgstr "冬季公园"
# my-evolution/Locations.h:2483
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
msgid "Wiscasset"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# addressbook/gui/contact-editor/fulladdr.glade.h:138
# my-evolution/Locations.h:2484
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
msgid "Wisconsin"
msgstr "威斯康星州"
# my-evolution/Locations.h:2485
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
msgid "Wisconsin Rapids"
msgstr ""
# my-evolution/Locations.h:2486
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
#, fuzzy
msgid "Wise"
msgstr "是"
# my-evolution/Locations.h:2487
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
msgid "Woensdrecht"
msgstr ""
# my-evolution/Locations.h:2488
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
msgid "Wolf Point"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:100
# addressbook/gui/contact-editor/fulladdr.glade.h:100
# my-evolution/Locations.h:2489
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
#, fuzzy
msgid "Woong Cheon"
msgstr "香港"
@@ -37700,7 +38182,7 @@ msgstr "香港"
# addressbook/printing/e-contact-print.glade.h:9
# addressbook/printing/e-contact-print.glade.h:9
# my-evolution/Locations.h:2490
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
#, fuzzy
msgid "Wooster"
msgstr "脚注:"
@@ -37708,14 +38190,14 @@ msgstr "脚注:"
# calendar/gui/dialogs/recurrence-page.glade.h:16
# calendar/gui/dialogs/recurrence-page.glade.h:16
# my-evolution/Locations.h:2491
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
msgid "Worcester"
msgstr "伍斯特"
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# addressbook/gui/contact-editor/fulladdr.glade.h:169
# my-evolution/Locations.h:2492
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
#, fuzzy
msgid "Worland"
msgstr "波兰"
@@ -37723,190 +38205,190 @@ msgstr "波兰"
# mail/mail-mt.c:901
# mail/mail-mt.c:901
# my-evolution/Locations.h:2493
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
#, fuzzy
msgid "Worthington"
msgstr "正在工作"
# my-evolution/Locations.h:2494
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
msgid "Wrangell"
msgstr "兰格尔"
# my-evolution/Locations.h:2495
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
msgid "Wrightstown / Mcguire AFB"
msgstr ""
# my-evolution/Locations.h:2496
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
msgid "Wuchia Observatory"
msgstr ""
# mail/mail-mt.c:901
# mail/mail-mt.c:901
# my-evolution/Locations.h:2497
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
msgid "Wyoming"
msgstr "怀俄明州"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
# my-evolution/Locations.h:2498
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
msgid "Xiamen"
msgstr "厦门"
# my-evolution/Locations.h:2499
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
msgid "Yacuiba"
msgstr ""
# my-evolution/Locations.h:2500
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
msgid "Yakima"
msgstr "雅吉瓦"
# my-evolution/Locations.h:2501
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
msgid "Yakushima"
msgstr ""
# addressbook/gui/contact-editor/fulladdr.glade.h:5
# calendar/zones.h:176
# my-evolution/Locations.h:2502
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
#, fuzzy
msgid "Yakutat"
msgstr "美洲萨摩亚"
# my-evolution/Locations.h:2503
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
msgid "Yakutsk"
msgstr "雅库茨克"
# my-evolution/Locations.h:2504
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
msgid "Yamagata Airport"
msgstr ""
# my-evolution/Locations.h:2505
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
msgid "Yamaguchi Ube Airport"
msgstr ""
# my-evolution/Locations.h:2506
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
msgid "Yankton"
msgstr ""
# shell/importer/intelligent.c:196
# shell/importer/intelligent.c:196
# my-evolution/Locations.h:2507
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
#, fuzzy
msgid "Yao Airport"
msgstr "不要导入"
# my-evolution/Locations.h:2508
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
msgid "Yechon Ab"
msgstr ""
# my-evolution/Locations.h:2509
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
msgid "Yekaterinburg"
msgstr ""
# my-evolution/Locations.h:2510
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
msgid "Yellowknife"
msgstr "耶洛奈夫"
# my-evolution/Locations.h:2511
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
msgid "Yellowstone"
msgstr "黄石国家公园"
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
# my-evolution/Locations.h:2513
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
msgid "Yenbo"
msgstr "延布"
# my-evolution/Locations.h:2514
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
msgid "Yeoju Range"
msgstr ""
# my-evolution/Locations.h:2515
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
msgid "Yeonpyeungdo"
msgstr ""
# my-evolution/Locations.h:2516
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
msgid "Yeovilton"
msgstr ""
# my-evolution/Locations.h:2517
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
msgid "Yokosuka Fwf"
msgstr "横须贺 Fwf"
# my-evolution/Locations.h:2518
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
msgid "Yokota Ab"
msgstr ""
# my-evolution/Locations.h:2519
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
msgid "Yongsan/H-208 Hp"
msgstr ""
# my-evolution/Locations.h:2520
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
msgid "Yoro"
msgstr ""
# my-evolution/Locations.h:2521
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
msgid "Yosu"
msgstr ""
# my-evolution/Locations.h:2522
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
msgid "Youngstown"
msgstr "扬斯敦"
# my-evolution/Locations.h:2523
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
msgid "Ypsilanti"
msgstr ""
# my-evolution/Locations.h:2525
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
msgid "Yukon"
msgstr "育空"
# my-evolution/Locations.h:2526
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
msgid "Yuma MCAS"
msgstr "尤马 MCAS"
# my-evolution/Locations.h:2527
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
msgid "Yurimaguas"
msgstr ""
# my-evolution/Locations.h:2528
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
msgid "Yuzhno-Sakhalinsk"
msgstr ""
# my-evolution/Locations.h:2529
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
msgid "Zacatecas"
msgstr "萨卡特卡斯"
@@ -37915,23 +38397,23 @@ msgstr "萨卡特卡斯"
# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# my-evolution/Locations.h:2530
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
msgid "Zadar"
msgstr "扎达尔"
# calendar/zones.h:331
# my-evolution/Locations.h:2531
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
msgid "Zagreb"
msgstr "萨格勒布"
# my-evolution/Locations.h:2532
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
msgid "Zakinthos"
msgstr ""
# my-evolution/Locations.h:2533
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
msgid "Zama Airfield"
msgstr ""
@@ -37946,7 +38428,7 @@ msgstr ""
# calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
# camel/camel-service.c:610 camel/camel-service.c:646
# my-evolution/Locations.h:2534
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
#, fuzzy
msgid "Zanesville"
msgstr "已经取消"
@@ -37954,124 +38436,109 @@ msgstr "已经取消"
# addressbook/gui/contact-editor/fulladdr.glade.h:165
# addressbook/gui/contact-editor/fulladdr.glade.h:165
# my-evolution/Locations.h:2535
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
msgid "Zaragoza"
msgstr "萨拉戈萨"
# my-evolution/Locations.h:2536
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
msgid "Zell Am See"
msgstr ""
# my-evolution/Locations.h:2537
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
msgid "Zuni Pueblo"
msgstr "祖尼 普维布洛"
# calendar/zones.h:333
# my-evolution/Locations.h:2538
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
msgid "Zurich"
msgstr "苏黎世"
# my-evolution/component-factory.c:44
# my-evolution/component-factory.c:44
# my-evolution/component-factory.c:44
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
msgid "Folder containing the Evolution Summary"
msgstr "含有 Evolution 概要的文件夹"
# my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
# my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
# my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
msgid "Appointments"
msgstr "约会"
# my-evolution/e-summary-calendar.c:341
# my-evolution/e-summary-calendar.c:341
# my-evolution/e-summary-calendar.c:341
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
+#: my-evolution/e-summary-calendar.c:388
+#, fuzzy
+msgid "No appointments."
msgstr "没有约会"
# my-evolution/e-summary-calendar.c:377
# my-evolution/e-summary-calendar.c:377
# my-evolution/e-summary-calendar.c:375
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
msgid "%k:%M %d %B"
msgstr "%B %d %k:%M"
# my-evolution/e-summary-calendar.c:379
# my-evolution/e-summary-calendar.c:379
# my-evolution/e-summary-calendar.c:377
-#: my-evolution/e-summary-calendar.c:420
-msgid "%l:%M %d %B"
+#: my-evolution/e-summary-calendar.c:407
+#, fuzzy
+msgid "%l:%M%P %d %B"
msgstr "%B %d %l:%M"
# mail/mail-config.glade.h:119
# mail/mail-config.glade.h:119
# my-evolution/e-summary-calendar.c:395
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
msgid "No description"
msgstr "无描述"
# my-evolution/e-summary-mail.c:129
# my-evolution/e-summary-mail.c:129
# my-evolution/e-summary-mail.c:129
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:188
msgid "Mail summary"
msgstr "邮件概要"
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
-#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:443 shell/e-local-storage.c:1151
msgid "Local Folders"
msgstr "本地文件夹"
-# my-evolution/e-summary-preferences.c:80
-# my-evolution/e-summary-weather.c:661
-# my-evolution/e-summary-preferences.c:80
-# my-evolution/e-summary-weather.c:661
-# my-evolution/e-summary-preferences.c:81
-# my-evolution/e-summary-weather.c:606
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr "KBOS"
-
# my-evolution/e-summary-preferences.c:444
# my-evolution/e-summary-preferences.c:444
# my-evolution/e-summary-preferences.c:445
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
msgid "Dictionary.com Word of the Day"
msgstr "Dictionary.com 的每日一词"
# my-evolution/e-summary-preferences.c:465
# my-evolution/e-summary-preferences.c:465
# my-evolution/e-summary-preferences.c:466
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
msgid "Quotes of the Day"
msgstr "每日引用"
# my-evolution/e-summary-preferences.c:944
# my-evolution/e-summary-preferences.c:944
# my-evolution/e-summary-preferences.c:946
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
msgid "Add a news feed"
msgstr "添加新闻来源"
# my-evolution/e-summary-preferences.c:952
# my-evolution/e-summary-preferences.c:952
# my-evolution/e-summary-preferences.c:954
-#: my-evolution/e-summary-preferences.c:848
+#: my-evolution/e-summary-preferences.c:621
msgid "Enter the URL of the news feed you wish to add"
msgstr "输入您希望添加的新闻来源的 URL"
@@ -38080,19 +38547,19 @@ msgstr "输入您希望添加的新闻来源的 URL"
# my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
# my-evolution/e-summary-rdf.c:415
# my-evolution/e-summary-rdf.c:300
-#: my-evolution/e-summary-rdf.c:303
+#: my-evolution/e-summary-rdf.c:305
msgid "Error downloading RDF"
msgstr "下载 RDF 错误"
# my-evolution/e-summary-rdf.c:528
# my-evolution/e-summary-rdf.c:528
# my-evolution/e-summary-rdf.c:443
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:443
msgid "News Feed"
msgstr "新闻来源"
# my-evolution/Locations.h:1354
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
#, fuzzy
msgid "All"
msgstr "麦卡伦"
@@ -38101,7 +38568,7 @@ msgstr "麦卡伦"
# calendar/gui/dialogs/recurrence-page.glade.h:1
# calendar/gui/dialogs/recurrence-page.glade.h:1
#. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
#, fuzzy
msgid "Add"
msgstr "添加(_D)"
@@ -38109,7 +38576,7 @@ msgstr "添加(_D)"
# my-evolution/metar.c:157
# my-evolution/metar.c:157
# my-evolution/metar.c:157
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
#, fuzzy
msgid "Shown"
msgstr "雪"
@@ -38117,39 +38584,53 @@ msgstr "雪"
# my-evolution/e-summary-tasks.c:248
# my-evolution/e-summary-tasks.c:248
# my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:329
msgid "No tasks"
msgstr "没有任务"
# my-evolution/e-summary-tasks.c:287
# my-evolution/e-summary-tasks.c:287
# my-evolution/e-summary-tasks.c:281
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:365
msgid "(No Description)"
msgstr "(没有描述)"
# my-evolution/e-summary-weather.c:71
# my-evolution/e-summary-weather.c:71
# my-evolution/e-summary-weather.c:70
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
msgid "My Weather"
msgstr "天气"
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:262
msgid "There was an error downloading data for"
msgstr ""
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:559
# my-evolution/e-summary-weather.c:504
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:480
msgid "Weather"
msgstr "天气"
+# my-evolution/e-summary-preferences.c:80
+# my-evolution/e-summary-weather.c:661
+# my-evolution/e-summary-preferences.c:80
+# my-evolution/e-summary-weather.c:661
+# my-evolution/e-summary-preferences.c:81
+# my-evolution/e-summary-weather.c:606
+#. translators: Put here a list of codes for locations you want to
+#. 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:584
+msgid "KBOS"
+msgstr "KBOS"
+
# my-evolution/e-summary.c:193
# my-evolution/e-summary.c:193
# my-evolution/e-summary.c:190
-#: my-evolution/e-summary.c:188
+#: my-evolution/e-summary.c:198
msgid "%A, %B %e %Y"
msgstr "%Y %B %e %A"
@@ -38158,241 +38639,234 @@ msgstr "%Y %B %e %A"
# importers/elm-importer.c:98 importers/netscape-importer.c:109
# importers/pine-importer.c:103
# my-evolution/e-summary.c:475
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
msgid "Please wait..."
msgstr "请等待..."
# my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
# my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
# my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:589 ui/my-evolution.xml.h:2
msgid "Print Summary"
msgstr "打印概要"
# my-evolution/e-summary.c:626
# my-evolution/e-summary.c:626
# my-evolution/e-summary.c:612
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:623
msgid "Printing of Summary failed"
msgstr "打印概要失败"
-# my-evolution/main.c:66
-# my-evolution/main.c:66
-# my-evolution/main.c:65
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "实施概要组件无法初始化 Bonobo。\n"
-
# my-evolution/metar.c:29
# my-evolution/metar.c:29
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
msgid " F"
msgstr " 华氏度"
# my-evolution/metar.c:29
# my-evolution/metar.c:29
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
msgid " C"
msgstr " 摄氏度"
# addressbook/printing/e-contact-print.glade.h:8
# my-evolution/metar.c:33
# my-evolution/metar.c:33
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
msgid "knots"
msgstr "节"
# my-evolution/metar.c:33
# my-evolution/metar.c:33
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
msgid "kph"
msgstr "kph"
# mail/mail-ops.c:895
# my-evolution/metar.c:38
# my-evolution/metar.c:38
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
msgid "inHg"
msgstr "英寸汞柱"
# my-evolution/metar.c:38
# my-evolution/metar.c:38
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
msgid "mmHg"
msgstr "毫米汞柱"
# mail/mail-callbacks.c:2262
# my-evolution/metar.c:41
# my-evolution/metar.c:41
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
msgid "miles"
msgstr "英里"
# mail/mail-callbacks.c:2262
# my-evolution/metar.c:41
# my-evolution/metar.c:41
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
msgid "kilometers"
msgstr "公里"
# my-evolution/metar.c:44
# my-evolution/metar.c:44
# my-evolution/metar.c:44
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
msgid "Clear sky"
msgstr "晴空"
# my-evolution/metar.c:45
# my-evolution/metar.c:45
# my-evolution/metar.c:45
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
msgid "Broken clouds"
msgstr "碎云"
# my-evolution/metar.c:46
# my-evolution/metar.c:46
# my-evolution/metar.c:46
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
msgid "Scattered clouds"
msgstr "散云"
# my-evolution/metar.c:47
# my-evolution/metar.c:47
# my-evolution/metar.c:47
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
msgid "Few clouds"
msgstr "少云"
# my-evolution/metar.c:48
# my-evolution/metar.c:48
# my-evolution/metar.c:48
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
msgid "Overcast"
msgstr "阴天"
# my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
# my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
# my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
msgid "Invalid"
msgstr "无效"
# my-evolution/metar.c:63
# my-evolution/metar.c:63
# my-evolution/metar.c:63
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
msgid "Variable"
msgstr "不定风"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/metar.c:64
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
msgid "North"
msgstr "北"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/metar.c:64
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
msgid "North - NorthEast"
msgstr "北 - 东北"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/metar.c:64
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
msgid "Northeast"
msgstr "东北"
# my-evolution/metar.c:64
# my-evolution/metar.c:64
# my-evolution/metar.c:64
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
msgid "East - NorthEast"
msgstr "东 - 东北"
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/metar.c:65
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
msgid "East"
msgstr "东"
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/metar.c:65
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
msgid "East - Southeast"
msgstr "东 - 东南"
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/metar.c:65
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
msgid "Southeast"
msgstr "东南"
# my-evolution/metar.c:65
# my-evolution/metar.c:65
# my-evolution/metar.c:65
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
msgid "South - Southeast"
msgstr "南 - 东南"
# my-evolution/metar.c:66
# my-evolution/metar.c:66
# my-evolution/metar.c:66
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
msgid "South"
msgstr "南"
# my-evolution/metar.c:66
# my-evolution/metar.c:66
# my-evolution/metar.c:66
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
msgid "South - Southwest"
msgstr "南 - 西南"
# my-evolution/metar.c:66
# my-evolution/metar.c:66
# my-evolution/metar.c:66
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
msgid "Southwest"
msgstr "西南"
# my-evolution/metar.c:66
# my-evolution/metar.c:66
# my-evolution/metar.c:66
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
msgid "West - Southwest"
msgstr "西 - 西南"
# my-evolution/metar.c:67
# my-evolution/metar.c:67
# my-evolution/metar.c:67
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
msgid "West"
msgstr "西"
# my-evolution/metar.c:67
# my-evolution/metar.c:67
# my-evolution/metar.c:67
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
msgid "West - Northwest"
msgstr "西 - 西北"
# my-evolution/metar.c:67
# my-evolution/metar.c:67
# my-evolution/metar.c:67
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
msgid "Northwest"
msgstr "西北"
# my-evolution/metar.c:67
# my-evolution/metar.c:67
# my-evolution/metar.c:67
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
msgid "North - Northwest"
msgstr "北 - 西北"
@@ -38400,91 +38874,91 @@ msgstr "北 - 西北"
# my-evolution/metar.c:127
# my-evolution/metar.c:127
#. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
msgid "Drizzle"
msgstr "细雨"
# my-evolution/metar.c:128
# my-evolution/metar.c:128
# my-evolution/metar.c:128
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
msgid "Drizzle in the vicinity"
msgstr "临近有细雨"
# my-evolution/metar.c:129
# my-evolution/metar.c:129
# my-evolution/metar.c:129
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
msgid "Light drizzle"
msgstr "小细雨"
# my-evolution/metar.c:130
# my-evolution/metar.c:130
# my-evolution/metar.c:130
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
msgid "Moderate drizzle"
msgstr "中细雨"
# my-evolution/metar.c:131
# my-evolution/metar.c:131
# my-evolution/metar.c:131
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
msgid "Heavy drizzle"
msgstr "大细雨"
# my-evolution/metar.c:132
# my-evolution/metar.c:132
# my-evolution/metar.c:132
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
msgid "Shallow drizzle"
msgstr "微量细雨"
# my-evolution/metar.c:133
# my-evolution/metar.c:133
# my-evolution/metar.c:133
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
msgid "Patches of drizzle"
msgstr "局部地区性细雨"
# my-evolution/metar.c:134
# my-evolution/metar.c:134
# my-evolution/metar.c:134
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
msgid "Partial drizzle"
msgstr "部分细雨"
# my-evolution/metar.c:135 my-evolution/metar.c:150
# my-evolution/metar.c:135 my-evolution/metar.c:150
# my-evolution/metar.c:135 my-evolution/metar.c:150
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
msgid "Thunderstorm"
msgstr "雷暴"
# my-evolution/metar.c:136
# my-evolution/metar.c:136
# my-evolution/metar.c:136
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
msgid "Windy drizzle"
msgstr "有风细雨"
# my-evolution/metar.c:137
# my-evolution/metar.c:137
# my-evolution/metar.c:137
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
msgid "Showers"
msgstr "骤雨"
# my-evolution/metar.c:138
# my-evolution/metar.c:138
# my-evolution/metar.c:138
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
msgid "Drifting drizzle"
msgstr "微风细雨"
# my-evolution/metar.c:139
# my-evolution/metar.c:139
# my-evolution/metar.c:139
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
msgid "Freezing drizzle"
msgstr "冰冻细雨"
@@ -38492,84 +38966,84 @@ msgstr "冰冻细雨"
# my-evolution/metar.c:142
# my-evolution/metar.c:142
#. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
msgid "Rain"
msgstr "雨"
# my-evolution/metar.c:143
# my-evolution/metar.c:143
# my-evolution/metar.c:143
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
msgid "Rain in the vicinity"
msgstr "邻近有雨"
# my-evolution/metar.c:144
# my-evolution/metar.c:144
# my-evolution/metar.c:144
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
msgid "Light rain"
msgstr "小雨"
# my-evolution/metar.c:145
# my-evolution/metar.c:145
# my-evolution/metar.c:145
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
msgid "Moderate rain"
msgstr "中雨"
# my-evolution/metar.c:146
# my-evolution/metar.c:146
# my-evolution/metar.c:146
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
msgid "Heavy rain"
msgstr "大雨"
# my-evolution/metar.c:147
# my-evolution/metar.c:147
# my-evolution/metar.c:147
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
msgid "Shallow rain"
msgstr "微量雨"
# my-evolution/metar.c:148
# my-evolution/metar.c:148
# my-evolution/metar.c:148
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
msgid "Patches of rain"
msgstr "局部地区性有雨"
# my-evolution/metar.c:149
# my-evolution/metar.c:149
# my-evolution/metar.c:149
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
msgid "Partial rainfall"
msgstr "部分有雨"
# my-evolution/metar.c:151
# my-evolution/metar.c:151
# my-evolution/metar.c:151
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
msgid "Blowing rainfall"
msgstr "大风雨"
# my-evolution/metar.c:152
# my-evolution/metar.c:152
# my-evolution/metar.c:152
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
msgid "Rain showers"
msgstr "骤雨"
# my-evolution/metar.c:153
# my-evolution/metar.c:153
# my-evolution/metar.c:153
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
msgid "Drifting rain"
msgstr "风雨"
# my-evolution/metar.c:154
# my-evolution/metar.c:154
# my-evolution/metar.c:154
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
msgid "Freezing rain"
msgstr "冻雨"
@@ -38577,91 +39051,91 @@ msgstr "冻雨"
# my-evolution/metar.c:157
# my-evolution/metar.c:157
#. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
msgid "Snow"
msgstr "雪"
# my-evolution/metar.c:158
# my-evolution/metar.c:158
# my-evolution/metar.c:158
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
msgid "Snow in the vicinity"
msgstr "邻近有雪"
# my-evolution/metar.c:159
# my-evolution/metar.c:159
# my-evolution/metar.c:159
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
msgid "Light snow"
msgstr "小雪"
# my-evolution/metar.c:160
# my-evolution/metar.c:160
# my-evolution/metar.c:160
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
msgid "Moderate snow"
msgstr "中雪"
# my-evolution/metar.c:161
# my-evolution/metar.c:161
# my-evolution/metar.c:161
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
msgid "Heavy snow"
msgstr "大雪"
# my-evolution/metar.c:162
# my-evolution/metar.c:162
# my-evolution/metar.c:162
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
msgid "Shallow snow"
msgstr "微雪"
# my-evolution/metar.c:163
# my-evolution/metar.c:163
# my-evolution/metar.c:163
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
msgid "Patches of snow"
msgstr "局部地区性有雪"
# my-evolution/metar.c:164
# my-evolution/metar.c:164
# my-evolution/metar.c:164
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
msgid "Partial snowfall"
msgstr "部分有雪"
# my-evolution/metar.c:165 my-evolution/metar.c:180
# my-evolution/metar.c:165 my-evolution/metar.c:180
# my-evolution/metar.c:165 my-evolution/metar.c:180
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
msgid "Snowstorm"
msgstr "暴风雪"
# my-evolution/metar.c:166
# my-evolution/metar.c:166
# my-evolution/metar.c:166
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
msgid "Blowing snowfall"
msgstr "风雪"
# my-evolution/metar.c:167
# my-evolution/metar.c:167
# my-evolution/metar.c:167
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
msgid "Snow showers"
msgstr "骤雪"
# my-evolution/metar.c:168
# my-evolution/metar.c:168
# my-evolution/metar.c:168
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
msgid "Drifting snow"
msgstr "微风加雪"
# my-evolution/metar.c:169
# my-evolution/metar.c:169
# my-evolution/metar.c:169
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
msgid "Freezing snow"
msgstr "冻雪"
@@ -38669,84 +39143,84 @@ msgstr "冻雪"
# my-evolution/metar.c:172
# my-evolution/metar.c:172
#. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
msgid "Snow grains"
msgstr "冰雪"
# my-evolution/metar.c:173
# my-evolution/metar.c:173
# my-evolution/metar.c:173
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
msgid "Snow grains in the vicinity"
msgstr "邻近有冰雪"
# my-evolution/metar.c:174
# my-evolution/metar.c:174
# my-evolution/metar.c:174
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
msgid "Light snow grains"
msgstr "小冰雪"
# my-evolution/metar.c:175
# my-evolution/metar.c:175
# my-evolution/metar.c:175
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
msgid "Moderate snow grains"
msgstr "中冰雪"
# my-evolution/metar.c:176
# my-evolution/metar.c:176
# my-evolution/metar.c:176
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
msgid "Heavy snow grains"
msgstr "大冰雪"
# my-evolution/metar.c:177
# my-evolution/metar.c:177
# my-evolution/metar.c:177
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
msgid "Shallow snow grains"
msgstr "微量冰雪"
# my-evolution/metar.c:178
# my-evolution/metar.c:178
# my-evolution/metar.c:178
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
msgid "Patches of snow grains"
msgstr "局部地区性有冰雪"
# my-evolution/metar.c:179
# my-evolution/metar.c:179
# my-evolution/metar.c:179
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
msgid "Partial snow grains"
msgstr "部分有冰雪"
# my-evolution/metar.c:181
# my-evolution/metar.c:181
# my-evolution/metar.c:181
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
msgid "Blowing snow grains"
msgstr "有风的冰雪"
# my-evolution/metar.c:182
# my-evolution/metar.c:182
# my-evolution/metar.c:182
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
msgid "Snow grain showers"
msgstr "骤降冰雪"
# my-evolution/metar.c:183
# my-evolution/metar.c:183
# my-evolution/metar.c:183
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
msgid "Drifting snow grains"
msgstr "微风加冰雪"
# my-evolution/metar.c:184
# my-evolution/metar.c:184
# my-evolution/metar.c:184
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
msgid "Freezing snow grains"
msgstr "冻冰雪"
@@ -38754,84 +39228,84 @@ msgstr "冻冰雪"
# my-evolution/metar.c:187
# my-evolution/metar.c:187
#. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
msgid "Ice crystals"
msgstr "冰晶"
# my-evolution/metar.c:188
# my-evolution/metar.c:188
# my-evolution/metar.c:188
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
msgid "Ice crystals in the vicinity"
msgstr "邻近有冰晶"
# my-evolution/metar.c:189
# my-evolution/metar.c:189
# my-evolution/metar.c:189
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
msgid "Few ice crystals"
msgstr "小冰晶"
# my-evolution/metar.c:190
# my-evolution/metar.c:190
# my-evolution/metar.c:190
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
msgid "Moderate ice crystals"
msgstr "中冰晶"
# my-evolution/metar.c:191
# my-evolution/metar.c:191
# my-evolution/metar.c:191
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
msgid "Heavy ice crystals"
msgstr "大冰晶"
# my-evolution/metar.c:193
# my-evolution/metar.c:193
# my-evolution/metar.c:193
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
msgid "Patches of ice crystals"
msgstr "局部地区性冰晶"
# my-evolution/metar.c:194
# my-evolution/metar.c:194
# my-evolution/metar.c:194
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
msgid "Partial ice crystals"
msgstr "部分有冰晶"
# my-evolution/metar.c:195
# my-evolution/metar.c:195
# my-evolution/metar.c:195
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
msgid "Ice crystal storm"
msgstr "冰晶暴"
# my-evolution/metar.c:196
# my-evolution/metar.c:196
# my-evolution/metar.c:196
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
msgid "Blowing ice crystals"
msgstr "有风冰晶"
# my-evolution/metar.c:197
# my-evolution/metar.c:197
# my-evolution/metar.c:197
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
msgid "Showers of ice crystals"
msgstr "骤降冰晶"
# my-evolution/metar.c:198
# my-evolution/metar.c:198
# my-evolution/metar.c:198
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
msgid "Drifting ice crystals"
msgstr "微风冰晶"
# my-evolution/metar.c:199
# my-evolution/metar.c:199
# my-evolution/metar.c:199
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
msgid "Freezing ice crystals"
msgstr "冻冰晶"
@@ -38839,175 +39313,175 @@ msgstr "冻冰晶"
# my-evolution/metar.c:202
# my-evolution/metar.c:202
#. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
msgid "Ice pellets"
msgstr "冰粒"
# my-evolution/metar.c:203
# my-evolution/metar.c:203
# my-evolution/metar.c:203
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
msgid "Ice pellets in the vicinity"
msgstr "临近有冰粒"
# my-evolution/metar.c:204
# my-evolution/metar.c:204
# my-evolution/metar.c:204
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
msgid "Few ice pellets"
msgstr "小冰粒"
# my-evolution/metar.c:205
# my-evolution/metar.c:205
# my-evolution/metar.c:205
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
msgid "Moderate ice pellets"
msgstr "中冰粒"
# my-evolution/metar.c:206
# my-evolution/metar.c:206
# my-evolution/metar.c:206
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
msgid "Heavy ice pellets"
msgstr "大冰粒"
# my-evolution/metar.c:207
# my-evolution/metar.c:207
# my-evolution/metar.c:207
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
msgid "Shallow ice pellets"
msgstr "微量冰粒"
# my-evolution/metar.c:208
# my-evolution/metar.c:208
# my-evolution/metar.c:208
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
msgid "Patches of ice pellets"
msgstr "局部地区性冰粒"
# my-evolution/metar.c:209
# my-evolution/metar.c:209
# my-evolution/metar.c:209
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
msgid "Partial ice pellets"
msgstr "部分有冰粒"
# my-evolution/metar.c:210
# my-evolution/metar.c:210
# my-evolution/metar.c:210
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
msgid "Ice pellet storm"
msgstr "冰粒暴"
# my-evolution/metar.c:211
# my-evolution/metar.c:211
# my-evolution/metar.c:211
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
msgid "Blowing ice pellets"
msgstr "有风冰粒"
# my-evolution/metar.c:212
# my-evolution/metar.c:212
# my-evolution/metar.c:212
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
msgid "Showers of ice pellets"
msgstr "骤降冰粒"
# my-evolution/metar.c:213
# my-evolution/metar.c:213
# my-evolution/metar.c:213
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
msgid "Drifting ice pellets"
msgstr "微风冰粒"
# my-evolution/metar.c:214
# my-evolution/metar.c:214
# my-evolution/metar.c:214
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
msgid "Freezing ice pellets"
msgstr "冻冰粒"
# my-evolution/metar.c:218
# my-evolution/metar.c:218
# my-evolution/metar.c:218
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
msgid "Hail in the vicinity"
msgstr "邻近有冰雹"
# my-evolution/metar.c:219 my-evolution/metar.c:234
# my-evolution/metar.c:219 my-evolution/metar.c:234
# my-evolution/metar.c:219 my-evolution/metar.c:234
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
msgid "Light hail"
msgstr "小冰雹"
# my-evolution/metar.c:220
# my-evolution/metar.c:220
# my-evolution/metar.c:220
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
msgid "Moderate hail"
msgstr "中冰雹"
# my-evolution/metar.c:221
# my-evolution/metar.c:221
# my-evolution/metar.c:221
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
msgid "Heavy hail"
msgstr "大冰雹"
# my-evolution/metar.c:222
# my-evolution/metar.c:222
# my-evolution/metar.c:222
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
msgid "Shallow hail"
msgstr "微量冰雹"
# my-evolution/metar.c:223
# my-evolution/metar.c:223
# my-evolution/metar.c:223
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
msgid "Patches of hail"
msgstr "局部地区性冰雹"
# my-evolution/metar.c:224
# my-evolution/metar.c:224
# my-evolution/metar.c:224
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
msgid "Partial hail"
msgstr "部分有冰雹"
# my-evolution/metar.c:225
# my-evolution/metar.c:225
# my-evolution/metar.c:225
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
msgid "Hailstorm"
msgstr "冰雹暴"
# my-evolution/metar.c:226
# my-evolution/metar.c:226
# my-evolution/metar.c:226
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
msgid "Blowing hail"
msgstr "有风冰雹"
# my-evolution/metar.c:227
# my-evolution/metar.c:227
# my-evolution/metar.c:227
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
msgid "Hail showers"
msgstr "骤降冰雹"
# my-evolution/metar.c:228
# my-evolution/metar.c:228
# my-evolution/metar.c:228
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
msgid "Drifting hail"
msgstr "微风冰雹"
# my-evolution/metar.c:229
# my-evolution/metar.c:229
# my-evolution/metar.c:229
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
msgid "Freezing hail"
msgstr "冻冰雹"
@@ -39015,84 +39489,84 @@ msgstr "冻冰雹"
# my-evolution/metar.c:232
# my-evolution/metar.c:232
#. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
msgid "Small hail"
msgstr "小冰雹"
# my-evolution/metar.c:233
# my-evolution/metar.c:233
# my-evolution/metar.c:233
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
msgid "Small hail in the vicinity"
msgstr "邻近有小冰雹"
# my-evolution/metar.c:235
# my-evolution/metar.c:235
# my-evolution/metar.c:235
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
msgid "Moderate small hail"
msgstr "中量小冰雹"
# my-evolution/metar.c:236
# my-evolution/metar.c:236
# my-evolution/metar.c:236
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
msgid "Heavy small hail"
msgstr "大量小冰雹"
# my-evolution/metar.c:237
# my-evolution/metar.c:237
# my-evolution/metar.c:237
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
msgid "Shallow small hail"
msgstr "微量小冰雹"
# my-evolution/metar.c:238
# my-evolution/metar.c:238
# my-evolution/metar.c:238
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
msgid "Patches of small hail"
msgstr "局部地区性小冰雹"
# my-evolution/metar.c:239
# my-evolution/metar.c:239
# my-evolution/metar.c:239
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
msgid "Partial small hail"
msgstr "部分有小冰雹"
# my-evolution/metar.c:240
# my-evolution/metar.c:240
# my-evolution/metar.c:240
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
msgid "Small hailstorm"
msgstr "小冰雹暴"
# my-evolution/metar.c:241
# my-evolution/metar.c:241
# my-evolution/metar.c:241
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
msgid "Blowing small hail"
msgstr "有风小冰雹"
# my-evolution/metar.c:242
# my-evolution/metar.c:242
# my-evolution/metar.c:242
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
msgid "Showers of small hail"
msgstr "骤降小冰雹"
# my-evolution/metar.c:243
# my-evolution/metar.c:243
# my-evolution/metar.c:243
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
msgid "Drifting small hail"
msgstr "微风小冰雹"
# my-evolution/metar.c:244
# my-evolution/metar.c:244
# my-evolution/metar.c:244
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
msgid "Freezing small hail"
msgstr "结冻小冰雹"
@@ -39100,91 +39574,91 @@ msgstr "结冻小冰雹"
# my-evolution/metar.c:247
# my-evolution/metar.c:247
#. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
msgid "Unknown precipitation"
msgstr "未知的降水"
# my-evolution/metar.c:248
# my-evolution/metar.c:248
# my-evolution/metar.c:248
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
msgid "Precipitation in the vicinity"
msgstr "临近有降水"
# my-evolution/metar.c:249
# my-evolution/metar.c:249
# my-evolution/metar.c:249
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
msgid "Light precipitation"
msgstr "少量降水"
# my-evolution/metar.c:250
# my-evolution/metar.c:250
# my-evolution/metar.c:250
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
msgid "Moderate precipitation"
msgstr "中量降水"
# my-evolution/metar.c:251
# my-evolution/metar.c:251
# my-evolution/metar.c:251
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
msgid "Heavy precipitation"
msgstr "大量降水"
# my-evolution/metar.c:252
# my-evolution/metar.c:252
# my-evolution/metar.c:252
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
msgid "Shallow precipitation"
msgstr "微量降水"
# my-evolution/metar.c:253
# my-evolution/metar.c:253
# my-evolution/metar.c:253
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
msgid "Patches of precipitation"
msgstr "局部地区性降水"
# my-evolution/metar.c:254
# my-evolution/metar.c:254
# my-evolution/metar.c:254
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
msgid "Partial precipitation"
msgstr "部分降水"
# my-evolution/metar.c:255
# my-evolution/metar.c:255
# my-evolution/metar.c:255
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
msgid "Unknown thunderstorm"
msgstr "未知的雷暴"
# my-evolution/metar.c:256
# my-evolution/metar.c:256
# my-evolution/metar.c:256
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
msgid "Blowing precipitation"
msgstr "有风雷暴"
# my-evolution/metar.c:257
# my-evolution/metar.c:257
# my-evolution/metar.c:257
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
msgid "Showers, type unknown"
msgstr "骤雨,未知类型"
# my-evolution/metar.c:258
# my-evolution/metar.c:258
# my-evolution/metar.c:258
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
msgid "Drifting precipitation"
msgstr "微风降水"
# my-evolution/metar.c:259
# my-evolution/metar.c:259
# my-evolution/metar.c:259
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
msgid "Freezing precipitation"
msgstr "结冻降水"
@@ -39192,77 +39666,77 @@ msgstr "结冻降水"
# my-evolution/metar.c:262
# my-evolution/metar.c:262
#. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
msgid "Mist"
msgstr "霭"
# my-evolution/metar.c:263
# my-evolution/metar.c:263
# my-evolution/metar.c:263
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
msgid "Mist in the vicinity"
msgstr "临近有霭"
# my-evolution/metar.c:264
# my-evolution/metar.c:264
# my-evolution/metar.c:264
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
msgid "Light mist"
msgstr "轻度霭"
# my-evolution/metar.c:265
# my-evolution/metar.c:265
# my-evolution/metar.c:265
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
msgid "Moderate mist"
msgstr "中度霭"
# my-evolution/metar.c:266
# my-evolution/metar.c:266
# my-evolution/metar.c:266
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
msgid "Thick mist"
msgstr "重度霭"
# my-evolution/metar.c:267
# my-evolution/metar.c:267
# my-evolution/metar.c:267
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
msgid "Shallow mist"
msgstr "微量霭"
# my-evolution/metar.c:268
# my-evolution/metar.c:268
# my-evolution/metar.c:268
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
msgid "Patches of mist"
msgstr "局部地区性霭"
# my-evolution/metar.c:269
# my-evolution/metar.c:269
# my-evolution/metar.c:269
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
msgid "Partial mist"
msgstr "部分霭"
# my-evolution/metar.c:271
# my-evolution/metar.c:271
# my-evolution/metar.c:271
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
msgid "Mist with wind"
msgstr "有风的霭"
# my-evolution/metar.c:273
# my-evolution/metar.c:273
# my-evolution/metar.c:273
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
msgid "Drifting mist"
msgstr "微风的霭"
# my-evolution/metar.c:274
# my-evolution/metar.c:274
# my-evolution/metar.c:274
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
msgid "Freezing mist"
msgstr "冻霭"
@@ -39270,77 +39744,77 @@ msgstr "冻霭"
# my-evolution/metar.c:277
# my-evolution/metar.c:277
#. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
msgid "Fog"
msgstr "雾"
# my-evolution/metar.c:278
# my-evolution/metar.c:278
# my-evolution/metar.c:278
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
msgid "Fog in the vicinity"
msgstr "邻近有雾"
# my-evolution/metar.c:279
# my-evolution/metar.c:279
# my-evolution/metar.c:279
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
msgid "Light fog"
msgstr "轻雾"
# my-evolution/metar.c:280
# my-evolution/metar.c:280
# my-evolution/metar.c:280
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
msgid "Moderate fog"
msgstr "中雾"
# my-evolution/metar.c:281
# my-evolution/metar.c:281
# my-evolution/metar.c:281
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
msgid "Thick fog"
msgstr "厚雾"
# my-evolution/metar.c:282
# my-evolution/metar.c:282
# my-evolution/metar.c:282
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
msgid "Shallow fog"
msgstr "微雾"
# my-evolution/metar.c:283
# my-evolution/metar.c:283
# my-evolution/metar.c:283
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
msgid "Patches of fog"
msgstr "局部地区性雾"
# my-evolution/metar.c:284
# my-evolution/metar.c:284
# my-evolution/metar.c:284
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
msgid "Partial fog"
msgstr "部分有雾"
# my-evolution/metar.c:286
# my-evolution/metar.c:286
# my-evolution/metar.c:286
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
msgid "Fog with wind"
msgstr "有风的雾"
# my-evolution/metar.c:288
# my-evolution/metar.c:288
# my-evolution/metar.c:288
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
msgid "Drifting fog"
msgstr "微风雾"
# my-evolution/metar.c:289
# my-evolution/metar.c:289
# my-evolution/metar.c:289
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
msgid "Freezing fog"
msgstr "冻雾"
@@ -39348,77 +39822,77 @@ msgstr "冻雾"
# my-evolution/metar.c:292
# my-evolution/metar.c:292
#. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
msgid "Smoke"
msgstr "烟霞"
# my-evolution/metar.c:293
# my-evolution/metar.c:293
# my-evolution/metar.c:293
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
msgid "Smoke in the vicinity"
msgstr "邻近有烟霞"
# my-evolution/metar.c:294
# my-evolution/metar.c:294
# my-evolution/metar.c:294
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
msgid "Thin smoke"
msgstr "小烟霞"
# my-evolution/metar.c:295
# my-evolution/metar.c:295
# my-evolution/metar.c:295
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
msgid "Moderate smoke"
msgstr "中烟霞"
# my-evolution/metar.c:296
# my-evolution/metar.c:296
# my-evolution/metar.c:296
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
msgid "Thick smoke"
msgstr "大烟霞"
# my-evolution/metar.c:297
# my-evolution/metar.c:297
# my-evolution/metar.c:297
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
msgid "Shallow smoke"
msgstr "微烟霞"
# my-evolution/metar.c:298
# my-evolution/metar.c:298
# my-evolution/metar.c:298
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
msgid "Patches of smoke"
msgstr "局部地区性烟霞"
# my-evolution/metar.c:299
# my-evolution/metar.c:299
# my-evolution/metar.c:299
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
msgid "Partial smoke"
msgstr "部分烟霞"
# my-evolution/metar.c:300
# my-evolution/metar.c:300
# my-evolution/metar.c:300
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
msgid "Thunderous smoke"
msgstr "雷烟霞"
# my-evolution/metar.c:301
# my-evolution/metar.c:301
# my-evolution/metar.c:301
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
msgid "Smoke with wind"
msgstr "有风烟霞"
# my-evolution/metar.c:303
# my-evolution/metar.c:303
# my-evolution/metar.c:303
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
msgid "Drifting smoke"
msgstr "微风烟霞"
@@ -39426,84 +39900,84 @@ msgstr "微风烟霞"
# my-evolution/metar.c:307
# my-evolution/metar.c:307
#. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
msgid "Volcanic ash"
msgstr "火山灰"
# my-evolution/metar.c:308
# my-evolution/metar.c:308
# my-evolution/metar.c:308
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
msgid "Volcanic ash in the vicinity"
msgstr "邻近有火山灰"
# my-evolution/metar.c:310
# my-evolution/metar.c:310
# my-evolution/metar.c:310
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
msgid "Moderate volcanic ash"
msgstr "中度火山灰"
# my-evolution/metar.c:311
# my-evolution/metar.c:311
# my-evolution/metar.c:311
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
msgid "Thick volcanic ash"
msgstr "重度火山灰"
# my-evolution/metar.c:312
# my-evolution/metar.c:312
# my-evolution/metar.c:312
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
msgid "Shallow volcanic ash"
msgstr "微量火山灰"
# my-evolution/metar.c:313
# my-evolution/metar.c:313
# my-evolution/metar.c:313
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
msgid "Patches of volcanic ash"
msgstr "局部地区性火山灰"
# my-evolution/metar.c:314
# my-evolution/metar.c:314
# my-evolution/metar.c:314
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
msgid "Partial volcanic ash"
msgstr "部分有火山灰"
# my-evolution/metar.c:315
# my-evolution/metar.c:315
# my-evolution/metar.c:315
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
msgid "Thunderous volcanic ash"
msgstr "有雷火山灰"
# my-evolution/metar.c:316
# my-evolution/metar.c:316
# my-evolution/metar.c:316
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
msgid "Blowing volcanic ash"
msgstr "有风火山灰"
# my-evolution/metar.c:317
# my-evolution/metar.c:317
# my-evolution/metar.c:317
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
msgid "Showers of volcanic ash"
msgstr "骤降火山灰"
# my-evolution/metar.c:318
# my-evolution/metar.c:318
# my-evolution/metar.c:318
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
msgid "Drifting volcanic ash"
msgstr "微风火山灰"
# my-evolution/metar.c:319
# my-evolution/metar.c:319
# my-evolution/metar.c:319
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
msgid "Freezing volcanic ash"
msgstr "冻火山灰"
@@ -39511,63 +39985,63 @@ msgstr "冻火山灰"
# my-evolution/metar.c:322
# my-evolution/metar.c:322
#. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
msgid "Sand"
msgstr "沙尘"
# my-evolution/metar.c:323
# my-evolution/metar.c:323
# my-evolution/metar.c:323
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
msgid "Sand in the vicinity"
msgstr "邻近有沙尘"
# my-evolution/metar.c:324
# my-evolution/metar.c:324
# my-evolution/metar.c:324
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
msgid "Light sand"
msgstr "轻沙尘"
# my-evolution/metar.c:325
# my-evolution/metar.c:325
# my-evolution/metar.c:325
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
msgid "Moderate sand"
msgstr "中沙尘"
# my-evolution/metar.c:326
# my-evolution/metar.c:326
# my-evolution/metar.c:326
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
msgid "Heavy sand"
msgstr "重沙尘"
# my-evolution/metar.c:328
# my-evolution/metar.c:328
# my-evolution/metar.c:328
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
msgid "Patches of sand"
msgstr "局部地区性有沙尘"
# my-evolution/metar.c:329
# my-evolution/metar.c:329
# my-evolution/metar.c:329
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
msgid "Partial sand"
msgstr "部分有沙尘"
# my-evolution/metar.c:331
# my-evolution/metar.c:331
# my-evolution/metar.c:331
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
msgid "Blowing sand"
msgstr "有风沙尘"
# my-evolution/metar.c:333
# my-evolution/metar.c:333
# my-evolution/metar.c:333
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
msgid "Drifting sand"
msgstr "微风沙尘"
@@ -39575,77 +40049,77 @@ msgstr "微风沙尘"
# my-evolution/metar.c:337
# my-evolution/metar.c:337
#. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
msgid "Haze"
msgstr "灰尘"
# my-evolution/metar.c:338
# my-evolution/metar.c:338
# my-evolution/metar.c:338
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
msgid "Haze in the vicinity"
msgstr "邻近有灰尘"
# my-evolution/metar.c:339
# my-evolution/metar.c:339
# my-evolution/metar.c:339
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
msgid "Light haze"
msgstr "轻灰尘"
# my-evolution/metar.c:340
# my-evolution/metar.c:340
# my-evolution/metar.c:340
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
msgid "Moderate haze"
msgstr "中灰尘"
# my-evolution/metar.c:341
# my-evolution/metar.c:341
# my-evolution/metar.c:341
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
msgid "Thick haze"
msgstr "重灰尘"
# my-evolution/metar.c:342
# my-evolution/metar.c:342
# my-evolution/metar.c:342
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
msgid "Shallow haze"
msgstr "微量灰尘"
# my-evolution/metar.c:343
# my-evolution/metar.c:343
# my-evolution/metar.c:343
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
msgid "Patches of haze"
msgstr "局部地区性灰尘"
# my-evolution/metar.c:344
# my-evolution/metar.c:344
# my-evolution/metar.c:344
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
msgid "Partial haze"
msgstr "部分有灰尘"
# my-evolution/metar.c:346
# my-evolution/metar.c:346
# my-evolution/metar.c:346
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
msgid "Haze with wind"
msgstr "有风灰尘"
# my-evolution/metar.c:348
# my-evolution/metar.c:348
# my-evolution/metar.c:348
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
msgid "Drifting haze"
msgstr "微风灰尘"
# my-evolution/metar.c:349
# my-evolution/metar.c:349
# my-evolution/metar.c:349
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
msgid "Freezing haze"
msgstr "冻灰尘"
@@ -39653,77 +40127,77 @@ msgstr "冻灰尘"
# my-evolution/metar.c:352
# my-evolution/metar.c:352
#. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
msgid "Spray"
msgstr "冰雾"
# my-evolution/metar.c:353
# my-evolution/metar.c:353
# my-evolution/metar.c:353
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
msgid "Spray in the vicinity"
msgstr "邻近有冰雾"
# my-evolution/metar.c:354
# my-evolution/metar.c:354
# my-evolution/metar.c:354
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
msgid "Light spray"
msgstr "轻度冰雾"
# my-evolution/metar.c:355
# my-evolution/metar.c:355
# my-evolution/metar.c:355
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
msgid "Moderate spray"
msgstr "中度冰雾"
# my-evolution/metar.c:356
# my-evolution/metar.c:356
# my-evolution/metar.c:356
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
msgid "Heavy spray"
msgstr "重度冰雾"
# my-evolution/metar.c:357
# my-evolution/metar.c:357
# my-evolution/metar.c:357
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
msgid "Shallow spray"
msgstr "微量冰雾"
# my-evolution/metar.c:358
# my-evolution/metar.c:358
# my-evolution/metar.c:358
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
msgid "Patches of spray"
msgstr "局部地区性冰雾"
# my-evolution/metar.c:359
# my-evolution/metar.c:359
# my-evolution/metar.c:359
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
msgid "Partial spray"
msgstr "部分有冰雾"
# my-evolution/metar.c:361
# my-evolution/metar.c:361
# my-evolution/metar.c:361
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
msgid "Blowing spray"
msgstr "有风冰雾"
# my-evolution/metar.c:363
# my-evolution/metar.c:363
# my-evolution/metar.c:363
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
msgid "Drifting spray"
msgstr "微风冰雾"
# my-evolution/metar.c:364
# my-evolution/metar.c:364
# my-evolution/metar.c:364
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
msgid "Freezing spray"
msgstr "冻冰雾"
@@ -39731,63 +40205,63 @@ msgstr "冻冰雾"
# my-evolution/metar.c:367
# my-evolution/metar.c:367
#. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
msgid "Dust"
msgstr "粉尘"
# my-evolution/metar.c:368
# my-evolution/metar.c:368
# my-evolution/metar.c:368
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
msgid "Dust in the vicinity"
msgstr "邻近有粉尘"
# my-evolution/metar.c:369
# my-evolution/metar.c:369
# my-evolution/metar.c:369
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
msgid "Light dust"
msgstr "轻度粉尘"
# my-evolution/metar.c:370
# my-evolution/metar.c:370
# my-evolution/metar.c:370
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
msgid "Moderate dust"
msgstr "中度粉尘"
# my-evolution/metar.c:371
# my-evolution/metar.c:371
# my-evolution/metar.c:371
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
msgid "Heavy dust"
msgstr "重度粉尘"
# my-evolution/metar.c:373
# my-evolution/metar.c:373
# my-evolution/metar.c:373
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
msgid "Patches of dust"
msgstr "局部地区性粉尘"
# my-evolution/metar.c:374
# my-evolution/metar.c:374
# my-evolution/metar.c:374
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
msgid "Partial dust"
msgstr "部分有粉尘"
# my-evolution/metar.c:376
# my-evolution/metar.c:376
# my-evolution/metar.c:376
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
msgid "Blowing dust"
msgstr "有风粉尘"
# my-evolution/metar.c:378
# my-evolution/metar.c:378
# my-evolution/metar.c:378
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
msgid "Drifting dust"
msgstr "微风粉尘"
@@ -39795,70 +40269,70 @@ msgstr "微风粉尘"
# my-evolution/metar.c:382
# my-evolution/metar.c:382
#. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
msgid "Squall"
msgstr "暴风"
# my-evolution/metar.c:383
# my-evolution/metar.c:383
# my-evolution/metar.c:383
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
msgid "Squall in the vicinity"
msgstr "邻近有暴风"
# my-evolution/metar.c:384
# my-evolution/metar.c:384
# my-evolution/metar.c:384
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
msgid "Light squall"
msgstr "轻度暴风"
# my-evolution/metar.c:385
# my-evolution/metar.c:385
# my-evolution/metar.c:385
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
msgid "Moderate squall"
msgstr "中度暴风"
# my-evolution/metar.c:386
# my-evolution/metar.c:386
# my-evolution/metar.c:386
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
msgid "Heavy squall"
msgstr "重度暴风"
# my-evolution/metar.c:389
# my-evolution/metar.c:389
# my-evolution/metar.c:389
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
msgid "Partial squall"
msgstr "局部地区性暴风"
# my-evolution/metar.c:390
# my-evolution/metar.c:390
# my-evolution/metar.c:390
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
msgid "Thunderous squall"
msgstr "雷暴风"
# my-evolution/metar.c:391
# my-evolution/metar.c:391
# my-evolution/metar.c:391
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
msgid "Blowing squall"
msgstr "暴风"
# my-evolution/metar.c:393
# my-evolution/metar.c:393
# my-evolution/metar.c:393
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
msgid "Drifting squall"
msgstr "微暴风"
# my-evolution/metar.c:394
# my-evolution/metar.c:394
# my-evolution/metar.c:394
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
msgid "Freezing squall"
msgstr "冻暴风"
@@ -39866,77 +40340,77 @@ msgstr "冻暴风"
# my-evolution/metar.c:397
# my-evolution/metar.c:397
#. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
msgid "Sandstorm"
msgstr "沙暴"
# my-evolution/metar.c:398
# my-evolution/metar.c:398
# my-evolution/metar.c:398
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
msgid "Sandstorm in the vicinity"
msgstr "邻近有沙暴"
# my-evolution/metar.c:399
# my-evolution/metar.c:399
# my-evolution/metar.c:399
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
msgid "Light standstorm"
msgstr "轻度沙暴"
# my-evolution/metar.c:400
# my-evolution/metar.c:400
# my-evolution/metar.c:400
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
msgid "Moderate sandstorm"
msgstr "中度沙暴"
# my-evolution/metar.c:401
# my-evolution/metar.c:401
# my-evolution/metar.c:401
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
msgid "Heavy sandstorm"
msgstr "重度沙暴"
# my-evolution/metar.c:402
# my-evolution/metar.c:402
# my-evolution/metar.c:402
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
msgid "Shallow sandstorm"
msgstr "微量沙暴"
# my-evolution/metar.c:404
# my-evolution/metar.c:404
# my-evolution/metar.c:404
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
msgid "Partial sandstorm"
msgstr "局部地区性沙暴"
# my-evolution/metar.c:405
# my-evolution/metar.c:405
# my-evolution/metar.c:405
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
msgid "Thunderous sandstorm"
msgstr "雷沙暴"
# my-evolution/metar.c:406
# my-evolution/metar.c:406
# my-evolution/metar.c:406
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
msgid "Blowing sandstorm"
msgstr "有风沙暴"
# my-evolution/metar.c:408
# my-evolution/metar.c:408
# my-evolution/metar.c:408
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
msgid "Drifting sandstorm"
msgstr "微风沙暴"
# my-evolution/metar.c:409
# my-evolution/metar.c:409
# my-evolution/metar.c:409
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
msgid "Freezing sandstorm"
msgstr "冻沙暴"
@@ -39944,77 +40418,77 @@ msgstr "冻沙暴"
# my-evolution/metar.c:412
# my-evolution/metar.c:412
#. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
msgid "Duststorm"
msgstr "尘暴"
# my-evolution/metar.c:413
# my-evolution/metar.c:413
# my-evolution/metar.c:413
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
msgid "Duststorm in the vicinity"
msgstr "邻近有尘暴"
# my-evolution/metar.c:414
# my-evolution/metar.c:414
# my-evolution/metar.c:414
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
msgid "Light duststorm"
msgstr "轻度尘暴"
# my-evolution/metar.c:415
# my-evolution/metar.c:415
# my-evolution/metar.c:415
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
msgid "Moderate duststorm"
msgstr "中度尘暴"
# my-evolution/metar.c:416
# my-evolution/metar.c:416
# my-evolution/metar.c:416
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
msgid "Heavy duststorm"
msgstr "重度尘暴"
# my-evolution/metar.c:417
# my-evolution/metar.c:417
# my-evolution/metar.c:417
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
msgid "Shallow duststorm"
msgstr "微量尘暴"
# my-evolution/metar.c:419
# my-evolution/metar.c:419
# my-evolution/metar.c:419
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
msgid "Partial duststorm"
msgstr "局部地区性尘暴"
# my-evolution/metar.c:420
# my-evolution/metar.c:420
# my-evolution/metar.c:420
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
msgid "Thunderous duststorm"
msgstr "雷尘暴"
# my-evolution/metar.c:421
# my-evolution/metar.c:421
# my-evolution/metar.c:421
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
msgid "Blowing duststorm"
msgstr "有风尘暴"
# my-evolution/metar.c:423
# my-evolution/metar.c:423
# my-evolution/metar.c:423
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
msgid "Drifting duststorm"
msgstr "微风尘暴"
# my-evolution/metar.c:424
# my-evolution/metar.c:424
# my-evolution/metar.c:424
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
msgid "Freezing duststorm"
msgstr "冻尘暴"
@@ -40022,70 +40496,70 @@ msgstr "冻尘暴"
# my-evolution/metar.c:427
# my-evolution/metar.c:427
#. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
msgid "Funnel cloud"
msgstr "漏斗云"
# my-evolution/metar.c:428
# my-evolution/metar.c:428
# my-evolution/metar.c:428
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
msgid "Funnel cloud in the vicinity"
msgstr "邻近有漏斗云"
# my-evolution/metar.c:429
# my-evolution/metar.c:429
# my-evolution/metar.c:429
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
msgid "Light funnel cloud"
msgstr "小型漏斗云"
# my-evolution/metar.c:430
# my-evolution/metar.c:430
# my-evolution/metar.c:430
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
msgid "Moderate funnel cloud"
msgstr "中型漏斗云"
# my-evolution/metar.c:431
# my-evolution/metar.c:431
# my-evolution/metar.c:431
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
msgid "Thick funnel cloud"
msgstr "大型漏斗云"
# my-evolution/metar.c:432
# my-evolution/metar.c:432
# my-evolution/metar.c:432
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
msgid "Shallow funnel cloud"
msgstr "微型漏斗云"
# my-evolution/metar.c:433
# my-evolution/metar.c:433
# my-evolution/metar.c:433
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
msgid "Patches of funnel clouds"
msgstr "局部地区性漏斗云"
# my-evolution/metar.c:434
# my-evolution/metar.c:434
# my-evolution/metar.c:434
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
msgid "Partial funnel clouds"
msgstr "部分漏斗云"
# my-evolution/metar.c:436
# my-evolution/metar.c:436
# my-evolution/metar.c:436
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
msgid "Funnel cloud w/ wind"
msgstr "漏斗云带风"
# my-evolution/metar.c:438
# my-evolution/metar.c:438
# my-evolution/metar.c:438
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
msgid "Drifting funnel cloud"
msgstr "微风漏斗云"
@@ -40093,56 +40567,56 @@ msgstr "微风漏斗云"
# my-evolution/metar.c:442 my-evolution/metar.c:451
# my-evolution/metar.c:442 my-evolution/metar.c:451
#. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
msgid "Tornado"
msgstr "龙卷风"
# my-evolution/metar.c:443
# my-evolution/metar.c:443
# my-evolution/metar.c:443
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
msgid "Tornado in the vicinity"
msgstr "邻近有龙卷风"
# my-evolution/metar.c:445
# my-evolution/metar.c:445
# my-evolution/metar.c:445
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
msgid "Moderate tornado"
msgstr "中型龙卷风"
# my-evolution/metar.c:446
# my-evolution/metar.c:446
# my-evolution/metar.c:446
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
msgid "Raging tornado"
msgstr "猛烈的龙卷风"
# my-evolution/metar.c:449
# my-evolution/metar.c:449
# my-evolution/metar.c:449
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
msgid "Partial tornado"
msgstr "局部地区性龙卷风"
# my-evolution/metar.c:450
# my-evolution/metar.c:450
# my-evolution/metar.c:450
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
msgid "Thunderous tornado"
msgstr "雷暴龙卷风"
# my-evolution/metar.c:453
# my-evolution/metar.c:453
# my-evolution/metar.c:453
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
msgid "Drifting tornado"
msgstr "阵龙卷风"
# my-evolution/metar.c:454
# my-evolution/metar.c:454
# my-evolution/metar.c:454
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
msgid "Freezing tornado"
msgstr "冻龙卷风"
@@ -40150,70 +40624,70 @@ msgstr "冻龙卷风"
# my-evolution/metar.c:457
# my-evolution/metar.c:457
#. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
msgid "Dust whirls"
msgstr "尘卷风"
# my-evolution/metar.c:458
# my-evolution/metar.c:458
# my-evolution/metar.c:458
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
msgid "Dust whirls in the vicinity"
msgstr "邻近有尘卷风"
# my-evolution/metar.c:459
# my-evolution/metar.c:459
# my-evolution/metar.c:459
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
msgid "Light dust whirls"
msgstr "小型尘卷风"
# my-evolution/metar.c:460
# my-evolution/metar.c:460
# my-evolution/metar.c:460
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
msgid "Moderate dust whirls"
msgstr "中型尘卷风"
# my-evolution/metar.c:461
# my-evolution/metar.c:461
# my-evolution/metar.c:461
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
msgid "Heavy dust whirls"
msgstr "大型尘卷风"
# my-evolution/metar.c:462
# my-evolution/metar.c:462
# my-evolution/metar.c:462
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
msgid "Shallow dust whirls"
msgstr "微型尘卷风"
# my-evolution/metar.c:463
# my-evolution/metar.c:463
# my-evolution/metar.c:463
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
msgid "Patches of dust whirls"
msgstr "局部地区性有尘卷风"
# my-evolution/metar.c:464
# my-evolution/metar.c:464
# my-evolution/metar.c:464
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
msgid "Partial dust whirls"
msgstr "部分有尘卷风"
# my-evolution/metar.c:466
# my-evolution/metar.c:466
# my-evolution/metar.c:466
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
msgid "Blowing dust whirls"
msgstr "尘卷风"
# my-evolution/metar.c:468
# my-evolution/metar.c:468
# my-evolution/metar.c:468
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
msgid "Drifting dust whirls"
msgstr "阵尘卷风"
@@ -40380,46 +40854,51 @@ msgstr "调度(_S)"
msgid "_Weather"
msgstr "天气(_W)"
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution folder settings."
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
msgid "Configure special folders and offline folder behavior here"
msgstr ""
+# shell/GNOME_Evolution_Shell.oaf.in.h:1
+# shell/GNOME_Evolution_Shell.oaf.in.h:1
+# shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution shell。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution 任务控制车间"
+
# mail/mail-accounts.c:783 mail/mail-config.glade.h:42
# mail/mail-accounts.c:798 mail/mail-config.glade.h:42
# mail/mail-accounts.c:824 mail/mail-config.glade.h:49
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
msgid "Folder Settings"
msgstr "文件夹设置"
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "The Evolution shell."
-msgstr "Evolution shell。"
-
# shell/e-activity-handler.c:200
# shell/e-activity-handler.c:200
# shell/e-activity-handler.c:200
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
msgid "Show Details"
msgstr "显示细节"
# shell/e-activity-handler.c:202
# shell/e-activity-handler.c:202
# shell/e-activity-handler.c:202
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
msgid "Cancel Operation"
msgstr "取消操作"
# shell/e-storage-set-view.c:658
# shell/e-storage-set-view.c:658
# shell/e-storage-set-view.c:658
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
#, c-format
msgid ""
"Cannot transfer folder:\n"
@@ -40431,7 +40910,7 @@ msgstr ""
# mail/mail-display.c:354
# mail/mail-display.c:353
# mail/mail-display.c:354
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
#, fuzzy, c-format
msgid "\"%s\" in \"%s\""
msgstr "在 %s 中打开..."
@@ -40442,7 +40921,7 @@ msgstr "在 %s 中打开..."
# shell/e-storage-set-view.etspec.h:1
# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
# shell/e-storage-set-view.etspec.h:1
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
#, fuzzy
msgid "Add a Folder"
msgstr "文件夹"
@@ -40450,22 +40929,22 @@ msgstr "文件夹"
# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
# mail/mail-config.glade.h:36 shell/e-local-storage.c:173
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
msgid "Drafts"
msgstr "草稿"
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
# shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:486
+#: shell/e-shell-view.c:490 shell/e-shortcuts.c:1084
msgid "Inbox"
msgstr "收件箱"
# shell/e-local-storage.c:175
# shell/e-local-storage.c:175
# shell/e-local-storage.c:175
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
msgid "Outbox"
msgstr "发件箱"
@@ -40475,46 +40954,21 @@ msgstr "发件箱"
# shell/e-local-storage.c:176
# mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
# shell/e-local-storage.c:176
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
msgid "Sent"
msgstr "已发送"
-# shell/e-setup.c:124
-# shell/e-setup.c:124
-# shell/e-setup.c:124
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "安装 Evolution"
-
-# shell/e-setup.c:128
-# shell/e-setup.c:128
-# shell/e-setup.c:128
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"该新版本的 Evolution 需要把附件文件\n"
-"安装到您的私人 Evolution 目录"
-
-# shell/e-setup.c:129
-# shell/e-setup.c:129
-# shell/e-setup.c:129
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "请点击“确认”以安装文件,或者点击“取消”以便退出。"
-
# shell/e-setup.c:169
# shell/e-setup.c:169
# shell/e-setup.c:169
-#: shell/e-setup.c:171
+#: shell/e-setup.c:146
msgid "Could not update files correctly"
msgstr "无法正确地更新文件"
# shell/e-setup.c:192
# shell/e-setup.c:192
# shell/e-setup.c:192
-#: shell/e-setup.c:194
+#: shell/e-setup.c:167
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -40528,7 +40982,7 @@ msgstr ""
# shell/e-setup.c:207
# shell/e-setup.c:207
# shell/e-setup.c:207
-#: shell/e-setup.c:209
+#: shell/e-setup.c:178
#, c-format
msgid ""
"An error occurred in copying files into\n"
@@ -40537,50 +40991,10 @@ msgstr ""
"在把文件复制到“%s”\n"
"时发生错误。"
-# camel/camel-session.c:532
-# shell/e-setup.c:280
-# shell/e-setup.c:280
-#: shell/e-setup.c:282
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
-"Evolution 无法创建目录\n"
-"%s:\n"
-"%s"
-
-# shell/e-setup.c:298
-# shell/e-setup.c:298
-#: shell/e-setup.c:300
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
-msgstr ""
-"目录 %s\n"
-"的许可权限不正确,请使它可读、\n"
-"可执行,并重新启动 Evolution。"
-
-# shell/e-setup.c:304
-# shell/e-setup.c:304
-#: shell/e-setup.c:306
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
-"文件 %s\n"
-"应该被删除以使 Evolution 能够正确运行。\n"
-"请删除该文件并重新启动 Evolution。"
-
# shell/e-setup.c:281
# shell/e-setup.c:327
# shell/e-setup.c:327
-#: shell/e-setup.c:329
+#: shell/e-setup.c:244
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -40590,27 +41004,10 @@ msgstr ""
"文件“%s”不是目录。\n"
"请移动它以便安装 Evolution 用户文件。"
-# shell/e-setup.c:295
-# shell/e-setup.c:341
-# shell/e-setup.c:341
-#: shell/e-setup.c:343
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-"Evolution 找到了\n"
-"老式的实施概要目录。\n"
-"在运行 Evolution \n"
-"之前,要删掉它。\n"
-"您希望我删掉该目录吗?"
-
# shell/e-setup.c:320
# shell/e-setup.c:366
# shell/e-setup.c:366
-#: shell/e-setup.c:368
+#: shell/e-setup.c:253
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -40630,7 +41027,7 @@ msgstr "制作团队"
# calendar/gui/e-calendar-table.etspec.h:8
# calendar/gui/e-calendar-table.etspec.h:8
# calendar/gui/e-calendar-table.etspec.h:8
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
#, fuzzy
msgid "Extra Completion folders"
msgstr "完成日期"
@@ -40638,14 +41035,14 @@ msgstr "完成日期"
# shell/e-shell-importer.c:1014
# shell/e-shell-importer.c:1014
# shell/e-shell-importer.c:1027
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
#, fuzzy
msgid "Select Default Folder"
msgstr "选择文件夹"
# mail/mail-config.glade.h:83
# mail/mail-config.glade.h:83
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
#, fuzzy
msgid "Default Folders"
msgstr "特殊文件夹"
@@ -40653,7 +41050,7 @@ msgstr "特殊文件夹"
# mail/mail-ops.c:86
# mail/mail-ops.c:87
# mail/mail-ops.c:87
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
#, fuzzy
msgid "Offline Folders"
msgstr "正在过滤文件夹"
@@ -40661,7 +41058,7 @@ msgstr "正在过滤文件夹"
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
# shell/e-local-storage.c:636
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
#, fuzzy
msgid "Autocompletion Folders"
msgstr "本地文件夹"
@@ -40680,7 +41077,7 @@ msgstr "无法检查文件夹: %s: %s"
# shell/e-shell-folder-commands.c:488
# shell/e-shell-folder-commands.c:488
# shell/e-shell-folder-commands.c:488
-#: shell/e-shell-folder-commands.c:143
+#: shell/e-shell-folder-commands.c:142
#, fuzzy, c-format
msgid "Cannot move folder: %s"
msgstr ""
@@ -40690,28 +41087,28 @@ msgstr ""
# shell/e-shell-folder-commands.c:176
# shell/e-shell-folder-commands.c:176
# shell/e-shell-folder-commands.c:176
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:188
msgid "Cannot move a folder over itself."
msgstr "无法把文件夹移动到它本身。"
# shell/e-shell-folder-commands.c:178
# shell/e-shell-folder-commands.c:178
# shell/e-shell-folder-commands.c:178
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:190
msgid "Cannot copy a folder over itself."
msgstr "无法把文件夹复制到它本身。"
# shell/e-shell-folder-commands.c:192
# shell/e-shell-folder-commands.c:192
# shell/e-shell-folder-commands.c:192
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:204
msgid "Cannot move a folder into one of its descendants."
msgstr "无法把文件夹移动到它子目录。"
# shell/e-shell-folder-commands.c:307
# shell/e-shell-folder-commands.c:307
# shell/e-shell-folder-commands.c:307
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:319
#, c-format
msgid "Specify a folder to copy folder \"%s\" into:"
msgstr "给出一个文件夹以便将文件夹“%s”复制进去:"
@@ -40719,14 +41116,14 @@ msgstr "给出一个文件夹以便将文件夹“%s”复制进去:"
# shell/e-shell-folder-commands.c:312
# shell/e-shell-folder-commands.c:312
# shell/e-shell-folder-commands.c:312
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:323
msgid "Copy folder"
msgstr "复制文件夹"
# shell/e-shell-folder-commands.c:354
# shell/e-shell-folder-commands.c:354
# shell/e-shell-folder-commands.c:354
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:363
#, c-format
msgid "Specify a folder to move folder \"%s\" into:"
msgstr "给出一个文件夹以便将文件夹“%s”移动进去:"
@@ -40734,14 +41131,14 @@ msgstr "给出一个文件夹以便将文件夹“%s”移动进去:"
# shell/e-shell-folder-commands.c:359
# shell/e-shell-folder-commands.c:359
# shell/e-shell-folder-commands.c:359
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:367
msgid "Move folder"
msgstr "移动文件夹"
# shell/e-shell-folder-commands.c:385
# shell/e-shell-folder-commands.c:385
# shell/e-shell-folder-commands.c:385
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:391
#, c-format
msgid ""
"Cannot delete folder:\n"
@@ -40750,28 +41147,28 @@ msgstr ""
"无法删除文件夹:\n"
"%s"
-# shell/e-shell-folder-commands.c:401
-# shell/e-shell-folder-commands.c:401
-# shell/e-shell-folder-commands.c:401
-#: shell/e-shell-folder-commands.c:406
-#, c-format
-msgid "Delete \"%s\""
-msgstr "删除“%s”"
-
# shell/e-shell-folder-commands.c:385
# shell/e-shell-folder-commands.c:385
# shell/e-shell-folder-commands.c:385
-#: shell/e-shell-folder-commands.c:407
+#: shell/e-shell-folder-commands.c:405
#, fuzzy, c-format
msgid "Really delete folder \"%s\"?"
msgstr ""
"无法删除文件夹:\n"
"%s"
+# shell/e-shell-folder-commands.c:401
+# shell/e-shell-folder-commands.c:401
+# shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:412
+#, c-format
+msgid "Delete \"%s\""
+msgstr "删除“%s”"
+
# shell/e-shell-folder-commands.c:488
# shell/e-shell-folder-commands.c:488
# shell/e-shell-folder-commands.c:488
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:485
#, c-format
msgid ""
"Cannot rename folder:\n"
@@ -40783,7 +41180,7 @@ msgstr ""
# shell/e-shell-folder-commands.c:537
# shell/e-shell-folder-commands.c:537
# shell/e-shell-folder-commands.c:537
-#: shell/e-shell-folder-commands.c:535
+#: shell/e-shell-folder-commands.c:534
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "把文件夹“%s”重命名为:"
@@ -40791,7 +41188,7 @@ msgstr "把文件夹“%s”重命名为:"
# shell/e-shell-folder-commands.c:544
# shell/e-shell-folder-commands.c:544
# shell/e-shell-folder-commands.c:544
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:540
msgid "Rename folder"
msgstr "重命名文件夹"
@@ -40801,20 +41198,20 @@ msgstr "重命名文件夹"
# shell/e-shell-folder-creation-dialog.c:148
# shell/e-shell-folder-commands.c:554
# shell/e-shell-folder-creation-dialog.c:168
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-creation-dialog.c:170
#, c-format
msgid "The specified folder name is not valid: %s"
msgstr "指定的文件夹名称不合法: %s"
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:583
msgid "Selected folder does not belong to another user"
msgstr "选中的文件夹不属于其它用户"
# shell/e-shell-folder-commands.c:488
# shell/e-shell-folder-commands.c:488
# shell/e-shell-folder-commands.c:488
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:586
#, c-format
msgid ""
"Cannot remove folder:\n"
@@ -40826,7 +41223,7 @@ msgstr ""
# shell/e-shell-folder-creation-dialog.c:111
# shell/e-shell-folder-creation-dialog.c:111
# shell/e-shell-folder-creation-dialog.c:125
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:127
#, c-format
msgid ""
"Cannot create the specified folder:\n"
@@ -40838,36 +41235,29 @@ msgstr ""
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:308
#, fuzzy
msgid "Create New Folder"
msgstr "创建新文件夹(_N)..."
-# shell/e-shell-folder-selection-dialog.c:376
-# shell/e-shell-folder-selection-dialog.c:376
-# shell/e-shell-folder-selection-dialog.c:376
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "正在新建..."
-
# shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
# shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
# shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
msgid "(Untitled)"
msgstr "(无标题)"
# shell/e-shell-importer.c:142
# shell/e-shell-importer.c:142
# shell/e-shell-importer.c:142
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
msgid "Choose the type of importer to run:"
msgstr "选择要运行的导入器类型:"
# shell/e-shell-importer.c:145
# shell/e-shell-importer.c:145
# shell/e-shell-importer.c:145
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -40882,14 +41272,14 @@ msgstr ""
# shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
# shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
# shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
# shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
# shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
# shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
#, c-format
msgid ""
"Importing %s\n"
@@ -40901,7 +41291,7 @@ msgstr ""
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:837
# mail/mail-account-gui.c:834
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:351
#, fuzzy
msgid "Select importer"
msgstr "选择文件夹"
@@ -40909,7 +41299,7 @@ msgstr "选择文件夹"
# shell/e-shell-importer.c:397
# shell/e-shell-importer.c:397
# shell/e-shell-importer.c:409
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
#, c-format
msgid "File %s does not exist"
msgstr "文件 %s 不存在"
@@ -40918,15 +41308,15 @@ msgstr "文件 %s 不存在"
# shell/e-shell-about-box.c:40
# shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
# shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:552
msgid "Evolution Error"
msgstr "Evolution 错误"
# shell/e-shell-importer.c:424
# shell/e-shell-importer.c:424
# shell/e-shell-importer.c:435
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:509
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -40938,14 +41328,14 @@ msgstr ""
# shell/e-shell-importer.c:434
# shell/e-shell-importer.c:434
# shell/e-shell-importer.c:445
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
msgid "Importing"
msgstr "正在导入"
# shell/e-shell-importer.c:442
# shell/e-shell-importer.c:442
# shell/e-shell-importer.c:453
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
#, c-format
msgid ""
"Importing %s.\n"
@@ -40957,7 +41347,7 @@ msgstr ""
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:455
# shell/e-shell-importer.c:466
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
#, c-format
msgid "Error starting %s"
msgstr "启动 %s 错误"
@@ -40965,7 +41355,7 @@ msgstr "启动 %s 错误"
# shell/e-shell-importer.c:474
# shell/e-shell-importer.c:474
# shell/e-shell-importer.c:485
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:551
#, c-format
msgid "Error loading %s"
msgstr "装入 %s 错误"
@@ -40973,7 +41363,7 @@ msgstr "装入 %s 错误"
# shell/e-shell-importer.c:491
# shell/e-shell-importer.c:491
# shell/e-shell-importer.c:502
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:568
#, c-format
msgid ""
"Importing %s\n"
@@ -40985,49 +41375,49 @@ msgstr ""
# shell/e-shell-importer.c:561
# shell/e-shell-importer.c:561
# shell/e-shell-importer.c:572
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:622
msgid "Automatic"
msgstr "自动"
# shell/e-shell-importer.c:612
# shell/e-shell-importer.c:612
# shell/e-shell-importer.c:623
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:671
msgid "Filename:"
msgstr "文件名:"
# shell/e-shell-importer.c:617
# shell/e-shell-importer.c:617
# shell/e-shell-importer.c:628
-#: shell/e-shell-importer.c:681
+#: shell/e-shell-importer.c:676
msgid "Select a file"
msgstr "选择一个文件"
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:638
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:685
msgid "File type:"
msgstr "文件类型:"
# shell/e-shell-importer.c:652
# shell/e-shell-importer.c:652
# shell/e-shell-importer.c:663
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:710
msgid "Import data and settings from older programs"
msgstr "从老版程序中导入数据和设置"
# shell/e-shell-importer.c:656
# shell/e-shell-importer.c:656
# shell/e-shell-importer.c:667
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:714
msgid "Import a single file"
msgstr "导入单个文件"
# shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
# shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
# shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:780 shell/e-shell-startup-wizard.c:538
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -41038,14 +41428,14 @@ msgstr ""
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:783
msgid "Starting Intelligent Importers"
msgstr "启动智能导入器"
# shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
# shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
# shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:907 shell/e-shell-startup-wizard.c:664
#, c-format
msgid "From %s:"
msgstr "从 %s:"
@@ -41053,35 +41443,35 @@ msgstr "从 %s:"
# shell/e-shell-importer.c:1014
# shell/e-shell-importer.c:1014
# shell/e-shell-importer.c:1027
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1081
msgid "Select folder"
msgstr "选择文件夹"
# shell/e-shell-importer.c:1015
# shell/e-shell-importer.c:1015
# shell/e-shell-importer.c:1028
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1082
msgid "Select a destination folder for importing this data"
msgstr "为导入的数据选择目标文件夹"
# shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
# shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
# shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1212 shell/importer/intelligent.c:191
msgid "Import"
msgstr "导入"
# shell/e-shell-offline-handler.c:572
# shell/e-shell-offline-handler.c:572
# shell/e-shell-offline-handler.c:572
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:592
msgid "Closing connections..."
msgstr "正在关闭连接..."
# mail/mail-mt.c:254
# mail/mail-mt.c:254
# mail/mail-mt.c:254
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
#, fuzzy, c-format
msgid ""
"Error synchronizing \"%s\":\n"
@@ -41093,13 +41483,13 @@ msgstr ""
# camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
# camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
# camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
#, fuzzy
msgid "Syncing Folder"
msgstr "正在同步文件夹"
#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:311
#, c-format
msgid "Synchronizing \"%s\" (%d of %d) ..."
msgstr "正在同步“%s” (%d / %d) ..."
@@ -41107,21 +41497,32 @@ msgstr "正在同步“%s” (%d / %d) ..."
# shell/e-shell-about-box.c:40
# shell/e-shell-about-box.c:40
# shell/e-shell-about-box.c:40
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:345
msgid "Evolution Settings"
msgstr "Evolution 设置"
+# mail/subscribe-dialog.c:1581
+# mail/subscribe-dialog.c:1581
+# mail/subscribe-dialog.c:1581
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+#, fuzzy
+msgid "Please select a user."
+msgstr "请选择服务器。"
+
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#: shell/e-shell-shared-folder-picker-dialog.c:374
msgid "Opening Folder"
msgstr "正在打开文件夹"
# mail/mail-ops.c:1234
# mail/mail-ops.c:1236
# mail/mail-ops.c:1279
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:380
#, fuzzy, c-format
msgid "Opening Folder \"%s\""
msgstr "正在打开文件夹“%s”"
@@ -41129,7 +41530,7 @@ msgstr "正在打开文件夹“%s”"
# mail/mail-display.c:354
# mail/mail-display.c:353
# mail/mail-display.c:354
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:385
#, c-format
msgid "in \"%s\" ..."
msgstr "在“%s”中..."
@@ -41137,7 +41538,7 @@ msgstr "在“%s”中..."
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
# camel/providers/local/camel-mbox-summary.c:650
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:465
#, c-format
msgid "Could not open shared folder: %s."
msgstr "无法打开共享文件夹:%s。"
@@ -41145,122 +41546,113 @@ msgstr "无法打开共享文件夹:%s。"
# shell/e-shell-folder-creation-dialog.c:111
# shell/e-shell-folder-creation-dialog.c:111
# shell/e-shell-folder-creation-dialog.c:125
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:518
msgid "Cannot find the specified shared folder."
msgstr "无法找到指定的共享文件夹。"
-# shell/e-shell-startup-wizard.c:159
-# shell/e-shell-startup-wizard.c:159
-# shell/e-shell-startup-wizard.c:159
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"无法启动 Evolution 邮件助手界面\n"
-"(%s)"
-
-# shell/e-shell-startup-wizard.c:169
-# shell/e-shell-startup-wizard.c:169
-# shell/e-shell-startup-wizard.c:169
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "无法启动 Evolution 邮件助手界面\n"
-
# widgets/misc/e-charset-picker.c:101
# widgets/misc/e-charset-picker.c:101
# shell/e-shell-user-creatable-items-handler.c:495
# shell/e-shell-user-creatable-items-handler.c:540
# widgets/misc/e-charset-picker.c:104
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
msgid "New"
msgstr "新建"
# shell/e-shell-utils.c:114
# shell/e-shell-utils.c:114
# shell/e-shell-utils.c:114
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
msgid "No folder name specified."
msgstr "没有指定文件夹名称。"
# shell/e-shell-utils.c:121
# shell/e-shell-utils.c:121
# shell/e-shell-utils.c:121
-#: shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:123
msgid "Folder name cannot contain the Return character."
msgstr "文件夹名不能含有回车符。"
-# shell/e-shell-utils.c:127
-# shell/e-shell-utils.c:127
-# shell/e-shell-utils.c:127
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr "文件夹名不能含有斜线。"
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:129
+#, fuzzy
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "文件夹名不能含有回车符。"
+
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+#: shell/e-shell-utils.c:135
+#, fuzzy
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "文件夹名不能含有回车符。"
# shell/e-shell-utils.c:133
# shell/e-shell-utils.c:133
# shell/e-shell-utils.c:133
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
msgid "'.' and '..' are reserved folder names."
msgstr "“.”和“..”是保留文件夹名。"
# shell/e-shell-view-menu.c:577
# shell/e-shell-view-menu.c:577
# shell/e-shell-view-menu.c:577
-#: shell/e-shell-view-menu.c:94
+#: shell/e-shell-view-menu.c:89
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "GNOME Pilot 工具好像并未安装到系统中。"
# shell/e-shell-view-menu.c:585
# shell/e-shell-view-menu.c:585
# shell/e-shell-view-menu.c:585
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
#, c-format
msgid "Error executing %s."
msgstr "执行 %s 错误。"
-# shell/e-shell-view-menu.c:165
-# shell/e-shell-view-menu.c:165
-# shell/e-shell-view-menu.c:165
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "在您的 $PATH 中找不到 Bug buddy。"
+# shell/e-shell-view-menu.c:173
+# shell/e-shell-view-menu.c:173
+# shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:193
+#, fuzzy
+msgid "Bug buddy is not installed."
+msgstr "无法运行 Bug buddy。"
# shell/e-shell-view-menu.c:173
# shell/e-shell-view-menu.c:173
# shell/e-shell-view-menu.c:173
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
msgid "Bug buddy could not be run."
msgstr "无法运行 Bug buddy。"
# shell/e-shell-view-menu.c:215
# shell/e-shell-view-menu.c:215
# shell/e-shell-view-menu.c:215
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
msgid "About Ximian Evolution"
msgstr "关于 Ximian Evolution"
# shell/e-shell-view-menu.c:424
# shell/e-shell-view-menu.c:424
# shell/e-shell-view-menu.c:424
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
msgid "Go to folder..."
msgstr "转到文件夹..."
# shell/e-shell-view-menu.c:425
# shell/e-shell-view-menu.c:425
# shell/e-shell-view-menu.c:425
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
msgid "Select the folder that you want to open"
msgstr "选择您希望打开的文件夹"
# shell/e-shell-view-menu.c:545
# shell/e-shell-view-menu.c:545
# shell/e-shell-view-menu.c:545
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
#, fuzzy
msgid "Create New Shortcut"
msgstr "创建新快捷方式"
@@ -41268,42 +41660,42 @@ msgstr "创建新快捷方式"
# shell/e-shell-view-menu.c:546
# shell/e-shell-view-menu.c:546
# shell/e-shell-view-menu.c:546
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
msgid "Select the folder you want the shortcut to point to:"
msgstr "选择您希望快捷方式指向的文件夹:"
# shell/e-shell-view-menu.c:688
# shell/e-shell-view-menu.c:688
# shell/e-shell-view-menu.c:688
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:769
msgid "_Work Online"
msgstr "在线工作(_W)"
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
# shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
msgid "_Work Offline"
msgstr "离线工作(_W)"
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
# shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:40
msgid "Work Offline"
msgstr "离线工作"
# shell/e-shell-view.c:214
# shell/e-shell-view.c:214
# shell/e-shell-view.c:215
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
msgid "(No folder displayed)"
msgstr "(未显示文件夹)"
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1585
# shell/e-shell-view.c:1598
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2045
#, c-format
msgid "%s (%d)"
msgstr "%s (%d)"
@@ -41311,14 +41703,14 @@ msgstr "%s (%d)"
# shell/e-shell-view.c:1587
# shell/e-shell-view.c:1587
# shell/e-shell-view.c:1600
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2047
msgid "(None)"
msgstr "(无)"
# shell/e-shell-view.c:1634
# shell/e-shell-view.c:1634
# shell/e-shell-view.c:1647
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2091
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -41326,14 +41718,14 @@ msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
# shell/e-shell-view.c:1641
# shell/e-shell-view.c:1641
# shell/e-shell-view.c:1654
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2098
msgid "Ximian Evolution is in the process of going offline."
msgstr "Ximian Evolution 正在离线过程中。"
# shell/e-shell-view.c:1647
# shell/e-shell-view.c:1647
# shell/e-shell-view.c:1660
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2104
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
@@ -41356,7 +41748,7 @@ msgstr ""
# shell/e-shell.c:651
# shell/e-shell.c:651
# shell/e-shell.c:651
-#: shell/e-shell.c:739
+#: shell/e-shell.c:741
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "无法设置本地存储 -- %s"
@@ -41364,7 +41756,7 @@ msgstr "无法设置本地存储 -- %s"
# shell/e-shell.c:1659
# shell/e-shell.c:1659
# shell/e-shell.c:1660
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1802
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -41378,166 +41770,157 @@ msgstr ""
# shell/e-shell.c:1886
# shell/e-shell.c:1886
# shell/e-shell.c:1887
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2067
msgid "Invalid arguments"
msgstr "无效参数"
# shell/e-shell.c:1888
# shell/e-shell.c:1888
# shell/e-shell.c:1889
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2069
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
# shell/e-shell.c:1890
# shell/e-shell.c:1890
# shell/e-shell.c:1891
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2071
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
# shell/e-shell.c:1892 shell/e-storage.c:500
# shell/e-shell.c:1892 shell/e-storage.c:500
# shell/e-shell.c:1893 shell/e-storage.c:500
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2073 shell/e-storage.c:572
msgid "Generic error"
msgstr "通用错误"
# shell/e-shortcuts-view.c:74
# shell/e-shortcuts-view.c:74
# shell/e-shortcuts-view.c:74
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
msgid "Create new shortcut group"
msgstr "创建新快捷方式组"
# shell/e-shortcuts-view.c:75
# shell/e-shortcuts-view.c:75
# shell/e-shortcuts-view.c:75
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
msgid "Group name:"
msgstr "组名:"
# shell/e-shortcuts-view.c:175
# shell/e-shortcuts-view.c:175
# shell/e-shortcuts-view.c:175
-#: shell/e-shortcuts-view.c:173
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+#: shell/e-shortcuts-view.c:179
+#, fuzzy, c-format
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
msgstr ""
"您真的希望从快捷方式栏\n"
"上删除“%s”组吗?"
-# shell/e-shortcuts-view.c:180
-# shell/e-shortcuts-view.c:180
-# shell/e-shortcuts-view.c:180
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "不删除"
-
# shell/e-shortcuts-view.c:209
# shell/e-shortcuts-view.c:209
# shell/e-shortcuts-view.c:209
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
msgid "Rename Shortcut Group"
msgstr "重命名快捷方式组"
# shell/e-shortcuts-view.c:210
# shell/e-shortcuts-view.c:210
# shell/e-shortcuts-view.c:210
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
msgid "Rename selected shortcut group to:"
msgstr "把选中的快捷方式组重命名为:"
# shell/e-shortcuts-view.c:224
# shell/e-shortcuts-view.c:224
# shell/e-shortcuts-view.c:224
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
msgid "_Small Icons"
msgstr "小图标(_S)"
# shell/e-shortcuts-view.c:225
# shell/e-shortcuts-view.c:225
# shell/e-shortcuts-view.c:225
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
msgid "Show the shortcuts as small icons"
msgstr "用小图标显示快捷方式"
# shell/e-shortcuts-view.c:227
# shell/e-shortcuts-view.c:227
# shell/e-shortcuts-view.c:227
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
msgid "_Large Icons"
msgstr "大图标(_L)"
# shell/e-shortcuts-view.c:228
# shell/e-shortcuts-view.c:228
# shell/e-shortcuts-view.c:228
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
msgid "Show the shortcuts as large icons"
msgstr "用大图标显示快捷方式"
# shell/e-shortcuts-view.c:239
# shell/e-shortcuts-view.c:239
# shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
msgid "_New Group..."
msgstr "新组(_N)..."
# shell/e-shortcuts-view.c:240
# shell/e-shortcuts-view.c:240
# shell/e-shortcuts-view.c:240
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
msgid "Create a new shortcut group"
msgstr "创建新快捷方式组"
# shell/e-shortcuts-view.c:242
# shell/e-shortcuts-view.c:242
# shell/e-shortcuts-view.c:242
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
msgid "_Remove this Group..."
msgstr "删除该组(_R)..."
# shell/e-shortcuts-view.c:243
# shell/e-shortcuts-view.c:243
# shell/e-shortcuts-view.c:243
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
msgid "Remove this shortcut group"
msgstr "删除该快捷方式组"
# shell/e-shortcuts-view.c:245
# shell/e-shortcuts-view.c:245
# shell/e-shortcuts-view.c:245
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
msgid "Re_name this Group..."
msgstr "重命名该组(_N)..."
# shell/e-shortcuts-view.c:246
# shell/e-shortcuts-view.c:246
# shell/e-shortcuts-view.c:246
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
msgid "Rename this shortcut group"
msgstr "重命名该快捷方式组"
# shell/e-shortcuts-view.c:251
# shell/e-shortcuts-view.c:251
# shell/e-shortcuts-view.c:251
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
msgid "_Hide the Shortcut Bar"
msgstr "隐藏快捷方式栏(_H)"
# shell/e-shortcuts-view.c:252
# shell/e-shortcuts-view.c:252
# shell/e-shortcuts-view.c:252
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
msgid "Hide the shortcut bar"
msgstr "隐藏快捷方式栏"
# shell/e-shell-view-menu.c:545
# shell/e-shell-view-menu.c:545
# shell/e-shell-view-menu.c:545
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
#, fuzzy
msgid "Create _Default Shortcuts"
msgstr "创建新快捷方式"
@@ -41545,7 +41928,7 @@ msgstr "创建新快捷方式"
# shell/e-shell-view-menu.c:545
# shell/e-shell-view-menu.c:545
# shell/e-shell-view-menu.c:545
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
#, fuzzy
msgid "Create Default Shortcuts"
msgstr "创建新快捷方式"
@@ -41553,77 +41936,77 @@ msgstr "创建新快捷方式"
# shell/e-shortcuts-view.c:371
# shell/e-shortcuts-view.c:371
# shell/e-shortcuts-view.c:371
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
msgid "Rename shortcut"
msgstr "重命名快捷方式"
# shell/e-shortcuts-view.c:372
# shell/e-shortcuts-view.c:372
# shell/e-shortcuts-view.c:372
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
msgid "Rename selected shortcut to:"
msgstr "把快捷方式重命名为:"
# shell/e-shortcuts-view.c:384
# shell/e-shortcuts-view.c:384
# shell/e-shortcuts-view.c:384
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
msgid "Open the folder linked to this shortcut"
msgstr "打开连接到该快捷方式的文件夹"
# shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
# shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
# shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
msgid "Open in New _Window"
msgstr "在新窗口中打开(_W)"
# shell/e-shortcuts-view.c:386
# shell/e-shortcuts-view.c:386
# shell/e-shortcuts-view.c:386
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:417
msgid "Open the folder linked to this shortcut in a new window"
msgstr "在新窗口中打开连接到该快捷方式的文件夹"
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
msgid "_Rename"
msgstr "重命名(_R)"
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
# shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
msgid "Rename this shortcut"
msgstr "重命名该快捷方式"
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
msgid "Re_move"
msgstr "删除(_M)"
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
# shell/e-shortcuts-view.c:391
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
msgid "Remove this shortcut from the shortcut bar"
msgstr "从快捷方式栏上删除该快捷方式"
# shell/e-shortcuts.c:640
# shell/e-shortcuts.c:640
# shell/e-shortcuts.c:640
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
msgid "Error saving shortcuts."
msgstr "保存快捷方式错误。"
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
# shell/e-shortcuts.c:1043
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
msgid "Shortcuts"
msgstr "快捷方式"
@@ -41640,102 +42023,102 @@ msgstr "主席"
# shell/e-storage.c:498
# shell/e-storage.c:498
# shell/e-storage.c:498
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
msgid "No error"
msgstr "无错误"
# shell/e-storage.c:502
# shell/e-storage.c:502
# shell/e-storage.c:502
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
msgid "A folder with the same name already exists"
msgstr "已经有一个同名文件夹存在"
# shell/e-storage.c:504
# shell/e-storage.c:504
# shell/e-storage.c:504
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
msgid "The specified folder type is not valid"
msgstr "指定的文件夹类型无效"
# shell/e-storage.c:506
# shell/e-storage.c:506
# shell/e-storage.c:506
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
msgid "I/O error"
msgstr "输入输出错误"
# shell/e-storage.c:508
# shell/e-storage.c:508
# shell/e-storage.c:508
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
msgid "Not enough space to create the folder"
msgstr "没有足够的空间创建文件夹"
# shell/e-storage.c:510
# shell/e-storage.c:510
# shell/e-storage.c:510
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
msgid "The folder is not empty"
msgstr "文件夹不为空"
# shell/e-storage.c:512
# shell/e-storage.c:512
# shell/e-storage.c:512
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
msgid "The specified folder was not found"
msgstr "找不到指定的文件夹"
# shell/e-storage.c:514
# shell/e-storage.c:514
# shell/e-storage.c:514
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
msgid "Function not implemented in this storage"
msgstr "在该存储中没有实现该功能"
# shell/e-storage.c:518
# shell/e-storage.c:518
# shell/e-storage.c:518
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
msgid "Operation not supported"
msgstr "不支持的操作"
# shell/e-storage.c:520
# shell/e-storage.c:520
# shell/e-storage.c:520
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
msgid "The specified type is not supported in this storage"
msgstr "在该存储中不支持指定的类型"
# shell/e-storage.c:522
# shell/e-storage.c:522
# shell/e-storage.c:522
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
msgid "The specified folder cannot be modified or removed"
msgstr "无法修改或删除指定的文件夹"
# shell/e-storage.c:524
# shell/e-storage.c:524
# shell/e-storage.c:524
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
msgid "Cannot make a folder a child of one of its descendants"
msgstr "无法使文件夹成为它的子目录的子目录"
# shell/e-storage.c:526
# shell/e-storage.c:526
# shell/e-storage.c:526
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
msgid "Cannot create a folder with that name"
msgstr "无法以那个名字创建文件夹"
-#: shell/e-storage.c:599
+#: shell/e-storage.c:600
msgid "This operation cannot be performed in off-line mode"
msgstr "本操作不能在离线模式下执行"
# shell/e-task-widget.c:191
# shell/e-task-widget.c:191
# shell/e-task-widget.c:191
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
#, c-format
msgid "%s (...)"
msgstr "%s (...)"
@@ -41743,12 +42126,12 @@ msgstr "%s (...)"
# shell/e-task-widget.c:196
# shell/e-task-widget.c:196
# shell/e-task-widget.c:196
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:100
msgid "<click here to select a folder>"
msgstr "<点击这里以便选择文件夹>"
@@ -41801,140 +42184,134 @@ msgstr ""
# shell/evolution-shell-component.c:1009
# shell/evolution-shell-component.c:1009
# shell/evolution-shell-component.c:1022
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1182
msgid "CORBA error"
msgstr "CORBA 错误"
# shell/evolution-shell-component.c:1011
# shell/evolution-shell-component.c:1011
# shell/evolution-shell-component.c:1024
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1184
msgid "Interrupted"
msgstr "被中断"
# shell/evolution-shell-component.c:1013
# shell/evolution-shell-component.c:1013
# shell/evolution-shell-component.c:1026
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1186
msgid "Invalid argument"
msgstr "无效参数"
# shell/evolution-shell-component.c:1015
# shell/evolution-shell-component.c:1015
# shell/evolution-shell-component.c:1028
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1188
msgid "Already has an owner"
msgstr "已经有所有者了"
# shell/evolution-shell-component.c:1017
# shell/evolution-shell-component.c:1017
# shell/evolution-shell-component.c:1030
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1190
msgid "No owner"
msgstr "无所有者"
# shell/evolution-shell-component.c:1019
# shell/evolution-shell-component.c:1019
# shell/evolution-shell-component.c:1032
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1192
msgid "Not found"
msgstr "没找到"
# shell/evolution-shell-component.c:1021
# shell/evolution-shell-component.c:1021
# shell/evolution-shell-component.c:1034
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1194
msgid "Unsupported type"
msgstr "不支持的类型"
# shell/evolution-shell-component.c:1023
# shell/evolution-shell-component.c:1023
# shell/evolution-shell-component.c:1036
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1196
msgid "Unsupported schema"
msgstr "不支持的方案"
# shell/evolution-shell-component.c:1025
# shell/evolution-shell-component.c:1025
# shell/evolution-shell-component.c:1038
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1198
msgid "Unsupported operation"
msgstr "不支持的操作"
# shell/evolution-shell-component.c:1027
# shell/evolution-shell-component.c:1027
# shell/evolution-shell-component.c:1040
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1200
msgid "Internal error"
msgstr "内部错误"
# shell/evolution-shell-component.c:1031
# shell/evolution-shell-component.c:1031
# shell/evolution-shell-component.c:1044
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1204
msgid "Exists"
msgstr "存在"
# shell/evolution-shell-component.c:1033
# shell/evolution-shell-component.c:1033
# shell/evolution-shell-component.c:1046
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1206
msgid "Invalid URI"
msgstr "无效 URI"
# shell/evolution-shell-component.c:1037
# shell/evolution-shell-component.c:1037
# shell/evolution-shell-component.c:1050
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1210
msgid "Has subfolders"
msgstr "含有子文件夹"
# shell/evolution-shell-component.c:1039
# shell/evolution-shell-component.c:1039
# shell/evolution-shell-component.c:1052
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1212
msgid "No space left"
msgstr "没有剩余空间"
# shell/evolution-shell-component.c:1041
# shell/evolution-shell-component.c:1041
# shell/evolution-shell-component.c:1054
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1214
msgid "Old owner has died"
msgstr "原所有者已死"
# shell/e-shell-importer.c:627
# shell/e-shell-importer.c:627
# shell/evolution-test-component.c:41
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
msgid "Test type"
msgstr "测试类型"
-# shell/glade/e-active-connection-dialog.glade.h:1
-# shell/glade/e-active-connection-dialog.glade.h:1
-# shell/glade/e-active-connection-dialog.glade.h:1
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "活跃连接"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: shell/evolution-test-component.c:703
+#, fuzzy
+msgid "Evolution Test Component"
+msgstr "Evolution 概要组件。"
# shell/glade/e-active-connection-dialog.glade.h:2
# shell/glade/e-active-connection-dialog.glade.h:2
# shell/glade/e-active-connection-dialog.glade.h:2
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/glade/e-active-connection-dialog.glade.h:1
msgid "Click OK to close these connections and go offline"
msgstr "点击确定以关闭这些连接并下线"
-# shell/glade/e-active-connection-dialog.glade.h:3
-# shell/glade/e-active-connection-dialog.glade.h:3
-# shell/glade/e-active-connection-dialog.glade.h:3
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "主机"
-
# shell/glade/e-active-connection-dialog.glade.h:4
# shell/glade/e-active-connection-dialog.glade.h:4
# shell/glade/e-active-connection-dialog.glade.h:4
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
msgid "The following connections are currently active:"
msgstr "下列连接正处于活跃状态:"
@@ -41985,21 +42362,21 @@ msgstr "任务"
# shell/glade/e-shell-folder-creation-dialog.glade.h:1
# shell/glade/e-shell-folder-creation-dialog.glade.h:1
# shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
msgid "Folder name:"
msgstr "文件夹名称:"
# shell/glade/e-shell-folder-creation-dialog.glade.h:2
# shell/glade/e-shell-folder-creation-dialog.glade.h:2
# shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
msgid "Folder type:"
msgstr "文件夹类型:"
# shell/glade/e-shell-folder-creation-dialog.glade.h:3
# shell/glade/e-shell-folder-creation-dialog.glade.h:3
# shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr "指定在那里创建文件夹:"
@@ -42038,41 +42415,42 @@ msgstr "用户名(_U):"
# shell/glade/evolution-startup-wizard.glade.h:3
# shell/glade/evolution-startup-wizard.glade.h:3
# shell/glade/evolution-startup-wizard.glade.h:3
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
msgid "Evolution Setup Assistant"
msgstr "Evolution 设置助手"
# shell/glade/evolution-startup-wizard.glade.h:5
# shell/glade/evolution-startup-wizard.glade.h:5
# shell/glade/evolution-startup-wizard.glade.h:5
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
msgid "Importing Files"
msgstr "正在导入文件"
# shell/glade/evolution-startup-wizard.glade.h:8
# shell/glade/evolution-startup-wizard.glade.h:8
# shell/glade/evolution-startup-wizard.glade.h:8
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
msgid "Timezone "
msgstr "时区"
# shell/glade/evolution-startup-wizard.glade.h:9
# shell/glade/evolution-startup-wizard.glade.h:9
# shell/glade/evolution-startup-wizard.glade.h:9
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
msgid "Welcome"
msgstr "欢迎"
# shell/glade/evolution-startup-wizard.glade.h:10
# shell/glade/evolution-startup-wizard.glade.h:10
# shell/glade/evolution-startup-wizard.glade.h:10
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
+#, fuzzy
msgid ""
"Welcome to Evolution. The next few screens will allow\n"
"Evolution to connect to your email accounts, and to import\n"
"files from other applications. \n"
"\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
msgstr ""
"欢迎使用 Evolution。以后的几个界面将允许\n"
" Evolution 连接到您的电子邮件帐号,\n"
@@ -42083,13 +42461,13 @@ msgstr ""
# shell/glade/evolution-startup-wizard.glade.h:15
# shell/glade/evolution-startup-wizard.glade.h:15
# shell/glade/evolution-startup-wizard.glade.h:15
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
#, fuzzy
msgid ""
"You have successfully entered all of the information\n"
"needed to set up Evolution. \n"
"\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
msgstr ""
"您已经成功输入了设置 Evolution\n"
" 所需的全部信息。\n"
@@ -42154,56 +42532,57 @@ msgstr ""
# shell/importer/intelligent.c:190
# shell/importer/intelligent.c:190
# shell/importer/intelligent.c:190
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
msgid "Importers"
msgstr "导入器"
# shell/importer/intelligent.c:196
# shell/importer/intelligent.c:196
# shell/importer/intelligent.c:196
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
msgid "Don't import"
msgstr "不要导入"
# shell/importer/intelligent.c:198
# shell/importer/intelligent.c:198
# shell/importer/intelligent.c:198
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
msgid "Don't ask me again"
msgstr "不要再问我"
# shell/importer/intelligent.c:208
# shell/importer/intelligent.c:208
# shell/importer/intelligent.c:208
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
msgid "Evolution can import data from the following files:"
msgstr "Evolution 可以从下列文件中导入数据:"
# data/evolution.desktop.in.h:1 shell/main.c:83
# shell/main.c:83
# shell/main.c:83
-#: shell/main.c:96
+#: shell/main.c:112 shell/main.c:564
msgid "Evolution"
msgstr "Evolution"
# shell/main.c:89
# shell/main.c:89
# shell/main.c:89
-#: shell/main.c:102
+#: shell/main.c:118
msgid "Evolution is now exiting ..."
msgstr "Evolution 正在退出 ..."
-#: shell/main.c:227
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:266
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
"of the Ximian Evolution groupware suite.\n"
"\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
"\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
"\n"
"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
"This product comes with no warranty and is not intended for\n"
@@ -42216,7 +42595,7 @@ msgstr ""
# ui/evolution.xml.h:31
# data/evolution.desktop.in.h:2
# data/evolution.desktop.in.h:2
-#: shell/main.c:250
+#: shell/main.c:290
#, fuzzy
msgid ""
"Thanks\n"
@@ -42226,7 +42605,7 @@ msgstr "Ximian Evolution"
# shell/importer/intelligent.c:198
# shell/importer/intelligent.c:198
# shell/importer/intelligent.c:198
-#: shell/main.c:259
+#: shell/main.c:298
#, fuzzy
msgid "Don't tell me again"
msgstr "不要再问我"
@@ -42234,14 +42613,14 @@ msgstr "不要再问我"
# shell/main.c:210
# shell/main.c:210
# shell/main.c:210
-#: shell/main.c:394
+#: shell/main.c:387
msgid "Cannot access the Ximian Evolution shell."
msgstr "无法访问 Ximian Evolution shell。"
# shell/main.c:219
# shell/main.c:219
# shell/main.c:219
-#: shell/main.c:403
+#: shell/main.c:396
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "无法初始化 Ximian Evolution shell: %s"
@@ -42249,14 +42628,14 @@ msgstr "无法初始化 Ximian Evolution shell: %s"
# shell/main.c:289
# shell/main.c:289
# shell/main.c:289
-#: shell/main.c:485
+#: shell/main.c:528
msgid "Disable splash screen"
msgstr "禁用启动屏幕"
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
# importers/netscape-importer.c:897
-#: shell/main.c:487
+#: shell/main.c:530
#, fuzzy
msgid "Start in offline mode"
msgstr "开始导入"
@@ -42264,23 +42643,31 @@ msgstr "开始导入"
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
# shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/main.c:489
+#: shell/main.c:532
#, fuzzy
msgid "Start in online mode"
msgstr "启动智能导入器"
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# notes/GNOME_Evolution_Notes.oaf.in.h:3
+#: shell/main.c:535
+#, fuzzy
+msgid "Forcibly shut down all evolution components"
+msgstr "Evolution 便签组件车间。"
+
# shell/main.c:290
# shell/main.c:290
# shell/main.c:290
-#: shell/main.c:491
+#: shell/main.c:538
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: shell/main.c:493
+#: shell/main.c:541
msgid "Force upgrading of configuration files from Evolution 1.0.x"
msgstr "强制更新来自 Evolution 1.0.x 的配置文件"
-#: shell/main.c:511
+#: shell/main.c:568
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -42289,13 +42676,6 @@ msgstr ""
"%s:不能同时使用 --online 和 --offline。\n"
" 详情请使用 %s --help。\n"
-# shell/main.c:332
-# shell/main.c:332
-# shell/main.c:332
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr "无法初始化 Bonobo 成员系统。"
-
# tools/evolution-addressbook-export.c:36
# tools/evolution-addressbook-import.c:46
# tools/evolution-addressbook-export.c:36
@@ -42303,8 +42683,7 @@ msgstr "无法初始化 Bonobo 成员系统。"
# tools/evolution-addressbook-abuse.c:80
# tools/evolution-addressbook-export.c:36
# tools/evolution-addressbook-import.c:46
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
#: tools/evolution-addressbook-import.c:46
msgid "Error loading default addressbook."
msgstr "装入默认地址簿错误。"
@@ -42313,25 +42692,70 @@ msgstr "装入默认地址簿错误。"
# tools/evolution-addressbook-import.c:67
# tools/evolution-addressbook-abuse.c:111
# tools/evolution-addressbook-import.c:67
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
#: tools/evolution-addressbook-import.c:67
msgid "Input File"
msgstr "输入文件"
-# tools/evolution-addressbook-export.c:46
-# tools/evolution-addressbook-export.c:46
-# tools/evolution-addressbook-export.c:46
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "输出文件"
-
# tools/evolution-addressbook-import.c:80
# tools/evolution-addressbook-import.c:80
# tools/evolution-addressbook-import.c:80
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
msgid "No filename provided."
msgstr "没有提供文件名。"
+# composer/e-msg-composer-attachment-bar.c:531
+# composer/e-msg-composer-attachment-bar.c:537
+# composer/e-msg-composer-attachment-bar.c:537
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "添加附件..."
+
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
+
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
+
+# calendar/gui/cal-search-bar.c:57
+# calendar/gui/cal-search-bar.c:57
+# calendar/gui/cal-search-bar.c:57
+#: tools/evolution-launch-composer.c:327
+#, fuzzy
+msgid "Description of the attachment."
+msgstr "描述含有"
+
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+# ui/evolution-mail-list.xml.h:4
+# ui/evolution-mail-list.xml.h:4
+# ui/evolution-mail-list.xml.h:4
+#: tools/evolution-launch-composer.c:329
+#, fuzzy
+msgid "Default subject for the message."
+msgstr "剪切选中的邮件"
+
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:63
+#, fuzzy, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "无法重命名“%s”:%s"
+
+#: tools/killev.c:78
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
# ui/evolution-mail-message.xml.h:7
# ui/evolution-mail-message.xml.h:7
# ui/evolution-mail-message.xml.h:7
@@ -42500,7 +42924,7 @@ msgstr "查看当前联系人"
#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
msgid "_Actions"
msgstr "动作(_A)"
@@ -42712,7 +43136,7 @@ msgstr "打印该项"
# ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
# ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
+#: ui/evolution-signature-editor.xml.h:5
msgid "Save"
msgstr "保存"
@@ -42778,7 +43202,7 @@ msgstr "把该项保存到磁盘"
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:42
#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
msgid "_File"
msgstr "文件(_F)"
@@ -43226,7 +43650,7 @@ msgstr "删除(_E)"
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
msgid "_Folder"
msgstr "文件夹(_F)"
@@ -43678,7 +44102,7 @@ msgstr "任务回复"
# camel/providers/imap/camel-imap-provider.c:45
#: ui/evolution-mail-message.xml.h:63
#, fuzzy
-msgid "Post a reply to a message message in a Public folder"
+msgid "Post a reply to a message in a Public folder"
msgstr "在所有文件夹中检查新邮件"
# ui/evolution-mail-message.xml.h:64
@@ -43961,7 +44385,7 @@ msgstr "重命名(_R)..."
# ui/my-evolution.xml.h:9
# ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
# ui/my-evolution.xml.h:9
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
msgid "_Tools"
msgstr "工具(_T)"
@@ -43994,7 +44418,7 @@ msgstr "关闭该窗口"
#: ui/evolution-mail-messagedisplay.xml.h:5
#: ui/evolution-message-composer.xml.h:39
#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
msgid "_Close"
msgstr "关闭(_C)"
@@ -44005,7 +44429,7 @@ msgstr "关闭(_C)"
# ui/evolution-mail-messagedisplay.xml.h:8
# ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
msgid "_View"
msgstr "查看(_V)"
@@ -44016,6 +44440,16 @@ msgstr "查看(_V)"
msgid "Attach"
msgstr "附加"
+# composer/e-msg-composer-select-file.c:228
+# ui/evolution-message-composer.xml.h:2
+# composer/e-msg-composer-select-file.c:290
+# ui/evolution-message-composer.xml.h:2
+# composer/e-msg-composer-select-file.c:291
+# ui/evolution-message-composer.xml.h:2
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "附件一个文件"
+
# ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
# ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
# ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
@@ -44321,7 +44755,7 @@ msgstr "保存项并关闭对话框"
# ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
# ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
# ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:52
msgid "_Help"
msgstr "帮助(_H)"
@@ -44628,18 +45062,10 @@ msgstr "在另一个窗口中打开该文件夹"
msgid "Pi_lot Settings..."
msgstr "Pilot 设置(_L)..."
-# ui/evolution.xml.h:45
-# ui/evolution.xml.h:45
-# ui/evolution.xml.h:45
-#: ui/evolution.xml.h:27
-#, fuzzy
-msgid "Pilot Con_duit Settings..."
-msgstr "Pilot 设置(_P)..."
-
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
#, fuzzy
msgid "Remove a folder added with \"Open Other User's Folder\""
msgstr "创建新文件夹(_N)..."
@@ -44647,14 +45073,14 @@ msgstr "创建新文件夹(_N)..."
# ui/evolution-mail-global.xml.h:13
# ui/evolution-mail-global.xml.h:13
# ui/evolution-mail-global.xml.h:13
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
msgid "Send / Receive"
msgstr "发送 / 接收"
# ui/evolution-mail-global.xml.h:14
# ui/evolution-mail-global.xml.h:14
# ui/evolution-mail-global.xml.h:14
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
#, fuzzy
msgid "Send queued items and retrieve new items"
msgstr "发送编队的邮件并检索新邮件"
@@ -44662,15 +45088,7 @@ msgstr "发送编队的邮件并检索新邮件"
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:41
# mail/mail-config.glade.h:48
-#: ui/evolution.xml.h:31
-#, fuzzy
-msgid "Set up Pilot conduit configuration"
-msgstr "邮件配置"
-
-# mail/mail-config.glade.h:41
-# mail/mail-config.glade.h:41
-# mail/mail-config.glade.h:48
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
#, fuzzy
msgid "Set up Pilot configuration"
msgstr "邮件配置"
@@ -44678,98 +45096,98 @@ msgstr "邮件配置"
# ui/evolution.xml.h:21
# ui/evolution.xml.h:21
# ui/evolution.xml.h:21
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
msgid "Show information about Ximian Evolution"
msgstr "显示关于 Ximian Evolution 的信息"
# ui/evolution.xml.h:22
# ui/evolution.xml.h:22
# ui/evolution.xml.h:22
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
msgid "Submit Bug Report"
msgstr "提交错误报告"
# ui/evolution.xml.h:23
# ui/evolution.xml.h:23
# ui/evolution.xml.h:23
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
msgid "Submit _Bug Report"
msgstr "提交错误报告(_B)"
# ui/evolution.xml.h:24
# ui/evolution.xml.h:24
# ui/evolution.xml.h:24
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
# ui/evolution.xml.h:25
# ui/evolution.xml.h:25
# ui/evolution.xml.h:25
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
msgid "Toggle"
msgstr "反转"
# ui/evolution.xml.h:26
# ui/evolution.xml.h:26
# ui/evolution.xml.h:26
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
msgid "Toggle whether to show the folder bar"
msgstr "是否显示文件夹栏"
# ui/evolution.xml.h:27
# ui/evolution.xml.h:27
# ui/evolution.xml.h:27
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
msgid "Toggle whether to show the shortcut bar"
msgstr "是否显示快捷方式栏"
# ui/evolution.xml.h:28
# ui/evolution.xml.h:28
# ui/evolution.xml.h:28
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
msgid "Toggle whether we are working offline."
msgstr "我们是否离线工作。"
# ui/evolution.xml.h:29
# ui/evolution.xml.h:29
# ui/evolution.xml.h:29
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
msgid "View the selected folder"
msgstr "查看选中的文件夹"
# ui/evolution.xml.h:31
# ui/evolution.xml.h:31
# ui/evolution.xml.h:31
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
msgid "Ximian Evolution _FAQ"
msgstr "Ximian Evolution 常见问题(_F)"
# ui/evolution.xml.h:32
# ui/evolution.xml.h:32
# ui/evolution.xml.h:32
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
msgid "_About Ximian Evolution..."
msgstr "关于 Ximian Evolution(_A)..."
# ui/evolution.xml.h:34
# ui/evolution.xml.h:34
# ui/evolution.xml.h:34
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
msgid "_Copy..."
msgstr "复制(_C)..."
# ui/evolution.xml.h:38
# ui/evolution.xml.h:38
# ui/evolution.xml.h:38
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
msgid "_Folder Bar"
msgstr "文件夹工具栏(_F)"
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
#, fuzzy
msgid "_Folder..."
msgstr "文件夹(_F)"
@@ -44777,42 +45195,42 @@ msgstr "文件夹(_F)"
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
# ui/evolution.xml.h:39
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
msgid "_Go to Folder..."
msgstr "转到文件夹(_G)..."
# ui/evolution.xml.h:41
# ui/evolution.xml.h:41
# ui/evolution.xml.h:41
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
msgid "_Import..."
msgstr "正在导入(_I)..."
# ui/evolution.xml.h:42
# ui/evolution.xml.h:42
# ui/evolution.xml.h:42
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
msgid "_Move..."
msgstr "移动(_M)..."
# ui/evolution.xml.h:43
# ui/evolution.xml.h:43
# ui/evolution.xml.h:43
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
msgid "_New"
msgstr "新建(_N)"
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
# ui/evolution.xml.h:44
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
msgid "_New Folder"
msgstr "新建文件夹(_N)"
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
# ui/evolution.xml.h:7
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:57
#, fuzzy
msgid "_Remove Other User's Folder"
msgstr "创建新文件夹(_N)..."
@@ -44820,28 +45238,28 @@ msgstr "创建新文件夹(_N)..."
# ui/evolution.xml.h:46
# ui/evolution.xml.h:46
# ui/evolution.xml.h:46
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
msgid "_Rename..."
msgstr "重命名(_R)..."
# ui/evolution-mail-global.xml.h:23
# ui/evolution-mail-global.xml.h:23
# ui/evolution-mail-global.xml.h:23
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
msgid "_Send / Receive"
msgstr "发送和接收(_S)"
# ui/evolution.xml.h:48
# ui/evolution.xml.h:48
# ui/evolution.xml.h:48
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
msgid "_Shortcut Bar"
msgstr "快捷方式栏(_S)"
# ui/evolution.xml.h:47
# ui/evolution.xml.h:47
# ui/evolution.xml.h:47
-#: ui/evolution.xml.h:64
+#: ui/evolution.xml.h:62
#, fuzzy
msgid "_Shortcut..."
msgstr "快捷方式(_S)"
@@ -44981,9 +45399,8 @@ msgstr "任务(_T)"
# widgets/e-timezone-dialog/e-timezone-dialog.c:207
# widgets/e-timezone-dialog/e-timezone-dialog.c:700
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
msgid "UTC"
msgstr ""
@@ -45023,7 +45440,7 @@ msgstr ""
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
msgid "_Current View"
msgstr "当前视图(_C)"
@@ -45031,19 +45448,19 @@ msgstr "当前视图(_C)"
# widgets/menus/gal-view-menus.c:195
# widgets/menus/gal-view-menus.c:195
#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:350
#, fuzzy
msgid "Custom View"
msgstr "当前视图(_C)"
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
msgid "Save Custom View"
msgstr ""
# widgets/menus/gal-view-menus.c:222
# widgets/menus/gal-view-menus.c:222
# widgets/menus/gal-view-menus.c:222
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
msgid "Define Views"
msgstr "定义视图"
@@ -45060,28 +45477,28 @@ msgstr "123456-"
# widgets/misc/e-calendar-item.c:1070
# widgets/misc/e-calendar-item.c:1070
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1102
msgid "%B %Y"
msgstr "%Y %B"
# widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
# widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
# widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
msgid "Now"
msgstr "现在"
# widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
# widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
# widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
msgid "Today"
msgstr "今天"
# widgets/misc/e-cell-date-edit.c:797
# widgets/misc/e-cell-date-edit.c:797
# widgets/misc/e-cell-date-edit.c:797
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
#, c-format
msgid "The time must be in the format: %s"
msgstr "时间必需采用格式: %s"
@@ -45096,110 +45513,110 @@ msgstr "百分比值必需在 0 到 100之间,含 0 和 100"
# widgets/misc/e-charset-picker.c:58
# widgets/misc/e-charset-picker.c:58
# widgets/misc/e-charset-picker.c:59
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:61
msgid "Baltic"
msgstr "波罗的语"
# widgets/misc/e-charset-picker.c:59
# widgets/misc/e-charset-picker.c:59
# widgets/misc/e-charset-picker.c:60
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
msgid "Central European"
msgstr "中欧"
# widgets/misc/e-charset-picker.c:60
# widgets/misc/e-charset-picker.c:60
# widgets/misc/e-charset-picker.c:61
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
msgid "Chinese"
msgstr "中文"
# widgets/misc/e-charset-picker.c:61
# widgets/misc/e-charset-picker.c:61
# widgets/misc/e-charset-picker.c:62
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
msgid "Cyrillic"
msgstr "西里尔语"
# widgets/misc/e-charset-picker.c:62
# widgets/misc/e-charset-picker.c:62
# widgets/misc/e-charset-picker.c:63
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
msgid "Greek"
msgstr "希腊语"
# widgets/misc/e-charset-picker.c:64
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
msgid "Hebrew"
msgstr "希伯来语"
# widgets/misc/e-charset-picker.c:63
# widgets/misc/e-charset-picker.c:63
# widgets/misc/e-charset-picker.c:65
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
msgid "Japanese"
msgstr "日文"
# widgets/misc/e-charset-picker.c:64
# widgets/misc/e-charset-picker.c:64
# widgets/misc/e-charset-picker.c:66
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
msgid "Korean"
msgstr "韩语"
# widgets/misc/e-charset-picker.c:65
# widgets/misc/e-charset-picker.c:65
# widgets/misc/e-charset-picker.c:67
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
msgid "Turkish"
msgstr "土耳其语"
# widgets/misc/e-charset-picker.c:66
# widgets/misc/e-charset-picker.c:66
# widgets/misc/e-charset-picker.c:68
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
msgid "Unicode"
msgstr "Unicode"
# widgets/misc/e-charset-picker.c:67
# widgets/misc/e-charset-picker.c:67
# widgets/misc/e-charset-picker.c:69
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
msgid "Western European"
msgstr "西欧"
# widgets/misc/e-charset-picker.c:84
# widgets/misc/e-charset-picker.c:84
# widgets/misc/e-charset-picker.c:86
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
msgid "Traditional"
msgstr "繁体"
# widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
# widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
# widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
msgid "Simplified"
msgstr "简体"
# widgets/misc/e-charset-picker.c:90
# widgets/misc/e-charset-picker.c:90
# widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
msgid "Ukrainian"
msgstr "乌克兰语"
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# addressbook/gui/contact-editor/fulladdr.glade.h:14
# widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
msgid "Visual"
msgstr "可视"
# widgets/misc/e-charset-picker.c:159
# widgets/misc/e-charset-picker.c:159
# widgets/misc/e-charset-picker.c:162
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
#, c-format
msgid "Unknown character set: %s"
msgstr "未知的字符集:%s"
@@ -45207,21 +45624,21 @@ msgstr "未知的字符集:%s"
# widgets/misc/e-charset-picker.c:201
# widgets/misc/e-charset-picker.c:201
# widgets/misc/e-charset-picker.c:204
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
msgid "Enter the character set to use"
msgstr "输入要使用的字符集"
# widgets/misc/e-charset-picker.c:276
# widgets/misc/e-charset-picker.c:276
# widgets/misc/e-charset-picker.c:279
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
msgid "Other..."
msgstr "其它..."
# widgets/misc/e-charset-picker.c:395
# widgets/misc/e-charset-picker.c:395
# widgets/misc/e-charset-picker.c:398
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
msgid "Character Encoding"
msgstr "字符编码"
@@ -45235,14 +45652,15 @@ msgstr "..."
# widgets/misc/e-filter-bar.c:152
# widgets/misc/e-filter-bar.c:153
# widgets/misc/e-filter-bar.c:153
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:183
msgid "Search Editor"
msgstr "搜索编辑器"
# widgets/misc/e-filter-bar.c:168
# widgets/misc/e-filter-bar.c:169
# widgets/misc/e-filter-bar.c:169
-#: widgets/misc/e-filter-bar.c:211
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:204
msgid "Save Search"
msgstr "保存搜索"
@@ -45275,7 +45693,7 @@ msgstr "高级..."
# widgets/misc/e-messagebox.c:152
# widgets/misc/e-messagebox.c:152
# widgets/misc/e-messagebox.c:152
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
msgid "Information"
msgstr "信息"
@@ -45285,36 +45703,35 @@ msgstr "信息"
# executive-summary/test-service/rdf-summary.c:549
# executive-summary/test-service/rdf-summary.c:594
# widgets/misc/e-messagebox.c:166
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
msgid "Error"
msgstr "错误"
# widgets/misc/e-messagebox.c:173
# widgets/misc/e-messagebox.c:173
# widgets/misc/e-messagebox.c:173
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
msgid "Question"
msgstr "问题"
# widgets/misc/e-messagebox.c:180
# widgets/misc/e-messagebox.c:180
# widgets/misc/e-messagebox.c:180
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
msgid "Message"
msgstr "邮件"
-# widgets/misc/e-messagebox.c:224
-# widgets/misc/e-messagebox.c:224
-# widgets/misc/e-messagebox.c:224
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "不再显示该邮件。"
+# mail/mail-search-dialogue.c:113
+# mail/mail-search-dialogue.c:113
+# mail/mail-search-dialogue.c:113
+#: widgets/misc/e-search-bar.c:531
+msgid "_Search"
+msgstr "搜索(_S)"
# widgets/misc/e-search-bar.c:460
# widgets/misc/e-search-bar.c:460
# widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:537
#, fuzzy
msgid "_Find Now"
msgstr "立即查找"
@@ -45323,36 +45740,1007 @@ msgstr "立即查找"
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# widgets/misc/e-filter-bar.h:95
# widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:538
#, fuzzy
msgid "_Clear"
msgstr "清除"
+#: widgets/misc/e-search-bar.c:833
+msgid "Item ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:840
+msgid "Subitem ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:847
+#, fuzzy
+msgid "Text"
+msgstr "测试"
+
# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
# widgets/misc/e-filter-bar.h:95
# widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:925
msgid "Clear"
msgstr "清除"
# widgets/misc/e-search-bar.c:460
# widgets/misc/e-search-bar.c:460
# widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:927
msgid "Find Now"
msgstr "立即查找"
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local/LDAP backend"
+msgstr "Evolution 地址簿小卡片显示器"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Calendar local file backend"
+msgstr "Evolution 日历实施概要组件。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook local file backend"
+msgstr "Evolution 地址簿小卡片显示器"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#~ msgid "Factory to import LDIF files into Evolution."
+#~ msgstr "Evolution 导入 LDIF 文件车间。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#~ msgid "Imports LDIF files into Evolution."
+#~ msgstr "把 LDIF 文件导入 Evolution。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#~ msgid "Factory to import VCard files into Evolution."
+#~ msgstr "Evolution 导入 VCard 车间。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#~ msgid "Imports VCard files into Evolution."
+#~ msgstr "将 VCard 文件导入 Evolution"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#~ msgid "A Bonobo control for an address popup."
+#~ msgstr "用于地址对话框的 Bonobo 控制。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+#~ msgid "A Bonobo control for displaying an address."
+#~ msgstr "用于显示一条地址的 Bonobo 控制。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+# notes/GNOME_Evolution_Notes.oaf.in.h:1
+#~ msgid "A sample Bonobo control which displays an addressbook."
+#~ msgstr "显示地址簿的 Bonobo 控制示例。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#~ msgid "Control that displays an Evolution addressbook minicard."
+#~ msgstr "显示 Evolution 地址簿小卡片的控制。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#~ msgid "Evolution component for handling contacts."
+#~ msgstr "处理联系人的 Evolution 成员。"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "地址簿小卡片控制车间"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "地址簿地址显示器车间"
+
+#~ msgid ""
+#~ "Factory for the configuration controls for the Evolution Addressbook."
+#~ msgstr "关于 Evolution 地址本的配置控制车间"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "示例地址簿控制车间"
+
+#~ msgid "1234"
+#~ msgstr "1234"
+
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:436
+#~ msgid "380"
+#~ msgstr "380"
+
+#~ msgid "666"
+#~ msgstr "666"
+
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+# 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 "<- 删除(_R)"
+
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
+#~ msgid "<< Fewer Options"
+#~ msgstr "<< 简洁选项"
+
+#~ msgid "Add (or Edit) Attribute Mappings"
+#~ msgstr "增加 (或编辑) 属性映射"
+
+#~ msgid "Associated LDAP Attribute"
+#~ msgstr "相关的 LDAP 属性"
+
+#~ msgid "Attribute"
+#~ msgstr "属性"
+
+#~ msgid "Corresponding Evolution Attribute"
+#~ msgstr "对应的 Evolution 属性"
+
+# calendar/gui/e-meeting-time-sel.c:431
+# calendar/gui/e-meeting-time-sel.c:434
+# calendar/gui/e-meeting-time-sel.c:434
+#~ msgid "DN Customization"
+#~ msgstr "定制已识别姓名"
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution 属性"
+
+#~ msgid "LDAP Attribute"
+#~ msgstr "LDAP 属性"
+
+# addressbook/printing/e-contact-print.glade.h:21
+# addressbook/printing/e-contact-print.glade.h:21
+# addressbook/printing/e-contact-print.glade.h:21
+#~ msgid "Mappings"
+#~ msgstr "正在映射"
+
+#~ msgid "Objectclasses"
+#~ msgstr "对象类"
+
+#~ msgid "Objectclasses Used in Evolution:"
+#~ msgstr "在 Evolution 中使用的对象类:"
+
+#~ msgid "Objectclasses Used on Server:"
+#~ msgstr "用在服务器上的对象类:"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#~ msgid "R_estore Defaults"
+#~ msgstr "恢复默认值(_E)"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#~ msgid "Re_store Defaults"
+#~ msgstr "恢复默认值(_S)"
+
+# ui/evolution-addressbook.xml.h:21
+# ui/evolution-addressbook.xml.h:21
+# ui/evolution-addressbook.xml.h:21
+#~ msgid "Select"
+#~ msgstr "选择"
+
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:31
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
+#~ msgid "_Add ->"
+#~ msgstr "添加(_A) ->"
+
+#~ msgid "_Add Mapping"
+#~ msgstr "添加映射(_A)"
+
+#~ msgid "_Add to DN"
+#~ msgstr "添加到已识别的名字(_A)"
+
+# calendar/gui/e-calendar-table.etspec.h:3
+# calendar/gui/e-calendar-table.etspec.h:3
+# calendar/gui/e-calendar-table.etspec.h:3
+#~ msgid "_Always"
+#~ msgstr "总是(_A)"
+
+# ui/evolution-message-composer.xml.h:46
+# ui/evolution-message-composer.xml.h:46
+# ui/evolution-message-composer.xml.h:46
+#~ msgid "_Delete Mapping"
+#~ msgstr "删除映射(_D)"
+
+# addressbook/gui/component/addressbook-config.glade.h:12
+#~ msgid "_Distinguished Name (DN):"
+#~ msgstr "已识别姓名 (DN)(_D):"
+
+#~ msgid "_Don't use SSL/TLS"
+#~ msgstr "不使用 SSL/TLS(_D)"
+
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#~ msgid "_Edit Mapping"
+#~ msgstr "编辑映射(_E)"
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#~ msgid "_Evolution attribute:"
+#~ msgstr "Evolution 属性(_E):"
+
+#~ msgid "_If necessary "
+#~ msgstr "如果必要(_I) "
+
+#~ msgid "_LDAP attribute:"
+#~ msgstr "LDAP 属性(_L):"
+
+#~ msgid "_LDAP attributes:"
+#~ msgstr "LDAP 属性(_L):"
+
+# calendar/gui/e-meeting-time-sel.c:467
+# calendar/gui/e-meeting-time-sel.c:470
+# calendar/gui/e-meeting-time-sel.c:470
+#~ msgid "_More Options >>"
+#~ msgstr "更多选项(_M) >>"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#~ msgid "_Restore Defaults"
+#~ msgstr "恢复默认值(_R)"
+
+# mail/mail-config.c:326
+# mail/mail-config.c:329
+# mail/mail-config.c:354
+#, fuzzy
+#~ msgid "account-druid"
+#~ msgstr "帐号 %d"
+
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#~ msgid "account-editor"
+#~ msgstr "账号编辑器"
+
+#~ msgid "dn-customization-tab"
+#~ msgstr "已识别姓名-定制-页"
+
+#~ msgid "mappings-tab"
+#~ msgstr "映射-页"
+
+#~ msgid "objectclasses-tab"
+#~ msgstr "对象类-页"
+
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+#~ msgid "Factory for the Addressbook's name selection interface"
+#~ msgstr "地址簿名称选择界面车间"
+
+# addressbook/gui/component/select-names/e-select-names-popup.c:405
+# addressbook/gui/component/select-names/e-select-names-popup.c:405
+# 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:423
+# addressbook/gui/component/select-names/e-select-names-popup.c:423
+# 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:440
+# addressbook/gui/component/select-names/e-select-names-popup.c:440
+# addressbook/gui/component/select-names/e-select-names-popup.c:440
+#~ msgid "(%d not shown)"
+#~ msgstr "(%d 未显示)"
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:7
+# addressbook/gui/contact-editor/contact-editor.glade.h:7
+# addressbook/gui/contact-editor/contact-editor.glade.h:7
+#~ msgid "C_ontacts..."
+#~ msgstr "联系人(_O)..."
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:25
+# addressbook/gui/contact-editor/contact-editor.glade.h:25
+# addressbook/gui/contact-editor/contact-editor.glade.h:25
+#~ msgid "Phone Types"
+#~ msgstr "电话类型"
+
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+#~ msgid "Delete Contact?"
+#~ msgstr "删除联系人?"
+
+#~ msgid "Confirm Overwrite"
+#~ msgstr "覆盖确认"
+
+# mail/mail-config.glade.h:28
+# mail/mail-config.glade.h:28
+# addressbook/gui/widgets/e-addressbook-util.c:202
+#~ msgid "Display Cards?"
+#~ msgstr "显示卡片?"
+
+# mail/mail-config.glade.h:28
+# mail/mail-config.glade.h:28
+# addressbook/gui/widgets/e-addressbook-util.c:203
+#~ msgid "Display Cards"
+#~ msgstr "显示卡片"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#~ msgid "A Bonobo control which displays a task list."
+#~ msgstr "显示任务列表的 Bonobo 控制。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#~ msgid "A sample Bonobo control which displays an calendar."
+#~ msgstr "显示日历的示例 Bonobo 控制。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#~ msgid "Configuration control for the Evolution Calendar."
+#~ msgstr "关于 Evolution 日历的配置控制。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#~ msgid "Evolution component for handling the calendar."
+#~ msgstr "处理日历的 Evolution 组件。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Evolution 任务控制车间"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "日历 iTip 视图控制车间"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "日历控制示例车间"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#~ msgid "Factory to centralize calendar component editor dialogs"
+#~ msgstr "日历组件编辑器对话框集中车间"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "创建组件编辑车间的车间"
+
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+#~ msgid "Alarm notification service"
+#~ msgstr "提醒服务"
+
+# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+# calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "无法初始化 GNOME"
+
+# calendar/gui/dialogs/alarm-options.glade.h:6
+# calendar/gui/dialogs/alarm-options.glade.h:6
+# calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders. You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "这是电子邮件提示器,但 Evolution 尚不支持这类提示器。您无法为该提示器编辑"
+#~ "选项。"
+
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1533
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1449
+# calendar/conduits/todo/todo-conduit.c:1130
+# 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
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1538
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1546
+# calendar/conduits/todo/todo-conduit.c:1130
+# 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
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1721
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1727
+# calendar/conduits/todo/todo-conduit.c:1316
+# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+# tools/evolution-addressbook-abuse.c:132
+# tools/evolution-addressbook-export.c:60
+# tools/evolution-addressbook-import.c:86
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "无法激活 Bonobo"
+
+# calendar/gui/main.c:91
+# calendar/gui/main.c:91
+# calendar/gui/main.c:91
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "无法创建组件编辑器车间"
+
+# calendar/gui/print.c:2386
+# calendar/gui/print.c:2386
+# calendar/gui/print.c:2386
+#~ msgid "Print Calendar"
+#~ msgstr "打印日历"
+
+# calendar/gui/tasks-control-factory.c:75
+# calendar/gui/tasks-control-factory.c:75
+# 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:105
+# calendar/gui/tasks-migrate.c:105
+# calendar/gui/tasks-migrate.c:105
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution 已经获得了您日历文件夹中的任务并自动将它们迁移到了新任务文件夹。"
+
+# calendar/gui/tasks-migrate.c:108
+# calendar/gui/tasks-migrate.c:108
+# 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"
+#~ "Some of the tasks could not be migrated, so this process may be attempted "
+#~ "again in the future."
+#~ msgstr ""
+#~ "Evolution 已经试图从您的日志文件夹中获取任务并把它们迁移到新任务文件夹。\n"
+#~ "有些任务无法迁移,所以该过程应在将来再次尝试。"
+
+# calendar/gui/tasks-migrate.c:120
+# calendar/gui/tasks-migrate.c:120
+# calendar/gui/tasks-migrate.c:120
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr "无法打开“%s”;不会从日志文件夹迁移项目到任务文件夹。"
+
+# calendar/gui/tasks-migrate.c:133
+# calendar/gui/tasks-migrate.c:133
+# calendar/gui/tasks-migrate.c:133
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr "不支持用于装入“%s”的方法;不会从日志文件夹迁移项目到任务文件夹。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#~ msgid "Factory to import iCalendar files into Evolution"
+#~ msgstr "将 iCalendar 文件导入 Evolution 的车间"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#~ msgid "Imports iCalendar files into Evolution"
+#~ msgstr "将 iCalendar 文件导入 Evolution"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#~ msgid "Imports vCalendar files into Evolution"
+#~ msgstr "将 vCalendar 文件导入 Evolution"
+
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+#~ msgid "Can't get storage list from registry: %s"
+#~ msgstr "无法从注册表获取存储列表:%s"
+
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+#~ msgid "Can't call getFolderAtPath on storage: %s"
+#~ msgstr "无法对存储调用 getFolderAtPath:%s"
+
+# composer/e-msg-composer.c:952
+# composer/e-msg-composer.c:956
+# composer/e-msg-composer.c:921
+#~ msgid "Warning!"
+#~ msgstr "警告!"
+
+# composer/evolution-composer.c:367
+# composer/evolution-composer.c:367
+# composer/evolution-composer.c:367
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "无法创建撰写窗口,这是因为您尚未在\n"
+#~ "邮件组件中配置任何标识。"
+
+# composer/evolution-composer.c:382
+# composer/evolution-composer.c:382
+# composer/evolution-composer.c:382
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "无法初始化 Evolution 的撰写器。"
+
+#~ msgid "minute"
+#~ msgstr "分钟"
+
+#~ msgid "hour"
+#~ msgstr "小时"
+
+#~ msgid "week"
+#~ msgstr "周"
+
+#~ msgid "year"
+#~ msgstr "年"
+
+#~ msgid "Add action"
+#~ msgstr "添加动作"
+
+#~ msgid "Add criterion"
+#~ msgstr "添加条件"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Display Fonts."
+#~ msgstr "Evolution 撰写器车间。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mail Accounts."
+#~ msgstr "Evolution 任务控制车间"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Mailer."
+#~ msgstr "Evolution 撰写器车间。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Message Composer."
+#~ msgstr "Evolution 撰写器车间。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:1
+# mail/GNOME_Evolution_Mail.oaf.in.h:1
+# mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#~ msgid "Evolution component for handling mail."
+#~ msgstr "Evolution 处理邮件组件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Evolution 邮件文件夹车间组件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Evolution 撰写器车间。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "邮件概要组件车间。"
+
+# composer/e-msg-composer.c:1412
+# composer/e-msg-composer.c:1329
+# composer/e-msg-composer.c:1295
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "警告: 未发送的邮件"
+
+# mail/component-factory.c:975
+# mail/component-factory.c:975
+# mail/component-factory.c:980
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "无法初始化 Evolution 的邮件组件。"
+
+# mail/component-factory.c:984
+# mail/component-factory.c:984
+# mail/component-factory.c:989
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "无法初始化 Evolution 的邮件配置组件。"
+
+# mail/component-factory.c:990
+# mail/component-factory.c:990
+# mail/component-factory.c:995
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "无法初始化 Evolution 的文件夹信息组件。"
+
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#~ msgid "Factory to import mbox into Evolution"
+#~ msgstr "将邮件箱导入 Evolution 的车间"
+
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+# mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#~ msgid "Imports mbox files into Evolution"
+#~ msgstr "将邮件箱文件导入到 Evolution"
+
+# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#~ msgid "Factory to import Outlook Express 4 mails into Evolution"
+#~ msgstr "将 Outlook Express 4 的邮件导入 Evolution 的车间"
+
+# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+# mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#~ msgid "Imports Outlook Express 4 files into Evolution"
+#~ msgstr "将 Outlook Express 4 文件导入到 Evolution"
+
+# mail/mail-accounts.c:300
+# mail/mail-accounts.c:300
+# mail/mail-accounts.c:300
+#~ msgid "Really delete account?"
+#~ msgstr "确实删除帐号?"
+
+# ui/evolution-mail-message.xml.h:21
+# ui/evolution-mail-message.xml.h:21
+# ui/evolution-mail-message.xml.h:21
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "转入下一个含有未读消息的文件夹?"
+
+#~ msgid ""
+#~ "There are no more new messages in this folder.\n"
+#~ "Would you like to go to the next folder?"
+#~ msgstr ""
+#~ "本文件夹里没有更多新消息了。\n"
+#~ "您愿意转入下一个文件夹?"
+
+# mail/mail-callbacks.c:2492
+# mail/mail-callbacks.c:2569
+#~ msgid "US-Letter"
+#~ msgstr "美国信纸"
+
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
+#~ msgid "Add Signature"
+#~ msgstr "添加签名"
+
+# mail/mail-config.c:326
+# mail/mail-config.c:329
+# mail/mail-config.c:354
+#~ msgid "Account %d"
+#~ msgstr "帐号 %d"
+
+#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+#~ msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+
+#~ msgid "Spell Checking Language"
+#~ msgstr "拼写检查语言"
+
+#~ msgid "_Fixed-width:"
+#~ msgstr "固定宽度(_F):"
+
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+#~ msgid "_Variable-width:"
+#~ msgstr "可变宽度(_V):"
+
+# mail/subscribe-dialog.glade.h:2
+# mail/subscribe-dialog.glade.h:2
+# mail/subscribe-dialog.glade.h:2
+#~ msgid "All folders"
+#~ msgstr "所有文件夹"
+
+# calendar/gui/goto-dialog.glade.h:1
+# calendar/gui/goto-dialog.glade.h:1
+# calendar/gui/goto-dialog.glade.h:1
+#, fuzzy
+#~ msgid "Apri file"
+#~ msgstr "四月"
+
+# mail/subscribe-dialog.glade.h:3
+# mail/subscribe-dialog.glade.h:3
+# mail/subscribe-dialog.glade.h:3
+#~ msgid "Display Options"
+#~ msgstr "显示选项"
+
+# mail/subscribe-dialog.glade.h:4
+# mail/subscribe-dialog.glade.h:4
+# mail/subscribe-dialog.glade.h:4
+#~ msgid "Folders whose names begin with:"
+#~ msgstr "名称以之开头的文件夹:"
+
+# shell/e-shell-importer.c:617
+# shell/e-shell-importer.c:617
+# shell/e-shell-importer.c:628
+#, fuzzy
+#~ msgid "Salve file"
+#~ msgstr "选择一个文件"
+
+# my-evolution/component-factory.c:44
+# my-evolution/component-factory.c:44
+# my-evolution/component-factory.c:44
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Summary."
+#~ msgstr "含有 Evolution 概要的文件夹"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+#~ msgid "Factory for the Evolution Summary component."
+#~ msgstr "Evolution 实施概要组件车间。"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:133
+# addressbook/gui/contact-editor/fulladdr.glade.h:133
+# my-evolution/Locations.h:1326
+#, fuzzy
+#~ msgid "Marquette"
+#~ msgstr "马提尼可岛"
+
+# my-evolution/main.c:66
+# my-evolution/main.c:66
+# my-evolution/main.c:65
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "实施概要组件无法初始化 Bonobo。\n"
+
+# shell/e-setup.c:124
+# shell/e-setup.c:124
+# shell/e-setup.c:124
+#~ msgid "Evolution installation"
+#~ msgstr "安装 Evolution"
+
+# shell/e-setup.c:128
+# shell/e-setup.c:128
+# shell/e-setup.c:128
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "该新版本的 Evolution 需要把附件文件\n"
+#~ "安装到您的私人 Evolution 目录"
+
+# shell/e-setup.c:129
+# shell/e-setup.c:129
+# shell/e-setup.c:129
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr "请点击“确认”以安装文件,或者点击“取消”以便退出。"
+
+# camel/camel-session.c:532
+# shell/e-setup.c:280
+# shell/e-setup.c:280
+#~ msgid ""
+#~ "Evolution could not create directory\n"
+#~ "%s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Evolution 无法创建目录\n"
+#~ "%s:\n"
+#~ "%s"
+
+# shell/e-setup.c:298
+# shell/e-setup.c:298
+#~ msgid ""
+#~ "Directory %s\n"
+#~ "does not have the right permissions. Please make it\n"
+#~ "readable and executable and restart Evolution."
+#~ msgstr ""
+#~ "目录 %s\n"
+#~ "的许可权限不正确,请使它可读、\n"
+#~ "可执行,并重新启动 Evolution。"
+
+# shell/e-setup.c:304
+# shell/e-setup.c:304
+#~ msgid ""
+#~ "File %s\n"
+#~ "should be removed to allow Evolution to work correctly.\n"
+#~ "Please remove this file and restart Evolution."
+#~ msgstr ""
+#~ "文件 %s\n"
+#~ "应该被删除以使 Evolution 能够正确运行。\n"
+#~ "请删除该文件并重新启动 Evolution。"
+
+# shell/e-setup.c:295
+# shell/e-setup.c:341
+# shell/e-setup.c:341
+#~ msgid ""
+#~ "Evolution has detected an old\n"
+#~ "Executive-Summary directory.\n"
+#~ "This needs to be removed before\n"
+#~ "Evolution will run.\n"
+#~ "Do you want me to remove this directory?"
+#~ msgstr ""
+#~ "Evolution 找到了\n"
+#~ "老式的实施概要目录。\n"
+#~ "在运行 Evolution \n"
+#~ "之前,要删掉它。\n"
+#~ "您希望我删掉该目录吗?"
+
+# shell/e-shell-folder-selection-dialog.c:376
+# shell/e-shell-folder-selection-dialog.c:376
+# shell/e-shell-folder-selection-dialog.c:376
+#~ msgid "New..."
+#~ msgstr "正在新建..."
+
+# shell/e-shell-startup-wizard.c:159
+# shell/e-shell-startup-wizard.c:159
+# shell/e-shell-startup-wizard.c:159
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "无法启动 Evolution 邮件助手界面\n"
+#~ "(%s)"
+
+# shell/e-shell-startup-wizard.c:169
+# shell/e-shell-startup-wizard.c:169
+# shell/e-shell-startup-wizard.c:169
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "无法启动 Evolution 邮件助手界面\n"
+
+# shell/e-shell-utils.c:127
+# shell/e-shell-utils.c:127
+# shell/e-shell-utils.c:127
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "文件夹名不能含有斜线。"
+
+# shell/e-shell-view-menu.c:165
+# shell/e-shell-view-menu.c:165
+# shell/e-shell-view-menu.c:165
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "在您的 $PATH 中找不到 Bug buddy。"
+
+# shell/e-shortcuts-view.c:180
+# shell/e-shortcuts-view.c:180
+# shell/e-shortcuts-view.c:180
+#~ msgid "Don't remove"
+#~ msgstr "不删除"
+
+# shell/glade/e-active-connection-dialog.glade.h:1
+# shell/glade/e-active-connection-dialog.glade.h:1
+# shell/glade/e-active-connection-dialog.glade.h:1
+#~ msgid "Active connections"
+#~ msgstr "活跃连接"
+
+# shell/glade/e-active-connection-dialog.glade.h:3
+# shell/glade/e-active-connection-dialog.glade.h:3
+# shell/glade/e-active-connection-dialog.glade.h:3
+#~ msgid "Host"
+#~ msgstr "主机"
+
+# shell/main.c:332
+# shell/main.c:332
+# shell/main.c:332
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "无法初始化 Bonobo 成员系统。"
+
+# tools/evolution-addressbook-export.c:46
+# tools/evolution-addressbook-export.c:46
+# tools/evolution-addressbook-export.c:46
+#~ msgid "Output File"
+#~ msgstr "输出文件"
+
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+#, fuzzy
+#~ msgid "Pilot Con_duit Settings..."
+#~ msgstr "Pilot 设置(_P)..."
+
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:48
+#, fuzzy
+#~ msgid "Set up Pilot conduit configuration"
+#~ msgstr "邮件配置"
+
# wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
# wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
# wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
# wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
# wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
# wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "个人地址簿服务器"
+#~ msgid "The Personal Addressbook Server"
+#~ msgstr "个人地址簿服务器"
# wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
# wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
@@ -45360,31 +46748,26 @@ msgstr "个人地址簿服务器"
# wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
# wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
# wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "个人日历服务器;日历工厂"
+#~ msgid "The Personal Calendar Server; calendar factory"
+#~ msgstr "个人日历服务器;日历工厂"
# wombat/wombat.c:200
# wombat/wombat.c:200
# wombat/wombat.c:200
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): 无法初始化 GNOME-VFS"
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): 无法初始化 GNOME-VFS"
# wombat/wombat.c:212
# wombat/wombat.c:212
# wombat/wombat.c:212
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): 无法初始化 GNOME"
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): 无法初始化 GNOME"
# wombat/wombat.c:225
# wombat/wombat.c:225
# wombat/wombat.c:225
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): 无法初始化 Bonobo"
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): 无法初始化 Bonobo"
# mail/mail-local.c:1416
# mail/mail-local.c:1416
@@ -45446,12 +46829,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "Copy selected messages"
#~ msgstr "复制选中的邮件"
-# ui/evolution-mail-list.xml.h:4
-# ui/evolution-mail-list.xml.h:4
-# ui/evolution-mail-list.xml.h:4
-#~ msgid "Cut selected messages"
-#~ msgstr "剪切选中的邮件"
-
# my-evolution/my-evolution.glade.h:1
# my-evolution/my-evolution.glade.h:1
# my-evolution/my-evolution.glade.h:1
@@ -45528,12 +46905,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ "导入没有就绪。\n"
#~ "请 5 秒中以后再试。"
-# shell/importer/import.glade.h:3
-# shell/importer/import.glade.h:3
-# shell/importer/import.glade.h:3
-#~ msgid "Evolution Importer Assistant"
-#~ msgstr "Evolution 导入器助手"
-
# calendar/gui/dialogs/recurrence-page.glade.h:11
# calendar/gui/dialogs/recurrence-page.glade.h:11
# calendar/gui/dialogs/recurrence-page.glade.h:11
@@ -45797,12 +47168,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "Command"
#~ msgstr "公司"
-# mail/mail-account-editor-news.c:160
-# mail/mail-account-editor-news.c:160
-# mail/mail-account-editor-news.c:160
-#~ msgid "Evolution News Editor"
-#~ msgstr "Evolution 新闻编辑器"
-
# mail/mail-accounts.c:532 mail/mail-accounts.c:536
# mail/mail-accounts.c:532 mail/mail-accounts.c:536
# mail/mail-accounts.c:532 mail/mail-accounts.c:536
@@ -45828,12 +47193,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "News Servers"
#~ msgstr "新闻来源(_N)"
-# mail/mail-config.glade.h:80
-# mail/mail-config.glade.h:80
-# mail/mail-config.glade.h:89
-#~ msgid "Source"
-#~ msgstr "来源"
-
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:81
# mail/mail-config.glade.h:90
@@ -45951,12 +47310,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "New Contact _List"
#~ msgstr "新建联系人列表(_L)"
-# addressbook/gui/component/addressbook-config.c:186
-# addressbook/gui/component/addressbook-config.c:186
-# addressbook/gui/component/addressbook-config.c:223
-#~ msgid "Edit Addressbook"
-#~ msgstr "编辑地址簿"
-
# camel/providers/smtp/camel-smtp-transport.c:222
# camel/providers/smtp/camel-smtp-transport.c:222
# addressbook/gui/component/addressbook-config.glade.h:3
@@ -46057,12 +47410,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "Show contacts matching the following criteria:"
#~ msgstr "显示符合以下条件的联系人:"
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#~ msgid "Evolution calendar executive summary component."
-#~ msgstr "Evolution 日历实施概要组件。"
-
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
@@ -46769,12 +48116,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "Regions"
#~ msgstr "区域"
-# my-evolution/my-evolution.glade.h:3
-# my-evolution/my-evolution.glade.h:3
-# my-evolution/my-evolution.glade.h:3
-#~ msgid "Al_l stations:"
-#~ msgstr "所有站点(_L):"
-
# my-evolution/my-evolution.glade.h:4
# my-evolution/my-evolution.glade.h:4
# my-evolution/my-evolution.glade.h:4
@@ -46799,12 +48140,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "_Displayed feeds:"
#~ msgstr "已显示的来源:"
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# notes/GNOME_Evolution_Notes.oaf.in.h:3
-#~ msgid "Factory for the Evolution notes component."
-#~ msgstr "Evolution 便签组件车间。"
-
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
# notes/GNOME_Evolution_Notes.oaf.in.h:4
@@ -46829,12 +48164,6 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
#~ msgid "(No name)"
#~ msgstr "(未命名)"
-# ui/evolution-addressbook.xml.h:12
-# ui/evolution-addressbook.xml.h:12
-# ui/evolution-addressbook.xml.h:12
-#~ msgid "New List"
-#~ msgstr "新列表"
-
# ui/evolution-calendar.xml.h:2
# ui/evolution-calendar.xml.h:2
# ui/evolution-calendar.xml.h:2
@@ -47443,4 +48772,3 @@ msgstr "init_bonobo(): 无法初始化 Bonobo"
# my-evolution/e-summary-weather.c:348
#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
#~ msgstr "<dd><b>无法联络的天气服务器</b></dd>"
-