Completed. (ypwong)

CVS version numbers

chinese/social_contract.wml: 1.8 -> 1.9

1 files changed, 80 insertions, 72 deletions

diff --git a/chinese/social_contract.wml b/chinese/social_contract.wml
index 71377eb4e71..3d7882a0397 100644
--- a/chinese/social_contract.wml
+++ b/chinese/social_contract.wml
@@ -53,34 +53,28 @@
      我們並為非自由軟件提供了內部結構（諸如我們的程序錯誤跟蹤系統以及通訊名單）。
 </OL>
 
-<P>以上 zhaoway 翻譯；以下譯文取自趙平望 <A href="mailto:tchao@worldnet.att.net">tchao@worldnet.att.net</A>
-的 OSD 中譯本，並由東東據 DFSG 原文修訂（未完全翻譯好，有譯錯的地方，\
-請不吝指正）。 :)</P>
+## <P>以上 zhaoway 翻譯；以下譯文取自趙平望 <A href="mailto:tchao@worldnet.att.net">tchao@worldnet.att.net</A>
+## 的 OSD 中譯本，並由東東據 DFSG 原文修訂（未完全翻譯好，有譯錯的地方，請不吝指正）。</P>
 
 <HR>
 <H2><a name="guidelines">Debian 自由軟件指導標準</a></H2>
 <OL>
+#   <LI><P><strong>免費自由重複散布 (Free Redistribution)</strong>
    <LI><P><strong>免費自由重複散布 (Free Redistribution)</strong>
-     <P>Debian 任何元件之許可證不得限制任何一方銷售或讓予作為\
-     其組成部分之一的 ....開放性原始碼程式。\
-     該許可證不得要求從是項銷售中索取使用費或其他費用。
-
-     <P>The license of a Debian component may not restrict any
-     party from selling or giving away the software as a
-     component of an aggregate software distribution containing
-     programs from several different sources. The license may not
-     require a royalty or other fee for such sale.</P>
-
-<!--
-The license may not restrict anyone from selling or giving away
-
-the software
-as a component of a distribution containing programs from other sources.
--->
-
+     <P>Debian 中的任何元件之許可證不得限制任何一方將此軟件\
+     以一個匯集不同來源的程式之整合軟件系統的其中一個元件的方式，\
+     來用作銷售或送贈用途。\
+#     該許可證不得要求從是項銷售中索取使用費或其他費用。
+     該許可證不一定要求從是項銷售中索取使用費或其他費用。</P>
+
+#     <P>The license of a Debian component may not restrict any
+#     party from selling or giving away the software as a
+#     component of an aggregate software distribution containing
+#     programs from several different sources. The license may not
+#     require a royalty or other fee for such sale.</P>
 
    <LI><P><strong>原程式碼</strong>
-     <P>軟件需要附有原程式碼，並允許以原程式碼及已編譯的形式分發。</P>
+     <P>軟件需要附有原程式碼，並允許以原程式碼及已編譯的形式散布。</P>
 #     該軟件除以編輯後的形式散布外，還應允許以原程式碼的形式散布。
 
 #     <P>The program must include source code, and must allow
@@ -88,70 +82,84 @@ as a component of a distribution containing programs from other sources.
 #     form.</P>
 
    <LI><P><strong>衍生軟件</strong>
-     <P>許可證需要允許修改軟件和衍生軟件，並允許修改後的軟件和衍生出的軟件\
-     以原軟件的同一條款散布。
-
-     <P>The license must allow modifications and derived works, and
-     must allow them to be distributed under the same terms as
-     the license of the original software.</P>
-
-   <LI><P><strong>原作者程式碼的完整</strong>
-   <P>許可證可限制原程式碼以修改後的形式散布，除非為修改軟件的目的在最後編輯\
-     時原始碼連同修改程式一起散布。許可證必須明確規定允許散布根據修改後的\
-     原程式碼編製的軟件。許可證可要求衍生軟件使用不同的名稱或版本號碼,有別\
-     於原始軟件。<em>（這是一個妥協。Debian 團體鼓勵所有作者不要限制任何\
-     源代碼檔案或機械碼檔案之修改。）</em></P>
-
-     <P>The license may restrict source-code from being distributed
-     in modified form _<strong>only</strong>_ if the license allows
-     the distribution of "<tt>patch files</tt>" with the source
-     code for the purpose of modifying the program at build
-     time. The license must explicitly permit distribution of
-     software built from modified source code. The license may
-     require derived works to carry a different name or version
-     number from the original software.  (<em>This is a
-     compromise. The Debian group encourages all authors to not
-     restrict any files, source or binary, from being
-     modified.</em>)</P>
+     <P>許可證必須允許軟件之修改及衍生，並必須允許修改後的軟件和衍生出的軟件\
+#     修改軟件和衍生軟件，並允許修改後的軟件和衍生出的軟件\
+     以原來軟件的許可證之同一條款散布。</P>
+
+#     <P>The license must allow modifications and derived works, and
+#     must allow them to be distributed under the same terms as
+#     the license of the original software.</P>
+
+   <LI><P><strong>原作者程式碼之完整</strong>
+   <P>許可證<strong>只可以</strong>在允許「<tt>修補檔案</tt>」\
+   （<tt>patch files</tt>）能夠與原程式碼一同分發，並用作在編譯時\
+    修改程式的情況之下，限制原程式碼不能以修改後的形式散布。
+
+#   許可證可限制原程式碼以修改後的形式散布，除非為修改軟件的目的在最後編輯\
+#     時原始碼連同修改程式一起散布。
+     
+     許可證必須清楚表明用已修改的原程式碼編譯而成的軟件，是可以散布的。\
+     許可證可要求衍生軟件使用有別於原來軟件的名稱或版本號碼。\
+     （<em>這是一個妥協，Debian 組織鼓勵所有作者不要限制任何\
+     原程式碼檔案或機械碼檔案之修改。）</em></P>
+
+#     <P>The license may restrict source-code from being distributed
+#     in modified form _<strong>only</strong>_ if the license allows
+#     the distribution of "<tt>patch files</tt>" with the source
+#     code for the purpose of modifying the program at build
+#     time.
+     
+#     The license must explicitly permit distribution of
+#     software built from modified source code. The license may
+#     require derived works to carry a different name or version
+#     number from the original software.  (<em>This is a
+#     compromise. The Debian group encourages all authors to not
+#     restrict any files, source or binary, from being
+#     modified.</em>)</P>
 
    <LI><P><strong>不得歧視任何人或團體</strong>
-     <P>許可證不得歧視任何人或多人組成的團體。</P>
+     <P>許可證不得歧視任何人或由多人組成的團體。</P>
 
-     <P>The license must not discriminate against any person or
-     group of persons.</P>
+#     <P>The license must not discriminate against any person or
+#     group of persons.</P>
 
    <LI><P><strong>不得歧視任何范疇的活動</strong>
-     <P>許可證不得限制任何人在某個范疇的活動中使用這些程式。\
+     <P>許可證不得限制任何人在某個范疇的活動中有關程式之使用。\
      例如，許可證不得限制程式作商業或基因研究用途。</P>
 
-     <P>The license must not restrict anyone from making use of the
-     program in a specific field of endeavor. For example, it may
-     not restrict the program from being used in a business, or
-     from being used for genetic research.</P>
+#     <P>The license must not restrict anyone from making use of the
+#     program in a specific field of endeavor. For example, it may
+#     not restrict the program from being used in a business, or
+#     from being used for genetic research.</P>
 
    <LI><P><strong>許可證之散布</strong>
 
-     <P>The rights attached to the program must apply to all to
-     whom the program is redistributed without the need for
-     execution of an additional license by those
-     parties.</P>
+     <P>程式附帶的權利必須適用於所有被分發程式的人，並不需要他們履行\
+     額外的許可證。</P>
+
+#     <P>The rights attached to the program must apply to all to
+#     whom the program is redistributed without the need for
+#     execution of an additional license by those
+#     parties.</P>
 
    <LI><P><strong>許可證不得有特別針對 Debian 的地方</strong>
-     <P>與程式有關的任何權利不得由該程式是否為 Debian 的一部分來決定。\
-     如果從 Debian 中取用一組程式，並根據該程式的規定使用或散布這組程式，\
-     則得到這組程式的所有各方的權利與得到 Debian 系統的使用者的權利相同。</P>
-
-     <P>The rights attached to the program must not depend on the
-     program's being part of a Debian system.  If the program is
-     extracted from Debian and used or distributed without Debian
-     but otherwise within the terms of the program's license, all
-     parties to whom the program is redistributed should have the
-     same rights as those that are granted in conjunction with
-     the Debian system.</P>
+     <P>程式附帶的權利不得由該程式是否為 Debian 的一部分來決定。\
+     如果從 Debian 中取用一個程式，並根據該程式的條款使用或散布它，\
+#     這個程式，\
+     則被分發程式的所有人之權利與得到 Debian 系統的使用者的權利相同。</P>
+#     得到這個程式的所有各方的權利與得到 Debian 系統的使用者的權利相同。</P>
+
+#     <P>The rights attached to the program must not depend on the
+#     program's being part of a Debian system.  If the program is
+#     extracted from Debian and used or distributed without Debian
+#     but otherwise within the terms of the program's license, all
+#     parties to whom the program is redistributed should have the
+#     same rights as those that are granted in conjunction with
+#     the Debian system.</P>
 
    <LI><P><strong>許可證的規定不得污染其他軟件</strong>
-     <P>許可證不得對其他與此軟件一起分發的軟件作出任何限制的規定。\
-     例如，許可證不得要求所有與它在同一媒體中一同分發的軟件都是自由軟件。
+     <P>許可證不得對其他與此軟件一同分發的軟件作出任何限制的規定。\
+     例如，許可證不得要求所有與它在同一媒體中一同分發的軟件都是自由軟件。</P>
 #     根它在同一介質散布的其他軟件都必須\
 #     為自由軟件。</P>
 
@@ -165,7 +173,7 @@ as a component of a distribution containing programs from other sources.
      <P>"<strong><a href="http://www.gnu.org/copyleft/gpl.html">GPL</a></strong>"、
      "<strong><a href="misc/bsd.license">BSD</a></strong>", and
      "<strong><a href="http://language.perl.com/misc/Artistic.html">Artistic</a></strong>"
-     都是我們認為是「<em>自由</em>」的許可證例子。
+     均是我們認為是「<em>自由</em>」的許可證例子。
 #     許可證均可視為符合開放性原始碼定義的許可證範例。 
 </OL>