From 50f8098d3eba690efb3c1dbcbc3894d3dd36f8f9 Mon Sep 17 00:00:00 2001 From: tkikuchi <> Date: Fri, 22 Apr 2005 01:56:32 +0000 Subject: Bumping version 2.1.6rc2 --- Mailman/Version.py | 4 +- admin/www/index.ht | 4 +- admin/www/version.ht | 4 +- messages/zh_CN/LC_MESSAGES/mailman.po | 1328 ++++++++++++++++++++++++--------- 4 files changed, 981 insertions(+), 359 deletions(-) diff --git a/Mailman/Version.py b/Mailman/Version.py index d9f08d9b..b0023f3f 100644 --- a/Mailman/Version.py +++ b/Mailman/Version.py @@ -15,7 +15,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Mailman version -VERSION = "2.1.6rc1" +VERSION = "2.1.6rc2" # And as a hex number in the manner of PY_VERSION_HEX ALPHA = 0xa @@ -30,7 +30,7 @@ MINOR_REV = 1 MICRO_REV = 6 REL_LEVEL = GAMMA # at most 15 beta releases! -REL_SERIAL = 1 +REL_SERIAL = 2 HEX_VERSION = ((MAJOR_REV << 24) | (MINOR_REV << 16) | (MICRO_REV << 8) | (REL_LEVEL << 4) | (REL_SERIAL << 0)) diff --git a/admin/www/index.ht b/admin/www/index.ht index d848a4b9..0749f932 100644 --- a/admin/www/index.ht +++ b/admin/www/index.ht @@ -39,9 +39,9 @@ The current stable GNU Mailman version is 2.1.5, released on 15-May-2004. If you are running this version you want to read the security notice.

Version -2.1.6rc1, +2.1.6rc2, (released on -14-Apr-2005) +22-Apr-2005) is the current patch development release.

Acknowledgements

diff --git a/admin/www/version.ht b/admin/www/version.ht index 93382834..a2f7d04f 100644 --- a/admin/www/version.ht +++ b/admin/www/version.ht @@ -4,9 +4,9 @@ Links: links.h download-links.h

Current Mailman Version

Version -(2.1.6rc1, +(2.1.6rc2, released on -14-Apr-2005) +22-Apr-2005) is the latest stable release. See also information on previous version if you're not yet ready to upgrade. diff --git a/messages/zh_CN/LC_MESSAGES/mailman.po b/messages/zh_CN/LC_MESSAGES/mailman.po index 97286259..5f5ef043 100644 --- a/messages/zh_CN/LC_MESSAGES/mailman.po +++ b/messages/zh_CN/LC_MESSAGES/mailman.po @@ -1,19 +1,22 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR , YEAR. +# translation of mailman.po to +# translation of mailman.po to +# translation of mailman.po to +# translation of mailman.po to +# Copyright (C) YEAR ORGANIZATION. +# CLIFF WOO , 2005. # msgid "" msgstr "" -"Project-Id-Version: mailman-2.1.6b5\n" +"Project-Id-Version: mailman\n" "POT-Creation-Date: Wed Mar 23 09:55:34 2005\n" -"PO-Revision-Date: Wed Mar 23 21:09:21 2005\n" -"Last-Translator: Xiaoguang Dai \n" -"Language-Team: Chinese \n" +"PO-Revision-Date: 2005-04-19 18:35+0800\n" +"Last-Translator: CLIFF WOO \n" +"Language-Team: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.4\n" - +"X-Generator: KBabel 1.3.1\n" #: Mailman/Archiver/HyperArch.py:121 msgid "size not available" @@ -66,8 +69,7 @@ msgid "Text%(sz)s" msgstr "" #: Mailman/Archiver/HyperArch.py:880 -msgid "" -"figuring article archives\n" +msgid "figuring article archives\n" msgstr "figuring article archives\n" #: Mailman/Archiver/HyperArch.py:890 @@ -151,8 +153,7 @@ msgid "%(day)i %(month)s %(year)i" msgstr "" #: Mailman/Archiver/HyperArch.py:1018 -msgid "" -"Computing threaded index\n" +msgid "Computing threaded index\n" msgstr "计算索引\n" #: Mailman/Archiver/HyperArch.py:1283 @@ -278,7 +279,6 @@ msgstr "" "您有摘要模式的会员, 但是摘要模式\n" " 被关闭。上述人员将接不到信件" - #: Mailman/Cgi/admin.py:192 msgid "" "You have regular list members but non-digestified mail is\n" @@ -289,7 +289,6 @@ msgstr "" " 的邮件选项被关闭。 直到您修正上述问题前,一般会员将持续收到信件。\n" " " - #: Mailman/Cgi/admin.py:216 msgid "%(hostname)s mailing lists - Admin Links" msgstr "%(hostname)s 的邮件列表 - 管理链接" @@ -340,7 +339,6 @@ msgstr "" "\n" "

通常列表的信息能够被发现在" - #: Mailman/Cgi/admin.py:275 msgid "the mailing list overview page" msgstr "邮件列表简介" @@ -707,8 +705,7 @@ msgstr "" msgid "" "hide -- Is the member's address concealed on\n" " the list of subscribers?" -msgstr "" -"隐藏 -- 用户的地址在订阅列表中式隐藏的么?" +msgstr "隐藏 -- 用户的地址在订阅列表中式隐藏的么?" #: Mailman/Cgi/admin.py:1058 msgid "" @@ -739,22 +736,19 @@ msgstr "" msgid "" "ack -- Does the member get acknowledgements of their\n" " posts?" -msgstr "" -"确认 -- 用户收到了对他们的投递的确认信了么?" +msgstr "确认 -- 用户收到了对他们的投递的确认信了么?" #: Mailman/Cgi/admin.py:1076 msgid "" "not metoo -- Does the member want to avoid copies of their\n" " own postings?" -msgstr "" -"除了我 -- 用户是否想避免收到自己信件的副本?" +msgstr "除了我 -- 用户是否想避免收到自己信件的副本?" #: Mailman/Cgi/admin.py:1079 msgid "" "nodupes -- Does the member want to avoid duplicates of the\n" " same message?" -msgstr "" -"无副本 -- 用户是否想避免收到同一信件的副本?" +msgstr "无副本 -- 用户是否想避免收到同一信件的副本?" #: Mailman/Cgi/admin.py:1082 msgid "" @@ -1153,15 +1147,13 @@ msgstr "反对" msgid "" "Ban %(esender)s from ever subscribing to this\n" " mailing list" -msgstr "" -"禁止 %(esender)s 订阅这个列表" +msgstr "禁止 %(esender)s 订阅这个列表" #: Mailman/Cgi/admindb.py:467 msgid "" "Click on the message number to view the individual\n" " message, or you can " -msgstr "" -"点击信息序号来查看分别的信息,或者您可以" +msgstr "点击信息序号来查看分别的信息,或者您可以" #: Mailman/Cgi/admindb.py:469 msgid "view all messages from %(esender)s" @@ -1350,7 +1342,6 @@ msgstr "" "\n" "

或者,如果您不想订阅这个列表,可以点击取消我的订阅请求 " - #: Mailman/Cgi/confirm.py:260 msgid "" "Your confirmation is required in order to continue with\n" @@ -1594,7 +1585,6 @@ msgstr "" "\n" "

或者点击 取消并且删除 来取消对地址的更改请求." - #: Mailman/Cgi/confirm.py:582 msgid "Change address" msgstr "更改地址" @@ -1607,8 +1597,7 @@ msgstr "继续等待批准" msgid "" "Okay, the list moderator will still have the\n" " opportunity to approve or reject this message." -msgstr "" -"OK, 列表缓冲器仍然有机会批准或者拒绝这条信息." +msgstr "OK, 列表缓冲器仍然有机会批准或者拒绝这条信息." #: Mailman/Cgi/confirm.py:625 msgid "Sender discarded message via web." @@ -1648,8 +1637,7 @@ msgstr "取消对滞留信息的发送" msgid "" "The held message you were referred to has\n" " already been handled by the list administrator." -msgstr "" -"您提到的滞留信息已经由列表管理员处理了." +msgstr "您提到的滞留信息已经由列表管理员处理了." #: Mailman/Cgi/confirm.py:688 msgid "" @@ -1755,6 +1743,7 @@ msgstr "" " 点击 重新设置有效您的成员资格 按钮以继续接受来自这个邮件列表的信件.\n" " 或者点击取消 按钮 推迟重新设置有效您的成员资格.\n" " " + #: Mailman/Cgi/confirm.py:818 msgid "Re-enable membership" msgstr "重新设置成员资格为有效" @@ -1804,8 +1793,7 @@ msgid "" "Leave the initial password (and confirmation) fields\n" " blank if you want Mailman to autogenerate the list\n" " passwords." -msgstr "" -"如果您想让 Mailman 自动生成列表密码,请将初始密码域(或者验证域)置空." +msgstr "如果您想让 Mailman 自动生成列表密码,请将初始密码域(或者验证域)置空." #: Mailman/Cgi/create.py:133 msgid "Initial list passwords do not match" @@ -1860,6 +1848,7 @@ msgstr "" "您已经成功地创建了邮件列表 %(listname)s\n" " 同时,通知已经发送到给了列表拥有者 %(owner)s.\n" " 现在您可以:" + #: Mailman/Cgi/create.py:262 msgid "Visit the list's info page" msgstr "访问列表信息页面" @@ -1921,6 +1910,7 @@ msgstr "" " 您可以在下面的域中输入这个密码.请注意站点管理员的密码\n" " 同样可以作为认证信息.\n" " " + #: Mailman/Cgi/create.py:319 msgid "List Identity" msgstr "列表身份" @@ -2057,8 +2047,7 @@ msgstr " %(hostname)s 邮件列表" msgid "" "

There currently are no publicly-advertised\n" " %(mailmanlink)s mailing lists on %(hostname)s." -msgstr "" -"

现在在 %(hostname)s 上没有公布的 %(mailmanlink)s 邮件列表." +msgstr "

现在在 %(hostname)s 上没有公布的 %(mailmanlink)s 邮件列表." #: Mailman/Cgi/listinfo.py:110 msgid "" @@ -2131,8 +2120,7 @@ msgstr "不存在 %(safeuser)s 这个成员." msgid "" "Your unsubscription request has been\n" " forwarded to the list administrator for approval." -msgstr "" -"您的取消订阅的请求已经转发给列表管理员,等待批准." +msgstr "您的取消订阅的请求已经转发给列表管理员,等待批准." #: Mailman/Cgi/options.py:178 Mailman/Cgi/options.py:192 msgid "The confirmation email has been sent." @@ -2155,8 +2143,7 @@ msgstr "为 %(safeuser)s 列出在 %(hostname)s 上的订阅" msgid "" "Click on a link to visit your options page for the\n" " requested mailing list." -msgstr "" -"点击连接以访问您请求的邮件列表的选项页面" +msgstr "点击连接以访问您请求的邮件列表的选项页面" #: Mailman/Cgi/options.py:315 msgid "Addresses did not match!" @@ -2403,8 +2390,7 @@ msgstr "口令提示函" msgid "" "By clicking on the Remind button, your\n" " password will be emailed to you." -msgstr "" -"通过点击提示按钮,您的口令将被邮寄给您。" +msgstr "通过点击提示按钮,您的口令将被邮寄给您。" #: Mailman/Cgi/options.py:856 msgid "Remind" @@ -2580,15 +2566,13 @@ msgstr "" msgid "" "The email address you supplied is not valid. (E.g. it must contain an\n" "`@'.)" -msgstr "" -"您提供的邮件地址是无效的。(例如,它必须包含一个`@'。)" +msgstr "您提供的邮件地址是无效的。(例如,它必须包含一个`@'。)" #: Mailman/Cgi/subscribe.py:189 msgid "" "Your subscription is not allowed because the email address you gave is\n" "insecure." -msgstr "" -"您的订阅请求别拒绝了,因为您提供的邮件地址是不可靠的。" +msgstr "您的订阅请求别拒绝了,因为您提供的邮件地址是不可靠的。" #: Mailman/Cgi/subscribe.py:197 msgid "" @@ -2690,15 +2674,13 @@ msgstr "您的请求已经被转发给列表管理员以核准。" msgid "" "You are not currently a member. Have you already unsubscribed or changed\n" "your email address?" -msgstr "" -"您还不是列表的成员。您是否已经退订了列表,或者修改了您的邮件地址?" +msgstr "您还不是列表的成员。您是否已经退订了列表,或者修改了您的邮件地址?" #: Mailman/Commands/cmd_confirm.py:67 msgid "" "You were not invited to this mailing list. The invitation has been discarded,\n" "and both list administrators have been alerted." -msgstr "" -"您没有被邀请加入此邮件列表。邀请已被废弃,列表的所有管理员都将收到此警告。" +msgstr "您没有被邀请加入此邮件列表。邀请已被废弃,列表的所有管理员都将收到此警告。" #: Mailman/Commands/cmd_confirm.py:71 msgid "Bad approval password given. Held message is still being held." @@ -2788,17 +2770,13 @@ msgstr "更多信息: %(listurl)s" #: Mailman/Commands/cmd_join.py:17 #, docstring -msgid "" -"The `join' command is synonymous with `subscribe'.\n" -msgstr "" -"`join'命令和`subscribe'命令是相同的。\n" +msgid "The `join' command is synonymous with `subscribe'.\n" +msgstr "`join'命令和`subscribe'命令是相同的。\n" #: Mailman/Commands/cmd_leave.py:17 #, docstring -msgid "" -"The `leave' command is synonymous with `unsubscribe'.\n" -msgstr "" -"`leave'命令和`unsubscribe'命令是相同的。\n" +msgid "The `leave' command is synonymous with `unsubscribe'.\n" +msgstr "`leave'命令和`unsubscribe'命令是相同的。\n" #: Mailman/Commands/cmd_lists.py:17 #, docstring @@ -2879,8 +2857,7 @@ msgstr "" #: Mailman/Commands/cmd_remove.py:17 #, docstring -msgid "" -"The `remove' command is synonymous with `unsubscribe'.\n" +msgid "The `remove' command is synonymous with `unsubscribe'.\n" msgstr "命令 \"remove\" 和命令 \"unsubscribe\"是相同的.\n" #: Mailman/Commands/cmd_set.py:26 @@ -3139,10 +3116,8 @@ msgstr "设置 reminder" #: Mailman/Commands/cmd_stop.py:17 #, docstring -msgid "" -"stop is synonymous with the end command.\n" -msgstr "" -"stop 和end 命令相同\n" +msgid "stop is synonymous with the end command.\n" +msgstr "stop 和end 命令相同\n" #: Mailman/Commands/cmd_subscribe.py:17 #, docstring @@ -3189,15 +3164,13 @@ msgstr "" msgid "" "Mailman won't accept the given email address as a valid address.\n" "(E.g. it must have an @ in it.)" -msgstr "" -"您输入的地址不是Mailman的有效地址(地址中必须有@)。" +msgstr "您输入的地址不是Mailman的有效地址(地址中必须有@)。" #: Mailman/Commands/cmd_subscribe.py:116 msgid "" "Your subscription is not allowed because\n" "the email address you gave is insecure." -msgstr "" -"由于您提供的邮件地址不可靠,所以您的订阅请求没有被批准。" +msgstr "由于您提供的邮件地址不可靠,所以您的订阅请求没有被批准。" #: Mailman/Commands/cmd_subscribe.py:121 msgid "You are already subscribed!" @@ -3215,8 +3188,7 @@ msgstr "此列表仅能订阅摘要!" msgid "" "Your subscription request has been forwarded to the list administrator\n" "at %(listowner)s for review." -msgstr "" -"您的订阅要求已经转发给了列表管理员 %(listowner)s 。" +msgstr "您的订阅要求已经转发给了列表管理员 %(listowner)s 。" #: Mailman/Commands/cmd_subscribe.py:139 msgid "Subscription request succeeded." @@ -3249,8 +3221,7 @@ msgstr "%(address)s 不是邮件列表 %(listname)s 中的地址" msgid "" "Your unsubscription request has been forwarded to the list administrator for\n" "approval." -msgstr "" -"您的取消订阅的请求已经发送给列表管理员去审查。" +msgstr "您的取消订阅的请求已经发送给列表管理员去审查。" #: Mailman/Commands/cmd_unsubscribe.py:84 msgid "You gave the wrong password" @@ -3582,8 +3553,7 @@ msgstr "" msgid "" "Should Mailman send an auto-response to mailing list\n" " posters?" -msgstr "" -"Mailman是否向邮件列表的发言者发送自动回复?" +msgstr "Mailman是否向邮件列表的发言者发送自动回复?" #: Mailman/Gui/Autoresponse.py:60 msgid "Auto-response text to send to mailing list posters." @@ -3593,8 +3563,7 @@ msgstr "向邮件列表发言者发送的自动回复文本." msgid "" "Should Mailman send an auto-response to emails sent to the\n" " -owner address?" -msgstr "" -"Mailman是否就发向列表所有者地址的邮件发送自动回复?" +msgstr "Mailman是否就发向列表所有者地址的邮件发送自动回复?" #: Mailman/Gui/Autoresponse.py:68 msgid "Auto-response text to send to -owner emails." @@ -3741,8 +3710,7 @@ msgid "" "The maximum member bounce score before the member's\n" " subscription is disabled. This value can be a floating point\n" " number." -msgstr "" -"用户的订阅被禁止所需的退信值阈值. 这个值可设为浮点数。" +msgstr "用户的订阅被禁止所需的退信值阈值. 这个值可设为浮点数。" #: Mailman/Gui/Bounce.py:88 msgid "" @@ -3793,8 +3761,7 @@ msgstr "" msgid "" "The number of days between sending the Your Membership\n" " Is Disabled warnings. This value must be an integer." -msgstr "" -"发出你的成员资格被禁止警告的间隔天数. 此值必须是整数。" +msgstr "发出你的成员资格被禁止警告的间隔天数. 此值必须是整数。" #: Mailman/Gui/Bounce.py:117 Mailman/Gui/General.py:263 msgid "Notifications" @@ -3852,8 +3819,7 @@ msgstr "" msgid "" "Should Mailman notify you, the list owner, when bounces\n" " cause a member's subscription to be disabled?" -msgstr "" -"当用户的订阅由于退信而被禁止, Mailman是否通知你?" +msgstr "当用户的订阅由于退信而被禁止, Mailman是否通知你?" #: Mailman/Gui/Bounce.py:149 msgid "" @@ -3870,8 +3836,7 @@ msgstr "" msgid "" "Should Mailman notify you, the list owner, when bounces\n" " cause a member to be unsubscribed?" -msgstr "" -"当用户由于退信而被退订时, Mailman是否通知您(列表所有者)?" +msgstr "当用户由于退信而被退订时, Mailman是否通知您(列表所有者)?" #: Mailman/Gui/Bounce.py:158 msgid "" @@ -3961,15 +3926,13 @@ msgstr "" msgid "" "Should Mailman filter the content of list traffic according\n" " to the settings below?" -msgstr "" -"Mainman是否安下列设置过滤列表中的消息内容?" +msgstr "Mainman是否安下列设置过滤列表中的消息内容?" #: Mailman/Gui/ContentFilter.py:75 msgid "" "Remove message attachments that have a matching content\n" " type." -msgstr "" -"移除类型匹配的附件." +msgstr "移除类型匹配的附件." #: Mailman/Gui/ContentFilter.py:78 msgid "" @@ -4026,17 +3989,14 @@ msgstr "" msgid "" "Remove message attachments that have a matching filename\n" " extension." -msgstr "" -"移除有匹配的扩展名的附件." - +msgstr "移除有匹配的扩展名的附件." #: Mailman/Gui/ContentFilter.py:108 msgid "" "Remove message attachments that don't have a matching\n" " filename extension. Leave this field blank to skip this filter\n" " test." -msgstr "" -"移除没有匹配的扩展名的消息附件. 留空此项以便跳过过滤." +msgstr "移除没有匹配的扩展名的消息附件. 留空此项以便跳过过滤." #: Mailman/Gui/ContentFilter.py:113 msgid "" @@ -4051,8 +4011,7 @@ msgstr "" msgid "" "Action to take when a message matches the content filtering\n" " rules." -msgstr "" -"当消息内容与内容过滤规则相符时采取的动作." +msgstr "当消息内容与内容过滤规则相符时采取的动作." #: Mailman/Gui/ContentFilter.py:122 msgid "" @@ -4698,8 +4657,7 @@ msgstr "" msgid "" "List-specific text prepended to new-subscriber welcome\n" " message" -msgstr "" -"添加到新订阅者欢迎消息前的列表说明文本" +msgstr "添加到新订阅者欢迎消息前的列表说明文本" #: Mailman/Gui/General.py:276 msgid "" @@ -4810,7 +4768,7 @@ msgid "" " type=\"hidden\" name=\"new_member_options\" value=\"ignore\">" msgstr "" "新加入列表成员的默认选项设定是:" +" type=\"hidden\" name=\"new_member_options\" value=\"ignore\">" #: Mailman/Gui/General.py:344 msgid "" @@ -4894,7 +4852,6 @@ msgstr "" " 这些头部存在的原因,并告诉他们怎样在邮件客户端隐藏头部。实在不行的话可以\n" " 禁用头部。但并不建议这样做(事实上,你最终会失去禁止头部的能力)。" - #: Mailman/Gui/General.py:399 msgid "Should postings include the List-Post: header?" msgstr "邮件是否应该包括邮件列表:的头部?" @@ -5042,15 +4999,15 @@ msgstr "成员列表" #: Mailman/Gui/Membership.py:31 msgid "Mass Subscription" -msgstr "大众订阅" +msgstr "批量订阅" #: Mailman/Gui/Membership.py:32 msgid "Mass Removal" -msgstr "大众移除" +msgstr "批量移除" #: Mailman/Gui/NonDigest.py:34 msgid "Non-digest options" -msgstr "未分类选项" +msgstr "非摘要(Non-digest)选项" #: Mailman/Gui/NonDigest.py:42 msgid "Policies concerning immediately delivered list traffic." @@ -5144,7 +5101,7 @@ msgstr "" "

当使用这个功能时,以下额外可选变量在邮件头部和尾部将可以使用。\n" "\n" "