diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/zh_CN.po | 5447 |
1 files changed, 2974 insertions, 2473 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 2de2925041..ee756b7bab 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Evolution\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-10-18 21:04+0200\n" +"POT-Creation-Date: 2004-12-12 05:36+0800\n" "PO-Revision-Date: 2004-10-19 10:17+0800\n" "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n" "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n" @@ -20,35 +20,57 @@ msgstr "" #: a11y/addressbook/ea-addressbook-view.c:94 #: a11y/addressbook/ea-addressbook-view.c:103 -#: a11y/addressbook/ea-minicard-view.c:119 +#: a11y/addressbook/ea-minicard-view.c:172 msgid "evolution addressbook" msgstr "evolution 地址簿" -#: a11y/addressbook/ea-minicard-view.c:101 +#: a11y/addressbook/ea-minicard-view.c:34 +#: addressbook/gui/component/addressbook-component.c:97 +msgid "New Contact" +msgstr "新建联系人" + +#: a11y/addressbook/ea-minicard-view.c:35 +#: addressbook/gui/component/addressbook-component.c:105 +msgid "New Contact List" +msgstr "新建联系人列表" + +#: a11y/addressbook/ea-minicard-view.c:153 msgid "current addressbook folder " msgstr "当前地址簿文件夹 " -#: a11y/addressbook/ea-minicard-view.c:102 +#: a11y/addressbook/ea-minicard-view.c:154 msgid "have " msgstr "有 " -#: a11y/addressbook/ea-minicard-view.c:102 +#: a11y/addressbook/ea-minicard-view.c:154 msgid "has " msgstr "有" -#: a11y/addressbook/ea-minicard-view.c:104 +#: a11y/addressbook/ea-minicard-view.c:156 msgid " cards" msgstr " 张卡片" -#: a11y/addressbook/ea-minicard-view.c:104 +#: a11y/addressbook/ea-minicard-view.c:156 msgid " card" msgstr " 张卡片" -#: a11y/addressbook/ea-minicard.c:105 -msgid "contact's header: " -msgstr "联系人头衔：" +#: a11y/addressbook/ea-minicard.c:31 +#: calendar/gui/alarm-notify/alarm-queue.c:863 +#: ui/evolution-message-composer.xml.h:10 +msgid "Open" +msgstr "打开" + +#: a11y/addressbook/ea-minicard.c:138 +#, fuzzy +msgid "Contact List: " +msgstr "联系人列表(_L)" + +#: a11y/addressbook/ea-minicard.c:139 +#, fuzzy +msgid "Contact: " +msgstr "联系人：" -#: a11y/addressbook/ea-minicard.c:166 +#: a11y/addressbook/ea-minicard.c:165 msgid "evolution minicard" msgstr "evolution 袖珍卡" @@ -59,8 +81,9 @@ msgstr "无法打开此地址簿。" #. addressbook:ldap-init secondary #: addressbook/addressbook-errors.xml.h:4 +#, fuzzy msgid "" -"This addressbook server might unreachable or the server name may be " +"This addressbook server might be unreachable or the server name may be " "misspelled or your network connection could be down." msgstr "地址簿服务器不可达，或者服务器名称拼错，又或者您的网络连接已断。" @@ -114,8 +137,20 @@ msgstr "LDAP 服务器无法响应有效的大纲信息。" msgid "Could not remove addressbook." msgstr "无法删除地址簿。" -#. addressbook:edit-categories primary +#. addressbook:ask-delete-addressbook primary #: addressbook/addressbook-errors.xml.h:22 +#, fuzzy +msgid "Delete address book '{0}'?" +msgstr "从地址簿中选择目标联系人。" + +#. addressbook:ask-delete-addressbook secondary +#: addressbook/addressbook-errors.xml.h:24 +#, fuzzy +msgid "This address book will be removed permanently." +msgstr "无法打开此地址簿。" + +#. addressbook:edit-categories primary +#: addressbook/addressbook-errors.xml.h:26 msgid "Category editor not available." msgstr "类别编辑器不可用。" @@ -130,9 +165,9 @@ msgstr "类别编辑器不可用。" #. mail:session-message-error-cancel secondary #. mail:ask-session-password secondary #. mail:filter-load-error secondary -#: addressbook/addressbook-errors.xml.h:24 -#: addressbook/addressbook-errors.xml.h:32 -#: addressbook/addressbook-errors.xml.h:36 mail/mail-errors.xml.h:70 +#: addressbook/addressbook-errors.xml.h:28 +#: addressbook/addressbook-errors.xml.h:36 +#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:70 #: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74 #: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78 #: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84 @@ -143,49 +178,49 @@ msgstr "{0}" #. addressbook:generic-error secondary #. mail-composer:no-attach secondary #. mail:no-save-path secondary -#: addressbook/addressbook-errors.xml.h:26 +#: addressbook/addressbook-errors.xml.h:30 #: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92 msgid "{1}" msgstr "{1}" #. addressbook:load-error title -#: addressbook/addressbook-errors.xml.h:28 +#: addressbook/addressbook-errors.xml.h:32 msgid "Unable to open addressbook" msgstr "无法打开地址簿" #. addressbook:load-error primary -#: addressbook/addressbook-errors.xml.h:30 +#: addressbook/addressbook-errors.xml.h:34 msgid "Error loading addressbook." msgstr "装入默认地址簿错误。" #. addressbook:search-error primary -#: addressbook/addressbook-errors.xml.h:34 +#: addressbook/addressbook-errors.xml.h:38 msgid "Unable to perform search." msgstr "无法执行搜索。" #. addressbook:prompt-save primary -#: addressbook/addressbook-errors.xml.h:38 +#: addressbook/addressbook-errors.xml.h:42 msgid "Would you like to save your changes?" msgstr "您希望保存更改吗？" #. addressbook:prompt-save secondary -#: addressbook/addressbook-errors.xml.h:40 +#: addressbook/addressbook-errors.xml.h:44 msgid "" "You have made modifications to this contact. Do you want to save these " "changes?" msgstr "您已对此联系人作出了修改。您想要保存这些更改吗？" -#: addressbook/addressbook-errors.xml.h:41 +#: addressbook/addressbook-errors.xml.h:45 msgid "_Discard" msgstr "丢弃(_D)" #. addressbook:prompt-move primary -#: addressbook/addressbook-errors.xml.h:43 +#: addressbook/addressbook-errors.xml.h:47 msgid "Cannot move contact." msgstr "无法移动联系人。" #. addressbook:prompt-move secondary -#: addressbook/addressbook-errors.xml.h:45 +#: addressbook/addressbook-errors.xml.h:49 msgid "" "You are attempting to move a contact from one addressbook to another but it " "cannot be removed from the source. Do you want to save a copy instead?" @@ -194,26 +229,46 @@ msgstr "" "人。您想要换作复制联系人吗？" #. addressbook:save-error primary -#: addressbook/addressbook-errors.xml.h:47 +#: addressbook/addressbook-errors.xml.h:51 msgid "Unable to save contact(s)." msgstr "无法保存联系人。" #. addressbook:save-error secondary -#: addressbook/addressbook-errors.xml.h:49 +#: addressbook/addressbook-errors.xml.h:53 msgid "Error saving contacts to {0}: {1}" msgstr "将联系人保存到 {0}:{1} 出错" #. addressbook:backend-died primary -#: addressbook/addressbook-errors.xml.h:51 +#: addressbook/addressbook-errors.xml.h:55 msgid "The Evolution addressbook has quit unexpectedly." msgstr "Evolution 地址簿异常退出。" #. addressbook:backend-died secondary -#: addressbook/addressbook-errors.xml.h:53 +#: addressbook/addressbook-errors.xml.h:57 msgid "" "Your contacts for {0} will not be available until Evolution is restarted." msgstr "除非您重新启动 Evolution，否则 {0} 的联系人无法使用。" +#. addressbook:ask-list-add-exists primary +#: addressbook/addressbook-errors.xml.h:59 +#, fuzzy +msgid "Address '{0}' already exists." +msgstr "文件夹已经存在" + +#. addressbook:ask-list-add-exists secondary +#: addressbook/addressbook-errors.xml.h:61 +#, fuzzy +msgid "" +"A contact already exists with this address. Would you like to add a new " +"card with the same address anyway?" +msgstr "" +"此联系人的姓名或地址已经在本文件夹中存在了。\n" +"您一定要添加吗？" + +#: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494 +msgid "_Add" +msgstr "添加(_A)" + #: addressbook/conduit/address-conduit.c:298 msgid "Default Sync Address:" msgstr "默认的同步地址：" @@ -246,8 +301,8 @@ msgstr "在此配置自动补全" #. Create the contacts group #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5 -#: addressbook/gui/component/addressbook-view.c:1143 -#: calendar/gui/migration.c:378 +#: addressbook/gui/component/addressbook-view.c:1118 +#: calendar/gui/migration.c:377 msgid "Contacts" msgstr "联系人" @@ -283,54 +338,102 @@ msgstr "Evolution 文件夹配置控件" msgid "Manage your S/MIME certificates here" msgstr "在此管理您的 S/MIME 证书" -#: addressbook/gui/component/addressbook-component.c:93 -msgid "New Contact" -msgstr "新建联系人" - -#: addressbook/gui/component/addressbook-component.c:94 +#: addressbook/gui/component/addressbook-component.c:98 msgid "_Contact" msgstr "联系人(_C)" -#: addressbook/gui/component/addressbook-component.c:95 +#: addressbook/gui/component/addressbook-component.c:99 msgid "Create a new contact" msgstr "创建一个新联系人" -#: addressbook/gui/component/addressbook-component.c:101 -msgid "New Contact List" -msgstr "新建联系人列表" - -#: addressbook/gui/component/addressbook-component.c:102 +#: addressbook/gui/component/addressbook-component.c:106 msgid "Contact _List" msgstr "联系人列表(_L)" -#: addressbook/gui/component/addressbook-component.c:103 +#: addressbook/gui/component/addressbook-component.c:107 msgid "Create a new contact list" msgstr "创建一个新的联系人列表" -#: addressbook/gui/component/addressbook-component.c:109 -#: addressbook/gui/component/addressbook-view.c:812 +#: addressbook/gui/component/addressbook-component.c:113 +#: addressbook/gui/component/addressbook-view.c:757 msgid "New Address Book" msgstr "新地址簿" -#: addressbook/gui/component/addressbook-component.c:110 +#: addressbook/gui/component/addressbook-component.c:114 msgid "Address _Book" msgstr "地址簿(_B)" -#: addressbook/gui/component/addressbook-component.c:111 +#: addressbook/gui/component/addressbook-component.c:115 msgid "Create a new address book" msgstr "创建新地址簿" -#: addressbook/gui/component/addressbook-component.c:184 +#: addressbook/gui/component/addressbook-component.c:188 msgid "Failed upgrading Addressbook settings or folders." msgstr "升级地址簿设置或文件夹失败。" +#: addressbook/gui/component/addressbook-config.c:314 +#, fuzzy +msgid "Base" +msgstr "粘贴" + +#: addressbook/gui/component/addressbook-config.c:509 +#: calendar/gui/dialogs/calendar-setup.c:191 +#: calendar/gui/dialogs/calendar-setup.glade.h:10 +msgid "_Type:" +msgstr "类型(_T)：" + +#: addressbook/gui/component/addressbook-config.c:862 +#: addressbook/gui/component/ldap-config.glade.h:23 +#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 +#: calendar/gui/dialogs/calendar-setup.c:324 +#: calendar/gui/dialogs/calendar-setup.c:334 mail/em-folder-properties.c:213 +#: mail/mail-config.glade.h:85 smime/gui/smime-ui.glade.h:27 +msgid "General" +msgstr "常规" + +#: addressbook/gui/component/addressbook-config.c:863 +#: mail/importers/pine-importer.c:479 +msgid "Addressbook" +msgstr "地址簿" + +#: addressbook/gui/component/addressbook-config.c:866 +#, fuzzy +msgid "Server Information" +msgstr "<b>服务器信息</b>" + +#: addressbook/gui/component/addressbook-config.c:868 +#, fuzzy +msgid "Authentication" +msgstr "SMTP 认证" + +#: addressbook/gui/component/addressbook-config.c:871 +#: addressbook/gui/component/ldap-config.glade.h:18 +#: mail/mail-dialogs.glade.h:12 smime/gui/smime-ui.glade.h:19 +msgid "Details" +msgstr "细节" + +#: addressbook/gui/component/addressbook-config.c:872 +#, fuzzy +msgid "Searching" +msgstr "间距" + +#: addressbook/gui/component/addressbook-config.c:874 +#, fuzzy +msgid "Downloading" +msgstr "<b>下载</b>" + +#: addressbook/gui/component/addressbook-config.c:1070 +#: addressbook/gui/component/ldap-config.glade.h:14 +msgid "Address Book Properties" +msgstr "地址簿属性" + #: addressbook/gui/component/addressbook-migrate.c:72 -#: calendar/gui/migration.c:142 mail/em-migrate.c:1160 +#: calendar/gui/migration.c:141 mail/em-migrate.c:1160 msgid "Migrating..." msgstr "正在升迁..." #: addressbook/gui/component/addressbook-migrate.c:124 -#: calendar/gui/migration.c:189 mail/em-migrate.c:1201 +#: calendar/gui/migration.c:188 mail/em-migrate.c:1201 #, c-format msgid "Migrating `%s':" msgstr "升迁“%s”：" @@ -338,9 +441,9 @@ msgstr "升迁“%s”：" #. create the local source group #. On This Computer is always first and VFolders is always last #: addressbook/gui/component/addressbook-migrate.c:493 -#: calendar/gui/migration.c:452 calendar/gui/migration.c:545 +#: calendar/gui/migration.c:451 calendar/gui/migration.c:544 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198 -#: mail/mail-component.c:250 mail/mail-vfolder.c:218 +#: mail/mail-component.c:270 mail/mail-vfolder.c:218 msgid "On This Computer" msgstr "在此计算机中" @@ -350,9 +453,9 @@ msgstr "在此计算机中" #. orange #: addressbook/gui/component/addressbook-migrate.c:501 #: addressbook/gui/contact-editor/contact-editor.glade.h:34 -#: calendar/gui/migration.c:460 calendar/gui/migration.c:553 +#: calendar/gui/migration.c:459 calendar/gui/migration.c:552 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78 -#: mail/mail-config.glade.h:109 +#: mail/mail-config.glade.h:102 msgid "Personal" msgstr "个人" @@ -410,14 +513,9 @@ msgstr "" "\n" "请稍候，Evolution 正在升迁您的 Pilot 同步数据..." -#: addressbook/gui/component/addressbook-view.c:710 -#, c-format -msgid "Address book '%s' will be removed. Are you sure you want to continue?" -msgstr "即将删除日历“%s”。您确定想要继续吗？" - -#: addressbook/gui/component/addressbook-view.c:813 -#: addressbook/gui/widgets/e-addressbook-view.c:1123 -#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:382 +#: addressbook/gui/component/addressbook-view.c:758 +#: addressbook/gui/widgets/e-addressbook-view.c:934 +#: calendar/gui/calendar-component.c:385 calendar/gui/tasks-component.c:330 #: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8 #: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4 #: ui/evolution-contact-editor.xml.h:3 @@ -426,8 +524,8 @@ msgstr "即将删除日历“%s”。您确定想要继续吗？" msgid "Delete" msgstr "删除" -#: addressbook/gui/component/addressbook-view.c:814 -#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:384 +#: addressbook/gui/component/addressbook-view.c:760 +#: calendar/gui/calendar-component.c:386 calendar/gui/tasks-component.c:331 msgid "Properties..." msgstr "属性..." @@ -436,39 +534,68 @@ msgid "Accessing LDAP Server anonymously" msgstr "匿名访问 LDAP 服务器" #: addressbook/gui/component/addressbook.c:184 -#: camel/providers/groupwise/camel-gw-listener.c:460 +#: camel/providers/groupwise/camel-gw-listener.c:494 msgid "Failed to authenticate.\n" msgstr "认证失败。\n" #: addressbook/gui/component/addressbook.c:191 -#: camel/providers/groupwise/camel-gw-listener.c:449 +#: camel/providers/groupwise/camel-gw-listener.c:483 #, c-format msgid "%sEnter password for %s (user %s)" msgstr "%s为 %s 输入口令 (用户 %s)" #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1 -msgid "EFolderList xml for the list of completion uris" +#, fuzzy +msgid "EFolderList XML for the list of completion URIs" msgstr "补全 uris 列表的 EFolderList xml" #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2 +#, fuzzy +msgid "EFolderList XML for the list of completion URIs." +msgstr "补全 uris 列表的 EFolderList xml" + +#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3 msgid "Position of the vertical pane in main view" msgstr "主视图中垂直面板的位置" -#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3 +#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4 +#, fuzzy +msgid "Position of the vertical pane in main view." +msgstr "主视图中垂直面板的位置" + +#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5 #: mail/evolution-mail.schemas.in.in.h:71 msgid "Show the \"Preview\" pane" msgstr "显示“预览”面板" -#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4 +#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6 +#: mail/evolution-mail.schemas.in.in.h:72 +msgid "Show the \"Preview\" pane." +msgstr "显示“预览”面板。" + +#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7 +#, fuzzy msgid "" -"The number of characters that must be typed before evolution will attempt to " +"The number of characters that must be typed before Evolution will attempt to " "autocomplete" msgstr "在 Evolution 试图进行自动补全之前应该输入多少个字符" -#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5 +#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8 +#, fuzzy +msgid "" +"The number of characters that must be typed before Evolution will attempt to " +"autocomplete." +msgstr "在 Evolution 试图进行自动补全之前应该输入多少个字符" + +#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9 msgid "URI for the folder last used in the select names dialog" msgstr "选择名称对话框中上次使用的文件夹 URI" +#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10 +#, fuzzy +msgid "URI for the folder last used in the select names dialog." +msgstr "选择名称对话框中上次使用的文件夹 URI" + #: addressbook/gui/component/ldap-config.glade.h:1 #: addressbook/gui/component/select-names/select-names.glade.h:1 #: addressbook/gui/contact-editor/contact-editor.glade.h:1 @@ -539,12 +666,7 @@ msgstr "<b>类型：</b>" msgid "Add Address Book" msgstr "添加地址簿" -#: addressbook/gui/component/ldap-config.glade.h:14 -msgid "Address Book Properties" -msgstr "地址簿属性" - -#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:85 -#: mail/mail-config.glade.h:42 +#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:86 msgid "Always" msgstr "总是" @@ -556,11 +678,6 @@ msgstr "匿名" msgid "Basic" msgstr "基本" -#: addressbook/gui/component/ldap-config.glade.h:18 -#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19 -msgid "Details" -msgstr "细节" - #: addressbook/gui/component/ldap-config.glade.h:19 msgid "Distinguished name" msgstr "识别性名称" @@ -578,18 +695,11 @@ msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认 msgid "Find Possible Search Bases" msgstr "查找可能的搜索基础" -#: addressbook/gui/component/ldap-config.glade.h:23 -#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 -#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27 -msgid "General" -msgstr "常规" - #: addressbook/gui/component/ldap-config.glade.h:24 msgid "Lo_gin:" msgstr "登录(_G)：" -#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:87 -#: mail/mail-config.glade.h:102 +#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:88 msgid "Never" msgstr "从不" @@ -670,8 +780,9 @@ msgid "" msgstr "这是可下载条目的最大数量。将此数值设定得太大将导致地址簿变慢。" #: addressbook/gui/component/ldap-config.glade.h:37 +#, fuzzy msgid "" -"This is the method evolution will use to authenticate you. Note that " +"This is the method Evolution will use to authenticate you. Note that " "setting this to \"Email Address\" requires anonymous access to your ldap " "server." msgstr "" @@ -701,8 +812,7 @@ msgstr "使用已识别的姓名(DN)" msgid "Using email address" msgstr "使用电子邮件地址" -#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:86 -#: mail/mail-config.glade.h:156 +#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:87 msgid "Whenever Possible" msgstr "可能时" @@ -723,7 +833,8 @@ msgid "_Log in method:" msgstr "登录方式(_L)：" #: addressbook/gui/component/ldap-config.glade.h:47 -#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171 +#: calendar/gui/dialogs/calendar-setup.c:243 +#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:161 msgid "_Name:" msgstr "名称(_N)：" @@ -752,9 +863,9 @@ msgid "cards" msgstr "卡片" #: addressbook/gui/component/ldap-config.glade.h:54 +#: calendar/gui/alarm-notify/alarm-notify.glade.h:12 #: calendar/gui/dialogs/alarm-dialog.glade.h:27 -#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15 -#: mail/mail-config.glade.h:183 +#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16 msgid "minutes" msgstr "分钟" @@ -762,35 +873,35 @@ msgstr "分钟" msgid "Evolution Addressbook name selection interface" msgstr "Evolution 的地址簿名称选择界面" -#: addressbook/gui/component/select-names/e-select-names-popup.c:208 +#: addressbook/gui/component/select-names/e-select-names-popup.c:207 msgid "Remove All" msgstr "全部删除" -#: addressbook/gui/component/select-names/e-select-names-popup.c:215 -#: addressbook/gui/component/select-names/e-select-names.c:702 -#: calendar/gui/dialogs/cal-prefs-dialog.c:724 +#: addressbook/gui/component/select-names/e-select-names-popup.c:214 +#: addressbook/gui/component/select-names/e-select-names.c:690 +#: calendar/gui/dialogs/cal-prefs-dialog.c:723 msgid "Remove" msgstr "删除" -#: addressbook/gui/component/select-names/e-select-names-popup.c:222 +#: addressbook/gui/component/select-names/e-select-names-popup.c:221 msgid "View Contact List" msgstr "查看联系人列表" -#: addressbook/gui/component/select-names/e-select-names-popup.c:222 +#: addressbook/gui/component/select-names/e-select-names-popup.c:221 msgid "View Contact Info" msgstr "查看联系人信息" -#: addressbook/gui/component/select-names/e-select-names-popup.c:229 -#: addressbook/gui/component/select-names/e-select-names-popup.c:330 +#: addressbook/gui/component/select-names/e-select-names-popup.c:228 +#: addressbook/gui/component/select-names/e-select-names-popup.c:327 msgid "Send HTML Mail?" msgstr "发送 HTML 邮件吗？" -#: addressbook/gui/component/select-names/e-select-names-popup.c:322 -#: addressbook/gui/widgets/eab-popup-control.c:983 +#: addressbook/gui/component/select-names/e-select-names-popup.c:319 +#: addressbook/gui/widgets/eab-popup-control.c:982 msgid "Add to Contacts" msgstr "添加到联系人" -#: addressbook/gui/component/select-names/e-select-names-popup.c:348 +#: addressbook/gui/component/select-names/e-select-names-popup.c:345 msgid "Unnamed Contact" msgstr "未命名的联系人" @@ -802,7 +913,7 @@ msgstr "姓名" #: addressbook/gui/component/select-names/e-select-names-table-model.c:351 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104 -#: addressbook/gui/widgets/e-addressbook-view.c:228 +#: addressbook/gui/widgets/e-addressbook-view.c:229 msgid "Source" msgstr "来源" @@ -873,7 +984,7 @@ msgstr "<b>工作</b>" #: addressbook/gui/contact-editor/contact-editor.glade.h:11 #: addressbook/gui/contact-editor/e-contact-editor.c:184 -#: addressbook/gui/widgets/eab-contact-display.c:333 +#: addressbook/gui/widgets/eab-contact-display.c:346 msgid "AIM" msgstr "AIM" @@ -907,14 +1018,14 @@ msgstr "公司：" #: addressbook/gui/contact-editor/contact-editor.glade.h:19 #: addressbook/gui/contact-editor/e-contact-editor.c:272 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:172 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:173 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1 #: addressbook/gui/widgets/e-minicard.c:181 msgid "Contact" msgstr "联系人" #: addressbook/gui/contact-editor/contact-editor.glade.h:20 -#: addressbook/gui/contact-editor/e-contact-editor.c:526 +#: addressbook/gui/contact-editor/e-contact-editor.c:533 msgid "Contact Editor" msgstr "联系人编辑器" @@ -1006,10 +1117,10 @@ msgstr "Web 日志：" #. red #: addressbook/gui/contact-editor/contact-editor.glade.h:43 -#: addressbook/gui/contact-editor/e-contact-editor-im.c:244 +#: addressbook/gui/contact-editor/e-contact-editor-im.c:235 #: addressbook/gui/contact-editor/e-contact-editor.c:201 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77 -#: mail/mail-config.glade.h:157 +#: mail/mail-config.glade.h:147 msgid "Work" msgstr "工作" @@ -1031,21 +1142,21 @@ msgid "_Where:" msgstr "何处(_W)：" #: addressbook/gui/contact-editor/e-contact-editor-address.c:96 -#: addressbook/gui/widgets/eab-contact-display.c:352 -#: addressbook/gui/widgets/eab-contact-display.c:367 +#: addressbook/gui/widgets/eab-contact-display.c:365 +#: addressbook/gui/widgets/eab-contact-display.c:380 msgid "Address" msgstr "地址" #: addressbook/gui/contact-editor/e-contact-editor-address.c:103 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141 -#: addressbook/gui/contact-editor/e-contact-editor.c:293 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:186 +#: addressbook/gui/contact-editor/e-contact-editor.c:300 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:187 #: addressbook/gui/widgets/e-addressbook-model.c:309 -#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392 +#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391 #: addressbook/gui/widgets/e-minicard-label.c:164 #: addressbook/gui/widgets/e-minicard-view-widget.c:119 -#: addressbook/gui/widgets/e-minicard-view.c:498 +#: addressbook/gui/widgets/e-minicard-view.c:519 #: addressbook/gui/widgets/e-minicard.c:174 msgid "Editable" msgstr "可编辑" @@ -1787,7 +1898,8 @@ msgid "Saint Lucia" msgstr "圣卢西亚岛" #: addressbook/gui/contact-editor/e-contact-editor-address.c:320 -msgid "Saint Vincent And The Grena-dines" +#, fuzzy +msgid "Saint Vincent And The Grenadines" msgstr "圣文森特和格林纳达" #: addressbook/gui/contact-editor/e-contact-editor-address.c:321 @@ -2024,7 +2136,7 @@ msgstr "AOL 即时通讯程序" #: addressbook/gui/contact-editor/e-contact-editor-im.c:64 #: addressbook/gui/contact-editor/e-contact-editor.c:185 -#: addressbook/gui/widgets/eab-contact-display.c:336 +#: addressbook/gui/widgets/eab-contact-display.c:349 msgid "Jabber" msgstr "Jabber" @@ -2034,7 +2146,7 @@ msgstr "雅虎通" #: addressbook/gui/contact-editor/e-contact-editor-im.c:67 #: addressbook/gui/contact-editor/e-contact-editor.c:188 -#: addressbook/gui/widgets/eab-contact-display.c:335 +#: addressbook/gui/widgets/eab-contact-display.c:348 msgid "ICQ" msgstr "ICQ" @@ -2043,7 +2155,7 @@ msgid "Service" msgstr "服务" #: addressbook/gui/contact-editor/e-contact-editor-im.c:127 -#: calendar/gui/dialogs/cal-prefs-dialog.c:578 +#: calendar/gui/dialogs/cal-prefs-dialog.c:577 #: calendar/gui/e-cal-list-view.etspec.h:3 msgid "Location" msgstr "位置" @@ -2052,28 +2164,28 @@ msgstr "位置" msgid "Username" msgstr "用户名" -#: addressbook/gui/contact-editor/e-contact-editor-im.c:240 +#: addressbook/gui/contact-editor/e-contact-editor-im.c:231 #: addressbook/gui/contact-editor/e-contact-editor.c:202 msgid "Home" msgstr "家庭" -#: addressbook/gui/contact-editor/e-contact-editor-im.c:248 +#: addressbook/gui/contact-editor/e-contact-editor-im.c:239 #: addressbook/gui/contact-editor/e-contact-editor.c:203 msgid "Other" msgstr "其它" #: addressbook/gui/contact-editor/e-contact-editor.c:186 -#: addressbook/gui/widgets/eab-contact-display.c:338 +#: addressbook/gui/widgets/eab-contact-display.c:351 msgid "Yahoo" msgstr "雅虎" #: addressbook/gui/contact-editor/e-contact-editor.c:187 -#: addressbook/gui/widgets/eab-contact-display.c:337 +#: addressbook/gui/widgets/eab-contact-display.c:350 msgid "MSN" msgstr "MSN" #: addressbook/gui/contact-editor/e-contact-editor.c:189 -#: addressbook/gui/widgets/eab-contact-display.c:334 +#: addressbook/gui/widgets/eab-contact-display.c:347 msgid "GroupWise" msgstr "GroupWise" @@ -2093,23 +2205,28 @@ msgstr "为新联系人" msgid "Writable Fields" msgstr "可写域" -#: addressbook/gui/contact-editor/e-contact-editor.c:300 +#: addressbook/gui/contact-editor/e-contact-editor.c:293 +#, fuzzy +msgid "Required Fields" +msgstr "必需的人(_R)" + +#: addressbook/gui/contact-editor/e-contact-editor.c:307 msgid "Changed" msgstr "已更改" -#: addressbook/gui/contact-editor/e-contact-editor.c:2457 +#: addressbook/gui/contact-editor/e-contact-editor.c:2463 msgid "This contact belongs to these categories:" msgstr "此联系人属于这些类别：" -#: addressbook/gui/contact-editor/e-contact-editor.c:2550 +#: addressbook/gui/contact-editor/e-contact-editor.c:2556 msgid "Please select an image for this contact" msgstr "请选择此联系人的图像" -#: addressbook/gui/contact-editor/e-contact-editor.c:2551 +#: addressbook/gui/contact-editor/e-contact-editor.c:2557 msgid "No image" msgstr "无图像" -#: addressbook/gui/contact-editor/e-contact-editor.c:2779 +#: addressbook/gui/contact-editor/e-contact-editor.c:2833 msgid "" "The contact data is invalid:\n" "\n" @@ -2117,7 +2234,7 @@ msgstr "" "联系人数据无效：\n" "\n" -#: addressbook/gui/contact-editor/e-contact-editor.c:2807 +#: addressbook/gui/contact-editor/e-contact-editor.c:2885 msgid "Invalid contact." msgstr "无效的联系人。" @@ -2130,7 +2247,7 @@ msgid "_Edit Full" msgstr "编辑全名(_E)" #: addressbook/gui/contact-editor/e-contact-quick-add.c:301 -#: mail/mail-config.glade.h:166 +#: mail/mail-config.glade.h:156 msgid "_Full Name:" msgstr "全名(_F)：" @@ -2276,7 +2393,7 @@ msgid "Add an email to the List" msgstr "将电子邮件添加到列表" #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:814 msgid "Contact List Editor" msgstr "联系人列表编辑器" @@ -2285,7 +2402,7 @@ msgid "Insert email adresses from Adress Book" msgstr "从地址簿中插入电子邮件地址" #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:714 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:715 msgid "Members" msgstr "成员" @@ -2309,22 +2426,22 @@ msgstr "列出姓名(_L)：" 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:165 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:166 #: addressbook/gui/widgets/e-addressbook-model.c:295 -#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378 -#: addressbook/gui/widgets/e-addressbook-view.c:221 +#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:377 +#: addressbook/gui/widgets/e-addressbook-view.c:222 #: addressbook/gui/widgets/e-minicard-view-widget.c:105 -#: addressbook/gui/widgets/e-minicard-view.c:484 +#: addressbook/gui/widgets/e-minicard-view.c:505 msgid "Book" msgstr "地址簿" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:179 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:180 msgid "Is New List" msgstr "为新列表" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:736 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:737 #: calendar/gui/e-meeting-list-view.c:60 -#: calendar/gui/e-meeting-list-view.c:457 +#: calendar/gui/e-meeting-list-view.c:458 msgid "Required Participants" msgstr "必需的参与者" @@ -2382,10 +2499,10 @@ msgid_plural "%d contacts" msgstr[0] "%d 个联系人" #: addressbook/gui/widgets/e-addressbook-model.c:302 -#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385 -#: addressbook/gui/widgets/e-addressbook-view.c:235 +#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384 +#: addressbook/gui/widgets/e-addressbook-view.c:236 #: addressbook/gui/widgets/e-minicard-view-widget.c:112 -#: addressbook/gui/widgets/e-minicard-view.c:491 +#: addressbook/gui/widgets/e-minicard-view.c:512 msgid "Query" msgstr "查询" @@ -2393,7 +2510,7 @@ msgstr "查询" msgid "Error getting book view" msgstr "获取名簿视图出错" -#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399 +#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398 msgid "Model" msgstr "模型" @@ -2401,130 +2518,101 @@ msgstr "模型" msgid "Error modifying card" msgstr "修改卡片错误" -#: addressbook/gui/widgets/e-addressbook-view.c:167 +#: addressbook/gui/widgets/e-addressbook-view.c:168 msgid "Name begins with" msgstr "姓名以此开头" -#: addressbook/gui/widgets/e-addressbook-view.c:168 +#: addressbook/gui/widgets/e-addressbook-view.c:169 msgid "Email begins with" msgstr "邮件以此开头" -#: addressbook/gui/widgets/e-addressbook-view.c:169 -#: calendar/gui/cal-search-bar.c:54 +#: addressbook/gui/widgets/e-addressbook-view.c:170 +#: calendar/gui/cal-search-bar.c:53 msgid "Category is" msgstr "类别为" #. We attach subitems below -#: addressbook/gui/widgets/e-addressbook-view.c:170 -#: calendar/gui/cal-search-bar.c:49 +#: addressbook/gui/widgets/e-addressbook-view.c:171 +#: calendar/gui/cal-search-bar.c:48 msgid "Any field contains" msgstr "任何域含有" -#: addressbook/gui/widgets/e-addressbook-view.c:171 -#: addressbook/gui/widgets/e-addressbook-view.c:176 +#: addressbook/gui/widgets/e-addressbook-view.c:172 +#: addressbook/gui/widgets/e-addressbook-view.c:177 msgid "Advanced..." msgstr "高级..." -#: addressbook/gui/widgets/e-addressbook-view.c:242 +#: addressbook/gui/widgets/e-addressbook-view.c:243 #: calendar/gui/dialogs/meeting-page.etspec.h:11 #: calendar/gui/e-calendar-table.etspec.h:13 -#: calendar/gui/e-meeting-list-view.c:227 +#: calendar/gui/e-meeting-list-view.c:228 #: calendar/gui/e-meeting-time-sel.etspec.h:11 msgid "Type" msgstr "类型" -#: addressbook/gui/widgets/e-addressbook-view.c:543 +#: addressbook/gui/widgets/e-addressbook-view.c:540 msgid "Address Book" msgstr "地址簿" -#: addressbook/gui/widgets/e-addressbook-view.c:887 -#: addressbook/gui/widgets/e-addressbook-view.c:1107 -#: addressbook/gui/widgets/e-addressbook-view.c:2097 +#: addressbook/gui/widgets/e-addressbook-view.c:803 +#: addressbook/gui/widgets/e-addressbook-view.c:921 +#: addressbook/gui/widgets/e-addressbook-view.c:1972 #: ui/evolution-addressbook.xml.h:19 msgid "Save as VCard..." msgstr "另存为 VCard..." -#: addressbook/gui/widgets/e-addressbook-view.c:1094 +#: addressbook/gui/widgets/e-addressbook-view.c:917 msgid "New Contact..." msgstr "新建联系人..." -#: addressbook/gui/widgets/e-addressbook-view.c:1095 +#: addressbook/gui/widgets/e-addressbook-view.c:918 msgid "New Contact List..." msgstr "新建联系人列表..." -#: addressbook/gui/widgets/e-addressbook-view.c:1098 -msgid "Go to Folder..." -msgstr "转到文件夹..." - -#: addressbook/gui/widgets/e-addressbook-view.c:1099 -msgid "Import..." -msgstr "导入..." - -#: addressbook/gui/widgets/e-addressbook-view.c:1101 -msgid "Search for Contacts..." -msgstr "搜索联系人..." - -#: addressbook/gui/widgets/e-addressbook-view.c:1102 -msgid "Address Book Sources..." -msgstr "地址簿来源..." - -#: addressbook/gui/widgets/e-addressbook-view.c:1104 -msgid "Pilot Settings..." -msgstr "Pilot 设置..." - -#: addressbook/gui/widgets/e-addressbook-view.c:1108 +#: addressbook/gui/widgets/e-addressbook-view.c:922 #: ui/evolution-addressbook.xml.h:10 msgid "Forward Contact" msgstr "转发联系人" -#: addressbook/gui/widgets/e-addressbook-view.c:1109 +#: addressbook/gui/widgets/e-addressbook-view.c:923 msgid "Send Message to Contact" msgstr "给联系人发信件" -#: addressbook/gui/widgets/e-addressbook-view.c:1110 calendar/gui/print.c:2480 +#: addressbook/gui/widgets/e-addressbook-view.c:924 calendar/gui/print.c:2483 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14 msgid "Print" msgstr "打印" -#: addressbook/gui/widgets/e-addressbook-view.c:1112 -msgid "Print Envelope" -msgstr "打印信封" - -#: addressbook/gui/widgets/e-addressbook-view.c:1116 +#: addressbook/gui/widgets/e-addressbook-view.c:927 msgid "Copy to Address Book..." msgstr "复制到地址簿..." -#: addressbook/gui/widgets/e-addressbook-view.c:1117 +#: addressbook/gui/widgets/e-addressbook-view.c:928 msgid "Move to Address Book..." msgstr "移动到地址簿..." -#: addressbook/gui/widgets/e-addressbook-view.c:1120 +#: addressbook/gui/widgets/e-addressbook-view.c:931 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4 msgid "Cut" msgstr "剪切" -#: addressbook/gui/widgets/e-addressbook-view.c:1121 -#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:380 +#: addressbook/gui/widgets/e-addressbook-view.c:932 +#: calendar/gui/calendar-component.c:384 calendar/gui/tasks-component.c:329 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9 #: ui/evolution-tasks.xml.h:2 msgid "Copy" msgstr "复制" -#: addressbook/gui/widgets/e-addressbook-view.c:1122 +#: addressbook/gui/widgets/e-addressbook-view.c:933 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11 msgid "Paste" msgstr "粘贴" -#: addressbook/gui/widgets/e-addressbook-view.c:1127 -#: calendar/gui/e-calendar-view.c:1418 -msgid "Current View" -msgstr "当前视图" - #. All, unmatched, separator -#: addressbook/gui/widgets/e-addressbook-view.c:1682 -#: calendar/gui/cal-search-bar.c:358 +#: addressbook/gui/widgets/e-addressbook-view.c:1526 +#: calendar/gui/cal-search-bar.c:346 msgid "Any Category" msgstr "任何类别" @@ -2557,6 +2645,7 @@ msgid "Car Phone" msgstr "车载电话" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8 +#: calendar/gui/dialogs/task-page.glade.h:5 #: calendar/gui/e-cal-list-view.etspec.h:1 #: calendar/gui/e-calendar-table.etspec.h:3 msgid "Categories" @@ -2567,17 +2656,17 @@ msgid "Company Phone" msgstr "公司电话" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10 -#: addressbook/gui/widgets/eab-contact-display.c:547 smime/lib/e-cert.c:826 +#: addressbook/gui/widgets/eab-contact-display.c:560 smime/lib/e-cert.c:826 msgid "Email" msgstr "电子邮件" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:11 -#: addressbook/gui/widgets/eab-popup-control.c:442 +#: addressbook/gui/widgets/eab-popup-control.c:441 msgid "Email 2" msgstr "电子邮件 2" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12 -#: addressbook/gui/widgets/eab-popup-control.c:452 +#: addressbook/gui/widgets/eab-popup-control.c:451 msgid "Email 3" msgstr "电子邮件 3" @@ -2618,7 +2707,7 @@ msgid "Manager" msgstr "经理" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23 -#: addressbook/gui/widgets/eab-contact-display.c:366 +#: addressbook/gui/widgets/eab-contact-display.c:379 msgid "Mobile Phone" msgstr "移动电话" @@ -2627,7 +2716,7 @@ msgid "Nickname" msgstr "昵称" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25 -#: addressbook/gui/widgets/eab-contact-display.c:377 +#: addressbook/gui/widgets/eab-contact-display.c:390 msgid "Note" msgstr "注释" @@ -2636,7 +2725,7 @@ msgid "Office" msgstr "办公室" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27 -#: addressbook/gui/widgets/eab-contact-display.c:347 +#: addressbook/gui/widgets/eab-contact-display.c:360 msgid "Organization" msgstr "组织" @@ -2662,7 +2751,7 @@ msgstr "收音机" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33 #: calendar/gui/dialogs/meeting-page.etspec.h:9 -#: calendar/gui/e-meeting-list-view.c:234 +#: calendar/gui/e-meeting-list-view.c:235 #: calendar/gui/e-meeting-time-sel.etspec.h:9 msgid "Role" msgstr "角色" @@ -2726,7 +2815,22 @@ msgstr "最大域名长度" msgid "Column Width" msgstr "列宽" -#: addressbook/gui/widgets/e-minicard-view.c:164 +#: addressbook/gui/widgets/e-minicard-view.c:171 +#, fuzzy +msgid "" +"\n" +"\n" +"Search for the Contact\n" +"\n" +"or double-click here to create a new Contact." +msgstr "" +"\n" +"\n" +"本视图中没有可显示的项。\n" +"\n" +"请在此双击以创建新联系人。" + +#: addressbook/gui/widgets/e-minicard-view.c:174 msgid "" "\n" "\n" @@ -2740,7 +2844,15 @@ msgstr "" "\n" "请在此双击以创建新联系人。" -#: addressbook/gui/widgets/e-minicard-view.c:167 +#: addressbook/gui/widgets/e-minicard-view.c:179 +#, fuzzy +msgid "" +"\n" +"\n" +"Search for the Contact." +msgstr "搜索联系人..." + +#: addressbook/gui/widgets/e-minicard-view.c:181 msgid "" "\n" "\n" @@ -2750,7 +2862,7 @@ msgstr "" "\n" "本视图中没有可显示的项。" -#: addressbook/gui/widgets/e-minicard-view.c:477 +#: addressbook/gui/widgets/e-minicard-view.c:498 msgid "Adapter" msgstr "适配器" @@ -2772,55 +2884,55 @@ msgstr "(地图)" msgid "map" msgstr "地图" -#: addressbook/gui/widgets/eab-contact-display.c:261 -#: addressbook/gui/widgets/eab-contact-display.c:528 +#: addressbook/gui/widgets/eab-contact-display.c:274 +#: addressbook/gui/widgets/eab-contact-display.c:541 msgid "List Members" msgstr "列出成员" -#: addressbook/gui/widgets/eab-contact-display.c:324 -#: addressbook/gui/widgets/eab-contact-display.c:326 +#: addressbook/gui/widgets/eab-contact-display.c:337 +#: addressbook/gui/widgets/eab-contact-display.c:339 msgid "E-mail" msgstr "电子邮件" -#: addressbook/gui/widgets/eab-contact-display.c:348 +#: addressbook/gui/widgets/eab-contact-display.c:361 msgid "Position" msgstr "位置" -#: addressbook/gui/widgets/eab-contact-display.c:349 +#: addressbook/gui/widgets/eab-contact-display.c:362 msgid "Video Conferencing" msgstr "视频会议" -#: addressbook/gui/widgets/eab-contact-display.c:350 -#: addressbook/gui/widgets/eab-contact-display.c:365 +#: addressbook/gui/widgets/eab-contact-display.c:363 +#: addressbook/gui/widgets/eab-contact-display.c:378 msgid "Phone" msgstr "电话" -#: addressbook/gui/widgets/eab-contact-display.c:351 +#: addressbook/gui/widgets/eab-contact-display.c:364 msgid "Fax" msgstr "传真" -#: addressbook/gui/widgets/eab-contact-display.c:355 +#: addressbook/gui/widgets/eab-contact-display.c:368 msgid "work" msgstr "工作" -#: addressbook/gui/widgets/eab-contact-display.c:362 +#: addressbook/gui/widgets/eab-contact-display.c:375 msgid "WWW" msgstr "WWW" -#: addressbook/gui/widgets/eab-contact-display.c:363 -#: addressbook/gui/widgets/eab-contact-display.c:582 +#: addressbook/gui/widgets/eab-contact-display.c:376 +#: addressbook/gui/widgets/eab-contact-display.c:595 msgid "Blog" msgstr "Blog" -#: addressbook/gui/widgets/eab-contact-display.c:370 +#: addressbook/gui/widgets/eab-contact-display.c:383 msgid "personal" msgstr "个人" -#: addressbook/gui/widgets/eab-contact-display.c:543 +#: addressbook/gui/widgets/eab-contact-display.c:556 msgid "Job Title" msgstr "职称" -#: addressbook/gui/widgets/eab-contact-display.c:574 +#: addressbook/gui/widgets/eab-contact-display.c:587 msgid "Home page" msgstr "主页" @@ -2875,12 +2987,11 @@ msgstr "不支持的协议" #. E_BOOK_ERROR_CANCELLED #: addressbook/gui/widgets/eab-gui-util.c:61 #: calendar/gui/dialogs/task-details-page.glade.h:3 -#: calendar/gui/e-cal-component-preview.c:233 -#: calendar/gui/e-cal-model-tasks.c:353 calendar/gui/e-cal-model-tasks.c:656 -#: calendar/gui/e-calendar-table.c:473 calendar/gui/print.c:2349 -#: camel/camel-service.c:724 camel/camel-service.c:886 -#: camel/camel-service.c:1017 camel/providers/pop3/camel-pop3-store.c:474 -#: camel/providers/pop3/camel-pop3-store.c:555 +#: calendar/gui/e-cal-component-preview.c:231 +#: calendar/gui/e-cal-model-tasks.c:347 calendar/gui/e-cal-model-tasks.c:650 +#: calendar/gui/e-calendar-table.c:457 calendar/gui/print.c:2352 +#: camel/providers/pop3/camel-pop3-store.c:439 +#: camel/providers/pop3/camel-pop3-store.c:520 msgid "Cancelled" msgstr "已经取消" @@ -2891,7 +3002,7 @@ msgstr "无法取消" #. E_BOOK_ERROR_AUTHENTICATION_FAILED #: addressbook/gui/widgets/eab-gui-util.c:63 -#: calendar/gui/comp-editor-factory.c:428 +#: calendar/gui/comp-editor-factory.c:431 msgid "Authentication Failed" msgstr "认证失败" @@ -3075,37 +3186,37 @@ msgstr "%s 的 VCard" #. * addresses (and *only* the e-mail addresses) associated with an existing #. * contact. #. -#: addressbook/gui/widgets/eab-popup-control.c:199 +#: addressbook/gui/widgets/eab-popup-control.c:198 msgid "(none)" msgstr "(无)" -#: addressbook/gui/widgets/eab-popup-control.c:432 +#: addressbook/gui/widgets/eab-popup-control.c:431 msgid "Primary Email" msgstr "主电子邮件" -#: addressbook/gui/widgets/eab-popup-control.c:568 +#: addressbook/gui/widgets/eab-popup-control.c:567 msgid "Select an Action" msgstr "选择一项活动" -#: addressbook/gui/widgets/eab-popup-control.c:576 +#: addressbook/gui/widgets/eab-popup-control.c:575 #, c-format msgid "Create a new contact \"%s\"" msgstr "创建新联系人“%s”" -#: addressbook/gui/widgets/eab-popup-control.c:592 +#: addressbook/gui/widgets/eab-popup-control.c:591 #, c-format msgid "Add address to existing contact \"%s\"" msgstr "为现有的联系人“%s”添加地址" -#: addressbook/gui/widgets/eab-popup-control.c:870 +#: addressbook/gui/widgets/eab-popup-control.c:869 msgid "Querying Address Book..." msgstr "正在查询地址簿..." -#: addressbook/gui/widgets/eab-popup-control.c:953 +#: addressbook/gui/widgets/eab-popup-control.c:952 msgid "Edit Contact Info" msgstr "编辑联系人信息" -#: addressbook/gui/widgets/eab-popup-control.c:1008 +#: addressbook/gui/widgets/eab-popup-control.c:1007 msgid "Merge E-Mail Address" msgstr "合并电子邮件地址" @@ -3163,10 +3274,6 @@ msgid "Evolution VCard Importer" msgstr "Evolution VCard 导入器" #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2 -msgid "Evolution VCard importer" -msgstr "Evolution vCard 导入器" - -#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3 msgid "VCard (.vcf, .gcrd)" msgstr "VCard (.vfg, .gcrd)" @@ -3273,6 +3380,12 @@ msgid "Number of columns:" msgstr "列数：" #: addressbook/printing/e-contact-print.glade.h:23 +#: camel/providers/groupwise/camel-groupwise-provider.c:59 +#: camel/providers/imap/camel-imap-provider.c:64 +#: camel/providers/imap4/camel-imap4-provider.c:49 +#: camel/providers/local/camel-local-provider.c:43 +#: camel/providers/local/camel-local-provider.c:79 +#: camel/providers/local/camel-local-provider.c:99 msgid "Options" msgstr "选项" @@ -3341,6 +3454,7 @@ msgid "Top:" msgstr "顶部：" #: addressbook/printing/e-contact-print.glade.h:40 +#: calendar/gui/dialogs/calendar-setup.c:175 msgid "Type:" msgstr "类型：" @@ -3407,8 +3521,9 @@ msgid "Export in asynchronous mode " msgstr "以异步模式导出" #: addressbook/tools/evolution-addressbook-export.c:63 +#, fuzzy msgid "" -"The number of cards in one output file in asychronous mode,default size 100." +"The number of cards in one output file in asychronous mode, default size 100." msgstr "异步模式中一个输出文件中的卡片数，默认大小为 100。" #: addressbook/tools/evolution-addressbook-export.c:63 @@ -3433,8 +3548,9 @@ msgid "In normal mode, there is no need for the size option." msgstr "在普通模式中，不应该有大小选项。" #: addressbook/tools/evolution-addressbook-export.c:153 -msgid "Impossible internal error." -msgstr "不可能的内部错误。" +#, fuzzy +msgid "Unhandled error" +msgstr "未知的错误" #: addressbook/tools/evolution-addressbook-import.c:46 msgid "Error loading default addressbook." @@ -3448,10 +3564,6 @@ msgstr "输入文件" msgid "No filename provided." msgstr "没有提供文件名。" -#: addressbook/util/e-destination.c:577 -msgid "Unnamed List" -msgstr "未命名的列表" - #. calendar:prompt-cancel-meeting primary #. calendar:prompt-cancel-task primary #: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12 @@ -3711,6 +3823,62 @@ msgstr "Evolution 日历异常退出。" msgid "Your calendars will not be available until Evolution is restarted." msgstr "除非您重新启动 Evolution，否则您的日历无法使用。" +#. calendar:prompt-delete-calendar primary +#: calendar/calendar-errors.xml.h:116 +#, fuzzy +msgid "Delete calendar '{0}'?" +msgstr "删除“{0}”吗？" + +#. calendar:prompt-delete-calendar secondary +#: calendar/calendar-errors.xml.h:118 +msgid "This calendar will be removed permanently." +msgstr "" + +#. calendar:prompt-delete-task-list primary +#: calendar/calendar-errors.xml.h:120 +#, fuzzy +msgid "Delete task list '{0}'?" +msgstr "删除该列表" + +#. calendar:prompt-delete-task-list secondary +#: calendar/calendar-errors.xml.h:122 +msgid "This task list will be removed permanently." +msgstr "" + +#. calendar:prompt-send-no-subject-calendar primary +#: calendar/calendar-errors.xml.h:124 +#, fuzzy +msgid "Are you sure you want to send the appointment without a summary?" +msgstr "您确定想要发送没有主题的信件吗？" + +#. calendar:prompt-send-no-subject-calendar secondary +#: calendar/calendar-errors.xml.h:126 +#, fuzzy +msgid "" +"Adding a meaningful Summary to your appointment will give your recipients an " +"idea of what your appointment is about." +msgstr "在您的信件中添加有意义的主题行可以让您的收件人更容易明白您邮件的内容。" + +#: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132 +#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20 +#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32 +msgid "_Send" +msgstr "发送(_S)" + +#. calendar:prompt-send-no-subject-task primary +#: calendar/calendar-errors.xml.h:129 +#, fuzzy +msgid "Are you sure you want to send the task without a summary?" +msgstr "您确定想要发送没有主题的信件吗？" + +#. calendar:prompt-send-no-subject-task secondary +#: calendar/calendar-errors.xml.h:131 +#, fuzzy +msgid "" +"Adding a meaningful Summary to your task will give your recipients an idea " +"of what your appointment is about." +msgstr "在您的信件中添加有意义的主题行可以让您的收件人更容易明白您邮件的内容。" + #: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301 #: smime/gui/component.c:48 msgid "Enter password" @@ -3746,7 +3914,7 @@ msgid "Calendar and Tasks" msgstr "日历和任务" #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2 -#: calendar/gui/calendar-component.c:1085 +#: calendar/gui/calendar-component.c:1082 msgid "Calendars" msgstr "日历" @@ -3779,11 +3947,11 @@ msgid "Evolution's Tasks component" msgstr "Evolution 任务组件" #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10 -#: calendar/gui/e-tasks.c:1199 calendar/gui/print.c:1819 -#: calendar/gui/tasks-component.c:425 calendar/gui/tasks-component.c:895 -#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83 +#: calendar/gui/e-tasks.c:1189 calendar/gui/print.c:1822 +#: calendar/gui/tasks-component.c:408 calendar/gui/tasks-component.c:878 +#: calendar/gui/tasks-control.c:410 calendar/importers/icalendar-importer.c:83 #: calendar/importers/icalendar-importer.c:709 -#: camel/providers/groupwise/camel-gw-listener.c:372 +#: camel/providers/groupwise/camel-gw-listener.c:406 msgid "Tasks" msgstr "任务" @@ -3800,53 +3968,96 @@ msgstr "任务(_T)" msgid "Evolution Calendar alarm notification service" msgstr "Evolution 日历提醒通知服务" -#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213 -msgid "Starting:" -msgstr "开始：" +#: calendar/gui/alarm-notify/alarm-notify.glade.h:1 +#: calendar/gui/dialogs/event-editor.c:138 calendar/gui/print.c:2298 +msgid "Appointment" +msgstr "约会" -#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215 -msgid "Ending:" -msgstr "结束：" +#: calendar/gui/alarm-notify/alarm-notify.glade.h:2 +#, fuzzy +msgid "Appointment Title" +msgstr "约会" -#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259 -msgid "Evolution Alarm" -msgstr "Evolution 提醒" +#: calendar/gui/alarm-notify/alarm-notify.glade.h:3 +#, fuzzy +msgid "End time:" +msgstr "结束时间(_E)：" -#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358 -#, c-format -msgid "Alarm on %s" -msgstr "在 %s 时提醒" +#: calendar/gui/alarm-notify/alarm-notify.glade.h:4 +#: calendar/gui/e-itip-control.c:1118 +msgid "Location:" +msgstr "位置：" -#: calendar/gui/alarm-notify/alarm-notify.glade.h:1 -msgid "Snooze _time (minutes):" +#: calendar/gui/alarm-notify/alarm-notify.glade.h:5 +#, fuzzy +msgid "Snooze _time:" msgstr "午睡时间(分钟)(_T)：" -#: calendar/gui/alarm-notify/alarm-notify.glade.h:2 -msgid "_Edit appointment" -msgstr "编辑约会(_E)" +#: calendar/gui/alarm-notify/alarm-notify.glade.h:6 +#, fuzzy +msgid "Start time:" +msgstr "开始时间(_S)：" -#: calendar/gui/alarm-notify/alarm-notify.glade.h:3 +#: calendar/gui/alarm-notify/alarm-notify.glade.h:7 +#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 +#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11 +#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:34 +#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8 +#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6 +#: ui/evolution-message-composer.xml.h:43 +#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10 +#: ui/evolution-tasks.xml.h:22 +msgid "_Edit" +msgstr "编辑(_E)" + +#: calendar/gui/alarm-notify/alarm-notify.glade.h:8 msgid "_Snooze" msgstr "午睡(_S)" -#: calendar/gui/alarm-notify/alarm-queue.c:893 -#: ui/evolution-message-composer.xml.h:10 -msgid "Open" -msgstr "打开" +#: calendar/gui/alarm-notify/alarm-notify.glade.h:9 +#, fuzzy +msgid "description of appointment" +msgstr "约会开始" + +#: calendar/gui/alarm-notify/alarm-notify.glade.h:10 +#, fuzzy +msgid "end-time" +msgstr "结束时间(_E)：" + +#: calendar/gui/alarm-notify/alarm-notify.glade.h:11 +#, fuzzy +msgid "location" +msgstr "位置" + +#: calendar/gui/alarm-notify/alarm-notify.glade.h:13 +#, fuzzy +msgid "start-time" +msgstr "开始时间(_S)：" -#: calendar/gui/alarm-notify/alarm-queue.c:895 +#: calendar/gui/alarm-notify/alarm-queue.c:864 msgid "Dismiss" msgstr "丢弃" -#: calendar/gui/alarm-notify/alarm-queue.c:897 +#: calendar/gui/alarm-notify/alarm-queue.c:865 msgid "Dismiss All" msgstr "全部丢弃" -#: calendar/gui/alarm-notify/alarm-queue.c:962 +#: calendar/gui/alarm-notify/alarm-queue.c:947 +#, fuzzy +msgid "No summary available." +msgstr "没有描述。" + +#: calendar/gui/alarm-notify/alarm-queue.c:956 +#: calendar/gui/alarm-notify/alarm-queue.c:958 msgid "No description available." msgstr "没有描述。" -#: calendar/gui/alarm-notify/alarm-queue.c:981 +#: calendar/gui/alarm-notify/alarm-queue.c:966 +#, fuzzy +msgid "No location information available." +msgstr "没有描述。" + +#: calendar/gui/alarm-notify/alarm-queue.c:982 #, c-format msgid "" "Alarm on %s\n" @@ -3859,12 +4070,12 @@ msgstr "" "开始于 %s\n" "结束于 %s" -#: calendar/gui/alarm-notify/alarm-queue.c:1081 -#: calendar/gui/alarm-notify/alarm-queue.c:1105 +#: calendar/gui/alarm-notify/alarm-queue.c:1084 +#: calendar/gui/alarm-notify/alarm-queue.c:1108 msgid "Warning" msgstr "警告" -#: calendar/gui/alarm-notify/alarm-queue.c:1085 +#: calendar/gui/alarm-notify/alarm-queue.c:1088 msgid "" "Evolution does not support calendar reminders with\n" "email notifications yet, but this reminder was\n" @@ -3876,7 +4087,7 @@ msgstr "" "发送电子邮件。Evolution 将以\n" "显示普通提示会话框代替。" -#: calendar/gui/alarm-notify/alarm-queue.c:1111 +#: calendar/gui/alarm-notify/alarm-queue.c:1114 #, c-format msgid "" "An Evolution Calendar reminder is about to trigger. This reminder is " @@ -3892,7 +4103,7 @@ msgstr "" "\n" "您确信您要运行该程序吗？" -#: calendar/gui/alarm-notify/alarm-queue.c:1125 +#: calendar/gui/alarm-notify/alarm-queue.c:1128 msgid "Do not ask me about this program again." msgstr "不要再次询问此问题。" @@ -4036,35 +4247,34 @@ msgstr "是以 24 小时格式还是以 12 小时格式显示时间" msgid "Whether to show week numbers in date navigator" msgstr "是否在日期浏览器中显示周数" -#: calendar/gui/cal-search-bar.c:50 +#: calendar/gui/cal-search-bar.c:49 msgid "Summary contains" msgstr "概要含有" -#: calendar/gui/cal-search-bar.c:51 +#: calendar/gui/cal-search-bar.c:50 msgid "Description contains" msgstr "描述含有" -#: calendar/gui/cal-search-bar.c:52 +#: calendar/gui/cal-search-bar.c:51 msgid "Comment contains" msgstr "注释含有" -#: calendar/gui/cal-search-bar.c:53 +#: calendar/gui/cal-search-bar.c:52 msgid "Location contains" msgstr "位置含有" -#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:342 +#: calendar/gui/cal-search-bar.c:350 camel/camel-vee-store.c:343 msgid "Unmatched" msgstr "无匹配" -#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:570 -#: calendar/gui/dialogs/select-source-dialog.c:112 -#: calendar/gui/gnome-cal.c:1910 -#: camel/providers/groupwise/camel-gw-listener.c:371 -#: camel/providers/groupwise/camel-gw-listener.c:401 +#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:567 +#: calendar/gui/dialogs/calendar-setup.c:325 calendar/gui/gnome-cal.c:1925 +#: camel/providers/groupwise/camel-gw-listener.c:405 +#: camel/providers/groupwise/camel-gw-listener.c:435 msgid "Calendar" msgstr "日历" -#: calendar/gui/calendar-commands.c:352 +#: calendar/gui/calendar-commands.c:355 msgid "" "This operation will permanently erase all events older than the selected " "amount of time. If you continue, you will not be able to recover these " @@ -4072,18 +4282,22 @@ msgid "" msgstr "" "该操作将永久删除所有比选中时间量早的事件。如果您继续，您将无法恢复这些事件。" -#: calendar/gui/calendar-commands.c:358 +#: calendar/gui/calendar-commands.c:361 msgid "Purge events older than" msgstr "销毁较早的事件" -#: calendar/gui/calendar-commands.c:363 +#: calendar/gui/calendar-commands.c:366 #: calendar/gui/dialogs/alarm-dialog.glade.h:21 -#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13 +#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14 msgid "days" msgstr "天数" -#: calendar/gui/calendar-commands.c:432 -msgid "%A %d %B %Y" +#: calendar/gui/calendar-component.c:383 +msgid "New Calendar" +msgstr "新建日历" + +#: calendar/gui/calendar-component.c:519 +msgid "%A %d %b %Y" msgstr "%Y年%-m月%-d日%A" #. strftime format %a = abbreviated weekday name, %d = day of month, @@ -4092,46 +4306,19 @@ msgstr "%Y年%-m月%-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/calendar-commands.c:435 calendar/gui/calendar-component.c:525 -#: calendar/gui/e-day-view-top-item.c:714 calendar/gui/e-day-view.c:1588 -#: calendar/gui/e-week-view-main-item.c:329 +#: calendar/gui/calendar-component.c:522 +#: calendar/gui/e-day-view-top-item.c:708 calendar/gui/e-day-view.c:1572 +#: calendar/gui/e-week-view-main-item.c:321 msgid "%a %d %b" msgstr "%-m月%-d日%A" -#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442 -#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:527 -#: calendar/gui/calendar-component.c:532 calendar/gui/calendar-component.c:534 +#: calendar/gui/calendar-component.c:524 calendar/gui/calendar-component.c:529 +#: calendar/gui/calendar-component.c:531 msgid "%a %d %b %Y" msgstr "%Y年%-m月%-d日%A" -#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467 -#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475 -msgid "%d %B %Y" -msgstr "%Y年%-m月%-d日" - -#. strftime format %d = day of month, %B = full -#. month name. You can change the order but don't -#. change the specifiers or add anything. -#: calendar/gui/calendar-commands.c:465 -#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498 -msgid "%d %B" -msgstr "%-m月%-d日" - -#: calendar/gui/calendar-component.c:370 -#, c-format -msgid "Calendar '%s' will be removed. Are you sure you want to continue?" -msgstr "即将删除日历“%s”。您确定想要继续吗？" - -#: calendar/gui/calendar-component.c:432 -msgid "New Calendar" -msgstr "新建日历" - -#: calendar/gui/calendar-component.c:522 -msgid "%A %d %b %Y" -msgstr "%Y年%-m月%-d日%A" - -#: calendar/gui/calendar-component.c:546 calendar/gui/calendar-component.c:553 -#: calendar/gui/calendar-component.c:559 calendar/gui/calendar-component.c:561 +#: calendar/gui/calendar-component.c:543 calendar/gui/calendar-component.c:550 +#: calendar/gui/calendar-component.c:556 calendar/gui/calendar-component.c:558 msgid "%d %b %Y" msgstr "%Y年%-m月%-d日" @@ -4140,122 +4327,122 @@ msgstr "%Y年%-m月%-d日" #. 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/calendar-component.c:551 -#: calendar/gui/e-day-view-top-item.c:718 calendar/gui/e-day-view.c:1604 -#: calendar/gui/e-week-view-main-item.c:343 +#: calendar/gui/calendar-component.c:548 +#: calendar/gui/e-day-view-top-item.c:712 calendar/gui/e-day-view.c:1588 +#: calendar/gui/e-week-view-main-item.c:335 msgid "%d %b" msgstr "%B%-d日" -#: calendar/gui/calendar-component.c:641 +#: calendar/gui/calendar-component.c:638 msgid "Failed upgrading calendars." msgstr "升级日历失败。" -#: calendar/gui/calendar-component.c:937 +#: calendar/gui/calendar-component.c:934 #, c-format msgid "Unable to open the calendar '%s' for creating events and meetings" msgstr "无法打开日历“%s”来创建事件和会议" -#: calendar/gui/calendar-component.c:953 +#: calendar/gui/calendar-component.c:950 msgid "There is no calendar available for creating events and meetings" msgstr "没有可创建事件和会议的日历" -#: calendar/gui/calendar-component.c:1251 +#: calendar/gui/calendar-component.c:1248 msgid "New appointment" msgstr "新建约会" -#: calendar/gui/calendar-component.c:1252 +#: calendar/gui/calendar-component.c:1249 msgid "_Appointment" msgstr "约会(_A)" -#: calendar/gui/calendar-component.c:1253 +#: calendar/gui/calendar-component.c:1250 msgid "Create a new appointment" msgstr "创建新约会" -#: calendar/gui/calendar-component.c:1259 +#: calendar/gui/calendar-component.c:1256 msgid "New meeting" msgstr "新闻会议" -#: calendar/gui/calendar-component.c:1260 +#: calendar/gui/calendar-component.c:1257 msgid "M_eeting" msgstr "会议(_E)" -#: calendar/gui/calendar-component.c:1261 +#: calendar/gui/calendar-component.c:1258 msgid "Create a new meeting request" msgstr "创建一条新会议请求" -#: calendar/gui/calendar-component.c:1267 +#: calendar/gui/calendar-component.c:1264 msgid "New all day appointment" msgstr "新建全天约会" -#: calendar/gui/calendar-component.c:1268 +#: calendar/gui/calendar-component.c:1265 msgid "All Day A_ppointment" msgstr "全天约会(_P)" -#: calendar/gui/calendar-component.c:1269 +#: calendar/gui/calendar-component.c:1266 msgid "Create a new all-day appointment" msgstr "创建新全天约会" -#: calendar/gui/calendar-component.c:1275 +#: calendar/gui/calendar-component.c:1272 msgid "New calendar" msgstr "新建日历" -#: calendar/gui/calendar-component.c:1276 +#: calendar/gui/calendar-component.c:1273 msgid "Cale_ndar" msgstr "日历(_N)" -#: calendar/gui/calendar-component.c:1277 +#: calendar/gui/calendar-component.c:1274 msgid "Create a new calendar" msgstr "创建新日历" -#: calendar/gui/calendar-offline-handler.c:192 +#: calendar/gui/calendar-offline-handler.c:191 #, c-format msgid "backend_go_offline(): %s" msgstr "backend_go_offline()：%s" -#: calendar/gui/calendar-offline-handler.c:215 +#: calendar/gui/calendar-offline-handler.c:214 #, c-format msgid "backend_go_online(): %s" msgstr "backend_go_online()：%s" -#: calendar/gui/calendar-view-factory.c:118 +#: calendar/gui/calendar-view-factory.c:109 msgid "Day View" msgstr "日视图" -#: calendar/gui/calendar-view-factory.c:121 +#: calendar/gui/calendar-view-factory.c:112 msgid "Work Week View" msgstr "周工作视图" -#: calendar/gui/calendar-view-factory.c:124 +#: calendar/gui/calendar-view-factory.c:115 msgid "Week View" msgstr "周视图" -#: calendar/gui/calendar-view-factory.c:127 +#: calendar/gui/calendar-view-factory.c:118 msgid "Month View" msgstr "月视图" -#: calendar/gui/comp-editor-factory.c:410 +#: calendar/gui/comp-editor-factory.c:413 msgid "Error while opening the calendar" msgstr "打开日历时出错" -#: calendar/gui/comp-editor-factory.c:416 +#: calendar/gui/comp-editor-factory.c:419 msgid "Method not supported when opening the calendar" msgstr "打开日历的方法不支持" -#: calendar/gui/comp-editor-factory.c:422 +#: calendar/gui/comp-editor-factory.c:425 msgid "Permission denied to open the calendar" msgstr "没有权限打开日历" -#: calendar/gui/comp-editor-factory.c:434 +#: calendar/gui/comp-editor-factory.c:437 #: camel/providers/imap/camel-imap-command.c:303 #: camel/providers/imap/camel-imap-command.c:400 -#: camel/providers/imap4/camel-imap4-store.c:260 -#: camel/providers/pop3/camel-pop3-store.c:561 -#: camel/providers/pop3/camel-pop3-store.c:568 -#: camel/providers/pop3/camel-pop3-store.c:574 shell/e-shell.c:1228 +#: camel/providers/imap4/camel-imap4-store.c:288 +#: camel/providers/pop3/camel-pop3-store.c:526 +#: camel/providers/pop3/camel-pop3-store.c:533 +#: camel/providers/pop3/camel-pop3-store.c:539 shell/e-shell.c:1247 msgid "Unknown error" msgstr "未知的错误" -#: calendar/gui/comp-editor-factory.c:478 +#: calendar/gui/comp-editor-factory.c:481 #, c-format msgid "open_client(): %s" msgstr "open_client()：%s" @@ -4353,7 +4540,7 @@ msgid "hour(s)" msgstr "小时" #: calendar/gui/dialogs/alarm-dialog.glade.h:25 -#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14 +#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15 msgid "hours" msgstr "小时" @@ -4362,10 +4549,28 @@ msgid "minute(s)" msgstr "分钟" #: calendar/gui/dialogs/alarm-dialog.glade.h:28 +msgid "option menu to choose alarm action" +msgstr "" + +#: calendar/gui/dialogs/alarm-dialog.glade.h:29 +#, fuzzy +msgid "option menu to choose alarm relative" +msgstr "您忘记选择日期了。" + +#: calendar/gui/dialogs/alarm-dialog.glade.h:30 +#, fuzzy +msgid "option menu to choose alarm time" +msgstr "您忘记选择日期了。" + +#: calendar/gui/dialogs/alarm-dialog.glade.h:31 +msgid "option menu to choose alarm value units" +msgstr "" + +#: calendar/gui/dialogs/alarm-dialog.glade.h:32 msgid "start of appointment" msgstr "约会开始" -#: calendar/gui/dialogs/alarm-list-dialog.c:192 +#: calendar/gui/dialogs/alarm-list-dialog.c:199 msgid "Action/Trigger" msgstr "动作/触发器" @@ -4379,34 +4584,34 @@ msgstr "提醒" #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which #. has "activatable" set. -#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466 -#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905 +#: calendar/gui/dialogs/cal-prefs-dialog.c:566 mail/em-account-prefs.c:480 +#: mail/em-composer-prefs.c:678 mail/em-composer-prefs.c:945 msgid "Enabled" msgstr "已启用" -#: calendar/gui/dialogs/cal-prefs-dialog.c:721 +#: calendar/gui/dialogs/cal-prefs-dialog.c:720 msgid "Are you sure you want to remove this URL?" msgstr "您确定您想要删除此 URL 吗？" -#: calendar/gui/dialogs/cal-prefs-dialog.c:729 +#: calendar/gui/dialogs/cal-prefs-dialog.c:728 msgid "Don't Remove" msgstr "不删除" -#: calendar/gui/dialogs/cal-prefs-dialog.c:778 -#: calendar/gui/dialogs/cal-prefs-dialog.c:811 -#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288 -#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372 -#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654 -#: mail/em-composer-prefs.c:684 +#: calendar/gui/dialogs/cal-prefs-dialog.c:777 +#: calendar/gui/dialogs/cal-prefs-dialog.c:810 +#: calendar/gui/dialogs/cal-prefs-dialog.c:843 mail/em-account-prefs.c:327 +#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:386 +#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655 +#: mail/em-composer-prefs.c:685 msgid "Disable" msgstr "禁用" -#: calendar/gui/dialogs/cal-prefs-dialog.c:778 -#: calendar/gui/dialogs/cal-prefs-dialog.c:811 -#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288 -#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374 -#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654 -#: mail/em-composer-prefs.c:684 +#: calendar/gui/dialogs/cal-prefs-dialog.c:777 +#: calendar/gui/dialogs/cal-prefs-dialog.c:810 +#: calendar/gui/dialogs/cal-prefs-dialog.c:845 mail/em-account-prefs.c:327 +#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:388 +#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655 +#: mail/em-composer-prefs.c:685 msgid "Enable" msgstr "启用" @@ -4475,7 +4680,7 @@ msgid "Display" msgstr "显示" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 -#: mail/mail-config.glade.h:76 +#: mail/mail-config.glade.h:74 msgid "E_nable" msgstr "启用(_N)" @@ -4484,8 +4689,8 @@ msgid "Free/Busy Publishing" msgstr "忙/闲发布" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 -#: calendar/gui/dialogs/recurrence-page.c:1049 -#: calendar/gui/e-itip-control.c:739 +#: calendar/gui/dialogs/recurrence-page.c:1031 +#: calendar/gui/e-itip-control.c:732 msgid "Friday" msgstr "星期五" @@ -4498,8 +4703,8 @@ msgid "Minutes" msgstr "分钟" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23 -#: calendar/gui/dialogs/recurrence-page.c:1045 -#: calendar/gui/e-itip-control.c:735 +#: calendar/gui/dialogs/recurrence-page.c:1027 +#: calendar/gui/e-itip-control.c:728 msgid "Monday" msgstr "星期一" @@ -4508,8 +4713,8 @@ msgid "S_un" msgstr "周日(_U)" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25 -#: calendar/gui/dialogs/recurrence-page.c:1050 -#: calendar/gui/e-itip-control.c:740 +#: calendar/gui/dialogs/recurrence-page.c:1032 +#: calendar/gui/e-itip-control.c:733 msgid "Saturday" msgstr "星期六" @@ -4522,8 +4727,8 @@ msgid "Show week _numbers in date navigator" msgstr "在日期浏览器中显示周数(_N)" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28 -#: calendar/gui/dialogs/recurrence-page.c:1051 -#: calendar/gui/e-itip-control.c:734 +#: calendar/gui/dialogs/recurrence-page.c:1033 +#: calendar/gui/e-itip-control.c:727 msgid "Sunday" msgstr "星期日" @@ -4536,8 +4741,8 @@ msgid "T_hu" msgstr "周四(_H)" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31 -#: calendar/gui/dialogs/recurrence-page.c:1048 -#: calendar/gui/e-itip-control.c:738 +#: calendar/gui/dialogs/recurrence-page.c:1030 +#: calendar/gui/e-itip-control.c:731 msgid "Thursday" msgstr "星期四" @@ -4550,8 +4755,8 @@ msgid "Time format:" msgstr "时间格式：" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34 -#: calendar/gui/dialogs/recurrence-page.c:1046 -#: calendar/gui/e-itip-control.c:736 +#: calendar/gui/dialogs/recurrence-page.c:1028 +#: calendar/gui/e-itip-control.c:729 msgid "Tuesday" msgstr "星期二" @@ -4560,8 +4765,8 @@ msgid "W_eek starts:" msgstr "一周开始(_E)：" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36 -#: calendar/gui/dialogs/recurrence-page.c:1047 -#: calendar/gui/e-itip-control.c:737 +#: calendar/gui/dialogs/recurrence-page.c:1029 +#: calendar/gui/e-itip-control.c:730 msgid "Wednesday" msgstr "星期三" @@ -4593,17 +4798,6 @@ msgstr "不在月视图中显示周末(_C)" msgid "_Day begins:" msgstr "一天开始(_D)：" -#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 -#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10 -#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34 -#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8 -#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6 -#: ui/evolution-message-composer.xml.h:43 -#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10 -#: ui/evolution-tasks.xml.h:22 -msgid "_Edit" -msgstr "编辑(_E)" - #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45 msgid "_Fri" msgstr "周五(_F)" @@ -4644,31 +4838,33 @@ msgstr "周三(_W)" msgid "before every appointment" msgstr "在每次约会前" -#: calendar/gui/dialogs/calendar-setup.c:172 -msgid "You must specify a location to get the calendar from." -msgstr "您必须获取日历的位置。" +#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55 +msgid "option menu to choose reminder units" +msgstr "" -#: calendar/gui/dialogs/calendar-setup.c:180 -#, c-format -msgid "The source location '%s' is not well-formed." -msgstr "源位置“%s”不是规格的。" +#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56 +msgid "option menu to choose time units" +msgstr "" -#: calendar/gui/dialogs/calendar-setup.c:195 -#, c-format -msgid "The source location '%s' is not a webcal source." -msgstr "源位置“%s”不是 Webcal 源。" +#: calendar/gui/dialogs/calendar-setup.c:299 +#: calendar/gui/dialogs/calendar-setup.glade.h:4 +msgid "C_olor:" +msgstr "颜色(_O)：" -#: calendar/gui/dialogs/calendar-setup.c:275 -#, c-format -msgid "Source with name '%s' already exists in the selected group" -msgstr "选中组中已经存在名为“%s”的源" +#: calendar/gui/dialogs/calendar-setup.c:335 +#, fuzzy +msgid "Tasks List" +msgstr "任务列表" -#: calendar/gui/dialogs/calendar-setup.c:288 -#, c-format -msgid "" -"The group '%s' is remote. You must specify a location to get the calendar " -"from" -msgstr "“%s”是远程组。您必须指定可获取日历的位置" +#: calendar/gui/dialogs/calendar-setup.c:400 +#, fuzzy +msgid "Calendar Properties" +msgstr "文件夹属性" + +#: calendar/gui/dialogs/calendar-setup.c:464 +#, fuzzy +msgid "Task List Properties" +msgstr "任务列表组" #: calendar/gui/dialogs/calendar-setup.glade.h:2 msgid "Add Calendar" @@ -4678,11 +4874,7 @@ msgstr "添加日历" msgid "Add Task List" msgstr "添加任务列表" -#: calendar/gui/dialogs/calendar-setup.glade.h:4 -msgid "C_olor:" -msgstr "颜色(_O)：" - -#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110 +#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:103 msgid "Pick a color" msgstr "选取一种颜色" @@ -4698,15 +4890,11 @@ msgstr "添加任务列表(_A)" msgid "_Refresh:" msgstr "刷新(_R)：" -#: calendar/gui/dialogs/calendar-setup.glade.h:10 -msgid "_Type:" -msgstr "类型(_T)：" - #: calendar/gui/dialogs/calendar-setup.glade.h:11 msgid "_URL:" msgstr "_URL：" -#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20 +#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21 msgid "weeks" msgstr "周" @@ -4759,65 +4947,77 @@ msgstr "%s 您还没有进行修改，更新编辑器吗？" msgid "Validation error: %s" msgstr "校验错误：%s" -#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258 +#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261 msgid " to " msgstr " 到 " -#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262 +#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265 msgid " (Completed " msgstr " (完成 " -#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264 +#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267 msgid "Completed " msgstr "已完成 " -#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269 +#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272 msgid " (Due " msgstr " (预定 " -#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271 +#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274 msgid "Due " msgstr "预定 " -#: calendar/gui/dialogs/comp-editor.c:264 +#: calendar/gui/dialogs/comp-editor.c:257 msgid "Could not update object" msgstr "无法更新对象" -#: calendar/gui/dialogs/comp-editor.c:870 -#: calendar/gui/dialogs/comp-editor.c:907 +#: calendar/gui/dialogs/comp-editor.c:899 +#: calendar/gui/dialogs/comp-editor.c:942 msgid "Edit Appointment" msgstr "编辑约会" -#: calendar/gui/dialogs/comp-editor.c:875 -#: calendar/gui/dialogs/comp-editor.c:912 +#: calendar/gui/dialogs/comp-editor.c:905 +#: calendar/gui/dialogs/comp-editor.c:948 +#, fuzzy, c-format +msgid "Meeting - %s" +msgstr "会议" + +#: calendar/gui/dialogs/comp-editor.c:907 +#: calendar/gui/dialogs/comp-editor.c:950 #, c-format msgid "Appointment - %s" msgstr "约会 - %s" -#: calendar/gui/dialogs/comp-editor.c:878 -#: calendar/gui/dialogs/comp-editor.c:915 +#: calendar/gui/dialogs/comp-editor.c:911 +#: calendar/gui/dialogs/comp-editor.c:954 +#, fuzzy, c-format +msgid "Assigned Task - %s" +msgstr "指派的任务(_D)" + +#: calendar/gui/dialogs/comp-editor.c:913 +#: calendar/gui/dialogs/comp-editor.c:956 #, c-format msgid "Task - %s" msgstr "任务 - %s" -#: calendar/gui/dialogs/comp-editor.c:881 -#: calendar/gui/dialogs/comp-editor.c:918 +#: calendar/gui/dialogs/comp-editor.c:916 +#: calendar/gui/dialogs/comp-editor.c:959 #, c-format msgid "Journal entry - %s" msgstr "日志条目 - %s" -#: calendar/gui/dialogs/comp-editor.c:892 -#: calendar/gui/dialogs/comp-editor.c:928 +#: calendar/gui/dialogs/comp-editor.c:927 +#: calendar/gui/dialogs/comp-editor.c:969 msgid "No summary" msgstr "没有概要" -#: calendar/gui/dialogs/comp-editor.c:1294 -#: calendar/gui/dialogs/comp-editor.c:1327 -#: calendar/gui/dialogs/comp-editor.c:1351 +#: calendar/gui/dialogs/comp-editor.c:1335 +#: calendar/gui/dialogs/comp-editor.c:1368 +#: calendar/gui/dialogs/comp-editor.c:1392 msgid "Changes made to this item may be discarded if an update arrives" msgstr "如果更新到达的话，对此项目的更改将被丢弃" -#: calendar/gui/dialogs/comp-editor.c:1375 +#: calendar/gui/dialogs/comp-editor.c:1416 msgid "Unable to use current version!" msgstr "无法使用当前版本！" @@ -4893,68 +5093,64 @@ msgstr "授权给：" msgid "Enter Delegate" msgstr "输入代表" -#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295 -msgid "Appointment" -msgstr "约会" - -#: calendar/gui/dialogs/event-editor.c:162 +#: calendar/gui/dialogs/event-editor.c:147 msgid "Recurrence" msgstr "再现" -#: calendar/gui/dialogs/event-editor.c:169 -#: calendar/gui/dialogs/event-editor.c:239 -#: calendar/gui/dialogs/event-editor.c:381 +#: calendar/gui/dialogs/event-editor.c:156 +#: calendar/gui/dialogs/event-editor.c:223 +#: calendar/gui/dialogs/event-editor.c:367 msgid "Scheduling" msgstr "调度" -#: calendar/gui/dialogs/event-editor.c:176 -#: calendar/gui/dialogs/event-editor.c:242 -#: calendar/gui/dialogs/event-editor.c:384 +#: calendar/gui/dialogs/event-editor.c:163 +#: calendar/gui/dialogs/event-editor.c:226 +#: calendar/gui/dialogs/event-editor.c:370 msgid "Invitations" msgstr "邀请" -#: calendar/gui/dialogs/event-page.c:692 +#: calendar/gui/dialogs/event-page.c:674 msgid "Event with no start date" msgstr "没有开始日期的事件" -#: calendar/gui/dialogs/event-page.c:695 +#: calendar/gui/dialogs/event-page.c:677 msgid "Event with no end date" msgstr "没有结束日期的事件" -#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523 +#: calendar/gui/dialogs/event-page.c:837 calendar/gui/dialogs/task-page.c:505 msgid "Start date is wrong" msgstr "开始日期有错" -#: calendar/gui/dialogs/event-page.c:865 +#: calendar/gui/dialogs/event-page.c:847 msgid "End date is wrong" msgstr "结束日期有错" -#: calendar/gui/dialogs/event-page.c:888 +#: calendar/gui/dialogs/event-page.c:870 msgid "Start time is wrong" msgstr "开始时间有错" -#: calendar/gui/dialogs/event-page.c:895 +#: calendar/gui/dialogs/event-page.c:877 msgid "End time is wrong" msgstr "结束时间有错" -#: calendar/gui/dialogs/event-page.c:1605 +#: calendar/gui/dialogs/event-page.c:1587 #, c-format msgid "Unable to open the calendar '%s'." msgstr "无法打开日历“%s”。" -#: calendar/gui/dialogs/event-page.c:1804 +#: calendar/gui/dialogs/event-page.c:1784 #, c-format msgid "%d day before appointment" msgid_plural "%d days before appointment" msgstr[0] "约会的 %d 天前" -#: calendar/gui/dialogs/event-page.c:1812 +#: calendar/gui/dialogs/event-page.c:1792 #, c-format msgid "%d hour before appointment" msgid_plural "%d hours before appointment" msgstr[0] "约会的 %d 小时前" -#: calendar/gui/dialogs/event-page.c:1820 +#: calendar/gui/dialogs/event-page.c:1800 #, c-format msgid "%d minute before appointement" msgid_plural "%d minutes before appointment" @@ -4998,61 +5194,66 @@ msgid "Cale_ndar:" msgstr "日历(_N)：" #: calendar/gui/dialogs/event-page.glade.h:11 -#: calendar/gui/dialogs/task-page.glade.h:5 +#: calendar/gui/dialogs/task-page.glade.h:6 msgid "Classi_fication:" msgstr "分类(_F)：" #: calendar/gui/dialogs/event-page.glade.h:12 -#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259 -#: calendar/gui/e-cal-model.c:355 calendar/gui/e-calendar-table.c:377 +#: calendar/gui/dialogs/task-page.glade.h:7 calendar/gui/e-cal-list-view.c:255 +#: calendar/gui/e-cal-model.c:346 calendar/gui/e-calendar-table.c:361 msgid "Confidential" msgstr "机密" #: calendar/gui/dialogs/event-page.glade.h:13 +#, fuzzy +msgid "Event Description" +msgstr "描述：" + +#: calendar/gui/dialogs/event-page.glade.h:14 msgid "Locat_ion:" msgstr "位置(_I)：" -#: calendar/gui/dialogs/event-page.glade.h:14 -#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258 -#: calendar/gui/e-cal-model.c:353 calendar/gui/e-calendar-table.c:376 +#: calendar/gui/dialogs/event-page.glade.h:15 +#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:254 +#: calendar/gui/e-cal-model.c:344 calendar/gui/e-calendar-table.c:360 msgid "Private" msgstr "保密" -#: calendar/gui/dialogs/event-page.glade.h:15 -#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257 -#: calendar/gui/e-cal-model.c:344 calendar/gui/e-cal-model.c:351 -#: calendar/gui/e-calendar-table.c:375 +#: calendar/gui/dialogs/event-page.glade.h:16 +#: calendar/gui/dialogs/task-page.glade.h:10 +#: calendar/gui/e-cal-list-view.c:253 calendar/gui/e-cal-model.c:335 +#: calendar/gui/e-cal-model.c:342 calendar/gui/e-calendar-table.c:359 msgid "Public" msgstr "公开" -#: calendar/gui/dialogs/event-page.glade.h:16 +#: calendar/gui/dialogs/event-page.glade.h:17 msgid "Show time as _busy" msgstr "将时间显示为忙(_B)" -#: calendar/gui/dialogs/event-page.glade.h:17 -#: calendar/gui/dialogs/task-page.glade.h:11 +#: calendar/gui/dialogs/event-page.glade.h:18 +#: calendar/gui/dialogs/task-page.glade.h:12 msgid "Su_mmary:" msgstr "概要(_M)：" -#: calendar/gui/dialogs/event-page.glade.h:18 +#: calendar/gui/dialogs/event-page.glade.h:19 msgid "This appointment has customized alarms" msgstr "此约会有自定义提醒" -#: calendar/gui/dialogs/event-page.glade.h:19 +#: calendar/gui/dialogs/event-page.glade.h:20 msgid "_Alarm" msgstr "提醒(_A)" -#: calendar/gui/dialogs/event-page.glade.h:20 +#: calendar/gui/dialogs/event-page.glade.h:21 msgid "_Description:" msgstr "描述(_D)：" -#: calendar/gui/dialogs/event-page.glade.h:21 -#: calendar/gui/e-meeting-time-sel.c:623 +#: calendar/gui/dialogs/event-page.glade.h:22 +#: calendar/gui/e-meeting-time-sel.c:633 msgid "_End time:" msgstr "结束时间(_E)：" -#: calendar/gui/dialogs/event-page.glade.h:22 -#: calendar/gui/e-meeting-time-sel.c:604 +#: calendar/gui/dialogs/event-page.glade.h:23 +#: calendar/gui/e-meeting-time-sel.c:606 msgid "_Start time:" msgstr "开始时间(_S)：" @@ -5062,42 +5263,41 @@ msgstr "开始时间(_S)：" #. When "None" is selected we want the field to be cleared. #. Note that we don't show this here, since by default a 'None' date #. is not permitted. -#: calendar/gui/dialogs/meeting-page.c:316 +#: calendar/gui/dialogs/meeting-page.c:296 #: calendar/gui/dialogs/meeting-page.glade.h:5 -#: calendar/gui/e-cal-model-tasks.c:648 calendar/gui/e-itip-control.c:1111 -#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877 -#: mail/em-account-prefs.c:427 mail/em-folder-view.c:936 -#: mail/mail-account-gui.c:1577 mail/mail-account-gui.c:2022 -#: mail/mail-config.glade.h:103 -#: widgets/e-timezone-dialog/e-timezone-dialog.c:193 -#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443 -#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595 +#: calendar/gui/e-cal-model-tasks.c:642 calendar/gui/e-itip-control.c:1104 +#: composer/e-msg-composer.c:2115 filter/filter-rule.c:878 +#: mail/em-account-prefs.c:441 mail/em-folder-view.c:961 +#: mail/mail-account-gui.c:1579 mail/mail-account-gui.c:2024 +#: widgets/e-timezone-dialog/e-timezone-dialog.c:190 +#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458 +#: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651 msgid "None" msgstr "无" -#: calendar/gui/dialogs/meeting-page.c:449 +#: calendar/gui/dialogs/meeting-page.c:432 msgid "The organizer selected no longer has an account." msgstr "选中的组织者没有帐户了。" -#: calendar/gui/dialogs/meeting-page.c:455 +#: calendar/gui/dialogs/meeting-page.c:438 msgid "An organizer is required." msgstr "需要一名组织者。" -#: calendar/gui/dialogs/meeting-page.c:470 +#: calendar/gui/dialogs/meeting-page.c:453 msgid "At least one attendee is required." msgstr "需要至少一个参加者。" -#: calendar/gui/dialogs/meeting-page.c:795 +#: calendar/gui/dialogs/meeting-page.c:778 msgid "_Delegate To..." msgstr "授权于(_D)..." -#: calendar/gui/dialogs/meeting-page.c:799 -#: composer/e-msg-composer-attachment-bar.c:453 +#: calendar/gui/dialogs/meeting-page.c:781 +#: composer/e-msg-composer-attachment-bar.c:440 msgid "_Remove" msgstr "删除(_R)" #: calendar/gui/dialogs/meeting-page.etspec.h:1 -#: calendar/gui/e-meeting-list-view.c:218 +#: calendar/gui/e-meeting-list-view.c:219 #: calendar/gui/e-meeting-time-sel.etspec.h:1 msgid "Attendee" msgstr "出席者" @@ -5133,16 +5333,16 @@ msgid "Member" msgstr "成员" #: calendar/gui/dialogs/meeting-page.etspec.h:8 -#: calendar/gui/e-meeting-list-view.c:241 +#: calendar/gui/e-meeting-list-view.c:242 #: calendar/gui/e-meeting-time-sel.etspec.h:8 msgid "RSVP" msgstr "RSVP" #: calendar/gui/dialogs/meeting-page.etspec.h:10 -#: calendar/gui/dialogs/task-editor.c:158 +#: calendar/gui/dialogs/task-editor.c:145 #: calendar/gui/e-calendar-table.etspec.h:10 -#: calendar/gui/e-meeting-list-view.c:248 -#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62 +#: calendar/gui/e-meeting-list-view.c:249 +#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63 #: mail/message-list.etspec.h:12 msgid "Status" msgstr "状态" @@ -5156,7 +5356,7 @@ msgid "C_hange Organizer" msgstr "更改组织者(_H)" #: calendar/gui/dialogs/meeting-page.glade.h:4 -#: calendar/gui/e-meeting-time-sel.c:425 +#: calendar/gui/e-meeting-time-sel.c:419 msgid "Con_tacts..." msgstr "联系人(_T)..." @@ -5165,6 +5365,11 @@ msgid "Or_ganizer:" msgstr "组织者(_G)：" #: calendar/gui/dialogs/meeting-page.glade.h:7 +#, fuzzy +msgid "Organizer" +msgstr "组织者：" + +#: calendar/gui/dialogs/meeting-page.glade.h:8 #: calendar/gui/e-itip-control.glade.h:9 msgid "Organizer:" msgstr "组织者：" @@ -5234,55 +5439,55 @@ msgstr "本次和以后各次" msgid "All Instances" msgstr "所有各次" -#: calendar/gui/dialogs/recurrence-page.c:511 +#: calendar/gui/dialogs/recurrence-page.c:493 msgid "This appointment contains recurrences that Evolution cannot edit." msgstr "此约会含有 Evolution 无法编辑的循环。" -#: calendar/gui/dialogs/recurrence-page.c:817 +#: calendar/gui/dialogs/recurrence-page.c:799 msgid "Recurrence date is invalid" msgstr "再现日期无效" -#: calendar/gui/dialogs/recurrence-page.c:928 +#: calendar/gui/dialogs/recurrence-page.c:910 msgid "on" msgstr "在" -#: calendar/gui/dialogs/recurrence-page.c:989 +#: calendar/gui/dialogs/recurrence-page.c:971 msgid "first" msgstr "第一" -#: calendar/gui/dialogs/recurrence-page.c:990 +#: calendar/gui/dialogs/recurrence-page.c:972 msgid "second" msgstr "第二" -#: calendar/gui/dialogs/recurrence-page.c:991 +#: calendar/gui/dialogs/recurrence-page.c:973 msgid "third" msgstr "第三" -#: calendar/gui/dialogs/recurrence-page.c:992 +#: calendar/gui/dialogs/recurrence-page.c:974 msgid "fourth" msgstr "第四" -#: calendar/gui/dialogs/recurrence-page.c:993 +#: calendar/gui/dialogs/recurrence-page.c:975 msgid "last" msgstr "最后" -#: calendar/gui/dialogs/recurrence-page.c:1016 +#: calendar/gui/dialogs/recurrence-page.c:998 msgid "Other Date" msgstr "其它日期" -#: calendar/gui/dialogs/recurrence-page.c:1044 +#: calendar/gui/dialogs/recurrence-page.c:1026 msgid "day" msgstr "天" -#: calendar/gui/dialogs/recurrence-page.c:1181 +#: calendar/gui/dialogs/recurrence-page.c:1163 msgid "on the" msgstr "在" -#: calendar/gui/dialogs/recurrence-page.c:1367 +#: calendar/gui/dialogs/recurrence-page.c:1349 msgid "occurrences" msgstr "循环" -#: calendar/gui/dialogs/recurrence-page.c:2320 +#: calendar/gui/dialogs/recurrence-page.c:2302 msgid "Date/Time" msgstr "日期/时间" @@ -5330,19 +5535,8 @@ msgstr "周" msgid "year(s)" msgstr "年" -#: calendar/gui/dialogs/select-source-dialog.c:88 -msgid "Select destination" -msgstr "选择目的" - -#: calendar/gui/dialogs/select-source-dialog.c:110 -msgid "_Destination" -msgstr "目的(_D)" - -#: calendar/gui/dialogs/select-source-dialog.c:112 -msgid "Task List" -msgstr "任务列表" - -#: calendar/gui/dialogs/task-details-page.c:427 +#: calendar/gui/dialogs/task-details-page.c:410 +#: calendar/gui/dialogs/task-details-page.c:429 msgid "Completed date is wrong" msgstr "完成日期有错" @@ -5357,44 +5551,44 @@ msgstr "<span weight=\"bold\">状态</span>" #. Pass TRUE as is_utc, so it gets converted to the current #. timezone. #: calendar/gui/dialogs/task-details-page.glade.h:4 -#: calendar/gui/e-cal-component-preview.c:230 -#: calendar/gui/e-cal-model-tasks.c:351 calendar/gui/e-cal-model-tasks.c:654 -#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:903 -#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210 -#: calendar/gui/print.c:2346 +#: calendar/gui/e-cal-component-preview.c:228 +#: calendar/gui/e-cal-model-tasks.c:345 calendar/gui/e-cal-model-tasks.c:648 +#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-itip-control.c:896 +#: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211 +#: calendar/gui/print.c:2349 msgid "Completed" msgstr "已完成" #: calendar/gui/dialogs/task-details-page.glade.h:5 -#: calendar/gui/e-cal-component-preview.c:249 -#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1012 +#: calendar/gui/e-cal-component-preview.c:247 +#: calendar/gui/e-calendar-table.c:381 mail/message-list.c:1011 msgid "High" msgstr "高" #: calendar/gui/dialogs/task-details-page.glade.h:6 -#: calendar/gui/e-cal-component-preview.c:227 -#: calendar/gui/e-cal-model-tasks.c:349 calendar/gui/e-cal-model-tasks.c:652 -#: calendar/gui/e-cal-model-tasks.c:727 calendar/gui/e-calendar-table.c:471 -#: calendar/gui/print.c:2343 +#: calendar/gui/e-cal-component-preview.c:225 +#: calendar/gui/e-cal-model-tasks.c:343 calendar/gui/e-cal-model-tasks.c:646 +#: calendar/gui/e-cal-model-tasks.c:721 calendar/gui/e-calendar-table.c:455 +#: calendar/gui/print.c:2346 msgid "In Progress" msgstr "进行中" #: calendar/gui/dialogs/task-details-page.glade.h:7 -#: calendar/gui/e-cal-component-preview.c:253 -#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1010 +#: calendar/gui/e-cal-component-preview.c:251 +#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1009 msgid "Low" msgstr "低" #: calendar/gui/dialogs/task-details-page.glade.h:8 -#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:949 -#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1011 +#: calendar/gui/e-cal-component-preview.c:249 calendar/gui/e-cal-model.c:940 +#: calendar/gui/e-calendar-table.c:382 mail/message-list.c:1010 msgid "Normal" msgstr "中" #: calendar/gui/dialogs/task-details-page.glade.h:9 -#: calendar/gui/e-cal-component-preview.c:237 -#: calendar/gui/e-cal-model-tasks.c:347 calendar/gui/e-cal-model-tasks.c:650 -#: calendar/gui/e-calendar-table.c:470 calendar/gui/print.c:2340 +#: calendar/gui/e-cal-component-preview.c:235 +#: calendar/gui/e-cal-model-tasks.c:341 calendar/gui/e-cal-model-tasks.c:644 +#: calendar/gui/e-calendar-table.c:454 calendar/gui/print.c:2343 msgid "Not Started" msgstr "尚未开始" @@ -5403,7 +5597,7 @@ msgid "P_ercent complete:" msgstr "完成百分比(_E)：" #: calendar/gui/dialogs/task-details-page.glade.h:11 -#: calendar/gui/e-calendar-table.c:400 +#: calendar/gui/e-calendar-table.c:384 msgid "Undefined" msgstr "未定义" @@ -5423,21 +5617,21 @@ msgstr "状态(_S)：" msgid "_Web Page:" msgstr "网页(_W)：" -#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297 +#: calendar/gui/dialogs/task-editor.c:136 calendar/gui/print.c:2300 msgid "Task" msgstr "任务" -#: calendar/gui/dialogs/task-editor.c:165 -#: calendar/gui/dialogs/task-editor.c:225 -#: calendar/gui/dialogs/task-editor.c:361 +#: calendar/gui/dialogs/task-editor.c:153 +#: calendar/gui/dialogs/task-editor.c:214 +#: calendar/gui/dialogs/task-editor.c:352 msgid "Assignment" msgstr "指派" -#: calendar/gui/dialogs/task-page.c:496 +#: calendar/gui/dialogs/task-page.c:478 msgid "Due date is wrong" msgstr "到期日期错误" -#: calendar/gui/dialogs/task-page.c:831 +#: calendar/gui/dialogs/task-page.c:813 #, c-format msgid "Unable to open tasks in '%s'." msgstr "无法打开“%s”中的任务。" @@ -5450,19 +5644,24 @@ msgstr "<span weight=\"bold\">基本</span>" msgid "<span weight=\"bold\">Date and Time</span>" msgstr "<span weight=\"bold\">日期和时间</span>" -#: calendar/gui/dialogs/task-page.glade.h:7 +#: calendar/gui/dialogs/task-page.glade.h:8 msgid "D_escription:" msgstr "描述(_E)：" -#: calendar/gui/dialogs/task-page.glade.h:10 +#: calendar/gui/dialogs/task-page.glade.h:11 msgid "Sta_rt date:" msgstr "开始日期(_R)：" -#: calendar/gui/dialogs/task-page.glade.h:12 +#: calendar/gui/dialogs/task-page.glade.h:13 +#, fuzzy +msgid "Task Description" +msgstr "描述：" + +#: calendar/gui/dialogs/task-page.glade.h:14 msgid "_Due date:" msgstr "到期日期(_D)：" -#: calendar/gui/dialogs/task-page.glade.h:13 +#: calendar/gui/dialogs/task-page.glade.h:15 msgid "_Group:" msgstr "组(_G)：" @@ -5580,46 +5779,46 @@ msgstr "在 %2$s 时 %1$s" msgid "%s for an unknown trigger type" msgstr "%s 为未知触发类型" -#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2389 +#: calendar/gui/e-cal-component-preview.c:69 mail/em-folder-view.c:2467 #, c-format msgid "Click to open %s" msgstr "单击以打开 %s" -#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794 +#: calendar/gui/e-cal-component-preview.c:154 filter/filter-rule.c:795 msgid "Untitled" msgstr "无标题" -#: calendar/gui/e-cal-component-preview.c:187 -#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.glade.h:11 +#: calendar/gui/e-cal-component-preview.c:185 +#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.glade.h:11 msgid "Summary:" msgstr "概要：" -#: calendar/gui/e-cal-component-preview.c:194 -#: calendar/gui/e-cal-component-preview.c:205 +#: calendar/gui/e-cal-component-preview.c:192 +#: calendar/gui/e-cal-component-preview.c:203 msgid "Start Date:" msgstr "开始日期：" -#: calendar/gui/e-cal-component-preview.c:216 +#: calendar/gui/e-cal-component-preview.c:214 msgid "Due Date:" msgstr "到期日期：" #. write status -#: calendar/gui/e-cal-component-preview.c:223 -#: calendar/gui/e-itip-control.c:1139 +#: calendar/gui/e-cal-component-preview.c:221 +#: calendar/gui/e-itip-control.c:1132 msgid "Status:" msgstr "状态：" -#: calendar/gui/e-cal-component-preview.c:247 +#: calendar/gui/e-cal-component-preview.c:245 msgid "Priority:" msgstr "优先级：" -#: calendar/gui/e-cal-component-preview.c:268 -#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.glade.h:6 -#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71 +#: calendar/gui/e-cal-component-preview.c:266 +#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-itip-control.glade.h:6 +#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69 msgid "Description:" msgstr "描述：" -#: calendar/gui/e-cal-component-preview.c:300 +#: calendar/gui/e-cal-component-preview.c:298 msgid "Web Page:" msgstr "网页：" @@ -5632,36 +5831,36 @@ msgid "Start Date" msgstr "开始日期" #: calendar/gui/e-cal-list-view.etspec.h:5 -#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22 +#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:21 msgid "Summary" msgstr "概要" -#: calendar/gui/e-cal-model-calendar.c:181 calendar/gui/e-calendar-table.c:449 +#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:433 msgid "Free" msgstr "空闲" -#: calendar/gui/e-cal-model-calendar.c:184 calendar/gui/e-calendar-table.c:450 -#: calendar/gui/e-meeting-time-sel.c:409 +#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:434 +#: calendar/gui/e-meeting-time-sel.c:403 msgid "Busy" msgstr "繁忙" -#: calendar/gui/e-cal-model-tasks.c:303 +#: calendar/gui/e-cal-model-tasks.c:297 msgid "N" msgstr "北" -#: calendar/gui/e-cal-model-tasks.c:303 +#: calendar/gui/e-cal-model-tasks.c:297 msgid "S" msgstr "南" -#: calendar/gui/e-cal-model-tasks.c:305 smime/lib/e-cert.c:681 +#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681 msgid "E" msgstr "东" -#: calendar/gui/e-cal-model-tasks.c:305 +#: calendar/gui/e-cal-model-tasks.c:299 msgid "W" msgstr "西" -#: calendar/gui/e-cal-model-tasks.c:602 +#: calendar/gui/e-cal-model-tasks.c:596 msgid "" "The geographical position must be entered in the format: \n" "\n" @@ -5671,184 +5870,177 @@ msgstr "" "\n" "45.436845,125.862501" -#: calendar/gui/e-cal-model-tasks.c:1013 calendar/gui/e-cal-model.c:955 -#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159 -#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765 +#: calendar/gui/e-cal-model-tasks.c:1007 calendar/gui/e-cal-model.c:946 +#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:160 +#: calendar/gui/e-meeting-store.c:170 calendar/gui/e-meeting-store.c:773 msgid "Yes" msgstr "是" -#: calendar/gui/e-cal-model-tasks.c:1013 calendar/gui/e-cal-model.c:955 -#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171 +#: calendar/gui/e-cal-model-tasks.c:1007 calendar/gui/e-cal-model.c:946 +#: calendar/gui/e-meeting-list-view.c:148 calendar/gui/e-meeting-store.c:172 msgid "No" msgstr "否" #. This is the default filename used for temporary file creation -#: calendar/gui/e-cal-model.c:357 calendar/gui/e-cal-model.c:360 -#: calendar/gui/e-itip-control.c:1156 calendar/gui/e-itip-control.c:1297 -#: calendar/gui/e-meeting-list-view.c:122 -#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115 -#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215 -#: camel/camel-gpg-context.c:1763 camel/camel-gpg-context.c:1814 +#: calendar/gui/e-cal-model.c:348 calendar/gui/e-cal-model.c:351 +#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290 +#: calendar/gui/e-meeting-list-view.c:123 +#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:116 +#: calendar/gui/e-meeting-store.c:151 calendar/gui/e-meeting-store.c:216 +#: camel/camel-gpg-context.c:1767 camel/camel-gpg-context.c:1818 #: camel/camel-tcp-stream-openssl.c:631 -#: camel/providers/imap4/camel-imap4-engine.c:1402 -#: camel/providers/imap4/camel-imap4-engine.c:1432 -#: camel/providers/imap4/camel-imap4-engine.c:1464 -#: camel/providers/imap4/camel-imap4-engine.c:1506 -#: camel/providers/imap4/camel-imap4-store.c:1204 -#: camel/providers/imap4/camel-imap4-utils.c:457 -#: camel/providers/smtp/camel-smtp-transport.c:172 -#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1155 +#: camel/providers/imap4/camel-imap4-engine.c:1465 +#: camel/providers/imap4/camel-imap4-engine.c:1504 +#: camel/providers/imap4/camel-imap4-engine.c:1549 +#: camel/providers/imap4/camel-imap4-engine.c:1605 +#: camel/providers/imap4/camel-imap4-store.c:1241 +#: camel/providers/imap4/camel-imap4-utils.c:575 +#: camel/providers/smtp/camel-smtp-transport.c:163 +#: camel/providers/smtp/camel-smtp-transport.c:218 mail/em-utils.c:1157 #: shell/e-component-registry.c:207 shell/e-component-registry.c:211 #: widgets/misc/e-charset-picker.c:62 msgid "Unknown" msgstr "未知" -#: calendar/gui/e-cal-model.c:951 +#: calendar/gui/e-cal-model.c:942 msgid "Recurring" msgstr "重复" -#: calendar/gui/e-cal-model.c:953 +#: calendar/gui/e-cal-model.c:944 msgid "Assigned" msgstr "已指派" -#: calendar/gui/e-calendar-table.c:419 +#: calendar/gui/e-calendar-table.c:403 msgid "0%" msgstr "0%" -#: calendar/gui/e-calendar-table.c:420 +#: calendar/gui/e-calendar-table.c:404 msgid "10%" msgstr "10%" -#: calendar/gui/e-calendar-table.c:421 +#: calendar/gui/e-calendar-table.c:405 msgid "20%" msgstr "20%" -#: calendar/gui/e-calendar-table.c:422 +#: calendar/gui/e-calendar-table.c:406 msgid "30%" msgstr "30%" -#: calendar/gui/e-calendar-table.c:423 +#: calendar/gui/e-calendar-table.c:407 msgid "40%" msgstr "40%" -#: calendar/gui/e-calendar-table.c:424 +#: calendar/gui/e-calendar-table.c:408 msgid "50%" msgstr "50%" -#: calendar/gui/e-calendar-table.c:425 +#: calendar/gui/e-calendar-table.c:409 msgid "60%" msgstr "60%" -#: calendar/gui/e-calendar-table.c:426 +#: calendar/gui/e-calendar-table.c:410 msgid "70%" msgstr "70%" -#: calendar/gui/e-calendar-table.c:427 +#: calendar/gui/e-calendar-table.c:411 msgid "80%" msgstr "80%" -#: calendar/gui/e-calendar-table.c:428 +#: calendar/gui/e-calendar-table.c:412 msgid "90%" msgstr "90%" -#: calendar/gui/e-calendar-table.c:429 +#: calendar/gui/e-calendar-table.c:413 msgid "100%" msgstr "100%" -#: calendar/gui/e-calendar-table.c:703 calendar/gui/e-calendar-view.c:658 +#: calendar/gui/e-calendar-table.c:689 calendar/gui/e-calendar-view.c:652 msgid "Deleting selected objects" msgstr "删除选中的对象" -#: calendar/gui/e-calendar-table.c:867 calendar/gui/e-calendar-view.c:762 +#: calendar/gui/e-calendar-table.c:868 calendar/gui/e-calendar-view.c:756 msgid "Updating objects" msgstr "更新对象" -#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084 -#: calendar/gui/e-calendar-view.c:1431 calendar/gui/e-calendar-view.c:1512 -#: mail/em-folder-view.c:902 ui/evolution-addressbook.xml.h:37 +#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-view.c:1064 +#: composer/e-msg-composer.c:1194 +msgid "Save as..." +msgstr "另存为..." + +#: calendar/gui/e-calendar-table.c:1151 calendar/gui/e-calendar-view.c:1389 +#: mail/em-folder-view.c:927 ui/evolution-addressbook.xml.h:37 msgid "_Open" msgstr "打开(_O)" -#: calendar/gui/e-calendar-table.c:1044 +#: calendar/gui/e-calendar-table.c:1152 msgid "Open _Web Page" msgstr "打开网页(_W)" -#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090 -#: calendar/gui/e-calendar-view.c:1432 calendar/gui/e-calendar-view.c:1518 -#: mail/em-folder-view.c:904 mail/em-popup.c:691 mail/em-popup.c:807 +#: calendar/gui/e-calendar-table.c:1153 calendar/gui/e-calendar-view.c:1390 +#: mail/em-folder-view.c:929 mail/em-popup.c:498 #: ui/evolution-mail-message.xml.h:128 msgid "_Save As..." msgstr "另存为(_S)..." -#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088 -#: calendar/gui/e-calendar-view.c:1410 calendar/gui/e-calendar-view.c:1433 -#: calendar/gui/e-calendar-view.c:1516 ui/evolution-addressbook.xml.h:40 +#: calendar/gui/e-calendar-table.c:1154 calendar/gui/e-calendar-view.c:1370 +#: calendar/gui/e-calendar-view.c:1391 ui/evolution-addressbook.xml.h:40 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125 #: ui/evolution-tasks.xml.h:25 msgid "_Print..." msgstr "打印(_P)..." -#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079 -#: calendar/gui/e-calendar-view.c:1438 calendar/gui/e-calendar-view.c:1482 +#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1395 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1 #: ui/evolution-tasks.xml.h:1 msgid "C_ut" msgstr "剪切(_U)" -#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077 -#: calendar/gui/e-calendar-view.c:1439 calendar/gui/e-calendar-view.c:1480 -#: mail/em-folder-tree.c:1013 mail/message-list.c:1702 -#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39 -#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109 -#: ui/evolution-tasks.xml.h:20 +#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1396 +#: composer/e-msg-composer.c:2882 mail/em-folder-tree.c:1024 +#: mail/message-list.c:1712 ui/evolution-addressbook.xml.h:31 +#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7 +#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20 msgid "_Copy" msgstr "复制(_C)" -#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086 -#: calendar/gui/e-calendar-view.c:1414 calendar/gui/e-calendar-view.c:1440 -#: calendar/gui/e-calendar-view.c:1514 ui/evolution-addressbook.xml.h:38 +#: calendar/gui/e-calendar-table.c:1160 calendar/gui/e-calendar-view.c:1373 +#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:38 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24 msgid "_Paste" msgstr "粘贴(_P)" -#: calendar/gui/e-calendar-table.c:1056 +#: calendar/gui/e-calendar-table.c:1164 msgid "_Assign Task" msgstr "指派任务(_A)" -#: calendar/gui/e-calendar-table.c:1057 +#: calendar/gui/e-calendar-table.c:1165 msgid "_Forward as iCalendar" msgstr "作为 iCalendar 转发(_F)" -#: calendar/gui/e-calendar-table.c:1058 +#: calendar/gui/e-calendar-table.c:1166 msgid "_Mark as Complete" msgstr "标记为完成(_M)" -#: calendar/gui/e-calendar-table.c:1059 +#: calendar/gui/e-calendar-table.c:1167 msgid "_Mark Selected Tasks as Complete" msgstr "把任务标记为完成(_M)" #. FIXME: need to disable for undeletable folders -#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081 -#: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484 -#: mail/em-folder-tree.c:2720 mail/em-folder-view.c:927 +#: calendar/gui/e-calendar-table.c:1171 calendar/gui/e-calendar-view.c:1408 +#: mail/em-folder-tree.c:2742 mail/em-folder-view.c:952 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21 msgid "_Delete" msgstr "删除(_D)" -#: calendar/gui/e-calendar-table.c:1064 calendar/gui/e-calendar-table.c:1082 +#: calendar/gui/e-calendar-table.c:1172 msgid "_Delete Selected Tasks" msgstr "删除选中任务(_D)" -#: calendar/gui/e-calendar-table.c:1199 calendar/gui/e-calendar-view.c:1060 -#: composer/e-msg-composer.c:1178 -msgid "Save as..." -msgstr "另存为..." - -#: calendar/gui/e-calendar-table.c:1377 +#: calendar/gui/e-calendar-table.c:1323 #: calendar/gui/e-calendar-table.etspec.h:4 msgid "Click to add a task" msgstr "单击以添加任务" @@ -5859,7 +6051,7 @@ msgid "% Complete" msgstr "% 完成" #: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178 -#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615 +#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:611 msgid "Complete" msgstr "完成" @@ -5883,88 +6075,82 @@ msgstr "开始日期" msgid "Task sort" msgstr "任务排序" -#: calendar/gui/e-calendar-view.c:1176 +#: calendar/gui/e-calendar-view.c:1179 msgid "Moving items" msgstr "移动项目" -#: calendar/gui/e-calendar-view.c:1178 +#: calendar/gui/e-calendar-view.c:1181 msgid "Copying items" msgstr "复制项目" -#: calendar/gui/e-calendar-view.c:1403 calendar/gui/e-calendar-view.c:1492 +#: calendar/gui/e-calendar-view.c:1364 msgid "New _Appointment..." msgstr "新建约会(_A)..." -#: calendar/gui/e-calendar-view.c:1404 calendar/gui/e-calendar-view.c:1497 +#: calendar/gui/e-calendar-view.c:1365 msgid "New All Day _Event" msgstr "新建全天事件(_E)" -#: calendar/gui/e-calendar-view.c:1405 calendar/gui/e-calendar-view.c:1502 +#: calendar/gui/e-calendar-view.c:1366 msgid "New Meeting" msgstr "新会议" -#: calendar/gui/e-calendar-view.c:1406 calendar/gui/e-calendar-view.c:1507 +#: calendar/gui/e-calendar-view.c:1367 msgid "New Task" msgstr "新建任务" -#: calendar/gui/e-calendar-view.c:1420 ui/evolution-calendar.xml.h:26 +#. FIXME: hook in this somehow +#: calendar/gui/e-calendar-view.c:1377 +msgid "Current View" +msgstr "当前视图" + +#: calendar/gui/e-calendar-view.c:1379 ui/evolution-calendar.xml.h:26 msgid "Select _Today" msgstr "选择今天(_T)" -#: calendar/gui/e-calendar-view.c:1421 +#: calendar/gui/e-calendar-view.c:1380 msgid "_Select Date..." msgstr "选择日期(_S)..." -#: calendar/gui/e-calendar-view.c:1425 ui/evolution-calendar.xml.h:45 +#. TODO: Why is this in a context menu when it applies globally? +#: calendar/gui/e-calendar-view.c:1385 ui/evolution-calendar.xml.h:45 msgid "_Publish Free/Busy Information" msgstr "发布忙闲信息(_P)" -#: calendar/gui/e-calendar-view.c:1444 +#: calendar/gui/e-calendar-view.c:1401 msgid "Cop_y to Calendar..." msgstr "复制到日历(_Y)..." -#: calendar/gui/e-calendar-view.c:1445 +#: calendar/gui/e-calendar-view.c:1402 msgid "Mo_ve to Calendar..." msgstr "移动到日历(_V)..." -#: calendar/gui/e-calendar-view.c:1446 +#: calendar/gui/e-calendar-view.c:1403 msgid "_Schedule Meeting..." msgstr "调度会议(_S)..." -#: calendar/gui/e-calendar-view.c:1447 +#: calendar/gui/e-calendar-view.c:1404 msgid "_Forward as iCalendar..." msgstr "作为 iCalendar 转发(_F)..." -#: calendar/gui/e-calendar-view.c:1452 +#: calendar/gui/e-calendar-view.c:1409 msgid "Make this Occurrence _Movable" msgstr "将此次发生变为可移动(_M)" -#: calendar/gui/e-calendar-view.c:1453 calendar/gui/e-calendar-view.c:1485 +#: calendar/gui/e-calendar-view.c:1410 msgid "Delete this _Occurrence" msgstr "删除此次出现(_O)" -#: calendar/gui/e-calendar-view.c:1454 calendar/gui/e-calendar-view.c:1486 +#: calendar/gui/e-calendar-view.c:1411 msgid "Delete _All Occurrences" msgstr "删除所有出现(_A)" -#: calendar/gui/e-calendar-view.c:1488 -msgid "Go to _Today" -msgstr "转到今天(_T)" - -#: calendar/gui/e-calendar-view.c:1490 -msgid "_Go to Date..." -msgstr "转到日期(_G)..." - -#: calendar/gui/e-calendar-view.c:1520 ui/evolution.xml.h:35 -msgid "_Settings..." -msgstr "设置(_S)..." - #. strftime format of a weekday, a date and a time, 24-hour. #. strptime format of a weekday, a date and a time, #. in 24-hour format. #. strftime format of a weekday, a date and a #. time, in 24-hour format. -#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180 +#: calendar/gui/e-cell-date-edit-text.c:115 e-util/e-time-utils.c:180 #: e-util/e-time-utils.c:393 msgid "%a %m/%d/%Y %H:%M:%S" msgstr "%Y年%m月%d日%A%H:%M:%S" @@ -5974,12 +6160,12 @@ msgstr "%Y年%m月%d日%A%H:%M:%S" #. in 12-hour format. #. strftime format of a weekday, a date and a #. time, in 12-hour format. -#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175 +#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:175 #: e-util/e-time-utils.c:402 msgid "%a %m/%d/%Y %I:%M:%S %p" msgstr "%Y-%m-%d %A %H:%M:%S" -#: calendar/gui/e-cell-date-edit-text.c:125 +#: calendar/gui/e-cell-date-edit-text.c:123 #, c-format msgid "" "The date must be entered in the format: \n" @@ -5990,7 +6176,7 @@ msgstr "" "\n" "%s" -#: calendar/gui/e-day-view-time-item.c:532 +#: calendar/gui/e-day-view-time-item.c:527 #, c-format msgid "%02i minute divisions" msgstr "%02i 分钟分割" @@ -6001,396 +6187,392 @@ msgstr "%02i 分钟分割" #. 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:710 calendar/gui/e-day-view.c:1571 -#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514 +#: calendar/gui/e-day-view-top-item.c:704 calendar/gui/e-day-view.c:1555 +#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517 msgid "%A %d %B" msgstr "%B%d日%A" #. String to use in 12-hour time format for times in the morning. -#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:583 -#: calendar/gui/print.c:838 +#: calendar/gui/e-day-view.c:811 calendar/gui/e-week-view.c:578 +#: calendar/gui/print.c:841 msgid "am" msgstr "上午" #. String to use in 12-hour time format for times in the afternoon. -#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:586 -#: calendar/gui/print.c:840 +#: calendar/gui/e-day-view.c:814 calendar/gui/e-week-view.c:581 +#: calendar/gui/print.c:843 msgid "pm" msgstr "下午" -#: calendar/gui/e-itip-control.c:768 +#: calendar/gui/e-itip-control.c:761 msgid "Yes. (Complex Recurrence)" msgstr "是(复杂重现)" -#: calendar/gui/e-itip-control.c:779 +#: calendar/gui/e-itip-control.c:772 #, c-format msgid "Every day" msgid_plural "Every %d days" msgstr[0] "每 %d 天" -#: calendar/gui/e-itip-control.c:784 +#: calendar/gui/e-itip-control.c:777 #, c-format msgid "Every week" msgid_plural "Every %d weeks" msgstr[0] "每 %d 周" -#: calendar/gui/e-itip-control.c:786 +#: calendar/gui/e-itip-control.c:779 #, c-format msgid "Every week on " msgid_plural "Every %d weeks on " msgstr[0] "每 %d 周的" -#: calendar/gui/e-itip-control.c:794 +#: calendar/gui/e-itip-control.c:787 msgid " and " msgstr " 和 " -#: calendar/gui/e-itip-control.c:801 +#: calendar/gui/e-itip-control.c:794 #, c-format msgid "The %s day of " msgstr "第 %s 天属于" -#: calendar/gui/e-itip-control.c:814 +#: calendar/gui/e-itip-control.c:807 #, c-format msgid "The %s %s of " msgstr "%s %s 属于" -#: calendar/gui/e-itip-control.c:821 +#: calendar/gui/e-itip-control.c:814 #, c-format msgid "every month" msgid_plural "every %d months" msgstr[0] "每 %d 月" -#: calendar/gui/e-itip-control.c:825 +#: calendar/gui/e-itip-control.c:818 #, c-format msgid "Every year" msgid_plural "Every %d years" msgstr[0] "每 %d 年" -#: calendar/gui/e-itip-control.c:836 +#: calendar/gui/e-itip-control.c:829 #, c-format msgid "a total of %d time" msgid_plural " a total of %d times" msgstr[0] " 总计 %d 次" -#: calendar/gui/e-itip-control.c:845 +#: calendar/gui/e-itip-control.c:838 msgid ", ending on " msgstr "，结束于 " -#: calendar/gui/e-itip-control.c:869 +#: calendar/gui/e-itip-control.c:862 msgid "Starts" msgstr "开始" -#: calendar/gui/e-itip-control.c:882 +#: calendar/gui/e-itip-control.c:875 msgid "Ends" msgstr "结束" -#: calendar/gui/e-itip-control.c:916 +#: calendar/gui/e-itip-control.c:909 msgid "Due" msgstr "到期" -#: calendar/gui/e-itip-control.c:956 calendar/gui/e-itip-control.c:1013 +#: calendar/gui/e-itip-control.c:949 calendar/gui/e-itip-control.c:1006 msgid "iCalendar Information" msgstr "iCalendar 信息" #. Title -#: calendar/gui/e-itip-control.c:973 +#: calendar/gui/e-itip-control.c:966 msgid "iCalendar Error" msgstr "iCalendar 错误" -#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-itip-control.c:1061 -#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1089 +#: calendar/gui/e-itip-control.c:1038 calendar/gui/e-itip-control.c:1054 +#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-itip-control.c:1082 msgid "An unknown person" msgstr "未知的人" #. Describe what the user can do -#: calendar/gui/e-itip-control.c:1096 +#: calendar/gui/e-itip-control.c:1089 msgid "" "<br> Please review the following information, and then select an action from " "the menu below." msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作。" -#: calendar/gui/e-itip-control.c:1125 -msgid "Location:" -msgstr "位置：" - -#: calendar/gui/e-itip-control.c:1144 calendar/gui/e-meeting-list-view.c:158 -#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202 -#: calendar/gui/itip-utils.c:422 +#: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:159 +#: calendar/gui/e-meeting-store.c:180 calendar/gui/e-meeting-store.c:203 +#: calendar/gui/itip-utils.c:421 msgid "Accepted" msgstr "接受" -#: calendar/gui/e-itip-control.c:1148 calendar/gui/itip-utils.c:425 +#: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:424 msgid "Tentatively Accepted" msgstr "暂时接受" -#: calendar/gui/e-itip-control.c:1152 calendar/gui/e-meeting-list-view.c:159 -#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204 -#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454 +#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:160 +#: calendar/gui/e-meeting-store.c:182 calendar/gui/e-meeting-store.c:205 +#: calendar/gui/itip-utils.c:427 calendar/gui/itip-utils.c:453 msgid "Declined" msgstr "拒绝" -#: calendar/gui/e-itip-control.c:1236 +#: calendar/gui/e-itip-control.c:1229 msgid "" "The meeting has been cancelled, however it could not be found in your " "calendars" msgstr "会议已经被取消，但无法在您的日历中找到该会议" -#: calendar/gui/e-itip-control.c:1238 +#: calendar/gui/e-itip-control.c:1231 msgid "" "The task has been cancelled, however it could not be found in your task lists" msgstr "任务已经被取消，但无法在您的任务列表中找到该任务" -#: calendar/gui/e-itip-control.c:1317 +#: calendar/gui/e-itip-control.c:1310 #, c-format msgid "<b>%s</b> has published meeting information." msgstr "<b>%s</b> 发布了会议信息。" -#: calendar/gui/e-itip-control.c:1318 +#: calendar/gui/e-itip-control.c:1311 msgid "Meeting Information" msgstr "会议信息" -#: calendar/gui/e-itip-control.c:1324 +#: calendar/gui/e-itip-control.c:1317 #, c-format msgid "<b>%s</b> requests the presence of %s at a meeting." msgstr "<b>%s</b> 请求 %s 参加一个会议。" -#: calendar/gui/e-itip-control.c:1326 +#: calendar/gui/e-itip-control.c:1319 #, c-format msgid "<b>%s</b> requests your presence at a meeting." msgstr "<b>%s</b> 请求您参加一个会议。" -#: calendar/gui/e-itip-control.c:1327 +#: calendar/gui/e-itip-control.c:1320 msgid "Meeting Proposal" msgstr "会议建议" #. FIXME Whats going on here? -#: calendar/gui/e-itip-control.c:1333 +#: calendar/gui/e-itip-control.c:1326 #, c-format msgid "<b>%s</b> wishes to add to an existing meeting." msgstr "<b>%s</b> 希望加入到已有的会议。" -#: calendar/gui/e-itip-control.c:1334 +#: calendar/gui/e-itip-control.c:1327 msgid "Meeting Update" msgstr "会议更新" -#: calendar/gui/e-itip-control.c:1338 +#: calendar/gui/e-itip-control.c:1331 #, c-format msgid "<b>%s</b> wishes to receive the latest meeting information." msgstr "<b>%s</b> 想收到最新的会议信息。" -#: calendar/gui/e-itip-control.c:1339 +#: calendar/gui/e-itip-control.c:1332 msgid "Meeting Update Request" msgstr "会议更新请求" -#: calendar/gui/e-itip-control.c:1346 +#: calendar/gui/e-itip-control.c:1339 #, c-format msgid "<b>%s</b> has replied to a meeting request." msgstr "<b>%s</b> 已回复一个会议请求。" -#: calendar/gui/e-itip-control.c:1347 +#: calendar/gui/e-itip-control.c:1340 msgid "Meeting Reply" msgstr "会议答复" -#: calendar/gui/e-itip-control.c:1354 +#: calendar/gui/e-itip-control.c:1347 #, c-format msgid "<b>%s</b> has cancelled a meeting." msgstr "<b>%s</b> 取消了一个会议。" -#: calendar/gui/e-itip-control.c:1355 +#: calendar/gui/e-itip-control.c:1348 msgid "Meeting Cancellation" msgstr "会议取消" -#: calendar/gui/e-itip-control.c:1365 calendar/gui/e-itip-control.c:1442 -#: calendar/gui/e-itip-control.c:1482 +#: calendar/gui/e-itip-control.c:1358 calendar/gui/e-itip-control.c:1435 +#: calendar/gui/e-itip-control.c:1475 #, c-format msgid "<b>%s</b> has sent an unintelligible message." msgstr "<b>%s</b> 发送了一个无法理解的信件。" -#: calendar/gui/e-itip-control.c:1366 +#: calendar/gui/e-itip-control.c:1359 msgid "Bad Meeting Message" msgstr "错误的会议信件" -#: calendar/gui/e-itip-control.c:1393 +#: calendar/gui/e-itip-control.c:1386 #, c-format msgid "<b>%s</b> has published task information." msgstr "<b>%s</b> 发布了任务信息。" -#: calendar/gui/e-itip-control.c:1394 +#: calendar/gui/e-itip-control.c:1387 msgid "Task Information" msgstr "任务信息" -#: calendar/gui/e-itip-control.c:1401 +#: calendar/gui/e-itip-control.c:1394 #, c-format msgid "<b>%s</b> requests %s to perform a task." msgstr "<b>%s</b> 请求 %s 完成一个任务。" -#: calendar/gui/e-itip-control.c:1403 +#: calendar/gui/e-itip-control.c:1396 #, c-format msgid "<b>%s</b> requests you perform a task." msgstr "<b>%s</b> 请求您完成一个任务。" -#: calendar/gui/e-itip-control.c:1404 +#: calendar/gui/e-itip-control.c:1397 msgid "Task Proposal" msgstr "任务建议" #. FIXME Whats going on here? -#: calendar/gui/e-itip-control.c:1410 +#: calendar/gui/e-itip-control.c:1403 #, c-format msgid "<b>%s</b> wishes to add to an existing task." msgstr "<b>%s<b> 希望加入到已存在的任务。" -#: calendar/gui/e-itip-control.c:1411 +#: calendar/gui/e-itip-control.c:1404 msgid "Task Update" msgstr "任务更新" -#: calendar/gui/e-itip-control.c:1415 +#: calendar/gui/e-itip-control.c:1408 #, c-format msgid "<b>%s</b> wishes to receive the latest task information." msgstr "<b>%s</b> 希望获取最新的任务信息。" -#: calendar/gui/e-itip-control.c:1416 +#: calendar/gui/e-itip-control.c:1409 msgid "Task Update Request" msgstr "任务更新请求" -#: calendar/gui/e-itip-control.c:1423 +#: calendar/gui/e-itip-control.c:1416 #, c-format msgid "<b>%s</b> has replied to a task assignment." msgstr "<b>%s</b> 已经回复了任务指派。" -#: calendar/gui/e-itip-control.c:1424 +#: calendar/gui/e-itip-control.c:1417 msgid "Task Reply" msgstr "任务回复" -#: calendar/gui/e-itip-control.c:1431 +#: calendar/gui/e-itip-control.c:1424 #, c-format msgid "<b>%s</b> has cancelled a task." msgstr "<b>%s</b> 取消了任务。" -#: calendar/gui/e-itip-control.c:1432 +#: calendar/gui/e-itip-control.c:1425 msgid "Task Cancellation" msgstr "任务取消" -#: calendar/gui/e-itip-control.c:1443 +#: calendar/gui/e-itip-control.c:1436 msgid "Bad Task Message" msgstr "错误的任务信件" -#: calendar/gui/e-itip-control.c:1467 +#: calendar/gui/e-itip-control.c:1460 #, c-format msgid "<b>%s</b> has published free/busy information." msgstr "<b>%s</b> 发布了忙闲信息。" -#: calendar/gui/e-itip-control.c:1468 +#: calendar/gui/e-itip-control.c:1461 msgid "Free/Busy Information" msgstr "忙闲信息" -#: calendar/gui/e-itip-control.c:1472 +#: calendar/gui/e-itip-control.c:1465 #, c-format msgid "<b>%s</b> requests your free/busy information." msgstr "<b>%s</b> 请求您的忙闲信息。" -#: calendar/gui/e-itip-control.c:1473 +#: calendar/gui/e-itip-control.c:1466 msgid "Free/Busy Request" msgstr "忙/闲请求" -#: calendar/gui/e-itip-control.c:1477 +#: calendar/gui/e-itip-control.c:1470 #, c-format msgid "<b>%s</b> has replied to a free/busy request." msgstr "<b>%s</b> 应答了忙闲请求。" -#: calendar/gui/e-itip-control.c:1478 +#: calendar/gui/e-itip-control.c:1471 msgid "Free/Busy Reply" msgstr "忙闲应答" -#: calendar/gui/e-itip-control.c:1483 +#: calendar/gui/e-itip-control.c:1476 msgid "Bad Free/Busy Message" msgstr "错误的忙闲信件" -#: calendar/gui/e-itip-control.c:1558 +#: calendar/gui/e-itip-control.c:1551 msgid "The message does not appear to be properly formed" msgstr "信件的格式可能不正确" -#: calendar/gui/e-itip-control.c:1617 +#: calendar/gui/e-itip-control.c:1610 msgid "The message contains only unsupported requests." msgstr "信件只含有不支持的请求。" -#: calendar/gui/e-itip-control.c:1650 +#: calendar/gui/e-itip-control.c:1643 msgid "The attachment does not contain a valid calendar message" msgstr "附件中没有有效的日历信件" -#: calendar/gui/e-itip-control.c:1682 +#: calendar/gui/e-itip-control.c:1675 msgid "The attachment has no viewable calendar items" msgstr "附件中没有可查看的日历项目" -#: calendar/gui/e-itip-control.c:1916 +#: calendar/gui/e-itip-control.c:1909 msgid "Update complete\n" msgstr "更新完成\n" -#: calendar/gui/e-itip-control.c:1944 +#: calendar/gui/e-itip-control.c:1937 msgid "Object is invalid and cannot be updated\n" msgstr "对象无效，无法更新\n" -#: calendar/gui/e-itip-control.c:1954 +#: calendar/gui/e-itip-control.c:1947 msgid "This response is not from a current attendee. Add as an attendee?" msgstr "此响应并非来自当前参与者。将响应者加为参与者吗？" -#: calendar/gui/e-itip-control.c:1966 +#: calendar/gui/e-itip-control.c:1959 msgid "Attendee status could not be updated because of an invalid status!\n" msgstr "因为无效状态而无法更新参与者状态！\n" -#: calendar/gui/e-itip-control.c:1983 +#: calendar/gui/e-itip-control.c:1976 msgid "Attendee status updated\n" msgstr "更新参与者状态\n" -#: calendar/gui/e-itip-control.c:1986 +#: calendar/gui/e-itip-control.c:1979 msgid "Attendee status can not be updated because the item no longer exists" msgstr "由于条目不再存在而无法更新参与者状态" -#: calendar/gui/e-itip-control.c:2013 +#: calendar/gui/e-itip-control.c:2006 msgid "Removal Complete" msgstr "删除完成" -#: calendar/gui/e-itip-control.c:2036 calendar/gui/e-itip-control.c:2084 +#: calendar/gui/e-itip-control.c:2029 calendar/gui/e-itip-control.c:2077 msgid "Item sent!\n" msgstr "项目已发送！\n" -#: calendar/gui/e-itip-control.c:2038 calendar/gui/e-itip-control.c:2088 +#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2081 msgid "The item could not be sent!\n" msgstr "无法发送项目！\n" -#: calendar/gui/e-itip-control.c:2168 +#: calendar/gui/e-itip-control.c:2161 msgid "Choose an action:" msgstr "选择一项活动：" -#: calendar/gui/e-itip-control.c:2239 +#: calendar/gui/e-itip-control.c:2232 msgid "Update" msgstr "更新" -#: calendar/gui/e-itip-control.c:2267 +#: calendar/gui/e-itip-control.c:2260 msgid "Accept" msgstr "接受" -#: calendar/gui/e-itip-control.c:2268 +#: calendar/gui/e-itip-control.c:2261 msgid "Tentatively accept" msgstr "暂时接受" -#: calendar/gui/e-itip-control.c:2269 +#: calendar/gui/e-itip-control.c:2262 msgid "Decline" msgstr "拒绝" -#: calendar/gui/e-itip-control.c:2298 +#: calendar/gui/e-itip-control.c:2291 msgid "Send Free/Busy Information" msgstr "发送忙闲信息" -#: calendar/gui/e-itip-control.c:2326 +#: calendar/gui/e-itip-control.c:2319 msgid "Update respondent status" msgstr "更新应答者状态" -#: calendar/gui/e-itip-control.c:2354 +#: calendar/gui/e-itip-control.c:2347 msgid "Send Latest Information" msgstr "发送最新的信息" -#: calendar/gui/e-itip-control.c:2382 calendar/gui/itip-utils.c:442 -#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464 +#: calendar/gui/e-itip-control.c:2375 calendar/gui/itip-utils.c:441 +#: mail/mail-send-recv.c:408 mail/mail-send-recv.c:460 #: ui/evolution-mail-global.xml.h:1 msgid "Cancel" msgstr "取消" @@ -6444,69 +6626,69 @@ msgstr "可选的参与者" msgid "Resources" msgstr "资源" -#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90 -#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759 +#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:91 +#: calendar/gui/e-meeting-store.c:108 calendar/gui/e-meeting-store.c:767 msgid "Individual" msgstr "个人" -#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92 -#: calendar/gui/e-meeting-store.c:109 +#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:93 +#: calendar/gui/e-meeting-store.c:110 msgid "Group" msgstr "组" -#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94 -#: calendar/gui/e-meeting-store.c:111 +#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:95 +#: calendar/gui/e-meeting-store.c:112 msgid "Resource" msgstr "资源" -#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96 -#: calendar/gui/e-meeting-store.c:113 +#: calendar/gui/e-meeting-list-view.c:122 calendar/gui/e-meeting-store.c:97 +#: calendar/gui/e-meeting-store.c:114 msgid "Room" msgstr "房间" -#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125 -#: calendar/gui/e-meeting-store.c:142 +#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:126 +#: calendar/gui/e-meeting-store.c:143 msgid "Chair" msgstr "主席" -#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127 -#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762 +#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:128 +#: calendar/gui/e-meeting-store.c:145 calendar/gui/e-meeting-store.c:770 msgid "Required Participant" msgstr "必需的参与者" -#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129 -#: calendar/gui/e-meeting-store.c:146 +#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:130 +#: calendar/gui/e-meeting-store.c:147 msgid "Optional Participant" msgstr "可选的参与者" -#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131 -#: calendar/gui/e-meeting-store.c:148 +#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:132 +#: calendar/gui/e-meeting-store.c:149 msgid "Non-Participant" msgstr "不参加" -#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177 -#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772 +#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:178 +#: calendar/gui/e-meeting-store.c:201 calendar/gui/e-meeting-store.c:780 msgid "Needs Action" msgstr "需要动作" -#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183 -#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:408 +#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:184 +#: calendar/gui/e-meeting-store.c:207 calendar/gui/e-meeting-time-sel.c:402 msgid "Tentative" msgstr "暂时的" -#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185 -#: calendar/gui/e-meeting-store.c:208 +#: calendar/gui/e-meeting-list-view.c:162 calendar/gui/e-meeting-store.c:186 +#: calendar/gui/e-meeting-store.c:209 msgid "Delegated" msgstr "被委任的" -#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212 +#: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213 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:452 -#: calendar/gui/e-meeting-time-sel.c:2079 +#: calendar/gui/e-meeting-time-sel-item.c:444 +#: calendar/gui/e-meeting-time-sel.c:2089 msgid "%A, %B %d, %Y" msgstr "%Y年%m月%d日%A" @@ -6516,8 +6698,8 @@ msgstr "%Y年%m月%d日%A" #. %m = month number, %d = month day, %Y = full year. #. strptime format of a weekday and a date. #. strftime format of a weekday and a date. -#: calendar/gui/e-meeting-time-sel-item.c:456 -#: calendar/gui/e-meeting-time-sel.c:2112 e-util/e-time-utils.c:203 +#: calendar/gui/e-meeting-time-sel-item.c:448 +#: calendar/gui/e-meeting-time-sel.c:2122 e-util/e-time-utils.c:203 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384 msgid "%a %m/%d/%Y" msgstr "%Y年%m月%d日%A" @@ -6528,60 +6710,60 @@ msgstr "%Y年%m月%d日%A" #. This is the preferred date format for the locale. #. This is a strftime() format for a short date. %m = month, #. %d = day of month, %Y = year (all digits). -#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238 -#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604 +#: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238 +#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660 msgid "%m/%d/%Y" msgstr "%Y-%m-%d" -#: calendar/gui/e-meeting-time-sel.c:410 designs/OOA/ooa.glade.h:11 +#: calendar/gui/e-meeting-time-sel.c:404 designs/OOA/ooa.glade.h:11 msgid "Out of Office" msgstr "办公室以外" -#: calendar/gui/e-meeting-time-sel.c:411 +#: calendar/gui/e-meeting-time-sel.c:405 msgid "No Information" msgstr "没有信息" -#: calendar/gui/e-meeting-time-sel.c:442 +#: calendar/gui/e-meeting-time-sel.c:436 msgid "O_ptions" msgstr "选项(_P)" -#: calendar/gui/e-meeting-time-sel.c:459 +#: calendar/gui/e-meeting-time-sel.c:453 msgid "Show _only working hours" msgstr "只显示工作小时(_O)" -#: calendar/gui/e-meeting-time-sel.c:469 +#: calendar/gui/e-meeting-time-sel.c:463 msgid "Show _zoomed out" msgstr "显示缩放的输出(_Z)" -#: calendar/gui/e-meeting-time-sel.c:484 +#: calendar/gui/e-meeting-time-sel.c:478 msgid "_Update free/busy" msgstr "更新忙闲(_U)" -#: calendar/gui/e-meeting-time-sel.c:499 +#: calendar/gui/e-meeting-time-sel.c:493 msgid "_<<" msgstr "_<<" -#: calendar/gui/e-meeting-time-sel.c:517 +#: calendar/gui/e-meeting-time-sel.c:511 msgid "_Autopick" msgstr "自动获取(_A)" -#: calendar/gui/e-meeting-time-sel.c:532 +#: calendar/gui/e-meeting-time-sel.c:526 msgid ">_>" msgstr ">_>" -#: calendar/gui/e-meeting-time-sel.c:549 +#: calendar/gui/e-meeting-time-sel.c:543 msgid "_All people and resources" msgstr "全部人和资源(_A)" -#: calendar/gui/e-meeting-time-sel.c:558 +#: calendar/gui/e-meeting-time-sel.c:552 msgid "All _people and one resource" msgstr "全部人和一个资源(_P)" -#: calendar/gui/e-meeting-time-sel.c:567 +#: calendar/gui/e-meeting-time-sel.c:561 msgid "_Required people" msgstr "必需的人(_R)" -#: calendar/gui/e-meeting-time-sel.c:576 +#: calendar/gui/e-meeting-time-sel.c:570 msgid "Required people and _one resource" msgstr "必需的人和一个资源(_O)" @@ -6590,7 +6772,7 @@ msgstr "必需的人和一个资源(_O)" msgid "Enter the password for %s" msgstr "为 %s 输入密码" -#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2313 +#: calendar/gui/e-tasks.c:734 calendar/gui/gnome-cal.c:2429 #, c-format msgid "" "Error on %s:\n" @@ -6599,47 +6781,73 @@ msgstr "" "%s 错误：\n" " %s" -#: calendar/gui/e-tasks.c:792 +#: calendar/gui/e-tasks.c:782 msgid "Loading tasks" msgstr "装入任务" -#: calendar/gui/e-tasks.c:874 +#: calendar/gui/e-tasks.c:864 #, c-format msgid "Opening tasks at %s" msgstr "在 %s 打开任务" -#: calendar/gui/e-tasks.c:1071 +#: calendar/gui/e-tasks.c:1061 msgid "Completing tasks..." msgstr "正在完成任务..." -#: calendar/gui/e-tasks.c:1094 +#: calendar/gui/e-tasks.c:1084 msgid "Deleting selected objects..." msgstr "正在删除选中的对象..." -#: calendar/gui/e-tasks.c:1121 +#: calendar/gui/e-tasks.c:1111 msgid "Expunging" msgstr "销毁" -#: calendar/gui/gnome-cal.c:722 +#: calendar/gui/e-timezone-entry.c:133 +#, fuzzy +msgid "Timezone Button" +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:329 calendar/gui/print.c:1501 +msgid "%d %B" +msgstr "%-m月%-d日" + +#: calendar/gui/gnome-cal.c:718 msgid "Updating query" msgstr "更新查询" -#: calendar/gui/gnome-cal.c:2090 +#. bonobo displays this string so it must be in locale +#: calendar/gui/gnome-cal.c:2040 widgets/menus/gal-view-menus.c:351 +msgid "Custom View" +msgstr "当前视图" + +#: calendar/gui/gnome-cal.c:2041 +#, fuzzy +msgid "Save Custom View" +msgstr "保存当前视图..." + +#: calendar/gui/gnome-cal.c:2046 widgets/menus/gal-view-menus.c:373 +msgid "Define Views..." +msgstr "定义视图..." + +#: calendar/gui/gnome-cal.c:2206 #, c-format msgid "Loading appointments at %s" msgstr "装入位于 %s 的约会" -#: calendar/gui/gnome-cal.c:2109 +#: calendar/gui/gnome-cal.c:2225 #, c-format msgid "Loading tasks at %s" msgstr "装入位于 %s 的任务" -#: calendar/gui/gnome-cal.c:2202 +#: calendar/gui/gnome-cal.c:2318 #, c-format msgid "Opening %s" msgstr "打开 %s" -#: calendar/gui/gnome-cal.c:3171 +#: calendar/gui/gnome-cal.c:3286 msgid "Purging" msgstr "销毁" @@ -6699,61 +6907,61 @@ msgstr "九月" msgid "_Select Today" msgstr "选择今天(_S)" -#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319 -#: calendar/gui/itip-utils.c:351 +#: calendar/gui/itip-utils.c:270 calendar/gui/itip-utils.c:318 +#: calendar/gui/itip-utils.c:350 msgid "An organizer must be set." msgstr "必须设定组织者。" -#: calendar/gui/itip-utils.c:306 +#: calendar/gui/itip-utils.c:305 msgid "At least one attendee is necessary" msgstr "至少需要一个参加者" -#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503 +#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502 msgid "Event information" msgstr "事件信息" -#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505 +#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504 msgid "Task information" msgstr "任务信息" -#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507 +#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:506 msgid "Journal information" msgstr "日志信息" -#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525 +#: calendar/gui/itip-utils.c:399 calendar/gui/itip-utils.c:524 msgid "Free/Busy information" msgstr "忙闲信息" -#: calendar/gui/itip-utils.c:402 +#: calendar/gui/itip-utils.c:401 msgid "Calendar information" msgstr "日历信息" -#: calendar/gui/itip-utils.c:438 +#: calendar/gui/itip-utils.c:437 msgid "Updated" msgstr "更新" -#: calendar/gui/itip-utils.c:446 +#: calendar/gui/itip-utils.c:445 msgid "Refresh" msgstr "刷新" -#: calendar/gui/itip-utils.c:450 +#: calendar/gui/itip-utils.c:449 msgid "Counter-proposal" msgstr "投票表决" -#: calendar/gui/itip-utils.c:521 +#: calendar/gui/itip-utils.c:520 #, c-format msgid "Free/Busy information (%s to %s)" msgstr "忙闲信息 (%s 到 %s)" -#: calendar/gui/itip-utils.c:531 +#: calendar/gui/itip-utils.c:530 msgid "iCalendar information" msgstr "iCalendar 信息" -#: calendar/gui/itip-utils.c:673 +#: calendar/gui/itip-utils.c:672 msgid "You must be an attendee of the event." msgstr "您必须是事件的参与者。" -#: calendar/gui/migration.c:151 +#: calendar/gui/migration.c:150 msgid "" "The location and hierarchy of the Evolution task folders has changed since " "Evolution 1.x.\n" @@ -6764,7 +6972,7 @@ msgstr "" "\n" "请稍候，Evolution 正在升迁您的文件夹..." -#: calendar/gui/migration.c:155 +#: calendar/gui/migration.c:154 msgid "" "The location and hierarchy of the Evolution calendar folders has changed " "since Evolution 1.x.\n" @@ -6775,330 +6983,325 @@ msgstr "" "\n" "请稍候，Evolution 正在升迁您的文件夹..." -#: calendar/gui/migration.c:381 +#: calendar/gui/migration.c:380 msgid "Birthdays & Anniversaries" msgstr "生日和纪念日" #. Create the Webcal source group -#: calendar/gui/migration.c:479 calendar/gui/migration.c:572 +#: calendar/gui/migration.c:478 calendar/gui/migration.c:571 msgid "On The Web" msgstr "网上" #. FIXME: set proper domain/code -#: calendar/gui/migration.c:736 calendar/gui/migration.c:888 +#: calendar/gui/migration.c:735 calendar/gui/migration.c:887 msgid "Unable to migrate old settings from evolution/config.xmldb" msgstr "无法从 evolution/config.xmldb 中升迁旧设置" #. FIXME: domain/code -#: calendar/gui/migration.c:765 +#: calendar/gui/migration.c:764 #, c-format msgid "Unable to migrate calendar `%s'" msgstr "无法升迁日历“%s”" #. FIXME: domain/code -#: calendar/gui/migration.c:917 +#: calendar/gui/migration.c:916 #, c-format msgid "Unable to migrate tasks `%s'" msgstr "无法升迁任务“%s”" -#: calendar/gui/print.c:489 +#: calendar/gui/print.c:492 msgid "1st" msgstr "1日" -#: calendar/gui/print.c:489 +#: calendar/gui/print.c:492 msgid "2nd" msgstr "2日" -#: calendar/gui/print.c:489 +#: calendar/gui/print.c:492 msgid "3rd" msgstr "3日" -#: calendar/gui/print.c:489 +#: calendar/gui/print.c:492 msgid "4th" msgstr "4日" -#: calendar/gui/print.c:489 +#: calendar/gui/print.c:492 msgid "5th" msgstr "5日" -#: calendar/gui/print.c:490 +#: calendar/gui/print.c:493 msgid "6th" msgstr "6日" -#: calendar/gui/print.c:490 +#: calendar/gui/print.c:493 msgid "7th" msgstr "7日" -#: calendar/gui/print.c:490 +#: calendar/gui/print.c:493 msgid "8th" msgstr "8日" -#: calendar/gui/print.c:490 +#: calendar/gui/print.c:493 msgid "9th" msgstr "9日" -#: calendar/gui/print.c:490 +#: calendar/gui/print.c:493 msgid "10th" msgstr "10日" -#: calendar/gui/print.c:491 +#: calendar/gui/print.c:494 msgid "11th" msgstr "11日" -#: calendar/gui/print.c:491 +#: calendar/gui/print.c:494 msgid "12th" msgstr "12日" -#: calendar/gui/print.c:491 +#: calendar/gui/print.c:494 msgid "13th" msgstr "13日" -#: calendar/gui/print.c:491 +#: calendar/gui/print.c:494 msgid "14th" msgstr "14日" -#: calendar/gui/print.c:491 +#: calendar/gui/print.c:494 msgid "15th" msgstr "15日" -#: calendar/gui/print.c:492 +#: calendar/gui/print.c:495 msgid "16th" msgstr "16日" -#: calendar/gui/print.c:492 +#: calendar/gui/print.c:495 msgid "17th" msgstr "17日" -#: calendar/gui/print.c:492 +#: calendar/gui/print.c:495 msgid "18th" msgstr "18日" -#: calendar/gui/print.c:492 +#: calendar/gui/print.c:495 msgid "19th" msgstr "19日" -#: calendar/gui/print.c:492 +#: calendar/gui/print.c:495 msgid "20th" msgstr "20日" -#: calendar/gui/print.c:493 +#: calendar/gui/print.c:496 msgid "21st" msgstr "21日" -#: calendar/gui/print.c:493 +#: calendar/gui/print.c:496 msgid "22nd" msgstr "22日" -#: calendar/gui/print.c:493 +#: calendar/gui/print.c:496 msgid "23rd" msgstr "23日" -#: calendar/gui/print.c:493 +#: calendar/gui/print.c:496 msgid "24th" msgstr "24日" -#: calendar/gui/print.c:493 +#: calendar/gui/print.c:496 msgid "25th" msgstr "25日" -#: calendar/gui/print.c:494 +#: calendar/gui/print.c:497 msgid "26th" msgstr "26日" -#: calendar/gui/print.c:494 +#: calendar/gui/print.c:497 msgid "27th" msgstr "27日" -#: calendar/gui/print.c:494 +#: calendar/gui/print.c:497 msgid "28th" msgstr "28日" -#: calendar/gui/print.c:494 +#: calendar/gui/print.c:497 msgid "29th" msgstr "29日" -#: calendar/gui/print.c:494 +#: calendar/gui/print.c:497 msgid "30th" msgstr "30日" -#: calendar/gui/print.c:495 +#: calendar/gui/print.c:498 msgid "31st" msgstr "31日" -#: calendar/gui/print.c:570 +#: calendar/gui/print.c:573 msgid "Su" msgstr "日" -#: calendar/gui/print.c:570 +#: calendar/gui/print.c:573 msgid "Mo" msgstr "一" -#: calendar/gui/print.c:570 +#: calendar/gui/print.c:573 msgid "Tu" msgstr "二" -#: calendar/gui/print.c:570 +#: calendar/gui/print.c:573 msgid "We" msgstr "三" -#: calendar/gui/print.c:571 +#: calendar/gui/print.c:574 msgid "Th" msgstr "四" -#: calendar/gui/print.c:571 +#: calendar/gui/print.c:574 msgid "Fr" msgstr "五" -#: calendar/gui/print.c:571 +#: calendar/gui/print.c:574 msgid "Sa" msgstr "六" #. Day -#: calendar/gui/print.c:1914 +#: calendar/gui/print.c:1917 msgid "Selected day (%a %b %d %Y)" msgstr "选中的日期(%Y年%m月%d日%A)" -#: calendar/gui/print.c:1939 calendar/gui/print.c:1943 +#: calendar/gui/print.c:1942 calendar/gui/print.c:1946 msgid "%a %b %d" msgstr "%m月%d日%A" -#: calendar/gui/print.c:1940 +#: calendar/gui/print.c:1943 msgid "%a %d %Y" msgstr "%Y年%d日%A" -#: calendar/gui/print.c:1944 calendar/gui/print.c:1946 -#: calendar/gui/print.c:1947 +#: calendar/gui/print.c:1947 calendar/gui/print.c:1949 +#: calendar/gui/print.c:1950 msgid "%a %b %d %Y" msgstr "%Y年%m月%d日%A" -#: calendar/gui/print.c:1951 +#: calendar/gui/print.c:1954 #, c-format msgid "Selected week (%s - %s)" msgstr "选中的周(%s - %s)" #. Month -#: calendar/gui/print.c:1959 +#: calendar/gui/print.c:1962 msgid "Selected month (%b %Y)" msgstr "选中的月(%Y年%m月)" #. Year -#: calendar/gui/print.c:1966 +#: calendar/gui/print.c:1969 msgid "Selected year (%Y)" msgstr "选中的年(%Y年)" -#: calendar/gui/print.c:2356 +#: calendar/gui/print.c:2359 #, c-format msgid "Status: %s" msgstr "状态：%s" -#: calendar/gui/print.c:2373 +#: calendar/gui/print.c:2376 #, c-format msgid "Priority: %s" msgstr "优先级：%s" -#: calendar/gui/print.c:2385 +#: calendar/gui/print.c:2388 #, c-format msgid "Percent Complete: %i" msgstr "完成率：%i" -#: calendar/gui/print.c:2397 +#: calendar/gui/print.c:2400 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: calendar/gui/print.c:2411 +#: calendar/gui/print.c:2414 #, c-format msgid "Categories: %s" msgstr "类别：%s" -#: calendar/gui/print.c:2422 +#: calendar/gui/print.c:2425 msgid "Contacts: " msgstr "联系人：" -#: calendar/gui/print.c:2559 calendar/gui/print.c:2645 -#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178 +#: calendar/gui/print.c:2562 calendar/gui/print.c:2648 +#: calendar/gui/print.c:2740 mail/em-format-html-print.c:178 msgid "Print Preview" msgstr "打印预览" -#: calendar/gui/print.c:2593 +#: calendar/gui/print.c:2596 msgid "Print Item" msgstr "打印项" -#: calendar/gui/print.c:2759 +#: calendar/gui/print.c:2762 msgid "Print Setup" msgstr "打印设置" -#: calendar/gui/tasks-component.c:314 -#, c-format -msgid "Task List '%s' will be removed. Are you sure you want to continue?" -msgstr "即将删除任务列表“%s”。您确定想要继续吗？" - -#: calendar/gui/tasks-component.c:378 +#: calendar/gui/tasks-component.c:328 msgid "New Task List" msgstr "新建任务列表" -#: calendar/gui/tasks-component.c:421 +#: calendar/gui/tasks-component.c:404 #, c-format msgid "%d task" msgid_plural "%d tasks" msgstr[0] "%d 个任务" -#: calendar/gui/tasks-component.c:423 mail/mail-component.c:503 +#: calendar/gui/tasks-component.c:406 mail/mail-component.c:523 #, c-format msgid ", %d selected" msgid_plural ", %d selected" msgstr[0] "，已选中 %d 个" -#: calendar/gui/tasks-component.c:470 +#: calendar/gui/tasks-component.c:453 msgid "Failed upgrading tasks." msgstr "升级任务失败。" -#: calendar/gui/tasks-component.c:764 +#: calendar/gui/tasks-component.c:747 #, c-format msgid "Unable to open the task list '%s' for creating events and meetings" msgstr "无法打开任务列表“%s”来创建事件和会议" -#: calendar/gui/tasks-component.c:779 +#: calendar/gui/tasks-component.c:762 msgid "There is no calendar available for creating tasks" msgstr "没有可创建任务的日历" -#: calendar/gui/tasks-component.c:1053 +#: calendar/gui/tasks-component.c:1036 msgid "New task" msgstr "新建任务" -#: calendar/gui/tasks-component.c:1054 +#: calendar/gui/tasks-component.c:1037 msgid "_Task" msgstr "任务(_T)" -#: calendar/gui/tasks-component.c:1055 +#: calendar/gui/tasks-component.c:1038 msgid "Create a new task" msgstr "创建新任务" -#: calendar/gui/tasks-component.c:1061 +#: calendar/gui/tasks-component.c:1044 msgid "New assigned task" msgstr "新建指派的任务" -#: calendar/gui/tasks-component.c:1062 +#: calendar/gui/tasks-component.c:1045 msgid "Assigne_d Task" msgstr "指派的任务(_D)" -#: calendar/gui/tasks-component.c:1063 +#: calendar/gui/tasks-component.c:1046 msgid "Create a new assigned task" msgstr "创建新指派的任务" -#: calendar/gui/tasks-component.c:1069 +#: calendar/gui/tasks-component.c:1052 msgid "New task list" msgstr "新建任务列表" -#: calendar/gui/tasks-component.c:1070 +#: calendar/gui/tasks-component.c:1053 msgid "Task l_ist" msgstr "任务列表(_I)" -#: calendar/gui/tasks-component.c:1071 +#: calendar/gui/tasks-component.c:1054 msgid "Create a new task list" msgstr "创建新任务列表" -#: calendar/gui/tasks-control.c:370 +#: calendar/gui/tasks-control.c:372 msgid "" "This operation will permanently erase all tasks marked as completed. If you " "continue, you will not be able to recover these tasks.\n" @@ -7109,15 +7312,15 @@ msgstr "" "\n" "确实删除这些任务吗？" -#: calendar/gui/tasks-control.c:373 +#: calendar/gui/tasks-control.c:375 msgid "Do not ask me again." msgstr "不要再次询问。" -#: calendar/gui/tasks-control.c:431 +#: calendar/gui/tasks-control.c:433 msgid "Print Tasks" msgstr "打印任务" -#: calendar/gui/weekday-picker.c:326 +#: calendar/gui/weekday-picker.c:318 msgid "SMTWTFS" msgstr "日一二三四五六" @@ -8694,56 +8897,56 @@ msgstr "太平洋/沃利斯" msgid "Pacific/Yap" msgstr "太平洋/雅浦" -#: camel/camel-cipher-context.c:102 +#: camel/camel-cipher-context.c:103 msgid "Signing is not supported by this cipher" msgstr "该密码不支持签名" -#: camel/camel-cipher-context.c:128 +#: camel/camel-cipher-context.c:129 msgid "Signing message" msgstr "签名信件" -#: camel/camel-cipher-context.c:145 +#: camel/camel-cipher-context.c:146 msgid "Verifying is not supported by this cipher" msgstr "该密码不支持验证" -#: camel/camel-cipher-context.c:171 +#: camel/camel-cipher-context.c:172 msgid "Verifying message" msgstr "校验信件" -#: camel/camel-cipher-context.c:189 +#: camel/camel-cipher-context.c:190 msgid "Encryption is not supported by this cipher" msgstr "该密码不支持加密" -#: camel/camel-cipher-context.c:215 +#: camel/camel-cipher-context.c:216 msgid "Encrypting message" msgstr "加密信件" -#: camel/camel-cipher-context.c:232 +#: camel/camel-cipher-context.c:233 msgid "Decryption is not supported by this cipher" msgstr "该密码不支持解密" -#: camel/camel-cipher-context.c:254 +#: camel/camel-cipher-context.c:255 msgid "Decrypting message" msgstr "解密信件" -#: camel/camel-cipher-context.c:271 +#: camel/camel-cipher-context.c:272 msgid "You may not import keys with this cipher" msgstr "您不能用此密码导入密钥" -#: camel/camel-cipher-context.c:301 +#: camel/camel-cipher-context.c:302 msgid "You may not export keys with this cipher" msgstr "您不能用此密码导出密钥" -#: camel/camel-data-cache.c:133 +#: camel/camel-data-cache.c:134 msgid "Unable to create cache path" msgstr "无法创建缓冲路径" -#: camel/camel-data-cache.c:375 +#: camel/camel-data-cache.c:376 #, c-format msgid "Could not remove cache entry: %s: %s" msgstr "无法删除缓冲条目：%s：%s" -#: camel/camel-disco-diary.c:194 +#: camel/camel-disco-diary.c:195 #, c-format msgid "" "Could not write log entry: %s\n" @@ -8754,7 +8957,7 @@ msgstr "" "当您重新连接到网络时本服务器\n" "上进一步的操作不会重做。" -#: camel/camel-disco-diary.c:257 +#: camel/camel-disco-diary.c:258 #, c-format msgid "" "Could not open `%s':\n" @@ -8765,28 +8968,28 @@ msgstr "" "%s\n" "对该文件夹的修改不会被重新同步。" -#: camel/camel-disco-diary.c:293 +#: camel/camel-disco-diary.c:294 msgid "Resynchronizing with server" msgstr "重新与服务器同步" -#: camel/camel-disco-folder.c:41 +#: camel/camel-disco-folder.c:42 camel/providers/imap4/camel-imap4-folder.c:61 msgid "Copy folder content locally for offline operation" msgstr "将文件夹内容复制到本地以进行脱机操作" -#: camel/camel-disco-folder.c:103 +#: camel/camel-disco-folder.c:104 msgid "Downloading new messages for offline mode" msgstr "下载新信件以进行脱机操作" -#: camel/camel-disco-folder.c:466 +#: camel/camel-disco-folder.c:467 #, c-format msgid "Preparing folder '%s' for offline" msgstr "准备脱机文件夹“%s”" -#: camel/camel-disco-store.c:404 +#: camel/camel-disco-store.c:405 msgid "You must be working online to complete this operation" msgstr "您必须在线工作以便完成该操作" -#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513 +#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:512 #: camel/camel-process.c:48 #, c-format msgid "Failed to create pipe to '%s': %s" @@ -8852,30 +9055,30 @@ msgstr "获取第%d封信，共%d封" msgid "Failed at message %d of %d" msgstr "在第%d封信失败，共%d封" -#: camel/camel-filter-search.c:136 +#: camel/camel-filter-search.c:135 msgid "Failed to retrieve message" msgstr "获取信件失败" -#: camel/camel-filter-search.c:386 +#: camel/camel-filter-search.c:385 msgid "Invalid arguments to (system-flag)" msgstr "(system-flag)参数无效" -#: camel/camel-filter-search.c:401 +#: camel/camel-filter-search.c:400 msgid "Invalid arguments to (user-tag)" msgstr "(user-tag)参数无效" -#: camel/camel-filter-search.c:549 +#: camel/camel-filter-search.c:548 #, c-format msgid "Failed to create create child process '%s': %s" msgstr "创建子进程“%s”失败：%s" #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru. -#: camel/camel-filter-search.c:671 camel/camel-filter-search.c:679 +#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678 #, c-format msgid "Error executing filter search: %s: %s" msgstr "执行过滤规则搜索错误：%s：%s" -#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476 +#: camel/camel-folder-search.c:357 camel/camel-folder-search.c:478 #, c-format msgid "" "Cannot parse search expression: %s:\n" @@ -8884,7 +9087,7 @@ msgstr "" "无法解析搜索表达式：%s：\n" "%s" -#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486 +#: camel/camel-folder-search.c:367 camel/camel-folder-search.c:488 #, c-format msgid "" "Error executing search expression: %s:\n" @@ -8893,63 +9096,63 @@ msgstr "" "执行搜索表达式错误：%s：\n" "%s" -#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705 +#: camel/camel-folder-search.c:674 camel/camel-folder-search.c:707 msgid "(match-all) requires a single bool result" msgstr "(match-all) 需要一个布尔结果" -#: camel/camel-folder-search.c:755 +#: camel/camel-folder-search.c:757 msgid "(match-threads) not allowed inside match-all" msgstr "(match-threads) 不允许在 match-all 中使用" -#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762 +#: camel/camel-folder-search.c:760 camel/camel-folder-search.c:764 msgid "(match-threads) requires a match type string" msgstr "(match-threads) 需要一个匹配类型字符串" -#: camel/camel-folder-search.c:784 +#: camel/camel-folder-search.c:786 msgid "(match-threads) expects an array result" msgstr "(match-threads) 需要一个数组结果" -#: camel/camel-folder-search.c:790 +#: camel/camel-folder-search.c:792 msgid "(match-threads) requires the folder set" msgstr "(match-threads) 需要文件夹集" -#: camel/camel-folder-search.c:879 +#: camel/camel-folder-search.c:881 #, c-format msgid "Performing query on unknown header: %s" msgstr "对未知的头进行查询：%s" -#: camel/camel-folder.c:653 +#: camel/camel-folder.c:610 #, c-format msgid "Unsupported operation: append message: for %s" msgstr "不支持的操作：附加信件：为 %s" -#: camel/camel-folder.c:1262 +#: camel/camel-folder.c:1200 #, c-format msgid "Unsupported operation: search by expression: for %s" msgstr "不支持的操作：按表达式搜索：搜索 %s" -#: camel/camel-folder.c:1302 +#: camel/camel-folder.c:1240 #, c-format msgid "Unsupported operation: search by uids: for %s" msgstr "不支持的操作：按 uid 搜索：搜索 %s" -#: camel/camel-folder.c:1416 +#: camel/camel-folder.c:1352 msgid "Moving messages" msgstr "移动信件" -#: camel/camel-folder.c:1416 +#: camel/camel-folder.c:1352 msgid "Copying messages" msgstr "复制信件" -#: camel/camel-folder.c:1665 +#: camel/camel-folder.c:1601 msgid "Learning junk" msgstr "学习垃圾邮件" -#: camel/camel-folder.c:1682 +#: camel/camel-folder.c:1618 msgid "Learning non-junk" msgstr "学习非垃圾邮件" -#: camel/camel-folder.c:1701 +#: camel/camel-folder.c:1637 msgid "Filtering new message(s)" msgstr "过滤新信件" @@ -8983,8 +9186,8 @@ msgstr "" #: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314 #: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589 -#: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1261 -#: mail/mail-ops.c:716 mail/mail-send-recv.c:611 +#: camel/camel-gpg-context.c:1701 camel/providers/nntp/camel-nntp-store.c:1262 +#: mail/mail-ops.c:718 mail/mail-send-recv.c:607 msgid "Cancelled." msgstr "已取消。" @@ -9017,21 +9220,21 @@ msgstr "" msgid "Failed to GPG %s: %s\n" msgstr "GPG %s 失败：%s\n" -#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:419 +#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:389 #, c-format msgid "Could not generate signing data: %s" msgstr "无法生成签名数据：%s" -#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1762 -#: camel/camel-gpg-context.c:1813 +#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1766 +#: camel/camel-gpg-context.c:1817 #, c-format msgid "Failed to execute gpg: %s" msgstr "执行 gpg 失败：%s" #: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491 #: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605 -#: camel/camel-gpg-context.c:1690 camel/camel-gpg-context.c:1714 -#: camel/camel-gpg-context.c:1784 camel/camel-gpg-context.c:1835 +#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1718 +#: camel/camel-gpg-context.c:1788 camel/camel-gpg-context.c:1839 msgid "Failed to execute gpg." msgstr "执行 gpg 失败。" @@ -9040,8 +9243,8 @@ msgid "This is a digitally signed message part" msgstr "这是信件的数字签名部分" #: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437 -#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:721 -#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739 +#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:692 +#: camel/camel-smime-context.c:703 camel/camel-smime-context.c:710 msgid "Cannot verify message signature: Incorrect message format" msgstr "无法校验信件签名：信件格式不对" @@ -9059,11 +9262,15 @@ msgstr "无法生成加密数据：%s" msgid "This is a digitally encrypted message part" msgstr "这是信件的数字加密部分" -#: camel/camel-gpg-context.c:1721 camel/camel-smime-context.c:995 +#: camel/camel-gpg-context.c:1674 +msgid "Failed to decrypt MIME part: protocol error" +msgstr "解密 MIME 部分失败：协议错误" + +#: camel/camel-gpg-context.c:1725 camel/camel-smime-context.c:966 msgid "Encrypted content" msgstr "加密内容" -#: camel/camel-gpg-context.c:1740 +#: camel/camel-gpg-context.c:1744 msgid "Unable to parse message content" msgstr "无法分析信件内容" @@ -9107,69 +9314,61 @@ msgstr "用 fcntl(2) 获取锁失败：%s" msgid "Failed to get lock using flock(2): %s" msgstr "用 flock(2) 获取锁失败：%s" -#: camel/camel-movemail.c:105 +#: camel/camel-movemail.c:104 #, c-format msgid "Could not check mail file %s: %s" msgstr "无法检查邮件文件 %s：%s" -#: camel/camel-movemail.c:118 +#: camel/camel-movemail.c:117 #, c-format msgid "Could not open mail file %s: %s" msgstr "无法打开邮件文件 %s：%s" -#: camel/camel-movemail.c:126 +#: camel/camel-movemail.c:125 #, c-format msgid "Could not open temporary mail file %s: %s" msgstr "无法打开临时邮件文件 %s：%s" -#: camel/camel-movemail.c:155 +#: camel/camel-movemail.c:154 #, c-format msgid "Failed to store mail in temp file %s: %s" msgstr "将邮件存储到临时文件 %s 失败：%s" -#: camel/camel-movemail.c:185 +#: camel/camel-movemail.c:184 #, c-format msgid "Could not create pipe: %s" msgstr "无法创建管道：%s" -#: camel/camel-movemail.c:197 +#: camel/camel-movemail.c:196 #, c-format msgid "Could not fork: %s" msgstr "无法创建进程：%s" -#: camel/camel-movemail.c:235 +#: camel/camel-movemail.c:234 #, c-format msgid "Movemail program failed: %s" msgstr "移动邮件程序失败：%s" -#: camel/camel-movemail.c:236 +#: camel/camel-movemail.c:235 msgid "(Unknown error)" msgstr "(未知的错误)" -#: camel/camel-movemail.c:259 +#: camel/camel-movemail.c:258 #, c-format msgid "Error reading mail file: %s" msgstr "阅读邮件文件错误：%s" -#: camel/camel-movemail.c:270 +#: camel/camel-movemail.c:269 #, c-format msgid "Error writing mail temp file: %s" msgstr "写入邮件临时文件错误：%s" -#: camel/camel-movemail.c:463 camel/camel-movemail.c:530 +#: camel/camel-movemail.c:462 camel/camel-movemail.c:529 #, c-format msgid "Error copying mail temp file: %s" msgstr "复制邮件临时文件错误：%s" -#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244 -msgid "Failed to decrypt MIME part: protocol error" -msgstr "解密 MIME 部分失败：协议错误" - -#: camel/camel-multipart-encrypted.c:257 -msgid "Failed to decrypt MIME part: invalid structure" -msgstr "解密 MIME 部分失败：无效的结构" - -#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724 +#: camel/camel-multipart-signed.c:559 msgid "parse error" msgstr "解析错误" @@ -9181,22 +9380,22 @@ msgstr "虚拟文件夹电子邮件提供者" msgid "For reading mail as a query of another set of folders" msgstr "关于将读入邮件作为对另一组文件夹的查询" -#: camel/camel-provider.c:172 +#: camel/camel-provider.c:185 #, c-format msgid "Could not load %s: Module loading not supported on this system." msgstr "无法装入 %s：本系统不支持模块装入。" -#: camel/camel-provider.c:181 +#: camel/camel-provider.c:194 #, c-format msgid "Could not load %s: %s" msgstr "无法装入 %s：%s" -#: camel/camel-provider.c:189 +#: camel/camel-provider.c:202 #, c-format msgid "Could not load %s: No initialization code in module." msgstr "无法装入 %s：模块中没有初始化代码。" -#: camel/camel-provider.c:356 camel/camel-session.c:160 +#: camel/camel-provider.c:374 camel/camel-session.c:161 #, c-format msgid "No provider available for protocol `%s'" msgstr "协议“%s”没有可用的提供者" @@ -9209,7 +9408,7 @@ msgstr "匿名" msgid "This option will connect to the server using an anonymous login." msgstr "该选项将连接到匿名登录的服务器上。" -#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87 +#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:88 msgid "Authentication failed." msgstr "认证失败。" @@ -9240,113 +9439,113 @@ msgstr "" "无效的跟踪信息：\n" "%s" -#: camel/camel-sasl-cram-md5.c:35 +#: camel/camel-sasl-cram-md5.c:36 msgid "CRAM-MD5" msgstr "CRAM-MD5" -#: camel/camel-sasl-cram-md5.c:37 +#: camel/camel-sasl-cram-md5.c:38 msgid "" "This option will connect to the server using a secure CRAM-MD5 password, if " "the server supports it." msgstr "如果服务器支持的话，该选项将用安全 CRAM-MD5 密码连接到服务器。" -#: camel/camel-sasl-digest-md5.c:48 +#: camel/camel-sasl-digest-md5.c:49 msgid "DIGEST-MD5" msgstr "DIGEST-MD5" -#: camel/camel-sasl-digest-md5.c:50 +#: camel/camel-sasl-digest-md5.c:51 msgid "" "This option will connect to the server using a secure DIGEST-MD5 password, " "if the server supports it." msgstr "如果服务器支持的话，该选项将用安全 DIGEST-MD5 密码连接到服务器。" -#: camel/camel-sasl-digest-md5.c:813 +#: camel/camel-sasl-digest-md5.c:814 msgid "Server challenge too long (>2048 octets)\n" msgstr "服务器质询过长 (>2048张八开纸)\n" -#: camel/camel-sasl-digest-md5.c:822 +#: camel/camel-sasl-digest-md5.c:823 msgid "Server challenge invalid\n" msgstr "服务器质询无效\n" -#: camel/camel-sasl-digest-md5.c:828 +#: camel/camel-sasl-digest-md5.c:829 msgid "Server challenge contained invalid \"Quality of Protection\" token\n" msgstr "服务器质询含有无效的“品质保护”标志\n" -#: camel/camel-sasl-digest-md5.c:858 +#: camel/camel-sasl-digest-md5.c:859 msgid "Server response did not contain authorization data\n" msgstr "服务器应答不含有认证数据\n" -#: camel/camel-sasl-digest-md5.c:876 +#: camel/camel-sasl-digest-md5.c:877 msgid "Server response contained incomplete authorization data\n" msgstr "服务器应达含有不完整的认证数据\n" -#: camel/camel-sasl-digest-md5.c:886 +#: camel/camel-sasl-digest-md5.c:887 msgid "Server response does not match\n" msgstr "服务器应答不匹配\n" -#: camel/camel-sasl-gssapi.c:52 +#: camel/camel-sasl-gssapi.c:53 msgid "GSSAPI" msgstr "GSSAPI" -#: camel/camel-sasl-gssapi.c:54 +#: camel/camel-sasl-gssapi.c:55 msgid "This option will connect to the server using Kerberos 5 authentication." msgstr "该选项将用 Kerberos 5 认证连接到服务器。" -#: camel/camel-sasl-gssapi.c:152 +#: camel/camel-sasl-gssapi.c:153 msgid "" "The specified mechanism is not supported by the provided credential, or is " "unrecognized by the implementation." msgstr "所提供的证书不支持指定的机制，或者无法被实现所识别。" -#: camel/camel-sasl-gssapi.c:157 +#: camel/camel-sasl-gssapi.c:158 msgid "The provided target_name parameter was ill-formed." msgstr "提供的 target_name 参数格式不对。" -#: camel/camel-sasl-gssapi.c:160 +#: camel/camel-sasl-gssapi.c:161 msgid "" "The provided target_name parameter contained an invalid or unsupported type " "of name." msgstr "提供的 target_name 参数包含无效或不支持的名称类型。" -#: camel/camel-sasl-gssapi.c:164 +#: camel/camel-sasl-gssapi.c:165 msgid "" "The input_token contains different channel bindings to those specified via " "the input_chan_bindings parameter." msgstr "" "input_token 包含的通道绑定与通过 input_chan_bindings 参数指定的通道不同。" -#: camel/camel-sasl-gssapi.c:169 +#: camel/camel-sasl-gssapi.c:170 msgid "" "The input_token contains an invalid signature, or a signature that could not " "be verified." msgstr "input_token 包含无效的签名，或者无法验证签名。" -#: camel/camel-sasl-gssapi.c:173 +#: camel/camel-sasl-gssapi.c:174 msgid "" "The supplied credentials were not valid for context initiation, or the " "credential handle did not reference any credentials." msgstr "提供的证书由于上下文的原因无效，或者证书句柄没有引用证书。" -#: camel/camel-sasl-gssapi.c:178 +#: camel/camel-sasl-gssapi.c:179 msgid "The supplied context handle did not refer to a valid context." msgstr "提供的上下文句柄所引用的上下文无效。" -#: camel/camel-sasl-gssapi.c:181 +#: camel/camel-sasl-gssapi.c:182 msgid "The consistency checks performed on the input_token failed." msgstr "对 input_token 执行完整性检查失败。" -#: camel/camel-sasl-gssapi.c:184 +#: camel/camel-sasl-gssapi.c:185 msgid "The consistency checks performed on the credential failed." msgstr "对证书执行完整性检查失败。" -#: camel/camel-sasl-gssapi.c:187 +#: camel/camel-sasl-gssapi.c:188 msgid "The referenced credentials have expired." msgstr "引用的证书已过期。" -#: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:242 +#: camel/camel-sasl-gssapi.c:194 camel/camel-sasl-gssapi.c:242 #: camel/camel-sasl-gssapi.c:278 camel/camel-sasl-gssapi.c:293 -#: camel/camel-sasl-kerberos4.c:225 -#: camel/providers/imap/camel-imap-store.c:1256 +#: camel/camel-sasl-kerberos4.c:226 +#: camel/providers/imap/camel-imap-store.c:1213 msgid "Bad authentication response from server." msgstr "来自服务器的无效认证应答。" @@ -9354,15 +9553,15 @@ msgstr "来自服务器的无效认证应答。" msgid "Unsupported security layer." msgstr "不支持的安全层。" -#: camel/camel-sasl-kerberos4.c:41 +#: camel/camel-sasl-kerberos4.c:42 msgid "Kerberos 4" msgstr "Kerberos 4" -#: camel/camel-sasl-kerberos4.c:43 +#: camel/camel-sasl-kerberos4.c:44 msgid "This option will connect to the server using Kerberos 4 authentication." msgstr "该选项将用 Kerberos 4 认证连接到服务器。" -#: camel/camel-sasl-kerberos4.c:168 +#: camel/camel-sasl-kerberos4.c:169 #, c-format msgid "" "Could not get Kerberos ticket:\n" @@ -9371,104 +9570,73 @@ msgstr "" "无法获取 Kerberos 标签：\n" "%s" -#: camel/camel-sasl-login.c:32 +#: camel/camel-sasl-login.c:33 msgid "Login" msgstr "Login" -#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34 +#: camel/camel-sasl-login.c:35 camel/camel-sasl-plain.c:35 msgid "This option will connect to the server using a simple password." msgstr "该选项将以普通密码连接到服务器。" -#: camel/camel-sasl-login.c:127 +#: camel/camel-sasl-login.c:128 msgid "Unknown authentication state." msgstr "未知的认证状态。" -#: camel/camel-sasl-ntlm.c:31 +#: camel/camel-sasl-ntlm.c:32 msgid "NTLM / SPA" msgstr "NTLM / SPA" -#: camel/camel-sasl-ntlm.c:33 +#: camel/camel-sasl-ntlm.c:34 msgid "" "This option will connect to a Windows-based server using NTLM / Secure " "Password Authentication." msgstr "该选项将使用 NTLM / Secure 口令认证连接到基于 Windows 的服务器。" -#: camel/camel-sasl-plain.c:32 +#: camel/camel-sasl-plain.c:33 msgid "PLAIN" msgstr "PLAIN" -#: camel/camel-sasl-popb4smtp.c:36 +#: camel/camel-sasl-popb4smtp.c:37 msgid "POP before SMTP" msgstr "在 SMTP 之前 POP" -#: camel/camel-sasl-popb4smtp.c:38 +#: camel/camel-sasl-popb4smtp.c:39 msgid "This option will authorise a POP connection before attempting SMTP" msgstr "该选项将在尝试 SMTP 之前允许 POP 连接" -#: camel/camel-sasl-popb4smtp.c:103 +#: camel/camel-sasl-popb4smtp.c:104 msgid "POP Source URI" msgstr "POP 源 URI" -#: camel/camel-sasl-popb4smtp.c:106 +#: camel/camel-sasl-popb4smtp.c:107 msgid "POP Before SMTP auth using an unknown transport" msgstr "以未知的传输进行 SMTP 之前的 POP 授权" -#: camel/camel-sasl-popb4smtp.c:111 +#: camel/camel-sasl-popb4smtp.c:112 msgid "POP Before SMTP auth using a non-pop source" msgstr "以非 pop 源进行 SMTP 之前的 POP 授权" -#: camel/camel-search-private.c:114 +#: camel/camel-search-private.c:151 #, c-format msgid "Regular expression compilation failed: %s: %s" msgstr "常规表达式编译失败：%s：%s" -#: camel/camel-service.c:274 +#: camel/camel-service.c:272 #, c-format msgid "URL '%s' needs a username component" msgstr "URL“%s”需要用户名组件" -#: camel/camel-service.c:278 +#: camel/camel-service.c:276 #, c-format msgid "URL '%s' needs a host component" msgstr "URL“%s”需要主机组件" -#: camel/camel-service.c:282 +#: camel/camel-service.c:280 #, c-format msgid "URL '%s' needs a path component" msgstr "URL“%s”需要路径组件" -#: camel/camel-service.c:743 -msgid "cannot create thread" -msgstr "无法创建线索" - -#: camel/camel-service.c:890 -#, c-format -msgid "Resolving: %s" -msgstr "解析：%s" - -#: camel/camel-service.c:912 -msgid "Host lookup failed" -msgstr "主机查阅失败" - -#: camel/camel-service.c:914 -#, c-format -msgid "Host lookup failed: %s: %s" -msgstr "主机查阅失败：%s：%s" - -#: camel/camel-service.c:1021 -msgid "Resolving address" -msgstr "解析地址" - -#: camel/camel-service.c:1041 -msgid "Name lookup failed" -msgstr "名称查阅失败" - -#: camel/camel-service.c:1044 -#, c-format -msgid "Name lookup failed: %s" -msgstr "名称查阅失败：%s" - -#: camel/camel-session.c:282 +#: camel/camel-session.c:283 #, c-format msgid "" "Could not create directory %s:\n" @@ -9477,252 +9645,260 @@ msgstr "" "无法创建目录 %s：\n" "%s" -#: camel/camel-smime-context.c:104 -#, c-format -msgid "Enter security pass-phrase for `%s'" -msgstr "为“%s”输入安全密码句" - -#: camel/camel-smime-context.c:261 +#: camel/camel-smime-context.c:231 #, c-format msgid "Cannot find certificate for '%s'" msgstr "找不到“%s”的证书" -#: camel/camel-smime-context.c:267 +#: camel/camel-smime-context.c:237 msgid "Cannot create CMS message" msgstr "无法创建 CMS 信件" -#: camel/camel-smime-context.c:272 -msgid "Cannot create CMS signedData" +#: camel/camel-smime-context.c:242 +#, fuzzy +msgid "Cannot create CMS signed data" msgstr "无法创建 CMS 签名数据" -#: camel/camel-smime-context.c:278 -msgid "Cannot attach CMS signedData" +#: camel/camel-smime-context.c:248 +#, fuzzy +msgid "Cannot attach CMS signed data" msgstr "无法附加 CMS 签名数据" -#: camel/camel-smime-context.c:285 +#: camel/camel-smime-context.c:255 msgid "Cannot attach CMS data" msgstr "无法附加 CMS 数据" -#: camel/camel-smime-context.c:291 -msgid "Cannot create CMS SignerInfo" +#: camel/camel-smime-context.c:261 +#, fuzzy +msgid "Cannot create CMS Signer information" msgstr "无法创建 CMS 签名者信息" -#: camel/camel-smime-context.c:297 -msgid "Cannot find cert chain" +#: camel/camel-smime-context.c:267 +#, fuzzy +msgid "Cannot find certificate chain" msgstr "找不到证书链" -#: camel/camel-smime-context.c:303 -msgid "Cannot add CMS SigningTime" +#: camel/camel-smime-context.c:273 +#, fuzzy +msgid "Cannot add CMS Signing time" msgstr "无法添加 CMS 签名时间" -#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337 -#, c-format -msgid "Encryption cert for '%s' does not exist" +#: camel/camel-smime-context.c:295 camel/camel-smime-context.c:307 +#, fuzzy, c-format +msgid "Encryption certificate for '%s' does not exist" msgstr "“%s”的加密证书不存在" -#: camel/camel-smime-context.c:344 +#: camel/camel-smime-context.c:314 msgid "Cannot add SMIMEEncKeyPrefs attribute" msgstr "无法添加 SMIMEEncKeyPrefs 属性" -#: camel/camel-smime-context.c:349 +#: camel/camel-smime-context.c:319 msgid "Cannot add MS SMIMEEncKeyPrefs attribute" msgstr "无法添加 MS SMIMEEncKeyPrefs 属性" -#: camel/camel-smime-context.c:354 +#: camel/camel-smime-context.c:324 msgid "Cannot add encryption certificate" msgstr "无法添加加密证书" -#: camel/camel-smime-context.c:360 -msgid "Cannot add CMS SignerInfo" +#: camel/camel-smime-context.c:330 +#, fuzzy +msgid "Cannot add CMS Signer information" msgstr "无法添加 CMS 签名者信息" -#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877 +#: camel/camel-smime-context.c:400 camel/camel-smime-context.c:848 msgid "Cannot create encoder context" msgstr "无法创建编码器上下文" -#: camel/camel-smime-context.c:436 +#: camel/camel-smime-context.c:406 msgid "Failed to add data to CMS encoder" msgstr "将数据添加到 CMS 编码器失败" -#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894 +#: camel/camel-smime-context.c:411 camel/camel-smime-context.c:865 msgid "Failed to encode data" msgstr "编码数据失败" -#: camel/camel-smime-context.c:514 +#: camel/camel-smime-context.c:484 msgid "Unverified" msgstr "未校验" -#: camel/camel-smime-context.c:516 +#: camel/camel-smime-context.c:486 msgid "Good signature" msgstr "完好签名" -#: camel/camel-smime-context.c:518 +#: camel/camel-smime-context.c:488 msgid "Bad signature" msgstr "无效签名" -#: camel/camel-smime-context.c:520 +#: camel/camel-smime-context.c:490 msgid "Content tampered with or altered in transit" msgstr "内容在传送过程中被篡改" -#: camel/camel-smime-context.c:522 +#: camel/camel-smime-context.c:492 msgid "Signing certificate not found" msgstr "签名证书找不到" -#: camel/camel-smime-context.c:524 +#: camel/camel-smime-context.c:494 msgid "Signing certificate not trusted" msgstr "签名证书不可信" -#: camel/camel-smime-context.c:526 +#: camel/camel-smime-context.c:496 msgid "Signature algorithm unknown" msgstr "签名算法未知" -#: camel/camel-smime-context.c:528 +#: camel/camel-smime-context.c:498 msgid "Signature algorithm unsupported" msgstr "签名算法不支持" -#: camel/camel-smime-context.c:530 +#: camel/camel-smime-context.c:500 msgid "Malformed signature" msgstr "签名格式不对" -#: camel/camel-smime-context.c:532 +#: camel/camel-smime-context.c:502 msgid "Processing error" msgstr "处理错误" -#: camel/camel-smime-context.c:569 -msgid "No signedData in signature" +#: camel/camel-smime-context.c:539 +#, fuzzy +msgid "No signed data in signature" msgstr "签名中没有签名数据" -#: camel/camel-smime-context.c:576 +#: camel/camel-smime-context.c:546 msgid "Digests missing from enveloped data" msgstr "信封数据缺少摘要" -#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599 +#: camel/camel-smime-context.c:559 camel/camel-smime-context.c:569 msgid "Cannot calculate digests" msgstr "无法计算摘要" -#: camel/camel-smime-context.c:604 +#: camel/camel-smime-context.c:574 msgid "Cannot set message digests" msgstr "无法设置信件摘要" -#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619 +#: camel/camel-smime-context.c:584 camel/camel-smime-context.c:589 msgid "Certificate import failed" msgstr "证书导入失败" -#: camel/camel-smime-context.c:628 -msgid "Certificate only message, cannot verify certificates" +#: camel/camel-smime-context.c:599 +#, fuzzy +msgid "Certificate is the only message, cannot verify certificates" msgstr "只有证书的信件，无法校验证书" -#: camel/camel-smime-context.c:631 -msgid "Certificate only message, certificates imported and verified" +#: camel/camel-smime-context.c:602 +#, fuzzy +msgid "Certificate is the only message, certificates imported and verified" msgstr "只有证书的信件，证书已导入并校验" -#: camel/camel-smime-context.c:635 +#: camel/camel-smime-context.c:606 msgid "Cannot find signature digests" msgstr "找不到签名摘要" -#: camel/camel-smime-context.c:651 +#: camel/camel-smime-context.c:622 #, c-format msgid "Signer: %s <%s>: %s\n" msgstr "签名者：%s <%s>：%s\n" -#: camel/camel-smime-context.c:752 +#: camel/camel-smime-context.c:723 msgid "Decoder failed" msgstr "解码器失败" -#: camel/camel-smime-context.c:804 +#: camel/camel-smime-context.c:775 #, c-format msgid "Cannot find certificate for `%s'" msgstr "找不到“%s”的证书" -#: camel/camel-smime-context.c:811 +#: camel/camel-smime-context.c:782 msgid "Cannot find common bulk encryption algorithm" msgstr "找不到公共批量加密算法" #. PORT_GetError(); ?? -#: camel/camel-smime-context.c:820 +#: camel/camel-smime-context.c:791 msgid "Cannot allocate slot for encryption bulk key" msgstr "无法为加密批量密钥分配密钥槽" -#: camel/camel-smime-context.c:831 +#: camel/camel-smime-context.c:802 msgid "Cannot create CMS Message" msgstr "无法创建 CMS 信件" -#: camel/camel-smime-context.c:837 -msgid "Cannot create CMS EnvelopedData" +#: camel/camel-smime-context.c:808 +#, fuzzy +msgid "Cannot create CMS Enveloped data" msgstr "无法创建 CMS 信封数据" -#: camel/camel-smime-context.c:843 -msgid "Cannot attach CMS EnvelopedData" +#: camel/camel-smime-context.c:814 +#, fuzzy +msgid "Cannot attach CMS Enveloped data" msgstr "无法附加 CMS 信封数据" -#: camel/camel-smime-context.c:849 +#: camel/camel-smime-context.c:820 msgid "Cannot attach CMS data object" msgstr "无法附加 CMS 数据对象" -#: camel/camel-smime-context.c:858 -msgid "Cannot create CMS RecipientInfo" +#: camel/camel-smime-context.c:829 +#, fuzzy +msgid "Cannot create CMS Recipient information" msgstr "无法创建 CMS 收件人信息" -#: camel/camel-smime-context.c:863 -msgid "Cannot add CMS RecipientInfo" +#: camel/camel-smime-context.c:834 +#, fuzzy +msgid "Cannot add CMS Recipient information" msgstr "无法添加 CMS 收件人信息" -#: camel/camel-smime-context.c:888 +#: camel/camel-smime-context.c:859 msgid "Failed to add data to encoder" msgstr "将数据添加到编码器失败" -#: camel/camel-smime-context.c:975 +#: camel/camel-smime-context.c:946 #, c-format msgid "Decoder failed, error %d" msgstr "解码器失败，错误号 %d" -#: camel/camel-smime-context.c:982 +#: camel/camel-smime-context.c:953 msgid "S/MIME Decrypt: No encrypted content found" msgstr "S/MIME 解密：没有找到加密内容" -#: camel/camel-smime-context.c:1009 +#: camel/camel-smime-context.c:980 msgid "import keys: unimplemented" msgstr "导入密钥：尚未实现" -#: camel/camel-smime-context.c:1017 +#: camel/camel-smime-context.c:988 msgid "export keys: unimplemented" msgstr "导出密钥：尚未实现" -#: camel/camel-store.c:213 +#: camel/camel-store.c:214 msgid "Cannot get folder: Invalid operation on this store" msgstr "无法获取文件夹：对该存储的无效操作" -#: camel/camel-store.c:243 +#: camel/camel-store.c:244 #, c-format msgid "Cannot create folder `%s': folder exists" msgstr "无法创建文件夹：%s：文件夹已存在" -#: camel/camel-store.c:297 +#: camel/camel-store.c:298 msgid "Cannot create folder: Invalid operation on this store" msgstr "无法创建文件夹：对该存储的无效操作" -#: camel/camel-store.c:325 +#: camel/camel-store.c:326 #, c-format msgid "Cannot create folder: %s: folder exists" msgstr "无法创建文件夹：%s：文件夹已存在" -#: camel/camel-store.c:389 camel/camel-vee-store.c:366 +#: camel/camel-store.c:390 camel/camel-vee-store.c:367 #, c-format msgid "Cannot delete folder: %s: Invalid operation" msgstr "无法删除文件夹：%s：无效操作" -#: camel/camel-store.c:439 camel/camel-vee-store.c:403 -#: camel/providers/local/camel-maildir-store.c:232 +#: camel/camel-store.c:440 camel/camel-vee-store.c:404 +#: camel/providers/local/camel-maildir-store.c:233 #, c-format msgid "Cannot rename folder: %s: Invalid operation" msgstr "无法重命名文件夹：%s：无效操作" -#: camel/camel-store.c:777 +#: camel/camel-store.c:778 msgid "Trash" msgstr "回收站" -#: camel/camel-store.c:779 mail/em-filter-i18n.h:35 -#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48 +#: camel/camel-store.c:780 mail/em-filter-i18n.h:35 +#: mail/mail-config.glade.h:93 ui/evolution-mail-message.xml.h:48 msgid "Junk" msgstr "垃圾" @@ -9842,7 +10018,7 @@ msgstr "密钥不支持证书签名" msgid "Error in application verification" msgstr "应用程序验证错误" -#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826 +#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:827 #, c-format msgid "" "Issuer: %s\n" @@ -9855,11 +10031,11 @@ msgstr "" "指纹： %s\n" "签名： %s" -#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832 +#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833 msgid "GOOD" msgstr "好" -#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832 +#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833 msgid "BAD" msgstr "坏" @@ -9883,7 +10059,7 @@ msgstr "" "您仍然希望接受吗？" #. construct our user prompt -#: camel/camel-tcp-stream-ssl.c:836 +#: camel/camel-tcp-stream-ssl.c:837 #, c-format msgid "" "SSL Certificate check for %s:\n" @@ -9898,7 +10074,7 @@ msgstr "" "\n" "您希望接受吗？" -#: camel/camel-tcp-stream-ssl.c:880 +#: camel/camel-tcp-stream-ssl.c:881 #, c-format msgid "" "Certificate problem: %s\n" @@ -9907,7 +10083,7 @@ msgstr "" "证书问题：%s\n" "发行者：%s" -#: camel/camel-tcp-stream-ssl.c:932 +#: camel/camel-tcp-stream-ssl.c:933 #, c-format msgid "" "Bad certificate domain: %s\n" @@ -9916,7 +10092,7 @@ msgstr "" "无效的证书域名：%s\n" "发行者：%s" -#: camel/camel-tcp-stream-ssl.c:950 +#: camel/camel-tcp-stream-ssl.c:951 #, c-format msgid "" "Certificate expired: %s\n" @@ -9925,7 +10101,7 @@ msgstr "" "证书过期：%s\n" "发行者：%s" -#: camel/camel-tcp-stream-ssl.c:967 +#: camel/camel-tcp-stream-ssl.c:968 #, c-format msgid "" "Certificate revocation list expired: %s\n" @@ -9934,125 +10110,124 @@ msgstr "" "证书撤销列表已过期：%s\n" "发行者：%s" -#: camel/camel-url.c:292 +#: camel/camel-url.c:293 #, c-format msgid "Could not parse URL `%s'" msgstr "无法解析 URL“%s”" -#: camel/camel-vee-folder.c:603 +#: camel/camel-vee-folder.c:476 #, c-format msgid "Error storing `%s': %s" msgstr "存储“%s”错误：%s" -#: camel/camel-vee-folder.c:645 +#: camel/camel-vee-folder.c:518 #, c-format msgid "No such message %s in %s" msgstr "在 %2$s 中没有信件 %1$s" -#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818 +#: camel/camel-vee-folder.c:643 camel/camel-vee-folder.c:649 msgid "Cannot copy or move messages into a Virtual Folder" msgstr "无法将信件移动或复制到虚拟文件夹中" -#: camel/camel-vee-store.c:389 +#: camel/camel-vee-store.c:390 #, c-format msgid "Cannot delete folder: %s: No such folder" msgstr "无法删除文件夹：%s：没有该文件夹" -#: camel/camel-vee-store.c:411 +#: camel/camel-vee-store.c:412 #, c-format msgid "Cannot rename folder: %s: No such folder" msgstr "无法重命名文件夹：%s：没有该文件夹" -#: camel/camel-vtrash-folder.c:44 +#: camel/camel-vtrash-folder.c:47 msgid "Cannot copy messages to the Trash folder" msgstr "无法将信件复制到回收站文件夹" -#: camel/camel-vtrash-folder.c:46 +#: camel/camel-vtrash-folder.c:49 msgid "Cannot copy messages to the Junk folder" msgstr "无法将信件复制到垃圾邮件文件夹" -#: camel/providers/groupwise/camel-groupwise-provider.c:53 -#: camel/providers/imap4/camel-imap4-provider.c:35 +#: camel/providers/groupwise/camel-groupwise-provider.c:54 +#: camel/providers/imap4/camel-imap4-provider.c:36 msgid "Checking for new mail" msgstr "检查新邮件" -#: camel/providers/groupwise/camel-groupwise-provider.c:55 -#: camel/providers/imap/camel-imap-provider.c:45 -#: camel/providers/imap4/camel-imap4-provider.c:37 +#: camel/providers/groupwise/camel-groupwise-provider.c:56 +#: camel/providers/imap4/camel-imap4-provider.c:38 msgid "Check for new messages in all folders" msgstr "在所有文件夹中检查新信件" -#: camel/providers/groupwise/camel-groupwise-provider.c:59 +#: camel/providers/groupwise/camel-groupwise-provider.c:61 msgid "Apply filters to new messages in Inbox on this server" msgstr "应用过滤规则到此服务器上收件箱中的新信件" -#: camel/providers/groupwise/camel-groupwise-provider.c:61 -#: camel/providers/imap/camel-imap-provider.c:66 +#: camel/providers/groupwise/camel-groupwise-provider.c:63 +#: camel/providers/imap4/camel-imap4-provider.c:53 msgid "Check new messages for Junk contents" msgstr "检查新信件的垃圾内容" -#: camel/providers/groupwise/camel-groupwise-provider.c:63 -#: camel/providers/imap/camel-imap-provider.c:68 +#: camel/providers/groupwise/camel-groupwise-provider.c:65 +#: camel/providers/imap4/camel-imap4-provider.c:55 msgid "Only check for Junk messages in the INBOX folder" msgstr "仅在收件箱中检查垃圾邮件" -#: camel/providers/groupwise/camel-groupwise-provider.c:65 -#: camel/providers/imap/camel-imap-provider.c:70 -msgid "Automatically synchronize remote mail locally" +#: camel/providers/groupwise/camel-groupwise-provider.c:67 +#, fuzzy +msgid "Automatically synchronize account locally" msgstr "自动将远程邮件同步到本地" -#: camel/providers/groupwise/camel-groupwise-provider.c:69 +#: camel/providers/groupwise/camel-groupwise-provider.c:72 msgid "Address Book and Calendar" msgstr "地址簿和日历" -#: camel/providers/groupwise/camel-groupwise-provider.c:72 +#: camel/providers/groupwise/camel-groupwise-provider.c:75 msgid "Post Office Agent:" msgstr "邮局代理：" -#: camel/providers/groupwise/camel-groupwise-provider.c:75 +#: camel/providers/groupwise/camel-groupwise-provider.c:78 msgid "Post Office Agent SOAP Port:" msgstr "邮局代理 SOAP 端口：" -#: camel/providers/groupwise/camel-groupwise-provider.c:78 +#: camel/providers/groupwise/camel-groupwise-provider.c:81 msgid "Use Secure Connection (SSL)" msgstr "使用安全连接(SSL)" -#: camel/providers/groupwise/camel-groupwise-provider.c:92 +#: camel/providers/groupwise/camel-groupwise-provider.c:94 msgid "Novell GroupWise" msgstr "Novell GroupWise" -#: camel/providers/groupwise/camel-groupwise-provider.c:94 +#: camel/providers/groupwise/camel-groupwise-provider.c:96 msgid "For accessing Novell Groupwise servers" msgstr "访问 Novell GroupWise 服务器" -#: camel/providers/groupwise/camel-groupwise-provider.c:109 -#: camel/providers/imap/camel-imap-provider.c:93 -#: camel/providers/imap4/camel-imap4-provider.c:70 -#: camel/providers/imapp/camel-imapp-provider.c:65 -#: camel/providers/nntp/camel-nntp-provider.c:71 -#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108 +#: camel/providers/groupwise/camel-groupwise-provider.c:111 +#: camel/providers/imap/camel-imap-provider.c:96 +#: camel/providers/imap4/camel-imap4-provider.c:81 +#: camel/providers/imapp/camel-imapp-provider.c:66 +#: camel/providers/nntp/camel-nntp-provider.c:72 +#: camel/providers/pop3/camel-pop3-provider.c:72 msgid "Password" msgstr "密码" -#: camel/providers/groupwise/camel-groupwise-provider.c:111 -#: camel/providers/imap/camel-imap-provider.c:95 -#: camel/providers/imapp/camel-imapp-provider.c:67 +#: camel/providers/groupwise/camel-groupwise-provider.c:113 +#: camel/providers/imap/camel-imap-provider.c:98 +#: camel/providers/imapp/camel-imapp-provider.c:68 msgid "This option will connect to the IMAP server using a plaintext password." msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。" -#: camel/providers/groupwise/camel-gw-listener.c:402 +#: camel/providers/groupwise/camel-gw-listener.c:436 msgid "Checklist" msgstr "待办清单" #: camel/providers/imap/camel-imap-command.c:218 #: camel/providers/imap/camel-imap-command.c:257 #: camel/providers/imap/camel-imap-command.c:447 -#: camel/providers/imap/camel-imap-store.c:3240 +#: camel/providers/imap/camel-imap-store.c:3200 msgid "Operation cancelled" msgstr "操作已取消" #: camel/providers/imap/camel-imap-command.c:302 -#: camel/providers/imap/camel-imap-store.c:3243 +#: camel/providers/imap/camel-imap-store.c:3203 #, c-format msgid "Server unexpectedly disconnected: %s" msgstr "服务器意外地中止了连接：%s" @@ -10110,12 +10285,12 @@ msgstr "文件夹已被删除并在服务器上重建了。" msgid "Scanning for changed messages" msgstr "扫描更改了的信件" -#: camel/providers/imap/camel-imap-folder.c:1938 +#: camel/providers/imap/camel-imap-folder.c:1939 #, c-format msgid "Unable to retrieve message: %s" msgstr "无法获取信件：%s" -#: camel/providers/imap/camel-imap-folder.c:1975 +#: camel/providers/imap/camel-imap-folder.c:1979 #, c-format msgid "" "Cannot get message: %s\n" @@ -10124,197 +10299,225 @@ msgstr "" "无法获取信件：%s\n" " %s" -#: camel/providers/imap/camel-imap-folder.c:1975 -#: camel/providers/local/camel-maildir-folder.c:244 -#: camel/providers/local/camel-mbox-folder.c:415 -#: camel/providers/local/camel-mh-folder.c:202 +#: camel/providers/imap/camel-imap-folder.c:1979 +#: camel/providers/local/camel-maildir-folder.c:245 +#: camel/providers/local/camel-mbox-folder.c:403 +#: camel/providers/local/camel-mh-folder.c:203 msgid "No such message" msgstr "没有该信件" -#: camel/providers/imap/camel-imap-folder.c:2017 -#: camel/providers/imap/camel-imap-folder.c:2620 -#: camel/providers/nntp/camel-nntp-folder.c:220 +#: camel/providers/imap/camel-imap-folder.c:2021 +#: camel/providers/imap/camel-imap-folder.c:2623 +#: camel/providers/nntp/camel-nntp-folder.c:221 msgid "This message is not currently available" msgstr "该信件目前不可用" -#: camel/providers/imap/camel-imap-folder.c:2283 -#: camel/providers/imap/camel-imap-folder.c:2353 +#: camel/providers/imap/camel-imap-folder.c:2287 +#: camel/providers/imap/camel-imap-folder.c:2357 msgid "Fetching summary information for new messages" msgstr "从新信件中获取概要信息" -#: camel/providers/imap/camel-imap-folder.c:2461 +#: camel/providers/imap/camel-imap-folder.c:2464 #, c-format msgid "Incomplete server response: no information provided for message %d" msgstr "不完整的服务器响应：没有为第%d封信提供信息" -#: camel/providers/imap/camel-imap-folder.c:2469 +#: camel/providers/imap/camel-imap-folder.c:2472 #, c-format msgid "Incomplete server response: no UID provided for message %d" msgstr "不完整的服务器响应：没有为第%d封信提供 UID" -#: camel/providers/imap/camel-imap-folder.c:2482 +#: camel/providers/imap/camel-imap-folder.c:2485 #, c-format msgid "" "Unexpected server response: Identical UIDs provided for messages %d and %d" msgstr "意外的服务器响应：为第%d封信和第%d封信提供了同样的 UID" -#: camel/providers/imap/camel-imap-folder.c:2658 +#: camel/providers/imap/camel-imap-folder.c:2661 msgid "Could not find message body in FETCH response." msgstr "无法在 FETCH 应答中找到信体。" -#: camel/providers/imap/camel-imap-message-cache.c:155 +#: camel/providers/imap/camel-imap-message-cache.c:156 #, c-format msgid "Could not open cache directory: %s" msgstr "无法打开缓冲器目录：%s" -#: camel/providers/imap/camel-imap-message-cache.c:252 -#: camel/providers/imap/camel-imap-message-cache.c:309 -#: camel/providers/imap/camel-imap-message-cache.c:340 -#: camel/providers/imap/camel-imap-message-cache.c:372 +#: camel/providers/imap/camel-imap-message-cache.c:253 +#: camel/providers/imap/camel-imap-message-cache.c:310 +#: camel/providers/imap/camel-imap-message-cache.c:341 +#: camel/providers/imap/camel-imap-message-cache.c:373 #, c-format msgid "Failed to cache message %s: %s" msgstr "缓存信件 %s 失败：%s" -#: camel/providers/imap/camel-imap-message-cache.c:417 +#: camel/providers/imap/camel-imap-message-cache.c:418 #, c-format msgid "Failed to cache %s: %s" msgstr "缓存 %s 失败：%s" -#: camel/providers/imap/camel-imap-provider.c:43 +#: camel/providers/imap/camel-imap-provider.c:44 msgid "Checking for New Mail" msgstr "检查新邮件" -#: camel/providers/imap/camel-imap-provider.c:48 +#: camel/providers/imap/camel-imap-provider.c:46 +#, fuzzy +msgid "C_heck for new messages in all folders" +msgstr "在所有文件夹中检查新信件" + +#: camel/providers/imap/camel-imap-provider.c:49 msgid "Connection to Server" msgstr "连接服务器" -#: camel/providers/imap/camel-imap-provider.c:50 -msgid "Use custom command to connect to server" +#: camel/providers/imap/camel-imap-provider.c:51 +#, fuzzy +msgid "_Use custom command to connect to server" msgstr "使用自定义命令连接到服务器" -#: camel/providers/imap/camel-imap-provider.c:52 +#: camel/providers/imap/camel-imap-provider.c:53 msgid "Command:" msgstr "命令：" -#: camel/providers/imap/camel-imap-provider.c:55 -#: camel/providers/imap4/camel-imap4-provider.c:40 -#: camel/providers/nntp/camel-nntp-provider.c:41 +#: camel/providers/imap/camel-imap-provider.c:56 +#: camel/providers/imap4/camel-imap4-provider.c:41 +#: camel/providers/nntp/camel-nntp-provider.c:42 msgid "Folders" msgstr "文件夹" -#: camel/providers/imap/camel-imap-provider.c:57 -#: camel/providers/imap4/camel-imap4-provider.c:42 -msgid "Show only subscribed folders" +#: camel/providers/imap/camel-imap-provider.c:58 +#, fuzzy +msgid "_Show only subscribed folders" msgstr "只显示订阅了的文件夹" -#: camel/providers/imap/camel-imap-provider.c:59 -#: camel/providers/imap4/camel-imap4-provider.c:44 -msgid "Override server-supplied folder namespace" +#: camel/providers/imap/camel-imap-provider.c:60 +#, fuzzy +msgid "O_verride server-supplied folder namespace" msgstr "覆盖服务器提供的文件夹命名空间" -#: camel/providers/imap/camel-imap-provider.c:61 -#: camel/providers/imap4/camel-imap4-provider.c:46 +#: camel/providers/imap/camel-imap-provider.c:62 +#: camel/providers/imap4/camel-imap4-provider.c:47 msgid "Namespace" msgstr "命名空间" -#: camel/providers/imap/camel-imap-provider.c:64 -msgid "Apply filters to new messages in INBOX on this server" +#: camel/providers/imap/camel-imap-provider.c:66 +#, fuzzy +msgid "_Apply filters to new messages in INBOX on this server" msgstr "应用过滤规则到本服务器上收件箱中的新信件" -#: camel/providers/imap/camel-imap-provider.c:76 +#: camel/providers/imap/camel-imap-provider.c:68 +#, fuzzy +msgid "Check new messages for _Junk contents" +msgstr "检查新信件的垃圾内容" + +#: camel/providers/imap/camel-imap-provider.c:70 +#, fuzzy +msgid "Only check for Junk messa_ges in the INBOX folder" +msgstr "仅在收件箱中检查垃圾邮件" + +#: camel/providers/imap/camel-imap-provider.c:72 +#, fuzzy +msgid "Automatically synchroni_ze remote mail locally" +msgstr "自动将远程邮件同步到本地" + +#: camel/providers/imap/camel-imap-provider.c:79 msgid "IMAP" msgstr "IMAP" -#: camel/providers/imap/camel-imap-provider.c:78 +#: camel/providers/imap/camel-imap-provider.c:81 msgid "For reading and storing mail on IMAP servers." msgstr "IMAP 服务器上的邮件的读写。" -#: camel/providers/imap/camel-imap-store.c:424 -#: camel/providers/imap4/camel-imap4-store.c:177 +#: camel/providers/imap/camel-imap-store.c:421 +#: camel/providers/imap4/camel-imap4-store.c:203 #, c-format msgid "IMAP server %s" msgstr "IMAP 服务器 %s" -#: camel/providers/imap/camel-imap-store.c:426 -#: camel/providers/imap4/camel-imap4-store.c:179 +#: camel/providers/imap/camel-imap-store.c:423 +#: camel/providers/imap4/camel-imap4-store.c:205 #, c-format msgid "IMAP service for %s on %s" msgstr "%2$s 为 %1$s 提供的 IMAP 服务" -#: camel/providers/imap/camel-imap-store.c:559 -#: camel/providers/imap/camel-imap-store.c:587 -#: camel/providers/imapp/camel-imapp-store.c:249 -#: camel/providers/nntp/camel-nntp-store.c:230 -#: camel/providers/pop3/camel-pop3-store.c:184 -#: camel/providers/smtp/camel-smtp-transport.c:278 -#: camel/providers/smtp/camel-smtp-transport.c:304 +#: camel/providers/imap/camel-imap-store.c:533 +#: camel/providers/imap/camel-imap-store.c:548 +#: camel/providers/imap4/camel-imap4-store.c:235 +#: camel/providers/imap4/camel-imap4-store.c:250 +#: camel/providers/nntp/camel-nntp-store.c:198 +#: camel/providers/nntp/camel-nntp-store.c:213 +#: camel/providers/pop3/camel-pop3-store.c:167 +#: camel/providers/pop3/camel-pop3-store.c:182 +#: camel/providers/smtp/camel-smtp-transport.c:255 +#: camel/providers/smtp/camel-smtp-transport.c:270 #, c-format -msgid "Could not connect to %s (port %s): %s" -msgstr "无法连接到 %s (端口 %s)：%s" +msgid "Could not connect to %s: %s" +msgstr "无法连接到 %s：%s" -#: camel/providers/imap/camel-imap-store.c:561 -#: camel/providers/imap4/camel-imap4-store.c:210 -#: camel/providers/pop3/camel-pop3-store.c:186 -#: camel/providers/smtp/camel-smtp-transport.c:280 +#: camel/providers/imap/camel-imap-store.c:534 +#: camel/providers/imap4/camel-imap4-store.c:236 +#: camel/providers/nntp/camel-nntp-store.c:199 +#: camel/providers/pop3/camel-pop3-store.c:168 +#: camel/providers/smtp/camel-smtp-transport.c:256 msgid "SSL unavailable" msgstr "SSL 不可用" -#: camel/providers/imap/camel-imap-store.c:584 -#: camel/providers/imap/camel-imap-store.c:861 -#: camel/providers/imap4/camel-imap4-store.c:221 -#: camel/providers/imapp/camel-imapp-store.c:246 -#: camel/providers/nntp/camel-nntp-store.c:227 -#: camel/providers/nntp/camel-nntp-store.c:245 -#: camel/providers/pop3/camel-pop3-store.c:210 +#: camel/providers/imap/camel-imap-store.c:545 +#: camel/providers/imap/camel-imap-store.c:808 +#: camel/providers/imap4/camel-imap4-store.c:247 +#: camel/providers/imapp/camel-imapp-store.c:248 +#: camel/providers/nntp/camel-nntp-store.c:210 +#: camel/providers/nntp/camel-nntp-store.c:229 +#: camel/providers/pop3/camel-pop3-store.c:179 +#: camel/providers/smtp/camel-smtp-transport.c:267 msgid "Connection cancelled" msgstr "连接已取消" -#: camel/providers/imap/camel-imap-store.c:695 -#: camel/providers/imap/camel-imap-store.c:726 -#: camel/providers/imap4/camel-imap4-store.c:246 -#: camel/providers/imap4/camel-imap4-store.c:259 +#: camel/providers/imap/camel-imap-store.c:652 +#: camel/providers/imap/camel-imap-store.c:674 +#: camel/providers/imap4/camel-imap4-store.c:274 +#: camel/providers/imap4/camel-imap4-store.c:287 #, c-format msgid "Failed to connect to IMAP server %s in secure mode: %s" msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s" -#: camel/providers/imap/camel-imap-store.c:696 -#: camel/providers/pop3/camel-pop3-store.c:251 -msgid "SSL/TLS extension not supported." +#: camel/providers/imap/camel-imap-store.c:653 +#: camel/providers/smtp/camel-smtp-transport.c:323 +#, fuzzy +msgid "STARTTLS not supported" msgstr "不支持 SSL/TLS 扩展。" -#: camel/providers/imap/camel-imap-store.c:727 -#: camel/providers/imap4/camel-imap4-store.c:247 -#: camel/providers/pop3/camel-pop3-store.c:292 +#: camel/providers/imap/camel-imap-store.c:675 +#: camel/providers/imap4/camel-imap4-store.c:275 +#: camel/providers/pop3/camel-pop3-store.c:243 msgid "SSL negotiations failed" msgstr "SSL 协商失败" -#: camel/providers/imap/camel-imap-store.c:864 +#: camel/providers/imap/camel-imap-store.c:811 #, c-format msgid "Could not connect with command \"%s\": %s" msgstr "无法使用命令“%s”连接：%s" -#: camel/providers/imap/camel-imap-store.c:1288 +#: camel/providers/imap/camel-imap-store.c:1245 #, c-format msgid "IMAP server %s does not support requested authentication type %s" msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s" -#: camel/providers/imap/camel-imap-store.c:1298 -#: camel/providers/smtp/camel-smtp-transport.c:505 +#: camel/providers/imap/camel-imap-store.c:1255 +#: camel/providers/smtp/camel-smtp-transport.c:489 #, c-format msgid "No support for authentication type %s" msgstr "不支持验证类型 %s" -#: camel/providers/imap/camel-imap-store.c:1321 -#: camel/providers/imapp/camel-imapp-store.c:362 +#: camel/providers/imap/camel-imap-store.c:1278 +#: camel/providers/imapp/camel-imapp-store.c:364 #, c-format msgid "%sPlease enter the IMAP password for %s@%s" msgstr "%s请为 %s@%s 输入 IMAP 密码" -#: camel/providers/imap/camel-imap-store.c:1335 +#: camel/providers/imap/camel-imap-store.c:1292 msgid "You didn't enter a password." msgstr "您没有输入密码。" -#: camel/providers/imap/camel-imap-store.c:1364 +#: camel/providers/imap/camel-imap-store.c:1321 #, c-format msgid "" "Unable to authenticate to IMAP server.\n" @@ -10325,265 +10528,350 @@ msgstr "" "%s\n" "\n" -#: camel/providers/imap/camel-imap-store.c:1883 -#: camel/providers/imap/camel-imap-store.c:2073 +#: camel/providers/imap/camel-imap-store.c:1843 +#: camel/providers/imap/camel-imap-store.c:2033 #, c-format msgid "No such folder %s" msgstr "没有文件夹 %s" -#: camel/providers/imap/camel-imap-store.c:1901 -#: camel/providers/imap/camel-imap-store.c:2279 -#: camel/providers/imap4/camel-imap4-store.c:745 +#: camel/providers/imap/camel-imap-store.c:1861 +#: camel/providers/imap/camel-imap-store.c:2239 +#: camel/providers/imap4/camel-imap4-store.c:759 #, c-format msgid "" "The folder name \"%s\" is invalid because it contains the character \"%c\"" msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”" -#: camel/providers/imap/camel-imap-store.c:1959 -#: camel/providers/imap/camel-imap-store.c:2340 +#: camel/providers/imap/camel-imap-store.c:1919 +#: camel/providers/imap/camel-imap-store.c:2300 msgid "The parent folder is not allowed to contain subfolders" msgstr "父文件夹不允许含有子文件夹" -#: camel/providers/imap/camel-imap-store.c:2014 -#: camel/providers/local/camel-maildir-store.c:139 -#: camel/providers/local/camel-mbox-store.c:209 -#: camel/providers/local/camel-mh-store.c:236 +#: camel/providers/imap/camel-imap-store.c:1974 +#: camel/providers/local/camel-maildir-store.c:140 +#: camel/providers/local/camel-mbox-store.c:210 +#: camel/providers/local/camel-mh-store.c:237 #, c-format msgid "Cannot create folder `%s': folder exists." msgstr "无法创建文件夹：%s：文件夹已存在。" -#: camel/providers/imap/camel-imap-store.c:2290 +#: camel/providers/imap/camel-imap-store.c:2250 #, c-format msgid "Unknown parent folder: %s" msgstr "未知的父文件夹：%s" -#: camel/providers/imap4/camel-imap4-command.c:550 -#: camel/providers/imap4/camel-imap4-command.c:557 +#: camel/providers/imap4/camel-imap4-command.c:551 +#: camel/providers/imap4/camel-imap4-command.c:558 #, c-format msgid "Failed sending command to IMAP server %s: %s" msgstr "向 IMAP 服务器 %s 发送命令失败：%s" -#: camel/providers/imap4/camel-imap4-command.c:656 +#: camel/providers/imap4/camel-imap4-command.c:661 #, c-format msgid "Unexpected response from IMAP4 server %s: %s" msgstr "来自 IMAP4 服务器 %s 的意外响应：%s" -#: camel/providers/imap4/camel-imap4-engine.c:230 +#: camel/providers/imap4/camel-imap4-engine.c:216 #, c-format msgid "Unexpected greeting from IMAP server %s." msgstr "来自 IMAP 服务器 %s 的意外应答。" -#: camel/providers/imap4/camel-imap4-engine.c:414 +#: camel/providers/imap4/camel-imap4-engine.c:410 #, c-format msgid "Cannot select folder `%s': Invalid mailbox name" msgstr "无法选择文件夹“%s”：无效的邮箱名" -#: camel/providers/imap4/camel-imap4-engine.c:420 +#: camel/providers/imap4/camel-imap4-engine.c:416 #, c-format msgid "Cannot select folder `%s': Bad command" msgstr "无法选择文件夹“%s”：无效的命令" -#: camel/providers/imap4/camel-imap4-engine.c:1401 -#: camel/providers/imap4/camel-imap4-engine.c:1431 -#: camel/providers/imap4/camel-imap4-engine.c:1463 -#: camel/providers/imap4/camel-imap4-engine.c:1505 +#: camel/providers/imap4/camel-imap4-engine.c:1464 +#: camel/providers/imap4/camel-imap4-engine.c:1503 +#: camel/providers/imap4/camel-imap4-engine.c:1548 +#: camel/providers/imap4/camel-imap4-engine.c:1604 #, c-format msgid "IMAP4 server %s unexpectedly disconnected: %s" msgstr "IMAP4 服务器 %s 意外断开连接：%s" #: camel/providers/imap4/camel-imap4-folder.c:359 +#, fuzzy, c-format +msgid "Cannot access folder `%s': %s" +msgstr "无法获取文件夹“%s”：%s" + +#: camel/providers/imap4/camel-imap4-folder.c:418 #, c-format msgid "Cannot sync flags to folder `%s': Unknown" msgstr "无法将标志与文件夹“%s”同步：未知" -#: camel/providers/imap4/camel-imap4-folder.c:365 +#: camel/providers/imap4/camel-imap4-folder.c:424 #, c-format msgid "Cannot sync flags to folder `%s': Bad command" msgstr "无法将标志与文件夹“%s”同步：无效的命令" -#: camel/providers/imap4/camel-imap4-folder.c:502 +#: camel/providers/imap4/camel-imap4-folder.c:565 #, c-format msgid "Cannot expunge folder `%s': Unknown" msgstr "无法销毁文件夹“%s”：未知" -#: camel/providers/imap4/camel-imap4-folder.c:507 +#: camel/providers/imap4/camel-imap4-folder.c:570 #, c-format msgid "Cannot expunge folder `%s': Bad command" msgstr "无法销毁文件夹“%s”：无效的命令" -#: camel/providers/imap4/camel-imap4-folder.c:697 +#: camel/providers/imap4/camel-imap4-folder.c:749 +#: camel/providers/nntp/camel-nntp-folder.c:157 +#: camel/providers/nntp/camel-nntp-folder.c:233 +#: camel/providers/nntp/camel-nntp-folder.c:372 +#: camel/providers/pop3/camel-pop3-folder.c:263 +#: camel/providers/pop3/camel-pop3-folder.c:431 +#: camel/providers/pop3/camel-pop3-folder.c:492 +#: camel/providers/pop3/camel-pop3-folder.c:510 +msgid "User cancelled" +msgstr "用户已取消" + +#: camel/providers/imap4/camel-imap4-folder.c:754 +#: camel/providers/nntp/camel-nntp-folder.c:148 +#: camel/providers/nntp/camel-nntp-folder.c:150 +#: camel/providers/nntp/camel-nntp-folder.c:159 +#: camel/providers/nntp/camel-nntp-folder.c:235 +#: camel/providers/pop3/camel-pop3-folder.c:434 +#: camel/providers/pop3/camel-pop3-folder.c:495 +#: camel/providers/pop3/camel-pop3-folder.c:502 +#: camel/providers/pop3/camel-pop3-folder.c:513 +#, c-format +msgid "Cannot get message %s: %s" +msgstr "无法获取信件 %s：%s" + +#: camel/providers/imap4/camel-imap4-folder.c:772 +#, fuzzy +msgid "This message is not available in offline mode." +msgstr "该信件目前不可用" + +#: camel/providers/imap4/camel-imap4-folder.c:826 #, c-format msgid "Cannot get message %s from folder `%s': No such message" msgstr "无法从文件夹“%2$s”获取信件 %1$s：没有这样的信件" -#: camel/providers/imap4/camel-imap4-folder.c:702 +#: camel/providers/imap4/camel-imap4-folder.c:831 #, c-format msgid "Cannot get message %s from folder `%s': Bad command" msgstr "无法从文件夹“%2$s”获取信件 %1$s：命令无效" -#: camel/providers/imap4/camel-imap4-folder.c:827 +#: camel/providers/imap4/camel-imap4-folder.c:873 +#, fuzzy +msgid "Cannot append messages to IMAP folders in offline mode." +msgstr "无法将信件追加到文件夹“%s”：未知错误" + +#: camel/providers/imap4/camel-imap4-folder.c:966 #, c-format msgid "Cannot append message to folder `%s': Unknown error" msgstr "无法将信件追加到文件夹“%s”：未知错误" -#: camel/providers/imap4/camel-imap4-folder.c:856 +#: camel/providers/imap4/camel-imap4-folder.c:995 #, c-format msgid "Cannot append message to folder `%s': Bad command" msgstr "无法将信件追加到文件夹“%s”：无效的命令" -#: camel/providers/imap4/camel-imap4-folder.c:935 +#: camel/providers/imap4/camel-imap4-folder.c:1038 +#, fuzzy +msgid "Cannot move messages to or from IMAP folders in offline mode." +msgstr "无法将信件从文件夹“%s”移动到文件夹“%s”：未知" + +#: camel/providers/imap4/camel-imap4-folder.c:1041 +#, fuzzy +msgid "Cannot copy messages to or from IMAP folders in offline mode." +msgstr "无法将信件从文件夹“%s”复制到文件夹“%s”：未知" + +#: camel/providers/imap4/camel-imap4-folder.c:1086 #, c-format msgid "Cannot move messages from folder `%s' to folder `%s': Unknown" msgstr "无法将信件从文件夹“%s”移动到文件夹“%s”：未知" -#: camel/providers/imap4/camel-imap4-folder.c:939 +#: camel/providers/imap4/camel-imap4-folder.c:1090 #, c-format msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown" msgstr "无法将信件从文件夹“%s”复制到文件夹“%s”：未知" -#: camel/providers/imap4/camel-imap4-folder.c:947 +#: camel/providers/imap4/camel-imap4-folder.c:1098 #, c-format msgid "Cannot move messages from folder `%s' to folder `%s': Bad command" msgstr "无法将信件从文件夹“%s”移动到文件夹“%s”：无效的命令" -#: camel/providers/imap4/camel-imap4-folder.c:951 +#: camel/providers/imap4/camel-imap4-folder.c:1102 #, c-format msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command" msgstr "无法将信件从文件夹“%s”复制到文件夹“%s”：无效的命令" -#: camel/providers/imap4/camel-imap4-provider.c:53 +#: camel/providers/imap4/camel-imap4-provider.c:43 +msgid "Show only subscribed folders" +msgstr "只显示订阅了的文件夹" + +#: camel/providers/imap4/camel-imap4-provider.c:45 +msgid "Override server-supplied folder namespace" +msgstr "覆盖服务器提供的文件夹命名空间" + +#: camel/providers/imap4/camel-imap4-provider.c:51 +msgid "Apply filters to new messages in INBOX on this server" +msgstr "应用过滤规则到本服务器上收件箱中的新信件" + +#: camel/providers/imap4/camel-imap4-provider.c:57 +msgid "Automatically synchronize remote mail locally" +msgstr "自动将远程邮件同步到本地" + +#: camel/providers/imap4/camel-imap4-provider.c:64 msgid "IMAPv4rev1" msgstr "IMAPv4rev1" -#: camel/providers/imap4/camel-imap4-provider.c:55 +#: camel/providers/imap4/camel-imap4-provider.c:66 msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!" msgstr "IMAPv4rev1 服务器上的邮件的读写。试验性！" -#: camel/providers/imap4/camel-imap4-provider.c:72 +#: camel/providers/imap4/camel-imap4-provider.c:83 msgid "" "This option will connect to the IMAPv4rev1 server using a plaintext password." msgstr "该选项将使用纯文本密码连接到 IMAPv4rev1 服务器。" -#: camel/providers/imap4/camel-imap4-store.c:209 -#: camel/providers/imap4/camel-imap4-store.c:224 -#, c-format -msgid "Could not connect to %s: %s" -msgstr "无法连接到 %s：%s" - -#: camel/providers/imap4/camel-imap4-store.c:344 +#: camel/providers/imap4/camel-imap4-store.c:378 #, c-format msgid "" "Cannot authenticate to IMAP server %s using the %s authentication mechanism" msgstr "无法使用 %2$s 身份验证算法对 IMAP 服务器 %1$s 进行身份验证" -#: camel/providers/imap4/camel-imap4-store.c:389 +#: camel/providers/imap4/camel-imap4-store.c:423 #, c-format msgid "%sPlease enter the IMAP password for %s on host %s" msgstr "%s请输入 %s@%s 的 IMAP 密码" -#: camel/providers/imap4/camel-imap4-store.c:459 +#: camel/providers/imap4/camel-imap4-store.c:493 #, c-format msgid "Cannot authenticate to IMAP server %s using %s" msgstr "无法使用 %2$s 认证到 IMAP 服务器 %1$s" -#: camel/providers/imap4/camel-imap4-store.c:682 +#: camel/providers/imap4/camel-imap4-store.c:656 +#: camel/providers/imap4/camel-imap4-store.c:769 +#, fuzzy +msgid "Cannot create IMAP folders in offline mode." +msgstr "无法以此名称创建文件夹。" + +#: camel/providers/imap4/camel-imap4-store.c:695 #, c-format msgid "Cannot get folder `%s' on IMAP server %s: Unknown" msgstr "无法获取 IMAP 服务器 %2$s 上的文件夹 %1$s：未知" -#: camel/providers/imap4/camel-imap4-store.c:796 +#: camel/providers/imap4/camel-imap4-store.c:817 #, c-format msgid "Cannot create folder `%s': Invalid mailbox name" msgstr "无法创建文件夹“%s”：无效的邮箱名" -#: camel/providers/imap4/camel-imap4-store.c:802 +#: camel/providers/imap4/camel-imap4-store.c:823 #, c-format msgid "Cannot create folder `%s': Bad command" msgstr "无法创建文件夹“%s”：无效的命令" -#: camel/providers/imap4/camel-imap4-store.c:833 +#: camel/providers/imap4/camel-imap4-store.c:855 #, c-format msgid "Cannot delete folder `%s': Special folder" msgstr "无法删除文件夹“%s”：特殊文件夹" -#: camel/providers/imap4/camel-imap4-store.c:892 +#: camel/providers/imap4/camel-imap4-store.c:862 +#, fuzzy +msgid "Cannot delete IMAP folders in offline mode." +msgstr "无法删除文件夹“%s”：特殊文件夹" + +#: camel/providers/imap4/camel-imap4-store.c:921 #, c-format msgid "Cannot delete folder `%s': Invalid mailbox name" msgstr "无法删除文件夹“%s”：无效的邮箱名" -#: camel/providers/imap4/camel-imap4-store.c:897 +#: camel/providers/imap4/camel-imap4-store.c:926 #, c-format msgid "Cannot delete folder `%s': Bad command" msgstr "无法删除文件夹“%s”：无效的命令" -#: camel/providers/imap4/camel-imap4-store.c:917 +#: camel/providers/imap4/camel-imap4-store.c:947 #, c-format msgid "Cannot rename folder `%s' to `%s': Special folder" msgstr "无法将文件夹“%s”重命名为“%s”：特殊文件夹" -#: camel/providers/imap4/camel-imap4-store.c:949 +#: camel/providers/imap4/camel-imap4-store.c:954 +#, fuzzy +msgid "Cannot rename IMAP folders in offline mode." +msgstr "您无法在新闻存储中重命名文件夹。" + +#: camel/providers/imap4/camel-imap4-store.c:985 #, c-format msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name" msgstr "无法将文件夹“%s”重命名为“%s”：无效的邮箱名" -#: camel/providers/imap4/camel-imap4-store.c:954 +#: camel/providers/imap4/camel-imap4-store.c:990 #, c-format msgid "Cannot rename folder `%s' to `%s': Bad command" msgstr "无法将文件夹“%s”重命名为“%s”：无效的命令" -#: camel/providers/imap4/camel-imap4-store.c:1202 +#: camel/providers/imap4/camel-imap4-store.c:1239 #, c-format msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s" msgstr "无法在 IMAP 服务器 %3$s 上为模式“%2$s”获取 %1$s 信息：%4$s" -#: camel/providers/imap4/camel-imap4-store.c:1204 +#: camel/providers/imap4/camel-imap4-store.c:1241 msgid "Bad command" msgstr "无效命令" #: camel/providers/imap4/camel-imap4-store.c:1280 +#, fuzzy +msgid "Cannot subscribe to IMAP folders in offline mode." +msgstr "无法订阅文件夹“%s”：无效的命令" + +#: camel/providers/imap4/camel-imap4-store.c:1325 #, c-format msgid "Cannot subscribe to folder `%s': Invalid mailbox name" msgstr "无法订阅文件夹“%s”：无效的邮箱名" -#: camel/providers/imap4/camel-imap4-store.c:1285 +#: camel/providers/imap4/camel-imap4-store.c:1330 #, c-format msgid "Cannot subscribe to folder `%s': Bad command" msgstr "无法订阅文件夹“%s”：无效的命令" -#: camel/providers/imap4/camel-imap4-store.c:1345 +#: camel/providers/imap4/camel-imap4-store.c:1353 +#, fuzzy +msgid "Cannot unsubscribe from IMAP folders in offline mode." +msgstr "无法退订文件夹“%s”：无效的命令" + +#: camel/providers/imap4/camel-imap4-store.c:1398 #, c-format msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name" msgstr "无法退订文件夹“%s”：无效的邮箱名" -#: camel/providers/imap4/camel-imap4-store.c:1350 +#: camel/providers/imap4/camel-imap4-store.c:1403 #, c-format msgid "Cannot unsubscribe from folder `%s': Bad command" msgstr "无法退订文件夹“%s”：无效的命令" -#: camel/providers/imap4/camel-imap4-utils.c:250 +#: camel/providers/imap4/camel-imap4-utils.c:368 #, c-format msgid "Unexpected token in response from IMAP server %s: " msgstr "来自 IMAP4 服务器 %s 的意外响应：" -#: camel/providers/imap4/camel-imap4-utils.c:273 +#: camel/providers/imap4/camel-imap4-utils.c:391 msgid "No data" msgstr "无数据" -#: camel/providers/imap4/camel-imap4-utils.c:456 +#: camel/providers/imap4/camel-imap4-utils.c:574 #, c-format msgid "IMAP server %s unexpectedly disconnected: %s" msgstr "IMAP4 服务器 %s 意外断开连接：%s" -#: camel/providers/imapp/camel-imapp-provider.c:39 -#: camel/providers/pop3/camel-pop3-provider.c:38 +#: camel/providers/imapp/camel-imapp-provider.c:40 +#: camel/providers/pop3/camel-pop3-provider.c:39 msgid "Message storage" msgstr "信件存储" -#: camel/providers/imapp/camel-imapp-provider.c:47 +#: camel/providers/imapp/camel-imapp-provider.c:48 msgid "IMAP+" msgstr "IMAP+" -#: camel/providers/imapp/camel-imapp-provider.c:49 +#: camel/providers/imapp/camel-imapp-provider.c:50 msgid "" "Experimental IMAP 4(.1) client\n" "This is untested and unsupported code, you want to use plain imap instead.\n" @@ -10595,7 +10883,12 @@ msgstr "" "\n" " !!! 不要对日常邮件使用此功能 !!!\n" -#: camel/providers/imapp/camel-imapp-store.c:346 +#: camel/providers/imapp/camel-imapp-store.c:251 +#, c-format +msgid "Could not connect to %s (port %s): %s" +msgstr "无法连接到 %s (端口 %s)：%s" + +#: camel/providers/imapp/camel-imapp-store.c:348 #, c-format msgid "Could not connect to POP server on %s" msgstr "无法连接到 %s 上的 POP 服务器" @@ -10623,23 +10916,23 @@ msgstr "邮件箱：%s (%s)" msgid "%s (%s)" msgstr "%s (%s)" -#: camel/providers/local/camel-local-provider.c:43 +#: camel/providers/local/camel-local-provider.c:45 msgid "Use the `.folders' folder summary file (exmh)" msgstr "使用“.folders”文件夹概览文件(exmh)" -#: camel/providers/local/camel-local-provider.c:49 +#: camel/providers/local/camel-local-provider.c:52 msgid "MH-format mail directories" msgstr "MH-格式的邮件目录" -#: camel/providers/local/camel-local-provider.c:50 +#: camel/providers/local/camel-local-provider.c:53 msgid "For storing local mail in MH-like mail directories." msgstr "在类似于 MH 的邮件目录中存储本地邮件。" -#: camel/providers/local/camel-local-provider.c:65 +#: camel/providers/local/camel-local-provider.c:68 msgid "Local delivery" msgstr "本地发送" -#: camel/providers/local/camel-local-provider.c:66 +#: camel/providers/local/camel-local-provider.c:69 msgid "" "For retrieving (moving) local mail from standard mbox formated spools into " "folders managed by Evolution." @@ -10647,28 +10940,28 @@ msgstr "" "对于将本地邮件从标准 mbox 格式脱机文件夹获取(移动)到由 Evolution 管理的文件" "夹。" -#: camel/providers/local/camel-local-provider.c:77 -#: camel/providers/local/camel-local-provider.c:94 +#: camel/providers/local/camel-local-provider.c:81 +#: camel/providers/local/camel-local-provider.c:100 msgid "Apply filters to new messages in INBOX" msgstr "将过滤规则应用到收件箱中的新信件" -#: camel/providers/local/camel-local-provider.c:83 +#: camel/providers/local/camel-local-provider.c:88 msgid "Maildir-format mail directories" msgstr "Maildir 格式的邮件目录" -#: camel/providers/local/camel-local-provider.c:84 +#: camel/providers/local/camel-local-provider.c:89 msgid "For storing local mail in maildir directories." msgstr "在 maildir 邮件目录中存储本地邮件。" -#: camel/providers/local/camel-local-provider.c:95 +#: camel/providers/local/camel-local-provider.c:101 msgid "Store status headers in Elm/Pine/Mutt format" msgstr "以 Elm/Pine/Mutt 格式存储状态头" -#: camel/providers/local/camel-local-provider.c:101 +#: camel/providers/local/camel-local-provider.c:108 msgid "Standard Unix mbox spool or directory" msgstr "标准 Unix mbox 脱机或目录" -#: camel/providers/local/camel-local-provider.c:102 +#: camel/providers/local/camel-local-provider.c:109 msgid "" "For reading and storing local mail in external standard mbox spool files.\n" "May also be used to read a tree of Elm, Pine, or Mutt style folders." @@ -10676,64 +10969,64 @@ msgstr "" "对于读取和存储外部标准 mbox 脱机文件中的本地邮件。\n" "也可用于读取 Elm、Pine 或 Mutt 风格的文件夹树。" -#: camel/providers/local/camel-local-store.c:142 -#: camel/providers/local/camel-local-store.c:253 -#: camel/providers/local/camel-mbox-store.c:352 -#: camel/providers/local/camel-spool-store.c:116 +#: camel/providers/local/camel-local-store.c:143 +#: camel/providers/local/camel-local-store.c:254 +#: camel/providers/local/camel-mbox-store.c:353 +#: camel/providers/local/camel-spool-store.c:117 #, c-format msgid "Store root %s is not an absolute path" msgstr "存储根目录 %s 不是绝对路径" -#: camel/providers/local/camel-local-store.c:149 +#: camel/providers/local/camel-local-store.c:150 #, c-format msgid "Store root %s is not a regular directory" msgstr "存储根目录 %s 不是普通目录" -#: camel/providers/local/camel-local-store.c:158 -#: camel/providers/local/camel-local-store.c:166 -#: camel/providers/local/camel-local-store.c:264 +#: camel/providers/local/camel-local-store.c:159 +#: camel/providers/local/camel-local-store.c:167 +#: camel/providers/local/camel-local-store.c:265 #, c-format msgid "Cannot get folder: %s: %s" msgstr "无法获取文件夹：%s：%s" -#: camel/providers/local/camel-local-store.c:178 +#: camel/providers/local/camel-local-store.c:179 msgid "Local stores do not have an inbox" msgstr "本地存储没有收件箱" -#: camel/providers/local/camel-local-store.c:224 +#: camel/providers/local/camel-local-store.c:225 #, c-format msgid "Local mail file %s" msgstr "本地邮件文件 %s" -#: camel/providers/local/camel-local-store.c:333 +#: camel/providers/local/camel-local-store.c:334 #, c-format msgid "Could not rename folder %s to %s: %s" msgstr "无法将文件夹 %s 改名为 %s：%s" -#: camel/providers/local/camel-local-store.c:398 +#: camel/providers/local/camel-local-store.c:399 #, c-format msgid "Could not rename '%s': %s" msgstr "无法重命名“%s”：%s" -#: camel/providers/local/camel-local-store.c:423 -#: camel/providers/local/camel-mbox-store.c:281 +#: camel/providers/local/camel-local-store.c:424 +#: camel/providers/local/camel-mbox-store.c:282 #, c-format msgid "Could not delete folder summary file `%s': %s" msgstr "无法删除文件夹概要文件“%s”：%s" -#: camel/providers/local/camel-local-store.c:433 -#: camel/providers/local/camel-mbox-store.c:293 +#: camel/providers/local/camel-local-store.c:434 +#: camel/providers/local/camel-mbox-store.c:294 #, c-format msgid "Could not delete folder index file `%s': %s" msgstr "无法删除文件夹索引文件“%s”：%s" -#: camel/providers/local/camel-local-store.c:456 -#: camel/providers/local/camel-mbox-store.c:317 +#: camel/providers/local/camel-local-store.c:457 +#: camel/providers/local/camel-mbox-store.c:318 #, c-format msgid "Could not delete folder meta file `%s': %s" msgstr "无法删除文件夹元文件“%s”：%s" -#: camel/providers/local/camel-local-summary.c:405 +#: camel/providers/local/camel-local-summary.c:406 #, c-format msgid "Could not save summary: %s: %s" msgstr "无法保存概要：%s：%s" @@ -10744,34 +11037,34 @@ msgstr "无法将信件添加到概要中：未知的原因" #. Inbox is always first #. translators: standard local mailbox names -#: camel/providers/local/camel-maildir-folder.c:74 -#: camel/providers/local/camel-maildir-store.c:232 -#: camel/providers/local/camel-maildir-store.c:248 -#: camel/providers/local/camel-spool-store.c:451 +#: camel/providers/local/camel-maildir-folder.c:75 +#: camel/providers/local/camel-maildir-store.c:233 +#: camel/providers/local/camel-maildir-store.c:249 +#: camel/providers/local/camel-spool-store.c:452 #: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214 -#: mail/mail-component.c:134 +#: mail/mail-component.c:138 msgid "Inbox" msgstr "收件箱" -#: camel/providers/local/camel-maildir-folder.c:214 +#: camel/providers/local/camel-maildir-folder.c:215 msgid "Maildir append message cancelled" msgstr "邮件目录附加已放弃" -#: camel/providers/local/camel-maildir-folder.c:217 +#: camel/providers/local/camel-maildir-folder.c:218 #, c-format msgid "Cannot append message to maildir folder: %s: %s" msgstr "无法将信件附加到邮件目录文件夹：%s：%s" -#: camel/providers/local/camel-maildir-folder.c:243 -#: camel/providers/local/camel-maildir-folder.c:257 -#: camel/providers/local/camel-maildir-folder.c:266 -#: camel/providers/local/camel-mbox-folder.c:414 -#: camel/providers/local/camel-mbox-folder.c:433 -#: camel/providers/local/camel-mbox-folder.c:464 -#: camel/providers/local/camel-mbox-folder.c:472 -#: camel/providers/local/camel-mh-folder.c:201 -#: camel/providers/local/camel-mh-folder.c:212 -#: camel/providers/local/camel-mh-folder.c:221 +#: camel/providers/local/camel-maildir-folder.c:244 +#: camel/providers/local/camel-maildir-folder.c:258 +#: camel/providers/local/camel-maildir-folder.c:267 +#: camel/providers/local/camel-mbox-folder.c:402 +#: camel/providers/local/camel-mbox-folder.c:421 +#: camel/providers/local/camel-mbox-folder.c:452 +#: camel/providers/local/camel-mbox-folder.c:460 +#: camel/providers/local/camel-mh-folder.c:202 +#: camel/providers/local/camel-mh-folder.c:213 +#: camel/providers/local/camel-mh-folder.c:222 #, c-format msgid "" "Cannot get message: %s from folder %s\n" @@ -10780,118 +11073,118 @@ msgstr "" "无法从文件夹 %2$s 获取信件：%1$s\n" " %3$s" -#: camel/providers/local/camel-maildir-folder.c:267 +#: camel/providers/local/camel-maildir-folder.c:268 msgid "Invalid message contents" msgstr "无效的信件内容" -#: camel/providers/local/camel-maildir-store.c:109 -#: camel/providers/local/camel-mbox-store.c:151 -#: camel/providers/local/camel-mh-store.c:204 +#: camel/providers/local/camel-maildir-store.c:110 +#: camel/providers/local/camel-mbox-store.c:152 +#: camel/providers/local/camel-mh-store.c:205 #, c-format msgid "Cannot get folder `%s': %s" msgstr "无法获取文件夹“%s”：%s" -#: camel/providers/local/camel-maildir-store.c:113 -#: camel/providers/local/camel-mbox-store.c:159 -#: camel/providers/local/camel-mh-store.c:211 +#: camel/providers/local/camel-maildir-store.c:114 +#: camel/providers/local/camel-mbox-store.c:160 +#: camel/providers/local/camel-mh-store.c:212 #, c-format msgid "Cannot get folder `%s': folder does not exist." msgstr "无法获得文件夹“%s”：文件夹不存在。" -#: camel/providers/local/camel-maildir-store.c:121 -#: camel/providers/local/camel-mbox-store.c:181 -#: camel/providers/local/camel-mbox-store.c:193 +#: camel/providers/local/camel-maildir-store.c:122 +#: camel/providers/local/camel-mbox-store.c:182 +#: camel/providers/local/camel-mbox-store.c:194 #, c-format msgid "Cannot create folder `%s': %s" msgstr "无法创建文件夹“%s”：%s" -#: camel/providers/local/camel-maildir-store.c:136 +#: camel/providers/local/camel-maildir-store.c:137 #, c-format msgid "Cannot get folder `%s': not a maildir directory." msgstr "无法获取文件夹“%s”：不是 maildir 目录。" -#: camel/providers/local/camel-maildir-store.c:175 -#: camel/providers/local/camel-maildir-store.c:213 -#: camel/providers/local/camel-mh-store.c:260 +#: camel/providers/local/camel-maildir-store.c:176 +#: camel/providers/local/camel-maildir-store.c:214 +#: camel/providers/local/camel-mh-store.c:261 #, c-format msgid "Could not delete folder `%s': %s" msgstr "无法删除文件夹“%s”：%s" -#: camel/providers/local/camel-maildir-store.c:177 +#: camel/providers/local/camel-maildir-store.c:178 msgid "not a maildir directory" msgstr "不是 maildir 目录" -#: camel/providers/local/camel-maildir-store.c:355 -#: camel/providers/local/camel-spool-store.c:318 -#: camel/providers/local/camel-spool-store.c:332 +#: camel/providers/local/camel-maildir-store.c:356 +#: camel/providers/local/camel-spool-store.c:319 +#: camel/providers/local/camel-spool-store.c:333 #, c-format msgid "Could not scan folder `%s': %s" msgstr "无法扫描文件夹“%s”：%s" -#: camel/providers/local/camel-maildir-summary.c:419 -#: camel/providers/local/camel-maildir-summary.c:550 +#: camel/providers/local/camel-maildir-summary.c:425 +#: camel/providers/local/camel-maildir-summary.c:556 #, c-format msgid "Cannot open maildir directory path: %s: %s" msgstr "无法打开邮件目录路径：%s：%s" -#: camel/providers/local/camel-maildir-summary.c:543 +#: camel/providers/local/camel-maildir-summary.c:549 msgid "Checking folder consistency" msgstr "检查文件夹一致性" -#: camel/providers/local/camel-maildir-summary.c:646 +#: camel/providers/local/camel-maildir-summary.c:652 msgid "Checking for new messages" msgstr "检查新信件" -#: camel/providers/local/camel-maildir-summary.c:735 -#: camel/providers/local/camel-mbox-summary.c:369 -#: camel/providers/local/camel-mbox-summary.c:542 -#: camel/providers/local/camel-mbox-summary.c:633 -#: camel/providers/local/camel-spool-summary.c:137 +#: camel/providers/local/camel-maildir-summary.c:741 +#: camel/providers/local/camel-mbox-summary.c:416 +#: camel/providers/local/camel-mbox-summary.c:589 +#: camel/providers/local/camel-mbox-summary.c:680 +#: camel/providers/local/camel-spool-summary.c:140 msgid "Storing folder" msgstr "存储文件夹" -#: camel/providers/local/camel-mbox-folder.c:222 +#: camel/providers/local/camel-mbox-folder.c:210 #: camel/providers/local/camel-spool-folder.c:176 #, c-format msgid "Cannot create folder lock on %s: %s" msgstr "无法在 %s 创建文件夹锁：%s" -#: camel/providers/local/camel-mbox-folder.c:281 +#: camel/providers/local/camel-mbox-folder.c:269 #, c-format msgid "Cannot open mailbox: %s: %s\n" msgstr "无法打开邮件箱：%s：%s\n" -#: camel/providers/local/camel-mbox-folder.c:341 +#: camel/providers/local/camel-mbox-folder.c:329 msgid "Mail append cancelled" msgstr "邮件追加取消" -#: camel/providers/local/camel-mbox-folder.c:344 +#: camel/providers/local/camel-mbox-folder.c:332 #, c-format msgid "Cannot append message to mbox file: %s: %s" msgstr "无法将信件附加到邮件箱文件：%s：%s" -#: camel/providers/local/camel-mbox-folder.c:465 +#: camel/providers/local/camel-mbox-folder.c:453 msgid "The folder appears to be irrecoverably corrupted." msgstr "文件夹好像已经被不可恢复地破坏了。" -#: camel/providers/local/camel-mbox-folder.c:473 -#: camel/providers/local/camel-mh-folder.c:222 +#: camel/providers/local/camel-mbox-folder.c:461 +#: camel/providers/local/camel-mh-folder.c:223 msgid "Message construction failed." msgstr "信件构建失败。" -#: camel/providers/local/camel-mbox-store.c:173 -#: camel/providers/local/camel-mbox-store.c:358 +#: camel/providers/local/camel-mbox-store.c:174 +#: camel/providers/local/camel-mbox-store.c:359 msgid "Cannot create a folder by this name." msgstr "无法以此名称创建文件夹。" -#: camel/providers/local/camel-mbox-store.c:203 +#: camel/providers/local/camel-mbox-store.c:204 #, c-format msgid "Cannot get folder `%s': not a regular file." msgstr "无法获取文件夹“%s”：不是普通文件" -#: camel/providers/local/camel-mbox-store.c:233 -#: camel/providers/local/camel-mbox-store.c:244 -#: camel/providers/local/camel-mbox-store.c:267 +#: camel/providers/local/camel-mbox-store.c:234 +#: camel/providers/local/camel-mbox-store.c:245 +#: camel/providers/local/camel-mbox-store.c:268 #, c-format msgid "" "Could not delete folder `%s':\n" @@ -10900,157 +11193,157 @@ msgstr "" "无法删除文件夹“%s”：\n" "%s" -#: camel/providers/local/camel-mbox-store.c:252 +#: camel/providers/local/camel-mbox-store.c:253 #, c-format msgid "`%s' is not a regular file." msgstr "“%s”并不是普通文件。" -#: camel/providers/local/camel-mbox-store.c:259 +#: camel/providers/local/camel-mbox-store.c:260 #, c-format msgid "Folder `%s' is not empty. Not deleted." msgstr "文件夹“%s”非空。没有删除。" -#: camel/providers/local/camel-mbox-store.c:371 +#: camel/providers/local/camel-mbox-store.c:372 #, c-format msgid "Cannot create directory `%s': %s." msgstr "无法创建目录“%s”：%s" -#: camel/providers/local/camel-mbox-store.c:385 +#: camel/providers/local/camel-mbox-store.c:386 #, c-format msgid "Cannot create folder: %s: %s" msgstr "无法创建文件夹：%s：%s" -#: camel/providers/local/camel-mbox-store.c:387 +#: camel/providers/local/camel-mbox-store.c:388 msgid "Folder already exists" msgstr "文件夹已经存在" -#: camel/providers/local/camel-mbox-store.c:469 +#: camel/providers/local/camel-mbox-store.c:470 msgid "The new folder name is illegal." msgstr "指定的文件夹名称不合法。" -#: camel/providers/local/camel-mbox-store.c:482 +#: camel/providers/local/camel-mbox-store.c:483 #, c-format msgid "Could not rename `%s': `%s': %s" msgstr "无法重命名“%s”：“%s”：%s" -#: camel/providers/local/camel-mbox-store.c:557 +#: camel/providers/local/camel-mbox-store.c:558 #, c-format msgid "Could not rename '%s' to %s: %s" msgstr "无法将“%s”重命名为 %s：%s" -#: camel/providers/local/camel-mbox-summary.c:375 +#: camel/providers/local/camel-mbox-summary.c:422 #, c-format msgid "Could not open folder: %s: %s" msgstr "无法打开文件夹：%s：%s" -#: camel/providers/local/camel-mbox-summary.c:423 +#: camel/providers/local/camel-mbox-summary.c:470 #, c-format msgid "Fatal mail parser error near position %ld in folder %s" msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误" -#: camel/providers/local/camel-mbox-summary.c:479 +#: camel/providers/local/camel-mbox-summary.c:526 #, c-format msgid "Cannot check folder: %s: %s" msgstr "无法检查文件夹：%s：%s" -#: camel/providers/local/camel-mbox-summary.c:547 -#: camel/providers/local/camel-mbox-summary.c:638 -#: camel/providers/local/camel-spool-summary.c:142 +#: camel/providers/local/camel-mbox-summary.c:594 +#: camel/providers/local/camel-mbox-summary.c:685 +#: camel/providers/local/camel-spool-summary.c:145 #, c-format msgid "Could not open file: %s: %s" msgstr "无法打开文件：%s：%s" -#: camel/providers/local/camel-mbox-summary.c:559 -#: camel/providers/local/camel-spool-summary.c:162 +#: camel/providers/local/camel-mbox-summary.c:606 +#: camel/providers/local/camel-spool-summary.c:165 #, c-format msgid "Cannot open temporary mailbox: %s" msgstr "无法打开临时邮件箱：%s" -#: camel/providers/local/camel-mbox-summary.c:572 -#: camel/providers/local/camel-mbox-summary.c:736 +#: camel/providers/local/camel-mbox-summary.c:619 +#: camel/providers/local/camel-mbox-summary.c:783 #, c-format msgid "Could not close source folder %s: %s" msgstr "无法关闭来源文件夹 %s：%s" -#: camel/providers/local/camel-mbox-summary.c:581 +#: camel/providers/local/camel-mbox-summary.c:628 #, c-format msgid "Could not close temp folder: %s" msgstr "无法关闭临时文件夹：%s" -#: camel/providers/local/camel-mbox-summary.c:592 +#: camel/providers/local/camel-mbox-summary.c:639 #, c-format msgid "Could not rename folder: %s" msgstr "无法重命名文件夹：%s" -#: camel/providers/local/camel-mbox-summary.c:676 -#: camel/providers/local/camel-mbox-summary.c:684 -#: camel/providers/local/camel-mbox-summary.c:877 -#: camel/providers/local/camel-mbox-summary.c:885 +#: camel/providers/local/camel-mbox-summary.c:723 +#: camel/providers/local/camel-mbox-summary.c:731 +#: camel/providers/local/camel-mbox-summary.c:925 +#: camel/providers/local/camel-mbox-summary.c:933 msgid "Summary and folder mismatch, even after a sync" msgstr "即使同步后，概要和文件夹仍然不匹配" -#: camel/providers/local/camel-mbox-summary.c:811 -#: camel/providers/local/camel-spool-summary.c:334 +#: camel/providers/local/camel-mbox-summary.c:859 +#: camel/providers/local/camel-spool-summary.c:337 #, c-format msgid "Unknown error: %s" msgstr "未知的错误：%s" -#: camel/providers/local/camel-mbox-summary.c:846 +#: camel/providers/local/camel-mbox-summary.c:894 #, c-format msgid "Could not store folder: %s" msgstr "无法存储文件夹：%s" -#: camel/providers/local/camel-mbox-summary.c:940 -#: camel/providers/local/camel-mbox-summary.c:966 +#: camel/providers/local/camel-mbox-summary.c:988 +#: camel/providers/local/camel-mbox-summary.c:1014 #, c-format msgid "Error writing to temp mailbox: %s" msgstr "写入临时文件夹错误：%s" -#: camel/providers/local/camel-mbox-summary.c:957 +#: camel/providers/local/camel-mbox-summary.c:1005 #, c-format msgid "Writing to tmp mailbox failed: %s: %s" msgstr "写入临时文件夹失败：%s：%s" -#: camel/providers/local/camel-mh-folder.c:174 +#: camel/providers/local/camel-mh-folder.c:175 msgid "MH append message cancelled" msgstr "已取消 MH 附件信件" -#: camel/providers/local/camel-mh-folder.c:177 +#: camel/providers/local/camel-mh-folder.c:178 #, c-format msgid "Cannot append message to mh folder: %s: %s" msgstr "无法将信件附加到 mh 文件夹：%s：%s" -#: camel/providers/local/camel-mh-store.c:219 +#: camel/providers/local/camel-mh-store.c:220 #, c-format msgid "Could not create folder `%s': %s" msgstr "无法创建文件夹“%s”：%s" -#: camel/providers/local/camel-mh-store.c:231 +#: camel/providers/local/camel-mh-store.c:232 #, c-format msgid "Cannot get folder `%s': not a directory." msgstr "无法获取文件夹“%s”：不是目录。" -#: camel/providers/local/camel-mh-summary.c:244 +#: camel/providers/local/camel-mh-summary.c:247 #, c-format msgid "Cannot open MH directory path: %s: %s" msgstr "无法打开 MH 目录：%s：%s" -#: camel/providers/local/camel-spool-store.c:122 +#: camel/providers/local/camel-spool-store.c:123 #, c-format msgid "Spool `%s' cannot be opened: %s" msgstr "无法打开脱机文件“%s”：%s" -#: camel/providers/local/camel-spool-store.c:134 +#: camel/providers/local/camel-spool-store.c:135 #, c-format msgid "Spool `%s' is not a regular file or directory" msgstr "脱机文件“%s”不是普通文件或目录" -#: camel/providers/local/camel-spool-store.c:153 +#: camel/providers/local/camel-spool-store.c:154 #, c-format msgid "Folder `%s/%s' does not exist." msgstr "文件夹“%s/%s”不存在。" -#: camel/providers/local/camel-spool-store.c:163 +#: camel/providers/local/camel-spool-store.c:164 #, c-format msgid "" "Could not open folder `%s':\n" @@ -11059,12 +11352,12 @@ msgstr "" "无法打开文件夹“%s”：\n" "%s" -#: camel/providers/local/camel-spool-store.c:167 +#: camel/providers/local/camel-spool-store.c:168 #, c-format msgid "Folder `%s' does not exist." msgstr "文件夹“%s”不存在。" -#: camel/providers/local/camel-spool-store.c:172 +#: camel/providers/local/camel-spool-store.c:173 #, c-format msgid "" "Could not create folder `%s':\n" @@ -11073,48 +11366,48 @@ msgstr "" "无法创建文件夹“%s”：\n" "%s" -#: camel/providers/local/camel-spool-store.c:180 +#: camel/providers/local/camel-spool-store.c:181 #, c-format msgid "`%s' is not a mailbox file." msgstr "“%s”不是邮件箱文件。" -#: camel/providers/local/camel-spool-store.c:197 +#: camel/providers/local/camel-spool-store.c:198 msgid "Store does not support an INBOX" msgstr "存储并不支持收件箱" -#: camel/providers/local/camel-spool-store.c:209 +#: camel/providers/local/camel-spool-store.c:210 #, c-format msgid "Spool mail file %s" msgstr "脱机邮件文件 %s" -#: camel/providers/local/camel-spool-store.c:209 +#: camel/providers/local/camel-spool-store.c:210 #, c-format msgid "Spool folder tree %s" msgstr "脱机文件夹树 %s" -#: camel/providers/local/camel-spool-store.c:217 +#: camel/providers/local/camel-spool-store.c:218 msgid "Spool folders cannot be renamed" msgstr "脱机文件夹无法改名" -#: camel/providers/local/camel-spool-store.c:225 +#: camel/providers/local/camel-spool-store.c:226 msgid "Spool folders cannot be deleted" msgstr "脱机文件夹无法删除" -#: camel/providers/local/camel-spool-summary.c:175 -#: camel/providers/local/camel-spool-summary.c:185 -#: camel/providers/local/camel-spool-summary.c:195 +#: camel/providers/local/camel-spool-summary.c:178 +#: camel/providers/local/camel-spool-summary.c:188 +#: camel/providers/local/camel-spool-summary.c:198 #, c-format msgid "Could not sync temporary folder %s: %s" msgstr "无法同步临时文件夹 %s：%s" -#: camel/providers/local/camel-spool-summary.c:211 +#: camel/providers/local/camel-spool-summary.c:214 #, c-format msgid "Could not sync spool folder %s: %s" msgstr "无法同步脱机文件夹 %s：%s" -#: camel/providers/local/camel-spool-summary.c:242 -#: camel/providers/local/camel-spool-summary.c:261 -#: camel/providers/local/camel-spool-summary.c:274 +#: camel/providers/local/camel-spool-summary.c:245 +#: camel/providers/local/camel-spool-summary.c:264 +#: camel/providers/local/camel-spool-summary.c:277 #, c-format msgid "" "Could not sync spool folder %s: %s\n" @@ -11124,7 +11417,7 @@ msgstr "" "文件夹可能已损坏，副本保存在“%s”" #: camel/providers/nntp/camel-nntp-auth.c:44 -#: camel/providers/nntp/camel-nntp-store.c:1153 +#: camel/providers/nntp/camel-nntp-store.c:1144 #, c-format msgid "Please enter the NNTP password for %s@%s" msgstr "请输入 %s@%s 的 NNTP 密码" @@ -11141,47 +11434,25 @@ msgstr "向服务器发送用户名失败" msgid "Server rejected username/password" msgstr "服务器拒绝了用户名/密码" -#: camel/providers/nntp/camel-nntp-folder.c:147 -#: camel/providers/nntp/camel-nntp-folder.c:149 -#: camel/providers/nntp/camel-nntp-folder.c:158 -#: camel/providers/nntp/camel-nntp-folder.c:234 -#: camel/providers/pop3/camel-pop3-folder.c:433 -#: camel/providers/pop3/camel-pop3-folder.c:494 -#: camel/providers/pop3/camel-pop3-folder.c:501 -#: camel/providers/pop3/camel-pop3-folder.c:512 -#, c-format -msgid "Cannot get message %s: %s" -msgstr "无法获取信件 %s：%s" - -#: camel/providers/nntp/camel-nntp-folder.c:156 -#: camel/providers/nntp/camel-nntp-folder.c:232 -#: camel/providers/nntp/camel-nntp-folder.c:371 -#: camel/providers/pop3/camel-pop3-folder.c:262 -#: camel/providers/pop3/camel-pop3-folder.c:430 -#: camel/providers/pop3/camel-pop3-folder.c:491 -#: camel/providers/pop3/camel-pop3-folder.c:509 -msgid "User cancelled" -msgstr "用户已取消" - -#: camel/providers/nntp/camel-nntp-folder.c:176 -#: camel/providers/nntp/camel-nntp-folder.c:208 +#: camel/providers/nntp/camel-nntp-folder.c:177 +#: camel/providers/nntp/camel-nntp-folder.c:209 #, c-format msgid "Internal error: uid in invalid format: %s" msgstr "内部错误：uid 的格式无效：%s" -#: camel/providers/nntp/camel-nntp-folder.c:328 -#: camel/providers/nntp/camel-nntp-folder.c:331 -#: camel/providers/nntp/camel-nntp-folder.c:373 -#: camel/providers/nntp/camel-nntp-folder.c:375 +#: camel/providers/nntp/camel-nntp-folder.c:329 +#: camel/providers/nntp/camel-nntp-folder.c:332 +#: camel/providers/nntp/camel-nntp-folder.c:374 +#: camel/providers/nntp/camel-nntp-folder.c:376 #, c-format msgid "Posting failed: %s" msgstr "投递失败：%s" -#: camel/providers/nntp/camel-nntp-folder.c:393 +#: camel/providers/nntp/camel-nntp-folder.c:394 msgid "You cannot post NNTP messages while working offline!" msgstr "您离线时无法投递 NNTP 信件！" -#: camel/providers/nntp/camel-nntp-folder.c:404 +#: camel/providers/nntp/camel-nntp-folder.c:405 msgid "You cannot copy messages from a NNTP folder!" msgstr "您无法从 NNTP 文件夹复制信件！" @@ -11200,51 +11471,45 @@ msgstr "无法装入 %s 的组列表文件：%s" msgid "Unable to save grouplist file for %s: %s" msgstr "无法保存 %s 的组列表文件：%s" -#: camel/providers/nntp/camel-nntp-provider.c:43 +#: camel/providers/nntp/camel-nntp-provider.c:44 msgid "" "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" msgstr "以短格式显示文件夹(如 c.o.linux 而不是 comp.os.linux)" -#: camel/providers/nntp/camel-nntp-provider.c:45 +#: camel/providers/nntp/camel-nntp-provider.c:46 msgid "In the subscription dialog, show relative folder names" msgstr "在订阅对话框中显示相对文件夹名称" -#: camel/providers/nntp/camel-nntp-provider.c:52 +#: camel/providers/nntp/camel-nntp-provider.c:53 msgid "USENET news" msgstr "USENET 新闻" -#: camel/providers/nntp/camel-nntp-provider.c:54 +#: camel/providers/nntp/camel-nntp-provider.c:55 msgid "This is a provider for reading from and posting toUSENET newsgroups." msgstr "这是一个从 USENET 新闻组和向 USENET 新闻组发布邮件的提供者。" -#: camel/providers/nntp/camel-nntp-provider.c:73 +#: camel/providers/nntp/camel-nntp-provider.c:74 msgid "" "This option will authenticate with the NNTP server using a plaintext " "password." msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。" -#: camel/providers/nntp/camel-nntp-store.c:120 -#: camel/providers/nntp/camel-nntp-store.c:1263 -#, c-format -msgid "NNTP Command failed: %s" -msgstr "NNTP 命令失败：%s" - -#: camel/providers/nntp/camel-nntp-store.c:248 +#: camel/providers/nntp/camel-nntp-store.c:232 #, c-format msgid "Could not read greeting from %s: %s" msgstr "无法阅读来自 %s 的欢迎信息：%s" -#: camel/providers/nntp/camel-nntp-store.c:260 +#: camel/providers/nntp/camel-nntp-store.c:244 #, c-format msgid "NNTP server %s returned error code %d: %s" msgstr "NNTP 服务器 %s 返回错误码 %d：%s" -#: camel/providers/nntp/camel-nntp-store.c:429 +#: camel/providers/nntp/camel-nntp-store.c:420 #, c-format msgid "USENET News via %s" msgstr "USENET 新闻 %s" -#: camel/providers/nntp/camel-nntp-store.c:808 +#: camel/providers/nntp/camel-nntp-store.c:799 #, c-format msgid "" "Error retrieving newsgroups:\n" @@ -11255,7 +11520,7 @@ msgstr "" "\n" "%s" -#: camel/providers/nntp/camel-nntp-store.c:902 +#: camel/providers/nntp/camel-nntp-store.c:893 msgid "" "You cannot subscribe to this newsgroup:\n" "\n" @@ -11265,7 +11530,7 @@ msgstr "" "\n" "没有这样的新闻组。选中项目可能是父文件夹。" -#: camel/providers/nntp/camel-nntp-store.c:934 +#: camel/providers/nntp/camel-nntp-store.c:925 msgid "" "You cannot unsubscribe to this newsgroup:\n" "\n" @@ -11275,113 +11540,118 @@ msgstr "" "\n" "新闻组不存在！" -#: camel/providers/nntp/camel-nntp-store.c:959 +#: camel/providers/nntp/camel-nntp-store.c:950 msgid "You cannot create a folder in a News store: subscribe instead." msgstr "您无法在新闻存储中创建文件夹：应该订阅。" -#: camel/providers/nntp/camel-nntp-store.c:967 +#: camel/providers/nntp/camel-nntp-store.c:958 msgid "You cannot rename a folder in a News store." msgstr "您无法在新闻存储中重命名文件夹。" -#: camel/providers/nntp/camel-nntp-store.c:975 +#: camel/providers/nntp/camel-nntp-store.c:966 msgid "You cannot remove a folder in a News store: unsubscribe instead." msgstr "您无法在新闻存储中删除文件夹：应该退订。" -#: camel/providers/nntp/camel-nntp-store.c:1145 +#: camel/providers/nntp/camel-nntp-store.c:1136 msgid "Authentication requested but no username provided" msgstr "请求了身份验证，但未提供用户名" -#: camel/providers/nntp/camel-nntp-store.c:1175 +#: camel/providers/nntp/camel-nntp-store.c:1148 #, c-format msgid "Cannot authenticate to server: %s" msgstr "无法认证到服务器：%s" -#: camel/providers/nntp/camel-nntp-store.c:1319 +#: camel/providers/nntp/camel-nntp-store.c:1264 +#, c-format +msgid "NNTP Command failed: %s" +msgstr "NNTP 命令失败：%s" + +#: camel/providers/nntp/camel-nntp-store.c:1320 msgid "Not connected." msgstr "未连接。" -#: camel/providers/nntp/camel-nntp-store.c:1370 +#: camel/providers/nntp/camel-nntp-store.c:1373 #, c-format msgid "No such folder: %s" msgstr "没有文件夹：%s" -#: camel/providers/nntp/camel-nntp-summary.c:218 -#: camel/providers/nntp/camel-nntp-summary.c:314 +#: camel/providers/nntp/camel-nntp-summary.c:221 +#: camel/providers/nntp/camel-nntp-summary.c:317 #, c-format msgid "%s: Scanning new messages" msgstr "%s：正在扫描新信件" -#: camel/providers/nntp/camel-nntp-summary.c:225 +#: camel/providers/nntp/camel-nntp-summary.c:228 #, c-format msgid "Unexpected server response from xover: %s" msgstr "来自 xover 的意外服务器应答：%s" -#: camel/providers/nntp/camel-nntp-summary.c:328 +#: camel/providers/nntp/camel-nntp-summary.c:331 #, c-format msgid "Unexpected server response from head: %s" msgstr "来自 head 的意外服务器应答：%s" -#: camel/providers/nntp/camel-nntp-summary.c:368 +#: camel/providers/nntp/camel-nntp-summary.c:371 msgid "Use cancel" msgstr "使用取消" -#: camel/providers/nntp/camel-nntp-summary.c:370 +#: camel/providers/nntp/camel-nntp-summary.c:373 #, c-format msgid "Operation failed: %s" msgstr "操作失败：%s" -#: camel/providers/pop3/camel-pop3-folder.c:246 +#: camel/providers/pop3/camel-pop3-folder.c:247 msgid "Retrieving POP summary" msgstr "正在获取 POP 概要" -#: camel/providers/pop3/camel-pop3-folder.c:265 +#: camel/providers/pop3/camel-pop3-folder.c:266 #, c-format msgid "Cannot get POP summary: %s" msgstr "无法获取 POP 摘要：%s" -#: camel/providers/pop3/camel-pop3-folder.c:308 +#: camel/providers/pop3/camel-pop3-folder.c:309 msgid "Expunging deleted messages" msgstr "彻底销毁已删除的信件" -#: camel/providers/pop3/camel-pop3-folder.c:404 +#: camel/providers/pop3/camel-pop3-folder.c:405 #, c-format msgid "No message with uid %s" msgstr "没有 uid 为 %s 的信件" #. Sigh, most of the crap in this function is so that the cancel button #. returns the proper exception code. Sigh. -#: camel/providers/pop3/camel-pop3-folder.c:411 +#: camel/providers/pop3/camel-pop3-folder.c:412 #, c-format msgid "Retrieving POP message %d" msgstr "正在获取 POP 信件 %d" -#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1210 -#: composer/e-msg-composer.c:1231 +#: camel/providers/pop3/camel-pop3-folder.c:502 composer/e-msg-composer.c:1226 +#: composer/e-msg-composer.c:1247 msgid "Unknown reason" msgstr "未知原因" -#: camel/providers/pop3/camel-pop3-provider.c:40 +#: camel/providers/pop3/camel-pop3-provider.c:41 msgid "Leave messages on server" msgstr "在服务器上保留信件" -#: camel/providers/pop3/camel-pop3-provider.c:43 +#: camel/providers/pop3/camel-pop3-provider.c:44 #, c-format msgid "Delete after %s day(s)" msgstr "%s 天之后删除" -#: camel/providers/pop3/camel-pop3-provider.c:46 +#: camel/providers/pop3/camel-pop3-provider.c:47 msgid "Disable support for all POP3 extensions" msgstr "禁用所有 POP3 扩展的支持" -#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107 +#: camel/providers/pop3/camel-pop3-provider.c:55 msgid "POP" msgstr "POP" -#: camel/providers/pop3/camel-pop3-provider.c:56 +#: camel/providers/pop3/camel-pop3-provider.c:57 msgid "For connecting to and downloading mail from POP servers." msgstr "关于连接到 POP 服务器和从 POP 服务器下载邮件。" -#: camel/providers/pop3/camel-pop3-provider.c:73 +#: camel/providers/pop3/camel-pop3-provider.c:74 msgid "" "This option will connect to the POP server using a plaintext password. This " "is the only option supported by many POP servers." @@ -11389,7 +11659,7 @@ msgstr "" "该选项使 Evolution 在连接到 POP 服务器时使用明文密码。这是许多 POP 服务器唯一" "支持的选项。" -#: camel/providers/pop3/camel-pop3-provider.c:83 +#: camel/providers/pop3/camel-pop3-provider.c:84 msgid "" "This option will connect to the POP server using an encrypted password via " "the APOP protocol. This may not work for all users even on servers that " @@ -11398,58 +11668,58 @@ msgstr "" "该选项使 Evolution 在连接到 POP 服务器时使用 APOP 协议。即使是声称支持这一功" "能的服务器，也不一定能使所有用户工作。" -#: camel/providers/pop3/camel-pop3-store.c:213 -#, c-format -msgid "Could not connect to POP server %s (port %s): %s" -msgstr "无法连接到 POP 服务器 %s (端口 %s)：%s" - -#: camel/providers/pop3/camel-pop3-store.c:232 -#, c-format -msgid "Failed to read a valid greeting from POP server %s (port %s)" +#: camel/providers/pop3/camel-pop3-store.c:202 +#, fuzzy, c-format +msgid "Failed to read a valid greeting from POP server %s" msgstr "从 POP 服务器 %s(端口 %s) 读取欢迎词失败" -#: camel/providers/pop3/camel-pop3-store.c:250 -#: camel/providers/pop3/camel-pop3-store.c:279 -#: camel/providers/pop3/camel-pop3-store.c:291 +#: camel/providers/pop3/camel-pop3-store.c:215 +#: camel/providers/pop3/camel-pop3-store.c:232 +#: camel/providers/pop3/camel-pop3-store.c:242 #, c-format msgid "Failed to connect to POP server %s in secure mode: %s" msgstr "以安全模式连接到 POP 服务器 %s 失败：%s" -#: camel/providers/pop3/camel-pop3-store.c:389 +#: camel/providers/pop3/camel-pop3-store.c:216 +#, fuzzy +msgid "STLS not supported" +msgstr "不支持 SSL/TLS 扩展。" + +#: camel/providers/pop3/camel-pop3-store.c:354 #, c-format msgid "Could not connect to POP server %s" msgstr "无法连接到 POP 服务器 %s" -#: camel/providers/pop3/camel-pop3-store.c:430 -#: camel/providers/pop3/camel-pop3-store.c:544 +#: camel/providers/pop3/camel-pop3-store.c:395 +#: camel/providers/pop3/camel-pop3-store.c:509 #, c-format msgid "" "Unable to connect to POP server %s: No support for requested authentication " "mechanism." msgstr "无法连接到 POP 服务器 %s：不支持请求认证机制。" -#: camel/providers/pop3/camel-pop3-store.c:446 +#: camel/providers/pop3/camel-pop3-store.c:411 #, c-format msgid "SASL `%s' Login failed for POP server %s: %s" msgstr "使用SASL“%s”登录 POP 服务器 %s 失败：%s" -#: camel/providers/pop3/camel-pop3-store.c:458 +#: camel/providers/pop3/camel-pop3-store.c:423 #, c-format msgid "Cannot login to POP server %s: SASL Protocol error" msgstr "无法登录到 POP 服务器 %s：SASL 协议错误" -#: camel/providers/pop3/camel-pop3-store.c:477 +#: camel/providers/pop3/camel-pop3-store.c:442 #, c-format msgid "Failed to authenticate on POP server %s: %s" msgstr "认证到 POP 服务器 %s 失败：%s" -#: camel/providers/pop3/camel-pop3-store.c:503 +#: camel/providers/pop3/camel-pop3-store.c:468 #, c-format msgid "%sPlease enter the POP password for %s on host %s" msgstr "%s请输入 %s@%s 的 POP 密码" -#: camel/providers/pop3/camel-pop3-store.c:558 -#: camel/providers/pop3/camel-pop3-store.c:571 +#: camel/providers/pop3/camel-pop3-store.c:523 +#: camel/providers/pop3/camel-pop3-store.c:536 #, c-format msgid "" "Unable to connect to POP server %s.\n" @@ -11458,7 +11728,7 @@ msgstr "" "无法连接到 POP 服务器 %s。\n" "发送密码错误：%s" -#: camel/providers/pop3/camel-pop3-store.c:565 +#: camel/providers/pop3/camel-pop3-store.c:530 #, c-format msgid "" "Unable to connect to POP server %s.\n" @@ -11467,206 +11737,201 @@ msgstr "" "无法连接到 POP 服务器 %s。\n" "发送用户名错误：%s" -#: camel/providers/pop3/camel-pop3-store.c:670 +#: camel/providers/pop3/camel-pop3-store.c:635 #, c-format msgid "No such folder `%s'." msgstr "没有文件夹“%s”。" -#: camel/providers/sendmail/camel-sendmail-provider.c:36 -#: mail/mail-config.glade.h:132 +#: camel/providers/sendmail/camel-sendmail-provider.c:37 msgid "Sendmail" msgstr "Sendmail" -#: camel/providers/sendmail/camel-sendmail-provider.c:38 +#: camel/providers/sendmail/camel-sendmail-provider.c:39 msgid "" "For delivering mail by passing it to the \"sendmail\" program on the local " "system." msgstr "将邮件传递到本地系统的“sendmail”来发送邮件。" -#: camel/providers/sendmail/camel-sendmail-transport.c:113 +#: camel/providers/sendmail/camel-sendmail-transport.c:114 msgid "Could not parse recipient list" msgstr "无法解析收件人列表" -#: camel/providers/sendmail/camel-sendmail-transport.c:144 +#: camel/providers/sendmail/camel-sendmail-transport.c:145 #, c-format msgid "Could not create pipe to sendmail: %s: mail not sent" msgstr "无法创建到 sendmail 的管道：%s：邮件未发送" -#: camel/providers/sendmail/camel-sendmail-transport.c:165 +#: camel/providers/sendmail/camel-sendmail-transport.c:166 #, c-format msgid "Could not fork sendmail: %s: mail not sent" msgstr "无法创建 sendmail 进程：%s：邮件未发送" -#: camel/providers/sendmail/camel-sendmail-transport.c:205 +#: camel/providers/sendmail/camel-sendmail-transport.c:206 #, c-format msgid "Could not send message: %s" msgstr "无法发送信件：%s" -#: camel/providers/sendmail/camel-sendmail-transport.c:233 +#: camel/providers/sendmail/camel-sendmail-transport.c:234 #, c-format msgid "sendmail exited with signal %s: mail not sent." msgstr "sendmail 以信号 %s 退出：邮件未发送。" -#: camel/providers/sendmail/camel-sendmail-transport.c:240 +#: camel/providers/sendmail/camel-sendmail-transport.c:241 #, c-format msgid "Could not execute %s: mail not sent." msgstr "无法执行 %s：邮件未发送。" -#: camel/providers/sendmail/camel-sendmail-transport.c:245 +#: camel/providers/sendmail/camel-sendmail-transport.c:246 #, c-format msgid "sendmail exited with status %d: mail not sent." msgstr "sendmail 以状态码 %d 退出：邮件未发送。" -#: camel/providers/sendmail/camel-sendmail-transport.c:259 +#: camel/providers/sendmail/camel-sendmail-transport.c:260 msgid "sendmail" msgstr "sendmail" -#: camel/providers/sendmail/camel-sendmail-transport.c:261 +#: camel/providers/sendmail/camel-sendmail-transport.c:262 msgid "Mail delivery via the sendmail program" msgstr "通过 sendmail 程序发送邮件" -#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122 +#: camel/providers/smtp/camel-smtp-provider.c:38 msgid "SMTP" msgstr "SMTP" -#: camel/providers/smtp/camel-smtp-provider.c:39 +#: camel/providers/smtp/camel-smtp-provider.c:40 msgid "For delivering mail by connecting to a remote mailhub using SMTP." msgstr "要投递邮件，应该使用 SMTP 连接到远程的邮件交换服务器。" -#: camel/providers/smtp/camel-smtp-transport.c:174 +#: camel/providers/smtp/camel-smtp-transport.c:165 msgid "Syntax error, command unrecognized" msgstr "语法错误，无法识别的命令" -#: camel/providers/smtp/camel-smtp-transport.c:176 +#: camel/providers/smtp/camel-smtp-transport.c:167 msgid "Syntax error in parameters or arguments" msgstr "参数语法错误" -#: camel/providers/smtp/camel-smtp-transport.c:178 +#: camel/providers/smtp/camel-smtp-transport.c:169 msgid "Command not implemented" msgstr "命令尚未实现" -#: camel/providers/smtp/camel-smtp-transport.c:180 +#: camel/providers/smtp/camel-smtp-transport.c:171 msgid "Command parameter not implemented" msgstr "命令参数尚未实现" -#: camel/providers/smtp/camel-smtp-transport.c:182 +#: camel/providers/smtp/camel-smtp-transport.c:173 msgid "System status, or system help reply" msgstr "系统状态，或系统求助就绪" -#: camel/providers/smtp/camel-smtp-transport.c:184 +#: camel/providers/smtp/camel-smtp-transport.c:175 msgid "Help message" msgstr "帮助信件" -#: camel/providers/smtp/camel-smtp-transport.c:186 +#: camel/providers/smtp/camel-smtp-transport.c:177 msgid "Service ready" msgstr "服务就绪" -#: camel/providers/smtp/camel-smtp-transport.c:188 +#: camel/providers/smtp/camel-smtp-transport.c:179 msgid "Service closing transmission channel" msgstr "服务正在关闭传输通道" -#: camel/providers/smtp/camel-smtp-transport.c:190 +#: camel/providers/smtp/camel-smtp-transport.c:181 msgid "Service not available, closing transmission channel" msgstr "服务不可用，正在关闭传输通道" -#: camel/providers/smtp/camel-smtp-transport.c:192 +#: camel/providers/smtp/camel-smtp-transport.c:183 msgid "Requested mail action okay, completed" msgstr "邮件动作请求确认，已完成" -#: camel/providers/smtp/camel-smtp-transport.c:194 +#: camel/providers/smtp/camel-smtp-transport.c:185 msgid "User not local; will forward to <forward-path>" msgstr "用户不在本地；将转发到 <转发路径>" -#: camel/providers/smtp/camel-smtp-transport.c:196 +#: camel/providers/smtp/camel-smtp-transport.c:187 msgid "Requested mail action not taken: mailbox unavailable" msgstr "邮件动作请求未发生：邮件箱无效" -#: camel/providers/smtp/camel-smtp-transport.c:198 +#: camel/providers/smtp/camel-smtp-transport.c:189 msgid "Requested action not taken: mailbox unavailable" msgstr "动作请求未发生：邮件箱无效" -#: camel/providers/smtp/camel-smtp-transport.c:200 +#: camel/providers/smtp/camel-smtp-transport.c:191 msgid "Requested action aborted: error in processing" msgstr "动作请求已放弃：处理中出错" -#: camel/providers/smtp/camel-smtp-transport.c:202 +#: camel/providers/smtp/camel-smtp-transport.c:193 msgid "User not local; please try <forward-path>" msgstr "用户不在本地；请尝试 <转发路径>" -#: camel/providers/smtp/camel-smtp-transport.c:204 +#: camel/providers/smtp/camel-smtp-transport.c:195 msgid "Requested action not taken: insufficient system storage" msgstr "动作请求未发生：系统存储空间不足" -#: camel/providers/smtp/camel-smtp-transport.c:206 +#: camel/providers/smtp/camel-smtp-transport.c:197 msgid "Requested mail action aborted: exceeded storage allocation" msgstr "邮件动作请求已放弃：超定额德存储分配" -#: camel/providers/smtp/camel-smtp-transport.c:208 +#: camel/providers/smtp/camel-smtp-transport.c:199 msgid "Requested action not taken: mailbox name not allowed" msgstr "动作请求未发生：不允许的邮件箱名称" -#: camel/providers/smtp/camel-smtp-transport.c:210 +#: camel/providers/smtp/camel-smtp-transport.c:201 msgid "Start mail input; end with <CRLF>.<CRLF>" msgstr "开始输入邮件；以 <CRLF>.<CRLF> 结束" -#: camel/providers/smtp/camel-smtp-transport.c:212 +#: camel/providers/smtp/camel-smtp-transport.c:203 msgid "Transaction failed" msgstr "事务失败" -#: camel/providers/smtp/camel-smtp-transport.c:216 +#: camel/providers/smtp/camel-smtp-transport.c:207 msgid "A password transition is needed" msgstr "必须传输密码" -#: camel/providers/smtp/camel-smtp-transport.c:218 +#: camel/providers/smtp/camel-smtp-transport.c:209 msgid "Authentication mechanism is too weak" msgstr "认证机制太弱" -#: camel/providers/smtp/camel-smtp-transport.c:220 +#: camel/providers/smtp/camel-smtp-transport.c:211 msgid "Encryption required for requested authentication mechanism" msgstr "请求的认证机制必须加密" -#: camel/providers/smtp/camel-smtp-transport.c:222 +#: camel/providers/smtp/camel-smtp-transport.c:213 msgid "Temporary authentication failure" msgstr "临时认证失败" -#: camel/providers/smtp/camel-smtp-transport.c:224 +#: camel/providers/smtp/camel-smtp-transport.c:215 msgid "Authentication required" msgstr "必须认证" -#: camel/providers/smtp/camel-smtp-transport.c:327 +#: camel/providers/smtp/camel-smtp-transport.c:292 msgid "Welcome response error" msgstr "欢迎应答错误" -#: camel/providers/smtp/camel-smtp-transport.c:362 -#: camel/providers/smtp/camel-smtp-transport.c:401 +#: camel/providers/smtp/camel-smtp-transport.c:322 +#: camel/providers/smtp/camel-smtp-transport.c:355 #, c-format msgid "Failed to connect to SMTP server %s in secure mode: %s" msgstr "以安全模式连接 SMTP 服务器 %s 失败：%s" -#: camel/providers/smtp/camel-smtp-transport.c:363 -msgid "server does not appear to support SSL" -msgstr "服务器似乎不支持 SSL" - -#: camel/providers/smtp/camel-smtp-transport.c:377 +#: camel/providers/smtp/camel-smtp-transport.c:331 #, c-format msgid "STARTTLS command failed: %s" msgstr "STARTTLS 命令失败：%s" -#: camel/providers/smtp/camel-smtp-transport.c:392 +#: camel/providers/smtp/camel-smtp-transport.c:346 msgid "STARTTLS command failed" msgstr "STARTTLS 命令失败" -#: camel/providers/smtp/camel-smtp-transport.c:495 +#: camel/providers/smtp/camel-smtp-transport.c:479 #, c-format msgid "SMTP server %s does not support requested authentication type %s." msgstr "SMTP 服务器 %s 不支持请求的认证类型 %s。" -#: camel/providers/smtp/camel-smtp-transport.c:533 +#: camel/providers/smtp/camel-smtp-transport.c:517 #, c-format msgid "%sPlease enter the SMTP password for %s on host %s" msgstr "%s请为 %s@%s 输入 SMTP 密码" -#: camel/providers/smtp/camel-smtp-transport.c:552 +#: camel/providers/smtp/camel-smtp-transport.c:536 #, c-format msgid "" "Unable to authenticate to SMTP server.\n" @@ -11677,93 +11942,93 @@ msgstr "" "%s\n" "\n" -#: camel/providers/smtp/camel-smtp-transport.c:676 +#: camel/providers/smtp/camel-smtp-transport.c:660 #, c-format msgid "SMTP server %s" msgstr "SMTP 服务器 %s" -#: camel/providers/smtp/camel-smtp-transport.c:678 +#: camel/providers/smtp/camel-smtp-transport.c:662 #, c-format msgid "SMTP mail delivery via %s" msgstr "通过 %s 发送 SMTP 邮件" -#: camel/providers/smtp/camel-smtp-transport.c:696 +#: camel/providers/smtp/camel-smtp-transport.c:680 msgid "Cannot send message: service not connected." msgstr "无法发送信件：服务未连接。" -#: camel/providers/smtp/camel-smtp-transport.c:702 +#: camel/providers/smtp/camel-smtp-transport.c:686 msgid "Cannot send message: sender address not valid." msgstr "无法发送信件：发件人地址不合法。" -#: camel/providers/smtp/camel-smtp-transport.c:706 +#: camel/providers/smtp/camel-smtp-transport.c:690 msgid "Sending message" msgstr "发送信件" -#: camel/providers/smtp/camel-smtp-transport.c:721 +#: camel/providers/smtp/camel-smtp-transport.c:705 msgid "Cannot send message: no recipients defined." msgstr "无法发送信件：没有定义收件人。" -#: camel/providers/smtp/camel-smtp-transport.c:732 +#: camel/providers/smtp/camel-smtp-transport.c:716 msgid "Cannot send message: one or more invalid recipients" msgstr "无法发送信件：一个或多个非法收件人" -#: camel/providers/smtp/camel-smtp-transport.c:901 +#: camel/providers/smtp/camel-smtp-transport.c:885 msgid "SMTP Greeting" msgstr "SMTP 欢迎" -#: camel/providers/smtp/camel-smtp-transport.c:918 +#: camel/providers/smtp/camel-smtp-transport.c:911 #, c-format msgid "HELO command failed: %s" msgstr "HELO 命令失败：%s" -#: camel/providers/smtp/camel-smtp-transport.c:935 +#: camel/providers/smtp/camel-smtp-transport.c:928 msgid "HELO command failed" msgstr "HELO 命令失败" -#: camel/providers/smtp/camel-smtp-transport.c:1001 +#: camel/providers/smtp/camel-smtp-transport.c:994 msgid "SMTP Authentication" msgstr "SMTP 认证" -#: camel/providers/smtp/camel-smtp-transport.c:1007 +#: camel/providers/smtp/camel-smtp-transport.c:1000 msgid "Error creating SASL authentication object." msgstr "创建 SASL 认证对象错误。" -#: camel/providers/smtp/camel-smtp-transport.c:1024 -#: camel/providers/smtp/camel-smtp-transport.c:1035 +#: camel/providers/smtp/camel-smtp-transport.c:1017 +#: camel/providers/smtp/camel-smtp-transport.c:1028 #, c-format msgid "AUTH command failed: %s" msgstr "AUTH 命令失败：%s" -#: camel/providers/smtp/camel-smtp-transport.c:1041 +#: camel/providers/smtp/camel-smtp-transport.c:1034 msgid "AUTH command failed" msgstr "AUTH 命令失败" -#: camel/providers/smtp/camel-smtp-transport.c:1103 +#: camel/providers/smtp/camel-smtp-transport.c:1096 msgid "Bad authentication response from server.\n" msgstr "来自服务器的错误认证应答。\n" -#: camel/providers/smtp/camel-smtp-transport.c:1128 +#: camel/providers/smtp/camel-smtp-transport.c:1121 #, c-format msgid "MAIL FROM command failed: %s: mail not sent" msgstr "MAIL FROM 命令失败：%s：邮件未发送" -#: camel/providers/smtp/camel-smtp-transport.c:1145 +#: camel/providers/smtp/camel-smtp-transport.c:1138 msgid "MAIL FROM command failed" msgstr "MAIL FROM 命令失败" -#: camel/providers/smtp/camel-smtp-transport.c:1169 +#: camel/providers/smtp/camel-smtp-transport.c:1162 #, c-format msgid "RCPT TO command failed: %s: mail not sent" msgstr "RCPT TO 命令失败：%s：邮件未发送" -#: camel/providers/smtp/camel-smtp-transport.c:1188 +#: camel/providers/smtp/camel-smtp-transport.c:1181 #, c-format msgid "RCPT TO <%s> failed" msgstr "RCPT TO <%s> 失败" -#: camel/providers/smtp/camel-smtp-transport.c:1227 -#: camel/providers/smtp/camel-smtp-transport.c:1285 -#: camel/providers/smtp/camel-smtp-transport.c:1304 +#: camel/providers/smtp/camel-smtp-transport.c:1220 +#: camel/providers/smtp/camel-smtp-transport.c:1278 +#: camel/providers/smtp/camel-smtp-transport.c:1297 #, c-format msgid "DATA command failed: %s: mail not sent" msgstr "DATA 命令失败：%s：邮件未发送" @@ -11771,67 +12036,65 @@ msgstr "DATA 命令失败：%s：邮件未发送" #. we should have gotten instructions on how to use the DATA command: #. * 354 Enter mail, end with "." on a line by itself #. -#: camel/providers/smtp/camel-smtp-transport.c:1244 -#: camel/providers/smtp/camel-smtp-transport.c:1320 +#: camel/providers/smtp/camel-smtp-transport.c:1237 +#: camel/providers/smtp/camel-smtp-transport.c:1313 msgid "DATA command failed" msgstr "DATP 命令失败" -#: camel/providers/smtp/camel-smtp-transport.c:1343 +#: camel/providers/smtp/camel-smtp-transport.c:1336 #, c-format msgid "RSET command failed: %s" msgstr "RSET 命令失败：%s" -#: camel/providers/smtp/camel-smtp-transport.c:1359 +#: camel/providers/smtp/camel-smtp-transport.c:1352 msgid "RSET command failed" msgstr "RSET 命令失败" -#: camel/providers/smtp/camel-smtp-transport.c:1382 +#: camel/providers/smtp/camel-smtp-transport.c:1375 #, c-format msgid "QUIT command failed: %s" msgstr "QUIT 命令失败：%s" -#: camel/providers/smtp/camel-smtp-transport.c:1396 +#: camel/providers/smtp/camel-smtp-transport.c:1389 msgid "QUIT command failed" msgstr "QUIT 命令失败" -#: composer/e-msg-composer-attachment-bar.c:106 +#: composer/e-msg-composer-attachment-bar.c:101 #, c-format msgid "%.0fK" msgstr "%.0fK" -#: composer/e-msg-composer-attachment-bar.c:109 +#: composer/e-msg-composer-attachment-bar.c:104 #, c-format msgid "%.0fM" msgstr "%.0fM" -#: composer/e-msg-composer-attachment-bar.c:112 +#: composer/e-msg-composer-attachment-bar.c:107 #, c-format msgid "%.0fG" msgstr "%.0fG" -#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:436 +#: composer/e-msg-composer-attachment-bar.c:293 mail/em-utils.c:436 msgid "attachment" msgstr "附件" -#: composer/e-msg-composer-attachment-bar.c:454 -msgid "Remove selected items from the attachment list" -msgstr "从附件列表中删除选中条目" +#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2746 +#: ui/evolution-mail-list.xml.h:27 +msgid "_Properties" +msgstr "属性(_P)" -#: composer/e-msg-composer-attachment-bar.c:494 -msgid "Add attachment..." +#: composer/e-msg-composer-attachment-bar.c:443 +#, fuzzy +msgid "_Add attachment..." msgstr "添加附件..." -#: composer/e-msg-composer-attachment-bar.c:495 -msgid "Attach a file to the message" -msgstr "把文件附件到信件" - -#: composer/e-msg-composer-attachment.c:173 -#: composer/e-msg-composer-attachment.c:189 +#: composer/e-msg-composer-attachment.c:174 +#: composer/e-msg-composer-attachment.c:190 #, c-format msgid "Cannot attach file %s: %s" msgstr "无法附加文件 %s：%s" -#: composer/e-msg-composer-attachment.c:181 +#: composer/e-msg-composer-attachment.c:182 #, c-format msgid "Cannot attach file %s: not a regular file" msgstr "无法附加文件 %s：不是普通文件" @@ -11849,20 +12112,20 @@ msgid "MIME type:" msgstr "MIME 类型：" #: composer/e-msg-composer-attachment.glade.h:6 -#: composer/e-msg-composer-select-file.c:92 -#: composer/e-msg-composer-select-file.c:111 +#: composer/e-msg-composer-select-file.c:93 +#: composer/e-msg-composer-select-file.c:112 msgid "Suggest automatic display of attachment" msgstr "建议自动显示附件" -#: composer/e-msg-composer-hdrs.c:512 +#: composer/e-msg-composer-hdrs.c:513 msgid "Posting destination" msgstr "投递目的" -#: composer/e-msg-composer-hdrs.c:513 +#: composer/e-msg-composer-hdrs.c:514 msgid "Choose folders to post the message to." msgstr "选择要将信件投递到哪个文件夹。" -#: composer/e-msg-composer-hdrs.c:547 +#: composer/e-msg-composer-hdrs.c:548 msgid "Click here for the address book" msgstr "单击此处以使用地址簿" @@ -11873,45 +12136,51 @@ msgstr "单击此处以使用地址簿" #. * because that causes from_changed to be called, which #. * expects the reply_to fields to be initialized. #. -#: composer/e-msg-composer-hdrs.c:577 -msgid "Reply-To:" +#: composer/e-msg-composer-hdrs.c:578 +#, fuzzy +msgid "_Reply-To:" msgstr "回复到：" #. #. * From #. -#: composer/e-msg-composer-hdrs.c:583 -msgid "From:" +#: composer/e-msg-composer-hdrs.c:585 +#, fuzzy +msgid "Fr_om:" msgstr "发件人：" #. #. * Subject #. -#: composer/e-msg-composer-hdrs.c:589 -msgid "Subject:" +#: composer/e-msg-composer-hdrs.c:592 +#, fuzzy +msgid "S_ubject:" msgstr "主题：" -#: composer/e-msg-composer-hdrs.c:598 -msgid "To:" +#: composer/e-msg-composer-hdrs.c:602 +#, fuzzy +msgid "_To:" msgstr "收信人：" -#: composer/e-msg-composer-hdrs.c:599 +#: composer/e-msg-composer-hdrs.c:603 msgid "Enter the recipients of the message" msgstr "输入信件的收件人" -#: composer/e-msg-composer-hdrs.c:602 -msgid "Cc:" +#: composer/e-msg-composer-hdrs.c:606 +#, fuzzy +msgid "_Cc:" msgstr "抄送：" -#: composer/e-msg-composer-hdrs.c:603 +#: composer/e-msg-composer-hdrs.c:607 msgid "Enter the addresses that will receive a carbon copy of the message" msgstr "输入将接收该信件副本的收件人地址" -#: composer/e-msg-composer-hdrs.c:606 -msgid "Bcc:" +#: composer/e-msg-composer-hdrs.c:610 +#, fuzzy +msgid "_Bcc:" msgstr "暗送：" -#: composer/e-msg-composer-hdrs.c:607 +#: composer/e-msg-composer-hdrs.c:611 msgid "" "Enter the addresses that will receive a carbon copy of the message without " "appearing in the recipient list of the message." @@ -11920,85 +12189,102 @@ msgstr "输入将接收该信件副本，但不出现在收件人列表中的收 #. #. * Post-To #. -#: composer/e-msg-composer-hdrs.c:614 -msgid "Post To:" +#: composer/e-msg-composer-hdrs.c:618 +#, fuzzy +msgid "_Post To:" msgstr "投递到：" -#: composer/e-msg-composer-hdrs.c:619 +#: composer/e-msg-composer-hdrs.c:623 msgid "Click here to select folders to post to" msgstr "单击此处以选择要投递到的文件夹" -#: composer/e-msg-composer-select-file.c:186 +#: composer/e-msg-composer-hdrs.c:629 +msgid "Post To:" +msgstr "投递到：" + +#: composer/e-msg-composer-select-file.c:187 msgid "Attach file(s)" msgstr "添加附件" -#: composer/e-msg-composer.c:704 +#: composer/e-msg-composer.c:720 msgid "" "Cannot sign outgoing message: No signing certificate set for this account" msgstr "无法对寄出的信件签名：未对此账户设置签名证书" -#: composer/e-msg-composer.c:711 +#: composer/e-msg-composer.c:727 msgid "" "Cannot encrypt outgoing message: No encryption certificate set for this " "account" msgstr "无法对寄出的信件加密：未对此账户设置加密证书" -#: composer/e-msg-composer.c:1268 +#: composer/e-msg-composer.c:1284 msgid "Could not open file" msgstr "无法打开文件" -#: composer/e-msg-composer.c:1276 +#: composer/e-msg-composer.c:1292 msgid "Unable to retrieve message from editor" msgstr "无法从编辑器获取信件" -#: composer/e-msg-composer.c:1546 +#: composer/e-msg-composer.c:1562 msgid "Untitled Message" msgstr "无标题信件" -#: composer/e-msg-composer.c:1576 +#: composer/e-msg-composer.c:1592 msgid "Open file" msgstr "打开文件" -#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1497 +#: composer/e-msg-composer.c:1999 mail/mail-account-gui.c:1499 msgid "Autogenerated" msgstr "自动生成的" -#: composer/e-msg-composer.c:2082 -msgid "Signature:" +#: composer/e-msg-composer.c:2098 +#, fuzzy +msgid "Si_gnature:" msgstr "签名：" -#: composer/e-msg-composer.c:2283 +#: composer/e-msg-composer.c:2301 #, c-format msgid "<b>%d</b> File Attached" msgid_plural "<b>%d</b> Files Attached" msgstr[0] "附加了 <b>%d</b> 个文件" -#: composer/e-msg-composer.c:2312 +#: composer/e-msg-composer.c:2330 msgid "Hide _Attachment Bar (drop attachments here)" msgstr "隐藏附件栏(将附件拖至此处)(_A)" -#: composer/e-msg-composer.c:2315 composer/e-msg-composer.c:3271 +#: composer/e-msg-composer.c:2333 composer/e-msg-composer.c:3440 msgid "Show _Attachment Bar (drop attachments here)" msgstr "显示附件栏(将附件拖至此处)(_A)" -#: composer/e-msg-composer.c:2332 composer/e-msg-composer.c:3163 -#: composer/e-msg-composer.c:3164 +#: composer/e-msg-composer.c:2350 composer/e-msg-composer.c:3329 +#: composer/e-msg-composer.c:3330 msgid "Compose a message" msgstr "撰写新件" -#: composer/e-msg-composer.c:2634 +#: composer/e-msg-composer.c:2652 #, c-format msgid "Attached message - %s" msgstr "附加的信件 - %s" #. translators, this count will always be >1 -#: composer/e-msg-composer.c:2639 composer/e-msg-composer.c:2783 +#: composer/e-msg-composer.c:2657 composer/e-msg-composer.c:2820 #, c-format msgid "Attached message" msgid_plural "%d attached messages" msgstr[0] "%d 封附加的信件" -#: composer/e-msg-composer.c:4342 +#: composer/e-msg-composer.c:2883 mail/em-folder-tree.c:1025 +#: mail/em-folder-tree.c:2243 mail/em-folder-view.c:823 +#: mail/message-list.c:1713 +msgid "_Move" +msgstr "移动(_M)" + +#: composer/e-msg-composer.c:2885 mail/em-folder-tree.c:1027 +#: mail/message-list.c:1715 +msgid "Cancel _Drag" +msgstr "取消拖曳(_D)" + +#: composer/e-msg-composer.c:4510 msgid "" "<b>(The composer contains a non-text message body, which cannot be edited.)" "<b>" @@ -12108,7 +12394,8 @@ msgid "_Discard Changes" msgstr "丢弃更改(_D)" #: composer/mail-composer-errors.xml.h:34 -msgid "Save Message" +#, fuzzy +msgid "_Save Message" msgstr "保存信件" #. mail-composer:no-build-message primary @@ -12159,7 +12446,7 @@ msgstr "" "无法激活 HTML 编辑器组件。\n" "请确定您的 gtkhtml 和 libgtkhtml 所安装的版本正确。" -#: data/evolution.desktop.in.in.h:1 shell/main.c:503 +#: data/evolution.desktop.in.in.h:1 shell/main.c:520 msgid "Evolution" msgstr "Evolution" @@ -12287,11 +12574,11 @@ msgstr "" msgid "Overwrite file?" msgstr "覆盖文件吗？" -#: e-util/e-passwords.c:464 +#: e-util/e-passwords.c:468 msgid "_Remember this password" msgstr "记住该密码(_R)" -#: e-util/e-passwords.c:465 +#: e-util/e-passwords.c:469 msgid "_Remember this password for the remainder of this session" msgstr "在本会话中记住该密码(_R)" @@ -12375,7 +12662,7 @@ msgstr "%H:%M:%S" #. without seconds. #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435 -#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639 +#: widgets/misc/e-dateedit.c:1431 widgets/misc/e-dateedit.c:1697 msgid "%I:%M %p" msgstr "%p %I:%M" @@ -12384,7 +12671,7 @@ msgstr "%p %I:%M" #. without seconds. #. This is a strftime() format. %H = hour (0-23), %M = minute. #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427 -#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636 +#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1694 msgid "%H:%M" msgstr "%H:%M" @@ -12514,19 +12801,19 @@ msgid "Choose a file" msgstr "选择文件" #: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011 -#: mail/mail-config.c:76 mail/mail-config.glade.h:93 +#: mail/mail-config.c:76 mail/mail-config.glade.h:91 msgid "Important" msgstr "重要" #. forest green #: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79 -#: mail/mail-config.glade.h:148 +#: mail/mail-config.glade.h:139 msgid "To Do" msgstr "待办" #. blue #: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80 -#: mail/mail-config.glade.h:97 +#: mail/mail-config.glade.h:94 msgid "Later" msgstr "稍候" @@ -12535,47 +12822,49 @@ msgid "Test" msgstr "测试" #: filter/filter-rule.c:790 -msgid "Rule name:" +#, fuzzy +msgid "_Rule name:" msgstr "规则名：" -#: filter/filter-rule.c:817 +#: filter/filter-rule.c:818 msgid "<b>If</b>" msgstr "<b>如果</b>" -#: filter/filter-rule.c:854 +#: filter/filter-rule.c:855 msgid "if all criteria are met" msgstr "如果满足所有条件" -#: filter/filter-rule.c:854 +#: filter/filter-rule.c:855 msgid "if any criteria are met" msgstr "如果满足任一条件" -#: filter/filter-rule.c:856 +#: filter/filter-rule.c:857 msgid "Execute actions" msgstr "执行动作" -#: filter/filter-rule.c:877 +#: filter/filter-rule.c:878 msgid "All related" msgstr "相关的全部" -#: filter/filter-rule.c:877 +#: filter/filter-rule.c:878 msgid "Replies" msgstr "回复" -#: filter/filter-rule.c:877 +#: filter/filter-rule.c:878 msgid "Replies and parents" msgstr "回复及原始邮件" -#: filter/filter-rule.c:879 +#: filter/filter-rule.c:880 msgid "Include threads" msgstr "包含线索" -#: filter/filter-rule.c:974 -msgid "incoming" +#: filter/filter-rule.c:975 filter/filter.glade.h:3 +msgid "Incoming" msgstr "接收" -#: filter/filter-rule.c:974 -msgid "outgoing" +#: filter/filter-rule.c:975 +#, fuzzy +msgid "Outgoing" msgstr "发送" #: filter/filter.glade.h:1 @@ -12586,53 +12875,53 @@ msgstr "<b>过滤规则(_F)</b>" msgid "Compare against" msgstr "比较" -#: filter/filter.glade.h:3 -msgid "Incoming" -msgstr "接收" - #: filter/filter.glade.h:4 +msgid "Show filters for mail:" +msgstr "" + +#: filter/filter.glade.h:5 msgid "" "The message's date will be compared against\n" "12:00am of the date specified." msgstr "信件的日期将会与指定日期的午夜12:00进行比较。" -#: filter/filter.glade.h:6 +#: filter/filter.glade.h:7 msgid "" "The message's date will be compared against\n" "a time relative to when filtering occurs." msgstr "信件的日期将会在过滤执行时与指定时间进行比较。" -#: filter/filter.glade.h:8 +#: filter/filter.glade.h:9 msgid "" "The message's date will be compared against\n" "the current time when filtering occurs." msgstr "信件的日期将会在过滤执行时与当前时间进行比较。" -#: filter/filter.glade.h:11 +#: filter/filter.glade.h:12 msgid "a time relative to the current time" msgstr "相对于当前时间的时间" -#: filter/filter.glade.h:12 +#: filter/filter.glade.h:13 msgid "ago" msgstr "过去" -#: filter/filter.glade.h:16 +#: filter/filter.glade.h:17 msgid "months" msgstr "月" -#: filter/filter.glade.h:17 mail/mail-config.glade.h:184 +#: filter/filter.glade.h:18 mail/mail-config.glade.h:173 msgid "seconds" msgstr "秒" -#: filter/filter.glade.h:18 +#: filter/filter.glade.h:19 msgid "the current time" msgstr "当前时间" -#: filter/filter.glade.h:19 +#: filter/filter.glade.h:20 msgid "the time you specify" msgstr "您指定的时间" -#: filter/filter.glade.h:21 +#: filter/filter.glade.h:22 msgid "years" msgstr "年" @@ -12689,10 +12978,10 @@ msgstr "Evolution 邮件撰写控件" msgid "Evolution Mail preferences control" msgstr "Evolution 邮件首选项控件" -#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:422 +#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:426 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902 -#: mail/importers/pine-importer.c:474 mail/mail-component.c:511 -#: mail/mail-component.c:562 +#: mail/importers/pine-importer.c:474 mail/mail-component.c:531 +#: mail/mail-component.c:582 msgid "Mail" msgstr "邮件" @@ -12700,7 +12989,7 @@ msgstr "邮件" msgid "Mail Accounts" msgstr "邮件账户" -#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:99 +#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96 msgid "Mail Preferences" msgstr "邮件首选项" @@ -12709,47 +12998,47 @@ msgid "_Mail" msgstr "邮件(_M)" #. translators: default account indicator -#: mail/em-account-prefs.c:418 +#: mail/em-account-prefs.c:432 msgid "[Default]" msgstr "[默认]" -#: mail/em-account-prefs.c:472 +#: mail/em-account-prefs.c:486 msgid "Account name" msgstr "账户名" -#: mail/em-account-prefs.c:474 +#: mail/em-account-prefs.c:488 msgid "Protocol" msgstr "协议" -#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424 -#: mail/mail-config.c:1049 +#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:425 +#: mail/mail-config.c:935 msgid "Unnamed" msgstr "未命名" -#: mail/em-composer-prefs.c:909 +#: mail/em-composer-prefs.c:949 msgid "Language(s)" msgstr "语言" -#: mail/em-composer-prefs.c:955 +#: mail/em-composer-prefs.c:995 msgid "Add signature script" msgstr "添加签名脚本" -#: mail/em-composer-prefs.c:975 +#: mail/em-composer-prefs.c:1015 msgid "Signature(s)" msgstr "签名" -#: mail/em-composer-utils.c:889 +#: mail/em-composer-utils.c:897 msgid "-------- Forwarded Message --------" msgstr "-------- 转发的信件 --------" -#: mail/em-composer-utils.c:1505 +#: mail/em-composer-utils.c:1513 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:1552 +#: mail/em-composer-utils.c:1560 msgid "" "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " "${TimeZone}, ${Sender} wrote:" @@ -12762,7 +13051,7 @@ msgid "_Filter Rules" msgstr "过滤规则(_F)" #: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494 -#: mail/mail-account-gui.c:1353 +#: mail/mail-account-gui.c:1355 msgid "Select Folder" msgstr "选择文件夹" @@ -12895,7 +13184,7 @@ msgstr "未标志" msgid "Junk Test" msgstr "垃圾测试" -#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:935 +#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:960 #: widgets/misc/e-expander.c:189 msgid "Label" msgstr "标签" @@ -12905,109 +13194,114 @@ msgid "Mailing list" msgstr "邮件列表" #: mail/em-filter-i18n.h:39 +#, fuzzy +msgid "Match All" +msgstr "全部备份" + +#: mail/em-filter-i18n.h:40 msgid "Message Body" msgstr "信体" -#: mail/em-filter-i18n.h:40 +#: mail/em-filter-i18n.h:41 msgid "Message Header" msgstr "信头" -#: mail/em-filter-i18n.h:41 +#: mail/em-filter-i18n.h:42 msgid "Message is Junk" msgstr "是垃圾邮件" -#: mail/em-filter-i18n.h:42 +#: mail/em-filter-i18n.h:43 msgid "Message is not Junk" msgstr "不是垃圾邮件" -#: mail/em-filter-i18n.h:43 +#: mail/em-filter-i18n.h:44 msgid "Move to Folder" msgstr "移动到文件夹" -#: mail/em-filter-i18n.h:44 +#: mail/em-filter-i18n.h:45 msgid "Pipe to Program" msgstr "管道到程序" -#: mail/em-filter-i18n.h:45 +#: mail/em-filter-i18n.h:46 msgid "Play Sound" msgstr "播放声音" -#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79 +#: mail/em-filter-i18n.h:47 mail/message-tag-followup.c:80 msgid "Read" msgstr "已读" -#: mail/em-filter-i18n.h:47 +#: mail/em-filter-i18n.h:48 msgid "Recipients" msgstr "收件人" -#: mail/em-filter-i18n.h:48 +#: mail/em-filter-i18n.h:49 msgid "Regex Match" msgstr "正则表达式匹配" -#: mail/em-filter-i18n.h:49 +#: mail/em-filter-i18n.h:50 msgid "Replied to" msgstr "已回复到" -#: mail/em-filter-i18n.h:50 +#: mail/em-filter-i18n.h:51 msgid "returns" msgstr "返回" -#: mail/em-filter-i18n.h:51 +#: mail/em-filter-i18n.h:52 msgid "returns greater than" msgstr "返回大于" -#: mail/em-filter-i18n.h:52 +#: mail/em-filter-i18n.h:53 msgid "returns less than" msgstr "返回小于" -#: mail/em-filter-i18n.h:53 +#: mail/em-filter-i18n.h:54 msgid "Run Program" msgstr "运行程序" -#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10 +#: mail/em-filter-i18n.h:55 mail/message-list.etspec.h:10 msgid "Score" msgstr "分数" -#: mail/em-filter-i18n.h:55 +#: mail/em-filter-i18n.h:56 msgid "Sender" msgstr "发送者" -#: mail/em-filter-i18n.h:56 +#: mail/em-filter-i18n.h:57 msgid "Set Status" msgstr "设置状态" -#: mail/em-filter-i18n.h:57 +#: mail/em-filter-i18n.h:58 msgid "Size (kB)" msgstr "大小(kB)" -#: mail/em-filter-i18n.h:58 +#: mail/em-filter-i18n.h:59 msgid "sounds like" msgstr "发音类似" -#: mail/em-filter-i18n.h:59 +#: mail/em-filter-i18n.h:60 msgid "Source Account" msgstr "来源账户" -#: mail/em-filter-i18n.h:60 +#: mail/em-filter-i18n.h:61 msgid "Specific header" msgstr "指定信头" -#: mail/em-filter-i18n.h:61 +#: mail/em-filter-i18n.h:62 msgid "starts with" msgstr "开始于" -#: mail/em-filter-i18n.h:63 +#: mail/em-filter-i18n.h:64 msgid "Stop Processing" msgstr "停止处理" -#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1571 -#: mail/em-format-quote.c:305 mail/em-format.c:807 mail/em-mailer-prefs.c:87 -#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329 +#: mail/em-filter-i18n.h:65 mail/em-format-html.c:1534 +#: mail/em-format-quote.c:306 mail/em-format.c:853 mail/em-mailer-prefs.c:88 +#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330 #: smime/lib/e-cert.c:1131 msgid "Subject" msgstr "主题" -#: mail/em-filter-i18n.h:65 +#: mail/em-filter-i18n.h:66 msgid "Unset Status" msgstr "取消状态" @@ -13016,26 +13310,26 @@ msgstr "取消状态" msgid "<b>Then</b>" msgstr "<b>则</b>" -#: mail/em-folder-browser.c:129 +#: mail/em-folder-browser.c:133 msgid "Create _Virtual Folder From Search..." msgstr "根据搜索创建虚拟文件夹(_V)..." -#: mail/em-folder-properties.c:122 -msgid "Folder Properties" -msgstr "文件夹属性" - #. TODO: can this be done in a loop? -#: mail/em-folder-properties.c:161 +#: mail/em-folder-properties.c:143 msgid "Total message:" msgid_plural "Total messages:" msgstr[0] "总信件数：" -#: mail/em-folder-properties.c:173 +#: mail/em-folder-properties.c:155 msgid "Unread message:" msgid_plural "Unread messages:" msgstr[0] "未读信件数：" -#: mail/em-folder-selection-button.c:120 +#: mail/em-folder-properties.c:269 +msgid "Folder Properties" +msgstr "文件夹属性" + +#: mail/em-folder-selection-button.c:121 msgid "<click here to select a folder>" msgstr "<单击此处以便选择文件夹>" @@ -13043,8 +13337,8 @@ msgstr "<单击此处以便选择文件夹>" msgid "Create New Folder" msgstr "创建新文件夹" -#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2440 -#: mail/mail-component.c:712 +#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2459 +#: mail/mail-component.c:732 msgid "Specify where to create the folder:" msgstr "指定在哪里创建文件夹：" @@ -13057,7 +13351,7 @@ msgid "Folder _name:" msgstr "文件夹名称(_N)：" #: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202 -#: mail/mail-vfolder.c:872 +#: mail/mail-vfolder.c:880 msgid "VFolders" msgstr "虚拟文件夹" @@ -13070,317 +13364,301 @@ msgstr "不匹配" msgid "Loading..." msgstr "正在装入..." -#: mail/em-folder-tree.c:894 +#: mail/em-folder-tree.c:899 #, c-format msgid "Moving folder %s" msgstr "移动文件夹“%s”" -#: mail/em-folder-tree.c:896 +#: mail/em-folder-tree.c:901 #, c-format msgid "Copying folder %s" msgstr "复制文件夹 %s" -#: mail/em-folder-tree.c:903 mail/message-list.c:1613 +#: mail/em-folder-tree.c:908 mail/message-list.c:1617 #, c-format msgid "Moving messages into folder %s" msgstr "把信件移动到文件夹 %s" -#: mail/em-folder-tree.c:905 mail/message-list.c:1615 +#: mail/em-folder-tree.c:910 mail/message-list.c:1619 #, c-format msgid "Copying messages into folder %s" msgstr "把信件复制到文件夹 %s" -#: mail/em-folder-tree.c:921 +#: mail/em-folder-tree.c:926 msgid "Cannot drop message(s) into toplevel store" msgstr "无法将信件放到顶级文件夹存储" -#: mail/em-folder-tree.c:1011 ui/evolution-mail-message.xml.h:110 +#: mail/em-folder-tree.c:1022 ui/evolution-mail-message.xml.h:110 msgid "_Copy to Folder" msgstr "复制到文件夹(_C)" -#: mail/em-folder-tree.c:1012 ui/evolution-mail-message.xml.h:119 +#: mail/em-folder-tree.c:1023 ui/evolution-mail-message.xml.h:119 msgid "_Move to Folder" msgstr "移动到文件夹(_M)" -#: mail/em-folder-tree.c:1014 mail/em-folder-tree.c:2226 -#: mail/em-folder-view.c:806 mail/message-list.c:1703 -msgid "_Move" -msgstr "移动(_M)" - -#: mail/em-folder-tree.c:1016 mail/message-list.c:1705 -msgid "Cancel _Drag" -msgstr "取消拖曳(_D)" - -#: mail/em-folder-tree.c:1707 mail/mail-ops.c:1013 +#: mail/em-folder-tree.c:1722 mail/mail-ops.c:1015 #, c-format msgid "Scanning folders in \"%s\"" msgstr "在“%s”中扫描文件夹" -#: mail/em-folder-tree.c:2213 mail/em-folder-tree.c:2226 -#: mail/em-folder-view.c:806 mail/em-folder-view.c:820 -#: mail/importers/evolution-mbox-importer.c:119 -#: mail/importers/evolution-outlook-importer.c:133 +#: mail/em-folder-tree.c:2229 mail/em-folder-tree.c:2243 +#: mail/em-folder-view.c:823 mail/em-folder-view.c:838 +#: mail/importers/evolution-mbox-importer.c:120 +#: mail/importers/evolution-outlook-importer.c:134 msgid "Select folder" msgstr "选择文件夹" -#: mail/em-folder-tree.c:2213 mail/em-folder-view.c:820 +#: mail/em-folder-tree.c:2229 mail/em-folder-view.c:838 msgid "C_opy" msgstr "复制(_O)" -#: mail/em-folder-tree.c:2253 +#: mail/em-folder-tree.c:2270 #, c-format msgid "Creating folder `%s'" msgstr "创建文件夹“%s”" -#: mail/em-folder-tree.c:2440 mail/mail-component.c:712 +#: mail/em-folder-tree.c:2459 mail/mail-component.c:732 msgid "Create folder" msgstr "创建文件夹" -#: mail/em-folder-tree.c:2631 +#: mail/em-folder-tree.c:2652 #, c-format msgid "Rename the \"%s\" folder to:" msgstr "把文件夹“%s”重命名为：" -#: mail/em-folder-tree.c:2633 +#: mail/em-folder-tree.c:2654 msgid "Rename Folder" msgstr "重命名文件夹" -#: mail/em-folder-tree.c:2708 ui/evolution-addressbook.xml.h:44 +#: mail/em-folder-tree.c:2730 ui/evolution-addressbook.xml.h:44 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37 msgid "_View" msgstr "查看(_V)" -#: mail/em-folder-tree.c:2709 +#: mail/em-folder-tree.c:2731 msgid "Open in _New Window" msgstr "在新窗口中打开(_N)" -#: mail/em-folder-tree.c:2713 +#: mail/em-folder-tree.c:2735 msgid "_Copy..." msgstr "复制(_C)..." -#: mail/em-folder-tree.c:2714 +#: mail/em-folder-tree.c:2736 msgid "_Move..." msgstr "移动(_M)..." #. FIXME: need to disable for nochildren folders -#: mail/em-folder-tree.c:2718 +#: mail/em-folder-tree.c:2740 msgid "_New Folder..." msgstr "新建文件夹(_N)..." -#: mail/em-folder-tree.c:2721 +#: mail/em-folder-tree.c:2743 msgid "_Rename..." msgstr "重命名(_R)..." -#: mail/em-folder-tree.c:2724 ui/evolution-mail-list.xml.h:27 -msgid "_Properties" -msgstr "属性(_P)" - -#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 }, -#: mail/em-folder-view.c:903 mail/em-popup.c:690 -#: ui/evolution-mail-message.xml.h:113 +#: mail/em-folder-view.c:928 ui/evolution-mail-message.xml.h:113 msgid "_Edit as New Message..." msgstr "作为新信件进行编辑(_E)..." -#: mail/em-folder-view.c:905 +#: mail/em-folder-view.c:930 msgid "_Print" msgstr "打印(_P)" -#: mail/em-folder-view.c:908 ui/evolution-mail-message.xml.h:127 +#: mail/em-folder-view.c:933 ui/evolution-mail-message.xml.h:127 msgid "_Reply to Sender" msgstr "回复发件人(_R)" -#: mail/em-folder-view.c:909 mail/em-popup.c:811 +#: mail/em-folder-view.c:934 mail/em-popup.c:502 #: ui/evolution-mail-message.xml.h:88 msgid "Reply to _List" msgstr "回复邮件列表(_L)" -#: mail/em-folder-view.c:910 mail/em-popup.c:812 +#: mail/em-folder-view.c:935 mail/em-popup.c:503 #: ui/evolution-mail-message.xml.h:87 msgid "Reply to _All" msgstr "回复所有人(_A)" -#: mail/em-folder-view.c:911 mail/em-popup.c:814 +#: mail/em-folder-view.c:936 mail/em-popup.c:505 #: ui/evolution-mail-message.xml.h:114 msgid "_Forward" msgstr "转发(_F)" -#: mail/em-folder-view.c:914 +#: mail/em-folder-view.c:939 msgid "Follo_w Up..." msgstr "跟随(_W)..." -#: mail/em-folder-view.c:915 +#: mail/em-folder-view.c:940 msgid "Fla_g Completed" msgstr "已完成标志(_G)" -#: mail/em-folder-view.c:916 +#: mail/em-folder-view.c:941 msgid "Cl_ear Flag" msgstr "清除标志(_E)" -#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:50 +#: mail/em-folder-view.c:944 ui/evolution-mail-message.xml.h:50 msgid "Mar_k as Read" msgstr "标记为已读(_K)" -#: mail/em-folder-view.c:920 +#: mail/em-folder-view.c:945 msgid "Mark as _Unread" msgstr "标记为未读(_U)" -#: mail/em-folder-view.c:921 +#: mail/em-folder-view.c:946 msgid "Mark as _Important" msgstr "标记为重要(_I)" -#: mail/em-folder-view.c:922 +#: mail/em-folder-view.c:947 msgid "_Mark as Unimportant" msgstr "标记为不重要(_M)" -#: mail/em-folder-view.c:923 ui/evolution-mail-message.xml.h:54 +#: mail/em-folder-view.c:948 ui/evolution-mail-message.xml.h:54 msgid "Mark as _Junk" msgstr "标记为垃圾(_J)" -#: mail/em-folder-view.c:924 ui/evolution-mail-message.xml.h:55 +#: mail/em-folder-view.c:949 ui/evolution-mail-message.xml.h:55 msgid "Mark as _Not Junk" msgstr "标记为非垃圾(_N)" -#: mail/em-folder-view.c:928 +#: mail/em-folder-view.c:953 msgid "U_ndelete" msgstr "取消删除(_N)" -#: mail/em-folder-view.c:931 +#: mail/em-folder-view.c:956 msgid "Mo_ve to Folder..." msgstr "移动到文件夹(_V)..." -#: mail/em-folder-view.c:932 ui/evolution-addressbook.xml.h:32 +#: mail/em-folder-view.c:957 ui/evolution-addressbook.xml.h:32 msgid "_Copy to Folder..." msgstr "复制到文件夹(_C)..." -#: mail/em-folder-view.c:940 +#: mail/em-folder-view.c:965 msgid "Add Sender to Address_book" msgstr "将发件人添加到地址簿(_B)" -#: mail/em-folder-view.c:943 +#: mail/em-folder-view.c:968 msgid "Appl_y Filters" msgstr "应用过滤规则(_Y)" -#: mail/em-folder-view.c:944 +#: mail/em-folder-view.c:969 msgid "F_ilter Junk" msgstr "过滤垃圾(_I)" -#: mail/em-folder-view.c:947 +#: mail/em-folder-view.c:972 msgid "Crea_te Rule From Message" msgstr "根据信件创建规则(_T)" -#: mail/em-folder-view.c:948 +#: mail/em-folder-view.c:973 msgid "VFolder on _Subject" msgstr "基于主题的虚拟文件夹(_S)" -#: mail/em-folder-view.c:949 +#: mail/em-folder-view.c:974 msgid "VFolder on Se_nder" msgstr "基于发件人的虚拟文件夹(_N)" -#: mail/em-folder-view.c:950 +#: mail/em-folder-view.c:975 msgid "VFolder on _Recipients" msgstr "基于收件人的虚拟文件夹(_R)" -#: mail/em-folder-view.c:951 +#: mail/em-folder-view.c:976 msgid "VFolder on Mailing _List" msgstr "基于邮件列表的虚拟文件夹(_L)" -#: mail/em-folder-view.c:955 +#: mail/em-folder-view.c:980 msgid "Filter on Sub_ject" msgstr "基于主题过滤(_J)" -#: mail/em-folder-view.c:956 +#: mail/em-folder-view.c:981 msgid "Filter on Sen_der" msgstr "基于发件人过滤(_D)" -#: mail/em-folder-view.c:957 +#: mail/em-folder-view.c:982 msgid "Filter on Re_cipients" msgstr "基于收件人过滤(_C)" -#: mail/em-folder-view.c:958 +#: mail/em-folder-view.c:983 msgid "Filter on _Mailing List" msgstr "基于邮件列表过滤(_M)" #. default charset used in mail view -#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754 -#: mail/mail-config.glade.h:68 +#: mail/em-folder-view.c:1760 mail/em-folder-view.c:1803 msgid "Default" msgstr "默认" -#: mail/em-folder-view.c:1851 +#: mail/em-folder-view.c:1900 msgid "Print Message" msgstr "打印信件" -#: mail/em-folder-view.c:2118 +#: mail/em-folder-view.c:2179 msgid "_Copy Link Location" msgstr "复制链接位置(_C)" -#: mail/em-folder-view.c:2384 +#: mail/em-folder-view.c:2462 #, c-format msgid "Click to mail %s" msgstr "单击以给 %s 发送邮件" #. message-search popup match count string -#: mail/em-format-html-display.c:410 +#: mail/em-format-html-display.c:405 #, c-format msgid "Matches: %d" msgstr "匹配：%d" -#: mail/em-format-html-display.c:643 mail/em-format-html.c:582 +#: mail/em-format-html-display.c:638 mail/em-format-html.c:580 msgid "Unsigned" msgstr "未签名" -#: mail/em-format-html-display.c:643 +#: mail/em-format-html-display.c:638 msgid "" "This message is not signed. There is no guarantee that this message is " "authentic." msgstr "此信件未签名。无法保证这封信是可信的。" -#: mail/em-format-html-display.c:644 mail/em-format-html.c:583 +#: mail/em-format-html-display.c:639 mail/em-format-html.c:581 msgid "Valid signature" msgstr "有效签名" -#: mail/em-format-html-display.c:644 +#: mail/em-format-html-display.c:639 msgid "" "This message is signed and is valid meaning that it is very likely that this " "message is authentic." msgstr "此信件已签名，而且签名是有效的。这意味着这封信应该是可信的。" -#: mail/em-format-html-display.c:645 mail/em-format-html.c:584 +#: mail/em-format-html-display.c:640 mail/em-format-html.c:582 msgid "Invalid signature" msgstr "无效签名" -#: mail/em-format-html-display.c:645 +#: mail/em-format-html-display.c:640 msgid "" "The signature of this message cannot be verified, it may have been altered " "in transit." msgstr "无法校验这封信的签名，可能在传送的过程中邮件被篡改了。" -#: mail/em-format-html-display.c:646 +#: mail/em-format-html-display.c:641 msgid "Valid signature, cannot verify sender" msgstr "签名有效，无法校验发送者" -#: mail/em-format-html-display.c:646 +#: mail/em-format-html-display.c:641 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:652 mail/em-format-html.c:591 +#: mail/em-format-html-display.c:647 mail/em-format-html.c:589 msgid "Unencrypted" msgstr "未加密" -#: mail/em-format-html-display.c:652 +#: mail/em-format-html-display.c:647 msgid "" "This message is not encrypted. Its content may be viewed in transit across " "the Internet." msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。" -#: mail/em-format-html-display.c:653 mail/em-format-html.c:592 +#: mail/em-format-html-display.c:648 mail/em-format-html.c:590 msgid "Encrypted, weak" msgstr "弱加密" -#: mail/em-format-html-display.c:653 +#: mail/em-format-html-display.c:648 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 " @@ -13389,21 +13667,21 @@ msgstr "" "这封信已加密，但使用的是弱加密算法。如果外人想要查看这封信的内容，可能要花大" "量时间进行暴力破解，这很困难但并不是不可能。" -#: mail/em-format-html-display.c:654 mail/em-format-html.c:593 +#: mail/em-format-html-display.c:649 mail/em-format-html.c:591 msgid "Encrypted" msgstr "加密" -#: mail/em-format-html-display.c:654 +#: mail/em-format-html-display.c:649 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:655 mail/em-format-html.c:594 +#: mail/em-format-html-display.c:650 mail/em-format-html.c:592 msgid "Encrypted, strong" msgstr "强加密" -#: mail/em-format-html-display.c:655 +#: mail/em-format-html-display.c:650 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 " @@ -13412,178 +13690,183 @@ msgstr "" "这封信已加密，且使用的是强加密算法。如果外人想要查看这封信的内容，可能要花大" "量时间进行暴力破解，这十分困难。" -#: mail/em-format-html-display.c:756 smime/gui/smime-ui.glade.h:47 +#: mail/em-format-html-display.c:751 smime/gui/smime-ui.glade.h:47 msgid "_View Certificate" msgstr "查看证书(_V)" -#: mail/em-format-html-display.c:771 +#: mail/em-format-html-display.c:766 msgid "This certificate is not viewable" msgstr "此证书不可查看" -#: mail/em-format-html-display.c:1006 +#: mail/em-format-html-display.c:995 msgid "Completed on %B %d, %Y, %l:%M %p" msgstr "%Y年%m月%d日%A，%H:%M完成" -#: mail/em-format-html-display.c:1014 +#: mail/em-format-html-display.c:1003 msgid "Overdue:" msgstr "延误：" -#: mail/em-format-html-display.c:1017 +#: mail/em-format-html-display.c:1006 msgid "by %B %d, %Y, %l:%M %p" msgstr "到 %m月%d日%A，%H:%M" -#: mail/em-format-html-display.c:1056 +#: mail/em-format-html-display.c:1053 msgid "_View Inline" msgstr "嵌入视图(_V)" -#: mail/em-format-html-display.c:1057 +#: mail/em-format-html-display.c:1054 msgid "_Hide" msgstr "隐藏(_H)" +#: mail/em-format-html-display.c:1298 +#, fuzzy +msgid "Attachment Button" +msgstr "附件" + #: mail/em-format-html-print.c:130 #, c-format msgid "Page %d of %d" msgstr "第 %d 页，共 %d 页" -#: mail/em-format-html.c:475 mail/em-format-html.c:477 +#: mail/em-format-html.c:473 mail/em-format-html.c:475 #, c-format msgid "Retrieving `%s'" msgstr "收取“%s”" -#: mail/em-format-html.c:585 +#: mail/em-format-html.c:583 msgid "Valid signature but cannot verify sender" msgstr "签名有效但是无法校验发送者" -#: mail/em-format-html.c:871 +#: mail/em-format-html.c:841 msgid "Malformed external-body part." msgstr "格式不正确的 external-body 部分。" -#: mail/em-format-html.c:901 +#: mail/em-format-html.c:871 #, c-format msgid "Pointer to FTP site (%s)" msgstr "指向 FTP 站点 (%s)" -#: mail/em-format-html.c:912 +#: mail/em-format-html.c:882 #, c-format msgid "Pointer to local file (%s) valid at site \"%s\"" msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法" -#: mail/em-format-html.c:914 +#: mail/em-format-html.c:884 #, c-format msgid "Pointer to local file (%s)" msgstr "指向本地文件 (%s)" -#: mail/em-format-html.c:935 +#: mail/em-format-html.c:905 #, c-format msgid "Pointer to remote data (%s)" msgstr "指向远程数据 (%s)" -#: mail/em-format-html.c:946 +#: mail/em-format-html.c:916 #, c-format msgid "Pointer to unknown external data (\"%s\" type)" msgstr "指向未知的外部数据 (“%s”类型)" -#: mail/em-format-html.c:1186 +#: mail/em-format-html.c:1138 msgid "Formatting message" msgstr "格式化信件" -#: mail/em-format-html.c:1462 mail/em-format-quote.c:192 mail/em-format.c:802 -#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7 -#: mail/message-tag-followup.c:325 +#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:848 +#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7 +#: mail/message-tag-followup.c:326 msgid "From" msgstr "发件人" -#: mail/em-format-html.c:1462 mail/em-format-quote.c:192 mail/em-format.c:803 -#: mail/em-mailer-prefs.c:83 +#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:849 +#: mail/em-mailer-prefs.c:84 msgid "Reply-To" msgstr "回复至" -#: mail/em-format-html.c:1462 mail/em-format-quote.c:192 mail/em-format.c:804 -#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14 +#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:850 +#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14 msgid "To" msgstr "收件人" -#: mail/em-format-html.c:1462 mail/em-format-quote.c:192 mail/em-format.c:805 -#: mail/em-mailer-prefs.c:85 +#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:851 +#: mail/em-mailer-prefs.c:86 msgid "Cc" msgstr "抄送" -#: mail/em-format-html.c:1462 mail/em-format-quote.c:192 mail/em-format.c:806 -#: mail/em-mailer-prefs.c:86 +#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:852 +#: mail/em-mailer-prefs.c:87 msgid "Bcc" msgstr "密件抄送" #. pseudo-header -#: mail/em-format-html.c:1575 mail/em-format-quote.c:314 -#: mail/em-mailer-prefs.c:939 +#: mail/em-format-html.c:1538 mail/em-format-quote.c:315 +#: mail/em-mailer-prefs.c:984 msgid "Mailer" msgstr "邮件程序" #. translators: strftime format for local time equivalent in Date header display, with day -#: mail/em-format-html.c:1602 +#: mail/em-format-html.c:1565 msgid "<I> (%a, %R %Z)</I>" msgstr "<I> (%A，%R %Z)</I>" #. translators: strftime format for local time equivalent in Date header display, without day -#: mail/em-format-html.c:1605 +#: mail/em-format-html.c:1568 msgid "<I> (%R %Z)</I>" msgstr "<I> (%R %Z)</I>" -#: mail/em-format-html.c:1615 mail/em-format-quote.c:321 mail/em-format.c:808 -#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2 +#: mail/em-format-html.c:1578 mail/em-format-quote.c:322 mail/em-format.c:854 +#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2 msgid "Date" msgstr "日期" -#: mail/em-format-html.c:1638 mail/em-format.c:809 mail/em-mailer-prefs.c:89 +#: mail/em-format-html.c:1601 mail/em-format.c:855 mail/em-mailer-prefs.c:90 msgid "Newsgroups" msgstr "新闻组" -#: mail/em-format.c:1058 +#: mail/em-format.c:1104 #, c-format msgid "%s attachment" msgstr "%s 附件" -#: mail/em-format.c:1097 mail/em-format.c:1230 +#: mail/em-format.c:1143 mail/em-format.c:1276 msgid "Could not parse S/MIME message: Unknown error" msgstr "无法解析 S/MIME 信件：未知错误" -#: mail/em-format.c:1220 +#: mail/em-format.c:1266 msgid "Unsupported encryption type for multipart/encrypted" msgstr "不支持 multipart/encrypted 的加密类型" -#: mail/em-format.c:1381 +#: mail/em-format.c:1414 msgid "Could not parse MIME message. Displaying as source." msgstr "无法解析 MIME 信件。显示源文本。" -#: mail/em-format.c:1400 +#: mail/em-format.c:1433 msgid "Unsupported signature format" msgstr "不支持的签名格式" -#: mail/em-format.c:1408 +#: mail/em-format.c:1441 msgid "Error verifying signature" msgstr "校验签名错误" -#: mail/em-format.c:1408 +#: mail/em-format.c:1441 msgid "Unknown error verifying signature" msgstr "校验签名发生了未知错误" -#: mail/em-junk-filter.c:86 +#: mail/em-junk-filter.c:110 msgid "Spamassassin (built-in)" msgstr "垃圾克星(内置)" -#: mail/em-mailer-prefs.c:100 +#: mail/em-mailer-prefs.c:101 msgid "Every time" msgstr "每次" -#: mail/em-mailer-prefs.c:101 +#: mail/em-mailer-prefs.c:102 msgid "Once per day" msgstr "每天一次" -#: mail/em-mailer-prefs.c:102 +#: mail/em-mailer-prefs.c:103 msgid "Once per week" msgstr "每周一次" -#: mail/em-mailer-prefs.c:103 +#: mail/em-mailer-prefs.c:104 msgid "Once per month" msgstr "每月一次" @@ -13628,17 +13911,17 @@ msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”：%s" msgid "Unable to copy POP3 keep-on-server data `%s': %s" msgstr "无法复制 POP3 在服务器上保留的数据“%s”：%s" -#: mail/em-migrate.c:2415 mail/em-migrate.c:2427 +#: mail/em-migrate.c:2494 mail/em-migrate.c:2506 #, c-format msgid "Failed to create local mail storage `%s': %s" msgstr "创建本地邮件存储“%s”失败：%s" -#: mail/em-migrate.c:2578 +#: mail/em-migrate.c:2657 #, c-format msgid "Unable to create local mail folders at `%s': %s" msgstr "无法在“%s”创建本地邮件文件夹：%s" -#: mail/em-migrate.c:2596 +#: mail/em-migrate.c:2675 msgid "" "Unable to read settings from previous Evolution install, `evolution/config." "xmldb' does not exist or is corrupt." @@ -13646,62 +13929,62 @@ msgstr "" "无法从先前的 Evolution 安装中读取设置，“evolution/config.xmldb”不存在或者已损" "坏。" -#: mail/em-popup.c:700 +#: mail/em-popup.c:386 msgid "Save As..." msgstr "另存为..." -#: mail/em-popup.c:718 +#: mail/em-popup.c:405 #, c-format msgid "untitled_image.%s" msgstr "无标题图像.%s" -#: mail/em-popup.c:808 +#: mail/em-popup.c:499 msgid "Set as _Background" msgstr "设为背景(_B)" -#: mail/em-popup.c:810 +#: mail/em-popup.c:501 msgid "_Reply to sender" msgstr "回复发件人(_R)" -#: mail/em-popup.c:859 +#: mail/em-popup.c:553 msgid "_Open Link in Browser" msgstr "在浏览器中打开链接(_O)" -#: mail/em-popup.c:860 +#: mail/em-popup.c:554 msgid "Se_nd message to..." msgstr "把信件发送到(_N)..." -#: mail/em-popup.c:861 +#: mail/em-popup.c:555 msgid "_Add to Addressbook" msgstr "添加到地址簿(_A)" -#: mail/em-popup.c:985 +#: mail/em-popup.c:686 #, c-format msgid "Open in %s..." msgstr "在 %s 中打开..." -#: mail/em-subscribe-editor.c:612 +#: mail/em-subscribe-editor.c:613 msgid "This store does not support subscriptions, or they are not enabled." msgstr "此存储不支持订阅，或订阅未启用。" -#: mail/em-subscribe-editor.c:641 +#: mail/em-subscribe-editor.c:642 msgid "Subscribed" msgstr "已订阅" -#: mail/em-subscribe-editor.c:645 +#: mail/em-subscribe-editor.c:646 msgid "Folder" msgstr "文件夹" #. FIXME: This is just to get the shadow, is there a better way? -#: mail/em-subscribe-editor.c:860 +#: mail/em-subscribe-editor.c:861 msgid "Please select a server." msgstr "请选择服务器。" -#: mail/em-subscribe-editor.c:881 +#: mail/em-subscribe-editor.c:882 msgid "No server has been selected" msgstr "没有选中服务器" -#: mail/em-utils.c:104 +#: mail/em-utils.c:105 msgid "Don't show this message again." msgstr "不再显示此信息。" @@ -13722,7 +14005,7 @@ msgid "Add address" msgstr "添加地址" #. Drop filename for messages from a mailbox -#: mail/em-utils.c:1053 +#: mail/em-utils.c:1055 #, c-format msgid "Messages from %s" msgstr "来自 %s 的信件" @@ -13731,10 +14014,6 @@ msgstr "来自 %s 的信件" msgid "Virtual _Folders" msgstr "虚拟文件夹(_F)" -#: mail/em-vfolder-rule.c:494 -msgid "_Add" -msgstr "添加(_A)" - #: mail/em-vfolder-rule.c:574 msgid "VFolder source" msgstr "虚拟文件夹来源" @@ -14041,10 +14320,6 @@ msgstr "在信件列表中显示删除了的信件(带有删除线)。" msgid "Show deleted messages in the message-list" msgstr "在信件列表中显示删除了的信件" -#: mail/evolution-mail.schemas.in.in.h:72 -msgid "Show the \"Preview\" pane." -msgstr "显示“预览”面板。" - #: mail/evolution-mail.schemas.in.in.h:73 msgid "Sound file to play when new mail arrives." msgstr "新邮件到达时要播放的声音文件。" @@ -14230,15 +14505,15 @@ msgid "Evolution is importing your old Elm mail" msgstr "Evolution 正在导入您原来的电子邮件" #: mail/importers/elm-importer.c:89 -#: mail/importers/evolution-mbox-importer.c:224 -#: mail/importers/evolution-outlook-importer.c:258 +#: mail/importers/evolution-mbox-importer.c:225 +#: mail/importers/evolution-outlook-importer.c:259 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117 msgid "Importing..." msgstr "正在导入..." #: mail/importers/elm-importer.c:91 -#: mail/importers/evolution-mbox-importer.c:226 -#: mail/importers/evolution-outlook-importer.c:260 +#: mail/importers/evolution-mbox-importer.c:227 +#: mail/importers/evolution-outlook-importer.c:261 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119 msgid "Please wait" msgstr "请稍候" @@ -14259,29 +14534,29 @@ msgstr "" msgid "Elm" msgstr "Elm" -#: mail/importers/evolution-mbox-importer.c:116 -#: mail/importers/evolution-outlook-importer.c:130 +#: mail/importers/evolution-mbox-importer.c:117 +#: mail/importers/evolution-outlook-importer.c:131 msgid "Destination folder:" msgstr "目的文件夹：" -#: mail/importers/evolution-mbox-importer.c:119 -#: mail/importers/evolution-outlook-importer.c:133 +#: mail/importers/evolution-mbox-importer.c:120 +#: mail/importers/evolution-outlook-importer.c:134 msgid "Select folder to import into" msgstr "选择要导入到哪个文件夹" -#: mail/importers/evolution-mbox-importer.c:222 -#: mail/importers/evolution-outlook-importer.c:256 +#: mail/importers/evolution-mbox-importer.c:223 +#: mail/importers/evolution-outlook-importer.c:257 #: mail/importers/mail-importer.c:226 #, c-format msgid "Importing `%s'" msgstr "导入“%s”" -#: mail/importers/evolution-outlook-importer.c:304 +#: mail/importers/evolution-outlook-importer.c:305 #: mail/importers/mail-importer.c:140 msgid "Importing mailbox" msgstr "导入邮箱" -#: mail/importers/mail-importer.c:361 +#: mail/importers/mail-importer.c:363 #, c-format msgid "Scanning %s" msgstr "扫描 %s" @@ -14369,10 +14644,6 @@ msgstr "Evolution 正在导入您原来的 Pine 数据" msgid "Importing Pine data" msgstr "导入 Pine 数据" -#: mail/importers/pine-importer.c:479 -msgid "Addressbook" -msgstr "地址簿" - #: mail/importers/pine-importer.c:498 msgid "" "Evolution has found Pine mail files.\n" @@ -14385,12 +14656,7 @@ msgstr "" msgid "Pine" msgstr "Pine" -#. give our dialog an OK button and title -#: mail/mail-account-editor.c:155 -msgid "Evolution Account Editor" -msgstr "Evolution 账户编辑器" - -#: mail/mail-account-gui.c:252 +#: mail/mail-account-gui.c:253 #, c-format msgid "" "\n" @@ -14402,24 +14668,24 @@ msgstr "" "请仔细阅读下方显示的 %s 许可协议\n" "并选中复选框表明您接受该协议\n" -#: mail/mail-account-gui.c:258 +#: mail/mail-account-gui.c:259 #, c-format msgid "%s License Agreement" msgstr "%s 许可协议" -#: mail/mail-account-gui.c:963 mail/mail-config.glade.h:167 +#: mail/mail-account-gui.c:964 mail/mail-config.glade.h:157 msgid "_Host:" msgstr "主机(_H)：" -#: mail/mail-account-gui.c:967 mail/mail-config.glade.h:151 +#: mail/mail-account-gui.c:968 mail/mail-config.glade.h:142 msgid "User_name:" msgstr "用户名(_N)：" -#: mail/mail-account-gui.c:971 mail/mail-config.glade.h:173 +#: mail/mail-account-gui.c:972 mail/mail-config.glade.h:163 msgid "_Path:" msgstr "路径(_P)：" -#: mail/mail-account-gui.c:1782 shell/e-shell-importer.c:643 +#: mail/mail-account-gui.c:1784 shell/e-shell-importer.c:643 msgid "Select a file" msgstr "选择一个文件" @@ -14447,157 +14713,88 @@ msgstr "%s 邮件列表" msgid "Add Filter Rule" msgstr "添加过滤规则" -#: mail/mail-component.c:135 +#: mail/mail-component.c:139 msgid "Drafts" msgstr "草稿" -#: mail/mail-component.c:136 +#: mail/mail-component.c:140 msgid "Outbox" msgstr "发件箱" -#: mail/mail-component.c:137 +#: mail/mail-component.c:141 msgid "Sent" msgstr "已发箱" -#: mail/mail-component.c:464 +#: mail/mail-component.c:484 #, c-format msgid "%d deleted" msgid_plural "%d deleted" msgstr[0] "%d 封已删除" -#: mail/mail-component.c:466 +#: mail/mail-component.c:486 #, c-format msgid "%d junk" msgid_plural "%d junk" msgstr[0] "%d 封垃圾" -#: mail/mail-component.c:489 +#: mail/mail-component.c:509 #, c-format msgid "%d draft" msgid_plural "%d drafts" msgstr[0] "%d 封草稿" -#: mail/mail-component.c:491 +#: mail/mail-component.c:511 #, c-format msgid "%d sent" msgid_plural "%d sent" msgstr[0] "%d 已发" -#: mail/mail-component.c:493 +#: mail/mail-component.c:513 #, c-format msgid "%d unsent" msgid_plural "%d unsent" msgstr[0] "%d 封未发" -#: mail/mail-component.c:497 +#: mail/mail-component.c:517 #, c-format msgid "%d total" msgid_plural "%d total" msgstr[0] "总共 %d 封" -#: mail/mail-component.c:499 +#: mail/mail-component.c:519 #, c-format msgid ", %d unread" msgid_plural ", %d unread" msgstr[0] "，%d 封未读" -#: mail/mail-component.c:664 +#: mail/mail-component.c:684 msgid "New Mail Message" msgstr "新建信件" -#: mail/mail-component.c:665 +#: mail/mail-component.c:685 msgid "_Mail Message" msgstr "信件(_M)" -#: mail/mail-component.c:666 +#: mail/mail-component.c:686 msgid "Compose a new mail message" msgstr "撰写一封新信" -#: mail/mail-component.c:672 +#: mail/mail-component.c:692 msgid "New Mail Folder" msgstr "新建邮件文件夹" -#: mail/mail-component.c:673 +#: mail/mail-component.c:693 msgid "Mail _Folder" msgstr "邮件文件夹(_F)" -#: mail/mail-component.c:674 +#: mail/mail-component.c:694 msgid "Create a new mail folder" msgstr "创建新邮件文件夹" -#: mail/mail-component.c:806 +#: mail/mail-component.c:826 msgid "Failed upgrading Mail settings or folders." msgstr "升级邮件设置或文件夹失败。" -#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92 -msgid "Identity" -msgstr "标识" - -#: mail/mail-config-druid.c:364 -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 " -"information in email you send." -msgstr "" -"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入，除非您想要在您发" -"出的邮件中包含此信息。" - -#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377 -#: mail/mail-config.glade.h:119 -msgid "Receiving Mail" -msgstr "接收邮件" - -#: mail/mail-config-druid.c:372 -msgid "" -"Please enter information about your incoming mail server below. If you are " -"not sure, ask your system administrator or Internet Service Provider." -msgstr "" -"请在下面输入您的收件服务器信息。如果您不太确定的话，请询问您的系统管理员或者" -"互联网服务提供商 ISP。" - -#: mail/mail-config-druid.c:379 -msgid "Please select among the following options" -msgstr "请从以下选项中选择" - -#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131 -msgid "Sending Mail" -msgstr "发送邮件" - -#: mail/mail-config-druid.c:384 -msgid "" -"Please enter information about the way you will send mail. If you are not " -"sure, ask your system administrator or Internet Service Provider." -msgstr "" -"请在下面输入您的发件服务器信息。如果您不太确定的话，请询问您的系统管理员或者" -"互联网服务提供商ISP。" - -#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37 -msgid "Account Management" -msgstr "账户管理" - -#: mail/mail-config-druid.c:391 -msgid "" -"You are almost done with the mail configuration process. The identity, " -"incoming mail server and outgoing mail transport method which you provided " -"will be grouped together to make an Evolution mail account. Please enter a " -"name for this account in the space below. This name will be used for display " -"purposes only." -msgstr "" -"您即将完成邮件配置的过程了。您提供的用于收件服务器和发送方式将被组合在一起，" -"成为 Evolution 的邮件帐户。请在下面输入此帐户的名称。此名称只会用作显示。" - -#: mail/mail-config.c:895 -msgid "Checking Service" -msgstr "检查服务" - -#. FIXME: make this use e-error. -#. * It has to be modal otherwise we can get nasty re-entrancy whilst waiting for the -#. * subthread to complete. -#. * FIXME: make this whole function async to deal with this issue -#: mail/mail-config.c:977 mail/mail-config.c:981 -msgid "Connecting to server..." -msgstr "正在连接服务器..." - #: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5 msgid " " msgstr " " @@ -14607,7 +14804,8 @@ msgid " Ch_eck for Supported Types " msgstr "检查支持的类型(_E)" #: mail/mail-config.glade.h:5 -msgid "<b>SSL is not supported in this build of evolution</b>" +#, fuzzy +msgid "<b>SSL is not supported in this build of Evolution</b>" msgstr "<b>(在此版本的 evolution 中不支持 SSL)</b>" #: mail/mail-config.glade.h:6 @@ -14639,190 +14837,199 @@ msgid "<span weight=\"bold\">Authentication</span>" msgstr "<span weight=\"bold\">身份验证</span>" #: mail/mail-config.glade.h:13 -msgid "<span weight=\"bold\">Checking for New Mail</span>" -msgstr "<span weight=\"bold\">检查新邮件</span>" - -#: mail/mail-config.glade.h:14 msgid "<span weight=\"bold\">Composing Messages</span>" msgstr "<span weight=\"bold\">撰写信件</span>" -#: mail/mail-config.glade.h:15 +#: mail/mail-config.glade.h:14 msgid "<span weight=\"bold\">Configuration</span>" msgstr "<span weight=\"bold\">配置</span>" -#: mail/mail-config.glade.h:16 +#: mail/mail-config.glade.h:15 msgid "<span weight=\"bold\">Default Behavior</span>" msgstr "<span weight=\"bold\">默认行为</span>" -#: mail/mail-config.glade.h:17 +#: mail/mail-config.glade.h:16 msgid "<span weight=\"bold\">Delete Mail</span>" msgstr "<span weight=\"bold\">删除邮件</span>" -#: mail/mail-config.glade.h:18 +#: mail/mail-config.glade.h:17 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>" msgstr "<span weight=\"bold\">显示的邮件头(_H)</span>" -#: mail/mail-config.glade.h:19 +#: mail/mail-config.glade.h:18 msgid "<span weight=\"bold\">Filter Options</span>" msgstr "<span weight=\"bold\">过滤器选项</span>" -#: mail/mail-config.glade.h:20 +#: mail/mail-config.glade.h:19 msgid "<span weight=\"bold\">General</span>" msgstr "<span weight=\"bold\">常规</span>" -#: mail/mail-config.glade.h:21 +#: mail/mail-config.glade.h:20 msgid "<span weight=\"bold\">Labels and Colors</span>" msgstr "<span weight=\"bold\">标签和颜色</span>" -#: mail/mail-config.glade.h:22 +#: mail/mail-config.glade.h:21 msgid "<span weight=\"bold\">Loading Images</span>" msgstr "<span weight=\"bold\">装入图像</span>" -#: mail/mail-config.glade.h:23 +#: mail/mail-config.glade.h:22 msgid "<span weight=\"bold\">Message Display</span>" msgstr "<span weight=\"bold\">信件显示</span>" -#: mail/mail-config.glade.h:24 +#: mail/mail-config.glade.h:23 msgid "<span weight=\"bold\">Message Fonts</span>" msgstr "<span weight=\"bold\">信件字体</span>" -#: mail/mail-config.glade.h:25 +#: mail/mail-config.glade.h:24 msgid "<span weight=\"bold\">New Mail Notification</span>" msgstr "<span weight=\"bold\">新邮件提醒</span>" -#: mail/mail-config.glade.h:26 +#: mail/mail-config.glade.h:25 msgid "<span weight=\"bold\">Optional Information</span>" msgstr "<span weight=\"bold\">可选信息</span>" -#: mail/mail-config.glade.h:27 +#: mail/mail-config.glade.h:26 msgid "<span weight=\"bold\">Options</span>" msgstr "<span weight=\"bold\">选项</span>" -#: mail/mail-config.glade.h:28 +#: mail/mail-config.glade.h:27 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>" msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>" -#: mail/mail-config.glade.h:29 +#: mail/mail-config.glade.h:28 msgid "<span weight=\"bold\">Printed Fonts</span>" msgstr "<span weight=\"bold\">打印字体</span>" -#: mail/mail-config.glade.h:30 +#: mail/mail-config.glade.h:29 msgid "<span weight=\"bold\">Required Information</span>" msgstr "<span weight=\"bold\">请求的信息</span>" -#: mail/mail-config.glade.h:31 +#: mail/mail-config.glade.h:30 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>" msgstr "<span weight=\"bold\">安全 MIME(S/MIME)</span>" -#: mail/mail-config.glade.h:32 +#: mail/mail-config.glade.h:31 msgid "<span weight=\"bold\">Security</span>" msgstr "<span weight=\"bold\">安全</span>" -#: mail/mail-config.glade.h:33 +#: mail/mail-config.glade.h:32 msgid "<span weight=\"bold\">Sent and Draft Messages</span>" msgstr "<span weight=\"bold\">已发送和草稿信件</span>" -#: mail/mail-config.glade.h:34 +#: mail/mail-config.glade.h:33 msgid "<span weight=\"bold\">Server Configuration</span>" msgstr "<span weight=\"bold\">服务器配置</span>" -#: mail/mail-config.glade.h:35 -msgid "A_lso encrypt to self when sending encrypted mail" -msgstr "当发送加密邮件时总是对自身加密(_L)" - -#: mail/mail-config.glade.h:36 +#: mail/mail-config.glade.h:34 msgid "Account Editor" msgstr "账户编辑器" -#: mail/mail-config.glade.h:38 +#: mail/mail-config.glade.h:35 +msgid "Account Management" +msgstr "账户管理" + +#: mail/mail-config.glade.h:36 msgid "Add Ne_w Signature..." msgstr "添加新签名(_N)..." -#: mail/mail-config.glade.h:39 +#: mail/mail-config.glade.h:37 msgid "Add _Script" msgstr "添加脚本(_S)" -#: mail/mail-config.glade.h:40 -msgid "Al_ways encrypt to myself when sending encrypted mail" -msgstr "当发送加密邮件时总是对自身加密(_W)" +#: mail/mail-config.glade.h:38 +#, fuzzy +msgid "Al_ways sign outgoing messages when using this account" +msgstr "当使用该账户时总是发送签名信件(_S)" -#: mail/mail-config.glade.h:41 +#: mail/mail-config.glade.h:39 +#, fuzzy +msgid "Also encrypt to sel_f when sending encrypted mail" +msgstr "当发送加密邮件时总是对自身加密(_L)" + +#: mail/mail-config.glade.h:40 msgid "Alway_s carbon-copy (cc) to:" msgstr "总是抄送到(_S)：" -#: mail/mail-config.glade.h:43 +#: mail/mail-config.glade.h:41 msgid "Always _blind carbon-copy (bcc) to:" msgstr "总是暗送到(_B)：" -#: mail/mail-config.glade.h:44 -msgid "Always _sign outgoing messages when using this account" -msgstr "当使用该账户时总是发送签名信件(_S)" - -#: mail/mail-config.glade.h:45 +#: mail/mail-config.glade.h:42 msgid "Always _trust keys in my keyring when encrypting" msgstr "加密时总是信任我的密钥环中的密钥(_T)" -#: mail/mail-config.glade.h:46 +#: mail/mail-config.glade.h:43 +#, fuzzy +msgid "Always encrypt to _myself when sending encrypted mail" +msgstr "当发送加密邮件时总是对自身加密(_W)" + +#: mail/mail-config.glade.h:44 msgid "Attach original message" msgstr "附加原始信件" -#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1 +#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1 msgid "Attachment" msgstr "附件" -#: mail/mail-config.glade.h:48 +#: mail/mail-config.glade.h:46 msgid "Automatically _insert smiley images" msgstr "自动插入笑脸图像(_I)" -#: mail/mail-config.glade.h:49 -msgid "Automatically check for _new mail every" -msgstr "自动检查新邮件的间隔(_N)" - -#: mail/mail-config.glade.h:50 +#: mail/mail-config.glade.h:47 msgid "Baltic (ISO-8859-13)" msgstr "波罗的语(ISO-8859-13)" -#: mail/mail-config.glade.h:51 +#: mail/mail-config.glade.h:48 msgid "Baltic (ISO-8859-4)" msgstr "波罗的语(ISO-8859-4)" -#: mail/mail-config.glade.h:52 +#: mail/mail-config.glade.h:49 msgid "Beep w_hen new mail arrives" msgstr "新邮件到达时响铃(_H)" -#: mail/mail-config.glade.h:53 +#: mail/mail-config.glade.h:50 msgid "C_haracter set:" msgstr "字符集(_H)" -#: mail/mail-config.glade.h:54 +#: mail/mail-config.glade.h:51 msgid "Ch_eck for Supported Types " msgstr "检查支持的类型(_E)" -#: mail/mail-config.glade.h:55 +#: mail/mail-config.glade.h:52 msgid "Check _incoming mail for junk" msgstr "检查收到的邮件是否是垃圾邮件(_I)" -#: mail/mail-config.glade.h:56 +#: mail/mail-config.glade.h:53 msgid "Check spelling while I _type" msgstr "在我输入时进行拼写检查(_T)" -#: mail/mail-config.glade.h:57 +#: mail/mail-config.glade.h:54 msgid "Checks incoming mail messages to be Junk" msgstr "检查收到的信件是否是垃圾邮件" -#: mail/mail-config.glade.h:58 +#: mail/mail-config.glade.h:55 +#, fuzzy +msgid "Cle_ar" +msgstr "清除(_C)" + +#: mail/mail-config.glade.h:56 +#, fuzzy +msgid "Clea_r" +msgstr "清除(_C)" + +#: mail/mail-config.glade.h:57 msgid "Color for _misspelled words:" msgstr "给错误拼写的单词着色(_M)：" -#: mail/mail-config.glade.h:59 +#: mail/mail-config.glade.h:58 msgid "Colors" msgstr "颜色" -#: mail/mail-config.glade.h:60 +#: mail/mail-config.glade.h:59 msgid "Confirm _when expunging a folder" msgstr "销毁文件夹时确认(_W)" -#: mail/mail-config.glade.h:61 +#: mail/mail-config.glade.h:60 msgid "" "Congratulations, your mail configuration is complete.\n" "\n" @@ -14837,241 +15044,263 @@ msgstr "" "\n" "单击“应用”可保存您的设置。" -#: mail/mail-config.glade.h:67 +#: mail/mail-config.glade.h:66 msgid "De_fault" msgstr "默认(_F)" -#: mail/mail-config.glade.h:69 +#: mail/mail-config.glade.h:67 msgid "Default character e_ncoding:" msgstr "默认字符编码(_N)：" -#: mail/mail-config.glade.h:70 +#: mail/mail-config.glade.h:68 msgid "Defaults" msgstr "默认" -#: mail/mail-config.glade.h:72 +#: mail/mail-config.glade.h:70 +#, fuzzy +msgid "Digitally _sign outgoing messages (by default)" +msgstr "对寄出的信件进行数字签名(默认)(_D)" + +#: mail/mail-config.glade.h:71 msgid "Do not quote original message" msgstr "无法引用原始信件" -#: mail/mail-config.glade.h:73 -msgid "Don't sign _meeting requests (for Outlook compatibility)" -msgstr "不要签名会议请求(同 Outlook 兼容)(_M)" - -#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1 +#: mail/mail-config.glade.h:72 shell/evolution-startup-wizard.glade.h:1 msgid "Done" msgstr "完成" -#: mail/mail-config.glade.h:75 +#: mail/mail-config.glade.h:73 msgid "Drafts _Folder:" msgstr "草稿文件夹(_F)：" -#: mail/mail-config.glade.h:77 +#: mail/mail-config.glade.h:75 msgid "Email Accounts" msgstr "电子邮件" -#: mail/mail-config.glade.h:78 +#: mail/mail-config.glade.h:76 msgid "Email _Address:" msgstr "电子邮件地址(_A)：" -#: mail/mail-config.glade.h:79 +#: mail/mail-config.glade.h:77 msgid "Empty trash folders on e_xit" msgstr "退出时清空已删除邮件(_X)" -#: mail/mail-config.glade.h:80 +#: mail/mail-config.glade.h:78 msgid "Encry_ption certificate:" msgstr "加密证书(_P)：" -#: mail/mail-config.glade.h:81 +#: mail/mail-config.glade.h:79 +#, fuzzy +msgid "Encrypt out_going messages (by default)" +msgstr "加密寄出的信件(默认)(_E)" + +#: mail/mail-config.glade.h:80 msgid "Evolution Account Assistant" msgstr "Evolution 账户助手" -#: mail/mail-config.glade.h:82 +#: mail/mail-config.glade.h:81 msgid "Execute Command..." msgstr "执行命令..." -#: mail/mail-config.glade.h:83 +#: mail/mail-config.glade.h:82 msgid "Fi_xed-width:" msgstr "等宽(_X)：" -#: mail/mail-config.glade.h:84 +#: mail/mail-config.glade.h:83 msgid "Font Properties" msgstr "字体属性" -#: mail/mail-config.glade.h:85 +#: mail/mail-config.glade.h:84 msgid "Format messages in _HTML" msgstr "用 HTML 格式化信件(_H)" -#: mail/mail-config.glade.h:87 +#: mail/mail-config.glade.h:86 msgid "HTML Mail" msgstr "HTML 邮件" -#: mail/mail-config.glade.h:88 +#: mail/mail-config.glade.h:87 msgid "Headers" msgstr "信头" -#: mail/mail-config.glade.h:89 +#: mail/mail-config.glade.h:88 msgid "Highlight _quotations with" msgstr "突出显示引用(_Q)" -#: mail/mail-config.glade.h:90 -msgid "IMAPv4 " -msgstr "IMAPv4" - -#: mail/mail-config.glade.h:91 +#: mail/mail-config.glade.h:89 msgid "I_nclude remote tests" msgstr "包含远程测试(_N)" -#: mail/mail-config.glade.h:94 +#: mail/mail-config.glade.h:90 +msgid "Identity" +msgstr "标识" + +#: mail/mail-config.glade.h:92 msgid "Inline" msgstr "嵌入" -#: mail/mail-config.glade.h:96 -msgid "Kerberos " -msgstr "Kerberos" - -#: mail/mail-config.glade.h:98 +#: mail/mail-config.glade.h:95 msgid "Mail Configuration" msgstr "邮件配置" -#: mail/mail-config.glade.h:100 +#: mail/mail-config.glade.h:97 msgid "Mailbox location" msgstr "邮件箱位置" -#: mail/mail-config.glade.h:101 +#: mail/mail-config.glade.h:98 msgid "Message Composer" msgstr "信件撰写器" -#: mail/mail-config.glade.h:104 +#: mail/mail-config.glade.h:99 msgid "" "Note: you will not be prompted for a password until you connect for the " "first time" msgstr "注意：直到您第一次连接的时候，才会询问密码。" -#: mail/mail-config.glade.h:105 +#: mail/mail-config.glade.h:100 msgid "Or_ganization:" msgstr "组织(_G)：" -#: mail/mail-config.glade.h:106 +#: mail/mail-config.glade.h:101 msgid "PGP/GPG _Key ID:" msgstr "PGP/GPG 键标识(_K)：" -#: mail/mail-config.glade.h:111 +#: mail/mail-config.glade.h:104 msgid "Play sound file when new mail arri_ves" msgstr "新邮件到达时播放声音文件(_V)" -#: mail/mail-config.glade.h:112 +#: mail/mail-config.glade.h:105 +msgid "" +"Please enter information about the way you will send mail. If you are not " +"sure, ask your system administrator or Internet Service Provider." +msgstr "" +"请在下面输入您的发件服务器信息。如果您不太确定的话，请询问您的系统管理员或者" +"互联网服务提供商ISP。" + +#: mail/mail-config.glade.h:106 +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 " +"information in email you send." +msgstr "" +"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入，除非您想要在您发" +"出的邮件中包含此信息。" + +#: mail/mail-config.glade.h:107 +msgid "Please select among the following options" +msgstr "请从以下选项中选择" + +#: mail/mail-config.glade.h:108 msgid "Pr_ompt when sending messages with only Bcc recipients defined" msgstr "发送只有暗送收件人的信件时提示(_O)" -#: mail/mail-config.glade.h:113 -msgid "Qmail maildir " -msgstr "Qmail maildir " - -#: mail/mail-config.glade.h:114 +#: mail/mail-config.glade.h:109 msgid "Quote original message" msgstr "引用原始信件" -#: mail/mail-config.glade.h:115 +#: mail/mail-config.glade.h:110 msgid "Quoted" msgstr "引用" -#: mail/mail-config.glade.h:116 +#: mail/mail-config.glade.h:111 msgid "Re_member password" msgstr "记住密码(_M)" -#: mail/mail-config.glade.h:117 +#: mail/mail-config.glade.h:112 msgid "Re_ply-To:" msgstr "回复到(_P)：" -#: mail/mail-config.glade.h:118 +#: mail/mail-config.glade.h:113 msgid "Receiving Email" msgstr "接收电子邮件" -#: mail/mail-config.glade.h:120 -msgid "Receiving Options" -msgstr "接收选项" - -#: mail/mail-config.glade.h:121 +#: mail/mail-config.glade.h:114 msgid "Remember _password" msgstr "记住密码(_P)" -#: mail/mail-config.glade.h:123 +#: mail/mail-config.glade.h:115 +#, fuzzy +msgid "S_elect..." +msgstr "选择..." + +#: mail/mail-config.glade.h:116 msgid "S_tandard Font:" msgstr "标准字体(_T)：" -#: mail/mail-config.glade.h:124 +#: mail/mail-config.glade.h:117 +#, fuzzy +msgid "Se_lect..." +msgstr "选择..." + +#: mail/mail-config.glade.h:118 msgid "Security" msgstr "安全" -#: mail/mail-config.glade.h:125 +#: mail/mail-config.glade.h:119 msgid "Select HTML fixed width font" msgstr "选择 HTML 固定宽度字体" -#: mail/mail-config.glade.h:126 +#: mail/mail-config.glade.h:120 msgid "Select HTML fixed width font for printing" msgstr "选择用于打印的 HTML 固定宽度字体" -#: mail/mail-config.glade.h:127 +#: mail/mail-config.glade.h:121 msgid "Select HTML variable width font" msgstr "选择 HTML 变宽度字体" -#: mail/mail-config.glade.h:128 +#: mail/mail-config.glade.h:122 msgid "Select HTML variable width font for printing" msgstr "选择用于打印的 HTML 变宽度字体" -#: mail/mail-config.glade.h:129 -msgid "Select..." -msgstr "选择..." - -#: mail/mail-config.glade.h:130 +#: mail/mail-config.glade.h:123 msgid "Sending Email" msgstr "发送电子邮件" -#: mail/mail-config.glade.h:133 +#: mail/mail-config.glade.h:124 +msgid "Sending Mail" +msgstr "发送邮件" + +#: mail/mail-config.glade.h:125 msgid "Sent _Messages Folder:" msgstr "已发送信件文件夹(_M)：" -#: mail/mail-config.glade.h:134 +#: mail/mail-config.glade.h:126 msgid "Ser_ver requires authentication" msgstr "服务器需要认证(_V)" -#: mail/mail-config.glade.h:135 +#: mail/mail-config.glade.h:127 msgid "Server _Type: " msgstr "服务器类型(_T)：" -#: mail/mail-config.glade.h:136 -msgid "Si_gning certificate:" +#: mail/mail-config.glade.h:128 +#, fuzzy +msgid "Sig_ning certificate:" msgstr "签名证书(_G)：" -#: mail/mail-config.glade.h:137 +#: mail/mail-config.glade.h:129 msgid "Signat_ure:" msgstr "签名(_U)：" -#: mail/mail-config.glade.h:138 +#: mail/mail-config.glade.h:130 msgid "Signatures" msgstr "签名" -#: mail/mail-config.glade.h:139 +#: mail/mail-config.glade.h:131 msgid "Specify _filename:" msgstr "指定文件名(_F)：" -#: mail/mail-config.glade.h:140 +#: mail/mail-config.glade.h:132 msgid "Spell Checking" msgstr "拼写检查" -#: mail/mail-config.glade.h:141 -msgid "Standard Unix mbox" -msgstr "标准 Unix mbox" - -#: mail/mail-config.glade.h:142 +#: mail/mail-config.glade.h:133 msgid "T_erminal Font:" msgstr "终端字体(_E)：" -#: mail/mail-config.glade.h:143 +#: mail/mail-config.glade.h:134 msgid "T_ype: " msgstr "类型(_Y)：" -#: mail/mail-config.glade.h:144 +#: mail/mail-config.glade.h:135 msgid "" "The output of this script will be used as your\n" "signature. The name you specify will be used\n" @@ -15080,7 +15309,7 @@ msgstr "" "此脚本的输出将用于您的签名。您指定的名称将只会\n" "用于显示。" -#: mail/mail-config.glade.h:147 +#: mail/mail-config.glade.h:138 msgid "" "This page allows you to configure spell checking behavior and language. The " "list of languages here reflects only the languages for which you have a " @@ -15088,7 +15317,7 @@ msgid "" msgstr "" "此页面允许您配置拼写检查行为和语言。在此列出的语言反映了您所安装的字典。" -#: mail/mail-config.glade.h:149 +#: mail/mail-config.glade.h:140 msgid "" "Type the name by which you would like to refer to this account.\n" "For example: \"Work\" or \"Personal\"" @@ -15096,11 +15325,11 @@ msgstr "" "输入您想要给此帐户起的名字。\n" "如：“工作”或“私人”" -#: mail/mail-config.glade.h:152 +#: mail/mail-config.glade.h:143 msgid "V_ariable-width:" msgstr "变宽(_A)：" -#: mail/mail-config.glade.h:153 +#: mail/mail-config.glade.h:144 msgid "" "Welcome to the Evolution Mail Configuration Assistant.\n" "\n" @@ -15110,83 +15339,92 @@ msgstr "" "\n" "单击“前进”开始。" -#: mail/mail-config.glade.h:158 +#: mail/mail-config.glade.h:148 +msgid "" +"You are almost done with the mail configuration process. The identity, " +"incoming mail server and outgoing mail transport method which you provided " +"will be grouped together to make an Evolution mail account. Please enter a " +"name for this account in the space below. This name will be used for display " +"purposes only." +msgstr "" +"您即将完成邮件配置的过程了。您提供的用于收件服务器和发送方式将被组合在一起，" +"成为 Evolution 的邮件帐户。请在下面输入此帐户的名称。此名称只会用作显示。" + +#: mail/mail-config.glade.h:149 msgid "_Add Signature" msgstr "添加签名(_A)" -#: mail/mail-config.glade.h:159 +#: mail/mail-config.glade.h:150 msgid "_Always load images from the Internet" msgstr "总是从 Internet 上装入图像(_A)" -#: mail/mail-config.glade.h:160 -msgid "_Digitally sign outgoing messages (by default)" -msgstr "对寄出的信件进行数字签名(默认)(_D)" - -#: mail/mail-config.glade.h:161 +#: mail/mail-config.glade.h:151 msgid "_Do not notify me when new mail arrives" msgstr "新邮件到达时不要提醒我(_D)" -#: mail/mail-config.glade.h:163 +#: mail/mail-config.glade.h:152 +#, fuzzy +msgid "_Don't sign meeting requests (for Outlook compatibility)" +msgstr "不要签名会议请求(同 Outlook 兼容)(_M)" + +#: mail/mail-config.glade.h:154 msgid "_Enable" msgstr "启用(_E)" -#: mail/mail-config.glade.h:164 -msgid "_Encrypt outgoing messages (by default)" -msgstr "加密寄出的信件(默认)(_E)" - -#: mail/mail-config.glade.h:165 +#: mail/mail-config.glade.h:155 msgid "_Forward style:" msgstr "转发方式(_F)：" -#: mail/mail-config.glade.h:168 +#: mail/mail-config.glade.h:158 msgid "_Load images if sender is in address book" msgstr "如果发件人在地址簿中就装入图像(_L)" -#: mail/mail-config.glade.h:169 +#: mail/mail-config.glade.h:159 msgid "_Make this my default account" msgstr "使它成为我的默认账户(_M)" -#: mail/mail-config.glade.h:170 +#: mail/mail-config.glade.h:160 msgid "_Mark messages as read after" msgstr "把信件标记为已读前等(_M)" -#: mail/mail-config.glade.h:172 +#: mail/mail-config.glade.h:162 msgid "_Never load images from the Internet" msgstr "绝不从 Internet 装入图像(_N)" -#: mail/mail-config.glade.h:174 +#: mail/mail-config.glade.h:164 msgid "_Prompt when sending HTML messages to contacts that don't want them" msgstr "发送给不想接收 HTML 的联系人时提示(_P)" -#: mail/mail-config.glade.h:175 +#: mail/mail-config.glade.h:165 msgid "_Prompt when sending messages with an empty subject line" msgstr "发送空主题行的信件时提示(_P)" -#: mail/mail-config.glade.h:176 +#: mail/mail-config.glade.h:166 msgid "_Reply style:" msgstr "回复风格(_R)：" -#: mail/mail-config.glade.h:177 +#: mail/mail-config.glade.h:167 msgid "_Script:" msgstr "脚本(_S)：" -#: mail/mail-config.glade.h:178 +#: mail/mail-config.glade.h:168 msgid "_Show animated images" msgstr "显示动画图像(_S)" -#: mail/mail-config.glade.h:179 -msgid "_Use Secure Connection (SSL):" -msgstr "使用安全连接(SSL)(_U)：" +#: mail/mail-config.glade.h:169 +#, fuzzy +msgid "_Use Secure Connection:" +msgstr "使用安全连接(_U)：" -#: mail/mail-config.glade.h:180 +#: mail/mail-config.glade.h:170 msgid "_Use the same fonts as other applications" msgstr "使用与其它应用程序相同的字体(_U)" -#: mail/mail-config.glade.h:181 +#: mail/mail-config.glade.h:171 msgid "color" msgstr "颜色" -#: mail/mail-config.glade.h:182 +#: mail/mail-config.glade.h:172 msgid "description" msgstr "描述" @@ -15212,51 +15450,50 @@ msgid "<span weight=\"bold\">Encryption</span>" msgstr "<span weight=\"bold\">加密</span>" #: mail/mail-dialogs.glade.h:10 -msgid "Accept License" -msgstr "接受协议" +#, fuzzy +msgid "Case _Sensitive" +msgstr "区分大小写" #: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2 -msgid "C_ompleted" -msgstr "已完成(_O)" +#, fuzzy +msgid "Co_mpleted" +msgstr "已完成" -#: mail/mail-dialogs.glade.h:12 -msgid "Case Sensitive" -msgstr "区分大小写" +#: mail/mail-dialogs.glade.h:13 +#, fuzzy +msgid "F_ind:" +msgstr "查找：" #: mail/mail-dialogs.glade.h:14 msgid "Find in Message" msgstr "在信件中寻找" -#: mail/mail-dialogs.glade.h:15 -msgid "Find:" -msgstr "查找：" - -#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294 +#: mail/mail-dialogs.glade.h:15 mail/message-tag-followup.c:295 #: mail/message-tags.glade.h:3 msgid "Flag to Follow Up" msgstr "跟随的标志" -#: mail/mail-dialogs.glade.h:17 +#: mail/mail-dialogs.glade.h:16 msgid "Folder Subscriptions" msgstr "文件夹订阅" -#: mail/mail-dialogs.glade.h:18 +#: mail/mail-dialogs.glade.h:17 msgid "License Agreement" msgstr "许可协议" -#: mail/mail-dialogs.glade.h:19 +#: mail/mail-dialogs.glade.h:18 msgid "None Selected" msgstr "没有选中" -#: mail/mail-dialogs.glade.h:20 +#: mail/mail-dialogs.glade.h:19 msgid "S_erver:" msgstr "服务器(_E)：" -#: mail/mail-dialogs.glade.h:21 +#: mail/mail-dialogs.glade.h:20 msgid "Security Information" msgstr "安全信息" -#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4 +#: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:4 msgid "" "The messages you have selected for follow up are listed below.\n" "Please select a follow up action from the \"Flag\" menu." @@ -15264,22 +15501,28 @@ msgstr "" "您选中进行跟随的信件已经在下面列出。\n" "请从“标志”菜单中选择跟随操作。" -#: mail/mail-dialogs.glade.h:25 -msgid "Tick this to accept the license agreement" -msgstr "选中此处以表明您接受许可协议" +#: mail/mail-dialogs.glade.h:24 +#, fuzzy +msgid "_Accept License" +msgstr "接受协议" -#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6 +#: mail/mail-dialogs.glade.h:25 mail/message-tags.glade.h:6 msgid "_Due By:" msgstr "延期人(_D)：" -#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7 +#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:7 msgid "_Flag:" msgstr "标志(_F)：" -#: mail/mail-dialogs.glade.h:28 +#: mail/mail-dialogs.glade.h:27 msgid "_Subscribe" msgstr "订阅(_S)" +#: mail/mail-dialogs.glade.h:28 +#, fuzzy +msgid "_Tick this to accept the license agreement" +msgstr "选中此处以表明您接受许可协议" + #: mail/mail-dialogs.glade.h:29 msgid "_Unsubscribe" msgstr "退订(_U)" @@ -15343,11 +15586,6 @@ msgstr "" "{0}\n" "仍然发送吗？" -#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20 -#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32 -msgid "_Send" -msgstr "发送(_S)" - #. mail:ask-send-no-subject primary #: mail/mail-errors.xml.h:17 msgid "Are you sure you want to send a message without a subject?" @@ -15829,15 +16067,47 @@ msgstr "覆盖(_O)" msgid "_Append" msgstr "追加(_A)" -#. mail:gw-accountsetup-error primary +#. mail:no-load-license primary #: mail/mail-errors.xml.h:234 +#, fuzzy +msgid "Unable to read license file." +msgstr "无法创建新文件夹“%s”：%s" + +#. mail:no-load-license secondary +#: mail/mail-errors.xml.h:236 +msgid "" +"Cannot read the license file \"{0}\", due to an\n" +" installation problem. You will not be able to use this provider " +"until\n" +" you can accept its license." +msgstr "" + +#. mail:checking-service title +#: mail/mail-errors.xml.h:240 +msgid "Querying server" +msgstr "" + +#. mail:checking-service primary +#: mail/mail-errors.xml.h:242 +#, fuzzy +msgid "Please wait." +msgstr "请稍候" + +#. mail:checking-service secondary +#: mail/mail-errors.xml.h:244 +#, fuzzy +msgid "Querying server for a list of supported authentication mechanisms." +msgstr "请求的认证机制必须加密" + +#. mail:gw-accountsetup-error primary +#: mail/mail-errors.xml.h:246 msgid "" "Unable to connect to the GroupWise\n" "server." msgstr "无法连接到 GroupWise 服务器。" #. mail:gw-accountsetup-error secondary -#: mail/mail-errors.xml.h:237 +#: mail/mail-errors.xml.h:249 msgid "" "\n" "Please check your account settings and try again.\n" @@ -15845,25 +16115,25 @@ msgstr "" "\n" "请检查您的账户设置然后再试一次。\n" -#: mail/mail-folder-cache.c:795 +#: mail/mail-folder-cache.c:812 #, c-format msgid "Pinging %s" msgstr "查验 %s" -#: mail/mail-ops.c:98 +#: mail/mail-ops.c:99 msgid "Filtering Folder" msgstr "过滤文件夹" -#: mail/mail-ops.c:259 +#: mail/mail-ops.c:260 msgid "Fetching Mail" msgstr "收取邮件" -#: mail/mail-ops.c:553 +#: mail/mail-ops.c:554 #, c-format msgid "Failed to apply outgoing filters: %s" msgstr "应用寄出过滤器失败：%s" -#: mail/mail-ops.c:578 +#: mail/mail-ops.c:579 #, c-format msgid "" "Failed to append to %s: %s\n" @@ -15872,108 +16142,108 @@ msgstr "" "追加到 %s：%s 失败\n" "转而追加到本地“已发”文件夹。" -#: mail/mail-ops.c:587 +#: mail/mail-ops.c:588 #, c-format msgid "Failed to append to local `Sent' folder: %s" msgstr "追加到本地“已发”文件夹失败：%s" -#: mail/mail-ops.c:683 +#: mail/mail-ops.c:685 #, c-format msgid "Sending message %d of %d" msgstr "发送第%d封信，共%d封" -#: mail/mail-ops.c:714 +#: mail/mail-ops.c:716 #, c-format msgid "Failed to send %d of %d messages" msgstr "在第%d封信失败，共%d封" -#: mail/mail-ops.c:718 +#: mail/mail-ops.c:720 msgid "Complete." msgstr "完成。" -#: mail/mail-ops.c:815 +#: mail/mail-ops.c:817 msgid "Saving message to folder" msgstr "把信件保存到文件夹中" -#: mail/mail-ops.c:900 +#: mail/mail-ops.c:902 #, c-format msgid "Moving messages to %s" msgstr "把信件移动到 %s" -#: mail/mail-ops.c:900 +#: mail/mail-ops.c:902 #, c-format msgid "Copying messages to %s" msgstr "把信件复制到 %s" -#: mail/mail-ops.c:1126 +#: mail/mail-ops.c:1128 msgid "Forwarded messages" msgstr "转发的信件" -#: mail/mail-ops.c:1169 +#: mail/mail-ops.c:1171 #, c-format msgid "Opening folder %s" msgstr "打开文件夹 %s" -#: mail/mail-ops.c:1241 +#: mail/mail-ops.c:1243 #, c-format msgid "Opening store %s" msgstr "打开存储 %s" -#: mail/mail-ops.c:1319 +#: mail/mail-ops.c:1321 #, c-format msgid "Removing folder %s" msgstr "删除文件夹“%s”" -#: mail/mail-ops.c:1413 +#: mail/mail-ops.c:1415 #, c-format msgid "Storing folder '%s'" msgstr "存储文件夹“%s”" -#: mail/mail-ops.c:1478 +#: mail/mail-ops.c:1480 #, c-format msgid "Expunging and storing account '%s'" msgstr "销毁并存储账户“%s”" -#: mail/mail-ops.c:1479 +#: mail/mail-ops.c:1481 #, c-format msgid "Storing account '%s'" msgstr "存储账户“%s”" -#: mail/mail-ops.c:1534 +#: mail/mail-ops.c:1536 msgid "Refreshing folder" msgstr "刷新文件夹" -#: mail/mail-ops.c:1570 mail/mail-ops.c:1621 +#: mail/mail-ops.c:1572 mail/mail-ops.c:1623 msgid "Expunging folder" msgstr "销毁文件夹" -#: mail/mail-ops.c:1618 +#: mail/mail-ops.c:1620 #, c-format msgid "Emptying trash in '%s'" msgstr "清空“%s”中的回收站" -#: mail/mail-ops.c:1619 +#: mail/mail-ops.c:1621 msgid "Local Folders" msgstr "本地文件夹" -#: mail/mail-ops.c:1702 +#: mail/mail-ops.c:1704 #, c-format msgid "Retrieving message %s" msgstr "收取信件 %s" -#: mail/mail-ops.c:1774 +#: mail/mail-ops.c:1776 #, c-format msgid "Retrieving %d message" msgid_plural "Retrieving %d messages" msgstr[0] "收取 %d 封信" -#: mail/mail-ops.c:1860 +#: mail/mail-ops.c:1862 #, c-format msgid "Saving %d message" msgid_plural "Saving %d messsages" msgstr[0] "保存 %d 封信" -#: mail/mail-ops.c:1910 +#: mail/mail-ops.c:1912 #, c-format msgid "" "Unable to create output file: %s\n" @@ -15982,7 +16252,7 @@ msgstr "" "无法创建输出文件：%s\n" " %s" -#: mail/mail-ops.c:1938 +#: mail/mail-ops.c:1940 #, c-format msgid "" "Error saving messages to: %s:\n" @@ -15991,11 +16261,11 @@ msgstr "" "在将信件保存到 %s 时发生错误：\n" " %s" -#: mail/mail-ops.c:2009 +#: mail/mail-ops.c:2011 msgid "Saving attachment" msgstr "保存附件" -#: mail/mail-ops.c:2021 +#: mail/mail-ops.c:2023 #, c-format msgid "" "Cannot create output file: %s:\n" @@ -16004,36 +16274,40 @@ msgstr "" "无法创建输出文件：%s：\n" " %s" -#: mail/mail-ops.c:2031 +#: mail/mail-ops.c:2033 #, c-format msgid "Could not write data: %s" msgstr "无法写数据：%s" -#: mail/mail-ops.c:2179 +#: mail/mail-ops.c:2181 #, c-format msgid "Disconnecting from %s" msgstr "断开与 %s 的连接" -#: mail/mail-ops.c:2179 +#: mail/mail-ops.c:2181 #, c-format msgid "Reconnecting to %s" msgstr "重新连接到 %s" -#: mail/mail-send-recv.c:157 +#: mail/mail-ops.c:2285 +msgid "Checking Service" +msgstr "检查服务" + +#: mail/mail-send-recv.c:158 msgid "Cancelling..." msgstr "正在取消..." -#: mail/mail-send-recv.c:264 +#: mail/mail-send-recv.c:265 #, c-format msgid "Server: %s, Type: %s" msgstr "服务器：%s，类型：%s" -#: mail/mail-send-recv.c:266 +#: mail/mail-send-recv.c:267 #, c-format msgid "Path: %s, Type: %s" msgstr "路径：%s，类型：%s" -#: mail/mail-send-recv.c:268 +#: mail/mail-send-recv.c:269 #, c-format msgid "Type: %s" msgstr "类型：%s" @@ -16046,24 +16320,24 @@ msgstr "发送和接收邮件" msgid "Cancel _All" msgstr "全部取消(_A)" -#: mail/mail-send-recv.c:412 +#: mail/mail-send-recv.c:410 msgid "Updating..." msgstr "正在更新..." -#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466 +#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:462 msgid "Waiting..." msgstr "正在等待..." -#: mail/mail-session.c:207 +#: mail/mail-session.c:208 #, c-format msgid "Enter Password for %s" msgstr "为 %s 输入密码" -#: mail/mail-session.c:209 +#: mail/mail-session.c:210 msgid "Enter Password" msgstr "输入密码" -#: mail/mail-session.c:238 +#: mail/mail-session.c:239 msgid "User canceled operation." msgstr "用户己取消操作。" @@ -16079,26 +16353,26 @@ msgstr "输入该签名的名字。" msgid "Name:" msgstr "名称：" -#: mail/mail-tools.c:114 +#: mail/mail-tools.c:115 #, c-format msgid "Could not create spool directory `%s': %s" msgstr "无法创建脱机目录“%s”：%s" -#: mail/mail-tools.c:141 +#: mail/mail-tools.c:142 #, c-format msgid "Trying to movemail a non-mbox source `%s'" msgstr "试图将邮件移动到非 mbox 源“%s”" -#: mail/mail-tools.c:276 +#: mail/mail-tools.c:277 #, c-format msgid "Forwarded message - %s" msgstr "转发的信件 - %s" -#: mail/mail-tools.c:278 +#: mail/mail-tools.c:279 msgid "Forwarded message" msgstr "转发的信件" -#: mail/mail-tools.c:319 +#: mail/mail-tools.c:320 #, c-format msgid "Invalid folder: `%s'" msgstr "无效的文件夹：“%s”" @@ -16118,79 +16392,84 @@ msgstr "更新“%s:%s”的虚拟文件夹" msgid "Updating vFolders for '%s'" msgstr "更新“%s”的虚拟文件夹" -#: mail/mail-vfolder.c:942 +#: mail/mail-vfolder.c:950 msgid "vFolders" msgstr "虚拟文件夹" -#: mail/mail-vfolder.c:981 +#: mail/mail-vfolder.c:989 msgid "Edit VFolder" msgstr "编辑虚拟文件夹" -#: mail/mail-vfolder.c:1065 +#: mail/mail-vfolder.c:1073 msgid "New VFolder" msgstr "新建虚拟文件夹" -#: mail/message-list.c:1000 +#: mail/message-list.c:999 msgid "Unseen" msgstr "未看" -#: mail/message-list.c:1001 +#: mail/message-list.c:1000 msgid "Seen" msgstr "已看" -#: mail/message-list.c:1002 +#: mail/message-list.c:1001 msgid "Answered" msgstr "已答复" -#: mail/message-list.c:1003 +#: mail/message-list.c:1002 msgid "Multiple Unseen Messages" msgstr "多封未看信件" -#: mail/message-list.c:1004 +#: mail/message-list.c:1003 msgid "Multiple Messages" msgstr "多封信" -#: mail/message-list.c:1008 +#: mail/message-list.c:1007 msgid "Lowest" msgstr "最低" -#: mail/message-list.c:1009 +#: mail/message-list.c:1008 msgid "Lower" msgstr "较低" -#: mail/message-list.c:1013 +#: mail/message-list.c:1012 msgid "Higher" msgstr "较高" -#: mail/message-list.c:1014 +#: mail/message-list.c:1013 msgid "Highest" msgstr "最高" -#: mail/message-list.c:1337 +#: mail/message-list.c:1341 msgid "?" msgstr "?" -#: mail/message-list.c:1344 +#: mail/message-list.c:1348 msgid "Today %l:%M %p" msgstr "今天 %H:%M" -#: mail/message-list.c:1353 +#: mail/message-list.c:1357 msgid "Yesterday %l:%M %p" msgstr "昨天 %H:%M" -#: mail/message-list.c:1365 +#: mail/message-list.c:1369 msgid "%a %l:%M %p" msgstr "%A %H:%M" -#: mail/message-list.c:1373 +#: mail/message-list.c:1377 msgid "%b %d %l:%M %p" msgstr "%m月%d日 %H:%M" -#: mail/message-list.c:1375 +#: mail/message-list.c:1379 msgid "%b %d %Y" msgstr "%Y年%m月%d日" -#: mail/message-list.c:3384 +#: mail/message-list.c:2044 +#, fuzzy +msgid "Message List" +msgstr "信件(_M)" + +#: mail/message-list.c:3409 msgid "Generating message list" msgstr "生成信件列表" @@ -16222,39 +16501,39 @@ msgstr "已接收" msgid "Size" msgstr "大小" -#: mail/message-tag-followup.c:73 +#: mail/message-tag-followup.c:74 msgid "Call" msgstr "呼叫" -#: mail/message-tag-followup.c:74 +#: mail/message-tag-followup.c:75 msgid "Do Not Forward" msgstr "不要转发" -#: mail/message-tag-followup.c:75 +#: mail/message-tag-followup.c:76 msgid "Follow-Up" msgstr "跟随" -#: mail/message-tag-followup.c:76 +#: mail/message-tag-followup.c:77 msgid "For Your Information" msgstr "给您的信息" -#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42 +#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42 msgid "Forward" msgstr "转发" -#: mail/message-tag-followup.c:78 +#: mail/message-tag-followup.c:79 msgid "No Response Necessary" msgstr "不必回复" -#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85 +#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85 msgid "Reply" msgstr "回复" -#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86 +#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86 msgid "Reply to All" msgstr "全部回复" -#: mail/message-tag-followup.c:82 +#: mail/message-tag-followup.c:83 msgid "Review" msgstr "回顾" @@ -16574,61 +16853,61 @@ msgstr "开源软件国际化之简体中文组 http://i18n.linux.net.cn" msgid "Groupware Suite" msgstr "Groupwise 套件" -#: shell/e-shell-window-commands.c:679 +#: shell/e-shell-window-commands.c:680 msgid "_Work Online" msgstr "联机工作(_W)" -#: shell/e-shell-window-commands.c:692 ui/evolution.xml.h:39 +#: shell/e-shell-window-commands.c:693 ui/evolution.xml.h:39 msgid "_Work Offline" msgstr "脱机工作(_W)" -#: shell/e-shell-window-commands.c:705 ui/evolution.xml.h:25 +#: shell/e-shell-window-commands.c:706 ui/evolution.xml.h:25 msgid "Work Offline" msgstr "脱机工作" -#: shell/e-shell-window.c:337 +#: shell/e-shell-window.c:343 msgid "Evolution is currently online. Click on this button to work offline." msgstr "Evolution 目前联机。单击该按钮可脱机工作。" -#: shell/e-shell-window.c:344 +#: shell/e-shell-window.c:351 msgid "Evolution is in the process of going offline." msgstr "Evolution 正在脱机过程中。" -#: shell/e-shell-window.c:350 +#: shell/e-shell-window.c:358 msgid "Evolution is currently offline. Click on this button to work online." msgstr "Evolution 目前脱机。单击该按钮可在线工作。" -#: shell/e-shell-window.c:637 +#: shell/e-shell-window.c:651 #, c-format msgid "Switch to %s" msgstr "切换到 %s" -#: shell/e-shell.c:589 +#: shell/e-shell.c:590 msgid "Uknown system error." msgstr "未知的系统错误。" -#: shell/e-shell.c:795 shell/e-shell.c:796 +#: shell/e-shell.c:798 shell/e-shell.c:799 #, c-format msgid "%ld KB" msgstr "%ld KB" -#: shell/e-shell.c:1218 widgets/misc/e-cell-date-edit.c:265 +#: shell/e-shell.c:1237 widgets/misc/e-cell-date-edit.c:256 msgid "OK" msgstr "确定" -#: shell/e-shell.c:1220 +#: shell/e-shell.c:1239 msgid "Invalid arguments" msgstr "无效参数" -#: shell/e-shell.c:1222 +#: shell/e-shell.c:1241 msgid "Cannot register on OAF" msgstr "无法注册到 OAF" -#: shell/e-shell.c:1224 +#: shell/e-shell.c:1243 msgid "Configuration Database not found" msgstr "找不到配置数据库" -#: shell/e-shell.c:1226 +#: shell/e-shell.c:1245 msgid "Generic error" msgstr "通用错误" @@ -16653,10 +16932,10 @@ msgid "Welcome" msgstr "欢迎" #: shell/evolution-startup-wizard.glade.h:6 +#, fuzzy msgid "" -"Welcome to Evolution. The next few screens will allow\n" -"Evolution to connect to your email accounts, and to import\n" -"files from other applications. \n" +"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 "" @@ -16665,10 +16944,11 @@ msgstr "" "\n" "请单击“下一步”按钮继续。" -#: shell/evolution-startup-wizard.glade.h:11 +#: shell/evolution-startup-wizard.glade.h:9 +#, fuzzy msgid "" -"You have successfully entered all of the information\n" -"needed to set up Evolution. \n" +"You have successfully entered all of the information needed to set up " +"Evolution. \n" "\n" "Click the \"Apply\" button to save your settings. " msgstr "" @@ -16746,7 +17026,7 @@ msgid "Evolution can import data from the following files:" msgstr "Evolution 可以从下列文件中导入数据：" #. Preview/Alpha/Beta version warning message -#: shell/main.c:226 +#: shell/main.c:237 #, no-c-format msgid "" "Hi. Thanks for taking the time to download this preview release\n" @@ -16778,7 +17058,7 @@ msgstr "" "\n" "我们希望您尽情享受我们努力工作的成果，我们也热切盼望着您的意见！\n" -#: shell/main.c:250 +#: shell/main.c:261 msgid "" "Thanks\n" "The Evolution Team\n" @@ -16786,35 +17066,44 @@ msgstr "" "感谢\n" "Evolution 团队\n" -#: shell/main.c:257 +#: shell/main.c:268 msgid "Don't tell me again" msgstr "不要再问我" -#: shell/main.c:462 +#: shell/main.c:473 msgid "Start Evolution activating the specified component" msgstr "启动 Evolution 并激活指定组件" -#: shell/main.c:464 +#: shell/main.c:475 msgid "Start in offline mode" msgstr "以脱机模式启动" -#: shell/main.c:466 +#: shell/main.c:477 msgid "Start in online mode" msgstr "以联机模式启动" -#: shell/main.c:469 -msgid "Forcibly shut down all evolution components" +#: shell/main.c:480 +#, fuzzy +msgid "Forcibly shut down all Evolution components" msgstr "强制关闭所有 Evolution 组件" -#: shell/main.c:473 +#: shell/main.c:484 msgid "Forcibly re-migrate from Evolution 1.4" msgstr "强制从 Evolution 1.4 重新升迁" -#: shell/main.c:476 +#: shell/main.c:487 msgid "Send the debugging output of all components to a file." msgstr "把所有成员的调试输出发送到一个文件中。" -#: shell/main.c:507 +#: shell/main.c:490 +msgid "Disable the mono plugin environment." +msgstr "" + +#: shell/main.c:493 +msgid "Disable loading of any plugins." +msgstr "" + +#: shell/main.c:524 #, c-format msgid "" "%s: --online and --offline cannot be used together.\n" @@ -17032,7 +17321,7 @@ msgid "Enter new password" msgstr "输入新密码" #. FIXME: add serial no, validity date, uses -#: smime/gui/e-cert-selector.c:121 +#: smime/gui/e-cert-selector.c:119 #, c-format msgid "" "Issued to:\n" @@ -17041,7 +17330,7 @@ msgstr "" "发行给：\n" " 主题：%s\n" -#: smime/gui/e-cert-selector.c:122 +#: smime/gui/e-cert-selector.c:120 #, c-format msgid "" "Issued by:\n" @@ -17050,7 +17339,7 @@ msgstr "" "发行者：\n" " 主题：%s\n" -#: smime/gui/e-cert-selector.c:169 +#: smime/gui/e-cert-selector.c:167 msgid "Select certificate" msgstr "选择证书" @@ -17702,8 +17991,8 @@ msgstr "显示一周" msgid "Show the working week" msgstr "显示工作周" -#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249 -#: widgets/misc/e-dateedit.c:435 +#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:240 +#: widgets/misc/e-dateedit.c:450 msgid "Today" msgstr "今天" @@ -18821,13 +19110,14 @@ msgid "Submit a bug report using Bug Buddy" msgstr "用 Bug Buddy 提交错误报告" #: ui/evolution.xml.h:23 -msgid "T_oolbar" -msgstr "工具栏(_O)" - -#: ui/evolution.xml.h:24 msgid "Toggle whether we are working offline." msgstr "切换是否脱机工作。" +#: ui/evolution.xml.h:24 +#, fuzzy +msgid "Tool_bar" +msgstr "工具栏(_O)" + #: ui/evolution.xml.h:26 msgid "_About Evolution..." msgstr "关于 Evolution(_A)..." @@ -18852,6 +19142,10 @@ msgstr "快速首选项(_Q)" msgid "_Send / Receive" msgstr "发送/接收(_S)" +#: ui/evolution.xml.h:35 +msgid "_Settings..." +msgstr "设置(_S)..." + #: ui/evolution.xml.h:38 msgid "_Window" msgstr "窗口(_W)" @@ -18920,8 +19214,8 @@ msgstr "到期日期(_D)" msgid "With _Status" msgstr "状态(_S)" -#: widgets/e-timezone-dialog/e-timezone-dialog.c:198 -#: widgets/e-timezone-dialog/e-timezone-dialog.c:640 +#: widgets/e-timezone-dialog/e-timezone-dialog.c:195 +#: widgets/e-timezone-dialog/e-timezone-dialog.c:637 msgid "UTC" msgstr "UTC" @@ -18938,6 +19232,11 @@ msgid "Select a Time Zone" msgstr "选择一个时区" #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6 +#, fuzzy +msgid "TimeZone Combobox" +msgstr "时区" + +#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7 msgid "" "Use the left mouse button to zoom in on an area of the map and select a time " "zone.\n" @@ -18950,40 +19249,41 @@ msgstr "" msgid "_Current View" msgstr "当前视图(_C)" -#. bonobo displays this string so it must be in locale -#: widgets/menus/gal-view-menus.c:351 -msgid "Custom View" -msgstr "当前视图" - #: widgets/menus/gal-view-menus.c:360 msgid "Save Custom View..." msgstr "保存当前视图..." -#: widgets/menus/gal-view-menus.c:373 -msgid "Define Views..." -msgstr "定义视图..." - #. Translators: These are the first characters of each day of the #. week, 'M' for 'Monday', 'T' for Tuesday etc. -#: widgets/misc/e-calendar-item.c:423 +#: widgets/misc/e-calendar-item.c:415 msgid "MTWTFSS" msgstr "一二三四五六日" #. This is a strftime() format. %B = Month name, %Y = Year. -#: widgets/misc/e-calendar-item.c:1128 +#: widgets/misc/e-calendar-item.c:1120 msgid "%B %Y" msgstr "%Y年%B" -#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429 +#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201 +#, fuzzy +msgid "Previous Button" +msgstr "上一项" + +#: widgets/misc/e-calendar.c:226 +#, fuzzy +msgid "Month Calendar" +msgstr "装入日历" + +#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444 msgid "Now" msgstr "现在" -#: widgets/misc/e-cell-date-edit.c:810 +#: widgets/misc/e-cell-date-edit.c:801 #, c-format msgid "The time must be in the format: %s" msgstr "时间必须采用格式：%s" -#: widgets/misc/e-cell-percent.c:77 +#: widgets/misc/e-cell-percent.c:76 msgid "The percent value must be between 0 and 100, inclusive" msgstr "百分比值必需在 0 到 100 之间，含 0 和 100" @@ -19074,6 +19374,36 @@ msgstr "其它..." msgid "..." msgstr "..." +#: widgets/misc/e-dateedit.c:313 +#, fuzzy +msgid "Date and Time Entry" +msgstr "<b>日期和时间</b>" + +#: widgets/misc/e-dateedit.c:332 +msgid "Text entry to input date" +msgstr "" + +#: widgets/misc/e-dateedit.c:333 +msgid "Text Date Entry" +msgstr "" + +#: widgets/misc/e-dateedit.c:350 +msgid "Click this button to show a calendar" +msgstr "" + +#: widgets/misc/e-dateedit.c:351 +#, fuzzy +msgid "Date Button" +msgstr "发送日期" + +#: widgets/misc/e-dateedit.c:371 +msgid "Combo box to select time" +msgstr "" + +#: widgets/misc/e-dateedit.c:372 +msgid "Time Combo Box" +msgstr "" + #: widgets/misc/e-error.c:83 widgets/misc/e-error.c:84 #: widgets/misc/e-error.c:126 msgid "Evolution Error" @@ -19242,13 +19572,184 @@ msgstr "无法保存文件“{0}”。" msgid "Cannot open file \"{0}\"." msgstr "无法打开文件“{0}”。" -#: widgets/misc/e-task-widget.c:212 +#: widgets/misc/e-task-widget.c:208 #, c-format msgid "%s (...)" msgstr "%s (...)" -#: widgets/misc/e-task-widget.c:217 +#: widgets/misc/e-task-widget.c:213 #, c-format msgid "%s (%d%% complete)" msgstr "%s (%d%% 完成)" +#~ msgid "contact's header: " +#~ msgstr "联系人头衔：" + +#~ msgid "" +#~ "Address book '%s' will be removed. Are you sure you want to continue?" +#~ msgstr "即将删除日历“%s”。您确定想要继续吗？" + +#~ msgid "Go to Folder..." +#~ msgstr "转到文件夹..." + +#~ msgid "Import..." +#~ msgstr "导入..." + +#~ msgid "Address Book Sources..." +#~ msgstr "地址簿来源..." + +#~ msgid "Pilot Settings..." +#~ msgstr "Pilot 设置..." + +#~ msgid "Print Envelope" +#~ msgstr "打印信封" + +#~ msgid "Evolution VCard importer" +#~ msgstr "Evolution vCard 导入器" + +#~ msgid "Impossible internal error." +#~ msgstr "不可能的内部错误。" + +#~ msgid "Unnamed List" +#~ msgstr "未命名的列表" + +#~ msgid "Starting:" +#~ msgstr "开始：" + +#~ msgid "Ending:" +#~ msgstr "结束：" + +#~ msgid "Evolution Alarm" +#~ msgstr "Evolution 提醒" + +#~ msgid "Alarm on %s" +#~ msgstr "在 %s 时提醒" + +#~ msgid "_Edit appointment" +#~ msgstr "编辑约会(_E)" + +#~ msgid "%A %d %B %Y" +#~ msgstr "%Y年%-m月%-d日%A" + +#~ msgid "%d %B %Y" +#~ msgstr "%Y年%-m月%-d日" + +#~ msgid "Calendar '%s' will be removed. Are you sure you want to continue?" +#~ msgstr "即将删除日历“%s”。您确定想要继续吗？" + +#~ msgid "You must specify a location to get the calendar from." +#~ msgstr "您必须获取日历的位置。" + +#~ msgid "The source location '%s' is not well-formed." +#~ msgstr "源位置“%s”不是规格的。" + +#~ msgid "The source location '%s' is not a webcal source." +#~ msgstr "源位置“%s”不是 Webcal 源。" + +#~ msgid "Source with name '%s' already exists in the selected group" +#~ msgstr "选中组中已经存在名为“%s”的源" + +#~ msgid "" +#~ "The group '%s' is remote. You must specify a location to get the calendar " +#~ "from" +#~ msgstr "“%s”是远程组。您必须指定可获取日历的位置" + +#~ msgid "Select destination" +#~ msgstr "选择目的" + +#~ msgid "_Destination" +#~ msgstr "目的(_D)" + +#~ msgid "Go to _Today" +#~ msgstr "转到今天(_T)" + +#~ msgid "_Go to Date..." +#~ msgstr "转到日期(_G)..." + +#~ msgid "Task List '%s' will be removed. Are you sure you want to continue?" +#~ msgstr "即将删除任务列表“%s”。您确定想要继续吗？" + +#~ msgid "Failed to decrypt MIME part: invalid structure" +#~ msgstr "解密 MIME 部分失败：无效的结构" + +#~ msgid "cannot create thread" +#~ msgstr "无法创建线索" + +#~ msgid "Resolving: %s" +#~ msgstr "解析：%s" + +#~ msgid "Host lookup failed" +#~ msgstr "主机查阅失败" + +#~ msgid "Host lookup failed: %s: %s" +#~ msgstr "主机查阅失败：%s：%s" + +#~ msgid "Resolving address" +#~ msgstr "解析地址" + +#~ msgid "Name lookup failed" +#~ msgstr "名称查阅失败" + +#~ msgid "Name lookup failed: %s" +#~ msgstr "名称查阅失败：%s" + +#~ msgid "Enter security pass-phrase for `%s'" +#~ msgstr "为“%s”输入安全密码句" + +#~ msgid "Could not connect to POP server %s (port %s): %s" +#~ msgstr "无法连接到 POP 服务器 %s (端口 %s)：%s" + +#~ msgid "server does not appear to support SSL" +#~ msgstr "服务器似乎不支持 SSL" + +#~ msgid "Remove selected items from the attachment list" +#~ msgstr "从附件列表中删除选中条目" + +#~ msgid "Attach a file to the message" +#~ msgstr "把文件附件到信件" + +#~ msgid "incoming" +#~ msgstr "接收" + +#~ msgid "Evolution Account Editor" +#~ msgstr "Evolution 账户编辑器" + +#~ msgid "Receiving Mail" +#~ msgstr "接收邮件" + +#~ msgid "" +#~ "Please enter information about your incoming mail server below. If you " +#~ "are not sure, ask your system administrator or Internet Service Provider." +#~ msgstr "" +#~ "请在下面输入您的收件服务器信息。如果您不太确定的话，请询问您的系统管理员或" +#~ "者互联网服务提供商 ISP。" + +#~ msgid "Connecting to server..." +#~ msgstr "正在连接服务器..." + +#~ msgid "<span weight=\"bold\">Checking for New Mail</span>" +#~ msgstr "<span weight=\"bold\">检查新邮件</span>" + +#~ msgid "Automatically check for _new mail every" +#~ msgstr "自动检查新邮件的间隔(_N)" + +#~ msgid "IMAPv4 " +#~ msgstr "IMAPv4" + +#~ msgid "Kerberos " +#~ msgstr "Kerberos" + +#~ msgid "Qmail maildir " +#~ msgstr "Qmail maildir " + +#~ msgid "Receiving Options" +#~ msgstr "接收选项" + +#~ msgid "Standard Unix mbox" +#~ msgstr "标准 Unix mbox" + +#~ msgid "_Use Secure Connection (SSL):" +#~ msgstr "使用安全连接(SSL)(_U)：" + +#~ msgid "C_ompleted" +#~ msgstr "已完成(_O)" |