[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www distros/common-distros.zh-cn.html distros/p...
|
From: |
GNUN |
|
Subject: |
www distros/common-distros.zh-cn.html distros/p... |
|
Date: |
Sat, 3 Aug 2019 09:58:20 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 19/08/03 09:58:20
Modified files:
distros : common-distros.zh-cn.html
distros/po : common-distros.zh-cn-en.html
common-distros.zh-cn.po
licenses : gpl-faq.zh-cn.html
licenses/po : gpl-faq.zh-cn-en.html gpl-faq.zh-cn.po
philosophy : free-sw.zh-cn.html fs-translations.zh-cn.html
philosophy/po : free-sw.zh-cn-en.html free-sw.zh-cn.po
fs-translations.zh-cn-en.html
fs-translations.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.zh-cn.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-cn-en.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-cn.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.zh-cn.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.zh-cn.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.zh-cn.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn.po?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.zh-cn-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.zh-cn.po?cvsroot=www&r1=1.14&r2=1.15
Patches:
Index: distros/common-distros.zh-cn.html
===================================================================
RCS file: /web/www/www/distros/common-distros.zh-cn.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- distros/common-distros.zh-cn.html 23 Feb 2019 08:29:33 -0000 1.12
+++ distros/common-distros.zh-cn.html 3 Aug 2019 13:58:18 -0000 1.13
@@ -63,7 +63,10 @@
<p>Debianæ¯å¯ä¸æ²¡æ被认å¯èå¨å
¶ä¸»åå¸ä¸æ²¡æéèªç±blobsçåè¡çãä¸è¿ï¼è¿æ¯æäºé®é¢ãéèªç±çåºä»¶ä»ç¶åå¨äºDebiançéèªç±è½¯ä»¶åºä¸ï¼è¿ç¹å¨debian.orgçææ¡£ä¸æ说æï¼å
¶å®è£
ç¨åºå¨æäºæ
åµä¸ä¼æ¨è计ç®æºå¨è¾¹è®¾å¤å®è£
è¿äºéèªç±åºä»¶ã</p>
-<p>Debiançwikiå«æå
³äºå®è£
è¿äºéèªç±åºä»¶ç页é¢ã</p>
+<p>æ¤å¤ï¼Debian çä¸äºå®æ¹èªç±è½¯ä»¶ä¼é请ç¨æ·å®è£
ä¸äºéèªç±ç软件ãå
·ä½æ¥è¯´ï¼Debian çç Firefox å Chromium
+ä¼æ¨èå®è£
éèªç±çéå ç»ä»¶ã</p>
+
+<p>Debian ç wiki å«æå
³äºå®è£
éèªç±åºä»¶ç页é¢ã</p>
<!-- https://wiki.debian.org/ATIProprietary -->
<p>请ä¸è¦ä½¿ç¨è¿ä¸ªéèªç±çåè¡çï¼è¯·ä½¿ç¨ç±å®æ¹é
çèªç±åè¡çï¼<a
@@ -240,7 +243,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/02/23 08:29:33 $
+$Date: 2019/08/03 13:58:18 $
<!-- timestamp end -->
</p>
Index: distros/po/common-distros.zh-cn-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-cn-en.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- distros/po/common-distros.zh-cn-en.html 12 Jan 2019 13:58:41 -0000
1.11
+++ distros/po/common-distros.zh-cn-en.html 3 Aug 2019 13:58:19 -0000
1.12
@@ -104,7 +104,13 @@
is referenced in the documentation on debian.org, and the installer in
some cases recommends them for the peripherals on the machine.</p>
-<p>Debian's wiki includes pages about installing nonfree firmware.</p>
+<p>In addition, some of the free programs that are officially part of
+Debian invite the user to install some nonfree programs.
+Specifically, the Debian versions of Firefox and Chromium suggest
+nonfree plug-ins to install into them.</p>
+
+<p>Debian's wiki also includes pages about installing nonfree
+firmware.</p>
<!-- https://wiki.debian.org/ATIProprietary -->
<p>Instead of this nonfree distribution, use one of the free distros
@@ -343,7 +349,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/01/12 13:58:41 $
+$Date: 2019/08/03 13:58:19 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/common-distros.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-cn.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- distros/po/common-distros.zh-cn.po 3 Aug 2019 13:46:17 -0000 1.28
+++ distros/po/common-distros.zh-cn.po 3 Aug 2019 13:58:19 -0000 1.29
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-07-31 11:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -654,10 +653,10 @@
#~ "partly remains: the installer in some cases recommends these nonfree "
#~ "firmware files for the peripherals on the machine."
#~ msgstr ""
-#~ "Debian以åçåå¸å
æ¬å¸¦éèªç±blobsçLinuxå
æ
¸ãä»2011å¹´2æçDebian "
-#~ "6.0３squeeze”ï¼åå¸èµ·ï¼è¿äºblobs被å
¶ä¸»åå¸ç§»é¤å°å离çéèªç±"
-#~ "软件åºãç¶èï¼é®é¢è¿æéçï¼å
¶å®è£
ç¨åºå¨æäºæ
åµä¸ä¼ä¸ºçµèçå¤è®¾æ¨èè¿äºé"
-#~ "èªç±çåºä»¶ã"
+#~ "Debian以åçåå¸å
æ¬å¸¦éèªç±blobsçLinuxå
æ
¸ãä»2011å¹´2æçDebian 6.0"
+#~ "３squeeze”ï¼åå¸èµ·ï¼è¿äºblobs被å
¶ä¸»åå¸ç§»é¤å°å离çéèªç±è½¯ä»¶"
+#~ "åºãç¶èï¼é®é¢è¿æéçï¼å
¶å®è£
ç¨åºå¨æäºæ
åµä¸ä¼ä¸ºçµèçå¤è®¾æ¨èè¿äºéèªç±"
+#~ "çåºä»¶ã"
#~ msgid ""
#~ "Arch has the two usual problems: there's no clear policy about what "
Index: licenses/gpl-faq.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/gpl-faq.zh-cn.html 8 Jun 2019 16:02:50 -0000 1.1
+++ licenses/gpl-faq.zh-cn.html 3 Aug 2019 13:58:20 -0000 1.2
@@ -311,7 +311,9 @@
<li><a href="#StolenCopy">å¦ææ人çåäºä¸å¼
å«æGPL软件çCDï¼é£ä¹GPLæ¯å¦æææ¤äººååå¸è¯¥è½¯ä»¶ï¼</a></li>
- <li><a href="#TradeSecretRelease">å¦æå
¬å¸æç
§åä¸ç§å¯æ¥åå¸è½¯ä»¶æ·è´ä¼æä¹æ ·ï¼</a></li>
+ <li><a href="#TradeSecretRelease">å¦æå
¬å¸æç
§åä¸ç§å¯æ¥åå¸ä»äººç GPL ä½åæ·è´ä¼æä¹æ ·ï¼</a></li>
+
+ <li><a href="#TradeSecretRelease">å¦æå
¬å¸æç
§åä¸ç§å¯æ¥åå¸å®èªå·±ç GPL ä½åæ·è´ä¼æä¹æ ·ï¼</a></li>
<li><a
href="#GPLFairUse">ææ¯å¦æ“åç使稔GPL软件çæºä»£ç
çæå©ï¼</a></li>
@@ -1394,11 +1396,18 @@
并ä¸æ¹åè¿ä¸ç¹ãå¦æ该å
¬å¸è¦åå¸è¯¥çæ¬å¹¶ä¸ä»ç¶æå®çä½æ¯åä¸æºå¯ï¼é£ä¹è¯¥å
¬å¸å°±è¿åäº GPLï¼ä½æ¯å¦æ该å
¬å¸æ²¡æåå¸è¯¥çæ¬ï¼é£ä¹å®å°±æ²¡æè¿å GPLã</p></dd>
-<dt id="TradeSecretRelease">å¦æå
¬å¸æç
§åä¸ç§å¯æ¥åå¸è½¯ä»¶æ·è´ä¼æä¹æ ·ï¼<span
class="anchor-reference-id">(<a
+<dt id="TradeSecretRelease">å¦æå
¬å¸æç
§åä¸ç§å¯æ¥åå¸ä»äººç
GPL ä½åæ·è´ä¼æä¹æ ·ï¼<span class="anchor-reference-id">(<a
+href="#TradeSecretRelease" >#TradeSecretRelease</a>)</span></dt>
+<dd><p>
+该å
¬å¸è¿åäº GPL 并ä¸å¿
é¡»åæ¢åå¸ã请注æè¿åä¸é¢çççªé®é¢ä¸åï¼è½¯ä»¶æ·è´éå°ççªæ¶ï¼å
¬å¸å¹¶æªææåå¸è¯¥è½¯ä»¶ï¼å æ¤å
¬å¸æ²¡æè¿å GPLã</p></dd>
+
+
+<dt id="TradeSecretRelease2">å¦æå
¬å¸æç
§åä¸ç§å¯æ¥åå¸èªå·±ç
GPL ä½åæ·è´ä¼æä¹æ ·ï¼<span class="anchor-reference-id">(<a
href="#TradeSecretRelease" >#TradeSecretRelease</a>)</span></dt>
+
<dd><p>
-å¦æä¸ä¸ªå
¬å¸åå¸æ·è´å¹¶å£°ç§°è¿æ¯åä¸æºå¯ï¼é£ä¹è¯¥å
¬å¸è¿åäº GPL
-并ä¸å¿
é¡»åæ¢åå¸ã请注æè¿åä¸é¢çççªé®é¢ä¸åï¼è½¯ä»¶æ·è´éå°ççªæ¶ï¼å
¬å¸å¹¶æªææåå¸è¯¥è½¯ä»¶ï¼å æ¤å
¬å¸æ²¡æè¿å GPLã</p></dd>
+å¦ææ¤åå¸ç¨åºä¸ä¸å
å«å
¶ä»äººç GPL ä½åï¼é£ä¹è¯¥å
¬å¸æ²¡æè¿å GPLï¼æ´å¤ä¿¡æ¯ï¼è¯·åç “<a
+href="#DeveloperViolate">GPLç¨åºçå¼åè
åGPLç»å®äºåï¼</a>”ï¼ãä½æ¯å®å¨ä½
å¦ä½ä½¿ç¨è¯¥ç¨åºçé®é¢ä¸ä½åºäºèªç¸çç¾çéè¿°ï¼ä½
æ¢å¯ä»¥ååå¸ä¹ï¼åä¸å¯ä»¥ååå¸ä¹ãå¨ä½
æ¥åç¨åºæ·è´ä¹åï¼ä½
æ好æ¯è¦æ±å®å°±å¦ä½ä½¿ç¨è¯¥ç¨åºä½åºæ确解éã</p></dd>
<dt id="WhySomeGPLAndNotLGPL">为ä»ä¹æäºGNUåºæ¯æç
§æ®éçGPLåå¸ï¼èä¸æ¯æç
§LGPLåå¸ï¼<span
class="anchor-reference-id">(<a
@@ -2293,7 +2302,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/06/08 16:02:50 $
+$Date: 2019/08/03 13:58:20 $
<!-- timestamp end -->
</p>
Index: licenses/po/gpl-faq.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/gpl-faq.zh-cn-en.html 8 Jun 2019 16:02:51 -0000 1.1
+++ licenses/po/gpl-faq.zh-cn-en.html 3 Aug 2019 13:58:20 -0000 1.2
@@ -434,7 +434,11 @@
redistribute that version?</a></li>
<li><a href="#TradeSecretRelease">What if a company distributes a
- copy as a trade secret?</a></li>
+ copy of some other developers' GPL-covered work to me as a trade
+ secret?</a></li>
+
+ <li><a href="#TradeSecretRelease2">What if a company distributes a
+ copy of its own GPL-covered work to me as a trade secret?</a></li>
<li><a href="#GPLFairUse">Do I have “fair use” rights in
using the source code of a GPL-covered program?</a></li>
@@ -2479,18 +2483,33 @@
hasn't released this version, no such violation has occurred.</p></dd>
-<dt id="TradeSecretRelease">What if a company distributes a copy as
- a trade secret?
+<dt id="TradeSecretRelease">What if a company distributes a copy of
+ some other developers' GPL-covered work to me as a trade secret?
<span class="anchor-reference-id">(<a href="#TradeSecretRelease"
>#TradeSecretRelease</a>)</span></dt>
<dd><p>
-If a company distributes a copy to you and claims it is a trade
-secret, the company has violated the GPL and will have to cease
-distribution. Note how this differs from the theft case above; the
+The company has violated the GPL and will have to cease distribution
+of that program. Note how this differs from the theft case above; the
company does not intentionally distribute a copy when a copy is
stolen, so in that case the company has not violated the GPL.</p></dd>
+<dt id="TradeSecretRelease2">What if a company distributes a copy
+ of its own GPL-covered work to me as a trade secret?
+ <span class="anchor-reference-id">(<a href="#TradeSecretRelease2"
+ >#TradeSecretRelease2</a>)</span></dt>
+
+<dd><p>
+If the program distributed does not incorporate anyone else's
+GPL-covered work, then the company is not violating the GPL (see
+“<a href="#DeveloperViolate">Is the developer of a GPL-covered
+program bound by the GPL?</a>” for more information). But it is
+making two contradictory statements about what you can do with that
+program: that you can redistribute it, and that you can't. It would
+make sense to demand clarification of the terms for use of that program
+before you accept a copy.</p></dd>
+
+
<dt id="WhySomeGPLAndNotLGPL">Why are some GNU libraries released under
the ordinary GPL rather than the Lesser GPL?
<span class="anchor-reference-id">(<a href="#WhySomeGPLAndNotLGPL"
@@ -3944,7 +3963,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/06/08 16:02:51 $
+$Date: 2019/08/03 13:58:20 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/gpl-faq.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.zh-cn.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- licenses/po/gpl-faq.zh-cn.po 3 Aug 2019 13:45:30 -0000 1.9
+++ licenses/po/gpl-faq.zh-cn.po 3 Aug 2019 13:58:20 -0000 1.10
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-08-01 08:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -1299,8 +1298,8 @@
#. type: Content of: <dl><dt>
msgid ""
-"What does “GPL” stand for? <span class=\"anchor-reference-id"
-"\">(<a href=\"#WhatDoesGPLStandFor\" >#WhatDoesGPLStandFor</a>)</span>"
+"What does “GPL” stand for? <span class=\"anchor-reference-id\">"
+"(<a href=\"#WhatDoesGPLStandFor\" >#WhatDoesGPLStandFor</a>)</span>"
msgstr ""
"“GPL”代表ä»ä¹ï¼<span class=\"anchor-reference-id\">(<a href="
"\"#WhatDoesGPLStandFor\" >#WhatDoesGPLStandFor</a>)</span>"
@@ -1318,8 +1317,8 @@
#. type: Content of: <dl><dt>
msgid ""
-"Does free software mean using the GPL? <span class=\"anchor-reference-id"
-"\">(<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" "
+"Does free software mean using the GPL? <span class=\"anchor-reference-id\">"
+"(<a href=\"#DoesFreeSoftwareMeanUsingTheGPL\" "
">#DoesFreeSoftwareMeanUsingTheGPL</a>)</span>"
msgstr ""
"èªç±è½¯ä»¶æ¯ä¸æ¯å°±æå³çè¦ç¨GPLï¼<span
class=\"anchor-reference-id\">(<a href="
@@ -1414,8 +1413,8 @@
"\"anchor-reference-id\">(<a href=\"#ReportingViolation\" "
">#ReportingViolation</a>)</span>"
msgstr ""
-"å¦æåç°å¯è½è¿åGPLçæ
åµï¼æåºè¯¥æä¹åï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#ReportingViolation\" >#ReportingViolation</a>)</span>"
+"å¦æåç°å¯è½è¿åGPLçæ
åµï¼æåºè¯¥æä¹åï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#ReportingViolation\" >#ReportingViolation</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1541,8 +1540,8 @@
"\"#CanIDemandACopy\" >#CanIDemandACopy</a>)</span>"
msgstr ""
"å¦ææç¥éæ人æä¸ä»½GPL软件çæ·è´ï¼ææ¯å¦å¯ä»¥è¦æ±ä»ä»¬ç»æä¸ä»½ï¼<span
class="
-"\"anchor-reference-id\">(<a href=\"#CanIDemandACopy\" >#CanIDemandACopy</"
-"a>)</span>"
+"\"anchor-reference-id\">(<a href=\"#CanIDemandACopy\" >#CanIDemandACopy</a>)"
+"</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1651,8 +1650,8 @@
"language? <span class=\"anchor-reference-id\">(<a href=\"#TranslateCode\" "
">#TranslateCode</a>)</span>"
msgstr ""
-"GPL对æç¨åºæ¹åæå¦å¤çç¼ç¨è¯è¨æä¹è¯´ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#TranslateCode\" >#TranslateCode</a>)</span>"
+"GPL对æç¨åºæ¹åæå¦å¤çç¼ç¨è¯è¨æä¹è¯´ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#TranslateCode\" >#TranslateCode</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1862,8 +1861,8 @@
"agreement? <span class=\"anchor-reference-id\">(<a href="
"\"#DevelopChangesUnderNDA\" >#DevelopChangesUnderNDA</a>)</span>"
msgstr ""
-"GPLæ¯å¦å
许使ç¨ä¿å¯åè®®å¼åä¿®æ¹ç软件ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#DevelopChangesUnderNDA\" >#DevelopChangesUnderNDA</a>)</span>"
+"GPLæ¯å¦å
许使ç¨ä¿å¯åè®®å¼åä¿®æ¹ç软件ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#DevelopChangesUnderNDA\" >#DevelopChangesUnderNDA</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1982,8 +1981,8 @@
#. type: Content of: <dl><dt>
msgid ""
"Is it enough just to put a copy of the GNU GPL in my repository? <span class="
-"\"anchor-reference-id\">(<a href=\"#LicenseCopyOnly\" >#LicenseCopyOnly</"
-"a>)</span>"
+"\"anchor-reference-id\">(<a href=\"#LicenseCopyOnly\" >#LicenseCopyOnly</a>)"
+"</span>"
msgstr ""
"æGNU GPLçæ·è´æ¾å¨æç代ç
åºéæ¯ä¸æ¯å°±ç®åºç¨äºGPLï¼<span class=\"anchor-"
"reference-id\">(<a href=\"#LicenseCopyOnly\" >#LicenseCopyOnly</a>)</span>"
@@ -2263,8 +2262,8 @@
"\"anchor-reference-id\">(<a href=\"#SystemLibraryException"
"\">#SystemLibraryException</a>)</span>"
msgstr ""
-"ææ¯å¦å¯ä»¥ç¨ä¸æç³»ç»åºè¿æ¥ä¸ä¸ªGPLç¨åºï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#SystemLibraryException\">#SystemLibraryException</a>)</span>"
+"ææ¯å¦å¯ä»¥ç¨ä¸æç³»ç»åºè¿æ¥ä¸ä¸ªGPLç¨åºï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#SystemLibraryException\">#SystemLibraryException</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -2298,8 +2297,8 @@
"software? <span class=\"anchor-reference-id\">(<a href=\"#GPLIncompatibleLibs"
"\" >#GPLIncompatibleLibs</a>)</span>"
msgstr ""
-"GPL软件使ç¨éGPLå
¼å®¹åºä¼æä»ä¹æ³å¾é®é¢ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#GPLIncompatibleLibs\" >#GPLIncompatibleLibs</a>)</span>"
+"GPL软件使ç¨éGPLå
¼å®¹åºä¼æä»ä¹æ³å¾é®é¢ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#GPLIncompatibleLibs\" >#GPLIncompatibleLibs</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -2439,9 +2438,9 @@
#. type: Content of: <dl><dd><blockquote><p>
msgid ""
"Linking <var>[name of your program]</var> statically or dynamically with "
-"other modules is making a combined work based on <var>[name of your "
-"program]</var>. Thus, the terms and conditions of the GNU General Public "
-"License cover the whole combination."
+"other modules is making a combined work based on <var>[name of your program]"
+"</var>. Thus, the terms and conditions of the GNU General Public License "
+"cover the whole combination."
msgstr ""
"éææå¨ææ<var>[ä½ çç¨åºå称]</var>åå
¶ä»æ¨¡åè¿æ¥å¨ä¸èµ·å°±æ¯å¨<var>[ä½ çç¨åº"
"å称]</var>çåºç¡ä¸åå·¥ä½ãå æ¤ï¼GNUéç¨å
Œ
±è®¸å¯è¯çæ¡æ¬¾ä¼è¦çå°æ´ä¸ªå并çå·¥"
@@ -2452,18 +2451,18 @@
"In addition, as a special exception, the copyright holders of <var>[name of "
"your program]</var> give you permission to combine <var>[name of your "
"program]</var> with free software programs or libraries that are released "
-"under the GNU LGPL and with code included in the standard release of "
-"<var>[name of library]</var> under the <var>[name of library's license]</"
-"var> (or modified versions of such code, with unchanged license). You may "
-"copy and distribute such a system following the terms of the GNU GPL for "
-"<var>[name of your program]</var> and the licenses of the other code "
-"concerned{, provided that you include the source code of that other code "
-"when and as the GNU GPL requires distribution of source code}."
+"under the GNU LGPL and with code included in the standard release of <var>"
+"[name of library]</var> under the <var>[name of library's license]</var> (or "
+"modified versions of such code, with unchanged license). You may copy and "
+"distribute such a system following the terms of the GNU GPL for <var>[name "
+"of your program]</var> and the licenses of the other code concerned{, "
+"provided that you include the source code of that other code when and as the "
+"GNU GPL requires distribution of source code}."
msgstr ""
"å¦å¤ï¼ä½ä¸ºä¸ä¸ªç¹ä¾ï¼<var>[ä½
ç¨åºçå称]</var>ççæææè
èµäºä½ æ<var>[ä½ ç¨åº"
-"çå称]</var>åèªç±è½¯ä»¶ææç
§GNU
LGPLåå¸çåºå并çæå©ï¼å
¶ä¸<var>[åºçå"
-"称]</var>æ ååå¸ä»£ç 使ç¨<var>[åºç许å¯è¯]</var>ï¼æè
该代ç çä¿®æ¹çï¼è®¸å¯è¯"
-"ä¸åï¼ãä½ å¯ä»¥å¤å¶ååå¸è¯¥ç³»ç»ï¼å
¶è®¸å¯è¯æ¡æ¬¾æ¯<var>[ä½
ç¨åºçå称]</var>使ç¨ç"
+"çå称]</var>åèªç±è½¯ä»¶ææç
§GNU
LGPLåå¸çåºå并çæå©ï¼å
¶ä¸<var>[åºçå称]"
+"</var>æ ååå¸ä»£ç 使ç¨<var>[åºç许å¯è¯]</var>ï¼æè
该代ç
çä¿®æ¹çï¼è®¸å¯è¯ä¸"
+"åï¼ãä½ å¯ä»¥å¤å¶ååå¸è¯¥ç³»ç»ï¼å
¶è®¸å¯è¯æ¡æ¬¾æ¯<var>[ä½
ç¨åºçå称]</var>使ç¨ç"
"GNU GPL许å¯è¯åå
¶ä»ä»£ç {, åå®ä½ æç
§GNU GPLçåå¸è¦æ±å
å«äºå
¶ä»ç¨åºçæºä»£ç }"
"使ç¨çç¸å
³è®¸å¯è¯ã"
@@ -2620,8 +2619,8 @@
msgid ""
"I would like to release a program I wrote under the GNU GPL, but I would "
"like to use the same code in nonfree programs. <span class=\"anchor-"
-"reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</"
-"a>)</span>"
+"reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" >#ReleaseUnderGPLAndNF</a>)"
+"</span>"
msgstr ""
"ææ¿æææåçç¨åºæç
§GNU
GPLåå¸ï¼ä½æ¯æä¹æ³å¨éèªç±è½¯ä»¶é使ç¨åæ ·ç代ç ã"
"<span class=\"anchor-reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\" "
@@ -2931,8 +2930,8 @@
"class=\"anchor-reference-id\">(<a href=\"#WhatCaseIsOutputGPL\" "
">#WhatCaseIsOutputGPL</a>)</span>"
msgstr ""
-"ä»ä¹æ
åµä¸GPL软件çè¾åºé¨åä¹è¦éµå¾ªGPLï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#WhatCaseIsOutputGPL\" >#WhatCaseIsOutputGPL</a>)</span>"
+"ä»ä¹æ
åµä¸GPL软件çè¾åºé¨åä¹è¦éµå¾ªGPLï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#WhatCaseIsOutputGPL\" >#WhatCaseIsOutputGPL</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3539,8 +3538,8 @@
"href=\"#MereAggregation\" >#MereAggregation</a>)</span>"
msgstr ""
"“èåç”åå
¶ä»“ä¿®æ¹ç”æä»ä¹ä¸åï¼<span class="
-"\"anchor-reference-id\">(<a href=\"#MereAggregation\" >#MereAggregation</"
-"a>)</span>"
+"\"anchor-reference-id\">(<a href=\"#MereAggregation\" >#MereAggregation</a>)"
+"</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3619,8 +3618,8 @@
"\"#AssignCopyright\" >#AssignCopyright</a>)</span>"
msgstr ""
"为ä»ä¹FSFè¦æ±å¯¹FSFæçæ软件çè´¡ç®è
æçæèµäºFSFï¼å¦æææGPL软件ççæï¼æ"
-"ä¹éè¦è¿æ ·ååï¼å¦æéè¦ï¼æåºè¯¥æä¹åï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#AssignCopyright\" >#AssignCopyright</a>)</span>"
+"ä¹éè¦è¿æ ·ååï¼å¦æéè¦ï¼æåºè¯¥æä¹åï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#AssignCopyright\" >#AssignCopyright</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3729,8 +3728,8 @@
"href=\"#GPLCommercially\" >#GPLCommercially</a>)</span>"
msgstr ""
"å¦ææéè¿GNU
GPLè·å¾äºä¸ä¸ªè½¯ä»¶ï¼é£ä¹ææ¯å¦å¯ä»¥ä¿®æ¹è¯¥è½¯ä»¶ç代ç
ï¼æå®åæä¸ä¸ª"
-"æ°çç¨åºï¼ç¶ååæç
§åä¸ç¨åºåè¡åéå®ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#GPLCommercially\" >#GPLCommercially</a>)</span>"
+"æ°çç¨åºï¼ç¶ååæç
§åä¸ç¨åºåè¡åéå®ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#GPLCommercially\" >#GPLCommercially</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3753,8 +3752,8 @@
#. type: Content of: <dl><dt>
msgid ""
"Can I use the GPL for something other than software? <span class=\"anchor-"
-"reference-id\">(<a href=\"#GPLOtherThanSoftware\" >#GPLOtherThanSoftware</"
-"a>)</span>"
+"reference-id\">(<a href=\"#GPLOtherThanSoftware\" >#GPLOtherThanSoftware</a>)"
+"</span>"
msgstr ""
"GPLå¯ä»¥ä¸ç¨äºè½¯ä»¶åï¼<span class=\"anchor-reference-id\">(<a href="
"\"#GPLOtherThanSoftware\" >#GPLOtherThanSoftware</a>)</span>"
@@ -3935,11 +3934,11 @@
#. type: Content of: <dl><dt>
msgid ""
"Where can I learn more about the GCC Runtime Library Exception? <span class="
-"\"anchor-reference-id\">(<a href=\"#LibGCCException\" >#LibGCCException</"
-"a>)</span>"
+"\"anchor-reference-id\">(<a href=\"#LibGCCException\" >#LibGCCException</a>)"
+"</span>"
msgstr ""
-"åªéå¯ä»¥äºè§£æ´å¤å
³äºGCCè¿è¡åºä¾å¤ç详æ
ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#LibGCCException\" >#LibGCCException</a>)</span>"
+"åªéå¯ä»¥äºè§£æ´å¤å
³äºGCCè¿è¡åºä¾å¤ç详æ
ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#LibGCCException\" >#LibGCCException</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4059,8 +4058,8 @@
"only? <span class=\"anchor-reference-id\">(<a href=\"#ModifiedJustBinary\" "
">#ModifiedJustBinary</a>)</span>"
msgstr ""
-"æå¯å¦åªåå¸GPLç¨åºä¿®æ¹ççäºè¿å¶å½¢å¼ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#ModifiedJustBinary\" >#ModifiedJustBinary</a>)</span>"
+"æå¯å¦åªåå¸GPLç¨åºä¿®æ¹ççäºè¿å¶å½¢å¼ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#ModifiedJustBinary\" >#ModifiedJustBinary</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4397,8 +4396,8 @@
"\"#InternalDistribution\" >#InternalDistribution</a>)</span>"
msgstr ""
"å¨ç»ç»æå
¬å¸å
é¨ä½¿ç¨æ¯ä¸æ¯“åå¸”ï¼ <span
class=\"anchor-"
-"reference-id\">(<a href=\"#InternalDistribution\" >#InternalDistribution</"
-"a>)</span>"
+"reference-id\">(<a href=\"#InternalDistribution\" >#InternalDistribution</a>)"
+"</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4506,8 +4505,8 @@
"\"#WhySomeGPLAndNotLGPL\" >#WhySomeGPLAndNotLGPL</a>)</span>"
msgstr ""
"为ä»ä¹æäºGNUåºæ¯æç
§æ®éçGPLåå¸ï¼èä¸æ¯æç
§LGPLåå¸ï¼<span class=\"anchor-"
-"reference-id\">(<a href=\"#WhySomeGPLAndNotLGPL\" >#WhySomeGPLAndNotLGPL</"
-"a>)</span>"
+"reference-id\">(<a href=\"#WhySomeGPLAndNotLGPL\" >#WhySomeGPLAndNotLGPL</a>)"
+"</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4726,11 +4725,11 @@
#. type: Content of: <dl><dt>
msgid ""
-"Why don't you use the GPL for manuals? <span class=\"anchor-reference-id"
-"\">(<a href=\"#WhyNotGPLForManuals\" >#WhyNotGPLForManuals</a>)</span>"
+"Why don't you use the GPL for manuals? <span class=\"anchor-reference-id\">"
+"(<a href=\"#WhyNotGPLForManuals\" >#WhyNotGPLForManuals</a>)</span>"
msgstr ""
-"WhyNotGPLForManuals\">为ä»ä¹æåä¸ç¨GPLï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#WhyNotGPLForManuals\" >#WhyNotGPLForManuals</a>)</span>"
+"WhyNotGPLForManuals\">为ä»ä¹æåä¸ç¨GPLï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#WhyNotGPLForManuals\" >#WhyNotGPLForManuals</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4842,8 +4841,8 @@
msgstr ""
"æå¨ç¼åä¸ä¸ªç½ç«ç»´æ¤ç³»ç»ï¼æ人称ä¹ä¸º“<a
href=\"/philosophy/words-to-"
"avoid.html#Content\">å
容管çç³»ç»</a>”ï¼ï¼æè
æ¯å
¶ä»éè¿æ¨¡æ¿å建ç½é¡µç"
-"åºç¨ãè¿äºæ¨¡æ¿åºè¯¥ä½¿ç¨ä»ä¹æ ·ç许å¯è¯å¢ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#WMS\" >#WMS</a>)</span>"
+"åºç¨ãè¿äºæ¨¡æ¿åºè¯¥ä½¿ç¨ä»ä¹æ ·ç许å¯è¯å¢ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#WMS\" >#WMS</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4913,8 +4912,8 @@
"<span class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\" "
">#NonFreeTools</a>)</span>"
msgstr ""
-"æè½å¦æç¨ä¸æå·¥å
·å¼åç软件æç
§GPLææï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#NonFreeTools\" >#NonFreeTools</a>)</span>"
+"æè½å¦æç¨ä¸æå·¥å
·å¼åç软件æç
§GPLææï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#NonFreeTools\" >#NonFreeTools</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -5147,8 +5146,8 @@
#. type: Content of: <dl><dt>
msgid ""
-"Who has the power to enforce the GPL? <span class=\"anchor-reference-id"
-"\">(<a href=\"#WhoHasThePower\" >#WhoHasThePower</a>)</span>"
+"Who has the power to enforce the GPL? <span class=\"anchor-reference-id\">"
+"(<a href=\"#WhoHasThePower\" >#WhoHasThePower</a>)</span>"
msgstr ""
"è°å¯ä»¥è¿è¡GPLæ§æ³ï¼<span class=\"anchor-reference-id\">(<a href="
"\"#WhoHasThePower\" >#WhoHasThePower</a>)</span>"
@@ -5175,8 +5174,8 @@
">#OOPLang</a>)</span>"
msgstr ""
"å¨ä¸ä¸ªé¢å对象çè¯è¨ï¼æ¯å¦Javaä¸ï¼å¦ææä¸å
ä¿®æ¹å°ä½¿ç¨äºä¸ä¸ªGPLç±»ï¼å¹¶åæäºå"
-"ç±»ï¼é£ä¹GPLä¼å¯¹æ´å¤§èå´çç¨åºæä»ä¹å½±åï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#OOPLang\" >#OOPLang</a>)</span>"
+"ç±»ï¼é£ä¹GPLä¼å¯¹æ´å¤§èå´çç¨åºæä»ä¹å½±åï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#OOPLang\" >#OOPLang</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -5482,8 +5481,8 @@
"\">(<a href=\"#SubscriptionFee\" >#SubscriptionFee</a>)</span>"
msgstr ""
"ææ¯å¦å¯ä»¥å¨ä¸ä¸ªç¨æ·ä¸ç»§ç»ä»è´¹å°±ä¸åå·¥ä½ç设å¤ä¸ä½¿ç¨GPL软件ï¼<span
class="
-"\"anchor-reference-id\">(<a href=\"#SubscriptionFee\" >#SubscriptionFee</"
-"a>)</span>"
+"\"anchor-reference-id\">(<a href=\"#SubscriptionFee\" >#SubscriptionFee</a>)"
+"</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -5536,8 +5535,8 @@
"How does GPLv3 make BitTorrent distribution easier? <span class=\"anchor-"
"reference-id\">(<a href=\"#BitTorrent\" >#BitTorrent</a>)</span>"
msgstr ""
-"GPLv3æ¯ææ ·è®©BitTorrentåè¡åå¾æ´å®¹æçï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#BitTorrent\" >#BitTorrent</a>)</span>"
+"GPLv3æ¯ææ ·è®©BitTorrentåè¡åå¾æ´å®¹æçï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#BitTorrent\" >#BitTorrent</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -5582,8 +5581,8 @@
"What is tivoization? How does GPLv3 prevent it? <span class=\"anchor-"
"reference-id\">(<a href=\"#Tivoization\" >#Tivoization</a>)</span>"
msgstr ""
-"tivoizationæçæ¯ä»ä¹ï¼GPLv3å¦ä½ç¦æ¢å®ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#Tivoization\" >#Tivoization</a>)</span>"
+"tivoizationæçæ¯ä»ä¹ï¼GPLv3å¦ä½ç¦æ¢å®ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#Tivoization\" >#Tivoization</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -5641,8 +5640,8 @@
#. type: Content of: <dl><dt>
msgid ""
-"Can I use the GPL to license hardware? <span class=\"anchor-reference-id"
-"\">(<a href=\"#GPLHardware\" >#GPLHardware</a>)</span>"
+"Can I use the GPL to license hardware? <span class=\"anchor-reference-id\">"
+"(<a href=\"#GPLHardware\" >#GPLHardware</a>)</span>"
msgstr ""
"è½å¦ç¨GPLä½ä¸ºç¡¬ä»¶è®¸å¯è¯ï¼<span class=\"anchor-reference-id\">(<a
href="
"\"#GPLHardware\" >#GPLHardware</a>)</span>"
@@ -5983,8 +5982,8 @@
#. type: Content of: <dl><dt>
msgid ""
"If I distribute a GPLv3-covered program, can I provide a warranty that is "
-"voided if the user modifies the program? <span class=\"anchor-reference-id"
-"\">(<a href=\"#v3ConditionalWarranty\" >#v3ConditionalWarranty</a>)</span>"
+"voided if the user modifies the program? <span class=\"anchor-reference-id\">"
+"(<a href=\"#v3ConditionalWarranty\" >#v3ConditionalWarranty</a>)</span>"
msgstr ""
"å¦ææåå¸GPLv3ç¨åºï¼ææ¯å¦å¯ä»¥è¯´å¦æç¨æ·ä¿®æ¹è¯¥ç¨åºï¼é£ä¹å®åä¿é就失æã"
"<span class=\"anchor-reference-id\">(<a href=\"#v3ConditionalWarranty\" "
@@ -6224,8 +6223,8 @@
"\"#SourceInCVS\" >#SourceInCVS</a>)</span>"
msgstr ""
"å¦ææå¨FTPæå¡å¨ä¸åå¸äºè¿å¶èåæ¶æä¾äºæºä»£ç
ççæ¬æ§å¶åºé¾æ¥ï¼æ¯å¦æ¯CVSæ"
-"Subversionï¼é£ä¹ææ¯å¦ä¹æ¯éµå®äºGPLv3ï¼<span
class=\"anchor-reference-id"
-"\">(<a href=\"#SourceInCVS\" >#SourceInCVS</a>)</span>"
+"Subversionï¼é£ä¹ææ¯å¦ä¹æ¯éµå®äºGPLv3ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#SourceInCVS\" >#SourceInCVS</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -6690,13 +6689,13 @@
"OK: Combination is under GPLv2 or later <a href=\"#compat-matrix-"
"footnote-7\">[7]</a>"
msgstr ""
-"å¯ä»¥ï¼ç»åéµå¾ª GPLv2 æè
å
¶ä»¥åç <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a>"
+"å¯ä»¥ï¼ç»åéµå¾ª GPLv2 æè
å
¶ä»¥åç <a
href=\"#compat-matrix-footnote-7\">"
+"[7]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-8\">[8]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-8\">[8]"
+"</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-8\">[8]</a>"
@@ -6706,15 +6705,15 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-3\">[3]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-3\">[3]"
+"</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-3\">[3]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-7\">[7]"
+"</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-7\">[7]</a>"
@@ -6723,8 +6722,8 @@
"OK: Convey copied code under GPLv2 <a href=\"#compat-matrix-"
"footnote-7\">[7]</a>"
msgstr ""
-"å¯ä»¥ï¼æç
§ GPLv2 è¾éå¤å¶ç代ç <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a>"
+"å¯ä»¥ï¼æç
§ GPLv2 è¾éå¤å¶ç代ç <a
href=\"#compat-matrix-footnote-7\">"
+"[7]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
@@ -6751,16 +6750,16 @@
"OK: Convey copied code under GPLv3 <a href=\"#compat-matrix-"
"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
msgstr ""
-"å¯ä»¥ï¼æç
§ GPLv3 è¾éå¤å¶ç代ç <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
+"å¯ä»¥ï¼æç
§ GPLv3 è¾éå¤å¶ç代ç <a
href=\"#compat-matrix-footnote-7\">"
+"[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
"OK: Convey copied code under GPLv2 <a href=\"#compat-matrix-"
"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-1\">[1]</a>"
msgstr ""
-"å¯ä»¥ï¼æç
§ GPLv2 è¾éå¤å¶ç代ç <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-1\">[1]</a>"
+"å¯ä»¥ï¼æç
§ GPLv2 è¾éå¤å¶ç代ç <a
href=\"#compat-matrix-footnote-7\">"
+"[7]</a><a href=\"#compat-matrix-footnote-1\">[1]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
@@ -6780,24 +6779,24 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-8\">[8]</a><a href=\"#compat-matrix-footnote-3\">[3]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-8\">[8]"
+"</a><a href=\"#compat-matrix-footnote-3\">[3]</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-8\">[8]</a><a "
"href=\"#compat-matrix-footnote-3\">[3]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-7\">[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-7\">[7]"
+"</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-7\">[7]</a><a "
"href=\"#compat-matrix-footnote-8\">[8]</a>"
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under LGPLv3 <a href=\"#compat-matrix-"
-"footnote-4\">[4]</a>"
+"OK: Combination is under LGPLv3 <a href=\"#compat-matrix-footnote-4\">"
+"[4]</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª LGPLv3 <a
href=\"#compat-matrix-footnote-4\">[4]</a>"
@@ -6807,8 +6806,8 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Combination is under GPLv3 <a href=\"#compat-matrix-"
-"footnote-9\">[9]</a>"
+"OK: Combination is under GPLv3 <a href=\"#compat-matrix-footnote-9\">[9]"
+"</a>"
msgstr ""
"å¯ä»¥ï¼ç»åéµå¾ª GPLv3 <a
href=\"#compat-matrix-footnote-9\">[9]</a>"
@@ -6983,8 +6982,8 @@
#~ "footnote-7\">[7]</a>"
#~ msgid ""
-#~ "OK: Convey code under GPLv3 <a href=\"#compat-matrix-"
-#~ "footnote-7\">[7]</a>"
+#~ "OK: Convey code under GPLv3 <a href=\"#compat-matrix-footnote-7\">[7]"
+#~ "</a>"
#~ msgstr ""
#~ "å¯ä»¥ï¼æç
§ GPLv3 è¾é代ç <a
href=\"#compat-matrix-footnote-7\">[7]</"
#~ "a>"
Index: philosophy/free-sw.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.zh-cn.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- philosophy/free-sw.zh-cn.html 22 Mar 2019 00:30:04 -0000 1.17
+++ philosophy/free-sw.zh-cn.html 3 Aug 2019 13:58:20 -0000 1.18
@@ -83,7 +83,9 @@
åå¦è·å¾èªç±è½¯ä»¶æ·è´çç¨æ·éµå®äºèªç±è½¯ä»¶ç许å¯è¯æ¡æ¬¾ï¼é£ä¹è¯¥èªç±è½¯ä»¶å¿
须为ç¨æ·æä¾èªç±è½¯ä»¶çå项åºæ¬èªç±ãå¨èªç±æ¹é¢å¯¹ç¨æ·å
以éå¶æè
è¦æ±ä»è´¹æè½å®è·µè¿äºèªç±åä¸èµäºç¨æ·èªç±æ²¡æä»ä¹ä¸¤æ
·ï¼å æ¤è¿æ ·çç¨åºä¸æ¯èªç±è½¯ä»¶ã
</p>
-<p>æ¬æçéä»ç»å¨åªäºæ
åµä¸ï¼è½¯ä»¶ä¼è¢«è®¤ä¸ºæä¾äºæå¥å¤ºäºæ个èªç±åº¦ã</p>
+<h3>æ¾æ¸
å ç¹</h3>
+
+<p>å¨æ¬æç以ä¸é¨åï¼æ们ä¼è¿ä¸æ¥åç¡®å°è§£éè¿äºèªç±é对åç§é®é¢ä¼å¦ä½æ©å±æè½ä½¿è½¯ä»¶èªç±ã</p>
<h4>èªç±åº¦0ï¼æ 论ç¨æ·åºäºä½ç§ç®çï¼å¿
é¡»å¯ä»¥æç
§ç¨æ·ææ¿èªç±å°è¿è¡è¯¥è½¯ä»¶ã</h4>
@@ -94,10 +96,12 @@
<p>
âèªç±å°è¿è¡ç¨åºâæå³ç没æ人å¯ä»¥ç¦æ¢æé»æ¢ç¨æ·è¿è¡è¯¥ç¨åºãè¿å该ç¨åºçåè½ç¹æ§æ²¡æå
³ç³»ï¼æ¢ä¸èè该ç¨åºå¨ç¹å®ç¯å¢ä¸çå¯ç¨æ§ï¼ä¹ä¸èè该ç¨åºå¯¹ç¹å®è®¡ç®çæææ§ã</p>
+<p>ä¾å¦ï¼å¦æ代ç éæå°æç»æäºææä¹çè¾å
¥——æè
çè³æ
æ¡ä»¶å°å¤±æ——è¿å°±å¯è½ä½¿è¯¥ç¨åºä¸é£ä¹æç¨ï¼çè³å¯è½å®å
¨æ ç¨ï¼ä½æ¯è¿å¹¶ä¸å¦¨ç¢ç¨æ·è¿è¡è¯¥ç¨åºçèªç±ï¼å
æ¤ï¼è¿åèªç±ä¹é¶å¹¶æ çç¾ãå¦æ该ç¨åºæ¯èªç±çï¼é£ä¹å
¶ç¨æ·å¯ä»¥å
æè¿äºæ ç¨ä¹å¤ï¼å 为èªç±ä¹ä¸åèªç±ä¹ä¸å
许ç¨æ·å社åºä¿®æ¹åå表ä¸å¸¦æéæ代ç çæ¹è¿çæ¬ã</p>
+
<h4>å¦ä¹ åæ´æ¹ç¨åºæºä»£ç çèªç±</h4>
<p>
-èªç±åº¦1å3ï¼èªç±å°ä¿®æ¹è½¯ä»¶ï¼èªç±å°åå¸ä¿®æ¹åç软件ï¼æå³çç¨æ·å¿
é¡»ææ访é®ç¨åºçæºä»£ç ãç±æ¤ï¼è®¿é®æºä»£ç
æ¯æ为èªç±è½¯ä»¶çå¿
è¦æ¡ä»¶ãæ··ç¼ï¼Obfuscatedï¼åç“æºä»£ç
”ä¸è½è¢«ç®ä½æ¤å¤è®¨è®ºçæºä»£ç ã
+èªç±åº¦1å3ï¼èªç±å°ä¿®æ¹è½¯ä»¶ï¼èªç±å°åå¸ä¿®æ¹åç软件ï¼æå³çç¨æ·å¿
é¡»ææ访é®ç¨åºçæºä»£ç ãç±æ¤ï¼è®¿é®æºä»£ç
æ¯æ为èªç±è½¯ä»¶çå¿
è¦æ¡ä»¶ãæ··ç¼ï¼Obfuscatedï¼åç“æºä»£ç
”ä¸æ¯çæ£çæºä»£ç ï¼ä¸è½è¢«ç®ä½æ¤å¤è®¨è®ºçæºä»£ç ã
</p>
<p>
@@ -256,12 +260,12 @@
<ul>
<li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.162&r2=1.163";>Version
-1.163</a>ï¼æ确软件çå个åºæ¬èªç±éç¨äºä»»ä½ä»¥åææç¨æ·ï¼å¹¶ä¸æ¾æ¸
ä»»ä½è¦æ±ä»è´¹æè½å®è·µè¿äºèªç±æå
¶ä¸é¨åèªç±çè¡ä¸ºé½æ¯å¦å®è¿äºèªç±çè¡ä¸ºã</li>
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.164&r2=1.165";>Version
+1.165</a>ï¼æ¾æ¸
ç¨åºä¸çéæ代ç
并没æå¦è®¤ç¨æ·çèªç±ä¹é¶ï¼è¿èèªç±ä¹ä¸åèªç±ä¹ä¸ä½¿ç¨æ·å¯ä»¥å
æè¿äºéæ代ç ã</li>
<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.152&r2=1.153";>Version
-1.153</a>ï¼å¼ºè°èªç±åº¦0æ¯ç¨æ·å¯ä»¥åºäºä»»ä½ç®çèè¿è¡è½¯ä»¶ã</li>
+1.153</a>ï¼å¼ºè°è¿è¡è½¯ä»¶çèªç±æ¯ä¸è½æä»»ä½æ
åµæ¥é²æ¢ç¨æ·è¿è¡è½¯ä»¶ã</li>
<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.140&r2=1.141";>Version
@@ -445,7 +449,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/03/22 00:30:04 $
+$Date: 2019/08/03 13:58:20 $
<!-- timestamp end -->
</p>
Index: philosophy/fs-translations.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.zh-cn.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/fs-translations.zh-cn.html 13 May 2019 14:00:29 -0000
1.10
+++ philosophy/fs-translations.zh-cn.html 3 Aug 2019 13:58:20 -0000
1.11
@@ -556,6 +556,15 @@
<tr><th>èªç±è½¯ä»¶</th>
<td lang="ms" xml:lang="ms">
perisian bebas</td></tr>
+<tr><th>å
费软件</th>
+<td lang="ms" xml:lang="ms">
+perisian percuma</td></tr>
+<tr><th>ä¸æ软件</th>
+<td lang="ms" xml:lang="ms">
+perisian hakmilik</td></tr>
+<tr><th>åä¸è½¯ä»¶</th>
+<td lang="ms" xml:lang="ms">
+perisian dagangan</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
@@ -1171,7 +1180,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/05/13 14:00:29 $
+$Date: 2019/08/03 13:58:20 $
<!-- timestamp end -->
</p>
Index: philosophy/po/free-sw.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/po/free-sw.zh-cn-en.html 22 Mar 2019 00:30:04 -0000 1.10
+++ philosophy/po/free-sw.zh-cn-en.html 3 Aug 2019 13:58:20 -0000 1.11
@@ -128,8 +128,11 @@
freedoms in question, and thus renders the program nonfree.
</p>
-<p>The rest of this page clarifies certain points about what makes
-specific freedoms adequate or not.</p>
+<h3>Clarifying the line at various points</h3>
+
+<p>In the rest of this article we explain more precisely how far the
+various freedoms need to extend, on various issues, in order for a
+program to be free.</p>
<h4>The freedom to run the program as you wish</h4>
@@ -151,11 +154,20 @@
functioning in any given environment, or whether it is useful for any
particular computing activity.</p>
+<p>For example, if the code arbitrarily rejects certain meaningful
+inputs—or even fails unconditionally—that may make the
+program less useful, perhaps even totally useless, but it does not
+deny users the freedom to run the program, so it does not conflict
+with freedom 0. If the program is free, the users can overcome the
+loss of usefulness, because freedoms 1 and 3 permit users and
+communities to make and distribute modified versions without the
+arbitrary nuisance code.</p>
+
<h4>The freedom to study the source code and make changes</h4>
<p>
In order for freedoms 1 and 3 (the freedom to make changes and the
-freedom to publish the changed versions) to be meaningful, you must have
+freedom to publish the changed versions) to be meaningful, you need to have
access to the source code of the program. Therefore, accessibility of
source code is a necessary condition for free software. Obfuscated
“source code” is not real source code and does not count
@@ -448,10 +460,9 @@
<ul>
-<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.162&r2=1.163";>Version
-1.163</a>: Clarify that the four freedoms apply to any and all users,
-and that requiring users to pay to exercise some of these freedoms is
-a way of denying them.</li>
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.164&r2=1.165";>Version
+1.165</a>: Clarify that arbitrary annoyances in the code do not
+negate freedom 0, and that freedoms 1 and 3 enable users to remove them.</li>
<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.152&r2=1.153";>Version
1.153</a>: Clarify that freedom to run the program means nothing stops
@@ -642,7 +653,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/03/22 00:30:04 $
+$Date: 2019/08/03 13:58:20 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/free-sw.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- philosophy/po/free-sw.zh-cn.po 3 Aug 2019 13:43:28 -0000 1.39
+++ philosophy/po/free-sw.zh-cn.po 3 Aug 2019 13:58:20 -0000 1.40
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-07-29 21:55+0000\n"
"X-Generator: Poedit 1.7.5\n"
#. type: Content of: <title>
Index: philosophy/po/fs-translations.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.zh-cn-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/fs-translations.zh-cn-en.html 13 May 2019 14:00:29 -0000
1.6
+++ philosophy/po/fs-translations.zh-cn-en.html 3 Aug 2019 13:58:20 -0000
1.7
@@ -600,6 +600,15 @@
<tr><th>Free Software</th>
<td lang="ms" xml:lang="ms">
perisian bebas</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="ms" xml:lang="ms">
+perisian percuma</td></tr>
+<tr><th>Proprietary Software</th>
+<td lang="ms" xml:lang="ms">
+perisian hakmilik</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="ms" xml:lang="ms">
+perisian dagangan</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -1044,7 +1053,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/05/13 14:00:29 $
+$Date: 2019/08/03 13:58:20 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/fs-translations.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.zh-cn.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/po/fs-translations.zh-cn.po 3 Aug 2019 13:44:21 -0000
1.14
+++ philosophy/po/fs-translations.zh-cn.po 3 Aug 2019 13:58:20 -0000
1.15
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-07-31 11:55+0000\n"
#. type: Content of: <title>
msgid ""
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www distros/common-distros.zh-cn.html distros/p...,
GNUN <=