[evolution] Update Simplified Chinese translation.
- From: Aron Xu <aronxu src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution] Update Simplified Chinese translation.
- Date: Sat, 6 Feb 2010 08:46:00 +0000 (UTC)
commit c211d932475c1b53f118bceda65bc4915e90140a
Author: Aron Xu <aronxu gnome org>
Date: Sat Feb 6 16:44:57 2010 +0800
Update Simplified Chinese translation.
po/zh_CN.po | 6486 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 3515 insertions(+), 2971 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 65d79d7..33d0d7e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,19 +1,23 @@
-# Ximian Evolution ç??ç®?ä½?ä¸æ??ç¿»è¯?
+# Evolution ç??ç®?ä½?ä¸æ??ç¿»è¯?
# Copyright (C) 2003 Ximian Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the evolution package.
# Wang Li <charles linux net cn>, 2002, 2003.
# Partly comes from Sun_l10n group, 2003
# Funda Wang <fundawang linux net cn>, 2003, 2004, 2005, 2006.
+# Tao Wei <weitao1979 gmail com>, 2009.
+# Andrew Zheng <andrew0zheng gmail com>, 2009.
#
-#: ../shell/main.c:510
+#: ../shell/main.c:512
msgid ""
msgstr ""
-"Project-Id-Version: Evolution 2.8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 14:12+0700\n"
-"PO-Revision-Date: 2009-11-26 21:17+0100\n"
-"Last-Translator: Tao Wei <weitao1979 gmail com>\n"
-"Language-Team: Chinese i18n <i18n-zh googlegroup com>\n"
+"Project-Id-Version: evolution master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution\n"
+"POT-Creation-Date: 2010-02-05 14:47+0000\n"
+"PO-Revision-Date: 2010-02-03 01:45+0800\n"
+"Last-Translator: Andrew Zheng <andrew0zheng gmail com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh googlegroup com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -81,50 +85,41 @@ msgid "Delete address book '{0}'?"
msgstr "å? é?¤å?°å??ç°¿â??{0}â??å??ï¼?"
#: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "è£?å?¥å?°å??ç°¿é??误ã??"
-
-#: ../addressbook/addressbook.error.xml.h:14
msgid "Error saving {0} to {1}: {2}"
msgstr "å°?{0}ä¿?å?å?° {1} å?ºé??ï¼?{2}"
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
msgid "Failed to authenticate with LDAP server."
msgstr "认è¯?å?° IMAP æ??å?¡å?¨å¤±è´¥ã??"
#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1022
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
msgid "Failed to delete contact"
msgstr "å? é?¤è??系人失败"
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:16
msgid "GroupWise Address book creation:"
msgstr "GroupWise å?°å??ç°¿å??建ï¼?"
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:17
msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP æ??å?¡å?¨æ? æ³?å??åº?æ??æ??ç??大纲信æ?¯ã??"
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:56
-msgid "Server Version"
-msgstr "æ??å?¡å?¨ç??æ?¬"
-
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
msgid "Some features may not work properly with your current server"
msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?å?¨æ?¨ç?®å??ç??æ??å?¡å?¨ä¸?å·¥ä½?"
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
msgid "The Evolution address book has quit unexpectedly."
msgstr "Evolution å?°å??ç°¿å¼?常é??å?ºã??"
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
msgid ""
"The image you have selected is large. Do you want to resize and store it?"
msgstr "æ?¨æ??é??æ?©ç??å?¾å??太大ã??æ?¨æ?¯å?¦æ?³è¦?缩æ?¾å¹¶å?å?¨ï¼?"
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:21
msgid ""
"This LDAP server may use an older version of LDAP, which does not support "
"this functionality or it may be misconfigured. Ask your administrator for "
@@ -133,45 +128,45 @@ msgstr ""
"æ¤ LDAP æ??å?¡å?¨å?¯è?½ä½¿ç?¨è¾?æ?©ç??æ?¬ç?? LDAPï¼?æ??以æ? æ³?æ?¯æ??æ¤å??è?½ï¼?æ??è??æ?¯é??ç½®é??误ã??请"
"询é?®æ?¨ç??管ç??å??æ??å?³æ?¯æ??ç??æ??ç´¢å?ºç¡?ä¸?äº?ã??"
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
msgid "This address book could not be opened."
msgstr "æ? æ³?æ??å¼?æ¤å?°å??ç°¿ã??"
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
msgid "This address book server does not have any suggested search bases."
msgstr "æ¤å?°å??ç°¿æ??å?¡å?¨ä¸?æ?¯æ??ä»»ä½?建议ç??æ??ç´¢å?ºç¡?ã??"
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:24
msgid ""
"This address book server might be unreachable or the server name may be "
"misspelled or your network connection could be down."
msgstr "æ¤å?°å??ç°¿æ??å?¡å?¨ä¸?å?¯è¾¾ï¼?æ??è??æ??å?¡å?¨å??称æ?¼é??ï¼?å??æ??è??æ?¨ç??ç½?ç»?è¿?æ?¥å·²æ?ã??"
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
msgid "This address book will be removed permanently."
msgstr "æ¤å?°å??ç°¿å?³å°?被永ä¹?å? é?¤ã??"
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
msgid "This server does not support LDAPv3 schema information."
msgstr "æ¤æ??å?¡å?¨ä¸?æ?¯æ?? LDAPv3 大纲信æ?¯ã??"
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
msgid "Unable to open address book"
msgstr "æ? æ³?æ??å¼?å?°å??ç°¿"
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
msgid "Unable to perform search."
msgstr "æ? æ³?æ?§è¡?æ??ç´¢ã??"
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
msgid "Unable to save {0}."
msgstr "æ? æ³?ä¿?å? {0}ã??"
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
msgid "Would you like to save your changes?"
msgstr "æ?¨å¸?æ??ä¿?å?æ?´æ?¹å??ï¼?"
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:31
msgid ""
"You are attempting to move a contact from one address book to another but it "
"cannot be removed from the source. Do you want to save a copy instead?"
@@ -179,7 +174,7 @@ msgstr ""
"æ?¨å?³å°?æ??è??系人ä»?ä¸?个å?°å??簿移è?³å?¦å¤?ä¸?个å?°å??ç°¿ï¼?ä½?æ?¯æ? æ³?ä»?æº?å?°å??ç°¿å? é?¤è¯¥è??ç³»"
"人ã??æ?¨æ?³è¦?æ?¢ä½?å¤?å?¶è??系人å??ï¼?"
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results the server should be upgraded to "
@@ -188,51 +183,51 @@ msgstr ""
"æ?¨æ£å?¨è¿?æ?¥å?°ä¸?æ?¯æ??ç?? GroupWise æ??å?¡å?¨ï¼?æ¤æ?¶ä½¿ç?¨ Evolution å?¯è?½é??å?°é?®é¢?ã??为äº?"
"å¾?å?°æ??ä½³æ??æ??ï¼?æ??å?¡å?¨åº?该å??级å?° Evolution æ?¯æ??ç??ç??æ?¬"
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
msgid "You do not have permission to delete contacts in this address book."
msgstr "æ?¨æ²¡æ??足å¤?ç??æ??é??ä»?å?°å??ç°¿ä¸å? é?¤è??系人ã??"
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
msgid ""
"You have made modifications to this contact. Do you want to save these "
"changes?"
msgstr "æ?¨å·²å¯¹æ¤è??系人ä½?å?ºäº?ä¿®æ?¹ã??æ?¨æ?³è¦?ä¿?å?è¿?äº?æ?´æ?¹å??ï¼?"
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:35
msgid ""
"Your contacts for {0} will not be available until Evolution is restarted."
msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å?? {0} ç??è??系人æ? æ³?使ç?¨ã??"
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:521
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
#: ../plugins/groupwise-features/junk-settings.ui.h:4
#: ../plugins/groupwise-features/properties.ui.h:10
#: ../widgets/table/e-table-config.ui.h:18
msgid "_Add"
msgstr "æ·»å? (_A)"
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:37
msgid "_Discard"
msgstr "丢�(_D)"
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
msgid "_Do not save"
msgstr "ä¸?ä¿?å?(_D)"
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
msgid "_Resize"
msgstr "缩�(_R)"
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
msgid "_Use as it is"
msgstr "å??æ ·ä½¿ç?¨(_U)"
#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:143
msgid "{0}"
msgstr "{0}"
#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:44
msgid "{1}"
msgstr "{1}"
@@ -252,7 +247,7 @@ msgstr "æ? æ³?读å?¥ Pilot ç??å?°å??åº?ç?¨ç¨?åº?å??"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1834
+#: ../calendar/gui/e-calendar-view.c:1987
msgid "Anniversary"
msgstr "纪念�"
@@ -263,7 +258,7 @@ msgstr "纪念�"
#. * the directory components.
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1833 ../shell/main.c:113
+#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:111
msgid "Birthday"
msgstr "ç??æ?¥"
@@ -278,16 +273,16 @@ msgid "Calendar:"
msgstr "æ?¥å??ï¼?"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:311
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
#: ../addressbook/gui/widgets/e-minicard.c:198
msgid "Contact"
msgstr "è??系人"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:591
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:606
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2497
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2496
msgid "Contact Editor"
msgstr "è??系人ç¼?è¾?å?¨"
@@ -297,7 +292,7 @@ msgstr "è??系人ç¼?è¾?å?¨"
#: ../addressbook/gui/widgets/eab-contact-display.c:517
#: ../addressbook/gui/widgets/eab-contact-display.c:525
#: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:808
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
msgid "Email"
msgstr "ç?µå?é?®ä»¶"
@@ -310,7 +305,7 @@ msgid "Full _Name..."
msgstr "å?¨å??(_N)..."
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
#: ../addressbook/gui/widgets/eab-contact-display.c:70
msgid "Home"
msgstr "家åº"
@@ -336,7 +331,7 @@ msgid "Mailing Address"
msgstr "é?®æ?¿å?°å??"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
msgid "Miscellaneous"
msgstr "æ??项"
@@ -347,16 +342,16 @@ msgstr "�称(_K)�"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
#: ../modules/calendar/e-memo-shell-migrate.c:250
#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:452
-#: ../plugins/groupwise-features/camel-gw-listener.c:567
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
msgid "Notes"
msgstr "�记"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
#: ../addressbook/gui/widgets/eab-contact-display.c:71
#: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1695
msgid "Other"
msgstr "��"
@@ -382,10 +377,10 @@ msgstr "�����"
#. red
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
#: ../addressbook/gui/widgets/eab-contact-display.c:69
#: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../modules/mail/e-mail-shell-migrate.c:957
+#: ../mail/e-mail-migrate.c:954
msgid "Work"
msgstr "工�"
@@ -408,7 +403,7 @@ msgstr "ç??æ?¥(_B)ï¼?"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
#: ../calendar/gui/dialogs/event-page.c:823
#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1928
+#: ../plugins/itip-formatter/itip-view.c:1909
msgid "_Calendar:"
msgstr "æ?¥å??(_C)ï¼?"
@@ -491,122 +486,123 @@ msgid "_Zip/Postal Code:"
msgstr "é?®æ?¿ç¼?ç ?(_Z)ï¼?"
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
+#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1159
#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:338
+#: ../widgets/menus/gal-define-views-dialog.c:315
#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:61
+#: ../widgets/menus/gal-view-new-dialog.c:60
msgid "Name"
msgstr "å§?å??"
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:339
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1285
-#: ../addressbook/gui/widgets/e-addressbook-model.c:523
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-model.c:522
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
#: ../addressbook/gui/widgets/e-minicard-label.c:164
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
+#: ../addressbook/gui/widgets/e-minicard-view.c:548
#: ../addressbook/gui/widgets/e-minicard.c:191
#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1829 ../widgets/text/e-text.c:3674
-#: ../widgets/text/e-text.c:3675
+#: ../widgets/table/e-cell-text.c:1655 ../widgets/text/e-text.c:3429
+#: ../widgets/text/e-text.c:3430
msgid "Editable"
msgstr "���"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
#: ../addressbook/gui/widgets/eab-contact-display.c:539
msgid "AIM"
msgstr "AIM"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
#: ../addressbook/gui/widgets/eab-contact-display.c:542
msgid "Jabber"
msgstr "Jabber"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
#: ../addressbook/gui/widgets/eab-contact-display.c:544
msgid "Yahoo"
msgstr "é??è??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
#: ../addressbook/gui/widgets/eab-contact-display.c:545
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
#: ../addressbook/gui/widgets/eab-contact-display.c:543
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
#: ../addressbook/gui/widgets/eab-contact-display.c:541
msgid "ICQ"
msgstr "ICQ"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
#: ../addressbook/gui/widgets/eab-contact-display.c:540
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
#: ../addressbook/gui/widgets/eab-contact-display.c:546
msgid "Skype"
msgstr "Skype"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
msgid "Error adding contact"
msgstr "æ·»å? è??系人å?ºé??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
msgid "Error modifying contact"
msgstr "ä¿®æ?¹è??系人å?ºé??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
msgid "Error removing contact"
msgstr "å? é?¤è??系人å?ºé??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
msgid "Source Book"
msgstr "æ?¥æº?å?°å??ç°¿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
msgid "Target Book"
msgstr "ç?®æ ?å?°å??ç°¿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
msgid "Is New Contact"
msgstr "为æ?°è??系人"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
msgid "Writable Fields"
msgstr "å?¯å??å??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
msgid "Required Fields"
msgstr "å¿?é??å??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
msgid "Changed"
msgstr "已��"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:601
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2492
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2491
#, c-format
msgid "Contact Editor - %s"
msgstr "è??系人ç¼?è¾?å?¨ - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2888
msgid "Please select an image for this contact"
msgstr "请é??æ?©æ¤è??系人ç??å?¾å??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
msgid "_No image"
msgstr "æ? å?¾å??(_N)"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3163
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3162
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -614,23 +610,23 @@ msgstr ""
"è??系人æ?°æ?®æ? æ??ï¼?\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3167
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
#, c-format
msgid "'%s' has an invalid format"
msgstr "â??%sâ??ç??æ ¼å¼?æ? æ??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3173
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%sâ??%sâ??ç??æ ¼å¼?æ? æ??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3189
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3200
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3199
#, c-format
msgid "%s'%s' is empty"
msgstr "%sâ??%sâ??为空"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3214
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3213
msgid "Invalid contact."
msgstr "æ? æ??ç??è??系人ã??"
@@ -655,15 +651,14 @@ msgid "_Select Address Book"
msgstr "é??æ?©å?°å??ç°¿(_S)"
#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:355
-#, fuzzy
+#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:681
msgid "Shell"
-msgstr "å¡?è??å°?"
+msgstr "�壳"
#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:356
+#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:682
msgid "The EShell singleton"
-msgstr ""
+msgstr "EShell ç??ä¸?个"
#: ../addressbook/gui/contact-editor/fullname.ui.h:1
msgid "Dr."
@@ -731,7 +726,7 @@ msgid "_Suffix:"
msgstr "å??ç¼?(_S)ï¼?"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:695
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:692
msgid "Contact List Editor"
msgstr "è??系人å??表ç¼?è¾?å?¨"
@@ -756,36 +751,36 @@ msgstr "é??æ?©(_S)..."
msgid "_Type an email address or drag a contact into the list below:"
msgstr "è¾?å?¥ç?µå?é?®ä»¶å?°å??æ??è??æ??è??系人æ??æ?¾å?°ä¸?é?¢ç??å??表(_T)ï¼?"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:788
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:785
msgid "Contact List Members"
msgstr "è??系人å??表æ??å??"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:936
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1343
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:933
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1345
msgid "_Members"
msgstr "æ??å??(_M)"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1183
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1185
msgid "Error adding list"
msgstr "æ·»å? å??表å?ºé??"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1197
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1199
msgid "Error modifying list"
msgstr "ä¿®æ?¹å??表å?ºé??"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1211
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1213
msgid "Error removing list"
msgstr "å? é?¤å??表å?ºé??"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1255
-#: ../addressbook/gui/widgets/e-addressbook-model.c:513
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
+#: ../addressbook/gui/widgets/e-addressbook-model.c:512
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
+#: ../addressbook/gui/widgets/e-minicard-view.c:534
msgid "Book"
msgstr "å?°å??ç°¿"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1275
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1277
msgid "Is New List"
msgstr "为æ?°å??表"
@@ -836,58 +831,58 @@ msgstr "å??并è??系人"
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
#: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-memo-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:978
msgid "Any field contains"
msgstr "ä»»ä½?å??å?«æ??"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
msgid "Email begins with"
msgstr "é?®ä»¶ä»¥æ¤å¼?头"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
msgid "Name contains"
msgstr "å§?å??å?«æ??"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
msgid "No contacts"
msgstr "æ? è??系人"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
#, c-format
msgid "%d contact"
msgid_plural "%d contacts"
msgstr[0] "%d 个è??系人"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:308
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
msgid "Error getting book view"
msgstr "è?·å??å??ç°¿è§?å?¾å?ºé??"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:533
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:421
+#: ../addressbook/gui/widgets/e-addressbook-model.c:532
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
+#: ../addressbook/gui/widgets/e-minicard-view.c:541
msgid "Query"
msgstr "�询"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:707
+#: ../addressbook/gui/widgets/e-addressbook-model.c:706
msgid "Search Interrupted"
msgstr "æ??ç´¢ä¸æ?äº?"
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:435
-#: ../addressbook/gui/widgets/e-addressbook-view.c:560
-#: ../calendar/gui/e-calendar-table.c:877 ../calendar/gui/e-memo-table.c:660
-#: ../modules/calendar/e-memo-shell-content.c:601
-#: ../modules/calendar/e-task-shell-content.c:624
-#: ../widgets/table/e-table-click-to-add.c:505
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
+#: ../addressbook/gui/widgets/e-addressbook-view.c:758
+#: ../calendar/gui/e-memo-table.c:1048 ../calendar/gui/e-task-table.c:1347
+#: ../modules/calendar/e-memo-shell-content.c:603
+#: ../modules/calendar/e-task-shell-content.c:625
+#: ../widgets/table/e-table-click-to-add.c:511
#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
-#: ../widgets/text/e-text.c:3542
+#: ../widgets/table/e-table.c:3349
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
+#: ../widgets/text/e-text.c:3297
msgid "Model"
msgstr "模å??"
@@ -895,43 +890,63 @@ msgstr "模å??"
msgid "Error modifying card"
msgstr "ä¿®æ?¹å??ç??é??误"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:570
-#: ../calendar/gui/e-calendar-table.c:888 ../calendar/gui/e-memo-table.c:671
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+msgid "Cut selected contacts to the clipboard"
+msgstr "å°?é??è??系人å?ªå??å?°å?ªè´´æ?¿"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+msgid "Copy selected contacts to the clipboard"
+msgstr "å°?é??ä¸è??系人å¤?å?¶å?°å?ªè´´æ?¿"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+msgid "Paste contacts from the clipboard"
+msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´è??系人"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:735
+msgid "Delete selected contacts"
+msgstr "å? é?¤é??ä¸ç??è??系人"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+msgid "Select all visible contacts"
+msgstr "é??ä¸å?¨é?¨å?¯è§?è??系人"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:774
+#: ../calendar/gui/e-memo-table.c:1065 ../calendar/gui/e-task-table.c:1364
msgid "Shell View"
-msgstr "é??æ?©è§?å?¾ï¼?%s"
+msgstr "�壳��"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:581
+#: ../addressbook/gui/widgets/e-addressbook-view.c:785
msgid "Source"
msgstr "��"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1040
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
msgid "Are you sure you want to delete these contact lists?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??表å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1044
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
msgid "Are you sure you want to delete this contact list?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??表å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1048
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
#, c-format
msgid "Are you sure you want to delete this contact list (%s)?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??系人å??表(%s)å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1054
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
msgid "Are you sure you want to delete these contacts?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1058
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
msgid "Are you sure you want to delete this contact?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1062
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
#, c-format
msgid "Are you sure you want to delete this contact (%s)?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??系人(%s)å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -940,11 +955,11 @@ msgstr ""
"æ??å¼? %d 个è??系人å°?å??æ?¶æ??å¼? %d 个æ?°çª?å?£ã??\n"
"æ?¨ç??ç??æ?³è¦?æ?¾ç¤ºæ??æ??è??系人å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
msgid "_Don't Display"
msgstr "��示(_D)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
msgid "Display _All Contacts"
msgstr "æ?¾ç¤ºå?¨é?¨è??系人(_A)"
@@ -1104,7 +1119,7 @@ msgid "Telex"
msgstr "ç?µä¼ "
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:520
+#: ../shell/e-shell-view.c:748
msgid "Title"
msgstr "头�"
@@ -1119,27 +1134,27 @@ msgstr "ç½?ç«?"
#: ../addressbook/gui/widgets/e-minicard-label.c:115
#: ../addressbook/gui/widgets/e-minicard.c:154
#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:519
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-group-container.c:994
-#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-click-to-add.c:525
+#: ../widgets/table/e-table-col.c:121
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1003
#: ../widgets/table/e-table-group-leaf.c:642
#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/table/e-table-item.c:2879 ../widgets/table/e-table-item.c:2880
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
msgid "Width"
msgstr "宽度"
#: ../addressbook/gui/widgets/e-minicard-label.c:122
#: ../addressbook/gui/widgets/e-minicard.c:161
#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:526
-#: ../widgets/table/e-table-group-container.c:987
-#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-click-to-add.c:532
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-container.c:996
#: ../widgets/table/e-table-group-leaf.c:635
#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-item.c:2885 ../widgets/table/e-table-item.c:2886
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
msgid "Height"
msgstr "�度"
@@ -1168,7 +1183,7 @@ msgstr "æ??大å??å??é?¿åº¦"
msgid "Column Width"
msgstr "å??宽"
-#: ../addressbook/gui/widgets/e-minicard-view.c:179
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
msgid ""
"\n"
"\n"
@@ -1178,7 +1193,7 @@ msgstr ""
"\n"
"æ£å?¨æ??ç´¢è??系人..."
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
msgid ""
"\n"
"\n"
@@ -1192,7 +1207,7 @@ msgstr ""
"\n"
"æ??å?¨æ¤å??å?»ä»¥å??建æ?°è??系人ã??"
-#: ../addressbook/gui/widgets/e-minicard-view.c:185
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
msgid ""
"\n"
"\n"
@@ -1206,7 +1221,7 @@ msgstr ""
"\n"
"请å?¨æ¤å??å?»ä»¥å??建æ?°è??系人ã??"
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
msgid ""
"\n"
"\n"
@@ -1216,7 +1231,7 @@ msgstr ""
"\n"
"æ??ç´¢è??系人ã??"
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
msgid ""
"\n"
"\n"
@@ -1226,7 +1241,7 @@ msgstr ""
"\n"
"æ?¬è§?å?¾ä¸æ²¡æ??å?¯æ?¾ç¤ºç??项ã??"
-#: ../addressbook/gui/widgets/e-minicard-view.c:520
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
msgid "Adapter"
msgstr "é??é??å?¨"
@@ -1292,17 +1307,17 @@ msgid "Copy _Email Address"
msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??(_E)"
#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:362
+#: ../widgets/misc/e-web-view.c:370
msgid "Copy the email address to the clipboard"
msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??å?°å?ªè´´æ?¿"
#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:367
+#: ../widgets/misc/e-web-view.c:375
msgid "_Send New Message To..."
msgstr "æ??æ?°ä¿¡å??é??å?°(_S)..."
#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:369
+#: ../widgets/misc/e-web-view.c:377
msgid "Send a mail message to this address"
msgstr "å??é??ä¸?个é?®ä»¶ä¿¡æ?¯å?°è¿?个å?°å??"
@@ -1339,12 +1354,12 @@ msgstr "è§?é¢?è??天"
#: ../addressbook/gui/widgets/eab-contact-display.c:562
#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
-#: ../modules/calendar/e-cal-shell-view.c:475
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view.c:465
#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:450
-#: ../plugins/groupwise-features/camel-gw-listener.c:565
+#: ../plugins/groupwise-features/camel-gw-listener.c:445
+#: ../plugins/groupwise-features/camel-gw-listener.c:560
#: ../plugins/hula-account-setup/camel-hula-listener.c:371
#: ../plugins/hula-account-setup/camel-hula-listener.c:399
#: ../plugins/publish-calendar/publish-calendar.ui.h:1
@@ -1380,22 +1395,22 @@ msgstr "主页"
msgid "Web Log"
msgstr "Web ��"
+#. orange
#. Create the default Person addressbook
#. Create the default Person calendar
#. Create the default Person memo list
#. Create the default Person task list
-#. orange
#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../mail/e-mail-migrate.c:955
#: ../modules/addressbook/e-book-shell-backend.c:175
#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:167
+#: ../modules/calendar/e-cal-shell-backend.c:171
#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:152
+#: ../modules/calendar/e-memo-shell-backend.c:154
#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:156
+#: ../modules/calendar/e-task-shell-backend.c:158
#: ../modules/calendar/e-task-shell-migrate.c:511
-#: ../modules/mail/e-mail-shell-migrate.c:958
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:320
msgid "Personal"
msgstr "个人"
@@ -1411,8 +1426,8 @@ msgstr "主页"
msgid "Blog"
msgstr "Blog"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1042
-#: ../widgets/misc/e-web-view.c:708
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../widgets/misc/e-web-view.c:750
#, c-format
msgid "Click to mail %s"
msgstr "å??å?»ä»¥ç»? %s å??é??é?®ä»¶"
@@ -1466,14 +1481,14 @@ msgid "Protocol not supported"
msgstr "ä¸?æ?¯æ??ç??å??è®®"
#. E_BOOK_ERROR_CANCELLED
+#. To Translators: This is task status
#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:1
-#: ../calendar/gui/e-cal-component-preview.c:293
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:215
-#: ../calendar/gui/e-calendar-table.c:226
-#: ../calendar/gui/e-calendar-table.c:791 ../calendar/gui/print.c:2619
+#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/print.c:2608
msgid "Canceled"
msgstr "å·²å??æ¶?"
@@ -1524,14 +1539,13 @@ msgid "Unsupported authentication method"
msgstr "ä¸?æ?¯æ??ç??认è¯?æ?¹å¼?"
#: ../addressbook/gui/widgets/eab-gui-util.c:107
-#, fuzzy
msgid ""
"This address book cannot be opened. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
"load the address book once in online mode to download its contents."
msgstr ""
-"æ??们æ? æ³?æ??å¼?æ¤å?°å??ç°¿ã??è¿?å?¯è?½æ??å?³ç??è¿?æ?¬å?°å??簿没æ??æ ?为è?±æ?ºä½¿ç?¨ï¼?æ??è??å°?æ?ªä¸?è½½å®?"
-"æ??以ä¾?è?±æ?ºä½¿ç?¨ã??请å?¨è??æ?ºæ¨¡å¼?ä¸è£?å?¥æ¤å?°å??簿以便ä¸?è½½å?¶å??容"
+"æ? æ³?æ??å¼?æ¤å?°å??ç°¿ã??è¿?å?¯è?½æ??å?³ç??æ¤å?°å??簿没æ??æ ?为å?¯è?±æ?ºä½¿ç?¨ï¼?æ??è??å°?æ?ªä¸?è½½å®?æ??以"
+"ä¾?è?±æ?ºä½¿ç?¨ã??请å?¨è??æ?ºæ¨¡å¼?ä¸è½½å?¥æ¤å?°å??簿以便ä¸?è½½å?¶å??容ã??"
#: ../addressbook/gui/widgets/eab-gui-util.c:116
#, c-format
@@ -1599,27 +1613,27 @@ msgstr "æ¤æ?¥è¯¢æ?ªæ??å??å®?æ??ã??"
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:245
+#: ../addressbook/gui/widgets/eab-gui-util.c:244
msgid "Select Address Book"
msgstr "é??æ?©å?°å??ç°¿"
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
msgid "list"
msgstr "å??表"
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
msgid "Move contact to"
msgstr "å°?è??系人移è?³"
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:434
msgid "Copy contact to"
msgstr "å°?è??系人å¤?å?¶å?°"
-#: ../addressbook/gui/widgets/eab-gui-util.c:435
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
msgid "Move contacts to"
msgstr "å°?è??系人移è?³"
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
msgid "Copy contacts to"
msgstr "å°?è??系人å¤?å?¶å?°"
@@ -1627,51 +1641,51 @@ msgstr "å°?è??系人å¤?å?¶å?°"
msgid "Card View"
msgstr "å??ç??è§?å?¾"
-#: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:511
-#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-vcard-importer.c:253
#: ../calendar/importers/icalendar-importer.c:310
#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
msgid "Importing..."
msgstr "æ£å?¨å¯¼å?¥..."
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:858
msgid "Outlook CSV or Tab (.csv, .tab)"
msgstr "Outlook CSV æ?? Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:862
+#: ../addressbook/importers/evolution-csv-importer.c:859
msgid "Outlook CSV and Tab Importer"
msgstr "Outlook CSV å?? Tab 导å?¥å?¨"
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:867
msgid "Mozilla CSV or Tab (.csv, .tab)"
msgstr "Mozilla CSV æ?? Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:871
+#: ../addressbook/importers/evolution-csv-importer.c:868
msgid "Mozilla CSV and Tab Importer"
msgstr "Mozilla CSV å?? Tab 导å?¥å?¨"
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:876
msgid "Evolution CSV or Tab (.csv, .tab)"
msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:880
+#: ../addressbook/importers/evolution-csv-importer.c:877
msgid "Evolution CSV and Tab Importer"
msgstr "Evolution CSV å?? Tab 导å?¥å?¨"
-#: ../addressbook/importers/evolution-ldif-importer.c:678
+#: ../addressbook/importers/evolution-ldif-importer.c:689
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP æ?°æ?®äº¤æ?¢æ ¼å¼?(.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:679
+#: ../addressbook/importers/evolution-ldif-importer.c:690
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF 导��"
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:556
msgid "vCard (.vcf, .gcrd)"
msgstr "vCard (.vfg, .gcrd)"
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:557
msgid "Evolution vCard Importer"
msgstr "Evolution vCard 导��"
@@ -1723,24 +1737,24 @@ msgstr "å¼?æ¥æ¨¡å¼?ä¸ä¸?个è¾?å?ºæ??件ä¸ç??å??ç??æ?°ï¼?é»?认大å°?为 100
msgid "NUMBER"
msgstr "æ?°å?"
-#: ../addressbook/tools/evolution-addressbook-export.c:99
+#: ../addressbook/tools/evolution-addressbook-export.c:101
msgid ""
"Command line arguments error, please use --help option to see the usage."
msgstr "å?½ä»¤è¡?å??æ?°é??误ï¼?请使ç?¨ --help é??项æ?¥ç??ç?¨æ³?ã??"
-#: ../addressbook/tools/evolution-addressbook-export.c:113
+#: ../addressbook/tools/evolution-addressbook-export.c:115
msgid "Only support csv or vcard format."
msgstr "ä»?æ?¯æ?? csv æ?? vcard æ ¼å¼?ã??"
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:124
msgid "In async mode, output must be file."
msgstr "å?¨å¼?æ¥æ¨¡å¼?ä¸ï¼?è¾?å?ºå¿?é¡»æ?¯æ??件ã??"
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:132
msgid "In normal mode, there is no need for the size option."
msgstr "å?¨æ?®é??模å¼?ä¸ï¼?ä¸?åº?该æ??大å°?é??项ã??"
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:163
msgid "Unhandled error"
msgstr "æ?ªå¤?ç??ç??é??误"
@@ -1749,20 +1763,21 @@ msgid "Accessing LDAP Server anonymously"
msgstr "å?¿å??访é?® LDAP æ??å?¡å?¨"
#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:530
+#: ../plugins/groupwise-features/camel-gw-listener.c:525
msgid "Failed to authenticate.\n"
msgstr "认è¯?失败ã??\n"
#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:510
+#: ../plugins/groupwise-features/camel-gw-listener.c:505
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "è¾?å?¥ %s ç??å¯?ç ?(ç?¨æ?· %s)"
#: ../addressbook/util/addressbook.c:225
#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:518
-#: ../plugins/publish-calendar/publish-calendar.c:215
+#: ../plugins/caldav/caldav-browse-server.c:809
+#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/publish-calendar/publish-calendar.c:328
#: ../smime/gui/component.c:49
msgid "Enter password"
msgstr "è¾?å?¥å¯?ç ?"
@@ -1839,9 +1854,8 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å? é?¤æ ?é¢?为â??{0}â??ç??约ä¼?å??ï¼?"
#: ../calendar/calendar.error.xml.h:17
-#, fuzzy
msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å? é?¤æ ?é¢?为â??{0}â??ç??约ä¼?å??ï¼?"
+msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å? é?¤æ ?é¢?为â??{0}â??ç??ä¼?è®®å??ï¼?"
#: ../calendar/calendar.error.xml.h:18
msgid "Are you sure you want to delete the memo '{0}'?"
@@ -1984,136 +1998,118 @@ msgid "No response from the server."
msgstr "æ??å?¡å?¨æ? å??åº?ã??"
#: ../calendar/calendar.error.xml.h:50
-msgid "Save Appointment"
-msgstr "ä¿?å?约ä¼?"
-
-#: ../calendar/calendar.error.xml.h:51
-#, fuzzy
-msgid "Save Meeting"
-msgstr "æ?°ä¼?è®®"
-
-#: ../calendar/calendar.error.xml.h:52
-msgid "Save Memo"
-msgstr "ä¿?å?å¤?å¿?"
-
-#: ../calendar/calendar.error.xml.h:53
-msgid "Save Task"
-msgstr "ä¿?å?ä»»å?¡"
-
-#: ../calendar/calendar.error.xml.h:54
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
msgstr "å??é??æ?´æ?°ç??ä¿¡æ?¯å°?å??许å?¶ä»?å?ºå¸è??使ä»?们ç??æ?¥å??ä¿?æ??æ??æ?°ã??"
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
msgstr "å??é??æ?´æ?°ç??ä¿¡æ?¯å??许å?¶ä»?å?ºå¸è??使ä»?们ç??ä»»å?¡å??表ä¿?æ??æ??æ?°ã??"
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:52
msgid ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
msgstr "é??件æ£å?¨ä¸?è½½ä¸ã??ä¿?å?约ä¼?å°?使å¾?约ä¼?ä¿?å?æ?¶æ? æ³?å??å?«å??ç»ç??é??件ã??"
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:53
msgid ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
msgstr "é??件æ£å?¨ä¸?è½½ä¸ã??ä¿?å?ä»»å?¡å°?使å¾?ä»»å?¡ä¿?å?æ?¶æ? æ³?å??å?«å??ç»ç??é??件ã??"
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:54
msgid "Some features may not work properly with your current server."
msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?å?¨æ?¨ç?®å??ç??æ??å?¡å?¨ä¸?å·¥ä½?ã??"
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:55
msgid "The Evolution calendar has quit unexpectedly."
msgstr "Evolution æ?¥å??å¼?常é??å?ºã??"
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:56
msgid "The Evolution calendars have quit unexpectedly."
msgstr "Evolution æ?¥å??å¼?常é??å?ºã??"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:57
msgid "The Evolution memo has quit unexpectedly."
msgstr "Evolution å¤?å¿?å¼?常é??å?ºã??"
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:58
msgid "The Evolution tasks have quit unexpectedly."
msgstr "Evolution ä»»å?¡å¼?常é??å?ºã??"
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:59
msgid "The calendar is not marked for offline usage."
msgstr "æ?¥å??æ?ªæ ?为è?±æ?ºä½¿ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:60
msgid "The memo list is not marked for offline usage."
msgstr "å¤?å¿?å??表æ?ªæ ?为è?±æ?ºä½¿ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
msgid "The task list is not marked for offline usage."
msgstr "ä»»å?¡å??表æ?ªæ ?为è?±æ?ºä½¿ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
msgid "This calendar will be removed permanently."
msgstr "æ¤æ?¥å??å°?被永ä¹?å? é?¤ã??"
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
msgid "This memo list will be removed permanently."
msgstr "æ¤å¤?å¿?å??表å°?被永ä¹?å? é?¤ã??"
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
msgid "This task list will be removed permanently."
msgstr "æ¤ä»»å?¡å??表å°?被永ä¹?å? é?¤ã??"
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
msgid "Unable to load the calendar"
msgstr "æ? æ³?è£?å?¥æ?¥å??"
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
msgid "Would you like to save your changes to this appointment?"
msgstr "æ?¨æ?³è¦?ä¿?å?对约ä¼?ç??æ?´æ?¹å??ï¼?"
-#: ../calendar/calendar.error.xml.h:72
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:67
msgid "Would you like to save your changes to this meeting?"
-msgstr "æ?¨æ?³è¦?ä¿?å?对æ¤å¤?å¿?ç??æ?´æ?¹å??ï¼?"
+msgstr "æ?¨æ?³è¦?ä¿?å?对æ¤ä¼?è®®ç??æ?´æ?¹å??ï¼?"
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
msgid "Would you like to save your changes to this memo?"
msgstr "æ?¨æ?³è¦?ä¿?å?对æ¤å¤?å¿?ç??æ?´æ?¹å??ï¼?"
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
msgid "Would you like to save your changes to this task?"
msgstr "æ?¨æ?³è¦?ä¿?å?对æ¤ä»»å?¡ç??æ?´æ?¹å??ï¼?"
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
msgid "Would you like to send a cancelation notice for this memo?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?为æ¤å¤?å¿?å??é??å??æ¶?é??ç?¥ï¼?"
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?¨é?¨å?ºå¸è??å??é??å??æ¶?é??ç?¥ï¼?"
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
msgid "Would you like to send meeting invitations to participants?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸è??å??é??ä¼?è®®é??请ï¼?"
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
msgid "Would you like to send this task to participants?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?å°?æ¤ä»»å?¡å??é??ç»?å?ºå¸è??ï¼?"
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
msgid "Would you like to send updated meeting information to participants?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸è??å??é??æ?´æ?°ç??ä¼?议信æ?¯ï¼?"
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
msgid "Would you like to send updated task information to participants?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸è??å??é??æ?´æ?°ç??ä»»å?¡ä¿¡æ?¯ï¼?"
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -2122,59 +2118,58 @@ msgstr ""
"æ?¨æ£å?¨è¿?æ?¥å?°ä¸?æ?¯æ??ç?? GroupWise æ??å?¡å?¨ï¼?æ¤æ?¶ä½¿ç?¨ Evolution å?¯è?½é??å?°é?®é¢?ã??为äº?"
"å¾?å?°æ??ä½³æ??æ??ï¼?æ??å?¡å?¨åº?该å??级å?°æ?¯æ??ç??ç??æ?¬ã??"
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
msgid "You have changed this appointment, but not yet saved it."
msgstr "æ?¨å·²ç»?æ?´æ?¹äº?æ¤çº¦ä¼?ï¼?ä½?å°?æ?ªä¿?å?ã??"
-#: ../calendar/calendar.error.xml.h:83
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:78
msgid "You have changed this meeting, but not yet saved it."
-msgstr "æ?¨å·²ç»?对æ¤ä»»å?¡å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å?ã??"
+msgstr "æ?¨å·²ç»?对æ¤ä¼?è®®å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å?ã??"
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
msgid "You have changed this task, but not yet saved it."
msgstr "æ?¨å·²ç»?对æ¤ä»»å?¡å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å?ã??"
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:80
msgid "You have made changes to this memo, but not yet saved them."
msgstr "æ?¨å·²ç»?对æ¤å¤?å¿?å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å?ã??"
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??æ?¥å??æ? æ³?使ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:82
msgid "Your memos will not be available until Evolution is restarted."
msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??å¤?å¿?å°?æ? æ³?使ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??ä»»å?¡å°?æ? æ³?使ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:89
-#: ../composer/mail-composer.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/mail-composer.error.xml.h:24
msgid "_Discard Changes"
msgstr "丢���(_D)"
-#: ../calendar/calendar.error.xml.h:90 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
msgid "_Save"
msgstr "ä¿?å?(_S)"
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:86
msgid "_Save Changes"
msgstr "ä¿?å?æ?´æ?¹(_S)"
-#: ../calendar/calendar.error.xml.h:92
-#: ../composer/mail-composer.error.xml.h:32 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:87
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Send"
msgstr "å??é??(_S)"
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:88
msgid "_Send Notice"
msgstr "å??é??é??ç?¥(_S)"
-#: ../calendar/calendar.error.xml.h:94
+#: ../calendar/calendar.error.xml.h:89
msgid "{0}."
msgstr "{0}ã??"
@@ -2226,16 +2221,10 @@ msgid_plural "minutes"
msgstr[0] "å??é??"
#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../filter/filter.ui.h:15
-#: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-file/calendar-file.c:294
-#: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:515
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-#: ../plugins/google-account-setup/google-source.c:740
-msgid "hours"
+#, fuzzy
+#| msgid "hours"
+#| msgid_plural "hours"
+msgid "hour"
msgid_plural "hours"
msgstr[0] "å°?æ?¶"
@@ -2254,9 +2243,9 @@ msgstr "å?¨é?¨é??è¿?(_A)"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1574
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
+#: ../calendar/gui/e-itip-control.c:1162
#: ../plugins/itip-formatter/itip-view.c:1031
msgid "Location:"
msgstr "�置�"
@@ -2270,11 +2259,11 @@ msgid "_Dismiss"
msgstr "é??è¿?(_D)"
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1065
+#: ../calendar/gui/dialogs/comp-editor.c:1015
#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:111
+#: ../mail/e-mail-browser.c:151
#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1605
#: ../widgets/menus/gal-define-views.ui.h:5
msgid "_Edit"
msgstr "ç¼?è¾?(_E)"
@@ -2283,49 +2272,55 @@ msgstr "ç¼?è¾?(_E)"
msgid "_Snooze"
msgstr "å??ç?¡(_S)"
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:422
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+#, fuzzy
+#| msgid "hours"
+#| msgid_plural "hours"
+msgid "hours"
+msgstr "å°?æ?¶"
+
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
msgid "location of appointment"
msgstr "约��置"
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../filter/filter.ui.h:17
-#: ../modules/addressbook/ldap-config.ui.h:32
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:293
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:514
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:421
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
#: ../plugins/google-account-setup/google-contacts-source.c:330
-#: ../plugins/google-account-setup/google-source.c:739
msgid "minutes"
msgstr "å??é??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1436
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1558
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1435
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1557
msgid "No summary available."
msgstr "没æ??å?¯ç?¨ç??æ??è¦?ã??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1447
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1444
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1446
msgid "No description available."
msgstr "没æ??æ??è¿°ã??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
msgid "No location information available."
msgstr "没æ??å?¯ç?¨ç??ä½?置信æ?¯ã??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1498
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
#, c-format
msgid "You have %d alarms"
msgstr "æ?¨æ?? %d 个æ??é??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1670
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
#: ../e-util/e-non-intrusive-error-dialog.h:39
msgid "Warning"
msgstr "è¦å??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1674
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -2337,7 +2332,7 @@ msgstr ""
"å??é??ç?µå?é?®ä»¶ã??Evolution å°?以\n"
"æ?¾ç¤ºæ?®é??æ??示ä¼?è¯?æ¡?代æ?¿ã??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1704
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2353,7 +2348,7 @@ msgstr ""
"\n"
"æ?¨ç¡®ä¿¡æ?¨è¦?è¿?è¡?该ç¨?åº?å??ï¼?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
msgid "Do not ask me about this program again."
msgstr "ä¸?è¦?å??次询é?®æ¤é?®é¢?ã??"
@@ -2446,9 +2441,8 @@ msgid "Default appointment reminder"
msgstr "é»?认约ä¼?æ??é??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-#, fuzzy
msgid "Default recurrence count"
-msgstr "é»?认æ??é??å??ä½?"
+msgstr "é»?认å??å¤?计æ?°"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
msgid "Default reminder units"
@@ -2508,11 +2502,11 @@ msgstr "å·¥ä½?æ?¥å¼?å§?ç??å°?æ?¶ï¼?以 24 å°?æ?¶æ ¼å¼?表示ï¼?0 å?° 23ã??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
msgid "If \"true\", show the memo preview pane in the main window."
-msgstr ""
+msgstr "å¦?æ?? â??trueâ??ï¼?å?¨ä¸»çª?å?£ä¸æ?¾ç¤ºå¤?å¿?é¢?è§?é?¢æ?¿ã??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
msgid "If \"true\", show the task preview pane in the main window."
-msgstr ""
+msgstr "å¦?æ?? â??trueâ??ï¼?å?¨ä¸»çª?å?£ä¸æ?¾ç¤ºä»»å?¡é¢?è§?é?¢æ?¿ã??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
msgid "Intervals shown in Day and Work Week views, in minutes."
@@ -2528,10 +2522,12 @@ msgid "Level beyond which the message should be logged."
msgstr "大äº?æ¤çº§å?«ç??æ¶?æ?¯ä¼?被记å½?ã??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#, fuzzy
msgid "List of recently used second time zones in a Day View."
-msgstr ""
+msgstr "å??å?ºå?¨æ?¥è§?å?¾ä¸æ??è¿?使ç?¨è¿?ç??第äº?æ?¶å?ºã??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#, fuzzy
msgid "List of server URLs for free/busy publishing."
msgstr "å??å?ºå??表å¿?/é?²ç??æ??å?¡å?¨ URLã??"
@@ -2551,24 +2547,23 @@ msgstr "Marcus Bains 线é¢?è?² - æ?¥æ??æ ?"
msgid ""
"Maximum number of recently used timezones to remember in a "
"'day_second_zones' list."
-msgstr ""
+msgstr "å?¨ 'day_second_zones' å??表ä¸ï¼?æ??è¿?使ç?¨è¿?ç??æ?¶å?ºæ??大记å¿?æ?°ç?®"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
msgid "Maximum number of recently used timezones to remember."
-msgstr ""
+msgstr "æ??è¿?使ç?¨è¿?ç??æ?¶å?ºæ??大记å¿?æ?°ç?®"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
msgid "Memo layout style"
-msgstr ""
+msgstr "å¤?å¿?å¤?è§?é£?æ ¼"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
msgid "Memo preview pane position (horizontal)"
-msgstr ""
+msgstr "å¤?å¿?é¢?è§?é?¢æ?¿ç??æ°´å¹³ä½?ç½®"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-#, fuzzy
msgid "Memo preview pane position (vertical)"
-msgstr "æ??è§?å?¾ä¸å??ç?´é?¢æ?¿ç??ä½?ç½®"
+msgstr "å¤?å¿?é¢?è§?é?¢æ?¿ç??å??ç?´ä½?ç½®"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
msgid "Minute the workday ends on, 0 to 59."
@@ -2612,15 +2607,15 @@ msgstr "æ??è§?å?¾ä¸è§?å?¾å??æ?¥æ??导è?ªå?¨æ?¥å??ä¹?é?´æ°´å¹³é?¢æ?¿ç??ä½?ç½®ï¼?
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
msgid "Position of the memo preview pane when oriented vertically."
-msgstr ""
+msgstr "å½?å??ç?´å®?å??æ?¶ï¼?å¤?å¿?é¢?è§?é?¢æ?¿ç??ä½?ç½®ã??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
msgid "Position of the task preview pane when oriented horizontally."
-msgstr ""
+msgstr "å½?æ°´å¹³å®?å??æ?¶ï¼?ä»»å?¡é¢?è§?é?¢æ?¿ç??ä½?ç½®ã??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
msgid "Position of the task preview pane when oriented vertically."
-msgstr ""
+msgstr "å½?å??ç?´å®?å??æ?¶ï¼?ä»»å?¡é¢?è§?é?¢æ?¿ç??ä½?ç½®ã??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
msgid ""
@@ -2658,7 +2653,7 @@ msgstr "å??许æ??é??è¿?è¡?ç??ç¨?åº?ã??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
msgid "Recently used second time zones in a Day View"
-msgstr ""
+msgstr "æ?¥è§?å?¾ä¸æ??è¿?æ?¯ç?¨è¿?ç??第äº?æ?¶å?º"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
msgid "Save directory for alarm audio"
@@ -2693,14 +2688,12 @@ msgid "Show status field in the event/task/meeting editor"
msgstr "å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸æ?¾ç¤ºç?¶æ??å??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-#, fuzzy
msgid "Show the memo preview pane"
-msgstr "æ?¾ç¤ºâ??é¢?è§?â??é?¢æ?¿"
+msgstr "æ?¾ç¤ºâ??å¤?å¿?é¢?è§?â??é?¢æ?¿"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-#, fuzzy
msgid "Show the task preview pane"
-msgstr "æ?¾ç¤ºâ??é¢?è§?â??é?¢æ?¿"
+msgstr "æ?¾ç¤ºâ??ä»»å?¡é¢?è§?â??é?¢æ?¿"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
msgid "Show timezone field in the event/meeting editor"
@@ -2722,21 +2715,19 @@ msgstr "å?¨æ?¥æ??导è?ªå?¨ä¸æ?¾ç¤ºå?¨æ?°"
msgid ""
"Shows the second time zone in a Day View, if set. Value is similar to one "
"used in a 'timezone' key."
-msgstr ""
+msgstr "å¦?æ??被设å®?ï¼?å?¨æ?¥è§?å?¾ä¸æ?¾ç¤ºç¬¬äº?æ?¶å?ºã??å?¼å??å?¨ 'timezone' ä¸ä½¿ç?¨è¿?ç??é?®ç?¸å??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
msgid "Task layout style"
-msgstr ""
+msgstr "ä»»å?¡å¤?è§?é£?æ ¼"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
-#, fuzzy
msgid "Task preview pane position (horizontal)"
-msgstr "ä»»å?¡å??ç?´é?¢æ?¿ä½?ç½®"
+msgstr "ä»»å?¡é¢?è§?é?¢æ?¿ç??æ°´å¹³ä½?ç½®"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
-#, fuzzy
msgid "Task preview pane position (vertical)"
-msgstr "ä»»å?¡å??ç?´é?¢æ?¿ä½?ç½®"
+msgstr "ä»»å?¡é¢?è§?é?¢æ?¿ç??å??ç?´ä½?ç½®"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
msgid "Tasks due today color"
@@ -2987,10 +2978,10 @@ msgstr "类�"
msgid "Classification"
msgstr "å??ç±»"
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
-#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-calendar-table.c:695
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:487
#: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:323
#: ../widgets/misc/e-send-options.ui.h:2
msgid "Confidential"
msgstr "��"
@@ -3020,7 +3011,7 @@ msgstr "å?å?¨"
#: ../calendar/gui/caltypes.xml.h:12
#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:720
+#: ../plugins/publish-calendar/publish-calendar.c:831
#: ../plugins/publish-calendar/publish-calendar.ui.h:8
#: ../plugins/save-calendar/csv-format.c:368
msgid "Location"
@@ -3031,15 +3022,15 @@ msgstr "ä½?ç½®"
msgid "Organizer"
msgstr "ç»?ç»?è??"
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
-#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-calendar-table.c:694
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:486
#: ../calendar/gui/memotypes.xml.h:12
msgid "Private"
msgstr "��"
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-cal-model.c:532
-#: ../calendar/gui/e-calendar-table.c:693 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-task-table.c:485 ../calendar/gui/memotypes.xml.h:13
msgid "Public"
msgstr "��"
@@ -3174,16 +3165,11 @@ msgstr "天"
#. Translators: This is the last part of the sentence:
#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../filter/filter.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:335
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:295
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:516
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../plugins/google-account-setup/google-source.c:741
#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:39
msgid "days"
msgstr "天"
@@ -3221,42 +3207,31 @@ msgstr "æ·»å? (_D)"
msgid "Alarms"
msgstr "æ??é??"
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:106
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:155
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.c:2940
-#: ../calendar/gui/e-cal-model-tasks.c:727
-#: ../calendar/gui/e-day-view-time-item.c:798
-#: ../calendar/gui/e-itip-control.c:1148 ../filter/e-filter-rule.c:744
-#: ../mail/em-account-editor.c:865 ../mail/em-account-editor.c:1674
-#: ../modules/mail/e-mail-junk-hook.c:88
-#: ../plugins/calendar-weather/calendar-weather.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:378
-#: ../plugins/email-custom-header/email-custom-header.c:379
-#: ../plugins/itip-formatter/itip-formatter.c:2300
-#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1677
-#: ../widgets/misc/e-dateedit.c:1894 ../widgets/misc/e-send-options.ui.h:11
-#: ../widgets/misc/e-signature-combo-box.c:75
-#: ../widgets/table/e-cell-date-edit.c:312
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/e-day-view-time-item.c:797
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-second-zone"
msgid "None"
msgstr "æ? "
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:182
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:824
#: ../calendar/gui/e-timezone-entry.c:319
msgid "Select..."
msgstr "é??æ?©..."
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
msgid "Selected Calendars for Alarms"
msgstr "å·²é??æ?©ç?¨äº?æ??é??ç??æ?¥å??"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
msgid "Time and date:"
msgstr "æ?¶é?´å??æ?¥æ??ï¼?"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
msgid "Date only:"
msgstr "å?ªæ??æ?¥æ??ï¼?"
@@ -3321,7 +3296,7 @@ msgstr "å?ªå?¨é??ç?¥å?ºå??æ?¾ç¤ºæ??é??(_N)"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/e-itip-control.c:738
msgid "Friday"
msgstr "æ??æ??äº?"
@@ -3331,9 +3306,9 @@ msgstr "æ??æ??äº?"
#: ../calendar/gui/dialogs/calendar-setup.c:389
#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2654
+#: ../plugins/itip-formatter/itip-formatter.c:2653
#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/smime-ui.ui.h:23
msgid "General"
msgstr "常�"
@@ -3347,10 +3322,18 @@ msgstr "å??é??"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
#: ../calendar/gui/dialogs/recurrence-page.c:1109
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/e-itip-control.c:734
msgid "Monday"
msgstr "æ??æ??ä¸?"
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#. Translators: Used in send options dialog
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
+msgid "None"
+msgstr "æ? "
+
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
#: ../mail/mail-config.ui.h:80
msgid "Pick a color"
@@ -3362,7 +3345,7 @@ msgstr "��(_U)"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/e-itip-control.c:739
msgid "Saturday"
msgstr "æ??æ??å?"
@@ -3396,7 +3379,7 @@ msgstr "å?¨æ?¥è§?å?¾å??å·¥ä½?æ?¥è§?å?¾ä¸æ?¾ç¤ºå?¨æ?°(_U)"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/e-itip-control.c:733
msgid "Sunday"
msgstr "æ??æ??æ?¥"
@@ -3419,13 +3402,13 @@ msgstr "模��"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/e-itip-control.c:737
msgid "Thursday"
msgstr "æ??æ??å??"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
-#: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:608
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:613
msgid "Time"
msgstr "��"
@@ -3440,7 +3423,7 @@ msgstr "æ?¶é?´æ ¼å¼?ï¼?"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
#: ../calendar/gui/dialogs/recurrence-page.c:1110
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/e-itip-control.c:735
msgid "Tuesday"
msgstr "æ??æ??äº?"
@@ -3450,7 +3433,7 @@ msgstr "�示系���(_Y)"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
#: ../calendar/gui/dialogs/recurrence-page.c:1111
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/e-itip-control.c:736
msgid "Wednesday"
msgstr "æ??æ??ä¸?"
@@ -3459,7 +3442,7 @@ msgid "Wee_k starts on:"
msgstr "�����(_K)�"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1585
msgid "Work Week"
msgstr "工��"
@@ -3541,7 +3524,7 @@ msgid "_Type:"
msgstr "ç±»å??(_T)ï¼?"
#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:27
#: ../plugins/groupwise-features/properties.ui.h:11
#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
#: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3641,246 +3624,266 @@ msgstr "%s æ?¨è¿?没æ??è¿?è¡?ä¿®æ?¹ï¼?æ?´æ?°ç¼?è¾?å?¨å??ï¼?"
msgid "Validation error: %s"
msgstr "æ ¡éª?é??误ï¼?%s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2391
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2380
msgid " to "
msgstr " å?° "
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2395
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2384
msgid " (Completed "
msgstr " (å®?æ?? "
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2397
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2386
msgid "Completed "
msgstr "å·²å®?æ?? "
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2402
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2391
msgid " (Due "
msgstr " (�� "
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2404
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2393
msgid "Due "
msgstr "�� "
-#: ../calendar/gui/dialogs/comp-editor.c:241
+#: ../calendar/gui/dialogs/comp-editor.c:246
msgid "Could not save attachments"
msgstr "ä¸?è?½ä¿?å?é??件"
-#: ../calendar/gui/dialogs/comp-editor.c:504
+#: ../calendar/gui/dialogs/comp-editor.c:509
msgid "Could not update object"
msgstr "æ? æ³?æ?´æ?°å¯¹è±¡"
-#: ../calendar/gui/dialogs/comp-editor.c:599
+#: ../calendar/gui/dialogs/comp-editor.c:604
msgid "Edit Appointment"
msgstr "��约�"
-#: ../calendar/gui/dialogs/comp-editor.c:606
+#: ../calendar/gui/dialogs/comp-editor.c:611
#, c-format
msgid "Meeting - %s"
msgstr "ä¼?è®® - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:608
+#: ../calendar/gui/dialogs/comp-editor.c:613
#, c-format
msgid "Appointment - %s"
msgstr "约� - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:619
#, c-format
msgid "Assigned Task - %s"
msgstr "å??é??ç??ä»»å?¡ - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:616
+#: ../calendar/gui/dialogs/comp-editor.c:621
#, c-format
msgid "Task - %s"
msgstr "任� - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:626
#, c-format
msgid "Memo - %s"
msgstr "�� - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:642
msgid "No Summary"
msgstr "没æ??æ¦?è¦?"
-#: ../calendar/gui/dialogs/comp-editor.c:791
+#: ../calendar/gui/dialogs/comp-editor.c:751
msgid "Keep original item?"
msgstr "ä¿?ç??å??å§?æ?¡ç?®ï¼?"
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:938
msgid "Click here to close the current window"
msgstr "å??å?»æ¤å¤?å?¯å?³é?å½?å??çª?å?£"
-#: ../calendar/gui/dialogs/comp-editor.c:1002
-msgid "Copy selected text to the clipboard"
-msgstr "å°?é??ä¸æ??å?å¤?å?¶å?°å?ªè´´æ?¿"
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1444
+#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+msgid "Copy the selection"
+msgstr "å¤?å?¶é??ä¸å??容"
-#: ../calendar/gui/dialogs/comp-editor.c:1009
-msgid "Cut selected text to the clipboard"
-msgstr "å°?é??ä¸æ??å?å?ªå??å?°å?ªè´´æ?¿"
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1451
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:959
+msgid "Cut the selection"
+msgstr "å?ªå??é??ä¸å??容"
+
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1458
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#, fuzzy
+#| msgid "Cut the selection"
+msgid "Delete the selection"
+msgstr "å?ªå??é??ä¸å??容"
-#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:966
msgid "Click here to view help available"
msgstr "å??å?»æ¤å¤?å?¯æ?¥ç??å?¯ç?¨ç??帮å?©"
-#: ../calendar/gui/dialogs/comp-editor.c:1023
-msgid "Paste text from the clipboard"
-msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´æ??å?"
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1493
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:971
+msgid "Paste the clipboard"
+msgstr "�贴�贴�"
-#: ../calendar/gui/dialogs/comp-editor.c:1044
+#: ../calendar/gui/dialogs/comp-editor.c:994
msgid "Click here to save the current window"
msgstr "å??å?»æ¤å¤?å?¯ä¿?å?å½?å??çª?å?£"
-#: ../calendar/gui/dialogs/comp-editor.c:1051
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1563
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
msgid "Select all text"
msgstr "é??ä¸æ??æ??æ??å?"
-#: ../calendar/gui/dialogs/comp-editor.c:1058
+#: ../calendar/gui/dialogs/comp-editor.c:1008
msgid "_Classification"
msgstr "å??ç±»(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1072 ../mail/e-mail-browser.c:104
-#: ../shell/e-shell-window-actions.c:1649
-#: ../widgets/misc/e-signature-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1612
+#: ../widgets/misc/e-signature-editor.c:217
msgid "_File"
msgstr "æ??件(_F)"
-#: ../calendar/gui/dialogs/comp-editor.c:1079
-#: ../shell/e-shell-window-actions.c:1656
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1619
msgid "_Help"
msgstr "帮�(_H)"
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1036
msgid "_Insert"
msgstr "æ??å?¥(_I)"
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:351
msgid "_Options"
msgstr "é??项(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1100 ../mail/e-mail-browser.c:118
-#: ../shell/e-shell-window-actions.c:1691
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1654
msgid "_View"
msgstr "æ?¥ç??(_V)"
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1060
#: ../composer/e-composer-actions.c:279
msgid "_Attachment..."
msgstr "é??件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1062
msgid "Click here to attach a file"
msgstr "å??å?»æ¤å¤?å?¯ä¾¿é??å? æ??件"
-#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../calendar/gui/dialogs/comp-editor.c:1070
msgid "_Categories"
msgstr "类�(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1072
msgid "Toggles whether to display categories"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç±»å?«"
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:1078
msgid "Time _Zone"
msgstr "��(_Z)"
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1080
msgid "Toggles whether the time zone is displayed"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºæ?¶å?º"
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1089
msgid "Pu_blic"
msgstr "��(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1091
msgid "Classify as public"
msgstr "å??类为å?¬å¼?"
-#: ../calendar/gui/dialogs/comp-editor.c:1146
+#: ../calendar/gui/dialogs/comp-editor.c:1096
msgid "_Private"
msgstr "�人(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1098
msgid "Classify as private"
msgstr "å??类为ç§?人"
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1103
msgid "_Confidential"
msgstr "��(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1155
+#: ../calendar/gui/dialogs/comp-editor.c:1105
msgid "Classify as confidential"
msgstr "å??类为æ?ºå¯?"
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1113
msgid "R_ole Field"
msgstr "è§?è?²å??(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1165
+#: ../calendar/gui/dialogs/comp-editor.c:1115
msgid "Toggles whether the Role field is displayed"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè§?è?²å??"
-#: ../calendar/gui/dialogs/comp-editor.c:1171
+#: ../calendar/gui/dialogs/comp-editor.c:1121
msgid "_RSVP"
msgstr "请å??å¤?(_R)"
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1123
msgid "Toggles whether the RSVP field is displayed"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè¯·å??å¤?å??"
-#: ../calendar/gui/dialogs/comp-editor.c:1179
+#: ../calendar/gui/dialogs/comp-editor.c:1129
msgid "_Status Field"
msgstr "ç?¶æ??å??(_S)"
-#: ../calendar/gui/dialogs/comp-editor.c:1181
+#: ../calendar/gui/dialogs/comp-editor.c:1131
msgid "Toggles whether the Status field is displayed"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç?¶æ??å??"
-#: ../calendar/gui/dialogs/comp-editor.c:1187
+#: ../calendar/gui/dialogs/comp-editor.c:1137
msgid "_Type Field"
msgstr "ç±»å??å??(_T)"
-#: ../calendar/gui/dialogs/comp-editor.c:1189
+#: ../calendar/gui/dialogs/comp-editor.c:1139
msgid "Toggles whether the Attendee Type is displayed"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºå?ºå¸è??ç±»å??å??"
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1163
#: ../composer/e-composer-private.c:70
msgid "Recent _Documents"
msgstr "æ??è¿?æ??æ¡£(_D)"
-#: ../calendar/gui/dialogs/comp-editor.c:1690
+#: ../calendar/gui/dialogs/comp-editor.c:1683
#: ../composer/e-composer-actions.c:475
msgid "Attach"
msgstr "é??件"
-#: ../calendar/gui/dialogs/comp-editor.c:1745
+#: ../calendar/gui/dialogs/comp-editor.c:1738
msgid "Save"
msgstr "ä¿?å?"
-#: ../calendar/gui/dialogs/comp-editor.c:2022
-#: ../calendar/gui/dialogs/comp-editor.c:2071
-#: ../calendar/gui/dialogs/comp-editor.c:2960
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2955
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "å¦?æ??æ?´æ?°å?°è¾¾ç??è¯?ï¼?对æ¤é¡¹ç?®ç??æ?´æ?¹å°?被丢å¼?"
-#: ../calendar/gui/dialogs/comp-editor.c:2928
+#: ../calendar/gui/dialogs/comp-editor.c:2923
#: ../plugins/prefer-plain/prefer-plain.c:67
msgid "attachment"
msgstr "é??件"
-#: ../calendar/gui/dialogs/comp-editor.c:2990
+#: ../calendar/gui/dialogs/comp-editor.c:2985
msgid "Unable to use current version!"
msgstr "æ? æ³?使ç?¨å½?å??ç??æ?¬ï¼?"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
msgid "Could not open source"
msgstr "æ? æ³?æ??å¼?æº?"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
msgid "Could not open destination"
msgstr "æ? æ³?æ??å¼?ç?®ç??"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
msgid "Destination is read only"
msgstr "ç?®ç??å?ªè¯»"
@@ -3967,7 +3970,7 @@ msgstr "å°?æ¤äº?件æ ?为é??å¤?å??ç??"
#: ../calendar/gui/dialogs/event-editor.c:215
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
#: ../plugins/groupwise-features/send-options.c:211
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:19
msgid "Send Options"
msgstr "å??é??é??项"
@@ -4013,7 +4016,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ¤æ? æ³?ç¼?è¾?å?¨é?¨äº?件ã??"
#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2695
+#: ../calendar/gui/dialogs/event-page.c:2718
msgid "This event has alarms"
msgstr "æ¤äº?件æ??æ??é??"
@@ -4031,50 +4034,50 @@ msgstr "代ç??人(_D)"
msgid "Atte_ndees"
msgstr "å?ºå¸è??(_N)"
-#: ../calendar/gui/dialogs/event-page.c:1069
+#: ../calendar/gui/dialogs/event-page.c:1094
msgid "Event with no start date"
msgstr "没æ??å¼?å§?æ?¥æ??ç??äº?件"
-#: ../calendar/gui/dialogs/event-page.c:1072
+#: ../calendar/gui/dialogs/event-page.c:1097
msgid "Event with no end date"
msgstr "没æ??ç»?æ??æ?¥æ??ç??äº?件"
-#: ../calendar/gui/dialogs/event-page.c:1243
-#: ../calendar/gui/dialogs/memo-page.c:657
-#: ../calendar/gui/dialogs/task-page.c:836
+#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/task-page.c:861
msgid "Start date is wrong"
msgstr "å¼?å§?æ?¥æ??æ??é??"
-#: ../calendar/gui/dialogs/event-page.c:1253
+#: ../calendar/gui/dialogs/event-page.c:1278
msgid "End date is wrong"
msgstr "ç»?æ??æ?¥æ??æ??é??"
-#: ../calendar/gui/dialogs/event-page.c:1276
+#: ../calendar/gui/dialogs/event-page.c:1301
msgid "Start time is wrong"
msgstr "å¼?å§?æ?¶é?´æ??é??"
-#: ../calendar/gui/dialogs/event-page.c:1283
+#: ../calendar/gui/dialogs/event-page.c:1308
msgid "End time is wrong"
msgstr "ç»?æ??æ?¶é?´æ??é??"
-#: ../calendar/gui/dialogs/event-page.c:1445
-#: ../calendar/gui/dialogs/memo-page.c:698
-#: ../calendar/gui/dialogs/task-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/task-page.c:921
msgid "The organizer selected no longer has an account."
msgstr "é??ä¸ç??ç»?ç»?è??没æ??å¸?æ?·äº?ã??"
-#: ../calendar/gui/dialogs/event-page.c:1451
-#: ../calendar/gui/dialogs/memo-page.c:704
-#: ../calendar/gui/dialogs/task-page.c:902
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:927
msgid "An organizer is required."
msgstr "é??è¦?ä¸?å??ç»?ç»?è??ã??"
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/task-page.c:926
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
msgid "At least one attendee is required."
msgstr "é??è¦?è?³å°?ä¸?个å?ºå¸è??ã??"
-#: ../calendar/gui/dialogs/event-page.c:2568
+#: ../calendar/gui/dialogs/event-page.c:2591
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "æ? æ³?æ??å¼?æ?¥å??â??%sâ??ã??"
@@ -4085,35 +4088,43 @@ msgstr "æ? æ³?æ??å¼?æ?¥å??â??%sâ??ã??"
#. on behalf of some other user
#. Translators: This string is used when we are creating a Task
#. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2612
-#: ../calendar/gui/dialogs/memo-page.c:916
-#: ../calendar/gui/dialogs/task-page.c:1720
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/task-page.c:1743
#, c-format
msgid "You are acting on behalf of %s"
msgstr "æ?¨æ£å?¨ä»¥ %s ç??身份è¡?å?¨"
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2937
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约ä¼?ç?? %d 天å??"
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2943
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约ä¼?ç?? %d å°?æ?¶å??"
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2949
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "约ä¼?ç?? %d å??é??å??"
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2962
msgid "Customize"
msgstr "���"
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2964
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "æ? "
+
#: ../calendar/gui/dialogs/event-page.ui.h:1
msgid "1 day before appointment"
msgstr "约ä¼?ç?? 1 天å??"
@@ -4161,7 +4172,7 @@ msgid "_Description:"
msgstr "æ??è¿°(_D)ï¼?"
#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:363
+#: ../plugins/calendar-weather/calendar-weather.c:356
msgid "_Location:"
msgstr "ä½?ç½®(_L)ï¼?"
@@ -4179,7 +4190,7 @@ msgstr "æ??ç»æ?¶é?´"
msgid "until"
msgstr "ç?´å?°"
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2540
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2529
msgid "Memo"
msgstr "��"
@@ -4191,14 +4202,14 @@ msgstr "å? æ??é??ç??å¤?å¿?å??表为å?ªè¯»ï¼?æ?¨æ? æ³?ç¼?è¾?该å¤?å¿?ã??"
msgid "Memo cannot be fully edited, because you are not the organizer"
msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ¤æ? æ³?ç¼?è¾?å?¨é?¨å¤?å¿?ã??"
-#: ../calendar/gui/dialogs/memo-page.c:877
+#: ../calendar/gui/dialogs/memo-page.c:875
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "æ? æ³?æ??å¼?â??%sâ??ä¸ç??å¤?å¿?ã??"
-#: ../calendar/gui/dialogs/memo-page.c:1044 ../em-format/em-format-quote.c:224
-#: ../em-format/em-format.c:961 ../mail/em-format-html.c:2235
-#: ../mail/em-format-html.c:2293 ../mail/em-format-html.c:2318
+#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
+#: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
msgid "To"
msgstr "�件人"
@@ -4440,78 +4451,78 @@ msgstr "å®?æ??æ?¥æ??æ??é??"
msgid "Web Page"
msgstr "�页"
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:290
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:292
#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:733
-#: ../calendar/gui/e-calendar-table.c:213
-#: ../calendar/gui/e-calendar-table.c:224
-#: ../calendar/gui/e-calendar-table.c:790 ../calendar/gui/e-itip-control.c:934
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/print.c:2616 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:737
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:212
+#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/print.c:2605 ../calendar/gui/tasktypes.xml.h:9
#: ../plugins/save-calendar/csv-format.c:358
msgid "Completed"
msgstr "å·²å®?æ??"
-#: ../calendar/gui/dialogs/task-details-page.ui.h:3
-#: ../calendar/gui/e-cal-component-preview.c:312
-#: ../calendar/gui/e-calendar-table.c:715 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1081 ../widgets/misc/e-send-options.ui.h:8
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:507 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
msgid "High"
msgstr "é«?"
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:287
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:289
#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:731
-#: ../calendar/gui/e-cal-model-tasks.c:808
-#: ../calendar/gui/e-calendar-table.c:211
-#: ../calendar/gui/e-calendar-table.c:222
-#: ../calendar/gui/e-calendar-table.c:789 ../calendar/gui/print.c:2613
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/print.c:2602
msgid "In Progress"
msgstr "è¿?è¡?ä¸"
-#: ../calendar/gui/dialogs/task-details-page.ui.h:5
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-calendar-table.c:717 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1079 ../widgets/misc/e-send-options.ui.h:9
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-task-table.c:509 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
msgid "Low"
msgstr "ä½?"
-#: ../calendar/gui/dialogs/task-details-page.ui.h:7
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-cal-model.c:1280 ../calendar/gui/e-calendar-table.c:716
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1080
-#: ../widgets/misc/e-send-options.ui.h:12
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:508
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../widgets/misc/e-send-options.ui.h:13
msgid "Normal"
msgstr "ä¸"
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:297
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/e-cal-component-preview.c:299
#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:729
-#: ../calendar/gui/e-calendar-table.c:209
-#: ../calendar/gui/e-calendar-table.c:220
-#: ../calendar/gui/e-calendar-table.c:788 ../calendar/gui/print.c:2610
-#: ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:580
+#: ../calendar/gui/print.c:2599 ../calendar/gui/tasktypes.xml.h:18
msgid "Not Started"
msgstr "����"
-#: ../calendar/gui/dialogs/task-details-page.ui.h:9
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
msgid "P_ercent complete:"
msgstr "å®?æ??ç?¾å??æ¯?(_E)ï¼?"
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
msgid "Stat_us:"
msgstr "ç?¶æ??(_U)ï¼?"
#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
#. Status: Accepted: X Declined: Y ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1590
+#: ../calendar/gui/e-calendar-view.c:1743
#: ../calendar/gui/e-meeting-list-view.c:603
#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4519,22 +4530,23 @@ msgstr "ç?¶æ??(_U)ï¼?"
msgid "Status"
msgstr "ç?¶æ??"
-#: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-calendar-table.c:718 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:23
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:24
msgid "Undefined"
msgstr "���"
-#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
msgid "_Date completed:"
msgstr "å®?æ??æ?¥æ??(_D)ï¼?"
-#: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:34
msgid "_Priority:"
msgstr "ä¼?å??级(_P)ï¼?"
-#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
msgid "_Web Page:"
msgstr "�页(_W)�"
@@ -4573,11 +4585,11 @@ msgstr "æ? æ³?å??é??æ¤ä¿¡ä»¶ï¼?å? 为æ?¨æ²¡æ??æ??å®?ä»»ä½?æ?¶ä»¶äºº"
msgid "Organi_zer:"
msgstr "ç»?ç»?è??(_Z)ï¼?"
-#: ../calendar/gui/dialogs/task-page.c:809
+#: ../calendar/gui/dialogs/task-page.c:834
msgid "Due date is wrong"
msgstr "å?°æ??æ?¥æ??é??误"
-#: ../calendar/gui/dialogs/task-page.c:1677
+#: ../calendar/gui/dialogs/task-page.c:1700
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "æ? æ³?æ??å¼?â??%sâ??ä¸ç??ä»»å?¡ã??"
@@ -4672,47 +4684,47 @@ msgstr "å?¨ %2$s æ?¶ %1$s"
msgid "%s for an unknown trigger type"
msgstr "%s 为æ?ªç?¥è§¦å??ç±»å??"
-#: ../calendar/gui/e-cal-component-preview.c:190 ../filter/e-filter-rule.c:658
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
msgid "Untitled"
msgstr "æ? æ ?é¢?"
-#: ../calendar/gui/e-cal-component-preview.c:196
+#: ../calendar/gui/e-cal-component-preview.c:198
#, fuzzy
msgid "Categories:"
msgstr "类�"
-#: ../calendar/gui/e-cal-component-preview.c:235
-#: ../calendar/gui/e-itip-control.c:1152 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
msgid "Summary:"
msgstr "���"
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
msgid "Start Date:"
msgstr "å¼?å§?æ?¥æ??ï¼?"
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:272
msgid "Due Date:"
msgstr "å?°æ??æ?¥æ??ï¼?"
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:283
-#: ../calendar/gui/e-itip-control.c:1177
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1176
#: ../plugins/itip-formatter/itip-view.c:1062
msgid "Status:"
msgstr "ç?¶æ??ï¼?"
-#: ../calendar/gui/e-cal-component-preview.c:310
+#: ../calendar/gui/e-cal-component-preview.c:312
msgid "Priority:"
msgstr "ä¼?å??级ï¼?"
-#: ../calendar/gui/e-cal-component-preview.c:335
-#: ../calendar/gui/e-itip-control.c:1215 ../calendar/gui/e-itip-control.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
#: ../mail/mail-config.ui.h:34
msgid "Description:"
msgstr "æ??è¿°ï¼?"
-#: ../calendar/gui/e-cal-component-preview.c:366
+#: ../calendar/gui/e-cal-component-preview.c:368
msgid "Web Page:"
msgstr "�页�"
@@ -4739,13 +4751,12 @@ msgid "Start Date"
msgstr "å¼?å§?æ?¥æ??"
#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:767
+#: ../calendar/gui/e-task-table.c:559
msgid "Free"
msgstr "空�"
#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:768
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:560
msgid "Busy"
msgstr "ç¹?å¿?"
@@ -4759,7 +4770,15 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1286
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "æ? "
+
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
#: ../calendar/gui/e-meeting-list-view.c:187
#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
#: ../calendar/gui/e-meeting-store.c:856
@@ -4767,149 +4786,58 @@ msgstr ""
msgid "Yes"
msgstr "æ?¯"
-#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1286
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
#: ../calendar/gui/e-meeting-list-view.c:188
#: ../calendar/gui/e-meeting-store.c:174
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "No"
msgstr "å?¦"
-#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
-#: ../shell/e-shell.c:791
+#: ../calendar/gui/e-cal-model.c:377
+#, fuzzy
+#| msgid "Default Mail Client"
+msgid "Default Client"
+msgstr "�认�件客�端"
+
+#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
+#: ../shell/e-shell.c:836
#, fuzzy
msgid "Shell Settings"
msgstr "Exchange 设置"
-#: ../calendar/gui/e-cal-model.c:364 ../calendar/gui/gnome-cal.c:525
-#: ../shell/e-shell.c:792
+#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
+#: ../shell/e-shell.c:837
#, fuzzy
msgid "Application-wide settings"
msgstr "��补�设置"
#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:538 ../calendar/gui/e-itip-control.c:1198
-#: ../calendar/gui/e-itip-control.c:1337
+#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
#: ../calendar/gui/e-meeting-list-view.c:163
#: ../calendar/gui/e-meeting-list-view.c:177
#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:975
-#: ../calendar/gui/print.c:992 ../e-util/e-charset.c:52 ../mail/em-utils.c:961
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:967
+#: ../calendar/gui/print.c:984 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
#: ../plugins/itip-formatter/itip-formatter.c:461
#: ../plugins/itip-formatter/itip-formatter.c:2325
#: ../plugins/plugin-manager/plugin-manager.c:89
msgid "Unknown"
msgstr "��"
-#: ../calendar/gui/e-cal-model.c:1282
+#: ../calendar/gui/e-cal-model.c:1306
msgid "Recurring"
msgstr "é??å¤?"
-#: ../calendar/gui/e-cal-model.c:1284
+#: ../calendar/gui/e-cal-model.c:1308
msgid "Assigned"
msgstr "å·²å??é??"
-#: ../calendar/gui/e-cal-model.c:2179 ../calendar/gui/gnome-cal.c:2035
+#: ../calendar/gui/e-cal-model.c:2203
#, c-format
msgid "Opening %s"
msgstr "æ??å¼? %s"
-#: ../calendar/gui/e-calendar-table.c:328 ../calendar/gui/e-memo-table.c:261
-msgid "* No Summary *"
-msgstr "* 没æ??æ¦?è¦? *"
-
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:364
-#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:297
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "ç»?ç»?è??ï¼?%s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:367
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:300
-#, c-format
-msgid "Organizer: %s"
-msgstr "ç»?ç»?è??ï¼?%s"
-
-#: ../calendar/gui/e-calendar-table.c:406 ../calendar/gui/e-memo-table.c:339
-msgid "Start: "
-msgstr "���"
-
-#: ../calendar/gui/e-calendar-table.c:424 ../calendar/gui/e-memo-table.c:357
-msgid "Due: "
-msgstr "å?°æ??ï¼?"
-
-#: ../calendar/gui/e-calendar-table.c:737
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-calendar-table.c:738
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-calendar-table.c:739
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-calendar-table.c:740
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-calendar-table.c:741
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-calendar-table.c:742
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-calendar-table.c:743
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-calendar-table.c:744
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-calendar-table.c:745
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-calendar-table.c:746
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-calendar-table.c:747
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-calendar-table.c:855 ../calendar/gui/print.c:2014
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:432
-#: ../modules/calendar/e-task-shell-view-actions.c:285
-#: ../modules/calendar/e-task-shell-view-actions.c:302
-#: ../modules/calendar/e-task-shell-view.c:439
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:566
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
-msgid "Tasks"
-msgstr "任�"
-
-#: ../calendar/gui/e-calendar-table.c:1097
-#: ../calendar/gui/e-calendar-view.c:602 ../calendar/gui/e-memo-table.c:883
-msgid "Deleting selected objects"
-msgstr "å? é?¤é??ä¸ç??对象"
-
-#: ../calendar/gui/e-calendar-table.c:1366
-#: ../calendar/gui/e-calendar-view.c:787 ../calendar/gui/e-memo-table.c:1081
-msgid "Updating objects"
-msgstr "��对象"
-
#: ../calendar/gui/e-calendar-table.etspec.h:2
#, no-c-format
msgid "% Complete"
@@ -4949,63 +4877,113 @@ msgstr "å¼?å§?æ?¥æ??"
msgid "Type"
msgstr "ç±»å??"
-#: ../calendar/gui/e-calendar-view.c:1537
-#: ../calendar/gui/e-itip-control.c:1183
+#: ../calendar/gui/e-calendar-view.c:392
+#, fuzzy
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected events to the clipboard"
+msgstr "å°?é??ä¸æ??å?å?ªå??å?°å?ªè´´æ?¿"
+
+#: ../calendar/gui/e-calendar-view.c:398
+#, fuzzy
+#| msgid "Copy selected text to the clipboard"
+msgid "Copy selected events to the clipboard"
+msgstr "å°?é??ä¸æ??å?å¤?å?¶å?°å?ªè´´æ?¿"
+
+#: ../calendar/gui/e-calendar-view.c:404
+#, fuzzy
+#| msgid "Paste text from the clipboard"
+msgid "Paste events from the clipboard"
+msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´æ??å?"
+
+#: ../calendar/gui/e-calendar-view.c:410
+#, fuzzy
+#| msgid "Delete selected memos"
+msgid "Delete selected events"
+msgstr "å? é?¤é??ä¸ç??å¤?å¿?"
+
+#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:186
+#: ../calendar/gui/e-task-table.c:264
+msgid "Deleting selected objects"
+msgstr "å? é?¤é??ä¸ç??对象"
+
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:841
+#: ../calendar/gui/e-task-table.c:1062
+msgid "Updating objects"
+msgstr "��对象"
+
+#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-itip-control.c:1182
#: ../calendar/gui/e-meeting-list-view.c:199
#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
#: ../plugins/itip-formatter/itip-formatter.c:2313
msgid "Accepted"
msgstr "æ?¥å??"
-#: ../calendar/gui/e-calendar-view.c:1538
-#: ../calendar/gui/e-itip-control.c:1193
+#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-itip-control.c:1192
#: ../calendar/gui/e-meeting-list-view.c:200
#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
#: ../plugins/itip-formatter/itip-formatter.c:2319
msgid "Declined"
msgstr "æ??ç»?"
-#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1692
#: ../calendar/gui/e-meeting-list-view.c:201
#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
#: ../calendar/gui/e-meeting-time-sel.c:542
msgid "Tentative"
msgstr "æ??æ?¶ç??"
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1693
#: ../calendar/gui/e-meeting-list-view.c:202
#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
#: ../plugins/itip-formatter/itip-formatter.c:2322
msgid "Delegated"
msgstr "被å§?ä»»ç??"
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1694
msgid "Needs action"
msgstr "é??è¦?å?¨ä½?"
+#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:526
+#: ../calendar/gui/e-task-table.c:737
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "ç»?ç»?è??ï¼?%s <%s>"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:531
+#: ../calendar/gui/e-task-table.c:740
+#, c-format
+msgid "Organizer: %s"
+msgstr "ç»?ç»?è??ï¼?%s"
+
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/print.c:2572
+#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2561
#, c-format
msgid "Location: %s"
msgstr "�置�%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1733
+#: ../calendar/gui/e-calendar-view.c:1886
#, c-format
msgid "Time: %s %s"
msgstr "���%s %s"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:162
+#: ../calendar/gui/e-cell-date-edit-text.c:160
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Yå¹´%mæ??%dæ?¥%A%H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
+#: ../calendar/gui/e-cell-date-edit-text.c:163
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d %A %p%I:%M:%S"
-#: ../calendar/gui/e-cell-date-edit-text.c:173
+#: ../calendar/gui/e-cell-date-edit-text.c:171
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -5018,12 +4996,12 @@ msgstr ""
#. * to change the length of the time division in the calendar day view, e.g.
#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
#.
-#: ../calendar/gui/e-day-view-time-item.c:760
+#: ../calendar/gui/e-day-view-time-item.c:759
#, c-format
msgid "%02i minute divisions"
msgstr "%02i å??é??å??å?²"
-#: ../calendar/gui/e-day-view-time-item.c:781
+#: ../calendar/gui/e-day-view-time-item.c:780
msgid "Show the second time zone"
msgstr "�示第���"
@@ -5033,8 +5011,8 @@ msgstr "�示第���"
#. month, %B = full month name. You can change the
#. order but don't change the specifiers or add
#. anything.
-#: ../calendar/gui/e-day-view-top-item.c:870 ../calendar/gui/e-day-view.c:1887
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1706
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1698
msgid "%A %d %B"
msgstr "%B%dæ?¥%A"
@@ -5044,10 +5022,10 @@ msgstr "%B%dæ?¥%A"
#. %d = day of month, %b = abbreviated month name.
#. You can change the order but don't change the
#. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:874 ../calendar/gui/e-day-view.c:1904
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
#: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:189
-#: ../modules/calendar/e-cal-shell-view-private.c:910
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:894
msgid "%a %d %b"
msgstr "%-mæ??%-dæ?¥%A"
@@ -5056,334 +5034,342 @@ msgstr "%-mæ??%-dæ?¥%A"
#. strftime format %d = day of month, %b = abbreviated
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:878 ../calendar/gui/e-day-view.c:1920
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
#: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:946
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:930
msgid "%d %b"
msgstr "%B%-dæ?¥"
#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:750
-#: ../calendar/gui/print.c:822
+#: ../calendar/gui/e-day-view.c:1120 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/print.c:814
msgid "am"
msgstr "ä¸?å??"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1126 ../calendar/gui/e-week-view.c:753
-#: ../calendar/gui/print.c:824
+#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/print.c:816
msgid "pm"
msgstr "ä¸?å??"
#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2625
+#: ../calendar/gui/e-day-view.c:2614
#, c-format
msgid "Week %d"
msgstr "第%d�"
-#: ../calendar/gui/e-itip-control.c:766
+#: ../calendar/gui/e-itip-control.c:765
msgid "Yes. (Complex Recurrence)"
msgstr "æ?¯(å¤?æ??é??ç?°)"
-#: ../calendar/gui/e-itip-control.c:783
+#: ../calendar/gui/e-itip-control.c:782
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "� %d 天"
-#: ../calendar/gui/e-itip-control.c:796
+#: ../calendar/gui/e-itip-control.c:795
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "� %d �"
-#: ../calendar/gui/e-itip-control.c:803
+#: ../calendar/gui/e-itip-control.c:802
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "æ¯? %d å?¨ç??"
#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:814
+#: ../calendar/gui/e-itip-control.c:813
msgid " and "
msgstr " å?? "
-#: ../calendar/gui/e-itip-control.c:823
+#: ../calendar/gui/e-itip-control.c:822
#, c-format
msgid "The %s day of "
msgstr "第 %s 天��"
-#: ../calendar/gui/e-itip-control.c:839
+#: ../calendar/gui/e-itip-control.c:838
#, c-format
msgid "The %s %s of "
msgstr "%s %s ��"
-#: ../calendar/gui/e-itip-control.c:850
+#: ../calendar/gui/e-itip-control.c:849
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "æ¯? %d æ??"
-#: ../calendar/gui/e-itip-control.c:862
+#: ../calendar/gui/e-itip-control.c:861
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "� %d 年"
-#: ../calendar/gui/e-itip-control.c:875
+#: ../calendar/gui/e-itip-control.c:874
#, c-format
msgid "a total of %d time"
msgid_plural "a total of %d times"
msgstr[0] "�计 %d 次"
#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:886
+#: ../calendar/gui/e-itip-control.c:885
msgid ", ending on "
msgstr "ï¼?ç»?æ??äº? "
#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:907
+#: ../calendar/gui/e-itip-control.c:906
msgid "Starts"
msgstr "��"
#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:917
+#: ../calendar/gui/e-itip-control.c:916
msgid "Ends"
msgstr "ç»?æ??"
-#: ../calendar/gui/e-itip-control.c:945
+#: ../calendar/gui/e-itip-control.c:943
#: ../plugins/save-calendar/csv-format.c:363
msgid "Due"
msgstr "å?°æ??"
-#: ../calendar/gui/e-itip-control.c:988 ../calendar/gui/e-itip-control.c:1049
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
msgid "iCalendar Information"
msgstr "iCalendar ä¿¡æ?¯"
#. Title
-#: ../calendar/gui/e-itip-control.c:1010
+#: ../calendar/gui/e-itip-control.c:1008
msgid "iCalendar Error"
msgstr "iCalendar é??误"
-#: ../calendar/gui/e-itip-control.c:1082 ../calendar/gui/e-itip-control.c:1098
-#: ../calendar/gui/e-itip-control.c:1109 ../calendar/gui/e-itip-control.c:1126
-#: ../plugins/itip-formatter/itip-view.c:349
+#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
+#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:351
#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:439
#: ../plugins/itip-formatter/itip-view.c:526
msgid "An unknown person"
msgstr "æ?ªç?¥ç??人"
-#: ../calendar/gui/e-itip-control.c:1134
+#: ../calendar/gui/e-itip-control.c:1132
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请æ?¥ç??ä¸?å??ä¿¡æ?¯ï¼?并ä»?ä¸?é?¢ç??è??å??ä¸é??æ?©ä¸?个å?¨ä½?ã??"
-#: ../calendar/gui/e-itip-control.c:1188
+#. Translators: "None" used as a default value for events without Summary received by mail
+#: ../calendar/gui/e-itip-control.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:2300
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-itip"
+msgid "None"
+msgstr "æ? "
+
+#: ../calendar/gui/e-itip-control.c:1187
#: ../plugins/itip-formatter/itip-formatter.c:2316
msgid "Tentatively Accepted"
msgstr "æ??æ?¶æ?¥å??"
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1277
msgid ""
"The meeting has been canceled, however it could not be found in your "
"calendars"
msgstr "ä¼?议已ç»?被å??æ¶?ï¼?ä½?æ? æ³?å?¨æ?¨ç??æ?¥å??ä¸æ?¾å?°è¯¥ä¼?è®®"
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1279
msgid ""
"The task has been canceled, however it could not be found in your task lists"
msgstr "ä»»å?¡å·²ç»?被å??æ¶?ï¼?ä½?æ? æ³?å?¨æ?¨ç??ä»»å?¡å??表ä¸æ?¾å?°è¯¥ä»»å?¡"
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1356
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> å??å¸?äº?ä¼?议信æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1357
msgid "Meeting Information"
msgstr "�议信�"
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1363
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> 请æ±? %s å??å? ä¸?个ä¼?è®®ã??"
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1365
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请æ±?æ?¨å??å? ä¸?个ä¼?è®®ã??"
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1366
msgid "Meeting Proposal"
msgstr "�议建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1372
#, c-format
msgid "<b>%s</b> wishes to be added to an existing meeting."
msgstr "<b>%s</b> å¸?æ??å? å?¥å?°å·²æ??ç??ä¼?è®®ã??"
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1373
msgid "Meeting Update"
msgstr "�议��"
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1377
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> å¸?æ??æ?¶å?°æ??æ?°ç??ä¼?议信æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1378
msgid "Meeting Update Request"
msgstr "�议��请�"
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1385
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> å·²å??å¤?ä¸?个ä¼?议请æ±?ã??"
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1386
msgid "Meeting Reply"
msgstr "ä¼?è®®ç?å¤?"
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1393
#, c-format
msgid "<b>%s</b> has canceled a meeting."
msgstr "<b>%s</b> å??æ¶?äº?ä¸?个ä¼?è®®ã??"
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1394
msgid "Meeting Cancelation"
msgstr "ä¼?è®®å??æ¶?"
-#: ../calendar/gui/e-itip-control.c:1405 ../calendar/gui/e-itip-control.c:1482
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> å??é??äº?ä¸?个æ? æ³?ç??解ç??信件ã??"
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1405
msgid "Bad Meeting Message"
msgstr "é??误ç??ä¼?议信件"
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1432
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> å??å¸?äº?ä»»å?¡ä¿¡æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1433
msgid "Task Information"
msgstr "任�信�"
-#: ../calendar/gui/e-itip-control.c:1441
+#: ../calendar/gui/e-itip-control.c:1440
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请æ±? %s å®?æ??ä¸?个任å?¡ã??"
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1442
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请æ±?æ?¨å®?æ??ä¸?个任å?¡ã??"
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1443
msgid "Task Proposal"
msgstr "任�建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1449
#, c-format
msgid "<b>%s</b> wishes to be added to an existing task."
msgstr "<b>%s<b> å¸?æ??å? å?¥å?°å·²æ??ç??ä»»å?¡ã??"
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1450
msgid "Task Update"
msgstr "任���"
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1454
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> å¸?æ??è?·å??æ??æ?°ç??ä»»å?¡ä¿¡æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1455
msgid "Task Update Request"
msgstr "任���请�"
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1462
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> å·²ç»?å??å¤?äº?ä»»å?¡å??é??ã??"
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1463
msgid "Task Reply"
msgstr "ä»»å?¡å??å¤?"
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1470
#, c-format
msgid "<b>%s</b> has canceled a task."
msgstr "<b>%s</b> å??æ¶?äº?ä»»å?¡ã??"
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1471
msgid "Task Cancelation"
msgstr "ä»»å?¡å??æ¶?"
-#: ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1482
msgid "Bad Task Message"
msgstr "é??误ç??ä»»å?¡ä¿¡ä»¶"
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1506
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> å??å¸?äº?å¿?é?²ä¿¡æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1507
msgid "Free/Busy Information"
msgstr "��信�"
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1511
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请æ±?æ?¨ç??å¿?é?²ä¿¡æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1512
msgid "Free/Busy Request"
msgstr "�/�请�"
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1516
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> åº?ç?äº?å¿?é?²è¯·æ±?ã??"
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1517
msgid "Free/Busy Reply"
msgstr "å¿?é?²åº?ç?"
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1522
msgid "Bad Free/Busy Message"
msgstr "é??误ç??å¿?é?²ä¿¡ä»¶"
-#: ../calendar/gui/e-itip-control.c:1599
+#: ../calendar/gui/e-itip-control.c:1598
msgid "The message does not appear to be properly formed"
msgstr "信件ç??æ ¼å¼?å?¯è?½ä¸?æ£ç¡®"
-#: ../calendar/gui/e-itip-control.c:1658
+#: ../calendar/gui/e-itip-control.c:1657
msgid "The message contains only unsupported requests."
msgstr "信件å?ªå?«æ??ä¸?æ?¯æ??ç??请æ±?ã??"
-#: ../calendar/gui/e-itip-control.c:1691
+#: ../calendar/gui/e-itip-control.c:1690
msgid "The attachment does not contain a valid calendar message"
msgstr "é??件ä¸æ²¡æ??æ??æ??ç??æ?¥å??信件"
-#: ../calendar/gui/e-itip-control.c:1729
+#: ../calendar/gui/e-itip-control.c:1728
msgid "The attachment has no viewable calendar items"
msgstr "é??件ä¸æ²¡æ??å?¯æ?¥ç??ç??æ?¥å??项ç?®"
-#: ../calendar/gui/e-itip-control.c:1971
+#: ../calendar/gui/e-itip-control.c:1970
msgid "Update complete\n"
msgstr "æ?´æ?°å®?æ??\n"
-#: ../calendar/gui/e-itip-control.c:2005
+#: ../calendar/gui/e-itip-control.c:2004
msgid "Object is invalid and cannot be updated\n"
msgstr "对象æ? æ??ï¼?æ? æ³?æ?´æ?°\n"
@@ -5400,7 +5386,7 @@ msgid "Attendee status updated\n"
msgstr "æ?´æ?°å?ºå¸è??ç?¶æ??\n"
#: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1409
+#: ../plugins/itip-formatter/itip-formatter.c:1408
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "ç?±äº?æ?¡ç?®ä¸?å??å?å?¨è??æ? æ³?æ?´æ?°å?ºå¸è??ç?¶æ??"
@@ -5428,7 +5414,7 @@ msgid "Update"
msgstr "æ?´æ?°"
#: ../calendar/gui/e-itip-control.c:2353
-#: ../plugins/groupwise-features/gw-ui.c:332
+#: ../plugins/groupwise-features/gw-ui.c:331
msgid "Accept"
msgstr "æ?¥å??"
@@ -5437,7 +5423,7 @@ msgid "Tentatively accept"
msgstr "æ??æ?¶æ?¥å??"
#: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/gw-ui.c:346
+#: ../plugins/groupwise-features/gw-ui.c:345
msgid "Decline"
msgstr "æ??ç»?"
@@ -5454,7 +5440,7 @@ msgid "Send Latest Information"
msgstr "å??é??æ??æ?°ç??ä¿¡æ?¯"
#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
#: ../widgets/misc/e-activity-proxy.c:299
msgid "Cancel"
msgstr "å??æ¶?"
@@ -5505,49 +5491,49 @@ msgstr "��"
#: ../calendar/gui/e-meeting-list-view.c:159
#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:971
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:963
msgid "Individual"
msgstr "个人"
#: ../calendar/gui/e-meeting-list-view.c:160
#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:972 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:964 ../widgets/table/e-table-config.ui.h:7
msgid "Group"
msgstr "ç»?"
#: ../calendar/gui/e-meeting-list-view.c:161
#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/print.c:973
+#: ../calendar/gui/print.c:965
msgid "Resource"
msgstr "��"
#: ../calendar/gui/e-meeting-list-view.c:162
#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../calendar/gui/print.c:974
+#: ../calendar/gui/print.c:966
msgid "Room"
msgstr "æ?¿é?´"
#: ../calendar/gui/e-meeting-list-view.c:173
#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/print.c:980
msgid "Chair"
msgstr "主å¸"
#: ../calendar/gui/e-meeting-list-view.c:174
#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:989
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:981
msgid "Required Participant"
msgstr "å¿?é??ç??å?ºå¸è??"
#: ../calendar/gui/e-meeting-list-view.c:175
#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/print.c:990
+#: ../calendar/gui/print.c:982
msgid "Optional Participant"
msgstr "å?¯é??ç??å?ºå¸è??"
#: ../calendar/gui/e-meeting-list-view.c:176
#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/print.c:991
+#: ../calendar/gui/print.c:983
msgid "Non-Participant"
msgstr "ä¸?å??å? "
@@ -5569,7 +5555,7 @@ msgstr "å¤?ç??ä¸"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2285
+#: ../calendar/gui/e-meeting-time-sel.c:2284
msgid "%A, %B %d, %Y"
msgstr "%Yå¹´%mæ??%dæ?¥%A"
@@ -5578,7 +5564,7 @@ msgstr "%Yå¹´%mæ??%dæ?¥%A"
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
#: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2316
+#: ../calendar/gui/e-meeting-time-sel.c:2315
msgid "%a %m/%d/%Y"
msgstr "%Yå¹´%mæ??%dæ?¥%A"
@@ -5640,15 +5626,15 @@ msgstr "å?¨é?¨äººå??ä¸?个èµ?æº?(_P)"
msgid "_Required people"
msgstr "å¿?é??ç??人(_R)"
-#: ../calendar/gui/e-meeting-time-sel.c:715
+#: ../calendar/gui/e-meeting-time-sel.c:714
msgid "Required people and _one resource"
msgstr "å¿?é??ç??人å??ä¸?个èµ?æº?(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:761
+#: ../calendar/gui/e-meeting-time-sel.c:760
msgid "_Start time:"
msgstr "����(_S)�"
-#: ../calendar/gui/e-meeting-time-sel.c:798
+#: ../calendar/gui/e-meeting-time-sel.c:797
msgid "_End time:"
msgstr "ç»?æ??æ?¶é?´(_E)ï¼?"
@@ -5676,18 +5662,145 @@ msgstr "è¯è¨?"
msgid "Member"
msgstr "æ??å??"
-#: ../calendar/gui/e-memo-table.c:638
-#: ../modules/calendar/e-cal-shell-content.c:461
-#: ../modules/calendar/e-memo-shell-view-actions.c:254
-#: ../modules/calendar/e-memo-shell-view-actions.c:271
-#: ../modules/calendar/e-memo-shell-view.c:292
+#: ../calendar/gui/e-memo-table.c:410
+#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view.c:289
+#: ../plugins/caldav/caldav-browse-server.c:432
msgid "Memos"
msgstr "��"
+#: ../calendar/gui/e-memo-table.c:488 ../calendar/gui/e-task-table.c:701
+msgid "* No Summary *"
+msgstr "* 没æ??æ¦?è¦? *"
+
+#: ../calendar/gui/e-memo-table.c:572 ../calendar/gui/e-task-table.c:781
+msgid "Start: "
+msgstr "���"
+
+#: ../calendar/gui/e-memo-table.c:590 ../calendar/gui/e-task-table.c:799
+msgid "Due: "
+msgstr "å?°æ??ï¼?"
+
+#: ../calendar/gui/e-memo-table.c:706
+#, fuzzy
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected memos to the clipboard"
+msgstr "å°?é??ä¸æ??å?å?ªå??å?°å?ªè´´æ?¿"
+
+#: ../calendar/gui/e-memo-table.c:712
+#, fuzzy
+#| msgid "Copy selected messages to the clipboard"
+msgid "Copy selected memos to the clipboard"
+msgstr "å°?é??ä¸ä¿¡ä»¶å¤?å?¶å?°å?ªè´´æ?¿"
+
+#: ../calendar/gui/e-memo-table.c:718
+#, fuzzy
+#| msgid "Paste memo from the clipboard"
+msgid "Paste memos from the clipboard"
+msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´å¤?å¿?"
+
+#: ../calendar/gui/e-memo-table.c:724
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
+msgid "Delete selected memos"
+msgstr "å? é?¤é??ä¸ç??å¤?å¿?"
+
+#: ../calendar/gui/e-memo-table.c:730
+#, fuzzy
+#| msgid "Select all visible messages"
+msgid "Select all visible memos"
+msgstr "é??ä¸æ??æ??å?¯è§?ç??信件"
+
#: ../calendar/gui/e-memo-table.etspec.h:2
msgid "Click to add a memo"
msgstr "å??å?»ä»¥æ·»å? å¤?å¿?"
+#: ../calendar/gui/e-task-table.c:529
+msgid "0%"
+msgstr "0%"
+
+#: ../calendar/gui/e-task-table.c:530
+msgid "10%"
+msgstr "10%"
+
+#: ../calendar/gui/e-task-table.c:531
+msgid "20%"
+msgstr "20%"
+
+#: ../calendar/gui/e-task-table.c:532
+msgid "30%"
+msgstr "30%"
+
+#: ../calendar/gui/e-task-table.c:533
+msgid "40%"
+msgstr "40%"
+
+#: ../calendar/gui/e-task-table.c:534
+msgid "50%"
+msgstr "50%"
+
+#: ../calendar/gui/e-task-table.c:535
+msgid "60%"
+msgstr "60%"
+
+#: ../calendar/gui/e-task-table.c:536
+msgid "70%"
+msgstr "70%"
+
+#: ../calendar/gui/e-task-table.c:537
+msgid "80%"
+msgstr "80%"
+
+#: ../calendar/gui/e-task-table.c:538
+msgid "90%"
+msgstr "90%"
+
+#: ../calendar/gui/e-task-table.c:539
+msgid "100%"
+msgstr "100%"
+
+#: ../calendar/gui/e-task-table.c:623 ../calendar/gui/print.c:2006
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:264
+#: ../modules/calendar/e-task-shell-view.c:437
+#: ../plugins/caldav/caldav-browse-server.c:430
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "任�"
+
+#: ../calendar/gui/e-task-table.c:927
+#, fuzzy
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected tasks to the clipboard"
+msgstr "å°?é??ä¸æ??å?å?ªå??å?°å?ªè´´æ?¿"
+
+#: ../calendar/gui/e-task-table.c:933
+#, fuzzy
+#| msgid "Copy selected text to the clipboard"
+msgid "Copy selected tasks to the clipboard"
+msgstr "å°?é??ä¸æ??å?å¤?å?¶å?°å?ªè´´æ?¿"
+
+#: ../calendar/gui/e-task-table.c:939
+msgid "Paste tasks from the clipboard"
+msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´ä»»å?¡"
+
+#: ../calendar/gui/e-task-table.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:701
+msgid "Delete selected tasks"
+msgstr "å? é?¤é??ä¸ç??ä»»å?¡"
+
+#: ../calendar/gui/e-task-table.c:951
+#, fuzzy
+#| msgid "Select all visible messages"
+msgid "Select all visible tasks"
+msgstr "é??ä¸æ??æ??å?¯è§?ç??信件"
+
#: ../calendar/gui/e-timezone-entry.c:330
msgid "Select Timezone"
msgstr "é??æ?©æ?¶å?º"
@@ -5695,7 +5808,7 @@ msgstr "é??æ?©æ?¶å?º"
#. 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/e-week-view-main-item.c:235 ../calendar/gui/print.c:1687
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1679
msgid "%d %B"
msgstr "%-mæ??%-dæ?¥"
@@ -5720,31 +5833,31 @@ msgstr "æ?¥å??äº?件ï¼?æ??è¦?为 %sã??"
msgid "Calendar Event: It has no summary."
msgstr "æ?¥å??äº?件ï¼?æ? æ??è¦?ã??"
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:299
msgid "calendar view event"
msgstr "æ?¥å??è§?å?¾äº?件"
-#: ../calendar/gui/ea-cal-view-event.c:525
+#: ../calendar/gui/ea-cal-view-event.c:527
msgid "Grab Focus"
msgstr "����"
-#: ../calendar/gui/ea-cal-view.c:298
+#: ../calendar/gui/ea-cal-view.c:300
msgid "New Appointment"
msgstr "�建约�"
-#: ../calendar/gui/ea-cal-view.c:299
+#: ../calendar/gui/ea-cal-view.c:301
msgid "New All Day Event"
msgstr "�建�天�件"
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:302
msgid "New Meeting"
msgstr "æ?°ä¼?è®®"
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:303
msgid "Go to Today"
msgstr "转��天"
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:304
msgid "Go to Date"
msgstr "转å?°æ?¥æ??"
@@ -5753,9 +5866,7 @@ msgstr "转å?°æ?¥æ??"
msgid "a table to view and select the current time range"
msgstr "å?¯æ?¥ç??并é??æ?©å½?å??æ?¶é?´è??å?´ç??表"
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:147 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
#, c-format
msgid "It has %d event."
msgid_plural "It has %d events."
@@ -5763,14 +5874,14 @@ msgstr[0] "æ?? %d 个äº?件ã??"
#. To translators: Here, "It" is either like "Work Week View: July
#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
msgid "It has no events."
msgstr "æ? äº?件ã??"
#. To translators: First %s is the week, for example "July 10th -
#. July 14th, 2006". Second %s is the number of events in this work
#. week, for example "It has %d event/events." or "It has no events."
-#: ../calendar/gui/ea-day-view.c:158
+#: ../calendar/gui/ea-day-view.c:160
#, c-format
msgid "Work Week View: %s. %s"
msgstr "å·¥ä½?æ?¥è§?å?¾ï¼?%sã??%s"
@@ -5778,55 +5889,55 @@ msgstr "å·¥ä½?æ?¥è§?å?¾ï¼?%sã??%s"
#. To translators: First %s is the day, for example "Thursday July
#. 13th, 2006". Second %s is the number of events on this day, for
#. example "It has %d event/events." or "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:166
#, c-format
msgid "Day View: %s. %s"
msgstr "æ?¥è§?å?¾ï¼?%sã??%s"
-#: ../calendar/gui/ea-day-view.c:195
+#: ../calendar/gui/ea-day-view.c:197
msgid "calendar view for a work week"
msgstr "å·¥ä½?æ?¥ç??æ?¥å??è§?å?¾"
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:199
msgid "calendar view for one or more days"
msgstr "ä¸?天æ??å¤?天ç??æ?¥å??è§?å?¾"
-#: ../calendar/gui/ea-gnome-calendar.c:186
-#: ../modules/calendar/e-cal-shell-view-private.c:906
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "Gnome æ?¥å??"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:890
msgid "%A %d %b %Y"
msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
-#: ../calendar/gui/ea-gnome-calendar.c:191
-#: ../calendar/gui/ea-gnome-calendar.c:196
-#: ../calendar/gui/ea-gnome-calendar.c:198
-#: ../modules/calendar/e-cal-shell-view-private.c:913
-#: ../modules/calendar/e-cal-shell-view-private.c:919
-#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:906
msgid "%a %d %b %Y"
msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
-#: ../calendar/gui/ea-gnome-calendar.c:215
-#: ../calendar/gui/ea-gnome-calendar.c:221
-#: ../calendar/gui/ea-gnome-calendar.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:229
-#: ../modules/calendar/e-cal-shell-view-private.c:939
-#: ../modules/calendar/e-cal-shell-view-private.c:950
-#: ../modules/calendar/e-cal-shell-view-private.c:957
-#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../calendar/gui/ea-gnome-calendar.c:226
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../modules/calendar/e-cal-shell-view-private.c:923
+#: ../modules/calendar/e-cal-shell-view-private.c:934
+#: ../modules/calendar/e-cal-shell-view-private.c:941
+#: ../modules/calendar/e-cal-shell-view-private.c:944
msgid "%d %b %Y"
msgstr "%Yå¹´%-mæ??%-dæ?¥"
-#: ../calendar/gui/ea-gnome-calendar.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
-msgid "Gnome Calendar"
-msgstr "Gnome æ?¥å??"
-
-#: ../calendar/gui/ea-jump-button.c:146
+#: ../calendar/gui/ea-jump-button.c:147
msgid "Jump button"
msgstr "跳转æ??é?®"
-#: ../calendar/gui/ea-jump-button.c:155
+#: ../calendar/gui/ea-jump-button.c:156
msgid "Click here, you can find more events."
msgstr "å??å?»æ¤å¤?å?¯æ?¥æ?¾æ?´å¤?äº?件ã??"
@@ -5848,12 +5959,7 @@ msgstr "æ??æ?¥å??è§?å?¾"
msgid "calendar view for one or more weeks"
msgstr "ä¸?å?¨æ??å¤?å?¨ç??æ?¥å??è§?å?¾"
-#: ../calendar/gui/gnome-cal.c:1946
-#, c-format
-msgid "Loading appointments at %s"
-msgstr "è£?å?¥ä½?äº? %s ç??约ä¼?"
-
-#: ../calendar/gui/gnome-cal.c:2567
+#: ../calendar/gui/gnome-cal.c:2144
msgid "Purging"
msgstr "é??æ¯?"
@@ -5922,23 +6028,23 @@ msgstr "å¿?须设å®?ç»?ç»?è??ã??"
msgid "At least one attendee is necessary"
msgstr "è?³å°?é??è¦?ä¸?个å??å? è??"
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:780
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:784
msgid "Event information"
msgstr "�件信�"
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:787
msgid "Task information"
msgstr "任�信�"
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:790
msgid "Memo information"
msgstr "��信�"
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:643 ../calendar/gui/itip-utils.c:808
msgid "Free/Busy information"
msgstr "��信�"
-#: ../calendar/gui/itip-utils.c:642
+#: ../calendar/gui/itip-utils.c:646
msgid "Calendar information"
msgstr "æ?¥å??ä¿¡æ?¯"
@@ -5946,7 +6052,7 @@ msgstr "æ?¥å??ä¿¡æ?¯"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:676
+#: ../calendar/gui/itip-utils.c:680
msgctxt "Meeting"
msgid "Accepted"
msgstr "æ?¥å??"
@@ -5955,7 +6061,7 @@ msgstr "æ?¥å??"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:683
+#: ../calendar/gui/itip-utils.c:687
msgctxt "Meeting"
msgid "Tentatively Accepted"
msgstr "æ??æ?¶æ?¥å??"
@@ -5967,7 +6073,7 @@ msgstr "æ??æ?¶æ?¥å??"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:738
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:742
msgctxt "Meeting"
msgid "Declined"
msgstr "æ??ç»?"
@@ -5976,7 +6082,7 @@ msgstr "æ??ç»?"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:697
+#: ../calendar/gui/itip-utils.c:701
msgctxt "Meeting"
msgid "Delegated"
msgstr "被å§?ä»»ç??"
@@ -5984,7 +6090,7 @@ msgstr "被å§?ä»»ç??"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:710
+#: ../calendar/gui/itip-utils.c:714
msgctxt "Meeting"
msgid "Updated"
msgstr "æ?´æ?°"
@@ -5992,7 +6098,7 @@ msgstr "æ?´æ?°"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:717
+#: ../calendar/gui/itip-utils.c:721
msgctxt "Meeting"
msgid "Cancel"
msgstr "å??æ¶?"
@@ -6000,7 +6106,7 @@ msgstr "å??æ¶?"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:724
+#: ../calendar/gui/itip-utils.c:728
msgctxt "Meeting"
msgid "Refresh"
msgstr "å?·æ?°"
@@ -6008,29 +6114,29 @@ msgstr "å?·æ?°"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:731
+#: ../calendar/gui/itip-utils.c:735
msgctxt "Meeting"
msgid "Counter-proposal"
msgstr "æ??票表å?³"
-#: ../calendar/gui/itip-utils.c:801
+#: ../calendar/gui/itip-utils.c:805
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "��信� (%s � %s)"
-#: ../calendar/gui/itip-utils.c:809
+#: ../calendar/gui/itip-utils.c:813
msgid "iCalendar information"
msgstr "iCalendar ä¿¡æ?¯"
-#: ../calendar/gui/itip-utils.c:829
+#: ../calendar/gui/itip-utils.c:833
msgid "Unable to book a resource, the new event collides with some other."
msgstr ""
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:835
msgid "Unable to book a resource, error: "
msgstr ""
-#: ../calendar/gui/itip-utils.c:985
+#: ../calendar/gui/itip-utils.c:988
msgid "You must be an attendee of the event."
msgstr "æ?¨å¿?é¡»æ?¯äº?件ç??å?ºå¸è??ã??"
@@ -6186,49 +6292,49 @@ msgstr "�"
msgid "Sa"
msgstr "å?"
-#: ../calendar/gui/print.c:2536
+#: ../calendar/gui/print.c:2525
msgid "Appointment"
msgstr "约�"
-#: ../calendar/gui/print.c:2538
+#: ../calendar/gui/print.c:2527
msgid "Task"
msgstr "任�"
-#: ../calendar/gui/print.c:2563
+#: ../calendar/gui/print.c:2552
#, c-format
msgid "Summary: %s"
msgstr "���%s"
-#: ../calendar/gui/print.c:2586
+#: ../calendar/gui/print.c:2575
msgid "Attendees: "
msgstr "å?ºå¸è??ï¼?"
-#: ../calendar/gui/print.c:2626
+#: ../calendar/gui/print.c:2615
#, c-format
msgid "Status: %s"
msgstr "ç?¶æ??ï¼?%s"
-#: ../calendar/gui/print.c:2640
+#: ../calendar/gui/print.c:2629
#, c-format
msgid "Priority: %s"
msgstr "ä¼?å??级ï¼?%s"
-#: ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2644
#, c-format
msgid "Percent Complete: %i"
msgstr "å®?æ??ç??ï¼?%i"
-#: ../calendar/gui/print.c:2666
+#: ../calendar/gui/print.c:2655
#, c-format
msgid "URL: %s"
msgstr "URLï¼?%s"
-#: ../calendar/gui/print.c:2679
+#: ../calendar/gui/print.c:2668
#, c-format
msgid "Categories: %s"
msgstr "类��%s"
-#: ../calendar/gui/print.c:2690
+#: ../calendar/gui/print.c:2679
msgid "Contacts: "
msgstr "è??系人ï¼?"
@@ -6259,7 +6365,7 @@ msgstr "约ä¼?å??ä¼?è®®"
#: ../calendar/importers/icalendar-importer.c:335
#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1821
+#: ../plugins/itip-formatter/itip-formatter.c:1820
msgid "Opening calendar"
msgstr "æ??å¼?æ?¥å??"
@@ -7854,7 +7960,7 @@ msgid "Attach a file"
msgstr "æ·»å? é??件"
#: ../composer/e-composer-actions.c:286
-#: ../widgets/misc/e-signature-editor.c:200
+#: ../widgets/misc/e-signature-editor.c:203
msgid "_Close"
msgstr "å?³é?(_C)"
@@ -7890,7 +7996,7 @@ msgstr "å?¦å?为è??稿(_D)"
msgid "Save as draft"
msgstr "å?¦å?为è??稿"
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:202
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:264
msgid "S_end"
msgstr "å??é??(_E)"
@@ -7910,10 +8016,6 @@ msgstr "æ??å¼?æ?°å»ºä¿¡ä»¶çª?å?£"
msgid "Character _Encoding"
msgstr "å?符ç¼?ç ?(_E)"
-#: ../composer/e-composer-actions.c:351
-msgid "_Security"
-msgstr "å®?å?¨(_S)"
-
#: ../composer/e-composer-actions.c:361
msgid "PGP _Encrypt"
msgstr "PGP å? å¯?(_E)"
@@ -7998,66 +8100,76 @@ msgstr "æ?¯å?¦æ?¾ç¤ºå??å¤?å??"
msgid "Save Draft"
msgstr "ä¿?å?è??稿"
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header.c:129
+#, fuzzy
+#| msgid "Sho_w:"
+msgid "Show"
+msgstr "�示(_W)�"
+
+#: ../composer/e-composer-header.c:137
+#, fuzzy
+#| msgid "_Hide"
+msgid "Hide"
+msgstr "é??è??(_H)"
+
+#: ../composer/e-composer-header-table.c:42
msgid "Enter the recipients of the message"
msgstr "è¾?å?¥ä¿¡ä»¶ç??æ?¶ä»¶äºº"
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:44
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡ä»¶å?¯æ?¬ç??æ?¶ä»¶äººå?°å??"
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:47
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message"
msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡ä»¶å?¯æ?¬ï¼?ä½?ä¸?å?ºç?°å?¨æ?¶ä»¶äººå??表ä¸ç??æ?¶ä»¶äººå?°å??"
-#: ../composer/e-composer-header-table.c:949
+#: ../composer/e-composer-header-table.c:959
msgid "Fr_om:"
msgstr "å??件人(_O)ï¼?"
-#: ../composer/e-composer-header-table.c:949
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:959
+#: ../composer/e-composer-header-table.c:959
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
#: ../modules/mail/em-mailer-prefs.c:77
msgid "From"
msgstr "å??件人"
-#: ../composer/e-composer-header-table.c:958
+#: ../composer/e-composer-header-table.c:968
msgid "_Reply-To:"
msgstr "å??å¤?å?°(_R)ï¼?"
-#: ../composer/e-composer-header-table.c:963
+#: ../composer/e-composer-header-table.c:973
msgid "_To:"
msgstr "�信人(_T)�"
-#: ../composer/e-composer-header-table.c:969
+#: ../composer/e-composer-header-table.c:979
msgid "_Cc:"
msgstr "æ??é??(_C)ï¼?"
-#: ../composer/e-composer-header-table.c:969
-#, fuzzy
-msgid "Show CC"
-msgstr "�示(_W)�"
+#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
-#: ../composer/e-composer-header-table.c:975
+#: ../composer/e-composer-header-table.c:985
msgid "_Bcc:"
msgstr "æ??é??(_B)ï¼?"
-#: ../composer/e-composer-header-table.c:975
-#, fuzzy
-msgid "Show BCC"
-msgstr "�示(_W)�"
+#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:990
msgid "_Post To:"
msgstr "æ??é??å?°(_P)ï¼?"
-#: ../composer/e-composer-header-table.c:984
+#: ../composer/e-composer-header-table.c:994
msgid "S_ubject:"
msgstr "主�(_U)�"
-#: ../composer/e-composer-header-table.c:993
+#: ../composer/e-composer-header-table.c:1003
msgid "Si_gnature:"
msgstr "ç¾å??(_G)ï¼?"
@@ -8069,38 +8181,38 @@ msgstr "å??å?»æ¤å¤?以使ç?¨å?°å??ç°¿"
msgid "Click here to select folders to post to"
msgstr "å??å?»æ¤å¤?以é??æ?©è¦?æ??é??å?°ç??æ??件夹"
-#: ../composer/e-composer-private.c:218
+#: ../composer/e-composer-private.c:284
#, fuzzy
msgid "Save draft"
msgstr "ä¿?å?è??稿"
#. Check buttons
-#: ../composer/e-msg-composer.c:193 ../mail/em-utils.c:180
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
#: ../plugins/attachment-reminder/attachment-reminder.c:128
msgid "_Do not show this message again."
msgstr "ä¸?å??æ?¾ç¤ºæ¤ä¿¡æ?¯(_D)ã??"
-#: ../composer/e-msg-composer.c:989
+#: ../composer/e-msg-composer.c:983
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr "æ? æ³?对å¯?å?ºç??信件ç¾å??ï¼?æ?ªå¯¹æ¤è´¦æ?·è®¾ç½®ç¾å??è¯?书"
-#: ../composer/e-msg-composer.c:996
+#: ../composer/e-msg-composer.c:990
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr "æ? æ³?对å¯?å?ºç??信件å? å¯?ï¼?æ?ªå¯¹æ¤è´¦æ?·è®¾ç½®å? å¯?è¯?书"
-#: ../composer/e-msg-composer.c:1385
+#: ../composer/e-msg-composer.c:1379
#, fuzzy
msgid "Unable to reconstruct message from autosave file"
msgstr "æ? æ³?ä»?ç¼?è¾?å?¨è?·å??信件"
-#: ../composer/e-msg-composer.c:1451 ../composer/e-msg-composer.c:2178
+#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
msgid "Compose Message"
msgstr "æ?°å??æ?°ä¿¡ä»¶"
-#: ../composer/e-msg-composer.c:3408
+#: ../composer/e-msg-composer.c:3310
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)</"
"b>"
@@ -8160,40 +8272,28 @@ msgid "Could not save to autosave file "{0}"."
msgstr "æ? æ³?ä¿?å?å?°è?ªå?¨ä¿?å?æ??件â??{0}â??ã??"
#: ../composer/mail-composer.error.xml.h:12
-msgid "Directories can not be attached to Messages."
-msgstr "æ? æ³?å°?ç?®å½?ä½?为信件ç??é??件ã??"
-
-#: ../composer/mail-composer.error.xml.h:13
msgid "Do you want to recover unfinished messages?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?æ?¢å¤?æ?ªå®?æ??ç??信件ï¼?"
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:13
msgid "Download in progress. Do you want to send the mail?"
msgstr "ä¸?è½½è¿?è¡?ä¸ã??æ?¨æ?³è¦?å??é??é?®ä»¶å??ï¼?"
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
msgid "Error saving to autosave because "{1}"."
msgstr "ä¿?å?å?°è?ªå?¨ä¿?å?å?ºé??ï¼?å??å? æ?¯â??{1}â??ã??"
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
msgid ""
"Evolution quit unexpectedly while you were composing a new message. "
"Recovering the message will allow you to continue where you left off."
msgstr "å?¨æ?¨ä¸?次ç¼?å??æ?°ä¿¡ä»¶æ?¶ Evolution æ??å¤?é??å?ºã??æ?¢å¤?é?®ä»¶å°?å??许æ?¨ç»§ç»å®?æ??ã??"
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:16
msgid "The file `{0}' is not a regular file and cannot be sent in a message."
msgstr "æ??件â??{0}â??ä¸?æ?¯æ?®é??æ??件ï¼?æ? æ³?å?¨é?®ä»¶ä¸å??é??ã??"
-#: ../composer/mail-composer.error.xml.h:18
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"è¦?å°?æ¤ç?®å½?ç??å??容ä½?为é??件ï¼?æ?¨é??è¦?é??ä¸?æ·»å? æ¤ç?®å½?ä¸ç??æ??件ï¼?æ??è??å??建ä¸?个æ¤ç?®å½?ç??"
-"å½?æ¡£æ??件ï¼?ç?¶å??å°?æ¤å½?æ¡£ä½?为é??件ã??"
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:17
msgid ""
"Unable to activate the HTML editor control.\n"
"\n"
@@ -8203,39 +8303,31 @@ msgstr ""
"æ? æ³?æ¿?æ´» HTML ç¼?è¾?å?¨ç»?件ã??\n"
"请确å®?æ?¨ç?? gtkhtml å?? libgtkhtml æ??å®?è£?ç??ç??æ?¬æ£ç¡®ã??"
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:20
msgid "Unable to activate the address selector control."
msgstr "æ? æ³?æ¿?æ´»å?°å??é??æ?©æ?§å?¶ã??"
-#: ../composer/mail-composer.error.xml.h:23
-msgid "Unfinished messages found"
-msgstr "æ?¾å?°äº?æ?ªå®?æ??ç??信件"
-
-#: ../composer/mail-composer.error.xml.h:24
-msgid "Warning: Modified Message"
-msgstr "è¦å??ï¼?已修æ?¹ç??信件"
-
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:21
msgid "You cannot attach the file `{0}' to this message."
msgstr "æ?¨æ? æ³?å°?æ??件â??{0}â??ä½?为è¿?å°?ä¿¡ç??é??件ã??"
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:22
msgid "You need to configure an account before you can compose mail."
msgstr "å?¨æ?¨å?¯ä»¥æ?°å??é?®ä»¶ä¹?å??æ?¨é??è¦?é??ç½®ä¸?个å¸?æ?·ã??"
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:23
msgid "_Continue Editing"
msgstr "继ç»ç¼?è¾?(_C)"
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:25
msgid "_Do not Recover"
msgstr "���(_D)"
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:26
msgid "_Recover"
msgstr "��(_R)"
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:27
msgid "_Save Draft"
msgstr "ä¿?å?è??稿(_S)"
@@ -8248,9 +8340,8 @@ msgstr "æ?¥å??ä¿¡æ?¯"
msgid "Evolution Alarm Notify"
msgstr "Evolution æ??é??é??ç?¥"
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:715
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/e-shell-window-private.c:209
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:786
+#: ../shell/e-shell-window-private.c:255
msgid "Evolution"
msgstr "Evolution"
@@ -8258,7 +8349,7 @@ msgstr "Evolution"
msgid "Evolution Mail and Calendar"
msgstr "Evolution é?®ä»¶å??æ?¥å??"
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
msgid "Groupware Suite"
msgstr "Groupwise �件"
@@ -8298,6 +8389,19 @@ msgstr "%s..."
msgid "%s (%d%% complete)"
msgstr "%s (%d%% å®?æ??)"
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "Evolution é??误"
+
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "Evolution è¦å??"
+
+#: ../e-util/e-alert.c:634
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "å??é?¨é??误ï¼?请æ±?äº?æ?ªç?¥ç??é??误â??%sâ??"
+
#: ../e-util/e-charset.c:53
msgid "Arabic"
msgstr "é?¿æ??伯è¯"
@@ -8373,14 +8477,14 @@ msgstr "��"
#. strftime format of a weekday and a date.
#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1763
-#: ../plugins/itip-formatter/itip-view.c:194
-#: ../widgets/table/e-cell-date-edit.c:304
+#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../plugins/itip-formatter/itip-view.c:195
+#: ../widgets/table/e-cell-date-edit.c:311
msgid "Today"
msgstr "�天"
#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:222
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
msgid "Tomorrow"
msgstr "æ??天"
@@ -8407,25 +8511,25 @@ msgstr "使����认�"
msgid "Format:"
msgstr "æ ¼å¼?ï¼?"
-#: ../e-util/e-file-utils.c:135
+#: ../e-util/e-file-utils.c:136
#, fuzzy
msgid "(Unknown Filename)"
msgstr "æ?ªç?¥ç±»å??"
#. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:139
+#: ../e-util/e-file-utils.c:140
#, fuzzy, c-format
msgid "Writing \"%s\""
msgstr "�� %s"
#. Translators: The first string value is the basename of a
#. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:144
+#: ../e-util/e-file-utils.c:145
#, fuzzy, c-format
msgid "Writing \"%s\" to %s"
msgstr "æ??â??%sâ??å¤?å?¶å?° %s"
-#: ../e-util/e-logger.c:172
+#: ../e-util/e-logger.c:175
#, fuzzy
msgid "Name of the logger"
msgstr "è®°å½?æ?¥å¿?ç??ç»?件å??称"
@@ -8439,35 +8543,35 @@ msgstr "æ??件å??"
msgid "The filename of the module"
msgstr "æ?´æ?¹æ¤æ??件夹ç??å??称"
-#: ../e-util/e-non-intrusive-error-dialog.c:191
+#: ../e-util/e-non-intrusive-error-dialog.c:194
msgid "Debug Logs"
msgstr "����"
-#: ../e-util/e-non-intrusive-error-dialog.c:205
+#: ../e-util/e-non-intrusive-error-dialog.c:208
msgid "Show _errors in the status bar for"
msgstr "å?¨ç?¶æ??æ ?æ?¾ç¤ºé??误(_E)"
#. Translators: This is the second part of the sentence
#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:223
+#: ../e-util/e-non-intrusive-error-dialog.c:226
msgid "second(s)."
msgstr "ç§?ã??"
-#: ../e-util/e-non-intrusive-error-dialog.c:229
+#: ../e-util/e-non-intrusive-error-dialog.c:232
msgid "Log Messages:"
msgstr "�����"
-#: ../e-util/e-non-intrusive-error-dialog.c:274
+#: ../e-util/e-non-intrusive-error-dialog.c:279
msgid "Log Level"
msgstr "��级�"
-#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2627
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
#: ../mail/message-list.etspec.h:10
msgid "Messages"
msgstr "信件"
-#: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
-#: ../shell/e-shell-window-actions.c:1502
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1430
msgid "Close this window"
msgstr "å?³é?æ¤çª?å?£"
@@ -8491,17 +8595,23 @@ msgstr "��"
msgid "Error, Warnings and Debug messages"
msgstr "é??误ï¼?è¦å??å??è°?è¯?ä¿¡æ?¯"
-#: ../e-util/e-plugin.c:292 ../modules/mail/em-composer-prefs.c:473
+#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:716
+#: ../plugins/publish-calendar/publish-calendar.c:827
#: ../widgets/misc/e-account-tree-view.c:205
msgid "Enabled"
msgstr "已��"
-#: ../e-util/e-plugin.c:293
+#: ../e-util/e-plugin.c:296
msgid "Whether the plugin is enabled"
msgstr "æ??件æ?¯å?¦å·²å?¯ç?¨"
+#: ../e-util/e-plugin-util.c:424 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "å?¨"
+
#: ../e-util/e-print.c:160
msgid "An error occurred while printing"
msgstr "æ??å?°æ?¶å??ç??äº?é??误"
@@ -8515,7 +8625,7 @@ msgid ""
"The printing system did not report any additional details about the error."
msgstr "æ??å?°ç³»ç»?æ?ªæ?¥å??å?³äº?é??误ç??ä»»ä½?é¢?å¤?ç»?è??ã??"
-#: ../e-util/e-signature.c:695
+#: ../e-util/e-signature.c:699
msgid "Autogenerated"
msgstr "è?ªå?¨ç??æ??ç??"
@@ -8539,11 +8649,7 @@ msgstr "æ?¨æ??ç®?è¦?ç??å®?å??ï¼?"
msgid "File exists \"{0}\"."
msgstr "æ??件已å?å?¨â??{0}â??ã??"
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "è¦?ç??æ??件å??ï¼?"
-
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:141
msgid "_Overwrite"
msgstr "è¦?ç??(_O)"
@@ -8555,107 +8661,107 @@ msgstr "æ? æ³?æ??å¼?é?¾æ?¥ã??"
msgid "Could not display help for Evolution."
msgstr "æ? æ³?æ?¾ç¤º Evolution ç??帮å?©ã??"
-#: ../e-util/gconf-bridge.c:1222
+#: ../e-util/gconf-bridge.c:1276
#, c-format
msgid "GConf error: %s"
msgstr "GConf é??误ï¼?%s"
-#: ../e-util/gconf-bridge.c:1233
+#: ../e-util/gconf-bridge.c:1287
msgid "All further errors shown only on terminal."
msgstr "å??ç»æ??æ??ç??é??误é?½å?ªæ?¾ç¤ºå?¨ç»?端ã??"
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:960
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
#: ../modules/mail/em-mailer-prefs.c:78
msgid "Reply-To"
msgstr "å??å¤?è?³"
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2236 ../mail/em-format-html.c:2300
-#: ../mail/em-format-html.c:2321 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
+#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
+#: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
msgid "Cc"
msgstr "æ??é??"
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:963
-#: ../mail/em-format-html.c:2237 ../mail/em-format-html.c:2306
-#: ../mail/em-format-html.c:2324 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
+#: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
msgid "Bcc"
msgstr "å¯?件æ??é??"
-#: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:964
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1112
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
msgid "Subject"
msgstr "主�"
#. pseudo-header
-#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2416
-#: ../modules/mail/em-mailer-prefs.c:1131
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2422
+#: ../modules/mail/em-mailer-prefs.c:1130
msgid "Mailer"
msgstr "�件��"
-#: ../em-format/em-format-quote.c:432 ../mail/em-composer-utils.c:1229
+#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
msgid "-------- Forwarded Message --------"
msgstr "-------- 转å??ç??信件 --------"
-#: ../em-format/em-format.c:965 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:544
-#: ../widgets/misc/e-dateedit.c:566
+#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:567
msgid "Date"
msgstr "æ?¥æ??"
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
msgid "Newsgroups"
msgstr "���"
-#: ../em-format/em-format.c:967 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
#: ../plugins/face/org-gnome-face.eplug.xml.h:2
msgid "Face"
msgstr "头å??"
-#: ../em-format/em-format.c:1320
+#: ../em-format/em-format.c:1319
#, c-format
msgid "%s attachment"
msgstr "%s é??件"
-#: ../em-format/em-format.c:1375
+#: ../em-format/em-format.c:1374
msgid "Could not parse S/MIME message: Unknown error"
msgstr "æ? æ³?解æ?? S/MIME 信件ï¼?æ?ªç?¥é??误"
-#: ../em-format/em-format.c:1513 ../em-format/em-format.c:1675
+#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
msgid "Could not parse MIME message. Displaying as source."
msgstr "æ? æ³?解æ?? MIME 信件ã??æ?¾ç¤ºæº?æ??æ?¬ã??"
-#: ../em-format/em-format.c:1521
+#: ../em-format/em-format.c:1520
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "ä¸?æ?¯æ?? multipart/encrypted ç??å? å¯?ç±»å??"
-#: ../em-format/em-format.c:1533
+#: ../em-format/em-format.c:1532
msgid "Could not parse PGP/MIME message"
msgstr "æ? æ³?解æ?? PGP/MIME 信件"
-#: ../em-format/em-format.c:1533
+#: ../em-format/em-format.c:1532
msgid "Could not parse PGP/MIME message: Unknown error"
msgstr "æ? æ³?解æ?? PGP/MIME 信件ï¼?æ?ªç?¥é??误"
-#: ../em-format/em-format.c:1699
+#: ../em-format/em-format.c:1698
msgid "Unsupported signature format"
msgstr "ä¸?æ?¯æ??ç??ç¾å??æ ¼å¼?"
-#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1848
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
msgid "Error verifying signature"
msgstr "æ ¡éª?ç¾å??é??误"
-#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1837
-#: ../em-format/em-format.c:1848
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
+#: ../em-format/em-format.c:1847
msgid "Unknown error verifying signature"
msgstr "æ ¡éª?ç¾å??å??ç??äº?æ?ªç?¥é??误"
-#: ../em-format/em-format.c:1925
+#: ../em-format/em-format.c:1924
msgid "Could not parse PGP message"
msgstr "æ? æ³?å??æ?? PGP 信件"
-#: ../em-format/em-format.c:1925
+#: ../em-format/em-format.c:1924
msgid "Could not parse PGP message: Unknown error"
msgstr "æ? æ³?解æ?? PGP 信件ï¼?æ?ªç?¥é??误"
@@ -8766,56 +8872,56 @@ msgstr "é??æ?©ç?¨äº?æ¯?è¾?ç??æ?¶é?´"
msgid "Choose a File"
msgstr "é??æ?©æ??件"
-#: ../filter/e-filter-rule.c:653
+#: ../filter/e-filter-rule.c:659
msgid "R_ule name:"
msgstr "è§?å??å??(_U)ï¼?"
-#: ../filter/e-filter-rule.c:682
+#: ../filter/e-filter-rule.c:689
msgid "Find items that meet the following conditions"
msgstr "æ?¥æ?¾ç¬¦å??ä¸?å??æ?¡ä»¶ç??项ç?®"
-#: ../filter/e-filter-rule.c:716
+#: ../filter/e-filter-rule.c:723
msgid "A_dd Condition"
msgstr "æ·»å? å?¨ä½?(_D)"
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:732
msgid "If all conditions are met"
msgstr "å¦?æ??满足æ??æ??æ?¡ä»¶"
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:733
msgid "If any conditions are met"
msgstr "å¦?æ??满足任ä¸?æ?¡ä»¶"
-#: ../filter/e-filter-rule.c:724
+#: ../filter/e-filter-rule.c:736
msgid "_Find items:"
msgstr "��项�(_F)�"
-#: ../filter/e-filter-rule.c:744
+#: ../filter/e-filter-rule.c:760
msgid "All related"
msgstr "ç?¸å?³ç??å?¨é?¨"
-#: ../filter/e-filter-rule.c:744 ../widgets/misc/e-send-options.ui.h:15
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
msgid "Replies"
msgstr "å??å¤?"
-#: ../filter/e-filter-rule.c:744
+#: ../filter/e-filter-rule.c:762
msgid "Replies and parents"
msgstr "å??å¤?å??å??å§?é?®ä»¶"
-#: ../filter/e-filter-rule.c:744
+#: ../filter/e-filter-rule.c:763
msgid "No reply or parent"
msgstr "æ? å??å¤?æ??å??å§?é?®ä»¶"
-#: ../filter/e-filter-rule.c:746
+#: ../filter/e-filter-rule.c:766
msgid "I_nclude threads"
msgstr "å??å?«çº¿ç´¢(_N)"
-#: ../filter/e-filter-rule.c:1119 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:331
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:301
msgid "Incoming"
msgstr "��"
-#: ../filter/e-filter-rule.c:1119 ../mail/em-utils.c:332
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
msgid "Outgoing"
msgstr "��"
@@ -8930,51 +9036,46 @@ msgstr "å½?å??æ?¶é?´"
msgid "the time you specify"
msgstr "æ?¨æ??å®?ç??æ?¶é?´"
-#: ../filter/filter.ui.h:22 ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:296
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:517
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-#: ../plugins/google-account-setup/google-source.c:742
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-msgid "weeks"
-msgstr "å?¨"
-
#: ../filter/filter.ui.h:23
msgid "years"
msgstr "å¹´"
-#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:993
-#: ../mail/mail-config.ui.h:13 ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:147
+#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1025 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
+#: ../widgets/misc/e-attachment-paned.c:153
msgid "Attachment"
msgid_plural "Attachments"
msgstr[0] "é??件"
-#: ../mail/e-mail-attachment-bar.c:614
-#: ../widgets/misc/e-attachment-paned.c:607
+#: ../mail/e-mail-attachment-bar.c:617
+#: ../widgets/misc/e-attachment-paned.c:612
msgid "Icon View"
msgstr "å?¾æ ?è§?å?¾"
-#: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:608
+#: ../mail/e-mail-attachment-bar.c:618
+#: ../widgets/misc/e-attachment-paned.c:613
msgid "List View"
msgstr "å??表è§?å?¾"
-#: ../mail/e-mail-browser.c:668
+#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:634
+msgid "Focus Tracker"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:739
#, fuzzy
msgid "Shell Module"
msgstr "é??æ?©æ¨¡å¼?"
-#: ../mail/e-mail-browser.c:669 ../mail/message-list.c:2511
+#: ../mail/e-mail-browser.c:740 ../mail/message-list.c:2589
msgid "The mail shell backend"
msgstr ""
-#: ../mail/e-mail-browser.c:679
+#: ../mail/e-mail-browser.c:750
msgid "Show Deleted"
msgstr "æ?¾ç¤ºå? é?¤ç??"
-#: ../mail/e-mail-browser.c:680
+#: ../mail/e-mail-browser.c:751
msgid "Show deleted messages"
msgstr "æ?¾ç¤ºå? é?¤ç??信件"
@@ -9024,7 +9125,7 @@ msgid "_Later"
msgstr "ç¨?å??(_L)"
#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:555
+#: ../modules/mail/e-mail-shell-view-actions.c:515
msgid "Add Label"
msgstr "æ·»å? æ ?ç¾"
@@ -9044,680 +9145,745 @@ msgid "Color"
msgstr "��"
#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:584 ../mail/em-folder-tree.c:2571
-#: ../modules/mail/e-mail-shell-view-private.c:907
+#: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2570
+#: ../modules/mail/e-mail-shell-view-private.c:908
msgid "Inbox"
msgstr "�件箱"
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:577
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
msgid "Drafts"
msgstr "è??稿"
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:587
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
msgid "Outbox"
msgstr "å??件箱"
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:589
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
msgid "Sent"
msgstr "å·²å??ç®±"
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:580
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
#: ../plugins/templates/templates.c:574
msgid "Templates"
msgstr "模�"
+#: ../mail/e-mail-migrate.c:953 ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "é??è¦?"
+
+#. green
+#: ../mail/e-mail-migrate.c:956
+msgid "To Do"
+msgstr "å¾?å??"
+
+#. blue
+#: ../mail/e-mail-migrate.c:957
+msgid "Later"
+msgstr "ç¨?å??"
+
+#: ../mail/e-mail-migrate.c:1103
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+msgid "Migrating..."
+msgstr "æ£å?¨å??è¿?..."
+
+#: ../mail/e-mail-migrate.c:1136
+msgid "Migration"
+msgstr "�移"
+
+#: ../mail/e-mail-migrate.c:1176
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#, c-format
+msgid "Migrating '%s':"
+msgstr "å??è¿?â??%sâ??ï¼?"
+
+#: ../mail/e-mail-migrate.c:1586
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "æ? æ³?å??建æ?°æ??件夹â??%sâ??ï¼?%s"
+
+#: ../mail/e-mail-migrate.c:1614
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "æ? æ³?å°?æ??件夹â??%sâ??å¤?å?¶ä¸ºâ??%sâ??ï¼?%s"
+
+#: ../mail/e-mail-migrate.c:1809
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "æ? æ³?æ?«æ??ä½?äº?â??%sâ??ç??å·²æ??é?®ç®±ï¼?%s"
+
+#: ../mail/e-mail-migrate.c:1815 ../mail/e-mail-migrate.c:2912
+msgid "Migrating Folders"
+msgstr "è¿?移æ??件夹"
+
+#: ../mail/e-mail-migrate.c:1816
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution ä»»å?¡æ??件夹ç??ä½?ç½®å??å±?次ä¸? Evolution 1.x ä¸?å??ã??\n"
+"\n"
+"请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
+
+#: ../mail/e-mail-migrate.c:2019
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "æ? æ³?æ??å¼?æ?§ç?? POP ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®â??%sâ??ï¼?%s"
+
+#: ../mail/e-mail-migrate.c:2035
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "æ? æ³?å??建 POP3 ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®ç?®å½?â??%sâ??ï¼?%s"
+
+#: ../mail/e-mail-migrate.c:2067
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "æ? æ³?å¤?å?¶ POP3 å?¨æ??å?¡å?¨ä¸?ä¿?ç??ç??æ?°æ?®â??%sâ??ï¼?%s"
+
+#: ../mail/e-mail-migrate.c:2538 ../mail/e-mail-migrate.c:2552
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "å??建æ?¬å?°é?®ä»¶å?å?¨â??%sâ??失败ï¼?%s"
+
+#: ../mail/e-mail-migrate.c:2913
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"è?ª Evolution 2.4 ä¹?å??ï¼?Evolution é?®ç®±æ??件夹ç??æ??è¦?æ ¼å¼?ç?°å·²ç§»è?³ SQLiteã??\n"
+"\n"
+"请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
+
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-migrate.c:2928 ../mail/e-mail-store.c:229
+#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
+#: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1617
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "å?¨æ¤è®¡ç®?æ?ºä¸"
+
+#: ../mail/e-mail-migrate.c:3008
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "æ? æ³?å?¨â??%sâ??å??建æ?¬å?°é?®ä»¶æ??件夹ï¼?%s"
+
+#: ../mail/e-mail-migrate.c:3026
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"æ? æ³?ä»?å??å??ç?? Evolution å®?è£?ä¸è¯»å??设置ï¼?â??evolution/config.xmldbâ??ä¸?å?å?¨æ??è??å·²æ??"
+"å??ã??"
+
#. XXX e-error should provide a widget layout and API suitable
#. * for packing additional widgets to the right of the alert
#. * icon. But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:108
-#: ../modules/calendar/e-task-shell-view-actions.c:606
+#: ../mail/e-mail-reader-utils.c:105
+#: ../modules/calendar/e-task-shell-view-actions.c:580
msgid "Do not ask me again"
msgstr "ä¸?è¦?å??次询é?®"
-#: ../mail/e-mail-reader.c:215 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:208 ../mail/em-filter-i18n.h:11
msgid "Copy to Folder"
msgstr "å¤?å?¶å?°æ??件夹"
-#: ../mail/e-mail-reader.c:215 ../mail/em-folder-utils.c:381
+#: ../mail/e-mail-reader.c:208 ../mail/em-folder-utils.c:385
msgid "C_opy"
msgstr "��(_O)"
-#: ../mail/e-mail-reader.c:621 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:582 ../mail/em-filter-i18n.h:51
msgid "Move to Folder"
msgstr "移è?³æ??件夹"
-#: ../mail/e-mail-reader.c:621 ../mail/em-folder-utils.c:381
+#: ../mail/e-mail-reader.c:582 ../mail/em-folder-utils.c:385
msgid "_Move"
msgstr "移�(_M)"
-#: ../mail/e-mail-reader.c:852
+#: ../mail/e-mail-reader.c:808
msgid "Save Message"
msgid_plural "Save Messages"
msgstr[0] "ä¿?å?ä¿¡æ?¯"
-#: ../mail/e-mail-reader.c:1144
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * Subject. The extension ".mbox" is appended to this
+#. * string, thus it will be something like "Message.mbox"
+#. * at the end.
+#: ../mail/e-mail-reader.c:829 ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:518
+#, fuzzy
+#| msgid "Message"
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "��"
+
+#: ../mail/e-mail-reader.c:1087
msgid "A_dd Sender to Address Book"
msgstr "å°?å??件人添å? å?°å?°å??ç°¿(_D)"
-#: ../mail/e-mail-reader.c:1146
+#: ../mail/e-mail-reader.c:1089
msgid "Add sender to address book"
msgstr "å°?å??件人添å? å?°å?°å??ç°¿"
-#: ../mail/e-mail-reader.c:1151
+#: ../mail/e-mail-reader.c:1094
msgid "Check for _Junk"
msgstr "æ£?æ?¥å??å?¾ä¿¡(_J)"
-#: ../mail/e-mail-reader.c:1153
+#: ../mail/e-mail-reader.c:1096
msgid "Filter the selected messages for junk status"
msgstr "æ??é??ä¸ç??信件æ ?记为å??å?¾é?®ä»¶"
-#: ../mail/e-mail-reader.c:1160
-msgid "Copy selected messages to the clipboard"
-msgstr "å°?é??ä¸ä¿¡ä»¶å¤?å?¶å?°å?ªè´´æ?¿"
-
-#: ../mail/e-mail-reader.c:1165
+#: ../mail/e-mail-reader.c:1101
msgid "_Copy to Folder..."
msgstr "å¤?å?¶å?°æ??件夹(_C)..."
-#: ../mail/e-mail-reader.c:1167
+#: ../mail/e-mail-reader.c:1103
msgid "Copy selected messages to another folder"
msgstr "æ??é??ä¸ç??信件å¤?å?¶å?°å?¶å®?æ??件夹"
-#: ../mail/e-mail-reader.c:1172
+#: ../mail/e-mail-reader.c:1108
msgid "_Delete Message"
msgstr "å? é?¤ä¿¡ä»¶(_D)"
-#: ../mail/e-mail-reader.c:1174
+#: ../mail/e-mail-reader.c:1110
msgid "Mark the selected messages for deletion"
msgstr "为é??ä¸ä¿¡ä»¶å??å? é?¤æ ?è®°"
-#: ../mail/e-mail-reader.c:1179
+#: ../mail/e-mail-reader.c:1115
msgid "Filter on Mailing _List..."
msgstr "æ ¹æ?®é?®ä»¶å??表è¿?滤(_L)..."
-#: ../mail/e-mail-reader.c:1181
+#: ../mail/e-mail-reader.c:1117
msgid "Create a rule to filter messages to this mailing list"
msgstr "å??建å?¯è¿?滤å¯?å¾?æ¤é?®ä»¶å??表ç??信件ç??è§?å??"
-#: ../mail/e-mail-reader.c:1186
+#: ../mail/e-mail-reader.c:1122
msgid "Filter on _Recipients..."
msgstr "æ ¹æ?®æ?¶ä»¶äººè¿?滤(_R)..."
-#: ../mail/e-mail-reader.c:1188
+#: ../mail/e-mail-reader.c:1124
msgid "Create a rule to filter messages to these recipients"
msgstr "å??建å?¯è¿?滤å¯?å¾?è¿?äº?æ?¶ä»¶äººç??信件ç??è§?å??"
-#: ../mail/e-mail-reader.c:1193
+#: ../mail/e-mail-reader.c:1129
msgid "Filter on Se_nder..."
msgstr "æ ¹æ?®å??件人è¿?滤(_N)..."
-#: ../mail/e-mail-reader.c:1195
+#: ../mail/e-mail-reader.c:1131
msgid "Create a rule to filter messages from this sender"
msgstr "å??建å?¯è¿?滤æ¤äººå¯?æ?¥ç??信件ç??è§?å??"
-#: ../mail/e-mail-reader.c:1200
+#: ../mail/e-mail-reader.c:1136
msgid "Filter on _Subject..."
msgstr "æ ¹æ?®ä¸»é¢?è¿?滤(_S)..."
-#: ../mail/e-mail-reader.c:1202
+#: ../mail/e-mail-reader.c:1138
msgid "Create a rule to filter messages with this subject"
msgstr "å??建å?¯è¿?滤æ¤ä¸»é¢?信件ç??è§?å??"
-#: ../mail/e-mail-reader.c:1207
+#: ../mail/e-mail-reader.c:1143
msgid "A_pply Filters"
msgstr "åº?ç?¨è¿?滤è§?å??(_P)"
-#: ../mail/e-mail-reader.c:1209
+#: ../mail/e-mail-reader.c:1145
msgid "Apply filter rules to the selected messages"
msgstr "åº?ç?¨è¿?滤è§?å??å?°é??ä¸ç??信件"
-#: ../mail/e-mail-reader.c:1214
+#: ../mail/e-mail-reader.c:1150
msgid "_Find in Message..."
msgstr "å?¨ä¿¡ä»¶ä¸æ?¥æ?¾(_F)..."
-#: ../mail/e-mail-reader.c:1216
+#: ../mail/e-mail-reader.c:1152
msgid "Search for text in the body of the displayed message"
msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
-#: ../mail/e-mail-reader.c:1221
+#: ../mail/e-mail-reader.c:1157
msgid "_Clear Flag"
msgstr "æ¸?é?¤æ ?å¿?(_C)"
-#: ../mail/e-mail-reader.c:1223
+#: ../mail/e-mail-reader.c:1159
#, fuzzy
msgid "Remove the follow-up flag from the selected messages"
msgstr "å??æ¶?é??ä¸ä¿¡ä»¶ç??å? é?¤"
-#: ../mail/e-mail-reader.c:1228
+#: ../mail/e-mail-reader.c:1164
msgid "_Flag Completed"
msgstr "æ ?å¿?为已å®?æ??(_F)"
-#: ../mail/e-mail-reader.c:1230
+#: ../mail/e-mail-reader.c:1166
#, fuzzy
msgid "Set the follow-up flag to completed on the selected messages"
msgstr "æ??å??ä¸?线索ä¸ç??æ??æ??信件é??æ?©ä¸ºé??ä¸ä¿¡ä»¶"
-#: ../mail/e-mail-reader.c:1235
+#: ../mail/e-mail-reader.c:1171
msgid "Follow _Up..."
msgstr "è·?é??(_U)..."
-#: ../mail/e-mail-reader.c:1237
+#: ../mail/e-mail-reader.c:1173
#, fuzzy
msgid "Flag the selected messages for follow-up"
msgstr "为é??ä¸ä¿¡ä»¶å??è·?é??æ ?å¿?"
-#: ../mail/e-mail-reader.c:1242
+#: ../mail/e-mail-reader.c:1178
msgid "_Attached"
msgstr "é??件(_A)"
-#: ../mail/e-mail-reader.c:1244 ../mail/e-mail-reader.c:1251
+#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
msgid "Forward the selected message to someone as an attachment"
msgstr "æ??é??ä¸ä¿¡ä»¶ä½?为é??件转å??ç»?æ??人"
-#: ../mail/e-mail-reader.c:1249
+#: ../mail/e-mail-reader.c:1185
#, fuzzy
msgid "Forward As _Attached"
msgstr "ä½?为 iCalendar 转å??(_F)"
-#: ../mail/e-mail-reader.c:1256
+#: ../mail/e-mail-reader.c:1192
msgid "_Inline"
msgstr "åµ?å?¥(_I)"
-#: ../mail/e-mail-reader.c:1258 ../mail/e-mail-reader.c:1265
+#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
msgid "Forward the selected message in the body of a new message"
msgstr "å?¨æ?°ä¿¡ä½?ä¸è½¬å??é??ä¸ä¿¡ä»¶"
-#: ../mail/e-mail-reader.c:1263
+#: ../mail/e-mail-reader.c:1199
#, fuzzy
msgid "Forward As _Inline"
msgstr "转å??æ?¹å¼?(_F)ï¼?"
-#: ../mail/e-mail-reader.c:1270
+#: ../mail/e-mail-reader.c:1206
msgid "_Quoted"
msgstr "å¼?ç?¨(_Q)"
-#: ../mail/e-mail-reader.c:1272 ../mail/e-mail-reader.c:1279
+#: ../mail/e-mail-reader.c:1208 ../mail/e-mail-reader.c:1215
msgid "Forward the selected message quoted like a reply"
msgstr "以类似äº?å??å¤?ç??å¼?ç?¨æ?¹å¼?转å??é??ä¸ç??信件"
-#: ../mail/e-mail-reader.c:1277
+#: ../mail/e-mail-reader.c:1213
#, fuzzy
msgid "Forward As _Quoted"
msgstr "转å??æ?¹å¼?(_F)ï¼?"
-#: ../mail/e-mail-reader.c:1284
+#: ../mail/e-mail-reader.c:1220
msgid "_Load Images"
msgstr "è£?å?¥å?¾å??(_L)"
-#: ../mail/e-mail-reader.c:1286
+#: ../mail/e-mail-reader.c:1222
msgid "Force images in HTML mail to be loaded"
msgstr "强å?¶è£?å?¥ HTML é?®ä»¶ä¸ç??å?¾å??"
-#: ../mail/e-mail-reader.c:1291
+#: ../mail/e-mail-reader.c:1227
msgid "_Important"
msgstr "é??è¦?(_I)"
-#: ../mail/e-mail-reader.c:1293
+#: ../mail/e-mail-reader.c:1229
msgid "Mark the selected messages as important"
msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为é??è¦?é?®ä»¶"
-#: ../mail/e-mail-reader.c:1298
+#: ../mail/e-mail-reader.c:1234
msgid "_Junk"
msgstr "å??å?¾(_J)"
-#: ../mail/e-mail-reader.c:1300
+#: ../mail/e-mail-reader.c:1236
msgid "Mark the selected messages as junk"
msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为å??å?¾é?®ä»¶"
-#: ../mail/e-mail-reader.c:1305
+#: ../mail/e-mail-reader.c:1241
msgid "_Not Junk"
msgstr "é??å??å?¾(_N)"
-#: ../mail/e-mail-reader.c:1307
+#: ../mail/e-mail-reader.c:1243
msgid "Mark the selected messages as not being junk"
msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为é??å??å?¾é?®ä»¶"
-#: ../mail/e-mail-reader.c:1312
+#: ../mail/e-mail-reader.c:1248
msgid "_Read"
msgstr "读å??(_R)"
-#: ../mail/e-mail-reader.c:1314
+#: ../mail/e-mail-reader.c:1250
msgid "Mark the selected messages as having been read"
msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为已读"
-#: ../mail/e-mail-reader.c:1319
+#: ../mail/e-mail-reader.c:1255
msgid "Uni_mportant"
msgstr "ä¸?é??è¦?(_M)"
-#: ../mail/e-mail-reader.c:1321
+#: ../mail/e-mail-reader.c:1257
msgid "Mark the selected messages as unimportant"
msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为ä¸?é??è¦?é?®ä»¶"
-#: ../mail/e-mail-reader.c:1326
+#: ../mail/e-mail-reader.c:1262
msgid "_Unread"
msgstr "�读(_U)"
-#: ../mail/e-mail-reader.c:1328
+#: ../mail/e-mail-reader.c:1264
msgid "Mark the selected messages as not having been read"
msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为æ?ªè¯»"
-#: ../mail/e-mail-reader.c:1333
+#: ../mail/e-mail-reader.c:1269
msgid "_Edit as New Message..."
msgstr "�为�信件����(_E)..."
-#: ../mail/e-mail-reader.c:1335
+#: ../mail/e-mail-reader.c:1271
msgid "Open the selected messages in the composer for editing"
msgstr "å?¨æ?°å??å?¨ä¸æ??å¼?é??ä¸ç??信件以便ç¼?è¾?"
-#: ../mail/e-mail-reader.c:1340
+#: ../mail/e-mail-reader.c:1276
msgid "Compose _New Message"
msgstr "æ?°å??æ?°ä¿¡ä»¶(_N)"
-#: ../mail/e-mail-reader.c:1342
+#: ../mail/e-mail-reader.c:1278
msgid "Open a window for composing a mail message"
msgstr "æ??å¼?çª?å?£ä»¥æ?°å??信件"
-#: ../mail/e-mail-reader.c:1347
+#: ../mail/e-mail-reader.c:1283
msgid "_Open in New Window"
msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?(_O)"
-#: ../mail/e-mail-reader.c:1349
+#: ../mail/e-mail-reader.c:1285
msgid "Open the selected messages in a new window"
msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?é??ä¸ç??信件"
-#: ../mail/e-mail-reader.c:1354
+#: ../mail/e-mail-reader.c:1290
msgid "_Move to Folder..."
msgstr "移è?³æ??件夹(_M)..."
-#: ../mail/e-mail-reader.c:1356
+#: ../mail/e-mail-reader.c:1292
msgid "Move selected messages to another folder"
msgstr "æ??é??ä¸ç??信件移è?³å?¶å®?æ??件夹"
-#: ../mail/e-mail-reader.c:1361
+#: ../mail/e-mail-reader.c:1297
msgid "_Next Message"
msgstr "���信(_N)"
-#: ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1299
msgid "Display the next message"
msgstr "�示���信件"
-#: ../mail/e-mail-reader.c:1368
+#: ../mail/e-mail-reader.c:1304
msgid "Next _Important Message"
msgstr "ä¸?ä¸?å°?é??è¦?信件(_I)"
-#: ../mail/e-mail-reader.c:1370
+#: ../mail/e-mail-reader.c:1306
msgid "Display the next important message"
msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?信件"
-#: ../mail/e-mail-reader.c:1375
+#: ../mail/e-mail-reader.c:1311
msgid "Next _Thread"
msgstr "���线索(_T)"
-#: ../mail/e-mail-reader.c:1377
+#: ../mail/e-mail-reader.c:1313
msgid "Display the next thread"
msgstr "�示���线索"
-#: ../mail/e-mail-reader.c:1382
+#: ../mail/e-mail-reader.c:1318
msgid "Next _Unread Message"
msgstr "����读信件(_U)"
-#: ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1320
msgid "Display the next unread message"
msgstr "�示����读信件"
-#: ../mail/e-mail-reader.c:1389
+#: ../mail/e-mail-reader.c:1325
msgid "_Previous Message"
msgstr "���信(_P)"
-#: ../mail/e-mail-reader.c:1391
+#: ../mail/e-mail-reader.c:1327
msgid "Display the previous message"
msgstr "�示���信件"
-#: ../mail/e-mail-reader.c:1396
+#: ../mail/e-mail-reader.c:1332
msgid "Pr_evious Important Message"
msgstr "ä¸?ä¸?å°?é??è¦?信件(_E)"
-#: ../mail/e-mail-reader.c:1398
+#: ../mail/e-mail-reader.c:1334
msgid "Display the previous important message"
msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?信件"
-#: ../mail/e-mail-reader.c:1403
+#: ../mail/e-mail-reader.c:1339
msgid "P_revious Unread Message"
msgstr "����读信件(_R)"
-#: ../mail/e-mail-reader.c:1405
+#: ../mail/e-mail-reader.c:1341
msgid "Display the previous unread message"
msgstr "�示����读信件"
-#: ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1348
msgid "Print this message"
msgstr "æ??å?°è¯¥ä¿¡ä»¶"
-#: ../mail/e-mail-reader.c:1419
+#: ../mail/e-mail-reader.c:1355
msgid "Preview the message to be printed"
msgstr "é¢?è§?è¦?æ??å?°ç??信件"
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1360
msgid "Re_direct"
msgstr "é??å??(_D)"
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:1362
msgid "Redirect (bounce) the selected message to someone"
msgstr "å°?é??ä¸ä¿¡ä»¶é??å??(é??å??)ç»?æ??人"
-#: ../mail/e-mail-reader.c:1431
-#: ../modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../mail/e-mail-reader.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
#: ../modules/mail/e-mail-attachment-handler.c:141
msgid "Reply to _All"
msgstr "å??å¤?æ??æ??人(_A)"
-#: ../mail/e-mail-reader.c:1433
+#: ../mail/e-mail-reader.c:1369
#, fuzzy
msgid "Compose a reply to all the recipients of the selected message"
msgstr "为é??ä¸ä¿¡ä»¶ç??æ??æ??æ?¶ä»¶äººæ?°å??å??å¤?"
-#: ../mail/e-mail-reader.c:1438
+#: ../mail/e-mail-reader.c:1374
msgid "Reply to _List"
msgstr "å??å¤?é?®ä»¶å??表(_L)"
-#: ../mail/e-mail-reader.c:1440
+#: ../mail/e-mail-reader.c:1376
msgid "Compose a reply to the mailing list of the selected message"
msgstr "为é??ä¸ä¿¡ä»¶ç??é?®ä»¶å??表æ?°å??å??å¤?"
-#: ../mail/e-mail-reader.c:1445
+#: ../mail/e-mail-reader.c:1381
#: ../modules/mail/e-mail-attachment-handler.c:148
msgid "_Reply to Sender"
msgstr "å??å¤?å??件人(_R)"
-#: ../mail/e-mail-reader.c:1447
+#: ../mail/e-mail-reader.c:1383
msgid "Compose a reply to the sender of the selected message"
msgstr "为é??ä¸ä¿¡ä»¶ç??å??件人æ?°å??å??å¤?"
-#: ../mail/e-mail-reader.c:1452
+#: ../mail/e-mail-reader.c:1388
#, fuzzy
msgid "_Save as mbox..."
msgstr "å?¦å?为..."
-#: ../mail/e-mail-reader.c:1454
+#: ../mail/e-mail-reader.c:1390
#, fuzzy
msgid "Save selected messages as an mbox file"
msgstr "æ??é??ä¸ä¿¡ä»¶å?¦å?为æ??æ?¬æ??件"
-#: ../mail/e-mail-reader.c:1459
+#: ../mail/e-mail-reader.c:1395
msgid "Search Folder from Mailing _List..."
msgstr "å?ºäº?é?®ä»¶å??表ç??æ??ç´¢æ??件夹(_L)..."
-#: ../mail/e-mail-reader.c:1461
+#: ../mail/e-mail-reader.c:1397
#, fuzzy
msgid "Create a search folder for this mailing list"
msgstr "为该é?®ä»¶å??表å??建æ??ç´¢æ??件夹"
-#: ../mail/e-mail-reader.c:1466
+#: ../mail/e-mail-reader.c:1402
msgid "Search Folder from Recipien_ts..."
msgstr "å?ºäº?æ?¶ä»¶äººç??æ??ç´¢æ??件夹(_T)..."
-#: ../mail/e-mail-reader.c:1468
+#: ../mail/e-mail-reader.c:1404
#, fuzzy
msgid "Create a search folder for these recipients"
msgstr "为è¿?äº?æ?¶ä»¶äººå??建æ??ç´¢æ??件夹"
-#: ../mail/e-mail-reader.c:1473
+#: ../mail/e-mail-reader.c:1409
msgid "Search Folder from Sen_der..."
msgstr "å?ºäº?å??件人ç??æ??ç´¢æ??件夹(_D)..."
-#: ../mail/e-mail-reader.c:1475
+#: ../mail/e-mail-reader.c:1411
#, fuzzy
msgid "Create a search folder for this sender"
msgstr "为该å??件人å??建æ??ç´¢æ??件夹"
-#: ../mail/e-mail-reader.c:1480
+#: ../mail/e-mail-reader.c:1416
msgid "Search Folder from S_ubject..."
msgstr "å?ºäº?主é¢?ç??æ??ç´¢æ??件夹(_U)..."
-#: ../mail/e-mail-reader.c:1482
+#: ../mail/e-mail-reader.c:1418
#, fuzzy
msgid "Create a search folder for this subject"
msgstr "为该主é¢?å??建æ??ç´¢æ??件夹"
-#: ../mail/e-mail-reader.c:1487
-msgid "Select _All Text"
-msgstr "é??ä¸æ??æ??æ??å?(_A)"
-
-#: ../mail/e-mail-reader.c:1489
-msgid "Select all the text in a message"
-msgstr "é??ä¸ä¿¡ä»¶ä¸ç??å?¨é?¨æ??æ?¬"
-
-#: ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1423
msgid "_Message Source"
msgstr "信件æº?代ç ?(_M)"
-#: ../mail/e-mail-reader.c:1496
+#: ../mail/e-mail-reader.c:1425
msgid "Show the raw email source of the message"
msgstr "æ?¾ç¤ºä¿¡ä»¶ç??å??å§?é?®ä»¶æº?代ç ?"
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1437
msgid "_Undelete Message"
msgstr "å??æ¶?å? é?¤ä¿¡ä»¶(_U)"
-#: ../mail/e-mail-reader.c:1510
+#: ../mail/e-mail-reader.c:1439
msgid "Undelete the selected messages"
msgstr "å??æ¶?é??ä¸ä¿¡ä»¶ç??å? é?¤"
-#: ../mail/e-mail-reader.c:1515
+#: ../mail/e-mail-reader.c:1444
msgid "_Normal Size"
msgstr "æ?®é??大å°?(_N)"
-#: ../mail/e-mail-reader.c:1517
+#: ../mail/e-mail-reader.c:1446
msgid "Reset the text to its original size"
msgstr "æ??æ??æ?¬é??æ?°è®¾ç½®ä¸ºå??æ?¥ç??大å°?"
-#: ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1451
msgid "_Zoom In"
msgstr "�大(_Z)"
-#: ../mail/e-mail-reader.c:1524
+#: ../mail/e-mail-reader.c:1453
msgid "Increase the text size"
msgstr "å¢?å? æ??æ?¬å¤§å°?"
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1458
msgid "Zoom _Out"
msgstr "缩�(_O)"
-#: ../mail/e-mail-reader.c:1531
+#: ../mail/e-mail-reader.c:1460
msgid "Decrease the text size"
msgstr "å??å°?æ??æ?¬å¤§å°?"
-#: ../mail/e-mail-reader.c:1538
+#: ../mail/e-mail-reader.c:1467
msgid "Create R_ule"
msgstr "å??建è§?å??(_U)"
-#: ../mail/e-mail-reader.c:1545
+#: ../mail/e-mail-reader.c:1474
msgid "Ch_aracter Encoding"
msgstr "å?符ç¼?ç ?(_A)"
-#: ../mail/e-mail-reader.c:1552
+#: ../mail/e-mail-reader.c:1481
msgid "F_orward As"
msgstr "转å??为(_O)"
-#: ../mail/e-mail-reader.c:1559
+#: ../mail/e-mail-reader.c:1488
msgid "_Go To"
msgstr "转�(_G)"
-#: ../mail/e-mail-reader.c:1566
+#: ../mail/e-mail-reader.c:1495
msgid "Mar_k As"
msgstr "æ ?记为(_K)"
-#: ../mail/e-mail-reader.c:1573
+#: ../mail/e-mail-reader.c:1502
msgid "_Message"
msgstr "信件(_M)"
-#: ../mail/e-mail-reader.c:1580
+#: ../mail/e-mail-reader.c:1509
msgid "_Zoom"
msgstr "缩�(_Z)"
-#: ../mail/e-mail-reader.c:1609
+#: ../mail/e-mail-reader.c:1534
msgid "Mark for Follo_w Up..."
msgstr "æ ?记为è·?é??(_W)..."
-#: ../mail/e-mail-reader.c:1617
+#: ../mail/e-mail-reader.c:1542
msgid "Mark as _Important"
msgstr "æ ?记为é??è¦?(_I)"
-#: ../mail/e-mail-reader.c:1621
+#: ../mail/e-mail-reader.c:1546
msgid "Mark as _Junk"
msgstr "æ ?记为å??å?¾(_J)"
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1550
msgid "Mark as _Not Junk"
msgstr "æ ?记为é??å??å?¾(_N)"
-#: ../mail/e-mail-reader.c:1629
+#: ../mail/e-mail-reader.c:1554
msgid "Mar_k as Read"
msgstr "æ ?记为已读(_K)"
-#: ../mail/e-mail-reader.c:1633
+#: ../mail/e-mail-reader.c:1558
msgid "Mark as Uni_mportant"
msgstr "æ ?记为ä¸?é??è¦?(_M)"
-#: ../mail/e-mail-reader.c:1637
+#: ../mail/e-mail-reader.c:1562
msgid "Mark as _Unread"
msgstr "æ ?记为æ?ªè¯»(_U)"
-#: ../mail/e-mail-reader.c:1673
+#: ../mail/e-mail-reader.c:1598
msgid "_Caret Mode"
msgstr "å??æ ?模å¼?(_C)"
-#: ../mail/e-mail-reader.c:1675
+#: ../mail/e-mail-reader.c:1600
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??ä¿¡ä½?ä¸æ?¾ç¤ºé?ªç??å??æ ?"
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:1606
msgid "All Message _Headers"
msgstr "��信头(_H)"
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:1608
msgid "Show messages with all email headers"
msgstr "æ?¾ç¤ºé?®ä»¶æ?¶æ?¾ç¤ºæ??æ??信头"
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1831
msgid "Unable to retrieve message"
msgstr "æ? æ³?è?·å??信件"
+#: ../mail/e-mail-reader.c:1876 ../mail/mail-ops.c:1849
+#, fuzzy, c-format
+msgid "Retrieving message '%s'"
+msgstr "æ?¶å??信件 %s"
+
#. we changed user, thus reset the chosen calendar combo too, because
#. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2402
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:612
-#: ../plugins/google-account-setup/google-source.c:783
+#: ../mail/e-mail-reader.c:2370
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:534
+#: ../plugins/google-account-setup/google-source.c:656
#: ../widgets/misc/e-account-tree-view.c:234
msgid "Default"
msgstr "�认"
-#: ../mail/e-mail-reader.c:2518
+#: ../mail/e-mail-reader.c:2489
#: ../modules/mail/e-mail-attachment-handler.c:134
msgid "_Forward"
msgstr "转å??(_F)"
-#: ../mail/e-mail-reader.c:2519
+#: ../mail/e-mail-reader.c:2490
msgid "Forward the selected message to someone"
msgstr "æ??é??ä¸ä¿¡ä»¶è½¬å??ç»?æ??人"
-#: ../mail/e-mail-reader.c:2567 ../mail/em-filter-i18n.h:14
-#: ../modules/addressbook/e-book-shell-view-actions.c:1132
-#: ../modules/calendar/e-cal-shell-view-actions.c:1784
-#: ../modules/calendar/e-memo-shell-view-actions.c:979
-#: ../modules/calendar/e-task-shell-view-actions.c:1178
-#: ../plugins/groupwise-features/share-folder.c:754
+#: ../mail/e-mail-reader.c:2534 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
msgid "Delete"
msgstr "å? é?¤"
-#: ../mail/e-mail-reader.c:2571
-#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../mail/e-mail-reader.c:2538
+#: ../modules/calendar/e-cal-shell-view-actions.c:1258
#: ../widgets/misc/e-calendar.c:193
msgid "Next"
msgstr "��项"
-#: ../mail/e-mail-reader.c:2575
-#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../mail/e-mail-reader.c:2542
+#: ../modules/calendar/e-cal-shell-view-actions.c:1251
#: ../widgets/misc/e-calendar.c:169
msgid "Previous"
msgstr "��项"
-#: ../mail/e-mail-reader.c:2579 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2546 ../mail/mail-dialogs.ui.h:18
msgid "Reply"
msgstr "å??å¤?"
-#: ../mail/e-mail-search-bar.c:77
-#, c-format
-msgid "Matches: %d"
-msgstr "å?¹é??ï¼?%d"
-
-#: ../mail/e-mail-search-bar.c:552
-msgid "Close the find bar"
-msgstr "å?³é?æ?¥æ?¾æ ?"
-
-#: ../mail/e-mail-search-bar.c:560
-msgid "Fin_d:"
-msgstr "��(_D)�"
-
-#: ../mail/e-mail-search-bar.c:572
-msgid "Clear the search"
-msgstr "æ¸?é?¤æ??ç´¢"
-
-#: ../mail/e-mail-search-bar.c:595
-msgid "_Previous"
-msgstr "��项(_P)"
-
-#: ../mail/e-mail-search-bar.c:601
-msgid "Find the previous occurrence of the phrase"
-msgstr "寻æ?¾è¯¥è¯?å?¥å?ºç?°ç??å??ä¸?个ä½?ç½®"
-
-#: ../mail/e-mail-search-bar.c:611
-msgid "_Next"
-msgstr "��项(_N)"
-
-#: ../mail/e-mail-search-bar.c:617
-msgid "Find the next occurrence of the phrase"
-msgstr "寻æ?¾è¯¥è¯?å?¥å?ºç?°ç??ä¸?ä¸?个ä½?ç½®"
-
-#: ../mail/e-mail-search-bar.c:627
-msgid "Mat_ch case"
-msgstr "大å°?å??å?¹é??(_C)"
-
-#: ../mail/e-mail-search-bar.c:655
-msgid "Reached bottom of page, continued from top"
-msgstr "å?°è¾¾é¡µé?¢åº?é?¨ï¼?移å?°é¡¶é?¨ç»§ç»"
-
-#: ../mail/e-mail-search-bar.c:677
-msgid "Reached top of page, continued from bottom"
-msgstr "å?°è¾¾é¡µé?¢é¡¶é?¨ï¼?移å?°åº?é?¨ç»§ç»"
-
-#. On This Computer is always first, and Search Folders
-#. * is always last.
-#. create the local source group
-#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
-#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1563
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:120
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:107
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:501
-#: ../modules/mail/e-mail-shell-migrate.c:2932
-msgid "On This Computer"
-msgstr "å?¨æ¤è®¡ç®?æ?ºä¸"
-
#: ../mail/e-mail-tag-editor.c:292
msgid "Flag to Follow Up"
msgstr "è·?é??ç??æ ?å¿?"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:484 ../mail/mail-config.ui.h:72
+#: ../mail/em-account-editor.c:500 ../mail/mail-config.ui.h:72
#: ../modules/addressbook/ldap-config.ui.h:10
msgid "No encryption"
msgstr "ä¸?å? å¯?"
@@ -9725,25 +9891,25 @@ msgstr "ä¸?å? å¯?"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. TLS (Transport Layer Security) is commonly known by
#. this abbreviation.
-#: ../mail/em-account-editor.c:488 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../mail/em-account-editor.c:504 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:21
msgid "TLS encryption"
msgstr "TLS å? å¯?"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
#. abbreviation.
-#: ../mail/em-account-editor.c:492 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:13
msgid "SSL encryption"
msgstr "SSL å? å¯?"
-#: ../mail/em-account-editor.c:579
+#: ../mail/em-account-editor.c:595
#, c-format
msgid "%s License Agreement"
msgstr "%s 许å?¯å??è®®"
-#: ../mail/em-account-editor.c:586
+#: ../mail/em-account-editor.c:602
#, c-format
msgid ""
"\n"
@@ -9755,23 +9921,39 @@ msgstr ""
"请ä»?ç»?é??读ä¸?æ?¹æ?¾ç¤ºç?? %s 许å?¯å??è®®\n"
"并é??ä¸å¤?é??æ¡?表æ??æ?¨æ?¥å??该å??è®®\n"
-#: ../mail/em-account-editor.c:948
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:882 ../widgets/misc/e-signature-combo-box.c:75
+#, fuzzy
+#| msgid "None"
+msgctxt "mail-signature"
+msgid "None"
+msgstr "æ? "
+
+#: ../mail/em-account-editor.c:965
msgid "Never"
msgstr "��"
-#: ../mail/em-account-editor.c:949
+#: ../mail/em-account-editor.c:966
msgid "Always"
msgstr "��"
-#: ../mail/em-account-editor.c:950
+#: ../mail/em-account-editor.c:967
msgid "Ask for each message"
msgstr "��信�询�"
-#: ../mail/em-account-editor.c:2025
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+#, fuzzy
+#| msgid "None"
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "æ? "
+
+#: ../mail/em-account-editor.c:2055
msgid "Mail Configuration"
msgstr "é?®ä»¶é??ç½®"
-#: ../mail/em-account-editor.c:2026
+#: ../mail/em-account-editor.c:2056
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -9781,12 +9963,12 @@ msgstr ""
"\n"
"å??å?»â??å??è¿?â??å¼?å§?ã??"
-#: ../mail/em-account-editor.c:2028 ../mail/em-account-editor.c:2164
+#: ../mail/em-account-editor.c:2058 ../mail/em-account-editor.c:2194
#: ../mail/mail-config.ui.h:58
msgid "Identity"
msgstr "æ ?è¯?"
-#: ../mail/em-account-editor.c:2029
+#: ../mail/em-account-editor.c:2059
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
@@ -9795,20 +9977,20 @@ msgstr ""
"请å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å§?å??å??ç?µå?é?®ä»¶å?°å??ã??ä¸?é?¢ç??â??å?¯é??â??å??ä¸?å¿?å¡«å?¥ï¼?é?¤é??æ?¨æ?³è¦?å?¨æ?¨å??"
"å?ºç??é?®ä»¶ä¸å??å?«æ¤ä¿¡æ?¯ã??"
-#: ../mail/em-account-editor.c:2031 ../mail/em-account-editor.c:2201
+#: ../mail/em-account-editor.c:2061 ../mail/em-account-editor.c:2231
#: ../mail/mail-config.ui.h:90
msgid "Receiving Email"
msgstr "æ?¥æ?¶ç?µå?é?®ä»¶"
-#: ../mail/em-account-editor.c:2032
+#: ../mail/em-account-editor.c:2062
msgid "Please configure the following account settings."
msgstr "请é??ç½®ä¸?å??å¸?æ?·è®¾ç½®ã??"
-#: ../mail/em-account-editor.c:2034 ../mail/em-account-editor.c:2657
+#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2708
msgid "Sending Email"
msgstr "å??é??ç?µå?é?®ä»¶"
-#: ../mail/em-account-editor.c:2035
+#: ../mail/em-account-editor.c:2065
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -9816,11 +9998,11 @@ msgstr ""
"请å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å??件æ??å?¡å?¨ä¿¡æ?¯ã??å¦?æ??æ?¨ä¸?太确å®?ç??è¯?ï¼?请询é?®æ?¨ç??ç³»ç»?管ç??å??æ??è??"
"äº?è??ç½?æ??å?¡æ??ä¾?å??ISPã??"
-#: ../mail/em-account-editor.c:2037
+#: ../mail/em-account-editor.c:2067
msgid "Account Management"
msgstr "è´¦æ?·ç®¡ç??"
-#: ../mail/em-account-editor.c:2038
+#: ../mail/em-account-editor.c:2068
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -9828,11 +10010,11 @@ msgstr ""
"请å?¨ä¸?é?¢ç??空ç?½å¤?è¾?å?¥æ¤è´¦æ?·ç??æ??è¿°æ?§å??称ã??\n"
"æ¤å??称å°?å?ªå?¨æ?¾ç¤ºæ?¶ä½¿ç?¨ã??"
-#: ../mail/em-account-editor.c:2042
+#: ../mail/em-account-editor.c:2072
msgid "Done"
msgstr "å®?æ??"
-#: ../mail/em-account-editor.c:2043
+#: ../mail/em-account-editor.c:2073
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -9846,57 +10028,48 @@ msgstr ""
"\n"
"å??å?»â??åº?ç?¨â??å?¯ä¿?å?æ?¨ç??设置ã??"
-#: ../mail/em-account-editor.c:2473
+#: ../mail/em-account-editor.c:2518
msgid "Check for _new messages every"
msgstr "è?ªå?¨æ£?æ?¥æ?°é?®ä»¶ç??é?´é??(_N)"
-#: ../mail/em-account-editor.c:2481
+#: ../mail/em-account-editor.c:2526
msgid "minu_tes"
msgstr "å??é??(_T)"
-#: ../mail/em-account-editor.c:2715 ../mail/mail-config.ui.h:31
+#: ../mail/em-account-editor.c:2772 ../mail/mail-config.ui.h:31
msgid "Defaults"
msgstr "�认"
-#: ../mail/em-account-editor.c:2777 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2834 ../mail/mail-config.ui.h:100
msgid "Security"
msgstr "å®?å?¨"
#. Most sections for this is auto-generated from the camel config
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2814 ../mail/em-account-editor.c:2882
+#: ../mail/em-account-editor.c:2871 ../mail/em-account-editor.c:2939
msgid "Receiving Options"
msgstr "æ?¥æ?¶é??项"
-#: ../mail/em-account-editor.c:2815 ../mail/em-account-editor.c:2883
+#: ../mail/em-account-editor.c:2872 ../mail/em-account-editor.c:2940
msgid "Checking for New Messages"
msgstr "����件"
-#: ../mail/em-account-editor.c:3346
+#: ../mail/em-account-editor.c:3408
msgid "Account Editor"
msgstr "账����"
-#: ../mail/em-account-editor.c:3346
+#: ../mail/em-account-editor.c:3408
msgid "Evolution Account Assistant"
msgstr "Evolution è´¦æ?·å?©æ??"
-#: ../mail/em-composer-utils.c:1687
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "缺å°?å??é??ç?®æ ?å?°å??ï¼?é?®ä»¶è½¬å??被å??æ¶?ã??"
-
-#: ../mail/em-composer-utils.c:1693
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "æ? å?¯ç?¨è´¦æ?·ï¼?é?®ä»¶è½¬å??被å??æ¶?ã??"
-
-#: ../mail/em-composer-utils.c:2136
+#: ../mail/em-composer-utils.c:1954
msgid "an unknown sender"
msgstr "æ?ªç?¥å??件人"
#. Note to translators: this is the attribution string used when quoting messages.
#. * each ${Variable} gets replaced with a value. To see a full list of available
#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2183
+#: ../mail/em-composer-utils.c:2001
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -9904,15 +10077,15 @@ msgstr ""
"å?¨ ${Year}-${Month}-${Day}${AbbrevWeekdayName}ç?? ${24Hour}:${Minute} "
"${TimeZone}ï¼?${Sender}å??é??ï¼?"
-#: ../mail/em-composer-utils.c:2327
+#: ../mail/em-composer-utils.c:2145
msgid "-----Original Message-----"
msgstr "-------- å??å§?信件 --------"
-#: ../mail/em-composer-utils.c:2507
+#: ../mail/em-composer-utils.c:2326
msgid "Posting destination"
msgstr "æ??é??ç?®ç??"
-#: ../mail/em-composer-utils.c:2508
+#: ../mail/em-composer-utils.c:2327
msgid "Choose folders to post the message to."
msgstr "é??æ?©è¦?å°?信件æ??é??å?°å?ªä¸ªæ??件夹ã??"
@@ -9933,18 +10106,10 @@ msgstr "å??é??é¢?è?²"
msgid "Assign Score"
msgstr "å??é??计å??"
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
#: ../mail/em-filter-i18n.h:7
msgid "Beep"
msgstr "å??é??"
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
#: ../mail/em-filter-i18n.h:9
msgid "Completed On"
msgstr "å®?æ??äº?"
@@ -10005,10 +10170,6 @@ msgstr "è·?é??"
msgid "Forward to"
msgstr "转å??è?³"
-#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:956
-msgid "Important"
-msgstr "é??è¦?"
-
#: ../mail/em-filter-i18n.h:32
msgid "is after"
msgstr "ä¹?å??"
@@ -10163,11 +10324,11 @@ msgid "Unset Status"
msgstr "å??æ¶?ç?¶æ??"
#. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:530
msgid "Then"
msgstr "ç?¶å??"
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:561
msgid "Add Ac_tion"
msgstr "æ·»å? å?¨ä½?(_T)"
@@ -10203,17 +10364,17 @@ msgstr "æ??件夹å±?æ?§"
msgid "<click here to select a folder>"
msgstr "<å??å?»æ¤å¤?以é??æ?©æ??件夹>"
-#: ../mail/em-folder-selector.c:267
+#: ../mail/em-folder-selector.c:266
msgid "C_reate"
msgstr "å??建(_R)"
-#: ../mail/em-folder-selector.c:271
+#: ../mail/em-folder-selector.c:270
msgid "Folder _name:"
msgstr "æ??件夹å??称(_N)ï¼?"
#. load store to mail component
#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
-#: ../mail/mail-vfolder.c:968 ../mail/mail-vfolder.c:1024
+#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
msgid "Search Folders"
msgstr "æ??ç´¢æ??件夹"
@@ -10222,7 +10383,7 @@ msgstr "æ??ç´¢æ??件夹"
msgid "UNMATCHED"
msgstr "ä¸?å?¹é??"
-#: ../mail/em-folder-tree-model.c:648 ../mail/em-folder-tree-model.c:985
+#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
msgid "Loading..."
msgstr "æ£å?¨è£?å?¥..."
@@ -10231,7 +10392,7 @@ msgstr "æ£å?¨è£?å?¥..."
msgid "Scanning folders in \"%s\""
msgstr "å?¨â??%sâ??ä¸æ?«æ??æ??件夹"
-#: ../mail/em-folder-tree.c:445
+#: ../mail/em-folder-tree.c:589
msgid "Folder names cannot contain '/'"
msgstr "æ??件夹å??ä¸?è?½å?«æ??å?符â??/â??"
@@ -10253,75 +10414,70 @@ msgstr "æ??件夹å??ä¸?è?½å?«æ??å?符â??/â??"
#. * Do not translate the "folder-display|" part. Remove it
#. * from your translation.
#.
-#: ../mail/em-folder-tree.c:978
+#: ../mail/em-folder-tree.c:1071
#, fuzzy, c-format
msgctxt "folder-display"
msgid "%s (%u%s)"
msgstr "%s (%u)"
-#: ../mail/em-folder-tree.c:1309
+#: ../mail/em-folder-tree.c:1277
msgid "Mail Folder Tree"
msgstr "é?®ä»¶æ??件夹æ ?"
-#: ../mail/em-folder-tree.c:1476
+#: ../mail/em-folder-tree.c:1477 ../mail/em-folder-utils.c:99
#, c-format
msgid "Moving folder %s"
msgstr "移å?¨æ??件夹â??%sâ??"
-#: ../mail/em-folder-tree.c:1478
+#: ../mail/em-folder-tree.c:1479 ../mail/em-folder-utils.c:101
#, c-format
msgid "Copying folder %s"
msgstr "å¤?å?¶æ??件夹 %s"
-#: ../mail/em-folder-tree.c:1485 ../mail/message-list.c:2076
+#: ../mail/em-folder-tree.c:1486 ../mail/message-list.c:2103
#, c-format
msgid "Moving messages into folder %s"
msgstr "æ??信件移è?³æ??件夹 %s"
-#: ../mail/em-folder-tree.c:1487 ../mail/message-list.c:2078
+#: ../mail/em-folder-tree.c:1488 ../mail/message-list.c:2105
#, c-format
msgid "Copying messages into folder %s"
msgstr "æ??信件å¤?å?¶å?°æ??件夹 %s"
-#: ../mail/em-folder-tree.c:1502
+#: ../mail/em-folder-tree.c:1503
msgid "Cannot drop message(s) into toplevel store"
msgstr "æ? æ³?å°?信件æ?¾å?°é¡¶çº§æ??件夹å?å?¨"
-#: ../mail/em-folder-utils.c:98
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "æ??â??%sâ??å¤?å?¶å?° %s"
-
-#: ../mail/em-folder-utils.c:382
+#: ../mail/em-folder-utils.c:386
msgid "Move Folder To"
msgstr "移å?¨æ??件夹å?°"
-#: ../mail/em-folder-utils.c:382
+#: ../mail/em-folder-utils.c:386
msgid "Copy Folder To"
msgstr "å¤?å?¶æ??件夹å?°"
-#: ../mail/em-folder-utils.c:495
+#: ../mail/em-folder-utils.c:499
#: ../plugins/groupwise-features/share-folder-common.c:141
#, c-format
msgid "Creating folder `%s'"
msgstr "å??建æ??件夹â??%sâ??"
-#: ../mail/em-folder-utils.c:657
+#: ../mail/em-folder-utils.c:662
msgid "Create Folder"
msgstr "å??建æ??件夹"
-#: ../mail/em-folder-utils.c:658
+#: ../mail/em-folder-utils.c:663
#: ../plugins/groupwise-features/install-shared.c:175
#: ../plugins/groupwise-features/share-folder-common.c:350
msgid "Specify where to create the folder:"
msgstr "æ??å®?å?¨å?ªé??å??建æ??件夹ï¼?"
-#: ../mail/em-folder-utils.c:674
+#: ../mail/em-folder-utils.c:679
#, c-format
msgid "Unsubscribing from folder \"%s\""
msgstr "æ? æ³?é??订æ??件夹â??%sâ??"
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
msgid "Unsigned"
msgstr "æ?ªç¾å??"
@@ -10331,7 +10487,7 @@ msgid ""
"authentic."
msgstr "æ¤ä¿¡ä»¶æ?ªç¾å??ã??æ? æ³?ä¿?è¯?è¿?å°?ä¿¡æ?¯å?¯ä¿¡ç??ã??"
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
msgid "Valid signature"
msgstr "æ??æ??ç¾å??"
@@ -10341,7 +10497,7 @@ msgid ""
"message is authentic."
msgstr "æ¤ä¿¡ä»¶å·²ç¾å??ï¼?è??ä¸?ç¾å??æ?¯æ??æ??ç??ã??è¿?æ??å?³ç??è¿?å°?ä¿¡åº?该æ?¯å?¯ä¿¡ç??ã??"
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
msgid "Invalid signature"
msgstr "æ? æ??ç¾å??"
@@ -10351,7 +10507,7 @@ msgid ""
"in transit."
msgstr "æ? æ³?æ ¡éª?è¿?å°?ä¿¡ç??ç¾å??ï¼?å?¯è?½å?¨ä¼ é??ç??è¿?ç¨?ä¸é?®ä»¶è¢«ç¯¡æ?¹äº?ã??"
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
msgid "Valid signature, but cannot verify sender"
msgstr "ç¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?å??é??è??"
@@ -10361,7 +10517,7 @@ msgid ""
"cannot be verified."
msgstr "è¿?å°?ä¿¡ç??ç¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?é?®ä»¶ç??å??é??è??ã??"
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1540
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
msgid "Signature exists, but need public key"
msgstr "ç¾å??å·²å?å?¨ï¼?ä½?é??è¦?å?¬é?¥"
@@ -10371,7 +10527,7 @@ msgid ""
"public key."
msgstr "è¿?å°?ä¿¡ç??ç¾å??æ??æ??ï¼?ä½?æ?¯æ²¡æ??ç?¸åº?ç??å?¬é?¥ã??"
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
msgid "Unencrypted"
msgstr "æ?ªå? å¯?"
@@ -10381,7 +10537,7 @@ msgid ""
"the Internet."
msgstr "è¿?å°?ä¿¡æ?ªå? å¯?ã??å?¨ Internet ä¸?ä¼ é??æ?¶æ??æ??人é?½å?¯ä»¥ç??å?°å?¶å??容ã??"
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
msgid "Encrypted, weak"
msgstr "å¼±å? å¯?"
@@ -10394,7 +10550,7 @@ msgstr ""
"è¿?å°?ä¿¡å·²å? å¯?ï¼?ä½?使ç?¨ç??æ?¯å¼±å? å¯?ç®?æ³?ã??å¦?æ??å¤?人æ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??容ï¼?å?¯è?½è¦?è?±ä¸?"
"å®?æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å¾?å?°é?¾ä½?并ä¸?æ?¯ä¸?å?¯è?½ã??"
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
msgid "Encrypted"
msgstr "å? å¯?"
@@ -10404,7 +10560,7 @@ msgid ""
"the content of this message."
msgstr "è¿?å°?ä¿¡å·²å? å¯?ã??å¤?人è¦?æ?³æ?¥ç??è¿?å°?ä¿¡ç??å??容å??å??å?°é?¾ã??"
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1549
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
msgid "Encrypted, strong"
msgstr "强å? å¯?"
@@ -10417,7 +10573,7 @@ msgstr ""
"è¿?å°?ä¿¡å·²å? å¯?ï¼?ä¸?使ç?¨ç??æ?¯å¼ºå? å¯?ç®?æ³?ã??å¦?æ??å¤?人æ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??容ï¼?å?¯è?½è¦?è?±å¤§"
"é??æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å??å??å?°é?¾ã??"
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
msgid "_View Certificate"
msgstr "æ?¥ç??è¯?书(_V)"
@@ -10433,28 +10589,28 @@ msgstr ""
"Evolution æ? æ³?渲æ??æ¤ç?µå?é?®ä»¶ï¼?å??å? æ?¯è¯¥é?®ä»¶å¤ªå¤§ã??æ?¨å?¯ä»¥ä»¥æ? æ ¼å¼?æ?¹å¼?æ?¥ç??该é?®"
"件ï¼?æ??è??使ç?¨å¤?é?¨æ??æ?¬ç¼?è¾?å?¨æ?¥ç??ã??"
-#: ../mail/em-format-html-display.c:730
+#: ../mail/em-format-html-display.c:738
msgid "Completed on"
msgstr "å®?æ??äº?"
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:746
msgid "Overdue:"
msgstr "延æ??ï¼?"
#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:742
+#: ../mail/em-format-html-display.c:750
msgid "by"
msgstr ""
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html-display.c:997
msgid "View _Unformatted"
msgstr "æ? æ ¼å¼?æ?¥ç??(_U)"
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:960
msgid "Hide _Unformatted"
msgstr "æ? æ ¼å¼?é??è??(_U)"
-#: ../mail/em-format-html-display.c:985
+#: ../mail/em-format-html-display.c:1017
msgid "O_pen With"
msgstr "æ??å¼?æ?¹å¼?(_P)"
@@ -10471,40 +10627,40 @@ msgstr "æ ¼å¼?å??信件"
msgid "Formatting Message..."
msgstr "æ£å?¨æ ¼å¼?å??信件..."
-#: ../mail/em-format-html.c:1387 ../mail/em-format-html.c:1396
+#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
#, c-format
msgid "Retrieving `%s'"
msgstr "æ?¶å??â??%sâ??"
-#: ../mail/em-format-html.c:1848
+#: ../mail/em-format-html.c:1854
msgid "Unknown external-body part."
msgstr "æ?ªç?¥ç?? external-body é?¨å??ã??"
-#: ../mail/em-format-html.c:1856
+#: ../mail/em-format-html.c:1862
msgid "Malformed external-body part."
msgstr "æ ¼å¼?ä¸?æ£ç¡®ç?? external-body é?¨å??ã??"
-#: ../mail/em-format-html.c:1886
+#: ../mail/em-format-html.c:1892
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "æ??å?? FTP ç«?ç?¹ (%s)"
-#: ../mail/em-format-html.c:1897
+#: ../mail/em-format-html.c:1903
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "å?¨ç«?ç?¹â??%2$sâ??æ??å??æ?¬å?°æ??件 (%1$s) å??æ³?"
-#: ../mail/em-format-html.c:1899
+#: ../mail/em-format-html.c:1905
#, c-format
msgid "Pointer to local file (%s)"
msgstr "æ??å??æ?¬å?°æ??件 (%s)"
-#: ../mail/em-format-html.c:1920
+#: ../mail/em-format-html.c:1926
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "æ??å??è¿?ç¨?æ?°æ?® (%s)"
-#: ../mail/em-format-html.c:1931
+#: ../mail/em-format-html.c:1937
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "æ??å??æ?ªç?¥ç??å¤?é?¨æ?°æ?® (â??%sâ??ç±»å??)"
@@ -10512,38 +10668,38 @@ msgstr "æ??å??æ?ªç?¥ç??å¤?é?¨æ?°æ?® (â??%sâ??ç±»å??)"
#. To translators: This message suggests to the receipients that the sender of the mail is
#. different from the one listed in From field.
#.
-#: ../mail/em-format-html.c:2589
+#: ../mail/em-format-html.c:2595
#, c-format
msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
msgstr "æ¤æ¶?æ?¯ç?± <b>%s</b> 以 <b>%s</b> ç??身份å??é??"
-#: ../mail/em-subscribe-editor.c:597
+#: ../mail/em-subscribe-editor.c:586
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "æ¤å?å?¨ä¸?æ?¯æ??订é??ï¼?æ??订é??æ?ªå?¯ç?¨ã??"
-#: ../mail/em-subscribe-editor.c:630
+#: ../mail/em-subscribe-editor.c:619
msgid "Subscribed"
msgstr "已订é??"
-#: ../mail/em-subscribe-editor.c:634
+#: ../mail/em-subscribe-editor.c:623
msgid "Folder"
msgstr "æ??件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:846
+#: ../mail/em-subscribe-editor.c:835
msgid "Please select a server."
msgstr "请é??æ?©æ??å?¡å?¨ã??"
-#: ../mail/em-subscribe-editor.c:882
+#: ../mail/em-subscribe-editor.c:871
msgid "No server has been selected"
msgstr "没æ??é??ä¸æ??å?¡å?¨"
-#: ../mail/em-utils.c:341
+#: ../mail/em-utils.c:311
msgid "Message Filters"
msgstr "�件�滤�"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:845
+#: ../mail/em-utils.c:815
#, c-format
msgid "Messages from %s"
msgstr "æ?¥è?ª %s ç??信件"
@@ -10552,7 +10708,7 @@ msgstr "æ?¥è?ª %s ç??信件"
msgid "Search _Folders"
msgstr "æ??ç´¢æ??件夹(_F)"
-#: ../mail/em-vfolder-rule.c:521
+#: ../mail/em-vfolder-rule.c:522
msgid "Add Folder"
msgstr "æ·»å? æ??件夹"
@@ -11276,83 +11432,75 @@ msgid ""
msgstr ""
#: ../mail/evolution-mail.schemas.in.h:157
-msgid "Show the \"Preview\" pane"
-msgstr "æ?¾ç¤ºâ??é¢?è§?â??é?¢æ?¿"
-
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "Show the \"Preview\" pane."
-msgstr "æ?¾ç¤ºâ??é¢?è§?â??é?¢æ?¿ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:159
msgid ""
"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
"from the View menu when a news account is chosen."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:158
msgid ""
"Show the \"Reply To\" field when sending a mail message. This is controlled "
"from the View menu when a mail account is chosen."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:159
msgid ""
"Show the email-address of the sender in a separate column in the message "
"list."
msgstr "å?¨ä¿¡ä»¶å??表ç??以å?¦å¤?ç??å??æ?¾ç¤ºç?µå?é?®ä»¶ç??å??é??è??ã??"
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:160
msgid ""
"Show the original \"Date\" header (with a local time only if the time zone "
"differs). Otherwise always show \"Date\" header value in a user preferred "
"format and local time zone."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:161
msgid "Show the photo of the sender in the message reading pane."
msgstr "å?¨ä¿¡ä»¶é??读é?¢æ?¿ä¸æ?¾ç¤ºå??件人ç?§ç??ã??"
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:162
msgid "Spell check inline"
msgstr "å??åµ?æ?¼å??æ£?æ?¥"
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:163
msgid "Spell checking color"
msgstr "æ?¼å??æ£?æ?¥é¢?è?²"
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:164
msgid "Spell checking languages"
msgstr "æ?¼å??æ£?æ?¥è¯è¨?"
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:165
msgid "Subscribe dialog default height"
msgstr "订é??对è¯?æ¡?é»?认é«?度"
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:166
msgid "Subscribe dialog default width"
msgstr "订é??对è¯?æ¡?é»?认宽度"
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:167
msgid "Terminal font"
msgstr "ç»?端å?ä½?"
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:168
msgid "Text message part limit"
msgstr "æ??æ?¬ä¿¡ä»¶é?¨å??é??å?¶"
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:169
msgid "The default plugin for Junk hook"
msgstr "é»?认ç??å??å?¾ä¿¡ä»¶é?©å?æ??件"
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:170
msgid "The last time empty junk was run, in days since the epoch."
msgstr "ä¸?次æ¸?空å??å?¾ä¿¡ä»¶ç??æ?¶é?´ï¼?以è?ªæ?°çºªå??å??ç??天æ?°æ?¾ç¤ºã??"
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:171
msgid "The last time empty trash was run, in days since the epoch."
msgstr "ä¸?次æ¸?空å??æ?¶ç«?ç??æ?¶é?´ï¼?以æ?°çºªå??å??ç??天æ?°æ?¾ç¤ºã??"
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:172
msgid ""
"The layout style determines where to place the preview pane in relation to "
"the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11360,21 +11508,21 @@ msgid ""
"message list."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:173
msgid "The terminal font for mail display."
msgstr "é?®ä»¶æ?¾ç¤ºç?¨ç??ç»?端å?ä½?ã??"
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:174
msgid "The variable width font for mail display."
msgstr "ç?¨äº?æ?¾ç¤ºé?®ä»¶ç??å??宽å?ä½?ã??"
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:175
msgid ""
"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
"\"2\" for debug messages."
msgstr "æ¤é??项æ??ä¸?ç§?å?¯è?½å?¼ï¼?0ï¼?é??误ï¼?1ï¼?è¦å??ï¼?2ï¼?è°?è¯?ä¿¡æ?¯ã??"
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:176
#, fuzzy
msgid ""
"This decides the max size of the text part that can be formatted under "
@@ -11383,7 +11531,7 @@ msgstr ""
"æ¤é??项å?³å®?äº? Evolution ä¸å?¯æ ¼å¼?å??ç??æ??大æ??æ?¬é?¨å??大å°?ã??é»?认为 4MB/4096 KBï¼?å??ä½?"
"为 KBã??"
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:177
msgid ""
"This is the default junk plugin, even though there are multiple plugins "
"enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11392,7 +11540,7 @@ msgstr ""
"è¿?æ?¯é»?认ç??å??å?¾é?®ä»¶æ??件ï¼?å?³ä½¿å?¯ç?¨äº?å¤?个æ??件ã??å¦?æ??é»?认å??å?ºç??æ??件被ç¦?ç?¨ï¼?å®?ä¸?ä¼?"
"缺ç??å?°å?¶å®?å?¯ç?¨ç??æ??件ã??"
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:178
#, fuzzy
msgid ""
"This key is read only once and reset to \"false\" after read. This unselects "
@@ -11401,7 +11549,7 @@ msgstr ""
"æ¤é?®å?ªè¢«è¯»å??ä¸?次并å?¨è¯»å??å??被é??设为 falseã??å®?å??æ¶?é??ä¸å??表ä¸ç??é?®ä»¶å¹¶ç§»é?¤ç?¸åº?æ??"
"件夹ç??é¢?è§?ã??"
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:179
msgid ""
"This key should contain a list of XML structures specifying custom headers, "
"and whether they are to be displayed. The format of the XML structure is <"
@@ -11411,30 +11559,30 @@ msgstr ""
"æ¤é?®åº?å??å?«æ??å®?è?ªå®?ä¹?é?®ä»¶å¤´ç?? XML ç»?æ??å??表ï¼?以å??æ?¯å?¦æ?¾ç¤ºè¿?äº?é?®ä»¶å¤´ã??XML ç»?æ??ç??"
"æ ¼å¼?为ï¼?<å?¯ç?¨ç??é?®ä»¶å¤´> - 设为 enabled å??å?¨é?®ä»¶è§?å?¾ä¸æ?¾ç¤ºè¯¥é?®ä»¶å¤´ã??"
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:180
msgid ""
"This option is related to the key lookup_addressbook and is used to "
"determine whether to look up addresses in local address book only to exclude "
"mail sent by known contacts from junk filtering."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:181
msgid "This option would help in improving the speed of fetching."
msgstr "æ¤é??项è?½å¸®å?©æ??é«?è?·å??信件ç??é??度"
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:182
msgid ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
msgstr "设å®?é»?认信件è§?å?¾ä¸è¦?æ?¾ç¤ºç??å?°å??æ?°ï¼?è¶?è¿?ç??é?¨å??æ?¾ç¤ºä¸ºâ??...â??ã??"
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:183
msgid ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
msgstr "æ¤è®¾ç½®æ??å®?äº?é»?认æ??å?µä¸?线索æ?¯è¢«å±?å¼?è¿?æ?¯è¢«æ??å? ã??é??è¦?é??å?¯ Evolutionã??"
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:184
msgid ""
"This setting specifies whether the threads should be sorted based on latest "
"message in each thread, rather than by message's date. Evolution requires a "
@@ -11443,99 +11591,91 @@ msgstr ""
"æ¤è®¾ç½®æ??å®?äº?é»?认æ??å?µä¸?æ?¯å?¦å°?线索æ??线索ä¸ç??æ??æ?°æ¶?æ?¯è??ä¸?æ?¯æ¶?æ?¯æ?¥æ??æ??åº?ã??é??è¦?é??"
"å?¯ Evolutionã??"
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid "Thread the message list."
-msgstr "æ??线索ç¼?æ??信件å??表ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:188
-msgid "Thread the message-list"
-msgstr "æ??线索ç¼?æ??信件å??表"
-
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:185
msgid "Thread the message-list based on Subject"
msgstr "å?ºäº?主é¢?æ??线索ç¼?æ??信件å??表"
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:186
msgid "Timeout for marking message as seen"
msgstr "å°?信件æ ?为已ç??ç??è¶?æ?¶æ?¶é?¿"
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:187
msgid "Timeout for marking message as seen."
msgstr "å°?信件æ ?为已ç??ç??è¶?æ?¶æ?¶é?¿ã??"
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:188
msgid "UID string of the default account."
msgstr "é»?认账æ?·ç?? UID å?符串ã??"
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:189
msgid "Underline color for misspelled words when using inline spelling."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:190
msgid "Use SpamAssassin daemon and client"
msgstr "使ç?¨å??å?¾å??æ??å®?æ?¤ç¨?åº?å??客æ?·"
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:191
msgid "Use SpamAssassin daemon and client (spamc/spamd)."
msgstr "使ç?¨ SpamAssassin å®?æ?¤ç¨?åº?å??客æ?·ç«¯(spamc/spamd)ã??"
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:192
msgid "Use custom fonts"
msgstr "使ç?¨è?ªå®?ä¹?å?ä½?"
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:193
msgid "Use custom fonts for displaying mail."
msgstr "使ç?¨è?ªå®?ä¹?å?ä½?æ?¾ç¤ºé?®ä»¶ã??"
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:194
msgid "Use only local spam tests."
msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?®ä»¶æµ?è¯?ã??"
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:195
msgid "Use only the local spam tests (no DNS)."
msgstr "ä¹?使ç?¨æ?¬å?°å??å?¾é?®ä»¶æµ?è¯?(æ? DNS)ã??"
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:196
msgid ""
"Users get all up in arms over where the cursor should go when replying to a "
"message. This determines whether the cursor is placed at the top of the "
"message or the bottom."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:197
msgid ""
"Users get all up in arms over where their signature should go when replying "
"to a message. This determines whether the signature is placed at the top of "
"the message or the bottom."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:198
msgid "Variable width font"
msgstr "å??宽å?ä½?"
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:199
msgid "Whether a read receipt request gets added to every message by default."
msgstr "æ?¯å?¦é»?认对æ??æ??信件添å? é??读æ?¶æ?¡è¯·æ±?ã??"
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:200
msgid "Whether disable ellipsizing feature of folder names in side bar."
msgstr "ç¦?ç?¨æ??å?¯ç?¨ä¾§è¾¹æ ?ä¸æ??件夹å??ç??ç??ç?¥æ?¾ç¤º"
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:201
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
msgstr "æ?¯å?¦å?¨ä¿¡ä»¶ä¸?å??å?« In-Reply-To æ?? References 头æ?¶å¼ºå?¶æ??主é¢?ç¼?æ??线索ã??"
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:202
msgid "Whether sort threads based on latest message in that thread"
msgstr "æ?¯å?¦ä»¥çº¿ç´¢ä¸ç??æ??æ?°ä¿¡ä»¶æ?¥æ??åº?线索"
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:203
msgid "Width of the message-list pane"
msgstr "信件å??表é?¢æ?¿ç??é«?度"
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:204
msgid "Width of the message-list pane."
msgstr "信件å??表é?¢æ?¿ç??é«?度ã??"
@@ -11543,17 +11683,17 @@ msgstr "信件å??表é?¢æ?¿ç??é«?度ã??"
msgid "Importing Elm data"
msgstr "导� Elm ��"
-#: ../mail/importers/elm-importer.c:323 ../mail/importers/pine-importer.c:377
-#: ../modules/mail/e-mail-shell-view.c:592
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../modules/mail/e-mail-shell-view.c:603
#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
msgid "Mail"
msgstr "�件"
-#: ../mail/importers/elm-importer.c:363
+#: ../mail/importers/elm-importer.c:367
msgid "Evolution Elm importer"
msgstr "Evolution Elm 导��"
-#: ../mail/importers/elm-importer.c:364
+#: ../mail/importers/elm-importer.c:368
msgid "Import mail from Elm."
msgstr "ä»? Elm 导å?¥é?®ä»¶ã??"
@@ -11572,11 +11712,12 @@ msgstr "é??æ?©æ??件夹"
msgid "Select folder to import into"
msgstr "é??æ?©è¦?导å?¥å?°å?ªä¸ªæ??件夹"
-#: ../mail/importers/evolution-mbox-importer.c:258
+#: ../mail/importers/evolution-mbox-importer.c:260
+#: ../shell/e-shell-utils.c:218
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley �箱(mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:259
+#: ../mail/importers/evolution-mbox-importer.c:261
msgid "Importer Berkeley Mailbox format folders"
msgstr "导å?¥å?¨ Berkeley é?®ç®±æ ¼å¼?æ??件夹"
@@ -11597,44 +11738,44 @@ msgstr "导å?¥â??%sâ??"
msgid "Scanning %s"
msgstr "æ?«æ?? %s"
-#: ../mail/importers/pine-importer.c:224
+#: ../mail/importers/pine-importer.c:221
msgid "Importing Pine data"
msgstr "导� Pine ��"
-#: ../mail/importers/pine-importer.c:382
+#: ../mail/importers/pine-importer.c:379
#: ../modules/addressbook/addressbook-config.c:986
msgid "Address Book"
msgstr "å?°å??ç°¿"
-#: ../mail/importers/pine-importer.c:423
+#: ../mail/importers/pine-importer.c:420
msgid "Evolution Pine importer"
msgstr "Evolution Pine 导��"
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:421
msgid "Import mail from Pine."
msgstr "ä»? Pine 导å?¥é?®ä»¶ã??"
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:73
#, c-format
msgid "Mail to %s"
msgstr "��� %s"
-#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
#, c-format
msgid "Mail from %s"
msgstr "æ?¥è?ª %s ç??é?®ä»¶"
-#: ../mail/mail-autofilter.c:258
+#: ../mail/mail-autofilter.c:259
#, c-format
msgid "Subject is %s"
msgstr "主�� %s"
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:294
#, c-format
msgid "%s mailing list"
msgstr "%s é?®ä»¶å??表"
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:366
msgid "Add Filter Rule"
msgstr "æ·»å? è¿?滤è§?å??"
@@ -12093,10 +12234,10 @@ msgstr "ç?¨æ?·å??(_E)ï¼?"
msgid "Use Authe_ntication"
msgstr "使�身份��(_N)"
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:405
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
#: ../plugins/google-account-setup/google-contacts-source.c:280
-#: ../plugins/google-account-setup/google-source.c:700
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
+#: ../plugins/google-account-setup/google-source.c:620
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
msgid "User_name:"
msgstr "ç?¨æ?·å??(_N)ï¼?"
@@ -12188,7 +12329,7 @@ msgstr "è??æ?¬(_S)ï¼?"
msgid "_Secure HTTP Proxy:"
msgstr "å®?å?¨ HTTP 代ç??(_S)ï¼?"
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:28
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
#: ../plugins/publish-calendar/publish-calendar.ui.h:28
msgid "_Server:"
msgstr "æ??å?¡å?¨(_S)ï¼?"
@@ -12218,7 +12359,7 @@ msgstr "使��认�(_U)"
msgid "_Use the same fonts as other applications"
msgstr "使ç?¨ä¸?å?¶å®?åº?ç?¨ç¨?åº?ç?¸å??ç??å?ä½?(_U)"
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
#, fuzzy
msgid "a"
msgstr "ä¸?å??"
@@ -12227,7 +12368,7 @@ msgstr "ä¸?å??"
msgid "addresses"
msgstr "个å?°å??"
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:50
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
msgid "b"
msgstr ""
@@ -12348,26 +12489,26 @@ msgstr "æ ?å¿?(_F)ï¼?"
msgid "_Tick this to accept the license agreement"
msgstr "é??ä¸æ¤å¤?以表æ??æ?¨æ?¥å??许å?¯å??è®®(_T)"
-#: ../mail/mail-folder-cache.c:890
+#: ../mail/mail-folder-cache.c:893
#, c-format
msgid "Pinging %s"
msgstr "�� %s"
-#: ../mail/mail-ops.c:110
+#: ../mail/mail-ops.c:95
msgid "Filtering Selected Messages"
msgstr "è¿?滤é??ä¸ç??信件"
-#: ../mail/mail-ops.c:269
+#: ../mail/mail-ops.c:254
msgid "Fetching Mail"
msgstr "æ?¶å??é?®ä»¶"
#. sending mail, filtering failed
-#: ../mail/mail-ops.c:600
+#: ../mail/mail-ops.c:585
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "�����滤�失败�%s"
-#: ../mail/mail-ops.c:612 ../mail/mail-ops.c:639
+#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -12376,129 +12517,124 @@ msgstr ""
"追å? å?° %sï¼?%s 失败\n"
"转è??追å? å?°æ?¬å?°â??å·²å??â??æ??件夹ã??"
-#: ../mail/mail-ops.c:656
+#: ../mail/mail-ops.c:641
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追å? å?°æ?¬å?°â??å·²å??â??æ??件夹失败ï¼?%s"
-#: ../mail/mail-ops.c:767 ../mail/mail-ops.c:848
+#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
msgid "Sending message"
msgstr "å??é??信件"
-#: ../mail/mail-ops.c:777
+#: ../mail/mail-ops.c:762
#, c-format
msgid "Sending message %d of %d"
msgstr "å??é??第%då°?ä¿¡ï¼?å?±%då°?"
-#: ../mail/mail-ops.c:804
+#: ../mail/mail-ops.c:789
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "�第%d�信失败��%d�"
-#: ../mail/mail-ops.c:806 ../mail/mail-send-recv.c:761
+#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
msgid "Canceled."
msgstr "å·²å??æ¶?ã??"
-#: ../mail/mail-ops.c:808 ../mail/mail-send-recv.c:763
+#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
msgid "Complete."
msgstr "å®?æ??ã??"
-#: ../mail/mail-ops.c:920
+#: ../mail/mail-ops.c:905
#, fuzzy, c-format
msgid "Saving message to folder '%s'"
msgstr "æ??信件ä¿?å?å?°æ??件夹ä¸"
-#: ../mail/mail-ops.c:997
+#: ../mail/mail-ops.c:982
#, fuzzy, c-format
msgid "Moving messages to '%s'"
msgstr "æ??信件移è?³ %s"
-#: ../mail/mail-ops.c:997
+#: ../mail/mail-ops.c:982
#, fuzzy, c-format
msgid "Copying messages to '%s'"
msgstr "æ??信件å¤?å?¶å?° %s"
-#: ../mail/mail-ops.c:1106
+#: ../mail/mail-ops.c:1091
#, fuzzy, c-format
msgid "Scanning folders in '%s'"
msgstr "å?¨â??%sâ??ä¸æ?«æ??æ??件夹"
-#: ../mail/mail-ops.c:1214
+#: ../mail/mail-ops.c:1199
msgid "Forwarded messages"
msgstr "转å??ç??信件"
-#: ../mail/mail-ops.c:1255
+#: ../mail/mail-ops.c:1240
#, fuzzy, c-format
msgid "Opening folder '%s'"
msgstr "æ??å¼?æ??件夹 %s"
-#: ../mail/mail-ops.c:1321
+#: ../mail/mail-ops.c:1306
#, fuzzy, c-format
msgid "Retrieving quota information for folder '%s'"
msgstr "æ£å?¨è?·å??æ??件å? %s ç??é??é¢?ä¿¡æ?¯"
-#: ../mail/mail-ops.c:1393
+#: ../mail/mail-ops.c:1378
#, fuzzy, c-format
msgid "Opening store '%s'"
msgstr "æ??å¼?å?å?¨ %s"
-#: ../mail/mail-ops.c:1464
+#: ../mail/mail-ops.c:1449
#, fuzzy, c-format
msgid "Removing folder '%s'"
msgstr "å? é?¤æ??件夹 %s"
-#: ../mail/mail-ops.c:1582
+#: ../mail/mail-ops.c:1567
#, c-format
msgid "Storing folder '%s'"
msgstr "å?å?¨æ??件夹â??%sâ??"
-#: ../mail/mail-ops.c:1645
+#: ../mail/mail-ops.c:1630
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "é??æ¯?并å?å?¨è´¦æ?·â??%sâ??"
-#: ../mail/mail-ops.c:1646
+#: ../mail/mail-ops.c:1631
#, c-format
msgid "Storing account '%s'"
msgstr "å?å?¨è´¦æ?·â??%sâ??"
-#: ../mail/mail-ops.c:1700
+#: ../mail/mail-ops.c:1685
#, fuzzy, c-format
msgid "Refreshing folder '%s'"
msgstr "å?·æ?°æ??件夹"
-#: ../mail/mail-ops.c:1740
+#: ../mail/mail-ops.c:1725
#, fuzzy, c-format
msgid "Expunging folder '%s'"
msgstr "é??æ¯?æ??件夹"
-#: ../mail/mail-ops.c:1785
+#: ../mail/mail-ops.c:1770
#, c-format
msgid "Emptying trash in '%s'"
msgstr "æ¸?空â??%sâ??ä¸ç??å??æ?¶ç«?"
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1771
msgid "Local Folders"
msgstr "æ?¬å?°æ??件夹"
-#: ../mail/mail-ops.c:1864
-#, fuzzy, c-format
-msgid "Retrieving message '%s'"
-msgstr "æ?¶å??信件 %s"
-
-#: ../mail/mail-ops.c:1982
+#: ../mail/mail-ops.c:1967
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "æ?¶å?? %d å°?ä¿¡"
-#: ../mail/mail-ops.c:2071
+#: ../mail/mail-ops.c:2056
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messages"
msgstr[0] "ä¿?å? %d å°?ä¿¡"
-#: ../mail/mail-ops.c:2151
+#: ../mail/mail-ops.c:2136
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -12507,11 +12643,11 @@ msgstr ""
"å?¨å°?信件ä¿?å?å?° %s æ?¶å??ç??é??误ï¼?\n"
" %s"
-#: ../mail/mail-ops.c:2223
+#: ../mail/mail-ops.c:2208
msgid "Saving attachment"
msgstr "ä¿?å?é??件"
-#: ../mail/mail-ops.c:2241 ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -12520,121 +12656,130 @@ msgstr ""
"æ? æ³?å??建è¾?å?ºæ??件ï¼?%sï¼?\n"
" %s"
-#: ../mail/mail-ops.c:2264
+#: ../mail/mail-ops.c:2249
#, c-format
msgid "Could not write data: %s"
msgstr "æ? æ³?å??æ?°æ?®ï¼?%s"
-#: ../mail/mail-ops.c:2409
+#: ../mail/mail-ops.c:2394
#, fuzzy, c-format
msgid "Disconnecting from '%s'"
msgstr "æ?å¼?ä¸? %s ç??è¿?æ?¥"
-#: ../mail/mail-ops.c:2409
+#: ../mail/mail-ops.c:2394
#, fuzzy, c-format
msgid "Reconnecting to '%s'"
msgstr "é??æ?°è¿?æ?¥å?° %s"
-#: ../mail/mail-ops.c:2505
+#: ../mail/mail-ops.c:2490
#, c-format
msgid "Preparing account '%s' for offline"
msgstr "æ£å?¨å??å¤?è?±æ?ºä½¿ç?¨è´¦æ?·â??%sâ??"
-#: ../mail/mail-ops.c:2591
+#: ../mail/mail-ops.c:2576
msgid "Checking Service"
msgstr "æ£?æ?¥æ??å?¡"
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:189
msgid "Canceling..."
msgstr "æ£å?¨å??æ¶?..."
-#: ../mail/mail-send-recv.c:432
+#: ../mail/mail-send-recv.c:431
msgid "Send & Receive Mail"
msgstr "å??é??å??æ?¥æ?¶é?®ä»¶"
-#: ../mail/mail-send-recv.c:445
+#: ../mail/mail-send-recv.c:444
msgid "Cancel _All"
msgstr "å?¨é?¨å??æ¶?(_A)"
-#: ../mail/mail-send-recv.c:554
+#: ../mail/mail-send-recv.c:553
msgid "Updating..."
msgstr "æ£å?¨æ?´æ?°..."
-#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
+#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
msgid "Waiting..."
msgstr "æ£å?¨ç?å¾?..."
-#: ../mail/mail-send-recv.c:874
+#: ../mail/mail-send-recv.c:873
#, c-format
msgid "Checking for new mail"
msgstr "����件"
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:220
#, c-format
msgid "Enter Passphrase for %s"
msgstr "è¾?å?¥ %s ç??å¯?ç ?"
-#: ../mail/mail-session.c:216
+#: ../mail/mail-session.c:222
msgid "Enter Passphrase"
msgstr "è¾?å?¥å¯?ç ?"
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:225
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s è¾?å?¥å¯?ç ?"
-#: ../mail/mail-session.c:221
+#: ../mail/mail-session.c:227
msgid "Enter Password"
msgstr "è¾?å?¥å¯?ç ?"
-#: ../mail/mail-session.c:263
+#: ../mail/mail-session.c:269
msgid "User canceled operation."
msgstr "ç?¨æ?·å·±å??æ¶?æ??ä½?ã??"
-#: ../mail/mail-tools.c:136
+#: ../mail/mail-session.c:663
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "缺å°?å??é??ç?®æ ?å?°å??ï¼?é?®ä»¶è½¬å??被å??æ¶?ã??"
+
+#: ../mail/mail-session.c:669
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "æ? å?¯ç?¨è´¦æ?·ï¼?é?®ä»¶è½¬å??被å??æ¶?ã??"
+
+#: ../mail/mail-tools.c:123
#, c-format
msgid "Could not create spool directory `%s': %s"
msgstr "æ? æ³?å??建è?±æ?ºç?®å½?â??%sâ??ï¼?%s"
-#: ../mail/mail-tools.c:166
+#: ../mail/mail-tools.c:153
#, c-format
msgid "Trying to movemail a non-mbox source `%s'"
msgstr "è¯?å?¾å°?é?®ä»¶ç§»è?³é?? mbox æº?â??%sâ??"
-#: ../mail/mail-tools.c:272
+#: ../mail/mail-tools.c:259
#, c-format
msgid "Forwarded message - %s"
msgstr "转å??ç??信件 - %s"
-#: ../mail/mail-tools.c:274
+#: ../mail/mail-tools.c:261
msgid "Forwarded message"
msgstr "转å??ç??信件"
-#: ../mail/mail-tools.c:314
+#: ../mail/mail-tools.c:301
#, c-format
msgid "Invalid folder: `%s'"
msgstr "æ? æ??ç??æ??件夹ï¼?â??%sâ??"
-#: ../mail/mail-vfolder.c:88
+#: ../mail/mail-vfolder.c:87
#, c-format
msgid "Setting up Search Folder: %s"
msgstr "设置æ??ç´¢æ??件夹ï¼?%s"
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:232
#, c-format
msgid "Updating Search Folders for '%s:%s'"
msgstr "æ?´æ?°â??%s:%sâ??ç??æ??ç´¢æ??件夹"
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:239
#, c-format
msgid "Updating Search Folders for '%s'"
msgstr "æ?´æ?°â??%sâ??ç??æ??ç´¢æ??件夹"
-#: ../mail/mail-vfolder.c:1075
+#: ../mail/mail-vfolder.c:1172
msgid "Edit Search Folder"
msgstr "ç¼?è¾?æ??ç´¢æ??件夹"
-#: ../mail/mail-vfolder.c:1168
+#: ../mail/mail-vfolder.c:1265
msgid "New Search Folder"
msgstr "æ?°å»ºæ??ç´¢æ??件夹"
@@ -13215,7 +13360,7 @@ msgid "_Do not Synchronize"
msgstr "ä¸?å??æ¥(_D)"
#: ../mail/mail.error.xml.h:138
-#: ../modules/mail/e-mail-shell-view-actions.c:1021
+#: ../modules/mail/e-mail-shell-view-actions.c:930
msgid "_Empty Trash"
msgstr "æ¸?空å??æ?¶ç«?(_E)"
@@ -13227,94 +13372,98 @@ msgstr "é??æ¯?(_E)"
msgid "_Open Messages"
msgstr "æ??å¼?信件(_O)"
-#: ../mail/message-list.c:1068
+#: ../mail/message-list.c:1122
msgid "Unseen"
msgstr "æ?ªç??"
-#: ../mail/message-list.c:1069
+#: ../mail/message-list.c:1123
msgid "Seen"
msgstr "å·²ç??"
-#: ../mail/message-list.c:1070
+#: ../mail/message-list.c:1124
msgid "Answered"
msgstr "å·²ç?å¤?"
-#: ../mail/message-list.c:1071
+#: ../mail/message-list.c:1125
msgid "Forwarded"
msgstr "已转å??"
-#: ../mail/message-list.c:1072
+#: ../mail/message-list.c:1126
msgid "Multiple Unseen Messages"
msgstr "å¤?å°?æ?ªç??信件"
-#: ../mail/message-list.c:1073
+#: ../mail/message-list.c:1127
msgid "Multiple Messages"
msgstr "��信"
-#: ../mail/message-list.c:1077
+#: ../mail/message-list.c:1131
msgid "Lowest"
msgstr "æ??ä½?"
-#: ../mail/message-list.c:1078
+#: ../mail/message-list.c:1132
msgid "Lower"
msgstr "è¾?ä½?"
-#: ../mail/message-list.c:1082
+#: ../mail/message-list.c:1136
msgid "Higher"
msgstr "è¾?é«?"
-#: ../mail/message-list.c:1083
+#: ../mail/message-list.c:1137
msgid "Highest"
msgstr "æ??é«?"
-#: ../mail/message-list.c:1712 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1719 ../plugins/itip-formatter/itip-view.c:208
+#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
msgid "Today %l:%M %p"
msgstr "�天%p%l:%M"
-#: ../mail/message-list.c:1728
+#: ../mail/message-list.c:1763
msgid "Yesterday %l:%M %p"
msgstr "�天%p%l:%M"
-#: ../mail/message-list.c:1740
+#: ../mail/message-list.c:1775
msgid "%a %l:%M %p"
msgstr "%A%p%l:%M"
-#: ../mail/message-list.c:1748
+#: ../mail/message-list.c:1783
msgid "%b %d %l:%M %p"
msgstr "%mæ??%dæ?¥%p%l:%M"
-#: ../mail/message-list.c:1750
+#: ../mail/message-list.c:1785
msgid "%b %d %Y"
msgstr "%Yå¹´%mæ??%dæ?¥"
-#: ../mail/message-list.c:2510 ../shell/e-shell-view.c:535
+#: ../mail/message-list.c:2537
+msgid "Select all visible messages"
+msgstr "é??ä¸æ??æ??å?¯è§?ç??信件"
+
+#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:652
msgid "Shell Backend"
msgstr ""
#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4263 ../mail/message-list.c:4743
+#: ../mail/message-list.c:4399 ../mail/message-list.c:4885
msgid "Generating message list"
msgstr "ç??æ??信件å??表"
-#: ../mail/message-list.c:4578
+#: ../mail/message-list.c:4720
msgid ""
"No message satisfies your search criteria. Either clear search with Search-"
">Clear menu item or change it."
msgstr ""
-#: ../mail/message-list.c:4580
+#: ../mail/message-list.c:4722
msgid ""
"There are only hidden messages in this folder. Use View->Show Hidden "
"Messages to show them."
msgstr ""
-#: ../mail/message-list.c:4582
+#: ../mail/message-list.c:4724
msgid "There are no messages in this folder."
msgstr "æ¤æ??件夹ä¸æ²¡æ??信件ã??"
@@ -13352,27 +13501,27 @@ msgid "Subject - Trimmed"
msgstr "主é¢? - 被æ?ªæ?"
#: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/mail/e-mail-shell-view-actions.c:1341
msgid "Body contains"
msgstr "é?®ä»¶ä½?å?«æ??"
#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-shell-view-actions.c:1348
msgid "Message contains"
msgstr "信件å?«æ??"
#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1432
+#: ../modules/mail/e-mail-shell-view-actions.c:1355
msgid "Recipients contain"
msgstr "æ?¶ä»¶äººå?«æ??"
#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1362
msgid "Sender contains"
msgstr "å??件人å?«æ??"
#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1369
msgid "Subject contains"
msgstr "主é¢?å?«æ??"
@@ -13544,7 +13693,6 @@ msgid "Whether to show the preview pane."
msgstr "æ?¯å?¦æ?¾ç¤ºé¢?è§?é?¢æ?¿ã??"
#: ../modules/addressbook/autocompletion-config.c:159
-#: ../modules/mail/em-mailer-prefs.c:1152
msgid "Table column:"
msgstr "è¡¨æ ¼æ ?ï¼?"
@@ -13568,7 +13716,7 @@ msgid "_Contact"
msgstr "è??系人(_C)"
#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:763
msgid "Create a new contact"
msgstr "å??建ä¸?个æ?°è??系人"
@@ -13578,7 +13726,7 @@ msgid "Contact _List"
msgstr "è??系人å??表(_L)"
#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:770
msgid "Create a new contact list"
msgstr "å??建ä¸?个æ?°ç??è??系人å??表"
@@ -13588,22 +13736,22 @@ msgid "Address _Book"
msgstr "å?°å??ç°¿(_B)"
#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:730
+#: ../modules/addressbook/e-book-shell-view-actions.c:693
msgid "Create a new address book"
msgstr "å??建æ?°å?°å??ç°¿"
#. Create the contacts group
#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:396
-#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/calendar/e-cal-shell-backend.c:123
#: ../modules/calendar/e-cal-shell-migrate.c:480
msgid "Contacts"
msgstr "è??系人"
#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:759
-#: ../modules/calendar/e-memo-shell-backend.c:583
-#: ../modules/calendar/e-task-shell-backend.c:593
+#: ../modules/calendar/e-cal-shell-backend.c:777
+#: ../modules/calendar/e-memo-shell-backend.c:587
+#: ../modules/calendar/e-task-shell-backend.c:597
msgid "Source List"
msgstr "æ?¥æº?å??表"
@@ -13612,55 +13760,40 @@ msgstr "æ?¥æº?å??表"
msgid "The registry of address books"
msgstr "æ? æ³?è?·å¾?å?°å??ç°¿å??表"
-#: ../modules/addressbook/e-book-shell-content.c:380
+#: ../modules/addressbook/e-book-shell-content.c:364
msgid "Current View"
msgstr "å½?å??è§?å?¾"
-#: ../modules/addressbook/e-book-shell-content.c:381
+#: ../modules/addressbook/e-book-shell-content.c:365
msgid "The currently selected address book view"
msgstr ""
-#: ../modules/addressbook/e-book-shell-content.c:390
+#: ../modules/addressbook/e-book-shell-content.c:374
#, fuzzy
msgid "Previewed Contact"
msgstr "æ?°å»ºè??系人"
-#: ../modules/addressbook/e-book-shell-content.c:391
+#: ../modules/addressbook/e-book-shell-content.c:375
#, fuzzy
msgid "The contact being shown in the preview pane"
msgstr "æ?¯å?¦æ?¾ç¤ºé¢?è§?é?¢æ?¿ã??"
-#: ../modules/addressbook/e-book-shell-content.c:400
-#: ../modules/calendar/e-memo-shell-content.c:611
-#: ../modules/calendar/e-task-shell-content.c:634
-#: ../modules/mail/e-mail-shell-content.c:726
+#: ../modules/addressbook/e-book-shell-content.c:384
+#: ../modules/calendar/e-memo-shell-content.c:613
+#: ../modules/calendar/e-task-shell-content.c:635
+#: ../modules/mail/e-mail-shell-content.c:688
#, fuzzy
msgid "Preview is Visible"
msgstr "侧边æ ?å?¯è§?"
-#: ../modules/addressbook/e-book-shell-content.c:401
-#: ../modules/calendar/e-memo-shell-content.c:612
-#: ../modules/calendar/e-task-shell-content.c:635
-#: ../modules/mail/e-mail-shell-content.c:727
+#: ../modules/addressbook/e-book-shell-content.c:385
+#: ../modules/calendar/e-memo-shell-content.c:614
+#: ../modules/calendar/e-task-shell-content.c:636
+#: ../modules/mail/e-mail-shell-content.c:689
#, fuzzy
msgid "Whether the preview pane is visible"
msgstr "æ?¯å?¦æ?¾ç¤ºé¢?è§?é?¢æ?¿ã??"
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
-#: ../modules/mail/e-mail-shell-migrate.c:1106
-msgid "Migrating..."
-msgstr "æ£å?¨å??è¿?..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
-#: ../modules/mail/e-mail-shell-migrate.c:1179
-#, c-format
-msgid "Migrating '%s':"
-msgstr "å??è¿?â??%sâ??ï¼?"
-
#: ../modules/addressbook/e-book-shell-migrate.c:645
msgid "LDAP Servers"
msgstr "LDAP æ??å?¡å?¨"
@@ -13711,9 +13844,9 @@ msgstr ""
"请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç?? Pilot å??æ¥æ?°æ?®..."
#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:608
-#: ../modules/calendar/e-memo-shell-sidebar.c:543
-#: ../modules/calendar/e-task-shell-sidebar.c:541
+#: ../modules/calendar/e-cal-shell-sidebar.c:761
+#: ../modules/calendar/e-memo-shell-sidebar.c:687
+#: ../modules/calendar/e-task-shell-sidebar.c:687
#, fuzzy
msgid "Source Selector Widget"
msgstr "å¤?å¿?æ?¥æº?é??æ?©å?¨"
@@ -13724,278 +13857,271 @@ msgid "This widget displays groups of address books"
msgstr "æ? æ³?è?·å¾?å?°å??ç°¿å??表"
#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:563
+#: ../modules/addressbook/e-book-shell-view-actions.c:539
msgid "Save as vCard"
msgstr "å?¦å?为 VCard"
-#: ../modules/addressbook/e-book-shell-view-actions.c:707
+#: ../modules/addressbook/e-book-shell-view-actions.c:670
msgid "Co_py All Contacts To..."
msgstr "å°?å?¨é?¨è??系人å¤?å?¶å?°(_P)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:709
+#: ../modules/addressbook/e-book-shell-view-actions.c:672
#, fuzzy
msgid "Copy the contacts of the selected address book to another"
msgstr "æ??é??ä¸æ??件夹ä¸ç??è??系人å¤?å?¶å?°å?¶å®?æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:714
-msgid "Del_ete Address Book"
+#: ../modules/addressbook/e-book-shell-view-actions.c:677
+#, fuzzy
+#| msgid "Del_ete Address Book"
+msgid "D_elete Address Book"
msgstr "å? é?¤å?°å??ç°¿(_E)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:716
+#: ../modules/addressbook/e-book-shell-view-actions.c:679
#, fuzzy
msgid "Delete the selected address book"
msgstr "å? é?¤é??ä¸ç??æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:721
+#: ../modules/addressbook/e-book-shell-view-actions.c:684
msgid "Mo_ve All Contacts To..."
msgstr "å°?å?¨é?¨è??系人移è?³(_V)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:723
+#: ../modules/addressbook/e-book-shell-view-actions.c:686
#, fuzzy
msgid "Move the contacts of the selected address book to another"
msgstr "æ??é??ä¸æ??件夹ä¸ç??è??系人移è?³å?¶å®?æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:728
+#: ../modules/addressbook/e-book-shell-view-actions.c:691
msgid "_New Address Book"
msgstr "æ?°å»ºå?°å??ç°¿(_N)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:735
+#: ../modules/addressbook/e-book-shell-view-actions.c:698
msgid "Address _Book Properties"
msgstr "å?°å??ç°¿å±?æ?§(_B)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:737
+#: ../modules/addressbook/e-book-shell-view-actions.c:700
#, fuzzy
msgid "Show properties of the selected address book"
msgstr "æ?´æ?¹é??ä¸æ??件夹ç??å±?æ?§"
-#: ../modules/addressbook/e-book-shell-view-actions.c:742
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
-#: ../modules/calendar/e-task-shell-view-actions.c:790
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/addressbook/e-book-shell-view-actions.c:705
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
msgid "_Rename..."
msgstr "é??å?½å??(_R)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:744
+#: ../modules/addressbook/e-book-shell-view-actions.c:707
#, fuzzy
msgid "Rename the selected address book"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:749
+#: ../modules/addressbook/e-book-shell-view-actions.c:712
msgid "S_ave Address Book as vCard"
msgstr "ä¿?å?å?°å??簿为 VCard(_A)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:751
+#: ../modules/addressbook/e-book-shell-view-actions.c:714
#, fuzzy
msgid "Save the contacts of the selected address book as a vCard"
msgstr "æ??é??ä¸æ??件夹ä¸ç??ç??è??系人ä¿?å?为 VCard"
-#: ../modules/addressbook/e-book-shell-view-actions.c:758
+#: ../modules/addressbook/e-book-shell-view-actions.c:721
msgid "Stop loading"
msgstr "å??æ¢è½½å?¥"
-#: ../modules/addressbook/e-book-shell-view-actions.c:765
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
-msgid "Copy the selection"
-msgstr "å¤?å?¶é??ä¸å??容"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:772
-#: ../modules/calendar/e-cal-shell-view-actions.c:1329
-msgid "Cut the selection"
-msgstr "å?ªå??é??ä¸å??容"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:779
-#: ../modules/calendar/e-cal-shell-view-actions.c:1336
-msgid "Paste the clipboard"
-msgstr "�贴�贴�"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:784
+#: ../modules/addressbook/e-book-shell-view-actions.c:726
#, fuzzy
msgid "_Copy Contact To..."
msgstr "å°?è??系人å¤?å?¶å?°(_C)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:786
+#: ../modules/addressbook/e-book-shell-view-actions.c:728
#, fuzzy
msgid "Copy selected contacts to another address book"
msgstr "æ??é??ä¸ç??è??系人å¤?å?¶å?°å?¶å®?æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:791
+#: ../modules/addressbook/e-book-shell-view-actions.c:733
msgid "_Delete Contact"
msgstr "å? é?¤è??系人(_D)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:793
-msgid "Delete selected contacts"
-msgstr "å? é?¤é??ä¸ç??è??系人"
+#: ../modules/addressbook/e-book-shell-view-actions.c:740
+#, fuzzy
+#| msgid "_Forward Contact..."
+msgid "_Find in Contact..."
+msgstr "转å??è??系人(_F)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:798
+#: ../modules/addressbook/e-book-shell-view-actions.c:742
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed contact"
+msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:747
msgid "_Forward Contact..."
msgstr "转å??è??系人(_F)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:800
+#: ../modules/addressbook/e-book-shell-view-actions.c:749
msgid "Send selected contacts to another person"
msgstr "æ??é??ä¸ç??è??系人å??é??ç»?å?¶ä»?人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:805
+#: ../modules/addressbook/e-book-shell-view-actions.c:754
#, fuzzy
msgid "_Move Contact To..."
msgstr "å°?è??系人移è?³(_M)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:807
+#: ../modules/addressbook/e-book-shell-view-actions.c:756
#, fuzzy
msgid "Move selected contacts to another address book"
msgstr "æ??é??ä¸ç??è??系人移è?³å?¶å®?æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:761
msgid "_New Contact..."
msgstr "æ?°å»ºè??系人(_N)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:819
+#: ../modules/addressbook/e-book-shell-view-actions.c:768
msgid "New Contact _List..."
msgstr "æ?°å»ºè??系人å??表(_L)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:826
+#: ../modules/addressbook/e-book-shell-view-actions.c:775
msgid "_Open Contact"
msgstr "æ??å¼?è??系人(_O)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:777
msgid "View the current contact"
msgstr "æ?¥ç??å½?å??è??系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:835
-msgid "Select all contacts"
-msgstr "é??ä¸å?¨é?¨è??系人"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:840
+#: ../modules/addressbook/e-book-shell-view-actions.c:782
msgid "_Send Message to Contact..."
msgstr "ç»?è??系人å??信件(_S)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:784
msgid "Send a message to the selected contacts"
msgstr "ç»?é??ä¸ç??è??系人å??信件"
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
-#: ../modules/calendar/e-task-shell-view-actions.c:848
+#: ../modules/addressbook/e-book-shell-view-actions.c:791
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-task-shell-view-actions.c:813
msgid "_Actions"
msgstr "æ??ä½?(_A)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:856
-#: ../modules/calendar/e-memo-shell-view-actions.c:703
-#: ../modules/calendar/e-task-shell-view-actions.c:855
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/addressbook/e-book-shell-view-actions.c:798
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-task-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
msgid "_Preview"
msgstr "��(_P)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:865
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-task-shell-view-actions.c:833
msgid "_Delete"
msgstr "å? é?¤(_D)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
msgid "_Properties"
msgstr "å±?æ?§(_P)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
msgid "_Save as vCard..."
msgstr "å?¦å?为 vCard(_S)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
msgid "Contact _Preview"
msgstr "è??系人é¢?è§?(_P)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
msgid "Show contact preview window"
msgstr "æ?¾ç¤ºè??系人é¢?è§?çª?å?£"
-#: ../modules/addressbook/e-book-shell-view-actions.c:942
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:953
-#: ../modules/mail/e-mail-shell-view-actions.c:1328
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
+#: ../modules/calendar/e-memo-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:902
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
msgid "_Classic View"
msgstr "å??ç±»è§?å?¾(_C)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
#, fuzzy
msgid "Show contact preview below the contact list"
msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1335
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
msgid "_Vertical View"
msgstr "å??ç?´è§?å?¾(_V)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
#, fuzzy
msgid "Show contact preview alongside the contact list"
msgstr "æ?¾ç¤ºè??系人é¢?è§?çª?å?£"
-#: ../modules/addressbook/e-book-shell-view-actions.c:959
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
-#: ../modules/calendar/e-memo-shell-view-actions.c:806
-#: ../modules/calendar/e-task-shell-view-actions.c:977
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:926
msgid "Any Category"
msgstr "任�类�"
-#: ../modules/addressbook/e-book-shell-view-actions.c:966
-#: ../modules/calendar/e-cal-shell-view-actions.c:1648
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/calendar/e-cal-shell-view-actions.c:1616
+#: ../modules/calendar/e-memo-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:961
msgid "Unmatched"
msgstr "æ? å?¹é??"
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
-#: ../modules/mail/e-mail-shell-view-actions.c:1411
-msgid "Advanced search"
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../shell/e-shell-content.c:516
+msgid "Advanced Search"
msgstr "é«?级æ??ç´¢"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../modules/addressbook/e-book-shell-view-actions.c:935
#, fuzzy
msgid "Print all shown contacts"
msgstr "æ??å?°é??ä¸ç??è??系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
#, fuzzy
msgid "Preview the contacts to be printed"
msgstr "é¢?è§?å°?è¦?æ??å?°ç??è??系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
msgid "Print selected contacts"
msgstr "æ??å?°é??ä¸ç??è??系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1038
+#: ../modules/addressbook/e-book-shell-view-actions.c:964
msgid "Save as vCard..."
msgstr "å?¦å?为 VCard..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:1040
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
#, fuzzy
msgid "Save selected contacts as a vCard"
msgstr "æ??é??ä¸ç??è??系人ä¿?å?为 VCard"
-#: ../modules/addressbook/e-book-shell-view.c:336
+#: ../modules/addressbook/e-book-shell-view.c:338
msgid "_Forward Contacts"
msgstr "转å??è??系人(_F)"
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:340
msgid "_Forward Contact"
msgstr "转å??è??系人(_F)"
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:371
#, fuzzy
msgid "_Send Message to Contacts"
msgstr "ç»?è??系人å??信件(_M)"
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:373
#, fuzzy
msgid "_Send Message to List"
msgstr "ç»?å??表å??信件(_M)"
-#: ../modules/addressbook/e-book-shell-view.c:377
+#: ../modules/addressbook/e-book-shell-view.c:375
#, fuzzy
msgid "_Send Message to Contact"
msgstr "ç»?è??系人å??信件(_M)"
@@ -14053,23 +14179,24 @@ msgstr "æµ?è§?æ¤å?°å??ç°¿ç?´å?°è¾¾å?°æ??é??(_R)"
msgid "Lo_gin:"
msgstr "��(_G)�"
-#: ../modules/addressbook/ldap-config.ui.h:11
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:12
msgid "One"
msgstr "�次"
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../modules/addressbook/ldap-config.ui.h:14
msgid "Search Filter"
msgstr "æ??ç´¢è¿?滤å?¨"
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:15
msgid "Search _base:"
msgstr "æ??ç´¢å?ºç¡?(_B)ï¼?"
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:16
msgid "Search _filter:"
msgstr "æ??ç´¢è¿?滤å?¨(_F)ï¼?"
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:17
#, fuzzy
msgid ""
"Search filter is the type of object to be searched for. If this is not "
@@ -14078,51 +14205,52 @@ msgstr ""
"æ??ç´¢è¿?滤å?¨æ?¯æ??æ?§è¡?æ??ç´¢æ?¶è¦?æ??ç´¢ç??对象类å??ã??å¦?æ??没æ??ä¿®æ?¹è¿?ç??è¯?ï¼?é»?认æ??å?µä¸?æ??ç´¢"
"å°?ä¼?å?¨â??个人â??ç±»å??ç??对象类å??ã??"
-#: ../modules/addressbook/ldap-config.ui.h:17
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:19
msgid "Sub"
msgstr "å?"
-#: ../modules/addressbook/ldap-config.ui.h:18
+#: ../modules/addressbook/ldap-config.ui.h:20
msgid "Supported Search Bases"
msgstr "æ?¯æ??ç??æ??索起ç?¹"
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:22
msgid "Using distinguished name (DN)"
msgstr "使ç?¨å·²è¯?å?«ç??å§?å??(DN)"
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../modules/addressbook/ldap-config.ui.h:23
msgid "Using email address"
msgstr "使ç?¨ç?µå?é?®ä»¶å?°å??"
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:24
msgid "_Download limit:"
msgstr "ä¸?è½½é??å?¶(_D)ï¼?"
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:25
msgid "_Find Possible Search Bases"
msgstr "æ?¥æ?¾å?¯è?½ç??æ??ç´¢å?ºç¡?(_F)"
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:26
msgid "_Login method:"
msgstr "����(_L)�"
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:28
msgid "_Port:"
msgstr "端�(_P)�"
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../modules/addressbook/ldap-config.ui.h:29
msgid "_Search scope:"
msgstr "æ??ç´¢è??å?´(_S)ï¼?"
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:31
msgid "_Timeout:"
msgstr "��(_T)�"
-#: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/addressbook/ldap-config.ui.h:32
msgid "_Use secure connection:"
msgstr "使�����(_U)�"
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:33
msgid "cards"
msgstr "å??ç??"
@@ -14147,69 +14275,69 @@ msgid "I_mport to Tasks"
msgstr "导��任�(_M)"
#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:122
+#: ../modules/calendar/e-cal-shell-backend.c:125
#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-backend.c:110
#: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-backend.c:113
#: ../modules/calendar/e-task-shell-migrate.c:535
msgid "On The Web"
msgstr "��"
-#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-backend.c:127
#: ../plugins/calendar-weather/calendar-weather.c:117
msgid "Weather"
msgstr "天�"
-#: ../modules/calendar/e-cal-shell-backend.c:238
+#: ../modules/calendar/e-cal-shell-backend.c:242
#: ../modules/calendar/e-cal-shell-migrate.c:483
msgid "Birthdays & Anniversaries"
msgstr "ç??æ?¥å??纪念æ?¥"
-#: ../modules/calendar/e-cal-shell-backend.c:424
+#: ../modules/calendar/e-cal-shell-backend.c:446
msgctxt "New"
msgid "_Appointment"
msgstr "约�(_A)"
-#: ../modules/calendar/e-cal-shell-backend.c:426
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
msgid "Create a new appointment"
msgstr "å??建æ?°çº¦ä¼?"
-#: ../modules/calendar/e-cal-shell-backend.c:431
+#: ../modules/calendar/e-cal-shell-backend.c:453
msgctxt "New"
msgid "All Day A_ppointment"
msgstr "�天约�(_P)"
-#: ../modules/calendar/e-cal-shell-backend.c:433
+#: ../modules/calendar/e-cal-shell-backend.c:455
msgid "Create a new all-day appointment"
msgstr "å??建æ?°å?¨å¤©çº¦ä¼?"
-#: ../modules/calendar/e-cal-shell-backend.c:438
+#: ../modules/calendar/e-cal-shell-backend.c:460
msgctxt "New"
msgid "M_eeting"
msgstr "ä¼?è®®(_E)"
-#: ../modules/calendar/e-cal-shell-backend.c:440
+#: ../modules/calendar/e-cal-shell-backend.c:462
msgid "Create a new meeting request"
msgstr "å??建ä¸?æ?¡æ?°ä¼?议请æ±?"
-#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-backend.c:470
msgctxt "New"
msgid "Cale_ndar"
msgstr "æ?¥å??(_N)"
-#: ../modules/calendar/e-cal-shell-backend.c:450
-#: ../modules/calendar/e-cal-shell-view-actions.c:1280
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1281
msgid "Create a new calendar"
msgstr "å??建æ?°æ?¥å??"
-#: ../modules/calendar/e-cal-shell-backend.c:485
-#: ../plugins/itip-formatter/itip-formatter.c:2645
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2644
msgid "Calendar and Tasks"
msgstr "æ?¥å??å??ä»»å?¡"
-#: ../modules/calendar/e-cal-shell-backend.c:760
+#: ../modules/calendar/e-cal-shell-backend.c:778
msgid "The registry of calendars"
msgstr ""
@@ -14237,9 +14365,9 @@ msgstr "æ? æ³?ä»? evolution/config.xmldb ä¸å??è¿?æ?§è®¾ç½®"
msgid "Unable to migrate calendar `%s'"
msgstr "æ? æ³?å??è¿?æ?¥å??â??%sâ??"
-#: ../modules/calendar/e-cal-shell-sidebar.c:152
-#: ../modules/calendar/e-memo-shell-sidebar.c:149
-#: ../modules/calendar/e-task-shell-sidebar.c:147
+#: ../modules/calendar/e-cal-shell-sidebar.c:162
+#: ../modules/calendar/e-memo-shell-sidebar.c:157
+#: ../modules/calendar/e-task-shell-sidebar.c:157
#, c-format
msgid ""
"Error on %s\n"
@@ -14248,37 +14376,47 @@ msgstr ""
"%s é??误ï¼?\n"
" %s"
-#: ../modules/calendar/e-cal-shell-sidebar.c:188
+#: ../modules/calendar/e-cal-shell-sidebar.c:221
msgid "Loading calendars"
msgstr "è£?å?¥æ?¥å??"
-#: ../modules/calendar/e-cal-shell-sidebar.c:428
+#: ../modules/calendar/e-cal-shell-sidebar.c:527
msgid "Calendar Selector"
msgstr "æ?¥å??é??æ?©å?¨"
-#: ../modules/calendar/e-cal-shell-sidebar.c:598
+#: ../modules/calendar/e-cal-shell-sidebar.c:741
msgid "Date Navigator Widget"
msgstr ""
-#: ../modules/calendar/e-cal-shell-sidebar.c:599
+#: ../modules/calendar/e-cal-shell-sidebar.c:742
msgid "This widget displays a miniature calendar"
msgstr ""
-#: ../modules/calendar/e-cal-shell-sidebar.c:609
+#: ../modules/calendar/e-cal-shell-sidebar.c:751
+#, fuzzy
+#| msgid "Default Mail Client"
+msgid "Default Calendar Client"
+msgstr "�认�件客�端"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:752
+msgid "Default client for calendar operations"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:762
msgid "This widget displays groups of calendars"
msgstr ""
-#: ../modules/calendar/e-cal-shell-sidebar.c:770
+#: ../modules/calendar/e-cal-shell-sidebar.c:949
#, c-format
msgid "Opening calendar at %s"
msgstr "å?¨ %s æ??å¼?æ?¥å??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
msgid "Print"
msgstr "æ??å?°"
-#: ../modules/calendar/e-cal-shell-view-actions.c:305
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
msgid ""
"This operation will permanently erase all events older than the selected "
"amount of time. If you continue, you will not be able to recover these "
@@ -14288,567 +14426,589 @@ msgstr ""
#. Translators: This is the first part of the sentence:
#. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:322
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
msgid "Purge events older than"
msgstr "é??æ¯?è¾?æ?©ç??äº?件"
-#: ../modules/calendar/e-cal-shell-view-actions.c:558
+#: ../modules/calendar/e-cal-shell-view-actions.c:540
msgid "Copying Items"
msgstr "��项�"
-#: ../modules/calendar/e-cal-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-actions.c:795
msgid "Moving Items"
msgstr "移�项�"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1109
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-memo-shell-view-actions.c:530
-#: ../modules/calendar/e-task-shell-view-actions.c:655
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1097
+#, fuzzy
+#| msgid "Sent"
+msgid "event"
+msgstr "å·²å??ç®±"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1099
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:507
+#: ../modules/calendar/e-task-shell-view-actions.c:632
msgid "Save as iCalendar"
msgstr "ä¿?å?为 iCalendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1236
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
msgid "_Copy..."
msgstr "��(_C)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#, fuzzy
+#| msgid "Select a Calendar"
+msgid "D_elete Calendar"
+msgstr "é??æ?©ä¸?个æ?¥å??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#, fuzzy
+#| msgid "Rename the selected calendar"
+msgid "Delete the selected calendar"
+msgstr "é??å?½å??é??ä¸ç??æ?¥å??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1253
msgid "Go Back"
msgstr "å??é??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#: ../modules/calendar/e-cal-shell-view-actions.c:1260
msgid "Go Forward"
msgstr "å??è¿?"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../modules/calendar/e-cal-shell-view-actions.c:1265
msgid "Select _Today"
msgstr "é??æ?©ä»?天(_T)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#: ../modules/calendar/e-cal-shell-view-actions.c:1267
msgid "Select today"
msgstr "é??æ?©ä»?天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1272
msgid "Select _Date"
msgstr "é??æ?©æ?¥æ??(_D)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+#: ../modules/calendar/e-cal-shell-view-actions.c:1274
msgid "Select a specific date"
msgstr "é??æ?©ç?¹å®?æ?¥æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+#: ../modules/calendar/e-cal-shell-view-actions.c:1279
msgid "_New Calendar"
msgstr "æ?°å»ºæ?¥å??(_N)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
-#: ../modules/calendar/e-task-shell-view-actions.c:839
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-task-shell-view-actions.c:804
msgid "Purg_e"
msgstr "é??æ¯?(_E)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
msgid "Purge old appointments and meetings"
msgstr "é??æ¯?æ?§çº¦ä¼?å??ä¼?è®®"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-task-shell-view-actions.c:748
msgid "Re_fresh"
msgstr "å?·æ?°(_F)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
#, fuzzy
msgid "Refresh the selected calendar"
msgstr "é??å?½å??é??ä¸ç??æ?¥å??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
msgid "Rename the selected calendar"
msgstr "é??å?½å??é??ä¸ç??æ?¥å??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
msgid "Show _Only This Calendar"
msgstr "å?ªæ?¾ç¤ºæ¤æ?¥å??(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
msgid "Cop_y to Calendar..."
msgstr "å¤?å?¶å?°æ?¥å??(_Y)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
msgid "_Delegate Meeting..."
msgstr "代ç??ä¼?è®®(_D)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
-msgid "Delete the appointment"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#, fuzzy
+#| msgid "Delete the appointment"
+msgid "_Delete Appointment"
+msgstr "å? é?¤çº¦ä¼?"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#, fuzzy
+#| msgid "Delete the appointment"
+msgid "Delete selected appointments"
msgstr "å? é?¤çº¦ä¼?"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
msgid "Delete This _Occurrence"
msgstr "å? é?¤æ¤æ¬¡å?ºç?°(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
msgid "Delete this occurrence"
msgstr "å? é?¤æ¤æ¬¡å??ç??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1369
-msgid "Delete _All Occurrences"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#, fuzzy
+#| msgid "Delete _All Occurrences"
+msgid "Delete All Occ_urrences"
msgstr "å? é?¤æ??æ??å?ºç?°(_A)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
msgid "Delete all occurrences"
msgstr "å? é?¤å?¨é?¨å??ç??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
msgid "New All Day _Event..."
msgstr "�建�天�件(_E)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
msgid "Create a new all day event"
msgstr "å??建ä¸?个æ?°ç??å?¨å¤©äº?件"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1383
-#: ../modules/calendar/e-cal-shell-view-memopad.c:322
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-task-shell-view-actions.c:713
msgid "_Forward as iCalendar..."
msgstr "ä½?为 iCalendar 转å??(_F)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
msgid "New _Meeting..."
msgstr "�建�议(_M)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
msgid "Create a new meeting"
msgstr "å??建ä¸?个æ?°ç??ä¼?è®®"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
msgid "Mo_ve to Calendar..."
msgstr "移è?³æ?¥å??(_V)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
msgid "New _Appointment..."
msgstr "�建约�(_A)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
msgid "Make this Occurrence _Movable"
msgstr "å°?æ¤æ¬¡å??ç??å??为å?¯ç§»å?¨(_M)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
msgid "_Open Appointment"
msgstr "æ??å¼?约ä¼?(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
msgid "View the current appointment"
msgstr "æ?¥ç??å½?å??约ä¼?"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
msgid "_Reply"
msgstr "å??å¤?(_R)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
-#: ../modules/calendar/e-cal-shell-view-memopad.c:350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
msgid "Save as iCalendar..."
msgstr "ä¿?å?为 iCalendar..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
msgid "_Schedule Meeting..."
msgstr "�度�议(_S)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
#, fuzzy
msgid "Converts an appointment to a meeting"
msgstr "é??æ¯?æ?§çº¦ä¼?å??ä¼?è®®"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
msgid "Conv_ert to Appointment..."
msgstr "转��约�(_E)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
#, fuzzy
msgid "Converts a meeting to an appointment"
msgstr "å?¨çº¦ä¼?ç»?æ??æ?¶ %s"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1589
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
msgid "Day"
msgstr "天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
msgid "Show one day"
msgstr "�示�天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1596
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
msgid "List"
msgstr "å??表"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1598
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
msgid "Show as list"
msgstr "æ?¾ç¤ºä¸ºå??表"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1603
+#: ../modules/calendar/e-cal-shell-view-actions.c:1571
msgid "Month"
msgstr "æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
msgid "Show one month"
msgstr "æ?¾ç¤ºä¸?个æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1610
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
msgid "Week"
msgstr "å?¨"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1612
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
msgid "Show one week"
msgstr "�示��"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
#, fuzzy
msgid "Show one work week"
msgstr "�示��"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
msgid "Active Appointments"
msgstr "活�约�"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
msgid "Next 7 Days' Appointments"
msgstr "ä¸?ä¸?å?¨ç??约ä¼?"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1672
-#: ../modules/calendar/e-memo-shell-view-actions.c:837
-#: ../modules/calendar/e-task-shell-view-actions.c:1036
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-memo-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:985
msgid "Description contains"
msgstr "æ??è¿°å?«æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
-#: ../modules/calendar/e-memo-shell-view-actions.c:844
-#: ../modules/calendar/e-task-shell-view-actions.c:1043
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:793
+#: ../modules/calendar/e-task-shell-view-actions.c:992
msgid "Summary contains"
msgstr "æ¦?è¦?å?«æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1691
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
msgid "Print this calendar"
msgstr "æ??å?°æ¤æ?¥å??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1698
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
#, fuzzy
msgid "Preview the calendar to be printed"
msgstr "é¢?è§?å°?è¦?æ??å?°ç??æ?¥å??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1766
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
msgid "Go To"
msgstr "转�"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:76
-#: ../modules/calendar/e-memo-shell-view-actions.c:97
-msgid "Deleting selected memos..."
-msgstr "å? é?¤é??ä¸ç??å¤?å¿?..."
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:296
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
-msgid "Copy selected memo"
-msgstr "å¤?å?¶é??ä¸ç??å¤?å¿?"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:303
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
-msgid "Cut selected memo"
-msgstr "å?ªå??é??ä¸ç??å¤?å¿?"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:310
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
-msgid "Paste memo from the clipboard"
-msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´å¤?å¿?"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:315
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
-msgid "_Delete Memo"
-msgstr "å? é?¤å¤?å¿?(_D)"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-msgid "Delete selected memos"
-msgstr "å? é?¤é??ä¸ç??å¤?å¿?"
+#. Translators: Default filename part saving a memo to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:505
+#, fuzzy
+#| msgid "Memo"
+msgid "memo"
+msgstr "��"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:329
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
msgid "New _Memo"
msgstr "�建��(_M)"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:331
-#: ../modules/calendar/e-memo-shell-backend.c:318
-#: ../modules/calendar/e-memo-shell-view-actions.c:682
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
msgid "Create a new memo"
msgstr "å??建æ?°å¤?å¿?"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:336
-#: ../modules/calendar/e-memo-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:652
msgid "_Open Memo"
msgstr "æ??å¼?å¤?å¿?(_O)"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:689
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
msgid "View the selected memo"
msgstr "æ?¥ç??é??ä¸ç??å¤?å¿?"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:343
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:431
-#: ../modules/calendar/e-memo-shell-view-actions.c:694
-#: ../modules/calendar/e-task-shell-view-actions.c:832
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-task-shell-view-actions.c:797
msgid "Open _Web Page"
msgstr "æ??å¼?ç½?页(_W)"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:870
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:819
msgid "Print the selected memo"
msgstr "æ??å?°é??ä¸ç??å¤?å¿?"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:444
-#: ../modules/calendar/e-memo-shell-view.c:232
-msgid "Delete Memo"
-msgid_plural "Delete Memos"
-msgstr[0] "å? é?¤å¤?å¿?"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:99
-#: ../modules/calendar/e-task-shell-view-actions.c:128
-msgid "Deleting selected tasks..."
-msgstr "å? é?¤é??ä¸ç??ä»»å?¡..."
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:630
+#, fuzzy
+#| msgid "Task"
+msgid "task"
+msgstr "任�"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:692
msgid "_Assign Task"
msgstr "å??é??ä»»å?¡(_A)"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../modules/calendar/e-task-shell-view-actions.c:722
-msgid "Copy selected tasks"
-msgstr "å¤?å?¶é??ä¸ç??ä»»å?¡"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:729
-msgid "Cut selected tasks"
-msgstr "å?ªå??é??ä¸ç??ä»»å?¡"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:736
-msgid "Paste tasks from the clipboard"
-msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´ä»»å?¡"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:389
-#: ../modules/calendar/e-task-shell-view-actions.c:741
-msgid "_Delete Task"
-msgstr "å? é?¤ä»»å?¡(_D)"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:391
-#: ../modules/calendar/e-task-shell-view-actions.c:743
-msgid "Delete selected tasks"
-msgstr "å? é?¤é??ä¸ç??ä»»å?¡"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:403
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:769
msgid "_Mark as Complete"
msgstr "æ ?记为å®?æ??(_M)"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:771
msgid "Mark selected tasks as complete"
msgstr "æ??é??ä¸ä»»å?¡æ ?记为å®?æ??"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:410
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
msgid "_Mark as Incomplete"
msgstr "æ ?记为æ?ªå®?æ??(_M)"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:412
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
#, fuzzy
msgid "Mark selected tasks as incomplete"
msgstr "æ??é??ä¸ä»»å?¡æ ?记为å®?æ??"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:417
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:783
msgid "New _Task"
msgstr "�建任�(_T)"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:419
-#: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:820
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:785
msgid "Create a new task"
msgstr "å??建æ?°ä»»å?¡"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:424
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:790
msgid "_Open Task"
msgstr "æ??å¼?ä»»å?¡(_O)"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:426
-#: ../modules/calendar/e-task-shell-view-actions.c:827
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
msgid "View the selected task"
msgstr "æ?¥ç??é??ä¸ç??ä»»å?¡"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:438
-#: ../modules/calendar/e-memo-shell-view-actions.c:885
-#: ../modules/calendar/e-task-shell-view-actions.c:1084
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:834
+#: ../modules/calendar/e-task-shell-view-actions.c:1033
msgid "_Save as iCalendar..."
msgstr "ä¿?å?为 iCalendar(_S)..."
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:450
-#: ../modules/calendar/e-task-shell-view-actions.c:1069
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
msgid "Print the selected task"
msgstr "æ??å?°é??ä¸ç??ä»»å?¡"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:555
-#: ../modules/calendar/e-task-shell-view.c:359
-msgid "Delete Task"
-msgid_plural "Delete Tasks"
-msgstr[0] "å? é?¤ä»»å?¡"
-
-#: ../modules/calendar/e-memo-shell-backend.c:316
+#: ../modules/calendar/e-memo-shell-backend.c:318
msgctxt "New"
msgid "Mem_o"
msgstr "��(_O)"
-#: ../modules/calendar/e-memo-shell-backend.c:323
+#: ../modules/calendar/e-memo-shell-backend.c:325
msgctxt "New"
msgid "_Shared Memo"
msgstr "å?±äº«ç??å¤?å¿?(_S)"
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:327
msgid "Create a new shared memo"
msgstr "å??建ä¸?个æ?°ç??å?±äº«å¤?å¿?"
-#: ../modules/calendar/e-memo-shell-backend.c:333
+#: ../modules/calendar/e-memo-shell-backend.c:335
msgctxt "New"
msgid "Memo Li_st"
msgstr "å¤?å¿?å??表(_S)"
-#: ../modules/calendar/e-memo-shell-backend.c:335
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
msgid "Create a new memo list"
msgstr "å??建æ?°å¤?å¿?å??表"
-#: ../modules/calendar/e-memo-shell-backend.c:584
+#: ../modules/calendar/e-memo-shell-backend.c:588
#, fuzzy
msgid "The registry of memo lists"
msgstr "æ??å?°å¤?å¿?å??表"
-#: ../modules/calendar/e-memo-shell-content.c:602
+#: ../modules/calendar/e-memo-shell-content.c:604
#, fuzzy
msgid "The memo table model"
msgstr "è¡¨æ ¼æ¨¡å??"
-#: ../modules/calendar/e-memo-shell-sidebar.c:185
+#: ../modules/calendar/e-memo-shell-sidebar.c:216
msgid "Loading memos"
msgstr "����"
-#: ../modules/calendar/e-memo-shell-sidebar.c:399
+#: ../modules/calendar/e-memo-shell-sidebar.c:492
msgid "Memo List Selector"
msgstr "å¤?å¿?å??表é??æ?©å?¨"
-#: ../modules/calendar/e-memo-shell-sidebar.c:544
+#: ../modules/calendar/e-memo-shell-sidebar.c:677
+#, fuzzy
+#| msgid "Default Mail Client"
+msgid "Default Memo Client"
+msgstr "�认�件客�端"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:678
+msgid "Default client for memo operations"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:688
msgid "This widget displays groups of memo lists"
msgstr ""
-#: ../modules/calendar/e-memo-shell-sidebar.c:697
+#: ../modules/calendar/e-memo-shell-sidebar.c:867
#, c-format
msgid "Opening memos at %s"
msgstr "å?¨ %s æ??å¼?å¤?å¿?"
-#: ../modules/calendar/e-memo-shell-view-actions.c:254
-#: ../modules/calendar/e-memo-shell-view-actions.c:271
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
msgid "Print Memos"
msgstr "æ??å?°å¤?å¿?"
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
+msgid "_Delete Memo"
+msgstr "å? é?¤å¤?å¿?(_D)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#, fuzzy
+#| msgid "_Find in Message..."
+msgid "_Find in Memo..."
+msgstr "å?¨ä¿¡ä»¶ä¸æ?¥æ?¾(_F)..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed memo"
+msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#, fuzzy
+#| msgid "Delete Memos"
+msgid "D_elete Memo List"
+msgstr "å? é?¤å¤?å¿?"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#, fuzzy
+msgid "Delete the selected memo list"
+msgstr "é??å?½å??é??ä¸æ??件夹"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
msgid "_New Memo List"
msgstr "æ?°å»ºå¤?å¿?å??表(_N)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:661
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
#, fuzzy
msgid "Refresh the selected memo list"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
#, fuzzy
msgid "Rename the selected memo list"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
#, fuzzy
msgid "Show _Only This Memo List"
msgstr "å?ªæ?¾ç¤ºæ¤å¤?å¿?å??表(_O)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
msgid "Memo _Preview"
msgstr "����(_P)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:770
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
#, fuzzy
msgid "Show memo preview pane"
msgstr "�示����"
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
#, fuzzy
msgid "Show memo preview below the memo list"
msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
#, fuzzy
msgid "Show memo preview alongside the memo list"
msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
-#: ../modules/calendar/e-memo-shell-view-actions.c:856
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
msgid "Print the list of memos"
msgstr "æ??å?°å¤?å¿?å??表"
-#: ../modules/calendar/e-memo-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:812
#, fuzzy
msgid "Preview the list of memos to be printed"
msgstr "é¢?è§?è¦?æ??å?°ç??å¤?å¿?å??表"
-#: ../modules/calendar/e-memo-shell-view-private.c:417
+#: ../modules/calendar/e-memo-shell-view-private.c:414
#, c-format
msgid "%d memo"
msgid_plural "%d memos"
msgstr[0] "%d 个��"
-#: ../modules/calendar/e-memo-shell-view-private.c:421
-#: ../modules/calendar/e-task-shell-view-private.c:572
+#: ../modules/calendar/e-memo-shell-view-private.c:418
+#: ../modules/calendar/e-task-shell-view-private.c:567
#, fuzzy, c-format
msgid "%d selected"
msgstr "ï¼?å·²é??ä¸ %d 个"
-#: ../modules/calendar/e-memo-shell-view.c:230
+#: ../modules/calendar/e-memo-shell-view.c:223
msgid "Delete Memos"
msgstr "å? é?¤å¤?å¿?"
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view.c:225
+#, fuzzy
+#| msgid "Delete Memo"
+#| msgid_plural "Delete Memos"
+msgid "Delete Memo"
+msgstr "å? é?¤å¤?å¿?"
+
+#: ../modules/calendar/e-task-shell-backend.c:322
msgctxt "New"
msgid "_Task"
msgstr "任�(_T)"
-#: ../modules/calendar/e-task-shell-backend.c:327
+#: ../modules/calendar/e-task-shell-backend.c:329
msgctxt "New"
msgid "Assigne_d Task"
msgstr "å??é??ç??ä»»å?¡(_D)"
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:331
msgid "Create a new assigned task"
msgstr "å??建æ?°å??é??ç??ä»»å?¡"
-#: ../modules/calendar/e-task-shell-backend.c:337
+#: ../modules/calendar/e-task-shell-backend.c:339
msgctxt "New"
msgid "Tas_k List"
msgstr "ä»»å?¡å??表(_K)"
-#: ../modules/calendar/e-task-shell-backend.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:736
msgid "Create a new task list"
msgstr "å??建æ?°ä»»å?¡å??表"
-#: ../modules/calendar/e-task-shell-backend.c:594
+#: ../modules/calendar/e-task-shell-backend.c:598
#, fuzzy
msgid "The registry of task lists"
msgstr "æ??å?°ä»»å?¡å??表"
-#: ../modules/calendar/e-task-shell-content.c:625
+#: ../modules/calendar/e-task-shell-content.c:626
#, fuzzy
msgid "The task table model"
msgstr "è¡¨æ ¼æ¨¡å??"
@@ -14870,30 +15030,42 @@ msgstr ""
msgid "Unable to migrate tasks `%s'"
msgstr "æ? æ³?å??è¿?ä»»å?¡â??%sâ??"
-#: ../modules/calendar/e-task-shell-sidebar.c:183
+#: ../modules/calendar/e-task-shell-sidebar.c:216
msgid "Loading tasks"
msgstr "��任�"
-#: ../modules/calendar/e-task-shell-sidebar.c:397
+#: ../modules/calendar/e-task-shell-sidebar.c:492
#, fuzzy
msgid "Task List Selector"
msgstr "ä»»å?¡æ?¥æº?é??æ?©å?¨"
-#: ../modules/calendar/e-task-shell-sidebar.c:542
+#: ../modules/calendar/e-task-shell-sidebar.c:677
+#, fuzzy
+#| msgid "Default Mail Client"
+msgid "Default Task Client"
+msgstr "�认�件客�端"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:678
+#, fuzzy
+#| msgid "Default value for thread expand state"
+msgid "Default client for task operations"
+msgstr "è¯?é¢?ç??é»?认å±?å¼?ç?¶æ??"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:688
msgid "This widget displays groups of task lists"
msgstr ""
-#: ../modules/calendar/e-task-shell-sidebar.c:695
+#: ../modules/calendar/e-task-shell-sidebar.c:867
#, c-format
msgid "Opening tasks at %s"
msgstr "å?¨ %s æ??å¼?ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:285
-#: ../modules/calendar/e-task-shell-view-actions.c:302
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:264
msgid "Print Tasks"
msgstr "æ??å?°ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:600
+#: ../modules/calendar/e-task-shell-view-actions.c:574
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -14904,586 +15076,544 @@ msgstr ""
"\n"
"ç¡®å®?å? é?¤è¿?äº?ä»»å?¡å??ï¼?"
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:699
+msgid "_Delete Task"
+msgstr "å? é?¤ä»»å?¡(_D)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:706
+#, fuzzy
+#| msgid "_Find in Message..."
+msgid "_Find in Task..."
+msgstr "å?¨ä¿¡ä»¶ä¸æ?¥æ?¾(_F)..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed task"
+msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:720
msgid "Copy..."
msgstr "��..."
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:727
+#, fuzzy
+#| msgid "Delete Tasks"
+msgid "D_elete Task List"
+msgstr "å? é?¤ä»»å?¡"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+#, fuzzy
+msgid "Delete the selected task list"
+msgstr "é??å?½å??é??ä¸æ??件夹"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:734
msgid "_New Task List"
msgstr "æ?°å»ºä»»å?¡å??表(_N)"
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:750
#, fuzzy
msgid "Refresh the selected task list"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-task-shell-view-actions.c:757
#, fuzzy
msgid "Rename the selected task list"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/calendar/e-task-shell-view-actions.c:797
+#: ../modules/calendar/e-task-shell-view-actions.c:762
msgid "Show _Only This Task List"
msgstr "å?ªæ?¾ç¤ºæ¤ä»»å?¡å??表(_O)"
-#: ../modules/calendar/e-task-shell-view-actions.c:811
+#: ../modules/calendar/e-task-shell-view-actions.c:776
msgid "Mar_k as Incomplete"
msgstr "æ ?记为æ?ªå®?æ??(_K)"
-#: ../modules/calendar/e-task-shell-view-actions.c:841
+#: ../modules/calendar/e-task-shell-view-actions.c:806
msgid "Delete completed tasks"
msgstr "å? é?¤å·²å®?æ??ç??ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:932
+#: ../modules/calendar/e-task-shell-view-actions.c:881
msgid "Task _Preview"
msgstr "任���(_P)"
-#: ../modules/calendar/e-task-shell-view-actions.c:934
+#: ../modules/calendar/e-task-shell-view-actions.c:883
#, fuzzy
msgid "Show task preview pane"
msgstr "�示����"
-#: ../modules/calendar/e-task-shell-view-actions.c:955
+#: ../modules/calendar/e-task-shell-view-actions.c:904
#, fuzzy
msgid "Show task preview below the task list"
msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
-#: ../modules/calendar/e-task-shell-view-actions.c:962
+#: ../modules/calendar/e-task-shell-view-actions.c:911
#, fuzzy
msgid "Show task preview alongside the task list"
msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../modules/calendar/e-task-shell-view-actions.c:919
msgid "Active Tasks"
msgstr "活�任�"
-#: ../modules/calendar/e-task-shell-view-actions.c:984
+#: ../modules/calendar/e-task-shell-view-actions.c:933
msgid "Completed Tasks"
msgstr "å·²å®?æ??ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:991
+#: ../modules/calendar/e-task-shell-view-actions.c:940
msgid "Next 7 Days' Tasks"
msgstr "ä¸?ä¸?å?¨ç??ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:998
+#: ../modules/calendar/e-task-shell-view-actions.c:947
msgid "Overdue Tasks"
msgstr "延æ??ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:1005
+#: ../modules/calendar/e-task-shell-view-actions.c:954
msgid "Tasks with Attachments"
msgstr "æ??é??件ç??ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:1055
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
msgid "Print the list of tasks"
msgstr "æ??å?°ä»»å?¡å??表"
-#: ../modules/calendar/e-task-shell-view-actions.c:1062
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
#, fuzzy
msgid "Preview the list of tasks to be printed"
msgstr "é¢?è§?è¦?æ??å?°ç??ä»»å?¡å??表"
-#: ../modules/calendar/e-task-shell-view-private.c:464
+#: ../modules/calendar/e-task-shell-view-private.c:461
msgid "Expunging"
msgstr "é??æ¯?"
-#: ../modules/calendar/e-task-shell-view-private.c:568
+#: ../modules/calendar/e-task-shell-view-private.c:563
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任�"
-#: ../modules/calendar/e-task-shell-view.c:357
+#: ../modules/calendar/e-task-shell-view.c:351
msgid "Delete Tasks"
msgstr "å? é?¤ä»»å?¡"
+#: ../modules/calendar/e-task-shell-view.c:353
+#, fuzzy
+#| msgid "Delete Task"
+#| msgid_plural "Delete Tasks"
+msgid "Delete Task"
+msgstr "å? é?¤ä»»å?¡"
+
#. Translators: This is only for multiple messages.
#: ../modules/mail/e-mail-attachment-handler.c:335
#, c-format
msgid "%d attached messages"
msgstr "%d 个é??å? ç??ä¿¡æ?¯"
-#: ../modules/mail/e-mail-shell-backend.c:174
+#. Translators: "None" for a junk hook name,
+#. * when the junk plugin is not enabled.
+#: ../modules/mail/e-mail-junk-hook.c:90
+#, fuzzy
+#| msgid "None"
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "æ? "
+
+#: ../modules/mail/e-mail-shell-backend.c:168
msgctxt "New"
msgid "_Mail Message"
msgstr "信件(_M)"
-#: ../modules/mail/e-mail-shell-backend.c:176
+#: ../modules/mail/e-mail-shell-backend.c:170
msgid "Compose a new mail message"
msgstr "æ?°å??ä¸?å°?æ?°ä¿¡"
-#: ../modules/mail/e-mail-shell-backend.c:184
+#: ../modules/mail/e-mail-shell-backend.c:178
msgctxt "New"
msgid "Mail _Folder"
msgstr "é?®ä»¶æ??件夹(_F)"
-#: ../modules/mail/e-mail-shell-backend.c:186
+#: ../modules/mail/e-mail-shell-backend.c:180
msgid "Create a new mail folder"
msgstr "å??建æ?°é?®ä»¶æ??件夹"
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:199
msgid "Mail Accounts"
msgstr "�件账�"
-#: ../modules/mail/e-mail-shell-backend.c:213
+#: ../modules/mail/e-mail-shell-backend.c:207
msgid "Mail Preferences"
msgstr "é?®ä»¶é¦?é??项"
-#: ../modules/mail/e-mail-shell-backend.c:221
+#: ../modules/mail/e-mail-shell-backend.c:215
msgid "Composer Preferences"
msgstr "ç¼?å??å?¨é¦?é??项"
-#: ../modules/mail/e-mail-shell-backend.c:229
+#: ../modules/mail/e-mail-shell-backend.c:223
msgid "Network Preferences"
msgstr "ç½?ç»?é¦?é??项"
-#. green
-#: ../modules/mail/e-mail-shell-migrate.c:959
-msgid "To Do"
-msgstr "å¾?å??"
-
-#. blue
-#: ../modules/mail/e-mail-shell-migrate.c:960
-msgid "Later"
-msgstr "ç¨?å??"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1139
-msgid "Migration"
-msgstr "�移"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1589
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "æ? æ³?å??建æ?°æ??件夹â??%sâ??ï¼?%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1617
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "æ? æ³?å°?æ??件夹â??%sâ??å¤?å?¶ä¸ºâ??%sâ??ï¼?%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1812
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "æ? æ³?æ?«æ??ä½?äº?â??%sâ??ç??å·²æ??é?®ç®±ï¼?%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1818
-#: ../modules/mail/e-mail-shell-migrate.c:2915
-msgid "Migrating Folders"
-msgstr "è¿?移æ??件夹"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1819
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution ä»»å?¡æ??件夹ç??ä½?ç½®å??å±?次ä¸? Evolution 1.x ä¸?å??ã??\n"
-"\n"
-"请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
-
-#: ../modules/mail/e-mail-shell-migrate.c:2022
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "æ? æ³?æ??å¼?æ?§ç?? POP ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®â??%sâ??ï¼?%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2038
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "æ? æ³?å??建 POP3 ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®ç?®å½?â??%sâ??ï¼?%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2070
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "æ? æ³?å¤?å?¶ POP3 å?¨æ??å?¡å?¨ä¸?ä¿?ç??ç??æ?°æ?®â??%sâ??ï¼?%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2541
-#: ../modules/mail/e-mail-shell-migrate.c:2555
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "å??建æ?¬å?°é?®ä»¶å?å?¨â??%sâ??失败ï¼?%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2916
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"è?ª Evolution 2.4 ä¹?å??ï¼?Evolution é?®ç®±æ??件夹ç??æ??è¦?æ ¼å¼?ç?°å·²ç§»è?³ SQLiteã??\n"
-"\n"
-"请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
-
-#: ../modules/mail/e-mail-shell-migrate.c:3013
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "æ? æ³?å?¨â??%sâ??å??建æ?¬å?°é?®ä»¶æ??件夹ï¼?%s"
+#: ../modules/mail/e-mail-shell-content.c:678
+#, fuzzy
+#| msgid "_Group By Threads"
+msgid "Group by Threads"
+msgstr "æ??线索å??ç»?(_G)"
-#: ../modules/mail/e-mail-shell-migrate.c:3031
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+#: ../modules/mail/e-mail-shell-content.c:679
+msgid "Whether to group messages by threads"
msgstr ""
-"æ? æ³?ä»?å??å??ç?? Evolution å®?è£?ä¸è¯»å??设置ï¼?â??evolution/config.xmldbâ??ä¸?å?å?¨æ??è??å·²æ??"
-"å??ã??"
-#: ../modules/mail/e-mail-shell-view-actions.c:993
-#: ../modules/mail/e-mail-shell-view.c:511
+#: ../modules/mail/e-mail-shell-view-actions.c:923
+#: ../modules/mail/e-mail-shell-view.c:526
msgid "_Disable Account"
msgstr "��账�(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:995
+#: ../modules/mail/e-mail-shell-view-actions.c:925
msgid "Disable this account"
msgstr "���个账�"
-#: ../modules/mail/e-mail-shell-view-actions.c:1000
+#: ../modules/mail/e-mail-shell-view-actions.c:932
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "æ°¸ä¹?å? é?¤æ??æ??æ??件夹ä¸ç??æ??æ??å·²å? é?¤ç??信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:937
msgid "C_reate Search Folder From Search..."
msgstr "ä»?头å??建æ??ç´¢æ??件夹(_R)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1007
+#: ../modules/mail/e-mail-shell-view-actions.c:944
msgid "_Download Messages for Offline Usage"
msgstr "�载信件以离线使�(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1009
+#: ../modules/mail/e-mail-shell-view-actions.c:946
#, fuzzy
-msgid "Download messages of accounts and folders marked for offline"
+msgid "Download messages of accounts and folders marked for offline usage"
msgstr "为æ ?记为è?±æ?ºç??å¸?æ?·/æ??件夹ä¸?载信件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1014
-msgid "Empty _Trash"
-msgstr "æ¸?空å??æ?¶ç«?(_T)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1016
-#: ../modules/mail/e-mail-shell-view-actions.c:1023
-#, fuzzy
-msgid "Permanently remove all the deleted messages from all folders"
-msgstr "æ°¸ä¹?å? é?¤æ??æ??æ??件夹ä¸ç??æ??æ??å·²å? é?¤ç??信件"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:951
msgid "Fl_ush Outbox"
msgstr "æ¸?空å??件箱(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1035
+#: ../modules/mail/e-mail-shell-view-actions.c:958
msgid "_Copy Folder To..."
msgstr "æ??件夹å¤?å?¶å?°(_C)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1037
+#: ../modules/mail/e-mail-shell-view-actions.c:960
msgid "Copy the selected folder into another folder"
msgstr "æ??é??ä¸ç??æ??件夹å¤?å?¶å?°å?¶å®?æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1044
+#: ../modules/mail/e-mail-shell-view-actions.c:967
msgid "Permanently remove this folder"
msgstr "æ°¸ä¹?å? é?¤æ¤æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1049
+#: ../modules/mail/e-mail-shell-view-actions.c:972
msgid "E_xpunge"
msgstr "é??æ¯?(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1051
+#: ../modules/mail/e-mail-shell-view-actions.c:974
msgid "Permanently remove all deleted messages from this folder"
msgstr "ä»?该æ??件夹永ä¹?å? é?¤æ??æ??å·²å? é?¤ç??信件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1056
+#: ../modules/mail/e-mail-shell-view-actions.c:979
msgid "Mar_k All Messages as Read"
msgstr "æ??å?¨é?¨ä¿¡ä»¶æ ?记为已读(_K)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1058
+#: ../modules/mail/e-mail-shell-view-actions.c:981
msgid "Mark all messages in the folder as read"
msgstr "å°?æ¤æ??件夹ä¸ç??æ??æ??信件æ ?记为已读"
-#: ../modules/mail/e-mail-shell-view-actions.c:1063
+#: ../modules/mail/e-mail-shell-view-actions.c:986
msgid "_Move Folder To..."
msgstr "æ??件夹移è?³(_M)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1065
+#: ../modules/mail/e-mail-shell-view-actions.c:988
msgid "Move the selected folder into another folder"
msgstr "æ??é??ä¸ç??æ??件夹移è?³å?¶å®?æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1070
+#: ../modules/mail/e-mail-shell-view-actions.c:993
msgid "_New..."
msgstr "�建(_N)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1072
+#: ../modules/mail/e-mail-shell-view-actions.c:995
msgid "Create a new folder for storing mail"
msgstr "å??建å?å?¨é?®ä»¶ç??æ?°æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1079
+#: ../modules/mail/e-mail-shell-view-actions.c:1002
msgid "Change the properties of this folder"
msgstr "æ?´æ?¹æ¤æ??件夹ç??å±?æ?§"
-#: ../modules/mail/e-mail-shell-view-actions.c:1086
+#: ../modules/mail/e-mail-shell-view-actions.c:1009
msgid "Refresh the folder"
msgstr "å?·æ?°æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#: ../modules/mail/e-mail-shell-view-actions.c:1016
msgid "Change the name of this folder"
msgstr "æ?´æ?¹æ¤æ??件夹ç??å??称"
-#: ../modules/mail/e-mail-shell-view-actions.c:1098
-msgid "Select _All Messages"
-msgstr "é??ä¸å?¨é?¨ä¿¡ä»¶(_A)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1100
-msgid "Select all visible messages"
-msgstr "é??ä¸æ??æ??å?¯è§?ç??信件"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
msgid "Select Message _Thread"
msgstr "é??æ?©ä¿¡ä»¶çº¿ç´¢(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1023
msgid "Select all messages in the same thread as the selected message"
msgstr "æ??å??ä¸?线索ä¸ç??æ??æ??信件é??æ?©ä¸ºé??ä¸ä¿¡ä»¶"
-#: ../modules/mail/e-mail-shell-view-actions.c:1112
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
msgid "Select Message S_ubthread"
msgstr "é??æ?©ä¿¡ä»¶å?线索(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1114
+#: ../modules/mail/e-mail-shell-view-actions.c:1030
msgid "Select all replies to the currently selected message"
msgstr "é??æ?©å½?å??é??ä¸ä¿¡ä»¶ç??æ??æ??å??å¤?"
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1035
msgid "_Unsubscribe"
msgstr "é??订(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#: ../modules/mail/e-mail-shell-view-actions.c:1037
#, fuzzy
msgid "Unsubscribe from the selected folder"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+msgid "Empty _Trash"
+msgstr "æ¸?空å??æ?¶ç«?(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1044
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "æ°¸ä¹?å? é?¤æ??æ??æ??件夹ä¸ç??æ??æ??å·²å? é?¤ç??信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
msgid "_New Label"
msgstr "æ?°å»ºæ ?ç¾(_N)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
msgid "N_one"
msgstr "æ? (_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1140
+#: ../modules/mail/e-mail-shell-view-actions.c:1063
msgid "Hide _Read Messages"
msgstr "é??è??已读ç??信件(_R)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1142
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
msgid "Temporarily hide all messages that have already been read"
msgstr "æ??æ?¶é??è??æ??æ??已读信件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
msgid "Hide S_elected Messages"
msgstr "é??è??é??ä¸ç??信件(_E)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
+#: ../modules/mail/e-mail-shell-view-actions.c:1072
msgid "Temporarily hide the selected messages"
msgstr "æ??æ?¶é??è??é??ä¸ä¿¡ä»¶"
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1077
msgid "Show Hidde_n Messages"
msgstr "æ?¾ç¤ºé??è??ç??信件(_N)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1079
msgid "Show messages that have been temporarily hidden"
msgstr "æ?¾ç¤ºæ??æ?¶è¢«é??è??ç??信件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1177
+#: ../modules/mail/e-mail-shell-view-actions.c:1100
msgid "Cancel the current mail operation"
msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
msgid "Collapse All _Threads"
msgstr "æ??å? å?¨é?¨çº¿ç´¢(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1184
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
msgid "Collapse all message threads"
msgstr "æ??å? å?¨é?¨ä¿¡ä»¶çº¿ç´¢"
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
msgid "E_xpand All Threads"
msgstr "����线索(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1114
msgid "Expand all message threads"
msgstr "����信件线索"
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
msgid "_Message Filters"
msgstr "信件�滤(_M)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
msgid "Create or edit rules for filtering new mail"
msgstr "å??建æ??ç¼?è¾?è¿?滤æ?°é?®ä»¶ç??è§?å??"
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
msgid "Search F_olders"
msgstr "æ??ç´¢æ??件夹(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
#, fuzzy
msgid "Create or edit search folder definitions"
msgstr "å??建æ??ç¼?è¾?æ??ç´¢æ??件夹å®?ä¹?"
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
msgid "_Subscriptions..."
msgstr "订é??(_S)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订é??æ??é??订è¿?ç¨?æ??å?¡å?¨ä¸?ç??æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1142
msgid "F_older"
msgstr "æ??件夹(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
msgid "_Label"
msgstr "æ ?ç¾(_L)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
msgid "_New Folder..."
msgstr "æ?°å»ºæ??件夹(_N)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1290
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
msgid "Hide _Deleted Messages"
msgstr "é??è??å·²å? é?¤ç??信件(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
msgid ""
"Hide deleted messages rather than displaying them with a line through them"
msgstr "é??è??å·²å? é?¤ç??信件è??ä¸?æ?¯å?¨ä¸?é?¢æ?¾ç¤ºä¸?æ?¡çº¿"
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
msgid "Show Message _Preview"
msgstr "�示信件��(_P)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
#, fuzzy
msgid "Show message preview pane"
msgstr "�示信件����"
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
msgid "_Group By Threads"
msgstr "æ??线索å??ç»?(_G)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
#, fuzzy
msgid "Threaded message list"
msgstr "æ??线索ç¼?æ??ç??信件å??表"
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
msgid "Show message preview below the message list"
msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1260
#, fuzzy
msgid "Show message preview alongside the message list"
msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
msgid "All Messages"
msgstr "��信件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
msgid "Important Messages"
msgstr "é??è¦?信件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
msgid "Last 5 Days' Messages"
msgstr "å??äº?天ç??信件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
msgid "Messages Not Junk"
msgstr "ä¸?æ?¯å??å?¾é?®ä»¶"
-#: ../modules/mail/e-mail-shell-view-actions.c:1373
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
msgid "Messages with Attachments"
msgstr "æ??é??件ç??信件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
msgid "No Label"
msgstr "æ? æ ?ç¾"
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
msgid "Read Messages"
msgstr "已读信件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
msgid "Recent Messages"
msgstr "æ??è¿?信件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
msgid "Unread Messages"
msgstr "�读信件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
#, fuzzy
msgid "Subject or Addresses contain"
msgstr "主é¢?æ??å??é??è??å?«æ??"
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1386
msgid "All Accounts"
msgstr "��账�"
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1393
msgid "Current Account"
msgstr "å½?å??è´¦æ?·"
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1400
msgid "Current Folder"
msgstr "å½?å??æ??件夹"
-#: ../modules/mail/e-mail-shell-view-private.c:835
+#: ../modules/mail/e-mail-shell-view-private.c:836
#, c-format
msgid "%d selected, "
msgid_plural "%d selected, "
msgstr[0] "å·²é??ä¸ %d 个ï¼?"
-#: ../modules/mail/e-mail-shell-view-private.c:846
+#: ../modules/mail/e-mail-shell-view-private.c:847
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d å°?å·²å? é?¤"
-#: ../modules/mail/e-mail-shell-view-private.c:852
-#: ../modules/mail/e-mail-shell-view-private.c:859
+#: ../modules/mail/e-mail-shell-view-private.c:853
+#: ../modules/mail/e-mail-shell-view-private.c:860
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d å°?å??å?¾"
-#: ../modules/mail/e-mail-shell-view-private.c:865
+#: ../modules/mail/e-mail-shell-view-private.c:866
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d å°?è??稿"
-#: ../modules/mail/e-mail-shell-view-private.c:871
+#: ../modules/mail/e-mail-shell-view-private.c:872
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d å°?æ?ªå??"
-#: ../modules/mail/e-mail-shell-view-private.c:877
+#: ../modules/mail/e-mail-shell-view-private.c:878
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d å°?å·²å??"
-#: ../modules/mail/e-mail-shell-view-private.c:889
+#: ../modules/mail/e-mail-shell-view-private.c:890
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] "�%d ��读�"
-#: ../modules/mail/e-mail-shell-view-private.c:892
+#: ../modules/mail/e-mail-shell-view-private.c:893
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "�� %d �"
-#: ../modules/mail/e-mail-shell-view.c:509
+#: ../modules/mail/e-mail-shell-view.c:524
msgid "Proxy _Logout"
msgstr "代ç??æ??å?¡å?¨æ³¨é??(_L)"
-#: ../modules/mail/em-composer-prefs.c:477
+#: ../modules/mail/em-composer-prefs.c:473
msgid "Language(s)"
msgstr "è¯è¨?"
@@ -15515,41 +15645,49 @@ msgstr "信头å??称ï¼?"
msgid "Header Value Contains:"
msgstr "信头å?¼å?«æ??ï¼?"
-#: ../modules/mail/em-mailer-prefs.c:326
-#: ../widgets/table/e-table-click-to-add.c:498
+#: ../modules/mail/em-mailer-prefs.c:325
+#: ../widgets/table/e-table-click-to-add.c:504
#: ../widgets/table/e-table-selection-model.c:309
msgid "Header"
msgstr "页ç??"
-#: ../modules/mail/em-mailer-prefs.c:330
+#: ../modules/mail/em-mailer-prefs.c:329
msgid "Contains Value"
msgstr "å??å?«å?¼"
#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:794
+#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
#, c-format
msgid "%s plugin is available and the binary is installed."
msgstr "%s æ??件å?¯ç?¨ï¼?äº?è¿?å?¶æ??件已ç»?å®?è£?ã??"
#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:803
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
#, c-format
msgid ""
"%s plugin is not available. Please check whether the package is installed."
msgstr "%s æ??件ä¸?å?¯ç?¨ã??请æ£?æ?¥è½¯ä»¶å??æ?¯å?¦å·²å®?è£?ã??"
-#: ../modules/mail/em-mailer-prefs.c:767
+#: ../modules/mail/em-mailer-prefs.c:766
#, fuzzy
msgid "No junk plugin available"
msgstr "没æ??å?¯ç?¨ç??å??å?¾é?®ä»¶æ??件"
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
#: ../modules/mail/em-mailer-prefs.c:1151
#, fuzzy
-msgid "Date header:"
-msgstr "表头"
+#| msgid "Table column:"
+msgid "_Table column:"
+msgstr "è¡¨æ ¼æ ?ï¼?"
+#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
#: ../modules/mail/em-mailer-prefs.c:1153
#, fuzzy
+msgid "_Date header:"
+msgstr "表头"
+
+#: ../modules/mail/em-mailer-prefs.c:1154
+#, fuzzy
msgid "Show _original header value"
msgstr "æ?¾ç¤ºå??å§?大å°?(_O)"
@@ -15596,28 +15734,27 @@ msgid "Keywords"
msgstr "å?³é?®å?"
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "é??件æ??é??"
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
msgid ""
"Evolution has found some keywords that suggest that this message should "
"contain an attachment, but cannot find one."
msgstr "Evolution æ?¾å?°ä¸?äº?å?³é?®å?表æ??æ¤ä¿¡ä»¶åº?å½?å??å?«é??件ï¼?ä½?å?´æ²¡å??ç?°é??件ã??"
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
msgid "Message has no attachments"
msgstr "信件æ? é??件"
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
msgid "_Add attachment..."
msgstr "æ·»å? é??件(_A)..."
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
msgid "_Edit Message"
msgstr "��信件(_E)"
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "é??件æ??é??"
+
#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
msgid "Reminds you when you forgot to add an attachment to a mail message."
msgstr ""
@@ -15755,42 +15892,42 @@ msgstr "å? é?¤ä¸´æ?¶å¤?份æ??件"
msgid "Ensuring local sources"
msgstr "确����"
-#: ../plugins/backup-restore/backup.c:429
+#: ../plugins/backup-restore/backup.c:427
#, c-format
msgid "Backing up to the folder %s"
msgstr "æ£å?¨å¤?份å?°æ??件夹 %s"
-#: ../plugins/backup-restore/backup.c:434
+#: ../plugins/backup-restore/backup.c:432
#, c-format
msgid "Restoring from the folder %s"
msgstr "æ£å?¨ä»?æ??件夹 %s ä¸æ?¢å¤?"
#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
msgid "Evolution Backup"
msgstr "Evolution �份"
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
msgid "Evolution Restore"
msgstr "Evolution ��"
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:487
msgid "Backing up Evolution Data"
msgstr "æ£å?¨å¤?份 Evolution æ?°æ?®"
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:488
msgid "Please wait while Evolution is backing up your data."
msgstr "请ç¨?å??ï¼?Evolution æ£å?¨å¤?份æ?¨ç??æ?°æ?®ã??"
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:490
msgid "Restoring Evolution Data"
msgstr "æ£å?¨æ?¢å¤? Evolution æ?°æ?®"
-#: ../plugins/backup-restore/backup.c:493
+#: ../plugins/backup-restore/backup.c:491
msgid "Please wait while Evolution is restoring your data."
msgstr "请ç¨?å??ï¼?Evolution æ£å?¨æ?¢å¤?æ?¨ç??æ?°æ?®ã??"
-#: ../plugins/backup-restore/backup.c:511
+#: ../plugins/backup-restore/backup.c:509
msgid "This may take a while depending on the amount of data in your account."
msgstr "è¿?å?¯è?½è¦?è?±ä¸?ç?¹æ?¶é?´ï¼?å??å?³äº?æ?¨å¸?æ?·ä¸ç??æ?°æ?®æ?»é??ã??"
@@ -15853,36 +15990,36 @@ msgstr ""
"å¤?å?ªè?½å?¨ Evolution æ?ªè¿?è¡?æ?¶å?¯å?¨ã??请确ä¿?å?¨å¼?å§?ä¹?å??æ?¨ä¿?å?å??å?³é?äº?æ?¨ç??æ??æ??ç??æ?ªä¿?"
"å?ç??çª?å?£ã??å¦?æ??æ?¨æ?³è®© Evolution å?¨æ?¢å¤?å??è?ªå?¨é??å?¯å?¨ï¼?请å?¯ç?¨å??æ?¢æ??é?®ã??"
-#: ../plugins/bbdb/bbdb.c:670 ../plugins/bbdb/bbdb.c:679
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "è?ªå?¨è??系人"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:710
#, fuzzy
msgid "Create _address book entries when sending mails"
msgstr "å??å¤?é?®ä»¶æ?¶è?ªå?¨å?¨å?°å??ç°¿ä¸å??建è??系人项(_A)"
-#: ../plugins/bbdb/bbdb.c:700
+#: ../plugins/bbdb/bbdb.c:716
msgid "Select Address book for Automatic Contacts"
msgstr "é??æ?©è?ªå?¨è??系人ç??å?°å??ç°¿"
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:731
msgid "Instant Messaging Contacts"
msgstr "å?³æ?¶é??讯è??系人"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:746
msgid "Synchronize contact info and images from Pidgin buddy list"
msgstr "å®?æ?¶ä»? Pidgin 好å??å??表ä¸å??æ¥è??系人信æ?¯å??å?¾å??"
-#: ../plugins/bbdb/bbdb.c:736
+#: ../plugins/bbdb/bbdb.c:752
msgid "Select Address book for Pidgin buddy list"
msgstr "é??æ?© Pidgin 好å??å??表ç??å?°å??ç°¿"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:747
+#: ../plugins/bbdb/bbdb.c:763
msgid "Synchronize with _buddy list now"
msgstr "ç«?å?³å??æ¥å¥½å??å??表(_B)"
@@ -15957,27 +16094,159 @@ msgstr "Bogofilter é??项"
msgid "Filter junk messages using Bogofilter."
msgstr "使ç?¨ Bogofilter è¿?滤å??å?¾ä¿¡ä»¶ã??"
-#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-browse-server.c:198
+msgid "Authentication failed. Server requires correct login."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:200
+msgid "Given URL cannot be found."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "æ?ªç?¥ç??é??误"
+
+#: ../plugins/caldav/caldav-browse-server.c:334
+#: ../plugins/caldav/caldav-browse-server.c:585
+msgid "Failed to parse server response."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:428
+#, fuzzy
+#| msgid "Ends"
+msgid "Events"
+msgstr "ç»?æ??"
+
+#: ../plugins/caldav/caldav-browse-server.c:450
+#, fuzzy
+#| msgid "New calendar"
+msgid "User's calendars"
+msgstr "æ?°å»ºæ?¥å??"
+
+#: ../plugins/caldav/caldav-browse-server.c:558
+#: ../plugins/caldav/caldav-browse-server.c:629
+#, fuzzy
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to get server URL."
+msgstr "认è¯?å?° IMAP æ??å?¡å?¨å¤±è´¥ã??"
+
+#: ../plugins/caldav/caldav-browse-server.c:627
+#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:1272
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching for user's calendars..."
+msgstr ""
+"\n"
+"\n"
+"æ£å?¨æ??ç´¢è??系人..."
+
+#: ../plugins/caldav/caldav-browse-server.c:666
+#, fuzzy
+#| msgid "Unable to find any calendars"
+msgid "Could not find any user calendar."
+msgstr "æ? æ³?æ?¾å?°ä»»ä½?æ?¥å??"
+
+#: ../plugins/caldav/caldav-browse-server.c:794
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:796
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:799
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr "è¾?å?¥ %s ç??å¯?ç ?(ç?¨æ?· %s)"
+
+#: ../plugins/caldav/caldav-browse-server.c:856
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot create output file: %s:\n"
+#| " %s"
+msgid "Cannot create soup message for URL '%s'"
+msgstr ""
+"æ? æ³?å??建è¾?å?ºæ??件ï¼?%sï¼?\n"
+" %s"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1091
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching folder content..."
+msgstr ""
+"\n"
+"\n"
+"æ£å?¨æ??ç´¢è??系人..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1134
+#, fuzzy
+#| msgid "Loading calendars"
+msgid "List of available calendars:"
+msgstr "è£?å?¥æ?¥å??"
+
+#: ../plugins/caldav/caldav-browse-server.c:1171
+#, fuzzy
+#| msgid "Hula Support"
+msgid "Supports"
+msgstr "Hula æ?¯æ??"
+
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, fuzzy, c-format
+msgid "Failed to create thread: %s"
+msgstr "å??建æ?¬å?°é?®ä»¶å?å?¨â??%sâ??失败ï¼?%s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1357
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1363
+msgid "Browse for a CalDAV calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:66
msgid "CalDAV"
msgstr "CalDAV"
-#: ../plugins/caldav/caldav-source.c:366
-#: ../plugins/calendar-http/calendar-http.c:171
+#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/calendar-http/calendar-http.c:92
msgid "_URL:"
msgstr "_URLï¼?"
-#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/caldav/caldav-source.c:219
#: ../plugins/google-account-setup/google-contacts-source.c:303
msgid "Use _SSL"
msgstr "使� _SSL"
-#. add refresh option
-#: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-file/calendar-file.c:274
-#: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:499
+#: ../plugins/caldav/caldav-source.c:228
+msgid "Brows_e server for a calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/calendar-http/calendar-http.c:111
+#: ../plugins/calendar-weather/calendar-weather.c:393
#: ../plugins/google-account-setup/google-contacts-source.c:322
-#: ../plugins/google-account-setup/google-source.c:717
+#: ../plugins/google-account-setup/google-source.c:627
msgid "Re_fresh:"
msgstr "å?·æ?°(_F)ï¼?"
@@ -15990,35 +16259,35 @@ msgstr ""
msgid "CalDAV Support"
msgstr "CalDAV �"
-#: ../plugins/calendar-file/calendar-file.c:208
+#: ../plugins/calendar-file/calendar-file.c:112
#, fuzzy
msgid "_Customize options"
msgstr "���"
-#: ../plugins/calendar-file/calendar-file.c:227
+#: ../plugins/calendar-file/calendar-file.c:131
msgid "File _name:"
msgstr "æ??件å??(_N)ï¼?"
-#: ../plugins/calendar-file/calendar-file.c:231
+#: ../plugins/calendar-file/calendar-file.c:135
#, fuzzy
msgid "Choose calendar file"
msgstr "é??æ?©æ??件"
-#: ../plugins/calendar-file/calendar-file.c:279
+#: ../plugins/calendar-file/calendar-file.c:183
#, fuzzy
msgid "On open"
msgstr "æ??å¼?"
-#: ../plugins/calendar-file/calendar-file.c:280
+#: ../plugins/calendar-file/calendar-file.c:184
msgid "On file change"
msgstr "å?¨æ??件æ?¹å??æ?¶"
-#: ../plugins/calendar-file/calendar-file.c:281
+#: ../plugins/calendar-file/calendar-file.c:185
#, fuzzy
msgid "Periodically"
msgstr "个人"
-#: ../plugins/calendar-file/calendar-file.c:308
+#: ../plugins/calendar-file/calendar-file.c:200
msgid "Force read _only"
msgstr "强��读(_O)"
@@ -16030,11 +16299,11 @@ msgstr "æ·»å? æ?¬å?°æ?¥å??å?° Evolutionã??"
msgid "Local Calendars"
msgstr "è£?å?¥æ?¥å??"
-#: ../plugins/calendar-http/calendar-http.c:369
+#: ../plugins/calendar-http/calendar-http.c:126
msgid "_Secure connection"
msgstr "����(_S)"
-#: ../plugins/calendar-http/calendar-http.c:455
+#: ../plugins/calendar-http/calendar-http.c:186
msgid "Userna_me:"
msgstr "ç?¨æ?·å??(_M)ï¼?"
@@ -16086,15 +16355,24 @@ msgstr "天�����"
msgid "Select a location"
msgstr "é??æ?©ä¸?个ä½?ç½®"
-#: ../plugins/calendar-weather/calendar-weather.c:597
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:371
+#, fuzzy
+#| msgid "None"
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "æ? "
+
+#: ../plugins/calendar-weather/calendar-weather.c:446
msgid "_Units:"
msgstr "å??ä½?(_U)ï¼?"
-#: ../plugins/calendar-weather/calendar-weather.c:604
+#: ../plugins/calendar-weather/calendar-weather.c:453
msgid "Metric (Celsius, cm, etc)"
msgstr "å?¬å?¶(æ??æ°?ã??å??ç±³ç?ç?)"
-#: ../plugins/calendar-weather/calendar-weather.c:605
+#: ../plugins/calendar-weather/calendar-weather.c:454
msgid "Imperial (Fahrenheit, inches, etc)"
msgstr "è?±å?¶(å??æ°?ã??è?±å¯¸ç?ç?)"
@@ -16106,13 +16384,13 @@ msgstr "æ·»å? 天æ°?æ?¥å??å?° Evolutionã??"
msgid "Weather Calendars"
msgstr "天æ°?æ??å??"
-#: ../plugins/contacts-map/contacts-map.c:59
-#: ../plugins/contacts-map/contacts-map.c:193
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
#, fuzzy
msgid "Contacts map"
msgstr "è??系人ï¼?"
-#: ../plugins/contacts-map/contacts-map.c:60
+#: ../plugins/contacts-map/contacts-map.c:56
#, fuzzy
msgid "Show a map of all the contacts"
msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
@@ -16147,24 +16425,24 @@ msgstr "�认�件客�端"
msgid "Do you want to make Evolution your default e-mail client?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?å°? Evolution 设置为æ?¨ç??é»?认ç?µå?é?®ä»¶å®¢æ?·ç«¯ï¼?"
-#: ../plugins/default-source/default-source.c:94
+#: ../plugins/default-source/default-source.c:75
msgid "Mark as _default address book"
msgstr "æ ?为é»?认å?°å??ç°¿(_D)"
-#: ../plugins/default-source/default-source.c:119
+#: ../plugins/default-source/default-source.c:88
#, fuzzy
msgid "A_utocomplete with this address book"
msgstr "å?¨å?°å??ç°¿ä¸æ?¥é??"
-#: ../plugins/default-source/default-source.c:138
+#: ../plugins/default-source/default-source.c:97
msgid "Mark as _default calendar"
msgstr "æ ?为é»?认æ?¥å??(_D)"
-#: ../plugins/default-source/default-source.c:139
+#: ../plugins/default-source/default-source.c:98
msgid "Mark as _default task list"
msgstr "æ ?为é»?认任å?¡å??表(_D)"
-#: ../plugins/default-source/default-source.c:140
+#: ../plugins/default-source/default-source.c:99
msgid "Mark as _default memo list"
msgstr "æ ?为é»?认å¤?å¿?å??表(_D)"
@@ -16187,27 +16465,36 @@ msgid ""
"custom header followed by \"=\" and the values separated by \";\""
msgstr ""
-#: ../plugins/email-custom-header/email-custom-header.c:318
+#: ../plugins/email-custom-header/email-custom-header.c:316
msgid "Security:"
msgstr "���"
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:321
msgid "Unclassified"
msgstr "æ?ªå??ç±»"
-#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../plugins/email-custom-header/email-custom-header.c:322
msgid "Protected"
msgstr "å??ä¿?æ?¤ç??"
-#: ../plugins/email-custom-header/email-custom-header.c:326
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
msgid "Secret"
msgstr "��"
-#: ../plugins/email-custom-header/email-custom-header.c:327
+#: ../plugins/email-custom-header/email-custom-header.c:325
msgid "Top secret"
msgstr "��"
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
+#. indicating the header will not be added to a mail message
+#: ../plugins/email-custom-header/email-custom-header.c:379
+#, fuzzy
+#| msgid "None"
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "æ? "
+
#: ../plugins/email-custom-header/email-custom-header.c:569
msgid "_Custom Header"
msgstr "���信头(_C)"
@@ -16324,10 +16611,6 @@ msgid ""
"should be set before checking this, otherwise nothing happens."
msgstr ""
-#: ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "æ?ªç?¥ç??é??误"
-
#: ../plugins/face/face.c:286
#, fuzzy
msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
@@ -16382,21 +16665,21 @@ msgid "The file you selected does not look like a valid .png image. Error: {0}"
msgstr ""
#: ../plugins/google-account-setup/google-contacts-source.c:51
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-source.c:82
msgid "Google"
msgstr "Google"
#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
msgid "<b>Server</b>"
msgstr "<b>æ??å?¡å?¨</b>"
-#: ../plugins/google-account-setup/google-source.c:517
+#: ../plugins/google-account-setup/google-source.c:439
#, c-format
msgid "Enter password for user %s to access list of subscribed calendars."
msgstr "è¾?å?¥ç?¨æ?· %s ç??å¯?ç ?以便访é?®å·²è®¢é??æ?¥å??ç??å??表ã??"
-#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/google-account-setup/google-source.c:545
#, c-format
msgid ""
"Cannot read data from Google server.\n"
@@ -16405,17 +16688,17 @@ msgstr ""
"æ? æ³?ä»? Google æ??å?¡å?¨ä¸?读å??æ?°æ?®ã??\n"
"%s"
-#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/google-account-setup/google-source.c:545
#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:943
+#: ../plugins/mail-to-task/mail-to-task.c:941
msgid "Unknown error."
msgstr "æ?ªç?¥é??误ã??"
-#: ../plugins/google-account-setup/google-source.c:758
+#: ../plugins/google-account-setup/google-source.c:631
msgid "Cal_endar:"
msgstr "æ?¥å??(_E)ï¼?"
-#: ../plugins/google-account-setup/google-source.c:793
+#: ../plugins/google-account-setup/google-source.c:666
msgid "Retrieve _list"
msgstr "è?·å??å??表(_L)"
@@ -16427,35 +16710,35 @@ msgstr ""
msgid "Google Calendars"
msgstr "Google æ?¥å??"
-#: ../plugins/groupwise-features/camel-gw-listener.c:451
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
msgid "Checklist"
msgstr "å¾?å??æ¸?å??"
-#: ../plugins/groupwise-features/gw-ui.c:111
+#: ../plugins/groupwise-features/gw-ui.c:112
msgid "New _Shared Folder..."
msgstr "æ?°å»ºå?±äº«æ??件夹(_S)..."
-#: ../plugins/groupwise-features/gw-ui.c:118
+#: ../plugins/groupwise-features/gw-ui.c:119
msgid "_Proxy Login..."
msgstr "代ç??æ??å?¡å?¨ç?»å½?(_P)..."
-#: ../plugins/groupwise-features/gw-ui.c:169
+#: ../plugins/groupwise-features/gw-ui.c:170
msgid "Junk Mail Settings..."
msgstr "å??å?¾é?®ä»¶è®¾ç½®..."
-#: ../plugins/groupwise-features/gw-ui.c:176
+#: ../plugins/groupwise-features/gw-ui.c:177
msgid "Track Message Status..."
msgstr "è·?踪信件ç?¶æ??..."
-#: ../plugins/groupwise-features/gw-ui.c:182
+#: ../plugins/groupwise-features/gw-ui.c:183
msgid "Retract Mail"
msgstr "æ?¶å??é?®ä»¶"
-#: ../plugins/groupwise-features/gw-ui.c:339
+#: ../plugins/groupwise-features/gw-ui.c:338
msgid "Accept Tentatively"
msgstr "æ??æ?¶æ?¥å??"
-#: ../plugins/groupwise-features/gw-ui.c:353
+#: ../plugins/groupwise-features/gw-ui.c:352
msgid "Rese_nd Meeting..."
msgstr "é??æ?°å??é??ä¼?è®®(_N)..."
@@ -16497,11 +16780,11 @@ msgstr "å®?è£?å?±äº«æ??件夹"
msgid "Shared Folder Installation"
msgstr "å?±äº«æ??件夹å®?è£?"
-#: ../plugins/groupwise-features/junk-mail-settings.c:82
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
msgid "Junk Settings"
msgstr "å??å?¾é?®ä»¶è®¾ç½®"
-#: ../plugins/groupwise-features/junk-mail-settings.c:95
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
#: ../plugins/groupwise-features/junk-settings.ui.h:3
msgid "Junk Mail Settings"
msgstr "å??å?¾é?®ä»¶è®¾ç½®"
@@ -16515,7 +16798,7 @@ msgid "Junk List:"
msgstr "å??å?¾é?®ä»¶å??表ï¼?"
#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../plugins/publish-calendar/publish-calendar.c:596
msgid "_Disable"
msgstr "��(_D)"
@@ -16533,17 +16816,17 @@ msgstr "å??å?¾æµ?è¯?(_J)"
msgid "_Remove"
msgstr "å? é?¤(_R)"
-#: ../plugins/groupwise-features/mail-retract.c:83
+#: ../plugins/groupwise-features/mail-retract.c:81
msgid "Message Retract"
msgstr "ä¿¡æ?¯æ?¶å??"
-#: ../plugins/groupwise-features/mail-retract.c:88
+#: ../plugins/groupwise-features/mail-retract.c:86
msgid ""
"Retracting a message may remove it from the recipient's mailbox. Are you "
"sure you want to do this?"
msgstr ""
-#: ../plugins/groupwise-features/mail-retract.c:109
+#: ../plugins/groupwise-features/mail-retract.c:107
msgid "Message retracted successfully"
msgstr "é?®ä»¶æ??å??æ?¶å??"
@@ -16683,11 +16966,6 @@ msgstr "è?ªå®?ä¹?é??ç?¥æ¶?æ?¯(_U)"
msgid "Con_tacts..."
msgstr "è??系人(_T)..."
-#: ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:512
-msgid "Message"
-msgstr "��"
-
#: ../plugins/groupwise-features/properties.ui.h:6
msgid "Shared Folder Notification"
msgstr "å?±äº«æ??件夹é??ç?¥"
@@ -16779,7 +17057,7 @@ msgid "The Proxy tab will be available only when the account is enabled."
msgstr "代ç??æ??å?¡å?¨æ ?ç¾ä»?å½?è´¦æ?·å?¯ç?¨æ?¶æ??å?¯ç?¨ã??"
#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:702
+#: ../plugins/groupwise-features/share-folder.c:701
msgid "Add User"
msgstr "æ·»å? ç?¨æ?·"
@@ -16788,7 +17066,7 @@ msgid "Advanced send options"
msgstr "é«?级å??é??é??项"
#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:737
+#: ../plugins/groupwise-features/share-folder.c:736
msgid "Users"
msgstr "��"
@@ -16800,64 +17078,64 @@ msgstr "è¾?å?¥ç?¨æ?·å??设å®?æ??é??"
msgid "Sharing"
msgstr "�享"
-#: ../plugins/groupwise-features/share-folder.c:530
+#: ../plugins/groupwise-features/share-folder.c:529
msgid "Custom Notification"
msgstr "è?ªå®?ä¹?é??ç?¥"
-#: ../plugins/groupwise-features/share-folder.c:742
+#: ../plugins/groupwise-features/share-folder.c:741
msgid "Add "
msgstr "æ·»å? "
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder.c:747
msgid "Modify"
msgstr "修�"
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:123
msgid "Message Status"
msgstr "信件ç?¶æ??"
#. Subject
-#: ../plugins/groupwise-features/status-track.c:139
+#: ../plugins/groupwise-features/status-track.c:137
msgid "Subject:"
msgstr "主��"
-#: ../plugins/groupwise-features/status-track.c:153
+#: ../plugins/groupwise-features/status-track.c:151
msgid "From:"
msgstr "å??件人ï¼?"
-#: ../plugins/groupwise-features/status-track.c:168
+#: ../plugins/groupwise-features/status-track.c:166
msgid "Creation date:"
msgstr "å??建æ?¥æ??ï¼?"
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
msgid "Recipient: "
msgstr "�件人�"
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:211
msgid "Delivered: "
msgstr "å·²æ??é??ï¼?"
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:217
msgid "Opened: "
msgstr "å·²æ??å¼?ï¼?"
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:222
msgid "Accepted: "
msgstr "å·²æ?¥å??ï¼?"
-#: ../plugins/groupwise-features/status-track.c:230
+#: ../plugins/groupwise-features/status-track.c:227
msgid "Deleted: "
msgstr "å·²å? é?¤ï¼?"
-#: ../plugins/groupwise-features/status-track.c:235
+#: ../plugins/groupwise-features/status-track.c:232
msgid "Declined: "
msgstr "å·²æ??ç»?ï¼?"
-#: ../plugins/groupwise-features/status-track.c:240
+#: ../plugins/groupwise-features/status-track.c:237
msgid "Completed: "
msgstr "å·²å®?æ??ï¼?"
-#: ../plugins/groupwise-features/status-track.c:245
+#: ../plugins/groupwise-features/status-track.c:242
msgid "Undelivered: "
msgstr "æ?ªæ??é??ï¼?"
@@ -16971,125 +17249,125 @@ msgstr "æ??å¼?æ?¥å??"
msgid "Searching for an existing version of this appointment"
msgstr "æ??ç´¢æ¤çº¦ä¼?ç??å·²æ??ç??æ?¬"
-#: ../plugins/itip-formatter/itip-formatter.c:1045
+#: ../plugins/itip-formatter/itip-formatter.c:1044
msgid "Unable to parse item"
msgstr "æ? æ³?å??æ??项ç?®"
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1131
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "æ? æ³?å°?项ç?®å??é??å?°æ?¥å??â??%sâ??ã??%s"
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1143
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "å°?æ?¥å??â??%sâ??å??é??为已æ?¥å??"
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1147
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "å°?æ?¥å??â??%sâ??å??é??为å¾?å®?"
-#: ../plugins/itip-formatter/itip-formatter.c:1153
+#: ../plugins/itip-formatter/itip-formatter.c:1152
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "å°?æ?¥å??â??%sâ??å??é??为已æ??ç»?"
-#: ../plugins/itip-formatter/itip-formatter.c:1158
+#: ../plugins/itip-formatter/itip-formatter.c:1157
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "å°?æ?¥å??â??%sâ??å??é??为已å??æ¶?"
-#: ../plugins/itip-formatter/itip-formatter.c:1252
+#: ../plugins/itip-formatter/itip-formatter.c:1251
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "ç»?ç»?è??å·²ç»?å? é?¤äº?代ç??人 %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1259
+#: ../plugins/itip-formatter/itip-formatter.c:1258
msgid "Sent a cancelation notice to the delegate"
msgstr "å·²ç»?代ç??人å??é??äº?å??æ¶?é??ç?¥"
-#: ../plugins/itip-formatter/itip-formatter.c:1261
+#: ../plugins/itip-formatter/itip-formatter.c:1260
msgid "Could not send the cancelation notice to the delegate"
msgstr "æ? æ³?ç»?代ç??人å??é??å??æ¶?é??ç?¥"
-#: ../plugins/itip-formatter/itip-formatter.c:1372
+#: ../plugins/itip-formatter/itip-formatter.c:1371
msgid "Attendee status could not be updated because the status is invalid"
msgstr "å?ºå¸è??ç?¶æ??æ? æ³?æ?´æ?°ï¼?å??å? æ?¯ç?¶æ??æ? æ??"
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1400
#, c-format
msgid "Unable to update attendee. %s"
msgstr "æ? æ³?æ?´æ?°å?ºå¸è??ã??%s"
-#: ../plugins/itip-formatter/itip-formatter.c:1405
+#: ../plugins/itip-formatter/itip-formatter.c:1404
msgid "Attendee status updated"
msgstr "å?ºå¸è??ç?¶æ??å·²æ?´æ?°"
-#: ../plugins/itip-formatter/itip-formatter.c:1431
+#: ../plugins/itip-formatter/itip-formatter.c:1430
msgid "Meeting information sent"
msgstr "ä¼?议信æ?¯å·²å??é??"
-#: ../plugins/itip-formatter/itip-formatter.c:1434
+#: ../plugins/itip-formatter/itip-formatter.c:1433
msgid "Task information sent"
msgstr "ä»»å?¡ä¿¡æ?¯å·²å??é??"
-#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1436
msgid "Memo information sent"
msgstr "å¤?å¿?ä¿¡æ?¯å·²å??é??"
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1445
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "æ? æ³?å??é??ä¼?议信æ?¯ï¼?ä¼?è®®ä¸?å?å?¨"
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
msgid "Unable to send task information, the task does not exist"
msgstr "æ? æ³?å??é??ä»»å?¡ä¿¡æ?¯ï¼?ä»»å?¡ä¸?å?å?¨"
-#: ../plugins/itip-formatter/itip-formatter.c:1452
+#: ../plugins/itip-formatter/itip-formatter.c:1451
msgid "Unable to send memo information, the memo does not exist"
msgstr "æ? æ³?å??é??å¤?å¿?ä¿¡æ?¯ï¼?å¤?å¿?ä¸?å?å?¨"
#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1516
msgid "calendar.ics"
msgstr "calendar.ics"
-#: ../plugins/itip-formatter/itip-formatter.c:1522
+#: ../plugins/itip-formatter/itip-formatter.c:1521
msgid "Save Calendar"
msgstr "ä¿?å?æ?¥å??"
-#: ../plugins/itip-formatter/itip-formatter.c:1575
-#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1574
+#: ../plugins/itip-formatter/itip-formatter.c:1585
msgid "The calendar attached is not valid"
msgstr "é??å? ç??æ?¥å??æ? æ??"
-#: ../plugins/itip-formatter/itip-formatter.c:1576
-#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1586
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
msgstr "信件声æ??å?¶å??å?«æ?¥å??ï¼?ä½?æ?¥å??ä¸?æ?¯æ??æ??ç?? iCalendarã??"
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../plugins/itip-formatter/itip-formatter.c:1655
-#: ../plugins/itip-formatter/itip-formatter.c:1761
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../plugins/itip-formatter/itip-formatter.c:1654
+#: ../plugins/itip-formatter/itip-formatter.c:1760
msgid "The item in the calendar is not valid"
msgstr "æ?¥å??项æ? æ??"
-#: ../plugins/itip-formatter/itip-formatter.c:1628
-#: ../plugins/itip-formatter/itip-formatter.c:1656
-#: ../plugins/itip-formatter/itip-formatter.c:1762
+#: ../plugins/itip-formatter/itip-formatter.c:1627
+#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1761
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
msgstr "信件ç??ç¡®å??å?«æ?¥å??ï¼?ä½?æ?¯æ?¥å??ä¸?å??å?«äº?件ã??ä»»å?¡æ??å¿?/é?²ä¿¡æ?¯"
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1668
msgid "The calendar attached contains multiple items"
msgstr "é??å? ç??æ?¥å??å??å?«å¤?个项ç?®"
-#: ../plugins/itip-formatter/itip-formatter.c:1670
+#: ../plugins/itip-formatter/itip-formatter.c:1669
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
@@ -17109,341 +17387,341 @@ msgstr "æ¤å¤?å¿?é??ç?°"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2670
+#: ../plugins/itip-formatter/itip-formatter.c:2669
msgid "_Delete message after acting"
msgstr "æ??ä½?å??å? é?¤æ¶?æ?¯(_D)"
-#: ../plugins/itip-formatter/itip-formatter.c:2680
-#: ../plugins/itip-formatter/itip-formatter.c:2713
+#: ../plugins/itip-formatter/itip-formatter.c:2679
+#: ../plugins/itip-formatter/itip-formatter.c:2712
msgid "Conflict Search"
msgstr "å?²çª?æ??ç´¢"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2695
+#: ../plugins/itip-formatter/itip-formatter.c:2694
msgid "Select the calendars to search for meeting conflicts"
msgstr "é??æ?©è¦?æ??ç´¢å?²çª?ä¼?è®®ç??æ?¥å??"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:200
msgid "Today %H:%M"
msgstr "�天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:203
+#: ../plugins/itip-formatter/itip-view.c:204
msgid "Today %H:%M:%S"
msgstr "�天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:213
msgid "Today %l:%M:%S %p"
msgstr "�天%p%l:%M:%S"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:228
msgid "Tomorrow %H:%M"
msgstr "æ??天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:232
msgid "Tomorrow %H:%M:%S"
msgstr "æ??天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:237
msgid "Tomorrow %l:%M %p"
msgstr "æ??天%p%l:%M"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:240
+#: ../plugins/itip-formatter/itip-view.c:241
msgid "Tomorrow %l:%M:%S %p"
msgstr "æ??天%p%l:%M:%S"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:260
#, c-format
msgid "%A"
msgstr "%A"
#. strftime format of a weekday and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:264
+#: ../plugins/itip-formatter/itip-view.c:265
msgid "%A %H:%M"
msgstr "%A %H:%M"
#. strftime format of a weekday and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:269
msgid "%A %H:%M:%S"
msgstr "%A %H:%M:%S"
#. strftime format of a weekday and a
#. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:274
msgid "%A %l:%M %p"
msgstr "%A%p%l:%M"
#. strftime format of a weekday and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:277
+#: ../plugins/itip-formatter/itip-view.c:278
msgid "%A %l:%M:%S %p"
msgstr "%A%p%l:%M:%S"
#. strftime format of a weekday and a date
#. without a year.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:287
msgid "%A, %B %e"
msgstr "%-mæ??%-dæ?¥%A"
#. strftime format of a weekday, a date
#. without a year and a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:292
+#: ../plugins/itip-formatter/itip-view.c:293
msgid "%A, %B %e %H:%M"
msgstr "%-mæ??%-dæ?¥%A %H:%M"
#. strftime format of a weekday, a date without a year
#. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:297
msgid "%A, %B %e %H:%M:%S"
msgstr "%-mæ??%-dæ?¥%A %H:%M:%S"
#. strftime format of a weekday, a date without a year
#. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:302
msgid "%A, %B %e %l:%M %p"
msgstr "%-mæ??%-dæ?¥%A%p%l:%M"
#. strftime format of a weekday, a date without a year
#. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:306
msgid "%A, %B %e %l:%M:%S %p"
msgstr "%-mæ??%-dæ?¥%A%p%l:%M:%S"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:312
msgid "%A, %B %e, %Y"
msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:317
msgid "%A, %B %e, %Y %H:%M"
msgstr "%Yå¹´%-mæ??%-dæ?¥%A %H:%M"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:321
msgid "%A, %B %e, %Y %H:%M:%S"
msgstr "%Yå¹´%-mæ??%-dæ?¥%A %H:%M:%S"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../plugins/itip-formatter/itip-view.c:326
msgid "%A, %B %e, %Y %l:%M %p"
msgstr "%Yå¹´%-mæ??%-dæ?¥%A%p%l:%M"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:329
+#: ../plugins/itip-formatter/itip-view.c:330
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Yå¹´%-mæ??%-dæ?¥%A%p%l:%M:%S"
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:443
#: ../plugins/itip-formatter/itip-view.c:530
#, c-format
msgid "Please respond on behalf of <b>%s</b>"
msgstr "请以 <b>%s</b> ç??身份å??åº?"
-#: ../plugins/itip-formatter/itip-view.c:356
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:445
#: ../plugins/itip-formatter/itip-view.c:532
#, c-format
msgid "Received on behalf of <b>%s</b>"
msgstr "以 <b>%s</b> ç??身份æ?¥æ?¶"
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:362
#, c-format
msgid "<b>%s</b> through %s has published the following meeting information:"
msgstr "<b>%s</b> é??è¿? %s å??å¸?äº?ä¼?议信æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:364
#, c-format
msgid "<b>%s</b> has published the following meeting information:"
msgstr "<b>%s</b> å??å¸?äº?ä¼?议信æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:369
#, c-format
msgid "<b>%s</b> has delegated the following meeting to you:"
msgstr "<b>%s</b> 为æ?¨ä»£ç??äº?ä¸?å??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:372
#, c-format
msgid "<b>%s</b> through %s requests your presence at the following meeting:"
msgstr "<b>%s</b> é??è¿? %s 请æ±?æ?¨å??å? ä¸?å??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:373
+#: ../plugins/itip-formatter/itip-view.c:374
#, c-format
msgid "<b>%s</b> requests your presence at the following meeting:"
msgstr "<b>%s</b> 请æ±?æ?¨å??å? ä¸?å??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:380
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
msgstr "<b>%s</b> é??è¿? %s å¸?æ??å? å?¥å?°å·²æ??ç??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:382
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting:"
msgstr "<b>%s</b> å¸?æ??å? å?¥å?°å·²æ??ç??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:386
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following meeting:"
msgstr "<b>%s</b> é??è¿? %s å¸?æ??æ?¥æ?¶å?°ä¸?å??ä¼?è®®ç??æ??æ?°ä¿¡æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:388
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following meeting:"
msgstr "<b>%s</b> å¸?æ??æ?¥æ?¶å?°ä¸?å??ä¼?è®®ç??æ??æ?°ä¿¡æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:392
#, c-format
msgid "<b>%s</b> through %s has sent back the following meeting response:"
msgstr "<b>%s</b> é??è¿? %s å??å??äº?ä¸?å??ä¼?议请æ±?ç??å??åº?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:394
#, c-format
msgid "<b>%s</b> has sent back the following meeting response:"
msgstr "<b>%s</b> å??å??äº?ä¸?å??ä¼?议请æ±?ç??å??åº?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:398
#, c-format
msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr "<b>%s</b> é??è¿? %s å??æ¶?äº?ä¸?å??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../plugins/itip-formatter/itip-view.c:400
#, c-format
msgid "<b>%s</b> has canceled the following meeting."
msgstr "<b>%s</b> å??æ¶?äº?ä¸?å??ä¼?è®®ã??"
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:404
#, c-format
msgid "<b>%s</b> through %s has proposed the following meeting changes."
msgstr "<b>%s</b> é??è¿? %s æ??è®®äº?ä¸?å??ä¼?è®®å??æ?´ã??"
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:406
#, c-format
msgid "<b>%s</b> has proposed the following meeting changes."
msgstr "<b>%s</b> æ??è®®äº?ä¸?å??ä¼?è®®å??æ?´ã??"
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:410
#, c-format
msgid "<b>%s</b> through %s has declined the following meeting changes:"
msgstr "<b>%s</b> é??è¿? %s æ??ç»?äº?ä¸?å??ä¼?è®®å??æ?´ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:412
#, c-format
msgid "<b>%s</b> has declined the following meeting changes."
msgstr "<b>%s</b> æ??ç»?äº?ä¸?å??ä¼?è®®å??æ?´ã??"
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:450
#, c-format
msgid "<b>%s</b> through %s has published the following task:"
msgstr "<b>%s</b> é??è¿? %s å??å¸?äº?ä¸?å??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:452
#, c-format
msgid "<b>%s</b> has published the following task:"
msgstr "<b>%s</b> å??å¸?äº?ä¸?å??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:457
#, c-format
msgid "<b>%s</b> requests the assignment of %s to the following task:"
msgstr "<b>%s</b> 请æ±?ç»? %s å??é??ä¸?å??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:460
#, c-format
msgid "<b>%s</b> through %s has assigned you a task:"
msgstr "<b>%s</b> é??è¿? %s 为æ?¨å??é??äº?ä¸?å??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:461
+#: ../plugins/itip-formatter/itip-view.c:462
#, c-format
msgid "<b>%s</b> has assigned you a task:"
msgstr "<b>%s</b> 为æ?¨å??é??äº?ä¸?个任å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:468
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing task:"
msgstr "<b>%s</b> é??è¿? %s å¸?æ??å? å?¥å?°å·²æ??ç??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:470
#, c-format
msgid "<b>%s</b> wishes to add to an existing task:"
msgstr "<b>%s<b> å¸?æ??å? å?¥å?°å·²å?å?¨ç??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:474
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following assigned task:"
msgstr "<b>%s</b> é??è¿? %s æ?³è¦?æ?¶å?°æ??å??é??ç??ä¸?å??ä»»å?¡ç??æ??æ?°ä¿¡æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:476
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following "
"assigned task:"
msgstr "<b>%s</b> æ?³è¦?æ?¶å?°æ??å??é??ç??ä¸?å??ä»»å?¡ç??æ??æ?°ä¿¡æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:480
#, c-format
msgid ""
"<b>%s</b> through %s has sent back the following assigned task response:"
msgstr "<b>%s</b> é??è¿? %s å??å??äº?ä¸?å??å??é??ä»»å?¡ç??å??åº?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../plugins/itip-formatter/itip-view.c:482
#, c-format
msgid "<b>%s</b> has sent back the following assigned task response:"
msgstr "<b>%s</b> å??å??äº?ä¸?å??å??é??ä»»å?¡ç??å??åº?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:486
#, c-format
msgid "<b>%s</b> through %s has canceled the following assigned task:"
msgstr "<b>%s</b> é??è¿? %s å??æ¶?äº?ä¸?å??ä»»å?¡å??é??ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:488
#, c-format
msgid "<b>%s</b> has canceled the following assigned task:"
msgstr "<b>%s</b> å??æ¶?å??é??ç??ä¸?å??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:492
#, c-format
msgid ""
"<b>%s</b> through %s has proposed the following task assignment changes:"
msgstr "<b>%s</b> é??è¿? %s æ??è®®äº?ä¸?å??ä»»å?¡å??é??å??æ?´ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:494
#, c-format
msgid "<b>%s</b> has proposed the following task assignment changes:"
msgstr "<b>%s</b> æ??è®®äº?ä¸?å??ä»»å?¡å??é??å??æ?´ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:498
#, c-format
msgid "<b>%s</b> through %s has declined the following assigned task:"
msgstr "<b>%s</b> é??è¿? %s æ??ç»?äº?ä¸?å??ä»»å?¡å??é??ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../plugins/itip-formatter/itip-view.c:500
#, c-format
msgid "<b>%s</b> has declined the following assigned task:"
msgstr "<b>%s</b> æ??ç»?äº?å??é??ç??ä¸?å??ä»»å?¡ï¼?"
@@ -17587,11 +17865,11 @@ msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
msgid "_Inherit reminder"
msgstr "继æ?¿æ??示(_I)"
-#: ../plugins/itip-formatter/itip-view.c:1930
+#: ../plugins/itip-formatter/itip-view.c:1911
msgid "_Tasks:"
msgstr "任�(_T)�"
-#: ../plugins/itip-formatter/itip-view.c:1932
+#: ../plugins/itip-formatter/itip-view.c:1913
msgid "_Memos:"
msgstr "��(_M)�"
@@ -17730,48 +18008,48 @@ msgid "You have received %d new message."
msgid_plural "You have received %d new messages."
msgstr[0] "æ?¨æ?¶å?°äº? %d å°?æ?°é?®ä»¶ã??"
-#: ../plugins/mail-notification/mail-notification.c:544
-#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:550
msgid "New email"
msgstr "æ?°ç?µå?é?®ä»¶"
-#: ../plugins/mail-notification/mail-notification.c:602
+#: ../plugins/mail-notification/mail-notification.c:604
msgid "Show icon in _notification area"
msgstr "å?¨é??ç?¥å?ºæ?¾ç¤ºå?¾æ ?(_N)"
-#: ../plugins/mail-notification/mail-notification.c:630
+#: ../plugins/mail-notification/mail-notification.c:632
msgid "B_link icon in notification area"
msgstr "é?ªç??é??ç?¥å?ºå?¾æ ?(_L)"
-#: ../plugins/mail-notification/mail-notification.c:640
+#: ../plugins/mail-notification/mail-notification.c:642
msgid "Popup _message together with the icon"
msgstr "å??æ?¶å¼¹å?ºå?¾æ ?å??æ¶?æ?¯(_M)"
-#: ../plugins/mail-notification/mail-notification.c:825
+#: ../plugins/mail-notification/mail-notification.c:827
msgid "_Play sound when new messages arrive"
msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶æ?æ?¾å£°é?³(_P)"
-#: ../plugins/mail-notification/mail-notification.c:854
+#: ../plugins/mail-notification/mail-notification.c:856
msgid "_Beep"
msgstr "å??é??(_B)"
-#: ../plugins/mail-notification/mail-notification.c:867
+#: ../plugins/mail-notification/mail-notification.c:869
msgid "Use sound _theme"
msgstr "使�声�主�(_T)"
-#: ../plugins/mail-notification/mail-notification.c:886
+#: ../plugins/mail-notification/mail-notification.c:888
msgid "Play _file:"
msgstr "æ?æ?¾æ??件(_F)ï¼?"
-#: ../plugins/mail-notification/mail-notification.c:897
+#: ../plugins/mail-notification/mail-notification.c:899
msgid "Select sound file"
msgstr "é??æ?©å£°é?³æ??件"
-#: ../plugins/mail-notification/mail-notification.c:955
+#: ../plugins/mail-notification/mail-notification.c:957
msgid "Notify new messages for _Inbox only"
msgstr "å?ªé??ç?¥æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_I)"
-#: ../plugins/mail-notification/mail-notification.c:964
+#: ../plugins/mail-notification/mail-notification.c:966
msgid "Generate a _D-Bus message"
msgstr "ç??æ?? _D-Bus æ¶?æ?¯"
@@ -17893,40 +18171,40 @@ msgid ""
"source, please."
msgstr "é??ä¸ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ¤ä¸?è?½å?¨æ¤å??建任å?¡ã??请é??æ?©å?¶å®?ç??æº?ã??"
-#: ../plugins/mail-to-task/mail-to-task.c:943
+#: ../plugins/mail-to-task/mail-to-task.c:941
#, c-format
msgid "Cannot get source list. %s"
msgstr "è?½è?·å??æº?å??表ã?? %s"
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1060
msgid "Create an _Event"
msgstr "å??建ä¸?个äº?件(_E)"
-#: ../plugins/mail-to-task/mail-to-task.c:1064
+#: ../plugins/mail-to-task/mail-to-task.c:1062
msgid "Create a new event from the selected message"
msgstr "ä»?é??æ?©ç??ä¿¡æ?¯ä¸å??建ä¸?个æ?°ç??äº?件"
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1067
msgid "Create a Mem_o"
msgstr "å??建ä¸?个å¤?å¿?(_O)"
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1069
msgid "Create a new memo from the selected message"
msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°å¤?å¿?"
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1074
msgid "Create a _Task"
msgstr "å??建ä¸?个任å?¡(_T)"
-#: ../plugins/mail-to-task/mail-to-task.c:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1076
msgid "Create a new task from the selected message"
msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°ä»»å?¡"
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1084
msgid "Create a _Meeting"
msgstr "å??建ä¸?个ä¼?è®®(_M)"
-#: ../plugins/mail-to-task/mail-to-task.c:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1086
msgid "Create a new meeting from the selected message"
msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°ä¼?è®®"
@@ -17934,56 +18212,56 @@ msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°ä¼?è®®"
msgid "Convert a mail message to a task."
msgstr "转æ?¢ä¸?个é?®ä»¶ä¿¡æ?¯æ??为ä¸?个任å?¡ã??"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:277
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
msgid "Get List _Archive"
msgstr "è?·å¾?å??表å?æ¡£(_A)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
msgid "Get an archive of the list this message belongs to"
msgstr "è?·å??è¿?å°?ä¿¡æ??å±?é?®ä»¶å??表ç??å?æ¡£"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:284
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
msgid "Get List _Usage Information"
msgstr "è?·å¾?å??表ç?¨æ³?ä¿¡æ?¯(_U)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
msgid "Get information about the usage of the list this message belongs to"
msgstr "è?·å??è¿?å°?ä¿¡æ??å±?é?®ä»¶å??表ç??ç?¨æ³?ä¿¡æ?¯"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
msgid "Contact List _Owner"
msgstr "è??ç³»å??表æ??æ??è??(_O)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
msgid "Contact the owner of the mailing list this message belongs to"
msgstr "è??ç³»è¿?å°?ä¿¡æ??å±?é?®ä»¶å??表ç??æ??æ??è??"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
msgid "_Post Message to List"
msgstr "æ??é??å?°å??表(_P)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
msgid "Post a message to the mailing list this message belongs to"
msgstr "ç»?è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??表æ??é??"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
msgid "_Subscribe to List"
msgstr "订é??å??表(_S)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
msgid "Subscribe to the mailing list this message belongs to"
msgstr "订é??è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??表"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
msgid "_Unsubscribe from List"
msgstr "é??订å??表(_U)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
#, fuzzy
msgid "Unsubscribe from the mailing list this message belongs to"
msgstr "é??订è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??表"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
msgid "Mailing _List"
msgstr "é?®ä»¶å??表(_L)"
@@ -18080,15 +18358,15 @@ msgid ""
"current folder as well as all subfolders?"
msgstr "æ?¨æ?¯æ?³è¦?å?ªæ ?è®°å½?å??æ??件夹ä¸ç??信件ï¼?è¿?æ?¯ä¹?å??æ?¬å?æ??件夹ä¸ç??信件ï¼?"
-#: ../plugins/mark-all-read/mark-all-read.c:171
+#: ../plugins/mark-all-read/mark-all-read.c:168
msgid "In Current Folder and _Subfolders"
msgstr "å?¨å½?å??æ??件夹å??å?æ??件夹(_S)"
-#: ../plugins/mark-all-read/mark-all-read.c:185
+#: ../plugins/mark-all-read/mark-all-read.c:182
msgid "In Current _Folder Only"
msgstr "å?ªå?¨å½?å??æ??件夹(_F)"
-#: ../plugins/mark-all-read/mark-all-read.c:342
+#: ../plugins/mark-all-read/mark-all-read.c:349
msgid "Mark Me_ssages as Read"
msgstr "æ??信件æ ?记为已读(_S)"
@@ -18237,6 +18515,8 @@ msgid "Importing Outlook data"
msgstr "导� Elm ��"
#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
msgid "Calendar Publishing"
msgstr "æ?¥å??å??å¸?"
@@ -18249,47 +18529,50 @@ msgstr "ä½?ç½®"
msgid "Publish calendars to the web."
msgstr "å??许å°?æ?¥å??å??å¸?å?° Web"
-#: ../plugins/publish-calendar/publish-calendar.c:94
-#: ../plugins/publish-calendar/publish-calendar.c:336
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
#, c-format
msgid "Could not open %s:"
msgstr "æ? æ³?æ??å¼? %sï¼?"
-#: ../plugins/publish-calendar/publish-calendar.c:96
+#: ../plugins/publish-calendar/publish-calendar.c:210
#, c-format
msgid "Could not open %s: Unknown error"
msgstr "æ? æ³?æ??å¼? %sï¼?æ?ªç?¥é??误"
-#: ../plugins/publish-calendar/publish-calendar.c:116
+#: ../plugins/publish-calendar/publish-calendar.c:230
#, c-format
msgid "There was an error while publishing to %s:"
msgstr ""
-#: ../plugins/publish-calendar/publish-calendar.c:118
+#: ../plugins/publish-calendar/publish-calendar.c:232
#, c-format
msgid "Publishing to %s finished successfully"
msgstr ""
-#: ../plugins/publish-calendar/publish-calendar.c:163
+#: ../plugins/publish-calendar/publish-calendar.c:276
#, c-format
msgid "Mount of %s failed:"
msgstr "å? è½½ %s 失败ï¼?"
-#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../plugins/publish-calendar/publish-calendar.c:596
#: ../plugins/publish-calendar/publish-calendar.ui.h:4
msgid "E_nable"
msgstr "��(_N)"
-#: ../plugins/publish-calendar/publish-calendar.c:629
+#: ../plugins/publish-calendar/publish-calendar.c:739
msgid "Are you sure you want to remove this location?"
msgstr "æ?¨ç¡®å®?æ?¨æ?³è¦?å? é?¤æ¤ä½?ç½®å??ï¼?"
-#: ../plugins/publish-calendar/publish-calendar.c:939
+#. To Translators: This is shown to a user when creation of a new thread,
+#. where the publishing should be done, fails. Basically, this shouldn't
+#. ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1051
#, fuzzy
msgid "Could not create publish thread."
msgstr "æ? æ³?å??建信件ã??"
-#: ../plugins/publish-calendar/publish-calendar.c:946
+#: ../plugins/publish-calendar/publish-calendar.c:1059
msgid "_Publish Calendar Information"
msgstr "å??å¸?æ?¥å??ä¿¡æ?¯(_P)"
@@ -18567,17 +18850,17 @@ msgstr "æ ¼å¼?(_F)ï¼?"
msgid "Select destination file"
msgstr "é??æ?©ç?®ç??æ??件"
-#: ../plugins/save-calendar/save-calendar.c:323
+#: ../plugins/save-calendar/save-calendar.c:325
#, fuzzy
msgid "Save the selected calendar to disk"
msgstr "æ??é??ä¸ç??æ?¥å??æ??ä»»å?¡å??表ä¿?å?å?°ç£?ç??ã??"
-#: ../plugins/save-calendar/save-calendar.c:358
+#: ../plugins/save-calendar/save-calendar.c:356
#, fuzzy
msgid "Save the selected memo list to disk"
msgstr "æ??é??ä¸ç??æ?¥å??æ??ä»»å?¡å??表ä¿?å?å?°ç£?ç??ã??"
-#: ../plugins/save-calendar/save-calendar.c:393
+#: ../plugins/save-calendar/save-calendar.c:387
#, fuzzy
msgid "Save the selected task list to disk"
msgstr "æ??é??ä¸ç??æ?¥å??æ??ä»»å?¡å??表ä¿?å?å?°ç£?ç??ã??"
@@ -18611,12 +18894,12 @@ msgstr ""
"请å??å?»â??å??è¿?â??æ??é?®ç»§ç»ã??"
#: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../widgets/misc/e-import-assistant.c:386
+#: ../widgets/misc/e-import-assistant.c:385
msgid "Please select the information that you would like to import:"
msgstr "请é??æ?©æ?¨å¸?æ??导å?¥ç??ä¿¡æ?¯ï¼?"
#: ../plugins/startup-wizard/startup-wizard.c:150
-#: ../widgets/misc/e-import-assistant.c:543
+#: ../widgets/misc/e-import-assistant.c:542
#, c-format
msgid "From %s:"
msgstr "ä»? %sï¼?"
@@ -18725,11 +19008,11 @@ msgstr "WebDAV è??系人"
msgid "WebDAV"
msgstr "WebDAV"
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
msgid "URL:"
msgstr "URLï¼?"
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
msgstr "é?¿å?? IfMatch (é??è¦? Apache < 2.2.8)"
@@ -18875,7 +19158,7 @@ msgstr "侧边æ ?å?¯è§?"
msgid "Skip development warning dialog"
msgstr "è·³è¿?å¼?å??è¦å??对è¯?æ¡?"
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:317
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
msgid "Start in offline mode"
msgstr "以��模���"
@@ -19018,126 +19301,154 @@ msgstr "çª?å?£æ??é?®æ ·å¼?"
msgid "Window buttons are visible"
msgstr "çª?å?£æ??é?®å?¯è§?"
+#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+msgid "Searches"
+msgstr "æ??ç´¢"
+
+#: ../shell/e-shell-content.c:619
+msgid "Save Search"
+msgstr "ä¿?å?æ??ç´¢"
+
+#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
#. Translators: The "Show:" label precedes a combo box that
#. * allows the user to filter the current view. Examples of
#. * items that appear in the combo box are "Unread Messages",
#. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-content.c:931
+#: ../shell/e-shell-searchbar.c:687
msgid "Sho_w:"
msgstr "�示(_W)�"
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:956
+#: ../shell/e-shell-searchbar.c:714
msgid "Sear_ch:"
msgstr "æ??ç´¢(_C)ï¼?"
-#. Scope Combo Widgets
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:998
+#: ../shell/e-shell-searchbar.c:769
msgid "i_n"
msgstr "å?¨(_N) "
-#: ../shell/e-shell-content.c:1495
-msgid "Advanced Search"
-msgstr "é«?级æ??ç´¢"
-
-#: ../shell/e-shell-content.c:1557 ../shell/e-shell-content.c:1558
-msgid "Searches"
-msgstr "æ??ç´¢"
-
-#: ../shell/e-shell-content.c:1604
-msgid "Save Search"
-msgstr "ä¿?å?æ??ç´¢"
-
-#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: ../shell/e-shell-switcher.c:446
+#: ../shell/e-shell-switcher.c:448
msgid "Toolbar Style"
msgstr "å·¥å?·æ ?æ ·å¼?"
-#: ../shell/e-shell-switcher.c:447
+#: ../shell/e-shell-switcher.c:449
msgid "The switcher's toolbar style"
msgstr ""
-#: ../shell/e-shell-switcher.c:463
+#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:743
msgid "Toolbar Visible"
msgstr "å·¥å?·æ ?å?¯è§?"
-#: ../shell/e-shell-switcher.c:464
+#: ../shell/e-shell-switcher.c:466
msgid "Whether the switcher is visible"
msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
-#: ../shell/e-shell-view.c:486
+#: ../shell/e-shell-utils.c:220
+#, fuzzy
+#| msgid "vCard (.vcf, .gcrd)"
+msgid "vCard (.vcf)"
+msgstr "vCard (.vfg, .gcrd)"
+
+#: ../shell/e-shell-utils.c:222
+#, fuzzy
+#| msgid "iCalendar files (.ics)"
+msgid "iCalendar (.ics)"
+msgstr "iCalendar æ??件(.ics)"
+
+#: ../shell/e-shell-utils.c:243
+#, fuzzy
+#| msgid "All files"
+msgid "All Files (*)"
+msgstr "å?¨é?¨æ??件"
+
+#: ../shell/e-shell-view.c:604
#, fuzzy
msgid "Switcher Action"
msgstr "å??æ?¢å?° %s"
-#: ../shell/e-shell-view.c:487
+#: ../shell/e-shell-view.c:605
msgid "The switcher action for this shell view"
msgstr ""
-#: ../shell/e-shell-view.c:502
+#: ../shell/e-shell-view.c:620
msgid "Page Number"
msgstr "页ç ?"
-#: ../shell/e-shell-view.c:503
+#: ../shell/e-shell-view.c:621
msgid "The notebook page number of the shell view"
msgstr ""
-#: ../shell/e-shell-view.c:521
-msgid "The title of the shell view"
-msgstr ""
+#: ../shell/e-shell-view.c:637
+#, fuzzy
+#| msgid "Search Filter"
+msgid "Search Rule"
+msgstr "æ??ç´¢è¿?滤å?¨"
+
+#: ../shell/e-shell-view.c:638
+#, fuzzy
+msgid "Criteria for the current search results"
+msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
-#: ../shell/e-shell-view.c:536
+#: ../shell/e-shell-view.c:653
msgid "The EShellBackend for this shell view"
msgstr ""
-#: ../shell/e-shell-view.c:551
+#: ../shell/e-shell-view.c:668
msgid "Shell Content Widget"
msgstr ""
-#: ../shell/e-shell-view.c:552
+#: ../shell/e-shell-view.c:669
msgid "The content widget appears in a shell window's right pane"
msgstr ""
-#: ../shell/e-shell-view.c:568
+#: ../shell/e-shell-view.c:685
#, fuzzy
msgid "Shell Sidebar Widget"
msgstr "é»?认侧边æ ?宽度"
-#: ../shell/e-shell-view.c:569
+#: ../shell/e-shell-view.c:686
msgid "The sidebar widget appears in a shell window's left pane"
msgstr ""
-#: ../shell/e-shell-view.c:584
+#: ../shell/e-shell-view.c:701
#, fuzzy
msgid "Shell Taskbar Widget"
msgstr "é??æ?©ä»»å?¡å??表"
-#: ../shell/e-shell-view.c:585
+#: ../shell/e-shell-view.c:702
msgid "The taskbar widget appears at the bottom of a shell window"
msgstr ""
-#: ../shell/e-shell-view.c:600
+#: ../shell/e-shell-view.c:717
#, fuzzy
msgid "Shell Window"
msgstr "�建��(_W)"
-#: ../shell/e-shell-view.c:601
+#: ../shell/e-shell-view.c:718
msgid "The window to which the shell view belongs"
msgstr ""
-#: ../shell/e-shell-view.c:616
+#: ../shell/e-shell-view.c:734
+msgid "The key file holding widget state data"
+msgstr ""
+
+#: ../shell/e-shell-view.c:749
+msgid "The title of the shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:763
#, fuzzy
msgid "Current View ID"
msgstr "å½?å??è§?å?¾(_C)"
-#: ../shell/e-shell-view.c:617
+#: ../shell/e-shell-view.c:764
#, fuzzy
msgid "The current GAL view ID"
msgstr "å½?å??æ?¶é?´"
@@ -19145,388 +19456,450 @@ msgstr "å½?å??æ?¶é?´"
#. The translator-credits string is for translators to list
#. * per-language credits for translation, displayed in the
#. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:644
msgid "translator-credits"
msgstr ""
"å¼?æº?软件å?½é??å??ä¹?ç®?ä½?ä¸æ??ç»?\n"
"http://i18n.linux.net.cn";
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:655
msgid "Evolution Website"
msgstr "Evolution ç½?ç«?"
-#: ../shell/e-shell-window-actions.c:1295
+#: ../shell/e-shell-window-actions.c:1223
#, fuzzy
msgid "Bug Buddy is not installed."
msgstr "æ?ªå®?è£? Bug buddyã??"
-#: ../shell/e-shell-window-actions.c:1297
+#: ../shell/e-shell-window-actions.c:1225
#, fuzzy
msgid "Bug Buddy could not be run."
msgstr "æ? æ³?è¿?è¡? Bug buddyã??"
-#: ../shell/e-shell-window-actions.c:1399
+#: ../shell/e-shell-window-actions.c:1327
msgid "GNOME Pilot is not installed."
msgstr "GNOME Pilot 没æ??å®?è£?ã??"
-#: ../shell/e-shell-window-actions.c:1401
+#: ../shell/e-shell-window-actions.c:1329
msgid "GNOME Pilot could not be run."
msgstr "GNOME Pilot ä¸?è?½è¿?è¡?ã??"
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1423
msgid "Show information about Evolution"
msgstr "æ?¾ç¤ºå?³äº? Evolution ç??ä¿¡æ?¯"
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1428
msgid "_Close Window"
msgstr "å?³é?çª?å?£(_C)"
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1435
#, fuzzy
msgid "_Contents"
msgstr "è??系人"
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1437
msgid "Open the Evolution User Guide"
msgstr "æ??å¼? Evolution ç?¨æ?·æ??å??"
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1463
msgid "Evolution _FAQ"
msgstr "Evolution _FAQ"
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1465
msgid "Open the Frequently Asked Questions webpage"
msgstr "æ??å¼? FAQ ç½?页"
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1470
msgid "_Forget Passwords"
msgstr "丢å¼?å¯?ç ?(_F)"
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1472
msgid "Forget all remembered passwords"
msgstr "å¿?è®°æ??æ??è®°ä½?ç??å¯?ç ?"
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1477
msgid "I_mport..."
msgstr "导�(_M)..."
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1479
msgid "Import data from other programs"
msgstr "�����导���"
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1484
msgid "New _Window"
msgstr "�建��(_W)"
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1486
msgid "Create a new window displaying this view"
msgstr "å??建ä¸?个æ?°çª?å?£æ?¥æ?¾ç¤ºè¿?个è§?å?¾"
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1500
msgid "Configure Evolution"
msgstr "é??ç½® Evolution"
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1505
msgid "_Quick Reference"
msgstr "å¿«é??é¦?é??项(_Q)"
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1507
#, fuzzy
msgid "Show Evolution's shortcut keys"
msgstr "æ?´æ?¹ Evolution ç??设置"
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1514
msgid "Exit the program"
msgstr "é??å?ºç¨?åº?"
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1519
msgid "_Advanced Search..."
msgstr "é«?级æ??ç´¢(_A)..."
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1521
msgid "Construct a more advanced search"
msgstr ""
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1528
#, fuzzy
msgid "Clear the current search parameters"
msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1533
msgid "_Edit Saved Searches..."
msgstr "ç¼?è¾?ä¿?å?ç??æ??ç´¢(_E)..."
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1535
msgid "Manage your saved searches"
msgstr "管ç??æ?¨ä¿?å?ç??æ??ç´¢"
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1542
msgid "Click here to change the search type"
msgstr "å??å?»æ¤å¤?æ?´æ?¹æ??索类å??"
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1547
msgid "_Find Now"
msgstr "����(_F)"
#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1549
#, fuzzy
msgid "Execute the current search parameters"
msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1554
msgid "_Save Search..."
msgstr "ä¿?å?æ??ç´¢(_S)..."
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1556
#, fuzzy
msgid "Save the current search parameters"
msgstr "ä¿?å?å½?å??æ??件"
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1568
msgid "Send / _Receive"
msgstr "å??é??/æ?¥æ?¶(_R)"
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1570
msgid "Send queued items and retrieve new items"
msgstr "å??é??é??å??ä¸ç??ç??é?®ä»¶å¹¶æ?¶å??æ?°é?®ä»¶"
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1575
#, fuzzy
msgid "Submit _Bug Report..."
msgstr "æ??交é??误æ?¥å??(_B)"
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1577
msgid "Submit a bug report using Bug Buddy"
msgstr "ç?¨ Bug Buddy æ??交é??误æ?¥å??"
-#: ../shell/e-shell-window-actions.c:1619
-msgid "_Synchronization Options..."
+#: ../shell/e-shell-window-actions.c:1582
+#, fuzzy
+#| msgid "_Synchronization Options..."
+msgid "GNOME Pilot _Synchronization..."
msgstr "å??æ¥é??项(_S)..."
-#: ../shell/e-shell-window-actions.c:1621
-msgid "Set up Pilot configuration"
+#: ../shell/e-shell-window-actions.c:1584
+#, fuzzy
+#| msgid "Set up Pilot configuration"
+msgid "Set up GNOME Pilot configuration"
msgstr "é??ç½® Pilot"
-#: ../shell/e-shell-window-actions.c:1626
+#: ../shell/e-shell-window-actions.c:1589
msgid "_Work Offline"
msgstr "��工�(_W)"
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1591
#, fuzzy
msgid "Put Evolution into offline mode"
msgstr "以��模���"
-#: ../shell/e-shell-window-actions.c:1633
+#: ../shell/e-shell-window-actions.c:1596
msgid "_Work Online"
msgstr "è??æ?ºå·¥ä½?(_W)"
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1598
#, fuzzy
msgid "Put Evolution into online mode"
msgstr "以è??æ?ºæ¨¡å¼?å?¯å?¨"
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1626
msgid "Lay_out"
msgstr "��(_O)"
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1633
msgid "_New"
msgstr "�建(_N)"
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1640
msgid "_Search"
msgstr "æ??ç´¢(_S)"
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1647
msgid "_Switcher Appearance"
msgstr "å??æ?¢å?¨å¤?è§?(_S)"
-#: ../shell/e-shell-window-actions.c:1698
+#: ../shell/e-shell-window-actions.c:1661
msgid "_Window"
msgstr "��(_W)"
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1690
msgid "Show Side _Bar"
msgstr "æ?¾ç¤ºä¾§è¾¹æ ?(_B)"
-#: ../shell/e-shell-window-actions.c:1710
+#: ../shell/e-shell-window-actions.c:1692
msgid "Show the side bar"
msgstr "æ?¾ç¤ºä¾§è¾¹æ ?"
-#: ../shell/e-shell-window-actions.c:1716
-msgid "Show _Status Bar"
-msgstr "æ?¾ç¤ºç?¶æ??æ ?(_S)"
-
-#: ../shell/e-shell-window-actions.c:1718
-msgid "Show the status bar"
-msgstr "æ?¾ç¤ºç?¶æ??æ ?"
-
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1698
msgid "Show _Buttons"
msgstr "æ?¾ç¤ºæ??é?®(_B)"
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1700
msgid "Show the switcher buttons"
msgstr "æ?¾ç¤ºå??æ?¢å?¨æ??é?®"
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1706
+msgid "Show _Status Bar"
+msgstr "æ?¾ç¤ºç?¶æ??æ ?(_S)"
+
+#: ../shell/e-shell-window-actions.c:1708
+msgid "Show the status bar"
+msgstr "æ?¾ç¤ºç?¶æ??æ ?"
+
+#: ../shell/e-shell-window-actions.c:1714
msgid "Show _Tool Bar"
msgstr "æ?¾ç¤ºå·¥å?·æ ?(_T)"
-#: ../shell/e-shell-window-actions.c:1734
-msgid "Show the toolbar"
+#: ../shell/e-shell-window-actions.c:1716
+#, fuzzy
+#| msgid "Show the toolbar"
+msgid "Show the tool bar"
msgstr "æ?¾ç¤ºå·¥å?·æ ?"
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1738
msgid "_Icons Only"
msgstr "å?ªæ??å?¾æ ?(_I)"
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1740
msgid "Display window buttons with icons only"
msgstr "æ?¾ç¤ºå?ªæ??å?¾æ ?ç??çª?å?£æ??é?®"
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1745
msgid "_Text Only"
msgstr "å?ªæ??æ??å?(_T)"
-#: ../shell/e-shell-window-actions.c:1765
+#: ../shell/e-shell-window-actions.c:1747
msgid "Display window buttons with text only"
msgstr "æ?¾ç¤ºå?ªæ??æ??å?ç??çª?å?£æ??é?®"
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1752
msgid "Icons _and Text"
msgstr "å?¾æ ?å??æ??å?(_A)"
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1754
msgid "Display window buttons with icons and text"
msgstr "æ?¾ç¤ºå¸¦å?¾æ ?å??æ??å?ç??çª?å?£æ??é?®"
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1759
msgid "Tool_bar Style"
msgstr "å·¥å?·æ ?æ ·å¼?(_B)"
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1761
msgid "Display window buttons using the desktop toolbar setting"
msgstr "使ç?¨æ¡?é?¢å·¥å?·æ ?设置æ?¾ç¤ºçª?å?£æ??é?®"
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1769
msgid "Define Views..."
msgstr "����..."
-#: ../shell/e-shell-window-actions.c:1789
+#: ../shell/e-shell-window-actions.c:1771
msgid "Create or edit views"
msgstr "å??建æ??ç¼?è¾?è§?å?¾"
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1776
msgid "Save Custom View..."
msgstr "ä¿?å?å½?å??è§?å?¾..."
-#: ../shell/e-shell-window-actions.c:1796
+#: ../shell/e-shell-window-actions.c:1778
msgid "Save current custom view"
msgstr "ä¿?å?å½?å??è?ªå®?ä¹?è§?å?¾"
-#: ../shell/e-shell-window-actions.c:1803
+#: ../shell/e-shell-window-actions.c:1785
msgid "C_urrent View"
msgstr "å½?å??è§?å?¾(_U)"
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1795
msgid "Custom View"
msgstr "å½?å??è§?å?¾"
-#: ../shell/e-shell-window-actions.c:1815
+#: ../shell/e-shell-window-actions.c:1797
msgid "Current view is a customized view"
msgstr "å½?å??è§?å?¾ä¸ºè?ªå®?ä¹?è§?å?¾"
-#: ../shell/e-shell-window-actions.c:1825
+#: ../shell/e-shell-window-actions.c:1807
#, fuzzy
msgid "Change the page settings for your current printer"
msgstr "设å®?æ?¨å½?å??æ??å?°æ?ºç??页é?¢è®¾ç½®"
-#: ../shell/e-shell-window-actions.c:2097
+#: ../shell/e-shell-window-actions.c:2127
#, c-format
msgid "Switch to %s"
msgstr "å??æ?¢å?° %s"
-#: ../shell/e-shell-window-actions.c:2300
+#: ../shell/e-shell-window-actions.c:2337
msgid "Execute these search parameters"
msgstr ""
-#: ../shell/e-shell-window-private.c:254
-msgid "New"
-msgstr "�建"
-
#. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:588
+#: ../shell/e-shell-window-private.c:552
#, c-format
msgid "%s - Evolution"
msgstr "%s - Evolution"
-#: ../shell/e-shell-window.c:308
+#: ../shell/e-shell-window.c:366
+msgid "New"
+msgstr "�建"
+
+#: ../shell/e-shell-window.c:619
msgid "Active Shell View"
msgstr ""
-#: ../shell/e-shell-window.c:309
+#: ../shell/e-shell-window.c:620
#, fuzzy
msgid "Name of the active shell view"
msgstr "æ?°è§?å?¾ç??å??称ï¼?"
-#: ../shell/e-shell-window.c:323 ../shell/e-shell.c:743
+#: ../shell/e-shell-window.c:635
+msgid "The shell window's EFocusTracker"
+msgstr ""
+
+#: ../shell/e-shell-window.c:649 ../shell/e-shell.c:772
msgid "Geometry"
msgstr ""
-#: ../shell/e-shell-window.c:324 ../shell/e-shell.c:744
+#: ../shell/e-shell-window.c:650 ../shell/e-shell.c:773
msgid "Initial window geometry string"
msgstr ""
-#: ../shell/e-shell-window.c:339
+#: ../shell/e-shell-window.c:665
msgid "Safe Mode"
msgstr "��模�"
-#: ../shell/e-shell-window.c:340
+#: ../shell/e-shell-window.c:666
#, fuzzy
msgid "Whether the shell window is in safe mode"
msgstr "æ??件æ?¯å?¦å·²å?¯ç?¨"
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:697
+#, fuzzy
+#| msgid "Sidebar is visible"
+msgid "Sidebar Visible"
+msgstr "侧边æ ?å?¯è§?"
+
+#: ../shell/e-shell-window.c:698
+#, fuzzy
+#| msgid "Whether the switcher is visible"
+msgid "Whether the shell window's side bar is visible"
+msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
+
+#: ../shell/e-shell-window.c:712
+#, fuzzy
+#| msgid "Sidebar is visible"
+msgid "Switcher Visible"
+msgstr "侧边æ ?å?¯è§?"
+
+#: ../shell/e-shell-window.c:713
+#, fuzzy
+#| msgid "Whether the window buttons should be visible."
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr "çª?å?£æ??é?®æ?¯å?¦å?¯è§?ã??"
+
+#: ../shell/e-shell-window.c:728
+#, fuzzy
+#| msgid "Toolbar Visible"
+msgid "Taskbar Visible"
+msgstr "å·¥å?·æ ?å?¯è§?"
+
+#: ../shell/e-shell-window.c:729
+#, fuzzy
+#| msgid "Whether the switcher is visible"
+msgid "Whether the shell window's task bar is visible"
+msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
+
+#: ../shell/e-shell-window.c:744
+#, fuzzy
+#| msgid "Whether the switcher is visible"
+msgid "Whether the shell window's tool bar is visible"
+msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
+
+#: ../shell/e-shell-window.c:758
msgid "UI Manager"
msgstr "UI 管ç??å?¨"
-#: ../shell/e-shell-window.c:372
+#: ../shell/e-shell-window.c:759
msgid "The shell window's GtkUIManager"
msgstr ""
-#: ../shell/e-shell.c:211
+#: ../shell/e-shell.c:213
msgid "Preparing to go offline..."
msgstr "æ£å?¨å??å¤?离线..."
-#: ../shell/e-shell.c:265
+#: ../shell/e-shell.c:267
msgid "Preparing to go online..."
msgstr "æ£å?¨å??å¤?ä¸?线..."
-#: ../shell/e-shell.c:337
+#: ../shell/e-shell.c:339
msgid "Preparing to quit..."
msgstr ""
-#: ../shell/e-shell.c:759
+#: ../shell/e-shell.c:788
+#, fuzzy
+#| msgid "Save directory"
+msgid "Module Directory"
+msgstr "ä¿?å?ç?®å½?"
+
+#: ../shell/e-shell.c:789
+msgid "The directory from which to load EModules"
+msgstr ""
+
+#: ../shell/e-shell.c:804
msgid "Network Available"
msgstr "����"
-#: ../shell/e-shell.c:760
+#: ../shell/e-shell.c:805
msgid "Whether the network is available"
msgstr "������"
-#: ../shell/e-shell.c:775 ../widgets/misc/e-online-button.c:130
+#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
msgid "Online"
msgstr "�线"
-#: ../shell/e-shell.c:776
+#: ../shell/e-shell.c:821
#, fuzzy
msgid "Whether the shell is online"
msgstr "æ??件æ?¯å?¦å·²å?¯ç?¨"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:162
+#: ../shell/main.c:167
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -19558,7 +19931,7 @@ msgstr ""
"\n"
"æ??们å¸?æ??æ?¨å°½æ??享å??æ??们å?ªå??å·¥ä½?ç??æ??æ??ï¼?æ??们ä¹?ç?å??ç?¼æ??ç??æ?¨ç??æ??è§?ï¼?\n"
-#: ../shell/main.c:186
+#: ../shell/main.c:191
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -19566,57 +19939,57 @@ msgstr ""
"æ??è°¢\n"
"Evolution å?¢é??\n"
-#: ../shell/main.c:193
+#: ../shell/main.c:198
msgid "Do not tell me again"
msgstr "ä¸?è¦?å??é??ç?¥æ??"
-#: ../shell/main.c:313
+#: ../shell/main.c:318
msgid "Start Evolution activating the specified component"
msgstr "å?¯å?¨ Evolution 并æ¿?æ´»æ??å®?ç»?件"
-#: ../shell/main.c:315
+#: ../shell/main.c:320
msgid "Apply the given geometry to the main window"
msgstr ""
-#: ../shell/main.c:319
+#: ../shell/main.c:324
msgid "Start in online mode"
msgstr "以è??æ?ºæ¨¡å¼?å?¯å?¨"
-#: ../shell/main.c:322
+#: ../shell/main.c:327
#, fuzzy
msgid "Forcibly shut down Evolution"
msgstr "强å?¶å?³é?æ??æ?? Evolution ç»?件"
-#: ../shell/main.c:326
+#: ../shell/main.c:331
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "强å?¶ä»? Evolution 1.4 é??æ?°å??è¿?"
-#: ../shell/main.c:329
+#: ../shell/main.c:334
msgid "Send the debugging output of all components to a file."
msgstr "æ??æ??æ??æ??å??ç??è°?è¯?è¾?å?ºå??é??å?°ä¸?个æ??件ä¸ã??"
-#: ../shell/main.c:331
+#: ../shell/main.c:336
msgid "Disable loading of any plugins."
msgstr "ç¦?æ¢è£?å?¥ä»»ä½?æ??件ã??"
-#: ../shell/main.c:333
+#: ../shell/main.c:338
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "ç¦?ç?¨é?®ä»¶ã??è??系人å??ä»»å?¡ç??é¢?è§?é?¢æ?¿ã??"
-#: ../shell/main.c:337
+#: ../shell/main.c:342
msgid "Import URIs or file names given as rest of arguments."
msgstr ""
-#: ../shell/main.c:339
+#: ../shell/main.c:344
#, fuzzy
msgid "Request a running Evolution process to quit"
msgstr "é??æ?°å?¯å?¨ Evolution"
-#: ../shell/main.c:496
+#: ../shell/main.c:498
msgid "- The Evolution PIM and Email Client"
msgstr "- Evolution 个人信æ?¯ç®¡ç??å??é?®ä»¶å®¢æ?·"
-#: ../shell/main.c:521
+#: ../shell/main.c:524
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -19778,33 +20151,33 @@ msgstr ""
msgid "Not a launchable item"
msgstr "ä¸?æ?¯ä¸?个å?¯å? è½½ç??æ?¡ç?®"
-#: ../smclient/eggsmclient.c:225
+#: ../smclient/eggsmclient.c:227
#, fuzzy
msgid "Disable connection to session manager"
msgstr "����� Internet(_D)"
-#: ../smclient/eggsmclient.c:228
+#: ../smclient/eggsmclient.c:230
#, fuzzy
msgid "Specify file containing saved configuration"
msgstr "é??ç½® Pilot"
-#: ../smclient/eggsmclient.c:228
+#: ../smclient/eggsmclient.c:230
msgid "FILE"
msgstr "æ??件"
-#: ../smclient/eggsmclient.c:231
+#: ../smclient/eggsmclient.c:233
msgid "Specify session management ID"
msgstr ""
-#: ../smclient/eggsmclient.c:231
+#: ../smclient/eggsmclient.c:233
msgid "ID"
msgstr "ID"
-#: ../smclient/eggsmclient.c:252
+#: ../smclient/eggsmclient.c:254
msgid "Session management options:"
msgstr ""
-#: ../smclient/eggsmclient.c:253
+#: ../smclient/eggsmclient.c:255
#, fuzzy
msgid "Show session management options"
msgstr "æ?¾ç¤ºå?¾å??å?¨ç?»(_S)"
@@ -19861,8 +20234,8 @@ msgstr "è¯?书å??称"
msgid "Purposes"
msgstr "ç?¨é??"
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:35
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:566
msgid "Serial Number"
msgstr "åº?å??å?·"
@@ -19882,7 +20255,7 @@ msgstr "ç?µå?é?®ä»¶å?°å??"
msgid "All CA certificate files"
msgstr "å?¨é?¨é¢?è¯?æ?ºæ??æ??件"
-#: ../smime/gui/certificate-manager.c:1046
+#: ../smime/gui/certificate-manager.c:1050
msgid "Certificates"
msgstr "�书"
@@ -19950,7 +20323,7 @@ msgid ""
"and its policy and procedures (if available)."
msgstr "å?¨ä¿¡ä»»æ¤ CA ç??ä»»ä½?ç?¨é??ä¹?å??ï¼?æ?¨åº?该å??æ£?æ?¥è¯¥è¯?书å??å?¶ç?ç?¥å??è¿?ç¨?(è?¥å?¯ç?¨)ã??"
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
msgid "Certificate"
msgstr "�书"
@@ -19989,304 +20362,300 @@ msgid "Do not trust the authenticity of this certificate"
msgstr "ä¸?ä¿¡ä»»æ¤è¯?书ç??é¢?å??æ?ºæ??"
#: ../smime/gui/smime-ui.ui.h:16
-msgid "Dummy window only"
-msgstr "å?ªå¯¹å??çª?å?£"
-
-#: ../smime/gui/smime-ui.ui.h:17
msgid "Edit"
msgstr "ç¼?è¾?"
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:17
msgid "Email Certificate Trust Settings"
msgstr "ç?µå?é?®ä»¶è¯?书信任设置"
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:18
msgid "Email Recipient Certificate"
msgstr "ç?µå?é?®ä»¶æ?¶ä»¶äººè¯?书"
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:19
msgid "Email Signer Certificate"
msgstr "ç?µå?é?®ä»¶ç¾å??è??è¯?书"
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:20
msgid "Expires On"
msgstr "å?°æ??"
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:21
#, fuzzy
msgid "Field Value"
msgstr "å??å??"
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:22
msgid "Fingerprints"
msgstr "æ??纹"
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:24
msgid "Import"
msgstr "导�"
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:25
msgid "Issued By"
msgstr "é¢?å??è??"
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:26
msgid "Issued On"
msgstr "å??è¡?æ?¥æ??"
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:27
msgid "Issued To"
msgstr "é¢?å??ç»?"
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:28
msgid "MD5 Fingerprint"
msgstr "MD5 æ??纹"
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:29
msgid "Organization (O)"
msgstr "ç»?ç»?(O)"
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:30
msgid "Organizational Unit (OU)"
msgstr "ç»?ç»?å??å??(OU)"
-#: ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/smime-ui.ui.h:31
msgid "SHA1 Fingerprint"
msgstr "SHA1 æ??纹"
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
msgid "SSL Client Certificate"
msgstr "SSL 客��书"
-#: ../smime/gui/smime-ui.ui.h:34 ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
msgid "SSL Server Certificate"
msgstr "SSL æ??å?¡å?¨è¯?书"
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:35
msgid "This certificate has been verified for the following uses:"
msgstr "æ¤è¯?书已ç»?被ä¸?å??ç?¨æ?·æ??éª?è¯?ï¼?"
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:36
msgid "Trust the authenticity of this certificate"
msgstr "ä¿¡ä»»æ¤è¯?书ç??é¢?å??æ?ºæ??"
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:37
msgid "Trust this CA to identify email users."
msgstr "ä¿¡ä»»æ¤é¢?å??æ?ºæ??æ ?è¯?ç??ç?µå?é?®ä»¶ç?¨æ?·ã??"
-#: ../smime/gui/smime-ui.ui.h:39
+#: ../smime/gui/smime-ui.ui.h:38
msgid "Trust this CA to identify software developers."
msgstr "ä¿¡ä»»æ¤é¢?å??æ?ºæ??æ ?è¯?ç??软件å¼?å??è??ã??"
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:39
msgid "Trust this CA to identify web sites."
msgstr "ä¿¡ä»»æ¤é¢?å??æ?ºæ??æ ?è¯?ç??ç½?ç«?ã??"
-#: ../smime/gui/smime-ui.ui.h:41
+#: ../smime/gui/smime-ui.ui.h:40
msgid "Validity"
msgstr "æ??æ??æ?§"
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:41
msgid "View"
msgstr "æ?¥ç??"
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:42
msgid "You have certificates from these organizations that identify you:"
msgstr "æ?¨æ?¥æ??è¿?äº?ç»?ç»?è¯?æ??æ?¨èº«ä»½ç??è¯?书ï¼?"
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:43
msgid ""
"You have certificates on file that identify these certificate authorities:"
msgstr "æ?¨æ?¥æ??è¯?æ??è¿?äº?é¢?å??æ?ºæ??ç??æ??件å??è¯?书ï¼?"
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:44
msgid "You have certificates on file that identify these people:"
msgstr "æ?¨æ?¥æ??è¯?æ??è¿?äº?人ç??æ??件å??è¯?书ï¼?"
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:45
msgid "Your Certificates"
msgstr "æ?¨ç??è¯?书"
-#: ../smime/gui/smime-ui.ui.h:47
+#: ../smime/gui/smime-ui.ui.h:46
msgid "_Edit CA Trust"
msgstr "ç¼?è¾? CA ä¿¡ä»»(_E)"
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:711
msgid "Certificate already exists"
msgstr "è¯?书已ç»?å?å?¨"
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
msgid "%d/%m/%Y"
msgstr "%Y-%m-%d"
#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:407
+#: ../smime/lib/e-cert.c:414
msgid "Sign"
msgstr "ç¾å??"
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:415
msgid "Encrypt"
msgstr "å? å¯?"
-#: ../smime/lib/e-cert.c:513
+#: ../smime/lib/e-cert.c:527
msgid "Version"
msgstr "ç??æ?¬"
-#: ../smime/lib/e-cert.c:528
+#: ../smime/lib/e-cert.c:542
msgid "Version 1"
msgstr "ç??æ?¬ 1"
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:545
msgid "Version 2"
msgstr "ç??æ?¬ 2"
-#: ../smime/lib/e-cert.c:534
+#: ../smime/lib/e-cert.c:548
msgid "Version 3"
msgstr "ç??æ?¬ 3"
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-cert.c:630
msgid "PKCS #1 MD2 With RSA Encryption"
msgstr "带 RSA å? å¯?ç?? PKCS #1 MD2"
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-cert.c:633
msgid "PKCS #1 MD5 With RSA Encryption"
msgstr "带 RSA å? å¯?ç?? PKCS #1 MD5"
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-cert.c:636
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr "带 RSA å? å¯?ç?? PKCS #1 SHA-1"
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:663
msgid "PKCS #1 RSA Encryption"
msgstr "PKCS #1 RSA å? å¯?"
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-cert.c:666
msgid "Certificate Key Usage"
msgstr "è¯?书å¯?é?¥ç?¨é??"
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-cert.c:669
msgid "Netscape Certificate Type"
msgstr "Netscape è¯?书类å??"
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-cert.c:672
msgid "Certificate Authority Key Identifier"
msgstr "è¯?书é¢?å??å¯?é?¥èº«ä»½"
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:684
#, c-format
msgid "Object Identifier (%s)"
msgstr "对象æ ?è¯?符(%s)"
-#: ../smime/lib/e-cert.c:720
+#: ../smime/lib/e-cert.c:735
msgid "Algorithm Identifier"
msgstr "ç®?æ³?æ ?è¯?符"
-#: ../smime/lib/e-cert.c:728
+#: ../smime/lib/e-cert.c:743
msgid "Algorithm Parameters"
msgstr "ç®?æ³?å??æ?°"
-#: ../smime/lib/e-cert.c:750
+#: ../smime/lib/e-cert.c:765
msgid "Subject Public Key Info"
msgstr "主���信�"
-#: ../smime/lib/e-cert.c:755
+#: ../smime/lib/e-cert.c:770
msgid "Subject Public Key Algorithm"
msgstr "主�����"
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:785
msgid "Subject's Public Key"
msgstr "主���"
-#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
msgid "Error: Unable to process extension"
msgstr "é??误ï¼?æ? æ³?å¤?ç??æ?©å±?"
-#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
msgid "Object Signer"
msgstr "对象ç¾å??è??"
-#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:831
msgid "SSL Certificate Authority"
msgstr "SSL è¯?书é¢?å??æ?ºæ??"
-#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:835
msgid "Email Certificate Authority"
msgstr "ç?µå?é?®ä»¶è¯?书é¢?å??æ?ºæ??"
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:863
msgid "Signing"
msgstr "ç¾å??"
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:867
msgid "Non-repudiation"
msgstr "����"
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:871
msgid "Key Encipherment"
msgstr "å¯?é?¥ç¼?ç ?å?¨"
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:875
msgid "Data Encipherment"
msgstr "æ?°æ?®ç¼?ç ?å?¨"
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:879
msgid "Key Agreement"
msgstr "å¯?é?¥å??è®®"
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:883
msgid "Certificate Signer"
msgstr "è¯?书ç¾å??è??"
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:887
msgid "CRL Signer"
msgstr "CRL ç¾å??è??"
-#: ../smime/lib/e-cert.c:920
+#: ../smime/lib/e-cert.c:935
msgid "Critical"
msgstr "��"
-#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
msgid "Not Critical"
msgstr "é??å?³é?®"
-#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:961
msgid "Extensions"
msgstr "æ?©å±?"
-#: ../smime/lib/e-cert.c:1017
+#: ../smime/lib/e-cert.c:1030
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
msgid "Certificate Signature Algorithm"
msgstr "è¯?书ç¾å??ç®?æ³?"
-#: ../smime/lib/e-cert.c:1081
+#: ../smime/lib/e-cert.c:1094
msgid "Issuer"
msgstr "å??è¡?è??"
-#: ../smime/lib/e-cert.c:1135
+#: ../smime/lib/e-cert.c:1149
msgid "Issuer Unique ID"
msgstr "å??è¡?è??å?¯ä¸? ID"
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1168
msgid "Subject Unique ID"
msgstr "主��� ID"
-#: ../smime/lib/e-cert.c:1197
+#: ../smime/lib/e-cert.c:1214
msgid "Certificate Signature Value"
msgstr "è¯?书ç¾å??å?¼"
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
msgid "PKCS12 File Password"
msgstr "PKCS12 æ??件å¯?ç ?"
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
msgid "Enter password for PKCS12 file:"
msgstr "è¾?å?¥ PKCS12 æ??件ç??å¯?ç ?ï¼?"
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
msgid "Imported Certificate"
msgstr "导å?¥ç??è¯?书"
@@ -20364,10 +20733,10 @@ msgstr "ç?¶æ??(_S)"
#. Put the "UTC" entry at the top of the combo's list.
#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:418
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:422
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:761
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
msgid "UTC"
msgstr "UTC"
@@ -20401,14 +20770,14 @@ msgstr "é??æ?©(_S)"
msgid "Collection"
msgstr "æ?¶è??"
-#: ../widgets/menus/gal-define-views-dialog.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:327
#: ../widgets/menus/gal-define-views.ui.h:4
#, no-c-format
msgid "Define Views for %s"
msgstr "å®?ä¹? %s ç??è§?å?¾"
-#: ../widgets/menus/gal-define-views-dialog.c:358
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:337
msgid "Define Views"
msgstr "����"
@@ -20418,8 +20787,6 @@ msgid "Define Views for \"%s\""
msgstr "å®?ä¹?â??%sâ??ç??è§?å?¾"
#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
msgid "Table"
msgstr "è¡¨æ ¼"
@@ -20439,11 +20806,11 @@ msgstr "å??建æ?°è§?å?¾(_C)"
msgid "_Replace existing view"
msgstr "æ?¿æ?¢ç?°æ??è§?å?¾(_R)"
-#: ../widgets/menus/gal-view-new-dialog.c:68
+#: ../widgets/menus/gal-view-new-dialog.c:67
msgid "Factory"
msgstr "å·¥å??"
-#: ../widgets/menus/gal-view-new-dialog.c:99
+#: ../widgets/menus/gal-view-new-dialog.c:98
msgid "Define New View"
msgstr "�����"
@@ -20492,7 +20859,7 @@ msgid "MIME Type:"
msgstr "MIME ç±»å??ï¼?"
#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:553
+#: ../widgets/misc/e-attachment-store.c:550
msgid "_Suggest automatic display of attachment"
msgstr "建议è?ªå?¨æ?¾ç¤ºé??件(_S)"
@@ -20529,30 +20896,33 @@ msgid "Saving"
msgstr "ä¿?å?"
#: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
-msgstr "é??è??é??件æ ?(_A)"
+msgid "Hide Attachment _Bar"
+msgstr "é??è??é??件æ ?(_B)"
#: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show Attachment _Bar"
+msgstr "æ?¾ç¤ºé??件æ ?(_B)"
+
+#: ../widgets/misc/e-attachment-paned.c:631
msgid "Show _Attachment Bar"
msgstr "æ?¾ç¤ºé??件æ ?(_A)"
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:538
msgid "Add Attachment"
msgstr "æ·»å? é??件"
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:541
msgid "A_ttach"
msgstr "é??件(_T)"
-#: ../widgets/misc/e-attachment-store.c:607
+#: ../widgets/misc/e-attachment-store.c:604
msgid "Save Attachment"
msgid_plural "Save Attachments"
msgstr[0] "ä¿?å?é??件"
#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:636
-#: ../widgets/misc/e-attachment.c:1768 ../widgets/misc/e-attachment.c:2294
+#: ../widgets/misc/e-attachment-store.c:633
+#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2317
msgid "attachment.dat"
msgstr "attachment.dat"
@@ -20582,49 +20952,53 @@ msgstr "使ç?¨â??%sâ??æ??å¼?"
msgid "Open this attachment in %s"
msgstr "å?¨ %s ä¸æ??å¼?é??件"
-#: ../widgets/misc/e-attachment.c:990
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:1002
msgid "Attached message"
msgstr "é??å? ç??ä¿¡æ?¯"
-#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2596
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2619
msgid "A load operation is already in progress"
msgstr "ä¸?个已ç»?å? è½½ç??æ??ä½?æ£å?¨è¿?è¡?"
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2604
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2627
msgid "A save operation is already in progress"
msgstr "个已ç»?ä¿?å?ç??æ??ä½?æ£å?¨è¿?è¡?"
-#: ../widgets/misc/e-attachment.c:1914
+#: ../widgets/misc/e-attachment.c:1920
#, c-format
msgid "Could not load '%s'"
msgstr "ä¸?è?½å? è½½â??%sâ??"
-#: ../widgets/misc/e-attachment.c:1917
+#: ../widgets/misc/e-attachment.c:1923
#, c-format
msgid "Could not load the attachment"
msgstr "ä¸?è?½å? è½½é??件"
-#: ../widgets/misc/e-attachment.c:2174
+#: ../widgets/misc/e-attachment.c:2197
#, c-format
msgid "Could not open '%s'"
msgstr "ä¸?è?½æ??å¼?â??%sâ??"
-#: ../widgets/misc/e-attachment.c:2177
+#: ../widgets/misc/e-attachment.c:2200
#, c-format
msgid "Could not open the attachment"
msgstr "ä¸?è?½æ??å¼?é??件"
-#: ../widgets/misc/e-attachment.c:2612
+#: ../widgets/misc/e-attachment.c:2635
#, fuzzy
msgid "Attachment contents not loaded"
msgstr "é??件æ??é??"
-#: ../widgets/misc/e-attachment.c:2688
+#: ../widgets/misc/e-attachment.c:2711
#, c-format
msgid "Could not save '%s'"
msgstr "ä¸?è?½ä¿?å?â??%sâ??"
-#: ../widgets/misc/e-attachment.c:2691
+#: ../widgets/misc/e-attachment.c:2714
#, fuzzy, c-format
msgid "Could not save the attachment"
msgstr "é??æ?©ä¿?å?å?¨é?¨é??件ç??æ??件夹..."
@@ -20635,7 +21009,7 @@ msgid "Ctrl-click to open a link"
msgstr "Ctrl å? å??å?»æ?¥æ??å¼?ä¸?个é?¾æ?¥"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1253
+#: ../widgets/misc/e-calendar-item.c:1249
msgid "%B %Y"
msgstr "%Yå¹´%B"
@@ -20643,58 +21017,58 @@ msgstr "%Yå¹´%B"
msgid "Month Calendar"
msgstr "æ??å??"
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3387
+#: ../widgets/text/e-text.c:3388
msgid "Fill color"
msgstr "å¡«å??é¢?è?²"
-#: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:462
-#: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
-#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
-#: ../widgets/text/e-text.c:3647
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482 ../widgets/text/e-text.c:3394
+#: ../widgets/text/e-text.c:3395 ../widgets/text/e-text.c:3401
+#: ../widgets/text/e-text.c:3402
msgid "GDK fill color"
msgstr "GDK å¡«å??é¢?è?²"
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
-#: ../widgets/text/e-text.c:3654
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489 ../widgets/text/e-text.c:3408
+#: ../widgets/text/e-text.c:3409
msgid "Fill stipple"
msgstr "ç?¹ç»?å¡«å??"
-#: ../widgets/misc/e-canvas-background.c:482
-#: ../widgets/misc/e-canvas-background.c:483
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
msgid "X1"
msgstr "X1"
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
msgid "X2"
msgstr "X2"
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
+#: ../widgets/misc/e-canvas-background.c:509
+#: ../widgets/misc/e-canvas-background.c:510
msgid "Y1"
msgstr "Y1"
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
+#: ../widgets/misc/e-canvas-background.c:516
+#: ../widgets/misc/e-canvas-background.c:517
msgid "Y2"
msgstr "Y2"
#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-container.c:1009
#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3062
+#: ../widgets/table/e-table-item.c:2872
msgid "Minimum width"
msgstr "æ??å°?宽度"
#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1010
#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:2873
msgid "Minimum Width"
msgstr "æ??å°?宽度"
@@ -20718,80 +21092,89 @@ msgstr "��..."
msgid "Date and Time"
msgstr "æ?¥æ??å??æ?¶é?´"
-#: ../widgets/misc/e-dateedit.c:543
+#: ../widgets/misc/e-dateedit.c:544
msgid "Text entry to input date"
msgstr "è¾?å?¥æ?¥æ??ç??æ??æ?¬æ¡?"
-#: ../widgets/misc/e-dateedit.c:565
+#: ../widgets/misc/e-dateedit.c:566
msgid "Click this button to show a calendar"
msgstr "å??å?»æ¤æ??é?®å?¯æ?¾ç¤ºæ?¥å??"
-#: ../widgets/misc/e-dateedit.c:607
+#: ../widgets/misc/e-dateedit.c:612
msgid "Drop-down combination box to select time"
msgstr "é??æ?©æ?¶é?´ç??ç»?å??æ¡?"
-#: ../widgets/misc/e-dateedit.c:683
+#: ../widgets/misc/e-dateedit.c:684
msgid "No_w"
msgstr "ç?°å?¨(_W)"
-#: ../widgets/misc/e-dateedit.c:689
+#: ../widgets/misc/e-dateedit.c:690
msgid "_Today"
msgstr "�天(_T)"
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
-#: ../widgets/misc/e-dateedit.c:697
+#: ../widgets/misc/e-dateedit.c:698
msgid "_None"
msgstr "æ? (_N)"
-#: ../widgets/misc/e-dateedit.c:1797
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1935
+#, fuzzy
+#| msgid "None"
+msgctxt "date"
+msgid "None"
+msgstr "æ? "
+
+#: ../widgets/misc/e-dateedit.c:1830
msgid "Invalid Date Value"
msgstr "æ? æ??ç??æ?¥æ??å?¼"
-#: ../widgets/misc/e-dateedit.c:1833
+#: ../widgets/misc/e-dateedit.c:1874
msgid "Invalid Time Value"
msgstr "æ? æ??ç??æ?¶é?´å?¼"
-#: ../widgets/misc/e-import-assistant.c:239
+#: ../widgets/misc/e-import-assistant.c:238
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list."
msgstr "é??æ?©æ?¨å¸?æ??导å?¥å?° Evolution ç??æ??件ï¼?并ä»?å??表ä¸é??æ?©æ??件ç??ç±»å??ã??"
-#: ../widgets/misc/e-import-assistant.c:256
+#: ../widgets/misc/e-import-assistant.c:255
msgid "F_ilename:"
msgstr "æ??件å??(_I)ï¼?"
-#: ../widgets/misc/e-import-assistant.c:266
+#: ../widgets/misc/e-import-assistant.c:265
msgid "Select a file"
msgstr "é??æ?©ä¸?个æ??件"
-#: ../widgets/misc/e-import-assistant.c:280
-#: ../widgets/misc/e-import-assistant.c:456
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
msgid "File _type:"
msgstr "æ??件类å??(_T)ï¼?"
-#: ../widgets/misc/e-import-assistant.c:323
+#: ../widgets/misc/e-import-assistant.c:322
msgid "Choose the destination for this import"
msgstr "é??æ?©æ¤å¯¼å?¥ç??ç?®ç??ä½?ç½®"
-#: ../widgets/misc/e-import-assistant.c:348
+#: ../widgets/misc/e-import-assistant.c:347
msgid "Choose the type of importer to run:"
msgstr "é??æ?©è¦?è¿?è¡?ç??导å?¥å?¨ç±»å??ï¼?"
-#: ../widgets/misc/e-import-assistant.c:356
+#: ../widgets/misc/e-import-assistant.c:355
msgid "Import data and settings from _older programs"
msgstr "ä»?æ?§ç??ç¨?åº?ä¸å¯¼å?¥æ?°æ?®å??设置(_O)"
-#: ../widgets/misc/e-import-assistant.c:364
+#: ../widgets/misc/e-import-assistant.c:363
msgid "Import a _single file"
msgstr "导å?¥å??个æ??件(_S)"
-#: ../widgets/misc/e-import-assistant.c:440
+#: ../widgets/misc/e-import-assistant.c:439
msgid "Select what type of file you want to import from the list."
msgstr ""
-#: ../widgets/misc/e-import-assistant.c:517
+#: ../widgets/misc/e-import-assistant.c:516
#, fuzzy
msgid ""
"Evolution checked for settings to import from the following applications: "
@@ -20802,17 +21185,17 @@ msgstr ""
"iCalendarã??并æ?ªå??ç?°å?¯å¯¼å?¥ç??设置ã??å¦?æ??æ?¨æ?³è¦?å??è¯?ä¸?次ï¼?请å??å?»\n"
"â??ä¸?ä¸?æ¥â??æ??é?®ã??\n"
-#: ../widgets/misc/e-import-assistant.c:1181
-#: ../widgets/misc/e-import-assistant.c:1208
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
msgid "Evolution Import Assistant"
msgstr "Evolution 导å?¥å?©æ??"
-#: ../widgets/misc/e-import-assistant.c:1190
-#: ../widgets/misc/e-import-assistant.c:1242
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
msgid "Import Location"
msgstr "导��置"
-#: ../widgets/misc/e-import-assistant.c:1201
+#: ../widgets/misc/e-import-assistant.c:1207
#, fuzzy
msgid ""
"Welcome to the Evolution Import Assistant.\n"
@@ -20822,33 +21205,33 @@ msgstr ""
"欢è¿?使ç?¨ Evolution 导å?¥å?©æ??ã??\n"
"æ?¬å?©æ??å°?å?¨ç¨?æ??导æ?¨å°?å¤?é?¨æ??件导å?¥ Evolutionã??"
-#: ../widgets/misc/e-import-assistant.c:1217
+#: ../widgets/misc/e-import-assistant.c:1223
msgid "Importer Type"
msgstr "导å?¥å?¨ç±»å??"
-#: ../widgets/misc/e-import-assistant.c:1226
+#: ../widgets/misc/e-import-assistant.c:1232
msgid "Select Information to Import"
msgstr "é??æ?©è¦?导å?¥ç??ä¿¡æ?¯"
-#: ../widgets/misc/e-import-assistant.c:1234
+#: ../widgets/misc/e-import-assistant.c:1240
msgid "Select a File"
msgstr "é??æ?©ä¸?个æ??件"
-#: ../widgets/misc/e-import-assistant.c:1249
+#: ../widgets/misc/e-import-assistant.c:1255
#, fuzzy
msgid "Click \"Apply\" to begin importing the file into Evolution."
msgstr "å??å?»â??导å?¥â??以便å¼?å§?å°?æ??件导å?¥å?° Evolutionã??"
-#: ../widgets/misc/e-import-assistant.c:1255
-#: ../widgets/misc/e-import-assistant.c:1265
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
msgid "Import Data"
msgstr "导���"
-#: ../widgets/misc/e-map.c:605
+#: ../widgets/misc/e-map.c:621
msgid "World Map"
msgstr "ä¸?ç??å?°å?¾"
-#: ../widgets/misc/e-map.c:607
+#: ../widgets/misc/e-map.c:623
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should instead select the timezone from the drop-down combination box below."
@@ -20872,33 +21255,53 @@ msgstr "å? 为ç½?ç»?ä¸?å?¯ç?¨ï¼?æ??以 Evolution ç?®å??è?±æ?ºã??"
msgid "The button state is online"
msgstr "æ??é?®ç?¶æ??为å?¨çº¿"
-#: ../widgets/misc/e-paned.c:244
+#: ../widgets/misc/e-paned.c:306
#, fuzzy
msgid "Horizontal Position"
msgstr "水平���置"
-#: ../widgets/misc/e-paned.c:245
+#: ../widgets/misc/e-paned.c:307
msgid "Pane position when oriented horizontally"
msgstr ""
-#: ../widgets/misc/e-paned.c:256
+#: ../widgets/misc/e-paned.c:318
#, fuzzy
msgid "Vertical Position"
msgstr "å??ç?´é?¢æ?¿ç??ä½?ç½®"
-#: ../widgets/misc/e-paned.c:257
+#: ../widgets/misc/e-paned.c:319
msgid "Pane position when oriented vertically"
msgstr ""
-#: ../widgets/misc/e-pilot-settings.c:99
+#: ../widgets/misc/e-paned.c:330
+#, fuzzy
+#| msgid "Position"
+msgid "Proportion"
+msgstr "ä½?ç½®"
+
+#: ../widgets/misc/e-paned.c:331
+msgid "Proportion of the 2nd pane size"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:342
+#, fuzzy
+#| msgid "_Resize"
+msgid "Fixed Resize"
+msgstr "缩�(_R)"
+
+#: ../widgets/misc/e-paned.c:343
+msgid "Keep the 2nd pane fixed during resize"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:95
msgid "Sync with:"
msgstr "å??æ¥å¯¹è±¡ï¼?"
-#: ../widgets/misc/e-pilot-settings.c:107
+#: ../widgets/misc/e-pilot-settings.c:103
msgid "Sync Private Records:"
msgstr "å??æ¥ç§?æ??è®°å½?ï¼?"
-#: ../widgets/misc/e-pilot-settings.c:116
+#: ../widgets/misc/e-pilot-settings.c:112
msgid "Sync Categories:"
msgstr "å??æ¥ç±»å?«ï¼?"
@@ -20906,6 +21309,51 @@ msgstr "å??æ¥ç±»å?«ï¼?"
msgid "Evolution Preferences"
msgstr "Evolution é¦?é??项"
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "å?¹é??ï¼?%d"
+
+#: ../widgets/misc/e-search-bar.c:554
+msgid "Close the find bar"
+msgstr "å?³é?æ?¥æ?¾æ ?"
+
+#: ../widgets/misc/e-search-bar.c:562
+msgid "Fin_d:"
+msgstr "��(_D)�"
+
+#: ../widgets/misc/e-search-bar.c:574
+msgid "Clear the search"
+msgstr "æ¸?é?¤æ??ç´¢"
+
+#: ../widgets/misc/e-search-bar.c:597
+msgid "_Previous"
+msgstr "��项(_P)"
+
+#: ../widgets/misc/e-search-bar.c:603
+msgid "Find the previous occurrence of the phrase"
+msgstr "寻æ?¾è¯¥è¯?å?¥å?ºç?°ç??å??ä¸?个ä½?ç½®"
+
+#: ../widgets/misc/e-search-bar.c:613
+msgid "_Next"
+msgstr "��项(_N)"
+
+#: ../widgets/misc/e-search-bar.c:619
+msgid "Find the next occurrence of the phrase"
+msgstr "寻æ?¾è¯¥è¯?å?¥å?ºç?°ç??ä¸?ä¸?个ä½?ç½®"
+
+#: ../widgets/misc/e-search-bar.c:629
+msgid "Mat_ch case"
+msgstr "大å°?å??å?¹é??(_C)"
+
+#: ../widgets/misc/e-search-bar.c:657
+msgid "Reached bottom of page, continued from top"
+msgstr "å?°è¾¾é¡µé?¢åº?é?¨ï¼?移å?°é¡¶é?¨ç»§ç»"
+
+#: ../widgets/misc/e-search-bar.c:679
+msgid "Reached top of page, continued from bottom"
+msgstr "å?°è¾¾é¡µé?¢é¡¶é?¨ï¼?移å?°åº?é?¨ç»§ç»"
+
#: ../widgets/misc/e-selection-model-array.c:593
#: ../widgets/table/e-tree-selection-model.c:803
msgid "Cursor Row"
@@ -20916,15 +21364,15 @@ msgstr "å??æ ?è¡?"
msgid "Cursor Column"
msgstr "å??æ ?å??"
-#: ../widgets/misc/e-selection-model.c:208
+#: ../widgets/misc/e-selection-model.c:216
msgid "Sorter"
msgstr "æ??åº?"
-#: ../widgets/misc/e-selection-model.c:215
+#: ../widgets/misc/e-selection-model.c:223
msgid "Selection Mode"
msgstr "é??æ?©æ¨¡å¼?"
-#: ../widgets/misc/e-selection-model.c:223
+#: ../widgets/misc/e-selection-model.c:231
msgid "Cursor Mode"
msgstr "å??æ ?模å¼?"
@@ -20964,106 +21412,106 @@ msgstr ""
"æ? \n"
"é??读æ?¶æ?¡"
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../widgets/misc/e-send-options.ui.h:14
#, fuzzy
msgid "Proprietary"
msgstr "ä¼?å??级"
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:15
msgid "R_eply requested"
msgstr "请æ±?å??å¤?(_E)"
-#: ../widgets/misc/e-send-options.ui.h:16
+#: ../widgets/misc/e-send-options.ui.h:17
#, fuzzy
msgid "Return Notification"
msgstr "<b>è¿?å??é??ç?¥</b>"
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../widgets/misc/e-send-options.ui.h:20
msgid "Sta_tus Tracking"
msgstr "ç?¶æ??è·?踪(_T)"
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:21
msgid "Standard"
msgstr "æ ?å??"
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:22
#, fuzzy
msgid "Status Tracking"
msgstr "ç?¶æ??è·?踪(_T)"
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:23
msgid "Top Secret"
msgstr "��"
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../widgets/misc/e-send-options.ui.h:25
msgid "When acce_pted:"
msgstr "æ?¥å??æ?¶(_P)ï¼?"
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:26
msgid "When co_mpleted:"
msgstr "å®?æ??æ?¶(_M)ï¼?"
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:27
msgid "When decli_ned:"
msgstr "æ??ç»?æ?¶(_N)ï¼?"
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:28
msgid "Wi_thin"
msgstr "��(_T)"
-#: ../widgets/misc/e-send-options.ui.h:28
+#: ../widgets/misc/e-send-options.ui.h:29
msgid "_After:"
msgstr "ä¹?å??(_A)ï¼?"
-#: ../widgets/misc/e-send-options.ui.h:29
+#: ../widgets/misc/e-send-options.ui.h:30
msgid "_All information"
msgstr "��信�(_A)"
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:31
#, fuzzy
msgid "_Classification:"
msgstr "å??ç±»(_C)"
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:32
msgid "_Delay message delivery"
msgstr "æ?¨è¿?信件æ??é??(_D)"
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:33
msgid "_Delivered"
msgstr "å·²æ??é??(_D)"
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:35
msgid "_Set expiration date"
msgstr "设置è¿?æ??æ?¶é?´(_S)"
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:36
msgid "_Until:"
msgstr "ç?´å?°(_U)ï¼?"
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:37
msgid "_When convenient"
msgstr "�便�(_W)"
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:38
msgid "_When opened:"
msgstr "æ??å¼?æ?¶(_W)ï¼?"
-#: ../widgets/misc/e-signature-editor.c:130
-#: ../widgets/misc/e-signature-editor.c:489
+#: ../widgets/misc/e-signature-editor.c:133
+#: ../widgets/misc/e-signature-editor.c:549
#: ../widgets/misc/e-signature-manager.c:349
#: ../widgets/misc/e-signature-script-dialog.c:218
msgid "Unnamed"
msgstr "æ?ªå?½å??"
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../widgets/misc/e-signature-editor.c:210
msgid "_Save and Close"
msgstr "ä¿?å?并å?³é?(_S)"
-#: ../widgets/misc/e-signature-editor.c:361
+#: ../widgets/misc/e-signature-editor.c:389
msgid "Edit Signature"
msgstr "ç¼?è¾?ç¾å??"
-#: ../widgets/misc/e-signature-editor.c:376
+#: ../widgets/misc/e-signature-editor.c:404
msgid "_Signature Name:"
msgstr "ç¾å??(_S)ï¼?"
@@ -21101,66 +21549,62 @@ msgstr "è??æ?¬(_S)ï¼?"
msgid "Script file must be executable."
msgstr "è??æ?¬æ??件å¿?é¡»å?å?¨ä¸?å?¯æ?§è¡?ã??"
-#: ../widgets/misc/e-url-entry.c:103
+#: ../widgets/misc/e-url-entry.c:105
msgid "Click here to go to URL"
msgstr "å??å?»æ¤å¤?转å?° URL"
-#: ../widgets/misc/e-web-view.c:340
+#: ../widgets/misc/e-web-view.c:348
msgid "_Copy Link Location"
msgstr "�����置(_C)"
-#: ../widgets/misc/e-web-view.c:342
+#: ../widgets/misc/e-web-view.c:350
#, fuzzy
msgid "Copy the link to the clipboard"
msgstr "å°?é??ä¸æ??å?å¤?å?¶å?°å?ªè´´æ?¿"
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:358
msgid "_Open Link in Browser"
msgstr "å?¨æµ?è§?å?¨ä¸æ??å¼?é?¾æ?¥(_O)"
-#: ../widgets/misc/e-web-view.c:352
+#: ../widgets/misc/e-web-view.c:360
#, fuzzy
msgid "Open the link in a web browser"
msgstr "å?¨æµ?è§?å?¨ä¸æ??å¼?é?¾æ?¥(_O)"
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:368
msgid "_Copy Email Address"
msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??(_C)"
-#: ../widgets/misc/e-web-view.c:379
-msgid "Copy the selection to the clipboard"
-msgstr "å¤?å?¶é??æ?©å?°å?ªè´´æ?¿"
-
-#: ../widgets/misc/e-web-view.c:389
+#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
msgid "Select all text and images"
msgstr "é??ä¸å?¨é?¨æ??æ?¬å??å?¾å??"
-#: ../widgets/misc/e-web-view.c:710 ../widgets/misc/e-web-view.c:712
-#: ../widgets/misc/e-web-view.c:714
+#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
+#: ../widgets/misc/e-web-view.c:756
#, c-format
msgid "Click to call %s"
msgstr "å??å?»ä»¥å?¼å?« %s"
-#: ../widgets/misc/e-web-view.c:716
+#: ../widgets/misc/e-web-view.c:758
msgid "Click to hide/unhide addresses"
msgstr "å??å?»å?¯é??è??/æ?¾ç¤ºå?°å??"
-#: ../widgets/misc/e-web-view.c:718
+#: ../widgets/misc/e-web-view.c:760
#, c-format
msgid "Click to open %s"
msgstr "å??å?»ä»¥æ??å¼? %s"
-#: ../widgets/misc/ea-calendar-item.c:295
-#: ../widgets/misc/ea-calendar-item.c:301
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
msgid "%d %B %Y"
msgstr "%Yå¹´%-mæ??%-dæ?¥"
-#: ../widgets/misc/ea-calendar-item.c:303
+#: ../widgets/misc/ea-calendar-item.c:311
#, c-format
msgid "Calendar: from %s to %s"
msgstr "æ?¥å??ï¼?ä»? %s å?° %s"
-#: ../widgets/misc/ea-calendar-item.c:338
+#: ../widgets/misc/ea-calendar-item.c:347
msgid "evolution calendar item"
msgstr "Evolution æ?¥å??项ç?®"
@@ -21168,15 +21612,23 @@ msgstr "Evolution æ?¥å??项ç?®"
msgid "popup list"
msgstr "å¼¹å?ºå??表"
-#: ../widgets/table/e-cell-date-edit.c:296
+#: ../widgets/table/e-cell-date-edit.c:303
msgid "Now"
msgstr "ç?°å?¨"
+#. Translators: "None" as a label of a button to unset date in a date table cell
#: ../widgets/table/e-cell-date-edit.c:320
+#, fuzzy
+#| msgid "None"
+msgctxt "table-date"
+msgid "None"
+msgstr "æ? "
+
+#: ../widgets/table/e-cell-date-edit.c:328
msgid "OK"
msgstr "确�"
-#: ../widgets/table/e-cell-date-edit.c:846
+#: ../widgets/table/e-cell-date-edit.c:862
#, c-format
msgid "The time must be in the format: %s"
msgstr "æ?¶é?´å¿?é¡»é??ç?¨æ ¼å¼?ï¼?%s"
@@ -21185,61 +21637,61 @@ msgstr "æ?¶é?´å¿?é¡»é??ç?¨æ ¼å¼?ï¼?%s"
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "ç?¾å??æ¯?å?¼å¿?é??å?¨ 0 å?° 100 ä¹?é?´ï¼?å?« 0 å?? 100"
-#: ../widgets/table/e-cell-pixbuf.c:360
+#: ../widgets/table/e-cell-pixbuf.c:357
msgid "Selected Column"
msgstr "é??ä¸å??"
-#: ../widgets/table/e-cell-pixbuf.c:367
+#: ../widgets/table/e-cell-pixbuf.c:364
msgid "Focused Column"
msgstr "è??ç?¦å??"
-#: ../widgets/table/e-cell-pixbuf.c:374
+#: ../widgets/table/e-cell-pixbuf.c:371
msgid "Unselected Column"
msgstr "æ?ªé??å??"
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1627
msgid "Strikeout Column"
msgstr "ç»?å??å? å? é?¤çº¿"
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1634
msgid "Underline Column"
msgstr "ç»?å??å? ä¸?å??线"
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1641
msgid "Bold Column"
msgstr "ç»?å??å? ç²?"
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1648
msgid "Color Column"
msgstr "ç»?å??ç??è?²"
-#: ../widgets/table/e-cell-text.c:1836
+#: ../widgets/table/e-cell-text.c:1662
msgid "BG Color Column"
msgstr "ç»?å??ç??è??æ?¯è?²"
-#: ../widgets/table/e-table-click-to-add.c:576
+#: ../widgets/table/e-table-click-to-add.c:582
#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
msgid "click to add"
msgstr "å??å?»å?¯æ·»å? "
-#: ../widgets/table/e-table-config.c:151
+#: ../widgets/table/e-table-config.c:150
msgid "State"
msgstr "ç?¶æ??"
-#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
msgid "(Ascending)"
msgstr "(å??åº?)"
-#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
msgid "(Descending)"
msgstr "(é??åº?)"
-#: ../widgets/table/e-table-config.c:389
+#: ../widgets/table/e-table-config.c:388
msgid "Not sorted"
msgstr "æ?ªæ??åº?"
-#: ../widgets/table/e-table-config.c:430
+#: ../widgets/table/e-table-config.c:429
msgid "No grouping"
msgstr "æ?ªå??ç»?"
@@ -21248,7 +21700,7 @@ msgstr "æ?ªå??ç»?"
msgid "Show Fields"
msgstr "æ?¾ç¤ºå??"
-#: ../widgets/table/e-table-config.c:657
+#: ../widgets/table/e-table-config.c:658
msgid "Available Fields"
msgstr "å?¯ç?¨å??"
@@ -21257,7 +21709,7 @@ msgid "A_vailable Fields:"
msgstr "å?¯ç?¨å??(_V)ï¼?"
#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1580
+#: ../widgets/table/e-table-header-item.c:1577
msgid "Ascending"
msgstr "å??åº?"
@@ -21270,7 +21722,7 @@ msgid "Clear _All"
msgstr "����(_A)"
#: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1580
+#: ../widgets/table/e-table-header-item.c:1577
msgid "Descending"
msgstr "é??åº?"
@@ -21331,8 +21783,10 @@ msgid "_Sort..."
msgstr "æ??åº?(_S)..."
#: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "æ·»å? ä¸?å??..."
+#, fuzzy
+#| msgid "Add a C_olumn..."
+msgid "Add a Column"
+msgstr "æ·»å? ä¸?å??(_O)..."
#: ../widgets/table/e-table-field-chooser.c:151
msgid ""
@@ -21340,209 +21794,204 @@ msgid ""
"the location in which you want it to appear."
msgstr "è¦?å?¨æ?¨ç??è¡¨æ ¼ä¸æ·»å? å??ï¼?请å°?å?¶æ??æ?³å?°æ?¨æ?³è¦?å?¶å?ºç?°ç??ä½?ç½®ã??"
-#: ../widgets/table/e-table-group-container.c:341
+#: ../widgets/table/e-table-group-container.c:342
#, c-format
msgid "%s : %s (%d item)"
msgid_plural "%s : %s (%d items)"
msgstr[0] "%s�%s (%d 项)"
-#: ../widgets/table/e-table-group-container.c:347
+#: ../widgets/table/e-table-group-container.c:348
#, c-format
msgid "%s (%d item)"
msgid_plural "%s (%d items)"
msgstr[0] "%s (%d 项)"
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
#: ../widgets/table/e-table-group-leaf.c:586
#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:2830 ../widgets/table/e-table-item.c:2831
msgid "Alternating Row Colors"
msgstr "交���"
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
#: ../widgets/table/e-table-group-leaf.c:593
#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
+#: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343
msgid "Horizontal Draw Grid"
msgstr "æ°´å¹³ç»?å?¶ç½?æ ¼"
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
#: ../widgets/table/e-table-group-leaf.c:600
#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
+#: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349
msgid "Vertical Draw Grid"
msgstr "å??ç?´ç»?å?¶ç½?æ ¼"
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
#: ../widgets/table/e-table-group-leaf.c:607
#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
+#: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355
msgid "Draw focus"
msgstr "����"
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
#: ../widgets/table/e-table-group-leaf.c:614
#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:2858 ../widgets/table/e-table-item.c:2859
msgid "Cursor mode"
msgstr "å??æ ?模å¼?"
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
#: ../widgets/table/e-table-group-leaf.c:628
#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:2823 ../widgets/table/e-table-item.c:2824
msgid "Selection model"
msgstr "é??æ?©æ¨¡å??"
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:975
#: ../widgets/table/e-table-group-leaf.c:621
#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-tree.c:3337
msgid "Length Threshold"
msgstr "é?¿åº¦é??å?¼"
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:982
#: ../widgets/table/e-table-group-leaf.c:663
#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
-#: ../widgets/table/e-tree.c:3366
+#: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
+#: ../widgets/table/e-table.c:3328 ../widgets/table/e-tree.c:3368
+#: ../widgets/table/e-tree.c:3369
msgid "Uniform row height"
msgstr "����"
-#: ../widgets/table/e-table-group-container.c:980
-#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-container.c:989
#: ../widgets/table/e-table-group-leaf.c:656
#: ../widgets/table/e-table-group-leaf.c:657
msgid "Frozen"
msgstr "��"
-#: ../widgets/table/e-table-header-item.c:1450
+#: ../widgets/table/e-table-header-item.c:1449
msgid "Customize Current View"
msgstr "è?ªå®?ä¹?å½?å??è§?å?¾"
-#: ../widgets/table/e-table-header-item.c:1470
+#: ../widgets/table/e-table-header-item.c:1469
msgid "Sort _Ascending"
msgstr "å??åº?æ??åº?(_A)"
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1470
msgid "Sort _Descending"
msgstr "é??åº?æ??åº?(_D)"
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1471
msgid "_Unsort"
msgstr "æ?ªæ??åº?(_U)"
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
msgid "Group By This _Field"
msgstr "æ??该å??å??ç»?(_F)"
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
msgid "Group By _Box"
msgstr "æ??æ?¹æ¡?å??ç»?(_B)"
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
msgid "Remove This _Column"
msgstr "å? é?¤è¯¥å??(_C)"
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
msgid "Add a C_olumn..."
msgstr "æ·»å? ä¸?å??(_O)..."
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
msgid "A_lignment"
msgstr "对�(_L)"
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
msgid "B_est Fit"
msgstr "æ??ä½³å?¹é??(_E)"
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1481
msgid "Format Column_s..."
msgstr "æ ¼å¼?å??å??(_S)..."
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
msgid "Custo_mize Current View..."
msgstr "è?ªå®?ä¹?å½?å??è§?å?¾(_M)..."
-#: ../widgets/table/e-table-header-item.c:1540
+#: ../widgets/table/e-table-header-item.c:1537
msgid "_Sort By"
msgstr "æ??åº?æ?¹å¼?(_S)"
#. Custom
-#: ../widgets/table/e-table-header-item.c:1558
+#: ../widgets/table/e-table-header-item.c:1555
msgid "_Custom"
msgstr "���(_C)"
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:2809 ../widgets/table/e-table-item.c:2810
msgid "Table header"
msgstr "表头"
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:2816 ../widgets/table/e-table-item.c:2817
msgid "Table model"
msgstr "è¡¨æ ¼æ¨¡å??"
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:2892 ../widgets/table/e-table-item.c:2893
msgid "Cursor row"
msgstr "å??æ ?è¡?"
-#: ../widgets/table/e-table-sorter.c:172
+#: ../widgets/table/e-table-sorter.c:173
msgid "Sort Info"
msgstr "æ??åº?ä¿¡æ?¯"
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
-#: ../widgets/table/e-tree.c:3373
+#: ../widgets/table/e-table.c:3335 ../widgets/table/e-tree.c:3375
+#: ../widgets/table/e-tree.c:3376
msgid "Always search"
msgstr "æ?»æ?¯æ??ç´¢"
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3342
msgid "Use click to add"
msgstr "å??å?»å?¯æ·»å? "
-#: ../widgets/table/e-table.c:3351
+#: ../widgets/table/e-table.c:3356
#, fuzzy
msgid "Vertical Row Spacing"
msgstr "æ ?è¯?å?¨é?´è·?"
-#: ../widgets/table/e-table.c:3352
+#: ../widgets/table/e-table.c:3357
msgid "Vertical space between rows. It is added to top and to bottom of a row"
msgstr ""
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "æ ?"
-
-#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
+#: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362
msgid "ETree table adapter"
msgstr "ETree è¡¨æ ¼é??é??å?¨"
-#: ../widgets/table/e-tree.c:3379
+#: ../widgets/table/e-tree.c:3382
msgid "Retro Look"
msgstr "ç?«ç®å¤?è§?"
-#: ../widgets/table/e-tree.c:3380
+#: ../widgets/table/e-tree.c:3383
msgid "Draw lines and +/- expanders."
msgstr "ç»?å?¶è¡?å?? +/- æ?©å±?æ??ã??"
-#: ../widgets/table/e-tree.c:3386
+#: ../widgets/table/e-tree.c:3389
msgid "Expander Size"
msgstr "���大�"
-#: ../widgets/table/e-tree.c:3387
+#: ../widgets/table/e-tree.c:3390
msgid "Size of the expander arrow"
msgstr "æ?©å±?å?¨ç®å¤´ç??大å°?"
@@ -21588,7 +22037,7 @@ msgstr "æ??å? "
msgid "collapses the row in the ETree containing this cell"
msgstr "å?¨å??å?«æ¤å??å??æ ¼ç?? ETree ä¸æ??å? è¡?"
-#: ../widgets/table/gal-a11y-e-cell.c:120
+#: ../widgets/table/gal-a11y-e-cell.c:119
msgid "Table Cell"
msgstr "è¡¨æ ¼å??å??æ ¼"
@@ -21600,127 +22049,231 @@ msgstr "å??å?»"
msgid "sort"
msgstr "æ??åº?"
-#: ../widgets/text/e-text.c:2719
+#: ../widgets/text/e-text.c:2474
msgid "Select All"
msgstr "å?¨é??"
-#: ../widgets/text/e-text.c:2731
+#: ../widgets/text/e-text.c:2486
msgid "Input Methods"
msgstr "���"
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3303 ../widgets/text/e-text.c:3304
msgid "Event Processor"
msgstr "äº?件å¤?ç??å?¨"
-#: ../widgets/text/e-text.c:3555 ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-text.c:3310 ../widgets/text/e-text.c:3311
msgid "Text"
msgstr "æ??å?"
-#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3317 ../widgets/text/e-text.c:3318
msgid "Bold"
msgstr "ç²?ä½?"
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3324 ../widgets/text/e-text.c:3325
msgid "Strikeout"
msgstr "å? é?¤çº¿"
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3331 ../widgets/text/e-text.c:3332
msgid "Anchor"
msgstr "é??ç?¹"
-#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3338 ../widgets/text/e-text.c:3339
msgid "Justification"
msgstr "两端对�"
-#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3345 ../widgets/text/e-text.c:3346
msgid "Clip Width"
msgstr "��宽度"
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3352 ../widgets/text/e-text.c:3353
msgid "Clip Height"
msgstr "���度"
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3359 ../widgets/text/e-text.c:3360
msgid "Clip"
msgstr "��"
-#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3366 ../widgets/text/e-text.c:3367
msgid "Fill clip rectangle"
msgstr "å¡«å??è£?å?ªç?©å½¢"
-#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3373 ../widgets/text/e-text.c:3374
msgid "X Offset"
msgstr "æ°´å¹³å??移"
-#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3380 ../widgets/text/e-text.c:3381
msgid "Y Offset"
msgstr "å??ç?´å??移"
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3415 ../widgets/text/e-text.c:3416
msgid "Text width"
msgstr "æ??å?宽度"
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3422 ../widgets/text/e-text.c:3423
msgid "Text height"
msgstr "æ??å?é«?度"
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3436 ../widgets/text/e-text.c:3437
msgid "Use ellipsis"
msgstr "使ç?¨æ¤å??"
-#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3443 ../widgets/text/e-text.c:3444
msgid "Ellipsis"
msgstr "æ¤å??"
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3450 ../widgets/text/e-text.c:3451
msgid "Line wrap"
msgstr "��"
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3457 ../widgets/text/e-text.c:3458
msgid "Break characters"
msgstr "æ?¢è¡?å?符"
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3464 ../widgets/text/e-text.c:3465
msgid "Max lines"
msgstr "æ??å¤?è¡?æ?°"
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/text/e-text.c:3485 ../widgets/text/e-text.c:3486
msgid "Draw borders"
msgstr "��边�"
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
msgid "Allow newlines"
msgstr "å??许æ?°è¡?"
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
msgid "Draw background"
msgstr "ç»?å?¶è??æ?¯"
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
msgid "Draw button"
msgstr "ç»?å?¶æ??é?®"
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3513 ../widgets/text/e-text.c:3514
msgid "Cursor position"
msgstr "å??æ ?ä½?ç½®"
#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3523
msgid "IM Context"
msgstr "�����"
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
msgid "Handle Popup"
msgstr "å¤?ç??å¼¹å?º"
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution é??误"
+#~ msgid "Loading appointments at %s"
+#~ msgstr "è£?å?¥ä½?äº? %s ç??约ä¼?"
+
+#~ msgid "_Security"
+#~ msgstr "å®?å?¨(_S)"
+
+#~ msgid "Copying `%s' to `%s'"
+#~ msgstr "æ??â??%sâ??å¤?å?¶å?° %s"
+
+#~ msgid "Deleting selected memos..."
+#~ msgstr "å? é?¤é??ä¸ç??å¤?å¿?..."
+
+#~ msgid "Deleting selected tasks..."
+#~ msgstr "å? é?¤é??ä¸ç??ä»»å?¡..."
+
+#~ msgid "Error loading address book."
+#~ msgstr "è£?å?¥å?°å??ç°¿é??误ã??"
+
+#~ msgid "Server Version"
+#~ msgstr "æ??å?¡å?¨ç??æ?¬"
+
+#~ msgid "Save Appointment"
+#~ msgstr "ä¿?å?约ä¼?"
+
+#, fuzzy
+#~ msgid "Save Meeting"
+#~ msgstr "æ?°ä¼?è®®"
+
+#~ msgid "Save Memo"
+#~ msgstr "ä¿?å?å¤?å¿?"
+
+#~ msgid "Save Task"
+#~ msgstr "ä¿?å?ä»»å?¡"
-#~ msgid "Evolution Warning"
-#~ msgstr "Evolution è¦å??"
+#, fuzzy
+#~ msgid "Show CC"
+#~ msgstr "�示(_W)�"
+
+#, fuzzy
+#~ msgid "Show BCC"
+#~ msgstr "�示(_W)�"
+
+#~ msgid "Directories can not be attached to Messages."
+#~ msgstr "æ? æ³?å°?ç?®å½?ä½?为信件ç??é??件ã??"
+
+#~ msgid ""
+#~ "To attach the contents of this directory, either attach the files in this "
+#~ "directory individually, or create an archive of the directory and attach "
+#~ "it."
+#~ msgstr ""
+#~ "è¦?å°?æ¤ç?®å½?ç??å??容ä½?为é??件ï¼?æ?¨é??è¦?é??ä¸?æ·»å? æ¤ç?®å½?ä¸ç??æ??件ï¼?æ??è??å??建ä¸?个æ¤ç?®å½?"
+#~ "ç??å½?æ¡£æ??件ï¼?ç?¶å??å°?æ¤å½?æ¡£ä½?为é??件ã??"
+
+#~ msgid "Unfinished messages found"
+#~ msgstr "æ?¾å?°äº?æ?ªå®?æ??ç??信件"
+
+#~ msgid "Warning: Modified Message"
+#~ msgstr "è¦å??ï¼?已修æ?¹ç??信件"
+
+#~ msgid "Overwrite file?"
+#~ msgstr "è¦?ç??æ??件å??ï¼?"
+
+#~ msgid "Select _All Text"
+#~ msgstr "é??ä¸æ??æ??æ??å?(_A)"
+
+#~ msgid "Select all the text in a message"
+#~ msgstr "é??ä¸ä¿¡ä»¶ä¸ç??å?¨é?¨æ??æ?¬"
+
+#~ msgid "Show the \"Preview\" pane"
+#~ msgstr "æ?¾ç¤ºâ??é¢?è§?â??é?¢æ?¿"
+
+#~ msgid "Show the \"Preview\" pane."
+#~ msgstr "æ?¾ç¤ºâ??é¢?è§?â??é?¢æ?¿ã??"
+
+#~ msgid "Thread the message list."
+#~ msgstr "æ??线索ç¼?æ??信件å??表ã??"
-#~ msgid "Internal error, unknown error '%s' requested"
-#~ msgstr "å??é?¨é??误ï¼?请æ±?äº?æ?ªç?¥ç??é??误â??%sâ??"
+#~ msgid "Thread the message-list"
+#~ msgstr "æ??线索ç¼?æ??信件å??表"
+
+#~ msgid "Advanced search"
+#~ msgstr "é«?级æ??ç´¢"
+
+#~ msgid "Copy selected memo"
+#~ msgstr "å¤?å?¶é??ä¸ç??å¤?å¿?"
+
+#~ msgid "Cut selected memo"
+#~ msgstr "å?ªå??é??ä¸ç??å¤?å¿?"
+
+#~ msgid "Copy selected tasks"
+#~ msgstr "å¤?å?¶é??ä¸ç??ä»»å?¡"
+
+#~ msgid "Cut selected tasks"
+#~ msgstr "å?ªå??é??ä¸ç??ä»»å?¡"
+
+#~ msgid "Select _All Messages"
+#~ msgstr "é??ä¸å?¨é?¨ä¿¡ä»¶(_A)"
+
+#~ msgid "Dummy window only"
+#~ msgstr "å?ªå¯¹å??çª?å?£"
+
+#~ msgid "Hide _Attachment Bar"
+#~ msgstr "é??è??é??件æ ?(_A)"
+
+#~ msgid "Copy the selection to the clipboard"
+#~ msgstr "å¤?å?¶é??æ?©å?°å?ªè´´æ?¿"
+
+#~ msgid "Add a column..."
+#~ msgstr "æ·»å? ä¸?å??..."
+
+#~ msgid "Tree"
+#~ msgstr "æ ?"
#~ msgid "search bar"
#~ msgstr "æ??ç´¢æ ?"
@@ -22885,9 +23438,6 @@ msgstr "å¤?ç??å¼¹å?º"
#~ msgid "New all day appointment"
#~ msgstr "�建�天约�"
-#~ msgid "New calendar"
-#~ msgstr "æ?°å»ºæ?¥å??"
-
#~ msgid "Error while opening the calendar"
#~ msgstr "æ??å¼?æ?¥å??æ?¶å?ºé??"
@@ -22973,12 +23523,6 @@ msgstr "å¤?ç??å¼¹å?º"
#~ msgid_plural "<b>%d</b> Attachments"
#~ msgstr[0] "<b>%d</b> 个é??件"
-#~ msgid "Hide Attachment _Bar"
-#~ msgstr "é??è??é??件æ ?(_B)"
-
-#~ msgid "Show Attachment _Bar"
-#~ msgstr "æ?¾ç¤ºé??件æ ?(_B)"
-
#~ msgid "Show Attachments"
#~ msgstr "æ?¾ç¤ºé??件"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
