diff options
author | Anthony Fok <foka> | 2011-04-03 08:09:26 +0000 |
---|---|---|
committer | Anthony Fok <foka> | 2011-04-03 08:09:26 +0000 |
commit | 6571d2f540cb85d8063dcc4c54527f9408b72254 (patch) | |
tree | e7a2d97bcd378d3d98bc0f170c57815f54d59114 /chinese/social_contract.wml | |
parent | bbb6631e2cb4b10e734cc2db4b5e6967fd182454 (diff) |
Correct spacing problem due to incorrect line-wrapping.
Change document name:
from "向自由軟件社群簽下的社群契約" (a contract "signed" "to" the community)
to "與自由軟件社群訂立社群契約" (a contract "made" "with" the community)
Other minor translation revisions to make it more natural in Chinese
CVS version numbers
chinese/social_contract.wml: 1.25 -> 1.26
Diffstat (limited to 'chinese/social_contract.wml')
-rw-r--r-- | chinese/social_contract.wml | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/chinese/social_contract.wml b/chinese/social_contract.wml index 6f2e28a131f..8ed06d5fb8a 100644 --- a/chinese/social_contract.wml +++ b/chinese/social_contract.wml @@ -6,23 +6,24 @@ # Created On : Wed Jul 2 12:47:56 1997 <p> - Version 1.1 w_2004~426qLAqӴF1997~75㪺 <a + Version 1.1 w2004~426qLAqӴF1997~75㪺 <a href="social_contract.1.0">Version 1.0</a>C </p> -<p>Debian ´A]NO Debian GNU/Linux tΪs@AgUF <strong>Debian -s</strong>C䤤 <a href="#guidelines">Debian ۥѳnɤw</a> _ -uO@ǧڭ̦PN@PXӿաA{bwgQۥѳnsǬ <a -href="http://www.opensource.org/docs/osd">}Xwq</a> ¦C</p> +<p>DebianA]NO Debian GNU/Linux tΪs@AqF <strong>Debian +s (Debian Social Contract)</strong>C\ + <a href="#guidelines">Debian ۥѳnɤw (Debian Free Software Guidelines, DFSG)</a> +AتOŧiڭ@N@PuӿաAӳQۥѳnsұįǡA <a +href="http://www.opensource.org/docs/osd">}Xwq (Open Source Definition)</a> ¦C</p> <hr /> - <h2>VۥѳnsñU<q>s</q></h2> + <h2>Pۥѳnsq<q>s</q></h2> <ol> <li> <strong>Debian NlO 100% ۥѳn</strong> <p> - ڭ̨q@ӦW<q><cite>Debian ۥѳnɤw</cite></q>ЭK_\ + ڭ̨q@ӦW<q><cite>Debian ۥѳnɤw</cite></q>ЭK\ ̧PwY@~<q><em>ۥ</em></q>P_Cڭ[HKTW:\աAN:]O Debian \ tξan]`oǦۥѳnwCڭ̱NPɤb Debian W}\ oΨϥΦۥѩΪ̫DۥѳnΤCOAڭ̨MoӨtΨ̿D\ @@ -56,9 +57,9 @@ href="http://www.opensource.org/docs/osd">}Xwq</a> ¦C</p> </li> <li><strong>ǧ@~ŦXڭ̪ۥѳnWd</strong> <p> - ڭ̩AAYǧڭ̪ΤݭnϥΤŦX Debian ۥѳnɤw@~C\ - ̬oǧ@~Abڭ̪ FTP wdXF<q><tt>contrib</tt></q>H\ - <q><tt>non-free</tt></q>ؿCboǥؿUn]A}ݤ_ Debian t\ + ڭ̩AAYǧڭ̪ΤݭnϥΤŦX Debian ۥѳnɤw@~C\ + ڭ̬oǧ@~Abڭ̪ FTP wdXF<q><tt>contrib</tt></q>H\ + <q><tt>non-free</tt></q>ؿCboǥؿUn]Aäݩ Debian t\ ޥ̤wQtmiHb Debian UϥΡCڭ̹yLsyӾ\ŪoǥؿU\ n\iҡAHP_L̬O_iHbL[CN:o:][HKTW::]odzn\ CҥHAޫDۥѳnëD Debian tΪ@Aڭ̤̪ϥΡA}\ @@ -77,7 +78,7 @@ href="http://www.opensource.org/docs/osd">}Xwq</a> ¦C</p> <li><p><strong>ۥѪA[CN:o:][HKTW::]</strong></p> <p>Debian [CN:ե:][HKTW::]\io@Nn@t\ YFPӷ[CN:{:][HKTW:{:]@MnX@[CN:ե:]\ - [HKTW::]Τ_PΪ̮ءCӳ\iҤoVѦpP欰P\ + [HKTW::]ΩPΪ̮ءCӳ\iҤoVѦpP欰P\ MQOΪ̨䥦OΡC</p></li> <li><p><strong>NX</strong></p> @@ -92,26 +93,25 @@ href="http://www.opensource.org/docs/osd">}Xwq</a> ¦C</p> <p>\i<strong>u</strong>b\<q><tt>[CN:ɤB:][HKTW:ɮ\ :]</tt></q>Hݧ@~NX@PoAHKbsĶɭק[CN:{:]\ [HKTW:{:]pUAiݧ@~NXboɪק欰C\ - \iҥMΤwק諸NXsĶӦnAO\[CN:o:][HKTW\ - ::]C\iҥinDlͳnϥΦOӳnW٩Ϊ̪C(<em>\ + \iҥMΤwק諸NXsĶӦnAO\[CN:o:][HKTW::]C\ + \iҥinDlͳnϥΦOӳnW٩Ϊ̪C(<em>\ oO@اADebian ´yҦ@̤nNX[CN::][HKTW:\ ɮ:]Ϊ[CN:Gi:][HKTW:X:][CN::][HKTW:ɮ:]קC</em>)\ </p></li> <li><p><strong>T[H[CN:h:][HKTW:K:]Ϊ[CN:´:][HKTW::]</strong></p> - <p>\iҤ[H[CN:h:][HKTW:K:]Ϊ̥ѦhHզ[CN:´:][HKTW:\ - :]C</p> + <p>\iҤ[H[CN:h:][HKTW:K:]Ϊ̥ѦhHզ[CN:´:][HKTW::]C</p> <li><p><strong>T[γ~</strong></p> - <p>\i[[CN:{:][HKTW:{:]iHQΤ_SwCҦpA\ - \iҤo[CN:{:][HKTW:{:]Τ_ӷ~Ϊ̰]sC</p></li> + <p>\i[[CN:{:][HKTW:{:]iHQΩSwCҦpA\ + \iҤo[CN:{:][HKTW:{:]Ωӷ~Ϊ̰]sC</p></li> <li><p><strong>\iҪ[CN:o:][HKTW::]</strong></p> - <p>[CN:{:][HKTW:{:]avQAΤ_[CN:{:][HKTW:{:]A\ + <p>[CN:{:][HKTW:{:]avQAΩ[CN:{:][HKTW:{:]A\ o檺C@ӨALݥL̦A@Ӫ[\iC</p></li> - <li><p><strong>\iҤSw_ Debian</strong></p> - <p>[CN:{:][HKTW:{:]avQѸ[CN:{:][HKTW:{:]O_ \ + <li><p><strong>\iҤSw Debian</strong></p> + <p>[CN:{:][HKTW:{:]avQѸ[CN:{:][HKTW:{:]O_ Debian @ӨMwCpGo[CN:{:][HKTW:{:]q Debian KX\ ӡAYϦb Debian ~Mb[CN:{:][HKTW:{:]\iڤUϥ\ Ϊ[CN:o:][HKTW::]AAo檺C@ӨN֦MǦb\ @@ -123,22 +123,21 @@ href="http://www.opensource.org/docs/osd">}Xwq</a> ¦C</p> ҤonDҦPbP@C餤@PonOۥѳnC</p></li> <li><p><strong>\iҥܨ</strong></p> - <p><q><strong><a href="http://www.gnu.org/copyleft/gpl.html">GPL</a></strong></q>B + <p><q><strong><a href="http://www.gnu.org/copyleft/gpl.html">GPL</a></strong></q>B\ <q><strong><a href="misc/bsd.license">BSD</a></strong></q> M <q><strong><a href="http://perldoc.perl.org/perlartistic.html">Artistic</a></strong></q> Oڭ̵<q><em>ۥ</em></q>\iҪܨҡC</p></li> </ol> -<p><em>ڭ<q>VۥѳnsñUs</q>A䤤ҳzO Ean \ -Schuessler XCO Bruce Perens gZAåѨ䥦 Debian }o̦b@ -EEC~_F@Ӥ몺qll|ijҦӦCӳQ <a +<p><em>ڭ<q>Pۥѳnsq<q>s</q></q>oӷO Ean \ +Schuessler XCO Bruce Perens gZAåѨL Debian }o̦b\ +[CN: 1997 ~ 6 :][HKTW:@EEC~:]_F@Ӥ몺qll|ijҦӦCӳQ <a href="http://lists.debian.org/debian-announce/debian-announce-1997/msg00017.html"> </a> @ Debian ةҤFC</em></p> -<p><em>ABruce Perens q Debian ۥѳnɤwSO Debian -AsF <a href="http://www.opensource.org/docs/definition.php"><q>} -Xwq</q></a>C</em></p> +<p><em>ABruce Perens q Debian ۥѳnɤwSO Debian A\ +sF <a href="http://www.opensource.org/docs/definition.php"><q>}Xwq</q></a>C</em></p> -<p><em>wL´ϥΥ[CN::][HKTW::]@¦CYzo˰AФޭz \ -Debian pHڭ̤@IgC</em></p> +<p><em>wL´Ho[CN::][HKTW::]¦ilͩMXgC\ +Yzo˰AеXB <q>Debian p</q>AHFڭ̤u@gM֩wC</em></p> |