web/html/docs/translation-quick-start-guide/zh_CN generated-index.php, 1.3, 1.4 index.php, 1.5, 1.6 legalnotice-opl.php, 1.2, 1.3 rv-revhistory.php, 1.5, 1.6 sn_accounts.php, 1.5, 1.6 sn_translating_docs.php, 1.5, 1.6 sn_translating_software.php, 1.5, 1.6

[Karsten Wade]

Author: kwade

Update of /cvs/fedora/web/html/docs/translation-quick-start-guide/zh_CN
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25067/zh_CN

Modified Files:
	generated-index.php index.php legalnotice-opl.php 
	rv-revhistory.php sn_accounts.php sn_translating_docs.php 
	sn_translating_software.php 
Log Message:
updating to latest version from upstream; resolves bugs such as bug#483176


Index: generated-index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-quick-start-guide/zh_CN/generated-index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- generated-index.php	15 Aug 2008 05:17:50 -0000	1.3
+++ generated-index.php	6 Feb 2009 01:58:09 -0000	1.4
@@ -3,11 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>索引</title>
 <link rel="stylesheet" href="fedora.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.php" title="翻译快速上手指南">
+<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
+<link rel="home" href="index.php" title="翻译快速上手指南">
 <link rel="up" href="index.php" title="翻译快速上手指南">
 <link rel="prev" href="sn_translating_docs.php" title="4. 文档翻译">
-<link rel="copyright" href="ln-legalnotice-opl.php" title="法律通告">
+<link rel="copyright" href="legalnotice-opl.php" title="法律通告">
 </head>
 <?
 


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-quick-start-guide/zh_CN/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.php	15 Aug 2008 05:17:50 -0000	1.5
+++ index.php	6 Feb 2009 01:58:09 -0000	1.6
@@ -3,10 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>翻译快速上手指南</title>
 <link rel="stylesheet" href="fedora.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.php" title="翻译快速上手指南">
+<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
+<link rel="home" href="index.php" title="翻译快速上手指南">
 <link rel="next" href="sn_accounts.php" title="2. 帐号和订阅">
-<link rel="copyright" href="ln-legalnotice-opl.php" title="法律通告">
+<link rel="copyright" href="legalnotice-opl.php" title="法律通告">
 </head>
 <?
 
@@ -56,33 +56,21 @@
 <span class="firstname">Dimitris</span> <span class="surname">Glezos</span>
 </h3>
 </div>
-</div></div>
-<div><div class="othercredit"><h3 class="othercredit">
-<span class="firstname">Hugo</span> <span class="surname">Cisneiros</span>
-</h3></div></div>
-<div><div class="othercredit"><h3 class="othercredit">
-<span class="firstname">Francesco</span> <span class="surname">Tombolini</span>
-</h3></div></div>
-<div><div class="othercredit"><h3 class="othercredit">
-<span class="firstname">Andrew</span> <span class="surname">Martynov</span>
-</h3></div></div>
-<div><div class="othercredit"><h3 class="othercredit">
-<span class="firstname">José</span> <span class="surname">Pires</span>
-</h3></div></div>
-<div><div class="othercredit"><h3 class="othercredit">
-<span class="firstname">Bart</span> <span class="surname">Courveur</span>
-</h3></div></div>
-<div><div class="othercredit"><h3 class="othercredit">
-<span class="firstname">Damien</span> <span class="surname">Durand</span>
-</h3></div></div>
-<div><div class="othercredit"><h3 class="othercredit">
-<span class="firstname">Guillermo</span> <span class="surname">Gomez</span>
-</h3></div></div>
-<div><div class="othercredit"><h3 class="othercredit">
+<div class="editor">
+<h4 class="editedby">编辑者</h4>
+<h3 class="editor">
 <span class="firstname">Diego</span> <span class="othername">Búrigo</span> <span class="surname">Zacarão</span>
-</h3></div></div>
-<div><p class="releaseinfo">Version 0.5 (2008-04-18)</p></div>
-<div><p class="copyright">版权 © 2005, 2006, 2007 Red Hat, Inc. 及其他</p></div>
+</h3>
+</div>
+<div class="editor">
+<h4 class="editedby">编辑者</h4>
+<h3 class="editor">
+<span class="firstname">Piotr</span> <span class="surname">DrÄ…g</span>
+</h3>
+</div>
+</div></div>
+<div><p class="releaseinfo">Version 0.5.2 (2009-01-09)</p></div>
+<div><p class="copyright">版权 © 2005, 2006, 2007, 2008, 2009 Red Hat, Inc. 及其他</p></div>
 <div><a href="legalnotice-opl.php">法律通告</a></div>
 <div><a href="rv-revhistory.php">修订历史</a></div>
 </div>
@@ -97,27 +85,25 @@
 <dt><span class="section"><a href="sn_accounts.php#sn-gpg-key">2.3. 生成GPG密钥</a></span></dt>
 <dt><span class="section"><a href="sn_accounts.php#sn-apply-account">2.4. 申请一个帐号</a></span></dt>
 <dt><span class="section"><a href="sn_accounts.php#sn-sign-cla">2.5. 签署CLA</a></span></dt>
-<dt><span class="section"><a href="sn_accounts.php#sn-join-cvsl10n">2.6. åŠ å…¥åˆ°<code class="systemitem">cvsl10n</code>小组</a></span></dt>
+<dt><span class="section"><a href="sn_accounts.php#sn-join-cvsl10n">2.6. åŠ å…¥åˆ°cvsl10n小组</a></span></dt>
 <dt><span class="section"><a href="sn_accounts.php#sn-test-access">2.7. æµ‹è¯•ä½ èƒ½è®¿é—®</a></span></dt>
-<dt><span class="section"><a href="sn_accounts.php#sn-create-wikiacct">2.8. 创建一个Wiki帐号</a></span></dt>
-<dt><span class="section"><a href="sn_accounts.php#sn-intro-yourself">2.9. ä»‹ç»ä½ è‡ªå·±</a></span></dt>
-<dt><span class="section"><a href="sn_accounts.php#sn-bugzilla-account">2.10. 创建一个Bugzilla帐号</a></span></dt>
-<dt><span class="section"><a href="sn_accounts.php#sn-check-list">2.11. 清单</a></span></dt>
+<dt><span class="section"><a href="sn_accounts.php#sn-intro-yourself">2.8. ä»‹ç»ä½ è‡ªå·±</a></span></dt>
+<dt><span class="section"><a href="sn_accounts.php#sn-bugzilla-account">2.9. 创建一个Bugzilla帐号</a></span></dt>
+<dt><span class="section"><a href="sn_accounts.php#sn-check-list">2.10. 清单</a></span></dt>
 </dl></dd>
 <dt><span class="section"><a href="sn_translating_software.php">3. 翻译软件</a></span></dt>
 <dd><dl>
 <dt><span class="section"><a href="sn_translating_software.php#sn-file-structure">3.1. 文件结构</a></span></dt>
 <dt><span class="section"><a href="sn_translating_software.php#sn-obtain-translate-modules">3.2. 获取和翻译模块</a></span></dt>
 <dt><span class="section"><a href="sn_translating_software.php#sn-commit-modules">3.3. 提交模块</a></span></dt>
-<dt><span class="section"><a href="sn_translating_software.php#sn-add-new-file">3.4. æ·»åŠ æ–°çš„.po文件</a></span></dt>
+<dt><span class="section"><a href="sn_translating_software.php#sn-add-new-file">3.4. Adding New .po File</a></span></dt>
 <dt><span class="section"><a href="sn_translating_software.php#sn-proofreading">3.5. æ ¡æ­£</a></span></dt>
 </dl></dd>
 <dt><span class="section"><a href="sn_translating_docs.php">4. 文档翻译</a></span></dt>
 <dd><dl>
-<dt><span class="section"><a href="sn_translating_docs.php#sn-get-started">4.1. 开始工作</a></span></dt>
-<dt><span class="section"><a href="sn_translating_docs.php#sn-creating-common">4.2. 创建公共文件</a></span></dt>
+<dt><span class="section"><a href="sn_translating_docs.php#sn-creating-common">4.1. 创建公共文件</a></span></dt>
+<dt><span class="section"><a href="sn_translating_docs.php#sn-what-to-translate">4.2. 翻译哪些</a></span></dt>
 <dt><span class="section"><a href="sn_translating_docs.php#sn-translating-with-apps">4.3. 使翻译应用</a></span></dt>
-<dt><span class="section"><a href="sn_translating_docs.php#sn-what-to-translate">4.4. 翻译哪些</a></span></dt>
 </dl></dd>
 <dt><span class="index"><a href="generated-index.php">索引</a></span></dt>
 </dl></div>


Index: legalnotice-opl.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-quick-start-guide/zh_CN/legalnotice-opl.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- legalnotice-opl.php	15 Aug 2008 05:17:50 -0000	1.2
+++ legalnotice-opl.php	6 Feb 2009 01:58:09 -0000	1.3
@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>法律通告</title>
 <link rel="stylesheet" href="fedora.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
 </head>
 <?
 
@@ -24,7 +24,7 @@
 <a name="opl.terms"></a><ol type="I">
 <li>
 <a name="opl.require"></a><h2>
-<a name="id395032"></a>REQUIREMENTS ON BOTH UNMODIFIED AND MODIFIED
+<a name="id2781499"></a>REQUIREMENTS ON BOTH UNMODIFIED AND MODIFIED
 	VERSIONS</h2>
 <p>
 	Open Publication works may be reproduced and distributed in
@@ -58,7 +58,7 @@
 </li>
 <li>
 <a name="opl.copyright"></a><h2>
-<a name="id394866"></a>COPYRIGHT</h2>
+<a name="id2769837"></a>COPYRIGHT</h2>
 <p>
 	The copyright to each Open Publication is owned by its author(s)
 	or designee.
@@ -66,7 +66,7 @@
 </li>
 <li>
 <a name="opl.scope"></a><h2>
-<a name="id394879"></a>SCOPE OF LICENSE</h2>
+<a name="id2762746"></a>SCOPE OF LICENSE</h2>
 <p>
 	The following license terms apply to all Open Publication works,
 	unless otherwise explicitly stated in the document.
@@ -94,7 +94,7 @@
 </li>
 <li>
 <a name="opl.modified.works"></a><h2>
-<a name="id394911"></a>REQUIREMENTS ON MODIFIED WORKS</h2>
+<a name="id2760160"></a>REQUIREMENTS ON MODIFIED WORKS</h2>
 <p>
 	All modified versions of documents covered by this license,
 	including translations, anthologies, compilations and partial
@@ -126,7 +126,7 @@
 </li>
 <li>
 <a name="opl.good-practice"></a><h2>
-<a name="id397073"></a>GOOD-PRACTICE RECOMMENDATIONS</h2>
+<a name="id2780191"></a>GOOD-PRACTICE RECOMMENDATIONS</h2>
 <p>
 	In addition to the requirements of this license, it is requested
 	from and strongly recommended of redistributors that:
@@ -155,7 +155,7 @@
 </li>
 <li>
 <a name="opl.options"></a><h2>
-<a name="id394753"></a>LICENSE OPTIONS</h2>
+<a name="id2754618"></a>LICENSE OPTIONS</h2>
 <p>
 	The author(s) and/or publisher of an Open Publication-licensed
 	document may elect certain options by appending language to the


Index: rv-revhistory.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-quick-start-guide/zh_CN/rv-revhistory.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rv-revhistory.php	15 Aug 2008 05:17:50 -0000	1.5
+++ rv-revhistory.php	6 Feb 2009 01:58:09 -0000	1.6
@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>修订历史</title>
 <link rel="stylesheet" href="fedora.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
 </head>
 <?
 
@@ -17,6 +17,26 @@
 <div class="revhistory"><table border="1" width="100%" summary="Revision history">
 <tr><th align="left" valign="top" colspan="3"><b>修订历史</b></th></tr>
 <tr>
+<td align="left">修订 0.5.2</td>
+<td align="left">2009-01-09</td>
+<td align="left">NM</td>
+</tr>
+<tr><td align="left" colspan="3">
+        <p>
+          Bug #479346 fixed
+        </p>
+      </td></tr>
+<tr>
+<td align="left">修订 0.5.1</td>
+<td align="left">2008-08-31</td>
+<td align="left">PD</td>
+</tr>
+<tr><td align="left" colspan="3">
+        <p>
+          General bug fixes
+        </p>
+      </td></tr>
+<tr>
 <td align="left">修订 0.5</td>
 <td align="left">2008-04-18</td>
 <td align="left">NM</td>
@@ -25,7 +45,7 @@
         <p>
           Updated Accounts and Subscriptions chapter to conform the
           current FAS2. Some minor changes made to other chapters along
-          with bugs filed.
+          with bugs filed
         </p>
       </td></tr>
 <tr>
@@ -35,7 +55,7 @@
 </tr>
 <tr><td align="left" colspan="3">
         <p>
-          替换在3.2节中的连接
+          Replaced the links in the section 3.2
         </p>
       </td></tr>
 <tr>
@@ -85,7 +105,9 @@
 </tr>
 <tr><td align="left" colspan="3">
         <p>
-          ä¿®æ”¹å’Œæ›´æ–°æ‰€æœ‰çš„ç« èŠ‚ä»¥ååº”åŒ…æ‹¬ä½¿ç”¨transifex和变化了的仓库等在内的最新信息.
+          Modified and updated all chapters to reflect latest
+          information including usage of Transifex, moved repository
+          etc.
         </p>
       </td></tr>
 <tr>
@@ -215,7 +237,8 @@
 </tr>
 <tr><td align="left" colspan="3">
         <p>
-          改进的翻译过程包含了其他公共的文件翻译
+          Fix docs translation procedure to include other common files
+          translations
         </p>
       </td></tr>
 <tr>
@@ -295,7 +318,7 @@
 </tr>
 <tr><td align="left" colspan="3">
         <p>
-          编辑的第一部分
+          First round of editing
         </p>
       </td></tr>
 <tr>


Index: sn_accounts.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-quick-start-guide/zh_CN/sn_accounts.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sn_accounts.php	15 Aug 2008 05:17:50 -0000	1.5
+++ sn_accounts.php	6 Feb 2009 01:58:09 -0000	1.6
@@ -3,12 +3,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>2. 帐号和订阅</title>
 <link rel="stylesheet" href="fedora.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.php" title="翻译快速上手指南">
+<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
+<link rel="home" href="index.php" title="翻译快速上手指南">
 <link rel="up" href="index.php" title="翻译快速上手指南">
 <link rel="prev" href="index.php" title="翻译快速上手指南">
 <link rel="next" href="sn_translating_software.php" title="3. 翻译软件">
-<link rel="copyright" href="ln-legalnotice-opl.php" title="法律通告">
+<link rel="copyright" href="legalnotice-opl.php" title="法律通告">
 </head>
 <?
 
@@ -39,9 +39,16 @@
 <div class="section" lang="zh-CN">
 <div class="titlepage"><div><div><h3 class="title" id="signup-ml">2.1. 订阅邮件列表</h3></div></div></div>
 <div class="procedure"><ol type="1">
-<li><p>访问<a class="ulink" href="https://listman.redhat.com/mailman/listinfo/fedora-trans-list/" target="_top">https://listman.redhat.com/mailman/listinfo/fedora-trans-list/</a>并且订阅重要的翻译邮件列表。</p></li>
+<li><p>
+          Visit <a class="ulink" href="https://listman.redhat.com/mailman/listinfo/fedora-trans-list" target="_top">https://listman.redhat.com/mailman/listinfo/fedora-trans-list</a>
+          and subscribe to the main translation mailing list.
+        </p></li>
 <li><p>等待确认邮件，它包含确认订阅的连接。点击这个连接以确认订阅。</p></li>
-<li><p>检查<a class="ulink" href="http://fedoraproject.org/wiki/L10N/Teams/" target="_top">http://fedoraproject.org/wiki/L10N/Teams/</a>ï¼Œçœ‹çœ‹æ˜¯å¦æœ‰å±žäºŽä½ çš„è¯­è¨€çš„ä¸“é—¨çš„é‚®ä»¶åˆ—è¡¨ã€‚å¦‚æžœæœ‰çš„è¯ï¼Œä¹Ÿè®¢é˜…è¿™ä¸ªé‚®ä»¶åˆ—è¡¨ã€‚</p></li>
+<li><p>
+          Check <a class="ulink" href="http://translate.fedoraproject.org/teams" target="_top">http://translate.fedoraproject.org/teams</a>
+          to see if there is a special mailing list for your language.
+          If so, subscribe to that list too.
+        </p></li>
 </ol></div>
 </div>
 <div class="section" lang="zh-CN">
@@ -52,9 +59,9 @@
 <p>输入以下命令：</p>
 <pre class="screen"><code class="command">ssh-keygen -t rsa</code></pre>
 <p>
-	  Accept the default location
-	  (<code class="filename">~/.ssh/id_rsa</code>) and enter a passphrase.
-	</p>
+          Accept the default location
+          (<code class="filename">~/.ssh/id_rsa</code>) and enter a passphrase.
+        </p>
 <div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Caution: è®°ä½ä½ çš„å£ä»¤">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[小心]" src="./stylesheet-images/caution.png"></td>
@@ -70,8 +77,9 @@
 chmod 644 ~/.ssh/id_rsa.pub</code></pre>
 </li>
 <li><p>
-		This public key (~/.ssh/id_rsa.pub) will be used for your Fedora account creation described  in <a class="xref" href="sn_accounts.php#sn-apply-account" title="2.4. 申请一个帐号">第 2.4 节 “申请一个帐号”</a>. 
-	</p></li>
+          This public key (~/.ssh/id_rsa.pub) will be used for your
+          Fedora account creation described in <a class="xref" href="sn_accounts.php#sn-apply-account" title="2.4. 申请一个帐号">第 2.4 节 “申请一个帐号”</a>.
+        </p></li>
 </ol></div>
 </div>
 <div class="section" lang="zh-CN">
@@ -96,7 +104,13 @@
 </td></tr>
 </table></div>
 </li>
-<li><p>在结果的文本中,æ‰¾åˆ°ä½ çš„key ID,它类似于"pub 1024D/1B2AFA1C".ä½ çš„key IDæ˜¯æ–œæ (<code class="literal">/</code>)后面的8个字符组成的部分.在前面这个例子中,GPGçš„Key ID是<code class="literal">1B2AFA1C</code>. è®°ä¸‹ä½ çš„key ID.</p></li>
+<li><p>
+          In the resulting text, find your key ID in the statement that
+          resembles 'pub 1024D/1B2AFA1C'. Your key ID is the 8
+          character 'word' after the slash (<code class="literal">/</code>). In
+          the previous example, the GPG Key ID is
+          <code class="literal">1B2AFA1C</code>. Write down your key ID.
+        </p></li>
 <li>
 <p>æŠŠä½ çš„å…¬é’¥å¯¼å‡ºåˆ°ä¸€ä¸ªå…¬å…±æœåŠ¡å™¨ä¸Š,è¿™æ ·åˆ«äººå°±èƒ½å¤Ÿé€šè¿‡å¦‚ä¸‹å‘½ä»¤æ‰¾åˆ°å®ƒäº†,è¦æ›¿æ¢ä¸ºä½ çš„key ID:</p>
 <pre class="screen"><code class="command">gpg --keyserver subkeys.pgp.net --send-keys <em class="replaceable"><code>GPGKEYID</code></em></code></pre>
@@ -107,13 +121,39 @@
 <div class="section" lang="zh-CN">
 <div class="titlepage"><div><div><h3 class="title" id="sn-apply-account">2.4. 申请一个帐号</h3></div></div></div>
 <div class="procedure"><ol type="1">
-<li><p>要申请一个 Fedora 帐号，首先访问<a class="ulink" href="https://admin.fedoraproject.org/accounts/" target="_top">https://admin.fedoraproject.org/accounts/</a>，然后选择<span class="guilabel"><strong>新帐号</strong></span>。</p></li>
+<li><p>
+          To sign up for a Fedora account, first visit <a class="ulink" href="https://admin.fedoraproject.org/accounts" target="_top">https://admin.fedoraproject.org/accounts</a> and select
+          <span class="guilabel"><strong>New Account</strong></span>.
+        </p></li>
 <li><p>å¡«å…¥<span class="guilabel"><strong>用户名</strong></span>, <span class="guilabel"><strong>全名</strong></span> å’Œ <span class="guilabel"><strong>Email</strong></span>, 然后点 <span class="guibutton"><strong>Sign up!</strong></span>.ä½ çš„å¯†ç ä¼šå‘é‚®ä»¶ç»™ä½ ã€‚</p></li>
-<li><p>回到<a class="ulink" href="https://admin.fedoraproject.org/accounts/" target="_top">https://admin.fedoraproject.org/accounts/</a>ï¼Œå¹¶ç”¨ä½ çš„å¯†ç ç™»å½•ã€‚å‡ºçŽ°æ¬¢è¿Žé¡µé¢ï¼Œå®ƒä¼šæé†’ä½ CLA没有完成，SSH key没有提交。</p></li>
-<li><p>要提交公共SSH key和GPG key ID，点击<span class="guilabel"><strong>我的账户</strong></span>或进入<a class="ulink" href="https://admin.fedoraproject.org/accounts/user/edit" target="_top"> https://admin.fedoraproject.org/accounts/user/edit</a>。</p></li>
-<li><p>在编辑账户页面，在<span class="guilabel"><strong>GPG Key ID:</strong></span>åŸŸä¸­è¾“å…¥ä½ çš„GPG key ID。对于公共SSH key，在<span class="guilabel"><strong>Public SSH Key:</strong></span>域旁边，点<span class="guilabel"><strong>浏览...</strong></span>æŒ‰é’®ï¼Œé€‰æ‹©ä½ çš„å…¬å…±SSH key。</p></li>
-<li><p>要签署CLA，<span class="guilabel"><strong>ç”µè¯å·ç </strong></span>å’Œ<span class="guilabel"><strong>邮政地址</strong></span>也要填写。这些信息不会被其他人访问到，除了admin组成员。请参考Fedora隐私策略 <a class="ulink" href="http://fedoraproject.org/wiki/Legal/PrivacyPolicy" target="_top"> http://fedoraproject.org/wiki/Legal/PrivacyPolicy</a>。</p></li>
-<li><p>在其他成员访问用户页面时，其它信息会被显示出来。</p></li>
+<li><p>
+          Go back to <a class="ulink" href="https://admin.fedoraproject.org/accounts" target="_top">https://admin.fedoraproject.org/accounts</a> and log in
+          with your password. The welcome page will be displayed, and it
+          reminds you that CLA is not completed and that an SSH key is
+          not submitted.
+        </p></li>
+<li><p>
+          To submit public SSH key and GPG key ID, click <span class="guilabel"><strong>My
+          Account</strong></span> or go to <a class="ulink" href="https://admin.fedoraproject.org/accounts/user/edit" target="_top">https://admin.fedoraproject.org/accounts/user/edit</a>.
+        </p></li>
+<li><p>
+          In the Edit Account (user_name) page, enter your GPG key ID in
+          <span class="guilabel"><strong>GPG Key ID:</strong></span> field. For the public SSH
+          key, click <span class="guilabel"><strong>Browse...</strong></span> button located next
+          to <span class="guilabel"><strong>Public SSH Key:</strong></span> field and specify your
+          public SSH key.
+        </p></li>
+<li><p>
+          <span class="guilabel"><strong>Telephone Number</strong></span> and <span class="guilabel"><strong>Postal
+          Address</strong></span> fields are also required to fill in for
+          signing the CLA. These information is NOT accessible by others
+          except admin groups. Please refer to Fedora Privacy Policy at
+          <a class="ulink" href="http://fedoraproject.org/wiki/Legal/PrivacyPolicy" target="_top">http://fedoraproject.org/wiki/Legal/PrivacyPolicy</a>.
+        </p></li>
+<li><p>
+          Other fields will be displayed by any other member by visiting
+          the user's view page.
+        </p></li>
 <li><p>现在点页面底部的<span class="guilabel"><strong>保存!</strong></span>æ¥ä¿å­˜ä½ çš„ä¿¡æ¯ã€‚</p></li>
 </ol></div>
 </div>
@@ -121,8 +161,15 @@
 <div class="titlepage"><div><div><h3 class="title" id="sn-sign-cla">2.5. 签署CLA</h3></div></div></div>
 <p>ä½ å¿…é¡»å®Œæˆè´¡çŒ®è€…è®¸å¯åè®®(the Contributors License Agreement),或<acronym class="acronym">CLA</acronym>.</p>
 <div class="procedure"><ol type="1">
-<li><p>访问<a class="ulink" href="https://admin.fedoraproject.org/accounts/" target="_top">https://admin.fedoraproject.org/accounts/</a>.ç”¨å‰é¢æ­¥éª¤å®Œæˆçš„ç”¨æˆ·åå’Œå¯†ç ç™»å½•.</p></li>
-<li><p>在欢迎页面中，点<span class="guilabel"><strong>完成CLA</strong></span>或进入<a class="ulink" href="https://admin.fedoraproject.org/accounts/user/edit" target="_top"> https://admin.fedoraproject.org/accounts/user/edit</a>。</p></li>
+<li><p>
+          Visit <a class="ulink" href="https://admin.fedoraproject.org/accounts" target="_top">https://admin.fedoraproject.org/accounts</a>
+          and login your account using your user name and password
+          obtained from the previous process.
+        </p></li>
+<li><p>
+          In the Welcome page, click <span class="guilabel"><strong>complete the
+          CLA</strong></span> or go to <a class="ulink" href="https://admin.fedoraproject.org/accounts/user/edit" target="_top">https://admin.fedoraproject.org/accounts/user/edit</a>.
+        </p></li>
 <li><p>å¦‚æžœç”µè¯å·ç å’Œé‚®æ”¿åœ°å€ä¿¡æ¯è¿˜æ²¡æä¾›ï¼Œç¼–è¾‘è´¦æˆ·é¡µé¢å°†å‡ºçŽ°ã€‚å¦åˆ™Fedoraè´¡çŒ®è€…è®¸å¯åè®®é¡µé¢å°†å‡ºçŽ°ã€‚ä»”ç»†é˜…è¯»åè®®ï¼Œå¦‚æžœä½ åŒæ„å°±ç‚¹<span class="guibutton"><strong>我同意</strong></span>。</p></li>
 <li><p>会出现用户视图页面，并在<span class="guilabel"><strong>CLA:</strong></span>域中显示<span class="guilabel"><strong>CLA Done</strong></span>。</p></li>
 </ol></div>
@@ -130,10 +177,21 @@
 <div class="section" lang="zh-CN">
 <div class="titlepage"><div><div><h3 class="title" id="sn-join-cvsl10n">2.6.Â åŠ å…¥åˆ°<code class="systemitem">cvsl10n</code>小组</h3></div></div></div>
 <div class="procedure"><ol type="1">
-<li><p>在用户视图页面中，点左边的<span class="guilabel"><strong>Apply For a new Group</strong></span>ã€‚å¦‚æžœä½ æƒ³ä¹‹åŽå†åšè¿™æ­¥ï¼Œå¯ä»¥åœ¨<a class="ulink" href="https://admin.fedoraproject.org/accounts/user/view/user_name" target="_top">https://admin.fedoraproject.org/accounts/user/view/user_name</a>è®¿é—®ä½ çš„ç”¨æˆ·è§†å›¾é¡µé¢ã€‚</p></li>
+<li><p>
+          In the user-view page, click <span class="guilabel"><strong>Apply for a New
+          Group</strong></span> located in the left side bar. If you like to
+          do this step sometime later, your user-view page can be
+          reached at <a class="ulink" href="https://admin.fedoraproject.org/accounts/user/view/user_name" target="_top">https://admin.fedoraproject.org/accounts/user/view/user_name</a>.
+        </p></li>
 <li><p>在字母表中点 <span class="guilabel"><strong>C</strong></span>， 会只显示以 'c'开始的组的列表。</p></li>
 <li><p>在列表中找到<span class="guilabel"><strong>cvsl10n</strong></span>组名，然后点<span class="guilabel"><strong>Apply</strong></span>。</p></li>
-<li><p>ä¸€ä¸ªç®¡ç†å‘˜ä¼šå¾—åˆ°ä½ çš„ç”³è¯·é€šçŸ¥,ç„¶åŽè®©ä½ é€šè¿‡.这可能会用一个小时或数天时间.一旦通过,ä½ ä¼šå¾—åˆ°ä¼šå‘˜èº«ä»½é€šçŸ¥çš„é‚®ä»¶.</p></li>
+<li><p>
+          All administrators are notified of your application.
+          Introduce yourself by following <a class="xref" href="sn_accounts.php#sn-intro-yourself" title="2.8.Â ä»‹ç»ä½ è‡ªå·±">第 2.8 节 â€œä»‹ç»ä½ è‡ªå·±â€</a>. Then your language
+          administrator offers to sponsor you. This may take between an
+          hour and a few days. The membership notification will be
+          emailed to you once sponsored.
+        </p></li>
 </ol></div>
 <div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Caution">
 <tr>
@@ -151,32 +209,41 @@
 <pre class="screen"><code class="command">su -c 'yum install cvs'</code></pre>
 </li>
 <li>
-<p>用下面的命令出去一些PO文件,æ›¿æ¢ä½ çš„ç”¨æˆ·åå¹¶æä¾›ä½ çš„SSH key口令:</p>
+<p>
+          Checkout some PO files with the following command,
+          substituting your user name and providing your SSH key
+          passphrase when prompted:
+        </p>
 <pre class="screen"><code class="command">export CVSROOT=:ext:<em class="replaceable"><code>用户名</code></em>@cvs.fedoraproject.org:/cvs/l10n cvs co web ls web/flpweb/po</code></pre>
 </li>
 </ol></div>
 </div>
 <div class="section" lang="zh-CN">
-<div class="titlepage"><div><div><h3 class="title" id="sn-create-wikiacct">2.8. 创建一个Wiki帐号</h3></div></div></div>
-<div class="procedure"><ol type="1">
-<li><p>一个当前的wikiç”¨æˆ·èƒ½å¤Ÿç»™ä½ ç¼–è¾‘wiki的权限.通过在<a class="ulink" href="http://fedoraproject.org/wiki/EditGroup/" target="_top">http://fedoraproject.org/wiki/EditGroup/</a>联系编辑组中的人,æˆ–æ·»åŠ ä½ çš„åå­—åˆ°<a class="ulink" href="http://fedoraproject.org/wiki/EditGroupQueue/" target="_top">http://fedoraproject.org/wiki/EditGroupQueue/</a>EditGroupQueue,ä¹‹åŽæœ‰äººå°†ä¼šæŠŠä½ æ·»åŠ è¿›åŽ».</p></li>
-<li><p>ä¸€æ—¦æ·»åŠ ,访问<a class="ulink" href="http://fedoraproject.org/wiki/UserPreferences/" target="_top">http://fedoraproject.org/wiki/UserPreferences/</a>并创建一个简介页面.å¯¹ä½ çš„åå­—,选择一个像'FirstnameLastname'的名字,然后选择<span class="guilabel"><strong>Create Profile</strong></span>.</p></li>
-<li><p>å¦‚æžœä½ å¼€å§‹ä¸€ä¸ªæ–°çš„è¯­è¨€,或者要成为其中的一名维护者,æ·»åŠ ä½ çš„ç›¸ä¿¡åˆ°L10N/Teams页面,在<a class="ulink" href="http://fedoraproject.org/wiki/L10N/Teams/" target="_top">http://fedoraproject.org/wiki/L10N/Teams/</a>.</p></li>
-</ol></div>
-</div>
-<div class="section" lang="zh-CN">
-<div class="titlepage"><div><div><h3 class="title" id="sn-intro-yourself">2.9.Â ä»‹ç»ä½ è‡ªå·±</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title" id="sn-intro-yourself">2.8.Â ä»‹ç»ä½ è‡ªå·±</h3></div></div></div>
 <div class="procedure"><ol type="1">
-<li><p>ä¸€æ—¦ä½ æœ‰äº†ç¼–è¾‘wiki的权限,创建一个个人主页.URL如<a class="ulink" href="http://fedoraproject.org/wiki/FirstnameLastname/" target="_top">http://fedoraproject.org/wiki/FirstnameLastname/</a>.这有利于Fedoraè´¡çŒ®è€…äº†è§£ä½ å¹¶ç›¸äº’è”ç³».</p></li>
-<li><p>提交一个短的自我介绍<a class="ulink" href="http://fedoraproject.org/wiki/L10N/Join/SelfIntroduction/" target="_top">http://fedoraproject.org/wiki/L10N/Join/SelfIntroduction/</a>到<code class="systemitem">fedora-trans-list</code>é‚®ä»¶åˆ—è¡¨å’Œä½ çš„æœ¬åœ°å°ç»„.</p></li>
+<li><p>
+          Create a personal page at <a class="ulink" href="http://fedoraproject.org/wiki/User:Username" target="_top">http://fedoraproject.org/wiki/User:Username</a>. This is
+          very useful for Fedora contributors to get to know and contact
+          each other.
+        </p></li>
+<li><p>
+          Post a short self introduction <a class="ulink" href="http://fedoraproject.org/wiki/L10N/Join/SelfIntroduction" target="_top">http://fedoraproject.org/wiki/L10N/Join/SelfIntroduction</a>
+          to the <code class="systemitem">fedora-trans-list</code> mailing list
+          and to the list of your local team. Please remember to include
+          your FAS username and your language. With this information,
+          sponsor can identify you for 'cvsl10n' group joining approval.
+        </p></li>
 </ol></div>
 </div>
 <div class="section" lang="zh-CN">
-<div class="titlepage"><div><div><h3 class="title" id="sn-bugzilla-account">2.10. 创建一个Bugzilla帐号</h3></div></div></div>
-<p>访问<a class="ulink" href="https://bugzilla.redhat.com/bugzilla/createaccount.cgi/" target="_top">https://bugzilla.redhat.com/bugzilla/createaccount.cgi/</a>创建一个Bugzilla帐号.</p>
+<div class="titlepage"><div><div><h3 class="title" id="sn-bugzilla-account">2.9. 创建一个Bugzilla帐号</h3></div></div></div>
+<p>
+      Visit <a class="ulink" href="https://bugzilla.redhat.com/bugzilla/createaccount.cgi" target="_top">https://bugzilla.redhat.com/bugzilla/createaccount.cgi</a>
+      to create a Bugzilla account.
+    </p>
 </div>
 <div class="section" lang="zh-CN">
-<div class="titlepage"><div><div><h3 class="title" id="sn-check-list">2.11. 清单</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title" id="sn-check-list">2.10. 清单</h3></div></div></div>
 <p>ä½ çŽ°åœ¨åº”è¯¥æœ‰è¿™äº›:</p>
 <div class="itemizedlist"><ul type="disc">
 <li><p>订阅了fedora-trans-listé‚®ä»¶åˆ—è¡¨å’Œä½ çš„æœ¬åœ°é‚®ä»¶åˆ—è¡¨</p></li>
@@ -184,8 +251,8 @@
 <li><p>一个GPG key</p></li>
 <li><p>一个Fedora帐号</p></li>
 <li><p>在<code class="systemitem">cvsl10n</code>小组的成员身份</p></li>
-<li><p>一个wiki帐号</p></li>
-<li><p>ä½ çš„è¯­è¨€å’Œç¿»è¯‘å°ç»„åœ¨<a class="ulink" href="http://fedoraproject.org/wiki/L10N/Teams/" target="_top">http://fedoraproject.org/wiki/L10N/Teams/</a></p></li>
+<li><p>Your language and translation team appear on
+        <a class="ulink" href="http://translate.fedoraproject.org/teams" target="_top">http://translate.fedoraproject.org/teams</a></p></li>
 <li><p>一个Bugzilla帐号</p></li>
 <li><p>一个wikiä¸Šçš„ä½ çš„ä¸ªäººä¸»é¡µ</p></li>
 <li><p>发送到邮件列表中的自我介绍</p></li>


Index: sn_translating_docs.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-quick-start-guide/zh_CN/sn_translating_docs.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sn_translating_docs.php	15 Aug 2008 05:17:50 -0000	1.5
+++ sn_translating_docs.php	6 Feb 2009 01:58:09 -0000	1.6
@@ -3,12 +3,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>4. 文档翻译</title>
 <link rel="stylesheet" href="fedora.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.php" title="翻译快速上手指南">
+<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
+<link rel="home" href="index.php" title="翻译快速上手指南">
 <link rel="up" href="index.php" title="翻译快速上手指南">
 <link rel="prev" href="sn_translating_software.php" title="3. 翻译软件">
 <link rel="next" href="generated-index.php" title="索引">
-<link rel="copyright" href="ln-legalnotice-opl.php" title="法律通告">
+<link rel="copyright" href="legalnotice-opl.php" title="法律通告">
 </head>
 <?
 
@@ -35,100 +35,119 @@
 </div>
 <div class="section" lang="zh-CN">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both" id="sn_translating_docs">4. 文档翻译</h2></div></div></div>
-<p>要翻译Fedora文档,先要成为<code class="systemitem">cvsl10n</code>小组的成员.关于帐户和订阅的更多信息,请参考<a class="xref" href="sn_accounts.php" title="2. 帐号和订阅">第 2 节 “帐号和订阅”</a>.</p>
-<p>è¦ç¿»è¯‘æ–‡æ¡£ï¼Œä½ éœ€è¦ Fedora 5 或者更新的系统,并且需要如下软件包：</p>
-<div class="itemizedlist"><ul type="disc">
-<li><p><span class="package">gnome-doc-utils</span></p></li>
-<li><p><span class="package">xmlto</span></p></li>
-<li><p><span class="package">make</span></p></li>
-<li><p><span class="package">w3m</span></p></li>
-</ul></div>
-<p><span class="package">gnome-doc-utils</span>软件包提供了<code class="command">xml2po</code>命令,å¹¶ä¸”ä¸éœ€è¦ä½ å®‰è£…GNOME桌面环境.<span class="package">xmlto</span>,<span class="package">make</span>å’Œ<span class="package">w3m</span>软件包包含了测试文档构建和翻译的必要工具.</p>
-<p>使用以下的命令来安装这些软件包：</p>
-<pre class="screen"><code class="command">su -c 'yum install gnome-doc-utils xmlto make w3m'</code></pre>
-<div class="section" lang="zh-CN">
-<div class="titlepage"><div><div><h3 class="title" id="sn-get-started">4.1. 开始工作</h3></div></div></div>
-<p>Fedora的文档是保存在CVS仓库的<code class="filename">docs/</code>ç›®å½•ä¸‹ã€‚ç”¨ä»¥ä¸‹å‘½ä»¤åˆ—å‡ºå¯èŽ·å–çš„æ¨¡å—ï¼ˆç”¨ä½ çš„Fedora帐号名替换<em class="replaceable"><code>username</code></em>）：</p>
-<pre class="screen"><code class="command">export CVSROOT=:ext:<em class="replaceable"><code>用户名</code></em>@cvs.fedoraproject.org:/cvs/docs</code>
-<code class="command">cvs co -c</code></pre>
-<p>è¦ä¸‹è½½æ¨¡å—æ¥ç¿»è¯‘ï¼Œé¦–å…ˆåˆ—å‡ºä»“åº“ä¸­çŽ°æœ‰çš„æ¨¡å—ç„¶åŽå–å‡ºéœ€è¦çš„æ¨¡å—ã€‚ä½ å¿…é¡»ä¹Ÿå–å‡º<code class="filename">docs-common</code>模块来和一些其它模块一起工作。</p>
-<pre class="screen"><code class="command">cvs co release-notes docs-common</code></pre>
-<p>一些模块是<em class="firstterm">特定版本</em>的,这意味着它们有一个<em class="firstterm">分支</em>,或子目录,对于Fedora的每个版本:</p>
-<pre class="screen"><strong class="userinput"><code>ls release-notes/</code></strong>
-<code class="computeroutput">CVS  F-7  FC-5  FC-6  FC3  FC4  devel</code></pre>
-<p><code class="filename">devel/</code>分支是用作即将到来的Fedora的版本.翻译者一般在这个分支上工作,并且如果需要会把改变放回到之前的版本.</p>
-<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Tip: 如何最小取出">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[提示]" src="./stylesheet-images/tip.png"></td>
-<th align="left">如何最小取出</th>
-</tr>
-<tr><td align="left" valign="top">
-<p>另一个方法是使用模块别名。</p>
-<pre class="screen"><code class="command">cvs co release-notes-devel</code></pre>
-<p>所有需要构建文档的东西现在在<code class="filename">release-notes-devel/</code>目录中：</p>
-<pre class="screen"><code class="command">ls release-notes-devel</code>
-<code class="command">CVS  docs-common  release-notes</code></pre>
-</td></tr>
+<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note: Some Fedora Documentation Has Moved">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[注意]" src="./stylesheet-images/note.png"></td>
+<th align="left">
+<a name="nt-docs_moved_to_git"></a>Some Fedora Documentation Has Moved</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+      Current Fedora Documentation material is now maintained in the
+      Fedora Hosted system as <code class="command">git</code> repositories.
+      This includes the latest versions of the common documentation
+      build tools. You do not need to install <code class="command">git</code>
+      to translate these materials. Instead, use Transifex, as
+      described in previous sections, to translate these documentation
+      materials.
+    </p></td></tr>
 </table></div>
-</div>
 <div class="section" lang="zh-CN">
-<div class="titlepage"><div><div><h3 class="title" id="sn-creating-common">4.2. 创建公共文件</h3></div></div></div>
-<p>ä»…å½“ä½ æ˜¯ç¬¬ä¸€ä¸ªä¸ºæŸè¯­è¨€åŒºåŸŸç¿»è¯‘çš„äººï¼Œä½ åº”è¯¥é¦–å…ˆç¿»è¯‘é‚£äº›ä½ æ‰€åœ¨è¯­è¨€åŒºåŸŸçš„æ–‡æ¡£çš„å…¬å…±æ–‡ä»¶ã€‚å®ƒä»¬åœ¨ <code class="filename">docs-common/common/</code>。</p>
+<div class="titlepage"><div><div><h3 class="title" id="sn-creating-common">4.1. 创建公共文件</h3></div></div></div>
+<p>
+        If you are creating the first-ever translation for a locale, you
+        must first translate some common files used in all documents for
+        your locale. The common files are located in the Fedora Hosted
+        repository for the <span class="package">fedora-doc-utils</span>
+        package.
+      </p>
 <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note: 例子的语言区域是pt_BR">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[注意]" src="./stylesheet-images/note.png"></td>
-<th align="left">例子的语言区域是<em class="replaceable"><code>pt_BR</code></em>
-</th>
+<th align="left">例子的语言区域是pt_BR</th>
 </tr>
 <tr><td align="left" valign="top"><p>ä¸‹é¢çš„ä¾‹å­ä½¿ç”¨çš„è¯­è¨€åŒºåŸŸä»£ç æ˜¯<em class="replaceable"><code>pt_BR</code></em>. 在这些命令中,æ›¿æ¢ä¸ºä½ æ‰€åœ¨çš„è¯­è¨€åŒºåŸŸä»£ç .</p></td></tr>
 </table></div>
 <div class="procedure"><ol type="1">
-<li><p>阅读位于<code class="filename">docs-common/common/entities</code>的<code class="filename">README.txt</code>文件，然后按照提示创建新的实体。</p></li>
-<li>
-<p>ä¸€æ—¦ä½ åˆ›å»ºäº†ä½ æ‰€åœ¨çš„è¯­è¨€åŒºåŸŸçš„å…¬å…±å®žä½“å¹¶ä¸”æäº¤åˆ°CVS,创建一个给法律声明用的语言文件:</p>
-<pre class="screen"><code class="command">cd docs-common/common/</code>
-<code class="command">cp legalnotice-opl-en_US.xml legalnotice-opl-<em class="replaceable"><code>pt_BR</code></em>.xml</code>
-<code class="command">cp legalnotice-relnotes-en_US.xml legalnotice-relnotes-<em class="replaceable"><code>pt_BR</code></em>.xml</code>	
-</pre>
-<div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Important: 不要翻译法律声明">
+<li><p>
+          Visit Transifex at <a class="ulink" href="http://translate.fedoraproject.org" target="_top">http://translate.fedoraproject.org</a>, and translate
+          the module <span class="guilabel"><strong>Docs :: Common entities</strong></span>, using
+          the same procedure shown in <a class="xref" href="sn_translating_software.php" title="3. 翻译软件">第 3 节 “翻译软件”</a>.
+        </p></li>
+<li><p>
+          Visit the <span class="package">fedora-doc-utils</span> hosted project
+          at <a class="ulink" href="https://fedorahosted.org/fedora-doc-utils" target="_top">https://fedorahosted.org/fedora-doc-utils</a>.
+          Select the <span class="guilabel"><strong>Login</strong></span> link and use your
+          Fedora Account System login and password to login.
+        </p></li>
+<li>
+<p>
+          Select the <span class="guilabel"><strong>New ticket</strong></span> link to file a
+          new ticket. Use the following information to fill in the
+          ticket:
+        </p>
+<div class="itemizedlist"><ul type="disc">
+<li><p>
+              Summary: New language support request:
+              <em class="replaceable"><code>pt_BR</code></em>
+            </p></li>
+<li><p>
+              Priority: minor
+            </p></li>
+<li><p>
+              Component: language support
+            </p></li>
+</ul></div>
+<p>
+          You may leave the details blank or fill in information as
+          desired.
+        </p>
+<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note: Attach Files if Necessary">
 <tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[重要]" src="./stylesheet-images/important.png"></td>
-<th align="left">不要翻译法律声明</th>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[注意]" src="./stylesheet-images/note.png"></td>
+<th align="left">Attach Files if Necessary</th>
 </tr>
-<tr><td align="left" valign="top"><p>为了保证OPL在所有语言环境都有同等的法律效力，请不要翻译OPL。</p></td></tr>
+<tr><td align="left" valign="top"><p>
+            If you have any problems submitting PO files using
+            Transifex, you can attach them to the Trac ticket.
+          </p></td></tr>
 </table></div>
 </li>
-<li>
-<p>然后也将这些文件提交到CVS：</p>
-<pre class="screen"><code class="command">cvs add legalnotice-*-<em class="replaceable"><code>pt_BR</code></em>.xml</code>
-<code class="command">cvs ci -m 'Added legal notices for <em class="replaceable"><code>pt_BR</code></em>' legalnotice-*-<em class="replaceable"><code>pt_BR</code></em>.xml</code></pre>
-</li>
-<li>
-<p>下一步，在<code class="filename">docs-common/images/</code>æ–‡ä»¶å¤¹ä¸­ç»™ä½ çš„è¯­è¨€åŒºåŸŸå»ºç«‹è‰æ¡ˆæ°´å°ï¼š</p>
-<pre class="screen"><code class="command">cd docs-common/images/</code>
-<code class="command">cp watermark-en_US.svg watermark-<em class="replaceable"><code>pt_BR</code></em>.svg</code></pre>
-<p>翻译SVG文件中的<code class="sgmltag-element">text</code>å…ƒç´ ã€‚ç„¶åŽæŠŠä½ æ‰€åœ¨çš„è¯­è¨€åŒºåŸŸçš„SVGæ–‡ä»¶æ·»åŠ åˆ°<code class="filename">Makefile</code>文件中，生成PNG并提交结果：</p>
-<pre class="screen"><code class="command">make watermark-<em class="replaceable"><code>pt_BR</code></em>.png</code>
-<code class="command">cvs add watermark-<em class="replaceable"><code>pt_BR</code></em>*</code>
-<code class="command">cvs ci -m 'Added <em class="replaceable"><code>pt_BR</code></em> images' Makefile watermark-<em class="replaceable"><code>pt_BR</code></em>*</code></pre>
-</li>
 </ol></div>
-<div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Important: 构建错误">
-<tr>
-<td rowspan="2" align="center" valign="top" width="25"><img alt="[重要]" src="./stylesheet-images/important.png"></td>
-<th align="left">构建错误</th>
-</tr>
-<tr><td align="left" valign="top"><p>å¦‚æžœä½ æ²¡åˆ›å»ºè¿™äº›å…¬å…±å®žä½“ï¼Œæž„å»ºæ–‡æ¡£çš„æ—¶å€™å¯èƒ½å¤±è´¥ã€‚</p></td></tr>
-</table></div>
+</div>
+<div class="section" lang="zh-CN">
+<div class="titlepage"><div><div><h3 class="title" id="sn-what-to-translate">4.2. 翻译哪些</h3></div></div></div>
+<p>
+      The most important documentation for each release of Fedora
+      are the following:
+    </p>
+<div class="itemizedlist"><ul type="disc">
+<li><p><span class="guilabel"><strong>Docs :: Common entities</strong></span></p></li>
+<li><p><span class="guilabel"><strong>Docs :: Release Notes</strong></span></p></li>
+<li><p><span class="guilabel"><strong>Docs :: Installation Guide</strong></span></p></li>
+<li><p><span class="guilabel"><strong>Docs :: About Fedora</strong></span></p></li>
+<li><p><span class="guilabel"><strong>Docs :: Readme</strong></span></p></li>
+<li><p><span class="guilabel"><strong>Docs :: Readme Burning ISOs</strong></span></p></li>
+<li><p><span class="guilabel"><strong>Docs :: Readme Live Image</strong></span></p></li>
+</ul></div>
 </div>
 <div class="section" lang="zh-CN">
 <div class="titlepage"><div><div><h3 class="title" id="sn-translating-with-apps">4.3. 使翻译应用</h3></div></div></div>
+<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note: For Advanced Users">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[注意]" src="./stylesheet-images/note.png"></td>
+<th align="left">For Advanced Users</th>
+</tr>
+<tr><td align="left" valign="top"><p>
+        Most casual translators do not need to read this section, and
+        should use Transifex instead. Translators who are used to
+        command-line tools can refer to this section for guidance.
+      </p></td></tr>
+</table></div>
 <p><code class="filename">po/</code>目录包含了要翻译内容的<code class="filename">.po</code>文件.也包含了一个<code class="filename">.pot</code>文件,或PO模板,它用来在需要时创建新的<code class="filename">.po</code>文件.</p>
 <p>如果<code class="filename">po/</code>文件夹不存在，以下命令可以创建它和翻译模板文件：</p>
 <pre class="screen"><code class="command">mkdir po</code>
 <code class="command">cvs add po/</code>
-<code class="command">make pot</code>
-</pre>
+<code class="command">make pot</code></pre>
 <div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Caution: 不要手工修改 POT 文件">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[小心]" src="./stylesheet-images/caution.png"></td>
@@ -136,12 +155,16 @@
 </tr>
 <tr><td align="left" valign="top"><p>ä½œè€…å’Œç¼–è€…æ ¹æ®æº XML 生成 POT 文件，这将覆盖任何手工修改的 POT æ–‡ä»¶ã€‚å¦‚æžœä½ åœ¨ POT 文件的原文中发现了问题，请提交到 bugzilla <a class="ulink" href="https://bugzilla.redhat.com" target="_top">https://bugzilla.redhat.com</a>。</p></td></tr>
 </table></div>
-<p>使用像<span class="application"><strong>KBabel</strong></span>或<span class="application"><strong>gtranslator</strong></span>è¿™æ ·çš„<code class="filename">.po</code>编辑器,请按照下面的步骤.</p>
+<p>
+      To work with a <code class="filename">.po</code> editor
+      like <span class="application"><strong>Lokalize</strong></span> or
+      <span class="application"><strong>gtranslator</strong></span>, follow these
+      steps.
+    </p>
 <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note: 例子的语言区域是pt_BR">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[注意]" src="./stylesheet-images/note.png"></td>
-<th align="left">例子的语言区域是<em class="replaceable"><code>pt_BR</code></em>
-</th>
+<th align="left">例子的语言区域是pt_BR</th>
 </tr>
 <tr><td align="left" valign="top"><p>ä¸‹é¢çš„ä¾‹å­ä½¿ç”¨çš„è¯­è¨€åŒºåŸŸä»£ç æ˜¯<em class="replaceable"><code>pt_BR</code></em>. 在这些命令中,æ›¿æ¢ä¸ºä½ æ‰€åœ¨çš„è¯­è¨€åŒºåŸŸä»£ç .</p></td></tr>
 </table></div>
@@ -157,8 +180,9 @@
 <p>ç”¨ä½ ä¹ æƒ¯çš„ç¼–è¾‘å™¨ï¼Œæ·»åŠ ä½ è¦ç¿»è¯‘çš„è¯­è¨€åŒºåŸŸä»£ç åˆ°<code class="filename">po/LINGUAS</code>文件中。例如，</p>
 <pre class="screen"><code class="command">vi po/LINGUAS</code></pre>
 <p>按'a'æ¥ä¿®æ”¹å¹¶æ·»åŠ ä½ çš„è¯­è¨€ä»£ç ã€‚ä¸€æ—¦æ·»åŠ ï¼Œä¿å­˜å¹¶é€€å‡ºç¼–è¾‘å™¨ã€‚</p>
-<p><span class="emphasis"><em>请记得使列表保持在字母表中顺序。</em></span> 
-	  </p>
+<p>
+          <span class="emphasis"><em>请记得使列表保持在字母表中顺序。</em></span>
+        </p>
 </li>
 <li>
 <p class="title"><b>创建PO文件</b></p>
@@ -168,7 +192,7 @@
 <li>
 <p class="title"><b>翻译字符串</b></p>
 <p>要翻译文件,ä½¿ç”¨åŒæ ·çš„ç”¨æ¥ç¿»è¯‘è½¯ä»¶çš„åº”ç”¨ï¼š</p>
-<pre class="screen"><code class="command">kbabel po/<em class="replaceable"><code>pt_BR</code></em>.po</code></pre>
+<pre class="screen"><code class="command">lokalize po/<em class="replaceable"><code>pt_BR</code></em>.po</code></pre>
 </li>
 <li>
 <p class="title"><b>检查完整性</b></p>
@@ -190,23 +214,6 @@
 </li>
 </ol></div>
 </div>
-<div class="section" lang="zh-CN">
-<div class="titlepage"><div><div><h3 class="title" id="sn-what-to-translate">4.4. 翻译哪些</h3></div></div></div>
-<p>这些是每个版本的最重要的文档模块/目录:</p>
-<div class="itemizedlist"><ul type="disc">
-<li><p><code class="filename">docs-common/common/entities</code></p></li>
-<li><p><code class="filename">release-notes/devel</code></p></li>
-<li><p><code class="filename">homepage/devel</code></p></li>
-<li><p><code class="filename">install-guide/devel</code></p></li>
-<li><p><code class="filename">about-fedora/devel</code></p></li>
-<li><p><code class="filename">readme/devel</code></p></li>
-<li><p><code class="filename">readme-burning-isos/devel</code></p></li>
-<li><p><code class="filename">readme-live-image/devel</code></p></li>
-</ul></div>
-<p>要查看在文档仓库中的所有可用文档,运行:</p>
-<pre class="screen"><code class="command">export CVSROOT=:ext:<em class="replaceable"><code>用户名</code></em>@cvs.fedoraproject.org:/cvs/docs</code>
-<code class="command">cvs co -c</code></pre>
-</div>
 </div>
 <div class="navfooter">
 <hr>


Index: sn_translating_software.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-quick-start-guide/zh_CN/sn_translating_software.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sn_translating_software.php	15 Aug 2008 05:17:50 -0000	1.5
+++ sn_translating_software.php	6 Feb 2009 01:58:09 -0000	1.6
@@ -3,12 +3,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>3. 翻译软件</title>
 <link rel="stylesheet" href="fedora.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.php" title="翻译快速上手指南">
+<meta name="generator" content="DocBook XSL Stylesheets V1.74.0">
+<link rel="home" href="index.php" title="翻译快速上手指南">
 <link rel="up" href="index.php" title="翻译快速上手指南">
 <link rel="prev" href="sn_accounts.php" title="2. 帐号和订阅">
 <link rel="next" href="sn_translating_docs.php" title="4. 文档翻译">
-<link rel="copyright" href="ln-legalnotice-opl.php" title="法律通告">
+<link rel="copyright" href="legalnotice-opl.php" title="法律通告">
 </head>
 <?
 
@@ -39,7 +39,10 @@
 <p>è¿™ä¸€ç« è§£é‡Šå¦‚ä½•ç¿»è¯‘é©»ç•™åœ¨<code class="systemitem">fedoraproject.org</code>中的模块.翻译者工作在两个界面中,一个用来获取模块,另一个用来提交模块.åœ¨ä½ å¼€å§‹å‰,ä½ å¿…é¡»å‡†å¤‡ä¸€ä¸ªå­˜æ”¾ä½ çš„<code class="filename">po</code>文件的目录.</p>
 <div class="section" lang="zh-CN">
 <div class="titlepage"><div><div><h3 class="title" id="sn-file-structure">3.1. 文件结构</h3></div></div></div>
-<p>要找到哪些模块是可以翻译的,访问这里的模块列表<a class="ulink" href="https://translate.fedoraproject.org/submit/module/" target="_top">https://translate.fedoraproject.org/submit/module/</a>.</p>
+<p>
+      To find which modules are translatable, visit the Module List at
+      <a class="ulink" href="https://translate.fedoraproject.org/submit/module" target="_top">https://translate.fedoraproject.org/submit/module</a>.
+    </p>
 <p>åœ¨ä½ ä¸‹è½½ä»»ä½•æ–‡ä»¶ä¹‹å‰,准备存在这些文件的结构.下面描述的结构是一个例子,å¹¶ä¸”ä½ çš„ç»“æž„å¯ä»¥æ˜¯ä¸åŒçš„.例如,å¦‚æžœä½ æƒ³ä¸‹è½½<code class="systemitem">comps</code>模块来翻译,创建下面的目录:</p>
 <pre class="screen"><code class="command">mkdir -p ~/myproject/comps/</code></pre>
 <p>之后要翻译另一个模块，在父目录下以模块名创建一个目录，如<code class="filename">~/myproject/system-config-printer/</code>。</p>
@@ -48,17 +51,26 @@
 <div class="titlepage"><div><div><h3 class="title" id="sn-obtain-translate-modules">3.2. 获取和翻译模块</h3></div></div></div>
 <p>æ—¢ç„¶ä½ å·²å‡†å¤‡å¥½äº†ç›®å½•ç»“æž„ï¼Œä½ å¯ä»¥ä¸‹è½½ä¸€ä¸ªæ–‡ä»¶æ¥ç¿»è¯‘ã€‚ä½ å¯èƒ½éœ€è¦å’Œä½ çš„è¯­è¨€å°ç»„ä¸­çš„å…¶å®ƒç¿»è¯‘äººæ²Ÿé€šï¼Œä»¥é¿å…å†²çªã€‚å¦‚æžœä½ ä¸ç¡®å®šï¼Œè¯·è”ç³»ä½ çš„è¯­è¨€åè°ƒäººã€‚</p>
 <div class="procedure"><ol type="1">
-<li><p>è®¿é—®ä½ çš„è¯­è¨€ä¸»é¡µ,如<a class="ulink" href="http://translate.fedoraproject.org/languages/ja/" target="_top">http://translate.fedoraproject.org/languages/ja/</a>,ç„¶åŽé€‰æ‹©ä¸€ä¸ªç›®æ ‡ç‰ˆæœ¬.ç•Œé¢å°†æŠŠä½ é‡å®šå‘åˆ°è¯¥ç‰ˆæœ¬é¡µé¢,如<a class="ulink" href="http://translate.fedoraproject.org/languages/ja/fedora-9" target="_top">http://translate.fedoraproject.org/languages/ja/fedora-9</a>.</p></li>
+<li><p>
+          Visit your language page such as <a class="ulink" href="http://translate.fedoraproject.org/languages/ja" target="_top">http://translate.fedoraproject.org/languages/ja</a>, and
+          select a target release. The interface will redirect you to a
+          page for that release, such as <a class="ulink" href="http://translate.fedoraproject.org/languages/ja/fedora-10" target="_top">http://translate.fedoraproject.org/languages/ja/fedora-10</a>.
+        </p></li>
 <li><p>向下滚动页面,找到这个版本的可用模块表.ä½¿ç”¨æŒ¨ç€æ¯ä¸ªæ¨¡å—çš„ç»¿è‰²ä¸‹è½½å›¾æ ‡æ¥ä¸‹è½½poæ–‡ä»¶åˆ°ä½ ä¹‹å‰å‡†å¤‡çš„ç›®å½•ä¸­.</p></li>
 <li>
 <p>å› ä¸ºè¦æäº¤çš„æ–‡ä»¶åéœ€è¦éµå¾ª<code class="filename">lang.po</code>的命名惯例,所以要改变下载的文件名.下面的例子使用日文区域的<code class="filename">po</code>文件:</p>
 <pre class="screen"><strong class="userinput"><code>ls ~/myproject/comps/</code></strong>
 <code class="computeroutput">comps.HEAD.ja.po</code>
-<strong class="userinput"><code>mv ~/myproject/comps/comps.HEAD.ja.po ja.po</code></strong> 
+<strong class="userinput"><code>mv ~/myproject/comps/comps.HEAD.ja.po ja.po</code></strong>
 <strong class="userinput"><code>ls ~/myproject/comps/</code></strong>
 <code class="computeroutput">ja.po</code></pre>
 </li>
-<li><p>现在文件已经准备好来翻译了.使用<code class="filename">po</code>文件编辑器,如<span class="application"><strong>KBabel</strong></span> 或者<span class="application"><strong>gtranslator</strong></span>,翻译<code class="filename">po</code>æ–‡ä»¶åˆ°ä½ çš„è¯­è¨€.</p></li>
+<li><p>
+          Now the file is ready for translation. Translate the <code class="filename">po</code> file for your language in a
+          <code class="filename">po</code> editor such as
+          <span class="application"><strong>Lokalize</strong></span> or
+          <span class="application"><strong>gtranslator</strong></span>.
+        </p></li>
 <li>
 <p>åœ¨ä½ æäº¤å‰,检查文件的完整性.</p>
 <pre class="screen"><code class="command">msgfmt -cvo /dev/null ja.po</code></pre>
@@ -92,13 +104,13 @@
 </ol></div>
 </div>
 <div class="section" lang="zh-CN">
-<div class="titlepage"><div><div><h3 class="title" id="sn-add-new-file">3.4.Â æ·»åŠ æ–°çš„.po文件</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title" id="sn-add-new-file">3.4. Adding New .po File</h3></div></div></div>
 <p>如果没有<code class="filename">po</code>æ–‡ä»¶åœ¨ä½ çš„è¯­è¨€ä¸­,æ·»åŠ å®ƒ.</p>
 <div class="procedure"><ol type="1">
 <li>
 <p>下载<code class="filename">pot</code>æ–‡ä»¶å¹¶å¤åˆ¶å®ƒåˆ°ä½ è‡ªå·±çš„è¯­è¨€çš„<code class="filename">po</code>文件.</p>
 <pre class="screen"><code class="command">cp ~/myproject/comps/comps.HEAD.pot ja.po
-kbabel ja.po
+lokalize ja.po
 msgfmt -cvo /dev/null ja.po</code></pre>
 </li>
 <li><p>ä¸€æ—¦ä½ å®Œæˆäº†ç¿»è¯‘,æŒ‰ç…§åŒæ ·çš„æ­¥éª¤è¿›è¡ŒéªŒè¯ï¼Œç„¶åŽä¾å‰é¢éƒ¨åˆ†çš„æè¿°è¿›è¡Œæäº¤.</p></li>