[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r13816: Updated zh-cn translation. (in website/trunk: docs/zh-cn zh-cn)
Author: hanru
Date: 2008-03-03 06:57:35 -0500 (Mon, 03 Mar 2008)
New Revision: 13816
Modified:
website/trunk/docs/zh-cn/tor-doc-relay.wml
website/trunk/docs/zh-cn/tor-doc-unix.wml
website/trunk/docs/zh-cn/tor-doc-windows.wml
website/trunk/docs/zh-cn/tor-hidden-service.wml
website/trunk/zh-cn/contact.wml
website/trunk/zh-cn/documentation.wml
website/trunk/zh-cn/donate.wml
website/trunk/zh-cn/download-unix.wml
website/trunk/zh-cn/download.wml
website/trunk/zh-cn/index.wml
website/trunk/zh-cn/jeff-index.wml
website/trunk/zh-cn/mirrors.wml
website/trunk/zh-cn/navigation.wmi
website/trunk/zh-cn/overview.wml
website/trunk/zh-cn/people.wml
website/trunk/zh-cn/research.wml
website/trunk/zh-cn/translation.wml
website/trunk/zh-cn/tshirt.wml
website/trunk/zh-cn/volunteer.wml
Log:
Updated zh-cn translation.
Modified: website/trunk/docs/zh-cn/tor-doc-relay.wml
===================================================================
--- website/trunk/docs/zh-cn/tor-doc-relay.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/docs/zh-cn/tor-doc-relay.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 13194
+# Based-On-Revision: 13768
# Translation-Priority: 2-medium
# Last-Translator: peihanru AT gmail.com
-#include "head.wmi" TITLE="中继配置指导" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 中继配置指导" CHARSET="UTF-8"
<div class="center">
Modified: website/trunk/docs/zh-cn/tor-doc-unix.wml
===================================================================
--- website/trunk/docs/zh-cn/tor-doc-unix.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/docs/zh-cn/tor-doc-unix.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 12809
+# Based-On-Revision: 13768
# Translation-Priority: 3-low
# Last-Translator: peihanru AT gmail.com
-#include "head.wmi" TITLE="Linux/BSD/Unix 安装指导" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: Linux/BSD/Unix 安装指导" CHARSET="UTF-8"
<div class="center">
Modified: website/trunk/docs/zh-cn/tor-doc-windows.wml
===================================================================
--- website/trunk/docs/zh-cn/tor-doc-windows.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/docs/zh-cn/tor-doc-windows.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 13192
+# Based-On-Revision: 13768
# Translation-Priority: 2-medium
# Last-Translator: peihanru AT gmail.com
-#include "head.wmi" TITLE="MS Windows 安装指导" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: MS Windows 安装指导" CHARSET="UTF-8"
<div class="center">
Modified: website/trunk/docs/zh-cn/tor-hidden-service.wml
===================================================================
--- website/trunk/docs/zh-cn/tor-hidden-service.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/docs/zh-cn/tor-hidden-service.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 13194
+# Based-On-Revision: 13768
# Translation-Priority: 3-low
# Last-Translator: peihanru AT gmail.com
-#include "head.wmi" TITLE="隐匿服务配置指导" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 隐匿服务配置指导" CHARSET="UTF-8"
<div class="center">
Modified: website/trunk/zh-cn/contact.wml
===================================================================
--- website/trunk/zh-cn/contact.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/contact.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 13465
+# Based-On-Revision: 13768
# Translation-Priority: 3-low
# Last-Translator: wtj.uestc AT gmail.com, peihanru AT gmail.com
-#include "head.wmi" TITLE="联系方式" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 联系方式" CHARSET="UTF-8"
<div class="main-column">
Modified: website/trunk/zh-cn/documentation.wml
===================================================================
--- website/trunk/zh-cn/documentation.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/documentation.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 13194
+# Based-On-Revision: 13768
# Translation-Priority: 2-medium
# Last-Translator: peihanru AT gmail.com
-#include "head.wmi" TITLE="文档" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 文档" CHARSET="UTF-8"
<div class="main-column">
Modified: website/trunk/zh-cn/donate.wml
===================================================================
--- website/trunk/zh-cn/donate.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/donate.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 13731
+# Based-On-Revision: 13772
# Translation-Priority: 2-medium
# Last-Translator: cheungtifan AT gmail.com, peihanru AT gmail.com
-#include "head.wmi" TITLE="捐助!" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 捐助!" CHARSET="UTF-8"
<div class="main-column">
@@ -14,14 +14,16 @@
如果你使用 Tor 而且希望帮助 Tor 项目，请考虑捐助以帮助我们继续我们的工作。
我们提供几种捐助方式：</p>
<ul>
-<li><a href="#check">支票、汇票、邮政汇票</a>。</li>
-<li><a href="#creditcard">信用卡</a>——直接通过银行。</li>
-<li><a href="#paypal">PayPal</a>。</li>
-<li><a href="#wire">电汇</a>。</li>
+<li><a href="#check">支票、汇票、邮政汇票</a></li>
+<li><a href="#paypal">PayPal</a></li>
+<li><a href="#wire">电汇</a></li>
+<li><a href="#eurobank">欧洲银行转帐</a></li>
</ul>
<p>到 2006 年 12 月为止，Tor 是 US 501[c][3] 研究/教育性的非营利组织。
-捐助我们也许会使美国公民或者在与美国互惠税务的国家的公民有减税的待遇。
+捐助我们也许会使美国公民或者在与美国对于慈善捐助有互惠税务的国家的公民有减税的待遇。
+如果你有问题，请直接<a href="mailto:donations@xxxxxxxxxxxxxx";>与我们联系</a>。
+我们乐意与你探讨大额的捐助、计划中的捐助以及对于捐助的公开答谢等问题。
</p>
<p>如果捐助超过 65 美元，你将有资格得到一件<a href="<page tshirt>">浅绿色的 Tor
@@ -42,15 +44,7 @@
A canceled check, money/postal order receipt, or appraisal
of donated property are valid records according to the IRS.
<!-- NEEDHELP: I'm an idiot on this. -->
-如果你有一笔大额的捐助，请告诉我们你是否愿意让我们在即将设立的支持者页面上答谢你！
-</p>
-<a id="creditcard"></a>
-<h3><a class="anchor" href="#creditcard">信用卡</a></h3>
-<p>我们能通过 <a href="https://www.communityroom.net/NPOMission.asp?449";>Tor 项目的
-Community Room</a> 直接接受来自美国境内的 Visa、Mastercard 和 American Express 的捐助。
-捐助金额在 20 美元至 10,000 美元之间。</p>
-
<a id="paypal"></a>
<h3><a class="anchor" href="#paypal">PayPal</a></h3>
<form id="subscribe" action="https://www.paypal.com/cgi-bin/webscr"; method="post">
@@ -67,7 +61,7 @@
<input type="hidden" name="src" value="1" />
<input type="hidden" name="no_shipping" value="1" />
<input type="hidden" name="no_note" value="1" />
-<input name="submit" type="submit" class="button" value="捐助!" />
+<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif"; border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">
<input type="hidden" name="cmd" value="_xclick-subscriptions" />
<input type="hidden" name="business" value="donations@xxxxxxxxxxxxxx" />
<input type="hidden" name="item_name" value="Tor Project Membership" />
@@ -84,7 +78,7 @@
<input type="radio" name="amount" value="10.00" />10 美元
<input type="radio" name="amount" value="" />其他
<input type="hidden" name="no_shipping" value="1" />
-<input name="submit" type="submit" class="button" value="捐助!" />
+<input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif"; border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!">
<input type="hidden" name="cmd" value="_xclick" />
<input type="hidden" name="business" value="donations@xxxxxxxxxxxxxx" />
<input type="hidden" name="item_name" value="Tor" />
@@ -95,14 +89,58 @@
<a id="wire"></a>
<h3><a class="anchor" href="#wire">电汇</a></h3>
+<p>我们乐意接受超过 100 美元的电汇。如果你身处欧洲，<a href="#eurobank">请看下面</a>。</p>
-<p>我们能接受 100 美元或更多的国际电汇。捐助的金额越大越有用处。
-电汇需要我们的 SWIFT 代码和银行帐号信息。<a
-href="mailto:donations@xxxxxxxxxxxxxx";>请让我们知道</a>，我们会很乐意接受你的捐助。
+<p>
+Organization Address:<br />
+The Tor Project<br />
+122 Scott Circle<br />
+Dedham, MA 02026<br />
</p>
+<p>
+account number: 63904958202<br />
+routing number: 011075150<br />
+SWIFT Code: SVRNUS33//FW011075150<br />
+</p>
+<p>
+Bank Address:<br />
+Sovereign Bank<br />
+1130 Berkshire Boulevard<br />
+Wyomissing, PA 19610<br />
+</p>
-<p>The Tor Project 尊重支持者的隐私，在任何时候我们都不出租或销售捐助人的名单。</p>
+<a id="eurobank"></a>
+<h3><a class="anchor" href="#eurobank">欧洲银行转帐</a></h3>
+<p>在欧洲，我们与 <a href="http://www.ccc.de/";>Chaos Computer Club</a> 有一项基金协议。
+你的捐助将汇入由 CCC 管理的一个单独的银行帐号，他们将使用这些基金从事对 Tor
+在欧洲的发展有益的活动。Residents from any of the <a
+href="http://en.wikipedia.org/wiki/Single_Euro_Payments_Area";>31 SEPA
+member states</a> can wire up to 50.000
+Euro at the cost of a domestic transaction (i.e., usually free if
+submitted electronically).
+<!-- NEEDHELP: I really don't understand what the above is saying... -->
+</p>
+<p>
+The account information is:<br />
+Wau Holland Stiftung<br />
+IBAN DE57 5204 0021 0277 281202<br />
+SWIFT BIC COBADEFFXXX<br />
+</p>
+<p>
+Classic style German account information is:<br />
+Konto: 2772812-02<br />
+Inhaber: Wau Holland Stiftung<br />
+Bank: Commerzbank Kassel<br />
+BLZ: 52040021<br />
+</p>
+<p>WHS issues a donation receipt upon request (if provided with address
+information).
+</p>
+
+<hr />
+<h4>The Tor Project 尊重支持者的隐私，在任何时候我们都不出租或销售捐助人的名单。</h4>
+
</div><!-- #main -->
#include <foot.wmi>
Modified: website/trunk/zh-cn/download-unix.wml
===================================================================
--- website/trunk/zh-cn/download-unix.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/download-unix.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,8 +1,8 @@
## translation metadata
-# Based-On-Revision: 13296
+# Based-On-Revision: 13768
# Last-Translator: peihanru AT gmail.com
-#include "head.wmi" TITLE="Linux/Unix 下载" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: Linux/Unix 下载" CHARSET="UTF-8"
<div class="main-column">
Modified: website/trunk/zh-cn/download.wml
===================================================================
--- website/trunk/zh-cn/download.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/download.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 13194
+# Based-On-Revision: 13768
# Translation-Priority: 1-high
# Last-Translator: peihanru AT gmail.com
-#include "head.wmi" TITLE="下载" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 下载" CHARSET="UTF-8"
<div class="main-column">
Modified: website/trunk/zh-cn/index.wml
===================================================================
--- website/trunk/zh-cn/index.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/index.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 13710
+# Based-On-Revision: 13768
# Translation-Priority: 1-high
# Last-Translator: peihanru AT gmail.com
-#include "head.wmi" TITLE="匿名在线" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 匿名在线" CHARSET="UTF-8"
<!-- SIDEBAR (OPTIONAL) -->
<div class="sidebar">
Modified: website/trunk/zh-cn/jeff-index.wml
===================================================================
--- website/trunk/zh-cn/jeff-index.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/jeff-index.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,8 +1,8 @@
## translation metadata
-# Based-On-Revision: 11474
+# Based-On-Revision: 13768
# Last-Translator: moses [dot] mason [at] GMAiL [dot] com
-#include "head.wmi" TITLE="匿名在线" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 匿名在线" CHARSET="UTF-8"
# Note to translators: this file is still under construction, and
# will probably change a whole lot before we link to it. So it's
Modified: website/trunk/zh-cn/mirrors.wml
===================================================================
--- website/trunk/zh-cn/mirrors.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/mirrors.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,8 +1,8 @@
## translation metadata
-# Based-On-Revision: 12100
+# Based-On-Revision: 13768
# Last-Translator: cheungtifan AT gmail.com
-#include "head.wmi" TITLE="镜像" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 镜像" CHARSET="UTF-8"
<div class="main-column">
Modified: website/trunk/zh-cn/navigation.wmi
===================================================================
--- website/trunk/zh-cn/navigation.wmi 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/navigation.wmi 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,7 +1,7 @@
#!/usr/bin/wml
## translation metadata
-# Based-On-Revision: 12150
+# Based-On-Revision: 13772
# Translation-Priority: 1-high
# Last-Translator: peihanru AT gmail.com
@@ -13,6 +13,7 @@
'documentation' , '文档',
'volunteer' , '志愿者',
'people' , '人员',
+ 'https://blog.torproject.org/', '博客',
'donate' , '捐助!',
);
:>
Modified: website/trunk/zh-cn/overview.wml
===================================================================
--- website/trunk/zh-cn/overview.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/overview.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 12156
+# Based-On-Revision: 13768
# Translation-Priority: 2-medium
# Last-Translator: peihanru AT gmail.com
-#include "head.wmi" TITLE="概述" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 概述" CHARSET="UTF-8"
<div class="main-column">
Modified: website/trunk/zh-cn/people.wml
===================================================================
--- website/trunk/zh-cn/people.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/people.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 13711
+# Based-On-Revision: 13768
# Translation-Priority: 3-low
# Last-Translator: cheungtifan AT gmail.com, peihanru AT gmail.com
-#include "head.wmi" TITLE="人员" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 人员" CHARSET="UTF-8"
<div class="main-column">
Modified: website/trunk/zh-cn/research.wml
===================================================================
--- website/trunk/zh-cn/research.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/research.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,8 +1,8 @@
## translation metadata
-# Based-On-Revision:7673
+# Based-On-Revision:13768
# Last-Translator: cheungtifan AT gmail.com
-#include "head.wmi" TITLE="研究" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 研究" CHARSET="UTF-8"
<div class="main-column">
Modified: website/trunk/zh-cn/translation.wml
===================================================================
--- website/trunk/zh-cn/translation.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/translation.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,8 +1,8 @@
## translation metadata
-# Based-On-Revision: 13465
+# Based-On-Revision: 13774
# Last-Translator: cheungtifan AT gmail.com, peihanru AT gmail.com
-#include "head.wmi" TITLE="翻译指导" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 翻译指导" CHARSET="UTF-8"
<div class="main-column">
@@ -11,15 +11,15 @@
<p>
如果你想帮助我们把 Tor 的网站和文档翻译到其他语种，这里有一些
-帮助你尽可能有效翻译的指导。请尽量使翻译贴近你的母语的使用习惯，
-而不是逐字翻译每一页。</p>
+帮助你尽可能有效翻译的指导。</p>
<p>
为了使你了解目前翻译的进展，我们创建了一个反映当前<a
href="<page translation-status>">翻译状态</a>的页面。</p>
<p>
-注意，即使你不能翻译许多页面，但是仅仅几页也是有帮助的。
+注意，即使你不能翻译许多页面，但是仅仅几页也是有帮助的。另外，
+请尽量使翻译贴近你的母语的使用习惯，而不是逐字翻译每一页。
</p>
<ol>
@@ -32,9 +32,9 @@
<li>翻译文本的第一行应该是<br />
\# Based-On-Revision: 13000<br />
-其中，13000 是原始文件的版本号。版本号的作用是方便你发现翻译是否过期。
-版本号可以在每一个页面的顶部找到——版本号由 SVN 创建，所以请<a
-href="<page documentation>#Developers">签出</a>网站的最新版本。
+其中，13000 是原始英文页面的版本号。版本号的作用是方便你发现翻译是否过期。
+版本号可以在每一个页面的顶部找到——你可以在 <a href="<svnwebsite>en/"><svnwebsite>en/</a>
+目录查看文件，或者手动<a href="<page documentation>#Developers">签出</a>网站的最新版本。
</li>
<li>翻译文本的第二行应该是翻译者的电子邮件地址，例如<br />
@@ -48,10 +48,12 @@
</li>
<!-- The following sentence is insane. I cannot find a sane one to replace it. -->
-<li>翻译版本网页应该链接到翻译版上。</li>
+<li>翻译版本网页应该链接到翻译版上。
+一般来说这一过程是自动的：<code><page download></code> 会自动将链接指向网页的翻译版，
+如果不存在翻译，则指向英文版。</li>
-<li>翻译的页面应该在 foot.wmi 后添加一条翻译成同样语种的注释：
-“Neither the Tor developers nor EFF have reviewed
+<li>翻译的页面应该在 foot.wmi 后添加一条翻译成同样语种的注释：“Neither
+the Tor developers nor EFF have reviewed
this translation for accuracy and correctness. It may be out of date
or wrong. The official Tor web site is the English version, available
at https://www.torproject.org/”;</li>
@@ -70,12 +72,12 @@
的结尾加上类似于 <code>CHARSET="UTF-8"</code> 的标记。
</li>
-<li>使你的翻译符合 XHTML，这样能将页面提交到 SVN 之前的工作减到最小。
-你可以在 <a href="http://validator.w3.org/";>validator.w3.org</a> 检验。</li>
+<li>使你的翻译符合 XHTML。当翻译上线后你可以在 <a
+href="http://validator.w3.org/";>validator.w3.org</a> 检验。</li>
<li>当你的翻译完成后，将它们发送至<a href="<page contact>">联系方式</a>中的
<tt>tor-translation</tt>。（如有你对已有翻译做出了更改，如有可能，请使用比较工具
-生成 patch 文件。）如果你计划维护这些翻译，我们会很高兴地给你一个 SVN 帐号，
+生成 patch 文件。）如果你计划维护这些翻译，请告诉我们，我们会很高兴地给你一个 SVN 帐号，
使你直接管理他们。</li>
</ol>
Modified: website/trunk/zh-cn/tshirt.wml
===================================================================
--- website/trunk/zh-cn/tshirt.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/tshirt.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,9 +1,9 @@
## translation metadata
-# Based-On-Revision: 12184
+# Based-On-Revision: 13768
# Translation-Priority: 3-low
# Last-Translator: cheungtifan AT gmail.com
-#include "head.wmi" TITLE="T 恤衫" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: T 恤衫" CHARSET="UTF-8"
<div class="main-column">
Modified: website/trunk/zh-cn/volunteer.wml
===================================================================
--- website/trunk/zh-cn/volunteer.wml 2008-03-03 08:46:52 UTC (rev 13815)
+++ website/trunk/zh-cn/volunteer.wml 2008-03-03 11:57:35 UTC (rev 13816)
@@ -1,8 +1,8 @@
## translation metadata
-# Based-On-Revision: 12228
+# Based-On-Revision: 13768
# Last-Translator: peihanru AT gmail.com
-#include "head.wmi" TITLE="志愿者" CHARSET="UTF-8"
+#include "head.wmi" TITLE="Tor: 志愿者" CHARSET="UTF-8"
<div class="main-column">