From 6c8106d36334fc56f6d9e089b6e7d1156651945d Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Mon, 9 Feb 2004 20:46:37 +0000 Subject: bump version, libtool numbers 2004-02-09 JP Rosevear * configure.in: bump version, libtool numbers svn path=/trunk/; revision=24685 --- po/zh_CN.po | 2576 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 1358 insertions(+), 1218 deletions(-) (limited to 'po/zh_CN.po') diff --git a/po/zh_CN.po b/po/zh_CN.po index 9269622265..79d62e9483 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Evolution\n" -"POT-Creation-Date: 2004-01-26 13:51-0500\n" +"POT-Creation-Date: 2004-02-09 15:17-0500\n" "PO-Revision-Date: 2004-01-25 07:08+0800\n" "Last-Translator: Funda Wang \n" "Language-Team: zh_CN \n" @@ -50,7 +50,7 @@ msgstr "在这里配置自动完成" #. name = e_book_get_name (book); #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51 -#: calendar/gui/migration.c:341 mail/importers/netscape-importer.c:1844 +#: calendar/gui/migration.c:362 mail/importers/netscape-importer.c:1844 #: shell/e-shortcuts.c:1088 msgid "Contacts" msgstr "联系人" @@ -96,13 +96,13 @@ msgstr "在此管理您的 S/Mime 证书" msgid "Addressbook '%s' will be removed. Are you sure you want to continue?" msgstr "即将删除地址簿“%s”。您确定想要继续吗？" -#: addressbook/gui/component/addressbook-component.c:268 +#: addressbook/gui/component/addressbook-component.c:270 #: addressbook/gui/component/ldap-config.glade.h:28 msgid "New Addressbook" msgstr "新建地址簿" -#: addressbook/gui/component/addressbook-component.c:269 -#: addressbook/gui/widgets/e-addressbook-view.c:1046 +#: addressbook/gui/component/addressbook-component.c:271 +#: addressbook/gui/widgets/e-addressbook-view.c:1071 #: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4 @@ -111,69 +111,69 @@ msgstr "新建地址簿" msgid "Delete" msgstr "删除" -#: addressbook/gui/component/addressbook-component.c:270 +#: addressbook/gui/component/addressbook-component.c:272 #: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365 msgid "Properties..." msgstr "属性..." -#: addressbook/gui/component/addressbook-component.c:341 +#: addressbook/gui/component/addressbook-component.c:343 msgid "New Contact" msgstr "新建联系人" -#: addressbook/gui/component/addressbook-component.c:342 +#: addressbook/gui/component/addressbook-component.c:344 msgid "_Contact" msgstr "联系人(_C)" -#: addressbook/gui/component/addressbook-component.c:343 +#: addressbook/gui/component/addressbook-component.c:345 msgid "Create a new contact" msgstr "创建一个新联系人" -#: addressbook/gui/component/addressbook-component.c:348 +#: addressbook/gui/component/addressbook-component.c:350 msgid "New Contact List" msgstr "新建联系人列表" -#: addressbook/gui/component/addressbook-component.c:349 +#: addressbook/gui/component/addressbook-component.c:351 msgid "Contact _List" msgstr "联系人列表(_L)" -#: addressbook/gui/component/addressbook-component.c:350 +#: addressbook/gui/component/addressbook-component.c:352 msgid "Create a new contact list" msgstr "创建一个新的联系人列表" -#: addressbook/gui/component/addressbook-config.c:391 +#: addressbook/gui/component/addressbook-config.c:398 msgid "Failed to connect to LDAP server" msgstr "连接 LDAP 服务器失败" -#: addressbook/gui/component/addressbook-config.c:415 +#: addressbook/gui/component/addressbook-config.c:422 msgid "Failed to authenticate with LDAP server" msgstr "LDAP 服务器认证失败" -#: addressbook/gui/component/addressbook-config.c:443 +#: addressbook/gui/component/addressbook-config.c:450 msgid "Could not perform query on Root DSE" msgstr "无法在根 DSE 上执行查询" -#: addressbook/gui/component/addressbook-config.c:767 +#: addressbook/gui/component/addressbook-config.c:774 msgid "The server responded with no supported search bases" msgstr "服务器响应为没有支持的搜索起点" -#: addressbook/gui/component/addressbook-config.c:1178 +#: addressbook/gui/component/addressbook-config.c:1185 msgid "This server does not support LDAPv3 schema information" msgstr "此服务器不支持 LDAPv3 schema 信息" -#: addressbook/gui/component/addressbook-config.c:1200 +#: addressbook/gui/component/addressbook-config.c:1207 msgid "Error retrieving schema information" msgstr "检索 schema 信息错误" -#: addressbook/gui/component/addressbook-config.c:1208 +#: addressbook/gui/component/addressbook-config.c:1215 msgid "Server did not respond with valid schema information" msgstr "服务器没有响应有效的 schema 信息" -#: addressbook/gui/component/addressbook-migrate.c:46 -#: calendar/gui/migration.c:127 mail/em-migrate.c:1070 +#: addressbook/gui/component/addressbook-migrate.c:57 +#: calendar/gui/migration.c:127 mail/em-migrate.c:1071 msgid "Migrating..." msgstr "正在升迁..." -#: addressbook/gui/component/addressbook-migrate.c:54 +#: addressbook/gui/component/addressbook-migrate.c:65 msgid "" "The location and hierarchy of the Evolution contact folders has changed " "since Evolution 1.x.\n" @@ -184,38 +184,36 @@ msgstr "" "\n" "请稍候，Evolution 正在升迁您的文件夹..." -#: addressbook/gui/component/addressbook-migrate.c:87 -#: calendar/gui/migration.c:174 mail/em-migrate.c:1111 +#: addressbook/gui/component/addressbook-migrate.c:99 +#: calendar/gui/migration.c:174 mail/em-migrate.c:1112 #, c-format msgid "Migrating `%s':" msgstr "升迁“%s”：" #. create the local source group -#: addressbook/gui/component/addressbook-migrate.c:384 -#: calendar/gui/migration.c:378 calendar/gui/migration.c:443 +#: addressbook/gui/component/addressbook-migrate.c:406 +#: calendar/gui/migration.c:425 calendar/gui/migration.c:502 msgid "On This Computer" msgstr "在此计算机中" -#. orange -#: addressbook/gui/component/addressbook-migrate.c:394 -#: addressbook/gui/component/addressbook-migrate.c:427 -#: calendar/gui/migration.c:391 calendar/gui/migration.c:456 -#: calendar/gui/migration.c:524 calendar/gui/migration.c:611 -#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:65 +#. Create the default Person addressbook +#: addressbook/gui/component/addressbook-migrate.c:414 +#: calendar/gui/migration.c:433 calendar/gui/migration.c:510 +#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65 #: mail/mail-config.glade.h:90 msgid "Personal" msgstr "个人" #. Create the LDAP source group -#: addressbook/gui/component/addressbook-migrate.c:402 +#: addressbook/gui/component/addressbook-migrate.c:422 msgid "On LDAP Servers" msgstr "在 LDAP 服务器上" -#: addressbook/gui/component/addressbook-migrate.c:529 +#: addressbook/gui/component/addressbook-migrate.c:550 msgid "LDAP Servers" msgstr "LDAP 服务器" -#: addressbook/gui/component/addressbook-migrate.c:649 +#: addressbook/gui/component/addressbook-migrate.c:670 msgid "Autocompletion Settings" msgstr "自动完成设置" @@ -311,7 +309,7 @@ msgstr "认证失败。\n" msgid "%sEnter password for %s (user %s)" msgstr "%s为 %s 输入口令 (用户 %s)" -#: addressbook/gui/component/addressbook.c:1070 +#: addressbook/gui/component/addressbook.c:1071 #, fuzzy msgid "UID of the contacts source that the view will display" msgstr "日历将显示的 URI" @@ -402,7 +400,7 @@ msgstr "地址簿属性" msgid "Addressbook Sources" msgstr "地址簿源" -#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:66 +#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65 #: mail/mail-config.glade.h:17 msgid "Always" msgstr "总是" @@ -416,8 +414,7 @@ msgstr "匿名" msgid "" "Congratulations, you are finished setting up this addressbook.\n" "\n" -"Please click the \"Finish\" button to save the settings you have entered " -"here." +"Please click the \"Apply\" button to save the settings you have entered here." msgstr "" "恭喜，您已经设置完了此 LDAP 服务器。您现在可以访问此目录了。\n" "\n" @@ -461,7 +458,7 @@ msgstr "常规" msgid "Group:" msgstr "组：" -#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68 +#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67 #: mail/mail-config.glade.h:80 msgid "Never" msgstr "从不" @@ -488,8 +485,6 @@ msgid "S_earch scope: " msgstr "搜索范围(_E)：" #: addressbook/gui/component/ldap-config.glade.h:34 -#: calendar/gui/e-cal-list-view.c:398 calendar/gui/e-cal-view.c:663 -#: calendar/gui/gnome-cal.c:586 msgid "Searching" msgstr "搜索" @@ -689,7 +684,7 @@ msgstr "使用已识别的姓名 (DN)" msgid "Using email address" msgstr "使用电子邮件地址" -#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67 +#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66 #: mail/mail-config.glade.h:136 msgid "Whenever Possible" msgstr "可能时" @@ -772,8 +767,7 @@ msgstr "全部删除" #: addressbook/gui/component/select-names/e-select-names-popup.c:214 #: addressbook/gui/component/select-names/e-select-names.c:693 -#: calendar/gui/dialogs/cal-prefs-dialog.c:663 -#: composer/e-msg-composer-attachment-bar.c:444 +#: calendar/gui/dialogs/cal-prefs-dialog.c:659 msgid "Remove" msgstr "删除" @@ -807,7 +801,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:213 +#: addressbook/gui/widgets/e-addressbook-view.c:216 msgid "Source" msgstr "来源" @@ -874,7 +868,7 @@ msgstr "合作" #. Construct the app #: addressbook/gui/contact-editor/contact-editor.glade.h:11 -#: addressbook/gui/contact-editor/e-contact-editor.c:2013 +#: addressbook/gui/contact-editor/e-contact-editor.c:2020 msgid "Contact Editor" msgstr "联系人编辑器" @@ -964,10 +958,10 @@ msgstr "类别(_C)..." #. FIXME: need to disable for undeletable folders #: addressbook/gui/contact-editor/contact-editor.glade.h:33 -#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1263 -#: calendar/gui/e-cal-view.c:1294 calendar/gui/e-calendar-table.c:1057 -#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:1773 -#: mail/em-folder-view.c:736 ui/evolution-addressbook.xml.h:33 +#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1255 +#: calendar/gui/e-cal-view.c:1286 calendar/gui/e-calendar-table.c:1057 +#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2111 +#: mail/em-folder-view.c:772 ui/evolution-addressbook.xml.h:33 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110 #: ui/evolution-tasks.xml.h:19 @@ -1015,14 +1009,16 @@ msgid "_Web page address:" msgstr "网页地址(_W)：" #: addressbook/gui/contact-editor/e-contact-editor-address.c:96 +#: addressbook/gui/widgets/eab-contact-display.c:249 +#: addressbook/gui/widgets/eab-contact-display.c:264 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:139 -#: addressbook/gui/contact-editor/e-contact-editor.c:242 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183 +#: addressbook/gui/contact-editor/e-contact-editor.c:243 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168 #: addressbook/gui/widgets/e-addressbook-model.c:312 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392 #: addressbook/gui/widgets/e-minicard-label.c:164 @@ -2009,7 +2005,9 @@ msgid "AOL Instant Messenger" msgstr "AOL 即时通讯程序" #: addressbook/gui/contact-editor/e-contact-editor-im.c:63 -#: addressbook/gui/contact-editor/e-contact-editor.c:2837 +#: addressbook/gui/contact-editor/e-contact-editor.c:2844 +#: addressbook/gui/widgets/eab-contact-display.c:245 +#: addressbook/gui/widgets/eab-contact-display.c:259 msgid "Jabber" msgstr "Jabber" @@ -2022,12 +2020,14 @@ msgid "MSN Messenger" msgstr "MSN Messenger" #: addressbook/gui/contact-editor/e-contact-editor-im.c:66 -#: addressbook/gui/contact-editor/e-contact-editor.c:2840 +#: addressbook/gui/contact-editor/e-contact-editor.c:2847 +#: addressbook/gui/widgets/eab-contact-display.c:241 +#: addressbook/gui/widgets/eab-contact-display.c:255 msgid "ICQ" msgstr "ICQ" #: addressbook/gui/contact-editor/e-contact-editor-im.c:116 -#: addressbook/gui/contact-editor/e-contact-editor.c:710 +#: addressbook/gui/contact-editor/e-contact-editor.c:711 msgid "Service" msgstr "服务" @@ -2041,94 +2041,100 @@ msgid "Username" msgstr "用户名" #: addressbook/gui/contact-editor/e-contact-editor-im.c:245 -#: addressbook/gui/contact-editor/e-contact-editor.c:2527 +#: addressbook/gui/contact-editor/e-contact-editor.c:2534 msgid "Home" msgstr "家庭" #. red #: addressbook/gui/contact-editor/e-contact-editor-im.c:249 -#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:64 +#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64 #: mail/mail-config.glade.h:137 msgid "Work" msgstr "工作" #: addressbook/gui/contact-editor/e-contact-editor-im.c:253 -#: addressbook/gui/contact-editor/e-contact-editor.c:2528 +#: addressbook/gui/contact-editor/e-contact-editor.c:2535 msgid "Other" msgstr "其它" -#: addressbook/gui/contact-editor/e-contact-editor.c:207 +#: addressbook/gui/contact-editor/e-contact-editor.c:208 msgid "Source Book" msgstr "" -#: addressbook/gui/contact-editor/e-contact-editor.c:214 +#: addressbook/gui/contact-editor/e-contact-editor.c:215 msgid "Target Book" msgstr "" -#: addressbook/gui/contact-editor/e-contact-editor.c:221 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169 +#: addressbook/gui/contact-editor/e-contact-editor.c:222 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1 #: addressbook/gui/widgets/e-minicard.c:189 msgid "Contact" msgstr "联系人" -#: addressbook/gui/contact-editor/e-contact-editor.c:228 +#: addressbook/gui/contact-editor/e-contact-editor.c:229 msgid "Is New Contact" msgstr "为新联系人" -#: addressbook/gui/contact-editor/e-contact-editor.c:235 +#: addressbook/gui/contact-editor/e-contact-editor.c:236 msgid "Writable Fields" msgstr "可写域" -#: addressbook/gui/contact-editor/e-contact-editor.c:249 +#: addressbook/gui/contact-editor/e-contact-editor.c:250 msgid "Changed" msgstr "已更改" -#: addressbook/gui/contact-editor/e-contact-editor.c:724 +#: addressbook/gui/contact-editor/e-contact-editor.c:725 msgid "Account Name" msgstr "账户名" -#: addressbook/gui/contact-editor/e-contact-editor.c:1447 +#: addressbook/gui/contact-editor/e-contact-editor.c:1454 msgid "Category editor not available." msgstr "类别编辑器不可用。" -#: addressbook/gui/contact-editor/e-contact-editor.c:1455 +#: addressbook/gui/contact-editor/e-contact-editor.c:1462 msgid "This contact belongs to these categories:" msgstr "此联系人属于这些类别：" -#: addressbook/gui/contact-editor/e-contact-editor.c:1678 +#: addressbook/gui/contact-editor/e-contact-editor.c:1685 msgid "Save Contact as VCard" msgstr "将联系人保存为 VCard" -#: addressbook/gui/contact-editor/e-contact-editor.c:1718 +#: addressbook/gui/contact-editor/e-contact-editor.c:1725 msgid "" "Are you sure you want\n" "to delete these contacts?" msgstr "您确定要删除这些联系人吗？" -#: addressbook/gui/contact-editor/e-contact-editor.c:1721 +#: addressbook/gui/contact-editor/e-contact-editor.c:1728 msgid "" "Are you sure you want\n" "to delete this contact?" msgstr "您确定要删除此联系人吗？" -#: addressbook/gui/contact-editor/e-contact-editor.c:2526 +#: addressbook/gui/contact-editor/e-contact-editor.c:2533 msgid "Business" msgstr "商务" -#: addressbook/gui/contact-editor/e-contact-editor.c:2836 +#: addressbook/gui/contact-editor/e-contact-editor.c:2843 +#: addressbook/gui/widgets/eab-contact-display.c:242 +#: addressbook/gui/widgets/eab-contact-display.c:256 msgid "AIM" msgstr "AIM" -#: addressbook/gui/contact-editor/e-contact-editor.c:2838 +#: addressbook/gui/contact-editor/e-contact-editor.c:2845 +#: addressbook/gui/widgets/eab-contact-display.c:244 +#: addressbook/gui/widgets/eab-contact-display.c:258 msgid "Yahoo" msgstr "雅虎" -#: addressbook/gui/contact-editor/e-contact-editor.c:2839 +#: addressbook/gui/contact-editor/e-contact-editor.c:2846 +#: addressbook/gui/widgets/eab-contact-display.c:243 +#: addressbook/gui/widgets/eab-contact-display.c:257 msgid "MSN" msgstr "MSN" -#: addressbook/gui/contact-editor/e-contact-editor.c:3127 +#: addressbook/gui/contact-editor/e-contact-editor.c:3134 #, c-format msgid "Could not find widget for a field: `%s'" msgstr "无法为域找到构件：“%s”" @@ -2263,7 +2269,7 @@ msgid "IM Service:" msgstr "即时通讯服务：" #: addressbook/gui/contact-editor/im.glade.h:5 -#: calendar/gui/e-itip-control.c:948 +#: calendar/gui/e-itip-control.c:947 msgid "Location:" msgstr "位置：" @@ -2287,25 +2293,25 @@ msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T) msgid "contact-list-editor" msgstr "联系人列表编辑器" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147 #: addressbook/gui/widgets/e-addressbook-model.c:298 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378 -#: addressbook/gui/widgets/e-addressbook-view.c:206 +#: addressbook/gui/widgets/e-addressbook-view.c:209 #: addressbook/gui/widgets/e-minicard-view-widget.c:105 #: addressbook/gui/widgets/e-minicard-view.c:460 msgid "Book" msgstr "名簿" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161 msgid "Is New List" msgstr "为新列表" #. Construct the app -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:272 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:247 msgid "Contact List Editor" msgstr "联系人列表编辑器" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:502 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:465 msgid "Save List as VCard" msgstr "将列表保存为 VCard" @@ -2348,7 +2354,7 @@ msgstr "" #. FIXME: get the toplevel window... #: addressbook/gui/search/e-addressbook-search-dialog.c:116 -#: widgets/misc/e-filter-bar.c:148 +#: widgets/misc/e-filter-bar.c:154 msgid "Advanced Search" msgstr "高级搜索" @@ -2367,7 +2373,7 @@ msgstr "%d 个联系人" #: addressbook/gui/widgets/e-addressbook-model.c:305 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385 -#: addressbook/gui/widgets/e-addressbook-view.c:220 +#: addressbook/gui/widgets/e-addressbook-view.c:223 #: addressbook/gui/widgets/e-minicard-view-widget.c:112 #: addressbook/gui/widgets/e-minicard-view.c:467 msgid "Query" @@ -2385,30 +2391,30 @@ msgstr "模型" msgid "Error modifying card" msgstr "修改卡片错误" -#: addressbook/gui/widgets/e-addressbook-view.c:157 +#: addressbook/gui/widgets/e-addressbook-view.c:160 msgid "Name begins with" msgstr "姓名以此开头" -#: addressbook/gui/widgets/e-addressbook-view.c:158 +#: addressbook/gui/widgets/e-addressbook-view.c:161 msgid "Email begins with" msgstr "邮件以此开头" -#: addressbook/gui/widgets/e-addressbook-view.c:159 +#: addressbook/gui/widgets/e-addressbook-view.c:162 #: calendar/gui/cal-search-bar.c:52 msgid "Category is" msgstr "类别为" #. We attach subitems below -#: addressbook/gui/widgets/e-addressbook-view.c:160 +#: addressbook/gui/widgets/e-addressbook-view.c:163 #: calendar/gui/cal-search-bar.c:48 msgid "Any field contains" msgstr "任何域含有" -#: addressbook/gui/widgets/e-addressbook-view.c:161 +#: addressbook/gui/widgets/e-addressbook-view.c:164 msgid "Advanced..." msgstr "高级..." -#: addressbook/gui/widgets/e-addressbook-view.c:227 +#: addressbook/gui/widgets/e-addressbook-view.c:230 #: calendar/gui/dialogs/meeting-page.etspec.h:11 #: calendar/gui/e-calendar-table.etspec.h:17 #: calendar/gui/e-meeting-list-view.c:249 @@ -2416,99 +2422,102 @@ msgstr "高级..." msgid "Type" msgstr "类型" -#: addressbook/gui/widgets/e-addressbook-view.c:486 +#: addressbook/gui/widgets/e-addressbook-view.c:494 #: mail/importers/pine-importer.c:577 msgid "Addressbook" msgstr "地址簿" -#: addressbook/gui/widgets/e-addressbook-view.c:810 -#: addressbook/gui/widgets/e-addressbook-view.c:1030 -#: addressbook/gui/widgets/e-addressbook-view.c:1964 +#: addressbook/gui/widgets/e-addressbook-view.c:835 +#: addressbook/gui/widgets/e-addressbook-view.c:1055 +#: addressbook/gui/widgets/e-addressbook-view.c:2013 #: ui/evolution-addressbook.xml.h:19 msgid "Save as VCard" msgstr "保存为 VCard" -#: addressbook/gui/widgets/e-addressbook-view.c:1017 +#: addressbook/gui/widgets/e-addressbook-view.c:1042 msgid "New Contact..." msgstr "新建联系人..." -#: addressbook/gui/widgets/e-addressbook-view.c:1018 +#: addressbook/gui/widgets/e-addressbook-view.c:1043 msgid "New Contact List..." msgstr "新建联系人列表..." -#: addressbook/gui/widgets/e-addressbook-view.c:1021 +#: addressbook/gui/widgets/e-addressbook-view.c:1046 msgid "Go to Folder..." msgstr "转到文件夹..." -#: addressbook/gui/widgets/e-addressbook-view.c:1022 +#: addressbook/gui/widgets/e-addressbook-view.c:1047 msgid "Import..." msgstr "导入..." -#: addressbook/gui/widgets/e-addressbook-view.c:1024 +#: addressbook/gui/widgets/e-addressbook-view.c:1049 msgid "Search for Contacts..." msgstr "搜索联系人..." -#: addressbook/gui/widgets/e-addressbook-view.c:1025 -msgid "Addressbook Sources..." +#: addressbook/gui/widgets/e-addressbook-view.c:1050 +#, fuzzy +msgid "Address Book Sources..." msgstr "地址簿来源..." -#: addressbook/gui/widgets/e-addressbook-view.c:1027 +#: addressbook/gui/widgets/e-addressbook-view.c:1052 msgid "Pilot Settings..." msgstr "Pilot 设置..." -#: addressbook/gui/widgets/e-addressbook-view.c:1031 +#: addressbook/gui/widgets/e-addressbook-view.c:1056 #: ui/evolution-addressbook.xml.h:10 msgid "Forward Contact" msgstr "转发联系人" -#: addressbook/gui/widgets/e-addressbook-view.c:1032 +#: addressbook/gui/widgets/e-addressbook-view.c:1057 msgid "Send Message to Contact" msgstr "给联系人发邮件" -#: addressbook/gui/widgets/e-addressbook-view.c:1033 calendar/gui/print.c:2480 +#: addressbook/gui/widgets/e-addressbook-view.c:1058 calendar/gui/print.c:2475 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78 #: ui/my-evolution.xml.h:1 msgid "Print" msgstr "打印" -#: addressbook/gui/widgets/e-addressbook-view.c:1035 +#: addressbook/gui/widgets/e-addressbook-view.c:1060 msgid "Print Envelope" msgstr "打印信封" -#: addressbook/gui/widgets/e-addressbook-view.c:1039 -msgid "Copy to folder..." -msgstr "复制到文件夹..." +#: addressbook/gui/widgets/e-addressbook-view.c:1064 +#, fuzzy +msgid "Copy to Address Book..." +msgstr "地址簿..." -#: addressbook/gui/widgets/e-addressbook-view.c:1040 -msgid "Move to folder..." -msgstr "移动到文件夹..." +#: addressbook/gui/widgets/e-addressbook-view.c:1065 +#, fuzzy +msgid "Move to Address Book..." +msgstr "地址簿..." -#: addressbook/gui/widgets/e-addressbook-view.c:1043 +#: addressbook/gui/widgets/e-addressbook-view.c:1068 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4 msgid "Cut" msgstr "剪切" #. create the dialog -#: addressbook/gui/widgets/e-addressbook-view.c:1044 +#: addressbook/gui/widgets/e-addressbook-view.c:1069 #: calendar/gui/calendar-component.c:358 -#: calendar/gui/dialogs/copy-source-dialog.c:136 +#: calendar/gui/dialogs/copy-source-dialog.c:158 #: calendar/gui/tasks-component.c:361 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:1045 +#: addressbook/gui/widgets/e-addressbook-view.c:1070 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10 msgid "Paste" msgstr "粘贴" -#: addressbook/gui/widgets/e-addressbook-view.c:1050 -#: calendar/gui/e-cal-view.c:1232 +#: addressbook/gui/widgets/e-addressbook-view.c:1075 +#: calendar/gui/e-cal-view.c:1224 msgid "Current View" msgstr "当前视图" -#: addressbook/gui/widgets/e-addressbook-view.c:1235 +#: addressbook/gui/widgets/e-addressbook-view.c:1264 #, c-format msgid "" "The addressbook backend for\n" @@ -2519,7 +2528,7 @@ msgstr "" "的地址簿后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端" #. All, unmatched, separator -#: addressbook/gui/widgets/e-addressbook-view.c:1555 +#: addressbook/gui/widgets/e-addressbook-view.c:1604 #: calendar/gui/cal-search-bar.c:353 msgid "Any Category" msgstr "任何类别" @@ -2563,10 +2572,7 @@ msgid "Company Phone" msgstr "公司电话" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10 -#: addressbook/gui/widgets/eab-contact-display.c:216 -#: addressbook/gui/widgets/eab-contact-display.c:217 -#: addressbook/gui/widgets/eab-contact-display.c:218 -#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769 +#: addressbook/gui/widgets/eab-contact-display.c:438 smime/lib/e-cert.c:769 msgid "Email" msgstr "电子邮件" @@ -2626,6 +2632,7 @@ msgid "Nickname" msgstr "昵称" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25 +#: addressbook/gui/widgets/eab-contact-display.c:270 msgid "Note" msgstr "注释" @@ -2634,6 +2641,7 @@ msgid "Office" msgstr "办公室" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27 +#: addressbook/gui/widgets/eab-contact-display.c:239 msgid "Organization" msgstr "组织" @@ -2759,142 +2767,168 @@ msgstr "已选择" msgid "Has Cursor" msgstr "有光标" -#: addressbook/gui/widgets/eab-contact-display.c:93 -#: addressbook/gui/widgets/eab-contact-display.c:114 -#, fuzzy -msgid "Map It" -msgstr "Mayport" +#: addressbook/gui/widgets/eab-contact-display.c:116 +msgid "(map)" +msgstr "" + +#: addressbook/gui/widgets/eab-contact-display.c:126 +msgid "map" +msgstr "" -#: addressbook/gui/widgets/eab-contact-display.c:198 -#: addressbook/gui/widgets/eab-contact-display.c:324 +#: addressbook/gui/widgets/eab-contact-display.c:176 +#: addressbook/gui/widgets/eab-contact-display.c:414 msgid "List Members" msgstr "列出成员" -#: addressbook/gui/widgets/eab-contact-display.c:214 -#: addressbook/gui/widgets/eab-contact-display.c:344 -msgid "Job Title" -msgstr "职称" +#: addressbook/gui/widgets/eab-contact-display.c:232 +#, fuzzy +msgid "E-mail" +msgstr "电子邮件" -#: addressbook/gui/widgets/eab-contact-display.c:221 -msgid "Home Address" -msgstr "家庭地址" +#: addressbook/gui/widgets/eab-contact-display.c:237 +#, fuzzy +msgid "work" +msgstr "工作" -#: addressbook/gui/widgets/eab-contact-display.c:222 -msgid "Work Address" -msgstr "工作地址" +#: addressbook/gui/widgets/eab-contact-display.c:240 +#, fuzzy +msgid "Position" +msgstr "描述" -#: addressbook/gui/widgets/eab-contact-display.c:223 -msgid "Other Address" -msgstr "其它地址" +#: addressbook/gui/widgets/eab-contact-display.c:246 +#, fuzzy +msgid "Video Conferencing" +msgstr "视频会议 URL(_V)：" -#: addressbook/gui/widgets/eab-contact-display.c:227 -#: addressbook/gui/widgets/eab-contact-display.c:375 -msgid "Home page" +#: addressbook/gui/widgets/eab-contact-display.c:247 +#, fuzzy +msgid "Phone" +msgstr "车载电话" + +#: addressbook/gui/widgets/eab-contact-display.c:248 +msgid "Fax" +msgstr "" + +#: addressbook/gui/widgets/eab-contact-display.c:253 +#, fuzzy +msgid "personal" +msgstr "个人" + +#: addressbook/gui/widgets/eab-contact-display.c:261 +msgid "WWW" msgstr "" -#: addressbook/gui/widgets/eab-contact-display.c:228 -#: addressbook/gui/widgets/eab-contact-display.c:383 +#: addressbook/gui/widgets/eab-contact-display.c:262 +#: addressbook/gui/widgets/eab-contact-display.c:473 msgid "Blog" msgstr "Blog" -#: addressbook/gui/widgets/eab-gui-util.c:43 +#: addressbook/gui/widgets/eab-contact-display.c:434 +msgid "Job Title" +msgstr "职称" + +#: addressbook/gui/widgets/eab-contact-display.c:465 +msgid "Home page" +msgstr "" + +#: addressbook/gui/widgets/eab-gui-util.c:46 msgid "Success" msgstr "成功" -#: addressbook/gui/widgets/eab-gui-util.c:44 +#: addressbook/gui/widgets/eab-gui-util.c:47 #: camel/providers/imap/camel-imap-command.c:306 #: camel/providers/imap/camel-imap-command.c:403 -#: camel/providers/pop3/camel-pop3-store.c:540 -#: camel/providers/pop3/camel-pop3-store.c:547 shell/e-shell.c:1002 +#: camel/providers/pop3/camel-pop3-store.c:538 +#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071 msgid "Unknown error" msgstr "未知的错误" -#: addressbook/gui/widgets/eab-gui-util.c:45 +#: addressbook/gui/widgets/eab-gui-util.c:48 msgid "Repository offline" msgstr "仓库离线" -#: addressbook/gui/widgets/eab-gui-util.c:46 +#: addressbook/gui/widgets/eab-gui-util.c:49 msgid "Permission denied" msgstr "没有权限" -#: addressbook/gui/widgets/eab-gui-util.c:47 +#: addressbook/gui/widgets/eab-gui-util.c:50 msgid "Contact not found" msgstr "找不到联系人" -#: addressbook/gui/widgets/eab-gui-util.c:48 +#: addressbook/gui/widgets/eab-gui-util.c:51 msgid "Contact ID already exists" msgstr "联系人 ID 已经存在" -#: addressbook/gui/widgets/eab-gui-util.c:49 +#: addressbook/gui/widgets/eab-gui-util.c:52 msgid "Protocol not supported" msgstr "不支持的协议" -#: addressbook/gui/widgets/eab-gui-util.c:50 +#: addressbook/gui/widgets/eab-gui-util.c:53 #: calendar/gui/dialogs/task-details-page.glade.h:3 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599 -#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:213 -#: calendar/gui/print.c:2349 camel/camel-service.c:734 -#: camel/camel-service.c:772 camel/camel-service.c:856 -#: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453 -#: camel/providers/pop3/camel-pop3-store.c:534 +#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209 +#: calendar/gui/print.c:2344 camel/camel-service.c:728 +#: camel/camel-service.c:766 camel/camel-service.c:850 +#: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451 +#: camel/providers/pop3/camel-pop3-store.c:532 msgid "Cancelled" msgstr "已经取消" -#: addressbook/gui/widgets/eab-gui-util.c:51 +#: addressbook/gui/widgets/eab-gui-util.c:54 msgid "Authentication Failed" msgstr "认证失败" -#: addressbook/gui/widgets/eab-gui-util.c:52 +#: addressbook/gui/widgets/eab-gui-util.c:55 msgid "Authentication Required" msgstr "必须认证" -#: addressbook/gui/widgets/eab-gui-util.c:53 +#: addressbook/gui/widgets/eab-gui-util.c:56 msgid "TLS not Available" msgstr "TLS 不可用" -#: addressbook/gui/widgets/eab-gui-util.c:54 +#: addressbook/gui/widgets/eab-gui-util.c:57 msgid "Addressbook does not exist" msgstr "地址簿不存在" -#: addressbook/gui/widgets/eab-gui-util.c:55 +#: addressbook/gui/widgets/eab-gui-util.c:58 msgid "Other error" msgstr "其它错误" -#: addressbook/gui/widgets/eab-gui-util.c:82 +#: addressbook/gui/widgets/eab-gui-util.c:85 msgid "Do you want to save changes?" msgstr "您希望保存修改吗？" -#: addressbook/gui/widgets/eab-gui-util.c:84 +#: addressbook/gui/widgets/eab-gui-util.c:87 msgid "_Discard" msgstr "丢弃(_D)" -#: addressbook/gui/widgets/eab-gui-util.c:103 +#: addressbook/gui/widgets/eab-gui-util.c:106 msgid "Error adding list" msgstr "添加列表出错" -#: addressbook/gui/widgets/eab-gui-util.c:103 -#: addressbook/gui/widgets/eab-gui-util.c:457 +#: addressbook/gui/widgets/eab-gui-util.c:106 +#: addressbook/gui/widgets/eab-gui-util.c:524 msgid "Error adding contact" msgstr "添加联系人出错" -#: addressbook/gui/widgets/eab-gui-util.c:112 +#: addressbook/gui/widgets/eab-gui-util.c:115 msgid "Error modifying list" msgstr "修改列表出错" -#: addressbook/gui/widgets/eab-gui-util.c:112 +#: addressbook/gui/widgets/eab-gui-util.c:115 msgid "Error modifying contact" msgstr "修改联系人出错" -#: addressbook/gui/widgets/eab-gui-util.c:122 +#: addressbook/gui/widgets/eab-gui-util.c:125 msgid "Error removing list" msgstr "删除列表出错" -#: addressbook/gui/widgets/eab-gui-util.c:122 -#: addressbook/gui/widgets/eab-gui-util.c:415 +#: addressbook/gui/widgets/eab-gui-util.c:125 +#: addressbook/gui/widgets/eab-gui-util.c:482 msgid "Error removing contact" msgstr "删除联系人出错" -#: addressbook/gui/widgets/eab-gui-util.c:204 +#: addressbook/gui/widgets/eab-gui-util.c:207 #, fuzzy, c-format msgid "" "Opening %d contacts will open %d new windows as well.\n" @@ -2903,7 +2937,7 @@ msgstr "" "打开 %d 张卡片将同时打开 %d 个新窗口。\n" "您真的想要显示所有卡片吗？" -#: addressbook/gui/widgets/eab-gui-util.c:230 +#: addressbook/gui/widgets/eab-gui-util.c:233 #, c-format msgid "" "%s already exists\n" @@ -2912,45 +2946,50 @@ msgstr "" "%s 已经存在\n" "您打算覆盖它吗？" -#: addressbook/gui/widgets/eab-gui-util.c:234 +#: addressbook/gui/widgets/eab-gui-util.c:237 msgid "Overwrite" msgstr "覆盖" -#: addressbook/gui/widgets/eab-gui-util.c:270 +#: addressbook/gui/widgets/eab-gui-util.c:273 #, c-format msgid "Error saving %s: %s" msgstr "保存 %s 出错：%s" #. This is a filename. Translators take note. -#: addressbook/gui/widgets/eab-gui-util.c:307 +#: addressbook/gui/widgets/eab-gui-util.c:310 msgid "card.vcf" msgstr "card.vcf" -#: addressbook/gui/widgets/eab-gui-util.c:376 +#: addressbook/gui/widgets/eab-gui-util.c:443 msgid "list" msgstr "列表" -#: addressbook/gui/widgets/eab-gui-util.c:513 +#: addressbook/gui/widgets/eab-gui-util.c:578 msgid "Move contact to" msgstr "将联系人移动到" -#: addressbook/gui/widgets/eab-gui-util.c:515 +#: addressbook/gui/widgets/eab-gui-util.c:580 msgid "Copy contact to" msgstr "将联系人复制到" -#: addressbook/gui/widgets/eab-gui-util.c:518 +#: addressbook/gui/widgets/eab-gui-util.c:583 msgid "Move contacts to" msgstr "将联系人移动到" -#: addressbook/gui/widgets/eab-gui-util.c:520 +#: addressbook/gui/widgets/eab-gui-util.c:585 msgid "Copy contacts to" msgstr "将联系人复制到" -#: addressbook/gui/widgets/eab-gui-util.c:707 +#: addressbook/gui/widgets/eab-gui-util.c:588 +#, fuzzy +msgid "Select target addressbook." +msgstr "从地址簿中选择联系人" + +#: addressbook/gui/widgets/eab-gui-util.c:767 msgid "Multiple VCards" msgstr "多个 VCard" -#: addressbook/gui/widgets/eab-gui-util.c:710 +#: addressbook/gui/widgets/eab-gui-util.c:770 #, c-format msgid "VCard for %s" msgstr "%s 的 VCard" @@ -3395,9 +3434,9 @@ msgid "Evolution's Tasks component" msgstr "Evolution 任务组件" #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12 -#: calendar/gui/e-tasks.c:1112 calendar/gui/print.c:1825 -#: calendar/gui/tasks-control.c:516 -#: calendar/importers/icalendar-importer.c:717 +#: calendar/gui/e-tasks.c:1101 calendar/gui/print.c:1820 +#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:80 +#: calendar/importers/icalendar-importer.c:710 #: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087 msgid "Tasks" msgstr "任务" @@ -3442,9 +3481,9 @@ msgstr "午睡时间(分钟)" msgid "_Edit appointment" msgstr "编辑约会(_E)" -#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1245 -#: calendar/gui/e-cal-view.c:1310 calendar/gui/e-calendar-table.c:1037 -#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:711 +#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1237 +#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-calendar-table.c:1037 +#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:747 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37 msgid "_Open" msgstr "打开(_O)" @@ -3507,15 +3546,15 @@ msgstr "" msgid "Do not ask me about this program again." msgstr "不要再次询问此问题。" -#: calendar/gui/alarm-notify/notify-main.c:159 +#: calendar/gui/alarm-notify/notify-main.c:160 msgid "Could not initialize Bonobo" msgstr "无法初始化 Bonobo" -#: calendar/gui/alarm-notify/notify-main.c:162 +#: calendar/gui/alarm-notify/notify-main.c:163 msgid "Could not initialize gnome-vfs" msgstr "无法创始化 gnome-vfs" -#: calendar/gui/alarm-notify/notify-main.c:171 +#: calendar/gui/alarm-notify/notify-main.c:172 msgid "Could not create the alarm notify service factory" msgstr "无法创建提醒服务车间" @@ -3671,11 +3710,11 @@ msgstr "描述含有" msgid "Comment contains" msgstr "注释含有" -#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1105 +#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109 msgid "Unmatched" msgstr "无匹配" -#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1608 +#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1597 #: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086 msgid "Calendar" msgstr "日历" @@ -3726,7 +3765,7 @@ msgstr "%Y年%m月%d日" #. month name. You can change the order but don't #. change the specifiers or add anything. #: calendar/gui/calendar-commands.c:464 -#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1503 +#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498 msgid "%d %B" msgstr "%m月%d日" @@ -3827,19 +3866,19 @@ msgstr "月视图" msgid "List View" msgstr "列表视图" -#: calendar/gui/comp-editor-factory.c:410 +#: calendar/gui/comp-editor-factory.c:408 msgid "Error while opening the calendar" msgstr "打开日历时出错" -#: calendar/gui/comp-editor-factory.c:421 +#: calendar/gui/comp-editor-factory.c:419 msgid "Method not supported when opening the calendar" msgstr "打开日历的方法不支持" -#: calendar/gui/comp-editor-factory.c:427 +#: calendar/gui/comp-editor-factory.c:425 msgid "Permission denied to open the calendar" msgstr "没有权限打开日历" -#: calendar/gui/comp-editor-factory.c:476 +#: calendar/gui/comp-editor-factory.c:474 #, c-format msgid "open_client(): %s" msgstr "" @@ -3930,74 +3969,79 @@ msgid "Action/Trigger" msgstr "" #: calendar/gui/dialogs/alarm-page.glade.h:1 +#: calendar/gui/dialogs/recurrence-page.glade.h:1 +msgid "A_dd" +msgstr "添加(_D)" + +#: calendar/gui/dialogs/alarm-page.glade.h:2 #: calendar/gui/dialogs/recurrence-page.glade.h:2 msgid "Basics" msgstr "基本" -#: calendar/gui/dialogs/alarm-page.glade.h:2 +#: calendar/gui/dialogs/alarm-page.glade.h:3 #: calendar/gui/dialogs/recurrence-page.glade.h:3 msgid "Date/Time:" msgstr "日期/时间：" -#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:463 +#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463 msgid "Display a message" msgstr "显示消息" -#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:459 +#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459 msgid "Play a sound" msgstr "播放声音" -#: calendar/gui/dialogs/alarm-page.glade.h:5 +#: calendar/gui/dialogs/alarm-page.glade.h:6 #, fuzzy msgid "Reminders" msgstr "提醒" -#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:471 +#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471 msgid "Run a program" msgstr "运行程序" -#: calendar/gui/dialogs/alarm-page.glade.h:7 +#: calendar/gui/dialogs/alarm-page.glade.h:8 msgid "Send an Email" msgstr "发送电子邮件" -#: calendar/gui/dialogs/alarm-page.glade.h:8 +#: calendar/gui/dialogs/alarm-page.glade.h:9 #: calendar/gui/dialogs/recurrence-page.glade.h:8 -#: calendar/gui/e-itip-control.c:939 calendar/gui/e-itip-control.glade.h:11 -#: calendar/gui/e-tasks.c:168 +#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11 +#: calendar/gui/e-tasks.c:164 msgid "Summary:" msgstr "概要：" -#: calendar/gui/dialogs/alarm-page.glade.h:9 +#: calendar/gui/dialogs/alarm-page.glade.h:10 msgid "_Options..." msgstr "选项(_O)..." -#: calendar/gui/dialogs/alarm-page.glade.h:10 +#: calendar/gui/dialogs/alarm-page.glade.h:11 msgid "after" msgstr "之后" -#: calendar/gui/dialogs/alarm-page.glade.h:11 +#: calendar/gui/dialogs/alarm-page.glade.h:12 msgid "before" msgstr "之前" -#: calendar/gui/dialogs/alarm-page.glade.h:12 +#: calendar/gui/dialogs/alarm-page.glade.h:13 #: calendar/gui/dialogs/recurrence-page.glade.h:14 msgid "day(s)" msgstr "天" -#: calendar/gui/dialogs/alarm-page.glade.h:13 +#: calendar/gui/dialogs/alarm-page.glade.h:14 msgid "end of appointment" msgstr "约会结束" -#: calendar/gui/dialogs/alarm-page.glade.h:14 +#: calendar/gui/dialogs/alarm-page.glade.h:15 msgid "hour(s)" msgstr "小时" -#: calendar/gui/dialogs/alarm-page.glade.h:15 +#: calendar/gui/dialogs/alarm-page.glade.h:16 #: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184 msgid "minute(s)" msgstr "分钟" -#: calendar/gui/dialogs/alarm-page.glade.h:16 +#: calendar/gui/dialogs/alarm-page.glade.h:17 msgid "start of appointment" msgstr "约会开始" @@ -4008,26 +4052,26 @@ msgstr "约会开始" msgid "Enabled" msgstr "已启用" -#: calendar/gui/dialogs/cal-prefs-dialog.c:660 +#: calendar/gui/dialogs/cal-prefs-dialog.c:656 msgid "Are you sure you want to remove this URL?" msgstr "您确定您想要删除此 URL 吗？" -#: calendar/gui/dialogs/cal-prefs-dialog.c:668 +#: calendar/gui/dialogs/cal-prefs-dialog.c:664 msgid "Don't Remove" msgstr "不删除" -#: calendar/gui/dialogs/cal-prefs-dialog.c:714 -#: calendar/gui/dialogs/cal-prefs-dialog.c:746 -#: calendar/gui/dialogs/cal-prefs-dialog.c:777 mail/em-account-prefs.c:315 +#: calendar/gui/dialogs/cal-prefs-dialog.c:710 +#: calendar/gui/dialogs/cal-prefs-dialog.c:742 +#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315 #: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397 #: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697 #: mail/em-composer-prefs.c:721 msgid "Disable" msgstr "禁用" -#: calendar/gui/dialogs/cal-prefs-dialog.c:714 -#: calendar/gui/dialogs/cal-prefs-dialog.c:746 -#: calendar/gui/dialogs/cal-prefs-dialog.c:779 mail/em-account-prefs.c:315 +#: calendar/gui/dialogs/cal-prefs-dialog.c:710 +#: calendar/gui/dialogs/cal-prefs-dialog.c:742 +#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315 #: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399 #: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697 #: mail/em-composer-prefs.c:721 @@ -4085,7 +4129,7 @@ msgstr "启用(_N)" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13 #: calendar/gui/dialogs/recurrence-page.c:1048 -#: calendar/gui/e-itip-control.c:563 +#: calendar/gui/e-itip-control.c:562 msgid "Friday" msgstr "星期五" @@ -4099,7 +4143,7 @@ msgstr "分钟" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16 #: calendar/gui/dialogs/recurrence-page.c:1044 -#: calendar/gui/e-itip-control.c:559 +#: calendar/gui/e-itip-control.c:558 msgid "Monday" msgstr "星期一" @@ -4109,7 +4153,7 @@ msgstr "周日(_U)" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18 #: calendar/gui/dialogs/recurrence-page.c:1049 -#: calendar/gui/e-itip-control.c:564 +#: calendar/gui/e-itip-control.c:563 msgid "Saturday" msgstr "星期六" @@ -4123,7 +4167,7 @@ msgstr "在日期浏览器中显示周数(_N)" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21 #: calendar/gui/dialogs/recurrence-page.c:1050 -#: calendar/gui/e-itip-control.c:558 +#: calendar/gui/e-itip-control.c:557 msgid "Sunday" msgstr "星期日" @@ -4141,7 +4185,7 @@ msgstr "任务列表" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25 #: calendar/gui/dialogs/recurrence-page.c:1047 -#: calendar/gui/e-itip-control.c:562 +#: calendar/gui/e-itip-control.c:561 msgid "Thursday" msgstr "星期四" @@ -4159,7 +4203,7 @@ msgstr "时间格式：" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29 #: calendar/gui/dialogs/recurrence-page.c:1045 -#: calendar/gui/e-itip-control.c:560 +#: calendar/gui/e-itip-control.c:559 msgid "Tuesday" msgstr "星期二" @@ -4169,7 +4213,7 @@ msgstr "一周开始(_E)：" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31 #: calendar/gui/dialogs/recurrence-page.c:1046 -#: calendar/gui/e-itip-control.c:561 +#: calendar/gui/e-itip-control.c:560 msgid "Wednesday" msgstr "星期三" @@ -4473,23 +4517,23 @@ 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:2253 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:2257 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:2259 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:2264 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:2266 msgid "Due " msgstr "预定 " @@ -4525,8 +4569,8 @@ msgstr "日志条目 - %s" msgid "No summary" msgstr "没有概要" -#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1046 -#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1130 +#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1038 +#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1148 msgid "Save as..." msgstr "另存为..." @@ -4540,7 +4584,21 @@ msgstr "如果更新到达的话，对此项目的更改将被丢弃" msgid "Unable to use current version!" msgstr "无法使用当前版本！" -#: calendar/gui/dialogs/copy-source-dialog.c:142 +#: calendar/gui/dialogs/copy-source-dialog.c:83 +#, fuzzy +msgid "Could not open source" +msgstr "无法打开“%s”：%s" + +#: calendar/gui/dialogs/copy-source-dialog.c:91 +#, fuzzy +msgid "Could not open destination" +msgstr "投递目的" + +#: calendar/gui/dialogs/copy-source-dialog.c:100 +msgid "Destination is read only" +msgstr "" + +#: calendar/gui/dialogs/copy-source-dialog.c:164 msgid "Select destination source" msgstr "" @@ -4650,7 +4708,7 @@ msgstr "授权给：" msgid "Enter Delegate" msgstr "输入代表" -#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295 +#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2290 msgid "Appointment" msgstr "约会" @@ -4674,23 +4732,23 @@ msgstr "调度" msgid "Meeting" msgstr "会议" -#: calendar/gui/dialogs/event-page.c:609 calendar/gui/dialogs/task-page.c:512 +#: calendar/gui/dialogs/event-page.c:606 calendar/gui/dialogs/task-page.c:510 msgid "Start date is wrong" msgstr "开始日期有错" -#: calendar/gui/dialogs/event-page.c:619 +#: calendar/gui/dialogs/event-page.c:616 msgid "End date is wrong" msgstr "结束日期有错" -#: calendar/gui/dialogs/event-page.c:642 +#: calendar/gui/dialogs/event-page.c:639 msgid "Start time is wrong" msgstr "开始时间有错" -#: calendar/gui/dialogs/event-page.c:649 +#: calendar/gui/dialogs/event-page.c:646 msgid "End time is wrong" msgstr "结束时间有错" -#: calendar/gui/dialogs/event-page.c:1228 +#: calendar/gui/dialogs/event-page.c:1225 #, c-format msgid "Unable to open the calendar '%s'." msgstr "无法打开日历“%s”。" @@ -4766,9 +4824,9 @@ msgstr "开始时间(_S)：" #. an empty string is the same as 'None' #: calendar/gui/dialogs/meeting-page.c:311 #: calendar/gui/dialogs/meeting-page.glade.h:3 -#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2068 -#: mail/em-account-prefs.c:448 mail/em-folder-view.c:745 -#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783 +#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2086 +#: mail/em-account-prefs.c:448 mail/em-folder-view.c:781 +#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782 #: mail/mail-config.glade.h:82 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445 @@ -4829,7 +4887,7 @@ msgid "Member" msgstr "成员" #: calendar/gui/dialogs/meeting-page.etspec.h:8 -#: calendar/gui/e-itip-control.c:1066 calendar/gui/e-meeting-list-view.c:263 +#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263 #: calendar/gui/e-meeting-time-sel.etspec.h:8 msgid "RSVP" msgstr "RSVP" @@ -4977,10 +5035,6 @@ msgstr "循环" msgid "Date/Time" msgstr "日期/时间" -#: calendar/gui/dialogs/recurrence-page.glade.h:1 -msgid "A_dd" -msgstr "添加(_D)" - #: calendar/gui/dialogs/recurrence-page.glade.h:4 msgid "Every" msgstr "每" @@ -5010,6 +5064,7 @@ msgid "_No recurrence" msgstr "不再现(_N)" #: calendar/gui/dialogs/recurrence-page.glade.h:12 +#: composer/e-msg-composer-attachment-bar.c:444 msgid "_Remove" msgstr "删除(_R)" @@ -5051,7 +5106,7 @@ msgstr "" "\n" "您希望保存改动吗？" -#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1547 +#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1565 msgid "_Discard Changes" msgstr "丢弃修改(_D)" @@ -5075,7 +5130,7 @@ msgstr "任务分配信息已创建。发送此信息吗？" msgid "The task information has changed. Send an updated version?" msgstr "任务信息已经改变。发送更新版本？" -#: calendar/gui/dialogs/task-details-page.c:404 +#: calendar/gui/dialogs/task-details-page.c:402 msgid "Completed date is wrong" msgstr "完成日期有错" @@ -5086,42 +5141,41 @@ msgstr "完成百分比(_C)" #: calendar/gui/dialogs/task-details-page.glade.h:4 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597 -#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-model.c:289 -#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187 -#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210 -#: calendar/gui/print.c:2346 +#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187 +#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206 +#: calendar/gui/print.c:2341 msgid "Completed" msgstr "已完成" #: calendar/gui/dialogs/task-details-page.glade.h:5 -#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:231 -#: mail/message-list.c:919 +#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227 +#: mail/message-list.c:939 msgid "High" msgstr "高" #: calendar/gui/dialogs/task-details-page.glade.h:6 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465 -#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2343 +#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2338 msgid "In Progress" msgstr "正在进行中" #: calendar/gui/dialogs/task-details-page.glade.h:7 -#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:235 -#: mail/message-list.c:917 +#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231 +#: mail/message-list.c:937 msgid "Low" msgstr "低" #: calendar/gui/dialogs/task-details-page.glade.h:8 #: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392 -#: calendar/gui/e-tasks.c:233 mail/message-list.c:918 +#: calendar/gui/e-tasks.c:229 mail/message-list.c:938 msgid "Normal" msgstr "中" #: calendar/gui/dialogs/task-details-page.glade.h:9 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593 -#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:217 -#: calendar/gui/print.c:2340 +#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213 +#: calendar/gui/print.c:2335 msgid "Not Started" msgstr "尚未开始" @@ -5160,15 +5214,16 @@ msgstr "基本" msgid "Assignment" msgstr "指派" -#: calendar/gui/dialogs/task-page.c:485 +#: calendar/gui/dialogs/task-page.c:483 msgid "Due date is wrong" msgstr "到期日期错误" -#: calendar/gui/dialogs/task-page.c:545 +#: calendar/gui/dialogs/task-page.c:543 calendar/gui/e-cal-model-tasks.c:738 +#: calendar/gui/e-cal-model-tasks.c:766 msgid "Due date is before start date!" msgstr "到期日期先于开始日期！" -#: calendar/gui/dialogs/task-page.c:810 +#: calendar/gui/dialogs/task-page.c:808 #, c-format msgid "Unable to open tasks in '%s'." msgstr "无法打开“%s”中的任务。" @@ -5177,8 +5232,8 @@ msgstr "无法打开“%s”中的任务。" msgid "Con_fidential" msgstr "机密(_F)" -#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:994 -#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247 +#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993 +#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46 msgid "Description:" msgstr "描述：" @@ -5326,12 +5381,12 @@ msgstr "在约会结束之后 %s %s" msgid "%s at the end of the appointment" msgstr "在约会结束时 %s" -#: calendar/gui/e-alarm-list.c:538 +#: calendar/gui/e-alarm-list.c:536 #, c-format msgid "%s at %s" msgstr "在 %2$s 时 %1$s" -#: calendar/gui/e-alarm-list.c:544 +#: calendar/gui/e-alarm-list.c:542 #, c-format msgid "%s for an unknown trigger type" msgstr "%s 为未知触发类型" @@ -5410,33 +5465,28 @@ msgstr "" "\n" "45.436845,125.862501" -#: calendar/gui/e-cal-model-tasks.c:932 calendar/gui/e-cal-model.c:841 -#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261 -#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529 -#: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159 +#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841 +#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765 msgid "Yes" msgstr "是" -#: calendar/gui/e-cal-model-tasks.c:932 calendar/gui/e-cal-model.c:841 -#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273 -#: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171 +#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841 +#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171 msgid "No" msgstr "否" #. This is the default filename used for temporary file creation #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299 -#: calendar/gui/e-itip-control.c:979 calendar/gui/e-itip-control.c:1181 +#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180 #: calendar/gui/e-meeting-list-view.c:144 -#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217 -#: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317 -#: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770 -#: 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:1664 -#: camel/camel-gpg-context.c:1715 camel/camel-tcp-stream-openssl.c:631 +#: calendar/gui/e-meeting-list-view.c:158 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:1664 camel/camel-gpg-context.c:1715 +#: camel/camel-tcp-stream-openssl.c:631 #: camel/providers/smtp/camel-smtp-transport.c:172 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2094 -#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60 +#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60 msgid "Unknown" msgstr "未知" @@ -5448,32 +5498,32 @@ msgstr "重复" msgid "Assigned" msgstr "已委派" -#: calendar/gui/e-cal-view.c:684 calendar/gui/e-calendar-table.c:698 +#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698 msgid "Deleting selected objects" msgstr "删除选中的对象" -#: calendar/gui/e-cal-view.c:788 calendar/gui/e-calendar-table.c:861 +#: calendar/gui/e-cal-view.c:780 calendar/gui/e-calendar-table.c:861 msgid "Updating objects" msgstr "更新对象" -#: calendar/gui/e-cal-view.c:1217 calendar/gui/e-cal-view.c:1302 +#: calendar/gui/e-cal-view.c:1209 calendar/gui/e-cal-view.c:1294 msgid "New _Appointment..." msgstr "新建约会(_A)..." -#: calendar/gui/e-cal-view.c:1218 calendar/gui/e-cal-view.c:1304 +#: calendar/gui/e-cal-view.c:1210 calendar/gui/e-cal-view.c:1296 msgid "New All Day _Event" msgstr "新建全天事件(_E)" -#: calendar/gui/e-cal-view.c:1219 calendar/gui/e-cal-view.c:1306 +#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1298 msgid "New Meeting" msgstr "新会议" -#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1308 +#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1300 msgid "New Task" msgstr "新建任务" -#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1247 -#: calendar/gui/e-cal-view.c:1314 calendar/gui/e-calendar-table.c:1040 +#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1239 +#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1040 #: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122 @@ -5481,66 +5531,66 @@ msgstr "新建任务" msgid "_Print..." msgstr "打印(_P)..." -#: calendar/gui/e-cal-view.c:1228 calendar/gui/e-cal-view.c:1254 -#: calendar/gui/e-cal-view.c:1312 calendar/gui/e-calendar-table.c:1046 +#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1246 +#: calendar/gui/e-cal-view.c:1304 calendar/gui/e-calendar-table.c:1046 #: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22 msgid "_Paste" msgstr "粘贴(_P)" -#: calendar/gui/e-cal-view.c:1234 calendar/gui/e-cal-view.c:1298 +#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1290 #: ui/evolution-calendar.xml.h:13 msgid "Go to _Today" msgstr "转到今天(_T)" -#: calendar/gui/e-cal-view.c:1235 calendar/gui/e-cal-view.c:1300 +#: calendar/gui/e-cal-view.c:1227 calendar/gui/e-cal-view.c:1292 msgid "_Go to Date..." msgstr "转到日期(_G)..." -#: calendar/gui/e-cal-view.c:1239 ui/evolution-calendar.xml.h:40 +#: calendar/gui/e-cal-view.c:1231 ui/evolution-calendar.xml.h:40 msgid "_Publish Free/Busy Information" msgstr "发布忙闲信息(_P)" -#: calendar/gui/e-cal-view.c:1246 calendar/gui/e-cal-view.c:1316 +#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1308 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084 -#: mail/em-folder-view.c:713 mail/em-popup.c:659 mail/em-popup.c:774 +#: mail/em-folder-view.c:749 mail/em-popup.c:659 mail/em-popup.c:774 #: ui/evolution-mail-message.xml.h:126 msgid "_Save As..." msgstr "另存为(_S)..." -#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1292 +#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1284 #: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073 #: 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-cal-view.c:1253 calendar/gui/e-cal-view.c:1290 +#: calendar/gui/e-cal-view.c:1245 calendar/gui/e-cal-view.c:1282 #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071 -#: mail/em-folder-tree.c:1766 ui/evolution-addressbook.xml.h:31 +#: mail/em-folder-tree.c:2104 ui/evolution-addressbook.xml.h:31 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18 msgid "_Copy" msgstr "复制(_C)" -#: calendar/gui/e-cal-view.c:1258 +#: calendar/gui/e-cal-view.c:1250 msgid "_Schedule Meeting..." msgstr "调度会议(_S)..." -#: calendar/gui/e-cal-view.c:1259 +#: calendar/gui/e-cal-view.c:1251 msgid "_Forward as iCalendar..." msgstr "作为 iCalendar 转发(_F)..." -#: calendar/gui/e-cal-view.c:1264 calendar/gui/e-cal-view.c:1295 +#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1287 msgid "Delete this _Occurrence" msgstr "删除此次出现(_O)" -#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1296 +#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1288 msgid "Delete _All Occurrences" msgstr "删除所有出现(_A)" -#: calendar/gui/e-cal-view.c:1318 ui/evolution.xml.h:32 +#: calendar/gui/e-cal-view.c:1310 ui/evolution.xml.h:33 msgid "_Settings..." msgstr "设置(_S)..." @@ -5612,7 +5662,7 @@ msgstr "把任务标记为完成(_M)" msgid "_Delete Selected Tasks" msgstr "删除选定的任务(_D)" -#: calendar/gui/e-calendar-table.c:1370 +#: calendar/gui/e-calendar-table.c:1368 #: calendar/gui/e-calendar-table.etspec.h:6 msgid "Click to add a task" msgstr "点击以添加任务" @@ -5627,7 +5677,7 @@ msgid "Alarms" msgstr "提醒" #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167 -#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:578 +#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:583 msgid "Complete" msgstr "完成" @@ -5686,7 +5736,7 @@ msgstr "%02i 分钟分割" #. strftime format %A = full weekday name, %d = day of month, #. %B = full month name. Don't use any other specifiers. #: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1348 -#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1519 +#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514 msgid "%A %d %B" msgstr "%B%d日%A" @@ -5699,432 +5749,429 @@ msgstr "%B%d日" #. String to use in 12-hour time format for times in the morning. #: calendar/gui/e-day-view.c:602 calendar/gui/e-week-view.c:334 -#: calendar/gui/print.c:843 +#: calendar/gui/print.c:838 msgid "am" msgstr "上午" #. String to use in 12-hour time format for times in the afternoon. #: calendar/gui/e-day-view.c:605 calendar/gui/e-week-view.c:337 -#: calendar/gui/print.c:845 +#: calendar/gui/print.c:840 msgid "pm" msgstr "下午" -#: calendar/gui/e-itip-control.c:592 +#: calendar/gui/e-itip-control.c:591 msgid "Yes. (Complex Recurrence)" msgstr "是(复杂重现)" -#: calendar/gui/e-itip-control.c:604 +#: calendar/gui/e-itip-control.c:603 msgid "Every day" msgstr "每天" -#: calendar/gui/e-itip-control.c:606 +#: calendar/gui/e-itip-control.c:605 #, c-format msgid "Every %d days" msgstr "每 %d 天" -#: calendar/gui/e-itip-control.c:612 +#: calendar/gui/e-itip-control.c:611 msgid "Every week" msgstr "每周" -#: calendar/gui/e-itip-control.c:614 +#: calendar/gui/e-itip-control.c:613 #, c-format msgid "Every %d weeks" msgstr "每 %d 周" -#: calendar/gui/e-itip-control.c:617 +#: calendar/gui/e-itip-control.c:616 msgid "Every week on " msgstr "每周的" -#: calendar/gui/e-itip-control.c:619 +#: calendar/gui/e-itip-control.c:618 #, c-format msgid "Every %d weeks on " msgstr "每 %d 周的" -#: calendar/gui/e-itip-control.c:627 +#: calendar/gui/e-itip-control.c:626 msgid " and " msgstr " 和 " -#: calendar/gui/e-itip-control.c:634 +#: calendar/gui/e-itip-control.c:633 #, c-format msgid "The %s day of " msgstr "第 %s 天属于" -#: calendar/gui/e-itip-control.c:647 +#: calendar/gui/e-itip-control.c:646 #, c-format msgid "The %s %s of " msgstr "%s %s 属于" -#: calendar/gui/e-itip-control.c:652 +#: calendar/gui/e-itip-control.c:651 msgid "every month" msgstr "每月" -#: calendar/gui/e-itip-control.c:657 +#: calendar/gui/e-itip-control.c:656 #, c-format msgid "every %d months" msgstr "每 %d 个月" -#: calendar/gui/e-itip-control.c:663 +#: calendar/gui/e-itip-control.c:662 msgid "Every year" msgstr "每年" -#: calendar/gui/e-itip-control.c:665 +#: calendar/gui/e-itip-control.c:664 #, c-format msgid "Every %d years" msgstr "每 %d 年" -#: calendar/gui/e-itip-control.c:677 +#: calendar/gui/e-itip-control.c:676 #, c-format msgid " a total of %d times" msgstr " 总计 %d 次" -#: calendar/gui/e-itip-control.c:686 +#: calendar/gui/e-itip-control.c:685 msgid ", ending on " msgstr "，结束于 " -#: calendar/gui/e-itip-control.c:710 +#: calendar/gui/e-itip-control.c:709 msgid "Starts: " msgstr "开始：" -#: calendar/gui/e-itip-control.c:720 +#: calendar/gui/e-itip-control.c:719 msgid "Ends: " msgstr "结束：" -#: calendar/gui/e-itip-control.c:740 +#: calendar/gui/e-itip-control.c:739 msgid "Completed: " msgstr "已完成： " -#: calendar/gui/e-itip-control.c:750 +#: calendar/gui/e-itip-control.c:749 msgid "Due: " msgstr "到期：" -#: calendar/gui/e-itip-control.c:787 calendar/gui/e-itip-control.c:840 +#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839 msgid "iCalendar Information" msgstr "iCalendar 信息" #. Title -#: calendar/gui/e-itip-control.c:802 +#: calendar/gui/e-itip-control.c:801 msgid "iCalendar Error" msgstr "iCalendar 错误" -#: calendar/gui/e-itip-control.c:871 calendar/gui/e-itip-control.c:887 -#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:915 +#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886 +#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914 msgid "An unknown person" msgstr "未知的人" #. Describe what the user can do -#: calendar/gui/e-itip-control.c:922 +#: calendar/gui/e-itip-control.c:921 msgid "" "
Please review the following information, and then select an action from " "the menu below." msgstr "
请查看下列信息，并从下面的菜单中选择一个动作。" -#: calendar/gui/e-itip-control.c:937 +#: calendar/gui/e-itip-control.c:936 msgid "None" msgstr "无" #. write status -#: calendar/gui/e-itip-control.c:962 calendar/gui/e-tasks.c:203 +#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199 msgid "Status:" msgstr "状态：" -#: calendar/gui/e-itip-control.c:967 calendar/gui/e-meeting-list-view.c:180 -#: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304 -#: calendar/gui/e-meeting-model.c:796 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:966 calendar/gui/e-meeting-list-view.c:180 +#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202 +#: calendar/gui/itip-utils.c:422 msgid "Accepted" msgstr "接受" -#: calendar/gui/e-itip-control.c:971 calendar/gui/itip-utils.c:425 +#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425 msgid "Tentatively Accepted" msgstr "暂时接受" -#: calendar/gui/e-itip-control.c:975 calendar/gui/e-meeting-list-view.c:181 -#: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306 -#: calendar/gui/e-meeting-model.c:797 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:974 calendar/gui/e-meeting-list-view.c:181 +#: 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 msgid "Declined" msgstr "拒绝" -#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1062 -#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-itip-control.c:1101 -#: calendar/gui/e-itip-control.c:1114 calendar/gui/e-itip-control.c:1127 +#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061 +#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100 +#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126 msgid "Choose an action:" msgstr "选择一项活动：" -#: calendar/gui/e-itip-control.c:1035 +#: calendar/gui/e-itip-control.c:1034 msgid "Update" msgstr "更新" -#: calendar/gui/e-itip-control.c:1036 calendar/gui/e-itip-control.c:1067 -#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1103 -#: calendar/gui/e-itip-control.c:1116 calendar/gui/e-itip-control.c:1129 -#: shell/e-shell.c:992 widgets/misc/e-cell-date-edit.c:265 +#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066 +#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102 +#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128 +#: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265 msgid "OK" msgstr "确定" -#: calendar/gui/e-itip-control.c:1063 +#: calendar/gui/e-itip-control.c:1062 msgid "Accept" msgstr "接受" -#: calendar/gui/e-itip-control.c:1064 +#: calendar/gui/e-itip-control.c:1063 msgid "Tentatively accept" msgstr "暂时接受" -#: calendar/gui/e-itip-control.c:1065 +#: calendar/gui/e-itip-control.c:1064 msgid "Decline" msgstr "拒绝" -#: calendar/gui/e-itip-control.c:1089 +#: calendar/gui/e-itip-control.c:1088 msgid "Send Free/Busy Information" msgstr "发送忙闲信息" -#: calendar/gui/e-itip-control.c:1102 +#: calendar/gui/e-itip-control.c:1101 msgid "Update respondent status" msgstr "更新应答者状态" -#: calendar/gui/e-itip-control.c:1115 +#: calendar/gui/e-itip-control.c:1114 msgid "Send Latest Information" msgstr "发送最新的信息" -#: calendar/gui/e-itip-control.c:1128 calendar/gui/itip-utils.c:442 -#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440 +#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442 +#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445 #: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1 msgid "Cancel" msgstr "取消" -#: calendar/gui/e-itip-control.c:1204 +#: calendar/gui/e-itip-control.c:1203 #, c-format msgid "%s has published meeting information." msgstr "%s 发布了会议信息。" -#: calendar/gui/e-itip-control.c:1205 +#: calendar/gui/e-itip-control.c:1204 msgid "Meeting Information" msgstr "会议信息" -#: calendar/gui/e-itip-control.c:1210 +#: calendar/gui/e-itip-control.c:1209 #, c-format msgid "%s requests the presence of %s at a meeting." msgstr "%s 请求 %s 参加一个会议。" -#: calendar/gui/e-itip-control.c:1212 +#: calendar/gui/e-itip-control.c:1211 #, c-format msgid "%s requests your presence at a meeting." msgstr "%s 请求您参加一个会议。" -#: calendar/gui/e-itip-control.c:1213 +#: calendar/gui/e-itip-control.c:1212 msgid "Meeting Proposal" msgstr "会议建议" -#: calendar/gui/e-itip-control.c:1217 +#: calendar/gui/e-itip-control.c:1216 #, c-format msgid "%s wishes to add to an existing meeting." msgstr "%s 希望加入到已存的会议。" -#: calendar/gui/e-itip-control.c:1218 +#: calendar/gui/e-itip-control.c:1217 msgid "Meeting Update" msgstr "会议更新" -#: calendar/gui/e-itip-control.c:1222 +#: calendar/gui/e-itip-control.c:1221 #, c-format msgid "%s wishes to receive the latest meeting information." msgstr "%s 想收到最新的会议信息。" -#: calendar/gui/e-itip-control.c:1223 +#: calendar/gui/e-itip-control.c:1222 msgid "Meeting Update Request" msgstr "会议更新请求" -#: calendar/gui/e-itip-control.c:1230 +#: calendar/gui/e-itip-control.c:1229 #, c-format msgid "%s has replied to a meeting request." msgstr "%s 已回复一个会议请求。" -#: calendar/gui/e-itip-control.c:1231 +#: calendar/gui/e-itip-control.c:1230 msgid "Meeting Reply" msgstr "会议答复" -#: calendar/gui/e-itip-control.c:1238 +#: calendar/gui/e-itip-control.c:1237 #, c-format msgid "%s has cancelled a meeting." msgstr "%s 取消了一个会议。" -#: calendar/gui/e-itip-control.c:1239 +#: calendar/gui/e-itip-control.c:1238 msgid "Meeting Cancellation" msgstr "会议取消" -#: calendar/gui/e-itip-control.c:1246 calendar/gui/e-itip-control.c:1314 -#: calendar/gui/e-itip-control.c:1349 +#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313 +#: calendar/gui/e-itip-control.c:1348 #, c-format msgid "%s has sent an unintelligible message." msgstr "%s 发送了一个无法理解的信息。" -#: calendar/gui/e-itip-control.c:1247 +#: calendar/gui/e-itip-control.c:1246 msgid "Bad Meeting Message" msgstr "错误的会议信息" -#: calendar/gui/e-itip-control.c:1272 +#: calendar/gui/e-itip-control.c:1271 #, c-format msgid "%s has published task information." msgstr "%s 发布了任务信息。" -#: calendar/gui/e-itip-control.c:1273 +#: calendar/gui/e-itip-control.c:1272 msgid "Task Information" msgstr "任务信息" -#: calendar/gui/e-itip-control.c:1278 +#: calendar/gui/e-itip-control.c:1277 #, c-format msgid "%s requests %s to perform a task." msgstr "%s 请求 %s 完成一个任务。" -#: calendar/gui/e-itip-control.c:1280 +#: calendar/gui/e-itip-control.c:1279 #, c-format msgid "%s requests you perform a task." msgstr "%s 请求您完成一个任务。" -#: calendar/gui/e-itip-control.c:1281 +#: calendar/gui/e-itip-control.c:1280 msgid "Task Proposal" msgstr "任务建议" -#: calendar/gui/e-itip-control.c:1285 +#: calendar/gui/e-itip-control.c:1284 #, c-format msgid "%s wishes to add to an existing task." msgstr "%s 希望加入到已存在的任务。" -#: calendar/gui/e-itip-control.c:1286 +#: calendar/gui/e-itip-control.c:1285 msgid "Task Update" msgstr "任务更新" -#: calendar/gui/e-itip-control.c:1290 +#: calendar/gui/e-itip-control.c:1289 #, c-format msgid "%s wishes to receive the latest task information." msgstr "%s 希望获取最新的任务信息。" -#: calendar/gui/e-itip-control.c:1291 +#: calendar/gui/e-itip-control.c:1290 msgid "Task Update Request" msgstr "任务更新请求" -#: calendar/gui/e-itip-control.c:1298 +#: calendar/gui/e-itip-control.c:1297 #, c-format msgid "%s has replied to a task assignment." msgstr "%s 已经回复了任务委派。" -#: calendar/gui/e-itip-control.c:1299 +#: calendar/gui/e-itip-control.c:1298 msgid "Task Reply" msgstr "任务回复" -#: calendar/gui/e-itip-control.c:1306 +#: calendar/gui/e-itip-control.c:1305 #, c-format msgid "%s has cancelled a task." msgstr "%s 取消了任务。" -#: calendar/gui/e-itip-control.c:1307 +#: calendar/gui/e-itip-control.c:1306 msgid "Task Cancellation" msgstr "任务取消" -#: calendar/gui/e-itip-control.c:1315 +#: calendar/gui/e-itip-control.c:1314 msgid "Bad Task Message" msgstr "错误的任务邮件" -#: calendar/gui/e-itip-control.c:1334 +#: calendar/gui/e-itip-control.c:1333 #, c-format msgid "%s has published free/busy information." msgstr "%s 发布了忙闲信息。" -#: calendar/gui/e-itip-control.c:1335 +#: calendar/gui/e-itip-control.c:1334 msgid "Free/Busy Information" msgstr "忙闲信息" -#: calendar/gui/e-itip-control.c:1339 +#: calendar/gui/e-itip-control.c:1338 #, c-format msgid "%s requests your free/busy information." msgstr "%s 请求您的忙闲信息。" -#: calendar/gui/e-itip-control.c:1340 +#: calendar/gui/e-itip-control.c:1339 msgid "Free/Busy Request" msgstr "忙/闲请求" -#: calendar/gui/e-itip-control.c:1344 +#: calendar/gui/e-itip-control.c:1343 #, c-format msgid "%s has replied to a free/busy request." msgstr "%s 应答了忙闲请求。" -#: calendar/gui/e-itip-control.c:1345 +#: calendar/gui/e-itip-control.c:1344 msgid "Free/Busy Reply" msgstr "忙闲应答" -#: calendar/gui/e-itip-control.c:1350 +#: calendar/gui/e-itip-control.c:1349 msgid "Bad Free/Busy Message" msgstr "错误的忙闲信息" -#: calendar/gui/e-itip-control.c:1423 +#: calendar/gui/e-itip-control.c:1424 msgid "The message does not appear to be properly formed" msgstr "邮件的格式可能不正确" -#: calendar/gui/e-itip-control.c:1482 +#: calendar/gui/e-itip-control.c:1483 msgid "The message contains only unsupported requests." msgstr "邮件只含有不支持的请求。" -#: calendar/gui/e-itip-control.c:1513 +#: calendar/gui/e-itip-control.c:1514 msgid "The attachment does not contain a valid calendar message" msgstr "附件中没有有效的日历信息" -#: calendar/gui/e-itip-control.c:1543 +#: calendar/gui/e-itip-control.c:1544 msgid "The attachment has no viewable calendar items" msgstr "附件中没有可查看的日历项目" -#: calendar/gui/e-itip-control.c:1774 +#: calendar/gui/e-itip-control.c:1775 msgid "Calendar file could not be updated!\n" msgstr "无法更新日历文件！\n" -#: calendar/gui/e-itip-control.c:1776 +#: calendar/gui/e-itip-control.c:1777 msgid "Update complete\n" msgstr "更新完成\n" -#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1878 +#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879 msgid "Attendee status can not be updated because the item no longer exists" msgstr "由于条目不再存在而无法更新参与者状态" -#: calendar/gui/e-itip-control.c:1822 calendar/gui/e-itip-control.c:1860 +#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861 msgid "Object is invalid and cannot be updated\n" msgstr "对象无效，无法更新\n" -#: calendar/gui/e-itip-control.c:1832 +#: calendar/gui/e-itip-control.c:1833 msgid "This response is not from a current attendee. Add as an attendee?" msgstr "此响应并非来自当前参与者。将响应者加为参与者吗？" -#: calendar/gui/e-itip-control.c:1844 +#: calendar/gui/e-itip-control.c:1845 msgid "Attendee status could not be updated because of an invalid status!\n" msgstr "因为无效状态而无法更新参与者状态！\n" -#: calendar/gui/e-itip-control.c:1863 +#: calendar/gui/e-itip-control.c:1864 msgid "There was an error on the CORBA system\n" msgstr "CORBA 系统出错\n" -#: calendar/gui/e-itip-control.c:1866 +#: calendar/gui/e-itip-control.c:1867 msgid "Object could not be found\n" msgstr "找不到对象\n" -#: calendar/gui/e-itip-control.c:1869 +#: calendar/gui/e-itip-control.c:1870 msgid "You don't have the right permissions to update the calendar\n" msgstr "您没有适当的权限打开日历\n" -#: calendar/gui/e-itip-control.c:1872 +#: calendar/gui/e-itip-control.c:1873 msgid "Attendee status updated\n" msgstr "更新参与者状态\n" -#: calendar/gui/e-itip-control.c:1875 +#: calendar/gui/e-itip-control.c:1876 msgid "Attendee status could not be updated!\n" msgstr "无法更新参与者状态！\n" -#: calendar/gui/e-itip-control.c:1906 +#: calendar/gui/e-itip-control.c:1907 msgid "Removal Complete" msgstr "删除完成" -#: calendar/gui/e-itip-control.c:1929 calendar/gui/e-itip-control.c:1977 +#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978 msgid "Item sent!\n" msgstr "项目已发送！\n" -#: calendar/gui/e-itip-control.c:1931 calendar/gui/e-itip-control.c:1981 +#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982 msgid "The item could not be sent!\n" msgstr "无法发送项目！\n" @@ -6165,95 +6212,78 @@ msgstr "日期-结束" msgid "date-start" msgstr "日期-开始" -#: calendar/gui/e-meeting-list-view.c:62 calendar/gui/e-meeting-model.c:77 +#: calendar/gui/e-meeting-list-view.c:62 msgid "Chair Persons" msgstr "主席人员" #: calendar/gui/e-meeting-list-view.c:63 -#: calendar/gui/e-meeting-list-view.c:479 calendar/gui/e-meeting-model.c:78 -#: calendar/gui/e-meeting-model.c:1635 +#: calendar/gui/e-meeting-list-view.c:479 msgid "Required Participants" msgstr "必需的参与者" -#: calendar/gui/e-meeting-list-view.c:64 calendar/gui/e-meeting-model.c:79 +#: calendar/gui/e-meeting-list-view.c:64 msgid "Optional Participants" msgstr "可选的参与者" -#: calendar/gui/e-meeting-list-view.c:65 calendar/gui/e-meeting-model.c:80 +#: calendar/gui/e-meeting-list-view.c:65 msgid "Resources" msgstr "资源" -#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-model.c:192 -#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:525 -#: calendar/gui/e-meeting-model.c:750 calendar/gui/e-meeting-store.c:90 +#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759 msgid "Individual" msgstr "个人" -#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-model.c:194 -#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:751 -#: calendar/gui/e-meeting-store.c:92 calendar/gui/e-meeting-store.c:109 +#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92 +#: calendar/gui/e-meeting-store.c:109 msgid "Group" msgstr "组" -#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-model.c:196 -#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:752 -#: calendar/gui/e-meeting-store.c:94 calendar/gui/e-meeting-store.c:111 +#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94 +#: calendar/gui/e-meeting-store.c:111 msgid "Resource" msgstr "资源" -#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-model.c:198 -#: calendar/gui/e-meeting-model.c:215 calendar/gui/e-meeting-model.c:753 -#: calendar/gui/e-meeting-store.c:96 calendar/gui/e-meeting-store.c:113 +#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96 +#: calendar/gui/e-meeting-store.c:113 msgid "Room" msgstr "房间" -#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-model.c:227 -#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:766 -#: calendar/gui/e-meeting-store.c:125 calendar/gui/e-meeting-store.c:142 +#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125 +#: calendar/gui/e-meeting-store.c:142 msgid "Chair" msgstr "主席" -#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-model.c:229 -#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:527 -#: calendar/gui/e-meeting-model.c:767 calendar/gui/e-meeting-store.c:127 +#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762 msgid "Required Participant" msgstr "必需的参与者" -#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-model.c:231 -#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:768 -#: calendar/gui/e-meeting-store.c:129 calendar/gui/e-meeting-store.c:146 +#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129 +#: calendar/gui/e-meeting-store.c:146 msgid "Optional Participant" msgstr "可选的参与者" -#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-model.c:233 -#: calendar/gui/e-meeting-model.c:250 calendar/gui/e-meeting-model.c:769 -#: calendar/gui/e-meeting-store.c:131 calendar/gui/e-meeting-store.c:148 +#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131 +#: calendar/gui/e-meeting-store.c:148 msgid "Non-Participant" msgstr "不参加" -#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-model.c:279 -#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:535 -#: calendar/gui/e-meeting-model.c:795 calendar/gui/e-meeting-store.c:177 +#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772 msgid "Needs Action" msgstr "需要动作" -#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-model.c:285 -#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:798 -#: calendar/gui/e-meeting-store.c:183 calendar/gui/e-meeting-store.c:206 -#: calendar/gui/e-meeting-time-sel.c:398 +#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183 +#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398 msgid "Tentative" msgstr "暂时的" -#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-model.c:287 -#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:799 -#: calendar/gui/e-meeting-store.c:185 calendar/gui/e-meeting-store.c:208 +#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185 +#: calendar/gui/e-meeting-store.c:208 msgid "Delegated" msgstr "被委任的" -#: calendar/gui/e-meeting-model.c:291 calendar/gui/e-meeting-model.c:314 #: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212 msgid "In Process" msgstr "正在处理" @@ -6340,30 +6370,30 @@ msgstr "会议开始时间(_S)：" msgid "Meeting _end time:" msgstr "会议结束时间(_E)：" -#: calendar/gui/e-tasks.c:181 +#: calendar/gui/e-tasks.c:177 msgid "Start Date:" msgstr "开始日期：" -#: calendar/gui/e-tasks.c:197 +#: calendar/gui/e-tasks.c:193 msgid "Due Date:" msgstr "到期日期：" #. write priority -#: calendar/gui/e-tasks.c:225 +#: calendar/gui/e-tasks.c:221 msgid "Priority:" msgstr "优先级：" #. URL -#: calendar/gui/e-tasks.c:281 +#: calendar/gui/e-tasks.c:277 msgid "Web Page:" msgstr "网页：" -#: calendar/gui/e-tasks.c:314 mail/em-folder-view.c:2137 +#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173 #, c-format msgid "Click to open %s" msgstr "点击以打开 %s" -#: calendar/gui/e-tasks.c:747 calendar/gui/gnome-cal.c:1892 +#: calendar/gui/e-tasks.c:736 calendar/gui/gnome-cal.c:1907 #, c-format msgid "" "Error on %s:\n" @@ -6373,7 +6403,7 @@ msgstr "" " %s" #. FIXME: this doesn't remove the task list from the list or anything -#: calendar/gui/e-tasks.c:766 calendar/gui/gnome-cal.c:1913 +#: calendar/gui/e-tasks.c:755 calendar/gui/gnome-cal.c:1928 #, c-format msgid "" "The task backend for\n" @@ -6381,12 +6411,12 @@ msgid "" " has crashed." msgstr "" -#: calendar/gui/e-tasks.c:846 +#: calendar/gui/e-tasks.c:835 #, c-format msgid "Opening tasks at %s" msgstr "在 %s 打开任务" -#: calendar/gui/e-tasks.c:867 +#: calendar/gui/e-tasks.c:856 #, c-format msgid "" "Error opening %s:\n" @@ -6395,33 +6425,28 @@ msgstr "" "打开 %s 出错：\n" " %s" -#: calendar/gui/e-tasks.c:886 +#: calendar/gui/e-tasks.c:875 msgid "Loading tasks" msgstr "装入任务" -#: calendar/gui/e-tasks.c:988 +#: calendar/gui/e-tasks.c:977 msgid "Completing tasks..." msgstr "正在完成的日期..." -#: calendar/gui/e-tasks.c:1011 +#: calendar/gui/e-tasks.c:1000 msgid "Deleting selected objects..." msgstr "正在删除选中的对象..." -#: calendar/gui/e-tasks.c:1036 +#: calendar/gui/e-tasks.c:1025 msgid "Expunging" msgstr "销毁" -#: calendar/gui/gnome-cal.c:1757 +#: calendar/gui/gnome-cal.c:1787 #, c-format msgid "Opening %s" msgstr "打开 %s" -#: calendar/gui/gnome-cal.c:1768 -#, c-format -msgid "Could not open '%s': %s" -msgstr "无法打开“%s”：%s" - -#: calendar/gui/gnome-cal.c:1921 +#: calendar/gui/gnome-cal.c:1936 #, c-format msgid "" "The calendar backend for\n" @@ -6429,7 +6454,7 @@ msgid "" " has crashed." msgstr "" -#: calendar/gui/gnome-cal.c:2808 +#: calendar/gui/gnome-cal.c:2799 #, fuzzy msgid "Purging" msgstr "都灵" @@ -6455,41 +6480,42 @@ msgid "Go To Date" msgstr "转到日期" #: calendar/gui/goto-dialog.glade.h:6 -msgid "Go To Today" -msgstr "转到今天" - -#: calendar/gui/goto-dialog.glade.h:7 msgid "January" msgstr "一月" -#: calendar/gui/goto-dialog.glade.h:8 +#: calendar/gui/goto-dialog.glade.h:7 msgid "July" msgstr "七月" -#: calendar/gui/goto-dialog.glade.h:9 +#: calendar/gui/goto-dialog.glade.h:8 msgid "June" msgstr "六月" -#: calendar/gui/goto-dialog.glade.h:10 +#: calendar/gui/goto-dialog.glade.h:9 msgid "March" msgstr "三月" -#: calendar/gui/goto-dialog.glade.h:11 +#: calendar/gui/goto-dialog.glade.h:10 msgid "May" msgstr "五月" -#: calendar/gui/goto-dialog.glade.h:12 +#: calendar/gui/goto-dialog.glade.h:11 msgid "November" msgstr "十一月" -#: calendar/gui/goto-dialog.glade.h:13 +#: calendar/gui/goto-dialog.glade.h:12 msgid "October" msgstr "十月" -#: calendar/gui/goto-dialog.glade.h:14 +#: calendar/gui/goto-dialog.glade.h:13 msgid "September" msgstr "九月" +#: calendar/gui/goto-dialog.glade.h:14 +#, fuzzy +msgid "_Go To Today" +msgstr "转到今天" + #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319 #: calendar/gui/itip-utils.c:351 msgid "An organizer must be set." @@ -6573,243 +6599,243 @@ msgstr "" "\n" "请稍候，Evolution 正在升迁您的文件夹..." -#: calendar/gui/migration.c:345 +#: calendar/gui/migration.c:365 msgid "Birthdays & Anniversaries" msgstr "" -#. Create the web group -#: calendar/gui/migration.c:400 +#. Create the Webcal source group +#: calendar/gui/migration.c:441 msgid "On The Web" msgstr "" -#: calendar/gui/print.c:500 +#: calendar/gui/print.c:489 msgid "1st" msgstr "1日" -#: calendar/gui/print.c:500 +#: calendar/gui/print.c:489 msgid "2nd" msgstr "2日" -#: calendar/gui/print.c:500 +#: calendar/gui/print.c:489 msgid "3rd" msgstr "3日" -#: calendar/gui/print.c:500 +#: calendar/gui/print.c:489 msgid "4th" msgstr "4日" -#: calendar/gui/print.c:500 +#: calendar/gui/print.c:489 msgid "5th" msgstr "5日" -#: calendar/gui/print.c:501 +#: calendar/gui/print.c:490 msgid "6th" msgstr "6日" -#: calendar/gui/print.c:501 +#: calendar/gui/print.c:490 msgid "7th" msgstr "7日" -#: calendar/gui/print.c:501 +#: calendar/gui/print.c:490 msgid "8th" msgstr "8日" -#: calendar/gui/print.c:501 +#: calendar/gui/print.c:490 msgid "9th" msgstr "9日" -#: calendar/gui/print.c:501 +#: calendar/gui/print.c:490 msgid "10th" msgstr "10日" -#: calendar/gui/print.c:502 +#: calendar/gui/print.c:491 msgid "11th" msgstr "11日" -#: calendar/gui/print.c:502 +#: calendar/gui/print.c:491 msgid "12th" msgstr "12日" -#: calendar/gui/print.c:502 +#: calendar/gui/print.c:491 msgid "13th" msgstr "13日" -#: calendar/gui/print.c:502 +#: calendar/gui/print.c:491 msgid "14th" msgstr "14日" -#: calendar/gui/print.c:502 +#: calendar/gui/print.c:491 msgid "15th" msgstr "15日" -#: calendar/gui/print.c:503 +#: calendar/gui/print.c:492 msgid "16th" msgstr "16日" -#: calendar/gui/print.c:503 +#: calendar/gui/print.c:492 msgid "17th" msgstr "17日" -#: calendar/gui/print.c:503 +#: calendar/gui/print.c:492 msgid "18th" msgstr "18日" -#: calendar/gui/print.c:503 +#: calendar/gui/print.c:492 msgid "19th" msgstr "19日" -#: calendar/gui/print.c:503 +#: calendar/gui/print.c:492 msgid "20th" msgstr "20日" -#: calendar/gui/print.c:504 +#: calendar/gui/print.c:493 msgid "21st" msgstr "21日" -#: calendar/gui/print.c:504 +#: calendar/gui/print.c:493 msgid "22nd" msgstr "22日" -#: calendar/gui/print.c:504 +#: calendar/gui/print.c:493 msgid "23rd" msgstr "23日" -#: calendar/gui/print.c:504 +#: calendar/gui/print.c:493 msgid "24th" msgstr "24日" -#: calendar/gui/print.c:504 +#: calendar/gui/print.c:493 msgid "25th" msgstr "25日" -#: calendar/gui/print.c:505 +#: calendar/gui/print.c:494 msgid "26th" msgstr "26日" -#: calendar/gui/print.c:505 +#: calendar/gui/print.c:494 msgid "27th" msgstr "27日" -#: calendar/gui/print.c:505 +#: calendar/gui/print.c:494 msgid "28th" msgstr "28日" -#: calendar/gui/print.c:505 +#: calendar/gui/print.c:494 msgid "29th" msgstr "29日" -#: calendar/gui/print.c:505 +#: calendar/gui/print.c:494 msgid "30th" msgstr "30日" -#: calendar/gui/print.c:506 +#: calendar/gui/print.c:495 msgid "31st" msgstr "31日" -#: calendar/gui/print.c:581 +#: calendar/gui/print.c:570 msgid "Su" msgstr "日" -#: calendar/gui/print.c:581 +#: calendar/gui/print.c:570 msgid "Mo" msgstr "一" -#: calendar/gui/print.c:581 +#: calendar/gui/print.c:570 msgid "Tu" msgstr "二" -#: calendar/gui/print.c:581 +#: calendar/gui/print.c:570 msgid "We" msgstr "三" -#: calendar/gui/print.c:582 +#: calendar/gui/print.c:571 msgid "Th" msgstr "四" -#: calendar/gui/print.c:582 +#: calendar/gui/print.c:571 msgid "Fr" msgstr "五" -#: calendar/gui/print.c:582 +#: calendar/gui/print.c:571 msgid "Sa" msgstr "六" #. Day -#: calendar/gui/print.c:1920 +#: calendar/gui/print.c:1915 msgid "Selected day (%a %b %d %Y)" msgstr "选中的日期(%Y年%m月%d日%A)" -#: calendar/gui/print.c:1945 calendar/gui/print.c:1949 +#: calendar/gui/print.c:1940 calendar/gui/print.c:1944 msgid "%a %b %d" msgstr "%m月%d日%A" -#: calendar/gui/print.c:1946 +#: calendar/gui/print.c:1941 msgid "%a %d %Y" msgstr "%Y年%d日%A" -#: calendar/gui/print.c:1950 calendar/gui/print.c:1952 -#: calendar/gui/print.c:1953 +#: calendar/gui/print.c:1945 calendar/gui/print.c:1947 +#: calendar/gui/print.c:1948 msgid "%a %b %d %Y" msgstr "%Y年%m月%d日%A" -#: calendar/gui/print.c:1957 +#: calendar/gui/print.c:1952 #, c-format msgid "Selected week (%s - %s)" msgstr "选中的周(%s - %s)" #. Month -#: calendar/gui/print.c:1965 +#: calendar/gui/print.c:1960 msgid "Selected month (%b %Y)" msgstr "选中的月(%Y年%m月)" #. Year -#: calendar/gui/print.c:1972 +#: calendar/gui/print.c:1967 msgid "Selected year (%Y)" msgstr "选中的年(%Y年)" -#: calendar/gui/print.c:2297 +#: calendar/gui/print.c:2292 msgid "Task" msgstr "任务" -#: calendar/gui/print.c:2356 +#: calendar/gui/print.c:2351 #, c-format msgid "Status: %s" msgstr "状态：%s" -#: calendar/gui/print.c:2373 +#: calendar/gui/print.c:2368 #, c-format msgid "Priority: %s" msgstr "优先级：%s" -#: calendar/gui/print.c:2385 +#: calendar/gui/print.c:2380 #, c-format msgid "Percent Complete: %i" msgstr "完成率：%i" -#: calendar/gui/print.c:2397 +#: calendar/gui/print.c:2392 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: calendar/gui/print.c:2411 +#: calendar/gui/print.c:2406 #, c-format msgid "Categories: %s" msgstr "类别：%s" -#: calendar/gui/print.c:2422 +#: calendar/gui/print.c:2417 msgid "Contacts: " msgstr "联系人：" -#: calendar/gui/print.c:2559 calendar/gui/print.c:2645 -#: calendar/gui/print.c:2737 mail/em-format-html-print.c:147 +#: calendar/gui/print.c:2554 calendar/gui/print.c:2640 +#: calendar/gui/print.c:2732 mail/em-format-html-print.c:147 msgid "Print Preview" msgstr "打印预览" -#: calendar/gui/print.c:2593 +#: calendar/gui/print.c:2588 msgid "Print Item" msgstr "打印项" -#: calendar/gui/print.c:2759 +#: calendar/gui/print.c:2754 msgid "Print Setup" msgstr "打印设置" @@ -6903,15 +6929,20 @@ msgstr "iCalendar 文件(.ics)" msgid "vCalendar files (.vcf)" msgstr "vCalendar 文件(.vcf)" -#: calendar/importers/icalendar-importer.c:470 +#: calendar/importers/icalendar-importer.c:79 +#, fuzzy +msgid "Appointments and Meetings" +msgstr "含有约会和事件的公共文件夹" + +#: calendar/importers/icalendar-importer.c:495 msgid "Reminder!!" msgstr "提醒!!" -#: calendar/importers/icalendar-importer.c:710 +#: calendar/importers/icalendar-importer.c:703 msgid "Calendar Events" msgstr "日历事件" -#: calendar/importers/icalendar-importer.c:735 +#: calendar/importers/icalendar-importer.c:728 msgid "" "Evolution has found Gnome Calendar files.\n" "Would you like to import them into Evolution?" @@ -6919,7 +6950,7 @@ msgstr "" "Evolution 已找到 Gnome 日历文件。\n" "您是否原意把它们导入 Evolution？" -#: calendar/importers/icalendar-importer.c:742 +#: calendar/importers/icalendar-importer.c:735 msgid "Gnome Calendar" msgstr "Gnome 日历" @@ -8639,7 +8670,7 @@ msgstr "(match-all) 需要一个布尔结果" msgid "Performing query on unknown header: %s" msgstr "正在对未知的头进行查询：%s" -#: camel/camel-folder.c:586 +#: camel/camel-folder.c:584 #, c-format msgid "Unsupported operation: append message: for %s" msgstr "不支持的操作：附加邮件：附加 %s" @@ -8662,7 +8693,7 @@ msgstr "移动邮件" msgid "Copying messages" msgstr "复制邮件" -#: camel/camel-folder.c:1572 +#: camel/camel-folder.c:1571 msgid "Filtering new message(s)" msgstr "过滤新邮件" @@ -8696,7 +8727,7 @@ msgstr "" #: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268 #: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507 -#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:574 +#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:579 msgid "Cancelled." msgstr "已取消。" @@ -8890,17 +8921,17 @@ msgstr "解密 MIME 部分失败：无效的结构" msgid "parse error" msgstr "解析错误" -#: camel/camel-provider.c:132 +#: camel/camel-provider.c:140 #, c-format msgid "Could not load %s: Module loading not supported on this system." msgstr "无法装入 %s：本系统不支持模块装入。" -#: camel/camel-provider.c:141 +#: camel/camel-provider.c:149 #, c-format msgid "Could not load %s: %s" msgstr "无法装入 %s：%s" -#: camel/camel-provider.c:149 +#: camel/camel-provider.c:157 #, c-format msgid "Could not load %s: No initialization code in module." msgstr "无法装入 %s：模块中没有初始化代码。" @@ -9131,55 +9162,55 @@ msgstr "以非 pop 源进行 SMTP 之前的 POP 授权" msgid "Regular expression compilation failed: %s: %s" msgstr "常规表达式编译失败：%s：%s" -#: camel/camel-service.c:278 +#: camel/camel-service.c:275 #, c-format msgid "URL '%s' needs a username component" msgstr "URL“%s”需要用户名组件" -#: camel/camel-service.c:286 +#: camel/camel-service.c:279 #, c-format msgid "URL '%s' needs a host component" msgstr "URL“%s”需要主机组件" -#: camel/camel-service.c:294 +#: camel/camel-service.c:283 #, c-format msgid "URL '%s' needs a path component" msgstr "URL “%s” 需要路径组件" -#: camel/camel-service.c:739 +#: camel/camel-service.c:733 #, c-format msgid "Resolving: %s" msgstr "正在解析：%s" -#: camel/camel-service.c:770 camel/camel-service.c:894 +#: camel/camel-service.c:764 camel/camel-service.c:888 #, c-format msgid "Failure in name lookup: %s" msgstr "域名查阅失败：%s" -#: camel/camel-service.c:791 camel/camel-service.c:915 +#: camel/camel-service.c:785 camel/camel-service.c:909 #, c-format msgid "Host lookup failed: cannot create thread: %s" msgstr "主机寻找失败：无法创建线程：%s" -#: camel/camel-service.c:804 +#: camel/camel-service.c:798 #, c-format msgid "Host lookup failed: %s: host not found" msgstr "主机寻找失败：%s：没有找到主机" -#: camel/camel-service.c:807 +#: camel/camel-service.c:801 #, c-format msgid "Host lookup failed: %s: unknown reason" msgstr "主机寻找失败：%s：未知的原因" -#: camel/camel-service.c:861 +#: camel/camel-service.c:855 msgid "Resolving address" msgstr "正在解析地址" -#: camel/camel-service.c:930 +#: camel/camel-service.c:924 msgid "Host lookup failed: host not found" msgstr "主机寻找失败：没有找到主机" -#: camel/camel-service.c:933 +#: camel/camel-service.c:927 msgid "Host lookup failed: unknown reason" msgstr "主机寻找失败：未知的原因" @@ -9191,7 +9222,7 @@ msgstr "虚拟文件夹电子邮件提供者" msgid "For reading mail as a query of another set of folders" msgstr "关于将读入邮件作为对另一组文件夹的查询" -#: camel/camel-session.c:351 camel/camel-session.c:401 +#: camel/camel-session.c:352 camel/camel-session.c:402 #, c-format msgid "No provider available for protocol `%s'" msgstr "协议“%s”没有可用的提供者" @@ -9262,20 +9293,25 @@ msgstr "解析错误" msgid "Signer: %s <%s>: %s\n" msgstr "服务器：%s，类型：%s" -#: camel/camel-store.c:217 +#: camel/camel-store.c:212 msgid "Cannot get folder: Invalid operation on this store" msgstr "无法获取文件夹：对该存储的无效操作" -#: camel/camel-store.c:274 +#: camel/camel-store.c:284 msgid "Cannot create folder: Invalid operation on this store" msgstr "无法创建文件夹：对该存储的无效操作" -#: camel/camel-store.c:792 mail/importers/netscape-importer.c:1842 -#: mail/mail-ops.c:1125 +#: camel/camel-store.c:368 camel/camel-vee-store.c:342 +#, c-format +msgid "Cannot delete folder: %s: Invalid operation" +msgstr "无法删除文件夹：%s：无效操作" + +#: camel/camel-store.c:766 mail/importers/netscape-importer.c:1842 +#: mail/mail-ops.c:1129 msgid "Trash" msgstr "回收站" -#: camel/camel-store.c:794 filter/libfilter-i18n.h:35 mail/mail-ops.c:1129 +#: camel/camel-store.c:768 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133 #: ui/evolution-mail-message.xml.h:46 #, fuzzy msgid "Junk" @@ -9489,7 +9525,7 @@ msgstr "" "证书撤销列表已过期：%s\n" "发行者：%s" -#: camel/camel-url.c:290 mail/mail-tools.c:138 +#: camel/camel-url.c:290 #, c-format msgid "Could not parse URL `%s'" msgstr "无法解析 URL “%s”" @@ -9504,26 +9540,21 @@ msgstr "存储“%s”错误：%s" 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:815 camel/camel-vee-folder.c:821 msgid "Cannot copy or move messages into a Virtual Folder" msgstr "无法将消息移动或复制到虚拟文件夹中" -#: camel/camel-vee-store.c:360 -#, c-format -msgid "Cannot delete folder: %s: Invalid operation" -msgstr "无法删除文件夹：%s：无效操作" - -#: camel/camel-vee-store.c:381 +#: camel/camel-vee-store.c:356 #, c-format msgid "Cannot delete folder: %s: No such folder" msgstr "无法删除文件夹：%s：没有该文件夹" -#: camel/camel-vee-store.c:394 +#: camel/camel-vee-store.c:369 #, c-format msgid "Cannot rename folder: %s: Invalid operation" msgstr "无法重命名文件夹：%s：无效操作" -#: camel/camel-vee-store.c:402 +#: camel/camel-vee-store.c:377 #, c-format msgid "Cannot rename folder: %s: No such folder" msgstr "无法重命名文件夹：%s：没有该文件夹" @@ -9564,7 +9595,8 @@ msgid "Novell GroupWise" msgstr "Novell GroupWise" #: camel/providers/groupwise/camel-groupwise-provider.c:85 -msgid "For accesing Novell Groupwise servers" +#, fuzzy +msgid "For accessing Novell Groupwise servers" msgstr "访问 Novell GroupWise 服务器" #: camel/providers/groupwise/camel-groupwise-provider.c:100 @@ -9582,9 +9614,9 @@ msgid "This option will connect to the IMAP server using a plaintext password." msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。" #. default charset used in mail view -#: camel/providers/groupwise/camel-gw-listener.c:298 #: camel/providers/groupwise/camel-gw-listener.c:299 -#: mail/em-folder-view.c:1542 mail/em-folder-view.c:1580 +#: camel/providers/groupwise/camel-gw-listener.c:300 +#: mail/em-folder-view.c:1578 mail/em-folder-view.c:1616 #: mail/mail-config.glade.h:42 msgid "Default" msgstr "默认" @@ -9592,12 +9624,12 @@ msgstr "默认" #: camel/providers/imap/camel-imap-command.c:221 #: camel/providers/imap/camel-imap-command.c:260 #: camel/providers/imap/camel-imap-command.c:450 -#: camel/providers/imap/camel-imap-store.c:2821 +#: camel/providers/imap/camel-imap-store.c:2827 msgid "Operation cancelled" msgstr "操作已取消" #: camel/providers/imap/camel-imap-command.c:305 -#: camel/providers/imap/camel-imap-store.c:2824 +#: camel/providers/imap/camel-imap-store.c:2830 #, c-format msgid "Server unexpectedly disconnected: %s" msgstr "服务器意外地中止了连接：%s" @@ -9646,21 +9678,21 @@ msgstr "无法创建目录 %s：%s" msgid "Could not load summary for %s" msgstr "无法为 %s 装入概要" -#: camel/providers/imap/camel-imap-folder.c:317 +#: camel/providers/imap/camel-imap-folder.c:320 msgid "Folder was destroyed and recreated on server." msgstr "文件夹已被删除并在服务器上重建了。" #. Check UIDs and flags of all messages we already know of. -#: camel/providers/imap/camel-imap-folder.c:563 +#: camel/providers/imap/camel-imap-folder.c:566 msgid "Scanning for changed messages" msgstr "正在扫描改变了的邮件" -#: camel/providers/imap/camel-imap-folder.c:1910 +#: camel/providers/imap/camel-imap-folder.c:1913 #, c-format msgid "Unable to retrieve message: %s" msgstr "无法检索邮件：%s" -#: camel/providers/imap/camel-imap-folder.c:1941 +#: camel/providers/imap/camel-imap-folder.c:1944 #: camel/providers/local/camel-maildir-folder.c:211 #: camel/providers/local/camel-maildir-folder.c:224 #: camel/providers/local/camel-maildir-folder.c:233 @@ -9676,25 +9708,25 @@ msgstr "" "无法获取邮件：%s\n" " %s" -#: camel/providers/imap/camel-imap-folder.c:1941 +#: camel/providers/imap/camel-imap-folder.c:1944 #: camel/providers/local/camel-maildir-folder.c:211 #: camel/providers/local/camel-mbox-folder.c:417 #: camel/providers/local/camel-mh-folder.c:200 msgid "No such message" msgstr "没有该邮件" -#: camel/providers/imap/camel-imap-folder.c:1964 -#: camel/providers/imap/camel-imap-folder.c:2560 +#: camel/providers/imap/camel-imap-folder.c:1967 +#: camel/providers/imap/camel-imap-folder.c:2569 #: camel/providers/nntp/camel-nntp-folder.c:205 msgid "This message is not currently available" msgstr "该邮件目前不可用" -#: camel/providers/imap/camel-imap-folder.c:2224 -#: camel/providers/imap/camel-imap-folder.c:2294 +#: camel/providers/imap/camel-imap-folder.c:2227 +#: camel/providers/imap/camel-imap-folder.c:2297 msgid "Fetching summary information for new messages" msgstr "从新邮件中获取概要信息" -#: camel/providers/imap/camel-imap-folder.c:2598 +#: camel/providers/imap/camel-imap-folder.c:2607 msgid "Could not find message body in FETCH response." msgstr "无法在 FETCH 应答中找到邮件体。" @@ -9769,9 +9801,9 @@ msgstr "%2$s 为 %1$s 提供的 IMAP 服务" #: camel/providers/imap/camel-imap-store.c:582 #: camel/providers/imap/camel-imap-store.c:602 -#: camel/providers/imapp/camel-imapp-store.c:236 +#: camel/providers/imapp/camel-imapp-store.c:233 #: camel/providers/nntp/camel-nntp-store.c:140 -#: camel/providers/pop3/camel-pop3-store.c:177 +#: camel/providers/pop3/camel-pop3-store.c:175 #: camel/providers/smtp/camel-smtp-transport.c:269 #: camel/providers/smtp/camel-smtp-transport.c:285 #, c-format @@ -9779,17 +9811,17 @@ msgid "Could not connect to %s (port %d): %s" msgstr "无法连接到 %s (端口 %d)：%s" #: camel/providers/imap/camel-imap-store.c:584 -#: camel/providers/pop3/camel-pop3-store.c:179 +#: camel/providers/pop3/camel-pop3-store.c:177 #: camel/providers/smtp/camel-smtp-transport.c:271 msgid "SSL unavailable" msgstr "SSL 不可用" #: camel/providers/imap/camel-imap-store.c:599 #: camel/providers/imap/camel-imap-store.c:831 -#: camel/providers/imapp/camel-imapp-store.c:233 +#: camel/providers/imapp/camel-imapp-store.c:230 #: camel/providers/nntp/camel-nntp-store.c:137 #: camel/providers/nntp/camel-nntp-store.c:155 -#: camel/providers/pop3/camel-pop3-store.c:194 +#: camel/providers/pop3/camel-pop3-store.c:192 msgid "Connection cancelled" msgstr "连接已取消" @@ -9800,12 +9832,12 @@ msgid "Failed to connect to IMAP server %s in secure mode: %s" msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s" #: camel/providers/imap/camel-imap-store.c:666 -#: camel/providers/pop3/camel-pop3-store.c:230 +#: camel/providers/pop3/camel-pop3-store.c:228 msgid "SSL/TLS extension not supported." msgstr "不支持 SSL/TLS 扩展。" #: camel/providers/imap/camel-imap-store.c:697 -#: camel/providers/pop3/camel-pop3-store.c:271 +#: camel/providers/pop3/camel-pop3-store.c:269 msgid "SSL negotiations failed" msgstr "SSL 协商失败" @@ -9826,7 +9858,7 @@ msgid "No support for authentication type %s" msgstr "不支持验证类型 %s" #: camel/providers/imap/camel-imap-store.c:1284 -#: camel/providers/imapp/camel-imapp-store.c:349 +#: camel/providers/imapp/camel-imapp-store.c:346 #, c-format msgid "%sPlease enter the IMAP password for %s@%s" msgstr "%s请为 %s@%s 输入 IMAP 密码" @@ -9884,7 +9916,7 @@ msgid "" " !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n" msgstr "" -#: camel/providers/imapp/camel-imapp-store.c:333 +#: camel/providers/imapp/camel-imapp-store.c:330 #, fuzzy, c-format msgid "Could not connect to POP server on %s" msgstr "无法连接到 POP 服务器 %s" @@ -9968,7 +10000,7 @@ msgstr "" #: camel/providers/local/camel-local-store.c:138 #: camel/providers/local/camel-local-store.c:227 -#: camel/providers/local/camel-mbox-store.c:331 +#: camel/providers/local/camel-mbox-store.c:335 #: camel/providers/local/camel-spool-store.c:116 #, c-format msgid "Store root %s is not an absolute path" @@ -10000,26 +10032,25 @@ msgstr "本地邮件文件 %s" msgid "Could not rename folder %s to %s: %s" msgstr "无法将文件夹 %s 改名为 %s：%s" -#: camel/providers/local/camel-local-store.c:364 -#: camel/providers/local/camel-mbox-store.c:501 +#: camel/providers/local/camel-local-store.c:372 #, c-format msgid "Could not rename '%s': %s" msgstr "无法重命名“%s”：%s" -#: camel/providers/local/camel-local-store.c:389 -#: camel/providers/local/camel-mbox-store.c:260 +#: camel/providers/local/camel-local-store.c:397 +#: camel/providers/local/camel-mbox-store.c:264 #, c-format msgid "Could not delete folder summary file `%s': %s" msgstr "无法删除文件夹概要文件 “%s”：%s" -#: camel/providers/local/camel-local-store.c:399 -#: camel/providers/local/camel-mbox-store.c:272 +#: camel/providers/local/camel-local-store.c:407 +#: camel/providers/local/camel-mbox-store.c:276 #, c-format msgid "Could not delete folder index file `%s': %s" msgstr "无法删除文件夹索引文件 “%s”：%s" -#: camel/providers/local/camel-local-store.c:421 -#: camel/providers/local/camel-mbox-store.c:295 +#: camel/providers/local/camel-local-store.c:429 +#: camel/providers/local/camel-mbox-store.c:299 #, c-format msgid "Could not delete folder meta file `%s': %s" msgstr "无法删除文件夹元文件“%s”：%s" @@ -10059,7 +10090,7 @@ msgstr "" "%s" #: camel/providers/local/camel-maildir-store.c:110 -#: camel/providers/local/camel-mbox-store.c:157 +#: camel/providers/local/camel-mbox-store.c:161 #: camel/providers/local/camel-mh-store.c:209 #: camel/providers/local/camel-spool-store.c:167 #, c-format @@ -10161,7 +10192,7 @@ msgstr "文件夹好像已经被不可恢复地破坏了。" msgid "Message construction failed: Corrupt mailbox?" msgstr "邮件构造失败：邮件箱已损坏？" -#: camel/providers/local/camel-mbox-store.c:149 +#: camel/providers/local/camel-mbox-store.c:153 #, c-format msgid "" "Could not open file `%s':\n" @@ -10170,7 +10201,7 @@ msgstr "" "无法打开文件“%s”：\n" "%s" -#: camel/providers/local/camel-mbox-store.c:166 +#: camel/providers/local/camel-mbox-store.c:170 #, fuzzy, c-format msgid "" "Could not create directory `%s':\n" @@ -10179,7 +10210,7 @@ msgstr "" "无法创建目录 %s：\n" "%s" -#: camel/providers/local/camel-mbox-store.c:178 +#: camel/providers/local/camel-mbox-store.c:182 #, c-format msgid "" "Could not create file `%s':\n" @@ -10188,15 +10219,15 @@ msgstr "" "无法创建文件“%s”：\n" "%s" -#: camel/providers/local/camel-mbox-store.c:188 -#: camel/providers/local/camel-mbox-store.c:231 +#: camel/providers/local/camel-mbox-store.c:192 +#: camel/providers/local/camel-mbox-store.c:235 #, c-format msgid "`%s' is not a regular file." msgstr "“%s”并不是普通文件。" -#: camel/providers/local/camel-mbox-store.c:212 -#: camel/providers/local/camel-mbox-store.c:223 -#: camel/providers/local/camel-mbox-store.c:246 +#: camel/providers/local/camel-mbox-store.c:216 +#: camel/providers/local/camel-mbox-store.c:227 +#: camel/providers/local/camel-mbox-store.c:250 #, c-format msgid "" "Could not delete folder `%s':\n" @@ -10205,38 +10236,43 @@ msgstr "" "无法删除文件夹“%s”：\n" "%s" -#: camel/providers/local/camel-mbox-store.c:238 +#: camel/providers/local/camel-mbox-store.c:242 #, c-format msgid "Folder `%s' is not empty. Not deleted." msgstr "文件夹“%s”非空。没有删除。" -#: camel/providers/local/camel-mbox-store.c:337 +#: camel/providers/local/camel-mbox-store.c:341 msgid "Cannot create a folder by this name." msgstr "无法以此名称创建文件夹。" -#: camel/providers/local/camel-mbox-store.c:350 +#: camel/providers/local/camel-mbox-store.c:354 #, c-format msgid "Cannot create directory `%s': %s." msgstr "无法创建目录“%s”：%s" -#: camel/providers/local/camel-mbox-store.c:364 +#: camel/providers/local/camel-mbox-store.c:368 #, c-format msgid "Cannot create folder: %s: %s" msgstr "无法创建文件夹：%s：%s" -#: camel/providers/local/camel-mbox-store.c:366 +#: camel/providers/local/camel-mbox-store.c:370 msgid "Folder already exists" msgstr "文件夹已经存在" -#: camel/providers/local/camel-mbox-store.c:435 -#, c-format -msgid "Could not rename %s to %s: %s" -msgstr "无法将 %s 改名为 %s：%s" - -#: camel/providers/local/camel-mbox-store.c:454 +#: camel/providers/local/camel-mbox-store.c:452 msgid "The new folder name is illegal." msgstr "指定的文件夹名称不合法。" +#: camel/providers/local/camel-mbox-store.c:465 +#, fuzzy, c-format +msgid "Could not rename `%s': `%s': %s" +msgstr "无法重命名“%s”：%s" + +#: camel/providers/local/camel-mbox-store.c:540 +#, fuzzy, c-format +msgid "Could not rename '%s' to %s: %s" +msgstr "无法将 %s 改名为 %s：%s" + #: camel/providers/local/camel-mbox-summary.c:343 #, c-format msgid "Could not open folder: %s: %s" @@ -10276,7 +10312,7 @@ msgstr "无法关闭来源文件夹 %s：%s" msgid "Could not close temp folder: %s" msgstr "无法关闭临时文件夹：%s" -#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1527 +#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:2066 #, c-format msgid "Could not rename folder: %s" msgstr "无法重命名文件夹：%s" @@ -10395,7 +10431,7 @@ msgstr "" "文件夹可能已损坏，副本保存在“%s”" #: camel/providers/nntp/camel-nntp-auth.c:44 -#: camel/providers/nntp/camel-nntp-store.c:998 +#: camel/providers/nntp/camel-nntp-store.c:997 #, c-format msgid "Please enter the NNTP password for %s@%s" msgstr "请输入 %s@%s 的 NNTP 密码" @@ -10536,12 +10572,12 @@ msgstr "NNTP 服务器 %s 返回错误码 %d：%s" msgid "USENET News via %s" msgstr "USENET 新闻 %s" -#: camel/providers/nntp/camel-nntp-store.c:641 +#: camel/providers/nntp/camel-nntp-store.c:640 #, fuzzy msgid "Stream error" msgstr "解析错误" -#: camel/providers/nntp/camel-nntp-store.c:644 +#: camel/providers/nntp/camel-nntp-store.c:643 #, fuzzy, c-format msgid "" "Error retrieving newsgroups:\n" @@ -10551,30 +10587,30 @@ msgstr "" "在将邮件保存到 %s 时发生错误：\n" " %s" -#: camel/providers/nntp/camel-nntp-store.c:736 +#: camel/providers/nntp/camel-nntp-store.c:735 msgid "" "You cannot subscribe to this newsgroup:\n" "\n" "No such newsgroup. The selected item is a probably a parent folder." msgstr "" -#: camel/providers/nntp/camel-nntp-store.c:768 +#: camel/providers/nntp/camel-nntp-store.c:767 msgid "" "You cannot unsubscribe to this newsgroup:\n" "\n" "newsgroup does not exist!" msgstr "" -#: camel/providers/nntp/camel-nntp-store.c:793 +#: camel/providers/nntp/camel-nntp-store.c:792 msgid "You cannot create a folder in a News store: subscribe instead." msgstr "" -#: camel/providers/nntp/camel-nntp-store.c:801 +#: camel/providers/nntp/camel-nntp-store.c:800 #, fuzzy msgid "You cannot rename a folder in a News store." msgstr "无法将文件夹 %s 改名为 %s：%s" -#: camel/providers/nntp/camel-nntp-store.c:809 +#: camel/providers/nntp/camel-nntp-store.c:808 #, fuzzy msgid "You cannot remove a folder in a News store: unsubscribe instead." msgstr "无法把文件夹移动到其子目录。" @@ -10691,53 +10727,53 @@ msgstr "" "该选项使 Evolution 在连接到 POP 服务器时使用 APOP 协议。即使是声称支持这一功" "能的服务器，也不一定能使所有用户工作。" -#: camel/providers/pop3/camel-pop3-store.c:197 +#: camel/providers/pop3/camel-pop3-store.c:195 #, c-format msgid "Could not connect to POP server %s (port %d): %s" msgstr "无法连接到 POP 服务器 %s (端口 %d)：%s" -#: camel/providers/pop3/camel-pop3-store.c:229 -#: camel/providers/pop3/camel-pop3-store.c:258 -#: camel/providers/pop3/camel-pop3-store.c:270 +#: camel/providers/pop3/camel-pop3-store.c:227 +#: camel/providers/pop3/camel-pop3-store.c:256 +#: camel/providers/pop3/camel-pop3-store.c:268 #, 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:368 +#: camel/providers/pop3/camel-pop3-store.c:366 #, c-format msgid "Could not connect to POP server %s" msgstr "无法连接到 POP 服务器 %s" -#: camel/providers/pop3/camel-pop3-store.c:409 -#: camel/providers/pop3/camel-pop3-store.c:523 +#: camel/providers/pop3/camel-pop3-store.c:407 +#: camel/providers/pop3/camel-pop3-store.c:521 #, 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:425 +#: camel/providers/pop3/camel-pop3-store.c:423 #, 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:437 +#: camel/providers/pop3/camel-pop3-store.c:435 #, c-format msgid "Cannot login to POP server %s: SASL Protocol error" msgstr "无法登录到 POP 服务器 %s：SASL 协议错误" -#: camel/providers/pop3/camel-pop3-store.c:456 +#: camel/providers/pop3/camel-pop3-store.c:454 #, c-format msgid "Failed to authenticate on POP server %s: %s" msgstr "认证到 POP 服务器 %s 失败：%s" -#: camel/providers/pop3/camel-pop3-store.c:482 -#, c-format -msgid "%sPlease enter the POP password for %s@%s" +#: camel/providers/pop3/camel-pop3-store.c:480 +#, fuzzy, 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:537 -#: camel/providers/pop3/camel-pop3-store.c:544 +#: camel/providers/pop3/camel-pop3-store.c:535 +#: camel/providers/pop3/camel-pop3-store.c:542 #, c-format msgid "" "Unable to connect to POP server %s.\n" @@ -10746,7 +10782,7 @@ msgstr "" "无法连接到 POP 服务器 %s。\n" "发送密码错误：%s" -#: camel/providers/pop3/camel-pop3-store.c:643 +#: camel/providers/pop3/camel-pop3-store.c:641 #, c-format msgid "No such folder `%s'." msgstr "没有文件夹“%s”。" @@ -10941,8 +10977,8 @@ msgid "SMTP server %s does not support requested authentication type %s." msgstr "SMTP 服务器 %s 不支持请求的认证类型 %s。" #: camel/providers/smtp/camel-smtp-transport.c:514 -#, c-format -msgid "%sPlease enter the SMTP password for %s@%s" +#, fuzzy, 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:533 @@ -10970,7 +11006,7 @@ msgstr "通过 %s 发送 SMTP 邮件" msgid "Cannot send message: sender address not valid." msgstr "无法发送邮件：发件人地址不合法。" -#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:611 +#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:614 msgid "Sending message" msgstr "正在发送邮件" @@ -11099,11 +11135,11 @@ msgstr "附件" msgid "Remove selected items from the attachment list" msgstr "从附件列表中删除选定的条目" -#: composer/e-msg-composer-attachment-bar.c:475 +#: composer/e-msg-composer-attachment-bar.c:476 msgid "Add attachment..." msgstr "添加附件..." -#: composer/e-msg-composer-attachment-bar.c:476 +#: composer/e-msg-composer-attachment-bar.c:477 msgid "Attach a file to the message" msgstr "把文件附件到邮件" @@ -11240,30 +11276,30 @@ msgstr "" "读入文件 %s 时发声错误：\n" "%s" -#: composer/e-msg-composer.c:1145 +#: composer/e-msg-composer.c:1163 msgid "File exists, overwrite?" msgstr "文件存在，覆盖它？" -#: composer/e-msg-composer.c:1156 composer/e-msg-composer.c:1172 +#: composer/e-msg-composer.c:1174 composer/e-msg-composer.c:1190 #, c-format msgid "Error saving file: %s" msgstr "保存文件错误：%s" -#: composer/e-msg-composer.c:1196 +#: composer/e-msg-composer.c:1214 #, c-format msgid "Error loading file: %s" msgstr "读入文件错误：%s" -#: composer/e-msg-composer.c:1234 +#: composer/e-msg-composer.c:1252 #, c-format msgid "Error accessing file: %s" msgstr "访问文件错误：%s" -#: composer/e-msg-composer.c:1242 +#: composer/e-msg-composer.c:1260 msgid "Unable to retrieve message from editor" msgstr "无法从编辑器检索邮件" -#: composer/e-msg-composer.c:1249 +#: composer/e-msg-composer.c:1267 #, c-format msgid "" "Unable to seek on file: %s\n" @@ -11272,7 +11308,7 @@ msgstr "" "无法搜索文件：%s\n" "%s" -#: composer/e-msg-composer.c:1256 +#: composer/e-msg-composer.c:1274 #, c-format msgid "" "Unable to truncate file: %s\n" @@ -11281,7 +11317,7 @@ msgstr "" "无法截断文件：%s\n" "%s" -#: composer/e-msg-composer.c:1265 +#: composer/e-msg-composer.c:1283 #, c-format msgid "" "Unable to copy file descriptor: %s\n" @@ -11290,7 +11326,7 @@ msgstr "" "无法复制文件描述符：%s\n" "%s" -#: composer/e-msg-composer.c:1274 +#: composer/e-msg-composer.c:1292 #, c-format msgid "" "Error autosaving message: %s\n" @@ -11299,7 +11335,7 @@ msgstr "" "自动存储邮件错误：%s\n" " %s" -#: composer/e-msg-composer.c:1378 +#: composer/e-msg-composer.c:1396 #, fuzzy msgid "" "Ximian Evolution has found unsaved messages from a previous session.\n" @@ -11308,7 +11344,7 @@ msgstr "" "Ximian Evolution 发现上次会话含有未保存的文件。\n" "您是否希望恢复它们？" -#: composer/e-msg-composer.c:1542 +#: composer/e-msg-composer.c:1560 #, c-format msgid "" "The message \"%s\" has not been sent.\n" @@ -11319,42 +11355,42 @@ msgstr "" "\n" "您是否希望保存修改？" -#: composer/e-msg-composer.c:1551 +#: composer/e-msg-composer.c:1569 msgid "Warning: Modified Message" msgstr "警告：已改动的邮件" -#: composer/e-msg-composer.c:1584 +#: composer/e-msg-composer.c:1602 msgid "Open file" msgstr "打开文件" -#: composer/e-msg-composer.c:2029 +#: composer/e-msg-composer.c:2047 msgid "Signature:" msgstr "签名：" -#: composer/e-msg-composer.c:2069 mail/mail-account-gui.c:1260 +#: composer/e-msg-composer.c:2087 mail/mail-account-gui.c:1259 msgid "Autogenerated" msgstr "自动生成的" -#: composer/e-msg-composer.c:2247 +#: composer/e-msg-composer.c:2265 #, c-format msgid "%d File Attached" msgid_plural "%d Files Attached" msgstr[0] "附加了 %d 个文件" -#: composer/e-msg-composer.c:2276 +#: composer/e-msg-composer.c:2294 msgid "Hide _Attachment Bar (drop attachments here)" msgstr "隐藏附件栏(将附件拖至此处)(_A)" -#: composer/e-msg-composer.c:2279 composer/e-msg-composer.c:3138 +#: composer/e-msg-composer.c:2297 composer/e-msg-composer.c:3156 msgid "Show _Attachment Bar (drop attachments here)" msgstr "显示附件栏(将附件拖至此处)(_A)" -#: composer/e-msg-composer.c:2296 composer/e-msg-composer.c:3022 -#: composer/e-msg-composer.c:3023 +#: composer/e-msg-composer.c:2314 composer/e-msg-composer.c:3040 +#: composer/e-msg-composer.c:3041 msgid "Compose a message" msgstr "撰写邮件" -#: composer/e-msg-composer.c:3054 +#: composer/e-msg-composer.c:3072 msgid "" "Could not create composer window:\n" "Unable to activate address selector control." @@ -11362,7 +11398,7 @@ msgstr "" "无法创建撰写窗口：\n" "无法激活地址选择控制。" -#: composer/e-msg-composer.c:3083 +#: composer/e-msg-composer.c:3101 msgid "" "Could not create composer window:\n" "Unable to activate HTML editor component.\n" @@ -11374,7 +11410,7 @@ msgstr "" "请确定您的 gtkhtml 和 libgtkhtml 所安装的版\n" "本正确。\n" -#: composer/e-msg-composer.c:3184 +#: composer/e-msg-composer.c:3201 msgid "" "Could not create composer window:\n" "Unable to activate HTML editor component." @@ -11382,7 +11418,7 @@ msgstr "" "无法创建撰写窗口：\n" "无法激活 HTML 编辑器组件。" -#: composer/e-msg-composer.c:4210 +#: composer/e-msg-composer.c:4222 msgid "" "(The composer contains a non-text message body, which cannot be edited.)" "" @@ -11728,11 +11764,11 @@ msgid "You must specify a folder." msgstr "您必须指定文件夹。" #: filter/filter-folder.c:242 filter/vfolder-rule.c:466 -#: mail/mail-account-gui.c:1099 +#: mail/mail-account-gui.c:1098 msgid "Select Folder" msgstr "选择文件夹" -#: filter/filter-input.c:191 +#: filter/filter-input.c:193 #, c-format msgid "" "Error in regular expression '%s':\n" @@ -11741,19 +11777,19 @@ msgstr "" "常规表达式错误 “%s”：\n" "%s" -#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922 +#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923 #: mail/mail-config.c:63 mail/mail-config.glade.h:68 msgid "Important" msgstr "重要" #. forest green -#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:66 +#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66 #: mail/mail-config.glade.h:127 msgid "To Do" msgstr "待办" #. blue -#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:67 +#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67 #: mail/mail-config.glade.h:72 msgid "Later" msgstr "稍候" @@ -12022,7 +12058,7 @@ msgstr "未标志" msgid "Junk Test" msgstr "六月" -#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:744 +#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:780 #: widgets/misc/e-expander.c:189 msgid "Label" msgstr "标签" @@ -12130,7 +12166,7 @@ msgstr "以之开始" msgid "Stop Processing" msgstr "停止处理" -#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1562 mail/em-format.c:712 +#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484 mail/em-format.c:747 #: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13 #: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074 msgid "Subject" @@ -12141,7 +12177,7 @@ msgid "Unset Status" msgstr "未设置状态" #: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326 -#: mail/mail-vfolder.c:979 +#: mail/mail-vfolder.c:1005 #, c-format msgid "Rule name '%s' is not unique, choose another." msgstr "规则名“%s”不唯一，请另外选择一个名称。" @@ -12255,7 +12291,7 @@ msgstr "Evolution 邮件文件夹查看器" msgid "Evolution Mail preferences control" msgstr "Evolution 邮件首选项控件" -#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:805 +#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:817 #: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085 #: mail/importers/pine-importer.c:572 msgid "Mail" @@ -12291,7 +12327,7 @@ msgid "Protocol" msgstr "协议" #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353 -#: mail/mail-config.c:1251 +#: mail/mail-config.c:1252 msgid "Unnamed" msgstr "未命名" @@ -12315,7 +12351,7 @@ msgstr "添加脚本签名" msgid "Signature(s)" msgstr "签名" -#: mail/em-composer-utils.c:123 +#: mail/em-composer-utils.c:124 #, fuzzy, c-format msgid "" "You are sending an HTML-formatted message. Please make sure that\n" @@ -12323,7 +12359,7 @@ msgid "" "%sSend anyway?" msgstr "您即将发送 HTML 格式的邮件。请确定下列收件人愿意接收 HTML 邮件：\n" -#: mail/em-composer-utils.c:137 +#: mail/em-composer-utils.c:138 msgid "" "This message has no subject.\n" "Really send?" @@ -12356,7 +12392,7 @@ msgstr "" msgid "You must specify recipients in order to send this message." msgstr "您必须指定收件人以便发送该消息。" -#: mail/em-composer-utils.c:579 +#: mail/em-composer-utils.c:578 msgid "" "Unable to open the drafts folder for this account.\n" "Would you like to use the default drafts folder?" @@ -12364,10 +12400,32 @@ msgstr "" "无法为该账户打开草稿文件夹。\n" "您是否希望使用默认草稿文件夹？" -#: mail/em-folder-browser.c:132 +#: mail/em-folder-browser.c:133 msgid "Create _Virtual Folder From Search..." msgstr "根据搜索创建虚拟文件夹(_V)..." +#: mail/em-folder-properties.c:120 +msgid "Folder properties" +msgstr "文件夹属性" + +#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc +#: mail/em-folder-properties.c:126 +msgid "Properties" +msgstr "属性" + +#. TODO: can this be done in a loop? +#: mail/em-folder-properties.c:135 +msgid "Folder Name" +msgstr "文件夹名称" + +#: mail/em-folder-properties.c:146 +msgid "Total messages" +msgstr "总邮件数" + +#: mail/em-folder-properties.c:158 +msgid "Unread messages" +msgstr "下一封未读邮件" + #: mail/em-folder-selection-button.c:120 #: shell/evolution-folder-selector-button.c:100 msgid "" @@ -12377,435 +12435,381 @@ msgstr "<点击这里以便选择文件夹>" msgid "Create New Folder" msgstr "创建新文件夹" -#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1305 +#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1843 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4 msgid "Specify where to create the folder:" msgstr "指定在哪里创建文件夹：" -#: mail/em-folder-selector.c:263 +#: mail/em-folder-selector.c:260 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2 msgid "Folder _name:" msgstr "文件夹名称(_N)：" #. On This Computer is always first and VFolders is always last -#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197 -#: mail/mail-component.c:212 +#: mail/em-folder-tree-model.c:160 mail/em-folder-tree-model.c:162 +#: mail/mail-component.c:170 msgid "On this Computer" msgstr "" -#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201 -#: mail/mail-vfolder.c:827 +#: mail/em-folder-tree-model.c:164 mail/em-folder-tree-model.c:166 +#: mail/mail-vfolder.c:853 msgid "VFolders" msgstr "虚拟文件夹" -#: mail/em-folder-tree-model.c:209 mail/em-folder-tree-model.c:211 +#: mail/em-folder-tree-model.c:174 mail/em-folder-tree-model.c:176 msgid "UNMATCHED" msgstr "" #. Inbox is always first -#: mail/em-folder-tree-model.c:237 mail/em-folder-tree-model.c:239 +#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204 #: shell/e-shortcuts.c:1085 msgid "Inbox" msgstr "收件箱" -#: mail/em-folder-tree-model.c:423 mail/em-folder-tree-model.c:713 +#: mail/em-folder-tree-model.c:447 mail/em-folder-tree-model.c:730 msgid "Loading..." msgstr "正在装入..." -#: mail/em-folder-tree-model.c:1276 mail/em-utils.c:2085 -#, c-format -msgid "Could not create temporary directory: %s" -msgstr "无法创建临时目录：%s" - -#: mail/em-folder-tree-model.c:1285 -#, fuzzy, c-format -msgid "Could not create temporary mbox store: %s" -msgstr "无法创建临时目录：%s" - -#: mail/em-folder-tree-model.c:1294 -#, fuzzy, c-format -msgid "Could not create temporary mbox folder: %s" -msgstr "无法创建临时文件“%s”：%s" - -#: mail/em-folder-tree-model.c:1309 -#, fuzzy, c-format -msgid "Could not copy messages to temporary mbox folder: %s" -msgstr "无法关闭临时文件夹：%s" +#: mail/em-folder-tree.c:818 +#, fuzzy +msgid "Cannot drop message(s) into toplevel store" +msgstr "无法将消息移动或复制到虚拟文件夹中" -#: mail/em-folder-tree.c:1183 mail/em-folder-tree.c:1270 +#: mail/em-folder-tree.c:1721 mail/em-folder-tree.c:1808 #, c-format msgid "%s" msgstr "%s" -#: mail/em-folder-tree.c:1199 mail/em-folder-tree.c:1212 -#: mail/em-folder-view.c:621 mail/em-folder-view.c:635 -#: shell/e-shell-importer.c:1060 +#: mail/em-folder-tree.c:1737 mail/em-folder-tree.c:1750 +#: mail/em-folder-view.c:657 mail/em-folder-view.c:671 msgid "Select folder" msgstr "选择文件夹" -#: mail/em-folder-tree.c:1305 +#: mail/em-folder-tree.c:1843 msgid "Create folder" msgstr "创建文件夹" -#: mail/em-folder-tree.c:1423 +#: mail/em-folder-tree.c:1962 #, c-format msgid "Could not delete folder: %s" msgstr "无法删除文件夹：%s" -#: mail/em-folder-tree.c:1444 +#: mail/em-folder-tree.c:1983 #, c-format msgid "Really delete folder \"%s\" and all of its subfolders?" msgstr "您真的要删除文件夹“%s”及其全部子文件夹吗？" -#: mail/em-folder-tree.c:1454 shell/e-shell-folder-commands.c:416 +#: mail/em-folder-tree.c:1993 shell/e-shell-folder-commands.c:416 #, c-format msgid "Delete \"%s\"" msgstr "删除“%s”" -#: mail/em-folder-tree.c:1488 shell/e-shell-folder-commands.c:534 +#: mail/em-folder-tree.c:2027 shell/e-shell-folder-commands.c:534 #, c-format msgid "Rename the \"%s\" folder to:" msgstr "把文件夹“%s”重命名为：" -#: mail/em-folder-tree.c:1490 shell/e-shell-folder-commands.c:541 +#: mail/em-folder-tree.c:2029 shell/e-shell-folder-commands.c:541 msgid "Rename Folder" msgstr "重命名文件夹" -#: mail/em-folder-tree.c:1514 shell/e-shell-folder-commands.c:554 +#: mail/em-folder-tree.c:2053 shell/e-shell-folder-commands.c:554 #, c-format msgid "A folder named \"%s\" already exists. Please use a different name." msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。" -#: mail/em-folder-tree.c:1614 -msgid "Folder properties" -msgstr "文件夹属性" - -#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc -#: mail/em-folder-tree.c:1620 -msgid "Properties" -msgstr "属性" - -#. TODO: can this be done in a loop? -#: mail/em-folder-tree.c:1629 -msgid "Folder Name" -msgstr "文件夹名称" - -#: mail/em-folder-tree.c:1640 -msgid "Total messages" -msgstr "总邮件数" - -#: mail/em-folder-tree.c:1652 -msgid "Unread messages" -msgstr "下一封未读邮件" - -#: mail/em-folder-tree.c:1761 ui/evolution-addressbook.xml.h:45 +#: mail/em-folder-tree.c:2099 ui/evolution-addressbook.xml.h:45 #: 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:34 +#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35 msgid "_View" msgstr "查看(_V)" -#: mail/em-folder-tree.c:1762 +#: mail/em-folder-tree.c:2100 msgid "Open in _New Window" msgstr "在新窗口中打开(_N)" -#: mail/em-folder-tree.c:1767 +#: mail/em-folder-tree.c:2105 msgid "_Move" msgstr "移动(_M)" #. FIXME: need to disable for nochildren folders -#: mail/em-folder-tree.c:1771 +#: mail/em-folder-tree.c:2109 msgid "_New Folder..." msgstr "新建文件夹(_N)..." -#: mail/em-folder-tree.c:1774 shell/e-shortcuts-view.c:427 +#: mail/em-folder-tree.c:2112 shell/e-shortcuts-view.c:427 msgid "_Rename" msgstr "重命名(_R)" -#: mail/em-folder-tree.c:1777 ui/evolution-mail-list.xml.h:27 +#: mail/em-folder-tree.c:2115 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:712 mail/em-popup.c:658 +#: mail/em-folder-view.c:748 mail/em-popup.c:658 msgid "_Edit as New Message..." msgstr "作为新邮件进行编辑(_E)..." -#: mail/em-folder-view.c:714 +#: mail/em-folder-view.c:750 msgid "_Print" msgstr "打印(_P)" -#: mail/em-folder-view.c:717 ui/evolution-mail-message.xml.h:124 +#: mail/em-folder-view.c:753 ui/evolution-mail-message.xml.h:124 msgid "_Reply to Sender" msgstr "回复发件人(_R)" -#: mail/em-folder-view.c:718 mail/em-popup.c:778 +#: mail/em-folder-view.c:754 mail/em-popup.c:778 #: ui/evolution-mail-message.xml.h:86 msgid "Reply to _List" msgstr "回复邮件列表(_L)" -#: mail/em-folder-view.c:719 mail/em-popup.c:779 +#: mail/em-folder-view.c:755 mail/em-popup.c:779 #: ui/evolution-mail-message.xml.h:85 msgid "Reply to _All" msgstr "回复所有人(_A)" -#: mail/em-folder-view.c:720 mail/em-popup.c:781 +#: mail/em-folder-view.c:756 mail/em-popup.c:781 #: ui/evolution-mail-message.xml.h:111 msgid "_Forward" msgstr "转发(_F)" -#: mail/em-folder-view.c:723 +#: mail/em-folder-view.c:759 msgid "Follo_w Up..." msgstr "跟随(_W)..." -#: mail/em-folder-view.c:724 +#: mail/em-folder-view.c:760 msgid "Fla_g Completed" msgstr "已完成标志(_G)" -#: mail/em-folder-view.c:725 +#: mail/em-folder-view.c:761 msgid "Cl_ear Flag" msgstr "清除标志(_E)" -#: mail/em-folder-view.c:728 ui/evolution-mail-message.xml.h:48 +#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:48 msgid "Mar_k as Read" msgstr "标记为已读(_K)" -#: mail/em-folder-view.c:729 +#: mail/em-folder-view.c:765 msgid "Mark as _Unread" msgstr "标记为未读(_U)" -#: mail/em-folder-view.c:730 +#: mail/em-folder-view.c:766 msgid "Mark as _Important" msgstr "标记为重要(_I)" -#: mail/em-folder-view.c:731 +#: mail/em-folder-view.c:767 msgid "_Mark as Unimportant" msgstr "标记为不重要(_M)" -#: mail/em-folder-view.c:732 ui/evolution-mail-message.xml.h:52 +#: mail/em-folder-view.c:768 ui/evolution-mail-message.xml.h:52 #, fuzzy msgid "Mark as _Junk" msgstr "标记为未读(_U)" -#: mail/em-folder-view.c:733 ui/evolution-mail-message.xml.h:53 +#: mail/em-folder-view.c:769 ui/evolution-mail-message.xml.h:53 #, fuzzy msgid "Mark as _Not Junk" msgstr "标记为重要(_I)" -#: mail/em-folder-view.c:737 +#: mail/em-folder-view.c:773 msgid "U_ndelete" msgstr "取消删除(_N)" -#: mail/em-folder-view.c:740 +#: mail/em-folder-view.c:776 msgid "Mo_ve to Folder..." msgstr "移动到文件夹(_V)..." -#: mail/em-folder-view.c:741 ui/evolution-addressbook.xml.h:32 +#: mail/em-folder-view.c:777 ui/evolution-addressbook.xml.h:32 msgid "_Copy to Folder..." msgstr "复制到文件夹(_C)..." -#: mail/em-folder-view.c:749 +#: mail/em-folder-view.c:785 msgid "Add Sender to Address_book" msgstr "将发件人添加到地址簿(_B)" -#: mail/em-folder-view.c:752 +#: mail/em-folder-view.c:788 msgid "Appl_y Filters" msgstr "应用过滤规则(_Y)" -#: mail/em-folder-view.c:755 +#: mail/em-folder-view.c:791 msgid "Crea_te Rule From Message" msgstr "从邮件创建规则(_T)" -#: mail/em-folder-view.c:756 +#: mail/em-folder-view.c:792 msgid "VFolder on _Subject" msgstr "基于主题的虚拟文件夹(_S)" -#: mail/em-folder-view.c:757 +#: mail/em-folder-view.c:793 msgid "VFolder on Se_nder" msgstr "基于发件人的虚拟文件夹(_N)" -#: mail/em-folder-view.c:758 +#: mail/em-folder-view.c:794 msgid "VFolder on _Recipients" msgstr "基于收件人的虚拟文件夹(_R)" -#: mail/em-folder-view.c:759 +#: mail/em-folder-view.c:795 msgid "VFolder on Mailing _List" msgstr "基于邮件列表的虚拟文件夹(_L)" -#: mail/em-folder-view.c:761 +#: mail/em-folder-view.c:797 msgid "VFolder on Thread" msgstr "基于线索的虚拟文件夹" -#: mail/em-folder-view.c:765 +#: mail/em-folder-view.c:801 msgid "Filter on Sub_ject" msgstr "基于主题过滤(_J)" -#: mail/em-folder-view.c:766 +#: mail/em-folder-view.c:802 msgid "Filter on Sen_der" msgstr "基于发件人过滤(_D)" -#: mail/em-folder-view.c:767 +#: mail/em-folder-view.c:803 msgid "Filter on Re_cipients" msgstr "基于收件人过滤(_C)" -#: mail/em-folder-view.c:768 +#: mail/em-folder-view.c:804 msgid "Filter on _Mailing List" msgstr "基于邮件列表过滤(_M)" -#: mail/em-folder-view.c:770 +#: mail/em-folder-view.c:806 msgid "Filter on Thread" msgstr "基于线索过滤" -#: mail/em-folder-view.c:1616 +#: mail/em-folder-view.c:1652 msgid "Print Message" msgstr "打印消息" -#: mail/em-folder-view.c:1870 +#: mail/em-folder-view.c:1906 msgid "_Copy Link Location" msgstr "复制链接位置(_C)" -#: mail/em-folder-view.c:2132 +#: mail/em-folder-view.c:2168 #, c-format msgid "Click to mail %s" msgstr "点击以给 %s 发送邮件" #. message-search popup match count string -#: mail/em-format-html-display.c:400 +#: mail/em-format-html-display.c:403 #, c-format msgid "Matches: %d" msgstr "匹配：%d" -#: mail/em-format-html-display.c:636 mail/em-format-html.c:563 +#: mail/em-format-html-display.c:639 mail/em-format-html.c:562 msgid "Unsigned" msgstr "未签名" -#: mail/em-format-html-display.c:636 +#: mail/em-format-html-display.c:639 #, fuzzy msgid "" "This message is not signed. There is no guarantee the sender of the message " "is authentic." msgstr "该邮件有数字签名，但不能证实是可信的。" -#: mail/em-format-html-display.c:637 mail/em-format-html.c:564 +#: mail/em-format-html-display.c:640 mail/em-format-html.c:563 #, fuzzy msgid "Valid signature" msgstr "编辑签名" -#: mail/em-format-html-display.c:637 +#: mail/em-format-html-display.c:640 msgid "" "This message is signed and is valid, the sender of this message is very " "likely who they claim to be." msgstr "" -#: mail/em-format-html-display.c:638 mail/em-format-html.c:565 +#: mail/em-format-html-display.c:641 mail/em-format-html.c:564 #, fuzzy msgid "Invalid signature" msgstr "编辑签名" -#: mail/em-format-html-display.c:638 +#: mail/em-format-html-display.c:641 msgid "" "The signature of this message cannot be verified, it may have been altered " "in transit." msgstr "" -#: mail/em-format-html-display.c:639 mail/em-format-html.c:566 +#: mail/em-format-html-display.c:642 mail/em-format-html.c:565 msgid "Valid signature, cannot verify sender" msgstr "" -#: mail/em-format-html-display.c:639 +#: mail/em-format-html-display.c:642 #, fuzzy msgid "" "This message is signed with a valid signature, but the sender of the message " "cannot be verified." msgstr "input_token 包含无效的签名，或者无法验证签名。" -#: mail/em-format-html-display.c:645 mail/em-format-html.c:572 +#: mail/em-format-html-display.c:648 mail/em-format-html.c:571 #, fuzzy msgid "Unencrypted" msgstr "被中断" -#: mail/em-format-html-display.c:645 +#: mail/em-format-html-display.c:648 msgid "" "This message is not encrypted. Its content may be viewed in transit across " "the Internet." msgstr "" -#: mail/em-format-html-display.c:646 mail/em-format-html.c:573 +#: mail/em-format-html-display.c:649 mail/em-format-html.c:572 msgid "Encrypted, weak" msgstr "" -#: mail/em-format-html-display.c:646 +#: mail/em-format-html-display.c:649 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 " "message in a practical amount of time." msgstr "" -#: mail/em-format-html-display.c:647 mail/em-format-html.c:574 +#: mail/em-format-html-display.c:650 mail/em-format-html.c:573 #, fuzzy msgid "Encrypted" msgstr "PGP 加密" -#: mail/em-format-html-display.c:647 +#: mail/em-format-html-display.c:650 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:648 mail/em-format-html.c:575 +#: mail/em-format-html-display.c:651 mail/em-format-html.c:574 msgid "Encrypted, strong" msgstr "" -#: mail/em-format-html-display.c:648 +#: mail/em-format-html-display.c:651 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 " "practical amount of time." msgstr "" -#: mail/em-format-html-display.c:732 +#: mail/em-format-html-display.c:735 #, fuzzy msgid "_View Certificate" msgstr "证书 ID(_C)：" -#: mail/em-format-html-display.c:737 +#: mail/em-format-html-display.c:740 #, fuzzy msgid "This certificate is not viewable" msgstr "证书未生效" -#: mail/em-format-html-display.c:905 mail/em-format-html.c:650 -#, fuzzy -msgid "Could not parse S/MIME message: Unknown error" -msgstr "无法解析 MIME 邮件。显示源文本。" - -#: mail/em-format-html-display.c:941 mail/em-format-html.c:1075 -#: mail/em-format.c:1270 -#, fuzzy -msgid "Unsupported signature format" -msgstr "不支持的方案" - -#: mail/em-format-html-display.c:949 mail/em-format-html.c:1083 -#, fuzzy -msgid "Unknown error verifying signature" -msgstr "无法校验叶子签名" - -#: mail/em-format-html-display.c:1064 +#: mail/em-format-html-display.c:976 #, fuzzy msgid "Completed on %B %d, %Y, %l:%M %p" msgstr "到 %m月%d日%A，%H:%M" -#: mail/em-format-html-display.c:1072 +#: mail/em-format-html-display.c:984 msgid "Overdue:" msgstr "延误：" -#: mail/em-format-html-display.c:1075 +#: mail/em-format-html-display.c:987 msgid "by %B %d, %Y, %l:%M %p" msgstr "到 %m月%d日%A，%H:%M" -#: mail/em-format-html-display.c:1145 +#: mail/em-format-html-display.c:1057 msgid "_View Inline" msgstr "嵌入视图(_V)" -#: mail/em-format-html-display.c:1146 +#: mail/em-format-html-display.c:1058 msgid "_Hide" msgstr "隐藏(_H)" @@ -12814,112 +12818,119 @@ msgstr "隐藏(_H)" msgid "Page %d of %d" msgstr "第 %d 页，共 %d 页" -#: mail/em-format-html.c:456 mail/em-format-html.c:458 +#: mail/em-format-html.c:455 mail/em-format-html.c:457 #, c-format msgid "Retrieving `%s'" msgstr "正在收取“%s”" -#: mail/em-format-html.c:844 +#: mail/em-format-html.c:812 msgid "Malformed external-body part." msgstr "格式不正确的 external-body 部分。" -#: mail/em-format-html.c:874 +#: mail/em-format-html.c:842 #, c-format msgid "Pointer to FTP site (%s)" msgstr "指向 FTP 站点 (%s)" -#: mail/em-format-html.c:885 +#: mail/em-format-html.c:853 #, c-format msgid "Pointer to local file (%s) valid at site \"%s\"" msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法" -#: mail/em-format-html.c:887 +#: mail/em-format-html.c:855 #, c-format msgid "Pointer to local file (%s)" msgstr "指向本地文件 (%s)" -#: mail/em-format-html.c:908 +#: mail/em-format-html.c:876 #, c-format msgid "Pointer to remote data (%s)" msgstr "指向远程数据 (%s)" -#: mail/em-format-html.c:919 +#: mail/em-format-html.c:887 #, c-format msgid "Pointer to unknown external data (\"%s\" type)" msgstr "指向未知的外部数据 (“%s”类型)" -#: mail/em-format-html.c:1061 -msgid "Could not parse MIME message. Displaying as source." -msgstr "无法解析 MIME 邮件。显示源文本。" - -#: mail/em-format-html.c:1177 +#: mail/em-format-html.c:1098 #, fuzzy msgid "Formatting message" msgstr "正在移动邮件" -#: mail/em-format-html.c:1453 mail/em-format.c:707 mail/em-mailer-prefs.c:67 +#: mail/em-format-html.c:1375 mail/em-format.c:742 mail/em-mailer-prefs.c:67 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301 msgid "From" msgstr "发件人" -#: mail/em-format-html.c:1453 mail/em-format.c:708 mail/em-mailer-prefs.c:68 +#: mail/em-format-html.c:1375 mail/em-format.c:743 mail/em-mailer-prefs.c:68 msgid "Reply-To" msgstr "回复至" -#: mail/em-format-html.c:1453 mail/em-format.c:709 mail/em-mailer-prefs.c:69 +#: mail/em-format-html.c:1375 mail/em-format.c:744 mail/em-mailer-prefs.c:69 #: mail/message-list.etspec.h:14 msgid "To" msgstr "收件人" -#: mail/em-format-html.c:1453 mail/em-format.c:710 mail/em-mailer-prefs.c:70 +#: mail/em-format-html.c:1375 mail/em-format.c:745 mail/em-mailer-prefs.c:70 msgid "Cc" msgstr "抄送" -#: mail/em-format-html.c:1453 mail/em-format.c:711 mail/em-mailer-prefs.c:71 +#: mail/em-format-html.c:1375 mail/em-format.c:746 mail/em-mailer-prefs.c:71 msgid "Bcc" msgstr "密件抄送" -#: mail/em-format-html.c:1569 mail/em-mailer-prefs.c:632 +#: mail/em-format-html.c:1491 mail/em-mailer-prefs.c:632 msgid "Mailer" msgstr "邮件程序" #. translators: strftime format for local time equivalent in Date header display, with day -#: mail/em-format-html.c:1595 +#: mail/em-format-html.c:1517 msgid " (%a, %R %Z)" msgstr "" #. translators: strftime format for local time equivalent in Date header display, without day -#: mail/em-format-html.c:1598 +#: mail/em-format-html.c:1520 msgid " (%R %Z)" msgstr "" -#: mail/em-format-html.c:1610 mail/em-format.c:713 mail/em-mailer-prefs.c:73 +#: mail/em-format-html.c:1532 mail/em-format.c:748 mail/em-mailer-prefs.c:73 #: mail/message-list.etspec.h:2 msgid "Date" msgstr "日期" -#: mail/em-format.c:929 +#: mail/em-format.c:963 #, c-format msgid "%s attachment" msgstr "%s 附件" -#: mail/em-format.c:1258 -msgid "Session not initialised" -msgstr "无法初始化会话" +#: mail/em-format.c:1042 mail/em-format.c:1161 +#, fuzzy +msgid "Could not parse S/MIME message: Unknown error" +msgstr "无法解析 MIME 邮件。显示源文本。" -#: mail/em-format.c:1284 -msgid "This message is digitally signed and has been found to be authentic." -msgstr "该邮件有数字签名，并被证实为可信。" +#: mail/em-format.c:1151 +msgid "Unsupported encryption type for multipart/encrypted" +msgstr "" -#: mail/em-format.c:1286 -msgid "This message is digitally signed but can not be proven to be authentic." -msgstr "该邮件有数字签名，但不能证实是可信的。" +#: mail/em-format.c:1295 +msgid "Could not parse MIME message. Displaying as source." +msgstr "无法解析 MIME 邮件。显示源文本。" + +#: mail/em-format.c:1312 +#, fuzzy +msgid "Unsupported signature format" +msgstr "不支持的方案" + +#: mail/em-format.c:1320 +#, fuzzy +msgid "Unknown error verifying signature" +msgstr "无法校验叶子签名" -#: mail/em-junk-filter.c:72 +#: mail/em-junk-filter.c:76 msgid "Spamassassin (built-in)" msgstr "" -#: mail/em-migrate.c:1078 +#: mail/em-migrate.c:1079 msgid "" "The location and hierarchy of the Evolution mailbox folders has changed " "since Evolution 1.x.\n" @@ -12927,22 +12938,22 @@ msgid "" "Please be patient while Evolution migrates your folders..." msgstr "" -#: mail/em-migrate.c:1770 mail/em-migrate.c:1785 +#: mail/em-migrate.c:1800 mail/em-migrate.c:1815 #, fuzzy, c-format msgid "Failed to migrate pop3 uid caches: %s" msgstr "缓冲 %s 失败：%s" -#: mail/em-migrate.c:1873 mail/em-migrate.c:1974 +#: mail/em-migrate.c:1903 mail/em-migrate.c:2004 #, fuzzy, c-format msgid "Failed to migrate folder expand state: %s" msgstr "缓冲 %s 失败：%s" -#: mail/em-migrate.c:2098 mail/em-migrate.c:2267 +#: mail/em-migrate.c:2128 mail/em-migrate.c:2300 #, fuzzy, c-format msgid "Failed to create directory `%s': %s" msgstr "创建到“%s”的管道失败：%s" -#: mail/em-migrate.c:2110 +#: mail/em-migrate.c:2140 #, fuzzy, c-format msgid "Failed to open store for `%s': %s" msgstr "解析主机“%s”：%s" @@ -12981,33 +12992,33 @@ msgstr "添加到地址簿(_A)" msgid "Open in %s..." msgstr "在 %s 中打开..." -#: mail/em-subscribe-editor.c:605 +#: mail/em-subscribe-editor.c:606 #, fuzzy msgid "This store does not support subscriptions, or they are not enabled." msgstr "此服务器不支持 LDAPv3 schema 信息" -#: mail/em-subscribe-editor.c:634 +#: mail/em-subscribe-editor.c:635 msgid "Subscribed" msgstr "已订阅" -#: mail/em-subscribe-editor.c:638 shell/e-storage-set-view.etspec.h:2 +#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2 msgid "Folder" msgstr "文件夹" #. FIXME: This is just to get the shadow, is there a better way? -#: mail/em-subscribe-editor.c:826 +#: mail/em-subscribe-editor.c:827 msgid "Please select a server." msgstr "请选择服务器。" -#: mail/em-subscribe-editor.c:847 +#: mail/em-subscribe-editor.c:848 msgid "No server has been selected" msgstr "没有选定服务器" -#: mail/em-utils.c:95 +#: mail/em-utils.c:97 msgid "Don't show this message again." msgstr "不再显示此信息。" -#: mail/em-utils.c:277 +#: mail/em-utils.c:279 #, c-format msgid "" "Error loading filter information:\n" @@ -13016,11 +13027,11 @@ msgstr "" "装入过滤规则信息错误：\n" "%s" -#: mail/em-utils.c:286 +#: mail/em-utils.c:288 msgid "Filters" msgstr "过滤规则" -#: mail/em-utils.c:531 +#: mail/em-utils.c:533 msgid "-------- Forwarded Message --------" msgstr "-------- 转发的邮件 --------" @@ -13070,7 +13081,12 @@ msgstr "保存邮件..." msgid "Add address" msgstr "地址" -#: mail/em-utils.c:2405 +#: mail/em-utils.c:2085 +#, c-format +msgid "Could not create temporary directory: %s" +msgstr "无法创建临时目录：%s" + +#: mail/em-utils.c:2403 #, fuzzy, c-format msgid "" "This operation will permanently remove all deleted messages in the folder `%" @@ -13083,7 +13099,7 @@ msgstr "" "\n" "确实删除这些邮件吗？" -#: mail/em-utils.c:2431 +#: mail/em-utils.c:2429 #, fuzzy msgid "" "This operation will permanently remove all deleted messages in all folders. " @@ -13147,261 +13163,279 @@ msgstr "转发方式(_F)：" #: mail/evolution-mail.schemas.in.in.h:12 #, fuzzy +msgid "Default height of the Message Window" +msgstr "邮件的默认主题。" + +#: mail/evolution-mail.schemas.in.in.h:13 +#, fuzzy msgid "Default reply style" msgstr "回复风格(_R)：" -#: mail/evolution-mail.schemas.in.in.h:13 +#: mail/evolution-mail.schemas.in.in.h:14 +#, fuzzy +msgid "Default width of the Message Window" +msgstr "文件夹栏面板的默认宽度" + +#: mail/evolution-mail.schemas.in.in.h:15 msgid "Draw spelling error indicators on words as you type." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:14 +#: mail/evolution-mail.schemas.in.in.h:16 #, fuzzy msgid "Empty Trash folders on exit" msgstr "退出时清空已删除邮件(_T)" -#: mail/evolution-mail.schemas.in.in.h:15 +#: mail/evolution-mail.schemas.in.in.h:17 #, fuzzy msgid "Empty all Trash folders when exiting Evolution." msgstr "退出时清空已删除邮件(_T)" -#: mail/evolution-mail.schemas.in.in.h:16 +#: mail/evolution-mail.schemas.in.in.h:18 msgid "Enable caret mode, so that you can see a cursor when reading mail." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:17 +#: mail/evolution-mail.schemas.in.in.h:19 msgid "Enable/disable caret mode" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:18 +#: mail/evolution-mail.schemas.in.in.h:20 msgid "Height of the message-list pane" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:19 +#: mail/evolution-mail.schemas.in.in.h:21 msgid "Height of the message-list pane." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:20 +#: mail/evolution-mail.schemas.in.in.h:22 msgid "" "If there isn't a builtin viewer for a particular mime-type inside Evolution, " "any mime-types appearing in this list which map to a bonobo-component viewer " "in GNOME's mime-type database may be used for displaying content." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:21 +#: mail/evolution-mail.schemas.in.in.h:23 msgid "List of Labels and their associated colours" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:22 +#: mail/evolution-mail.schemas.in.in.h:24 #, fuzzy msgid "List of accounts" msgstr "邮件账户" -#: mail/evolution-mail.schemas.in.in.h:23 +#: mail/evolution-mail.schemas.in.in.h:25 msgid "" "List of accounts known to the mail component of Evolution. The list contains " "strings naming subdirectories relative to /apps/evolution/mail/accounts." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:24 +#: mail/evolution-mail.schemas.in.in.h:26 msgid "List of custom headers and whether they are enabled." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:25 +#: mail/evolution-mail.schemas.in.in.h:27 msgid "" "List of labels known to the mail component of Evolution. The list contains " "strings containing name:colour where colour uses the HTML hex encoding." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:26 +#: mail/evolution-mail.schemas.in.in.h:28 msgid "List of mime types to check for bonobo component viewers" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:27 +#: mail/evolution-mail.schemas.in.in.h:29 msgid "Load images for HTML messages over http" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:28 +#: mail/evolution-mail.schemas.in.in.h:30 msgid "" "Load images for HTML messages over http(s). Possible values are: 0 - Never " "load images off the net 1 - Load images if sender is in the addressbook 2 - " "Always load images off the net" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:29 +#: mail/evolution-mail.schemas.in.in.h:31 #, fuzzy msgid "Log filter actions" msgstr "执行动作" -#: mail/evolution-mail.schemas.in.in.h:30 +#: mail/evolution-mail.schemas.in.in.h:32 msgid "Log filter actions to the specified log file." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:31 +#: mail/evolution-mail.schemas.in.in.h:33 msgid "Logfile to log filter actions" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:32 +#: mail/evolution-mail.schemas.in.in.h:34 msgid "Logfile to log filter actions." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:33 +#: mail/evolution-mail.schemas.in.in.h:35 msgid "Mark as Seen after specified timeout" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:34 +#: mail/evolution-mail.schemas.in.in.h:36 msgid "Mark as Seen after specified timeout." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:35 +#: mail/evolution-mail.schemas.in.in.h:37 msgid "Mark citations in the message \"Preview\"" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:36 +#: mail/evolution-mail.schemas.in.in.h:38 msgid "Mark citations in the message \"Preview\"." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:37 +#: mail/evolution-mail.schemas.in.in.h:39 +msgid "Message Window default hight" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:40 +msgid "Message Window default width" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:41 msgid "Message-display style (normal, full headers, source)" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:38 +#: mail/evolution-mail.schemas.in.in.h:42 #, fuzzy msgid "New Mail Notify sound file" msgstr "新邮件提醒" -#: mail/evolution-mail.schemas.in.in.h:39 +#: mail/evolution-mail.schemas.in.in.h:43 #, fuzzy msgid "New Mail Notify type" msgstr "新邮件提醒" -#: mail/evolution-mail.schemas.in.in.h:40 +#: mail/evolution-mail.schemas.in.in.h:44 msgid "Prompt on empty subject" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:41 +#: mail/evolution-mail.schemas.in.in.h:45 msgid "Prompt the user when he or she tries to expunge a folder." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:42 +#: mail/evolution-mail.schemas.in.in.h:46 msgid "" "Prompt the user when he or she tries to send a message without a Subject." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:43 +#: mail/evolution-mail.schemas.in.in.h:47 msgid "Prompt when user expunges" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:44 +#: mail/evolution-mail.schemas.in.in.h:48 msgid "Prompt when user only fills Bcc" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:45 +#: mail/evolution-mail.schemas.in.in.h:49 #, fuzzy msgid "" "Prompt when user tries to send HTML mail to recipients that may not want to " "receive HTML mail." msgstr "发送给不想接收 HTML 的联系人时提示(_P)" -#: mail/evolution-mail.schemas.in.in.h:46 +#: mail/evolution-mail.schemas.in.in.h:50 #, fuzzy msgid "Prompt when user tries to send a message with no To or Cc recipients." msgstr "发送只有暗送收件人的邮件时提示(_O)" -#: mail/evolution-mail.schemas.in.in.h:47 +#: mail/evolution-mail.schemas.in.in.h:51 msgid "Prompt when user tries to send unwanted HTML" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:48 +#: mail/evolution-mail.schemas.in.in.h:52 msgid "Recognize links in text and replace them." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:49 +#: mail/evolution-mail.schemas.in.in.h:53 msgid "Recognize smileys in text and replace them with images." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:50 +#: mail/evolution-mail.schemas.in.in.h:54 msgid "Run junk test on incoming mail" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:51 +#: mail/evolution-mail.schemas.in.in.h:55 msgid "" "Run junk test on incoming mail for IMAP accounts (only valid if " "check_incoming is set to true)" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:52 +#: mail/evolution-mail.schemas.in.in.h:56 msgid "S3kr3t 0pt10n" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:53 +#: mail/evolution-mail.schemas.in.in.h:57 msgid "S3kr3t 0pt10n." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:54 +#: mail/evolution-mail.schemas.in.in.h:58 #, fuzzy msgid "Send HTML mail by default" msgstr "发送 HTML 邮件？" -#: mail/evolution-mail.schemas.in.in.h:55 +#: mail/evolution-mail.schemas.in.in.h:59 #, fuzzy msgid "Send HTML mail by default." msgstr "发送 HTML 邮件？" -#: mail/evolution-mail.schemas.in.in.h:56 +#: mail/evolution-mail.schemas.in.in.h:60 #, fuzzy msgid "Show Animations" msgstr "显示动画图像(_S)" -#: mail/evolution-mail.schemas.in.in.h:57 +#: mail/evolution-mail.schemas.in.in.h:61 #, fuzzy msgid "Show animated images as animations." msgstr "显示动画图像(_S)" -#: mail/evolution-mail.schemas.in.in.h:58 +#: mail/evolution-mail.schemas.in.in.h:62 msgid "Show deleted messages (with a strike-through) in the message-list." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:59 +#: mail/evolution-mail.schemas.in.in.h:63 #, fuzzy msgid "Show deleted messages in the message-list" msgstr "以普通样式显示邮件" -#: mail/evolution-mail.schemas.in.in.h:60 +#: mail/evolution-mail.schemas.in.in.h:64 msgid "Show the \"Preview\" pane" msgstr "显示“预览”面板" -#: mail/evolution-mail.schemas.in.in.h:61 +#: mail/evolution-mail.schemas.in.in.h:65 msgid "Show the \"Preview\" pane." msgstr "显示“预览”面板。" -#: mail/evolution-mail.schemas.in.in.h:62 +#: mail/evolution-mail.schemas.in.in.h:66 #, fuzzy msgid "Sound file to play when new mail arrives." msgstr "新邮件到达时播放声音文件(_P)" -#: mail/evolution-mail.schemas.in.in.h:63 +#: mail/evolution-mail.schemas.in.in.h:67 msgid "Specifies the type of New Mail Notification the user wishes to use." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:64 +#: mail/evolution-mail.schemas.in.in.h:68 #, fuzzy msgid "Spell check inline" msgstr "拼写检查(_C)" -#: mail/evolution-mail.schemas.in.in.h:65 +#: mail/evolution-mail.schemas.in.in.h:69 msgid "Terminal font" msgstr "终端字体" -#: mail/evolution-mail.schemas.in.in.h:66 +#: mail/evolution-mail.schemas.in.in.h:70 msgid "The terminal font for mail display" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:67 +#: mail/evolution-mail.schemas.in.in.h:71 #, fuzzy msgid "The variable width font for mail display" msgstr "选择用于打印的 HTML 变宽度字体" -#: mail/evolution-mail.schemas.in.in.h:68 +#: mail/evolution-mail.schemas.in.in.h:72 msgid "" "This key should contain a list of XML structures specifying custom headers, " "and whether they are to be displayed. The format of the XML structure is <" @@ -13409,113 +13443,113 @@ msgid "" "mail view." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:69 +#: mail/evolution-mail.schemas.in.in.h:73 #, fuzzy msgid "Thread the message list." msgstr "按线索编排的邮件列表" -#: mail/evolution-mail.schemas.in.in.h:70 +#: mail/evolution-mail.schemas.in.in.h:74 #, fuzzy msgid "Thread the message-list" msgstr "按线索编排的邮件列表" -#: mail/evolution-mail.schemas.in.in.h:71 +#: mail/evolution-mail.schemas.in.in.h:75 msgid "Thread the message-list based on Subject" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:72 +#: mail/evolution-mail.schemas.in.in.h:76 msgid "Timeout for marking message as Seen" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:73 +#: mail/evolution-mail.schemas.in.in.h:77 msgid "Timeout for marking message as Seen." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:74 +#: mail/evolution-mail.schemas.in.in.h:78 #, fuzzy msgid "UID string of the default account." msgstr "使它成为我的默认账户(_M)" -#: mail/evolution-mail.schemas.in.in.h:75 +#: mail/evolution-mail.schemas.in.in.h:79 msgid "Use Spamasssassin daemon and client" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:76 +#: mail/evolution-mail.schemas.in.in.h:80 msgid "Use Spamasssassin daemon and client (spamc/spamd)" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:77 +#: mail/evolution-mail.schemas.in.in.h:81 msgid "Use custom fonts" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:78 +#: mail/evolution-mail.schemas.in.in.h:82 msgid "Use custom fonts for displaying mail" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:79 +#: mail/evolution-mail.schemas.in.in.h:83 msgid "Use only local spam tests." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:80 +#: mail/evolution-mail.schemas.in.in.h:84 msgid "Use only the local spam tests (no DNS)." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:81 +#: mail/evolution-mail.schemas.in.in.h:85 #, fuzzy msgid "Variable width font" msgstr "变宽(_A)：" -#: mail/evolution-mail.schemas.in.in.h:82 +#: mail/evolution-mail.schemas.in.in.h:86 msgid "View/Bcc menu item is checked" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:83 +#: mail/evolution-mail.schemas.in.in.h:87 msgid "View/Bcc menu item is checked." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:84 +#: mail/evolution-mail.schemas.in.in.h:88 msgid "View/Cc menu item is checked" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:85 +#: mail/evolution-mail.schemas.in.in.h:89 msgid "View/Cc menu item is checked." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:86 +#: mail/evolution-mail.schemas.in.in.h:90 msgid "View/From menu item is checked" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:87 +#: mail/evolution-mail.schemas.in.in.h:91 msgid "View/From menu item is checked." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:88 +#: mail/evolution-mail.schemas.in.in.h:92 msgid "View/PostTo menu item is checked" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:89 +#: mail/evolution-mail.schemas.in.in.h:93 msgid "View/PostTo menu item is checked." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:90 +#: mail/evolution-mail.schemas.in.in.h:94 msgid "View/ReplyTo menu item is checked" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:91 +#: mail/evolution-mail.schemas.in.in.h:95 msgid "View/ReplyTo menu item is checked." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:92 +#: mail/evolution-mail.schemas.in.in.h:96 msgid "" "Whether or not to fall back on threading by subjects when the messages do " "not contain In-Reply-To or References headers." msgstr "" -#: mail/evolution-mail.schemas.in.in.h:93 +#: mail/evolution-mail.schemas.in.in.h:97 msgid "port for starting user runned spamd" msgstr "" -#: mail/evolution-mail.schemas.in.in.h:94 +#: mail/evolution-mail.schemas.in.in.h:98 #, fuzzy msgid "spamd port" msgstr "导入" @@ -13728,56 +13762,56 @@ msgstr "您还没有填写所有必须的信息。" msgid "Evolution Account Editor" msgstr "Evolution 账户编辑器" -#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:157 +#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157 msgid "_Host:" msgstr "主机(_H)：" -#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:131 +#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131 msgid "User_name:" msgstr "用户名(_N)：" -#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:166 +#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166 msgid "_Path:" msgstr "路径(_P)：" -#: mail/mail-account-gui.c:1970 +#: mail/mail-account-gui.c:1969 msgid "You may not create two accounts with the same name." msgstr "您不能以相同的名字创建两个账户。" -#: mail/mail-autofilter.c:74 +#: mail/mail-autofilter.c:75 #, c-format msgid "Mail to %s" msgstr "邮寄给 %s" -#: mail/mail-autofilter.c:260 +#: mail/mail-autofilter.c:261 #, c-format msgid "Subject is %s" msgstr "主题是 %s" -#: mail/mail-autofilter.c:276 +#: mail/mail-autofilter.c:277 #, c-format msgid "Mail from %s" msgstr "来自 %s 的邮件" -#: mail/mail-autofilter.c:293 +#: mail/mail-autofilter.c:294 #, c-format msgid "%s mailing list" msgstr "%s 邮件列表" -#: mail/mail-autofilter.c:317 +#: mail/mail-autofilter.c:318 #, c-format msgid "Replies to %s" msgstr "到 %s 的回复" -#: mail/mail-autofilter.c:372 +#: mail/mail-autofilter.c:373 msgid "Add Filter Rule" msgstr "添加过滤规则" -#: mail/mail-autofilter.c:421 +#: mail/mail-autofilter.c:422 msgid "The following filter rule(s):\n" msgstr "下列过滤器规则：\n" -#: mail/mail-autofilter.c:427 +#: mail/mail-autofilter.c:428 #, c-format msgid "" "Used the removed folder:\n" @@ -13788,19 +13822,23 @@ msgstr "" " “%s”\n" "已经被更新。" -#: mail/mail-component.c:436 +#: mail/mail-component.c:463 +msgid "You have unsent messages, do you wish to quit anyway?" +msgstr "" + +#: mail/mail-component.c:522 msgid "New Mail Message" msgstr "新建邮件" -#: mail/mail-component.c:437 +#: mail/mail-component.c:523 msgid "_Mail Message" msgstr "邮件(_M)" -#: mail/mail-component.c:438 +#: mail/mail-component.c:524 msgid "Compose a new mail message" msgstr "撰写一封新邮件" -#: mail/mail-component.c:577 +#: mail/mail-component.c:657 #, fuzzy msgid "URI of the mail source that the view will display" msgstr "日历将显示的 URI" @@ -13861,11 +13899,11 @@ msgstr "" "您即将完成邮件配置的过程了。您提供的用于收件服务器和发送方式将被组合在一起，" "成为 Evolution 的邮件帐户。请在下面输入此帐户的名称。此名称只会用作显示。" -#: mail/mail-config.c:1091 +#: mail/mail-config.c:1092 msgid "Checking Service" msgstr "检查服务" -#: mail/mail-config.c:1169 mail/mail-config.c:1173 +#: mail/mail-config.c:1170 mail/mail-config.c:1174 msgid "Connecting to server..." msgstr "正在连接服务器..." @@ -14477,7 +14515,7 @@ msgstr "使用与其它应用程序相同的字体(_U)" msgid "description" msgstr "描述" -#: mail/mail-folder-cache.c:786 +#: mail/mail-folder-cache.c:787 #, c-format msgid "Pinging %s" msgstr "正在查验 %s" @@ -14512,12 +14550,12 @@ msgstr "过滤文件夹" msgid "Fetching Mail" msgstr "收取邮件" -#: mail/mail-ops.c:537 +#: mail/mail-ops.c:536 #, c-format msgid "Failed to apply outgoing filters: %s" msgstr "应用寄出过滤器失败：%s" -#: mail/mail-ops.c:558 +#: mail/mail-ops.c:561 #, c-format msgid "" "Failed to append to %s: %s\n" @@ -14526,106 +14564,116 @@ msgstr "" "追加到 %s：%s 失败\n" "转而追加到本地“已发”文件夹。" -#: mail/mail-ops.c:567 +#: mail/mail-ops.c:570 #, c-format msgid "Failed to append to local `Sent' folder: %s" msgstr "追加到本地“已发”文件夹失败：%s" -#: mail/mail-ops.c:609 +#: mail/mail-ops.c:612 #, c-format msgid "Sending \"%s\"" msgstr "正在发送“%s”" -#: mail/mail-ops.c:727 +#: mail/mail-ops.c:731 #, c-format msgid "Sending message %d of %d" msgstr "发送第 %d 个邮件，共 %d 个" -#: mail/mail-ops.c:746 +#: mail/mail-ops.c:750 #, c-format msgid "Failed on message %d of %d" msgstr "在第 %d 个邮件失败，共 %d 个" -#: mail/mail-ops.c:748 +#: mail/mail-ops.c:752 msgid "Complete." msgstr "完成。" -#: mail/mail-ops.c:842 +#: mail/mail-ops.c:846 msgid "Saving message to folder" msgstr "把邮件保存到文件夹中" -#: mail/mail-ops.c:927 +#: mail/mail-ops.c:931 #, c-format msgid "Moving messages to %s" msgstr "把邮件移动到 %s" -#: mail/mail-ops.c:927 +#: mail/mail-ops.c:931 #, c-format msgid "Copying messages to %s" msgstr "把邮件复制到 %s" -#: mail/mail-ops.c:1040 +#: mail/mail-ops.c:1044 #, c-format msgid "Scanning folders in \"%s\"" msgstr "正在“%s”中扫描文件夹" -#: mail/mail-ops.c:1236 +#: mail/mail-ops.c:1240 msgid "Forwarded messages" msgstr "转发的邮件" -#: mail/mail-ops.c:1279 +#: mail/mail-ops.c:1283 #, c-format msgid "Opening folder %s" msgstr "正在打开文件夹 %s" -#: mail/mail-ops.c:1351 +#: mail/mail-ops.c:1355 #, c-format msgid "Opening store %s" msgstr "正在打开存储 %s" -#: mail/mail-ops.c:1429 +#: mail/mail-ops.c:1433 #, c-format msgid "Removing folder %s" msgstr "正在删除文件夹“%s”" -#: mail/mail-ops.c:1523 +#: mail/mail-ops.c:1527 #, c-format msgid "Storing folder '%s'" msgstr "正在存储文件夹“%s”" -#: mail/mail-ops.c:1574 +#: mail/mail-ops.c:1592 +#, c-format +msgid "Expunging and storing account '%s'" +msgstr "" + +#: mail/mail-ops.c:1593 +#, fuzzy, c-format +msgid "Storing account '%s'" +msgstr "正在存储文件夹“%s”" + +#: mail/mail-ops.c:1648 msgid "Refreshing folder" msgstr "正在刷新文件夹" -#: mail/mail-ops.c:1610 mail/mail-ops.c:1661 +#: mail/mail-ops.c:1684 mail/mail-ops.c:1735 msgid "Expunging folder" msgstr "正在销毁文件夹" -#: mail/mail-ops.c:1658 +#: mail/mail-ops.c:1732 #, c-format msgid "Emptying trash in '%s'" msgstr "正在清空“%s”中的已删除邮件" -#: mail/mail-ops.c:1659 +#: mail/mail-ops.c:1733 msgid "Local Folders" msgstr "本地文件夹" -#: mail/mail-ops.c:1742 +#: mail/mail-ops.c:1816 #, c-format msgid "Retrieving message %s" msgstr "正在收取邮件 %s" -#: mail/mail-ops.c:1814 +#: mail/mail-ops.c:1888 #, c-format msgid "Retrieving %d message(s)" msgstr "正在收取 %d 封邮件" -#: mail/mail-ops.c:1898 +#: mail/mail-ops.c:1972 #, c-format msgid "Saving %d messsage(s)" msgstr "正在保存 %d 封邮件" -#: mail/mail-ops.c:1946 +#: mail/mail-ops.c:2020 #, c-format msgid "" "Unable to create output file: %s\n" @@ -14634,7 +14682,7 @@ msgstr "" "无法创建输出文件：%s\n" " %s" -#: mail/mail-ops.c:1974 +#: mail/mail-ops.c:2048 #, c-format msgid "" "Error saving messages to: %s:\n" @@ -14643,11 +14691,11 @@ msgstr "" "在将邮件保存到 %s 时发生错误：\n" " %s" -#: mail/mail-ops.c:2045 +#: mail/mail-ops.c:2119 msgid "Saving attachment" msgstr "正在保存附件" -#: mail/mail-ops.c:2062 +#: mail/mail-ops.c:2136 #, c-format msgid "" "Cannot create output file: %s:\n" @@ -14656,22 +14704,22 @@ msgstr "" "无法创建输出文件：%s：\n" " %s" -#: mail/mail-ops.c:2092 +#: mail/mail-ops.c:2166 #, c-format msgid "Could not write data: %s" msgstr "无法写数据：%s" -#: mail/mail-ops.c:2240 +#: mail/mail-ops.c:2314 #, c-format msgid "Disconnecting from %s" msgstr "正在断开与 %s 的连接" -#: mail/mail-ops.c:2240 +#: mail/mail-ops.c:2314 #, c-format msgid "Reconnecting to %s" msgstr "正在重新连接到 %s" -#: mail/mail-ops.c:2342 +#: mail/mail-ops.c:2416 msgid "Changing junk status" msgstr "" @@ -14703,59 +14751,59 @@ msgstr "加密" msgid "Security Information" msgstr "安全信息" -#: mail/mail-send-recv.c:146 +#: mail/mail-send-recv.c:147 msgid "Cancelling..." msgstr "正在取消..." -#: mail/mail-send-recv.c:253 +#: mail/mail-send-recv.c:254 #, c-format msgid "Server: %s, Type: %s" msgstr "服务器：%s，类型：%s" -#: mail/mail-send-recv.c:255 +#: mail/mail-send-recv.c:256 #, c-format msgid "Path: %s, Type: %s" msgstr "路径：%s，类型：%s" -#: mail/mail-send-recv.c:257 +#: mail/mail-send-recv.c:258 #, c-format msgid "Type: %s" msgstr "类型：%s" -#: mail/mail-send-recv.c:306 +#: mail/mail-send-recv.c:311 msgid "Send & Receive Mail" msgstr "发送和接收邮件" -#: mail/mail-send-recv.c:309 +#: mail/mail-send-recv.c:314 msgid "Cancel _All" msgstr "全部取消(_A)" -#: mail/mail-send-recv.c:390 +#: mail/mail-send-recv.c:395 msgid "Updating..." msgstr "正在更新..." -#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442 +#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447 msgid "Waiting..." msgstr "正在等待..." -#: mail/mail-session.c:240 +#: mail/mail-session.c:233 msgid "User canceled operation." msgstr "用户己取消操作。" -#: mail/mail-session.c:273 +#: mail/mail-session.c:266 #, c-format msgid "Enter Password for %s" msgstr "为 %s 输入密码" -#: mail/mail-session.c:275 +#: mail/mail-session.c:268 msgid "Enter Password" msgstr "输入密码" -#: mail/mail-session.c:301 +#: mail/mail-session.c:294 msgid "_Remember this password" msgstr "记住该密码(_R)" -#: mail/mail-session.c:302 +#: mail/mail-session.c:295 msgid "_Remember this password for the remainder of this session" msgstr "在本会话中记住该密码(_R)" @@ -14794,16 +14842,28 @@ msgstr "输入该签名的名字。" msgid "Name:" msgstr "名称：" -#: mail/mail-tools.c:271 +#: mail/mail-tools.c:114 +#, fuzzy, c-format +msgid "Could not create spool directory `%s': %s" +msgstr "" +"无法创建目录 %s：\n" +"%s" + +#: mail/mail-tools.c:141 +#, c-format +msgid "Trying to movemail a non-mbox source `%s'" +msgstr "" + +#: mail/mail-tools.c:276 #, c-format msgid "Forwarded message - %s" msgstr "转发的邮件 - %s" -#: mail/mail-tools.c:273 +#: mail/mail-tools.c:278 msgid "Forwarded message" msgstr "转发的邮件" -#: mail/mail-tools.c:313 +#: mail/mail-tools.c:319 #, c-format msgid "Invalid folder: `%s'" msgstr "无效的文件夹：“%s”" @@ -14818,7 +14878,7 @@ msgstr "设置虚拟文件夹：%s" msgid "Updating vfolders for uri: %s" msgstr "为 uri: %s 更新虚拟文件夹" -#: mail/mail-vfolder.c:498 +#: mail/mail-vfolder.c:524 #, c-format msgid "" "The following vFolder(s):\n" @@ -14831,84 +14891,84 @@ msgstr "" " “%s”\n" "已经被更新。" -#: mail/mail-vfolder.c:897 +#: mail/mail-vfolder.c:923 msgid "vFolders" msgstr "虚拟文件夹" -#: mail/mail-vfolder.c:936 +#: mail/mail-vfolder.c:962 msgid "Edit VFolder" msgstr "编辑虚拟文件夹" -#: mail/mail-vfolder.c:956 +#: mail/mail-vfolder.c:982 #, c-format msgid "Trying to edit a vfolder '%s' which doesn't exist." msgstr "试图编辑并不存在的虚拟文件夹“%s”。" -#: mail/mail-vfolder.c:1028 +#: mail/mail-vfolder.c:1054 msgid "New VFolder" msgstr "新建虚拟文件夹" -#: mail/message-list.c:907 +#: mail/message-list.c:927 msgid "Unseen" msgstr "不可见" -#: mail/message-list.c:908 +#: mail/message-list.c:928 msgid "Seen" msgstr "可见" -#: mail/message-list.c:909 +#: mail/message-list.c:929 msgid "Answered" msgstr "已答复" -#: mail/message-list.c:910 +#: mail/message-list.c:930 msgid "Multiple Unseen Messages" msgstr "多封不可见邮件" -#: mail/message-list.c:911 +#: mail/message-list.c:931 msgid "Multiple Messages" msgstr "多封邮件" -#: mail/message-list.c:915 +#: mail/message-list.c:935 msgid "Lowest" msgstr "最低" -#: mail/message-list.c:916 +#: mail/message-list.c:936 msgid "Lower" msgstr "较低" -#: mail/message-list.c:920 +#: mail/message-list.c:940 msgid "Higher" msgstr "较高" -#: mail/message-list.c:921 +#: mail/message-list.c:941 msgid "Highest" msgstr "最高" -#: mail/message-list.c:1242 +#: mail/message-list.c:1262 msgid "?" msgstr "?" -#: mail/message-list.c:1249 +#: mail/message-list.c:1269 msgid "Today %l:%M %p" msgstr "今天 %H:%M" -#: mail/message-list.c:1258 +#: mail/message-list.c:1278 msgid "Yesterday %l:%M %p" msgstr "昨天 %H:%M" -#: mail/message-list.c:1270 +#: mail/message-list.c:1290 msgid "%a %l:%M %p" msgstr "%A %H:%M" -#: mail/message-list.c:1278 +#: mail/message-list.c:1298 msgid "%b %d %l:%M %p" msgstr "%m月%d日 %H:%M" -#: mail/message-list.c:1280 +#: mail/message-list.c:1300 msgid "%b %d %Y" msgstr "%Y年%m月%d日" -#: mail/message-list.c:3100 +#: mail/message-list.c:3115 msgid "Generating message list" msgstr "正在生成邮件列表" @@ -15258,11 +15318,11 @@ msgstr "" msgid "(Untitled)" msgstr "(无标题)" -#: shell/e-shell-importer.c:138 +#: shell/e-shell-importer.c:145 msgid "Choose the type of importer to run:" msgstr "选择要运行的导入器类型：" -#: shell/e-shell-importer.c:141 +#: shell/e-shell-importer.c:148 msgid "" "Choose the file that you want to import into Evolution, and select what type " "of file it is from the list.\n" @@ -15274,11 +15334,16 @@ msgstr "" "\n" "如果您不清楚，可以选择“自动”，Evolution 将试图为您确定类型。" -#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:737 +#: shell/e-shell-importer.c:154 +#, fuzzy +msgid "Choose the destination for this import" +msgstr "取消该项的会议" + +#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737 msgid "Please select the information that you would like to import:" msgstr "请选择您希望导入的信息：" -#: shell/e-shell-importer.c:150 +#: shell/e-shell-importer.c:160 msgid "" "Evolution checked for settings to import from the following\n" "applications: Pine, Netscape, Elm, iCalendar. No settings\n" @@ -15289,7 +15354,7 @@ msgstr "" "iCalendar。并未发现可导入的设置。如果您想要再试一次，请单击\n" "“后退”按钮。\n" -#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249 +#: shell/e-shell-importer.c:228 shell/e-shell-importer.c:259 #, c-format msgid "" "Importing %s\n" @@ -15298,53 +15363,30 @@ msgstr "" "正在导入 %s\n" "正在导入项目 %d。" -#: shell/e-shell-importer.c:322 +#: shell/e-shell-importer.c:332 msgid "Select importer" msgstr "选择导入器" -#: shell/e-shell-importer.c:463 +#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020 #, c-format msgid "File %s does not exist" msgstr "文件 %s 不存在" -#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481 -#: shell/e-shell-importer.c:523 -msgid "Evolution Error" -msgstr "Evolution 错误" - -#: shell/e-shell-importer.c:480 -#, c-format -msgid "" -"There is no importer that is able to handle\n" -"%s" -msgstr "" -"没有导入器能够处理\n" -"%s" - -#: shell/e-shell-importer.c:489 +#: shell/e-shell-importer.c:456 msgid "Importing" msgstr "正在导入" -#: shell/e-shell-importer.c:496 -#, c-format -msgid "" -"Importing %s.\n" -"Starting %s" -msgstr "" -"正在导入 %s。\n" -"正在启动 %s" - -#: shell/e-shell-importer.c:508 -#, c-format -msgid "Error starting %s" -msgstr "启动 %s 错误" +#: shell/e-shell-importer.c:463 +#, fuzzy, c-format +msgid "Importing %s.\n" +msgstr "正在导入" -#: shell/e-shell-importer.c:522 +#: shell/e-shell-importer.c:473 shell/e-shell-importer.c:474 #, c-format msgid "Error loading %s" msgstr "装入 %s 错误" -#: shell/e-shell-importer.c:539 +#: shell/e-shell-importer.c:490 #, c-format msgid "" "Importing %s\n" @@ -15353,31 +15395,31 @@ msgstr "" "正在导入 %s\n" "正在导入项目 1。" -#: shell/e-shell-importer.c:593 +#: shell/e-shell-importer.c:544 msgid "Automatic" msgstr "自动" -#: shell/e-shell-importer.c:642 +#: shell/e-shell-importer.c:593 msgid "_Filename:" msgstr "文件名(_F)：" -#: shell/e-shell-importer.c:647 +#: shell/e-shell-importer.c:598 msgid "Select a file" msgstr "选择一个文件" -#: shell/e-shell-importer.c:657 +#: shell/e-shell-importer.c:608 msgid "File _type:" msgstr "文件类型(_T)：" -#: shell/e-shell-importer.c:683 +#: shell/e-shell-importer.c:647 msgid "Import data and settings from _older programs" msgstr "从老版程序中导入数据和设置(_O)" -#: shell/e-shell-importer.c:686 +#: shell/e-shell-importer.c:650 msgid "Import a _single file" msgstr "导入单个文件(_S)" -#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:566 +#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566 msgid "" "Please wait...\n" "Scanning for existing setups" @@ -15385,20 +15427,26 @@ msgstr "" "请稍候...\n" "正在扫描现有设置" -#: shell/e-shell-importer.c:757 +#: shell/e-shell-importer.c:721 msgid "Starting Intelligent Importers" msgstr "启动智能导入器" -#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:692 +#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692 #, c-format msgid "From %s:" msgstr "从 %s：" -#: shell/e-shell-importer.c:1061 -msgid "Select a destination folder for importing this data" -msgstr "为导入的数据选择目标文件夹" +#: shell/e-shell-importer.c:1034 +#, fuzzy, c-format +msgid "No importer available for file %s" +msgstr "协议“%s”没有可用的提供者" + +#: shell/e-shell-importer.c:1046 +#, fuzzy +msgid "Unable to execute importer" +msgstr "执行 gpg 失败。" -#: shell/e-shell-importer.c:1190 +#: shell/e-shell-importer.c:1156 msgid "_Import" msgstr "导入(_I)" @@ -15473,84 +15521,74 @@ msgstr "文件夹名不能含有字符“#”。" msgid "'.' and '..' are reserved folder names." msgstr "“.”和“..”是保留文件夹名。" -#: shell/e-shell-view-menu.c:90 shell/e-shell-window-commands.c:59 +#: shell/e-shell-window-commands.c:63 msgid "The GNOME Pilot tools do not appear to be installed on this system." msgstr "GNOME Pilot 工具好像并未安装到系统中。" -#: shell/e-shell-view-menu.c:98 shell/e-shell-window-commands.c:67 +#: shell/e-shell-window-commands.c:71 #, c-format msgid "Error executing %s." msgstr "执行 %s 错误。" -#: shell/e-shell-view-menu.c:194 shell/e-shell-window-commands.c:121 +#: shell/e-shell-window-commands.c:121 msgid "Bug buddy is not installed." msgstr "未安装 Bug buddy。" -#: shell/e-shell-view-menu.c:202 shell/e-shell-window-commands.c:129 +#: shell/e-shell-window-commands.c:129 msgid "Bug buddy could not be run." msgstr "无法运行 Bug buddy。" -#: shell/e-shell-view-menu.c:248 shell/e-shell-window-commands.c:171 +#: shell/e-shell-window-commands.c:171 msgid "About Ximian Evolution" msgstr "关于 Ximian Evolution" -#: shell/e-shell-view-menu.c:511 -msgid "Go to folder..." -msgstr "转到文件夹..." - -#: shell/e-shell-view-menu.c:512 -msgid "Select the folder that you want to open" -msgstr "选择您希望打开的文件夹" - -#: shell/e-shell-view-menu.c:626 -msgid "Create New Shortcut" -msgstr "创建新快捷方式" - -#: shell/e-shell-view-menu.c:627 -msgid "Select the folder you want the shortcut to point to:" -msgstr "选择您希望快捷方式指向的文件夹：" - -#: shell/e-shell-view-menu.c:779 shell/e-shell-window-commands.c:323 +#: shell/e-shell-window-commands.c:381 msgid "_Work Online" msgstr "在线工作(_W)" -#: shell/e-shell-view-menu.c:792 shell/e-shell-window-commands.c:336 -#: ui/evolution.xml.h:36 +#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37 msgid "_Work Offline" msgstr "离线工作(_W)" -#: shell/e-shell-view-menu.c:805 shell/e-shell-window-commands.c:349 -#: ui/evolution.xml.h:22 +#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22 msgid "Work Offline" msgstr "离线工作" -#: shell/e-shell-window.c:324 +#: shell/e-shell-window.c:327 msgid "" "Ximian Evolution is currently online. Click on this button to work offline." msgstr "Ximian Evolution 目前在线。点击该按钮则离线工作。" -#: shell/e-shell-window.c:331 +#: shell/e-shell-window.c:334 msgid "Ximian Evolution is in the process of going offline." msgstr "Ximian Evolution 正在离线过程中。" -#: shell/e-shell-window.c:337 +#: shell/e-shell-window.c:340 msgid "" "Ximian Evolution is currently offline. Click on this button to work online." msgstr "Ximian Evolution 目前离线。点击该按钮则在线工作。" -#: shell/e-shell.c:994 +#: shell/e-shell.c:537 +#, c-format +msgid "" +"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n" +"The data hasn't been deleted, but it will not be seen by this version of " +"Evolution.\n" +msgstr "" + +#: shell/e-shell.c:1063 msgid "Invalid arguments" msgstr "无效参数" -#: shell/e-shell.c:996 +#: shell/e-shell.c:1065 msgid "Cannot register on OAF" msgstr "无法注册到 OAF" -#: shell/e-shell.c:998 +#: shell/e-shell.c:1067 msgid "Configuration Database not found" msgstr "找不到配置数据库" -#: shell/e-shell.c:1000 +#: shell/e-shell.c:1069 msgid "Generic error" msgstr "通用错误" @@ -15675,16 +15713,6 @@ msgstr "快捷方式" msgid "Checkbox" msgstr "复选框" -#: shell/e-task-widget.c:211 -#, c-format -msgid "%s (...)" -msgstr "%s (...)" - -#: shell/e-task-widget.c:216 -#, c-format -msgid "%s (%d%% complete)" -msgstr "%s (%d%% 完成)" - #: shell/e-user-creatable-items-handler.c:601 #: shell/e-user-creatable-items-handler.c:642 #: widgets/misc/e-charset-picker.c:109 @@ -15842,22 +15870,31 @@ msgid "Evolution Import Assistant" msgstr "Evolution 导入助手" #: shell/importer/import.glade.h:3 -msgid "Import File (step 3 of 3)" -msgstr "导入文件 (第 3 步，共 3 步)" +#, fuzzy +msgid "Import File" +msgstr "正在导入文件" #: shell/importer/import.glade.h:4 -msgid "Importer Type (step 1 of 3)" -msgstr "导入类型 (第 1 步，共 3 步)" +#, fuzzy +msgid "Import Location" +msgstr "位置" #: shell/importer/import.glade.h:5 -msgid "Select Importers (step 2 of 3)" -msgstr "选择导入器 (第 2 步，共 3 步)" +#, fuzzy +msgid "Importer Type" +msgstr "导入器" #: shell/importer/import.glade.h:6 -msgid "Select a File (step 2 of 3)" -msgstr "选择文件 (第 2 步，共 3 步)" +#, fuzzy +msgid "Select Importers" +msgstr "选择导入器" #: shell/importer/import.glade.h:7 +#, fuzzy +msgid "Select a File" +msgstr "选择一个文件" + +#: shell/importer/import.glade.h:8 msgid "" "Welcome to the Evolution Import Assistant.\n" "With this assistant you will be guided through the process of\n" @@ -15886,16 +15923,8 @@ msgstr "不要再问我" msgid "Evolution can import data from the following files:" msgstr "Evolution 可以从下列文件中导入数据：" -#: shell/main.c:115 shell/main.c:628 -msgid "Evolution" -msgstr "Evolution" - -#: shell/main.c:121 -msgid "Evolution is now exiting ..." -msgstr "Evolution 正在退出 ..." - #. Preview/Alpha/Beta version warning message -#: shell/main.c:271 +#: shell/main.c:217 #, no-c-format msgid "" "Hi. Thanks for taking the time to download this preview release\n" @@ -15927,7 +15956,7 @@ msgstr "" "\n" "我们希望您尽情享受我们努力工作的成果，我们也热切盼望着您的意见！\n" -#: shell/main.c:295 +#: shell/main.c:241 msgid "" "Thanks\n" "The Ximian Evolution Team\n" @@ -15935,48 +15964,48 @@ msgstr "" "感谢\n" "Ximian Evolution 团队\n" -#: shell/main.c:303 +#: shell/main.c:249 msgid "Don't tell me again" msgstr "不要再问我" -#: shell/main.c:407 -#, c-format -msgid "" -"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n" -"The data hasn't been deleted, but it will not be seen by this version of " -"Evolution.\n" -msgstr "" - -#: shell/main.c:486 +#: shell/main.c:381 msgid "Cannot access the Ximian Evolution shell." msgstr "无法访问 Ximian Evolution shell。" -#: shell/main.c:495 +#: shell/main.c:390 #, c-format msgid "Cannot initialize the Ximian Evolution shell: %s" msgstr "无法初始化 Ximian Evolution shell：%s" -#: shell/main.c:595 +#: shell/main.c:487 msgid "Start Evolution activating the specified component" msgstr "" -#: shell/main.c:597 +#: shell/main.c:489 msgid "Start in offline mode" msgstr "以离线模式启动" -#: shell/main.c:599 +#: shell/main.c:491 msgid "Start in online mode" msgstr "以在线模式启动" -#: shell/main.c:602 +#: shell/main.c:494 msgid "Forcibly shut down all evolution components" msgstr "强制关闭所有 Evolution 组件" -#: shell/main.c:605 +#: shell/main.c:498 +msgid "Forcibly re-migrate from Evolution 1.4" +msgstr "" + +#: shell/main.c:501 msgid "Send the debugging output of all components to a file." msgstr "把所有成员的调试输出发送到一个文件中。" -#: shell/main.c:632 +#: shell/main.c:524 +msgid "Evolution" +msgstr "Evolution" + +#: shell/main.c:528 #, c-format msgid "" "%s: --online and --offline cannot be used together.\n" @@ -17437,7 +17466,7 @@ msgstr "引用(_Q)" msgid "_Resend..." msgstr "重发(_R)..." -#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:33 +#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34 msgid "_Tools" msgstr "工具(_T)" @@ -17842,10 +17871,15 @@ msgid "_New" msgstr "新建(_N)" #: ui/evolution.xml.h:31 +#, fuzzy +msgid "_Quick Reference" +msgstr "邮件首选项" + +#: ui/evolution.xml.h:32 msgid "_Send / Receive" msgstr "发送/接收(_S)" -#: ui/evolution.xml.h:35 +#: ui/evolution.xml.h:36 msgid "_Window" msgstr "窗口(_W)" @@ -18138,27 +18172,32 @@ msgstr "Indian Springs" msgid "Spacing around expander arrow" msgstr "" -#: widgets/misc/e-filter-bar.c:185 +#: widgets/misc/e-filter-bar.c:191 msgid "Search Editor" msgstr "搜索编辑器" #. FIXME: get the toplevel window... -#: widgets/misc/e-filter-bar.c:206 +#: widgets/misc/e-filter-bar.c:212 msgid "Save Search" msgstr "保存搜索" -#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98 +#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99 msgid "_Save Search..." msgstr "保存搜索(_S)..." -#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99 +#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100 msgid "_Edit Saved Searches..." msgstr "编辑保存的搜索(_E)..." -#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100 +#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101 msgid "_Advanced..." msgstr "高级(_A)..." +#: widgets/misc/e-image-chooser.c:172 +#, fuzzy +msgid "Choose Image" +msgstr "选择文件" + #: widgets/misc/e-search-bar.c:531 msgid "_Search" msgstr "搜索(_S)" @@ -18187,6 +18226,107 @@ msgstr "文字" msgid "Find _Now" msgstr "立即查找(_N)" +#: widgets/misc/e-task-widget.c:211 +#, c-format +msgid "%s (...)" +msgstr "%s (...)" + +#: widgets/misc/e-task-widget.c:216 +#, c-format +msgid "%s (%d%% complete)" +msgstr "%s (%d%% 完成)" + +#~ msgid "Copy to folder..." +#~ msgstr "复制到文件夹..." + +#~ msgid "Move to folder..." +#~ msgstr "移动到文件夹..." + +#, fuzzy +#~ msgid "Map It" +#~ msgstr "Mayport" + +#~ msgid "Home Address" +#~ msgstr "家庭地址" + +#~ msgid "Work Address" +#~ msgstr "工作地址" + +#~ msgid "Other Address" +#~ msgstr "其它地址" + +#, fuzzy +#~ msgid "Could not create temporary mbox store: %s" +#~ msgstr "无法创建临时目录：%s" + +#, fuzzy +#~ msgid "Could not create temporary mbox folder: %s" +#~ msgstr "无法创建临时文件“%s”：%s" + +#, fuzzy +#~ msgid "Could not copy messages to temporary mbox folder: %s" +#~ msgstr "无法关闭临时文件夹：%s" + +#~ msgid "Session not initialised" +#~ msgstr "无法初始化会话" + +#~ msgid "This message is digitally signed and has been found to be authentic." +#~ msgstr "该邮件有数字签名，并被证实为可信。" + +#~ msgid "" +#~ "This message is digitally signed but can not be proven to be authentic." +#~ msgstr "该邮件有数字签名，但不能证实是可信的。" + +#~ msgid "Evolution Error" +#~ msgstr "Evolution 错误" + +#~ msgid "" +#~ "There is no importer that is able to handle\n" +#~ "%s" +#~ msgstr "" +#~ "没有导入器能够处理\n" +#~ "%s" + +#~ msgid "" +#~ "Importing %s.\n" +#~ "Starting %s" +#~ msgstr "" +#~ "正在导入 %s。\n" +#~ "正在启动 %s" + +#~ msgid "Error starting %s" +#~ msgstr "启动 %s 错误" + +#~ msgid "Select a destination folder for importing this data" +#~ msgstr "为导入的数据选择目标文件夹" + +#~ msgid "Go to folder..." +#~ msgstr "转到文件夹..." + +#~ msgid "Select the folder that you want to open" +#~ msgstr "选择您希望打开的文件夹" + +#~ msgid "Create New Shortcut" +#~ msgstr "创建新快捷方式" + +#~ msgid "Select the folder you want the shortcut to point to:" +#~ msgstr "选择您希望快捷方式指向的文件夹：" + +#~ msgid "Import File (step 3 of 3)" +#~ msgstr "导入文件 (第 3 步，共 3 步)" + +#~ msgid "Importer Type (step 1 of 3)" +#~ msgstr "导入类型 (第 1 步，共 3 步)" + +#~ msgid "Select Importers (step 2 of 3)" +#~ msgstr "选择导入器 (第 2 步，共 3 步)" + +#~ msgid "Select a File (step 2 of 3)" +#~ msgstr "选择文件 (第 2 步，共 3 步)" + +#~ msgid "Evolution is now exiting ..." +#~ msgstr "Evolution 正在退出 ..." + #~ msgid "Select Contents from Address Book" #~ msgstr "从地址簿中选择内容" -- cgit