[evolution] Update Simplified Chinese translation.
- From: Aron Xu <aronxu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Update Simplified Chinese translation.
- Date: Wed, 14 Jul 2010 07:32:43 +0000 (UTC)
commit 229d083ed753f90345b472115e49228c87cf8ce7
Author: Aron Xu <aronxu gnome org>
Date: Wed Jul 14 15:32:21 2010 +0800
Update Simplified Chinese translation.
po/zh_CN.po |11317 +++++++++++++++++++++++++++++------------------------------
1 files changed, 5629 insertions(+), 5688 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1a7e749..9770553 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,16 +7,17 @@
# Funda Wang <fundawang linux net cn>, 2003, 2004, 2005, 2006.
# Tao Wei <weitao1979 gmail com>, 2009.
# Andrew Zheng <andrew0zheng gmail com>, 2009.
+# Funda Wang <fundawang0zheng gmail com>, 2010.
+# Aron Xu <aronxu gnome org>, 2010.
#
-#: ../shell/main.c:479
+#: ../shell/main.c:519
msgid ""
msgstr ""
"Project-Id-Version: evolution master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution\n"
-"POT-Creation-Date: 2010-04-17 11:48+0000\n"
-"PO-Revision-Date: 2010-04-18 00:27+0800\n"
-"Last-Translator: Funda Wang <fundawang0zheng gmail com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-14 14:27+0800\n"
+"PO-Revision-Date: 2010-07-14 15:31+0800\n"
+"Last-Translator: Aron Xu <happyaron xu 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"
@@ -84,41 +85,46 @@ msgid "Delete address book '{0}'?"
msgstr "å? é?¤å?°å??ç°¿â??{0}â??å??ï¼?"
#: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "ä¸?å? é?¤(_N)"
+
+#: ../addressbook/addressbook.error.xml.h:14
msgid "Error saving {0} to {1}: {2}"
msgstr "å°?{0}ä¿?å?å?° {1} å?ºé??ï¼?{2}"
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
msgid "Failed to authenticate with LDAP server."
msgstr "认è¯?å?° IMAP æ??å?¡å?¨å¤±è´¥ã??"
#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
msgid "Failed to delete contact"
msgstr "å? é?¤è??系人失败"
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
msgid "GroupWise Address book creation:"
msgstr "GroupWise å?°å??ç°¿å??建ï¼?"
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP æ??å?¡å?¨æ? æ³?å??åº?æ??æ??ç??大纲信æ?¯ã??"
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
msgid "Some features may not work properly with your current server"
msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?å?¨æ?¨ç?®å??ç??æ??å?¡å?¨ä¸?å·¥ä½?"
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
msgid "The Evolution address book has quit unexpectedly."
msgstr "Evolution å?°å??ç°¿å¼?常é??å?ºã??"
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
msgid ""
"The image you have selected is large. Do you want to resize and store it?"
msgstr "æ?¨æ??é??æ?©ç??å?¾å??太大ã??æ?¨æ?¯å?¦æ?³è¦?缩æ?¾å¹¶å?å?¨ï¼?"
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
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 "
@@ -127,45 +133,45 @@ msgstr ""
"æ¤ LDAP æ??å?¡å?¨å?¯è?½ä½¿ç?¨è¾?æ?©ç??æ?¬ç?? LDAPï¼?æ??以æ? æ³?æ?¯æ??æ¤å??è?½ï¼?æ??è??æ?¯é??ç½®é??误ã??请"
"询é?®æ?¨ç??管ç??å??æ??å?³æ?¯æ??ç??æ??ç´¢å?ºç¡?ä¸?äº?ã??"
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
msgid "This address book could not be opened."
msgstr "æ? æ³?æ??å¼?æ¤å?°å??ç°¿ã??"
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
msgid "This address book server does not have any suggested search bases."
msgstr "æ¤å?°å??ç°¿æ??å?¡å?¨ä¸?æ?¯æ??ä»»ä½?建议ç??æ??ç´¢å?ºç¡?ã??"
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
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:25
+#: ../addressbook/addressbook.error.xml.h:26
msgid "This address book will be removed permanently."
msgstr "æ¤å?°å??ç°¿å?³å°?被永ä¹?å? é?¤ã??"
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
msgid "This server does not support LDAPv3 schema information."
msgstr "æ¤æ??å?¡å?¨ä¸?æ?¯æ?? LDAPv3 大纲信æ?¯ã??"
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
msgid "Unable to open address book"
msgstr "æ? æ³?æ??å¼?å?°å??ç°¿"
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
msgid "Unable to perform search."
msgstr "æ? æ³?æ?§è¡?æ??ç´¢ã??"
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
msgid "Unable to save {0}."
msgstr "æ? æ³?ä¿?å? {0}ã??"
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
msgid "Would you like to save your changes?"
msgstr "æ?¨å¸?æ??ä¿?å?æ?´æ?¹å??ï¼?"
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
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?"
@@ -173,7 +179,7 @@ msgstr ""
"æ?¨å?³å°?æ??è??系人ä»?ä¸?个å?°å??簿移è?³å?¦å¤?ä¸?个å?°å??ç°¿ï¼?ä½?æ?¯æ? æ³?ä»?æº?å?°å??ç°¿å? é?¤è¯¥è??ç³»"
"人ã??æ?¨æ?³è¦?æ?¢ä½?å¤?å?¶è??系人å??ï¼?"
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results the server should be upgraded to "
@@ -182,71 +188,47 @@ msgstr ""
"æ?¨æ£å?¨è¿?æ?¥å?°ä¸?æ?¯æ??ç?? GroupWise æ??å?¡å?¨ï¼?æ¤æ?¶ä½¿ç?¨ Evolution å?¯è?½é??å?°é?®é¢?ã??为äº?"
"å¾?å?°æ??ä½³æ??æ??ï¼?æ??å?¡å?¨åº?该å??级å?° Evolution æ?¯æ??ç??ç??æ?¬"
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
msgid "You do not have permission to delete contacts in this address book."
msgstr "æ?¨æ²¡æ??足å¤?ç??æ??é??ä»?å?°å??ç°¿ä¸å? é?¤è??系人ã??"
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
msgid ""
"You have made modifications to this contact. Do you want to save these "
"changes?"
msgstr "æ?¨å·²å¯¹æ¤è??系人ä½?å?ºäº?ä¿®æ?¹ã??æ?¨æ?³è¦?ä¿?å?è¿?äº?æ?´æ?¹å??ï¼?"
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
msgid ""
"Your contacts for {0} will not be available until Evolution is restarted."
msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å?? {0} ç??è??系人æ? æ³?使ç?¨ã??"
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
#: ../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:37
+#: ../addressbook/addressbook.error.xml.h:38
msgid "_Discard"
msgstr "丢�(_D)"
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
msgid "_Do not save"
msgstr "ä¸?ä¿?å?(_D)"
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
msgid "_Resize"
msgstr "缩�(_R)"
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
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:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "é»?认å??æ¥å?°å??ï¼?"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "æ? æ³?è£?å?¥å?°å??ç°¿"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-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:1987
+#: ../calendar/gui/e-calendar-view.c:2022
msgid "Anniversary"
msgstr "纪念�"
@@ -257,260 +239,235 @@ 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:1986 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:118
msgid "Birthday"
msgstr "ç??æ?¥"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "å??客ï¼?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:10
#: ../calendar/gui/dialogs/memo-page.ui.h:1
msgid "Ca_tegories..."
msgstr "类�(_T)..."
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
msgid "Calendar:"
msgstr "æ?¥å??ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
msgid "Contact"
msgstr "è??系人"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
#: ../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:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
msgid "Contact Editor"
msgstr "è??系人ç¼?è¾?å?¨"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
#: ../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:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
msgid "Email"
msgstr "ç?µå?é?®ä»¶"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
msgid "Free/Busy:"
msgstr "é?²/å¿?ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
msgid "Full _Name..."
msgstr "å?¨å??(_N)..."
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
#: ../addressbook/gui/widgets/eab-contact-display.c:70
msgid "Home"
msgstr "家åº"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
msgid "Home Page:"
msgstr "主页�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
msgid "Image"
msgstr "å?¾å??"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
msgid "Instant Messaging"
msgstr "å?³æ?¶é??讯"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
msgid "Job"
msgstr "工�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
msgid "Mailing Address"
msgstr "é?®æ?¿å?°å??"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
#: ../calendar/gui/dialogs/task-details-page.ui.h:11
msgid "Miscellaneous"
msgstr "æ??项"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
msgid "Nic_kname:"
msgstr "�称(_K)�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
#: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
msgid "Notes"
msgstr "�记"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
#: ../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:1695
+#: ../calendar/gui/e-calendar-view.c:1725
msgid "Other"
msgstr "��"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
msgid "Personal Information"
msgstr "个人信�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
msgid "Telephone"
msgstr "��"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
msgid "Video Chat:"
msgstr "è§?é¢?è??天ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
msgid "Web Addresses"
msgstr "ç½?ç»?å?°å??"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "�����"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "ç½?ç»?å?°å??"
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
#: ../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
-#: ../mail/e-mail-migrate.c:961
msgid "Work"
msgstr "工�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
msgid "_Address:"
msgstr "å?°å??(_A)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
msgid "_Anniversary:"
msgstr "�年(_A)�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
msgid "_Assistant:"
msgstr "å?©æ??(_A)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
msgid "_Birthday:"
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:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+msgid "_Blog:"
+msgstr "å??客(_N)ï¼?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/itip-formatter/itip-view.c:1921
msgid "_Calendar:"
msgstr "æ?¥å??(_C)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
msgid "_City:"
msgstr "å??å¸?(_C)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
msgid "_Company:"
msgstr "��(_C)�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
msgid "_Country:"
msgstr "�家/��(_C)�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
msgid "_Department:"
msgstr "��(_D)�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
msgid "_File under:"
msgstr "å?档为(_F)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
msgid "_Free/Busy:"
msgstr "å¿?/é?²(_F)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
msgid "_Home Page:"
msgstr "主页(_H)�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
msgid "_Manager:"
msgstr "ç»?ç??(_M)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
msgid "_Office:"
msgstr "å??å?¬å®¤(_O)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
msgid "_PO Box:"
msgstr "���箱(_P)�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
msgid "_Profession:"
msgstr "è??ä¸?(_P)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
msgid "_Spouse:"
msgstr "é??å?¶(_S)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
msgid "_State/Province:"
msgstr "å·?/ç??(_S)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
#: ../addressbook/gui/contact-editor/fullname.ui.h:17
msgid "_Title:"
msgstr "头�(_T):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
msgid "_Video Chat:"
msgstr "è§?é¢?è??天(_V)ï¼?"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
msgid "_Wants to receive HTML mail"
msgstr "æ?¿æ??æ?¥æ?¶ HTML é?®ä»¶(_W)"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "_Web ���"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
msgid "_Where:"
msgstr "��(_W)�"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
msgid "_Zip/Postal Code:"
msgstr "é?®æ?¿ç¼?ç ?(_Z)ï¼?"
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../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:320
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../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:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../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:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "���"
-
#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
#: ../addressbook/gui/widgets/eab-contact-display.c:539
msgid "AIM"
@@ -552,7 +509,7 @@ msgid "Skype"
msgstr "Skype"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:353
msgid "Error adding contact"
msgstr "æ·»å? è??系人å?ºé??"
@@ -564,45 +521,21 @@ msgstr "ä¿®æ?¹è??系人å?ºé??"
msgid "Error removing contact"
msgstr "å? é?¤è??系人å?ºé??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "æ?¥æº?å?°å??ç°¿"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "ç?®æ ?å?°å??ç°¿"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "为æ?°è??系人"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "å?¯å??å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "å¿?é??å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "已��"
-
#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
#, c-format
msgid "Contact Editor - %s"
msgstr "è??系人ç¼?è¾?å?¨ - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
msgid "Please select an image for this contact"
msgstr "请é??æ?©æ¤è??系人ç??å?¾å??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
msgid "_No image"
msgstr "æ? å?¾å??(_N)"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -610,56 +543,46 @@ msgstr ""
"è??系人æ?°æ?®æ? æ??ï¼?\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
#, c-format
msgid "'%s' has an invalid format"
msgstr "â??%sâ??ç??æ ¼å¼?æ? æ??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%sâ??%sâ??ç??æ ¼å¼?æ? æ??"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
#, c-format
msgid "%s'%s' is empty"
msgstr "%sâ??%sâ??为空"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
msgid "Invalid contact."
msgstr "æ? æ??ç??è??系人ã??"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
msgid "Contact Quick-Add"
msgstr "å¿«é??æ·»å? è??系人"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
msgid "_Edit Full"
msgstr "ç¼?è¾?å?¨å??(_E)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
msgid "_Full name"
msgstr "å?¨å??(_F)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
msgid "E_mail"
msgstr "ç?µå?é?®ä»¶(_M)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
msgid "_Select Address Book"
msgstr "é??æ?©å?°å??ç°¿(_S)"
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "�壳"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "EShell ç??ä¸?个"
-
#: ../addressbook/gui/contact-editor/fullname.ui.h:1
msgid "Dr."
msgstr "å??士"
@@ -726,7 +649,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:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
msgid "Contact List Editor"
msgstr "è??系人å??表ç¼?è¾?å?¨"
@@ -743,7 +666,7 @@ msgid "_List name:"
msgstr "å??表å??称(_L)ï¼?"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:168
msgid "_Select..."
msgstr "é??æ?©(_S)..."
@@ -751,39 +674,27 @@ 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:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
msgid "Contact List Members"
msgstr "è??系人å??表æ??å??"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
msgid "_Members"
msgstr "æ??å??(_M)"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
msgid "Error adding list"
msgstr "æ·»å? å??表å?ºé??"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
msgid "Error modifying list"
msgstr "ä¿®æ?¹å??表å?ºé??"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
msgid "Error removing list"
msgstr "å? é?¤å??表å?ºé??"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../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:534
-msgid "Book"
-msgstr "å?°å??ç°¿"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "为æ?°å??表"
-
#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
msgid "Changed Contact:"
msgstr "æ?´æ?¹äº?ç??è??系人ï¼?"
@@ -820,133 +731,110 @@ msgstr ""
"æ?¨ä¸?å®?è¦?æ·»å? å??ï¼?"
#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
msgid "_Merge"
msgstr "å??并(_M)"
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "å·²å??æ¶?"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
msgid "Merge Contact"
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:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
msgid "Any field contains"
msgstr "ä»»ä½?å??å?«æ??"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
msgid "Email begins with"
msgstr "é?®ä»¶ä»¥æ¤å¼?头"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
msgid "Name contains"
msgstr "å§?å??å?«æ??"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
msgid "No contacts"
msgstr "æ? è??系人"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
#, c-format
msgid "%d contact"
msgid_plural "%d contacts"
msgstr[0] "%d 个è??系人"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-model.c:309
msgid "Error getting book view"
msgstr "è?·å??å??ç°¿è§?å?¾å?ºé??"
-#: ../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:541
-msgid "Query"
-msgstr "�询"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#: ../addressbook/gui/widgets/e-addressbook-model.c:708
msgid "Search Interrupted"
msgstr "æ??ç´¢ä¸æ?äº?"
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "模å??"
-
#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
msgid "Error modifying card"
msgstr "ä¿®æ?¹å??ç??é??误"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
msgid "Cut selected contacts to the clipboard"
msgstr "å°?é??è??系人å?ªå??å?°å?ªè´´æ?¿"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
msgid "Copy selected contacts to the clipboard"
msgstr "å°?é??ä¸è??系人å¤?å?¶å?°å?ªè´´æ?¿"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
msgid "Paste contacts from the clipboard"
msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´è??系人"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
msgid "Delete selected contacts"
msgstr "å? é?¤é??ä¸ç??è??系人"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
msgid "Select all visible contacts"
msgstr "é??ä¸å?¨é?¨å?¯è§?è??系人"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "�壳��"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "��"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
msgid "Are you sure you want to delete these contact lists?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??表å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
msgid "Are you sure you want to delete this contact list?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??表å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
#, c-format
msgid "Are you sure you want to delete this contact list (%s)?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??系人å??表(%s)å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
msgid "Are you sure you want to delete these contacts?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
msgid "Are you sure you want to delete this contact?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
#, c-format
msgid "Are you sure you want to delete this contact (%s)?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??系人(%s)å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -955,11 +843,11 @@ msgstr ""
"æ??å¼? %d 个è??系人å°?å??æ?¶æ??å¼? %d 个æ?°çª?å?£ã??\n"
"æ?¨ç??ç??æ?³è¦?æ?¾ç¤ºæ??æ??è??系人å??ï¼?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
msgid "_Don't Display"
msgstr "��示(_D)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
msgid "Display _All Contacts"
msgstr "æ?¾ç¤ºå?¨é?¨è??系人(_A)"
@@ -993,7 +881,7 @@ msgid "Car Phone"
msgstr "车载��"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:11
#: ../calendar/gui/e-cal-list-view.etspec.h:1
#: ../calendar/gui/e-calendar-table.etspec.h:3
#: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1094,7 +982,7 @@ msgid "Radio"
msgstr "���"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
msgid "Role"
msgstr "��"
@@ -1119,7 +1007,6 @@ msgid "Telex"
msgstr "ç?µä¼ "
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:825
msgid "Title"
msgstr "头�"
@@ -1131,59 +1018,7 @@ msgstr "å??ä½?"
msgid "Web Site"
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: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:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-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: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:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "�度"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "æ??ç?¦ç?¹"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "å??"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "å??å??"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "æ??å?模å??"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "æ??大å??å??é?¿åº¦"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "å??宽"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
msgid ""
"\n"
"\n"
@@ -1193,7 +1028,7 @@ msgstr ""
"\n"
"æ£å?¨æ??ç´¢è??系人..."
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
msgid ""
"\n"
"\n"
@@ -1207,7 +1042,7 @@ msgstr ""
"\n"
"æ??å?¨æ¤å??å?»ä»¥å??建æ?°è??系人ã??"
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
msgid ""
"\n"
"\n"
@@ -1221,7 +1056,7 @@ msgstr ""
"\n"
"请å?¨æ¤å??å?»ä»¥å??建æ?°è??系人ã??"
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
msgid ""
"\n"
"\n"
@@ -1231,7 +1066,7 @@ msgstr ""
"\n"
"æ??ç´¢è??系人ã??"
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
msgid ""
"\n"
"\n"
@@ -1241,10 +1076,6 @@ msgstr ""
"\n"
"æ?¬è§?å?¾ä¸æ²¡æ??å?¯æ?¾ç¤ºç??项ã??"
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "é??é??å?¨"
-
#: ../addressbook/gui/widgets/e-minicard.c:99
msgid "Work Email"
msgstr "å·¥ä½?ç?µå?é?®ä»¶"
@@ -1254,21 +1085,13 @@ msgid "Home Email"
msgstr "家åºç?µå?é?®ä»¶"
#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:807
msgid "Other Email"
msgstr "å?¶å®?ç?µå?é?®ä»¶"
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "å·²é??æ?©"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "æ??å??æ ?"
-
#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
msgid "evolution address book"
msgstr "evolution å?°å??ç°¿"
@@ -1280,7 +1103,7 @@ msgstr "æ?°å»ºè??系人"
msgid "New Contact List"
msgstr "æ?°å»ºè??系人å??表"
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
#, c-format
msgid "current address book folder %s has %d card"
msgid_plural "current address book folder %s has %d cards"
@@ -1307,17 +1130,17 @@ msgid "Copy _Email Address"
msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??(_E)"
#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:391
msgid "Copy the email address to the clipboard"
msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??å?°å?ªè´´æ?¿"
#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:396
msgid "_Send New Message To..."
msgstr "æ??æ?°ä¿¡å??é??å?°(_S)..."
#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:398
msgid "Send a mail message to this address"
msgstr "å??é??ä¸?个é?®ä»¶ä¿¡æ?¯å?°è¿?个å?°å??"
@@ -1353,22 +1176,22 @@ msgid "Video Chat"
msgstr "è§?é¢?è??天"
#: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
#: ../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: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
+#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
msgid "Calendar"
msgstr "æ?¥å??"
#: ../addressbook/gui/widgets/eab-contact-display.c:563
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
#: ../plugins/publish-calendar/publish-calendar.ui.h:6
msgid "Free/Busy"
msgstr "å¿?/é?²"
@@ -1396,21 +1219,19 @@ msgid "Web Log"
msgstr "Web ��"
#. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
#. Create the default Person calendar
#. Create the default Person memo list
#. Create the default Person task list
#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:346 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:176
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:181
+#: ../modules/calendar/e-cal-shell-migrate.c:151
#: ../modules/calendar/e-memo-shell-backend.c:154
#: ../modules/calendar/e-memo-shell-migrate.c:112
#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:121
#: ../plugins/email-custom-header/email-custom-header.c:320
msgid "Personal"
msgstr "个人"
@@ -1427,119 +1248,13 @@ msgstr "主页"
msgid "Blog"
msgstr "Blog"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:848
#, c-format
msgid "Click to mail %s"
msgstr "å??å?»ä»¥ç»? %s å??é??é?®ä»¶"
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "æ??å??"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "å??å?°å¿?"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "����"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "å?°å??ç°¿ä¸?å?å?¨"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "æ?ªå®?ä¹?è?ªèº«è??系人"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "没æ??æ??é??"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "æ?¾ä¸?å?°è??系人"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "è??系人 ID å·²ç»?å?å?¨"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-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:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
-msgid "Canceled"
-msgstr "å·²å??æ¶?"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "æ? æ³?å??æ¶?"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "认�失败"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "�须认�"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS ���"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "没æ??æ?¥æº?"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
#: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "��模�����"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "å?¶å®?é??误"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "æ? æ??ç??æ??å?¡å?¨ç??æ?¬"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "ä¸?æ?¯æ??ç??认è¯?æ?¹å¼?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
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 "
@@ -1548,14 +1263,14 @@ msgstr ""
"æ? æ³?æ??å¼?æ¤å?°å??ç°¿ã??è¿?å?¯è?½æ??å?³ç??æ¤å?°å??簿没æ??æ ?为å?¯è?±æ?ºä½¿ç?¨ï¼?æ??è??å°?æ?ªä¸?è½½å®?æ??以"
"ä¾?è?±æ?ºä½¿ç?¨ã??请å?¨è??æ?ºæ¨¡å¼?ä¸è½½å?¥æ¤å?°å??簿以便ä¸?è½½å?¶å??容ã??"
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:81
#, c-format
msgid ""
"This address book cannot be opened. Please check that the path %s exists "
"and that permissions are set to access it."
msgstr "æ? æ³?æ??å¼?æ¤å?°å??ç°¿ã??请æ£?æ?¥è·¯å¾? %s æ?¯å?¦å?å?¨ä»¥å??æ?¨æ?¯å?¦æ??足å¤?ç??æ??é??访é?®å®?ã??"
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:93
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. To "
"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1563,7 +1278,7 @@ msgstr ""
"æ?¬ç??æ?¬ç?? Evolution 并没æ??æ?? LDAP æ?¯æ??ç¼?è¯?è¿?å?»ã??å¦?æ??æ?¨å¸?æ??å?¨ Evolution ä¸ä½¿ç?¨ "
"LDAPï¼?å°±å¿?é¡»å®?è£?å?¯ç?¨äº? LDAP ç?? Evolution å??ã??"
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
msgid ""
"This address book cannot be opened. This either means that an incorrect URI "
"was entered, or the server is unreachable."
@@ -1571,11 +1286,11 @@ msgstr ""
"æ? æ³?æ??å¼?æ¤å?°å??ç°¿ã??è¿?å?¯è?½æ?¯ç?±äº?æ?¨è¾?å?¥äº?é??误ç?? URIï¼?ä¹?å?¯è?½æ?¯å? 为æ??å?¡å?¨å·²ç»?å?³"
"é?ã??"
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
msgid "Detailed error message:"
msgstr "é??误ç»?è??æ¶?æ?¯ï¼?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -1586,7 +1301,7 @@ msgstr ""
"Evolution é??ç½®è¦?æ?¾ç¤ºç??æ?°ç?®ã??请å?¨æ??ç´¢ç??æ?¶å??æ??å®?æ?´å? ä¸¥æ ¼ç??\n"
"æ??ç´¢æ?¡ä»¶ï¼?æ??è??å?¨æ¤å?°å??ç°¿ç??ç?®å½?æ??å?¡å?¨å??æ?°ä¸å°?ç»?æ??é??å?¶è°?é«?ã??"
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"configured for this address book. Please make your search\n"
@@ -1597,44 +1312,50 @@ msgstr ""
"请å?¨æ??ç´¢ç??æ?¶å??æ??å®?æ?´å? ä¸¥æ ¼ç??æ??ç´¢æ?¡ä»¶ï¼?æ??è??å?¨æ¤å?°å??ç°¿ç??ç?®å½?æ??å?¡å?¨å??æ?°\n"
"ä¸å°?æ?¶é?´é??å?¶è°?é«?ã??"
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
-msgstr "æ¤å?°å??ç°¿ç??å??端æ? æ³?解æ??æ¤æ?¥è¯¢ã??"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "æ¤å?°å??ç°¿ç??å??端æ? æ³?解æ??æ¤æ?¥è¯¢ã??%s"
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
-msgstr "æ¤å?°å??ç°¿ç??å??端æ??ç»?æ?§è¡?æ¤æ?¥è¯¢ã??"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "æ¤å?°å??ç°¿ç??å??端æ??ç»?æ?§è¡?æ¤æ?¥è¯¢ã??%s"
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "æ¤æ?¥è¯¢æ?ªæ??å??å®?æ??ã??"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "æ¤æ?¥è¯¢æ?ªæ??å??å®?æ??ã??%s"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
msgid "Select Address Book"
msgstr "é??æ?©å?°å??ç°¿"
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:287
msgid "list"
msgstr "å??表"
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:414
msgid "Move contact to"
msgstr "å°?è??系人移è?³"
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:416
msgid "Copy contact to"
msgstr "å°?è??系人å¤?å?¶å?°"
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:419
msgid "Move contacts to"
msgstr "å°?è??系人移è?³"
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:421
msgid "Copy contacts to"
msgstr "å°?è??系人å¤?å?¶å?°"
@@ -1642,54 +1363,61 @@ msgstr "å°?è??系人å¤?å?¶å?°"
msgid "Card View"
msgstr "å??ç??è§?å?¾"
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
#: ../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
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
msgid "Importing..."
msgstr "æ£å?¨å¯¼å?¥..."
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
msgid "Outlook CSV or Tab (.csv, .tab)"
msgstr "Outlook CSV æ?? Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
msgid "Outlook CSV and Tab Importer"
msgstr "Outlook CSV å?? Tab 导å?¥å?¨"
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
msgid "Mozilla CSV or Tab (.csv, .tab)"
msgstr "Mozilla CSV æ?? Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
msgid "Mozilla CSV and Tab Importer"
msgstr "Mozilla CSV å?? Tab 导å?¥å?¨"
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
msgid "Evolution CSV or Tab (.csv, .tab)"
msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
msgid "Evolution CSV and Tab Importer"
msgstr "Evolution CSV å?? Tab 导å?¥å?¨"
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP æ?°æ?®äº¤æ?¢æ ¼å¼?(.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF 导��"
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
msgid "vCard (.vcf, .gcrd)"
msgstr "vCard (.vfg, .gcrd)"
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
msgid "Evolution vCard Importer"
msgstr "Evolution vCard 导��"
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:746
+#, c-format
+msgid "Page %d"
+msgstr "第 %d 页"
+
#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1763,21 +1491,21 @@ msgstr "æ?ªå¤?ç??ç??é??误"
msgid "Accessing LDAP Server anonymously"
msgstr "å?¿å??访é?® LDAP æ??å?¡å?¨"
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
msgid "Failed to authenticate.\n"
msgstr "认è¯?失败ã??\n"
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../addressbook/util/addressbook.c:222
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "è¾?å?¥ %s ç??å¯?ç ?(ç?¨æ?· %s)"
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:55
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
#: ../plugins/publish-calendar/publish-calendar.c:328
#: ../smime/gui/component.c:49
msgid "Enter password"
@@ -1800,14 +1528,14 @@ msgstr "â??{0}â??æ?¯å?ªè¯»æ?¥å??ï¼?æ? æ³?ä¿®æ?¹ã??请å?¦é??ä¸?个å?¯æ?¥å??约ä¼?
#: ../calendar/calendar.error.xml.h:5
msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
msgstr "å?¨æ?¨ç??约ä¼?ä¸æ·»å? æ??æ??ä¹?ç??æ??è¦?å?¯ä»¥è®©æ?¨ç??æ?¶ä»¶äººæ?´å®¹æ??æ??ç?½æ?¨çº¦ä¼?ç??å??容ã??"
#: ../calendar/calendar.error.xml.h:6
msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
msgstr "å?¨æ?¨ç??ä»»å?¡ä¸æ·»å? æ??æ??ä¹?ç??æ??è¦?å?¯ä»¥è®©æ?¨ç??æ?¶ä»¶äººæ?´å®¹æ??æ??ç?½æ?¨ä»»å?¡ç??å??容ã??"
#: ../calendar/calendar.error.xml.h:7
@@ -1897,38 +1625,34 @@ msgid "Are you sure you want to delete this task?"
msgstr "æ?¨ç¡®å®?è¦?å? é?¤æ¤ä»»å?¡å??ï¼?"
#: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "æ?¨ç¡®å®?æ?³è¦?ä¿?å?没æ??æ??è¦?ç??å¤?å¿?å??ï¼?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "æ?¨ç¡®å®?æ?³è¦?å??é??没æ??æ??è¦?ç??约ä¼?å??ï¼?"
#: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "æ?¨ç¡®å®?æ?³è¦?å??é??没æ??æ??è¦?ç??约ä¼?å??ï¼?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "æ?¨ç¡®å®?æ?³è¦?ä¿?å?没æ??æ??è¦?ç??å¤?å¿?å??ï¼?"
#: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
+msgid "Are you sure you want to save the task without a summary?"
msgstr "æ?¨ç¡®å®?æ?³è¦?å??é??没æ??æ??è¦?ç??ä»»å?¡å??ï¼?"
#: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "æ?¥å??ä»?åº?è?±æ?ºã??"
-
-#: ../calendar/calendar.error.xml.h:30
msgid "Cannot create a new event"
msgstr "æ? æ³?å??建æ?°äº?件"
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
msgid "Cannot save event"
msgstr "æ? æ³?ä¿?å?äº?件"
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
msgid "Delete calendar '{0}'?"
msgstr "å? é?¤æ?¥å??â??{0}â??å??ï¼?"
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
msgid "Delete memo list '{0}'?"
msgstr "å? é?¤å¤?å¿?å??表â??{0}â??å??ï¼?"
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
msgid "Delete task list '{0}'?"
msgstr "å? é?¤ä»»å?¡å??表â??{0}â??å??ï¼?"
@@ -1946,7 +1670,7 @@ msgstr "ä¸?è½½è¿?è¡?ä¸ã??æ?¨æ?³è¦?ä¿?å?ä»»å?¡å??ï¼?"
#: ../calendar/calendar.error.xml.h:38
msgid "Editor could not be loaded."
-msgstr "æ? æ³?è£?å?¥ç¼?è¾?å?¨ã??"
+msgstr "æ? æ³?è½½å?¥ç¼?è¾?å?¨ã??"
#: ../calendar/calendar.error.xml.h:39
msgid ""
@@ -1961,156 +1685,143 @@ msgstr "å°?ä¼?å??å?¨é?¨å?ºå¸è??å??é??ç?µå?é?®ä»¶é??请ï¼?并å??许ä»?们ç?å¤?
#: ../calendar/calendar.error.xml.h:41
msgid "Error loading calendar"
-msgstr "è£?å?¥æ?¥å??æ?¶å?ºé??"
+msgstr "è½½å?¥æ?¥å??æ?¶å?ºé??"
#: ../calendar/calendar.error.xml.h:42
msgid "Error loading memo list"
-msgstr "è£?å?¥å¤?å¿?å??表å?ºé??"
+msgstr "è½½å?¥å¤?å¿?å??表å?ºé??"
#: ../calendar/calendar.error.xml.h:43
msgid "Error loading task list"
-msgstr "è£?å?¥ä»»å?¡å??表å?ºé??"
-
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "{0} å?ºé??"
+msgstr "è½½å?¥ä»»å?¡å??表å?ºé??"
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the meeting is canceled."
msgstr "å¦?æ??æ?¨ä¸?å??é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å?ºå¸è??ä¹?许ä¸?ç?¥é??ä¼?议已ç»?å??æ¶?ã??"
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:45
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the memo has been deleted."
msgstr "å¦?æ??æ?¨ä¸?å??é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å?ºå¸è??å?¯è?½ä¸?ç?¥é??å¤?å¿?å·²ç»?å? é?¤ã??"
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:46
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the task has been deleted."
msgstr "å¦?æ??æ?¨ä¸?å??é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å?ºå¸è??å?¯è?½ä¸?ç?¥é??ä»»å?¡å·²ç»?å? é?¤ã??"
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "æ??å?¡å?¨æ? å??åº?ã??"
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:47
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
msgstr "å??é??æ?´æ?°ç??ä¿¡æ?¯å°?å??许å?¶ä»?å?ºå¸è??使ä»?们ç??æ?¥å??ä¿?æ??æ??æ?°ã??"
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:48
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
msgstr "å??é??æ?´æ?°ç??ä¿¡æ?¯å??许å?¶ä»?å?ºå¸è??使ä»?们ç??ä»»å?¡å??表ä¿?æ??æ??æ?°ã??"
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:49
msgid ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
msgstr "é??件æ£å?¨ä¸?è½½ä¸ã??ä¿?å?约ä¼?å°?使å¾?约ä¼?ä¿?å?æ?¶æ? æ³?å??å?«å??ç»ç??é??件ã??"
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:50
msgid ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
msgstr "é??件æ£å?¨ä¸?è½½ä¸ã??ä¿?å?ä»»å?¡å°?使å¾?ä»»å?¡ä¿?å?æ?¶æ? æ³?å??å?«å??ç»ç??é??件ã??"
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
msgid "Some features may not work properly with your current server."
msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?å?¨æ?¨ç?®å??ç??æ??å?¡å?¨ä¸?å·¥ä½?ã??"
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
msgid "The Evolution calendar has quit unexpectedly."
msgstr "Evolution æ?¥å??å¼?常é??å?ºã??"
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
msgid "The Evolution calendars have quit unexpectedly."
msgstr "Evolution æ?¥å??å¼?常é??å?ºã??"
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
msgid "The Evolution memo has quit unexpectedly."
msgstr "Evolution å¤?å¿?å¼?常é??å?ºã??"
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
msgid "The Evolution tasks have quit unexpectedly."
msgstr "Evolution ä»»å?¡å¼?常é??å?ºã??"
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
msgid "The calendar is not marked for offline usage."
msgstr "æ?¥å??æ?ªæ ?为è?±æ?ºä½¿ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
msgid "The memo list is not marked for offline usage."
msgstr "å¤?å¿?å??表æ?ªæ ?为è?±æ?ºä½¿ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
msgid "The task list is not marked for offline usage."
msgstr "ä»»å?¡å??表æ?ªæ ?为è?±æ?ºä½¿ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
msgid "This calendar will be removed permanently."
msgstr "æ¤æ?¥å??å°?被永ä¹?å? é?¤ã??"
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
msgid "This memo list will be removed permanently."
msgstr "æ¤å¤?å¿?å??表å°?被永ä¹?å? é?¤ã??"
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
msgid "This task list will be removed permanently."
msgstr "æ¤ä»»å?¡å??表å°?被永ä¹?å? é?¤ã??"
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "æ? æ³?è£?å?¥æ?¥å??"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
msgid "Would you like to save your changes to this appointment?"
msgstr "æ?¨æ?³è¦?ä¿?å?对约ä¼?ç??æ?´æ?¹å??ï¼?"
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
msgid "Would you like to save your changes to this meeting?"
msgstr "æ?¨æ?³è¦?ä¿?å?对æ¤ä¼?è®®ç??æ?´æ?¹å??ï¼?"
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
msgid "Would you like to save your changes to this memo?"
msgstr "æ?¨æ?³è¦?ä¿?å?对æ¤å¤?å¿?ç??æ?´æ?¹å??ï¼?"
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
msgid "Would you like to save your changes to this task?"
msgstr "æ?¨æ?³è¦?ä¿?å?对æ¤ä»»å?¡ç??æ?´æ?¹å??ï¼?"
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
msgid "Would you like to send a cancelation notice for this memo?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?为æ¤å¤?å¿?å??é??å??æ¶?é??ç?¥ï¼?"
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?¨é?¨å?ºå¸è??å??é??å??æ¶?é??ç?¥ï¼?"
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
msgid "Would you like to send meeting invitations to participants?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸è??å??é??ä¼?è®®é??请ï¼?"
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
msgid "Would you like to send this task to participants?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?å°?æ¤ä»»å?¡å??é??ç»?å?ºå¸è??ï¼?"
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
msgid "Would you like to send updated meeting information to participants?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸è??å??é??æ?´æ?°ç??ä¼?议信æ?¯ï¼?"
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
msgid "Would you like to send updated task information to participants?"
msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸è??å??é??æ?´æ?°ç??ä»»å?¡ä¿¡æ?¯ï¼?"
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:72
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -2119,103 +1830,57 @@ msgstr ""
"æ?¨æ£å?¨è¿?æ?¥å?°ä¸?æ?¯æ??ç?? GroupWise æ??å?¡å?¨ï¼?æ¤æ?¶ä½¿ç?¨ Evolution å?¯è?½é??å?°é?®é¢?ã??为äº?"
"å¾?å?°æ??ä½³æ??æ??ï¼?æ??å?¡å?¨åº?该å??级å?°æ?¯æ??ç??ç??æ?¬ã??"
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:73
msgid "You have changed this appointment, but not yet saved it."
msgstr "æ?¨å·²ç»?æ?´æ?¹äº?æ¤çº¦ä¼?ï¼?ä½?å°?æ?ªä¿?å?ã??"
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
msgid "You have changed this meeting, but not yet saved it."
msgstr "æ?¨å·²ç»?对æ¤ä¼?è®®å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å?ã??"
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
msgid "You have changed this task, but not yet saved it."
msgstr "æ?¨å·²ç»?对æ¤ä»»å?¡å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å?ã??"
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
msgid "You have made changes to this memo, but not yet saved them."
msgstr "æ?¨å·²ç»?对æ¤å¤?å¿?å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å?ã??"
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??æ?¥å??æ? æ³?使ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
msgid "Your memos will not be available until Evolution is restarted."
msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??å¤?å¿?å°?æ? æ³?使ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??ä»»å?¡å°?æ? æ³?使ç?¨ã??"
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
#: ../composer/mail-composer.error.xml.h:24
msgid "_Discard Changes"
msgstr "丢���(_D)"
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
msgid "_Save"
msgstr "ä¿?å?(_S)"
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
msgid "_Save Changes"
msgstr "ä¿?å?æ?´æ?¹(_S)"
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Send"
msgstr "å??é??(_S)"
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
msgid "_Send Notice"
msgstr "å??é??é??ç?¥(_S)"
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}ã??"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "å??å?²å¤?æ?¥äº?件ï¼?"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "æ? æ³?å?¯å?¨ evolution-data-server"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "æ? æ³?读å?¥ Pilot æ?¥å??åº?ç?¨ç¨?åº?å??"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "æ? æ³?读å?¥ Pilot ç??å¤?å¿?åº?ç?¨ç¨?åº?å??"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "æ? æ³?å??å?¥ Pilot å¤?å¿?åº?ç?¨ç¨?åº?å??"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "é»?认ä¼?å??级ï¼?"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "æ? æ³?读å?¥ Pilot ToDo åº?ç?¨ç¨?åº?å??"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "æ? æ³?å??å?¥ Pilot ToDo åº?ç?¨ç¨?åº?å??"
-
#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
msgid "minute"
msgid_plural "minutes"
@@ -2226,7 +1891,7 @@ msgid "hour"
msgid_plural "hours"
msgstr[0] "å°?æ?¶"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
msgid "Start time"
msgstr "����"
@@ -2241,10 +1906,10 @@ msgstr "å?¨é?¨é??è¿?(_A)"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
msgid "Location:"
msgstr "�置�"
@@ -2257,11 +1922,11 @@ msgid "_Dismiss"
msgstr "é??è¿?(_D)"
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1025
+#: ../calendar/gui/dialogs/comp-editor.c:1060
#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:153
#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1607
#: ../widgets/menus/gal-define-views.ui.h:5
msgid "_Edit"
msgstr "ç¼?è¾?(_E)"
@@ -2271,10 +1936,10 @@ 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:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
#: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
msgid "hours"
msgstr "å°?æ?¶"
@@ -2282,40 +1947,41 @@ msgstr "å°?æ?¶"
msgid "location of appointment"
msgstr "约��置"
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
#: ../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 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
msgid "minutes"
msgstr "å??é??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
msgid "No summary available."
msgstr "没æ??å?¯ç?¨ç??æ??è¦?ã??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
msgid "No description available."
msgstr "没æ??æ??è¿°ã??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
msgid "No location information available."
msgstr "没æ??å?¯ç?¨ç??ä½?置信æ?¯ã??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
#, c-format
msgid "You have %d alarms"
msgstr "æ?¨æ?? %d 个æ??é??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
#: ../e-util/e-non-intrusive-error-dialog.h:39
msgid "Warning"
msgstr "è¦å??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -2327,7 +1993,7 @@ msgstr ""
"å??é??ç?µå?é?®ä»¶ã??Evolution å°?以\n"
"æ?¾ç¤ºæ?®é??æ??示ä¼?è¯?æ¡?代æ?¿ã??"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2343,7 +2009,7 @@ msgstr ""
"\n"
"æ?¨ç¡®ä¿¡æ?¨è¦?è¿?è¡?该ç¨?åº?å??ï¼?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
msgid "Do not ask me about this program again."
msgstr "ä¸?è¦?å??次询é?®æ¤é?®é¢?ã??"
@@ -2382,7 +2048,7 @@ msgid "Alarm programs"
msgstr "æ??é??ç¨?åº?"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
msgid "Amount of time in seconds the error should be shown on the status bar."
msgstr "å?¨ç?¶æ??æ ?ä¸æ?¾ç¤ºé??误ç??æ?¶é?´ç§?æ?°ã??"
@@ -2508,17 +2174,15 @@ msgid "Last alarm time"
msgstr "ä¸?次æ??é??æ?¶é?´"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:89
msgid "Level beyond which the message should be logged."
msgstr "大äº?æ¤çº§å?«ç??æ¶?æ?¯ä¼?被记å½?ã??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-#, fuzzy
msgid "List of recently used second time zones in a Day View."
msgstr "å??å?ºå?¨æ?¥è§?å?¾ä¸æ??è¿?使ç?¨è¿?ç??第äº?æ?¶å?ºã??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
-#, fuzzy
msgid "List of server URLs for free/busy publishing."
msgstr "å??å?ºå??表å¿?/é?²ç??æ??å?¡å?¨ URLã??"
@@ -2695,36 +2359,32 @@ msgid "Show type field in the event/task/meeting editor"
msgstr "å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸æ?¾ç¤ºç±»å??å??"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid "Show week number in Day and Work Week View"
-msgstr "å?¨æ?¥å??å·¥ä½?æ?¥è§?å?¾ä¸æ?¾ç¤ºå?¨æ?°"
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "å?¨æ?¥è§?å?¾ã??å·¥ä½?æ?¥è§?å?¾å??æ?¥æ??导è?ªä¸æ?¾ç¤ºå?¨æ?°"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in date navigator"
-msgstr "å?¨æ?¥æ??导è?ªå?¨ä¸æ?¾ç¤ºå?¨æ?°"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
msgid ""
"Shows the second time zone in a Day View, if set. Value is similar to one "
"used in a 'timezone' key."
msgstr "å¦?æ??被设å®?ï¼?å?¨æ?¥è§?å?¾ä¸æ?¾ç¤ºç¬¬äº?æ?¶å?ºã??å?¼å??å?¨ 'timezone' ä¸ä½¿ç?¨è¿?ç??é?®ç?¸å??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
msgid "Task layout style"
msgstr "ä»»å?¡å¤?è§?é£?æ ¼"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
msgid "Task preview pane position (horizontal)"
msgstr "ä»»å?¡é¢?è§?é?¢æ?¿ç??æ°´å¹³ä½?ç½®"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
msgid "Task preview pane position (vertical)"
msgstr "ä»»å?¡é¢?è§?é?¢æ?¿ç??å??ç?´ä½?ç½®"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
msgid "Tasks due today color"
msgstr "ä»?天å?°æ??ç??ä»»å?¡é¢?è?²"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
#, no-c-format
msgid ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2733,7 +2393,7 @@ msgstr ""
"ç?¨ä½?å¿?/é?²æ?°æ?®å??å¸?ç?? URL 模æ?¿ï¼?%u å°?æ?¿æ?¢ä¸ºç?µå?é?®ä»¶ç??ç?¨æ?·é?¨å??ï¼?è?? %d å°?æ?¿æ?¢ä¸ºå??"
"å??ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
msgid ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olsen timezone database location like \"America/New York\"."
@@ -2741,186 +2401,182 @@ msgstr ""
"æ?¥å??ä¸æ?¥æ??å??æ?¶é?´æ??使ç?¨ç??é»?认æ?¶å?ºï¼?以æ?ªç¿»è¯?ç??æ?¶å?ºæ?°æ?®åº?ä½?置表示ï¼?å¦?â??Asia/"
"Shanghaiâ??ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
msgid ""
"The layout style determines where to place the preview pane in relation to "
"the memo list. \"0\" (Classic View) places the preview pane below the memo "
"list. \"1\" (Vertical View) places the preview pane next to the memo list."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
msgid ""
"The layout style determines where to place the preview pane in relation to "
"the task list. \"0\" (Classic View) places the preview pane below the task "
"list. \"1\" (Vertical View) places the preview pane next to the task list."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
msgid "The second timezone for a Day View"
msgstr "æ?¥è§?å?¾ç??第äº?æ?¶å?º"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
msgid ""
"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
"debug messages."
msgstr "æ¤é??项æ??ä¸?ç§?å?¯è?½å?¼ï¼?0ï¼?é??误ï¼?1ï¼?è¦å??ï¼?2ï¼?è°?è¯?ä¿¡æ?¯ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
msgid "Time divisions"
msgstr "æ?¶é?´å??å?²"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
msgid "Time the last alarm ran, in time_t."
msgstr "æ??é??ä¸?次è¿?è¡?ç??æ?¶é?´ï¼?以 time_t æ ¼å¼?ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
msgid "Timezone"
msgstr "��"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
msgid ""
"Transparency of the events in calendar views, a value between 0 "
"(transparent) and 1 (opaque)."
msgstr "æ?¥å??è§?å?¾ä¸äº?件ç??é??æ??度ï¼?åº?该ä»?äº? 0(é??æ??)å?? 1(ä¸?é??æ??)ä¹?é?´ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
msgid "Twenty four hour time format"
msgstr "äº?å??å??å°?æ?¶æ?¶é?´æ ¼å¼?"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
msgid "URI of the highlighted (\"primary\") calendar"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
msgid "URI of the highlighted (\"primary\") memo list"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
msgid "URI of the highlighted (\"primary\") task list"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
msgstr "é»?认æ??é??ç??å??ä½?ï¼?å?¯ä¸ºâ??minutesâ??ï¼?â??hoursâ??æ??â??daysâ??ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
msgid ""
"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
msgstr "å?³å®?æ?¯å?¦é??è??ä»»å?¡ç??å??ä½?ï¼?å?¯ä¸ºâ??minutesâ??ï¼?â??hoursâ??æ??â??daysâ??ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
msgid "Use system timezone"
msgstr "使�系���"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
msgid "Use the system timezone instead of the timezone selected in Evolution."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
msgid "Vertical pane position"
msgstr "å??ç?´é?¢æ?¿ç??ä½?ç½®"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
msgid "Week start"
msgstr "����"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
msgstr "ä¸?å?¨å¼?å§?ç??æ?¥å?ï¼?ä»?æ??æ??æ?¥(0)å?°æ??æ??å?(6)ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
msgid "Whether or not to use the notification tray for display alarms."
msgstr "æ?¯å?¦ä½¿ç?¨é??ç?¥æ??ç??æ?¥æ?¾ç¤ºæ??é??ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
msgid "Whether to ask for confirmation when deleting an appointment or task."
msgstr "å? é?¤çº¦ä¼?æ??ä»»å?¡æ?¶æ?¯å?¦è¦?æ±?确认ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
msgid "Whether to ask for confirmation when expunging appointments and tasks."
msgstr "é??æ¯?约ä¼?å??ä»»å?¡æ?¶æ?¯å?¦è¦?æ±?确认ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
msgid ""
"Whether to compress weekends in the month view, which puts Saturday and "
"Sunday in the space of one weekday."
msgstr "å?¨æ??è§?å?¾ä¸æ?¯å?¦å??缩å?¨æ?«ï¼?å??缩æ?¶å°?æ??å?¨å?å??å?¨æ?¥ç?¨ä¸?个å??å??æ ¼æ?¾ç¤ºã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
msgid "Whether to display the end time of events in the week and month views."
msgstr "æ?¯å?¦å?¨å?¨è§?å?¾å??æ??è§?å?¾ä¸æ?¾ç¤ºäº?件ç??ç»?æ??æ?¶é?´ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
msgid ""
"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
msgstr "æ?¯å?¦å?¨æ?¥å??ä¸ç»?å?¶ Marcus Bains 线(å½?å??æ?¶é?´çº¿)ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
msgid "Whether to hide completed tasks in the tasks view."
msgstr "æ?¯å?¦å?¨ä»»å?¡è§?å?¾ä¸é??è??å·²å®?æ??ç??ä»»å?¡ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
msgid "Whether to scroll a Month View by a week, not by a month."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
msgid "Whether to set a default reminder for appointments."
msgstr "æ?¯å?¦ä¸ºçº¦ä¼?设置é»?认æ??é??ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
msgid "Whether to show RSVP field in the event/task/meeting editor"
msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸æ?¾ç¤ºè¯·å??å¤?å??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
msgid "Whether to show categories field in the event/meeting editor"
msgstr "æ?¯å?¦å?¨äº?件/ä¼?è®®ç¼?è¾?å?¨ä¸æ?¾ç¤ºå??ç±»å??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
msgid "Whether to show role field in the event/task/meeting editor"
msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?è®®ä¸æ?¾ç¤ºè§?è?²å??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
msgid "Whether to show status field in the event/task/meeting editor"
msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸æ?¾ç¤ºç?¶æ??å??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
msgid ""
"Whether to show times in twenty four hour format instead of using am/pm."
msgstr "æ?¯ä»¥ 24 å°?æ?¶æ ¼å¼?è¿?æ?¯ä»¥ 12 å°?æ?¶æ ¼å¼?æ?¾ç¤ºæ?¶é?´ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
msgid "Whether to show timezone field in the event/meeting editor"
msgstr "æ?¯å?¦å?¨äº?件/ä¼?è®®ç¼?è¾?å?¨ä¸æ?¾ç¤ºæ?¶å?ºå??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
msgid "Whether to show type field in the event/task/meeting editor"
msgstr "æ?¯å?¦å?¨äº?件/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸æ?¾ç¤ºç±»å??å??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "æ?¯å?¦å?¨æ?¥è§?å?¾å??å·¥ä½?æ?¥è§?å?¾ä¸æ?¾ç¤ºå?¨æ?°ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in the date navigator."
-msgstr "æ?¯å?¦å?¨æ?¥æ??导è?ªå?¨ä¸æ?¾ç¤ºå?¨æ?°ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "æ?¯å?¦å?¨æ?¥å??ä¸æ?¾ç¤ºå?¨æ?°ã??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
msgid "Work days"
msgstr "工��"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
msgid "Workday end hour"
msgstr "å·¥ä½?æ?¥ç»?æ??å°?æ?¶"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
msgid "Workday end minute"
msgstr "å·¥ä½?æ?¥ç»?æ??å??é??"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
msgid "Workday start hour"
msgstr "工������"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
msgid "Workday start minute"
msgstr "å·¥ä½?æ?¥å¼?å§?å??é??"
@@ -2970,17 +2626,17 @@ msgid "Classification"
msgstr "å??ç±»"
#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:571 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
#: ../calendar/gui/memotypes.xml.h:6
#: ../plugins/email-custom-header/email-custom-header.c:323
#: ../widgets/misc/e-send-options.ui.h:2
msgid "Confidential"
msgstr "��"
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
#: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
#: ../widgets/table/e-table-config.ui.h:6
msgid "Description"
msgstr "æ??è¿°"
@@ -3001,7 +2657,7 @@ msgid "Exist"
msgstr "å?å?¨"
#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
#: ../plugins/publish-calendar/publish-calendar.c:831
#: ../plugins/publish-calendar/publish-calendar.ui.h:8
#: ../plugins/save-calendar/csv-format.c:377
@@ -3014,25 +2670,26 @@ msgid "Organizer"
msgstr "ç»?ç»?è??"
#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:569 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
#: ../calendar/gui/memotypes.xml.h:12
msgid "Private"
msgstr "��"
#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-cal-model.c:567
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
msgid "Public"
msgstr "��"
#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
msgid "Recurrence"
msgstr "å??ç?°"
#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
#: ../calendar/gui/e-calendar-table.etspec.h:13
#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
#: ../calendar/gui/tasktypes.xml.h:22
@@ -3094,6 +2751,7 @@ msgid "Add Alarm"
msgstr "æ·»å? æ??é??"
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
msgid "Alarm"
msgstr "æ??é??"
@@ -3109,7 +2767,7 @@ msgstr "è?ªå®?ä¹?æ??é??声é?³"
msgid "Mes_sage:"
msgstr "��(_S)�"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:79
msgid "Options"
msgstr "é??项"
@@ -3149,18 +2807,20 @@ msgstr "ä¹?å??"
msgid "before"
msgstr "ä¹?å??"
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
msgid "day(s)"
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 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
msgid "days"
msgstr "天"
@@ -3168,19 +2828,20 @@ msgstr "天"
msgid "end of appointment"
msgstr "约ä¼?ç»?æ??"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
msgid "extra times every"
msgstr "�个����"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
msgid "hour(s)"
msgstr "å°?æ?¶"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
msgid "minute(s)"
msgstr "å??é??"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
msgid "start of appointment"
msgstr "约���"
@@ -3194,35 +2855,35 @@ msgstr "æ·»å? (_D)"
#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:7
msgid "Alarms"
msgstr "æ??é??"
#. 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/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
#: ../calendar/gui/e-day-view-time-item.c:797
msgctxt "cal-second-zone"
msgid "None"
msgstr "æ? "
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
#: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
msgid "Select..."
msgstr "é??æ?©..."
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
msgid "Selected Calendars for Alarms"
msgstr "å·²é??æ?©ç?¨äº?æ??é??ç??æ?¥å??"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "æ?¶é?´å??æ?¥æ??ï¼?"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+msgid "Ti_me and date:"
+msgstr "æ?¶é?´å??æ?¥æ??(_M)ï¼?"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "å?ªæ??æ?¥æ??ï¼?"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "_Date only:"
+msgstr "ä»?æ?¥æ??(_D)ï¼?"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
#, no-c-format
@@ -3253,12 +2914,12 @@ msgstr "30 å??é??"
msgid "60 minutes"
msgstr "60 å??é??"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
msgid "Alerts"
msgstr "æ??é??"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
#: ../modules/addressbook/autocompletion-config.c:153
msgid "Date/Time Format"
msgstr "æ?¥æ??/æ?¶é?´æ ¼å¼?"
@@ -3284,20 +2945,20 @@ msgid "Display alarms in _notification area only"
msgstr "å?ªå?¨é??ç?¥å?ºå??æ?¾ç¤ºæ??é??(_N)"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
#: ../calendar/gui/e-itip-control.c:738
msgid "Friday"
msgstr "æ??æ??äº?"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../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:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2676
#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
msgid "General"
msgstr "常�"
@@ -3310,7 +2971,7 @@ msgid "Minutes"
msgstr "å??é??"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
#: ../calendar/gui/e-itip-control.c:734
msgid "Monday"
msgstr "æ??æ??ä¸?"
@@ -3324,182 +2985,190 @@ msgid "None"
msgstr "æ? "
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
msgid "Pick a color"
msgstr "é??å??ä¸?ç§?é¢?è?²"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
msgid "S_un"
msgstr "��(_U)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
#: ../calendar/gui/e-itip-control.c:739
msgid "Saturday"
msgstr "æ??æ??å?"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
msgid "Sc_roll Month View by a week"
msgstr "é??è¿?ä¸?个å?¨æ?¥æ»?å?¨æ??è§?å?¾(_R)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
msgid "Se_cond zone:"
msgstr "第���(_C)�"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
msgid "Select the calendars for alarm notification"
msgstr "é??æ?©ç?¨äº?æ??é??ç??æ?¥å??"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
msgid "Sh_ow a reminder"
msgstr "æ?¾ç¤ºä¸?æ?¡æ??é??(_O)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
msgid "Show a _reminder"
msgstr "æ?¾ç¤ºä¸?æ?¡æ??é??(_R)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Show week _numbers in date navigator"
-msgstr "å?¨æ?¥æ??æµ?è§?å?¨ä¸æ?¾ç¤ºå?¨æ?°(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "å?¨æ?¥è§?å?¾å??å·¥ä½?æ?¥è§?å?¾ä¸æ?¾ç¤ºå?¨æ?°(_U)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+msgid "Show week _numbers"
+msgstr "�示��(_N)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
#: ../calendar/gui/e-itip-control.c:733
msgid "Sunday"
msgstr "æ??æ??æ?¥"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
msgid "T_asks due today:"
msgstr "ä»?天å?°æ??ç??ä»»å?¡(_A)ï¼?"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
msgid "T_hu"
msgstr "å?¨å??(_H)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:381
msgid "Task List"
msgstr "ä»»å?¡å??表"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
msgid "Template:"
msgstr "模��"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
#: ../calendar/gui/e-itip-control.c:737
msgid "Thursday"
msgstr "æ??æ??å??"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
#: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
msgid "Time"
msgstr "��"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/event-page.ui.h:15
msgid "Time _zone:"
msgstr "��(_Z)�"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
msgid "Time format:"
msgstr "æ?¶é?´æ ¼å¼?ï¼?"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
#: ../calendar/gui/e-itip-control.c:735
msgid "Tuesday"
msgstr "æ??æ??äº?"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
msgid "Use s_ystem time zone"
msgstr "�示系���(_Y)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
#: ../calendar/gui/e-itip-control.c:736
msgid "Wednesday"
msgstr "æ??æ??ä¸?"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
msgid "Wee_k starts on:"
msgstr "�����(_K)�"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
msgid "Work Week"
msgstr "工��"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
msgid "Work days:"
msgstr "工���"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
msgid "_12 hour (AM/PM)"
msgstr "_12 å°?æ?¶(ä¸?/ä¸?å??)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
msgid "_24 hour"
msgstr "_24 å°?æ?¶"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
msgid "_Ask for confirmation when deleting items"
msgstr "å? é?¤é¡¹æ?¶è¦?æ±?确认(_A)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
msgid "_Compress weekends in month view"
msgstr "ä¸?å?¨æ??è§?å?¾ä¸æ?¾ç¤ºå?¨æ?«(_C)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
msgid "_Day begins:"
msgstr "�天��(_D)�"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
msgid "_Fri"
msgstr "��(_F)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
msgid "_Hide completed tasks after"
msgstr "é??å??é??è??å·²å®?æ??ç??ä»»å?¡(_H)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
msgid "_Mon"
msgstr "��(_M)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
msgid "_Overdue tasks:"
msgstr "延æ??ä»»å?¡(_O)ï¼?"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
msgid "_Sat"
msgstr "å?¨å?(_S)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
msgid "_Show appointment end times in week and month view"
msgstr "å?¨å?¨è§?å?¾å??æ??è§?å?¾ä¸æ?¾ç¤ºçº¦ä¼?ç»?æ??æ?¶é?´(_S)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
msgid "_Time divisions:"
msgstr "æ?¶é?´å??å?²(_T)ï¼?"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
msgid "_Tue"
msgstr "��(_T)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
msgid "_Wed"
msgstr "��(_W)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
msgid "before every anniversary/birthday"
msgstr "å?¨æ¯?个å?¨å¹´/ç??æ?¥å??"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
msgid "before every appointment"
msgstr "å?¨æ¯?次约ä¼?å??"
@@ -3508,12 +3177,12 @@ msgid "Type:"
msgstr "ç±»å??ï¼?"
#: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
msgid "_Type:"
msgstr "ç±»å??(_T)ï¼?"
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:160
+#: ../modules/addressbook/ldap-config.ui.h:26
#: ../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
@@ -3532,35 +3201,35 @@ msgstr "å°?ä»»å?¡å??表å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_Y)"
msgid "Cop_y memo list contents locally for offline operation"
msgstr "å°?å¤?å¿?å??表å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
msgid "Colo_r:"
msgstr "��(_R)�"
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
msgid "Memo List"
msgstr "å¤?å¿?å??表"
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
msgid "Calendar Properties"
msgstr "æ?¥å??å±?æ?§"
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
msgid "New Calendar"
msgstr "æ?°å»ºæ?¥å??"
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
msgid "Task List Properties"
msgstr "ä»»å?¡å??表å±?æ?§"
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
msgid "New Task List"
msgstr "æ?°å»ºä»»å?¡å??表"
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
msgid "Memo List Properties"
msgstr "å¤?å¿?å??表å±?æ?§"
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
msgid "New Memo List"
msgstr "æ?°å»ºå¤?å¿?å??表"
@@ -3613,264 +3282,240 @@ msgstr "%s æ?¨è¿?没æ??è¿?è¡?ä¿®æ?¹ï¼?æ?´æ?°ç¼?è¾?å?¨å??ï¼?"
msgid "Validation error: %s"
msgstr "æ ¡éª?é??误ï¼?%s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " å?° "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (å®?æ?? "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "å·²å®?æ?? "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (�� "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "�� "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:246
msgid "Could not save attachments"
msgstr "ä¸?è?½ä¿?å?é??件"
-#: ../calendar/gui/dialogs/comp-editor.c:515
+#: ../calendar/gui/dialogs/comp-editor.c:522
msgid "Could not update object"
msgstr "æ? æ³?æ?´æ?°å¯¹è±¡"
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:637
msgid "Edit Appointment"
msgstr "��约�"
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:644
#, c-format
msgid "Meeting - %s"
msgstr "ä¼?è®® - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:646
#, c-format
msgid "Appointment - %s"
msgstr "约� - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:652
#, c-format
msgid "Assigned Task - %s"
msgstr "å??é??ç??ä»»å?¡ - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:631
+#: ../calendar/gui/dialogs/comp-editor.c:654
#, c-format
msgid "Task - %s"
msgstr "任� - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:636
+#: ../calendar/gui/dialogs/comp-editor.c:659
#, c-format
msgid "Memo - %s"
msgstr "�� - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:675
msgid "No Summary"
msgstr "没æ??æ¦?è¦?"
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:786
msgid "Keep original item?"
msgstr "ä¿?ç??å??å§?æ?¡ç?®ï¼?"
-#: ../calendar/gui/dialogs/comp-editor.c:948
+#: ../calendar/gui/dialogs/comp-editor.c:983
msgid "Click here to close the current window"
msgstr "å??å?»æ¤å¤?å?¯å?³é?å½?å??çª?å?£"
-#: ../calendar/gui/dialogs/comp-editor.c:955 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:118
+#: ../shell/e-shell-window-actions.c:1453
#: ../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
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
msgid "Copy the selection"
msgstr "å¤?å?¶é??ä¸å??容"
-#: ../calendar/gui/dialogs/comp-editor.c:962 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:125
+#: ../shell/e-shell-window-actions.c:1460
#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1055
msgid "Cut the selection"
msgstr "å?ªå??é??ä¸å??容"
-#: ../calendar/gui/dialogs/comp-editor.c:969
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1467
#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
msgid "Delete the selection"
msgstr "å? é?¤é??ä¸å??容"
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:1011
msgid "Click here to view help available"
msgstr "å??å?»æ¤å¤?å?¯æ?¥ç??å?¯ç?¨ç??帮å?©"
-#: ../calendar/gui/dialogs/comp-editor.c:983 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:132
+#: ../shell/e-shell-window-actions.c:1502
#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1067
msgid "Paste the clipboard"
msgstr "�贴�贴�"
-#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../calendar/gui/dialogs/comp-editor.c:1039
msgid "Click here to save the current window"
msgstr "å??å?»æ¤å¤?å?¯ä¿?å?å½?å??çª?å?£"
-#: ../calendar/gui/dialogs/comp-editor.c:1011 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1572
#: ../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:1018
+#: ../calendar/gui/dialogs/comp-editor.c:1053
msgid "_Classification"
msgstr "å??ç±»(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1032 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1614
#: ../widgets/misc/e-signature-editor.c:217
msgid "_File"
msgstr "æ??件(_F)"
-#: ../calendar/gui/dialogs/comp-editor.c:1039
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1621
msgid "_Help"
msgstr "帮�(_H)"
-#: ../calendar/gui/dialogs/comp-editor.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:1081
msgid "_Insert"
msgstr "æ??å?¥(_I)"
-#: ../calendar/gui/dialogs/comp-editor.c:1053
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:312
msgid "_Options"
msgstr "é??项(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1060 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1656 ../smime/gui/smime-ui.ui.h:45
msgid "_View"
msgstr "æ?¥ç??(_V)"
-#: ../calendar/gui/dialogs/comp-editor.c:1070
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:240
msgid "_Attachment..."
msgstr "é??件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1107
msgid "Click here to attach a file"
msgstr "å??å?»æ¤å¤?å?¯ä¾¿é??å? æ??件"
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1115
msgid "_Categories"
msgstr "类�(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1117
msgid "Toggles whether to display categories"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç±»å?«"
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1123
msgid "Time _Zone"
msgstr "��(_Z)"
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1125
msgid "Toggles whether the time zone is displayed"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºæ?¶å?º"
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1134
msgid "Pu_blic"
msgstr "��(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1136
msgid "Classify as public"
msgstr "å??类为å?¬å¼?"
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1141
msgid "_Private"
msgstr "�人(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1143
msgid "Classify as private"
msgstr "å??类为ç§?人"
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1148
msgid "_Confidential"
msgstr "��(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1150
msgid "Classify as confidential"
msgstr "å??类为æ?ºå¯?"
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1158
msgid "R_ole Field"
msgstr "è§?è?²å??(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1160
msgid "Toggles whether the Role field is displayed"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè§?è?²å??"
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1166
msgid "_RSVP"
msgstr "请å??å¤?(_R)"
-#: ../calendar/gui/dialogs/comp-editor.c:1133
+#: ../calendar/gui/dialogs/comp-editor.c:1168
msgid "Toggles whether the RSVP field is displayed"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè¯·å??å¤?å??"
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1174
msgid "_Status Field"
msgstr "ç?¶æ??å??(_S)"
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1176
msgid "Toggles whether the Status field is displayed"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç?¶æ??å??"
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1182
msgid "_Type Field"
msgstr "ç±»å??å??(_T)"
-#: ../calendar/gui/dialogs/comp-editor.c:1149
+#: ../calendar/gui/dialogs/comp-editor.c:1184
msgid "Toggles whether the Attendee Type is displayed"
msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºå?ºå¸è??ç±»å??å??"
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1208
#: ../composer/e-composer-private.c:70
msgid "Recent _Documents"
msgstr "æ??è¿?æ??æ¡£(_D)"
-#: ../calendar/gui/dialogs/comp-editor.c:1693
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:428
msgid "Attach"
msgstr "é??件"
-#: ../calendar/gui/dialogs/comp-editor.c:1748
-msgid "Save"
-msgstr "ä¿?å?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2025
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2965
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "å¦?æ??æ?´æ?°å?°è¾¾ç??è¯?ï¼?对æ¤é¡¹ç?®ç??æ?´æ?¹å°?被丢å¼?"
-#: ../calendar/gui/dialogs/comp-editor.c:2933
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../plugins/prefer-plain/prefer-plain.c:64
msgid "attachment"
msgstr "é??件"
-#: ../calendar/gui/dialogs/comp-editor.c:2995
+#: ../calendar/gui/dialogs/comp-editor.c:3118
msgid "Unable to use current version!"
msgstr "æ? æ³?使ç?¨å½?å??ç??æ?¬ï¼?"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
msgid "Could not open source"
msgstr "æ? æ³?æ??å¼?æº?"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
msgid "Could not open destination"
msgstr "æ? æ³?æ??å¼?ç?®ç??"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
msgid "Destination is read only"
msgstr "ç?®ç??å?ªè¯»"
@@ -3878,53 +3523,73 @@ msgstr "ç?®ç??å?ªè¯»"
msgid "_Delete this item from all other recipient's mailboxes?"
msgstr "ä»?å?¨é?¨å?¶å®?æ?¶ä»¶äººç??é?®ç®±ä¸å? é?¤æ¤é¡¹å??ï¼?(_D)"
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "æ? æ³?å? é?¤äº?件ï¼?å??å? æ?¯ corba é??误"
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "æ?¤é??è¯?论(_R)ï¼?"
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "æ? æ³?å? é?¤ä»»å?¡ï¼?å??å? æ?¯ corba é??误"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "ç?±äº? dbus é??误 %sï¼?æ? æ³?å? é?¤è¯¥äº?件ã??"
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "æ? æ³?å? é?¤å¤?å¿?ï¼?å??å? æ?¯ corba é??误"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "ç?±äº? dbus é??误 %sï¼?æ? æ³?该å? é?¤ä»»å?¡ã??"
+#. Translators: The '%s' is replaced with a detailed error message
#: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "æ? æ³?å? é?¤é¡¹ç?®ï¼?å??å? æ?¯ corba é??误"
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "ç?±äº? dbus é??误 %sï¼?æ? æ³?该å? é?¤å¤?å¿?ã??"
-#: ../calendar/gui/dialogs/delete-error.c:71
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "ç?±äº? dbus é??误 %sï¼?æ? æ³?å? é?¤è¯¥é¡¹ç?®ã??"
+
+#: ../calendar/gui/dialogs/delete-error.c:75
msgid "The event could not be deleted because permission was denied"
msgstr "æ? æ³?å? é?¤äº?件ï¼?å??å? æ?¯æ??é??被ç¦?æ¢"
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
msgid "The task could not be deleted because permission was denied"
msgstr "æ? æ³?å? é?¤ä»»å?¡ï¼?å??å? æ?¯æ??é??被ç¦?æ¢"
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
msgid "The memo could not be deleted because permission was denied"
msgstr "æ? æ³?å? é?¤å¤?å¿?ï¼?å??å? æ?¯æ??é??被ç¦?æ¢"
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
msgid "The item could not be deleted because permission was denied"
msgstr "æ? æ³?å? é?¤é¡¹ç?®ï¼?å??å? æ?¯æ??é??被ç¦?æ¢"
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
-msgstr "ç?±äº?é??误ï¼?æ? æ³?å? é?¤äº?件"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "ç?±äº?é??误ï¼?æ? æ³?å? é?¤äº?件ï¼?%s"
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
-msgstr "ç?±äº?é??误ï¼?æ? æ³?å? é?¤ä»»å?¡"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "ç?±äº?é??误ï¼?æ? æ³?å? é?¤ä»»å?¡ï¼?%s"
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
-msgstr "ç?±äº?é??误ï¼?æ? æ³?å? é?¤å¤?å¿?"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "ç?±äº?é??误ï¼?æ? æ³?å? é?¤å¤?å¿?ï¼?%s"
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
-msgstr "ç?±äº?é??误ï¼?æ? æ³?å? é?¤é¡¹ç?®"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "ç?±äº?é??误ï¼?æ? æ³?å? é?¤é¡¹ç?®ï¼?%s"
#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
msgid "Contacts..."
@@ -3938,133 +3603,147 @@ msgstr "æ??æ??ç»?ï¼?"
msgid "Enter Delegate"
msgstr "��代表"
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:217
msgid "_Alarms"
msgstr "æ??é??(_A)"
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:219
msgid "Click here to set or unset alarms for this event"
msgstr "å??å?»æ¤å¤?以设å®?æ??å??æ¶?æ¤äº?件ç??æ??é??"
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "����示为�(_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "å??æ?¢æ?¯å?¦å°?æ?¶é?´æ?¾ç¤ºä¸ºå¿?"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
msgid "_Recurrence"
msgstr "å??ç?°(_R)"
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:240
msgid "Make this a recurring event"
msgstr "å°?æ¤äº?件æ ?为é??å¤?å??ç??"
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:245
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
#: ../widgets/misc/e-send-options.ui.h:19
msgid "Send Options"
msgstr "å??é??é??项"
-#: ../calendar/gui/dialogs/event-editor.c:217
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
msgid "Insert advanced send options"
msgstr "æ??å?¥é«?级å??é??é??项"
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:255
msgid "All _Day Event"
msgstr "�天�件(_D)"
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:257
msgid "Toggles whether to have All Day Event"
msgstr "å??æ?¢æ?¯å?¦æ??å?¨å¤©äº?件"
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "����示为�(_B)"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "å??æ?¢æ?¯å?¦å°?æ?¶é?´æ?¾ç¤ºä¸ºå¿?"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:266
msgid "_Free/Busy"
msgstr "å¿?/é?²(_F)"
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:268
msgid "Query free / busy information for the attendees"
msgstr "æ?¥è¯¢å?ºå¸è??ç??å¿?é?²ä¿¡æ?¯"
-#: ../calendar/gui/dialogs/event-editor.c:291
-msgid "Appoint_ment"
-msgstr "约�(_M)"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+msgid "Appointment"
+msgstr "约�"
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "å?ºå¸è??"
+
+#: ../calendar/gui/dialogs/event-editor.c:578
+msgid "Print this event"
+msgstr "æ??å?°æ¤äº?件"
+
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "�件�������"
+
+#: ../calendar/gui/dialogs/event-page.c:807
msgid "Event cannot be edited, because the selected calendar is read only"
msgstr "å? æ??é??ç??æ?¥ç¨?为å?ªè¯»ï¼?æ?¨æ? æ³?ç¼?è¾?该äº?件ã??"
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
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:2722
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
msgid "This event has alarms"
msgstr "æ¤äº?件æ??æ??é??"
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:14
#: ../calendar/gui/dialogs/memo-page.ui.h:2
msgid "Or_ganizer:"
msgstr "ç»?ç»?è??(_G)ï¼?"
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:937
msgid "_Delegatees"
msgstr "代ç??人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:939
msgid "Atte_ndees"
msgstr "å?ºå¸è??(_N)"
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1154
msgid "Event with no start date"
msgstr "没æ??å¼?å§?æ?¥æ??ç??äº?件"
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1157
msgid "Event with no end date"
msgstr "没æ??ç»?æ??æ?¥æ??ç??äº?件"
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
msgid "Start date is wrong"
msgstr "å¼?å§?æ?¥æ??æ??é??"
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1338
msgid "End date is wrong"
msgstr "ç»?æ??æ?¥æ??æ??é??"
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1361
msgid "Start time is wrong"
msgstr "å¼?å§?æ?¶é?´æ??é??"
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1368
msgid "End time is wrong"
msgstr "ç»?æ??æ?¶é?´æ??é??"
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
msgid "The organizer selected no longer has an account."
msgstr "é??ä¸ç??ç»?ç»?è??没æ??å¸?æ?·äº?ã??"
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
msgid "An organizer is required."
msgstr "é??è¦?ä¸?å??ç»?ç»?è??ã??"
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
msgid "At least one attendee is required."
msgstr "é??è¦?è?³å°?ä¸?个å?ºå¸è??ã??"
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2649
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "æ? æ³?æ??å¼?æ?¥å??â??%sâ??ã??"
@@ -4075,127 +3754,137 @@ 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:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
#, c-format
msgid "You are acting on behalf of %s"
msgstr "æ?¨æ£å?¨ä»¥ %s ç??身份è¡?å?¨"
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2994
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约ä¼?ç?? %d 天å??"
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:3000
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约ä¼?ç?? %d å°?æ?¶å??"
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:3006
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "约ä¼?ç?? %d å??é??å??"
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:3019
msgid "Customize"
msgstr "���"
#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:3021
msgctxt "cal-alarms"
msgid "None"
msgstr "æ? "
-#: ../calendar/gui/dialogs/event-page.ui.h:1
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:2
msgid "1 day before appointment"
msgstr "约ä¼?ç?? 1 天å??"
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:4
msgid "1 hour before appointment"
msgstr "约ä¼?ç?? 1 å°?æ?¶å??"
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:6
msgid "15 minutes before appointment"
msgstr "约ä¼?ç?? 15 å??é??å??"
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "å?ºå¸è??(_S)..."
-
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "å?ºå¸è??"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "å?ºå¸è??(_N)..."
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:12
msgid "Custom Alarm:"
msgstr "è?ªå®?ä¹?æ??é??ï¼?"
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:13
msgid "Event Description"
msgstr "äº?件æ??è¿°"
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "��(_M)�"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:16
msgid "_Alarm"
msgstr "æ??é??(_A)"
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:18
#: ../calendar/gui/dialogs/memo-page.ui.h:6
#: ../calendar/gui/dialogs/task-page.ui.h:8
#: ../widgets/misc/e-attachment-dialog.c:345
msgid "_Description:"
msgstr "æ??è¿°(_D)ï¼?"
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../plugins/calendar-weather/calendar-weather.c:358
msgid "_Location:"
msgstr "ä½?ç½®(_L)ï¼?"
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+msgid "_Summary:"
+msgstr "��(_S)�"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:21
msgid "_Time:"
msgstr "��(_T)�"
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
msgid "for"
msgstr "æ??ç»æ?¶é?´"
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
msgid "until"
msgstr "ç?´å?°"
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
msgid "Memo"
msgstr "��"
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "æ??å?°æ¤å¤?å¿?å½?"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "����������"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
msgid "Memo cannot be edited, because the selected memo list is read only"
msgstr "å? æ??é??ç??å¤?å¿?å??表为å?ªè¯»ï¼?æ?¨æ? æ³?ç¼?è¾?该å¤?å¿?ã??"
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
msgid "Memo cannot be fully edited, because you are not the organizer"
msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ¤æ? æ³?ç¼?è¾?å?¨é?¨å¤?å¿?ã??"
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:907
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "æ? æ³?æ??å¼?â??%sâ??ä¸ç??å¤?å¿?ã??"
-#: ../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:2246
-#: ../mail/em-format-html.c:2305 ../mail/em-format-html.c:2329
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2284
+#: ../mail/em-format-html.c:2343 ../mail/em-format-html.c:2367
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
msgid "To"
msgstr "�件人"
@@ -4204,67 +3893,72 @@ msgstr "�件人"
msgid "Sta_rt date:"
msgstr "å¼?å§?æ?¥æ??(_R)ï¼?"
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "��(_M)�"
+
#: ../calendar/gui/dialogs/memo-page.ui.h:5
msgid "T_o:"
msgstr "å?°(_O)ï¼?"
#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:426
#: ../calendar/gui/dialogs/task-page.ui.h:9
msgid "_Group:"
msgstr "ç»?(_G)ï¼?"
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
#, c-format
msgid "You are modifying a recurring event. What would you like to modify?"
msgstr "æ?¨å?³å°?ä¿®æ?¹å??ç?°äº?件ã??æ?¨æ?³è¦?ä¿®æ?¹ä½?å??容ï¼?"
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
#, c-format
msgid "You are delegating a recurring event. What would you like to delegate?"
msgstr "æ?¨å?³å°?代ç??å??ç?°äº?件ã??æ?¨æ?³è¦?代ç??ä½?å??容ï¼?"
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
#, c-format
msgid "You are modifying a recurring task. What would you like to modify?"
msgstr "æ?¨å?³å°?ä¿®æ?¹å??ç?°ä»»å?¡ã??æ?¨æ?³è¦?ä¿®æ?¹ä½?å??容ï¼?"
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
#, c-format
msgid "You are modifying a recurring memo. What would you like to modify?"
msgstr "æ?¨å?³å°?ä¿®æ?¹å??ç?°å¤?å¿?ã??æ?¨æ?³è¦?ä¿®æ?¹ä½?å??容ï¼?"
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
msgid "This Instance Only"
msgstr "���次"
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
msgid "This and Prior Instances"
msgstr "æ?¬æ¬¡å??以å??å??次"
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
msgid "This and Future Instances"
msgstr "æ?¬æ¬¡å??以å??å??次"
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
msgid "All Instances"
msgstr "æ??æ??å??次"
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "æ¤çº¦ä¼?å?«æ?? Evolution æ? æ³?ç¼?è¾?ç??å??ç?°ã??"
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
msgid "Recurrence date is invalid"
msgstr "å??ç?°æ?¥æ??æ? æ??"
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:932
msgid "End time of the recurrence was before event's start"
msgstr "é??å¤?äº?件æ?¡ç?®ç??ç»?æ??æ?¶é?´å°?äº?å¼?å§?æ?¶é?´"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:963
+#: ../calendar/gui/dialogs/recurrence-page.c:961
msgid "on"
msgstr "å?¨"
@@ -4272,7 +3966,7 @@ msgstr "å?¨"
#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1020
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
msgid "first"
msgstr "第�个"
@@ -4281,7 +3975,7 @@ msgstr "第�个"
#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
msgid "second"
msgstr "第�"
@@ -4289,7 +3983,7 @@ msgstr "第�"
#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
msgid "third"
msgstr "第�个"
@@ -4297,7 +3991,7 @@ msgstr "第�个"
#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
msgid "fourth"
msgstr "第å??个"
@@ -4305,7 +3999,7 @@ msgstr "第å??个"
#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
msgid "fifth"
msgstr "第�个"
@@ -4313,13 +4007,13 @@ msgstr "第�个"
#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
msgid "last"
msgstr "æ??å??ä¸?个"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
#. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
msgid "Other Date"
msgstr "å?¶å®?æ?¥æ??"
@@ -4327,7 +4021,7 @@ msgstr "å?¶å®?æ?¥æ??"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1076
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
msgid "1st to 10th"
msgstr "��"
@@ -4335,7 +4029,7 @@ msgstr "��"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
msgid "11th to 20th"
msgstr "ä¸æ?¬"
@@ -4343,45 +4037,45 @@ msgstr "ä¸æ?¬"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
msgid "21st to 31st"
msgstr "��"
#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
msgid "day"
msgstr "天"
#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
#. * (dropdown menu options are in [square brackets])."
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1242
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
msgid "on the"
msgstr "å?¨"
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
msgid "occurrences"
msgstr "循�"
-#: ../calendar/gui/dialogs/recurrence-page.c:2122
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
msgid "Add exception"
msgstr "æ·»å? ä¾?å¤?"
-#: ../calendar/gui/dialogs/recurrence-page.c:2163
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
msgid "Could not get a selection to modify."
msgstr "æ? æ³?è?·å¾?è¦?ä¿®æ?¹ç??é??ä¸é¡¹ã??"
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
msgid "Modify exception"
msgstr "修���"
-#: ../calendar/gui/dialogs/recurrence-page.c:2213
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
msgid "Could not get a selection to delete."
msgstr "æ? æ³?è?·å¾?è¦?å? é?¤ç??é??ä¸é¡¹ã??"
-#: ../calendar/gui/dialogs/recurrence-page.c:2352
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
msgid "Date/Time"
msgstr "æ?¥æ??/æ?¶é?´"
@@ -4393,7 +4087,7 @@ msgstr "�"
msgid "Exceptions"
msgstr "��"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:87
msgid "Preview"
msgstr "��"
@@ -4401,49 +4095,65 @@ msgstr "��"
msgid "This appointment rec_urs"
msgstr "æ¤çº¦ä¼?é??ç?°(_U)"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
msgid "forever"
msgstr "永�"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
msgid "month(s)"
msgstr "æ??"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
msgid "week(s)"
msgstr "å?¨"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
msgid "year(s)"
msgstr "å¹´"
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
msgid "Send my alarms with this event"
msgstr "å?¨è¿?个äº?件é??å??é??æ??ç??æ??é??"
-#: ../calendar/gui/dialogs/send-comp.c:162
-######
+# #####
+#: ../calendar/gui/dialogs/send-comp.c:164
msgid "Notify new attendees _only"
msgstr "å?ªé??ç?¥æ?°ç??å?ºå¸è??(_O)"
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
msgid "Completed date is wrong"
msgstr "å®?æ??æ?¥æ??æ??é??"
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:483
msgid "Web Page"
msgstr "�页"
#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, c-format
+msgid "Canceled"
+msgstr "å·²å??æ¶?"
+
+#. 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: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:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
#: ../plugins/save-calendar/csv-format.c:367
msgid "Completed"
msgstr "å·²å®?æ??"
@@ -4451,35 +4161,35 @@ msgstr "å·²å®?æ??"
#. 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:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1132 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1172 ../widgets/misc/e-send-options.ui.h:8
msgid "High"
msgstr "é«?"
#. 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:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2669
msgid "In Progress"
msgstr "è¿?è¡?ä¸"
#. 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:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1130 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1170 ../widgets/misc/e-send-options.ui.h:9
msgid "Low"
msgstr "ä½?"
#. 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:1315 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
+#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1171
#: ../widgets/misc/e-send-options.ui.h:13
msgid "Normal"
msgstr "ä¸"
@@ -4487,10 +4197,10 @@ msgstr "ä¸"
#. 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:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
msgid "Not Started"
msgstr "����"
@@ -4506,8 +4216,8 @@ msgstr "ç?¶æ??(_U)ï¼?"
#. Status: Accepted: X Declined: Y ...
#: ../calendar/gui/dialogs/task-details-page.ui.h:18
#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
#: ../mail/message-list.etspec.h:17
@@ -4516,7 +4226,7 @@ msgstr "ç?¶æ??"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
#: ../widgets/misc/e-send-options.ui.h:24
msgid "Undefined"
msgstr "���"
@@ -4526,7 +4236,7 @@ msgid "_Date completed:"
msgstr "å®?æ??æ?¥æ??(_D)ï¼?"
#: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
msgid "_Priority:"
msgstr "ä¼?å??级(_P)ï¼?"
@@ -4534,53 +4244,62 @@ msgstr "ä¼?å??级(_P)ï¼?"
msgid "_Web Page:"
msgstr "�页(_W)�"
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
msgid "_Status Details"
msgstr "ç?¶æ??ç»?è??(_S)"
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
msgid "Click to change or view the status details of the task"
msgstr "å??å?»å?¯æ?´æ?¹æ??æ?¥ç??ä»»å?¡ç??ç?¶æ??ç»?è??"
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:127
#: ../plugins/groupwise-features/mail-send-options.c:200
msgid "_Send Options"
msgstr "å??é??é??项(_S)"
-#: ../calendar/gui/dialogs/task-editor.c:334
-msgid "_Task"
-msgstr "任�(_T)"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
+#: ../widgets/misc/e-send-options.c:502
+msgid "Task"
+msgstr "任�"
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:331
msgid "Task Details"
msgstr "ä»»å?¡ç»?è??"
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+msgid "Print this task"
+msgstr "æ??å?°æ¤ä»»å?¡"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:379
msgid "Task cannot be edited, because the selected task list is read only"
msgstr "ä»»å?¡ä¸?è?½è¢«ç¼?è¾?ï¼?å? 为é??æ?©ç??ä»»å?¡å??表æ?¯å?ªè¯»ç??"
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
msgid "Task cannot be fully edited, because you are not the organizer"
msgstr "æ? æ³?å®?å?¨ç¼?è¾?ä»»å?¡ï¼?å? 为æ?¨ä¸?æ?¯ç»?ç»?è??"
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:434
#: ../calendar/gui/dialogs/task-page.ui.h:4
msgid "Organi_zer:"
msgstr "ç»?ç»?è??(_Z)ï¼?"
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:880
msgid "Due date is wrong"
msgstr "å?°æ??æ?¥æ??é??误"
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1744
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "æ? æ³?æ??å¼?â??%sâ??ä¸ç??ä»»å?¡ã??"
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "å?ºå¸è??(_N)..."
-
#: ../calendar/gui/dialogs/task-page.ui.h:2
msgid "Categor_ies..."
msgstr "类�(_I)..."
@@ -4676,7 +4395,7 @@ msgid "Categories:"
msgstr "类��"
#: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
msgid "Summary:"
msgstr "���"
@@ -4691,8 +4410,8 @@ msgstr "å?°æ??æ?¥æ??ï¼?"
#. Status
#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
msgid "Status:"
msgstr "ç?¶æ??ï¼?"
@@ -4701,8 +4420,8 @@ msgid "Priority:"
msgstr "ä¼?å??级ï¼?"
#: ../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
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:37
msgid "Description:"
msgstr "æ??è¿°ï¼?"
@@ -4717,32 +4436,32 @@ msgstr "�页�"
msgid "Created"
msgstr "å??建æ?¶é?´"
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
msgid "End Date"
msgstr "ç»?æ??æ?¥æ??"
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
#: ../calendar/gui/e-calendar-table.etspec.h:9
#: ../calendar/gui/e-memo-table.etspec.h:4
msgid "Last modified"
msgstr "�次修�"
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Start Date"
msgstr "å¼?å§?æ?¥æ??"
#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:563
msgid "Free"
msgstr "空�"
#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
msgid "Busy"
msgstr "ç¹?å¿?"
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -4753,63 +4472,47 @@ msgstr ""
"45.436845,125.862501"
#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
msgctxt "cal-task-status"
msgid "None"
msgstr "æ? "
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
#: ../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:169 ../calendar/gui/e-meeting-store.c:179
#: ../calendar/gui/e-meeting-store.c:856
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
msgid "Yes"
msgstr "æ?¯"
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
#: ../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
+#: ../calendar/gui/e-meeting-store.c:181
msgid "No"
msgstr "å?¦"
-#: ../calendar/gui/e-cal-model.c:378
-msgid "Default Client"
-msgstr "�认客�端"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:551
-#: ../shell/e-shell.c:868
-msgid "Shell Settings"
-msgstr "�壳设置"
-
-#: ../calendar/gui/e-cal-model.c:389 ../calendar/gui/gnome-cal.c:552
-#: ../shell/e-shell.c:869
-msgid "Application-wide settings"
-msgstr "����级设置"
-
#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:573 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
#: ../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:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2343
#: ../plugins/plugin-manager/plugin-manager.c:89
msgid "Unknown"
msgstr "��"
-#: ../calendar/gui/e-cal-model.c:1317
+#: ../calendar/gui/e-cal-model.c:1271
msgid "Recurring"
msgstr "é??å¤?"
-#: ../calendar/gui/e-cal-model.c:1319
+#: ../calendar/gui/e-cal-model.c:1273
msgid "Assigned"
msgstr "å·²å??é??"
-#: ../calendar/gui/e-cal-model.c:2225
+#: ../calendar/gui/e-cal-model.c:2175
#, c-format
msgid "Opening %s"
msgstr "æ??å¼? %s"
@@ -4846,97 +4549,97 @@ msgid "Start date"
msgstr "å¼?å§?æ?¥æ??"
#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
#: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
msgid "Type"
msgstr "ç±»å??"
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
msgid "Cut selected events to the clipboard"
msgstr "å°?é??ä¸äº?件å?ªå??å?°å?ªè´´æ?¿"
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
msgid "Copy selected events to the clipboard"
msgstr "å°?é??ä¸äº?件å¤?å?¶å?°å?ªè´´æ?¿"
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
msgid "Paste events from the clipboard"
msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´äº?件"
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
msgid "Delete selected events"
msgstr "å? é?¤é??ä¸ç??äº?件"
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
msgid "Deleting selected objects"
msgstr "å? é?¤é??ä¸ç??对象"
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-task-table.c:1068
msgid "Updating objects"
msgstr "��对象"
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-itip-control.c:1195
#: ../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:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2331
msgid "Accepted"
msgstr "æ?¥å??"
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-itip-control.c:1205
#: ../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:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2337
msgid "Declined"
msgstr "æ??ç»?"
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1722
#: ../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
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
msgid "Tentative"
msgstr "æ??æ?¶ç??"
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1723
#: ../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:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2340
msgid "Delegated"
msgstr "被å§?ä»»ç??"
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1724
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:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
+#: ../calendar/gui/e-task-table.c:743
#, 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:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
+#: ../calendar/gui/e-task-table.c:746
#, c-format
msgid "Organizer: %s"
msgstr "ç»?ç»?è??ï¼?%s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
#, c-format
msgid "Location: %s"
msgstr "�置�%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1920
#, c-format
msgid "Time: %s %s"
msgstr "���%s %s"
@@ -4979,8 +4682,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:864 ../calendar/gui/e-day-view.c:1883
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
msgid "%A %d %B"
msgstr "%B%dæ?¥%A"
@@ -4990,10 +4693,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:868 ../calendar/gui/e-day-view.c:1900
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:990
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
msgid "%a %d %b"
msgstr "%-mæ??%-dæ?¥%A"
@@ -5002,31 +4705,35 @@ 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:872 ../calendar/gui/e-day-view.c:1916
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
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:1116 ../calendar/gui/e-week-view.c:750
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
#: ../calendar/gui/print.c:819
msgid "am"
msgstr "ä¸?å??"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1119 ../calendar/gui/e-week-view.c:753
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
#: ../calendar/gui/print.c:821
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:2613
+#: ../calendar/gui/e-day-view.c:2645
#, c-format
msgid "Week %d"
msgstr "第%d�"
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "é??å¤?ï¼?"
+
#: ../calendar/gui/e-itip-control.c:765
msgid "Yes. (Complex Recurrence)"
msgstr "æ?¯(å¤?æ??é??ç?°)"
@@ -5102,7 +4809,7 @@ msgstr "ç»?æ??"
msgid "Due"
msgstr "å?°æ??"
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
msgid "iCalendar Information"
msgstr "iCalendar ä¿¡æ?¯"
@@ -5111,303 +4818,303 @@ msgstr "iCalendar ä¿¡æ?¯"
msgid "iCalendar Error"
msgstr "iCalendar é??误"
-#: ../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:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
msgid "An unknown person"
msgstr "æ?ªç?¥ç??人"
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr "<br> 请æ?¥ç??ä¸?å??ä¿¡æ?¯ï¼?并ä»?ä¸?é?¢ç??è??å??ä¸é??æ?©ä¸?个å?¨ä½?ã??"
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr "请æ?¥ç??ä¸?å??ä¿¡æ?¯ï¼?并ä»?ä¸?é?¢ç??è??å??ä¸é??æ?©ä¸?个å?¨ä½?ã??"
#. 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:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2318
msgctxt "cal-itip"
msgid "None"
msgstr "æ? "
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2334
msgid "Tentatively Accepted"
msgstr "æ??æ?¶æ?¥å??"
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
msgid ""
"The meeting has been canceled, however it could not be found in your "
"calendars"
msgstr "ä¼?议已ç»?被å??æ¶?ï¼?ä½?æ? æ³?å?¨æ?¨ç??æ?¥å??ä¸æ?¾å?°è¯¥ä¼?è®®"
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
msgid ""
"The task has been canceled, however it could not be found in your task lists"
msgstr "ä»»å?¡å·²ç»?被å??æ¶?ï¼?ä½?æ? æ³?å?¨æ?¨ç??ä»»å?¡å??表ä¸æ?¾å?°è¯¥ä»»å?¡"
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> å??å¸?äº?ä¼?议信æ?¯ã??"
+msgid "%s has published meeting information."
+msgstr "%s å??å¸?äº?ä¼?议信æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
msgid "Meeting Information"
msgstr "�议信�"
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
#, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> 请æ±? %s å??å? ä¸?个ä¼?è®®ã??"
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s 请æ±? %s å??å? ä¸?个ä¼?è®®ã??"
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> 请æ±?æ?¨å??å? ä¸?个ä¼?è®®ã??"
+msgid "%s requests your presence at a meeting."
+msgstr "%s é??请æ?¨å??å? ä¸?个ä¼?è®®ã??"
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
msgid "Meeting Proposal"
msgstr "�议建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
#, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> å¸?æ??å? å?¥å?°å·²æ??ç??ä¼?è®®ã??"
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s å¸?æ??å? å?¥å?°å·²æ??ç??ä¼?è®®ã??"
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
msgid "Meeting Update"
msgstr "�议��"
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> å¸?æ??æ?¶å?°æ??æ?°ç??ä¼?议信æ?¯ã??"
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??ä¼?议信æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
msgid "Meeting Update Request"
msgstr "�议��请�"
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> å·²å??å¤?ä¸?个ä¼?议请æ±?ã??"
+msgid "%s has replied to a meeting request."
+msgstr "%s å·²å??å¤?ä¸?个ä¼?议请æ±?ã??"
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
msgid "Meeting Reply"
msgstr "ä¼?è®®ç?å¤?"
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
#, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> å??æ¶?äº?ä¸?个ä¼?è®®ã??"
+msgid "%s has canceled a meeting."
+msgstr "%s å??æ¶?äº?ä¸?个ä¼?è®®ã??"
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
msgid "Meeting Cancelation"
msgstr "ä¼?è®®å??æ¶?"
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> å??é??äº?ä¸?个æ? æ³?ç??解ç??信件ã??"
+msgid "%s has sent an unintelligible message."
+msgstr "%s å??é??äº?ä¸?个æ? æ³?ç??解ç??ä¿¡æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
msgid "Bad Meeting Message"
-msgstr "é??误ç??ä¼?议信件"
+msgstr "é??误ç??ä¼?议信æ?¯"
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> å??å¸?äº?ä»»å?¡ä¿¡æ?¯ã??"
+msgid "%s has published task information."
+msgstr "%s å??å¸?äº?ä»»å?¡ä¿¡æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
msgid "Task Information"
msgstr "任�信�"
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
#, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> 请æ±? %s å®?æ??ä¸?个任å?¡ã??"
+msgid "%s requests %s to perform a task."
+msgstr "%s 请æ±? %s å®?æ??ä¸?个任å?¡ã??"
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> 请æ±?æ?¨å®?æ??ä¸?个任å?¡ã??"
+msgid "%s requests you perform a task."
+msgstr "%s 请æ±?æ?¨å®?æ??ä¸?个任å?¡ã??"
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
msgid "Task Proposal"
msgstr "任�建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
#, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s<b> å¸?æ??å? å?¥å?°å·²æ??ç??ä»»å?¡ã??"
+msgid "%s wishes to be added to an existing task."
+msgstr "%s å¸?æ??å? å?¥å?°å·²æ??ç??ä»»å?¡ã??"
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
msgid "Task Update"
msgstr "任���"
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> å¸?æ??è?·å??æ??æ?°ç??ä»»å?¡ä¿¡æ?¯ã??"
+msgid "%s wishes to receive the latest task information."
+msgstr "%s å¸?æ??è?·å??æ??æ?°ç??ä»»å?¡ä¿¡æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
msgid "Task Update Request"
msgstr "任���请�"
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> å·²ç»?å??å¤?äº?ä»»å?¡å??é??ã??"
+msgid "%s has replied to a task assignment."
+msgstr "%s å·²ç»?å??å¤?äº?ä»»å?¡å??é??ã??"
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
msgid "Task Reply"
msgstr "ä»»å?¡å??å¤?"
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
#, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> å??æ¶?äº?ä»»å?¡ã??"
+msgid "%s has canceled a task."
+msgstr "%s å??æ¶?äº?ä»»å?¡ã??"
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
msgid "Task Cancelation"
msgstr "ä»»å?¡å??æ¶?"
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
msgid "Bad Task Message"
-msgstr "é??误ç??ä»»å?¡ä¿¡ä»¶"
+msgstr "é??误ç??ä»»å?¡ä¿¡æ?¯"
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
#, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> å??å¸?äº?å¿?é?²ä¿¡æ?¯ã??"
+msgid "%s has published free/busy information."
+msgstr "%s å??å¸?äº?å¿?é?²ä¿¡æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
msgid "Free/Busy Information"
msgstr "��信�"
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> 请æ±?æ?¨ç??å¿?é?²ä¿¡æ?¯ã??"
+msgid "%s requests your free/busy information."
+msgstr "%s 请æ±?æ?¨ç??å¿?é?²ä¿¡æ?¯ã??"
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
msgid "Free/Busy Request"
msgstr "�/�请�"
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> åº?ç?äº?å¿?é?²è¯·æ±?ã??"
+msgid "%s has replied to a free/busy request."
+msgstr "%s åº?ç?äº?å¿?é?²è¯·æ±?ã??"
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
msgid "Free/Busy Reply"
msgstr "å¿?é?²åº?ç?"
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
msgid "Bad Free/Busy Message"
-msgstr "é??误ç??å¿?é?²ä¿¡ä»¶"
+msgstr "é??误ç??å¿?é?²ä¿¡æ?¯"
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
msgid "The message does not appear to be properly formed"
-msgstr "信件ç??æ ¼å¼?å?¯è?½ä¸?æ£ç¡®"
+msgstr "ä¿¡æ?¯ç??æ ¼å¼?å?¯è?½ä¸?æ£ç¡®"
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
msgid "The message contains only unsupported requests."
-msgstr "信件å?ªå?«æ??ä¸?æ?¯æ??ç??请æ±?ã??"
+msgstr "ä¿¡æ?¯å?ªå?«æ??ä¸?æ?¯æ??ç??请æ±?ã??"
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
msgid "The attachment does not contain a valid calendar message"
-msgstr "é??件ä¸æ²¡æ??æ??æ??ç??æ?¥å??信件"
+msgstr "é??件ä¸æ²¡æ??æ??æ??ç??æ?¥å??ä¿¡æ?¯"
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
msgid "The attachment has no viewable calendar items"
msgstr "é??件ä¸æ²¡æ??å?¯æ?¥ç??ç??æ?¥å??项ç?®"
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
msgid "Update complete\n"
msgstr "æ?´æ?°å®?æ??\n"
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
msgid "Object is invalid and cannot be updated\n"
msgstr "对象æ? æ??ï¼?æ? æ³?æ?´æ?°\n"
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "æ¤å??åº?并é??æ?¥è?ªå½?å??å?ºå¸è??ã??å°?å??åº?è??å? 为å?ºå¸è??å??ï¼?"
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "å? 为æ? æ??ç?¶æ??è??æ? æ³?æ?´æ?°å?ºå¸è??ç?¶æ??ï¼?\n"
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
msgid "Attendee status updated\n"
msgstr "æ?´æ?°å?ºå¸è??ç?¶æ??\n"
-#: ../calendar/gui/e-itip-control.c:2071
+#: ../calendar/gui/e-itip-control.c:2084
#: ../plugins/itip-formatter/itip-formatter.c:1421
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "ç?±äº?æ?¡ç?®ä¸?å??å?å?¨è??æ? æ³?æ?´æ?°å?ºå¸è??ç?¶æ??"
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
msgid "Item sent!\n"
msgstr "项ç?®å·²å??é??ï¼?\n"
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
msgid "The item could not be sent!\n"
msgstr "æ? æ³?å??é??项ç?®ï¼?\n"
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
msgid "Choose an action:"
msgstr "é??æ?©ä¸?项活å?¨ï¼?"
#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "请å??å¤?"
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
msgid "Update"
msgstr "æ?´æ?°"
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
#: ../plugins/groupwise-features/gw-ui.c:331
msgid "Accept"
msgstr "æ?¥å??"
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
msgid "Tentatively accept"
msgstr "æ??æ?¶æ?¥å??"
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
#: ../plugins/groupwise-features/gw-ui.c:345
msgid "Decline"
msgstr "æ??ç»?"
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
msgid "Send Free/Busy Information"
msgstr "å??é??å¿?é?²ä¿¡æ?¯"
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
msgid "Update respondent status"
msgstr "æ?´æ?°åº?ç?è??ç?¶æ??"
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
msgid "Send Latest Information"
msgstr "å??é??æ??æ?°ç??ä¿¡æ?¯"
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../widgets/misc/e-activity-proxy.c:298
msgid "Cancel"
msgstr "å??æ¶?"
@@ -5417,7 +5124,7 @@ msgstr "--å?°--"
#: ../calendar/gui/e-itip-control.ui.h:2
msgid "Calendar Message"
-msgstr "æ?¥å??信件"
+msgstr "æ?¥å??ä¿¡æ?¯"
#: ../calendar/gui/e-itip-control.ui.h:3
msgid "Date:"
@@ -5425,11 +5132,11 @@ msgstr "æ?¥æ??ï¼?"
#: ../calendar/gui/e-itip-control.ui.h:5
msgid "Loading Calendar"
-msgstr "è£?å?¥æ?¥å??"
+msgstr "è½½å?¥æ?¥å??"
#: ../calendar/gui/e-itip-control.ui.h:6
msgid "Loading calendar..."
-msgstr "æ£å?¨è£?å?¥æ?¥å??..."
+msgstr "æ£å?¨è½½å?¥æ?¥å??..."
#: ../calendar/gui/e-itip-control.ui.h:7
msgid "Organizer:"
@@ -5456,72 +5163,72 @@ msgid "Resources"
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:102 ../calendar/gui/e-meeting-store.c:119
#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
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/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
#: ../calendar/gui/print.c:969 ../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/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
#: ../calendar/gui/print.c:970
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/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
#: ../calendar/gui/print.c:971
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/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
#: ../calendar/gui/print.c:985
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:139 ../calendar/gui/e-meeting-store.c:156
#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
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/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
#: ../calendar/gui/print.c:987
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/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
#: ../calendar/gui/print.c:988
msgid "Non-Participant"
msgstr "ä¸?å??å? "
#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
#: ../calendar/gui/e-meeting-store.c:863
msgid "Needs Action"
msgstr "é??è¦?å?¨ä½?"
#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
msgid "Attendee "
msgstr "å?ºå¸è?? "
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
msgid "In Process"
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:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2376
msgid "%A, %B %d, %Y"
msgstr "%Yå¹´%mæ??%dæ?¥%A"
@@ -5530,7 +5237,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:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2407
msgid "%a %m/%d/%Y"
msgstr "%Yå¹´%mæ??%dæ?¥%A"
@@ -5540,67 +5247,63 @@ msgstr "%Yå¹´%mæ??%dæ?¥%A"
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
msgid "Out of Office"
msgstr "å??å?¬å®¤ä»¥å¤?"
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
msgid "No Information"
msgstr "没æ??ä¿¡æ?¯"
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "å?ºå¸è??(_T)..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
msgid "O_ptions"
msgstr "é??项(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
msgid "Show _only working hours"
msgstr "��示工���(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
msgid "Show _zoomed out"
msgstr "æ?¾ç¤ºç¼©æ?¾ç??è¾?å?º(_Z)"
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
msgid "_Update free/busy"
msgstr "æ?´æ?°å¿?é?²(_U)"
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
msgid "_Autopick"
msgstr "è?ªå?¨è?·å??(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
msgid "_All people and resources"
msgstr "å?¨é?¨äººå??èµ?æº?(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
msgid "All _people and one resource"
msgstr "å?¨é?¨äººå??ä¸?个èµ?æº?(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
msgid "_Required people"
msgstr "å¿?é??ç??人(_R)"
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
msgid "Required people and _one resource"
msgstr "å¿?é??ç??人å??ä¸?个èµ?æº?(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
msgid "_Start time:"
msgstr "����(_S)�"
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
msgid "_End time:"
msgstr "ç»?æ??æ?¶é?´(_E)ï¼?"
@@ -5628,45 +5331,47 @@ msgstr "è¯è¨?"
msgid "Member"
msgstr "æ??å??"
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:456
+#: ../calendar/gui/e-memo-table.c:412
+#: ../modules/calendar/e-cal-shell-content.c:468
#: ../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
+#: ../plugins/caldav/caldav-browse-server.c:431
msgid "Memos"
msgstr "��"
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
msgid "* No Summary *"
msgstr "* 没æ??æ¦?è¦? *"
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
msgid "Start: "
msgstr "���"
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
msgid "Due: "
msgstr "å?°æ??ï¼?"
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:710
msgid "Cut selected memos to the clipboard"
msgstr "å°?é??ä¸å¤?å¿?å?ªå??å?°å?ªè´´æ?¿"
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:716
msgid "Copy selected memos to the clipboard"
msgstr "å°?é??ä¸å¤?å¿?å¤?å?¶å?°å?ªè´´æ?¿"
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:722
msgid "Paste memos from the clipboard"
msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´å¤?å¿?"
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
msgid "Delete selected memos"
msgstr "å? é?¤é??ä¸ç??å¤?å¿?"
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:734
msgid "Select all visible memos"
msgstr "é??ä¸æ??æ??å?¯è§?ç??å¤?å¿?"
@@ -5674,142 +5379,107 @@ msgstr "é??ä¸æ??æ??å?¯è§?ç??å¤?å¿?"
msgid "Click to add a memo"
msgstr "å??å?»ä»¥æ·»å? å¤?å¿?"
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:418
+#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:429
#: ../modules/calendar/e-task-shell-view-actions.c:241
#: ../modules/calendar/e-task-shell-view-actions.c:256
#: ../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/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
msgid "Tasks"
msgstr "任�"
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:933
msgid "Cut selected tasks to the clipboard"
msgstr "å°?é??ä¸ä»»å?¡å?ªå??å?°å?ªè´´æ?¿"
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:939
msgid "Copy selected tasks to the clipboard"
msgstr "å°?é??ä¸ä»»å?¡å¤?å?¶å?°å?ªè´´æ?¿"
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:945
msgid "Paste tasks from the clipboard"
msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´ä»»å?¡"
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:690
msgid "Delete selected tasks"
msgstr "å? é?¤é??ä¸ç??ä»»å?¡"
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:957
msgid "Select all visible tasks"
msgstr "é??ä¸æ??æ??å?¯è§?ç??ä»»å?¡"
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
msgid "Select Timezone"
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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
msgid "%d %B"
msgstr "%-mæ??%-dæ?¥"
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
msgid "It has alarms."
msgstr "æ??æ??é??ã??"
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
msgid "It has recurrences."
msgstr "æ??å??ç?°ã??"
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
msgid "It is a meeting."
msgstr "为ä¼?è®®ã??"
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
#, c-format
msgid "Calendar Event: Summary is %s."
msgstr "æ?¥å??äº?件ï¼?æ??è¦?为 %sã??"
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
msgid "Calendar Event: It has no summary."
msgstr "æ?¥å??äº?件ï¼?æ? æ??è¦?ã??"
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
msgid "calendar view event"
msgstr "æ?¥å??è§?å?¾äº?件"
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
msgid "Grab Focus"
msgstr "����"
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
msgid "New Appointment"
msgstr "�建约�"
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
msgid "New All Day Event"
msgstr "�建�天�件"
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
msgid "New Meeting"
msgstr "æ?°ä¼?è®®"
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
msgid "Go to Today"
msgstr "转��天"
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
msgid "Go to Date"
msgstr "转å?°æ?¥æ??"
@@ -5818,7 +5488,7 @@ msgstr "转å?°æ?¥æ??"
msgid "a table to view and select the current time range"
msgstr "å?¯æ?¥ç??并é??æ?©å½?å??æ?¶é?´è??å?´ç??表"
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
#, c-format
msgid "It has %d event."
msgid_plural "It has %d events."
@@ -5826,14 +5496,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:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
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:164
+#: ../calendar/gui/ea-day-view.c:162
#, c-format
msgid "Work Week View: %s. %s"
msgstr "å·¥ä½?æ?¥è§?å?¾ï¼?%sã??%s"
@@ -5841,47 +5511,47 @@ 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:170
+#: ../calendar/gui/ea-day-view.c:168
#, c-format
msgid "Day View: %s. %s"
msgstr "æ?¥è§?å?¾ï¼?%sã??%s"
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:202
msgid "calendar view for a work week"
msgstr "å·¥ä½?æ?¥ç??æ?¥å??è§?å?¾"
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:204
msgid "calendar view for one or more days"
msgstr "ä¸?天æ??å¤?天ç??æ?¥å??è§?å?¾"
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
msgid "Gnome Calendar"
msgstr "Gnome æ?¥å??"
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:986
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
msgid "%A %d %b %Y"
msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:993
-#: ../modules/calendar/e-cal-shell-view-private.c:999
-#: ../modules/calendar/e-cal-shell-view-private.c:1002
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
msgid "%a %d %b %Y"
msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
-#: ../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:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1019
-#: ../modules/calendar/e-cal-shell-view-private.c:1030
-#: ../modules/calendar/e-cal-shell-view-private.c:1037
-#: ../modules/calendar/e-cal-shell-view-private.c:1040
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
msgid "%d %b %Y"
msgstr "%Yå¹´%-mæ??%-dæ?¥"
@@ -5903,15 +5573,15 @@ msgstr "æ??è§?å?¾ï¼?%sã??%s"
msgid "Week View: %s. %s"
msgstr "å?¨è§?å?¾ï¼?%sã??%s"
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:195
msgid "calendar view for a month"
msgstr "æ??æ?¥å??è§?å?¾"
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:197
msgid "calendar view for one or more weeks"
msgstr "ä¸?å?¨æ??å¤?å?¨ç??æ?¥å??è§?å?¾"
-#: ../calendar/gui/gnome-cal.c:2299
+#: ../calendar/gui/gnome-cal.c:2287
msgid "Purging"
msgstr "é??æ¯?"
@@ -5964,39 +5634,40 @@ msgid "Select Date"
msgstr "é??æ?©æ?¥æ??"
#: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "ä¹?æ??"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "é??æ?©ä»?天(_T)"
#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "é??æ?©ä»?天(_S)"
+msgid "September"
+msgstr "ä¹?æ??"
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
msgid "An organizer must be set."
msgstr "å¿?须设å®?ç»?ç»?è??ã??"
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
msgid "At least one attendee is necessary"
msgstr "è?³å°?é??è¦?ä¸?个å??å? è??"
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
msgid "Event information"
msgstr "�件信�"
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
msgid "Task information"
msgstr "任�信�"
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
msgid "Memo information"
msgstr "��信�"
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
msgid "Free/Busy information"
msgstr "��信�"
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
msgid "Calendar information"
msgstr "æ?¥å??ä¿¡æ?¯"
@@ -6004,7 +5675,7 @@ msgstr "æ?¥å??ä¿¡æ?¯"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
msgctxt "Meeting"
msgid "Accepted"
msgstr "æ?¥å??"
@@ -6013,7 +5684,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:686
+#: ../calendar/gui/itip-utils.c:685
msgctxt "Meeting"
msgid "Tentatively Accepted"
msgstr "æ??æ?¶æ?¥å??"
@@ -6025,7 +5696,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:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
msgctxt "Meeting"
msgid "Declined"
msgstr "æ??ç»?"
@@ -6034,7 +5705,7 @@ msgstr "æ??ç»?"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
msgctxt "Meeting"
msgid "Delegated"
msgstr "被å§?ä»»ç??"
@@ -6042,7 +5713,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:713
+#: ../calendar/gui/itip-utils.c:712
msgctxt "Meeting"
msgid "Updated"
msgstr "æ?´æ?°"
@@ -6050,7 +5721,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:720
+#: ../calendar/gui/itip-utils.c:719
msgctxt "Meeting"
msgid "Cancel"
msgstr "å??æ¶?"
@@ -6058,7 +5729,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:727
+#: ../calendar/gui/itip-utils.c:726
msgctxt "Meeting"
msgid "Refresh"
msgstr "å?·æ?°"
@@ -6066,29 +5737,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:734
+#: ../calendar/gui/itip-utils.c:733
msgctxt "Meeting"
msgid "Counter-proposal"
msgstr "æ??票表å?³"
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "��信� (%s � %s)"
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
msgid "iCalendar information"
msgstr "iCalendar ä¿¡æ?¯"
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
msgid "Unable to book a resource, the new event collides with some other."
msgstr "æ? æ³?é¢?约èµ?æº?ï¼?æ?°äº?件ä¸?å?¶å®?äº?件å?²çª?ã??"
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
msgid "Unable to book a resource, error: "
msgstr "æ? æ³?é¢?约èµ?æº?ï¼?é??误ï¼?"
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
msgid "You must be an attendee of the event."
msgstr "æ?¨å¿?é¡»æ?¯äº?件ç??å?ºå¸è??ã??"
@@ -6244,49 +5915,73 @@ msgstr "�"
msgid "Sa"
msgstr "å?"
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "约�"
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
+msgid " to "
+msgstr " å?° "
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "任�"
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
+msgid " (Completed "
+msgstr " (å®?æ?? "
-#: ../calendar/gui/print.c:2591
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
+msgid "Completed "
+msgstr "å·²å®?æ?? "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
+msgid " (Due "
+msgstr " (�� "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2454
+msgid "Due "
+msgstr "�� "
+
+#: ../calendar/gui/print.c:2615
#, c-format
msgid "Summary: %s"
msgstr "���%s"
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2639
msgid "Attendees: "
msgstr "å?ºå¸è??ï¼?"
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2682
#, c-format
msgid "Status: %s"
msgstr "ç?¶æ??ï¼?%s"
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2697
#, c-format
msgid "Priority: %s"
msgstr "ä¼?å??级ï¼?%s"
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2715
#, c-format
msgid "Percent Complete: %i"
msgstr "å®?æ??ç??ï¼?%i"
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2726
#, c-format
msgid "URL: %s"
msgstr "URLï¼?%s"
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2739
#, c-format
msgid "Categories: %s"
msgstr "类��%s"
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2750
msgid "Contacts: "
msgstr "è??系人ï¼?"
@@ -6295,10 +5990,6 @@ msgstr "è??系人ï¼?"
msgid "% Completed"
msgstr "% å®?æ??"
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "å·²å??æ¶?"
-
#: ../calendar/gui/tasktypes.xml.h:15
msgid "In progress"
msgstr "è¿?è¡?ä¸"
@@ -6311,44 +6002,189 @@ msgstr "大�"
msgid "is less than"
msgstr "��"
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
msgid "Appointments and Meetings"
msgstr "约ä¼?å??ä¼?è®®"
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
#: ../plugins/itip-formatter/itip-formatter.c:1833
msgid "Opening calendar"
msgstr "æ??å¼?æ?¥å??"
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
msgid "iCalendar files (.ics)"
msgstr "iCalendar æ??件(.ics)"
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar 导��"
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
msgid "Reminder!"
msgstr "æ??é??!!"
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "vCalendar æ??件(.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+msgid "vCalendar files (.vcs)"
+msgstr "vCalendar æ??件(.vcs)"
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar 导��"
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
msgid "Calendar Events"
msgstr "æ?¥å??äº?件"
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution æ?¥å??æ?ºè?½å¯¼å?¥å?¨"
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "ä¼?è®®"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "�件"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "任�"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "��"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "æ??å??ç?°"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "æ?¬æ¬¡å??以å??å??次"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "æ??æ??é??"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "æ??é??件"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "��"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "��"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "��"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "å??ç±»"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "��"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "ä½?ç½®"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "��"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "å?°æ??"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "ç»?æ??"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "类�"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "å·²å®?æ??"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "ç»?ç»?è??"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "å?ºå¸è??"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "æ??è¿°"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "ç±»å??"
+
#.
#. *
#. * This program is free software; you can redistribute it and/or
@@ -7898,288 +7734,256 @@ msgstr "太平�/���"
msgid "Pacific/Yap"
msgstr "太平æ´?/é??浦"
-#: ../composer/e-composer-actions.c:79
-msgid "Untitled Message"
-msgstr "æ? æ ?é¢?信件"
-
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:163
msgid "Save as..."
msgstr "å?¦å?为..."
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:242
+#: ../widgets/misc/e-attachment-view.c:329
msgid "Attach a file"
msgstr "æ·»å? é??件"
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:247
#: ../widgets/misc/e-signature-editor.c:203
msgid "_Close"
msgstr "å?³é?(_C)"
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:249
msgid "Close the current file"
msgstr "å?³é?å½?å??æ??件"
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:254
msgid "_Print..."
msgstr "æ??å?°(_P)..."
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:261
msgid "Print Pre_view"
msgstr "æ??å?°é¢?è§?(_V)"
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:270
msgid "Save the current file"
msgstr "ä¿?å?å½?å??æ??件"
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:275
msgid "Save _As..."
msgstr "å?¦å?为(_A)..."
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:277
msgid "Save the current file with a different name"
msgstr "ç?¨ä¸?å??ç??æ??件å??ä¿?å?å½?å??æ??件"
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:282
msgid "Save as _Draft"
msgstr "å?¦å?为è??稿(_D)"
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:284
msgid "Save as draft"
msgstr "å?¦å?为è??稿"
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
msgid "S_end"
msgstr "å??é??(_E)"
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:291
msgid "Send this message"
msgstr "å??é??è¿?å°?ä¿¡"
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:296
msgid "New _Message"
-msgstr "�建信件(_M)"
+msgstr "�建信�(_M)"
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:298
msgid "Open New Message window"
-msgstr "æ??å¼?æ?°å»ºä¿¡ä»¶çª?å?£"
+msgstr "æ??å¼?æ?°å»ºä¿¡æ?¯çª?å?£"
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:305
msgid "Character _Encoding"
msgstr "å?符ç¼?ç ?(_E)"
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:322
msgid "PGP _Encrypt"
msgstr "PGP å? å¯?(_E)"
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:324
msgid "Encrypt this message with PGP"
-msgstr "ç?¨ PGP å? å¯?该信件"
+msgstr "ç?¨ PGP å? å¯?该信æ?¯"
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:330
msgid "PGP _Sign"
msgstr "PGP ç¾å??(_S)"
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:332
msgid "Sign this message with your PGP key"
-msgstr "ç?¨æ?¨ç?? PGP å¯?é?¥ç¾å??该信件"
+msgstr "ç?¨æ?¨ç?? PGP å¯?é?¥ç¾å??该信æ?¯"
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:338
msgid "_Prioritize Message"
msgstr "æ ?为ä¼?å??(_P)"
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:340
msgid "Set the message priority to high"
-msgstr "å°?信件设å®?为é«?ä¼?å??级"
+msgstr "å°?ä¿¡æ?¯è®¾å®?为é«?ä¼?å??级"
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:346
msgid "Re_quest Read Receipt"
msgstr "请æ±?é??读æ?¶æ?¡(_Q)"
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:348
msgid "Get delivery notification when your message is read"
-msgstr "å½?æ?¨ç??信件被é??读æ?¶å¾?å?°æ??é??é??ç?¥"
+msgstr "å½?æ?¨ç??ä¿¡æ?¯è¢«é??读æ?¶å¾?å?°æ??é??é??ç?¥"
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:354
msgid "S/MIME En_crypt"
msgstr "S/MIME å? å¯?(_C)"
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:356
msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "ç?¨æ?¨ç?? S/MIME å? å¯?è¯?书å? å¯?该信件"
+msgstr "ç?¨æ?¨ç?? S/MIME å? å¯?è¯?书å? å¯?该信æ?¯"
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:362
msgid "S/MIME Sig_n"
msgstr "S/MIME ç¾å??(_N)"
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:364
msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "ç?¨æ?¨ç?? S/MIME ç¾å??认è¯?ç¾å??该信件"
+msgstr "ç?¨æ?¨ç?? S/MIME ç¾å??认è¯?ç¾å??该信æ?¯"
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:370
msgid "_Bcc Field"
msgstr "æ??é??å??(_B)"
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:372
msgid "Toggles whether the BCC field is displayed"
msgstr "æ?¯å?¦æ?¾ç¤ºæ??ä¸è½¬å??å??"
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:378
msgid "_Cc Field"
msgstr "æ??é??å??(_C)"
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:380
msgid "Toggles whether the CC field is displayed"
msgstr "æ?¯å?¦æ?¾ç¤ºè½¬å??å??"
-#: ../composer/e-composer-actions.c:425
-msgid "_From Field"
-msgstr "å??件人å??(_F)"
-
-#: ../composer/e-composer-actions.c:427
-msgid "Toggles whether the From chooser is displayed"
-msgstr "æ?¯å?¦æ?¾ç¤ºå??件人é??æ?©å?¨"
-
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:386
msgid "_Reply-To Field"
msgstr "å??å¤?å??(_R)"
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:388
msgid "Toggles whether the Reply-To field is displayed"
msgstr "æ?¯å?¦æ?¾ç¤ºå??å¤?å??"
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:431
msgid "Save Draft"
msgstr "ä¿?å?è??稿"
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "�示"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "é??è??"
-
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
msgid "Enter the recipients of the message"
-msgstr "è¾?å?¥ä¿¡ä»¶ç??æ?¶ä»¶äºº"
+msgstr "è¾?å?¥ä¿¡æ?¯ç??æ?¶ä»¶äºº"
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡ä»¶å?¯æ?¬ç??æ?¶ä»¶äººå?°å??"
+msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡æ?¯å?¯æ?¬ç??æ?¶ä»¶äººå?°å??"
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message"
-msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡ä»¶å?¯æ?¬ï¼?ä½?ä¸?å?ºç?°å?¨æ?¶ä»¶äººå??表ä¸ç??æ?¶ä»¶äººå?°å??"
+msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡æ?¯å?¯æ?¬ï¼?ä½?ä¸?å?ºç?°å?¨æ?¶ä»¶äººå??表ä¸ç??æ?¶ä»¶äººå?°å??"
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:1005
msgid "Fr_om:"
msgstr "å??件人(_O)ï¼?"
-#: ../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:968
+#: ../composer/e-composer-header-table.c:1014
msgid "_Reply-To:"
msgstr "å??å¤?å?°(_R)ï¼?"
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:1018
msgid "_To:"
msgstr "�信人(_T)�"
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:1023
msgid "_Cc:"
msgstr "æ??é??(_C)ï¼?"
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:1028
msgid "_Bcc:"
msgstr "æ??é??(_B)ï¼?"
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:1033
msgid "_Post To:"
msgstr "æ??é??å?°(_P)ï¼?"
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:1037
msgid "S_ubject:"
msgstr "主�(_U)�"
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1046
msgid "Si_gnature:"
msgstr "ç¾å??(_G)ï¼?"
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
msgid "Click here for the address book"
msgstr "å??å?»æ¤å¤?以使ç?¨å?°å??ç°¿"
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
msgid "Click here to select folders to post to"
msgstr "å??å?»æ¤å¤?以é??æ?©è¦?æ??é??å?°ç??æ??件夹"
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:211
msgid "Undo the last action"
msgstr "æ?¤æ¶?ä¸?次æ??ä½?"
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:215
msgid "Redo the last undone action"
msgstr "é??å??ä¸?次æ??ä½?"
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:219
msgid "Search for text"
msgstr "æ??ç´¢æ??æ?¬"
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:223
msgid "Search for and replace text"
msgstr "æ??ç´¢å??æ?¿æ?¢æ??æ?¬"
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:313
msgid "Save draft"
msgstr "ä¿?å?è??稿"
#. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:199
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
msgid "_Do not show this message again."
msgstr "ä¸?å??æ?¾ç¤ºæ¤ä¿¡æ?¯(_D)ã??"
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1029
+#, c-format
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "æ? æ³?对å¯?å?ºç??信件ç¾å??ï¼?æ?ªå¯¹æ¤è´¦æ?·è®¾ç½®ç¾å??è¯?书"
+msgstr "æ? æ³?对å¯?å?ºç??ä¿¡æ?¯ç¾å??ï¼?æ?ªå¯¹æ¤å¸?å?·è®¾ç½®ç¾å??è¯?书"
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1041
+#, c-format
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
-msgstr "æ? æ³?对å¯?å?ºç??信件å? å¯?ï¼?æ?ªå¯¹æ¤è´¦æ?·è®¾ç½®å? å¯?è¯?书"
+msgstr "æ? æ³?对å¯?å?ºç??ä¿¡æ?¯å? å¯?ï¼?æ?ªå¯¹æ¤å¸?å?·è®¾ç½®å? å¯?è¯?书"
-#: ../composer/e-msg-composer.c:1381
-#, fuzzy
+#: ../composer/e-msg-composer.c:1465
msgid "Unable to reconstruct message from autosave file"
-msgstr "æ? æ³?ä»?ç¼?è¾?å?¨è?·å??信件"
+msgstr "æ? æ³?ä»?è?ªå?¨ä¿?å?ç??æ??件é??建æ¶?æ?¯"
-#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:1643
+#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
msgid "Compose Message"
-msgstr "æ?°å??æ?°ä¿¡ä»¶"
+msgstr "æ?°å??æ?°ä¿¡æ?¯"
-#: ../composer/e-msg-composer.c:3312
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr "<b>(ç¼?å??å?¨å?«æ??ä¸?å?¯ç¼?è¾?ç??é??æ??æ?¬ä¿¡ä½?ã??)</b>"
+#: ../composer/e-msg-composer.c:3538
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr "ç¼?å??å?¨å?«æ??ä¸?å?¯ç¼?è¾?ç??é??æ??æ?¬ä¿¡ä½?ã??"
+
+#: ../composer/e-msg-composer.c:4144
+msgid "Untitled Message"
+msgstr "æ? æ ?é¢?ä¿¡æ?¯"
#: ../composer/mail-composer.error.xml.h:1
msgid ""
@@ -8189,13 +7993,13 @@ msgstr "é??件æ£å?¨ä¸?è½½ä¸ã??å??é??é?®ä»¶å°?使å¾?é?®ä»¶å??é??æ?¶æ? æ³?å??å?«
#: ../composer/mail-composer.error.xml.h:2
msgid "All accounts have been removed."
-msgstr "å·²ç»?å? é?¤äº?å?¨é?¨è´¦æ?·ã??"
+msgstr "å·²ç»?å? é?¤äº?å?¨é?¨å¸?å?·ã??"
#: ../composer/mail-composer.error.xml.h:3
msgid ""
"Are you sure you want to discard the message, titled '{0}', you are "
"composing?"
-msgstr "æ?¨ç¡®å®?æ?³è¦?丢å¼?æ?¨æ£å?¨ç¼?å??ç??æ ?é¢?为â??{0}â??ç??信件å??ï¼?"
+msgstr "æ?¨ç¡®å®?æ?³è¦?丢å¼?æ?¨æ£å?¨ç¼?å??ç??æ ?é¢?为â??{0}â??ç??ä¿¡æ?¯å??ï¼?"
#: ../composer/mail-composer.error.xml.h:4
msgid "Because "{0}", you may need to select different mail options."
@@ -8211,8 +8015,8 @@ msgid ""
"you choose to save the message in your Drafts folder. This will allow you to "
"continue the message at a later date."
msgstr ""
-"å?³é?æ¤ç¼?å??çª?å?£å°?ä¼?æ°¸ä¹?丢å¼?信件ï¼?é?¤é??æ?¨é??æ?©å?¨è??稿æ??件夹ä¸ä¿?å?è¿?å°?ä¿¡ã??è¿?å??许æ?¨"
-"å?¨ç¨?å??继ç»ç¼?å??信件ã??"
+"å?³é?æ¤ç¼?å??çª?å?£å°?ä¼?æ°¸ä¹?丢å¼?ä¿¡æ?¯ï¼?é?¤é??æ?¨é??æ?©å?¨è??稿æ??件夹ä¸ä¿?å?è¿?å°?ä¿¡ã??è¿?å??许æ?¨"
+"å?¨ç¨?å??继ç»ç¼?å??ä¿¡æ?¯ã??"
#: ../composer/mail-composer.error.xml.h:7
msgid "Could not create composer window."
@@ -8220,7 +8024,7 @@ msgstr "æ? æ³?å??建æ?°å??å?¨çª?å?£ã??"
#: ../composer/mail-composer.error.xml.h:8
msgid "Could not create message."
-msgstr "æ? æ³?å??建信件ã??"
+msgstr "æ? æ³?å??建信æ?¯ã??"
#: ../composer/mail-composer.error.xml.h:9
msgid "Could not read signature file "{0}"."
@@ -8228,7 +8032,7 @@ msgstr "æ? æ³?读å??ç¾å??æ??件â??{0}â??ã??"
#: ../composer/mail-composer.error.xml.h:10
msgid "Could not retrieve messages to attach from {0}."
-msgstr "æ? æ³?ä»? {0} è?·å??è¦?é??å? ç??信件ã??"
+msgstr "æ? æ³?ä»? {0} è?·å??è¦?é??å? ç??ä¿¡æ?¯ã??"
#: ../composer/mail-composer.error.xml.h:11
msgid "Could not save to autosave file "{0}"."
@@ -8236,7 +8040,7 @@ msgstr "æ? æ³?ä¿?å?å?°è?ªå?¨ä¿?å?æ??件â??{0}â??ã??"
#: ../composer/mail-composer.error.xml.h:12
msgid "Do you want to recover unfinished messages?"
-msgstr "æ?¨æ?¯å?¦æ?³è¦?æ?¢å¤?æ?ªå®?æ??ç??信件ï¼?"
+msgstr "æ?¨æ?¯å?¦æ?³è¦?æ?¢å¤?æ?ªå®?æ??ç??ä¿¡æ?¯ï¼?"
#: ../composer/mail-composer.error.xml.h:13
msgid "Download in progress. Do you want to send the mail?"
@@ -8250,10 +8054,10 @@ msgstr "ä¿?å?å?°è?ªå?¨ä¿?å?å?ºé??ï¼?å??å? æ?¯â??{1}â??ã??"
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 æ??å¤?é??å?ºã??æ?¢å¤?é?®ä»¶å°?å??许æ?¨ç»§ç»å®?æ??ã??"
+msgstr "å?¨æ?¨ä¸?次ç¼?å??æ?°ä¿¡æ?¯æ?¶ Evolution æ??å¤?é??å?ºã??æ?¢å¤?é?®ä»¶å°?å??许æ?¨ç»§ç»å®?æ??ã??"
#: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
msgstr "æ??件â??{0}â??ä¸?æ?¯æ?®é??æ??件ï¼?æ? æ³?å?¨é?®ä»¶ä¸å??é??ã??"
#: ../composer/mail-composer.error.xml.h:17
@@ -8271,8 +8075,8 @@ msgid "Unable to activate the address selector control."
msgstr "æ? æ³?æ¿?æ´»å?°å??é??æ?©æ?§å?¶ã??"
#: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "æ?¨æ? æ³?å°?æ??件â??{0}â??ä½?为è¿?å°?ä¿¡ç??é??件ã??"
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "æ?¨æ? æ³?å°?æ??件â??n{0}â??ä½?为è¿?å°?ä¿¡ç??é??件ã??"
#: ../composer/mail-composer.error.xml.h:22
msgid "You need to configure an account before you can compose mail."
@@ -8299,10 +8103,8 @@ msgid "Run Anjal in a window"
msgstr "å?¨æ?°çª?å?£ä¸è¿?è¡? Anjal"
#: ../capplet/anjal-settings-main.c:200
-#, fuzzy
-#| msgid "Mark as _default memo list"
msgid "Make Anjal the default email client"
-msgstr "æ ?为é»?认å¤?å¿?å??表(_D)"
+msgstr "å°? Anjal 设为é»?认ç?µå?é?®ä»¶å®¢æ?·ç«¯"
#. TRANSLATORS: don't translate the terms in brackets
#: ../capplet/anjal-settings-main.c:207
@@ -8310,287 +8112,278 @@ msgid "ID of the socket to embed in"
msgstr ""
#: ../capplet/anjal-settings-main.c:208
-#, fuzzy
-#| msgid "sort"
msgid "socket"
-msgstr "æ??åº?"
+msgstr "å¥?æ?¥å?"
#: ../capplet/anjal-settings-main.c:221
msgid "Anjal email client"
msgstr "Anjal �件客�端"
-#: ../capplet/settings/mail-account-view.c:56
-#, fuzzy
-#| msgid "Please choose another name."
+#: ../capplet/settings/mail-account-view.c:74
msgid "Please enter your full name."
-msgstr "请å?¦é??ä¸?个å??称ã??"
+msgstr "请è¾?å?¥æ?¨ç??å?¨å??ã??"
-#: ../capplet/settings/mail-account-view.c:57
-#, fuzzy
-#| msgid "Using email address"
+#: ../capplet/settings/mail-account-view.c:75
msgid "Please enter your email address."
-msgstr "使ç?¨ç?µå?é?®ä»¶å?°å??"
+msgstr "请è¾?å?¥æ?¨ç??ç?µå?é?®ä»¶å?°å??"
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
msgid "The email address you have entered is invalid."
-msgstr ""
+msgstr "æ?¨è¾?å?¥ç??ç?µå?é?®ä»¶å?°å??æ? æ??ã??"
-#: ../capplet/settings/mail-account-view.c:181
-#, fuzzy
-#| msgid "<span weight=\"bold\">Delete Mail</span>"
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span weight=\"bold\">å? é?¤é?®ä»¶</span>"
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "请è¾?å?¥æ?¨ç??å¯?ç ?ã??"
-#: ../capplet/settings/mail-account-view.c:186
-#, fuzzy
-#| msgid "_Name:"
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:464
+msgid "Personal details:"
+msgstr "个人详�信��"
+
+#: ../capplet/settings/mail-account-view.c:471
msgid "Name:"
-msgstr "å??称(_N)ï¼?"
+msgstr "å??称ï¼?"
-#: ../capplet/settings/mail-account-view.c:195
-#, fuzzy
-#| msgid "Email address"
+#: ../capplet/settings/mail-account-view.c:480
msgid "Email address:"
-msgstr "ç?µå?é?®ä»¶å?°å??"
+msgstr "ç?µå?é?®ä»¶å?°å??ï¼?"
-#: ../capplet/settings/mail-account-view.c:205
-#, fuzzy
-#| msgid "<span weight=\"bold\">General</span>"
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span weight=\"bold\">常�</span>"
+#: ../capplet/settings/mail-account-view.c:490
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">详æ??ï¼?</span>"
-#: ../capplet/settings/mail-account-view.c:210
-#: ../capplet/settings/mail-account-view.c:258
-#, fuzzy
-#| msgid "Server _Type:"
+#: ../capplet/settings/mail-account-view.c:496
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr "<span size=\"large\" weight=\"bold\">æ£å?¨æ?¥æ?¶</span>"
+
+#: ../capplet/settings/mail-account-view.c:501
msgid "Server type:"
-msgstr "æ??å?¡å?¨ç±»å??(_T)ï¼?"
+msgstr "æ??å?¡å?¨ç±»å??ï¼?"
-#: ../capplet/settings/mail-account-view.c:219
-#: ../capplet/settings/mail-account-view.c:267
-#, fuzzy
-#| msgid "Server Message:"
+#: ../capplet/settings/mail-account-view.c:510
msgid "Server address:"
-msgstr "æ??å?¡å?¨æ¶?æ?¯ï¼?"
+msgstr "æ??å?¡å?¨å?°å??ï¼?"
-#: ../capplet/settings/mail-account-view.c:228
-#: ../capplet/settings/mail-account-view.c:276
-#, fuzzy
-#| msgid "Us_ername:"
+#: ../capplet/settings/mail-account-view.c:519
msgid "Username:"
-msgstr "ç?¨æ?·å??(_E)ï¼?"
+msgstr "ç?¨æ?·å??ï¼?"
-#: ../capplet/settings/mail-account-view.c:237
-#: ../capplet/settings/mail-account-view.c:285
-#, fuzzy
-#| msgid "No encryption"
+#: ../capplet/settings/mail-account-view.c:528
msgid "Use encryption:"
-msgstr "ä¸?å? å¯?"
+msgstr "使ç?¨å? å¯?ï¼?"
-#: ../capplet/settings/mail-account-view.c:242
-#: ../capplet/settings/mail-account-view.c:290
-#, fuzzy
-#| msgid "Never"
+#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:566
msgid "never"
msgstr "��"
-#: ../capplet/settings/mail-account-view.c:253
-#, fuzzy
-#| msgid "<span weight=\"bold\">General</span>"
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span weight=\"bold\">常�</span>"
+#: ../capplet/settings/mail-account-view.c:545
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr "<span size=\"large\" weight=\"bold\">æ£å?¨å??é??</span>"
-#: ../capplet/settings/mail-account-view.c:309
+#: ../capplet/settings/mail-account-view.c:585
msgid ""
"To use the email application you'll need to setup an account. Put your email "
"address and password in below and we'll try and work out all the settings. "
"If we can't do it automatically you'll need your server details as well."
msgstr ""
-#: ../capplet/settings/mail-account-view.c:311
+#: ../capplet/settings/mail-account-view.c:587
msgid ""
"Sorry, we can't work out the settings to get your mail automatically. Please "
"enter them below. We've tried to make a start with the details you just "
"entered but you may need to change them."
msgstr ""
-#: ../capplet/settings/mail-account-view.c:313
+#: ../capplet/settings/mail-account-view.c:589
msgid "You can specify more options to configure the account."
-msgstr ""
+msgstr "æ?¨å?¯ä»¥æ??å®?æ?´å¤?é??项以é??ç½®æ¤å¸?å?·ã??"
-#: ../capplet/settings/mail-account-view.c:315
+#: ../capplet/settings/mail-account-view.c:591
msgid ""
"Now we need your settings for sending mail. We've tried to make some guesses "
"but you should check them over to make sure."
msgstr ""
-#: ../capplet/settings/mail-account-view.c:316
+#: ../capplet/settings/mail-account-view.c:592
msgid "You can specify your default settings for your account."
-msgstr ""
+msgstr "æ?¨å?¯ä»¥ä¸ºæ?¨ç??å¸?å?·æ??å®?é»?认设置ã??"
-#: ../capplet/settings/mail-account-view.c:317
+#: ../capplet/settings/mail-account-view.c:593
msgid ""
"Time to check things over before we try and connect to the server and fetch "
"your mail."
msgstr ""
-#: ../capplet/settings/mail-account-view.c:332
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2219
+#: ../mail/mail-config.ui.h:61
msgid "Identity"
msgstr "æ ?è¯?"
-#: ../capplet/settings/mail-account-view.c:332
-#, fuzzy
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:608
msgid "Next - Receiving mail"
-msgstr "æ?¥æ?¶ç?µå?é?®ä»¶"
+msgstr "å??è¿? - æ?¥æ?¶ç?µå?é?®ä»¶"
-#: ../capplet/settings/mail-account-view.c:333
-#, fuzzy
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:609
msgid "Receiving mail"
msgstr "æ?¥æ?¶ç?µå?é?®ä»¶"
-#: ../capplet/settings/mail-account-view.c:333
-#: ../capplet/settings/mail-account-view.c:334
-#, fuzzy
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
msgid "Next - Sending mail"
-msgstr "å??é??ç?µå?é?®ä»¶"
+msgstr "å??è¿? - å??é??ç?µå?é?®ä»¶"
-#: ../capplet/settings/mail-account-view.c:333
-#, fuzzy
-#| msgid "Identity"
+#: ../capplet/settings/mail-account-view.c:609
msgid "Back - Identity"
-msgstr "æ ?è¯?"
+msgstr "å??é?? - æ ?è¯?"
-#: ../capplet/settings/mail-account-view.c:333
-#, fuzzy
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:609
msgid "Next - Receiving options"
-msgstr "æ?¥æ?¶é??项"
+msgstr "å??è¿? - æ?¥æ?¶é??项"
-#: ../capplet/settings/mail-account-view.c:334
-#, fuzzy
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:610
msgid "Receiving options"
msgstr "æ?¥æ?¶é??项"
-#: ../capplet/settings/mail-account-view.c:334
-#: ../capplet/settings/mail-account-view.c:336
-#, fuzzy
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:612
msgid "Back - Receiving mail"
-msgstr "æ?¥æ?¶ç?µå?é?®ä»¶"
+msgstr "å??é?? - æ?¥æ?¶ç?µå?é?®ä»¶"
-#: ../capplet/settings/mail-account-view.c:336
-#, fuzzy
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:612
msgid "Sending mail"
msgstr "å??é??ç?µå?é?®ä»¶"
-#: ../capplet/settings/mail-account-view.c:336
-#: ../capplet/settings/mail-account-view.c:337
-#, fuzzy
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:613
msgid "Next - Review account"
-msgstr "å? é?¤è´¦æ?·å??ï¼?"
+msgstr "å??è¿? - æ£?æ?¥å¸?å?·"
-#: ../capplet/settings/mail-account-view.c:336
-#, fuzzy
-#| msgid "Defaults"
+#: ../capplet/settings/mail-account-view.c:612
msgid "Next - Defaults"
-msgstr "�认"
+msgstr "å??è¿? - é»?认å?¼"
-#: ../capplet/settings/mail-account-view.c:336
-#, fuzzy
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:612
msgid "Back - Receiving options"
-msgstr "æ?¥æ?¶é??项"
+msgstr "å??é?? - æ?¥æ?¶é??项"
-#: ../capplet/settings/mail-account-view.c:337
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2983 ../mail/mail-config.ui.h:34
msgid "Defaults"
-msgstr "�认"
+msgstr "�认�"
-#: ../capplet/settings/mail-account-view.c:337
-#, fuzzy
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:613
msgid "Back - Sending mail"
-msgstr "å??é??ç?µå?é?®ä»¶"
+msgstr "å??é?? - å??é??ç?µå?é?®ä»¶"
-#: ../capplet/settings/mail-account-view.c:339
-#, fuzzy
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:615
msgid "Review account"
-msgstr "å? é?¤è´¦æ?·å??ï¼?"
+msgstr "����"
-#: ../capplet/settings/mail-account-view.c:339
-#, fuzzy
-#| msgid "Fiji"
+#: ../capplet/settings/mail-account-view.c:615
msgid "Finish"
-msgstr "æ??æµ?"
+msgstr "å®?æ??"
-#: ../capplet/settings/mail-account-view.c:339
-#, fuzzy
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:615
msgid "Back - Sending"
-msgstr "å??åº?"
+msgstr "å??é?? - å??é??"
-#: ../capplet/settings/mail-account-view.c:671
-#: ../capplet/settings/mail-settings-view.c:262
-#, fuzzy
-#| msgid "_Close"
+#: ../capplet/settings/mail-account-view.c:719
+msgid "Setup Google contacts with Evolution"
+msgstr "设置 Google è??系人å?° Evolution"
+
+#: ../capplet/settings/mail-account-view.c:720
+msgid "Setup Google calendar with Evolution"
+msgstr "æ·»å? Google æ?¥å??å?° Evolution"
+
+#: ../capplet/settings/mail-account-view.c:725
+msgid "You may need to enable IMAP access."
+msgstr "æ?¨å?¯è?½é??è¦?å?¯ç?¨ IMAP 访é?®ã??"
+
+#: ../capplet/settings/mail-account-view.c:733
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Google ��设置�</span>"
+
+#: ../capplet/settings/mail-account-view.c:757
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "æ·»å? Yahoo æ?¥å??å?° Evolution"
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:768
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Yahoo ��设置�</span>"
+
+#: ../capplet/settings/mail-account-view.c:780
+msgid "Yahoo Calendar name:"
+msgstr "Yahoo æ?¥å??å??称ï¼?"
+
+#: ../capplet/settings/mail-account-view.c:1023
+msgid "Password:"
+msgstr "å¯?ç ?ï¼?"
+
+#: ../capplet/settings/mail-account-view.c:1091
+#: ../capplet/settings/mail-settings-view.c:267
msgid "Close Tab"
-msgstr "å?³é?(_C)"
+msgstr "å?³é?æ ?ç¾"
-#: ../capplet/settings/mail-account-view.c:681
-#, fuzzy
-#| msgid "Account Editor"
+#: ../capplet/settings/mail-account-view.c:1101
msgid "Account Wizard"
-msgstr "账����"
+msgstr "å¸?å?·å??导"
#: ../capplet/settings/mail-capplet-shell.c:208
-#, fuzzy
-#| msgid "Evolution Account Assistant"
msgid "Evolution account assistant"
-msgstr "Evolution è´¦æ?·å?©æ??"
+msgstr "Evolution å¸?å?·å?©æ??"
#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:2948
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1614
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1655
#: ../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/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:122
+#: ../modules/calendar/e-cal-shell-backend.c:134
+#: ../modules/calendar/e-cal-shell-migrate.c:141
#: ../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
+#: ../modules/calendar/e-task-shell-migrate.c:111
msgid "On This Computer"
msgstr "å?¨æ¤è®¡ç®?æ?ºä¸"
#: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:747
+#: ../plugins/groupwise-features/share-folder.c:737
msgid "Modify"
msgstr "修�"
#: ../capplet/settings/mail-settings-view.c:148
msgid "Add a new account"
-msgstr "æ·»å? æ?°è´¦æ?·"
+msgstr "æ·»å? æ?°å¸?å?·"
-#: ../capplet/settings/mail-settings-view.c:183
-#, fuzzy
-#| msgid "<span weight=\"bold\">Account Information</span>"
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span weight=\"bold\">账�信�</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "å¸?å?·ç®¡ç??"
-#: ../capplet/settings/mail-settings-view.c:272
+#: ../capplet/settings/mail-settings-view.c:277
msgid "Settings"
msgstr "设置"
@@ -8602,8 +8395,8 @@ msgstr "æ?¥å??äº?件信æ?¯"
msgid "Evolution Alarm Notify"
msgstr "Evolution æ??é??é??ç?¥"
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:825
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:865
+#: ../shell/e-shell-window-private.c:253
msgid "Evolution"
msgstr "Evolution"
@@ -8621,20 +8414,12 @@ msgstr "é??ç½®æ?¨ç??ç?µå?é?®ä»¶ï¼?è??系人å??æ?¥ç¨?表"
#: ../data/evolution-settings.desktop.in.in.h:1
msgid "Configure email accounts"
-msgstr "é??ç½®ç?µå?é?®ä»¶è´¦æ?·"
+msgstr "é??ç½®ç?µå?é?®ä»¶å¸?å?·"
#: ../data/evolution-settings.desktop.in.in.h:2
msgid "Email Settings"
msgstr "ç?µå?é?®ä»¶è®¾ç½®"
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "å?°å??å?¡"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "æ?¥å??ä¿¡æ?¯"
-
#. Translators: This is a cancelled activity.
#: ../e-util/e-activity.c:224
#, c-format
@@ -8659,15 +8444,15 @@ msgstr "%s..."
msgid "%s (%d%% complete)"
msgstr "%s (%d%% å®?æ??)"
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
msgid "Evolution Error"
msgstr "Evolution é??误"
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
msgid "Evolution Warning"
msgstr "Evolution è¦å??"
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:649
#, c-format
msgid "Internal error, unknown error '%s' requested"
msgstr "å??é?¨é??误ï¼?请æ±?äº?æ?ªç?¥ç??é??误â??%sâ??"
@@ -8728,33 +8513,37 @@ msgstr "西欧"
msgid "Western European, New"
msgstr "西欧��"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
msgid "Traditional"
msgstr "ç¹?ä½?"
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
msgid "Simplified"
msgstr "ç®?ä½?"
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
msgid "Ukrainian"
msgstr "ä¹?å??å?°è¯"
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
msgid "Visual"
msgstr "��"
#. strftime format of a weekday and a date.
#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../plugins/itip-formatter/itip-view.c:191
#: ../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:205 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
msgid "Tomorrow"
msgstr "æ??天"
@@ -8762,22 +8551,26 @@ msgstr "æ??天"
msgid "Yesterday"
msgstr "�天"
-#: ../e-util/e-datetime-format.c:210
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
#, c-format
-msgid "%d days from now"
-msgstr "è·?ç?°å?¨æ?? %d 天"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "è·?ç?°å?¨æ?? %d 天"
-#: ../e-util/e-datetime-format.c:212
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
#, c-format
-msgid "%d days ago"
-msgstr "%d 天å??"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天å??"
-#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
-#: ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
msgid "Use locale default"
msgstr "使����认�"
-#: ../e-util/e-datetime-format.c:499
+#: ../e-util/e-datetime-format.c:502
msgid "Format:"
msgstr "æ ¼å¼?ï¼?"
@@ -8787,30 +8580,16 @@ msgstr "(æ?ªç?¥æ??件å??)"
#. Translators: The string value is the basename of a file.
#: ../e-util/e-file-utils.c:140
-#, fuzzy, c-format
+#, c-format
msgid "Writing \"%s\""
-msgstr "�� %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:145
-#, fuzzy, c-format
+#, c-format
msgid "Writing \"%s\" to %s"
-msgstr "æ??â??%sâ??å¤?å?¶å?° %s"
-
-#: ../e-util/e-logger.c:175
-#, fuzzy
-msgid "Name of the logger"
-msgstr "è®°å½?æ?¥å¿?ç??ç»?件å??称"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "æ??件å??"
-
-#: ../e-util/e-module.c:189
-#, fuzzy
-msgid "The filename of the module"
-msgstr "æ?´æ?¹æ¤æ??件夹ç??å??称"
+msgstr "æ??â??%sâ??å??å?¥å?° %s"
#: ../e-util/e-non-intrusive-error-dialog.c:194
msgid "Debug Logs"
@@ -8834,13 +8613,15 @@ msgstr "�����"
msgid "Log Level"
msgstr "��级�"
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2687
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2741
#: ../mail/message-list.etspec.h:10
msgid "Messages"
-msgstr "信件"
+msgstr "ä¿¡æ?¯"
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:111
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:1439
msgid "Close this window"
msgstr "å?³é?æ¤çª?å?£"
@@ -8864,32 +8645,21 @@ msgstr "��"
msgid "Error, Warnings and Debug messages"
msgstr "é??误ï¼?è¦å??å??è°?è¯?ä¿¡æ?¯"
-#: ../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:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "已��"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "æ??件æ?¯å?¦å·²å?¯ç?¨"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
#: ../plugins/publish-calendar/publish-calendar.ui.h:33
msgid "weeks"
msgstr "å?¨"
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
msgid "An error occurred while printing"
msgstr "æ??å?°æ?¶å??ç??äº?é??误"
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
msgid "The printing system reported the following details about the error:"
msgstr "æ??å?°ç³»ç»?æ?¥å??äº?ä¸?å??é??误ç»?è??ï¼?"
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
msgid ""
"The printing system did not report any additional details about the error."
msgstr "æ??å?°ç³»ç»?æ?ªæ?¥å??å?³äº?é??误ç??ä»»ä½?é¢?å¤?ç»?è??ã??"
@@ -8898,7 +8668,7 @@ msgstr "æ??å?°ç³»ç»?æ?ªæ?¥å??å?³äº?é??误ç??ä»»ä½?é¢?å¤?ç»?è??ã??"
msgid "Autogenerated"
msgstr "è?ªå?¨ç??æ??ç??"
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
msgid "Because \"{1}\"."
msgstr "å??å? æ?¯â??{1}â??ã??"
@@ -8918,226 +8688,233 @@ msgstr "æ?¨æ??ç®?è¦?ç??å®?å??ï¼?"
msgid "File exists \"{0}\"."
msgstr "æ??件已å?å?¨â??{0}â??ã??"
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
msgid "_Overwrite"
msgstr "è¦?ç??(_O)"
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:146
msgid "Could not open the link."
msgstr "æ? æ³?æ??å¼?é?¾æ?¥ã??"
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:193
msgid "Could not display help for Evolution."
msgstr "æ? æ³?æ?¾ç¤º Evolution ç??帮å?©ã??"
-#: ../e-util/gconf-bridge.c:1307
+#: ../e-util/gconf-bridge.c:1281
#, c-format
msgid "GConf error: %s"
msgstr "GConf é??误ï¼?%s"
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1292
msgid "All further errors shown only on terminal."
msgstr "å??ç»æ??æ??ç??é??误é?½å?ªæ?¾ç¤ºå?¨ç»?端ã??"
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
#: ../modules/mail/em-mailer-prefs.c:78
+msgid "From"
+msgstr "å??件人"
+
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:79
msgid "Reply-To"
msgstr "å??å¤?è?³"
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2247 ../mail/em-format-html.c:2309
-#: ../mail/em-format-html.c:2332 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2285 ../mail/em-format-html.c:2347
+#: ../mail/em-format-html.c:2370 ../modules/mail/em-mailer-prefs.c:81
msgid "Cc"
msgstr "æ??é??"
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2248 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2335 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2286 ../mail/em-format-html.c:2351
+#: ../mail/em-format-html.c:2373 ../modules/mail/em-mailer-prefs.c:82
msgid "Bcc"
msgstr "å¯?件æ??é??"
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
#: ../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:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
msgid "Subject"
msgstr "主�"
#. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2429
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2467
+#: ../modules/mail/em-mailer-prefs.c:1144
msgid "Mailer"
msgstr "�件��"
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1190
msgid "-------- Forwarded Message --------"
-msgstr "-------- 转å??ç??信件 --------"
+msgstr "-------- 转å??ç??ä¿¡æ?¯ --------"
-#: ../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
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
msgid "Date"
msgstr "æ?¥æ??"
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:85
msgid "Newsgroups"
msgstr "���"
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:86
#: ../plugins/face/org-gnome-face.eplug.xml.h:2
msgid "Face"
msgstr "头å??"
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1307
#, c-format
msgid "%s attachment"
msgstr "%s é??件"
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1367
msgid "Could not parse S/MIME message: Unknown error"
-msgstr "æ? æ³?解æ?? S/MIME 信件ï¼?æ?ªç?¥é??误"
+msgstr "æ? æ³?解æ?? S/MIME ä¿¡æ?¯ï¼?æ?ªç?¥é??误"
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1522 ../em-format/em-format.c:1696
msgid "Could not parse MIME message. Displaying as source."
-msgstr "æ? æ³?解æ?? MIME 信件ã??æ?¾ç¤ºæº?æ??æ?¬ã??"
+msgstr "æ? æ³?解æ?? MIME ä¿¡æ?¯ã??æ?¾ç¤ºæº?æ??æ?¬ã??"
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1530
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "ä¸?æ?¯æ?? multipart/encrypted ç??å? å¯?ç±»å??"
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1543
msgid "Could not parse PGP/MIME message"
-msgstr "æ? æ³?解æ?? PGP/MIME 信件"
+msgstr "æ? æ³?解æ?? PGP/MIME ä¿¡æ?¯"
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1544
msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "æ? æ³?解æ?? PGP/MIME 信件ï¼?æ?ªç?¥é??误"
+msgstr "æ? æ³?解æ?? PGP/MIME ä¿¡æ?¯ï¼?æ?ªç?¥é??误"
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1720
msgid "Unsupported signature format"
msgstr "ä¸?æ?¯æ??ç??ç¾å??æ ¼å¼?"
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1730 ../em-format/em-format.c:1886
msgid "Error verifying signature"
msgstr "æ ¡éª?ç¾å??é??误"
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1731 ../em-format/em-format.c:1874
+#: ../em-format/em-format.c:1887
msgid "Unknown error verifying signature"
msgstr "æ ¡éª?ç¾å??å??ç??äº?æ?ªç?¥é??误"
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message"
-msgstr "æ? æ³?å??æ?? PGP 信件"
+#: ../em-format/em-format.c:1967
+msgid "Could not parse PGP message: "
+msgstr "æ? æ³?解æ?? PGP æ¶?æ?¯ï¼?"
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message: Unknown error"
-msgstr "æ? æ³?解æ?? PGP 信件ï¼?æ?ªç?¥é??误"
+#: ../em-format/em-format.c:1973 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "æ?ªç?¥é??误"
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
#, c-format
msgid "1 second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%d ç§?å??"
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
#, c-format
msgid "1 second in the future"
msgid_plural "%d seconds in the future"
msgstr[0] "%d ç§?å??"
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
#, c-format
msgid "1 minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d å??é??å??"
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
#, c-format
msgid "1 minute in the future"
msgid_plural "%d minutes in the future"
msgstr[0] "%d å??é??å??"
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
#, c-format
msgid "1 hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d å°?æ?¶å??"
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
#, c-format
msgid "1 hour in the future"
msgid_plural "%d hours in the future"
msgstr[0] "%d å°?æ?¶å??"
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
#, c-format
msgid "1 day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 天å??"
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
#, c-format
msgid "1 day in the future"
msgid_plural "%d days in the future"
msgstr[0] "%d å??"
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
#, c-format
msgid "1 week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%d å?¨å??"
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
#, c-format
msgid "1 week in the future"
msgid_plural "%d weeks in the future"
msgstr[0] "%d å?¨å??"
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
#, c-format
msgid "1 month ago"
msgid_plural "%d months ago"
msgstr[0] "%d 个æ??å??"
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
#, c-format
msgid "1 month in the future"
msgid_plural "%d months in the future"
msgstr[0] "%d 个æ??å??"
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
#, c-format
msgid "1 year ago"
msgid_plural "%d years ago"
msgstr[0] "%d å¹´å??"
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
#, c-format
msgid "1 year in the future"
msgid_plural "%d years in the future"
msgstr[0] "%d å¹´å??"
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
msgid "<click here to select a date>"
msgstr "<å??å?»æ¤å¤?以é??æ?©æ?¥æ??>"
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
msgid "now"
msgstr "ç?°å?¨"
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
msgid "%d-%b-%Y"
msgstr "%Y-%m-%d"
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
msgid "Select a time to compare against"
msgstr "é??æ?©ç?¨äº?æ¯?è¾?ç??æ?¶é?´"
#: ../filter/e-filter-file.c:184
-#, fuzzy
msgid "Choose a File"
msgstr "é??æ?©æ??件"
@@ -9186,11 +8963,11 @@ msgid "I_nclude threads"
msgstr "å??å?«çº¿ç´¢(_N)"
#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
msgid "Incoming"
msgstr "��"
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
msgid "Outgoing"
msgstr "��"
@@ -9222,7 +8999,7 @@ msgstr "缺å°?æ?¥æ??ã??"
msgid "Missing file name."
msgstr "缺å°?æ??件å??ã??"
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
msgid "Missing name."
msgstr "缺å°?å??称ã??"
@@ -9258,21 +9035,21 @@ msgstr "�示�件�滤��"
msgid ""
"The message's date will be compared against\n"
"12:00am of the date specified."
-msgstr "信件ç??æ?¥æ??å°?ä¼?ä¸?æ??å®?æ?¥æ??ç??å??å¤?12:00è¿?è¡?æ¯?è¾?ã??"
+msgstr "ä¿¡æ?¯ç??æ?¥æ??å°?ä¼?ä¸?æ??å®?æ?¥æ??ç??å??å¤?12:00è¿?è¡?æ¯?è¾?ã??"
#: ../filter/filter.ui.h:6
msgid ""
"The message's date will be compared against\n"
"a time relative to when filtering occurs."
-msgstr "信件ç??æ?¥æ??å°?ä¼?å?¨è¿?滤æ?§è¡?æ?¶ä¸?æ??å®?æ?¶é?´è¿?è¡?æ¯?è¾?ã??"
+msgstr "ä¿¡æ?¯ç??æ?¥æ??å°?ä¼?å?¨è¿?滤æ?§è¡?æ?¶ä¸?æ??å®?æ?¶é?´è¿?è¡?æ¯?è¾?ã??"
#: ../filter/filter.ui.h:8
msgid ""
"The message's date will be compared against\n"
"the current time when filtering occurs."
-msgstr "信件ç??æ?¥æ??å°?ä¼?å?¨è¿?滤æ?§è¡?æ?¶ä¸?å½?å??æ?¶é?´è¿?è¡?æ¯?è¾?ã??"
+msgstr "ä¿¡æ?¯ç??æ?¥æ??å°?ä¼?å?¨è¿?滤æ?§è¡?æ?¶ä¸?å½?å??æ?¶é?´è¿?è¡?æ¯?è¾?ã??"
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
msgid "_Filter Rules"
msgstr "è¿?滤è§?å??(_F)"
@@ -9293,7 +9070,7 @@ msgstr "��"
msgid "months"
msgstr "æ??"
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:185
msgid "seconds"
msgstr "�"
@@ -9309,44 +9086,27 @@ msgstr "æ?¨æ??å®?ç??æ?¶é?´"
msgid "years"
msgstr "å¹´"
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../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
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1027 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
msgid "Attachment"
msgid_plural "Attachments"
msgstr[0] "é??件"
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586
+#: ../widgets/misc/e-attachment-paned.c:581
msgid "Icon View"
msgstr "å?¾æ ?è§?å?¾"
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587
+#: ../widgets/misc/e-attachment-paned.c:582
msgid "List View"
msgstr "å??表è§?å?¾"
-#: ../mail/e-mail-browser.c:769 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr ""
-
-#: ../mail/e-mail-browser.c:779
-#, fuzzy
-msgid "Shell Module"
-msgstr "é??æ?©æ¨¡å¼?"
-
-#: ../mail/e-mail-browser.c:780 ../mail/message-list.c:2580
-msgid "The mail shell backend"
-msgstr ""
-
-#: ../mail/e-mail-browser.c:790
-msgid "Show Deleted"
-msgstr "æ?¾ç¤ºå? é?¤ç??"
-
-#: ../mail/e-mail-browser.c:791
-msgid "Show deleted messages"
-msgstr "æ?¾ç¤ºå? é?¤ç??信件"
+#: ../mail/e-mail-browser.c:266
+msgid "(No Subject)"
+msgstr "(æ? 主é¢?)"
#: ../mail/e-mail-display.c:66
msgid "_Add to Address Book..."
@@ -9361,9 +9121,8 @@ msgid "_From This Address"
msgstr "è?ªæ¤å?°å??(_F)"
#: ../mail/e-mail-display.c:89
-#, fuzzy
msgid "Create Search _Folder"
-msgstr "å??建æ??ç´¢æ??件夹(_S)"
+msgstr "å??建æ??ç´¢æ??件夹(_F)"
#: ../mail/e-mail-label-dialog.c:220
msgid "_Label name:"
@@ -9394,7 +9153,7 @@ msgid "_Later"
msgstr "ç¨?å??(_L)"
#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:519
+#: ../modules/mail/e-mail-shell-view-actions.c:478
msgid "Add Label"
msgstr "æ·»å? æ ?ç¾"
@@ -9403,7 +9162,6 @@ msgid "Edit Label"
msgstr "ç¼?è¾?æ ?ç¾"
#: ../mail/e-mail-label-manager.c:349
-#, fuzzy
msgid ""
"Note: Underscore in the label name is used\n"
"as mnemonic identifier in menu."
@@ -9413,114 +9171,57 @@ msgstr "注æ??ï¼?æ ?ç¾å??ä¸ç??ä¸?å??线被ç?¨ä½?è??å??ä¸ç??å?©è®°ç¬¦ã??"
msgid "Color"
msgstr "��"
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:334
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "å§?å??"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
+#: ../modules/mail/e-mail-shell-view-private.c:959
msgid "Inbox"
msgstr "�件箱"
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
msgid "Drafts"
msgstr "è??稿"
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
msgid "Outbox"
msgstr "å??件箱"
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
msgid "Sent"
msgstr "å·²å??ç®±"
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:573
msgid "Templates"
msgstr "模�"
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "é??è¦?"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "å¾?å??"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "ç¨?å??"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
msgid "Migrating..."
msgstr "æ£å?¨å??è¿?..."
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
msgid "Migration"
msgstr "�移"
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
#, c-format
msgid "Migrating '%s':"
msgstr "å??è¿?â??%sâ??ï¼?"
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "æ? æ³?å??建æ?°æ??件夹â??%sâ??ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "æ? æ³?å°?æ??件夹â??%sâ??å¤?å?¶ä¸ºâ??%sâ??ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "æ? æ³?æ?«æ??ä½?äº?â??%sâ??ç??å·²æ??é?®ç®±ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
+#: ../mail/e-mail-migrate.c:649
msgid "Migrating Folders"
msgstr "è¿?移æ??件夹"
-#: ../mail/e-mail-migrate.c:1824
-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:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "æ? æ³?æ??å¼?æ?§ç?? POP ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®â??%sâ??ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "æ? æ³?å??建 POP3 ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®ç?®å½?â??%sâ??ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "æ? æ³?å¤?å?¶ POP3 å?¨æ??å?¡å?¨ä¸?ä¿?ç??ç??æ?°æ?®â??%sâ??ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "å??建æ?¬å?°é?®ä»¶å?å?¨â??%sâ??失败ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:650
msgid ""
"The summary format of the Evolution mailbox folders has been moved to SQLite "
"since Evolution 2.24.\n"
@@ -9531,25 +9232,16 @@ msgstr ""
"\n"
"请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
-#: ../mail/e-mail-migrate.c:3030
+#: ../mail/e-mail-migrate.c:739
#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
+msgid "Unable to create local mail folders at '%s': %s"
msgstr "æ? æ³?å?¨â??%sâ??å??建æ?¬å?°é?®ä»¶æ??件夹ï¼?%s"
-#: ../mail/e-mail-migrate.c:3048
-#, 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:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
msgid "Do not ask me again"
msgstr "ä¸?è¦?å??次询é?®"
@@ -9557,7 +9249,7 @@ msgstr "ä¸?è¦?å??次询é?®"
msgid "Copy to Folder"
msgstr "å¤?å?¶å?°æ??件夹"
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:402
msgid "C_opy"
msgstr "��(_O)"
@@ -9565,7 +9257,7 @@ msgstr "��(_O)"
msgid "Move to Folder"
msgstr "移è?³æ??件夹"
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:402
msgid "_Move"
msgstr "移�(_M)"
@@ -9580,10 +9272,7 @@ msgstr[0] "ä¿?å?ä¿¡æ?¯"
#. * 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:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
-#, fuzzy
-#| msgid "Message"
+#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:4
msgid "Message"
msgid_plural "Messages"
msgstr[0] "��"
@@ -9602,7 +9291,7 @@ msgstr "æ£?æ?¥å??å?¾ä¿¡(_J)"
#: ../mail/e-mail-reader.c:1152
msgid "Filter the selected messages for junk status"
-msgstr "æ??é??ä¸ç??信件æ ?记为å??å?¾é?®ä»¶"
+msgstr "æ??é??ä¸ç??ä¿¡æ?¯æ ?记为å??å?¾é?®ä»¶"
#: ../mail/e-mail-reader.c:1157
msgid "_Copy to Folder..."
@@ -9610,15 +9299,15 @@ msgstr "å¤?å?¶å?°æ??件夹(_C)..."
#: ../mail/e-mail-reader.c:1159
msgid "Copy selected messages to another folder"
-msgstr "æ??é??ä¸ç??信件å¤?å?¶å?°å?¶å®?æ??件夹"
+msgstr "æ??é??ä¸ç??ä¿¡æ?¯å¤?å?¶å?°å?¶å®?æ??件夹"
#: ../mail/e-mail-reader.c:1164
msgid "_Delete Message"
-msgstr "å? é?¤ä¿¡ä»¶(_D)"
+msgstr "å? é?¤ä¿¡æ?¯(_D)"
#: ../mail/e-mail-reader.c:1166
msgid "Mark the selected messages for deletion"
-msgstr "为é??ä¸ä¿¡ä»¶å??å? é?¤æ ?è®°"
+msgstr "为é??ä¸ä¿¡æ?¯å??å? é?¤æ ?è®°"
#: ../mail/e-mail-reader.c:1171
msgid "Filter on Mailing _List..."
@@ -9626,7 +9315,7 @@ msgstr "æ ¹æ?®é?®ä»¶å??表è¿?滤(_L)..."
#: ../mail/e-mail-reader.c:1173
msgid "Create a rule to filter messages to this mailing list"
-msgstr "å??建å?¯è¿?滤å¯?å¾?æ¤é?®ä»¶å??表ç??信件ç??è§?å??"
+msgstr "å??建å?¯è¿?滤å¯?å¾?æ¤é?®ä»¶å??表ç??ä¿¡æ?¯ç??è§?å??"
#: ../mail/e-mail-reader.c:1178
msgid "Filter on _Recipients..."
@@ -9634,7 +9323,7 @@ msgstr "æ ¹æ?®æ?¶ä»¶äººè¿?滤(_R)..."
#: ../mail/e-mail-reader.c:1180
msgid "Create a rule to filter messages to these recipients"
-msgstr "å??建å?¯è¿?滤å¯?å¾?è¿?äº?æ?¶ä»¶äººç??信件ç??è§?å??"
+msgstr "å??建å?¯è¿?滤å¯?å¾?è¿?äº?æ?¶ä»¶äººç??ä¿¡æ?¯ç??è§?å??"
#: ../mail/e-mail-reader.c:1185
msgid "Filter on Se_nder..."
@@ -9642,7 +9331,7 @@ msgstr "æ ¹æ?®å??件人è¿?滤(_N)..."
#: ../mail/e-mail-reader.c:1187
msgid "Create a rule to filter messages from this sender"
-msgstr "å??建å?¯è¿?滤æ¤äººå¯?æ?¥ç??信件ç??è§?å??"
+msgstr "å??建å?¯è¿?滤æ¤äººå¯?æ?¥ç??ä¿¡æ?¯ç??è§?å??"
#: ../mail/e-mail-reader.c:1192
msgid "Filter on _Subject..."
@@ -9650,7 +9339,7 @@ msgstr "æ ¹æ?®ä¸»é¢?è¿?滤(_S)..."
#: ../mail/e-mail-reader.c:1194
msgid "Create a rule to filter messages with this subject"
-msgstr "å??建å?¯è¿?滤æ¤ä¸»é¢?信件ç??è§?å??"
+msgstr "å??建å?¯è¿?滤æ¤ä¸»é¢?ä¿¡æ?¯ç??è§?å??"
#: ../mail/e-mail-reader.c:1199
msgid "A_pply Filters"
@@ -9658,42 +9347,39 @@ msgstr "åº?ç?¨è¿?滤è§?å??(_P)"
#: ../mail/e-mail-reader.c:1201
msgid "Apply filter rules to the selected messages"
-msgstr "åº?ç?¨è¿?滤è§?å??å?°é??ä¸ç??信件"
+msgstr "åº?ç?¨è¿?滤è§?å??å?°é??ä¸ç??ä¿¡æ?¯"
#: ../mail/e-mail-reader.c:1206
msgid "_Find in Message..."
-msgstr "å?¨ä¿¡ä»¶ä¸æ?¥æ?¾(_F)..."
+msgstr "å?¨ä¿¡æ?¯ä¸æ?¥æ?¾(_F)..."
#: ../mail/e-mail-reader.c:1208
msgid "Search for text in the body of the displayed message"
-msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
+msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
#: ../mail/e-mail-reader.c:1213
msgid "_Clear Flag"
msgstr "æ¸?é?¤æ ?å¿?(_C)"
#: ../mail/e-mail-reader.c:1215
-#, fuzzy
msgid "Remove the follow-up flag from the selected messages"
-msgstr "å??æ¶?é??ä¸ä¿¡ä»¶ç??å? é?¤"
+msgstr "å? é?¤é??ä¸ä¿¡æ?¯ç??è·?é??æ ?å¿?"
#: ../mail/e-mail-reader.c:1220
msgid "_Flag Completed"
msgstr "æ ?å¿?为已å®?æ??(_F)"
#: ../mail/e-mail-reader.c:1222
-#, fuzzy
msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "æ??å??ä¸?线索ä¸ç??æ??æ??信件é??æ?©ä¸ºé??ä¸ä¿¡ä»¶"
+msgstr "设置é??ä¸ä¿¡æ?¯ç??è·?é??æ ?å¿?为已å®?æ??"
#: ../mail/e-mail-reader.c:1227
msgid "Follow _Up..."
msgstr "è·?é??(_U)..."
#: ../mail/e-mail-reader.c:1229
-#, fuzzy
msgid "Flag the selected messages for follow-up"
-msgstr "为é??ä¸ä¿¡ä»¶å??è·?é??æ ?å¿?"
+msgstr "为é??ä¸ä¿¡æ?¯æ·»å? è·?é??æ ?å¿?"
#: ../mail/e-mail-reader.c:1234
msgid "_Attached"
@@ -9701,12 +9387,11 @@ msgstr "é??件(_A)"
#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
msgid "Forward the selected message to someone as an attachment"
-msgstr "æ??é??ä¸ä¿¡ä»¶ä½?为é??件转å??ç»?æ??人"
+msgstr "æ??é??ä¸ä¿¡æ?¯ä½?为é??件转å??ç»?æ??人"
#: ../mail/e-mail-reader.c:1241
-#, fuzzy
msgid "Forward As _Attached"
-msgstr "ä½?为 iCalendar 转å??(_F)"
+msgstr "ä½?为é??件转å??(_A)"
#: ../mail/e-mail-reader.c:1248
msgid "_Inline"
@@ -9714,12 +9399,11 @@ msgstr "åµ?å?¥(_I)"
#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
msgid "Forward the selected message in the body of a new message"
-msgstr "å?¨æ?°ä¿¡ä½?ä¸è½¬å??é??ä¸ä¿¡ä»¶"
+msgstr "å?¨æ?°ä¿¡ä½?ä¸è½¬å??é??ä¸ä¿¡æ?¯"
#: ../mail/e-mail-reader.c:1255
-#, fuzzy
msgid "Forward As _Inline"
-msgstr "转å??æ?¹å¼?(_F)ï¼?"
+msgstr "åµ?å?¥æ£æ??转å??(_I)"
#: ../mail/e-mail-reader.c:1262
msgid "_Quoted"
@@ -9727,20 +9411,19 @@ msgstr "å¼?ç?¨(_Q)"
#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
msgid "Forward the selected message quoted like a reply"
-msgstr "以类似äº?å??å¤?ç??å¼?ç?¨æ?¹å¼?转å??é??ä¸ç??信件"
+msgstr "以类似äº?å??å¤?ç??å¼?ç?¨æ?¹å¼?转å??é??ä¸ç??ä¿¡æ?¯"
#: ../mail/e-mail-reader.c:1269
-#, fuzzy
msgid "Forward As _Quoted"
-msgstr "转å??æ?¹å¼?(_F)ï¼?"
+msgstr "ä½?æ??å¼?ç?¨è½¬å??(_Q)"
#: ../mail/e-mail-reader.c:1276
msgid "_Load Images"
-msgstr "è£?å?¥å?¾å??(_L)"
+msgstr "è½½å?¥å?¾å??(_L)"
#: ../mail/e-mail-reader.c:1278
msgid "Force images in HTML mail to be loaded"
-msgstr "强å?¶è£?å?¥ HTML é?®ä»¶ä¸ç??å?¾å??"
+msgstr "强å?¶è½½å?¥ HTML é?®ä»¶ä¸ç??å?¾å??"
#: ../mail/e-mail-reader.c:1283
msgid "_Important"
@@ -9748,7 +9431,7 @@ msgstr "é??è¦?(_I)"
#: ../mail/e-mail-reader.c:1285
msgid "Mark the selected messages as important"
-msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为é??è¦?é?®ä»¶"
+msgstr "æ??é??ä¸ä¿¡æ?¯æ ?记为é??è¦?é?®ä»¶"
#: ../mail/e-mail-reader.c:1290
msgid "_Junk"
@@ -9756,7 +9439,7 @@ msgstr "å??å?¾(_J)"
#: ../mail/e-mail-reader.c:1292
msgid "Mark the selected messages as junk"
-msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为å??å?¾é?®ä»¶"
+msgstr "æ??é??ä¸ä¿¡æ?¯æ ?记为å??å?¾é?®ä»¶"
#: ../mail/e-mail-reader.c:1297
msgid "_Not Junk"
@@ -9764,7 +9447,7 @@ msgstr "é??å??å?¾(_N)"
#: ../mail/e-mail-reader.c:1299
msgid "Mark the selected messages as not being junk"
-msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为é??å??å?¾é?®ä»¶"
+msgstr "æ??é??ä¸ä¿¡æ?¯æ ?记为é??å??å?¾é?®ä»¶"
#: ../mail/e-mail-reader.c:1304
msgid "_Read"
@@ -9772,7 +9455,7 @@ msgstr "读å??(_R)"
#: ../mail/e-mail-reader.c:1306
msgid "Mark the selected messages as having been read"
-msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为已读"
+msgstr "æ??é??ä¸ä¿¡æ?¯æ ?记为已读"
#: ../mail/e-mail-reader.c:1311
msgid "Uni_mportant"
@@ -9780,7 +9463,7 @@ msgstr "ä¸?é??è¦?(_M)"
#: ../mail/e-mail-reader.c:1313
msgid "Mark the selected messages as unimportant"
-msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为ä¸?é??è¦?é?®ä»¶"
+msgstr "æ??é??ä¸ä¿¡æ?¯æ ?记为ä¸?é??è¦?é?®ä»¶"
#: ../mail/e-mail-reader.c:1318
msgid "_Unread"
@@ -9788,23 +9471,23 @@ msgstr "�读(_U)"
#: ../mail/e-mail-reader.c:1320
msgid "Mark the selected messages as not having been read"
-msgstr "æ??é??ä¸ä¿¡ä»¶æ ?记为æ?ªè¯»"
+msgstr "æ??é??ä¸ä¿¡æ?¯æ ?记为æ?ªè¯»"
#: ../mail/e-mail-reader.c:1325
msgid "_Edit as New Message..."
-msgstr "�为�信件����(_E)..."
+msgstr "�为�信�����(_E)..."
#: ../mail/e-mail-reader.c:1327
msgid "Open the selected messages in the composer for editing"
-msgstr "å?¨æ?°å??å?¨ä¸æ??å¼?é??ä¸ç??信件以便ç¼?è¾?"
+msgstr "å?¨æ?°å??å?¨ä¸æ??å¼?é??ä¸ç??ä¿¡æ?¯ä»¥ä¾¿ç¼?è¾?"
#: ../mail/e-mail-reader.c:1332
msgid "Compose _New Message"
-msgstr "æ?°å??æ?°ä¿¡ä»¶(_N)"
+msgstr "æ?°å??æ?°ä¿¡æ?¯(_N)"
#: ../mail/e-mail-reader.c:1334
msgid "Open a window for composing a mail message"
-msgstr "æ??å¼?çª?å?£ä»¥æ?°å??信件"
+msgstr "æ??å¼?çª?å?£ä»¥æ?°å??ä¿¡æ?¯"
#: ../mail/e-mail-reader.c:1339
msgid "_Open in New Window"
@@ -9812,7 +9495,7 @@ msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?(_O)"
#: ../mail/e-mail-reader.c:1341
msgid "Open the selected messages in a new window"
-msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?é??ä¸ç??信件"
+msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?é??ä¸ç??ä¿¡æ?¯"
#: ../mail/e-mail-reader.c:1346
msgid "_Move to Folder..."
@@ -9820,7 +9503,7 @@ msgstr "移è?³æ??件夹(_M)..."
#: ../mail/e-mail-reader.c:1348
msgid "Move selected messages to another folder"
-msgstr "æ??é??ä¸ç??信件移è?³å?¶å®?æ??件夹"
+msgstr "æ??é??ä¸ç??ä¿¡æ?¯ç§»è?³å?¶å®?æ??件夹"
#: ../mail/e-mail-reader.c:1353
msgid "_Next Message"
@@ -9828,15 +9511,15 @@ msgstr "���信(_N)"
#: ../mail/e-mail-reader.c:1355
msgid "Display the next message"
-msgstr "�示���信件"
+msgstr "�示���信�"
#: ../mail/e-mail-reader.c:1360
msgid "Next _Important Message"
-msgstr "ä¸?ä¸?å°?é??è¦?信件(_I)"
+msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡æ?¯(_I)"
#: ../mail/e-mail-reader.c:1362
msgid "Display the next important message"
-msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?信件"
+msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡æ?¯"
#: ../mail/e-mail-reader.c:1367
msgid "Next _Thread"
@@ -9848,11 +9531,11 @@ msgstr "�示���线索"
#: ../mail/e-mail-reader.c:1374
msgid "Next _Unread Message"
-msgstr "����读信件(_U)"
+msgstr "����读信�(_U)"
#: ../mail/e-mail-reader.c:1376
msgid "Display the next unread message"
-msgstr "�示����读信件"
+msgstr "�示����读信�"
#: ../mail/e-mail-reader.c:1381
msgid "_Previous Message"
@@ -9860,31 +9543,31 @@ msgstr "���信(_P)"
#: ../mail/e-mail-reader.c:1383
msgid "Display the previous message"
-msgstr "�示���信件"
+msgstr "�示���信�"
#: ../mail/e-mail-reader.c:1388
msgid "Pr_evious Important Message"
-msgstr "ä¸?ä¸?å°?é??è¦?信件(_E)"
+msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡æ?¯(_E)"
#: ../mail/e-mail-reader.c:1390
msgid "Display the previous important message"
-msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?信件"
+msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡æ?¯"
#: ../mail/e-mail-reader.c:1395
msgid "P_revious Unread Message"
-msgstr "����读信件(_R)"
+msgstr "����读信�(_R)"
#: ../mail/e-mail-reader.c:1397
msgid "Display the previous unread message"
-msgstr "�示����读信件"
+msgstr "�示����读信�"
#: ../mail/e-mail-reader.c:1404
msgid "Print this message"
-msgstr "æ??å?°è¯¥ä¿¡ä»¶"
+msgstr "æ??å?°è¯¥ä¿¡æ?¯"
#: ../mail/e-mail-reader.c:1411
msgid "Preview the message to be printed"
-msgstr "é¢?è§?è¦?æ??å?°ç??信件"
+msgstr "é¢?è§?è¦?æ??å?°ç??ä¿¡æ?¯"
#: ../mail/e-mail-reader.c:1416
msgid "Re_direct"
@@ -9892,18 +9575,17 @@ msgstr "é??å??(_D)"
#: ../mail/e-mail-reader.c:1418
msgid "Redirect (bounce) the selected message to someone"
-msgstr "å°?é??ä¸ä¿¡ä»¶é??å??(é??å??)ç»?æ??人"
+msgstr "å°?é??ä¸ä¿¡æ?¯é??å??(é??å??)ç»?æ??人"
#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:139
msgid "Reply to _All"
msgstr "å??å¤?æ??æ??人(_A)"
#: ../mail/e-mail-reader.c:1425
-#, fuzzy
msgid "Compose a reply to all the recipients of the selected message"
-msgstr "为é??ä¸ä¿¡ä»¶ç??æ??æ??æ?¶ä»¶äººæ?°å??å??å¤?"
+msgstr "为é??ä¸ä¿¡æ?¯ç??æ??æ??æ?¶ä»¶äººæ?°å??å??å¤?"
#: ../mail/e-mail-reader.c:1430
msgid "Reply to _List"
@@ -9911,42 +9593,38 @@ msgstr "å??å¤?é?®ä»¶å??表(_L)"
#: ../mail/e-mail-reader.c:1432
msgid "Compose a reply to the mailing list of the selected message"
-msgstr "为é??ä¸ä¿¡ä»¶ç??é?®ä»¶å??表æ?°å??å??å¤?"
+msgstr "为é??ä¸ä¿¡æ?¯ç??é?®ä»¶å??表æ?°å??å??å¤?"
#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../modules/mail/e-mail-attachment-handler.c:146
msgid "_Reply to Sender"
msgstr "å??å¤?å??件人(_R)"
#: ../mail/e-mail-reader.c:1439
msgid "Compose a reply to the sender of the selected message"
-msgstr "为é??ä¸ä¿¡ä»¶ç??å??件人æ?°å??å??å¤?"
+msgstr "为é??ä¸ä¿¡æ?¯ç??å??件人æ?°å??å??å¤?"
#: ../mail/e-mail-reader.c:1444
-#, fuzzy
msgid "_Save as mbox..."
-msgstr "å?¦å?为..."
+msgstr "å?¦å?为 mbox æ ¼å¼?(_S)..."
#: ../mail/e-mail-reader.c:1446
-#, fuzzy
msgid "Save selected messages as an mbox file"
-msgstr "æ??é??ä¸ä¿¡ä»¶å?¦å?为æ??æ?¬æ??件"
+msgstr "æ??é??ä¸ä¿¡æ?¯å?¦å?为 mbox æ ¼å¼?æ??件"
#: ../mail/e-mail-reader.c:1451
msgid "Search Folder from Mailing _List..."
msgstr "å?ºäº?é?®ä»¶å??表ç??æ??ç´¢æ??件夹(_L)..."
#: ../mail/e-mail-reader.c:1453
-#, fuzzy
msgid "Create a search folder for this mailing list"
-msgstr "为该é?®ä»¶å??表å??建æ??ç´¢æ??件夹"
+msgstr "为æ¤é?®ä»¶å??表å??建æ??ç´¢æ??件夹"
#: ../mail/e-mail-reader.c:1458
msgid "Search Folder from Recipien_ts..."
msgstr "å?ºäº?æ?¶ä»¶äººç??æ??ç´¢æ??件夹(_T)..."
#: ../mail/e-mail-reader.c:1460
-#, fuzzy
msgid "Create a search folder for these recipients"
msgstr "为è¿?äº?æ?¶ä»¶äººå??建æ??ç´¢æ??件夹"
@@ -9955,7 +9633,6 @@ msgid "Search Folder from Sen_der..."
msgstr "å?ºäº?å??件人ç??æ??ç´¢æ??件夹(_D)..."
#: ../mail/e-mail-reader.c:1467
-#, fuzzy
msgid "Create a search folder for this sender"
msgstr "为该å??件人å??建æ??ç´¢æ??件夹"
@@ -9964,25 +9641,24 @@ msgid "Search Folder from S_ubject..."
msgstr "å?ºäº?主é¢?ç??æ??ç´¢æ??件夹(_U)..."
#: ../mail/e-mail-reader.c:1474
-#, fuzzy
msgid "Create a search folder for this subject"
msgstr "为该主é¢?å??建æ??ç´¢æ??件夹"
#: ../mail/e-mail-reader.c:1479
msgid "_Message Source"
-msgstr "信件æº?代ç ?(_M)"
+msgstr "ä¿¡æ?¯æº?代ç ?(_M)"
#: ../mail/e-mail-reader.c:1481
msgid "Show the raw email source of the message"
-msgstr "æ?¾ç¤ºä¿¡ä»¶ç??å??å§?é?®ä»¶æº?代ç ?"
+msgstr "æ?¾ç¤ºä¿¡æ?¯ç??å??å§?é?®ä»¶æº?代ç ?"
#: ../mail/e-mail-reader.c:1493
msgid "_Undelete Message"
-msgstr "å??æ¶?å? é?¤ä¿¡ä»¶(_U)"
+msgstr "å??æ¶?å? é?¤ä¿¡æ?¯(_U)"
#: ../mail/e-mail-reader.c:1495
msgid "Undelete the selected messages"
-msgstr "å??æ¶?é??ä¸ä¿¡ä»¶ç??å? é?¤"
+msgstr "å??æ¶?é??ä¸ä¿¡æ?¯ç??å? é?¤"
#: ../mail/e-mail-reader.c:1500
msgid "_Normal Size"
@@ -10030,7 +9706,7 @@ msgstr "æ ?记为(_K)"
#: ../mail/e-mail-reader.c:1558
msgid "_Message"
-msgstr "信件(_M)"
+msgstr "ä¿¡æ?¯(_M)"
#: ../mail/e-mail-reader.c:1565
msgid "_Zoom"
@@ -10070,7 +9746,7 @@ msgstr "å??æ ?模å¼?(_C)"
#: ../mail/e-mail-reader.c:1656
msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??ä¿¡ä½?ä¸æ?¾ç¤ºé?ªç??å??æ ?"
+msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??ä¿¡ä½?ä¸æ?¾ç¤ºé?ªç??å??æ ?"
#: ../mail/e-mail-reader.c:1662
msgid "All Message _Headers"
@@ -10080,53 +9756,52 @@ msgstr "��信头(_H)"
msgid "Show messages with all email headers"
msgstr "æ?¾ç¤ºé?®ä»¶æ?¶æ?¾ç¤ºæ??æ??信头"
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1885
msgid "Unable to retrieve message"
-msgstr "æ? æ³?è?·å??信件"
+msgstr "æ? æ³?è?·å??ä¿¡æ?¯"
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
-#, fuzzy, c-format
+#: ../mail/e-mail-reader.c:1945 ../mail/mail-ops.c:1891
+#, c-format
msgid "Retrieving message '%s'"
-msgstr "æ?¶å??信件 %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:2471
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2461 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
#: ../widgets/misc/e-account-tree-view.c:234
msgid "Default"
msgstr "�认"
-#: ../mail/e-mail-reader.c:2592
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2601
+#: ../modules/mail/e-mail-attachment-handler.c:132
msgid "_Forward"
msgstr "转å??(_F)"
-#: ../mail/e-mail-reader.c:2593
+#: ../mail/e-mail-reader.c:2602
msgid "Forward the selected message to someone"
-msgstr "æ??é??ä¸ä¿¡ä»¶è½¬å??ç»?æ??人"
+msgstr "æ??é??ä¸ä¿¡æ?¯è½¬å??ç»?æ??人"
-#: ../mail/e-mail-reader.c:2637 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../mail/e-mail-reader.c:2647 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
msgid "Delete"
msgstr "å? é?¤"
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2655
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
#: ../widgets/misc/e-calendar.c:193
msgid "Next"
msgstr "��项"
-#: ../mail/e-mail-reader.c:2645
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
#: ../widgets/misc/e-calendar.c:169
msgid "Previous"
msgstr "��项"
-#: ../mail/e-mail-reader.c:2649 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2669 ../mail/mail-dialogs.ui.h:19
msgid "Reply"
msgstr "å??å¤?"
@@ -10136,33 +9811,33 @@ 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:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:75
+#: ../modules/addressbook/ldap-config.ui.h:9
msgid "No encryption"
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:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:131
+#: ../modules/addressbook/ldap-config.ui.h:20
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:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:100
+#: ../modules/addressbook/ldap-config.ui.h:12
msgid "SSL encryption"
msgstr "SSL å? å¯?"
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:603
#, c-format
msgid "%s License Agreement"
msgstr "%s 许å?¯å??è®®"
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:610
#, c-format
msgid ""
"\n"
@@ -10175,38 +9850,34 @@ msgstr ""
"并é??ä¸å¤?é??æ¡?表æ??æ?¨æ?¥å??该å??è®®\n"
#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
-#, fuzzy
-#| msgid "None"
+#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
msgctxt "mail-signature"
msgid "None"
msgstr "æ? "
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:981
msgid "Never"
msgstr "��"
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:982
msgid "Always"
msgstr "��"
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:983
msgid "Ask for each message"
msgstr "��信�询�"
#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
-#, fuzzy
-#| msgid "None"
+#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
msgctxt "mail-receiving"
msgid "None"
msgstr "æ? "
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2095
msgid "Mail Configuration"
msgstr "é?®ä»¶é??ç½®"
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2096
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -10216,7 +9887,7 @@ msgstr ""
"\n"
"å??å?»â??å??è¿?â??å¼?å§?ã??"
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2099
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 "
@@ -10225,20 +9896,20 @@ msgstr ""
"请å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å§?å??å??ç?µå?é?®ä»¶å?°å??ã??ä¸?é?¢ç??â??å?¯é??â??å??ä¸?å¿?å¡«å?¥ï¼?é?¤é??æ?¨æ?³è¦?å?¨æ?¨å??"
"å?ºç??é?®ä»¶ä¸å??å?«æ¤ä¿¡æ?¯ã??"
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2258
+#: ../mail/mail-config.ui.h:93
msgid "Receiving Email"
msgstr "æ?¥æ?¶ç?µå?é?®ä»¶"
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2102
msgid "Please configure the following account settings."
msgstr "请é??ç½®ä¸?å??å¸?æ?·è®¾ç½®ã??"
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2738
msgid "Sending Email"
msgstr "å??é??ç?µå?é?®ä»¶"
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2105
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -10246,23 +9917,23 @@ msgstr ""
"请å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å??件æ??å?¡å?¨ä¿¡æ?¯ã??å¦?æ??æ?¨ä¸?太确å®?ç??è¯?ï¼?请询é?®æ?¨ç??ç³»ç»?管ç??å??æ??è??"
"äº?è??ç½?æ??å?¡æ??ä¾?å??ISPã??"
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2107
msgid "Account Management"
-msgstr "è´¦æ?·ç®¡ç??"
+msgstr "å¸?å?·ç®¡ç??"
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2108
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
msgstr ""
-"请å?¨ä¸?é?¢ç??空ç?½å¤?è¾?å?¥æ¤è´¦æ?·ç??æ??è¿°æ?§å??称ã??\n"
+"请å?¨ä¸?é?¢ç??空ç?½å¤?è¾?å?¥æ¤å¸?å?·ç??æ??è¿°æ?§å??称ã??\n"
"æ¤å??称å°?å?ªå?¨æ?¾ç¤ºæ?¶ä½¿ç?¨ã??"
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2112
msgid "Done"
msgstr "å®?æ??"
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2113
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -10276,57 +9947,52 @@ msgstr ""
"\n"
"å??å?»â??åº?ç?¨â??å?¯ä¿?å?æ?¨ç??设置ã??"
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2554
msgid "Check for _new messages every"
msgstr "è?ªå?¨æ£?æ?¥æ?°é?®ä»¶ç??é?´é??(_N)"
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2562
msgid "minu_tes"
msgstr "å??é??(_T)"
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2836
+msgid "Please select a folder from the current account."
+msgstr "请ä»?å½?å??å¸?å?·é??æ?©ä¸?个æ??件夹ã??"
+
+#: ../mail/em-account-editor.c:3106 ../mail/mail-config.ui.h:107
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:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:3151 ../mail/em-account-editor.c:3219
msgid "Receiving Options"
msgstr "æ?¥æ?¶é??项"
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:3152 ../mail/em-account-editor.c:3220
msgid "Checking for New Messages"
msgstr "����件"
-#: ../mail/em-account-editor.c:3418
-msgid "Account Editor"
-msgstr "账����"
-
-#: ../mail/em-account-editor.c:3418
-msgid "Evolution Account Assistant"
-msgstr "Evolution è´¦æ?·å?©æ??"
-
#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1539
#, c-format
msgid "Your message to %s about \"%s\" on %s has been read."
msgstr ""
#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
-#, fuzzy, c-format
-#| msgid "Mail Notification Properties"
+#: ../mail/em-composer-utils.c:1587
+#, c-format
msgid "Delivery Notification for: \"%s\""
-msgstr "é?®ä»¶é??ç?¥å±?æ?§"
+msgstr "é?®ä»¶é??ç?¥ï¼?%s"
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1918
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:1997
+#: ../mail/em-composer-utils.c:1965
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -10334,19 +10000,19 @@ msgstr ""
"å?¨ ${Year}-${Month}-${Day}${AbbrevWeekdayName}ç?? ${24Hour}:${Minute} "
"${TimeZone}ï¼?${Sender}å??é??ï¼?"
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2109
msgid "-----Original Message-----"
-msgstr "-------- å??å§?信件 --------"
+msgstr "-------- å??å§?ä¿¡æ?¯ --------"
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2289
msgid "Posting destination"
msgstr "æ??é??ç?®ç??"
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2290
msgid "Choose folders to post the message to."
-msgstr "é??æ?©è¦?å°?信件æ??é??å?°å?ªä¸ªæ??件夹ã??"
+msgstr "é??æ?©è¦?å°?ä¿¡æ?¯æ??é??å?°å?ªä¸ªæ??件夹ã??"
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
msgid "Select Folder"
msgstr "é??æ?©æ??件夹"
@@ -10363,10 +10029,18 @@ 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 "å®?æ??äº?"
@@ -10427,6 +10101,10 @@ msgstr "è·?é??"
msgid "Forward to"
msgstr "转å??è?³"
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "é??è¦?"
+
#: ../mail/em-filter-i18n.h:32
msgid "is after"
msgstr "ä¹?å??"
@@ -10451,7 +10129,7 @@ msgstr "�设置"
msgid "is set"
msgstr "已设置"
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:64
msgid "Junk"
msgstr "å??å?¾"
@@ -10489,7 +10167,7 @@ msgstr "ä¸?æ?¯å??å?¾é?®ä»¶"
#: ../mail/em-filter-i18n.h:50
msgid "Message Location"
-msgstr "信件�置"
+msgstr "信��置"
#: ../mail/em-filter-i18n.h:52
msgid "Pipe to Program"
@@ -10500,7 +10178,7 @@ msgid "Play Sound"
msgstr "æ?æ?¾å£°é?³"
#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
msgid "Read"
msgstr "已读"
@@ -10562,7 +10240,7 @@ msgstr "å??é?³ç±»ä¼¼"
#: ../mail/em-filter-i18n.h:69
msgid "Source Account"
-msgstr "��账�"
+msgstr "����"
#: ../mail/em-filter-i18n.h:70
msgid "Specific header"
@@ -10581,39 +10259,39 @@ msgid "Unset Status"
msgstr "å??æ¶?ç?¶æ??"
#. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
msgid "Then"
msgstr "ç?¶å??"
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
msgid "Add Ac_tion"
msgstr "æ·»å? å?¨ä½?(_T)"
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
msgid "Unread messages:"
msgid_plural "Unread messages:"
-msgstr[0] "�读信件��"
+msgstr[0] "�读信���"
#. TODO: can this be done in a loop?
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
msgid "Total messages:"
msgid_plural "Total messages:"
-msgstr[0] "�信件��"
+msgstr[0] "�信���"
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
#, c-format
msgid "Quota usage (%s):"
msgstr "é??é¢?使ç?¨(%s)ï¼?"
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
#, c-format
msgid "Quota usage"
msgstr "é??é¢?使ç?¨"
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
msgid "Folder Properties"
msgstr "æ??件夹å±?æ?§"
@@ -10621,32 +10299,32 @@ msgstr "æ??件夹å±?æ?§"
msgid "<click here to select a folder>"
msgstr "<å??å?»æ¤å¤?以é??æ?©æ??件夹>"
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
msgid "C_reate"
msgstr "å??建(_R)"
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
msgid "Folder _name:"
msgstr "æ??件夹å??称(_N)ï¼?"
#. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1061 ../mail/mail-vfolder.c:1126
msgid "Search Folders"
msgstr "æ??ç´¢æ??件夹"
#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
msgid "UNMATCHED"
msgstr "ä¸?å?¹é??"
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
msgid "Loading..."
-msgstr "æ£å?¨è£?å?¥..."
+msgstr "æ£å?¨è½½å?¥..."
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:184
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "å?¨â??%sâ??ä¸æ?«æ??æ??件夹"
@@ -10673,134 +10351,135 @@ msgstr "æ??件夹å??ä¸?è?½å?«æ??å?符â??/â??"
#. * Do not translate the "folder-display|" part. Remove it
#. * from your translation.
#.
-#: ../mail/em-folder-tree.c:1083
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:1084
+#, c-format
msgctxt "folder-display"
msgid "%s (%u%s)"
-msgstr "%s (%u)"
+msgstr "%s (%u%s)"
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1318
msgid "Mail Folder Tree"
msgstr "é?®ä»¶æ??件夹æ ?"
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
#, c-format
msgid "Moving folder %s"
msgstr "移å?¨æ??件夹â??%sâ??"
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
#, c-format
msgid "Copying folder %s"
msgstr "å¤?å?¶æ??件夹 %s"
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2100
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2153
#, c-format
msgid "Moving messages into folder %s"
-msgstr "æ??信件移è?³æ??件夹 %s"
+msgstr "æ??ä¿¡æ?¯ç§»è?³æ??件夹 %s"
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2102
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2155
#, c-format
msgid "Copying messages into folder %s"
-msgstr "æ??信件å¤?å?¶å?°æ??件夹 %s"
+msgstr "æ??ä¿¡æ?¯å¤?å?¶å?°æ??件夹 %s"
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1650
+#, c-format
msgid "Cannot drop message(s) into toplevel store"
-msgstr "æ? æ³?å°?信件æ?¾å?°é¡¶çº§æ??件夹å?å?¨"
+msgstr "æ? æ³?å°?ä¿¡æ?¯æ?¾å?°é¡¶çº§æ??件夹å?å?¨"
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
msgid "Move Folder To"
msgstr "移å?¨æ??件夹å?°"
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
msgid "Copy Folder To"
msgstr "å¤?å?¶æ??件夹å?°"
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:136
#, c-format
-msgid "Creating folder `%s'"
+msgid "Creating folder '%s'"
msgstr "å??建æ??件夹â??%sâ??"
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:693
msgid "Create Folder"
msgstr "å??建æ??件夹"
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
msgid "Specify where to create the folder:"
msgstr "æ??å®?å?¨å?ªé??å??建æ??件夹ï¼?"
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:714
#, c-format
msgid "Unsubscribing from folder \"%s\""
msgstr "æ? æ³?é??订æ??件夹â??%sâ??"
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1540
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1571
msgid "Unsigned"
msgstr "æ?ªç¾å??"
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
-msgstr "æ¤ä¿¡ä»¶æ?ªç¾å??ã??æ? æ³?ä¿?è¯?è¿?å°?ä¿¡æ?¯å?¯ä¿¡ç??ã??"
+msgstr "æ¤ä¿¡æ?¯æ?ªç¾å??ã??æ? æ³?ä¿?è¯?è¿?å°?ä¿¡æ?¯å?¯ä¿¡ç??ã??"
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1541
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1572
msgid "Valid signature"
msgstr "æ??æ??ç¾å??"
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
-msgstr "æ¤ä¿¡ä»¶å·²ç¾å??ï¼?è??ä¸?ç¾å??æ?¯æ??æ??ç??ã??è¿?æ??å?³ç??è¿?å°?ä¿¡åº?该æ?¯å?¯ä¿¡ç??ã??"
+msgstr "æ¤ä¿¡æ?¯å·²ç¾å??ï¼?è??ä¸?ç¾å??æ?¯æ??æ??ç??ã??è¿?æ??å?³ç??è¿?å°?ä¿¡åº?该æ?¯å?¯ä¿¡ç??ã??"
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1542
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1573
msgid "Invalid signature"
msgstr "æ? æ??ç¾å??"
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr "æ? æ³?æ ¡éª?è¿?å°?ä¿¡ç??ç¾å??ï¼?å?¯è?½å?¨ä¼ é??ç??è¿?ç¨?ä¸é?®ä»¶è¢«ç¯¡æ?¹äº?ã??"
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1543
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1574
msgid "Valid signature, but cannot verify sender"
msgstr "ç¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?å??é??è??"
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
msgstr "è¿?å°?ä¿¡ç??ç¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?é?®ä»¶ç??å??é??è??ã??"
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1544
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1575
msgid "Signature exists, but need public key"
msgstr "ç¾å??å·²å?å?¨ï¼?ä½?é??è¦?å?¬é?¥"
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
msgid ""
"This message is signed with a signature, but there is no corresponding "
"public key."
msgstr "è¿?å°?ä¿¡ç??ç¾å??æ??æ??ï¼?ä½?æ?¯æ²¡æ??ç?¸åº?ç??å?¬é?¥ã??"
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1550
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1581
msgid "Unencrypted"
msgstr "æ?ªå? å¯?"
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr "è¿?å°?ä¿¡æ?ªå? å¯?ã??å?¨ Internet ä¸?ä¼ é??æ?¶æ??æ??人é?½å?¯ä»¥ç??å?°å?¶å??容ã??"
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1551
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1582
msgid "Encrypted, weak"
msgstr "å¼±å? å¯?"
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
msgid ""
"This message is encrypted, but with a weak encryption algorithm. It would be "
"difficult, but not impossible for an outsider to view the content of this "
@@ -10809,21 +10488,21 @@ msgstr ""
"è¿?å°?ä¿¡å·²å? å¯?ï¼?ä½?使ç?¨ç??æ?¯å¼±å? å¯?ç®?æ³?ã??å¦?æ??å¤?人æ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??容ï¼?å?¯è?½è¦?è?±ä¸?"
"å®?æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å¾?å?°é?¾ä½?并ä¸?æ?¯ä¸?å?¯è?½ã??"
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1552
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1583
msgid "Encrypted"
msgstr "å? å¯?"
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
msgstr "è¿?å°?ä¿¡å·²å? å¯?ã??å¤?人è¦?æ?³æ?¥ç??è¿?å°?ä¿¡ç??å??容å??å??å?°é?¾ã??"
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1553
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1584
msgid "Encrypted, strong"
msgstr "强å? å¯?"
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
@@ -10832,15 +10511,15 @@ msgstr ""
"è¿?å°?ä¿¡å·²å? å¯?ï¼?ä¸?使ç?¨ç??æ?¯å¼ºå? å¯?ç®?æ³?ã??å¦?æ??å¤?人æ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??容ï¼?å?¯è?½è¦?è?±å¤§"
"é??æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å??å??å?°é?¾ã??"
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
msgid "_View Certificate"
msgstr "æ?¥ç??è¯?书(_V)"
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
msgid "This certificate is not viewable"
msgstr "æ¤è¯?书ä¸?å?¯æ?¥ç??"
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
msgid ""
"Evolution cannot render this email as it is too large to process. You can "
"view it unformatted or with an external text editor."
@@ -10848,126 +10527,144 @@ msgstr ""
"Evolution æ? æ³?渲æ??æ¤ç?µå?é?®ä»¶ï¼?å??å? æ?¯è¯¥é?®ä»¶å¤ªå¤§ã??æ?¨å?¯ä»¥ä»¥æ? æ ¼å¼?æ?¹å¼?æ?¥ç??该é?®"
"件ï¼?æ??è??使ç?¨å¤?é?¨æ??æ?¬ç¼?è¾?å?¨æ?¥ç??ã??"
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:725
msgid "Completed on"
msgstr "å®?æ??äº?"
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:733
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:750
+#: ../mail/em-format-html-display.c:737
msgid "by"
msgstr ""
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html-display.c:999
msgid "View _Unformatted"
msgstr "æ? æ ¼å¼?æ?¥ç??(_U)"
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:954
msgid "Hide _Unformatted"
msgstr "æ? æ ¼å¼?é??è??(_U)"
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1019
msgid "O_pen With"
msgstr "æ??å¼?æ?¹å¼?(_P)"
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:162
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页�� %d 页"
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:151
msgid "Formatting message"
-msgstr "æ ¼å¼?å??信件"
+msgstr "æ ¼å¼?å??ä¿¡æ?¯"
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:347
msgid "Formatting Message..."
-msgstr "æ£å?¨æ ¼å¼?å??信件..."
+msgstr "æ£å?¨æ ¼å¼?å??ä¿¡æ?¯..."
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1416 ../mail/em-format-html.c:1425
#, c-format
-msgid "Retrieving `%s'"
+msgid "Retrieving '%s'"
msgstr "æ?¶å??â??%sâ??"
-#: ../mail/em-format-html.c:1859
+#: ../mail/em-format-html.c:1896
msgid "Unknown external-body part."
msgstr "æ?ªç?¥ç?? external-body é?¨å??ã??"
-#: ../mail/em-format-html.c:1867
+#: ../mail/em-format-html.c:1904
msgid "Malformed external-body part."
msgstr "æ ¼å¼?ä¸?æ£ç¡®ç?? external-body é?¨å??ã??"
-#: ../mail/em-format-html.c:1897
+#: ../mail/em-format-html.c:1934
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "æ??å?? FTP ç«?ç?¹ (%s)"
-#: ../mail/em-format-html.c:1908
+#: ../mail/em-format-html.c:1945
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "å?¨ç«?ç?¹â??%2$sâ??æ??å??æ?¬å?°æ??件 (%1$s) å??æ³?"
-#: ../mail/em-format-html.c:1910
+#: ../mail/em-format-html.c:1947
#, c-format
msgid "Pointer to local file (%s)"
msgstr "æ??å??æ?¬å?°æ??件 (%s)"
-#: ../mail/em-format-html.c:1931
+#: ../mail/em-format-html.c:1968
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "æ??å??è¿?ç¨?æ?°æ?® (%s)"
-#: ../mail/em-format-html.c:1942
+#: ../mail/em-format-html.c:1979
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
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:2602
+#: ../mail/em-format-html.c:2642
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "æ¤æ¶?æ?¯ç?± %s 代表 %s ç??身份å??é??"
+
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
#, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "æ¤æ¶?æ?¯ç?± <b>%s</b> 以 <b>%s</b> ç??身份å??é??"
+msgid "No HTML stream available"
+msgstr "没æ??å?¯ç?¨ç?? HTML æµ?ã??"
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:677
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "æ¤å?å?¨ä¸?æ?¯æ??订é??ï¼?æ??订é??æ?ªå?¯ç?¨ã??"
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:728
msgid "Subscribed"
msgstr "已订é??"
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:732
msgid "Folder"
msgstr "æ??件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1120
msgid "Please select a server."
msgstr "请é??æ?©æ??å?¡å?¨ã??"
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1166
msgid "No server has been selected"
msgstr "没æ??é??ä¸æ??å?¡å?¨"
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "æ?¨ç¡®å®?è¦?ä¸?次æ??å¼? %d å°?ä¿¡å??ï¼?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "ä¸?å??æ?¾ç¤ºæ¤ä¿¡æ?¯(_D)"
+
+#: ../mail/em-utils.c:314
msgid "Message Filters"
msgstr "�件�滤�"
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:848
#, c-format
msgid "Messages from %s"
-msgstr "æ?¥è?ª %s ç??信件"
+msgstr "æ?¥è?ª %s ç??ä¿¡æ?¯"
#: ../mail/em-vfolder-editor.c:126
msgid "Search _Folders"
msgstr "æ??ç´¢æ??件夹(_F)"
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:525
msgid "Add Folder"
msgstr "æ·»å? æ??件夹"
@@ -11008,138 +10705,134 @@ msgid "\"Send and Receive Mail\" window width"
msgstr "â??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£å®½åº¦"
#: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "å??许 Evolution æ?¾ç¤ºè¢«é??å?¶å¤§å°?ç??æ??æ?¬é?¨å??"
-
-#: ../mail/evolution-mail.schemas.in.h:11
msgid "Always request read receipt"
msgstr "æ?»æ?¯è¯·æ±?é??读æ?¶æ?¡"
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
msgid "Automatic emoticon recognition"
msgstr "è?ªå?¨è¯?å?«è¡¨æ??å?¾æ ?"
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
msgid "Automatic link recognition"
msgstr "������"
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
msgid "Check incoming mail being junk"
msgstr "æ£?æ?¥æ?¶å?°ç??é?®ä»¶æ?¯å?¦æ?¯å??å?¾é?®ä»¶"
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
msgid "Citation highlight color"
msgstr "������"
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
msgid "Citation highlight color."
msgstr "å¼?ç?¨çª?å?ºé¢?è?²ã??"
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
msgid "Composer Window default height"
msgstr "ç¼?å??çª?å?£ç??é»?认é«?度"
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
msgid "Composer Window default width"
msgstr "ç¼?å??çª?å?£ç??é»?认宽度"
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
msgid "Composer load/attach directory"
msgstr "æ?°å??å?¨å? è½½/é??件ç?®å½?"
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
msgid "Compress display of addresses in TO/CC/BCC"
msgstr "å??缩 TO/CC/BCC ä¸å?°å??ç??æ?¾ç¤º"
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
msgid ""
"Compress display of addresses in TO/CC/BCC to the number specified in "
"address_count."
msgstr "å°? TO/CC/BCC ç??æ?¾ç¤ºå?°å??æ?°å??缩å?° address_count æ??æ??å®?ç??æ?°é??ã??"
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
msgid ""
"Controls how frequently local changes are synchronized with the remote mail "
"server. The interval must be at least 30 seconds."
msgstr "æ?§å?¶ä¸?è¿?ç¨?é?®ä»¶æ??å?¡å?¨å??æ¥æ?¬å?°æ?´æ?¹ç??é¢?ç??ã??é?´é??å¿?é¡»è?³å°?为 30 ç§?ã??"
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
msgid "Custom headers to use while checking for junk."
msgstr "è?ªå®?ä¹?ç?¨ä»¥æ£?æ?¥å??å?¾é?®ä»¶ç??信头ã??"
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
msgid ""
"Custom headers to use while checking for junk. The list elements are string "
"in the format \"headername=value\"."
msgstr "è?ªå®?ä¹?ç?¨ä»¥æ£?æ?¥å??å?¾é?®ä»¶ç??信头ã??å??表å??ç´ ç??å?ç¬¦ä¸²æ ¼å¼?为â??信头å??=å?¼â??ã??"
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
msgid "Default charset in which to compose messages"
-msgstr "ç¼?å??信件ç??é»?认å?符é??"
+msgstr "ç¼?å??ä¿¡æ?¯ç??é»?认å?符é??"
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
msgid "Default charset in which to compose messages."
-msgstr "ç¼?å??信件ç??é»?认å?符é??ã??"
+msgstr "ç¼?å??ä¿¡æ?¯ç??é»?认å?符é??ã??"
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
msgid "Default charset in which to display messages"
-msgstr "æ?¾ç¤ºä¿¡ä»¶ç??é»?认å?符é??"
+msgstr "æ?¾ç¤ºä¿¡æ?¯ç??é»?认å?符é??"
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
msgid "Default charset in which to display messages."
-msgstr "æ?¾ç¤ºä¿¡ä»¶ç??é»?认å?符é??ã??"
+msgstr "æ?¾ç¤ºä¿¡æ?¯ç??é»?认å?符é??ã??"
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
msgid "Default forward style"
msgstr "é»?认转å??æ?¹å¼?"
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
msgid "Default height of the Composer Window."
msgstr "æ?°å??çª?å?£ç??é»?认é«?度ã??"
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
msgid "Default height of the mail browser window."
msgstr "é?®ä»¶æµ?è§?å?¨çª?å?£ç??é»?认é«?度ã??"
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
msgid "Default height of the subscribe dialog."
msgstr "订é??对è¯?æ¡?ç??é»?认é«?度ã??"
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
msgid "Default maximized state of the mail browser window."
msgstr "é?®ä»¶æµ?è§?å?¨çª?å?£ç??é»?认æ??大å??ç?¶æ??ã??"
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
msgid "Default reply style"
msgstr "é»?认å??å¤?æ ·å¼?"
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
msgid "Default value for thread expand state"
msgstr "è¯?é¢?ç??é»?认å±?å¼?ç?¶æ??"
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
msgid "Default width of the Composer Window."
msgstr "æ?°å??çª?å?£ç??é»?认宽度ã??"
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
msgid "Default width of the mail browser window."
msgstr "é?®ä»¶æµ?è§?å?¨çª?å?£ç??é»?认宽度ã??"
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
msgid "Default width of the subscribe dialog."
msgstr "订é??对è¯?æ¡?ç??é»?认宽度ã??"
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
msgid ""
"Determines whether to look up addresses for junk filtering in local address "
"book only"
msgstr "å?³å®?æ?¯å?¦ä»?å?¨æ?¬å?°å?°å??ç°¿ä¸æ?¥æ?¾å?°å??è¿?è¡?å??å?¾é?®ä»¶è¿?滤"
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
msgid "Determines whether to lookup in address book for sender email"
msgstr "å?³å®?æ?¯å?¦å?¨å?°å??ç°¿ä¸æ?¥æ?¾å??件人ç?µå?é?®ä»¶"
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
msgid ""
"Determines whether to lookup the sender email in address book. If found, it "
"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11150,11 +10843,11 @@ msgstr ""
"为è?ªå?¨è¡¥å?¨ç??å?°å??ç°¿ä¸æ?¥æ?¾ï¼?å¦?æ??è¿?ç¨?å?°å??ç°¿(å¦? LDAP)被æ ?记为è?ªå?¨è¡¥å?¨ç??è¯?ï¼?å?¯è?½ä¼?"
"æ¯?è¾?æ?¢ã??"
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
msgid "Determines whether to use custom headers to check for junk"
msgstr "å?³å®?æ?¯å?¦ä½¿ç?¨è?ªå®?ä¹?信头æ£?æµ?å??å?¾é?®ä»¶"
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
msgid ""
"Determines whether to use custom headers to check for junk. If this option "
"is enabled and the headers are mentioned, it will be improve the junk "
@@ -11163,28 +10856,31 @@ msgstr ""
"å?³å®?æ?¯å?¦ä½¿ç?¨è?ªå®?ä¹?信头æ£?æµ?å??å?¾é?®ä»¶ã??å¦?æ??æ¤é??项被å?¯ç?¨ä¸?信头被设置ç??è¯?ï¼?å°?æ??é«?"
"å??å?¾é?®ä»¶æ£?æµ?é??度ã??"
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
msgid ""
"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
"lines in the \"Messages\" column in vertical view."
-msgstr "å?³å®?æ?¯å?¦å?¨å??ç?´è§?å?¾ä¸å¯¹â??信件â??å??ç??â??æ?¥è?ªâ??å??â??主é¢?â??è¡?使ç?¨ç?¸å??ç??å?ä½?ã??"
+msgstr "å?³å®?æ?¯å?¦å?¨å??ç?´è§?å?¾ä¸å¯¹â??ä¿¡æ?¯â??å??ç??â??æ?¥è?ªâ??å??â??主é¢?â??è¡?使ç?¨ç?¸å??ç??å?ä½?ã??"
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
msgid "Directory for loading/attaching files to composer."
msgstr "é?®ä»¶å??ä½?å?¨ç?¨æ?¥å? è½½/é??å? æ??件ç??ç?®å½?"
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
msgid "Directory for saving mail component files."
msgstr "ä¿?å?é?®ä»¶ç»?件æ??件ç??ç?®å½?ã??"
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
msgid "Disable or enable ellipsizing of folder names in side bar"
msgstr "ç¦?ç?¨æ??å?¯ç?¨ä¾§è¾¹æ ?ä¸æ??件夹å??ç??ç??ç?¥æ?¾ç¤º"
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+
#: ../mail/evolution-mail.schemas.in.h:49
-#, fuzzy
msgid "Do not add signature delimiter"
-msgstr "æ? æ³?ä¿?å?ç¾å??æ??件ã??"
+msgstr "ä¸?æ·»å? ç¾å??å??é??符"
#: ../mail/evolution-mail.schemas.in.h:50
msgid "Draw spelling error indicators on words as you type."
@@ -11221,9 +10917,8 @@ msgid "Enable or disable magic space bar"
msgstr "å?¯ç?¨æ??ç¦?ç?¨é?æ?¯ç©ºæ ¼é?®"
#: ../mail/evolution-mail.schemas.in.h:58
-#, fuzzy
msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr "ç¦?ç?¨/å?¯ç?¨å¯¹å¤?å°?é?®ä»¶ç??æ ?è®°ã??"
+msgstr "ç¦?ç?¨/å?¯ç?¨å¯¹å¤?å°?é?®ä»¶æ ?è®°æ?¶ç??æ??示ã??"
#: ../mail/evolution-mail.schemas.in.h:59
msgid "Enable or disable type ahead search feature"
@@ -11250,18 +10945,29 @@ msgid ""
msgstr "å?¯ç?¨ä»¥å?¨æ¶?æ?¯é¢?è§?ã??æ¶?æ?¯å??表å??æ??件夹ä¸ä½¿ç?¨ç©ºæ ¼é?®ã??"
#: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "å??许渲æ??被é??å?¶å¤§å°?ç??信件æ??æ?¬é?¨å??ã??"
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:66
+#, fuzzy
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr "å?¯ç?¨ä»¥å?¨æ¶?æ?¯é¢?è§?ã??æ¶?æ?¯å??表å??æ??件夹ä¸ä½¿ç?¨ç©ºæ ¼é?®ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:67
msgid "Enable/disable caret mode"
msgstr "å?¯ç?¨/ç¦?ç?¨å??æ ?模å¼?"
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
msgid "Encode file names in an Outlook/GMail way"
msgstr "使ç?¨ Outlook/Gmail ç??æ?¹å¼?ç¼?ç ?æ??件å??"
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
msgid ""
"Encode file names in the mail headers same as Outlook or GMail do, to let "
"them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11269,25 +10975,29 @@ msgid ""
"standard."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:71
msgid "Height of the message-list pane"
-msgstr "信件å??表é?¢æ?¿ç??é«?度"
+msgstr "ä¿¡æ?¯å??表é?¢æ?¿ç??é«?度"
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:72
msgid "Height of the message-list pane."
-msgstr "信件å??表é?¢æ?¿ç??é«?度ã??"
+msgstr "ä¿¡æ?¯å??表é?¢æ?¿ç??é«?度ã??"
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:73
msgid "Hides the per-folder preview and removes the selection"
msgstr "é??è??å??æ??件夹é¢?è§?并移é?¤é??æ?©"
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:74
msgid ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
-msgstr "å¦?æ??ç?¨æ?·è¯?å?¾ä¸?次æ??å¼?ç??信件大äº?ç?äº?å??å°?ï¼?å°?ä¼?询é?®ç?¨æ?·æ?¯å?¦ç??ç??è¦?è¿?ä¹?å??ã??"
+msgstr "å¦?æ??ç?¨æ?·è¯?å?¾ä¸?次æ??å¼?ç??ä¿¡æ?¯å¤§äº?ç?äº?å??å°?ï¼?å°?ä¼?询é?®ç?¨æ?·æ?¯å?¦ç??ç??è¦?è¿?ä¹?å??ã??"
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:75
#, fuzzy
msgid ""
"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
@@ -11298,25 +11008,25 @@ msgstr ""
"MIME ç±»å??å?¨ GNOME ç?? MIME ç±»å??æ?°æ?®åº?ä¸æ? å°?ç?? bonobo ç»?件æ?¥ç??å?¨å°?被ç?¨æ?¥æ?¾ç¤ºå?¶"
"å??容ã??"
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
msgid ""
"Initial height of the \"Filter Editor\" window. The value updates as the "
"user resizes the window vertically."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
msgid ""
"Initial height of the \"Search Folder Editor\" window. The value updates as "
"the user resizes the window vertically."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:78
msgid ""
"Initial height of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window vertically."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:79
msgid ""
"Initial maximize state of the \"Filter Editor\" window. The value updates "
"when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11324,7 +11034,7 @@ msgid ""
"maximized. This key exists only as an implementation detail."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
msgid ""
"Initial maximize state of the \"Search Folder Editor\" window. The value "
"updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11332,7 +11042,7 @@ msgid ""
"window cannot be maximized. This key exists only as an implementation detail."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:81
msgid ""
"Initial maximize state of the \"Send and Receive Mail\" window. The value "
"updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11341,78 +11051,77 @@ msgid ""
"detail."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:82
msgid ""
"Initial width of the \"Filter Editor\" window. The value updates as the user "
"resizes the window horizontally."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:83
msgid ""
"Initial width of the \"Search Folder Editor\" window. The value updates as "
"the user resizes the window horizontally."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:84
msgid ""
"Initial width of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window horizontally."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:85
msgid ""
"It disables/enables the repeated prompts to warn that deleting messages from "
"a search folder permanently deletes the message, not simply removing it from "
"the search results."
msgstr ""
-"ç¦?ç?¨/å?¯ç?¨æ°¸ä¹?å? é?¤(è??é??ç®?å??å?°ä»?ç»?æ??ä¸ç§»é?¤)æ??ç´¢æ??件夹ä¸ç??信件æ?¶ä¸?æ?å¼¹å?ºç??æ??示ã??"
+"ç¦?ç?¨/å?¯ç?¨æ°¸ä¹?å? é?¤(è??é??ç®?å??å?°ä»?ç»?æ??ä¸ç§»é?¤)æ??ç´¢æ??件夹ä¸ç??ä¿¡æ?¯æ?¶ä¸?æ?å¼¹å?ºç??æ??示ã??"
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
-msgstr "ä¸?次æ¸?空å??å?¾é?®ä»¶ç??æ?¶é?´"
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Last time Empty Junk was run"
+msgstr "ä¸?次æ¸?空å??å?¾é?®ä»¶ç??æ?¶é?´ä¸ºï¼?"
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
-msgstr "ä¸?次æ¸?空å??æ?¶ç«?ç??æ?¶é?´"
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Last time Empty Trash was run"
+msgstr "ä¸?次æ¸?空å??æ?¶ç«?ç??æ?¶é?´ä¸ºï¼?"
-#: ../mail/evolution-mail.schemas.in.h:85
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:88
msgid "Layout style"
-msgstr "马约��"
+msgstr "å¸?å±?æ ·å¼?"
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:90
msgid "List of Labels and their associated colors"
msgstr "æ ?ç¾å??å?¶å¯¹åº?é¢?è?²ç??å??表"
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:91
msgid "List of MIME types to check for Bonobo component viewers"
msgstr "å??å?ºè¦?使ç?¨ bonobo ç»?件æ?¥ç??å?¨æ?¥ç??ç?? MIME ç±»å??"
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "List of accepted licenses"
msgstr "å??å?ºæ?¥å??ç??许å?¯"
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "List of accounts"
-msgstr "è´¦æ?·å??表"
+msgstr "å¸?å?·å??表"
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:94
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
msgstr ""
-"å??å?ºäº? Evolution é?®ä»¶ç»?件已ç?¥ç??è´¦æ?·ã??æ¤å??表å??å?«äº?ç?¸å¯¹äº? /apps/evolution/mail/"
+"å??å?ºäº? Evolution é?®ä»¶ç»?件已ç?¥ç??å¸?å?·ã??æ¤å??表å??å?«äº?ç?¸å¯¹äº? /apps/evolution/mail/"
"accounts ç??å?ç?®å½?å?½å??å?符串ã??"
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "List of custom headers and whether they are enabled."
msgstr "è?ªå®?ä¹?头å??该头æ?¯å?¦å?¯ç?¨ã??"
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "List of dictionary language codes used for spell checking."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:97
msgid ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:color where color uses the HTML hex encoding."
@@ -11420,377 +11129,368 @@ msgstr ""
"å??å?ºäº? Evolution é?®ä»¶ç»?件已ç?¥ç??æ ?ç¾ã??å??表ä¸ç??å?ç¬¦ä¸²æ ¼å¼?å½¢å¦?â??å??称:é¢?è?²â??ï¼?å?¶ä¸"
"é¢?è?²ä½¿ç?¨äº? HTML å??å?è¿?å?¶ç¼?ç ?æ?¹å¼?ã??"
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:98
msgid "List of protocol names whose license has been accepted."
msgstr "å??å?ºæ?¥å??å??è®®ç??å??è®®å??称ã??"
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:99
msgid "Load images for HTML messages over HTTP"
-msgstr "å?¨ HTML 信件ä¸è£?å?¥ HTTP å?¾å??"
+msgstr "å?¨ HTML ä¿¡æ?¯ä¸è½½å?¥ HTTP å?¾å??"
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:100
msgid ""
"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
"Never load images off the net. \"1\" - Load images in messages from "
"contacts. \"2\" - Always load images off the net."
msgstr ""
-"å?¨ HTML 信件ä¸è£?å?¥ HTTP(S) å?¾å??ã??å?¯ä¾?é??æ?©ç??å?¼æ??ï¼?0 - ç»?ä¸?ä»?ç½?ä¸?è£?å?¥å?¾å??ï¼?1 - "
-"å¦?æ??å??é??è??å?¨å?°å??ç°¿ä¸å??è£?å?¥å?¾å??ï¼?2 - æ?»æ?¯ä»?ç½?ä¸?è£?å?¥å?¾å??ã??"
+"å?¨ HTML ä¿¡æ?¯ä¸è½½å?¥ HTTP(S) å?¾å??ã??å?¯ä¾?é??æ?©ç??å?¼æ??ï¼?0 - ç»?ä¸?ä»?ç½?ä¸?è½½å?¥å?¾å??ï¼?1 - "
+"å¦?æ??å??é??è??å?¨å?°å??ç°¿ä¸å??è½½å?¥å?¾å??ï¼?2 - æ?»æ?¯ä»?ç½?ä¸?è½½å?¥å?¾å??ã??"
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "Log filter actions"
msgstr "记��滤��"
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:102
msgid "Log filter actions to the specified log file."
msgstr "å°?è¿?滤å?¨ä½?è®°å½?å?°æ??å®?æ?¥å¿?æ??件ã??"
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:103
msgid "Logfile to log filter actions"
msgstr "è®°å½?è¿?滤å?¨ä½?ç??æ?¥å¿?æ??件"
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "Logfile to log filter actions."
msgstr "è®°å½?è¿?滤å?¨ä½?ç??æ?¥å¿?æ??件ã??"
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:105
msgid "Mail browser height"
msgstr "�件����度"
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:106
msgid "Mail browser maximized"
msgstr "é?®ä»¶æµ?è§?å?¨æ??大å??"
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:107
msgid "Mail browser width"
msgstr "�件���宽度"
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:108
msgid "Mark as Seen after specified timeout"
msgstr "å?¨æ??å®?è¶?æ?¶è¿?å??æ ?为已ç??"
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:109
msgid "Mark as Seen after specified timeout."
msgstr "å?¨æ??å®?è¶?æ?¶è¿?å??æ ?为已ç??ã??"
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:110
msgid "Mark citations in the message \"Preview\""
-msgstr "å?¨ä¿¡ä»¶â??é¢?è§?â??ä¸æ ?å?ºå¼?ç?¨"
+msgstr "å?¨ä¿¡æ?¯â??é¢?è§?â??ä¸æ ?å?ºå¼?ç?¨"
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "Mark citations in the message \"Preview\"."
-msgstr "å?¨ä¿¡ä»¶â??é¢?è§?â??ä¸æ ?å?ºå¼?ç?¨ã??"
+msgstr "å?¨ä¿¡æ?¯â??é¢?è§?â??ä¸æ ?å?ºå¼?ç?¨ã??"
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Message text limit for display"
+msgstr "ä¿¡æ?¯æ??æ?¬æ?¾ç¤ºé??å?¶"
+
+#: ../mail/evolution-mail.schemas.in.h:113
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "信件æ?¾ç¤ºé£?æ ¼(â??normalâ??æ?®é??ã??â??full headersâ??å?¨é?¨é?®ä»¶å¤´ã??â??sourceâ??æº?代ç ?)"
+msgstr "ä¿¡æ?¯æ?¾ç¤ºé£?æ ¼(â??normalâ??æ?®é??ã??â??full headersâ??å?¨é?¨é?®ä»¶å¤´ã??â??sourceâ??æº?代ç ?)"
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:114
msgid "Minimum days between emptying the junk on exit"
-msgstr "é??å?ºæ?¶æ¸?空å??å?¾ä¿¡ä»¶ç??æ??å°?天æ?°"
+msgstr "é??å?ºæ?¶æ¸?空å??å?¾ä¿¡æ?¯ç??æ??å°?天æ?°"
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:115
msgid "Minimum days between emptying the trash on exit"
msgstr "é??å?ºæ?¶æ¸?空å??æ?¶ç«?ç??æ??å°?天æ?°"
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:116
msgid "Minimum time between emptying the junk on exit, in days."
-msgstr "é??å?ºæ?¶æ¸?空å??å?¾ä¿¡ä»¶ç??æ??å°?æ?¶é?´ï¼?以天计ã??"
+msgstr "é??å?ºæ?¶æ¸?空å??å?¾ä¿¡æ?¯ç??æ??å°?æ?¶é?´ï¼?以天计ã??"
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:117
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "é??å?ºæ?¶æ¸?空å??æ?¶ç«?ç??æ??å°?天æ?°ã??"
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:118
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "è¦?å?¨ TO/CC/BCC ä¸æ?¾ç¤ºç??å?°å??æ?°"
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:119
msgid "Prompt on empty subject"
msgstr "空主é¢?æ?¶æ??示"
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "ç?¨æ?·è§?å?¾é??æ¯?æ??件夹æ?¶æ??示ã??"
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:121
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr "ç?¨æ?·è§?å?¾å??é??没æ??主é¢?ç??é?®ä»¶æ?¶æ??示ã??"
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "Prompt when deleting messages in search folder"
-msgstr "å? é?¤æ??ç´¢æ??件夹ä¸ç??信件æ?¶æ??示"
+msgstr "å? é?¤æ??ç´¢æ??件夹ä¸ç??ä¿¡æ?¯æ?¶æ??示"
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:123
msgid "Prompt when user expunges"
msgstr "ç?¨æ?·é??æ¯?æ?¶æ??示"
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:124
msgid "Prompt when user only fills Bcc"
msgstr "ç?¨æ?·å?ªå¡«å?¥ Bcc æ?¶æ??示"
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:125
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "å½?ç?¨æ?·è¯?å?¾ä¸?次æ??å¼?è¶?è¿?å??å°?ä¿¡æ?¶æ??示"
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:126
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
msgstr "å½?ç?¨æ?·è¯?å?¾ç»?ä¸?æ?³æ?¥æ?¶ HTML ç??è??系人å??é?? HTML é?®ä»¶æ?¶æ??示ã??"
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:127
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "å½?ç?¨æ?·è¯?å?¾å??é??没æ?? To æ?? Cc æ?¶ä»¶äººç??é?®ä»¶æ?¶æ??示ã??"
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:128
msgid "Prompt when user tries to send unwanted HTML"
msgstr "å½?ç?¨æ?·æ?¯å?¦å??é??æ??å¤?ç?? HTML æ?¶æ??示"
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:129
msgid "Prompt while marking multiple messages"
-msgstr "æ ?è®°å¤?å°?信件æ?¶æ??示"
+msgstr "æ ?è®°å¤?å°?ä¿¡æ?¯æ?¶æ??示"
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:130
msgid "Put personalized signatures at the top of replies"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:131
#, fuzzy
msgid "Put the cursor at the bottom of replies"
msgstr "å??å¤?æ?¶å?¨åº?é?¨å¼?å§?æ??å?(_T)"
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:132
msgid "Recognize emoticons in text and replace them with images."
msgstr "è¯?å?«æ??æ?¬ä¸ç??表æ??ï¼?并å°?å?¶æ?¿æ?¢ä¸ºå?¾å??ã??"
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:133
msgid "Recognize links in text and replace them."
msgstr "è¯?å?«æ??æ?¬ä¸ç??é?¾æ?¥å¹¶è¿?è¡?æ?¿æ?¢ã??"
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:134
msgid "Run junk test on incoming mail."
msgstr "对æ?¶å?°ç??é?®ä»¶è¿?è¡?å??å?¾é?®ä»¶æµ?è¯?ã??"
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:135
msgid "Save directory"
msgstr "ä¿?å?ç?®å½?"
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "Search for the sender photo in local address books"
msgstr "å?¨æ?¬å?°å?°å??è??ä¸æ??ç´¢å??件人ç?§ç??"
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "Send HTML mail by default"
msgstr "é»?认以 HTML å??é??é?®ä»¶"
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:138
msgid "Send HTML mail by default."
msgstr "é»?认以 HTML å??é??é?®ä»¶ã??"
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:139
msgid "Sender email-address column in the message list"
-msgstr "å?¨ä¿¡ä»¶å??表ä¸æ?¾ç¤º email å?°å??å??"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸æ?¾ç¤º email å?°å??å??"
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:140
msgid "Server synchronization interval"
msgstr "æ??å?¡å?¨å??æ¥é?´é??"
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:141
msgid ""
"Set to TRUE in case you do not want to add signature delimiter before your "
"signature when composing a mail."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:142
msgid "Show \"Bcc\" field when sending a mail message"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:143
msgid "Show \"Cc\" field when sending a mail message"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:144
msgid "Show \"From\" field when posting to a newsgroup"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:145
msgid "Show \"Reply To\" field when posting to a newsgroup"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:146
#, fuzzy
msgid "Show \"Reply To\" field when sending a mail message"
msgstr "å½?å??é??å? å¯?é?®ä»¶æ?¶ä¹?对è?ªèº«å? å¯?(_F)"
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:147
msgid "Show Animations"
msgstr "�示��"
-#: ../mail/evolution-mail.schemas.in.h:145
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:148
msgid "Show all message headers"
-msgstr "æ??å? å?¨é?¨ä¿¡ä»¶çº¿ç´¢"
+msgstr "�示��信�头"
-#: ../mail/evolution-mail.schemas.in.h:146
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:149
msgid "Show all the headers when viewing a messages."
-msgstr "é??ä¸ä¿¡ä»¶ä¸ç??å?¨é?¨æ??æ?¬"
+msgstr "æ?¥ç??æ¶?æ?¯æ?¶æ?¾ç¤ºå?¨é?¨ä¿¡æ?¯å¤´ã??"
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:150
msgid "Show animated images as animations."
msgstr "å°?å?¨ç?»å?¾å??æ?¾ç¤ºä¸ºå?¨ç?»ã??"
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:151
msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "å?¨ä¿¡ä»¶å??表ä¸æ?¾ç¤ºå? é?¤äº?ç??信件(带æ??å? é?¤çº¿)ã??"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯(带æ??å? é?¤çº¿)ã??"
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:152
msgid "Show deleted messages in the message-list"
-msgstr "å?¨ä¿¡ä»¶å??表ä¸æ?¾ç¤ºå? é?¤äº?ç??信件"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯"
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:153
msgid "Show image animations"
msgstr "æ?¾ç¤ºå?¾å??å?¨ç?»"
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:154
msgid "Show original \"Date\" header value."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:155
msgid "Show photo of the sender"
msgstr "æ?¾ç¤ºå??件人ç?§ç??"
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:156
msgid ""
"Show the \"Bcc\" 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:154
+#: ../mail/evolution-mail.schemas.in.h:157
msgid ""
"Show the \"Cc\" 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:155
+#: ../mail/evolution-mail.schemas.in.h:158
msgid ""
"Show the \"From\" 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:156
-msgid ""
-"Show the \"From\" 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:157
+#: ../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:158
+#: ../mail/evolution-mail.schemas.in.h:160
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:159
+#: ../mail/evolution-mail.schemas.in.h:161
msgid ""
"Show the email-address of the sender in a separate column in the message "
"list."
-msgstr "å?¨ä¿¡ä»¶å??表ç??以å?¦å¤?ç??å??æ?¾ç¤ºç?µå?é?®ä»¶ç??å??é??è??ã??"
+msgstr "å?¨ä¿¡æ?¯å??表ç??以å?¦å¤?ç??å??æ?¾ç¤ºç?µå?é?®ä»¶ç??å??é??è??ã??"
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
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:161
+#: ../mail/evolution-mail.schemas.in.h:163
msgid "Show the photo of the sender in the message reading pane."
-msgstr "å?¨ä¿¡ä»¶é??读é?¢æ?¿ä¸æ?¾ç¤ºå??件人ç?§ç??ã??"
+msgstr "å?¨ä¿¡æ?¯é??读é?¢æ?¿ä¸æ?¾ç¤ºå??件人ç?§ç??ã??"
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
msgid "Spell check inline"
msgstr "å??åµ?æ?¼å??æ£?æ?¥"
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
msgid "Spell checking color"
msgstr "æ?¼å??æ£?æ?¥é¢?è?²"
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
msgid "Spell checking languages"
msgstr "æ?¼å??æ£?æ?¥è¯è¨?"
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
msgid "Subscribe dialog default height"
msgstr "订é??对è¯?æ¡?é»?认é«?度"
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
msgid "Subscribe dialog default width"
msgstr "订é??对è¯?æ¡?é»?认宽度"
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
msgid "Terminal font"
msgstr "ç»?端å?ä½?"
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "æ??æ?¬ä¿¡ä»¶é?¨å??é??å?¶"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "The default plugin for Junk hook"
-msgstr "é»?认ç??å??å?¾ä¿¡ä»¶é?©å?æ??件"
-
#: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "ä¸?次æ¸?空å??å?¾ä¿¡ä»¶ç??æ?¶é?´ï¼?以è?ªæ?°çºªå??å??ç??天æ?°æ?¾ç¤ºã??"
+msgid "The default plugin for Junk hook"
+msgstr "é»?认ç??å??å?¾ä¿¡æ?¯é?©å?æ??件"
#: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr "ä¸?次æ¸?空å??æ?¶ç«?ç??æ?¶é?´ï¼?以æ?°çºªå??å??ç??天æ?°æ?¾ç¤ºã??"
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "ä¸?次æ¸?空å??å?¾ä¿¡æ?¯ç??æ?¶é?´ï¼?以è?ªæ?°çºªå??å??ç??天æ?°æ?¾ç¤ºã??"
#: ../mail/evolution-mail.schemas.in.h:172
msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "ä¸?次æ¸?空å??æ?¶ç«?ç??æ?¶é?´ï¼?以æ?°çºªå??å??ç??天æ?°æ?¾ç¤ºã??"
+
+#: ../mail/evolution-mail.schemas.in.h:173
+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 "
"message list. \"1\" (Vertical View) places the preview pane next to the "
"message list."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
msgid "The terminal font for mail display."
msgstr "é?®ä»¶æ?¾ç¤ºç?¨ç??ç»?端å?ä½?ã??"
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
msgid "The variable width font for mail display."
msgstr "ç?¨äº?æ?¾ç¤ºé?®ä»¶ç??å??宽å?ä½?ã??"
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:176
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:176
+#: ../mail/evolution-mail.schemas.in.h:177
#, fuzzy
msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
msgstr ""
"æ¤é??项å?³å®?äº? Evolution ä¸å?¯æ ¼å¼?å??ç??æ??大æ??æ?¬é?¨å??大å°?ã??é»?认为 4MB/4096 KBï¼?å??ä½?"
"为 KBã??"
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
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 "
@@ -11799,7 +11499,7 @@ msgstr ""
"è¿?æ?¯é»?认ç??å??å?¾é?®ä»¶æ??件ï¼?å?³ä½¿å?¯ç?¨äº?å¤?个æ??件ã??å¦?æ??é»?认å??å?ºç??æ??件被ç¦?ç?¨ï¼?å®?ä¸?ä¼?"
"缺ç??å?°å?¶å®?å?¯ç?¨ç??æ??件ã??"
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
#, fuzzy
msgid ""
"This key is read only once and reset to \"false\" after read. This unselects "
@@ -11808,7 +11508,7 @@ msgstr ""
"æ¤é?®å?ªè¢«è¯»å??ä¸?次并å?¨è¯»å??å??被é??设为 falseã??å®?å??æ¶?é??ä¸å??表ä¸ç??é?®ä»¶å¹¶ç§»é?¤ç?¸åº?æ??"
"件夹ç??é¢?è§?ã??"
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:180
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 <"
@@ -11818,30 +11518,30 @@ msgstr ""
"æ¤é?®åº?å??å?«æ??å®?è?ªå®?ä¹?é?®ä»¶å¤´ç?? XML ç»?æ??å??表ï¼?以å??æ?¯å?¦æ?¾ç¤ºè¿?äº?é?®ä»¶å¤´ã??XML ç»?æ??ç??"
"æ ¼å¼?为ï¼?<å?¯ç?¨ç??é?®ä»¶å¤´> - 设为 enabled å??å?¨é?®ä»¶è§?å?¾ä¸æ?¾ç¤ºè¯¥é?®ä»¶å¤´ã??"
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:181
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:181
+#: ../mail/evolution-mail.schemas.in.h:182
msgid "This option would help in improving the speed of fetching."
-msgstr "æ¤é??项è?½å¸®å?©æ??é«?è?·å??信件ç??é??度"
+msgstr "æ¤é??项è?½å¸®å?©æ??é«?è?·å??ä¿¡æ?¯ç??é??度"
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:183
msgid ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
-msgstr "设å®?é»?认信件è§?å?¾ä¸è¦?æ?¾ç¤ºç??å?°å??æ?°ï¼?è¶?è¿?ç??é?¨å??æ?¾ç¤ºä¸ºâ??...â??ã??"
+msgstr "设å®?é»?认信æ?¯è§?å?¾ä¸è¦?æ?¾ç¤ºç??å?°å??æ?°ï¼?è¶?è¿?ç??é?¨å??æ?¾ç¤ºä¸ºâ??...â??ã??"
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:184
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:184
+#: ../mail/evolution-mail.schemas.in.h:185
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 "
@@ -11850,149 +11550,174 @@ msgstr ""
"æ¤è®¾ç½®æ??å®?äº?é»?认æ??å?µä¸?æ?¯å?¦å°?线索æ??线索ä¸ç??æ??æ?°æ¶?æ?¯è??ä¸?æ?¯æ¶?æ?¯æ?¥æ??æ??åº?ã??é??è¦?é??"
"å?¯ Evolutionã??"
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:186
msgid "Thread the message-list based on Subject"
-msgstr "å?ºäº?主é¢?æ??线索ç¼?æ??信件å??表"
+msgstr "å?ºäº?主é¢?æ??线索ç¼?æ??ä¿¡æ?¯å??表"
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:187
msgid "Timeout for marking message as seen"
-msgstr "å°?信件æ ?为已ç??ç??è¶?æ?¶æ?¶é?¿"
+msgstr "å°?ä¿¡æ?¯æ ?为已ç??ç??è¶?æ?¶æ?¶é?¿"
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:188
msgid "Timeout for marking message as seen."
-msgstr "å°?信件æ ?为已ç??ç??è¶?æ?¶æ?¶é?¿ã??"
+msgstr "å°?ä¿¡æ?¯æ ?为已ç??ç??è¶?æ?¶æ?¶é?¿ã??"
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:189
msgid "UID string of the default account."
-msgstr "é»?认账æ?·ç?? UID å?符串ã??"
+msgstr "é»?认å¸?å?·ç?? UID å?符串ã??"
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
msgid "Underline color for misspelled words when using inline spelling."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
msgid "Use SpamAssassin daemon and client"
msgstr "使ç?¨å??å?¾å??æ??å®?æ?¤ç¨?åº?å??客æ?·"
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:192
msgid "Use SpamAssassin daemon and client (spamc/spamd)."
msgstr "使ç?¨ SpamAssassin å®?æ?¤ç¨?åº?å??客æ?·ç«¯(spamc/spamd)ã??"
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:193
msgid "Use custom fonts"
msgstr "使ç?¨è?ªå®?ä¹?å?ä½?"
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:194
msgid "Use custom fonts for displaying mail."
msgstr "使ç?¨è?ªå®?ä¹?å?ä½?æ?¾ç¤ºé?®ä»¶ã??"
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:195
msgid "Use only local spam tests."
msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?®ä»¶æµ?è¯?ã??"
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:196
msgid "Use only the local spam tests (no DNS)."
msgstr "ä¹?使ç?¨æ?¬å?°å??å?¾é?®ä»¶æµ?è¯?(æ? DNS)ã??"
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:197
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:197
+#: ../mail/evolution-mail.schemas.in.h:198
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:198
+#: ../mail/evolution-mail.schemas.in.h:199
msgid "Variable width font"
msgstr "å??宽å?ä½?"
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:200
msgid "Whether a read receipt request gets added to every message by default."
-msgstr "æ?¯å?¦é»?认对æ??æ??信件添å? é??读æ?¶æ?¡è¯·æ±?ã??"
+msgstr "æ?¯å?¦é»?认对æ??æ??ä¿¡æ?¯æ·»å? é??读æ?¶æ?¡è¯·æ±?ã??"
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:201
msgid "Whether disable ellipsizing feature of folder names in side bar."
msgstr "ç¦?ç?¨æ??å?¯ç?¨ä¾§è¾¹æ ?ä¸æ??件夹å??ç??ç??ç?¥æ?¾ç¤º"
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:202
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 头æ?¶å¼ºå?¶æ??主é¢?ç¼?æ??线索ã??"
+msgstr "æ?¯å?¦å?¨ä¿¡æ?¯ä¸?å??å?« In-Reply-To æ?? References 头æ?¶å¼ºå?¶æ??主é¢?ç¼?æ??线索ã??"
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:203
msgid "Whether sort threads based on latest message in that thread"
-msgstr "æ?¯å?¦ä»¥çº¿ç´¢ä¸ç??æ??æ?°ä¿¡ä»¶æ?¥æ??åº?线索"
+msgstr "æ?¯å?¦ä»¥çº¿ç´¢ä¸ç??æ??æ?°ä¿¡æ?¯æ?¥æ??åº?线索"
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:204
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:205
msgid "Width of the message-list pane"
-msgstr "信件å??表é?¢æ?¿ç??é«?度"
+msgstr "ä¿¡æ?¯å??表é?¢æ?¿ç??é«?度"
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
msgid "Width of the message-list pane."
-msgstr "信件å??表é?¢æ?¿ç??é«?度ã??"
+msgstr "ä¿¡æ?¯å??表é?¢æ?¿ç??é«?度ã??"
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
msgid "Importing Elm data"
msgstr "导� Elm ��"
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
#: ../modules/mail/e-mail-shell-view.c:952
#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
msgid "Mail"
msgstr "�件"
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
msgid "Evolution Elm importer"
msgstr "Evolution Elm 导��"
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
msgid "Import mail from Elm."
msgstr "ä»? Elm 导å?¥é?®ä»¶ã??"
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+#, fuzzy
+msgid "_Destination folder:"
msgstr "ç?®ç??æ??件夹ï¼?"
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
msgid "Select folder"
msgstr "é??æ?©æ??件夹"
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
msgid "Select folder to import into"
msgstr "é??æ?©è¦?导å?¥å?°å?ªä¸ªæ??件夹"
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:245
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+#, fuzzy
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "主�"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+#, fuzzy
+msgctxt "mboxImp"
+msgid "From"
+msgstr "å??件人"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley �箱(mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:413
msgid "Importer Berkeley Mailbox format folders"
msgstr "导å?¥å?¨ Berkeley é?®ç®±æ ¼å¼?æ??件夹"
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
msgid "Importing mailbox"
msgstr "导��箱"
#. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
-#, c-format
-msgid "Importing `%s'"
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
+#, fuzzy, c-format
+msgid "Importing '%s'"
msgstr "导å?¥â??%sâ??"
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:295
#, c-format
msgid "Scanning %s"
msgstr "æ?«æ?? %s"
@@ -12001,474 +11726,534 @@ msgstr "æ?«æ?? %s"
msgid "Importing Pine data"
msgstr "导� Pine ��"
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:405
+#: ../modules/addressbook/addressbook-config.c:1006
msgid "Address Book"
msgstr "å?°å??ç°¿"
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:447
msgid "Evolution Pine importer"
msgstr "Evolution Pine 导��"
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:448
msgid "Import mail from Pine."
msgstr "ä»? Pine 导å?¥é?®ä»¶ã??"
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
#, c-format
msgid "Mail to %s"
msgstr "��� %s"
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
#, c-format
msgid "Mail from %s"
msgstr "æ?¥è?ª %s ç??é?®ä»¶"
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
#, c-format
msgid "Subject is %s"
msgstr "主�� %s"
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
#, c-format
msgid "%s mailing list"
msgstr "%s é?®ä»¶å??表"
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
msgid "Add Filter Rule"
msgstr "æ·»å? è¿?滤è§?å??"
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(注æ??ï¼?é??è¦?é??å?¯åº?ç?¨ç¨?åº?)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
#: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Top Posting é??项</b> (ä¸?æ?¨è??)"
+msgid "(Not Recommended)"
+msgstr ""
#: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(注æ??ï¼?é??è¦?é??å?¯åº?ç?¨ç¨?åº?)"
+
+#: ../mail/mail-config.ui.h:4
msgid "Account Information"
msgstr "��信�"
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
msgid "Add Ne_w Signature..."
msgstr "æ·»å? æ?°ç¾å??(_W)..."
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
msgid "Al_ways sign outgoing messages when using this account"
-msgstr "å½?使ç?¨è¯¥è´¦æ?·æ?¶æ?»æ?¯å??é??ç¾å??信件(_W)"
+msgstr "å½?使ç?¨è¯¥å¸?å?·æ?¶æ?»æ?¯å??é??ç¾å??ä¿¡æ?¯(_W)"
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
msgid "Also encrypt to sel_f when sending encrypted messages"
msgstr "å½?å??é??å? å¯?é?®ä»¶æ?¶ä¹?对è?ªèº«å? å¯?(_F)"
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
msgid "Alway_s carbon-copy (cc) to:"
msgstr "æ?»æ?¯æ??é??å?°(_S)ï¼?"
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "æ?»æ?¯æ??é??å?°(_B)ï¼?"
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
msgid "Always _trust keys in my keyring when encrypting"
msgstr "å? å¯?æ?¶æ?»æ?¯ä¿¡ä»»æ??ç??å¯?é?¥ç?¯ä¸ç??å¯?é?¥(_T)"
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
msgid "Always encrypt to _myself when sending encrypted messages"
msgstr "å½?å??é??å? å¯?é?®ä»¶æ?¶æ?»æ?¯å¯¹è?ªèº«å? å¯?(_M)"
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
msgid "Always request rea_d receipt"
msgstr "请æ±?é??读æ?¶æ?¡(_D)"
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:16
+#: ../modules/addressbook/addressbook-config.c:1013
msgid "Authentication"
msgstr "身份��"
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
msgid "Automatically insert _emoticon images"
msgstr "è?ªå?¨æ??å?¥è¡¨æ??å?¾å??(_E)"
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
msgid "C_haracter set:"
msgstr "å?符é??(_H)ï¼?"
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
msgid "Ch_eck for Supported Types"
msgstr "æ£?æ?¥æ?¯æ??ç??ç±»å??(_E)"
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
msgid "Check cu_stom headers for junk"
msgstr "æ£?æ?¥è?ªå®?ä¹?信头以å?¤å?«å??å?¾é?®ä»¶(_S)"
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
msgid "Check incoming _messages for junk"
msgstr "æ£?æ?¥æ?¶å?°ç??é?®ä»¶æ?¯å?¦æ?¯å??å?¾é?®ä»¶(_M)"
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
msgid "Check spelling while I _type"
msgstr "å?¨æ??è¾?å?¥æ?¶è¿?è¡?æ?¼å??æ£?æ?¥(_T)"
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
msgid "Checks incoming mail messages to be Junk"
-msgstr "æ£?æ?¥æ?¶å?°ç??信件æ?¯å?¦æ?¯å??å?¾é?®ä»¶"
+msgstr "æ£?æ?¥æ?¶å?°ç??ä¿¡æ?¯æ?¯å?¦æ?¯å??å?¾é?®ä»¶"
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
msgid "Cle_ar"
msgstr "��(_A)"
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
msgid "Clea_r"
msgstr "��(_R)"
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
msgid "Color for _misspelled words:"
msgstr "ç»?é??误æ?¼å??ç??å??è¯?ç??è?²(_M)ï¼?"
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
msgid "Composing Messages"
-msgstr "æ?°å??信件"
+msgstr "æ?°å??ä¿¡æ?¯"
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
msgid "Configuration"
msgstr "é??ç½®"
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
msgid "Confirm _when expunging a folder"
msgstr "é??æ¯?æ??件夹æ?¶ç¡®è®¤(_W)"
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
msgid "Default Behavior"
msgstr "�认�为"
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
msgid "Default character e_ncoding:"
msgstr "é»?认å?符ç¼?ç ?(_N)ï¼?"
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:35
msgid "Delete Mail"
msgstr "å? é?¤é?®ä»¶"
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
msgid "Delete junk messages on e_xit"
msgstr "é??å?ºæ?¶å? é?¤å??å?¾é?®ä»¶(_X)"
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:38
msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "对å¯?å?ºç??信件è¿?è¡?æ?°å?ç¾å??(é»?认)(_U)"
+msgstr "对å¯?å?ºç??ä¿¡æ?¯è¿?è¡?æ?°å?ç¾å??(é»?认)(_U)"
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
+#: ../mail/mail-config.ui.h:39
+#, fuzzy
+msgid "Displayed Message Headers"
msgstr "�示信头(_H)"
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
+#: ../mail/mail-config.ui.h:40
+#, fuzzy
+msgid "Do not display messages when text si_ze exceeds"
msgstr "å¦?æ??æ??æ?¬è¶?å?ºå¤§å°?é??å?¶ï¼?å??ä¸?æ ¼å¼?å??é?®ä»¶ä¸ç??æ??æ?¬å??容(_Z)"
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:41
msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr "å¦?æ??信件å??é??è??å?¨å?°å??ç°¿ä¸å??ä¸?æ ?记为å??å?¾é?®ä»¶(_K)"
+msgstr "å¦?æ??ä¿¡æ?¯å??é??è??å?¨å?°å??ç°¿ä¸å??ä¸?æ ?记为å??å?¾é?®ä»¶(_K)"
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:42
msgid "Do not quote"
msgstr "���"
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:43
msgid "Drafts _Folder:"
msgstr "è??稿æ??件夹(_F)ï¼?"
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:44
msgid "Email _Address:"
msgstr "ç?µå?é?®ä»¶å?°å??(_A)ï¼?"
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:45
msgid "Empty trash folders on e_xit"
msgstr "é??å?ºæ?¶æ¸?空已å? é?¤é?®ä»¶(_X)"
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:46
msgid "Enable Magic S_pacebar"
msgstr "å?¯ç?¨é?æ?¯ç©ºæ ¼é?®(_P)"
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:47
msgid "Enable Sea_rch Folders"
msgstr "å?¯ç?¨æ??ç´¢æ??件夹(_R)"
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:49
msgid "Encry_ption certificate:"
msgstr "å? å¯?è¯?书(_P)ï¼?"
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:50
msgid "Encrypt out_going messages (by default)"
-msgstr "å? å¯?å¯?å?ºç??信件(é»?认)(_G)"
+msgstr "å? å¯?å¯?å?ºç??ä¿¡æ?¯(é»?认)(_G)"
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:51
msgid "Fi_xed-width:"
msgstr "ç?宽(_X)ï¼?"
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
msgid "Fix_ed width Font:"
msgstr "ç?宽å?ä½?(_E)ï¼?"
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
msgid "Font Properties"
msgstr "å?ä½?å±?æ?§"
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
msgid "Format messages in _HTML"
-msgstr "ç?¨ HTML æ ¼å¼?å??信件(_H)"
+msgstr "ç?¨ HTML æ ¼å¼?å??ä¿¡æ?¯(_H)"
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:55
msgid "Full Nam_e:"
msgstr "å?¨å??(_E)ï¼?"
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
msgid "HTML Messages"
-msgstr "HTML 信件"
+msgstr "HTML ä¿¡æ?¯"
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:58
msgid "H_TTP Proxy:"
msgstr "HTTP 代ç??æ??å?¡å?¨(_T)ï¼?"
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
msgid "Headers"
msgstr "信头"
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
msgid "Highlight _quotations with"
msgstr "���示��(_Q)"
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
msgid "Inline"
msgstr "åµ?å?¥"
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:63
msgid "Inline (Outlook style)"
msgstr "åµ?å?¥(Outlook é£?æ ¼)"
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
msgid "KB"
msgstr "KB"
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:66 ../mail/message-list.etspec.h:8
msgid "Labels"
msgstr "æ ?ç¾"
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
msgid "Languages Table"
msgstr "è¯è¨?表"
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
msgid "Loading Images"
-msgstr "è£?å?¥å?¾å??"
+msgstr "è½½å?¥å?¾å??"
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
msgid "Mail Headers Table"
msgstr "�件头表"
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
msgid "Mailbox location"
msgstr "�件箱�置"
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
msgid "Message Display"
-msgstr "信件�示"
+msgstr "信��示"
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:72
msgid "Message Fonts"
-msgstr "信件å?ä½?"
+msgstr "ä¿¡æ?¯å?ä½?"
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:73
#, fuzzy
msgid "Message Receipts"
-msgstr "信件ç?¶æ??"
+msgstr "ä¿¡æ?¯ç?¶æ??"
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
msgid "No _Proxy for:"
msgstr "ä¸?使ç?¨ä»£ç??ç??æ??å?µ(_P)ï¼?"
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr "注æ??ï¼?ç?´å?°æ?¨ç¬¬ä¸?次è¿?æ?¥ç??æ?¶å??ï¼?æ??ä¼?询é?®å¯?ç ?ã??"
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
msgid "Option is ignored if a match for custom junk headers is found."
msgstr "å¦?æ??æ?¾å?°å?¹é??ç??è?ªå®?ä¹?å??å?¾ä¿¡å¤´ï¼?æ¤é??项å°?被è¦?ç??ã??"
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
#: ../plugins/publish-calendar/publish-calendar.ui.h:10
msgid "Optional Information"
msgstr "å?¯é??ä¿¡æ?¯"
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
msgid "Or_ganization:"
msgstr "ç»?ç»?(_G)ï¼?"
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG é?®æ ?è¯?(_K)ï¼?"
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:82
msgid "Pass_word:"
msgstr "å¯?ç ?(_W)ï¼?"
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
msgid "Port:"
msgstr "端��"
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "å??é??å?ªæ??æ??é??æ?¶ä»¶äººç??信件æ?¶æ??示(_O)"
+msgstr "å??é??å?ªæ??æ??é??æ?¶ä»¶äººç??ä¿¡æ?¯æ?¶æ??示(_O)"
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
#, fuzzy
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
msgid "Printed Fonts"
msgstr "æ??å?°å?ä½?"
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
msgid "Proxy Settings"
msgstr "代ç??设置"
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
msgid "Quoted"
msgstr "å¼?ç?¨"
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
msgid "Re_member password"
msgstr "è®°ä½?å¯?ç ?(_M)"
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
msgid "Re_ply-To:"
msgstr "å??å¤?å?°(_P)ï¼?"
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:94
msgid "Remember _password"
msgstr "è®°ä½?å¯?ç ?(_P)"
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:95
msgid "Required Information"
msgstr "é??è¦?ç??ä¿¡æ?¯"
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:96
+msgid "SHA1"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:97
+msgid "SHA256"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:98
+msgid "SHA384"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:99
+msgid "SHA512"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:101
#, fuzzy
msgid "SSL is not supported in this build of Evolution"
msgstr "<b>(å?¨æ¤ç??æ?¬ç?? Evolution ä¸ä¸?æ?¯æ?? SSL)</b>"
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:102
msgid "S_earch for sender photograph only in local address books"
msgstr "ä»?å?¨æ?¬å?°å?°å??ç°¿ä¸æ??ç´¢å??件人ç?§ç??(_E)"
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:103
msgid "S_elect..."
msgstr "é??æ?©(_E)..."
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:104
msgid "S_end message receipts:"
-msgstr "å??é??信件æ?¶æ?¡(_E)ï¼?"
+msgstr "å??é??ä¿¡æ?¯æ?¶æ?¡(_E)ï¼?"
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:105
msgid "S_tandard Font:"
msgstr "æ ?å??å?ä½?(_T)ï¼?"
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:106
msgid "Secure MIME (S/MIME)"
msgstr "å®?å?¨ MIME(S/MIME)"
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:108
msgid "Select Drafts Folder"
msgstr "é??æ?©è??稿æ??件夹"
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:109
msgid "Select HTML fixed width font"
msgstr "é??æ?© HTML å?ºå®?宽度å?ä½?"
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:110
msgid "Select HTML fixed width font for printing"
msgstr "é??æ?©ç?¨äº?æ??å?°ç?? HTML å?ºå®?宽度å?ä½?"
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:111
msgid "Select HTML variable width font"
msgstr "é??æ?© HTML å??宽度å?ä½?"
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:112
msgid "Select HTML variable width font for printing"
msgstr "é??æ?©ç?¨äº?æ??å?°ç?? HTML å??宽度å?ä½?"
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:113
+#, fuzzy
+msgid "Select Junk Folder"
+msgstr "é??æ?©æ??件夹"
+
+#: ../mail/mail-config.ui.h:114
msgid "Select Sent Folder"
msgstr "é??æ?©å·²å??æ??件夹"
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:115
+#, fuzzy
+msgid "Select Trash Folder"
+msgstr "é??æ?©è??稿æ??件夹"
+
+#: ../mail/mail-config.ui.h:116
#, fuzzy
msgid "Sender Photograph"
msgstr "<b>å??é??è??ç?§ç??</b>"
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:117
msgid "Sending Mail"
msgstr "å??é??é?®ä»¶"
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:118
msgid "Sent _Messages Folder:"
-msgstr "å·²å??é??信件æ??件夹(_M)ï¼?"
+msgstr "å·²å??é??ä¿¡æ?¯æ??件夹(_M)ï¼?"
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:119
#, fuzzy
msgid "Sent and Draft Messages"
-msgstr "å·²å??信件"
+msgstr "å·²å??ä¿¡æ?¯"
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:120
msgid "Ser_ver requires authentication"
msgstr "æ??å?¡å?¨é??è¦?认è¯?(_V)"
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:121
msgid "Server Configuration"
msgstr "æ??å?¡å?¨é??ç½®"
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:122
msgid "Server _Type:"
msgstr "æ??å?¡å?¨ç±»å??(_T)ï¼?"
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:123
+#, fuzzy
+msgid "Si_gning algorithm:"
+msgstr "ç¾å??è¯?书(_N)ï¼?"
+
+#: ../mail/mail-config.ui.h:124
msgid "Sig_natures"
msgstr "ç¾å??(_N)"
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:125
msgid "Sig_ning certificate:"
msgstr "ç¾å??è¯?书(_N)ï¼?"
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:126
msgid "Signat_ure:"
msgstr "ç¾å??(_U)ï¼?"
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:127
msgid "Signatures"
msgstr "ç¾å??"
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:128
+#, fuzzy
+msgid "Signing _algorithm:"
+msgstr "ç¾å??è¯?书(_N)ï¼?"
+
+#: ../mail/mail-config.ui.h:129
msgid "Spell Checking"
msgstr "æ?¼å??æ£?æ?¥"
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:130
msgid "Start _typing at the bottom on replying"
msgstr "å??å¤?æ?¶å?¨åº?é?¨å¼?å§?æ??å?(_T)"
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:132
msgid "T_ype:"
msgstr "ç±»å??(_Y)ï¼?"
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:133
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr "å?¨æ¤å??å?ºç??è¯è¨?å??æ? äº?æ?¨æ??å®?è£?ç??å?å?¸ã??"
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:134
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -12477,7 +12262,13 @@ msgstr ""
"æ¤è??æ?¬ç??è¾?å?ºå°?ç?¨äº?æ?¨ç??ç¾å??ã??æ?¨æ??å®?ç??å??称å°?å?ªä¼?\n"
"ç?¨äº?æ?¾ç¤ºã??"
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:138
+#, fuzzy
+msgid "Top Posting Option"
+msgstr "æ??é??ç?®ç??"
+
+#: ../mail/mail-config.ui.h:139
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -12485,184 +12276,197 @@ msgstr ""
"è¾?å?¥æ?¨æ?³è¦?ç»?æ¤å¸?æ?·èµ·ç??å??å?ã??\n"
"å¦?ï¼?â??å·¥ä½?â??æ??â??ç§?人â??"
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:141
msgid "Us_ername:"
msgstr "ç?¨æ?·å??(_E)ï¼?"
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:142
msgid "Use Authe_ntication"
msgstr "使�身份��(_N)"
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:143 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
msgid "User_name:"
msgstr "ç?¨æ?·å??(_N)ï¼?"
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:144
msgid "V_ariable-width:"
msgstr "å??宽(_A)ï¼?"
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:145
msgid "_Add Signature"
msgstr "æ·»å? ç¾å??(_A)"
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:146
msgid "_Always load images from the Internet"
-msgstr "æ?»æ?¯ä»? Internet ä¸?è£?å?¥å?¾å??(_A)"
+msgstr "æ?»æ?¯ä»? Internet ä¸?è½½å?¥å?¾å??(_A)"
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:147
msgid "_Authentication Type"
msgstr "身份éª?è¯?ç±»å??(_A)"
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:148
msgid "_Default junk plugin:"
msgstr "é»?认ç??å??å?¾é?®ä»¶æ??件(_D)ï¼?"
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:149
msgid "_Direct connection to the Internet"
msgstr "����� Internet(_D)"
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:150
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "ä¸?è¦?ç¾å??ä¼?议请æ±?(å?? Outlook å?¼å®¹)(_D)"
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:151
msgid "_Forward style:"
msgstr "转å??æ?¹å¼?(_F)ï¼?"
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:152
+#, fuzzy
+msgid "_Junk Folder:"
+msgstr "å½?å??æ??件夹"
+
+#: ../mail/mail-config.ui.h:153
msgid "_Keep Signature above the original message on replying"
-msgstr "å??å¤?æ?¶ä¿?ç??å??å§?信件ç??ç¾å??(_K)"
+msgstr "å??å¤?æ?¶ä¿?ç??å??å§?ä¿¡æ?¯ç??ç¾å??(_K)"
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:154
msgid "_Languages"
msgstr "è¯è¨?(_L)"
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:155
msgid "_Load images in messages from contacts"
-msgstr "è£?å?¥æ?¥è?ªè??系人ç??é?®ä»¶ä¸ç??å?¾å??(_L)"
+msgstr "è½½å?¥æ?¥è?ªè??系人ç??é?®ä»¶ä¸ç??å?¾å??(_L)"
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:156
msgid "_Lookup in local address book only"
msgstr "ä»?å?¨æ?¬å?°å?°å??ç°¿ä¸æ?¥é??(_L)"
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:157
msgid "_Make this my default account"
-msgstr "使å®?æ??为æ??ç??é»?认账æ?·(_M)"
+msgstr "使å®?æ??为æ??ç??é»?认å¸?å?·(_M)"
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:158
msgid "_Manual proxy configuration:"
msgstr "æ??å?¨ä»£ç??æ??å?¡å?¨é??ç½®(_M)ï¼?"
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:159
msgid "_Mark messages as read after"
-msgstr "æ??信件æ ?记为已读å??ç?(_M)"
+msgstr "æ??ä¿¡æ?¯æ ?记为已读å??ç?(_M)"
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:161
msgid "_Never load images from the Internet"
-msgstr "ç»?ä¸?ä»? Internet è£?å?¥å?¾å??(_N)"
+msgstr "ç»?ä¸?ä»? Internet è½½å?¥å?¾å??(_N)"
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:162
msgid "_Path:"
msgstr "路�(_P)�"
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:163
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "å??é??ç»?ä¸?æ?³æ?¥æ?¶ HTML ç??è??系人æ?¶æ??示(_P)"
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:164
msgid "_Prompt when sending messages with an empty subject line"
-msgstr "å??é??空主é¢?è¡?ç??信件æ?¶æ??示(_P)"
+msgstr "å??é??空主é¢?è¡?ç??ä¿¡æ?¯æ?¶æ??示(_P)"
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:165
msgid "_Reply style:"
msgstr "å??å¤?é£?æ ¼(_R)ï¼?"
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:166
msgid "_Script:"
msgstr "è??æ?¬(_S)ï¼?"
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:167
msgid "_Secure HTTP Proxy:"
msgstr "å®?å?¨ HTTP 代ç??(_S)ï¼?"
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:29
#: ../plugins/publish-calendar/publish-calendar.ui.h:28
msgid "_Server:"
msgstr "æ??å?¡å?¨(_S)ï¼?"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:171
msgid "_Show image animations"
msgstr "æ?¾ç¤ºå?¾å??å?¨ç?»(_S)"
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:172
msgid "_Show the photograph of sender in the message preview"
msgstr "å?¨ç?µå?é?®ä»¶é¢?è§?ä¸æ?¾ç¤ºå??é??è??ç??ç?§ç??(_S)"
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:174
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "å?ªæ?¾ç¤º To/Cc/Bcc 头ä¸ç??å??(_S)"
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:175
+#, fuzzy
+msgid "_Trash Folder:"
+msgstr "è??稿æ??件夹(_F)ï¼?"
+
+#: ../mail/mail-config.ui.h:176
msgid "_Use Secure Connection:"
msgstr "使�����(_U)�"
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:177
msgid "_Use system defaults"
msgstr "使��认�(_U)"
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:178
msgid "_Use the same fonts as other applications"
msgstr "使ç?¨ä¸?å?¶å®?åº?ç?¨ç¨?åº?ç?¸å??ç??å?ä½?(_U)"
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:179 ../smime/gui/smime-ui.ui.h:47
#, fuzzy
msgid "a"
msgstr "ä¸?å??"
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:181
msgid "addresses"
msgstr "个å?°å??"
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:182 ../smime/gui/smime-ui.ui.h:48
msgid "b"
msgstr ""
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:183
msgid "color"
msgstr "��"
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:184
msgid "description"
msgstr "æ??è¿°"
#: ../mail/mail-dialogs.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../mail/mail-dialogs.ui.h:2
msgid "All active remote folders"
msgstr "å?¨é?¨æ´»è·?è¿?ç¨?æ??件夹"
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
msgid "All local and active remote folders"
msgstr "å?¨é?¨æ?¬å?°å??æ´»è·?è¿?ç¨?æ??件夹"
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
msgid "All local folders"
msgstr "å?¨é?¨æ?¬å?°æ??件夹"
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
msgid "Call"
msgstr "��"
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
msgid "Co_mpleted"
msgstr "å·²å®?æ??(_M)"
+#: ../mail/mail-dialogs.ui.h:6
+#, fuzzy
+msgid "Collapse _all"
+msgstr "æ??å? "
+
#: ../mail/mail-dialogs.ui.h:7
msgid "Digital Signature"
msgstr "æ?°å?ç¾å??"
@@ -12672,241 +12476,247 @@ msgid "Do Not Forward"
msgstr "ä¸?è¦?转å??"
#: ../mail/mail-dialogs.ui.h:9
+#, fuzzy
+msgid "E_xpand all"
+msgstr "����线索(_X)"
+
+#: ../mail/mail-dialogs.ui.h:10
msgid "Encryption"
msgstr "å? å¯?"
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
msgid "Folder Subscriptions"
msgstr "æ??件夹订é??"
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
msgid "Follow-Up"
msgstr "è·?é??"
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
msgid "For Your Information"
msgstr "ç»?æ?¨ç??ä¿¡æ?¯"
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
msgid "Forward"
msgstr "转å??"
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
msgid "License Agreement"
msgstr "许å?¯å??è®®"
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
msgid "No Response Necessary"
msgstr "ä¸?å¿?å??å¤?"
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
msgid "Reply to All"
msgstr "å?¨é?¨å??å¤?"
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
msgid "Review"
msgstr "å??顾"
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
msgid "S_erver:"
msgstr "æ??å?¡å?¨(_E)ï¼?"
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr ""
+
+#: ../mail/mail-dialogs.ui.h:24
#, fuzzy
msgid "Search Folder Sources"
msgstr "æ??ç´¢æ??件夹æ?¥æº?"
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
msgid "Security Information"
msgstr "��信�"
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
msgid "Specific folders"
msgstr "æ??å®?æ??件夹"
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
msgstr ""
-"æ?¨é??ä¸è¿?è¡?è·?é??ç??信件已ç»?å?¨ä¸?é?¢å??å?ºã??\n"
+"æ?¨é??ä¸è¿?è¡?è·?é??ç??ä¿¡æ?¯å·²ç»?å?¨ä¸?é?¢å??å?ºã??\n"
"请ä»?â??æ ?å¿?â??è??å??ä¸é??æ?©è·?é??æ??ä½?ã??"
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
msgid "_Accept License"
msgstr "æ?¥å??å??è®®(_A)"
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
msgid "_Due By:"
msgstr "延æ??人(_D)ï¼?"
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
msgid "_Flag:"
msgstr "æ ?å¿?(_F)ï¼?"
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
msgid "_Tick this to accept the license agreement"
msgstr "é??ä¸æ¤å¤?以表æ??æ?¨æ?¥å??许å?¯å??è®®(_T)"
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:783
#, c-format
msgid "Pinging %s"
msgstr "�� %s"
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
msgid "Filtering Selected Messages"
-msgstr "è¿?滤é??ä¸ç??信件"
+msgstr "è¿?滤é??ä¸ç??ä¿¡æ?¯"
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:245
msgid "Fetching Mail"
msgstr "æ?¶å??é?®ä»¶"
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:592
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "�����滤�失败�%s"
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
-#, c-format
+#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
+#, fuzzy, c-format
msgid ""
"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
msgstr ""
"追å? å?° %sï¼?%s 失败\n"
"转è??追å? å?°æ?¬å?°â??å·²å??â??æ??件夹ã??"
-#: ../mail/mail-ops.c:641
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/mail-ops.c:654
+#, fuzzy, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
msgstr "追å? å?°æ?¬å?°â??å·²å??â??æ??件夹失败ï¼?%s"
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
msgid "Sending message"
-msgstr "å??é??信件"
+msgstr "å??é??ä¿¡æ?¯"
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:782
#, c-format
msgid "Sending message %d of %d"
msgstr "å??é??第%då°?ä¿¡ï¼?å?±%då°?"
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:826
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "�第%d�信失败��%d�"
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
msgid "Canceled."
msgstr "å·²å??æ¶?ã??"
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
msgid "Complete."
msgstr "å®?æ??ã??"
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:938
#, fuzzy, c-format
msgid "Saving message to folder '%s'"
-msgstr "æ??信件ä¿?å?å?°æ??件夹ä¸"
+msgstr "æ??ä¿¡æ?¯ä¿?å?å?°æ??件夹ä¸"
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
#, fuzzy, c-format
msgid "Moving messages to '%s'"
-msgstr "æ??信件移è?³ %s"
+msgstr "æ??ä¿¡æ?¯ç§»è?³ %s"
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
#, fuzzy, c-format
msgid "Copying messages to '%s'"
-msgstr "æ??信件å¤?å?¶å?° %s"
+msgstr "æ??ä¿¡æ?¯å¤?å?¶å?° %s"
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1127
#, fuzzy, c-format
msgid "Scanning folders in '%s'"
msgstr "å?¨â??%sâ??ä¸æ?«æ??æ??件夹"
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1235
msgid "Forwarded messages"
-msgstr "转å??ç??信件"
+msgstr "转å??ç??ä¿¡æ?¯"
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1276
#, fuzzy, c-format
msgid "Opening folder '%s'"
msgstr "æ??å¼?æ??件夹 %s"
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1342
#, fuzzy, c-format
msgid "Retrieving quota information for folder '%s'"
msgstr "æ£å?¨è?·å??æ??件å? %s ç??é??é¢?ä¿¡æ?¯"
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1414
#, fuzzy, c-format
msgid "Opening store '%s'"
msgstr "æ??å¼?å?å?¨ %s"
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1485
#, fuzzy, c-format
msgid "Removing folder '%s'"
msgstr "å? é?¤æ??件夹 %s"
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1609
#, c-format
msgid "Storing folder '%s'"
msgstr "å?å?¨æ??件夹â??%sâ??"
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1672
#, c-format
msgid "Expunging and storing account '%s'"
-msgstr "é??æ¯?并å?å?¨è´¦æ?·â??%sâ??"
+msgstr "é??æ¯?并å?å?¨å¸?å?·â??%sâ??"
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1673
#, c-format
msgid "Storing account '%s'"
-msgstr "å?å?¨è´¦æ?·â??%sâ??"
+msgstr "å?å?¨å¸?å?·â??%sâ??"
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1727
#, fuzzy, c-format
msgid "Refreshing folder '%s'"
msgstr "å?·æ?°æ??件夹"
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1767
#, fuzzy, c-format
msgid "Expunging folder '%s'"
msgstr "é??æ¯?æ??件夹"
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1812
#, c-format
msgid "Emptying trash in '%s'"
msgstr "æ¸?空â??%sâ??ä¸ç??å??æ?¶ç«?"
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1813
msgid "Local Folders"
msgstr "æ?¬å?°æ??件夹"
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:2016
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "æ?¶å?? %d å°?ä¿¡"
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2105
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messages"
msgstr[0] "ä¿?å? %d å°?ä¿¡"
-#: ../mail/mail-ops.c:2136
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
+#: ../mail/mail-ops.c:2192
+#, fuzzy, c-format
+msgid "Error saving messages to: %s:\n"
msgstr ""
-"å?¨å°?信件ä¿?å?å?° %s æ?¶å??ç??é??误ï¼?\n"
+"å?¨å°?ä¿¡æ?¯ä¿?å?å?° %s æ?¶å??ç??é??误ï¼?\n"
" %s"
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2265
msgid "Saving attachment"
msgstr "ä¿?å?é??件"
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -12915,142 +12725,176 @@ msgstr ""
"æ? æ³?å??建è¾?å?ºæ??件ï¼?%sï¼?\n"
" %s"
-#: ../mail/mail-ops.c:2249
-#, c-format
-msgid "Could not write data: %s"
+#: ../mail/mail-ops.c:2310
+#, fuzzy
+msgid "Could not write data: "
msgstr "æ? æ³?å??æ?°æ?®ï¼?%s"
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
#, fuzzy, c-format
msgid "Disconnecting from '%s'"
msgstr "æ?å¼?ä¸? %s ç??è¿?æ?¥"
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
#, fuzzy, c-format
msgid "Reconnecting to '%s'"
msgstr "é??æ?°è¿?æ?¥å?° %s"
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2550
#, c-format
msgid "Preparing account '%s' for offline"
-msgstr "æ£å?¨å??å¤?è?±æ?ºä½¿ç?¨è´¦æ?·â??%sâ??"
+msgstr "æ£å?¨å??å¤?è?±æ?ºä½¿ç?¨å¸?å?·â??%sâ??"
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2636
msgid "Checking Service"
msgstr "æ£?æ?¥æ??å?¡"
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
msgid "Canceling..."
msgstr "æ£å?¨å??æ¶?..."
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:424
msgid "Send & Receive Mail"
msgstr "å??é??å??æ?¥æ?¶é?®ä»¶"
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:441
msgid "Cancel _All"
msgstr "å?¨é?¨å??æ¶?(_A)"
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:551
msgid "Updating..."
msgstr "æ£å?¨æ?´æ?°..."
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
msgid "Waiting..."
msgstr "æ£å?¨ç?å¾?..."
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:866
#, c-format
msgid "Checking for new mail"
msgstr "����件"
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:225
#, c-format
msgid "Enter Passphrase for %s"
msgstr "è¾?å?¥ %s ç??å¯?ç ?"
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:227
msgid "Enter Passphrase"
msgstr "è¾?å?¥å¯?ç ?"
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:230
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s è¾?å?¥å¯?ç ?"
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:232
msgid "Enter Password"
msgstr "è¾?å?¥å¯?ç ?"
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:277
+#, c-format
msgid "User canceled operation."
msgstr "ç?¨æ?·å·±å??æ¶?æ??ä½?ã??"
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:723
+#, c-format
msgid ""
"No destination address provided, forward of the message has been cancelled."
msgstr "缺å°?å??é??ç?®æ ?å?°å??ï¼?é?®ä»¶è½¬å??被å??æ¶?ã??"
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:732
+#, c-format
msgid "No account found to use, forward of the message has been cancelled."
-msgstr "æ? å?¯ç?¨è´¦æ?·ï¼?é?®ä»¶è½¬å??被å??æ¶?ã??"
+msgstr "æ? å?¯ç?¨å¸?å?·ï¼?é?®ä»¶è½¬å??被å??æ¶?ã??"
-#: ../mail/mail-tools.c:123
-#, c-format
-msgid "Could not create spool directory `%s': %s"
+#: ../mail/mail-tools.c:128
+#, fuzzy, c-format
+msgid "Could not create spool directory '%s': %s"
msgstr "æ? æ³?å??建è?±æ?ºç?®å½?â??%sâ??ï¼?%s"
-#: ../mail/mail-tools.c:153
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#: ../mail/mail-tools.c:161
+#, fuzzy, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
msgstr "è¯?å?¾å°?é?®ä»¶ç§»è?³é?? mbox æº?â??%sâ??"
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:273
#, c-format
msgid "Forwarded message - %s"
-msgstr "转å??ç??信件 - %s"
+msgstr "转å??ç??ä¿¡æ?¯ - %s"
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:275
msgid "Forwarded message"
-msgstr "转å??ç??信件"
+msgstr "转å??ç??ä¿¡æ?¯"
-#: ../mail/mail-tools.c:301
-#, c-format
-msgid "Invalid folder: `%s'"
+#: ../mail/mail-tools.c:318
+#, fuzzy, c-format
+msgid "Invalid folder: '%s'"
msgstr "æ? æ??ç??æ??件夹ï¼?â??%sâ??"
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
#, c-format
msgid "Setting up Search Folder: %s"
msgstr "设置æ??ç´¢æ??件夹ï¼?%s"
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:224
#, c-format
msgid "Updating Search Folders for '%s:%s'"
msgstr "æ?´æ?°â??%s:%sâ??ç??æ??ç´¢æ??件夹"
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:231
#, c-format
msgid "Updating Search Folders for '%s'"
msgstr "æ?´æ?°â??%sâ??ç??æ??ç´¢æ??件夹"
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:674
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+
+#: ../mail/mail-vfolder.c:1179
msgid "Edit Search Folder"
msgstr "ç¼?è¾?æ??ç´¢æ??件夹"
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1284
msgid "New Search Folder"
msgstr "æ?°å»ºæ??ç´¢æ??件夹"
#: ../mail/mail.error.xml.h:1
+#, fuzzy
+msgid "\"Check Junk\" Failed"
+msgstr "æ£?æ?¥å??å?¾ä¿¡å¤±è´¥"
+
+#: ../mail/mail.error.xml.h:2
+#, fuzzy
+msgid "\"Report Junk\" Failed"
+msgstr "æ?¥å??å??å?¾é?®ä»¶å¤±è´¥"
+
+#: ../mail/mail.error.xml.h:3
+#, fuzzy
+msgid "\"Report Not Junk\" Failed"
+msgstr "æ?¥å??é??å??å?¾é?®ä»¶å¤±è´¥"
+
+#: ../mail/mail.error.xml.h:4
msgid "A folder named \"{0}\" already exists. Please use a different name."
msgstr "å·²ç»?å?å?¨å??为â??{0}â??ç??æ??件夹ã??请使ç?¨ä¸?å??ç??å??称ã??"
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr "å·²ç»?å?å?¨å??为â??{1}â??ç??æ??件夹ã??请使ç?¨ä¸?å??ç??å??称ã??"
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
msgid ""
"A non-empty folder at \"{1}\" already exists.\n"
"\n"
@@ -13061,136 +12905,125 @@ msgstr ""
"\n"
"æ?¨å?¯ä»¥é??æ?©å¿½ç?¥æ¤æ??件夹ï¼?è¦?ç??æ??追å? å?¶å??容ï¼?æ??è??é??å?ºã??"
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
msgid ""
"A read receipt notification has been requested for \"{1}\". Send the receipt "
"notification to {0}?"
msgstr "â??{1}â??请æ±?äº?é??读æ?¶æ?¡ã??å°?é??读æ?¶æ?¡å??é??ç»?{0}å??ï¼?"
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
msgid ""
"A signature already exists with the name \"{0}\". Please specify a different "
"name."
msgstr "å·²ç»?å?å?¨å??为â??{0}â??ç??ç¾å??ã??请使ç?¨ä¸?å??ç??å??称ã??"
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
msgid ""
"Adding a meaningful Subject line to your messages will give your recipients "
"an idea of what your mail is about."
-msgstr "å?¨æ?¨ç??信件ä¸æ·»å? æ??æ??ä¹?ç??主é¢?å?¯ä»¥è®©æ?¨ç??æ?¶ä»¶äººæ?´å®¹æ??æ??ç?½æ?¨é?®ä»¶ç??å??容ã??"
+msgstr "å?¨æ?¨ç??ä¿¡æ?¯ä¸æ·»å? æ??æ??ä¹?ç??主é¢?å?¯ä»¥è®©æ?¨ç??æ?¶ä»¶äººæ?´å®¹æ??æ??ç?½æ?¨é?®ä»¶ç??å??容ã??"
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "æ?¨ç¡®å®?è¦?å? é?¤æ¤è´¦æ?·å??å?¶å?¨é?¨ä»£ç??æ??å?¡å?¨å??ï¼?"
+msgstr "æ?¨ç¡®å®?è¦?å? é?¤æ¤å¸?å?·å??å?¶å?¨é?¨ä»£ç??æ??å?¡å?¨å??ï¼?"
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
msgid "Are you sure you want to delete this account?"
-msgstr "æ?¨ç¡®å®?è¦?å? é?¤æ¤è´¦æ?·å??ï¼?"
+msgstr "æ?¨ç¡®å®?è¦?å? é?¤æ¤å¸?å?·å??ï¼?"
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
msgid ""
"Are you sure you want to disable this account and delete all its proxies?"
-msgstr "æ?¨ç¡®å®?è¦?ç¦?ç?¨æ¤è´¦æ?·å??å?¶å?¨é?¨ä»£ç??æ??å?¡å?¨å??ï¼?"
-
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "æ?¨ç¡®å®?è¦?ä¸?次æ??å¼?{0}å°?ä¿¡å??ï¼?"
+msgstr "æ?¨ç¡®å®?è¦?ç¦?ç?¨æ¤å¸?å?·å??å?¶å?¨é?¨ä»£ç??æ??å?¡å?¨å??ï¼?"
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
msgid ""
"Are you sure you want to permanently remove all the deleted messages in all "
"folders?"
-msgstr "æ?¨ç¡®å®?æ?³è¦?æ°¸ä¹?å? é?¤å?¨é?¨æ??件夹ä¸å·²å? é?¤ç??å?¨é?¨ä¿¡ä»¶å??ï¼?"
+msgstr "æ?¨ç¡®å®?æ?³è¦?æ°¸ä¹?å? é?¤å?¨é?¨æ??件夹ä¸å·²å? é?¤ç??å?¨é?¨ä¿¡æ?¯å??ï¼?"
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
msgid ""
"Are you sure you want to permanently remove all the deleted messages in "
"folder \"{0}\"?"
-msgstr "æ?¨ç¡®å®?æ?³è¦?æ°¸ä¹?å? é?¤æ??件夹â??{0}â??ä¸å·²å? é?¤ç??å?¨é?¨ä¿¡ä»¶å??ï¼?"
+msgstr "æ?¨ç¡®å®?æ?³è¦?æ°¸ä¹?å? é?¤æ??件夹â??{0}â??ä¸å·²å? é?¤ç??å?¨é?¨ä¿¡æ?¯å??ï¼?"
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
msgid "Are you sure you want to send a message in HTML format?"
-msgstr "æ?¨ç¡®å®?æ?³è¦?以 HTML æ ¼å¼?å??é??信件å??ï¼?"
+msgstr "æ?¨ç¡®å®?æ?³è¦?以 HTML æ ¼å¼?å??é??ä¿¡æ?¯å??ï¼?"
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
#, fuzzy
msgid "Are you sure you want to send a message with invalid address?"
-msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å??é??å?ªæ??å¯?件æ??é??æ?¶ä»¶äººç??信件å??ï¼?"
+msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å??é??å?ªæ??å¯?件æ??é??æ?¶ä»¶äººç??ä¿¡æ?¯å??ï¼?"
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
#, fuzzy
msgid "Are you sure you want to send a message with invalid addresses?"
-msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å??é??å?ªæ??å¯?件æ??é??æ?¶ä»¶äººç??信件å??ï¼?"
+msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å??é??å?ªæ??å¯?件æ??é??æ?¶ä»¶äººç??ä¿¡æ?¯å??ï¼?"
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å??é??å?ªæ??å¯?件æ??é??æ?¶ä»¶äººç??信件å??ï¼?"
+msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å??é??å?ªæ??å¯?件æ??é??æ?¶ä»¶äººç??ä¿¡æ?¯å??ï¼?"
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
msgid "Are you sure you want to send a message without a subject?"
-msgstr "æ?¨ç¡®å®?æ?³è¦?å??é??没æ??主é¢?ç??信件å??ï¼?"
-
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "å??å? æ?¯â??{0}â??ã??"
+msgstr "æ?¨ç¡®å®?æ?³è¦?å??é??没æ??主é¢?ç??ä¿¡æ?¯å??ï¼?"
#: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "å??å? æ?¯â??{2}â??ã??"
-
-#: ../mail/mail.error.xml.h:23
msgid "Blank Signature"
msgstr "空ç¾å??"
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
msgid "Cannot add Search Folder \"{0}\"."
msgstr "æ? æ³?æ·»å? æ??ç´¢æ??件夹â??{0}â??ã??"
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
msgstr "æ? æ³?å°?æ??件夹â??{0}â??å¤?å?¶å?°â??{1}â??ã??"
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
msgid "Cannot create folder \"{0}\"."
msgstr "æ? æ³?å??建æ??件夹â??{0}â??ã??"
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
msgid "Cannot create temporary save directory."
msgstr "æ? æ³?å??建临æ?¶ä¿?å?ç?®å½?ã??"
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
msgid "Cannot create the save directory, because \"{1}\""
msgstr "æ? æ³?å??建ä¿?å?ç?®å½?ï¼?å??å? æ?¯â??{1}â??"
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
msgid "Cannot delete folder \"{0}\"."
msgstr "æ? æ³?å? é?¤æ??件夹â??{0}â??ã??"
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
msgid "Cannot delete system folder \"{0}\"."
msgstr "æ? æ³?å? é?¤ç³»ç»?æ??件夹â??{0}â??ã??"
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
msgstr "æ? æ³?ç¼?è¾?æ??ç´¢æ??件夹â??{0}â??ï¼?å??å? æ?¯è¯¥æ??件夹ä¸?å?å?¨ã??"
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "æ? æ³?å°?æ??件夹â??{0}â??移è?³â??{1}â??ã??"
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+#, fuzzy
+msgid "Cannot open source \"{1}\"."
msgstr "æ? æ³?æ??å¼?æº?â??{0}â??"
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
msgid "Cannot open source \"{2}\"."
msgstr "æ? æ³?æ??å¼?æº?â??{2}â??ã??"
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
msgid "Cannot open target \"{2}\"."
msgstr "æ? æ³?æ??å¼?ç?®æ ?â??{2}â??ã??"
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
msgid ""
"Cannot read the license file \"{0}\", due to an installation problem. You "
"will not be able to use this provider until you can accept its license."
@@ -13198,35 +13031,31 @@ msgstr ""
"æ? æ³?读å??许å?¯æ??件â??{0}â??ï¼?å??å? æ?¯å®?è£?æ??é?®é¢?ã??æ?¨å°?æ? æ³?使ç?¨æ¤æ??ä¾?è??ï¼?é?¤é??æ?¨æ?¥å??å?¶è®¸"
"å?¯å??è®®ã??"
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr "æ? æ³?å°?â??{0}â??é??å?½å??为â??{1}â??ã??"
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
msgid "Cannot rename or move system folder \"{0}\"."
msgstr "æ? æ³?é??å?½å??æ??移å?¨ç³»ç»?æ??件夹â??{0}â??ã??"
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
msgid "Cannot save changes to account."
-msgstr "æ? æ³?å°?æ?´æ?¹ä¿?å?å?°è´¦æ?·ã??"
+msgstr "æ? æ³?å°?æ?´æ?¹ä¿?å?å?°å¸?å?·ã??"
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
msgid "Cannot save to directory \"{0}\"."
msgstr "æ? æ³?ä¿?å?å?°ç?®å½?â??{0}â??ã??"
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
msgid "Cannot save to file \"{0}\"."
msgstr "æ? æ³?ä¿?å?å?°æ??件â??{0}â??ã??"
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
msgid "Cannot set signature script \"{0}\"."
msgstr "æ? æ³?设å®?ç¾å??è??æ?¬â??{0}â??ã??"
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "æ£?æ?¥å??å?¾ä¿¡å¤±è´¥"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
msgid ""
"Check to make sure your password is spelled correctly. Remember that many "
"passwords are case sensitive; your caps lock might be on."
@@ -13234,151 +13063,155 @@ msgstr ""
"é??ä¸æ¤å¤?以确ä¿?æ?¨ç??å¯?ç ?æ?¼å??æ£ç¡®ã??请记ä½?ï¼?å¾?å¤?å¯?ç ?é?½æ?¯å?ºå??大å°?å??ç??ï¼?æ?¨ç?? Caps "
"Lock ç?¯å?¯è?½ä¸ºå¼?ã??"
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
msgid "Could not save signature file."
msgstr "æ? æ³?ä¿?å?ç¾å??æ??件ã??"
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "å? é?¤æ??ç´¢æ??件夹â??{0}â??ä¸ç??信件å??ï¼?"
+msgstr "å? é?¤æ??ç´¢æ??件夹â??{0}â??ä¸ç??ä¿¡æ?¯å??ï¼?"
+
+#: ../mail/mail.error.xml.h:46
+#, fuzzy
+msgid "Do _Not Disable"
+msgstr "���"
#: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "ä¸?å? é?¤(_E)"
+#, fuzzy
+msgid "Do _Not Send"
+msgstr "ä¸?å??é??(_N)"
#: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "ä¸?å? é?¤"
+#, fuzzy
+msgid "Do _Not Synchronize"
+msgstr "ä¸?å??æ¥(_D)"
#: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "���"
-
-#: ../mail/mail.error.xml.h:50
msgid ""
"Do you want to locally synchronize the folders that are marked for offline "
"usage?"
msgstr "æ?¨æ?³è¦?å??æ¥é?£äº?æ ?记为离线使ç?¨ç??æ??件夹å??ï¼?"
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
msgid "Do you want to mark all messages as read?"
-msgstr "æ?¨æ?¯å?¦æ?³è¦?æ??æ??æ??信件æ ?记为已读ï¼?"
+msgstr "æ?¨æ?¯å?¦æ?³è¦?æ??æ??æ??ä¿¡æ?¯æ ?记为已读ï¼?"
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
msgid "Do you wish to save your changes?"
msgstr "æ?¨å¸?æ??ä¿?å?æ?´æ?¹å??ï¼?"
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
msgid "Enter password."
msgstr "è¾?å?¥å¯?ç ?ã??"
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
msgid "Error loading filter definitions."
-msgstr "è£?å?¥è¿?滤å?¨å®?ä¹?é??误ã??"
+msgstr "è½½å?¥è¿?滤å?¨å®?ä¹?é??误ã??"
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
msgid "Error while performing operation."
msgstr "æ?§è¡?æ??ä½?æ?¶å?ºé??ã??"
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
msgid "Error while {0}."
msgstr "{0} æ?¶å?ºé??ã??"
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
msgid "File exists but cannot overwrite it."
msgstr "æ??件å?å?¨ä½?æ? æ³?è¦?ç??ã??"
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
msgid "File exists but is not a regular file."
msgstr "æ??件å?å?¨ä½?ä¸?æ?¯æ?®é??æ??件ã??"
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
msgid "If you continue, you will not be able to recover these messages."
-msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?æ?¨å°?æ? æ³?æ?¢å¤?è¿?äº?信件ã??"
+msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?æ?¨å°?æ? æ³?æ?¢å¤?è¿?äº?ä¿¡æ?¯ã??"
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
+#, fuzzy
msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
"will be deleted permanently."
msgstr "å¦?æ??æ?¨å? é?¤æ??件夹ï¼?å?¶ä¸ç??å?¨é?¨å??容å??å?¶å?æ??件夹å??容å°?被永ä¹?å? é?¤ã??"
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
#, fuzzy
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
msgid ""
"If you delete the folder, all of its contents will be deleted permanently."
msgstr "å¦?æ??æ?¨å? é?¤æ??件夹ï¼?å?¶ä¸ç??å?¨é?¨å??容å??å?¶å?æ??件夹å??容å°?被永ä¹?å? é?¤ã??"
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?å?¨é?¨ä»£ç??æ??å?¡å?¨è´¦æ?·é?½å°?被永ä¹?å? é?¤ã??"
+msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?å?¨é?¨ä»£ç??æ??å?¡å?¨å¸?å?·é?½å°?被永ä¹?å? é?¤ã??"
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
-msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?è´¦æ?·ä¿¡æ?¯å??å?¶å?¨é?¨ä»£ç??æ??å?¡å?¨ä¿¡æ?¯å°?被永ä¹?å? é?¤ã??"
+msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?å¸?å?·ä¿¡æ?¯å??å?¶å?¨é?¨ä»£ç??æ??å?¡å?¨ä¿¡æ?¯å°?被永ä¹?å? é?¤ã??"
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
msgid "If you proceed, the account information will be deleted permanently."
-msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?è´¦æ?·ä¿¡æ?¯å°?被永ä¹?å? é?¤ã??"
+msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?å¸?å?·ä¿¡æ?¯å°?被永ä¹?å? é?¤ã??"
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
msgid ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
-msgstr "å¦?æ??æ?¨é??å?ºï¼?è¿?äº?信件å°?ä¼?ç?å?° Evolution ä¸?次å?¯å?¨æ??ä¼?å??å?ºã??"
+msgstr "å¦?æ??æ?¨é??å?ºï¼?è¿?äº?ä¿¡æ?¯å°?ä¼?ç?å?° Evolution ä¸?次å?¯å?¨æ??ä¼?å??å?ºã??"
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
msgid "Ignore"
msgstr "忽�"
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
msgid "Invalid authentication"
msgstr "æ? æ??ç??身份éª?è¯?"
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
msgid "Mail Deletion Failed"
msgstr "é?®ä»¶å? é?¤å¤±è´¥"
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
msgid "Mail filters automatically updated."
msgstr "é?®ä»¶è¿?滤å?¨å·²è?ªå?¨æ?´æ?°ã??"
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
msgid ""
"Many email systems add an Apparently-To header to messages that only have "
"BCC recipients. This header, if added, will list all of your recipients to "
"your message anyway. To avoid this, you should add at least one To: or CC: "
"recipient."
msgstr ""
-"许å¤?é?®ä»¶ç³»ç»?ä¼?å?¨å?ªæ??å¯?件æ??é??æ?¶ä»¶äººç??信件ä¸æ·»å? Apparently-To 头ã??å¦?æ??æ·»å? äº?è¿?"
-"个é?®ä»¶å¤´ï¼?å°?å?¨æ?¨ç??信件ä¸å??å?ºæ?¨ç??å?¨é?¨æ?¶ä»¶äººã??为äº?é?¿å??è¿?ç§?æ??å?µï¼?æ?¨åº?该è?³å°?å¡«å?¥"
+"许å¤?é?®ä»¶ç³»ç»?ä¼?å?¨å?ªæ??å¯?件æ??é??æ?¶ä»¶äººç??ä¿¡æ?¯ä¸æ·»å? Apparently-To 头ã??å¦?æ??æ·»å? äº?è¿?"
+"个é?®ä»¶å¤´ï¼?å°?å?¨æ?¨ç??ä¿¡æ?¯ä¸å??å?ºæ?¨ç??å?¨é?¨æ?¶ä»¶äººã??为äº?é?¿å??è¿?ç§?æ??å?µï¼?æ?¨åº?该è?³å°?å¡«å?¥"
"ä¸?个 To: æ?? CC: æ?¶ä»¶äººã??"
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
msgid "Missing folder."
msgstr "缺å°?æ??件夹ã??"
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
msgid "No sources selected."
msgstr "没æ??é??ä¸æº?ã??"
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
msgid "Opening too many messages at once may take a long time."
msgstr "ä¸?次æ??å¼?太å¤?å°?ä¿¡å?¯è?½è¦?è?±ä¸?ç?¹æ?¶é?´ã??"
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
msgid "Please check your account settings and try again."
-msgstr "请æ£?æ?¥æ?¨ç??è´¦æ?·è®¾ç½®ï¼?ç?¶å??å??è¯?ä¸?次ã??"
+msgstr "请æ£?æ?¥æ?¨ç??å¸?å?·è®¾ç½®ï¼?ç?¶å??å??è¯?ä¸?次ã??"
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
msgid "Please enable the account or send using another account."
-msgstr "请å?¯ç?¨è´¦æ?·æ??è??使ç?¨å?¶å®?è´¦æ?·å??é??ã??"
+msgstr "请å?¯ç?¨å¸?å?·æ??è??使ç?¨å?¶å®?å¸?å?·å??é??ã??"
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
msgid ""
"Please enter a valid email address in the To: field. You can search for "
"email addresses by clicking on the To: button next to the entry box."
@@ -13386,7 +13219,7 @@ msgstr ""
"请å?¨ To: ä¸è¾?å?¥æ??æ??ç??ç?µå?é?®ä»¶å?°å??ã??æ?¨å?¯ä»¥å??å?»è¾?å?¥æ¡?æ??è¾¹ç?? To: æ??é?®æ?¥æ??ç´¢ç?µå?"
"é?®ä»¶å?°å??ã??"
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
msgid ""
"Please make sure the following recipients are willing and able to receive "
"HTML email:\n"
@@ -13395,71 +13228,54 @@ msgstr ""
"请确å®?ä¸?å??æ?¶ä»¶äººæ?¿æ??并ä¸?è?½å¤?æ?¥æ?¶ HTML é?®ä»¶ï¼?\n"
"{0}"
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
msgid "Please provide an unique name to identify this signature."
msgstr "请æ??ä¾?æ¤ç¾å??ç??å?¯ä¸?æ ?è¯?å??称ã??"
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
msgid "Please wait."
msgstr "请ç¨?å??ã??"
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
msgid "Problem migrating old mail folder \"{0}\"."
msgstr "å??è¿?æ?§ç??é?®ä»¶æ??件夹â??{0}â??å?ºç?°é?®é¢?ã??"
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "æ?¥è¯¢æ??å?¡å?¨æ??æ?¯æ??ç??身份éª?è¯?ç®?æ³?å??表ã??"
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
msgid "Read receipt requested."
msgstr "é??读æ?¶æ?¡å·²è¯·æ±?ã??"
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
msgid "Really delete folder \"{0}\" and all of its subfolders?"
msgstr "ç??ç??è¦?å? é?¤æ??件夹â??{0}â??å??å?¶å?¨é?¨å?æ??件夹å??ï¼?"
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
#, fuzzy
-#| msgid "Cannot delete folder \"{0}\"."
msgid "Really delete folder \"{0}\"?"
msgstr "æ? æ³?å? é?¤æ??件夹â??{0}â??ã??"
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "æ?¥å??å??å?¾é?®ä»¶å¤±è´¥"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "æ?¥å??é??å??å?¾é?®ä»¶å¤±è´¥"
-
#: ../mail/mail.error.xml.h:90
msgid "Search Folders automatically updated."
msgstr "æ??ç´¢æ??件夹已è?ªå?¨æ?´æ?°ã??"
#: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "å??é??æ?¶æ?¡"
-
-#: ../mail/mail.error.xml.h:92
msgid "Signature Already Exists"
msgstr "ç¾å??å·²ç»?å?å?¨"
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "å??æ¥"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
msgid "Synchronize folders locally for offline usage?"
msgstr "å??æ¥æ??件夹å?°æ?¬å?°ä»¥è?±æ?ºä½¿ç?¨å??ï¼?"
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
msgid ""
"System folders are required for Evolution to function correctly and cannot "
"be renamed, moved, or deleted."
msgstr "æ?¨æ? æ³?é??å?½å??ã??移å?¨æ??å? é?¤è¦?让 Evolution æ£å¸¸è¿?ä½?æ??é??ç??ç³»ç»?æ??件夹ã??"
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:94
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -13470,145 +13286,122 @@ msgid ""
msgstr ""
"æ?¨å?³å°?å??é??ç??è??系人å??表é??置为é??è??å??表æ?¶ä»¶äººã??\n"
"\n"
-"许å¤?é?®ä»¶ç³»ç»?ä¼?å?¨å?ªæ??å¯?件æ??é??æ?¶ä»¶äººç??信件ä¸æ·»å? Apparently-To 头ã??å¦?æ??æ·»å? äº?è¿?"
-"个é?®ä»¶å¤´ï¼?å°?å?¨æ?¨ç??信件ä¸å??å?ºæ?¨ç??å?¨é?¨æ?¶ä»¶äººã??为äº?é?¿å??è¿?ç§?æ??å?µï¼?æ?¨åº?该è?³å°?å¡«å?¥"
+"许å¤?é?®ä»¶ç³»ç»?ä¼?å?¨å?ªæ??å¯?件æ??é??æ?¶ä»¶äººç??ä¿¡æ?¯ä¸æ·»å? Apparently-To 头ã??å¦?æ??æ·»å? äº?è¿?"
+"个é?®ä»¶å¤´ï¼?å°?å?¨æ?¨ç??ä¿¡æ?¯ä¸å??å?ºæ?¨ç??å?¨é?¨æ?¶ä»¶äººã??为äº?é?¿å??è¿?ç§?æ??å?µï¼?æ?¨åº?该è?³å°?å¡«å?¥"
"ä¸?个 To: æ?? CC: æ?¶ä»¶äººã??"
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-" \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"ä¸?å??æ??ç´¢æ??件夹ï¼?\n"
-"{0}\n"
-"使ç?¨ç?°å·²å? é?¤ç??æ??件夹ï¼?\n"
-" â??{1}â??\n"
-"å·²ç»?æ?´æ?°ã??"
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-" \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"ä¸?å??è¿?滤è§?å??ï¼?\n"
-"{0}\n"
-"使ç?¨ç?°å·²å? é?¤ç??æ??件夹ï¼?\n"
-" â??{1}â??\n"
-"å·²ç»?æ?´æ?°ã??"
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:97
msgid ""
"The following recipient was not recognized as a valid mail address:\n"
"{0}"
msgstr ""
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:99
msgid ""
"The following recipients were not recognized as valid mail addresses:\n"
"{0}"
msgstr ""
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:101
msgid "The script file must exist and be executable."
msgstr "è??æ?¬æ??件å¿?é¡»å?å?¨ä¸?å?¯æ?§è¡?ã??"
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:102
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
msgstr ""
"æ¤æ??件夹å?¯è?½å·²ç»?é??å¼?æ·»å? äº?ã??å¦?æ??é??è¦?ç??è¯?ï¼?请转å?°æ??ç´¢æ??件夹ç¼?è¾?å?¨æ?¾å¼?æ·»å? ã??"
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:104
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
-msgstr "æ? æ³?å??é??æ¤ä¿¡ä»¶ï¼?å? 为æ?¨æ??é??æ?©ç?¨æ?¥å??é??ç??è´¦æ?·æ?ªå?¯ç?¨"
+msgstr "æ? æ³?å??é??æ¤ä¿¡æ?¯ï¼?å? 为æ?¨æ??é??æ?©ç?¨æ?¥å??é??ç??å¸?å?·æ?ªå?¯ç?¨"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:105
msgid ""
"This message cannot be sent because you have not specified any recipients"
-msgstr "æ? æ³?å??é??æ¤ä¿¡ä»¶ï¼?å? 为æ?¨æ²¡æ??æ??å®?ä»»ä½?æ?¶ä»¶äºº"
+msgstr "æ? æ³?å??é??æ¤ä¿¡æ?¯ï¼?å? 为æ?¨æ²¡æ??æ??å®?ä»»ä½?æ?¶ä»¶äºº"
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:106
msgid ""
"This server does not support this type of authentication and may not support "
"authentication at all."
msgstr "æ¤æ??å?¡å?¨ä¸?æ?¯æ??æ¤ç±»å??ç??身份éª?è¯?ï¼?ä¹?å?¯è?½æ ¹æ?¬ä¸?æ?¯æ??身份éª?è¯?ã??"
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:107
msgid "This signature has been changed, but has not been saved."
msgstr "ç¾å??å·²ç»?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å?ã??"
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:108
msgid ""
"This will mark all messages as read in the selected folder and its "
"subfolders."
-msgstr "è¿?å°?æ??é??ä¸æ??件夹å??å?¶å?æ??件夹ä¸ç??å?¨é?¨ä¿¡ä»¶æ ?记为已读ã??"
+msgstr "è¿?å°?æ??é??ä¸æ??件夹å??å?¶å?æ??件夹ä¸ç??å?¨é?¨ä¿¡æ?¯æ ?记为已读ã??"
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:109
+#, fuzzy
+msgid "This will mark all messages as read in the selected folder."
+msgstr "è¿?å°?æ??é??ä¸æ??件夹å??å?¶å?æ??件夹ä¸ç??å?¨é?¨ä¿¡æ?¯æ ?记为已读ã??"
+
+#: ../mail/mail.error.xml.h:110
msgid "Unable to connect to the GroupWise server."
msgstr "æ? æ³?è¿?æ?¥å?° GroupWise æ??å?¡å?¨ã??"
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
msgid ""
"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
-msgstr "æ? æ³?æ??å¼?æ¤è´¦æ?·ç??è??稿æ??件夹ã??使ç?¨ç³»ç»?ç??è??稿æ??件夹å??ï¼?"
+msgstr "æ? æ³?æ??å¼?æ¤å¸?å?·ç??è??稿æ??件夹ã??使ç?¨ç³»ç»?ç??è??稿æ??件夹å??ï¼?"
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:112
msgid "Unable to read license file."
msgstr "æ? æ³?读å??许å?¯æ??件ã??"
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
msgid "Use _Default"
msgstr "使��认�(_D)"
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
msgid "Use default drafts folder?"
msgstr "使ç?¨é»?认ç??è??稿æ??件夹å??ï¼?"
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
msgid ""
"Warning: Deleting messages from a Search Folder will delete the actual "
"message from one of your local or remote folders.\n"
"Do you really want to do this?"
msgstr ""
-"è¦å??ï¼?ä»?æ??ç´¢æ??件夹ä¸å? é?¤ä¿¡ä»¶å°?ä¼?å? é?¤å®?é??ä½?äº?æ?¨ç??æ?¬å?°æ??è¿?ç¨?æ??件夹ä¸ç??ç?¸åº?ä¿¡"
+"è¦å??ï¼?ä»?æ??ç´¢æ??件夹ä¸å? é?¤ä¿¡æ?¯å°?ä¼?å? é?¤å®?é??ä½?äº?æ?¨ç??æ?¬å?°æ??è¿?ç¨?æ??件夹ä¸ç??ç?¸åº?ä¿¡"
"件ã??\n"
"æ?¨ç??ç??æ?³è¦?è¿?ä¹?å??å??ï¼?"
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
msgid "You do not have sufficient permissions to delete this mail."
msgstr "æ?¨æ²¡æ??足å¤?ç??æ??é??å? é?¤æ¤é?®ä»¶ã??"
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:118
msgid "You have not filled in all of the required information."
msgstr "æ?¨æ²¡æ??å¡«å?¥æ??é??ç??å?¨é?¨ä¿¡æ?¯ã??"
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:119
msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "æ?¨æ??æ?ªå??信件ï¼?æ?¨ä»?ç?¶æ?³è¦?é??å?ºå??ï¼?"
+msgstr "æ?¨æ??æ?ªå??ä¿¡æ?¯ï¼?æ?¨ä»?ç?¶æ?³è¦?é??å?ºå??ï¼?"
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:120
msgid "You may not create two accounts with the same name."
-msgstr "æ?¨ä¸?è?½å??建两个å??å??è´¦æ?·ã??"
+msgstr "æ?¨ä¸?è?½å??建两个å??å??å¸?å?·ã??"
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:121
msgid "You must name this Search Folder."
msgstr "æ?¨å¿?须为æ¤æ??ç´¢æ??件夹å?½å??ã??"
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
msgid "You must specify a folder."
msgstr "æ?¨å¿?é¡»æ??å®?æ??件夹ã??"
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -13617,129 +13410,131 @@ msgstr ""
"æ?¨å¿?é¡»ä¸?次è?³å°?æ??å®?ä¸?个æ??件夹ä½?为æº?ã??\n"
"æ??è??é??ä¸?é??æ?©æ??件夹ï¼?æ??è??é??ä¸å?¨é?¨æ?¬å?°æ??件夹å??/æ??å?¨é?¨è¿?ç¨?æ??件夹ã??"
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:125
msgid "Your login to your server \"{0}\" as \"{0}\" failed."
msgstr "æ?¨ä»¥â??{0}â??ç??身份ç?»å½?å?°æ??å?¡å?¨â??{0}â??失败ã??"
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:126
msgid "_Append"
msgstr "追å? (_A)"
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "��(_D)"
+
+#: ../mail/mail.error.xml.h:128
msgid "_Discard changes"
msgstr "丢���(_D)"
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "ä¸?å??æ¥(_D)"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:866
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:827
msgid "_Empty Trash"
msgstr "æ¸?空å??æ?¶ç«?(_E)"
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
msgid "_Expunge"
msgstr "é??æ¯?(_E)"
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
msgid "_Open Messages"
-msgstr "æ??å¼?信件(_O)"
+msgstr "æ??å¼?ä¿¡æ?¯(_O)"
+
+#: ../mail/mail.error.xml.h:134
+#, fuzzy
+msgid "_Send Receipt"
+msgstr "å??é??æ?¶æ?¡"
+
+#: ../mail/mail.error.xml.h:135
+#, fuzzy
+msgid "_Synchronize"
+msgstr "å??æ¥"
-#: ../mail/message-list.c:1119
+#: ../mail/message-list.c:1159
msgid "Unseen"
msgstr "æ?ªç??"
-#: ../mail/message-list.c:1120
+#: ../mail/message-list.c:1160
msgid "Seen"
msgstr "å·²ç??"
-#: ../mail/message-list.c:1121
+#: ../mail/message-list.c:1161
msgid "Answered"
msgstr "å·²ç?å¤?"
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1162
msgid "Forwarded"
msgstr "已转å??"
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1163
msgid "Multiple Unseen Messages"
-msgstr "å¤?å°?æ?ªç??信件"
+msgstr "å¤?å°?æ?ªç??ä¿¡æ?¯"
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1164
msgid "Multiple Messages"
msgstr "��信"
-#: ../mail/message-list.c:1128
+#: ../mail/message-list.c:1168
msgid "Lowest"
msgstr "æ??ä½?"
-#: ../mail/message-list.c:1129
+#: ../mail/message-list.c:1169
msgid "Lower"
msgstr "è¾?ä½?"
-#: ../mail/message-list.c:1133
+#: ../mail/message-list.c:1173
msgid "Higher"
msgstr "è¾?é«?"
-#: ../mail/message-list.c:1134
+#: ../mail/message-list.c:1174
msgid "Highest"
msgstr "æ??é«?"
-#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1784 ../widgets/table/e-cell-date.c:46
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1791 ../plugins/itip-formatter/itip-view.c:205
msgid "Today %l:%M %p"
msgstr "�天%p%l:%M"
-#: ../mail/message-list.c:1760
+#: ../mail/message-list.c:1800
msgid "Yesterday %l:%M %p"
msgstr "�天%p%l:%M"
-#: ../mail/message-list.c:1772
+#: ../mail/message-list.c:1812
msgid "%a %l:%M %p"
msgstr "%A%p%l:%M"
-#: ../mail/message-list.c:1780
+#: ../mail/message-list.c:1820
msgid "%b %d %l:%M %p"
msgstr "%mæ??%dæ?¥%p%l:%M"
-#: ../mail/message-list.c:1782
+#: ../mail/message-list.c:1822
msgid "%b %d %Y"
msgstr "%Yå¹´%mæ??%dæ?¥"
-#: ../mail/message-list.c:2528
+#: ../mail/message-list.c:2582
msgid "Select all visible messages"
-msgstr "é??ä¸æ??æ??å?¯è§?ç??信件"
-
-#: ../mail/message-list.c:2579 ../shell/e-shell-view.c:729
-msgid "Shell Backend"
-msgstr ""
+msgstr "é??ä¸æ??æ??å?¯è§?ç??ä¿¡æ?¯"
#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4434 ../mail/message-list.c:4932
+#: ../mail/message-list.c:4342 ../mail/message-list.c:4734
msgid "Generating message list"
-msgstr "ç??æ??信件å??表"
+msgstr "ç??æ??ä¿¡æ?¯å??表"
-#: ../mail/message-list.c:4763
+#: ../mail/message-list.c:4573
msgid ""
"No message satisfies your search criteria. Either clear search with Search-"
">Clear menu item or change it."
msgstr ""
-#: ../mail/message-list.c:4765
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-
-#: ../mail/message-list.c:4767
+#: ../mail/message-list.c:4575
msgid "There are no messages in this folder."
-msgstr "æ¤æ??件夹ä¸æ²¡æ??信件ã??"
+msgstr "æ¤æ??件夹ä¸æ²¡æ??ä¿¡æ?¯ã??"
#: ../mail/message-list.etspec.h:3
msgid "Due By"
@@ -13763,10 +13558,10 @@ msgstr "已��"
#: ../mail/message-list.etspec.h:15
msgid "Sent Messages"
-msgstr "å·²å??信件"
+msgstr "å·²å??ä¿¡æ?¯"
#: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
msgid "Size"
msgstr "大�"
@@ -13775,27 +13570,27 @@ msgid "Subject - Trimmed"
msgstr "主é¢? - 被æ?ªæ?"
#: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
msgid "Body contains"
msgstr "é?®ä»¶ä½?å?«æ??"
#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
msgid "Message contains"
-msgstr "信件å?«æ??"
+msgstr "ä¿¡æ?¯å?«æ??"
#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
msgid "Recipients contain"
msgstr "æ?¶ä»¶äººå?«æ??"
#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
msgid "Sender contains"
msgstr "å??件人å?«æ??"
#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1246
msgid "Subject contains"
msgstr "主é¢?å?«æ??"
@@ -13829,16 +13624,16 @@ msgstr ""
"é??æ?©æ¤é??项æ??å?³ç??æ?¨ç??æ??å?¡å?¨æ?¢ä¸?æ?¯æ?? SSL ä¹?ä¸?æ?¯æ?? TLSã??å?¯è?½å¯¼è?´ç??ç»?æ??å°?æ?¯æ?¨ç??è¿?"
"æ?¥ä¸?太å®?å?¨ï¼?æ?¨ä¹?æ??äº?å??å?°å®?å?¨æ¼?æ´?ç??æ?»å?»ã??"
-#: ../modules/addressbook/addressbook-config.c:592
+#: ../modules/addressbook/addressbook-config.c:602
#, fuzzy
-msgid "Use in _Birthday & Anniversaries calendar"
+msgid "U_se in Birthday & Anniversaries calendar"
msgstr "ç??æ?¥å??纪念æ?¥"
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
msgid "Copy _book content locally for offline operation"
msgstr "å°?å?°å??ç°¿å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_B)"
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. A "
"list of standard ports has been provided. Ask your system administrator what "
@@ -13847,7 +13642,7 @@ msgstr ""
"è¿?æ?¯ LDAP æ??å?¡å?¨ä¸?ç??端å?£ï¼?Evolution å°?è¯?å?¾è¿?æ?¥å?°æ?¨æ??ç»?å?ºç??æ ?å??端å?£å??表ã??å¦?æ??"
"æ?¨ä¸?æ¸?æ¥?è¦?æ??å®?ç??端å?£ï¼?请询é?®æ?¨ç??ç³»ç»?管ç??å??ã??"
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
msgid ""
"This is the method Evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13856,7 +13651,7 @@ msgstr ""
"è¿?æ?¯ Evolution ç?¨æ?¥è®¤è¯?æ?¨ç??æ?¹æ³?ã??请注æ??è?¥å?¨æ¤è®¾å®?为â??ç?µå?é?®ä»¶å?°å??â??å??é??è¦?æ?¨å?·æ??"
"对 LDAP æ??å?¡å?¨ç??å?¿å??访é?®æ??é??ã??"
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13867,29 +13662,29 @@ msgstr ""
"æ??ç´¢å?ºç¡?ä¸?æ??å±?ç??å?¨é?¨é¡¹ã??æ??ç´¢è??å?´è?¥ä¸ºâ??ä¸?级â??ï¼?å??å?ªä¼?å??å?«æ?¨æ??å®?ç??æ??ç´¢å?ºç¡?ä¹?ä¸?ä¸?"
"级ç??项ç?®ã??"
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
msgid "Server Information"
msgstr "æ??å?¡å?¨ä¿¡æ?¯"
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
msgid "Details"
msgstr "ç»?è??"
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
#: ../modules/mail/e-mail-shell-view.c:54
msgid "Searching"
msgstr "æ??ç´¢"
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
msgid "Downloading"
msgstr "�载"
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
msgid "Address Book Properties"
msgstr "å?°å??ç°¿å±?æ?§"
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
msgid "New Address Book"
msgstr "æ?°å?°å??ç°¿"
@@ -13967,8 +13762,11 @@ msgstr ""
msgid "Whether to show the preview pane."
msgstr "æ?¯å?¦æ?¾ç¤ºé¢?è§?é?¢æ?¿ã??"
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
#: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
+#: ../modules/mail/em-mailer-prefs.c:1165
+#, fuzzy
+msgid "_Table column:"
msgstr "è¡¨æ ¼æ ?ï¼?"
#: ../modules/addressbook/autocompletion-config.c:162
@@ -13980,426 +13778,314 @@ msgid "Always _show address of the autocompleted contact"
msgstr "æ?»æ?¯æ?¾ç¤ºè?ªå?¨è¡¥å?¨ç??è??系人ç??å?°å??(_S)"
#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:191
+#: ../modules/addressbook/e-book-shell-migrate.c:148
msgid "On LDAP Servers"
msgstr "å?¨ LDAP æ??å?¡å?¨ä¸?"
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:341
msgctxt "New"
msgid "_Contact"
msgstr "è??系人(_C)"
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:343
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
msgid "Create a new contact"
msgstr "å??建ä¸?个æ?°è??系人"
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:348
msgctxt "New"
msgid "Contact _List"
msgstr "è??系人å??表(_L)"
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:350
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
msgid "Create a new contact list"
msgstr "å??建ä¸?个æ?°ç??è??系人å??表"
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:358
msgctxt "New"
msgid "Address _Book"
msgstr "å?°å??ç°¿(_B)"
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:360
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
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:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/addressbook/e-book-shell-backend.c:377
+#: ../modules/addressbook/e-book-shell-view.c:398
+#: ../modules/calendar/e-cal-shell-backend.c:124
+#: ../modules/calendar/e-cal-shell-migrate.c:57
msgid "Contacts"
msgstr "è??系人"
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../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 "æ?¥æº?å??表"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-#, fuzzy
-msgid "The registry of address books"
-msgstr "æ? æ³?è?·å¾?å?°å??ç°¿å??表"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "å½?å??è§?å?¾"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr ""
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-#, fuzzy
-msgid "Previewed Contact"
-msgstr "æ?°å»ºè??系人"
-
-#: ../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:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-#, fuzzy
-msgid "Preview is Visible"
-msgstr "侧边æ ?å?¯è§?"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-#, fuzzy
-msgid "Whether the preview pane is visible"
-msgstr "æ?¯å?¦æ?¾ç¤ºé¢?è§?é?¢æ?¿ã??"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP æ??å?¡å?¨"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "��补�设置"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact 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/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"é?®ä»¶å??表è??系人ç??æ ¼å¼?å·²ç»?æ?´æ?¹ã??\n"
-"\n"
-"请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution å?å?¨æ??äº?ç?µè¯?å?·ç ?ç??æ?¹å¼?å·²ç»?æ?´æ?¹ã??\n"
-"\n"
-"请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution Palm å??æ¥æ?´æ?°æ?¥å¿?å??å?°å?¾æ??件已ç»?æ?´æ?¹ã??\n"
-"\n"
-"请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç?? Pilot å??æ¥æ?°æ?®..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:763
-#: ../modules/calendar/e-memo-shell-sidebar.c:689
-#: ../modules/calendar/e-task-shell-sidebar.c:689
-#, fuzzy
-msgid "Source Selector Widget"
-msgstr "å¤?å¿?æ?¥æº?é??æ?©å?¨"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-#, fuzzy
-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:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
msgid "Save as vCard"
msgstr "å?¦å?为 VCard"
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
msgid "Co_py All Contacts To..."
msgstr "å°?å?¨é?¨è??系人å¤?å?¶å?°(_P)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
#, fuzzy
msgid "Copy the contacts of the selected address book to another"
msgstr "æ??é??ä¸æ??件夹ä¸ç??è??系人å¤?å?¶å?°å?¶å®?æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
#, fuzzy
-#| msgid "Del_ete Address Book"
msgid "D_elete Address Book"
msgstr "å? é?¤å?°å??ç°¿(_E)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
#, fuzzy
msgid "Delete the selected address book"
msgstr "å? é?¤é??ä¸ç??æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
msgid "Mo_ve All Contacts To..."
msgstr "å°?å?¨é?¨è??系人移è?³(_V)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
#, fuzzy
msgid "Move the contacts of the selected address book to another"
msgstr "æ??é??ä¸æ??件夹ä¸ç??è??系人移è?³å?¶å®?æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
msgid "_New Address Book"
msgstr "æ?°å»ºå?°å??ç°¿(_N)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
msgid "Address _Book Properties"
msgstr "å?°å??ç°¿å±?æ?§(_B)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
#, fuzzy
msgid "Show properties of the selected address book"
msgstr "æ?´æ?¹é??ä¸æ??件夹ç??å±?æ?§"
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:911
msgid "_Rename..."
msgstr "é??å?½å??(_R)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
#, fuzzy
msgid "Rename the selected address book"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
msgid "S_ave Address Book as vCard"
msgstr "ä¿?å?å?°å??簿为 VCard(_A)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
#, fuzzy
msgid "Save the contacts of the selected address book as a vCard"
msgstr "æ??é??ä¸æ??件夹ä¸ç??ç??è??系人ä¿?å?为 VCard"
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
msgid "Stop loading"
msgstr "å??æ¢è½½å?¥"
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
#, fuzzy
msgid "_Copy Contact To..."
msgstr "å°?è??系人å¤?å?¶å?°(_C)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
#, fuzzy
msgid "Copy selected contacts to another address book"
msgstr "æ??é??ä¸ç??è??系人å¤?å?¶å?°å?¶å®?æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
msgid "_Delete Contact"
msgstr "å? é?¤è??系人(_D)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
#, fuzzy
-#| msgid "_Forward Contact..."
msgid "_Find in Contact..."
msgstr "转å??è??系人(_F)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
#, fuzzy
-#| msgid "Search for text in the body of the displayed message"
msgid "Search for text in the displayed contact"
-msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
+msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
msgid "_Forward Contact..."
msgstr "转å??è??系人(_F)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
msgid "Send selected contacts to another person"
msgstr "æ??é??ä¸ç??è??系人å??é??ç»?å?¶ä»?人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
#, fuzzy
msgid "_Move Contact To..."
msgstr "å°?è??系人移è?³(_M)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
#, fuzzy
msgid "Move selected contacts to another address book"
msgstr "æ??é??ä¸ç??è??系人移è?³å?¶å®?æ??件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
msgid "_New Contact..."
msgstr "æ?°å»ºè??系人(_N)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
msgid "New Contact _List..."
msgstr "æ?°å»ºè??系人å??表(_L)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
msgid "_Open Contact"
msgstr "æ??å¼?è??系人(_O)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
msgid "View the current contact"
msgstr "æ?¥ç??å½?å??è??系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
msgid "_Send Message to Contact..."
-msgstr "ç»?è??系人å??信件(_S)..."
+msgstr "ç»?è??系人å??ä¿¡æ?¯(_S)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
msgid "Send a message to the selected contacts"
-msgstr "ç»?é??ä¸ç??è??系人å??信件"
+msgstr "ç»?é??ä¸ç??è??系人å??ä¿¡æ?¯"
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
msgid "_Actions"
msgstr "æ??ä½?(_A)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
msgid "_Preview"
msgstr "��(_P)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
msgid "_Delete"
msgstr "å? é?¤(_D)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
msgid "_Properties"
msgstr "å±?æ?§(_P)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
msgid "_Save as vCard..."
msgstr "å?¦å?为 vCard(_S)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
msgid "Contact _Preview"
msgstr "è??系人é¢?è§?(_P)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
msgid "Show contact preview window"
msgstr "æ?¾ç¤ºè??系人é¢?è§?çª?å?£"
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
msgid "_Classic View"
msgstr "å??ç±»è§?å?¾(_C)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
#, fuzzy
msgid "Show contact preview below the contact list"
-msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸?æ?¹æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
msgid "_Vertical View"
msgstr "å??ç?´è§?å?¾(_V)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
#, fuzzy
msgid "Show contact preview alongside the contact list"
msgstr "æ?¾ç¤ºè??系人é¢?è§?çª?å?£"
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
msgid "Any Category"
msgstr "任�类�"
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
msgid "Unmatched"
msgstr "æ? å?¹é??"
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
+#: ../shell/e-shell-content.c:459
msgid "Advanced Search"
msgstr "é«?级æ??ç´¢"
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
#, fuzzy
msgid "Print all shown contacts"
msgstr "æ??å?°é??ä¸ç??è??系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
#, fuzzy
msgid "Preview the contacts to be printed"
msgstr "é¢?è§?å°?è¦?æ??å?°ç??è??系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
msgid "Print selected contacts"
msgstr "æ??å?°é??ä¸ç??è??系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "å?¦å?为 VCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
#, fuzzy
msgid "Save selected contacts as a vCard"
msgstr "æ??é??ä¸ç??è??系人ä¿?å?为 VCard"
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:342
msgid "_Forward Contacts"
msgstr "转å??è??系人(_F)"
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:344
msgid "_Forward Contact"
msgstr "转å??è??系人(_F)"
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:375
#, fuzzy
msgid "_Send Message to Contacts"
-msgstr "ç»?è??系人å??信件(_M)"
+msgstr "ç»?è??系人å??ä¿¡æ?¯(_M)"
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:377
#, fuzzy
msgid "_Send Message to List"
-msgstr "ç»?å??表å??信件(_M)"
+msgstr "ç»?å??表å??ä¿¡æ?¯(_M)"
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:379
#, fuzzy
msgid "_Send Message to Contact"
-msgstr "ç»?è??系人å??信件(_M)"
+msgstr "ç»?è??系人å??ä¿¡æ?¯(_M)"
#: ../modules/addressbook/eab-composer-util.c:137
msgid "Multiple vCards"
@@ -14421,57 +14107,47 @@ msgstr "è??系人信æ?¯"
msgid "Contact information for %s"
msgstr "%s ç??è??系人信æ?¯"
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
msgid "1"
msgstr "1"
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
#: ../modules/addressbook/ldap-config.ui.h:4
msgid "5"
msgstr "5"
#: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
msgid "Anonymously"
msgstr "å?¿å??"
#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
msgid "B_rowse this book until limit reached"
msgstr "æµ?è§?æ¤å?°å??ç°¿ç?´å?°è¾¾å?°æ??é??(_R)"
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
msgid "Lo_gin:"
msgstr "��(_G)�"
#. 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
+#: ../modules/addressbook/ldap-config.ui.h:11
msgid "One"
msgstr "�次"
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
msgid "Search Filter"
msgstr "æ??ç´¢è¿?滤å?¨"
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
msgid "Search _base:"
msgstr "æ??ç´¢å?ºç¡?(_B)ï¼?"
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
msgid "Search _filter:"
msgstr "æ??ç´¢è¿?滤å?¨(_F)ï¼?"
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
#, fuzzy
msgid ""
"Search filter is the type of object to be searched for. If this is not "
@@ -14481,55 +14157,56 @@ msgstr ""
"å°?ä¼?å?¨â??个人â??ç±»å??ç??对象类å??ã??"
#. 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
+#: ../modules/addressbook/ldap-config.ui.h:18
msgid "Sub"
msgstr "å?"
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
msgid "Supported Search Bases"
msgstr "æ?¯æ??ç??æ??索起ç?¹"
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
msgid "Using distinguished name (DN)"
msgstr "使ç?¨å·²è¯?å?«ç??å§?å??(DN)"
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
msgid "Using email address"
msgstr "使ç?¨ç?µå?é?®ä»¶å?°å??"
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
msgid "_Download limit:"
msgstr "ä¸?è½½é??å?¶(_D)ï¼?"
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
msgid "_Find Possible Search Bases"
msgstr "æ?¥æ?¾å?¯è?½ç??æ??ç´¢å?ºç¡?(_F)"
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
msgid "_Login method:"
msgstr "����(_L)�"
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
msgid "_Port:"
msgstr "端�(_P)�"
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
msgid "_Search scope:"
msgstr "æ??ç´¢è??å?´(_S)ï¼?"
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
msgid "_Timeout:"
msgstr "��(_T)�"
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
msgid "_Use secure connection:"
msgstr "使�����(_U)�"
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
msgid "cards"
msgstr "å??ç??"
#: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
msgid "I_mport"
msgstr "导�(_M)"
@@ -14550,97 +14227,69 @@ msgid "I_mport to Tasks"
msgstr "导��任�(_M)"
#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-backend.c:126
+#: ../modules/calendar/e-cal-shell-migrate.c:176
#: ../modules/calendar/e-memo-shell-backend.c:110
#: ../modules/calendar/e-memo-shell-migrate.c:136
#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:145
msgid "On The Web"
msgstr "��"
-#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-backend.c:128
#: ../plugins/calendar-weather/calendar-weather.c:117
msgid "Weather"
msgstr "天�"
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:252
+#: ../modules/calendar/e-cal-shell-migrate.c:60
msgid "Birthdays & Anniversaries"
msgstr "ç??æ?¥å??纪念æ?¥"
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:456
msgctxt "New"
msgid "_Appointment"
msgstr "约�(_A)"
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:458
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
msgid "Create a new appointment"
msgstr "å??建æ?°çº¦ä¼?"
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:463
msgctxt "New"
msgid "All Day A_ppointment"
msgstr "�天约�(_P)"
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:465
msgid "Create a new all-day appointment"
msgstr "å??建æ?°å?¨å¤©çº¦ä¼?"
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:470
msgctxt "New"
msgid "M_eeting"
msgstr "ä¼?è®®(_E)"
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:472
msgid "Create a new meeting request"
msgstr "å??建ä¸?æ?¡æ?°ä¼?议请æ±?"
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:480
msgctxt "New"
msgid "Cale_ndar"
msgstr "æ?¥å??(_N)"
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
msgid "Create a new calendar"
msgstr "å??建æ?°æ?¥å??"
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:517
+#: ../plugins/itip-formatter/itip-formatter.c:2667
msgid "Calendar and Tasks"
msgstr "æ?¥å??å??ä»»å?¡"
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar 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 æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "æ? æ³?ä»? evolution/config.xmldb ä¸å??è¿?æ?§è®¾ç½®"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "æ? æ³?å??è¿?æ?¥å??â??%sâ??"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-cal-shell-sidebar.c:169
#: ../modules/calendar/e-memo-shell-sidebar.c:163
#: ../modules/calendar/e-task-shell-sidebar.c:163
#, c-format
@@ -14651,38 +14300,21 @@ msgstr ""
"%s é??误ï¼?\n"
" %s"
-#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#: ../modules/calendar/e-cal-shell-sidebar.c:230
msgid "Loading calendars"
-msgstr "è£?å?¥æ?¥å??"
+msgstr "è½½å?¥æ?¥å??"
-#: ../modules/calendar/e-cal-shell-sidebar.c:617
-msgid "Calendar Selector"
-msgstr "æ?¥å??é??æ?©å?¨"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:743
-msgid "Date Navigator Widget"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:744
-msgid "This widget displays a miniature calendar"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:753
+#: ../modules/calendar/e-cal-shell-sidebar.c:652
#, fuzzy
-#| msgid "Default Mail Client"
-msgid "Default Calendar Client"
-msgstr "�认�件客�端"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:754
-msgid "Default client for calendar operations"
-msgstr ""
+msgid "_New Calendar..."
+msgstr "æ?°å»ºæ?¥å??(_N)"
-#: ../modules/calendar/e-cal-shell-sidebar.c:764
-msgid "This widget displays groups of calendars"
-msgstr ""
+#: ../modules/calendar/e-cal-shell-sidebar.c:669
+msgid "Calendar Selector"
+msgstr "æ?¥å??é??æ?©å?¨"
#. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:952
+#: ../modules/calendar/e-cal-shell-sidebar.c:1010
#, c-format
msgid "Opening calendar at %s"
msgstr "å?¨ %s æ??å¼?æ?¥å??"
@@ -14710,303 +14342,303 @@ msgstr "é??æ¯?è¾?æ?©ç??äº?件"
msgid "Copying Items"
msgstr "��项�"
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
msgid "Moving Items"
msgstr "移�项�"
#. 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:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
msgid "event"
msgstr "�件"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
msgid "Save as iCalendar"
msgstr "ä¿?å?为 iCalendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
msgid "_Copy..."
msgstr "��(_C)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
msgid "D_elete Calendar"
msgstr "å? é?¤æ?¥å??(_E)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
#, fuzzy
-#| msgid "Rename the selected calendar"
msgid "Delete the selected calendar"
msgstr "é??å?½å??é??ä¸ç??æ?¥å??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
msgid "Go Back"
msgstr "å??é??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
msgid "Go Forward"
msgstr "å??è¿?"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "é??æ?©ä»?天(_T)"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
msgid "Select today"
msgstr "é??æ?©ä»?天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
msgid "Select _Date"
msgstr "é??æ?©æ?¥æ??(_D)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
msgid "Select a specific date"
msgstr "é??æ?©ç?¹å®?æ?¥æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
msgid "_New Calendar"
msgstr "æ?°å»ºæ?¥å??(_N)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
msgid "Purg_e"
msgstr "é??æ¯?(_E)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
msgid "Purge old appointments and meetings"
msgstr "é??æ¯?æ?§çº¦ä¼?å??ä¼?è®®"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
msgid "Re_fresh"
msgstr "å?·æ?°(_F)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
msgid "Refresh the selected calendar"
msgstr "å?·æ?°é??ä¸ç??æ?¥å??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
msgid "Rename the selected calendar"
msgstr "é??å?½å??é??ä¸ç??æ?¥å??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
msgid "Show _Only This Calendar"
msgstr "å?ªæ?¾ç¤ºæ¤æ?¥å??(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
msgid "Cop_y to Calendar..."
msgstr "å¤?å?¶å?°æ?¥å??(_Y)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
msgid "_Delegate Meeting..."
msgstr "代ç??ä¼?è®®(_D)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
msgid "_Delete Appointment"
msgstr "å? é?¤çº¦ä¼?(_D)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
msgid "Delete selected appointments"
msgstr "å? é?¤é??ä¸ç??约ä¼?"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
msgid "Delete This _Occurrence"
msgstr "å? é?¤æ¤æ¬¡å?ºç?°(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
msgid "Delete this occurrence"
msgstr "å? é?¤æ¤æ¬¡å??ç??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
msgid "Delete All Occ_urrences"
msgstr "å? é?¤æ??æ??å?ºç?°(_U)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
msgid "Delete all occurrences"
msgstr "å? é?¤å?¨é?¨å??ç??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
msgid "New All Day _Event..."
msgstr "�建�天�件(_E)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
msgid "Create a new all day event"
msgstr "å??建ä¸?个æ?°ç??å?¨å¤©äº?件"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
msgid "_Forward as iCalendar..."
msgstr "ä½?为 iCalendar 转å??(_F)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
msgid "New _Meeting..."
msgstr "�建�议(_M)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
msgid "Create a new meeting"
msgstr "å??建ä¸?个æ?°ç??ä¼?è®®"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
msgid "Mo_ve to Calendar..."
msgstr "移è?³æ?¥å??(_V)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
msgid "New _Appointment..."
msgstr "�建约�(_A)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
msgid "Make this Occurrence _Movable"
msgstr "å°?æ¤æ¬¡å??ç??å??为å?¯ç§»å?¨(_M)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
msgid "_Open Appointment"
msgstr "æ??å¼?约ä¼?(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
msgid "View the current appointment"
msgstr "æ?¥ç??å½?å??约ä¼?"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
msgid "_Reply"
msgstr "å??å¤?(_R)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
msgid "Save as iCalendar..."
msgstr "ä¿?å?为 iCalendar..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
msgid "_Schedule Meeting..."
msgstr "�度�议(_S)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
#, fuzzy
msgid "Converts an appointment to a meeting"
msgstr "é??æ¯?æ?§çº¦ä¼?å??ä¼?è®®"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
msgid "Conv_ert to Appointment..."
msgstr "转��约�(_E)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
#, fuzzy
msgid "Converts a meeting to an appointment"
msgstr "å?¨çº¦ä¼?ç»?æ??æ?¶ %s"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#, fuzzy
+msgid "Quit"
+msgstr "å¼?ç?¨"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
msgid "Day"
msgstr "天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
msgid "Show one day"
msgstr "�示�天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
msgid "List"
msgstr "å??表"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
msgid "Show as list"
msgstr "æ?¾ç¤ºä¸ºå??表"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
msgid "Month"
msgstr "æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
msgid "Show one month"
msgstr "æ?¾ç¤ºä¸?个æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
msgid "Week"
msgstr "å?¨"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
msgid "Show one week"
msgstr "�示��"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
#, fuzzy
msgid "Show one work week"
msgstr "�示��"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
msgid "Active Appointments"
msgstr "活�约�"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
msgid "Next 7 Days' Appointments"
msgstr "ä¸?ä¸?å?¨ç??约ä¼?"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
msgid "Description contains"
msgstr "æ??è¿°å?«æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
msgid "Summary contains"
msgstr "æ¦?è¦?å?«æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
msgid "Print this calendar"
msgstr "æ??å?°æ¤æ?¥å??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
msgid "Preview the calendar to be printed"
msgstr "é¢?è§?å°?è¦?æ??å?°ç??æ?¥å??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
msgid "Go To"
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:492
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
msgid "memo"
msgstr "��"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
msgid "New _Memo"
msgstr "�建��(_M)"
-#: ../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:626
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:322
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
msgid "Create a new memo"
msgstr "å??建æ?°å¤?å¿?"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
msgid "_Open Memo"
msgstr "æ??å¼?å¤?å¿?(_O)"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
msgid "View the selected memo"
msgstr "æ?¥ç??é??ä¸ç??å¤?å¿?"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
msgid "Open _Web Page"
msgstr "æ??å¼?ç½?页(_W)"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
msgid "Print the selected memo"
msgstr "æ??å?°é??ä¸ç??å¤?å¿?"
@@ -15015,22 +14647,22 @@ msgstr "æ??å?°é??ä¸ç??å¤?å¿?"
#. 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:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
msgid "task"
msgstr "任�"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
msgid "_Assign Task"
msgstr "å??é??ä»»å?¡(_A)"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
msgid "_Mark as Complete"
msgstr "æ ?记为å®?æ??(_M)"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
msgid "Mark selected tasks as complete"
msgstr "æ??é??ä¸ä»»å?¡æ ?记为å®?æ??"
@@ -15039,100 +14671,76 @@ msgid "_Mark as Incomplete"
msgstr "æ ?记为æ?ªå®?æ??(_M)"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
msgid "Mark selected tasks as incomplete"
msgstr "æ??é??ä¸ä»»å?¡æ ?记为æ?ªå®?æ??"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
msgid "New _Task"
msgstr "�建任�(_T)"
#: ../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:764
+#: ../modules/calendar/e-task-shell-view-actions.c:774
msgid "Create a new task"
msgstr "å??建æ?°ä»»å?¡"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
msgid "_Open Task"
msgstr "æ??å¼?ä»»å?¡(_O)"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
msgid "View the selected task"
msgstr "æ?¥ç??é??ä¸ç??ä»»å?¡"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
msgid "_Save as iCalendar..."
msgstr "ä¿?å?为 iCalendar(_S)..."
#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
msgid "Print the selected task"
msgstr "æ??å?°é??ä¸ç??ä»»å?¡"
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:320
msgctxt "New"
msgid "Mem_o"
msgstr "��(_O)"
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:327
msgctxt "New"
msgid "_Shared Memo"
msgstr "å?±äº«ç??å¤?å¿?(_S)"
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:329
msgid "Create a new shared memo"
msgstr "å??建ä¸?个æ?°ç??å?±äº«å¤?å¿?"
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:337
msgctxt "New"
msgid "Memo Li_st"
msgstr "å¤?å¿?å??表(_S)"
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-backend.c:339
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
msgid "Create a new memo list"
msgstr "å??建æ?°å¤?å¿?å??表"
-#: ../modules/calendar/e-memo-shell-backend.c:588
-#, fuzzy
-msgid "The registry of memo lists"
-msgstr "æ??å?°å¤?å¿?å??表"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-#, fuzzy
-msgid "The memo table model"
-msgstr "è¡¨æ ¼æ¨¡å??"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:222
+#: ../modules/calendar/e-memo-shell-sidebar.c:224
msgid "Loading memos"
-msgstr "����"
+msgstr "载���"
-#: ../modules/calendar/e-memo-shell-sidebar.c:571
+#: ../modules/calendar/e-memo-shell-sidebar.c:591
msgid "Memo List Selector"
msgstr "å¤?å¿?å??表é??æ?©å?¨"
-#: ../modules/calendar/e-memo-shell-sidebar.c:679
-#, fuzzy
-#| msgid "Default Mail Client"
-msgid "Default Memo Client"
-msgstr "�认�件客�端"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:680
-msgid "Default client for memo operations"
-msgstr ""
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:690
-msgid "This widget displays groups of memo lists"
-msgstr ""
-
#. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:870
+#: ../modules/calendar/e-memo-shell-sidebar.c:896
#, c-format
msgid "Opening memos at %s"
msgstr "å?¨ %s æ??å¼?å¤?å¿?"
@@ -15142,76 +14750,73 @@ msgstr "å?¨ %s æ??å¼?å¤?å¿?"
msgid "Print Memos"
msgstr "æ??å?°å¤?å¿?"
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
msgid "_Delete Memo"
msgstr "å? é?¤å¤?å¿?(_D)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
#, fuzzy
-#| msgid "_Find in Message..."
msgid "_Find in Memo..."
-msgstr "å?¨ä¿¡ä»¶ä¸æ?¥æ?¾(_F)..."
+msgstr "å?¨ä¿¡æ?¯ä¸æ?¥æ?¾(_F)..."
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
#, fuzzy
-#| msgid "Search for text in the body of the displayed message"
msgid "Search for text in the displayed memo"
-msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
+msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
#, fuzzy
-#| msgid "Delete Memos"
msgid "D_elete Memo List"
msgstr "å? é?¤å¤?å¿?"
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
#, fuzzy
msgid "Delete the selected memo list"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
msgid "_New Memo List"
msgstr "æ?°å»ºå¤?å¿?å??表(_N)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
#, fuzzy
msgid "Refresh the selected memo list"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
#, fuzzy
msgid "Rename the selected memo list"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
#, fuzzy
msgid "Show _Only This Memo List"
msgstr "å?ªæ?¾ç¤ºæ¤å¤?å¿?å??表(_O)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
msgid "Memo _Preview"
msgstr "����(_P)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
#, fuzzy
msgid "Show memo preview pane"
msgstr "�示����"
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
#, fuzzy
msgid "Show memo preview below the memo list"
-msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸?æ?¹æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
#, fuzzy
msgid "Show memo preview alongside the memo list"
-msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸?æ?¹æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
msgid "Print the list of memos"
msgstr "æ??å?°å¤?å¿?å??表"
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
#, fuzzy
msgid "Preview the list of memos to be printed"
msgstr "é¢?è§?è¦?æ??å?°ç??å¤?å¿?å??表"
@@ -15234,8 +14839,6 @@ msgstr "å? é?¤å¤?å¿?"
#: ../modules/calendar/e-memo-shell-view.c:225
#, fuzzy
-#| msgid "Delete Memo"
-#| msgid_plural "Delete Memos"
msgid "Delete Memo"
msgstr "å? é?¤å¤?å¿?"
@@ -15259,64 +14862,21 @@ msgid "Tas_k List"
msgstr "ä»»å?¡å??表(_K)"
#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:725
msgid "Create a new task list"
msgstr "å??建æ?°ä»»å?¡å??表"
-#: ../modules/calendar/e-task-shell-backend.c:598
-#, fuzzy
-msgid "The registry of task lists"
-msgstr "æ??å?°ä»»å?¡å??表"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-#, fuzzy
-msgid "The task table model"
-msgstr "è¡¨æ ¼æ¨¡å??"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task 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 æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "æ? æ³?å??è¿?ä»»å?¡â??%sâ??"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:222
+#: ../modules/calendar/e-task-shell-sidebar.c:224
msgid "Loading tasks"
-msgstr "��任�"
+msgstr "载�任�"
-#: ../modules/calendar/e-task-shell-sidebar.c:571
+#: ../modules/calendar/e-task-shell-sidebar.c:591
#, fuzzy
msgid "Task List Selector"
msgstr "ä»»å?¡æ?¥æº?é??æ?©å?¨"
-#: ../modules/calendar/e-task-shell-sidebar.c:679
-#, fuzzy
-#| msgid "Default Mail Client"
-msgid "Default Task Client"
-msgstr "�认�件客�端"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:680
-#, fuzzy
-#| msgid "Default value for thread expand state"
-msgid "Default client for task operations"
-msgstr "è¯?é¢?ç??é»?认å±?å¼?ç?¶æ??"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:690
-msgid "This widget displays groups of task lists"
-msgstr ""
-
#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:870
+#: ../modules/calendar/e-task-shell-sidebar.c:896
#, c-format
msgid "Opening tasks at %s"
msgstr "å?¨ %s æ??å¼?ä»»å?¡"
@@ -15326,7 +14886,7 @@ msgstr "å?¨ %s æ??å¼?ä»»å?¡"
msgid "Print Tasks"
msgstr "æ??å?°ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -15337,107 +14897,104 @@ msgstr ""
"\n"
"ç¡®å®?å? é?¤è¿?äº?ä»»å?¡å??ï¼?"
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
msgid "_Delete Task"
msgstr "å? é?¤ä»»å?¡(_D)"
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
#, fuzzy
-#| msgid "_Find in Message..."
msgid "_Find in Task..."
-msgstr "å?¨ä¿¡ä»¶ä¸æ?¥æ?¾(_F)..."
+msgstr "å?¨ä¿¡æ?¯ä¸æ?¥æ?¾(_F)..."
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
#, fuzzy
-#| msgid "Search for text in the body of the displayed message"
msgid "Search for text in the displayed task"
-msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
+msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??主ä½?ä¸æ??ç´¢æ??æ?¬"
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
msgid "Copy..."
msgstr "��..."
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
#, fuzzy
-#| msgid "Delete Tasks"
msgid "D_elete Task List"
msgstr "å? é?¤ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
#, fuzzy
msgid "Delete the selected task list"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
msgid "_New Task List"
msgstr "æ?°å»ºä»»å?¡å??表(_N)"
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
#, fuzzy
msgid "Refresh the selected task list"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
#, fuzzy
msgid "Rename the selected task list"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
msgid "Show _Only This Task List"
msgstr "å?ªæ?¾ç¤ºæ¤ä»»å?¡å??表(_O)"
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
msgid "Mar_k as Incomplete"
msgstr "æ ?记为æ?ªå®?æ??(_K)"
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
msgid "Delete completed tasks"
msgstr "å? é?¤å·²å®?æ??ç??ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
msgid "Task _Preview"
msgstr "任���(_P)"
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
#, fuzzy
msgid "Show task preview pane"
msgstr "�示����"
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
#, fuzzy
msgid "Show task preview below the task list"
-msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸?æ?¹æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
#, fuzzy
msgid "Show task preview alongside the task list"
-msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸?æ?¹æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
msgid "Active Tasks"
msgstr "活�任�"
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
msgid "Completed Tasks"
msgstr "å·²å®?æ??ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
msgid "Next 7 Days' Tasks"
msgstr "ä¸?ä¸?å?¨ç??ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
msgid "Overdue Tasks"
msgstr "延æ??ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
msgid "Tasks with Attachments"
msgstr "æ??é??件ç??ä»»å?¡"
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
msgid "Print the list of tasks"
msgstr "æ??å?°ä»»å?¡å??表"
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
#, fuzzy
msgid "Preview the list of tasks to be printed"
msgstr "é¢?è§?è¦?æ??å?°ç??ä»»å?¡å??表"
@@ -15458,413 +15015,377 @@ 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
+#: ../modules/mail/e-mail-attachment-handler.c:333
#, c-format
msgid "%d attached messages"
msgstr "%d 个é??å? ç??ä¿¡æ?¯"
#. Translators: "None" for a junk hook name,
#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
#, fuzzy
-#| msgid "None"
msgctxt "mail-junk-hook"
msgid "None"
msgstr "æ? "
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:169
msgctxt "New"
msgid "_Mail Message"
-msgstr "信件(_M)"
+msgstr "ä¿¡æ?¯(_M)"
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:171
msgid "Compose a new mail message"
msgstr "æ?°å??ä¸?å°?æ?°ä¿¡"
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:179
msgctxt "New"
msgid "Mail _Folder"
msgstr "é?®ä»¶æ??件夹(_F)"
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:181
msgid "Create a new mail folder"
msgstr "å??建æ?°é?®ä»¶æ??件夹"
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:200
msgid "Mail Accounts"
-msgstr "�件账�"
+msgstr "�件��"
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:208
msgid "Mail Preferences"
msgstr "é?®ä»¶é¦?é??项"
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:216
msgid "Composer Preferences"
msgstr "ç¼?å??å?¨é¦?é??项"
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:224
msgid "Network Preferences"
msgstr "ç½?ç»?é¦?é??项"
-#: ../modules/mail/e-mail-shell-content.c:679
-#, fuzzy
-#| msgid "_Group By Threads"
-msgid "Group by Threads"
-msgstr "æ??线索å??ç»?(_G)"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr ""
-
-#: ../modules/mail/e-mail-shell-view-actions.c:859
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view.c:871
msgid "_Disable Account"
-msgstr "��账�(_D)"
+msgstr "����(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:861
+#: ../modules/mail/e-mail-shell-view-actions.c:822
msgid "Disable this account"
-msgstr "���个账�"
+msgstr "���个��"
-#: ../modules/mail/e-mail-shell-view-actions.c:868
+#: ../modules/mail/e-mail-shell-view-actions.c:829
#, fuzzy
msgid "Permanently remove all the deleted messages from all folders"
-msgstr "æ°¸ä¹?å? é?¤æ??æ??æ??件夹ä¸ç??æ??æ??å·²å? é?¤ç??信件"
+msgstr "æ°¸ä¹?å? é?¤æ??æ??æ??件夹ä¸ç??æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
-#: ../modules/mail/e-mail-shell-view-actions.c:873
+#: ../modules/mail/e-mail-shell-view-actions.c:834
msgid "C_reate Search Folder From Search..."
msgstr "ä»?头å??建æ??ç´¢æ??件夹(_R)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view-actions.c:841
msgid "_Download Messages for Offline Usage"
-msgstr "�载信件以离线使�(_D)"
+msgstr "�载信�以离线使�(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:843
#, fuzzy
msgid "Download messages of accounts and folders marked for offline usage"
-msgstr "为æ ?记为è?±æ?ºç??å¸?æ?·/æ??件夹ä¸?载信件"
+msgstr "为æ ?记为è?±æ?ºç??å¸?æ?·/æ??件夹ä¸?载信æ?¯"
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../modules/mail/e-mail-shell-view-actions.c:848
msgid "Fl_ush Outbox"
msgstr "æ¸?空å??件箱(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:855
msgid "_Copy Folder To..."
msgstr "æ??件夹å¤?å?¶å?°(_C)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:896
+#: ../modules/mail/e-mail-shell-view-actions.c:857
msgid "Copy the selected folder into another folder"
msgstr "æ??é??ä¸ç??æ??件夹å¤?å?¶å?°å?¶å®?æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:864
msgid "Permanently remove this folder"
msgstr "æ°¸ä¹?å? é?¤æ¤æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:869
msgid "E_xpunge"
msgstr "é??æ¯?(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:910
+#: ../modules/mail/e-mail-shell-view-actions.c:871
msgid "Permanently remove all deleted messages from this folder"
-msgstr "ä»?该æ??件夹永ä¹?å? é?¤æ??æ??å·²å? é?¤ç??信件"
+msgstr "ä»?该æ??件夹永ä¹?å? é?¤æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:876
msgid "Mar_k All Messages as Read"
-msgstr "æ??å?¨é?¨ä¿¡ä»¶æ ?记为已读(_K)"
+msgstr "æ??å?¨é?¨ä¿¡æ?¯æ ?记为已读(_K)"
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:878
msgid "Mark all messages in the folder as read"
-msgstr "å°?æ¤æ??件夹ä¸ç??æ??æ??信件æ ?记为已读"
+msgstr "å°?æ¤æ??件夹ä¸ç??æ??æ??ä¿¡æ?¯æ ?记为已读"
-#: ../modules/mail/e-mail-shell-view-actions.c:922
+#: ../modules/mail/e-mail-shell-view-actions.c:883
msgid "_Move Folder To..."
msgstr "æ??件夹移è?³(_M)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:885
msgid "Move the selected folder into another folder"
msgstr "æ??é??ä¸ç??æ??件夹移è?³å?¶å®?æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:890
msgid "_New..."
msgstr "�建(_N)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:892
msgid "Create a new folder for storing mail"
msgstr "å??建å?å?¨é?®ä»¶ç??æ?°æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:899
msgid "Change the properties of this folder"
msgstr "æ?´æ?¹æ¤æ??件夹ç??å±?æ?§"
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:906
msgid "Refresh the folder"
msgstr "å?·æ?°æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:913
msgid "Change the name of this folder"
msgstr "æ?´æ?¹æ¤æ??件夹ç??å??称"
-#: ../modules/mail/e-mail-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:918
msgid "Select Message _Thread"
-msgstr "é??æ?©ä¿¡ä»¶çº¿ç´¢(_T)"
+msgstr "é??æ?©ä¿¡æ?¯çº¿ç´¢(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:920
msgid "Select all messages in the same thread as the selected message"
-msgstr "æ??å??ä¸?线索ä¸ç??æ??æ??信件é??æ?©ä¸ºé??ä¸ä¿¡ä»¶"
+msgstr "æ??å??ä¸?线索ä¸ç??æ??æ??ä¿¡æ?¯é??æ?©ä¸ºé??ä¸ä¿¡æ?¯"
-#: ../modules/mail/e-mail-shell-view-actions.c:964
+#: ../modules/mail/e-mail-shell-view-actions.c:925
msgid "Select Message S_ubthread"
-msgstr "é??æ?©ä¿¡ä»¶å?线索(_U)"
+msgstr "é??æ?©ä¿¡æ?¯å?线索(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:927
msgid "Select all replies to the currently selected message"
-msgstr "é??æ?©å½?å??é??ä¸ä¿¡ä»¶ç??æ??æ??å??å¤?"
+msgstr "é??æ?©å½?å??é??ä¸ä¿¡æ?¯ç??æ??æ??å??å¤?"
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:932
msgid "_Unsubscribe"
msgstr "é??订(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:934
#, fuzzy
msgid "Unsubscribe from the selected folder"
msgstr "é??å?½å??é??ä¸æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:939
msgid "Empty _Trash"
msgstr "æ¸?空å??æ?¶ç«?(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:941
#, fuzzy
msgid "Permanently remove all the deleted messages from all accounts"
-msgstr "æ°¸ä¹?å? é?¤æ??æ??æ??件夹ä¸ç??æ??æ??å·²å? é?¤ç??信件"
+msgstr "æ°¸ä¹?å? é?¤æ??æ??æ??件夹ä¸ç??æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:946
msgid "_New Label"
msgstr "æ?°å»ºæ ?ç¾(_N)"
-#: ../modules/mail/e-mail-shell-view-actions.c:994
+#: ../modules/mail/e-mail-shell-view-actions.c:955
msgid "N_one"
msgstr "æ? (_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
-msgid "Hide _Read Messages"
-msgstr "é??è??已读ç??信件(_R)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1003
-msgid "Temporarily hide all messages that have already been read"
-msgstr "æ??æ?¶é??è??æ??æ??已读信件"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1008
-msgid "Hide S_elected Messages"
-msgstr "é??è??é??ä¸ç??信件(_E)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1010
-msgid "Temporarily hide the selected messages"
-msgstr "æ??æ?¶é??è??é??ä¸ä¿¡ä»¶"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
-msgid "Show Hidde_n Messages"
-msgstr "æ?¾ç¤ºé??è??ç??信件(_N)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1017
-msgid "Show messages that have been temporarily hidden"
-msgstr "æ?¾ç¤ºæ??æ?¶è¢«é??è??ç??信件"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:978
msgid "Cancel the current mail operation"
msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:983
msgid "Collapse All _Threads"
msgstr "æ??å? å?¨é?¨çº¿ç´¢(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:985
msgid "Collapse all message threads"
-msgstr "æ??å? å?¨é?¨ä¿¡ä»¶çº¿ç´¢"
+msgstr "æ??å? å?¨é?¨ä¿¡æ?¯çº¿ç´¢"
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:990
msgid "E_xpand All Threads"
msgstr "����线索(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:992
msgid "Expand all message threads"
-msgstr "����信件线索"
+msgstr "����信�线索"
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:997
msgid "_Message Filters"
-msgstr "信件�滤(_M)"
+msgstr "信��滤(_M)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:999
msgid "Create or edit rules for filtering new mail"
msgstr "å??建æ??ç¼?è¾?è¿?滤æ?°é?®ä»¶ç??è§?å??"
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
msgid "Search F_olders"
msgstr "æ??ç´¢æ??件夹(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
#, fuzzy
msgid "Create or edit search folder definitions"
msgstr "å??建æ??ç¼?è¾?æ??ç´¢æ??件夹å®?ä¹?"
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
msgid "_Subscriptions..."
msgstr "订é??(_S)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订é??æ??é??订è¿?ç¨?æ??å?¡å?¨ä¸?ç??æ??件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
msgid "F_older"
msgstr "æ??件夹(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
msgid "_Label"
msgstr "æ ?ç¾(_L)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
msgid "_New Folder..."
msgstr "æ?°å»ºæ??件夹(_N)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
-msgid "Hide _Deleted Messages"
-msgstr "é??è??å·²å? é?¤ç??信件(_D)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "é??è??å·²å? é?¤ç??信件è??ä¸?æ?¯å?¨ä¸?é?¢æ?¾ç¤ºä¸?æ?¡çº¿"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
msgid "Show Message _Preview"
-msgstr "�示信件��(_P)"
+msgstr "�示信���(_P)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
#, fuzzy
msgid "Show message preview pane"
-msgstr "�示信件����"
+msgstr "�示信�����"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#, fuzzy
+msgid "Show _Deleted Messages"
+msgstr "æ?¾ç¤ºå? é?¤ç??ä¿¡æ?¯"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#, fuzzy
+msgid "Show deleted messages with a line through them"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯(带æ??å? é?¤çº¿)ã??"
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
msgid "_Group By Threads"
msgstr "æ??线索å??ç»?(_G)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
#, fuzzy
msgid "Threaded message list"
-msgstr "æ??线索ç¼?æ??ç??信件å??表"
+msgstr "æ??线索ç¼?æ??ç??ä¿¡æ?¯å??表"
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
msgid "Show message preview below the message list"
-msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸?æ?¹æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
#, fuzzy
msgid "Show message preview alongside the message list"
-msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸?æ?¹æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
msgid "All Messages"
-msgstr "��信件"
+msgstr "��信�"
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
msgid "Important Messages"
-msgstr "é??è¦?信件"
+msgstr "é??è¦?ä¿¡æ?¯"
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
msgid "Last 5 Days' Messages"
-msgstr "å??äº?天ç??信件"
+msgstr "å??äº?天ç??ä¿¡æ?¯"
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
msgid "Messages Not Junk"
msgstr "ä¸?æ?¯å??å?¾é?®ä»¶"
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
msgid "Messages with Attachments"
-msgstr "æ??é??件ç??信件"
+msgstr "æ??é??件ç??ä¿¡æ?¯"
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
msgid "No Label"
msgstr "æ? æ ?ç¾"
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
msgid "Read Messages"
-msgstr "已读信件"
+msgstr "已读信�"
-#: ../modules/mail/e-mail-shell-view-actions.c:1255
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
msgid "Recent Messages"
-msgstr "æ??è¿?信件"
+msgstr "æ??è¿?ä¿¡æ?¯"
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
msgid "Unread Messages"
-msgstr "�读信件"
+msgstr "�读信�"
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
#, fuzzy
msgid "Subject or Addresses contain"
msgstr "主é¢?æ??å??é??è??å?«æ??"
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
msgid "All Accounts"
-msgstr "��账�"
+msgstr "����"
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
msgid "Current Account"
-msgstr "å½?å??è´¦æ?·"
+msgstr "å½?å??å¸?å?·"
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
msgid "Current Folder"
msgstr "å½?å??æ??件夹"
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:887
#, c-format
msgid "%d selected, "
msgid_plural "%d selected, "
msgstr[0] "å·²é??ä¸ %d 个ï¼?"
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:898
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d å°?å·²å? é?¤"
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:904
+#: ../modules/mail/e-mail-shell-view-private.c:911
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d å°?å??å?¾"
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:917
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d å°?è??稿"
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:923
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d å°?æ?ªå??"
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:929
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d å°?å·²å??"
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:941
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] "�%d ��读�"
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:944
#, c-format
msgid "%d total"
msgid_plural "%d total"
@@ -15872,94 +15393,114 @@ msgstr[0] "�� %d �"
#: ../modules/mail/e-mail-shell-view.c:548
msgid "All Account Search"
-msgstr "å?¨é?¨è´¦æ?·æ??ç´¢"
+msgstr "å?¨é?¨å¸?å?·æ??ç´¢"
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:675
msgid "Account Search"
-msgstr "è´¦æ?·æ??ç´¢"
+msgstr "å¸?å?·æ??ç´¢"
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:869
msgid "Proxy _Logout"
msgstr "代ç??æ??å?¡å?¨æ³¨é??(_L)"
+#: ../modules/mail/em-account-prefs.c:129
+msgid "Evolution Account Assistant"
+msgstr "Evolution å¸?å?·å?©æ??"
+
+#: ../modules/mail/em-account-prefs.c:178
+msgid "Account Editor"
+msgstr "�����"
+
#: ../modules/mail/em-composer-prefs.c:473
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "已��"
+
+#: ../modules/mail/em-composer-prefs.c:477
msgid "Language(s)"
msgstr "è¯è¨?"
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:97
msgid "Every time"
msgstr "�次"
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:98
msgid "Once per day"
msgstr "�天�次"
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:99
msgid "Once per week"
msgstr "���次"
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:100
msgid "Once per month"
msgstr "æ¯?æ??ä¸?次"
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:225
msgid "Add Custom Junk Header"
msgstr "æ·»å? è?ªå®?ä¹?å??å?¾ä¿¡å¤´"
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:233
msgid "Header Name:"
msgstr "信头å??称ï¼?"
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:234
msgid "Header Value Contains:"
msgstr "信头å?¼å?«æ??ï¼?"
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:334
msgid "Header"
msgstr "页ç??"
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:338
msgid "Contains Value"
msgstr "å??å?«å?¼"
#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
#, 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:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
#, c-format
msgid ""
"%s plugin is not available. Please check whether the package is installed."
msgstr "%s æ??件ä¸?å?¯ç?¨ã??请æ£?æ?¥è½¯ä»¶å??æ?¯å?¦å·²å®?è£?ã??"
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:775
#, 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 "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
+#: ../modules/mail/em-mailer-prefs.c:1167
#, fuzzy
msgid "_Date header:"
msgstr "表头"
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1168
#, fuzzy
msgid "Show _original header value"
msgstr "æ?¾ç¤ºå??å§?大å°?(_O)"
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "�� Evolution ����认�件��"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "æ¯?次å?¯å?¨ Evolution ç??æ?¶å??ï¼?æ£?æ?¥å®?æ?¯å?¦æ?¯é»?认é?®ä»¶ç¨?åº?ã??"
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#, fuzzy
+msgid "Do you want to make Evolution your default email client?"
+msgstr "æ?¨æ?¯å?¦æ?³è¦?å°? Evolution 设置为æ?¨ç??é»?认ç?µå?é?®ä»¶å®¢æ?·ç«¯ï¼?"
+
#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
msgid "Hello Python"
msgstr "ä½ å¥½ Python"
@@ -15976,6 +15517,51 @@ msgstr "Python æµ?è¯?æ??件"
msgid "Test Plugin for Python EPlugin loader."
msgstr "Python Eplugin å? è½½å?¨æµ?è¯?æ??件ã??"
+#: ../modules/startup-wizard/evolution-startup-wizard.c:270
+#: ../widgets/misc/e-import-assistant.c:389
+msgid "Please select the information that you would like to import:"
+msgstr "请é??æ?©æ?¨å¸?æ??导å?¥ç??ä¿¡æ?¯ï¼?"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:302
+#: ../widgets/misc/e-import-assistant.c:545
+#, c-format
+msgid "From %s:"
+msgstr "ä»? %sï¼?"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+#, fuzzy
+msgid "Importing Files"
+msgstr "导å?¥æ??件"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr ""
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr ""
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+msgid "Evolution Setup Assistant"
+msgstr "Evolution 设置å?©æ??"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+msgid "Welcome"
+msgstr "欢�"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"欢è¿?使ç?¨ Evolutionã??ä¸?é?¢å? å±?å°?å??许 Evolution è¿?æ?¥å?°æ?¨ç??ç?µå?é?®ä»¶å¸?å?·ï¼?并ä»?å?¶å®?"
+"åº?ç?¨ç¨?åº?ä¸å¯¼å?¥æ??件ã??\n"
+"\n"
+"请å??å?»â??å??è¿?â??æ??é?®ç»§ç»ã??"
+
#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
#, fuzzy
msgid "Add local address books to Evolution."
@@ -15991,14 +15577,8 @@ msgid ""
"body"
msgstr "æ¶?æ?¯ä¸»ä½?ä¸ç??ç?¨äº?é??件æ??é??æ??件ç??线索å??表"
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "æ¶?æ?¯ä¸»ä½?ä¸ç??ç?¨äº?é??件æ??é??æ??件ç??线索å??表ã??"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
+#: ../plugins/templates/templates.c:409
msgid "Keywords"
msgstr "å?³é?®å?"
@@ -16006,11 +15586,11 @@ msgstr "å?³é?®å?"
msgid ""
"Evolution has found some keywords that suggest that this message should "
"contain an attachment, but cannot find one."
-msgstr "Evolution æ?¾å?°ä¸?äº?å?³é?®å?表æ??æ¤ä¿¡ä»¶åº?å½?å??å?«é??件ï¼?ä½?å?´æ²¡å??ç?°é??件ã??"
+msgstr "Evolution æ?¾å?°ä¸?äº?å?³é?®å?表æ??æ¤ä¿¡æ?¯åº?å½?å??å?«é??件ï¼?ä½?å?´æ²¡å??ç?°é??件ã??"
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
msgid "Message has no attachments"
-msgstr "信件æ? é??件"
+msgstr "ä¿¡æ?¯æ? é??件"
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
msgid "_Add attachment..."
@@ -16018,7 +15598,7 @@ msgstr "æ·»å? é??件(_A)..."
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
msgid "_Edit Message"
-msgstr "��信件(_E)"
+msgstr "ç¼?è¾?ä¿¡æ?¯(_E)"
#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
msgid "Attachment Reminder"
@@ -16037,23 +15617,23 @@ msgstr "åµ?å?¥"
msgid "Play audio attachments directly in mail messages."
msgstr ""
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
msgid "Select name of the Evolution backup file"
msgstr "é??æ?© Evolution å¤?份æ??件å??称"
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
msgid "_Restart Evolution after backup"
msgstr "å¤?份å??é??æ?°å?¯å?¨ Evolution(_R)"
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
msgid "Select name of the Evolution backup file to restore"
msgstr "é??æ?©è¦?æ?¢å¤?ç?? Evolution å¤?份æ??件å??称"
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
msgid "_Restart Evolution after restore"
msgstr "æ?¢å¤?å??é??æ?°å?¯å?¨ Evolution(_R)"
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
#, fuzzy
msgid ""
"You can restore Evolution from your backup. It can restore all the Mails, "
@@ -16064,36 +15644,38 @@ msgstr ""
"人ã??\n"
"å®?è¿?è?½æ?¢å¤?æ?¨ç??æ??æ??ç??个人设置å??é?®ä»¶è¿?滤å?¨ç?ã??"
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
msgid "_Restore Evolution from the backup file"
msgstr "ä»?å¤?份æ??件ä¸æ?¢å¤? Evolution(_R)"
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
msgid "Please select an Evolution Archive to restore:"
msgstr "é??æ?©è¦?æ?¢å¤?ç?? Evolution å?æ¡£ï¼?"
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
msgid "Choose a file to restore"
msgstr "é??æ?©è¦?æ?¢å¤?ç??æ??件"
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
msgid "Restore from backup"
msgstr "ä»?å¤?份ä¸æ?¢å¤?"
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
+#: ../plugins/backup-restore/backup-restore.c:361
+#, fuzzy
+msgid "_Backup Evolution Settings..."
msgstr "�份设置(_B)..."
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
#, fuzzy
msgid "Backup Evolution data and settings to an archive file"
msgstr "å¤?份å??æ?¢å¤? Evolution ç??æ?°æ?®å??设置"
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
+#: ../plugins/backup-restore/backup-restore.c:368
+#, fuzzy
+msgid "R_estore Evolution Settings..."
msgstr "��设置(_E)..."
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
#, fuzzy
msgid "Restore Evolution data and settings from an archive file"
msgstr "å¤?份å??æ?¢å¤? Evolution ç??æ?°æ?®å??设置"
@@ -16125,7 +15707,7 @@ msgstr "å?³é? Evolution"
#: ../plugins/backup-restore/backup.c:196
msgid "Backing Evolution accounts and settings"
-msgstr "å¤?份 Evolution ç??è´¦æ?·å??设置"
+msgstr "å¤?份 Evolution ç??å¸?å?·å??设置"
#: ../plugins/backup-restore/backup.c:202
msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
@@ -16142,7 +15724,8 @@ msgid "Restarting Evolution"
msgstr "é??æ?°å?¯å?¨ Evolution"
#: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+#, fuzzy
+msgid "Back up current Evolution data"
msgstr "å¤?份å½?å?? Evolution æ?°æ?®"
#: ../plugins/backup-restore/backup.c:260
@@ -16151,7 +15734,7 @@ msgstr "ä»?å¤?份ä¸æ??å??æ??件"
#: ../plugins/backup-restore/backup.c:267
msgid "Loading Evolution settings"
-msgstr "è£?å?¥ Evolution ç??设置"
+msgstr "è½½å?¥ Evolution ç??设置"
#: ../plugins/backup-restore/backup.c:274
msgid "Removing temporary backup files"
@@ -16172,31 +15755,31 @@ msgid "Restoring from the folder %s"
msgstr "æ£å?¨ä»?æ??件夹 %s ä¸æ?¢å¤?"
#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
msgid "Evolution Backup"
msgstr "Evolution �份"
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
msgid "Evolution Restore"
msgstr "Evolution ��"
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
msgid "Backing up Evolution Data"
msgstr "æ£å?¨å¤?份 Evolution æ?°æ?®"
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
msgid "Please wait while Evolution is backing up your data."
msgstr "请ç¨?å??ï¼?Evolution æ£å?¨å¤?份æ?¨ç??æ?°æ?®ã??"
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
msgid "Restoring Evolution Data"
msgstr "æ£å?¨æ?¢å¤? Evolution æ?°æ?®"
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
msgid "Please wait while Evolution is restoring your data."
msgstr "请ç¨?å??ï¼?Evolution æ£å?¨æ?¢å¤?æ?¨ç??æ?°æ?®ã??"
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
msgid "This may take a while depending on the amount of data in your account."
msgstr "è¿?å?¯è?½è¦?è?±ä¸?ç?¹æ?¶é?´ï¼?å??å?³äº?æ?¨å¸?æ?·ä¸ç??æ?°æ?®æ?»é??ã??"
@@ -16257,36 +15840,37 @@ msgstr ""
"å¤?å?ªè?½å?¨ Evolution æ?ªè¿?è¡?æ?¶å?¯å?¨ã??请确ä¿?å?¨å¼?å§?ä¹?å??æ?¨ä¿?å?å??å?³é?äº?æ?¨ç??æ??æ??ç??æ?ªä¿?"
"å?ç??çª?å?£ã??å¦?æ??æ?¨æ?³è®© Evolution å?¨æ?¢å¤?å??è?ªå?¨é??å?¯å?¨ï¼?请å?¯ç?¨å??æ?¢æ??é?®ã??"
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "è?ªå?¨è??系人"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
#, fuzzy
msgid "Create _address book entries when sending mails"
msgstr "å??å¤?é?®ä»¶æ?¶è?ªå?¨å?¨å?°å??ç°¿ä¸å??建è??系人项(_A)"
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
msgid "Select Address book for Automatic Contacts"
msgstr "é??æ?©è?ªå?¨è??系人ç??å?°å??ç°¿"
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
msgid "Instant Messaging Contacts"
msgstr "å?³æ?¶é??讯è??系人"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+#, fuzzy
+msgid "_Synchronize contact info and images from Pidgin buddy list"
msgstr "å®?æ?¶ä»? Pidgin 好å??å??表ä¸å??æ¥è??系人信æ?¯å??å?¾å??"
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
msgid "Select Address book for Pidgin buddy list"
msgstr "é??æ?© Pidgin 好å??å??表ç??å?°å??ç°¿"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
msgid "Synchronize with _buddy list now"
msgstr "ç«?å?³å??æ¥å¥½å??å??表(_B)"
@@ -16306,35 +15890,35 @@ msgstr ""
"å?¨æ?¨å??å¤?é?®ä»¶æ?¶è?ªå?¨ç?¨å§?å??å??ç?µå?é?®ä»¶å?°å??å¡«å?¥æ?¨ç??å?°å??ç°¿ã??å??æ?¶è¿?å°?å¡«å?¥æ?¨å¥½å??å??表"
"ç??å?³æ?¶é??讯è??系信æ?¯ã??"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
#, c-format
msgid "Bogofilter is not available. Please install it first."
msgstr ""
#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
#, fuzzy, c-format
msgid "Error occurred while spawning %s: %s."
msgstr "æ??å?°æ?¶å??ç??äº?é??误"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
#, c-format
msgid "Bogofilter child process does not respond, killing..."
msgstr ""
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
#, c-format
msgid "Wait for Bogofilter child process interrupted, terminating..."
msgstr ""
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
#, c-format
msgid "Pipe to Bogofilter failed, error code: %d."
msgstr ""
#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
msgid "Convert message text to _Unicode"
-msgstr "å°?信件æ??æ?¬è½¬æ?¢ä¸º _Unicode"
+msgstr "å°?ä¿¡æ?¯æ??æ?¬è½¬æ?¢ä¸º _Unicode"
#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
msgid "Convert mail messages to Unicode"
@@ -16345,7 +15929,7 @@ msgid ""
"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
"different character sets."
msgstr ""
-"å°?信件æ??æ?¬è½¬æ?¢å?° Unicode UTF-8 以ä¸?è?´å??æ?¥è?ªäº?ä¸?å??å?符é??ç??å??å?¾ä¿¡ä»¶ç?¹å¾?ã??"
+"å°?ä¿¡æ?¯æ??æ?¬è½¬æ?¢å?° Unicode UTF-8 以ä¸?è?´å??æ?¥è?ªäº?ä¸?å??å?符é??ç??å??å?¾ä¿¡æ?¯ç?¹å¾?ã??"
#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
msgid "Bogofilter Junk Filter"
@@ -16358,69 +15942,56 @@ msgstr "Bogofilter é??项"
#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
#, fuzzy
msgid "Filter junk messages using Bogofilter."
-msgstr "使ç?¨ Bogofilter è¿?滤å??å?¾ä¿¡ä»¶ã??"
+msgstr "使ç?¨ Bogofilter è¿?滤å??å?¾ä¿¡æ?¯ã??"
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
msgid "Authentication failed. Server requires correct login."
msgstr ""
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
msgid "Given URL cannot be found."
msgstr ""
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
#, 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
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
msgid "Failed to parse server response."
msgstr ""
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
#, fuzzy
-#| msgid "Ends"
msgid "Events"
msgstr "ç»?æ??"
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
#, fuzzy
-#| msgid "New calendar"
msgid "User's calendars"
msgstr "æ?°å»ºæ?¥å??"
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
#, 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
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
#, fuzzy
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Searching for the Contacts..."
msgid "Searching for user's calendars..."
msgstr ""
"\n"
"\n"
"æ£å?¨æ??ç´¢è??系人..."
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
#, fuzzy
-#| msgid "Unable to find any calendars"
msgid "Could not find any user calendar."
msgstr "æ? æ³?æ?¾å?°ä»»ä½?æ?¥å??"
@@ -16434,85 +16005,71 @@ msgstr ""
msgid "Previous attempt failed with code %d"
msgstr ""
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgid "Enter password for user %s on server %s"
msgstr "è¾?å?¥ %s ç??å¯?ç ?(ç?¨æ?· %s)"
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
#, 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
+#: ../plugins/caldav/caldav-browse-server.c:1095
#, fuzzy
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Searching for the Contacts..."
msgid "Searching folder content..."
msgstr ""
"\n"
"\n"
"æ£å?¨æ??ç´¢è??系人..."
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
#, fuzzy
-#| msgid "Loading calendars"
msgid "List of available calendars:"
-msgstr "è£?å?¥æ?¥å??"
+msgstr "è½½å?¥æ?¥å??"
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
#, fuzzy
-#| msgid "Hula Support"
msgid "Supports"
msgstr "Hula æ?¯æ??"
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
#, fuzzy, c-format
msgid "Failed to create thread: %s"
msgstr "å??建æ?¬å?°é?®ä»¶å?å?¨â??%sâ??失败ï¼?%s"
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
#, c-format
msgid "Server URL '%s' is not a valid URL"
msgstr ""
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
msgid "Browse for a CalDAV calendar"
msgstr ""
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
msgid "_URL:"
msgstr "_URLï¼?"
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
msgid "Use _SSL"
msgstr "使� _SSL"
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
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:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
msgid "Re_fresh:"
msgstr "å?·æ?°(_F)ï¼?"
@@ -16525,35 +16082,35 @@ msgstr ""
msgid "CalDAV Support"
msgstr "CalDAV �"
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
#, fuzzy
msgid "_Customize options"
msgstr "���"
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
msgid "File _name:"
msgstr "æ??件å??(_N)ï¼?"
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
#, fuzzy
msgid "Choose calendar file"
msgstr "é??æ?©æ??件"
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
#, fuzzy
msgid "On open"
msgstr "æ??å¼?"
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
msgid "On file change"
msgstr "å?¨æ??件æ?¹å??æ?¶"
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
#, fuzzy
msgid "Periodically"
msgstr "个人"
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
msgid "Force read _only"
msgstr "强��读(_O)"
@@ -16563,13 +16120,13 @@ msgstr "æ·»å? æ?¬å?°æ?¥å??å?° Evolutionã??"
#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
msgid "Local Calendars"
-msgstr "è£?å?¥æ?¥å??"
+msgstr "è½½å?¥æ?¥å??"
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
msgid "_Secure connection"
msgstr "����(_S)"
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
msgid "Userna_me:"
msgstr "ç?¨æ?·å??(_M)ï¼?"
@@ -16617,28 +16174,27 @@ msgstr "天�� ���"
msgid "Weather: Thunderstorms"
msgstr "天�����"
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
msgid "Select a location"
msgstr "é??æ?©ä¸?个ä½?ç½®"
#. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
#, fuzzy
-#| msgid "None"
msgctxt "weather-cal-location"
msgid "None"
msgstr "æ? "
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
msgid "_Units:"
msgstr "å??ä½?(_U)ï¼?"
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
msgid "Metric (Celsius, cm, etc)"
msgstr "å?¬å?¶(æ??æ°?ã??å??ç±³ç?ç?)"
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
msgid "Imperial (Fahrenheit, inches, etc)"
msgstr "è?±å?¶(å??æ°?ã??è?±å¯¸ç?ç?)"
@@ -16659,7 +16215,7 @@ msgstr "è??系人ï¼?"
#: ../plugins/contacts-map/contacts-map.c:56
#, fuzzy
msgid "Show a map of all the contacts"
-msgstr "å?¨ä¿¡ä»¶å??表ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+msgstr "å?¨ä¿¡æ?¯å??表ä¸?æ?¹æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
msgid "Add a map showing the location of contacts when possible."
@@ -16670,45 +16226,49 @@ msgstr ""
msgid "Map for contacts"
msgstr "æ? è??系人"
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "�� Evolution ����认�件��"
+#: ../plugins/dbx-import/dbx-importer.c:232
+#, fuzzy
+msgid "Select folder to import OE folder into"
+msgstr "é??æ?©è¦?导å?¥å?°å?ªä¸ªæ??件夹"
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "æ¯?次å?¯å?¨ Evolution ç??æ?¶å??ï¼?æ£?æ?¥å®?æ?¯å?¦æ?¯é»?认é?®ä»¶ç¨?åº?ã??"
+#: ../plugins/dbx-import/dbx-importer.c:251
+#, fuzzy
+msgid "Importing Outlook Express data"
+msgstr "导� Outlook ��"
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "å?¨å?¯å?¨æ?¶æ£?æ?¥ Evolution æ?¯ä¸?æ?¯é»?认ç??é?®ä»¶å®¢æ?·ç«¯ã??"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook Express messages from DBX file"
+msgstr "ä»? PST æ??件ä¸å¯¼å?¥ Outlook é?®ä»¶"
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "�认�件客�端"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook DBX import"
+msgstr "Outlook PST 导�"
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "æ?¨æ?¯å?¦æ?³è¦?å°? Evolution 设置为æ?¨ç??é»?认ç?µå?é?®ä»¶å®¢æ?·ç«¯ï¼?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#, fuzzy
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Outlook 个人æ??件夹(.pst)"
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
msgid "Mark as _default address book"
msgstr "æ ?为é»?认å?°å??ç°¿(_D)"
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
#, fuzzy
msgid "A_utocomplete with this address book"
msgstr "å?¨å?°å??ç°¿ä¸æ?¥é??"
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
msgid "Mark as _default calendar"
msgstr "æ ?为é»?认æ?¥å??(_D)"
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
msgid "Mark as _default task list"
msgstr "æ ?为é»?认任å?¡å??表(_D)"
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
msgid "Mark as _default memo list"
msgstr "æ ?为é»?认å¤?å¿?å??表(_D)"
@@ -16756,28 +16316,27 @@ msgstr "��"
#. 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
+#: ../plugins/email-custom-header/email-custom-header.c:571
msgid "_Custom Header"
msgstr "���信头(_C)"
#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:830
msgid ""
"The format for specifying a Custom Header key value is:\n"
"Name of the Custom Header key values separated by \";\"."
msgstr ""
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:884
msgid "Key"
msgstr "é?®"
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:900
+#: ../plugins/templates/templates.c:415
msgid "Values"
msgstr "å?¼"
@@ -16799,7 +16358,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
msgstr ""
#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
msgid "Automatically launch when a new mail is edited"
msgstr ""
@@ -16811,11 +16370,11 @@ msgstr "�认�����"
msgid "The default command that must be used as the editor."
msgstr "é»?认å?½ä»¤å¿?é¡»ç?¨ä½?ç¼?è¾?å?¨ã??"
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
msgid "Command to be executed to launch the editor: "
msgstr "è°?ç?¨ç¼?è¾?å?¨è¦?æ?§è¡?ç??å?½ä»¤ï¼?"
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
msgid ""
"For Emacs use \"xemacs\"\n"
"For VI use \"gvim -f\""
@@ -16823,8 +16382,8 @@ msgstr ""
"Emacs åº?使ç?¨â??xemacsâ??\n"
"VI åº?使ç?¨â??gvim -fâ??"
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
msgid "Compose in External Editor"
msgstr "å?¨å¤?é?¨ç¼?è¾?å?¨ä¸å??ä½?"
@@ -16835,7 +16394,7 @@ msgstr "�����"
#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
#, fuzzy
msgid "Use an external editor to compose plain-text mail messages."
-msgstr "ä¸?个使ç?¨å¤?é?¨ç¼?è¾?å?¨ä½?为æ?°å??å?¨ç??æ??件ã??æ?¨å?ªè?½å??é??纯æ??æ?¬ä¿¡ä»¶ã??"
+msgstr "ä¸?个使ç?¨å¤?é?¨ç¼?è¾?å?¨ä½?为æ?°å??å?¨ç??æ??件ã??æ?¨å?ªè?½å??é??纯æ??æ?¬ä¿¡æ?¯ã??"
#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
msgid "Cannot create Temporary File"
@@ -16894,7 +16453,7 @@ msgstr ""
msgid "Load new _Face picture"
msgstr ""
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
#, fuzzy
msgid "Include _Face"
msgstr "å??å?«ï¼?"
@@ -16930,22 +16489,18 @@ msgstr "è¿?个æ??件ä¸?è?½è¢«è¯»å??"
msgid "The file you selected does not look like a valid .png image. Error: {0}"
msgstr ""
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>æ??å?¡å?¨</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#, fuzzy
+msgid "Server"
+msgstr "æ??å?¡å?¨(_S)ï¼?"
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
#, c-format
msgid "Enter password for user %s to access list of subscribed calendars."
msgstr "è¾?å?¥ç?¨æ?· %s ç??å¯?ç ?以便访é?®å·²è®¢é??æ?¥å??ç??å??表ã??"
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
#, c-format
msgid ""
"Cannot read data from Google server.\n"
@@ -16954,18 +16509,19 @@ msgstr ""
"æ? æ³?ä»? Google æ??å?¡å?¨ä¸?读å??æ?°æ?®ã??\n"
"%s"
-#: ../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:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
msgid "Unknown error."
msgstr "æ?ªç?¥é??误ã??"
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
msgid "Cal_endar:"
msgstr "æ?¥å??(_E)ï¼?"
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+#, fuzzy
+msgid "Retrieve _List"
msgstr "è?·å??å??表(_L)"
#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -16976,7 +16532,7 @@ msgstr ""
msgid "Google Calendars"
msgstr "Google æ?¥å??"
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
msgid "Checklist"
msgstr "å¾?å??æ¸?å??"
@@ -16994,7 +16550,7 @@ msgstr "å??å?¾é?®ä»¶è®¾ç½®..."
#: ../plugins/groupwise-features/gw-ui.c:177
msgid "Track Message Status..."
-msgstr "è·?踪信件ç?¶æ??..."
+msgstr "è·?踪信æ?¯ç?¶æ??..."
#: ../plugins/groupwise-features/gw-ui.c:183
msgid "Retract Mail"
@@ -17008,12 +16564,12 @@ msgstr "æ??æ?¶æ?¥å??"
msgid "Rese_nd Meeting..."
msgstr "é??æ?°å??é??ä¼?è®®(_N)..."
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
msgid "Create folder"
msgstr "å??建æ??件夹"
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:217
#, fuzzy, c-format
msgid ""
"The user '%s' has shared a folder with you\n"
@@ -17038,19 +16594,19 @@ msgstr ""
"å??å?»â??å??è¿?â??å?¯å®?è£?å?±äº«æ??件夹\n"
"\n"
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:229
msgid "Install the shared folder"
msgstr "å®?è£?å?±äº«æ??件夹"
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:233
msgid "Shared Folder Installation"
msgstr "å?±äº«æ??件夹å®?è£?"
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
msgid "Junk Settings"
msgstr "å??å?¾é?®ä»¶è®¾ç½®"
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
#: ../plugins/groupwise-features/junk-settings.ui.h:3
msgid "Junk Mail Settings"
msgstr "å??å?¾é?®ä»¶è®¾ç½®"
@@ -17063,11 +16619,6 @@ msgstr "ç?µå?é?®ä»¶ï¼?"
msgid "Junk List:"
msgstr "å??å?¾é?®ä»¶å??表ï¼?"
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "��(_D)"
-
#: ../plugins/groupwise-features/junk-settings.ui.h:6
msgid "_Enable"
msgstr "��(_E)"
@@ -17086,13 +16637,13 @@ msgstr "å? é?¤(_R)"
msgid "Message Retract"
msgstr "ä¿¡æ?¯æ?¶å??"
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
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:107
+#: ../plugins/groupwise-features/mail-retract.c:111
msgid "Message retracted successfully"
msgstr "é?®ä»¶æ??å??æ?¶å??"
@@ -17186,7 +16737,7 @@ msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å? é?¤è¯¥ä¼?è®®å??ï¼?"
#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
#, fuzzy
msgid "Do you want to retract the original item?"
-msgstr "æ?¨æ?¯å?¦æ?³è¦?æ?¢å¤?æ?ªå®?æ??ç??信件ï¼?"
+msgstr "æ?¨æ?¯å?¦æ?³è¦?æ?¢å¤?æ?ªå®?æ??ç??ä¿¡æ?¯ï¼?"
#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
#, fuzzy
@@ -17221,25 +16772,26 @@ msgid "Would you like to decline it?"
msgstr "æ?¨å¸?æ??ä¿?å?æ?´æ?¹å??ï¼?"
#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>����</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
msgid "C_ustomize notification message"
msgstr "è?ªå®?ä¹?é??ç?¥æ¶?æ?¯(_U)"
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
msgid "Con_tacts..."
msgstr "è??系人(_T)..."
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
msgid "Shared Folder Notification"
msgstr "å?±äº«æ??件夹é??ç?¥"
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
msgid "The participants will receive the following notification.\n"
msgstr "æ?¶ä»¶äººå°?æ?¥æ?¶å?°ä¸?å??é??ç?¥ã??\n"
+#: ../plugins/groupwise-features/properties.ui.h:9
+#, fuzzy
+msgid "Users:"
+msgstr "��"
+
#: ../plugins/groupwise-features/properties.ui.h:12
msgid "_Not Shared"
msgstr "��享(_N)"
@@ -17297,50 +16849,58 @@ msgid "Proxy"
msgstr "代ç??æ??å?¡å?¨"
#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>è´¦æ?·å??</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "å¸?å?·å??"
#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
msgid "Proxy Login"
msgstr "代ç??æ??å?¡å?¨ç?»å½?"
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%sè¾?å?¥ %s ç??å¯?ç ?(ç?¨æ?· %s)"
#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
msgid "The Proxy tab will be available only when the account is online."
-msgstr "代ç??æ??å?¡å?¨æ ?ç¾ä»?å½?è´¦æ?·è??æ?ºæ?¶æ??å?¯ç?¨ã??"
+msgstr "代ç??æ??å?¡å?¨æ ?ç¾ä»?å½?å¸?å?·è??æ?ºæ?¶æ??å?¯ç?¨ã??"
#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "代ç??æ??å?¡å?¨æ ?ç¾ä»?å½?è´¦æ?·å?¯ç?¨æ?¶æ??å?¯ç?¨ã??"
+msgstr "代ç??æ??å?¡å?¨æ ?ç¾ä»?å½?å¸?å?·å?¯ç?¨æ?¶æ??å?¯ç?¨ã??"
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:700
+#, fuzzy
+msgctxt "GW"
+msgid "Proxy"
+msgstr "代ç??æ??å?¡å?¨"
+
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
msgid "Add User"
msgstr "æ·»å? ç?¨æ?·"
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
msgid "Advanced send options"
msgstr "é«?级å??é??é??项"
-#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder.c:726
msgid "Users"
msgstr "��"
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:310
msgid "Enter the users and set permissions"
msgstr "è¾?å?¥ç?¨æ?·å??设å®?æ??é??"
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:410
msgid "Sharing"
msgstr "�享"
@@ -17348,67 +16908,59 @@ msgstr "�享"
msgid "Custom Notification"
msgstr "è?ªå®?ä¹?é??ç?¥"
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
msgid "Add "
msgstr "æ·»å? "
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
msgid "Message Status"
-msgstr "信件ç?¶æ??"
+msgstr "ä¿¡æ?¯ç?¶æ??"
#. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
msgid "Subject:"
msgstr "主��"
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
msgid "From:"
msgstr "å??件人ï¼?"
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
msgid "Creation date:"
msgstr "å??建æ?¥æ??ï¼?"
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
msgid "Recipient: "
msgstr "�件人�"
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
msgid "Delivered: "
msgstr "å·²æ??é??ï¼?"
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
msgid "Opened: "
msgstr "å·²æ??å¼?ï¼?"
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
msgid "Accepted: "
msgstr "å·²æ?¥å??ï¼?"
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
msgid "Deleted: "
msgstr "å·²å? é?¤ï¼?"
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
msgid "Declined: "
msgstr "å·²æ??ç»?ï¼?"
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
msgid "Completed: "
msgstr "å·²å®?æ??ï¼?"
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
msgid "Undelivered: "
msgstr "æ?ªæ??é??ï¼?"
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr ""
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Hula æ?¯æ??"
-
#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
#, fuzzy
msgid "Inline Image"
@@ -17418,12 +16970,12 @@ msgstr "åµ?å?¥"
msgid "View image attachments directly in mail messages."
msgstr ""
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:330
#: ../plugins/imap-features/imap-headers.ui.h:2
msgid "Custom Headers"
msgstr "���信头"
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:343
#: ../plugins/imap-features/imap-headers.ui.h:5
msgid "IMAP Headers"
msgstr "IMAP 信头"
@@ -17464,40 +17016,42 @@ msgstr "è?·å??å?¨é?¨ä¿¡å¤´(_L)"
#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
msgid "Fine-tune your IMAP accounts."
-msgstr "è°?æ?´æ?¨ç?? IMAP è´¦æ?·ã??"
+msgstr "è°?æ?´æ?¨ç?? IMAP å¸?å?·ã??"
#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
msgid "IMAP Features"
msgstr "IMAP ��"
-#: ../plugins/itip-formatter/itip-formatter.c:486
-#, c-format
-msgid "Failed to load the calendar '%s'"
-msgstr "è£?å?¥æ?¥å??â??%sâ??失败"
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
+#, fuzzy, c-format
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "è½½å?¥æ?¥å??â??%sâ??失败"
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:649
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "æ?¥å??â??%sâ??ä¸ç??ä¸?个约ä¼?ä¸?æ¤ä¼?è®®å?²çª?"
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:685
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "å?¨æ?¥å??â??%sâ??ä¸æ?¾å?°äº?约ä¼?"
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:784
msgid "Unable to find any calendars"
msgstr "æ? æ³?æ?¾å?°ä»»ä½?æ?¥å??"
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:791
msgid "Unable to find this meeting in any calendar"
msgstr "æ? æ³?å?¨ä»»ä½?æ?¥å??ä¸æ?¾å?°æ¤ä¼?è®®"
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:795
msgid "Unable to find this task in any task list"
msgstr "æ? æ³?å?¨ä»»ä½?ä»»å?¡å??表ä¸æ?¾å?°æ¤ä»»å?¡"
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:799
msgid "Unable to find this memo in any memo list"
msgstr "æ? æ³?å?¨ä»»ä½?å¤?å¿?å??表ä¸æ?¾å?°æ¤å¤?å¿?"
@@ -17608,7 +17162,7 @@ msgstr "é??å? ç??æ?¥å??æ? æ??"
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
-msgstr "信件声æ??å?¶å??å?«æ?¥å??ï¼?ä½?æ?¥å??ä¸?æ?¯æ??æ??ç?? iCalendarã??"
+msgstr "ä¿¡æ?¯å£°æ??å?¶å??å?«æ?¥å??ï¼?ä½?æ?¥å??ä¸?æ?¯æ??æ??ç?? iCalendarã??"
#: ../plugins/itip-formatter/itip-formatter.c:1639
#: ../plugins/itip-formatter/itip-formatter.c:1667
@@ -17622,7 +17176,7 @@ msgstr "æ?¥å??项æ? æ??"
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
-msgstr "信件ç??ç¡®å??å?«æ?¥å??ï¼?ä½?æ?¯æ?¥å??ä¸?å??å?«äº?件ã??ä»»å?¡æ??å¿?/é?²ä¿¡æ?¯"
+msgstr "ä¿¡æ?¯ç??ç¡®å??å?«æ?¥å??ï¼?ä½?æ?¯æ?¥å??ä¸?å??å?«äº?件ã??ä»»å?¡æ??å¿?/é?²ä¿¡æ?¯"
#: ../plugins/itip-formatter/itip-formatter.c:1681
msgid "The calendar attached contains multiple items"
@@ -17634,503 +17188,501 @@ msgid ""
"imported"
msgstr "è¦?å¤?ç??è¿?äº?å?¨é?¨é¡¹ç?®ï¼?åº?该ä¿?å?æ??件并导å?¥æ?¥å??"
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2452
msgid "This meeting recurs"
msgstr "æ¤ä¼?è®®é??ç?°"
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2455
msgid "This task recurs"
msgstr "æ¤ä»»å?¡é??ç?°"
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2458
msgid "This memo recurs"
msgstr "æ¤å¤?å¿?é??ç?°"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2692
msgid "_Delete message after acting"
msgstr "æ??ä½?å??å? é?¤æ¶?æ?¯(_D)"
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2702
+#: ../plugins/itip-formatter/itip-formatter.c:2735
msgid "Conflict Search"
msgstr "å?²çª?æ??ç´¢"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2717
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:200
+#: ../plugins/itip-formatter/itip-view.c:196
msgid "Today %H:%M"
msgstr "�天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
msgid "Today %H:%M:%S"
msgstr "�天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
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:228
+#: ../plugins/itip-formatter/itip-view.c:224
msgid "Tomorrow %H:%M"
msgstr "æ??天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
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:237
+#: ../plugins/itip-formatter/itip-view.c:233
msgid "Tomorrow %l:%M %p"
msgstr "æ??天%p%l:%M"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
msgid "Tomorrow %l:%M:%S %p"
msgstr "æ??天%p%l:%M:%S"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
#, 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:265
+#: ../plugins/itip-formatter/itip-view.c:261
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:269
+#: ../plugins/itip-formatter/itip-view.c:265
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:274
+#: ../plugins/itip-formatter/itip-view.c:270
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:278
+#: ../plugins/itip-formatter/itip-view.c:274
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:287
+#: ../plugins/itip-formatter/itip-view.c:283
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:293
+#: ../plugins/itip-formatter/itip-view.c:289
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:297
+#: ../plugins/itip-formatter/itip-view.c:293
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:302
+#: ../plugins/itip-formatter/itip-view.c:298
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:306
+#: ../plugins/itip-formatter/itip-view.c:302
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:312
+#: ../plugins/itip-formatter/itip-view.c:308
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:317
+#: ../plugins/itip-formatter/itip-view.c:313
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:321
+#: ../plugins/itip-formatter/itip-view.c:317
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:326
+#: ../plugins/itip-formatter/itip-view.c:322
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:330
+#: ../plugins/itip-formatter/itip-view.c:326
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Yå¹´%-mæ??%-dæ?¥%A%p%l:%M:%S"
-#: ../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>"
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
+#, fuzzy, c-format
+msgid "Please respond on behalf of %s"
msgstr "请以 <b>%s</b> ç??身份å??åº?"
-#: ../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>"
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
+#, fuzzy, c-format
+msgid "Received on behalf of %s"
msgstr "以 <b>%s</b> ç??身份æ?¥æ?¶"
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
+#: ../plugins/itip-formatter/itip-view.c:374
+#, fuzzy, c-format
+msgid "%s through %s has published the following meeting information:"
msgstr "<b>%s</b> é??è¿? %s å??å¸?äº?ä¼?议信æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
+#: ../plugins/itip-formatter/itip-view.c:376
+#, fuzzy, c-format
+msgid "%s has published the following meeting information:"
msgstr "<b>%s</b> å??å¸?äº?ä¼?议信æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:369
-#, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
+#: ../plugins/itip-formatter/itip-view.c:381
+#, fuzzy, c-format
+msgid "%s has delegated the following meeting to you:"
msgstr "<b>%s</b> 为æ?¨ä»£ç??äº?ä¸?å??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:384
+#, fuzzy, c-format
+msgid "%s through %s requests your presence at the following meeting:"
msgstr "<b>%s</b> é??è¿? %s 请æ±?æ?¨å??å? ä¸?å??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:374
-#, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:386
+#, fuzzy, c-format
+msgid "%s requests your presence at the following meeting:"
msgstr "<b>%s</b> 请æ±?æ?¨å??å? ä¸?å??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:380
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+#: ../plugins/itip-formatter/itip-view.c:392
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing meeting:"
msgstr "<b>%s</b> é??è¿? %s å¸?æ??å? å?¥å?°å·²æ??ç??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:382
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
+#: ../plugins/itip-formatter/itip-view.c:394
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing meeting:"
msgstr "<b>%s</b> å¸?æ??å? å?¥å?°å·²æ??ç??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:386
-#, c-format
+#: ../plugins/itip-formatter/itip-view.c:398
+#, fuzzy, c-format
msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
msgstr "<b>%s</b> é??è¿? %s å¸?æ??æ?¥æ?¶å?°ä¸?å??ä¼?è®®ç??æ??æ?°ä¿¡æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:388
-#, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:400
+#, fuzzy, c-format
+msgid "%s wishes to receive the latest information for the following meeting:"
msgstr "<b>%s</b> å¸?æ??æ?¥æ?¶å?°ä¸?å??ä¼?è®®ç??æ??æ?°ä¿¡æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:392
-#, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
+#: ../plugins/itip-formatter/itip-view.c:404
+#, fuzzy, c-format
+msgid "%s through %s has sent back the following meeting response:"
msgstr "<b>%s</b> é??è¿? %s å??å??äº?ä¸?å??ä¼?议请æ±?ç??å??åº?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:394
-#, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
+#: ../plugins/itip-formatter/itip-view.c:406
+#, fuzzy, c-format
+msgid "%s has sent back the following meeting response:"
msgstr "<b>%s</b> å??å??äº?ä¸?å??ä¼?议请æ±?ç??å??åº?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:398
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:410
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following meeting:"
msgstr "<b>%s</b> é??è¿? %s å??æ¶?äº?ä¸?å??ä¼?è®®ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:400
-#, c-format
-msgid "<b>%s</b> has canceled the following meeting."
+#: ../plugins/itip-formatter/itip-view.c:412
+#, fuzzy, c-format
+msgid "%s has canceled the following meeting."
msgstr "<b>%s</b> å??æ¶?äº?ä¸?å??ä¼?è®®ã??"
-#: ../plugins/itip-formatter/itip-view.c:404
-#, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:416
+#, fuzzy, c-format
+msgid "%s through %s has proposed the following meeting changes."
msgstr "<b>%s</b> é??è¿? %s æ??è®®äº?ä¸?å??ä¼?è®®å??æ?´ã??"
-#: ../plugins/itip-formatter/itip-view.c:406
-#, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:418
+#, fuzzy, c-format
+msgid "%s has proposed the following meeting changes."
msgstr "<b>%s</b> æ??è®®äº?ä¸?å??ä¼?è®®å??æ?´ã??"
-#: ../plugins/itip-formatter/itip-view.c:410
-#, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
+#: ../plugins/itip-formatter/itip-view.c:422
+#, fuzzy, c-format
+msgid "%s through %s has declined the following meeting changes:"
msgstr "<b>%s</b> é??è¿? %s æ??ç»?äº?ä¸?å??ä¼?è®®å??æ?´ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:412
-#, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:424
+#, fuzzy, c-format
+msgid "%s has declined the following meeting changes."
msgstr "<b>%s</b> æ??ç»?äº?ä¸?å??ä¼?è®®å??æ?´ã??"
-#: ../plugins/itip-formatter/itip-view.c:450
-#, c-format
-msgid "<b>%s</b> through %s has published the following task:"
+#: ../plugins/itip-formatter/itip-view.c:462
+#, fuzzy, c-format
+msgid "%s through %s has published the following task:"
msgstr "<b>%s</b> é??è¿? %s å??å¸?äº?ä¸?å??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:452
-#, c-format
-msgid "<b>%s</b> has published the following task:"
+#: ../plugins/itip-formatter/itip-view.c:464
+#, fuzzy, c-format
+msgid "%s has published the following task:"
msgstr "<b>%s</b> å??å¸?äº?ä¸?å??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:457
-#, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
+#: ../plugins/itip-formatter/itip-view.c:469
+#, fuzzy, c-format
+msgid "%s requests the assignment of %s to the following task:"
msgstr "<b>%s</b> 请æ±?ç»? %s å??é??ä¸?å??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:460
-#, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
+#: ../plugins/itip-formatter/itip-view.c:472
+#, fuzzy, c-format
+msgid "%s through %s has assigned you a task:"
msgstr "<b>%s</b> é??è¿? %s 为æ?¨å??é??äº?ä¸?å??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:462
-#, c-format
-msgid "<b>%s</b> has assigned you a task:"
+#: ../plugins/itip-formatter/itip-view.c:474
+#, fuzzy, c-format
+msgid "%s has assigned you a task:"
msgstr "<b>%s</b> 为æ?¨å??é??äº?ä¸?个任å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:468
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
+#: ../plugins/itip-formatter/itip-view.c:480
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing task:"
msgstr "<b>%s</b> é??è¿? %s å¸?æ??å? å?¥å?°å·²æ??ç??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:470
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
+#: ../plugins/itip-formatter/itip-view.c:482
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing task:"
msgstr "<b>%s<b> å¸?æ??å? å?¥å?°å·²å?å?¨ç??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:474
-#, c-format
+#: ../plugins/itip-formatter/itip-view.c:486
+#, fuzzy, c-format
msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
msgstr "<b>%s</b> é??è¿? %s æ?³è¦?æ?¶å?°æ??å??é??ç??ä¸?å??ä»»å?¡ç??æ??æ?°ä¿¡æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:476
-#, c-format
+#: ../plugins/itip-formatter/itip-view.c:488
+#, fuzzy, c-format
msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
+"%s wishes to receive the latest information for the following assigned task:"
msgstr "<b>%s</b> æ?³è¦?æ?¶å?°æ??å??é??ç??ä¸?å??ä»»å?¡ç??æ??æ?°ä¿¡æ?¯ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:480
-#, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+#: ../plugins/itip-formatter/itip-view.c:492
+#, fuzzy, c-format
+msgid "%s through %s has sent back the following assigned task response:"
msgstr "<b>%s</b> é??è¿? %s å??å??äº?ä¸?å??å??é??ä»»å?¡ç??å??åº?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
+#: ../plugins/itip-formatter/itip-view.c:494
+#, fuzzy, c-format
+msgid "%s has sent back the following assigned task response:"
msgstr "<b>%s</b> å??å??äº?ä¸?å??å??é??ä»»å?¡ç??å??åº?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:486
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:498
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following assigned task:"
msgstr "<b>%s</b> é??è¿? %s å??æ¶?äº?ä¸?å??ä»»å?¡å??é??ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:488
-#, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:500
+#, fuzzy, c-format
+msgid "%s has canceled the following assigned task:"
msgstr "<b>%s</b> å??æ¶?å??é??ç??ä¸?å??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:492
-#, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+#: ../plugins/itip-formatter/itip-view.c:504
+#, fuzzy, c-format
+msgid "%s through %s has proposed the following task assignment changes:"
msgstr "<b>%s</b> é??è¿? %s æ??è®®äº?ä¸?å??ä»»å?¡å??é??å??æ?´ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:494
-#, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
+#: ../plugins/itip-formatter/itip-view.c:506
+#, fuzzy, c-format
+msgid "%s has proposed the following task assignment changes:"
msgstr "<b>%s</b> æ??è®®äº?ä¸?å??ä»»å?¡å??é??å??æ?´ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:498
-#, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:510
+#, fuzzy, c-format
+msgid "%s through %s has declined the following assigned task:"
msgstr "<b>%s</b> é??è¿? %s æ??ç»?äº?ä¸?å??ä»»å?¡å??é??ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:500
-#, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:512
+#, fuzzy, c-format
+msgid "%s has declined the following assigned task:"
msgstr "<b>%s</b> æ??ç»?äº?å??é??ç??ä¸?å??ä»»å?¡ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:537
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
+#: ../plugins/itip-formatter/itip-view.c:549
+#, fuzzy, c-format
+msgid "%s through %s has published the following memo:"
msgstr "<b>%s</b> é??è¿? %s å??å¸?äº?ä¸?å??å¤?å¿?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:539
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
+#: ../plugins/itip-formatter/itip-view.c:551
+#, fuzzy, c-format
+msgid "%s has published the following memo:"
msgstr "<b>%s</b> å??å¸?äº?ä¸?å??å¤?å¿?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:544
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+#: ../plugins/itip-formatter/itip-view.c:556
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing memo:"
msgstr "<b>%s</b> é??è¿? %s å¸?æ??å? å?¥å?°å·²æ??ç??å¤?å¿?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:546
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
+#: ../plugins/itip-formatter/itip-view.c:558
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing memo:"
msgstr "<b>%s</b> å¸?æ??å? å?¥å?°å·²æ??ç??å¤?å¿?ä¸ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:550
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
+#: ../plugins/itip-formatter/itip-view.c:562
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following shared memo:"
msgstr "<b>%s</b> é??è¿? %s å??æ¶?äº?ä¸?å??å?±äº«å¤?å¿?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:552
-#, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
+#: ../plugins/itip-formatter/itip-view.c:564
+#, fuzzy, c-format
+msgid "%s has canceled the following shared memo:"
msgstr "<b>%s</b> å??æ¶?äº?ä¸?å??å?±äº«å¤?å¿?ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:688
msgid "All day:"
msgstr "�天�"
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
msgid "Start day:"
msgstr "å¼?å§?æ?¥æ??ï¼?"
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
msgid "Start time:"
msgstr "�����"
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
msgid "End day:"
msgstr "ç»?æ??æ?¥æ??ï¼?"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
msgid "End time:"
msgstr "ç»?æ??æ?¶é?´ï¼?"
#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
msgid "_Open Calendar"
msgstr "æ??å¼?æ?¥å??(_O)"
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
msgid "_Decline"
msgstr "æ??ç»?(_D)"
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "æ?¥å??(_A)"
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+#, fuzzy
+msgid "A_ccept"
+msgstr "æ?¥å??"
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:853
msgid "_Decline all"
msgstr "å?¨é?¨æ??ç»?(_D)"
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
msgid "_Tentative all"
msgstr "����(_T)"
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
msgid "_Tentative"
msgstr "å¾?å®?(_T)"
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+#, fuzzy
+msgid "A_ccept all"
msgstr "å?¨é?¨æ?¥å??(_A)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
msgid "_Send Information"
msgstr "å??é??ä¿¡æ?¯(_S)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
msgid "_Update Attendee Status"
msgstr "æ?´æ?°ä¸?ä¼?è??ç?¶æ??(_U)"
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
msgid "_Update"
msgstr "æ?´æ?°(_U)"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
msgid "Comment:"
msgstr "注é??ï¼?"
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
msgid "Send _reply to sender"
msgstr "å??å¤?å??件人(_R)"
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
msgid "Send _updates to attendees"
msgstr "ç»?å?ºå¸è??å??é??æ?´æ?°(_U)"
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
msgid "_Apply to all instances"
msgstr "�������(_A)"
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
msgid "Show time as _free"
msgstr "����示为空�(_F)"
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
msgid "_Preserve my reminder"
msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
msgid "_Inherit reminder"
msgstr "继æ?¿æ??示(_I)"
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
msgid "_Tasks:"
msgstr "任�(_T)�"
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
msgid "_Memos:"
msgstr "��(_M)�"
@@ -18143,16 +17695,15 @@ msgid "Itip Formatter"
msgstr "Itip æ ¼å¼?å??"
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-""{0}" has delegated the meeting. Do you want to add the delegate "
-""{1}"?"
+#, fuzzy
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
msgstr "â??{0}â??代ç??äº?该ä¼?è®®ã??æ?¨æ?¯å?¦æ?³è¦?æ·»å? 代ç??人â??{1}â??ï¼?"
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "This meeting has been delegated"
msgstr "该ä¼?议已被代ç??"
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
msgid ""
"This response is not from a current attendee. Add the sender as an attendee?"
msgstr "æ¤å??åº?并é??æ?¥è?ªå½?å??å?ºå¸è??ã??å°?å??åº?è??å? 为å?ºå¸è??å??ï¼?"
@@ -18181,11 +17732,11 @@ msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶ç??æ?? D-Bus ä¿¡æ?¯ã??"
msgid ""
"If \"true\", then beep, otherwise will play sound file when new messages "
"arrive."
-msgstr "æ?°ä¿¡ä»¶å?°è¾¾æ?¶ï¼?æ¤å?¼å¦?æ??为 trueï¼?å??å??é??ï¼?å?¦å??æ?æ?¾å£°é?³æ??件ã??"
+msgstr "æ?°ä¿¡æ?¯å?°è¾¾æ?¶ï¼?æ¤å?¼å¦?æ??为 trueï¼?å??å??é??ï¼?å?¦å??æ?æ?¾å£°é?³æ??件ã??"
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
msgid "Notify new messages for Inbox only."
-msgstr "å?ªé??ç?¥æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶ã??"
+msgstr "å?ªé??ç?¥æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡æ?¯ã??"
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
msgid "Play sound when new messages arrive."
@@ -18230,18 +17781,17 @@ msgstr "æ?¯å?¦é?ªç??å?¾æ ?ã??"
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
msgid "Whether to notify new messages in Inbox folder only."
-msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶ç®±æ??件夹ä¸ç??æ?°ä¿¡ä»¶ã??"
+msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶ç®±æ??件夹ä¸ç??æ?°ä¿¡æ?¯ã??"
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:355
msgid "Evolution's Mail Notification"
msgstr "Evolution é?®ä»¶é??ç?¥"
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:377
msgid "Mail Notification Properties"
msgstr "é?®ä»¶é??ç?¥å±?æ?§"
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:513
#, c-format
msgid ""
"You have received %d new message\n"
@@ -18251,66 +17801,68 @@ msgid_plural ""
"in %s."
msgstr[0] "æ?¨å?¨ %2$s ä¸æ?¶å?°äº? %1$d å°?æ?°é?®ä»¶ã??"
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:525
#, c-format
msgid "From: %s"
msgstr "���%s"
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:538
#, c-format
msgid "Subject: %s"
msgstr "主��%s"
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:548
#, c-format
msgid "You have received %d new message."
msgid_plural "You have received %d new messages."
msgstr[0] "æ?¨æ?¶å?°äº? %d å°?æ?°é?®ä»¶ã??"
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:577
msgid "New email"
msgstr "æ?°ç?µå?é?®ä»¶"
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:638
msgid "Show icon in _notification area"
msgstr "å?¨é??ç?¥å?ºæ?¾ç¤ºå?¾æ ?(_N)"
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:666
msgid "B_link icon in notification area"
msgstr "é?ªç??é??ç?¥å?ºå?¾æ ?(_L)"
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:676
msgid "Popup _message together with the icon"
msgstr "å??æ?¶å¼¹å?ºå?¾æ ?å??æ¶?æ?¯(_M)"
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:863
msgid "_Play sound when new messages arrive"
msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶æ?æ?¾å£°é?³(_P)"
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:892
msgid "_Beep"
msgstr "å??é??(_B)"
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:905
msgid "Use sound _theme"
msgstr "使�声�主�(_T)"
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:924
msgid "Play _file:"
msgstr "æ?æ?¾æ??件(_F)ï¼?"
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:935
msgid "Select sound file"
msgstr "é??æ?©å£°é?³æ??件"
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:993
msgid "Notify new messages for _Inbox only"
-msgstr "å?ªé??ç?¥æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_I)"
+msgstr "å?ªé??ç?¥æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡æ?¯(_I)"
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:1002
msgid "Generate a _D-Bus message"
msgstr "ç??æ?? _D-Bus æ¶?æ?¯"
@@ -18323,51 +17875,63 @@ msgid "Notifies you when new mail messages arrive."
msgstr "å½?æ?°ç??é?®ä»¶ä¿¡æ?¯å?°è¾¾æ?¶æ??示æ?¨ã??"
#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
#, c-format
msgid "Created from a mail by %s"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
#, c-format
msgid ""
"Selected calendar contains event '%s' already. Would you like to edit the "
"old event?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
#, c-format
msgid ""
"Selected task list contains task '%s' already. Would you like to edit the "
"old task?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
#, c-format
msgid ""
"Selected memo list contains memo '%s' already. Would you like to edit the "
"old memo?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:515
msgid ""
"Selected calendar contains some events for the given mails already. Would "
"you like to create new events anyway?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:521
msgid ""
"Selected task list contains some tasks for the given mails already. Would "
"you like to create new tasks anyway?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:527
msgid ""
"Selected memo list contains some memos for the given mails already. Would "
"you like to create new memos anyway?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:548
msgid ""
"Selected calendar contains an event for the given mail already. Would you "
"like to create new event anyway?"
@@ -18376,7 +17940,10 @@ msgid_plural ""
"like to create new events anyway?"
msgstr[0] ""
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:557
msgid ""
"Selected task list contains a task for the given mail already. Would you "
"like to create new task anyway?"
@@ -18385,7 +17952,10 @@ msgid_plural ""
"like to create new tasks anyway?"
msgstr[0] ""
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:566
msgid ""
"Selected memo list contains a memo for the given mail already. Would you "
"like to create new memo anyway?"
@@ -18394,78 +17964,78 @@ msgid_plural ""
"like to create new memos anyway?"
msgstr[0] ""
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:625
msgid "[No Summary]"
msgstr "[没æ??æ¦?è¦?]"
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:636
msgid "Invalid object returned from a server"
msgstr "ä»?ä¸?个æ??å?¡å?¨ä¸?è¿?å??äº?æ? æ??ç??对象"
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:707
#, c-format
msgid "An error occurred during processing: %s"
msgstr "å?¨å¤?ç??æ?¶å?ºç?°äº?ä¸?个é??误ï¼?%s"
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:736
#, c-format
msgid "Cannot open calendar. %s"
msgstr "æ? æ³?æ??å¼?æ?¥å??ã??%s"
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:743
#, fuzzy
msgid ""
"Selected source is read only, thus cannot create event there. Select other "
"source, please."
msgstr "é??ä¸ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ¤ä¸?è?½å?¨æ¤å??建任å?¡ã??请é??æ?©å?¶å®?ç??æº?ã??"
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:746
msgid ""
"Selected source is read only, thus cannot create task there. Select other "
"source, please."
msgstr "é??ä¸ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ¤ä¸?è?½å?¨æ¤å??建任å?¡ã??请é??æ?©å?¶å®?ç??æº?ã??"
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:749
#, fuzzy
msgid ""
"Selected source is read only, thus cannot create memo there. Select other "
"source, please."
msgstr "é??ä¸ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ¤ä¸?è?½å?¨æ¤å??建任å?¡ã??请é??æ?©å?¶å®?ç??æº?ã??"
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:952
#, c-format
msgid "Cannot get source list. %s"
msgstr "è?½è?·å??æº?å??表ã?? %s"
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1071
msgid "Create an _Event"
msgstr "å??建ä¸?个äº?件(_E)"
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1073
msgid "Create a new event from the selected message"
msgstr "ä»?é??æ?©ç??ä¿¡æ?¯ä¸å??建ä¸?个æ?°ç??äº?件"
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1078
msgid "Create a Mem_o"
msgstr "å??建ä¸?个å¤?å¿?(_O)"
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1080
msgid "Create a new memo from the selected message"
msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°å¤?å¿?"
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1085
msgid "Create a _Task"
msgstr "å??建ä¸?个任å?¡(_T)"
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1087
msgid "Create a new task from the selected message"
msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°ä»»å?¡"
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1095
msgid "Create a _Meeting"
msgstr "å??建ä¸?个ä¼?è®®(_M)"
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1097
msgid "Create a new meeting from the selected message"
msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°ä¼?è®®"
@@ -18473,56 +18043,56 @@ msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°ä¼?è®®"
msgid "Convert a mail message to a task."
msgstr "转æ?¢ä¸?个é?®ä»¶ä¿¡æ?¯æ??为ä¸?个任å?¡ã??"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
msgid "Get List _Archive"
msgstr "è?·å¾?å??表å?æ¡£(_A)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
msgid "Get an archive of the list this message belongs to"
msgstr "è?·å??è¿?å°?ä¿¡æ??å±?é?®ä»¶å??表ç??å?æ¡£"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
msgid "Get List _Usage Information"
msgstr "è?·å¾?å??表ç?¨æ³?ä¿¡æ?¯(_U)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
msgid "Get information about the usage of the list this message belongs to"
msgstr "è?·å??è¿?å°?ä¿¡æ??å±?é?®ä»¶å??表ç??ç?¨æ³?ä¿¡æ?¯"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
msgid "Contact List _Owner"
msgstr "è??ç³»å??表æ??æ??è??(_O)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
msgid "Contact the owner of the mailing list this message belongs to"
msgstr "è??ç³»è¿?å°?ä¿¡æ??å±?é?®ä»¶å??表ç??æ??æ??è??"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
msgid "_Post Message to List"
msgstr "æ??é??å?°å??表(_P)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
msgid "Post a message to the mailing list this message belongs to"
msgstr "ç»?è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??表æ??é??"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
msgid "_Subscribe to List"
msgstr "订é??å??表(_S)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
msgid "Subscribe to the mailing list this message belongs to"
msgstr "订é??è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??表"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
msgid "_Unsubscribe from List"
msgstr "é??订å??表(_U)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
#, fuzzy
msgid "Unsubscribe from the mailing list this message belongs to"
msgstr "é??订è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??表"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
msgid "Mailing _List"
msgstr "é?®ä»¶å??表(_L)"
@@ -18571,7 +18141,7 @@ msgstr ""
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
msgid "Send e-mail message to mailing list?"
-msgstr "æ??信件å??é??å?°é?®ä»¶å??表å??ï¼?"
+msgstr "æ??ä¿¡æ?¯å??é??å?°é?®ä»¶å??表å??ï¼?"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
#, fuzzy
@@ -18591,7 +18161,7 @@ msgid ""
"\n"
"Header: {1}"
msgstr ""
-"信件ç?? {0} å¤´æ ¼å¼?ä¸?对ï¼?æ? æ³?å¤?ç??ã??\n"
+"ä¿¡æ?¯ç?? {0} å¤´æ ¼å¼?ä¸?对ï¼?æ? æ³?å¤?ç??ã??\n"
"\n"
"头�{1}"
@@ -18603,33 +18173,33 @@ msgstr "è¿?å°?ä¿¡ä¸?å??å?«æ¤å?¨ä½?æ??é??ç??头信æ?¯ã??"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
msgid "_Edit message"
-msgstr "��信件(_E)"
+msgstr "ç¼?è¾?ä¿¡æ?¯(_E)"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
msgid "_Send message"
-msgstr "å??é??信件(_S)"
+msgstr "å??é??ä¿¡æ?¯(_S)"
#: ../plugins/mark-all-read/mark-all-read.c:42
msgid "Also mark messages in subfolders?"
-msgstr "ä¹?æ ?è®°ç??å?æ??件夹ä¸ç??信件å??ï¼?"
+msgstr "ä¹?æ ?è®°ç??å?æ??件夹ä¸ç??ä¿¡æ?¯å??ï¼?"
#: ../plugins/mark-all-read/mark-all-read.c:44
msgid ""
"Do you want to mark messages as read in the current folder only, or in the "
"current folder as well as all subfolders?"
-msgstr "æ?¨æ?¯æ?³è¦?å?ªæ ?è®°å½?å??æ??件夹ä¸ç??信件ï¼?è¿?æ?¯ä¹?å??æ?¬å?æ??件夹ä¸ç??信件ï¼?"
+msgstr "æ?¨æ?¯æ?³è¦?å?ªæ ?è®°å½?å??æ??件夹ä¸ç??ä¿¡æ?¯ï¼?è¿?æ?¯ä¹?å??æ?¬å?æ??件夹ä¸ç??ä¿¡æ?¯ï¼?"
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:194
msgid "In Current Folder and _Subfolders"
msgstr "å?¨å½?å??æ??件夹å??å?æ??件夹(_S)"
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:208
msgid "In Current _Folder Only"
msgstr "å?ªå?¨å½?å??æ??件夹(_F)"
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:437
msgid "Mark Me_ssages as Read"
-msgstr "æ??信件æ ?记为已读(_S)"
+msgstr "æ??ä¿¡æ?¯æ ?记为已读(_S)"
#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
msgid "Mark All Read"
@@ -18638,7 +18208,7 @@ msgstr "å?¨é?¨æ ?为已读"
#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
#, fuzzy
msgid "Mark all messages in a folder as read."
-msgstr "å°?æ¤æ??件夹ä¸ç??æ??æ??信件æ ?记为已读"
+msgstr "å°?æ¤æ??件夹ä¸ç??æ??æ??ä¿¡æ?¯æ ?记为已读"
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
msgid "Manage your Evolution plugins."
@@ -18687,41 +18257,41 @@ msgstr "é¦?é??纯æ??æ?¬"
msgid "View mail messages as plain text, even if they contain HTML content."
msgstr "ä½?为纯æ??æ?¬æ?¥æ?¥ç??é?®ä»¶ä¿¡æ?¯ï¼?ç??è?³å?¨å®?们å??å?« HTML å??容æ?¶ã??"
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
msgid "Show HTML if present"
msgstr "é¦?é?? HTML"
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
msgid "Let Evolution choose the best part to show."
msgstr ""
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
#, fuzzy
msgid "Show plain text if present"
msgstr "é¦?é?? HTML"
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
msgid ""
"Show plain text part, if present, otherwise let Evolution choose the best "
"part to show."
msgstr ""
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
#, fuzzy
msgid "Only ever show plain text"
msgstr "ä»?æ?¾ç¤ºçº¯æ??æ?¬"
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
msgid ""
"Always show plain text part and make attachments from other parts, if "
"requested."
msgstr ""
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
msgid "Show s_uppressed HTML parts as attachments"
msgstr ""
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
msgid "HTML _Mode"
msgstr "HT_ML 模�"
@@ -18745,31 +18315,35 @@ msgstr "Outlook PST 导�"
msgid "Outlook personal folders (.pst)"
msgstr "Outlook 个人æ??件夹(.pst)"
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:295
msgid "_Mail"
msgstr "�件(_M)"
+#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "ç?®ç??æ??件夹ï¼?"
+
#. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:313
msgid "_Address Book"
msgstr "å?°å??ç°¿(_A)"
#. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:320
msgid "A_ppointments"
msgstr "约�(_P)"
#. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr "任�(_T)"
#. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:332
msgid "_Journal entries"
msgstr "�记项(_J)"
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:347
msgid "Importing Outlook data"
msgstr "导� Outlook ��"
@@ -18829,7 +18403,7 @@ msgstr "æ?¨ç¡®å®?æ?¨æ?³è¦?å? é?¤æ¤ä½?ç½®å??ï¼?"
#: ../plugins/publish-calendar/publish-calendar.c:1051
#, fuzzy
msgid "Could not create publish thread."
-msgstr "æ? æ³?å??建信件ã??"
+msgstr "æ? æ³?å??建信æ?¯ã??"
#: ../plugins/publish-calendar/publish-calendar.c:1059
msgid "_Publish Calendar Information"
@@ -18933,64 +18507,64 @@ msgstr "iCal"
msgid "Could not publish calendar: Calendar backend no longer exists"
msgstr "ä¸?è?½å??å¸?æ?¥å??ï¼?æ?¥å??å??端已ç»?ä¸?å?å?¨äº?"
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
msgid "New Location"
msgstr "�建�置"
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
msgid "Edit Location"
msgstr "ç¼?è¾?ä½?ç½®"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
#, fuzzy, c-format
msgid "SpamAssassin not found, code: %d"
msgstr "å??å?¾å??æ??æ??件"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
#, fuzzy, c-format
msgid "Failed to create pipe: %s"
msgstr "å??建æ?¬å?°é?®ä»¶å?å?¨â??%sâ??失败ï¼?%s"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
#, fuzzy, c-format
msgid "Error after fork: %s"
msgstr ""
"%s é??误ï¼?\n"
" %s"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
#, c-format
msgid "SpamAssassin child process does not respond, killing..."
msgstr "SpamAssassin å?è¿?ç¨?没æ??å??åº?ï¼?å?³é?ä¸..."
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
#, c-format
msgid "Wait for SpamAssassin child process interrupted, terminating..."
msgstr "ç?å¾?å??æ¢ SpamAssassin å?è¿?ç¨?ï¼?ç»?æ¢ä¸..."
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
#, c-format
msgid "Pipe to SpamAssassin failed, error code: %d"
msgstr "SpamAssassin ç??管é??å?ºé??äº?ï¼?é??误ç ?ï¼?%d"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
#, fuzzy, c-format
msgid "SpamAssassin is not available. Please install it first."
msgstr "å??å?¾å??æ??ä¸?å?¯ç?¨ã??"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
msgid "This will make SpamAssassin more reliable, but slower"
msgstr "è¿?å°?让å??å?¾å??æ??æ?´å?¯é? ï¼?ä½?ç¨?æ?¢"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
msgid "I_nclude remote tests"
msgstr "å??å?«è¿?ç¨?æµ?è¯?(_N)"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
#, fuzzy
msgid "Filter junk messages using SpamAssassin."
-msgstr "使ç?¨ Bogofilter è¿?滤å??å?¾ä¿¡ä»¶ã??"
+msgstr "使ç?¨ Bogofilter è¿?滤å??å?¾ä¿¡æ?¯ã??"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
msgid "SpamAssassin Junk Filter"
@@ -19101,80 +18675,29 @@ msgstr "%FT%T"
msgid "RDF format (.rdf)"
msgstr "RDF æ ¼å¼?(.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
msgid "_Format:"
msgstr "æ ¼å¼?(_F)ï¼?"
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
msgid "Select destination file"
msgstr "é??æ?©ç?®ç??æ??件"
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
#, fuzzy
msgid "Save the selected calendar to disk"
msgstr "æ??é??ä¸ç??æ?¥å??æ??ä»»å?¡å??表ä¿?å?å?°ç£?ç??ã??"
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
#, fuzzy
msgid "Save the selected memo list to disk"
msgstr "æ??é??ä¸ç??æ?¥å??æ??ä»»å?¡å??表ä¿?å?å?°ç£?ç??ã??"
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
#, fuzzy
msgid "Save the selected task list to disk"
msgstr "æ??é??ä¸ç??æ?¥å??æ??ä»»å?¡å??表ä¿?å?å?°ç£?ç??ã??"
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "æ??å¼?æ?¨è¿?è¡?å??å§?å¸?æ?·ç??设置ã??"
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "设置å?©æ??"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "Evolution 设置å?©æ??"
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "欢�"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"欢è¿?使ç?¨ Evolutionã??ä¸?é?¢å? å±?å°?å??许 Evolution è¿?æ?¥å?°æ?¨ç??ç?µå?é?®ä»¶è´¦æ?·ï¼?并ä»?å?¶å®?"
-"åº?ç?¨ç¨?åº?ä¸å¯¼å?¥æ??件ã??\n"
-"\n"
-"请å??å?»â??å??è¿?â??æ??é?®ç»§ç»ã??"
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../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:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "ä»? %sï¼?"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "导å?¥æ??件"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
-msgid "Importing data."
-msgstr "æ£å?¨å¯¼å?¥æ?°æ?®ã??"
-
-#: ../plugins/startup-wizard/startup-wizard.c:250
-msgid "Please wait"
-msgstr "请ç¨?å??"
-
#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
msgid "Sort mail message threads by subject."
msgstr "é??è¿?主é¢?æ?¥æ??åº?é?®ä»¶ä¿¡æ?¯ã??"
@@ -19185,12 +18708,12 @@ msgstr "主�线索"
#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
msgid "Thread messages by subject"
-msgstr "å?ºäº?主é¢?æ??线索ç¼?æ??信件å??表"
+msgstr "å?ºäº?主é¢?æ??线索ç¼?æ??ä¿¡æ?¯å??表"
#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
msgid "F_all back to threading messages by subject"
-msgstr "é»?认æ??ç?§ä¸»é¢?对线索ä¸ç??信件æ??åº?(_A)"
+msgstr "é»?认æ??ç?§ä¸»é¢?对线索ä¸ç??ä¿¡æ?¯æ??åº?(_A)"
#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
#, fuzzy
@@ -19203,15 +18726,15 @@ msgstr "æ¶?æ?¯ä¸»ä½?ä¸ç??ç?¨äº?é??件æ??é??æ??件ç??线索å??表ã??"
msgid "Drafts based template plugin"
msgstr "å?ºäº?è??稿ç??模æ?¿å??æ??件"
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:616
msgid "No Title"
msgstr "æ? æ ?é¢?"
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:687
msgid "Save as _Template"
msgstr "å?¦å?为模æ?¿(_T)"
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:689
msgid "Save as Template"
msgstr "å?¦å?为模æ?¿"
@@ -19232,26 +18755,26 @@ msgstr "�个 vCard"
msgid "Show vCards directly in mail messages."
msgstr "å?¨é?®ä»¶ä¿¡æ?¯é??ç?´æ?¥æ?¥ç?? vCardsã??"
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
msgid "Show Full vCard"
msgstr "�示�� vCard"
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
msgid "Show Compact vCard"
msgstr "æ?¾ç¤ºç´§å?? vCard"
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
msgid "There is one other contact."
msgstr "æ??å?¦å¤? 1 个è??系人ã??"
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
#, c-format
msgid "There is %d other contact."
msgid_plural "There are %d other contacts."
msgstr[0] "æ??å?¦å¤? %d 个è??系人ã??"
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
msgid "Save in Address Book"
msgstr "ä¿?å?è?³å?°å??ç°¿"
@@ -19267,11 +18790,11 @@ msgstr "WebDAV è??系人"
msgid "WebDAV"
msgstr "WebDAV"
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
msgid "URL:"
msgstr "URLï¼?"
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
msgstr "é?¿å?? IfMatch (é??è¦? Apache < 2.2.8)"
@@ -19315,7 +18838,6 @@ msgstr "�认��宽度"
#: ../shell/apps_evolution_shell.schemas.in.h:10
#, fuzzy
-#| msgid "Enable search folders"
msgid "Enable express mode"
msgstr "å?¯ç?¨æ??ç´¢æ??件夹"
@@ -19570,158 +19092,49 @@ msgstr "çª?å?£æ??é?®æ ·å¼?"
msgid "Window buttons are visible"
msgstr "çª?å?£æ??é?®å?¯è§?"
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
msgid "Searches"
msgstr "æ??ç´¢"
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:563
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-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:921
msgid "Sho_w:"
msgstr "�示(_W)�"
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:952
msgid "Sear_ch:"
msgstr "æ??ç´¢(_C)ï¼?"
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1013
msgid "i_n"
msgstr "å?¨(_N) "
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "å·¥å?·æ ?æ ·å¼?"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr ""
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "å·¥å?·æ ?å?¯è§?"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
-
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:253
#, fuzzy
-#| msgid "vCard (.vcf, .gcrd)"
msgid "vCard (.vcf)"
msgstr "vCard (.vfg, .gcrd)"
-#: ../shell/e-shell-utils.c:249
+#: ../shell/e-shell-utils.c:255
#, fuzzy
-#| msgid "iCalendar files (.ics)"
msgid "iCalendar (.ics)"
msgstr "iCalendar æ??件(.ics)"
-#: ../shell/e-shell-utils.c:270
+#: ../shell/e-shell-utils.c:276
#, fuzzy
-#| msgid "All files"
msgid "All Files (*)"
msgstr "å?¨é?¨æ??件"
-#: ../shell/e-shell-view.c:681
-#, fuzzy
-msgid "Switcher Action"
-msgstr "å??æ?¢å?° %s"
-
-#: ../shell/e-shell-view.c:682
-msgid "The switcher action for this shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:697
-msgid "Page Number"
-msgstr "页ç ?"
-
-#: ../shell/e-shell-view.c:698
-msgid "The notebook page number of the shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:714
-#, fuzzy
-#| msgid "Search Filter"
-msgid "Search Rule"
-msgstr "æ??ç´¢è¿?滤å?¨"
-
-#: ../shell/e-shell-view.c:715
-#, fuzzy
-msgid "Criteria for the current search results"
-msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
-
-#: ../shell/e-shell-view.c:730
-msgid "The EShellBackend for this shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:745
-msgid "Shell Content Widget"
-msgstr ""
-
-#: ../shell/e-shell-view.c:746
-msgid "The content widget appears in a shell window's right pane"
-msgstr ""
-
-#: ../shell/e-shell-view.c:762
-#, fuzzy
-msgid "Shell Sidebar Widget"
-msgstr "é»?认侧边æ ?宽度"
-
-#: ../shell/e-shell-view.c:763
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
-
-#: ../shell/e-shell-view.c:778
-#, fuzzy
-msgid "Shell Taskbar Widget"
-msgstr "é??æ?©ä»»å?¡å??表"
-
-#: ../shell/e-shell-view.c:779
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
-
-#: ../shell/e-shell-view.c:794
-#, fuzzy
-msgid "Shell Window"
-msgstr "�建��(_W)"
-
-#: ../shell/e-shell-view.c:795
-msgid "The window to which the shell view belongs"
-msgstr ""
-
-#: ../shell/e-shell-view.c:811
-msgid "The key file holding widget state data"
-msgstr ""
-
-#: ../shell/e-shell-view.c:826
-msgid "The title of the shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:840
-#, fuzzy
-msgid "Current View ID"
-msgstr "å½?å??è§?å?¾(_C)"
-
-#: ../shell/e-shell-view.c:841
-#, fuzzy
-msgid "The current GAL view ID"
-msgstr "å½?å??æ?¶é?´"
-
#. The translator-credits string is for translators to list
#. * per-language credits for translation, displayed in the
#. * about dialog.
@@ -19735,421 +19148,303 @@ msgstr ""
msgid "Evolution Website"
msgstr "Evolution ç½?ç«?"
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1235
msgid "Bug Buddy is not installed."
msgstr "æ?ªå®?è£? Bug Buddyã??"
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1237
msgid "Bug Buddy could not be run."
msgstr "æ? æ³?è¿?è¡? Bug Buddyã??"
-#: ../shell/e-shell-window-actions.c:1343
-msgid "GNOME Pilot is not installed."
-msgstr "GNOME Pilot 没æ??å®?è£?ã??"
-
-#: ../shell/e-shell-window-actions.c:1345
-msgid "GNOME Pilot could not be run."
-msgstr "GNOME Pilot ä¸?è?½è¿?è¡?ã??"
-
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1418
msgid "Show information about Evolution"
msgstr "æ?¾ç¤ºå?³äº? Evolution ç??ä¿¡æ?¯"
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1437
msgid "_Close Window"
msgstr "å?³é?çª?å?£(_C)"
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1444
msgid "_Contents"
msgstr "��(_C)"
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1446
msgid "Open the Evolution User Guide"
msgstr "æ??å¼? Evolution ç?¨æ?·æ??å??"
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1472
msgid "Evolution _FAQ"
msgstr "Evolution _FAQ"
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1474
msgid "Open the Frequently Asked Questions webpage"
msgstr "æ??å¼? FAQ ç½?页"
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1479
msgid "_Forget Passwords"
msgstr "丢å¼?å¯?ç ?(_F)"
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1481
msgid "Forget all remembered passwords"
msgstr "å¿?è®°æ??æ??è®°ä½?ç??å¯?ç ?"
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1486
msgid "I_mport..."
msgstr "导�(_M)..."
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1488
msgid "Import data from other programs"
msgstr "�����导���"
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1493
msgid "New _Window"
msgstr "�建��(_W)"
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1495
msgid "Create a new window displaying this view"
msgstr "å??建ä¸?个æ?°çª?å?£æ?¥æ?¾ç¤ºè¿?个è§?å?¾"
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1509
msgid "Configure Evolution"
msgstr "é??ç½® Evolution"
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1514
msgid "_Quick Reference"
msgstr "å¿«é??é¦?é??项(_Q)"
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1516
msgid "Show Evolution's shortcut keys"
msgstr "æ?¾ç¤º Evolution ç??å¿«æ?·é?®"
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1523
msgid "Exit the program"
msgstr "é??å?ºç¨?åº?"
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1528
msgid "_Advanced Search..."
msgstr "é«?级æ??ç´¢(_A)..."
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1530
msgid "Construct a more advanced search"
msgstr ""
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1537
#, fuzzy
msgid "Clear the current search parameters"
msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1542
msgid "_Edit Saved Searches..."
msgstr "ç¼?è¾?ä¿?å?ç??æ??ç´¢(_E)..."
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1544
msgid "Manage your saved searches"
msgstr "管ç??æ?¨ä¿?å?ç??æ??ç´¢"
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1551
msgid "Click here to change the search type"
msgstr "å??å?»æ¤å¤?æ?´æ?¹æ??索类å??"
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1556
msgid "_Find Now"
msgstr "����(_F)"
#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1558
msgid "Execute the current search parameters"
msgstr "æ?§è¡?å½?å??æ??ç´¢å??æ?°"
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1563
msgid "_Save Search..."
msgstr "ä¿?å?æ??ç´¢(_S)..."
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1565
msgid "Save the current search parameters"
msgstr "ä¿?å?å½?å??æ??ç´¢å??æ?°"
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1577
msgid "Send / _Receive"
msgstr "å??é??/æ?¥æ?¶(_R)"
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1579
msgid "Send queued items and retrieve new items"
msgstr "å??é??é??å??ä¸ç??ç??é?®ä»¶å¹¶æ?¶å??æ?°é?®ä»¶"
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1584
msgid "Submit _Bug Report..."
msgstr "æ??交é??误æ?¥å??(_B)..."
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1586
msgid "Submit a bug report using Bug Buddy"
msgstr "ç?¨ Bug Buddy æ??交é??误æ?¥å??"
-#: ../shell/e-shell-window-actions.c:1598
-msgid "GNOME Pilot _Synchronization..."
-msgstr "GNOME Pilot å??æ¥(_S)..."
-
-#: ../shell/e-shell-window-actions.c:1600
-msgid "Set up GNOME Pilot configuration"
-msgstr "设置 GNOME Pilot é??ç½®"
-
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1591
msgid "_Work Offline"
msgstr "��工�(_W)"
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1593
msgid "Put Evolution into offline mode"
msgstr "� Evolution 转���模�"
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1598
msgid "_Work Online"
msgstr "è??æ?ºå·¥ä½?(_W)"
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1600
msgid "Put Evolution into online mode"
msgstr "å°? Evolution 转å?¥è??æ?ºæ¨¡å¼?"
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1628
msgid "Lay_out"
msgstr "��(_O)"
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1635
msgid "_New"
msgstr "�建(_N)"
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1642
msgid "_Search"
msgstr "æ??ç´¢(_S)"
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1649
msgid "_Switcher Appearance"
msgstr "å??æ?¢å?¨å¤?è§?(_S)"
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1663
msgid "_Window"
msgstr "��(_W)"
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1692
msgid "Show Side _Bar"
msgstr "æ?¾ç¤ºä¾§è¾¹æ ?(_B)"
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1694
msgid "Show the side bar"
msgstr "æ?¾ç¤ºä¾§è¾¹æ ?"
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1700
msgid "Show _Buttons"
msgstr "æ?¾ç¤ºæ??é?®(_B)"
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1702
msgid "Show the switcher buttons"
msgstr "æ?¾ç¤ºå??æ?¢å?¨æ??é?®"
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1708
msgid "Show _Status Bar"
msgstr "æ?¾ç¤ºç?¶æ??æ ?(_S)"
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1710
msgid "Show the status bar"
msgstr "æ?¾ç¤ºç?¶æ??æ ?"
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1716
msgid "Show _Tool Bar"
msgstr "æ?¾ç¤ºå·¥å?·æ ?(_T)"
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1718
msgid "Show the tool bar"
msgstr "æ?¾ç¤ºå·¥å?·æ ?"
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1740
msgid "_Icons Only"
msgstr "å?ªæ??å?¾æ ?(_I)"
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1742
msgid "Display window buttons with icons only"
msgstr "æ?¾ç¤ºå?ªæ??å?¾æ ?ç??çª?å?£æ??é?®"
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1747
msgid "_Text Only"
msgstr "å?ªæ??æ??å?(_T)"
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1749
msgid "Display window buttons with text only"
msgstr "æ?¾ç¤ºå?ªæ??æ??å?ç??çª?å?£æ??é?®"
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1754
msgid "Icons _and Text"
msgstr "å?¾æ ?å??æ??å?(_A)"
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1756
msgid "Display window buttons with icons and text"
msgstr "æ?¾ç¤ºå¸¦å?¾æ ?å??æ??å?ç??çª?å?£æ??é?®"
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1761
msgid "Tool_bar Style"
msgstr "å·¥å?·æ ?æ ·å¼?(_B)"
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1763
msgid "Display window buttons using the desktop toolbar setting"
msgstr "使ç?¨æ¡?é?¢å·¥å?·æ ?设置æ?¾ç¤ºçª?å?£æ??é?®"
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1771
msgid "Define Views..."
msgstr "����..."
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1773
msgid "Create or edit views"
msgstr "å??建æ??ç¼?è¾?è§?å?¾"
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1778
msgid "Save Custom View..."
msgstr "ä¿?å?å½?å??è§?å?¾..."
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1780
msgid "Save current custom view"
msgstr "ä¿?å?å½?å??è?ªå®?ä¹?è§?å?¾"
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1787
msgid "C_urrent View"
msgstr "å½?å??è§?å?¾(_U)"
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1797
msgid "Custom View"
msgstr "å½?å??è§?å?¾"
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1799
msgid "Current view is a customized view"
msgstr "å½?å??è§?å?¾ä¸ºè?ªå®?ä¹?è§?å?¾"
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1809
#, fuzzy
msgid "Change the page settings for your current printer"
msgstr "设å®?æ?¨å½?å??æ??å?°æ?ºç??页é?¢è®¾ç½®"
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2182
#, c-format
msgid "Switch to %s"
msgstr "å??æ?¢å?° %s"
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2395
msgid "Execute these search parameters"
msgstr ""
#. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:571
+#: ../shell/e-shell-window-private.c:576
#, c-format
msgid "%s - Evolution"
msgstr "%s - Evolution"
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:416
msgid "New"
msgstr "�建"
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr ""
-
-#: ../shell/e-shell-window.c:617
-#, fuzzy
-msgid "Name of the active shell view"
-msgstr "æ?°è§?å?¾ç??å??称ï¼?"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr ""
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:804
-msgid "Geometry"
-msgstr ""
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:805
-msgid "Initial window geometry string"
-msgstr ""
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "��模�"
-
-#: ../shell/e-shell-window.c:663
-#, fuzzy
-msgid "Whether the shell window is in safe mode"
-msgstr "æ??件æ?¯å?¦å·²å?¯ç?¨"
-
-#: ../shell/e-shell-window.c:694
-#, fuzzy
-#| msgid "Sidebar is visible"
-msgid "Sidebar Visible"
-msgstr "侧边æ ?å?¯è§?"
-
-#: ../shell/e-shell-window.c:695
-#, fuzzy
-#| msgid "Whether the switcher is visible"
-msgid "Whether the shell window's side bar is visible"
-msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
-
-#: ../shell/e-shell-window.c:709
-#, fuzzy
-#| msgid "Sidebar is visible"
-msgid "Switcher Visible"
-msgstr "侧边æ ?å?¯è§?"
-
-#: ../shell/e-shell-window.c:710
-#, 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:725
-msgid "Taskbar Visible"
-msgstr "ä»»å?¡æ ?å?¯è§?"
-
-#: ../shell/e-shell-window.c:726
-#, fuzzy
-#| msgid "Whether the switcher is visible"
-msgid "Whether the shell window's task bar is visible"
-msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
-
-#: ../shell/e-shell-window.c:741
-#, fuzzy
-#| msgid "Whether the switcher is visible"
-msgid "Whether the shell window's tool bar is visible"
-msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "UI 管ç??å?¨"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr ""
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:226
msgid "Preparing to go offline..."
msgstr "æ£å?¨å??å¤?离线..."
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:276
msgid "Preparing to go online..."
msgstr "æ£å?¨å??å¤?ä¸?线..."
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:335
msgid "Preparing to quit..."
msgstr "æ£å?¨å??å¤?é??å?º..."
-#: ../shell/e-shell.c:820
-msgid "Module Directory"
-msgstr "模å??ç?®å½?"
-
-#: ../shell/e-shell.c:821
-msgid "The directory from which to load EModules"
-msgstr ""
-
-#: ../shell/e-shell.c:836
-msgid "Network Available"
-msgstr "����"
-
-#: ../shell/e-shell.c:837
-msgid "Whether the network is available"
-msgstr "������"
-
-#: ../shell/e-shell.c:852 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "�线"
-
-#: ../shell/e-shell.c:853
-#, fuzzy
-msgid "Whether the shell is online"
-msgstr "æ??件æ?¯å?¦å·²å?¯ç?¨"
-
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:175
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -20181,7 +19476,7 @@ msgstr ""
"\n"
"æ??们å¸?æ??æ?¨å°½æ??享å??æ??们å?ªå??å·¥ä½?ç??æ??æ??ï¼?æ??们ä¹?ç?å??ç?¼æ??ç??æ?¨ç??æ??è§?ï¼?\n"
-#: ../shell/main.c:192
+#: ../shell/main.c:199
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -20189,7 +19484,7 @@ msgstr ""
"æ??è°¢\n"
"Evolution å?¢é??\n"
-#: ../shell/main.c:199
+#: ../shell/main.c:206
msgid "Do not tell me again"
msgstr "ä¸?è¦?å??é??ç?¥æ??"
@@ -20213,35 +19508,31 @@ msgstr "以â??å¿«é??â??模å¼?å?¯å?¨"
msgid "Forcibly shut down Evolution"
msgstr "强å?¶å?³é?æ??æ?? Evolution"
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "强å?¶ä»? Evolution 1.4 é??æ?°å??è¿?"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:336
msgid "Send the debugging output of all components to a file."
msgstr "æ??æ??æ??æ??å??ç??è°?è¯?è¾?å?ºå??é??å?°ä¸?个æ??件ä¸ã??"
-#: ../shell/main.c:342
+#: ../shell/main.c:338
msgid "Disable loading of any plugins."
-msgstr "ç¦?æ¢è£?å?¥ä»»ä½?æ??件ã??"
+msgstr "ç¦?æ¢è½½å?¥ä»»ä½?æ??件ã??"
-#: ../shell/main.c:344
+#: ../shell/main.c:340
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "ç¦?ç?¨é?®ä»¶ã??è??系人å??ä»»å?¡ç??é¢?è§?é?¢æ?¿ã??"
-#: ../shell/main.c:348
+#: ../shell/main.c:344
msgid "Import URIs or file names given as rest of arguments."
msgstr ""
-#: ../shell/main.c:350
+#: ../shell/main.c:346
msgid "Request a running Evolution process to quit"
msgstr "请æ±?æ£å?¨è¿?è¡?ç?? Evolution è¿?ç¨?é??å?º"
-#: ../shell/main.c:465
+#: ../shell/main.c:469
msgid "- The Evolution PIM and Email Client"
msgstr "- Evolution 个人信æ?¯ç®¡ç??å??é?®ä»¶å®¢æ?·"
-#: ../shell/main.c:491
+#: ../shell/main.c:531
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -20255,90 +19546,41 @@ msgid "Are you sure you want to forget all remembered passwords?"
msgstr "æ?¨ç¡®å®?è¦?å¿?è®°è®°ä½?ç??æ??æ??å¯?ç ?å??ï¼?"
#: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "继ç»"
+#, fuzzy
+msgid "Cannot upgrade directly from version {0}"
+msgstr "å? é?¤ç??æ?¬ {0} ä¸ç??æ?§æ?°æ?®å??ï¼?"
#: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "å? é?¤ç??æ?¬ {0} ä¸ç??æ?§æ?°æ?®å??ï¼?"
+#, fuzzy
+msgid "Continue Anyway"
+msgstr "继ç»"
#: ../shell/shell.error.xml.h:4
msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
"Forgetting your passwords will clear all remembered passwords. You will be "
"reprompted next time they are needed."
msgstr "å¿?è®°æ?¨ç??å¯?ç ?å°?æ¸?é?¤è®°ä½?ç??å?¨é?¨å¯?ç ?ã??ä¸?次é??è¦?å¯?ç ?ç??æ?¶å??ï¼?æ?¨å¿?é¡»é??æ?°è¾?å?¥ã??"
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "ç£?ç??空é?´ä¸?足以è¿?è¡?å??级ã??"
-
#: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "ç??ç??è¦?å? é?¤æ?§æ?°æ?®å??ï¼?"
-
-#: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the "evolution" directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
+msgid "Quit Now"
msgstr ""
-"å?³å°?æ°¸ä¹?å? é?¤â??evolutionâ??ç?®å½?ç??å?¨é?¨å??容ã??\n"
-"\n"
-"æ??们建议æ?¨å?¨å? é?¤æ?§æ?°æ?®ä¹?å??ï¼?æ??å?¨æ£?æ?¥æ?¨å?¨é?¨ç??é?®ä»¶ã??è??系人å??æ?¥å??ä¿¡æ?¯é?½å?å?¨ï¼?并"
-"ä¸?确认æ¤ç??æ?¬ç?? Evolution å·¥ä½?æ£å¸¸ã??\n"
-"\n"
-"å? é?¤ä¹?å??ï¼?æ?¨å°?æ? æ³?é??级è?³å??å??ç??æ?¬ç?? Evolutionï¼?é?¤é??æ?¨æ??å?¨ä»?头æ?¥è¿?ã??\n"
-#: ../shell/shell.error.xml.h:14
-#, fuzzy
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the ""
-"evolution" directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of ""
-"evolution" at your convenience.\n"
-msgstr ""
-"å??å??ç??æ?¬ç?? Evolution å°?å?¶æ?°æ?®å?å?¨å?¨ä¸?å??ç??ä½?ç½®ã??\n"
-"\n"
-"å¦?æ??æ?¨é??æ?©å? é?¤æ¤æ?°æ?®ï¼?â??evolutionâ??ç?®å½?ä¸ç??å?¨é?¨å??容é?½å°?被永ä¹?å? é?¤ã??å¦?æ??æ?¨é??æ?©ä¿?"
-"ç??æ¤æ?°æ?®ï¼?é?£ä¹?æ?¨å?¯ä»¥å?¨æ?¨æ?¹ä¾¿ç??æ?¶å??æ??å?¨å? é?¤â??evolutionâ??ç?®å½?ã??\n"
-
-#: ../shell/shell.error.xml.h:18
+#: ../shell/shell.error.xml.h:8
msgid "Upgrade from previous version failed:"
msgstr "ä»?å??å??ç??æ?¬å??级失败ï¼?"
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"å??级æ?¨ç??æ?°æ?®å??设置é??è¦?å¤?è?³ {0} ç??ç£?ç??空é?´ï¼?ä½?æ?¨ç?°å?¨å?ªæ?? {1}ã??\n"
-"\n"
-"æ?¨é??è¦?å?¨ç»§ç»ä¹?å??å?¨ä¸»ç?®å½?ä¸è?¾å?ºæ?´å¤?空é?´ã??"
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
msgid "_Forget"
msgstr "å¿?è®°(_F)"
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "ä¿?ç??æ?°æ?®(_K)"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "ç¨?å??æ??é??(_R)"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
#, fuzzy
msgid ""
"{0}\n"
@@ -20433,7 +19675,7 @@ msgstr ""
msgid "Show session management options"
msgstr "æ?¾ç¤ºä¼?è¯?管ç??é??项"
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
#, c-format
msgid ""
"Certificate '%s' is a CA certificate.\n"
@@ -20458,66 +19700,80 @@ msgid ""
"unless otherwise indicated here"
msgstr "ç?±äº?æ?¨ä¸?ä¿¡ä»»é¢?å??æ¤è¯?书ç??æ?ºæ??ï¼?æ?¨å°±å°?ä¸?ä¿¡ä»»æ¤è¯?书ç??æ??å¨?æ?§ï¼?é?¤é??å?¨æ¤å£°æ??"
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
msgid "Select a certificate to import..."
msgstr "é??æ?©è¦?导å?¥ç??è¯?书..."
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
msgid "All PKCS12 files"
msgstr "å?¨é?¨ PKCS12 æ??件"
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
msgid "All files"
msgstr "å?¨é?¨æ??件"
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+#, fuzzy
+msgid "Failed to import user's certificate"
+msgstr "导å?¥ç??è¯?书"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
msgid "Certificate Name"
msgstr "è¯?书å??称"
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
msgid "Purposes"
msgstr "ç?¨é??"
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
#: ../smime/lib/e-cert.c:566
msgid "Serial Number"
msgstr "åº?å??å?·"
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
msgid "Expires"
msgstr "å?°æ??"
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
msgid "All email certificate files"
msgstr "æ??æ??ç?µå?é?®ä»¶è¯?书æ??件"
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+#, fuzzy
+msgid "Failed to import contact's certificate"
+msgstr "å? é?¤è??系人失败"
+
+#: ../smime/gui/certificate-manager.c:583
msgid "E-Mail Address"
msgstr "ç?µå?é?®ä»¶å?°å??"
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
msgid "All CA certificate files"
msgstr "å?¨é?¨é¢?è¯?æ?ºæ??æ??件"
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1148
msgid "Certificates"
msgstr "�书"
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
#, c-format
msgid "Certificate Viewer: %s"
msgstr "è¯?书æ?¥ç??å?¨ï¼?%s"
#: ../smime/gui/component.c:46
-#, c-format
-msgid "Enter the password for `%s'"
+#, fuzzy, c-format
+msgid "Enter the password for '%s'"
msgstr "è¾?å?¥â??%sâ??ç??å¯?ç ?"
#. we're setting the password initially
@@ -20548,7 +19804,7 @@ msgstr ""
"å??è¡?è??ï¼?\n"
" 主��%s\n"
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
msgid "Select certificate"
msgstr "é??æ?©è¯?书"
@@ -20561,174 +19817,164 @@ msgid "Authorities"
msgstr "è¯?书é¢?å??æ?ºæ??"
#: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "�份"
-
-#: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
+#, fuzzy
+msgid "Backup _All"
msgstr "���份"
-#: ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/smime-ui.ui.h:4
msgid ""
"Before trusting this CA for any purpose, you should examine its certificate "
"and its policy and procedures (if available)."
msgstr "å?¨ä¿¡ä»»æ¤ CA ç??ä»»ä½?ç?¨é??ä¹?å??ï¼?æ?¨åº?该å??æ£?æ?¥è¯¥è¯?书å??å?¶ç?ç?¥å??è¿?ç¨?(è?¥å?¯ç?¨)ã??"
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
msgid "Certificate"
msgstr "�书"
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
msgid "Certificate Authority Trust"
msgstr "è¯?书é¢?å??æ?ºæ??ä¿¡ä»»"
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
msgid "Certificate Fields"
msgstr "è¯?书å??"
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
msgid "Certificate Hierarchy"
msgstr "�书�次"
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
msgid "Certificate details"
msgstr "è¯?书ç»?è??"
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
msgid "Certificates Table"
msgstr "�书表"
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
msgid "Common Name (CN)"
msgstr "é??ç?¨å??(CN)"
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
msgid "Contact Certificates"
msgstr "è??系人è¯?书"
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
msgid "Do not trust the authenticity of this certificate"
msgstr "ä¸?ä¿¡ä»»æ¤è¯?书ç??é¢?å??æ?ºæ??"
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "ç¼?è¾?"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
msgid "Email Certificate Trust Settings"
msgstr "ç?µå?é?®ä»¶è¯?书信任设置"
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
msgid "Email Recipient Certificate"
msgstr "ç?µå?é?®ä»¶æ?¶ä»¶äººè¯?书"
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
msgid "Email Signer Certificate"
msgstr "ç?µå?é?®ä»¶ç¾å??è??è¯?书"
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
msgid "Expires On"
msgstr "å?°æ??"
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
msgid "Field Value"
msgstr "å??å?¼"
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
msgid "Fingerprints"
msgstr "æ??纹"
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "导�"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
msgid "Issued By"
msgstr "é¢?å??è??"
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
msgid "Issued On"
msgstr "å??è¡?æ?¥æ??"
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
msgid "Issued To"
msgstr "é¢?å??ç»?"
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
msgid "MD5 Fingerprint"
msgstr "MD5 æ??纹"
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
msgid "Organization (O)"
msgstr "ç»?ç»?(O)"
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
msgid "Organizational Unit (OU)"
msgstr "ç»?ç»?å??å??(OU)"
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
msgid "SHA1 Fingerprint"
msgstr "SHA1 æ??纹"
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
msgid "SSL Client Certificate"
msgstr "SSL 客��书"
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
msgid "SSL Server Certificate"
msgstr "SSL æ??å?¡å?¨è¯?书"
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
msgid "This certificate has been verified for the following uses:"
msgstr "æ¤è¯?书已ç»?被ä¸?å??ç?¨æ?·æ??éª?è¯?ï¼?"
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
msgid "Trust the authenticity of this certificate"
msgstr "ä¿¡ä»»æ¤è¯?书ç??é¢?å??æ?ºæ??"
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
msgid "Trust this CA to identify email users."
msgstr "ä¿¡ä»»æ¤é¢?å??æ?ºæ??æ ?è¯?ç??ç?µå?é?®ä»¶ç?¨æ?·ã??"
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
msgid "Trust this CA to identify software developers."
msgstr "ä¿¡ä»»æ¤é¢?å??æ?ºæ??æ ?è¯?ç??软件å¼?å??è??ã??"
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+#, fuzzy
+msgid "Trust this CA to identify websites."
msgstr "ä¿¡ä»»æ¤é¢?å??æ?ºæ??æ ?è¯?ç??ç½?ç«?ã??"
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
msgid "Validity"
msgstr "æ??æ??æ?§"
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "æ?¥ç??"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
msgid "You have certificates from these organizations that identify you:"
msgstr "æ?¨æ?¥æ??è¿?äº?ç»?ç»?è¯?æ??æ?¨èº«ä»½ç??è¯?书ï¼?"
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
msgid ""
"You have certificates on file that identify these certificate authorities:"
msgstr "æ?¨æ?¥æ??è¯?æ??è¿?äº?é¢?å??æ?ºæ??ç??æ??件å??è¯?书ï¼?"
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
msgid "You have certificates on file that identify these people:"
msgstr "æ?¨æ?¥æ??è¯?æ??è¿?äº?人ç??æ??件å??è¯?书ï¼?"
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
msgid "Your Certificates"
msgstr "æ?¨ç??è¯?书"
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+#, fuzzy
+msgid "_Backup"
+msgstr "�份"
+
+#: ../smime/gui/smime-ui.ui.h:44
msgid "_Edit CA Trust"
msgstr "ç¼?è¾? CA ä¿¡ä»»(_E)"
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:906
msgid "Certificate already exists"
msgstr "è¯?书已ç»?å?å?¨"
@@ -20773,125 +20019,146 @@ msgstr "带 RSA å? å¯?ç?? PKCS #1 MD5"
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr "带 RSA å? å¯?ç?? PKCS #1 SHA-1"
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+#, fuzzy
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "带 RSA å? å¯?ç?? PKCS #1 SHA-1"
+
+#: ../smime/lib/e-cert.c:642
+#, fuzzy
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "带 RSA å? å¯?ç?? PKCS #1 SHA-1"
+
+#: ../smime/lib/e-cert.c:645
+#, fuzzy
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "带 RSA å? å¯?ç?? PKCS #1 SHA-1"
+
+#: ../smime/lib/e-cert.c:672
msgid "PKCS #1 RSA Encryption"
msgstr "PKCS #1 RSA å? å¯?"
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
msgid "Certificate Key Usage"
msgstr "è¯?书å¯?é?¥ç?¨é??"
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
msgid "Netscape Certificate Type"
msgstr "Netscape è¯?书类å??"
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
msgid "Certificate Authority Key Identifier"
msgstr "è¯?书é¢?å??å¯?é?¥èº«ä»½"
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
#, c-format
msgid "Object Identifier (%s)"
msgstr "对象æ ?è¯?符(%s)"
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
msgid "Algorithm Identifier"
msgstr "ç®?æ³?æ ?è¯?符"
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
msgid "Algorithm Parameters"
msgstr "ç®?æ³?å??æ?°"
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
msgid "Subject Public Key Info"
msgstr "主���信�"
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
msgid "Subject Public Key Algorithm"
msgstr "主�����"
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
msgid "Subject's Public Key"
msgstr "主���"
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
msgid "Error: Unable to process extension"
msgstr "é??误ï¼?æ? æ³?å¤?ç??æ?©å±?"
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
msgid "Object Signer"
msgstr "对象ç¾å??è??"
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
msgid "SSL Certificate Authority"
msgstr "SSL è¯?书é¢?å??æ?ºæ??"
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
msgid "Email Certificate Authority"
msgstr "ç?µå?é?®ä»¶è¯?书é¢?å??æ?ºæ??"
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
msgid "Signing"
msgstr "ç¾å??"
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
msgid "Non-repudiation"
msgstr "����"
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
msgid "Key Encipherment"
msgstr "å¯?é?¥ç¼?ç ?å?¨"
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
msgid "Data Encipherment"
msgstr "æ?°æ?®ç¼?ç ?å?¨"
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
msgid "Key Agreement"
msgstr "å¯?é?¥å??è®®"
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
msgid "Certificate Signer"
msgstr "è¯?书ç¾å??è??"
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
msgid "CRL Signer"
msgstr "CRL ç¾å??è??"
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
msgid "Critical"
msgstr "��"
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
msgid "Not Critical"
msgstr "é??å?³é?®"
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
msgid "Extensions"
msgstr "æ?©å±?"
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
msgid "Certificate Signature Algorithm"
msgstr "è¯?书ç¾å??ç®?æ³?"
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
msgid "Issuer"
msgstr "å??è¡?è??"
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
msgid "Issuer Unique ID"
msgstr "å??è¡?è??å?¯ä¸? ID"
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
msgid "Subject Unique ID"
msgstr "主��� ID"
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
msgid "Certificate Signature Value"
msgstr "è¯?书ç¾å??å?¼"
@@ -20965,7 +20232,7 @@ msgstr "对宽���(_W)"
#: ../views/mail/galview.xml.h:8
msgid "_Messages"
-msgstr "信件(_M)"
+msgstr "ä¿¡æ?¯(_M)"
#: ../views/memos/galview.xml.h:1
msgid "_Memos"
@@ -20980,11 +20247,11 @@ msgid "With _Status"
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: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
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
msgid "UTC"
msgstr "UTC"
@@ -21013,19 +20280,14 @@ msgstr ""
msgid "_Selection"
msgstr "é??æ?©(_S)"
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "æ?¶è??"
-
-#: ../widgets/menus/gal-define-views-dialog.c:332
+#: ../widgets/menus/gal-define-views-dialog.c:346
#: ../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:340
-#: ../widgets/menus/gal-define-views-dialog.c:342
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
msgid "Define Views"
msgstr "����"
@@ -21038,11 +20300,7 @@ msgstr "å®?ä¹?â??%sâ??ç??è§?å?¾"
msgid "Table"
msgstr "è¡¨æ ¼"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "å®?ä¾?"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
msgid "Save Current View"
msgstr "ä¿?å?å½?å??è§?å?¾"
@@ -21054,11 +20312,7 @@ msgstr "å??建æ?°è§?å?¾(_C)"
msgid "_Replace existing view"
msgstr "æ?¿æ?¢ç?°æ??è§?å?¾(_R)"
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "å·¥å??"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
msgid "Define New View"
msgstr "�����"
@@ -21078,22 +20332,10 @@ msgstr "è§?å?¾ç±»å??ï¼?"
msgid "De_fault"
msgstr "�认(_F)"
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "è´¦æ?·å??"
-
#: ../widgets/misc/e-account-tree-view.c:255
msgid "Protocol"
msgstr "å??è®®"
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "活�"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr ""
-
#: ../widgets/misc/e-attachment-dialog.c:305
msgid "Attachment Properties"
msgstr "é??件å±?æ?§"
@@ -21111,11 +20353,11 @@ msgstr "MIME ç±»å??ï¼?"
msgid "_Suggest automatic display of attachment"
msgstr "建议è?ªå?¨æ?¾ç¤ºé??件(_S)"
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
msgid "Could not set as background"
msgstr "ä¸?è?½è®¾ç½®ä¸ºè??æ?¯"
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
msgid "Set as _Background"
msgstr "设为è??æ?¯(_B)"
@@ -21133,13 +20375,13 @@ msgstr "å??é??å?°(_S)..."
msgid "Send the selected attachments somewhere"
msgstr "é??æ?©ä¿?å?é??ä¸é??件ç??æ??件夹..."
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
msgid "Loading"
-msgstr "��"
+msgstr "载�"
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
msgid "Saving"
msgstr "ä¿?å?"
@@ -21148,13 +20390,10 @@ msgid "Hide Attachment _Bar"
msgstr "é??è??é??件æ ?(_B)"
#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:605
msgid "Show Attachment _Bar"
msgstr "æ?¾ç¤ºé??件æ ?(_B)"
-#: ../widgets/misc/e-attachment-paned.c:636
-msgid "Show _Attachment Bar"
-msgstr "æ?¾ç¤ºé??件æ ?(_A)"
-
#: ../widgets/misc/e-attachment-store.c:538
msgid "Add Attachment"
msgstr "æ·»å? é??件"
@@ -21170,32 +20409,32 @@ msgstr[0] "ä¿?å?é??件"
#. Translators: Default attachment filename.
#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
msgid "attachment.dat"
msgstr "attachment.dat"
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:301
msgid "S_ave All"
msgstr "å?¨é?¨ä¿?å?(_A)"
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:327
msgid "A_dd Attachment..."
msgstr "æ·»å? é??件(_D)..."
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:351
msgid "_Hide"
msgstr "é??è??(_H)"
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:358
msgid "_View Inline"
msgstr "����(_V)"
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:640
#, c-format
msgid "Open with \"%s\""
msgstr "使ç?¨â??%sâ??æ??å¼?"
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:643
#, c-format
msgid "Open this attachment in %s"
msgstr "å?¨ %s ä¸æ??å¼?é??件"
@@ -21204,59 +20443,59 @@ msgstr "å?¨ %s ä¸æ??å¼?é??件"
#. * 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
+#: ../widgets/misc/e-attachment.c:1021
msgid "Attached message"
msgstr "é??å? ç??ä¿¡æ?¯"
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
msgid "A load operation is already in progress"
msgstr "ä¸?个已ç»?å? è½½ç??æ??ä½?æ£å?¨è¿?è¡?"
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
msgid "A save operation is already in progress"
msgstr "个已ç»?ä¿?å?ç??æ??ä½?æ£å?¨è¿?è¡?"
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1949
#, c-format
msgid "Could not load '%s'"
msgstr "ä¸?è?½å? è½½â??%sâ??"
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1952
#, c-format
msgid "Could not load the attachment"
msgstr "ä¸?è?½å? è½½é??件"
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2228
#, c-format
msgid "Could not open '%s'"
msgstr "ä¸?è?½æ??å¼?â??%sâ??"
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2231
#, c-format
msgid "Could not open the attachment"
msgstr "ä¸?è?½æ??å¼?é??件"
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2666
msgid "Attachment contents not loaded"
-msgstr "é??件å??容æ?ªè£?å?¥"
+msgstr "é??件å??容æ?ªè½½å?¥"
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2742
#, c-format
msgid "Could not save '%s'"
msgstr "ä¸?è?½ä¿?å?â??%sâ??"
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2745
#, c-format
msgid "Could not save the attachment"
msgstr "æ? æ³?ä¿?å?é??件"
#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
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:1249
+#: ../widgets/misc/e-calendar-item.c:1255
msgid "%B %Y"
msgstr "%Yå¹´%B"
@@ -21264,65 +20503,6 @@ msgstr "%Yå¹´%B"
msgid "Month Calendar"
msgstr "æ??å??"
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "å¡«å??é¢?è?²"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK å¡«å??é¢?è?²"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "ç?¹ç»?å¡«å??"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "æ??å°?宽度"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "æ??å°?宽度"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "é?´è·?"
-
#: ../widgets/misc/e-charset-combo-box.c:93
msgid "Character Encoding"
msgstr "å?符ç¼?ç ?"
@@ -21335,91 +20515,88 @@ msgstr "è¾?å?¥è¦?使ç?¨ç??å?符é??"
msgid "Other..."
msgstr "��..."
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
msgid "Date and Time"
msgstr "æ?¥æ??å??æ?¶é?´"
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
msgid "Text entry to input date"
msgstr "è¾?å?¥æ?¥æ??ç??æ??æ?¬æ¡?"
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
msgid "Click this button to show a calendar"
msgstr "å??å?»æ¤æ??é?®å?¯æ?¾ç¤ºæ?¥å??"
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
msgid "Drop-down combination box to select time"
msgstr "é??æ?©æ?¶é?´ç??ç»?å??æ¡?"
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
msgid "No_w"
msgstr "ç?°å?¨(_W)"
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
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:698
+#: ../widgets/misc/e-dateedit.c:677
msgid "_None"
msgstr "æ? (_N)"
#. 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:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
msgctxt "date"
msgid "None"
msgstr "æ? "
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
msgid "Invalid Date Value"
msgstr "æ? æ??ç??æ?¥æ??å?¼"
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
msgid "Invalid Time Value"
msgstr "æ? æ??ç??æ?¶é?´å?¼"
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:242
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:255
+#: ../widgets/misc/e-import-assistant.c:259
msgid "F_ilename:"
msgstr "æ??件å??(_I)ï¼?"
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:269
msgid "Select a file"
msgstr "é??æ?©ä¸?个æ??件"
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:283
+#: ../widgets/misc/e-import-assistant.c:458
msgid "File _type:"
msgstr "æ??件类å??(_T)ï¼?"
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:326
+#: ../widgets/misc/e-import-assistant.c:909
msgid "Choose the destination for this import"
msgstr "é??æ?©æ¤å¯¼å?¥ç??ç?®ç??ä½?ç½®"
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:351
msgid "Choose the type of importer to run:"
msgstr "é??æ?©è¦?è¿?è¡?ç??导å?¥å?¨ç±»å??ï¼?"
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:359
msgid "Import data and settings from _older programs"
msgstr "ä»?æ?§ç??ç¨?åº?ä¸å¯¼å?¥æ?°æ?®å??设置(_O)"
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:367
msgid "Import a _single file"
msgstr "导å?¥å??个æ??件(_S)"
-#: ../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:516
+#: ../widgets/misc/e-import-assistant.c:519
#, fuzzy
msgid ""
"Evolution checked for settings to import from the following applications: "
@@ -21430,17 +20607,40 @@ msgstr ""
"iCalendarã??并æ?ªå??ç?°å?¯å¯¼å?¥ç??设置ã??å¦?æ??æ?¨æ?³è¦?å??è¯?ä¸?次ï¼?请å??å?»\n"
"â??ä¸?ä¸?æ¥â??æ??é?®ã??\n"
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:766
+#, fuzzy
+msgid "_Cancel Import"
+msgstr "å??æ¶?"
+
+#: ../widgets/misc/e-import-assistant.c:908
+#, fuzzy
+msgid "Preview data to be imported"
+msgstr "é¢?è§?è¦?æ??å?°ç??ä¿¡æ?¯"
+
+#: ../widgets/misc/e-import-assistant.c:914
+#: ../widgets/misc/e-import-assistant.c:927
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1342
+#: ../widgets/misc/e-import-assistant.c:1351
+msgid "Import Data"
+msgstr "导���"
+
+#: ../widgets/misc/e-import-assistant.c:922
+msgid "Select what type of file you want to import from the list."
+msgstr ""
+
+#: ../widgets/misc/e-import-assistant.c:1268
+#: ../widgets/misc/e-import-assistant.c:1300
msgid "Evolution Import Assistant"
msgstr "Evolution 导å?¥å?©æ??"
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1330
msgid "Import Location"
msgstr "导��置"
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1294
msgid ""
"Welcome to the Evolution Import Assistant.\n"
"With this assistant you will be guided through the process of importing "
@@ -21449,32 +20649,27 @@ msgstr ""
"欢è¿?使ç?¨ Evolution 导å?¥å?©æ??ã??\n"
"æ?¬å?©æ??å°?å?¨ç¨?æ??导æ?¨å°?å¤?é?¨æ??件导å?¥ Evolutionã??"
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1308
msgid "Importer Type"
msgstr "导å?¥å?¨ç±»å??"
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1316
msgid "Select Information to Import"
msgstr "é??æ?©è¦?导å?¥ç??ä¿¡æ?¯"
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1323
msgid "Select a File"
msgstr "é??æ?©ä¸?个æ??件"
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1337
msgid "Click \"Apply\" to begin importing the file into Evolution."
msgstr "å??å?»â??åº?ç?¨â??以便å¼?å§?å°?æ??件导å?¥å?° Evolutionã??"
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "导���"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
msgid "World Map"
msgstr "ä¸?ç??å?°å?¾"
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should instead select the timezone from the drop-down combination box below."
@@ -21494,61 +20689,7 @@ msgstr "Evolution ç?®å??è?±æ?ºã??å??å?»è¯¥æ??é?®å?¯è??æ?ºå·¥ä½?ã??"
msgid "Evolution is currently offline because the network is unavailable."
msgstr "å? 为ç½?ç»?ä¸?å?¯ç?¨ï¼?æ??以 Evolution ç?®å??è?±æ?ºã??"
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "æ??é?®ç?¶æ??为å?¨çº¿"
-
-#: ../widgets/misc/e-paned.c:306
-#, fuzzy
-msgid "Horizontal Position"
-msgstr "水平���置"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:318
-#, fuzzy
-msgid "Vertical Position"
-msgstr "å??ç?´é?¢æ?¿ç??ä½?ç½®"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr ""
-
-#: ../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:103
-msgid "Sync Private Records:"
-msgstr "å??æ¥ç§?æ??è®°å½?ï¼?"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "å??æ¥ç±»å?«ï¼?"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:266
msgid "Evolution Preferences"
msgstr "Evolution é¦?é??项"
@@ -21557,68 +20698,46 @@ msgstr "Evolution é¦?é??项"
msgid "Matches: %d"
msgstr "å?¹é??ï¼?%d"
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
msgid "Close the find bar"
msgstr "å?³é?æ?¥æ?¾æ ?"
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
msgid "Fin_d:"
msgstr "��(_D)�"
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
msgid "Clear the search"
msgstr "æ¸?é?¤æ??ç´¢"
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
msgid "_Previous"
msgstr "��项(_P)"
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
msgid "Find the previous occurrence of the phrase"
msgstr "寻æ?¾è¯¥è¯?å?¥å?ºç?°ç??å??ä¸?个ä½?ç½®"
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
msgid "_Next"
msgstr "��项(_N)"
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
msgid "Find the next occurrence of the phrase"
msgstr "寻æ?¾è¯¥è¯?å?¥å?ºç?°ç??ä¸?ä¸?个ä½?ç½®"
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
msgid "Mat_ch case"
msgstr "大å°?å??å?¹é??(_C)"
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
msgid "Reached bottom of page, continued from top"
msgstr "å?°è¾¾é¡µé?¢åº?é?¨ï¼?移å?°é¡¶é?¨ç»§ç»"
-#: ../widgets/misc/e-search-bar.c:683
+#: ../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"
-msgstr "å??æ ?è¡?"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "å??æ ?å??"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "æ??åº?"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "é??æ?©æ¨¡å¼?"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "å??æ ?模å¼?"
-
#: ../widgets/misc/e-send-options.c:515
msgid "When de_leted:"
msgstr "å? é?¤æ?¶(_L)ï¼?"
@@ -21649,8 +20768,7 @@ msgstr "常è§?é??项(_R)"
#: ../widgets/misc/e-send-options.ui.h:10
msgid "Mail Receipt"
-msgstr ""
-"é??读æ?¶æ?¡"
+msgstr "é??读æ?¶æ?¡"
#: ../widgets/misc/e-send-options.ui.h:14
msgid "Proprietary"
@@ -21692,43 +20810,48 @@ msgstr "å®?æ??æ?¶(_M)ï¼?"
msgid "When decli_ned:"
msgstr "æ??ç»?æ?¶(_N)ï¼?"
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
msgid "Wi_thin"
msgstr "��(_T)"
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+#, fuzzy
+msgid "_After"
msgstr "ä¹?å??(_A)ï¼?"
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
msgid "_All information"
msgstr "��信�(_A)"
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
msgid "_Classification:"
msgstr "å??ç±»(_C)ï¼?"
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
msgid "_Delay message delivery"
-msgstr "æ?¨è¿?信件æ??é??(_D)"
+msgstr "æ?¨è¿?ä¿¡æ?¯æ??é??(_D)"
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
msgid "_Delivered"
msgstr "å·²æ??é??(_D)"
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
msgid "_Set expiration date"
msgstr "设置è¿?æ??æ?¶é?´(_S)"
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+#, fuzzy
+msgid "_Until"
msgstr "ç?´å?°(_U)ï¼?"
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
msgid "_When convenient"
msgstr "�便�(_W)"
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
msgid "_When opened:"
msgstr "æ??å¼?æ?¶(_W)ï¼?"
@@ -21785,41 +20908,41 @@ msgstr "è??æ?¬æ??件å¿?é¡»å?¯æ?§è¡?ã??"
msgid "Click here to go to URL"
msgstr "å??å?»æ¤å¤?转å?° URL"
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:369
msgid "_Copy Link Location"
msgstr "�����置(_C)"
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:371
msgid "Copy the link to the clipboard"
msgstr "�������贴�"
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:379
msgid "_Open Link in Browser"
msgstr "å?¨æµ?è§?å?¨ä¸æ??å¼?é?¾æ?¥(_O)"
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:381
msgid "Open the link in a web browser"
msgstr "å?¨æµ?è§?å?¨ä¸æ??å¼?é?¾æ?¥"
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:389
msgid "_Copy Email Address"
msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??(_C)"
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
msgid "Select all text and images"
msgstr "é??ä¸å?¨é?¨æ??æ?¬å??å?¾å??"
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
+#: ../widgets/misc/e-web-view.c:854
#, c-format
msgid "Click to call %s"
msgstr "å??å?»ä»¥å?¼å?« %s"
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:856
msgid "Click to hide/unhide addresses"
msgstr "å??å?»å?¯é??è??/æ?¾ç¤ºå?°å??"
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:858
#, c-format
msgid "Click to open %s"
msgstr "å??å?»ä»¥æ??å¼? %s"
@@ -21838,7 +20961,7 @@ msgstr "æ?¥å??ï¼?ä»? %s å?° %s"
msgid "evolution calendar item"
msgstr "Evolution æ?¥å??项ç?®"
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
msgid "popup list"
msgstr "å¼¹å?ºå??表"
@@ -21856,7 +20979,7 @@ msgstr "æ? "
msgid "OK"
msgstr "确�"
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
#, c-format
msgid "The time must be in the format: %s"
msgstr "æ?¶é?´å¿?é¡»é??ç?¨æ ¼å¼?ï¼?%s"
@@ -21865,48 +20988,12 @@ msgstr "æ?¶é?´å¿?é¡»é??ç?¨æ ¼å¼?ï¼?%s"
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "ç?¾å??æ¯?å?¼å¿?é??å?¨ 0 å?° 100 ä¹?é?´ï¼?å?« 0 å?? 100"
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "é??ä¸å??"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "è??ç?¦å??"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "æ?ªé??å??"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "ç»?å??å? å? é?¤çº¿"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "ç»?å??å? ä¸?å??线"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "ç»?å??å? ç²?"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "ç»?å??ç??è?²"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "ç»?å??ç??è??æ?¯è?²"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
msgid "click to add"
msgstr "å??å?»å?¯æ·»å? "
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "ç?¶æ??"
-
#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
msgid "(Ascending)"
msgstr "(å??åº?)"
@@ -21923,12 +21010,12 @@ msgstr "æ?ªæ??åº?"
msgid "No grouping"
msgstr "æ?ªå??ç»?"
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
#: ../widgets/table/e-table-config.ui.h:11
msgid "Show Fields"
msgstr "æ?¾ç¤ºå??"
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
msgid "Available Fields"
msgstr "å?¯ç?¨å??"
@@ -21937,7 +21024,7 @@ msgid "A_vailable Fields:"
msgstr "å?¯ç?¨å??(_V)ï¼?"
#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
msgid "Ascending"
msgstr "å??åº?"
@@ -21950,7 +21037,7 @@ msgid "Clear _All"
msgstr "����(_A)"
#: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
msgid "Descending"
msgstr "é??åº?"
@@ -22010,9 +21097,8 @@ msgstr "æ??顺åº?æ?¾ç¤ºè¿?äº?å??(_S)ï¼?"
msgid "_Sort..."
msgstr "æ??åº?(_S)..."
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
#, fuzzy
-#| msgid "Add a C_olumn..."
msgid "Add a Column"
msgstr "æ·»å? ä¸?å??(_O)..."
@@ -22022,246 +21108,110 @@ msgid ""
"the location in which you want it to appear."
msgstr "è¦?å?¨æ?¨ç??è¡¨æ ¼ä¸æ·»å? å??ï¼?请å°?å?¶æ??æ?³å?°æ?¨æ?³è¦?å?¶å?ºç?°ç??ä½?ç½®ã??"
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, fuzzy, 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:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
#, c-format
msgid "%s (%d item)"
msgid_plural "%s (%d items)"
msgstr[0] "%s (%d 项)"
-#: ../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:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "交���"
-
-#: ../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:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "æ°´å¹³ç»?å?¶ç½?æ ¼"
-
-#: ../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:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "å??ç?´ç»?å?¶ç½?æ ¼"
-
-#: ../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:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "����"
-
-#: ../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:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "å??æ ?模å¼?"
-
-#: ../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:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "é??æ?©æ¨¡å??"
-
-#: ../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:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "é?¿åº¦é??å?¼"
-
-#: ../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:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "����"
-
-#: ../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:1487
+#: ../widgets/table/e-table-header-item.c:1546
msgid "Customize Current View"
msgstr "è?ªå®?ä¹?å½?å??è§?å?¾"
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1567
msgid "Sort _Ascending"
msgstr "å??åº?æ??åº?(_A)"
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1570
msgid "Sort _Descending"
msgstr "é??åº?æ??åº?(_D)"
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1573
msgid "_Unsort"
msgstr "æ?ªæ??åº?(_U)"
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1576
msgid "Group By This _Field"
msgstr "æ??该å??å??ç»?(_F)"
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1579
msgid "Group By _Box"
msgstr "æ??æ?¹æ¡?å??ç»?(_B)"
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1583
msgid "Remove This _Column"
msgstr "å? é?¤è¯¥å??(_C)"
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1586
msgid "Add a C_olumn..."
msgstr "æ·»å? ä¸?å??(_O)..."
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1590
msgid "A_lignment"
msgstr "对�(_L)"
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1593
msgid "B_est Fit"
msgstr "æ??ä½³å?¹é??(_E)"
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1596
msgid "Format Column_s..."
msgstr "æ ¼å¼?å??å??(_S)..."
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1600
msgid "Custo_mize Current View..."
msgstr "è?ªå®?ä¹?å½?å??è§?å?¾(_M)..."
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1659
msgid "_Sort By"
msgstr "æ??åº?æ?¹å¼?(_S)"
#. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1677
msgid "_Custom"
msgstr "���(_C)"
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "表头"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "è¡¨æ ¼æ¨¡å??"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "å??æ ?è¡?"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "æ??åº?ä¿¡æ?¯"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "æ?»æ?¯æ??ç´¢"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "å??å?»å?¯æ·»å? "
-
-#: ../widgets/table/e-table.c:3374
-#, fuzzy
-msgid "Vertical Row Spacing"
-msgstr "æ ?è¯?å?¨é?´è·?"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree è¡¨æ ¼é??é??å?¨"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "ç?«ç®å¤?è§?"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "ç»?å?¶è¡?å?? +/- æ?©å±?æ??ã??"
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "���大�"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "æ?©å±?å?¨ç®å¤´ç??大å°?"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "弹�"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
msgid "popup a child"
msgstr "å¼¹å?ºå?对象"
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "ç¼?è¾?"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
msgid "begin editing this cell"
msgstr "å¼?å§?ç¼?è¾?æ¤å??å??æ ¼"
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "å??æ?¢"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
msgid "toggle the cell"
msgstr "å??æ?¢å??å??æ ¼"
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "å±?å¼?"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
msgid "expands the row in the ETree containing this cell"
msgstr "å?¨å??å?«æ¤å??å??æ ¼ç?? ETree ä¸å±?å¼?è¡?"
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "æ??å? "
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
msgid "collapses the row in the ETree containing this cell"
msgstr "å?¨å??å?«æ¤å??å??æ ¼ç?? ETree ä¸æ??å? è¡?"
@@ -22277,115 +21227,1106 @@ msgstr "å??å?»"
msgid "sort"
msgstr "æ??åº?"
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2533
msgid "Select All"
msgstr "å?¨é??"
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2545
msgid "Input Methods"
msgstr "���"
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "äº?件å¤?ç??å?¨"
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Default Sync Address:"
+#~ msgstr "é»?认å??æ¥å?°å??ï¼?"
+
+#~ msgid "Could not load address book"
+#~ msgstr "æ? æ³?è½½å?¥å?°å??ç°¿"
+
+#~ msgid "Could not read pilot's Address application block"
+#~ msgstr "æ? æ³?读å?¥ Pilot ç??å?°å??åº?ç?¨ç¨?åº?å??"
+
+#~ msgid "Web Log:"
+#~ msgstr "�����"
+
+#~ msgid "_Web Log:"
+#~ msgstr "_Web ���"
+
+#~ msgid "Editable"
+#~ msgstr "���"
+
+#~ msgid "Source Book"
+#~ msgstr "æ?¥æº?å?°å??ç°¿"
+
+#~ msgid "Target Book"
+#~ msgstr "ç?®æ ?å?°å??ç°¿"
+
+#~ msgid "Is New Contact"
+#~ msgstr "为æ?°è??系人"
+
+#~ msgid "Writable Fields"
+#~ msgstr "å?¯å??å??"
+
+#~ msgid "Required Fields"
+#~ msgstr "å¿?é??å??"
+
+#~ msgid "Changed"
+#~ msgstr "已��"
+
+#~ msgid "Shell"
+#~ msgstr "�壳"
+
+#~ msgid "The EShell singleton"
+#~ msgstr "EShell ç??ä¸?个"
+
+#~ msgid "Book"
+#~ msgstr "å?°å??ç°¿"
+
+#~ msgid "Is New List"
+#~ msgstr "为æ?°å??表"
+
+#~ msgid "Query"
+#~ msgstr "�询"
+
+#~ msgid "Model"
+#~ msgstr "模å??"
+
+#~ msgid "Shell View"
+#~ msgstr "�壳��"
+
+#~ msgid "Source"
+#~ msgstr "��"
+
+#~ msgid "Width"
+#~ msgstr "宽度"
+
+#~ msgid "Height"
+#~ msgstr "�度"
+
+#~ msgid "Has Focus"
+#~ msgstr "æ??ç?¦ç?¹"
+
+#~ msgid "Field"
+#~ msgstr "å??"
+
+#~ msgid "Field Name"
+#~ msgstr "å??å??"
+
+#~ msgid "Text Model"
+#~ msgstr "æ??å?模å??"
+
+#~ msgid "Max field name length"
+#~ msgstr "æ??大å??å??é?¿åº¦"
+
+#~ msgid "Column Width"
+#~ msgstr "å??宽"
+
+#~ msgid "Adapter"
+#~ msgstr "é??é??å?¨"
+
+#~ msgid "Selected"
+#~ msgstr "å·²é??æ?©"
+
+#~ msgid "Has Cursor"
+#~ msgstr "æ??å??æ ?"
+
+#~ msgid "Success"
+#~ msgstr "æ??å??"
+
+#~ msgid "Backend busy"
+#~ msgstr "å??å?°å¿?"
+
+#~ msgid "Repository offline"
+#~ msgstr "����"
+
+#~ msgid "Address Book does not exist"
+#~ msgstr "å?°å??ç°¿ä¸?å?å?¨"
+
+#~ msgid "No Self Contact defined"
+#~ msgstr "æ?ªå®?ä¹?è?ªèº«è??系人"
+
+#~ msgid "Permission denied"
+#~ msgstr "没æ??æ??é??"
+
+#~ msgid "Contact not found"
+#~ msgstr "æ?¾ä¸?å?°è??系人"
+
+#~ msgid "Contact ID already exists"
+#~ msgstr "è??系人 ID å·²ç»?å?å?¨"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "ä¸?æ?¯æ??ç??å??è®®"
+
+#~ msgid "Could not cancel"
+#~ msgstr "æ? æ³?å??æ¶?"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "认�失败"
+
+#~ msgid "Authentication Required"
+#~ msgstr "�须认�"
+
+#~ msgid "TLS not Available"
+#~ msgstr "TLS ���"
+
+#~ msgid "No such source"
+#~ msgstr "没æ??æ?¥æº?"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "��模�����"
+
+#~ msgid "Other error"
+#~ msgstr "å?¶å®?é??误"
+
+#~ msgid "Invalid server version"
+#~ msgstr "æ? æ??ç??æ??å?¡å?¨ç??æ?¬"
+
+#~ msgid "Unsupported authentication method"
+#~ msgstr "ä¸?æ?¯æ??ç??认è¯?æ?¹å¼?"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "æ?¥å??ä»?åº?è?±æ?ºã??"
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "{0} å?ºé??"
+
+#~ msgid "No response from the server."
+#~ msgstr "æ??å?¡å?¨æ? å??åº?ã??"
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "æ? æ³?è½½å?¥æ?¥å??"
+
+#~ msgid "{0}."
+#~ msgstr "{0}ã??"
+
+#~ msgid "Split Multi-Day Events:"
+#~ msgstr "å??å?²å¤?æ?¥äº?件ï¼?"
+
+#~ msgid "Could not start evolution-data-server"
+#~ msgstr "æ? æ³?å?¯å?¨ evolution-data-server"
+
+#~ msgid "Could not read pilot's Calendar application block"
+#~ msgstr "æ? æ³?读å?¥ Pilot æ?¥å??åº?ç?¨ç¨?åº?å??"
+
+#~ msgid "Could not read pilot's Memo application block"
+#~ msgstr "æ? æ³?读å?¥ Pilot ç??å¤?å¿?åº?ç?¨ç¨?åº?å??"
+
+#~ msgid "Could not write pilot's Memo application block"
+#~ msgstr "æ? æ³?å??å?¥ Pilot å¤?å¿?åº?ç?¨ç¨?åº?å??"
+
+#~ msgid "Default Priority:"
+#~ msgstr "é»?认ä¼?å??级ï¼?"
+
+#~ msgid "Could not read pilot's ToDo application block"
+#~ msgstr "æ? æ³?读å?¥ Pilot ToDo åº?ç?¨ç¨?åº?å??"
+
+#~ msgid "Could not write pilot's ToDo application block"
+#~ msgstr "æ? æ³?å??å?¥ Pilot ToDo åº?ç?¨ç¨?åº?å??"
+
+#~ msgid "Show week numbers in date navigator"
+#~ msgstr "å?¨æ?¥æ??导è?ªå?¨ä¸æ?¾ç¤ºå?¨æ?°"
+
+#~ msgid "Whether to show week number in the Day and Work Week View."
+#~ msgstr "æ?¯å?¦å?¨æ?¥è§?å?¾å??å·¥ä½?æ?¥è§?å?¾ä¸æ?¾ç¤ºå?¨æ?°ã??"
+
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr "å?¨æ?¥è§?å?¾å??å·¥ä½?æ?¥è§?å?¾ä¸æ?¾ç¤ºå?¨æ?°(_U)"
+
+#~ msgid "Save"
+#~ msgstr "ä¿?å?"
+
+#~ msgid "The event could not be deleted due to a corba error"
+#~ msgstr "æ? æ³?å? é?¤äº?件ï¼?å??å? æ?¯ corba é??误"
+
+#~ msgid "The task could not be deleted due to a corba error"
+#~ msgstr "æ? æ³?å? é?¤ä»»å?¡ï¼?å??å? æ?¯ corba é??误"
+
+#~ msgid "The memo could not be deleted due to a corba error"
+#~ msgstr "æ? æ³?å? é?¤å¤?å¿?ï¼?å??å? æ?¯ corba é??误"
+
+#~ msgid "The item could not be deleted due to a corba error"
+#~ msgstr "æ? æ³?å? é?¤é¡¹ç?®ï¼?å??å? æ?¯ corba é??误"
+
+#~ msgid "Appoint_ment"
+#~ msgstr "约�(_M)"
+
+#~ msgid "Attendee_s..."
+#~ msgstr "å?ºå¸è??(_S)..."
+
+#~ msgid "_Task"
+#~ msgstr "任�(_T)"
+
+#~ msgid "Default Client"
+#~ msgstr "�认客�端"
+
+#~ msgid "Shell Settings"
+#~ msgstr "�壳设置"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "����级设置"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "å?ºå¸è??(_T)..."
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "é??æ?©ä»?天(_S)"
+
+#~ msgid "_From Field"
+#~ msgstr "å??件人å??(_F)"
+
+#~ msgid "Toggles whether the From chooser is displayed"
+#~ msgstr "æ?¯å?¦æ?¾ç¤ºå??件人é??æ?©å?¨"
+
+#~ msgid "Show"
+#~ msgstr "�示"
+
+#~ msgid "Hide"
+#~ msgstr "é??è??"
+
+#~ msgid "address card"
+#~ msgstr "å?°å??å?¡"
+
+#~ msgid "calendar information"
+#~ msgstr "æ?¥å??ä¿¡æ?¯"
+
+#, fuzzy
+#~ msgid "Name of the logger"
+#~ msgstr "è®°å½?æ?¥å¿?ç??ç»?件å??称"
+
+#~ msgid "Filename"
+#~ msgstr "æ??件å??"
+
+#, fuzzy
+#~ msgid "The filename of the module"
+#~ msgstr "æ?´æ?¹æ¤æ??件夹ç??å??称"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "æ??件æ?¯å?¦å·²å?¯ç?¨"
+
+#~ msgid "Could not parse PGP message: Unknown error"
+#~ msgstr "æ? æ³?解æ?? PGP ä¿¡æ?¯ï¼?æ?ªç?¥é??误"
+
+#, fuzzy
+#~ msgid "Shell Module"
+#~ msgstr "é??æ?©æ¨¡å¼?"
+
+#~ msgid "Show Deleted"
+#~ msgstr "æ?¾ç¤ºå? é?¤ç??"
+
+#~ msgid "To Do"
+#~ msgstr "å¾?å??"
+
+#~ msgid "Later"
+#~ msgstr "ç¨?å??"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "æ? æ³?å??建æ?°æ??件夹â??%sâ??ï¼?%s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "æ? æ³?å°?æ??件夹â??%sâ??å¤?å?¶ä¸ºâ??%sâ??ï¼?%s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "æ? æ³?æ?«æ??ä½?äº?â??%sâ??ç??å·²æ??é?®ç®±ï¼?%s"
+
+#~ 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 æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "æ? æ³?æ??å¼?æ?§ç?? POP ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®â??%sâ??ï¼?%s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "æ? æ³?å??建 POP3 ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®ç?®å½?â??%sâ??ï¼?%s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "æ? æ³?å¤?å?¶ POP3 å?¨æ??å?¡å?¨ä¸?ä¿?ç??ç??æ?°æ?®â??%sâ??ï¼?%s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "å??建æ?¬å?°é?®ä»¶å?å?¨â??%sâ??失败ï¼?%s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "æ? æ³?ä»?å??å??ç?? Evolution å®?è£?ä¸è¯»å??设置ï¼?â??evolution/config.xmldbâ??ä¸?å?å?¨æ??è??"
+#~ "å·²æ??å??ã??"
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "å??许 Evolution æ?¾ç¤ºè¢«é??å?¶å¤§å°?ç??æ??æ?¬é?¨å??"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "å??许渲æ??被é??å?¶å¤§å°?ç??ä¿¡æ?¯æ??æ?¬é?¨å??ã??"
+
+#~ msgid "Text message part limit"
+#~ msgstr "æ??æ?¬ä¿¡æ?¯é?¨å??é??å?¶"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>Top Posting é??项</b> (ä¸?æ?¨è??)"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "å??å? æ?¯â??{0}â??ã??"
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "å??å? æ?¯â??{2}â??ã??"
+
+#~ msgid "Do not d_elete"
+#~ msgstr "ä¸?å? é?¤(_E)"
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ " \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "ä¸?å??æ??ç´¢æ??件夹ï¼?\n"
+#~ "{0}\n"
+#~ "使ç?¨ç?°å·²å? é?¤ç??æ??件夹ï¼?\n"
+#~ " â??{1}â??\n"
+#~ "å·²ç»?æ?´æ?°ã??"
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ " \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "ä¸?å??è¿?滤è§?å??ï¼?\n"
+#~ "{0}\n"
+#~ "使ç?¨ç?°å·²å? é?¤ç??æ??件夹ï¼?\n"
+#~ " â??{1}â??\n"
+#~ "å·²ç»?æ?´æ?°ã??"
+
+#~ msgid "Table column:"
+#~ msgstr "è¡¨æ ¼æ ?ï¼?"
+
+#~ msgid "Source List"
+#~ msgstr "æ?¥æº?å??表"
+
+#, fuzzy
+#~ msgid "The registry of address books"
+#~ msgstr "æ? æ³?è?·å¾?å?°å??ç°¿å??表"
+
+#~ msgid "Current View"
+#~ msgstr "å½?å??è§?å?¾"
+
+#, fuzzy
+#~ msgid "Previewed Contact"
+#~ msgstr "æ?°å»ºè??系人"
+
+#, fuzzy
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "æ?¯å?¦æ?¾ç¤ºé¢?è§?é?¢æ?¿ã??"
+
+#, fuzzy
+#~ msgid "Preview is Visible"
+#~ msgstr "侧边æ ?å?¯è§?"
+
+#, fuzzy
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "æ?¯å?¦æ?¾ç¤ºé¢?è§?é?¢æ?¿ã??"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "LDAP æ??å?¡å?¨"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "��补�设置"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact 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 æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "é?®ä»¶å??表è??系人ç??æ ¼å¼?å·²ç»?æ?´æ?¹ã??\n"
+#~ "\n"
+#~ "请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution å?å?¨æ??äº?ç?µè¯?å?·ç ?ç??æ?¹å¼?å·²ç»?æ?´æ?¹ã??\n"
+#~ "\n"
+#~ "请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Evolution Palm å??æ¥æ?´æ?°æ?¥å¿?å??å?°å?¾æ??件已ç»?æ?´æ?¹ã??\n"
+#~ "\n"
+#~ "请ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç?? Pilot å??æ¥æ?°æ?®..."
+
+#, fuzzy
+#~ msgid "Source Selector Widget"
+#~ msgstr "å¤?å¿?æ?¥æº?é??æ?©å?¨"
+
+#, fuzzy
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "æ? æ³?è?·å¾?å?°å??ç°¿å??表"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "å?¦å?为 VCard..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar 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 æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr "æ? æ³?ä»? evolution/config.xmldb ä¸å??è¿?æ?§è®¾ç½®"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "æ? æ³?å??è¿?æ?¥å??â??%sâ??"
+
+#, fuzzy
+#~| msgid "Default Mail Client"
+#~ msgid "Default Calendar Client"
+#~ msgstr "�认�件客�端"
+
+#, fuzzy
+#~ msgid "The registry of memo lists"
+#~ msgstr "æ??å?°å¤?å¿?å??表"
+
+#, fuzzy
+#~ msgid "The memo table model"
+#~ msgstr "è¡¨æ ¼æ¨¡å??"
+
+#, fuzzy
+#~| msgid "Default Mail Client"
+#~ msgid "Default Memo Client"
+#~ msgstr "�认�件客�端"
+
+#, fuzzy
+#~ msgid "The registry of task lists"
+#~ msgstr "æ??å?°ä»»å?¡å??表"
+
+#, fuzzy
+#~ msgid "The task table model"
+#~ msgstr "è¡¨æ ¼æ¨¡å??"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task 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 æ£å?¨å??è¿?æ?¨ç??æ??件夹..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "æ? æ³?å??è¿?ä»»å?¡â??%sâ??"
+
+#, fuzzy
+#~| msgid "Default Mail Client"
+#~ msgid "Default Task Client"
+#~ msgstr "�认�件客�端"
+
+#, fuzzy
+#~| msgid "Default value for thread expand state"
+#~ msgid "Default client for task operations"
+#~ msgstr "è¯?é¢?ç??é»?认å±?å¼?ç?¶æ??"
+
+#, fuzzy
+#~| msgid "_Group By Threads"
+#~ msgid "Group by Threads"
+#~ msgstr "æ??线索å??ç»?(_G)"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "é??è??已读ç??ä¿¡æ?¯(_R)"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "æ??æ?¶é??è??æ??æ??已读信æ?¯"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "é??è??é??ä¸ç??ä¿¡æ?¯(_E)"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "æ??æ?¶é??è??é??ä¸ä¿¡æ?¯"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "æ?¾ç¤ºé??è??ç??ä¿¡æ?¯(_N)"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "æ?¾ç¤ºæ??æ?¶è¢«é??è??ç??ä¿¡æ?¯"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "é??è??å·²å? é?¤ç??ä¿¡æ?¯(_D)"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "é??è??å·²å? é?¤ç??ä¿¡æ?¯è??ä¸?æ?¯å?¨ä¸?é?¢æ?¾ç¤ºä¸?æ?¡çº¿"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr "æ¶?æ?¯ä¸»ä½?ä¸ç??ç?¨äº?é??件æ??é??æ??件ç??线索å??表ã??"
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr "å?¨å?¯å?¨æ?¶æ£?æ?¥ Evolution æ?¯ä¸?æ?¯é»?认ç??é?®ä»¶å®¢æ?·ç«¯ã??"
+
+#~ msgid "Default Mail Client"
+#~ msgstr "�认�件客�端"
+
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>æ??å?¡å?¨</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>����</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>å¸?å?·å??</b>"
+
+#~ msgid "Hula Support"
+#~ msgstr "Hula æ?¯æ??"
+
+#~ msgid "_Accept"
+#~ msgstr "æ?¥å??(_A)"
+
+#~ msgid "Guides you through your initial account setup."
+#~ msgstr "æ??å¼?æ?¨è¿?è¡?å??å§?å¸?æ?·ç??设置ã??"
+
+#~ msgid "Setup Assistant"
+#~ msgstr "设置å?©æ??"
+
+#~ msgid "Importing data."
+#~ msgstr "æ£å?¨å¯¼å?¥æ?°æ?®ã??"
+
+#~ msgid "Please wait"
+#~ msgstr "请ç¨?å??"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "å·¥å?·æ ?æ ·å¼?"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "å·¥å?·æ ?å?¯è§?"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
+
+#, fuzzy
+#~ msgid "Switcher Action"
+#~ msgstr "å??æ?¢å?° %s"
+
+#~ msgid "Page Number"
+#~ msgstr "页ç ?"
+
+#, fuzzy
+#~| msgid "Search Filter"
+#~ msgid "Search Rule"
+#~ msgstr "æ??ç´¢è¿?滤å?¨"
+
+#, fuzzy
+#~ msgid "Criteria for the current search results"
+#~ msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
+
+#, fuzzy
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "é»?认侧边æ ?宽度"
+
+#, fuzzy
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "é??æ?©ä»»å?¡å??表"
+
+#, fuzzy
+#~ msgid "Shell Window"
+#~ msgstr "�建��(_W)"
+
+#, fuzzy
+#~ msgid "Current View ID"
+#~ msgstr "å½?å??è§?å?¾(_C)"
+
+#, fuzzy
+#~ msgid "The current GAL view ID"
+#~ msgstr "å½?å??æ?¶é?´"
+
+#~ msgid "GNOME Pilot is not installed."
+#~ msgstr "GNOME Pilot 没æ??å®?è£?ã??"
+
+#~ msgid "GNOME Pilot could not be run."
+#~ msgstr "GNOME Pilot ä¸?è?½è¿?è¡?ã??"
+
+#~ msgid "GNOME Pilot _Synchronization..."
+#~ msgstr "GNOME Pilot å??æ¥(_S)..."
+
+#~ msgid "Set up GNOME Pilot configuration"
+#~ msgstr "设置 GNOME Pilot é??ç½®"
+
+#, fuzzy
+#~ msgid "Name of the active shell view"
+#~ msgstr "æ?°è§?å?¾ç??å??称ï¼?"
+
+#~ msgid "Safe Mode"
+#~ msgstr "��模�"
+
+#, fuzzy
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "æ??件æ?¯å?¦å·²å?¯ç?¨"
+
+#, fuzzy
+#~| msgid "Sidebar is visible"
+#~ msgid "Sidebar Visible"
+#~ msgstr "侧边æ ?å?¯è§?"
+
+#, fuzzy
+#~| msgid "Whether the switcher is visible"
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
+
+#, fuzzy
+#~| msgid "Sidebar is visible"
+#~ msgid "Switcher Visible"
+#~ msgstr "侧边æ ?å?¯è§?"
+
+#, fuzzy
+#~| msgid "Whether the window buttons should be visible."
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "çª?å?£æ??é?®æ?¯å?¦å?¯è§?ã??"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "ä»»å?¡æ ?å?¯è§?"
+
+#, fuzzy
+#~| msgid "Whether the switcher is visible"
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
+
+#, fuzzy
+#~| msgid "Whether the switcher is visible"
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
+
+#~ msgid "UI Manager"
+#~ msgstr "UI 管ç??å?¨"
+
+#~ msgid "Module Directory"
+#~ msgstr "模å??ç?®å½?"
+
+#~ msgid "Network Available"
+#~ msgstr "����"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "������"
+
+#~ msgid "Online"
+#~ msgstr "�线"
+
+#, fuzzy
+#~ msgid "Whether the shell is online"
+#~ msgstr "æ??件æ?¯å?¦å·²å?¯ç?¨"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "强å?¶ä»? Evolution 1.4 é??æ?°å??è¿?"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "ç£?ç??空é?´ä¸?足以è¿?è¡?å??级ã??"
+
+#~ msgid "Really delete old data?"
+#~ msgstr "ç??ç??è¦?å? é?¤æ?§æ?°æ?®å??ï¼?"
+
+#~ msgid ""
+#~ "The entire contents of the "evolution" directory are about to "
+#~ "be permanently removed.\n"
+#~ "\n"
+#~ "It is suggested you manually verify that all of your mail, contact, and "
+#~ "calendar data is present, and that this version of Evolution operates "
+#~ "correctly before deleting this old data.\n"
+#~ "\n"
+#~ "Once deleted, you cannot downgrade to the previous version of Evolution "
+#~ "without manual intervention.\n"
+#~ msgstr ""
+#~ "å?³å°?æ°¸ä¹?å? é?¤â??evolutionâ??ç?®å½?ç??å?¨é?¨å??容ã??\n"
+#~ "\n"
+#~ "æ??们建议æ?¨å?¨å? é?¤æ?§æ?°æ?®ä¹?å??ï¼?æ??å?¨æ£?æ?¥æ?¨å?¨é?¨ç??é?®ä»¶ã??è??系人å??æ?¥å??ä¿¡æ?¯é?½å?å?¨ï¼?"
+#~ "并ä¸?确认æ¤ç??æ?¬ç?? Evolution å·¥ä½?æ£å¸¸ã??\n"
+#~ "\n"
+#~ "å? é?¤ä¹?å??ï¼?æ?¨å°?æ? æ³?é??级è?³å??å??ç??æ?¬ç?? Evolutionï¼?é?¤é??æ?¨æ??å?¨ä»?头æ?¥è¿?ã??\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the ""
+#~ "evolution" directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of ""
+#~ "evolution" at your convenience.\n"
+#~ msgstr ""
+#~ "å??å??ç??æ?¬ç?? Evolution å°?å?¶æ?°æ?®å?å?¨å?¨ä¸?å??ç??ä½?ç½®ã??\n"
+#~ "\n"
+#~ "å¦?æ??æ?¨é??æ?©å? é?¤æ¤æ?°æ?®ï¼?â??evolutionâ??ç?®å½?ä¸ç??å?¨é?¨å??容é?½å°?被永ä¹?å? é?¤ã??å¦?æ??æ?¨é??"
+#~ "æ?©ä¿?ç??æ¤æ?°æ?®ï¼?é?£ä¹?æ?¨å?¯ä»¥å?¨æ?¨æ?¹ä¾¿ç??æ?¶å??æ??å?¨å? é?¤â??evolutionâ??ç?®å½?ã??\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "å??级æ?¨ç??æ?°æ?®å??设置é??è¦?å¤?è?³ {0} ç??ç£?ç??空é?´ï¼?ä½?æ?¨ç?°å?¨å?ªæ?? {1}ã??\n"
+#~ "\n"
+#~ "æ?¨é??è¦?å?¨ç»§ç»ä¹?å??å?¨ä¸»ç?®å½?ä¸è?¾å?ºæ?´å¤?空é?´ã??"
+
+#~ msgid "_Keep Data"
+#~ msgstr "ä¿?ç??æ?°æ?®(_K)"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "ç¨?å??æ??é??(_R)"
+
+#~ msgid "Edit"
+#~ msgstr "ç¼?è¾?"
+
+#~ msgid "Import"
+#~ msgstr "导�"
+
+#~ msgid "View"
+#~ msgstr "æ?¥ç??"
+
+#~ msgid "Collection"
+#~ msgstr "æ?¶è??"
+
+#~ msgid "Instance"
+#~ msgstr "å®?ä¾?"
+
+#~ msgid "Factory"
+#~ msgstr "å·¥å??"
+
+#~ msgid "Action"
+#~ msgstr "活�"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "æ?¾ç¤ºé??件æ ?(_A)"
+
+#~ msgid "Fill color"
+#~ msgstr "å¡«å??é¢?è?²"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK å¡«å??é¢?è?²"
+
+#~ msgid "Fill stipple"
+#~ msgstr "ç?¹ç»?å¡«å??"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "æ??å°?宽度"
+
+#~ msgid "Minimum Width"
+#~ msgstr "æ??å°?宽度"
+
+#~ msgid "Spacing"
+#~ msgstr "é?´è·?"
+
+#~ msgid "The button state is online"
+#~ msgstr "æ??é?®ç?¶æ??为å?¨çº¿"
+
+#, fuzzy
+#~ msgid "Horizontal Position"
+#~ msgstr "水平���置"
+
+#, fuzzy
+#~ msgid "Vertical Position"
+#~ msgstr "å??ç?´é?¢æ?¿ç??ä½?ç½®"
+
+#, fuzzy
+#~| msgid "Position"
+#~ msgid "Proportion"
+#~ msgstr "ä½?ç½®"
+
+#, fuzzy
+#~| msgid "_Resize"
+#~ msgid "Fixed Resize"
+#~ msgstr "缩�(_R)"
+
+#~ msgid "Sync with:"
+#~ msgstr "å??æ¥å¯¹è±¡ï¼?"
+
+#~ msgid "Sync Private Records:"
+#~ msgstr "å??æ¥ç§?æ??è®°å½?ï¼?"
+
+#~ msgid "Sync Categories:"
+#~ msgstr "å??æ¥ç±»å?«ï¼?"
+
+#~ msgid "Cursor Row"
+#~ msgstr "å??æ ?è¡?"
+
+#~ msgid "Cursor Column"
+#~ msgstr "å??æ ?å??"
+
+#~ msgid "Sorter"
+#~ msgstr "æ??åº?"
+
+#~ msgid "Selection Mode"
+#~ msgstr "é??æ?©æ¨¡å¼?"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "å??æ ?模å¼?"
+
+#~ msgid "Selected Column"
+#~ msgstr "é??ä¸å??"
+
+#~ msgid "Focused Column"
+#~ msgstr "è??ç?¦å??"
+
+#~ msgid "Unselected Column"
+#~ msgstr "æ?ªé??å??"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "ç»?å??å? å? é?¤çº¿"
+
+#~ msgid "Underline Column"
+#~ msgstr "ç»?å??å? ä¸?å??线"
+
+#~ msgid "Bold Column"
+#~ msgstr "ç»?å??å? ç²?"
+
+#~ msgid "Color Column"
+#~ msgstr "ç»?å??ç??è?²"
+
+#~ msgid "BG Color Column"
+#~ msgstr "ç»?å??ç??è??æ?¯è?²"
+
+#~ msgid "State"
+#~ msgstr "ç?¶æ??"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "交���"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "æ°´å¹³ç»?å?¶ç½?æ ¼"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "å??ç?´ç»?å?¶ç½?æ ¼"
+
+#~ msgid "Draw focus"
+#~ msgstr "����"
+
+#~ msgid "Cursor mode"
+#~ msgstr "å??æ ?模å¼?"
+
+#~ msgid "Selection model"
+#~ msgstr "é??æ?©æ¨¡å??"
+
+#~ msgid "Length Threshold"
+#~ msgstr "é?¿åº¦é??å?¼"
+
+#~ msgid "Uniform row height"
+#~ msgstr "����"
+
+#~ msgid "Frozen"
+#~ msgstr "��"
+
+#~ msgid "Table header"
+#~ msgstr "表头"
+
+#~ msgid "Table model"
+#~ msgstr "è¡¨æ ¼æ¨¡å??"
+
+#~ msgid "Cursor row"
+#~ msgstr "å??æ ?è¡?"
+
+#~ msgid "Sort Info"
+#~ msgstr "æ??åº?ä¿¡æ?¯"
+
+#~ msgid "Always search"
+#~ msgstr "æ?»æ?¯æ??ç´¢"
+
+#~ msgid "Use click to add"
+#~ msgstr "å??å?»å?¯æ·»å? "
+
+#, fuzzy
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "æ ?è¯?å?¨é?´è·?"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ETree è¡¨æ ¼é??é??å?¨"
+
+#~ msgid "Retro Look"
+#~ msgstr "ç?«ç®å¤?è§?"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "ç»?å?¶è¡?å?? +/- æ?©å±?æ??ã??"
+
+#~ msgid "Expander Size"
+#~ msgstr "���大�"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "æ?©å±?å?¨ç®å¤´ç??大å°?"
+
+#~ msgid "popup"
+#~ msgstr "弹�"
+
+#~ msgid "edit"
+#~ msgstr "ç¼?è¾?"
+
+#~ msgid "toggle"
+#~ msgstr "å??æ?¢"
+
+#~ msgid "expand"
+#~ msgstr "å±?å¼?"
+
+#~ msgid "Event Processor"
+#~ msgstr "äº?件å¤?ç??å?¨"
+
+#~ msgid "Text"
+#~ msgstr "æ??å?"
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "æ??å?"
+#~ msgid "Bold"
+#~ msgstr "ç²?ä½?"
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "ç²?ä½?"
+#~ msgid "Strikeout"
+#~ msgstr "å? é?¤çº¿"
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "å? é?¤çº¿"
+#~ msgid "Anchor"
+#~ msgstr "é??ç?¹"
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "é??ç?¹"
+#~ msgid "Justification"
+#~ msgstr "两端对�"
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "两端对�"
+#~ msgid "Clip Width"
+#~ msgstr "��宽度"
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "��宽度"
+#~ msgid "Clip Height"
+#~ msgstr "���度"
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "���度"
+#~ msgid "Clip"
+#~ msgstr "��"
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "��"
+#~ msgid "Fill clip rectangle"
+#~ msgstr "å¡«å??è£?å?ªç?©å½¢"
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "å¡«å??è£?å?ªç?©å½¢"
+#~ msgid "X Offset"
+#~ msgstr "æ°´å¹³å??移"
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "æ°´å¹³å??移"
+#~ msgid "Y Offset"
+#~ msgstr "å??ç?´å??移"
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "å??ç?´å??移"
+#~ msgid "Text width"
+#~ msgstr "æ??å?宽度"
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "æ??å?宽度"
+#~ msgid "Text height"
+#~ msgstr "æ??å?é«?度"
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "æ??å?é«?度"
+#~ msgid "Use ellipsis"
+#~ msgstr "使ç?¨æ¤å??"
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "使ç?¨æ¤å??"
+#~ msgid "Ellipsis"
+#~ msgstr "æ¤å??"
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "æ¤å??"
+#~ msgid "Line wrap"
+#~ msgstr "��"
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "��"
+#~ msgid "Break characters"
+#~ msgstr "æ?¢è¡?å?符"
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "æ?¢è¡?å?符"
+#~ msgid "Max lines"
+#~ msgstr "æ??å¤?è¡?æ?°"
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "æ??å¤?è¡?æ?°"
+#~ msgid "Draw borders"
+#~ msgstr "��边�"
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "��边�"
+#~ msgid "Allow newlines"
+#~ msgstr "å??许æ?°è¡?"
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "å??许æ?°è¡?"
+#~ msgid "Draw background"
+#~ msgstr "ç»?å?¶è??æ?¯"
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "ç»?å?¶è??æ?¯"
+#~ msgid "Draw button"
+#~ msgstr "ç»?å?¶æ??é?®"
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "ç»?å?¶æ??é?®"
+#~ msgid "Cursor position"
+#~ msgstr "å??æ ?ä½?ç½®"
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "å??æ ?ä½?ç½®"
+#~ msgid "IM Context"
+#~ msgstr "�����"
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "�����"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "å¤?ç??å¼¹å?º"
+#~ msgid "Handle Popup"
+#~ msgstr "å¤?ç??å¼¹å?º"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
