[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses license-compatibility.zh-cn.html p...
|
From: |
GNUN |
|
Subject: |
www/licenses license-compatibility.zh-cn.html p... |
|
Date: |
Wed, 29 Dec 2021 21:29:58 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 21/12/29 21:29:58
Modified files:
licenses : license-compatibility.zh-cn.html
licenses/po : license-compatibility.zh-cn-en.html
license-compatibility.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-compatibility.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.zh-cn.po?cvsroot=www&r1=1.10&r2=1.11
Patches:
Index: license-compatibility.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/license-compatibility.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- license-compatibility.zh-cn.html 24 Nov 2020 04:29:49 -0000 1.3
+++ license-compatibility.zh-cn.html 30 Dec 2021 02:29:57 -0000 1.4
@@ -1,21 +1,23 @@
<!--#set var="ENGLISH_PAGE" value="/licenses/license-compatibility.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>许å¯è¯å
¼å®¹æ§åå次ææ - GNU å·¥ç¨ -
èªç±è½¯ä»¶åºéä¼</title>
<!--#include virtual="/licenses/po/license-compatibility.translist" -->
<!--#include virtual="/server/banner.zh-cn.html" -->
+<div class="article reduced-width">
<h2>许å¯è¯å
¼å®¹æ§åå次ææ</h2>
-<p>Richard Stallman è</p>
+<address class="byline">Richard Stallman è</address>
<p>å¦æä½ è¦æ两个èªç±ç¨åºåè为ä¸ï¼æè
æå
¶ä¸ä¹ä¸ç代ç 并å
¥å¦ä¸ä¸ªï¼é£ä¹å°±ä¼æä¸ä¸ªå®ä»¬ç许å¯è¯æ¯å¦å
许/ç¦æ¢è¿æ
·åçé®é¢ã<a
-href="#f1">(*)</a></p>
+href="#f1">[1]</a></p>
-<p>å¦æ两个软件使ç¨åæ
·ç许å¯è¯ï¼åºè¯¥æ²¡æé®é¢ï¼åå®è¯¥è®¸å¯è¯è±¡å
ä¹ææçèªç±è½¯ä»¶è®¸å¯è¯ä¸æ ·é¡ºçæç« ã<a href="#f2">(**)</a></p>
+<p>å¦æ两个软件使ç¨åæ
·ç许å¯è¯ï¼åºè¯¥æ²¡æé®é¢ï¼åå®è¯¥è®¸å¯è¯è±¡å
ä¹ææçèªç±è½¯ä»¶è®¸å¯è¯ä¸æ ·é¡ºçæç« ã<a href="#f2">[2]</a></p>
<p>é£ä¹å¦æ许å¯è¯ä¸ä¸æ
·ä¼å¦ä½å¢ï¼ä¸è¬æ¥è¯´ï¼å¦æææ¹æ³å¯ä»¥å并代ç
èåè½åæ¶éµå¾ªå个代ç
ç许å¯è¯ï¼é£ä¹æ们就说è¿äºè®¸å¯è¯æ¯
<em>å
¼å®¹ç</em>ãå
¶ç»æç»å¸¸æ¯ä¸ä¸ªç±å个é¨å使ç¨ä¸å许å¯è¯çç»åç¨åº——ä½ä¹ä¸å°½ç¶ãå
·æè¿ä¸ªå
¼å®¹æ§ï¼æè
没ææ¤å
¼å®¹æ§ï¼æ¯è®¸å¯è¯ç»åå¨ä¸èµ·çç¹ç¹ï¼è¿ä¸ªç¹ç¹å¹¶ä¸ä¾èµäºä½
使ç¨å®ä»¬ç顺åºã该许å¯è¯ç»åè¿å³å®ç该å并ç¨åºéè¦åªä¸ªè®¸å¯è¯ã</p>
@@ -29,7 +31,7 @@
“顺ä»å许å¯è¯”ï¼çç±æ¯å®ä»¬å¨ç¨æ·çèªç±è¢«å¦å®æ¶æ²¡æ说
“且ã</p>
<p>å¨æ使ç¨æ¾æ£å许å¯è¯ç代ç
åå¨ä¸èµ·æ¶ï¼ç»åç¨åºçæ¯ä¸ªé¨åé½å¸¦æèªå·±ç许å¯è¯ãå½è¿äºä»£ç
交ç»å¨ä¸èµ·æ æ³å辨æ¶ï¼ç»åç¨åºåºè¯¥å¸¦ä¸ææ代ç
ç许å¯è¯ãç±äºè¿äºè®¸å¯è¯é½æ¯æ¾æ£åçï¼æ以å
¨é½å¸¦ä¸é¤äºå¤ªé¿ä¹å¤ä¹æ²¡æå«çé®é¢ã<a
-href="#f3">(***)</a></p>
+href="#f3">[3]</a></p>
<p>åçå¯ç¥ï¼æ¾æ£å许å¯è¯é常ä¹å copyleft 许å¯è¯å
¼å®¹ãå¨ç»åç¨åºä¸ï¼ä½¿ç¨æ¾æ£å许å¯è¯ç代ç
ä»ç¶å¸¦çæ¾æ£å许å¯è¯ï¼èç»åç¨åºæ´ä½ä½¿ç¨
copyleft 许å¯è¯ãæä¸ä¸ªæ¾æ£å许å¯è¯ï¼Apache 2.0ï¼å¸¦æå GPL
v2 ä¸å
¼å®¹çä¸å©æ¡æ¬¾ï¼ç±äºæ认为è¿äºä¸å©æ¡æ¬¾è¿ä¸éï¼æ以æ让
@@ -70,7 +72,7 @@
GPL 1” æè
“ç¨ GPL 1 æ以åç” æ¥åå¸ã</p>
<p>ä»é£æ¶èµ·ï¼æå°±å¨æéå½æ¶çå³å®æ¯å¦ææºãå Linux è¿æ
·çç¨åºï¼åªå
许ä¸ä¸ªçæ¬ç GNU GPL
并æç»å级许å¯è¯ï¼è¿å°±å¯¼è´å®é
ä¸çä¸å
¼å®¹ã<a
-href="#f4">(****)</a>æ许æ们åºè¯¥å¨ GPL v4 çæ¶ä¾¯å
å«ä¸ä¸ªèªå¨å级æ¡æ¬¾ï¼å¦ææ们éè¦çæ¬ 4 çè¯ã</p>
+href="#f4">[4]</a>æ许æ们åºè¯¥å¨ GPL v4 çæ¶ä¾¯å
å«ä¸ä¸ªèªå¨å级æ¡æ¬¾ï¼å¦ææ们éè¦çæ¬ 4 çè¯ã</p>
<p>æäº copyleft 许å¯è¯æä¸ä¸ªæç¡®çå次æææ¡æ¬¾ï¼è¯¥æ¡æ¬¾å
许å°ä»£ç æç
§ä¸åç copyleft 许å¯è¯ææï¼è¿æ ·å°±å
许äº
copyleft
许å¯è¯ä¹é´ç交åææãä¾å¦ï¼CeCILL 许å¯è¯æ确许å¯å°ä»£ç
æç
§ GNU GPL v2 æ以åçå次ææãå¦æç¨åº P ä½¿ç¨ CeCILL
@@ -111,9 +113,9 @@
许å¯è¯ãMozilla å
Œ
±è®¸å¯è¯å
许å°ä»£ç å次ææå° GNU
GPLï¼é¤é该代ç æç¡®æç»è¿æ ·åã</p>
<p>æåï¼åé许å¯è¯æä¹åå¢ï¼<a
-href="#f5">(*****)</a>åé许å¯è¯æ¯ä¸ç§æçå
³ç³»ï¼å®çæææ¯åä¸ä¸ªç¨åºå¯ä»¥éæ©ä¸¤ä¸ªæå¤ä¸ªè®¸å¯è¯ä¸çä¸ä¸ªæå
个ãä¾å¦ï¼èçæ¬ç
-Perl 就带æåé许å¯è¯ï¼æè
æ¯ Artistic 许å¯è¯ï¼æè
æ¯ GNU
éç¨å
Œ
±è®¸å¯è¯ãè¿æå³çæ¯ä¸ªç¨æ·é½å¯ä»¥éæ©å¹¶æç
§å
¶ä¸ä¸ä¸ªè®¸å¯è¯æè
å°±æç
§
-Perl åæ¥çæ¹å¼å次ææ
Perlãå¦æåé许å¯è¯ä¸çä¸ä¸ªè®¸å¯è¯åä¸ç»è®¸å¯è¯å
¼å®¹ï¼é£ä¹è¯¥åé许å¯è¯å°±å该ç»è®¸å¯è¯å
¼å®¹ã</p>
+href="#f5">[5]</a>åé许å¯è¯æ¯ä¸ç§æçå
³ç³»ï¼å®çæææ¯åä¸ä¸ªç¨åºå¯ä»¥éæ©ä¸¤ä¸ªæå¤ä¸ªè®¸å¯è¯ä¸çä¸ä¸ªæå
个ãä¾å¦ï¼èçæ¬ç Perl
+就带æåé许å¯è¯ï¼æè
æ¯ Artistic 许å¯è¯ï¼æè
æ¯ GNU
éç¨å
Œ
±è®¸å¯è¯ãè¿æå³çæ¯ä¸ªç¨æ·é½å¯ä»¥éæ©å¹¶æç
§å
¶ä¸ä¸ä¸ªè®¸å¯è¯æè
å°±æç
§ Perl
+åæ¥çæ¹å¼å次ææ
Perlãå¦æåé许å¯è¯ä¸çä¸ä¸ªè®¸å¯è¯åä¸ç»è®¸å¯è¯å
¼å®¹ï¼é£ä¹è¯¥åé许å¯è¯å°±å该ç»è®¸å¯è¯å
¼å®¹ã</p>
<p>å½ä½ éæ©è®¸å¯è¯æ¶ï¼è¯·éæ© GNU GPL v3 æè
以åçæ¬ï¼æè
æ¯ä¸ä¹å
¼å®¹ç许å¯è¯ãè¿æ¯ä½¿ä½ ç代ç è½å¤åå
ä¹ææèªç±è½¯ä»¶éåç代ç ç»åçæ£ç¡®æ¹æ³ãéæ©
GPL æ AGPLï¼v3 æè
以åçæ¬ï¼ä¹ä¼æ大ç¨åº¦å°ä¿æ¤ææ使ç¨ä½ å个çæ¬ä»£ç
çç¨æ·çèªç±ã</p>
@@ -142,29 +144,30 @@
<p>æ¤å¤å¹¶éè¦æä¾ä¸ä¸ªå®æ´å表ï¼ä½æ¯å¦ææ们åç°è¿æå
¶ä»å¼å¾è¯´æçä¾åï¼æ们è¿ä¼æ·»å ã</p>
<p>å½æäºè®¸å¯è¯è¢«å
å«æ¶ï¼ä½ ä»ç¶éè¦å¨åå¸ç»åç¨åºæ¶å
å«è¯¥è®¸å¯è¯çæ·è´ã</p>
+<div class="column-limit"></div>
-<h3 id="footnotes">è注</h3>
+<h3 id="footnotes" class="footnote">è注</h3>
+<ol>
+<li id="f1"><p>å¯ä»¥æ³è±¡è¿å¯è½æå
³äºå并ç¨åºçå
¶ä»æ³å¾é®é¢ï¼è¿äºé®é¢å¯è½åå并ç¨åºç许å¯è¯æ å
³ãæ们åªè®¨è®ºå许å¯è¯æ¬èº«æå
³çé®é¢ã</p></li>
-<p id="f1"><b>*</b> å¯ä»¥æ³è±¡è¿å¯è½æå
³äºå并ç¨åºçå
¶ä»æ³å¾é®é¢ï¼è¿äºé®é¢å¯è½åå并ç¨åºç许å¯è¯æ å
³ãæ们åªè®¨è®ºå许å¯è¯æ¬èº«æå
³çé®é¢ã</p>
-
-<p id="f2"><b>**</b> å®é
å½ä¸ç¨å°çä¸é£ä¹é¡ºçæç«
ç许å¯è¯ä¸»è¦æ¯ TeX ç许å¯è¯ï¼å¦æ两个ç¨åºé½æç
§ TeX
-çæ¹å¼ææï¼é£ä¹ä½
就没æåæ³åå¸ä¸¤ä¸ªç¨åºçç»åç¨åºã</p>
+<li id="f2"><p>å®é
å½ä¸ç¨å°çä¸é£ä¹é¡ºçæç« ç许å¯è¯ä¸»è¦æ¯
TeX ç许å¯è¯ï¼å¦æ两个ç¨åºé½æç
§ TeX çæ¹å¼ææï¼é£ä¹ä½
就没æåæ³åå¸ä¸¤ä¸ªç¨åºçç»åç¨åºã</p>
<p>TeX 许å¯è¯å
许åå¸çä¿®æ¹çåªè½æ¯åæ¥ççæ¬å
ä¸ä¸ä¸ªå·®å¼æ件ãå¦æç²åä¹ä¸¤ä¸ªç¨åºåå«æç
§ Tex
许å¯è¯åå¸ï¼ç¶ååå并ï¼é£ä¹æç
§ç²ç¨åºå
ä¸ä¸ä¸ªå·®å¼æ件æ¥åå¸å并ç¨åºå°±è¿åäºä¹ç¨åºç许å¯è¯ãåè¿æ¥ï¼åå¸ä¹ç¨åºå
ä¸å·®å¼æ件çè¯åè¿åäºç²ç许å¯è¯ãæç
§å
¶ä»æ¹å¼åå¸çè¯å°±è¿åäºç²ä¹ä¸¤ä¸ªç¨åºç许å¯è¯ã</p>
<p>è¿ä¸ªå¹¶ä¸æå¤ï¼TeX æ©å¨ 1982
å¹´å°±åå¸äºï¼ç¤¾åºä»æ¤éæ¸å¦ä¼äºæ°å顺çæç«
ç许å¯è¯ã</p>
+</li>
-<p id="f3"><b>***</b>
-å½åå¸æºä»£ç æ¶ï¼å¨æºä»£ç éå å
¥è®¸å¯è¯å£°æé常就足å¤äºï¼åªæ象使ç¨æ¾æ£å许å¯è¯çä»
åå¸äºè¿å¶èä¸å¸¦æºä»£ç
çç¨åºæéè¦é¢å¤ç许å¯è¯å£°æã</p>
+<li id="f3"><p>å½åå¸æºä»£ç æ¶ï¼å¨æºä»£ç éå å
¥è®¸å¯è¯å£°æé常就足å¤äºï¼åªæ象使ç¨æ¾æ£å许å¯è¯çä»
åå¸äºè¿å¶èä¸å¸¦æºä»£ç
çç¨åºæéè¦é¢å¤ç许å¯è¯å£°æã</p></li>
-<p id="f4"><b>****</b> å¦å¤ï¼GPL v2
-ä»ç¶å
许éèªç±çäºè¿å¶——硬件åªè¿è¡ç¹å«ç¾åçäºè¿å¶èæç»å
¶ä»äºè¿å¶æ件ï¼èä¸ä»ç¶ä¸å
è®¸ä½¿ç¨ torrent åå¸äºè¿å¶ã<a
-href="/licenses/rms-why-gplv3.html">æ们å¨çæ¬ 3
ä¸ä¿®å¤äºè¿äºé®é¢ï¼è¿ä¿®å¤äºå
¶ä»é®é¢</a>ï¼ä½æ¯æ们ä¸è½æ¹åçæ¬
-2ã</p>
+<li id="f4"><p>å¦å¤ï¼GPL v2 ä»ç¶å
许éèªç±çäºè¿å¶——硬件åªè¿è¡ç¹å«ç¾åçäºè¿å¶èæç»å
¶ä»äºè¿å¶æ件ï¼èä¸ä»ç¶ä¸å
è®¸ä½¿ç¨ torrent
+åå¸äºè¿å¶ã<a href="/licenses/rms-why-gplv3.html">æ们å¨çæ¬ 3
+ä¸ä¿®å¤äºè¿äºé®é¢ï¼è¿ä¿®å¤äºå
¶ä»é®é¢</a>ï¼ä½æ¯æ们ä¸è½æ¹åçæ¬ 2ã</p></li>
-<p id="f5"><b>*****</b> æäººä½¿ç¨ “åé许å¯è¯” æ¥å
å®è®¸å¯è¯ä¾å¤ï¼ä½æ¯è¯ä¸è¾¾æã请åç <a
-href="/philosophy/selling-exceptions.html">å
å®ä¾å¤</a>ã请注æï¼å¦ææ个许å¯è¯å
å®çç¨åºå
å«äºä»»ä½éèªç±ç代ç ï¼é£ä¹å®å°±ä¸æ¯å¨å
å®ä¾å¤ï¼å®å°±æ¯éèªç±è½¯ä»¶ã</p>
+<li id="f5"><p>æäººä½¿ç¨ “åé许å¯è¯” æ¥å
å®è®¸å¯è¯ä¾å¤ï¼ä½æ¯è¯ä¸è¾¾æã请åç <a
+href="/philosophy/selling-exceptions.html">å
å®ä¾å¤</a>ã请注æï¼å¦ææ个许å¯è¯å
å®çç¨åºå
å«äºä»»ä½éèªç±ç代ç ï¼é£ä¹å®å°±ä¸æ¯å¨å
å®ä¾å¤ï¼å®å°±æ¯éèªç±è½¯ä»¶ã</p></li>
+</ol>
+</div>
<div class="translators-notes">
@@ -174,7 +177,7 @@
<!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.zh-cn.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
<div class="unprintable">
<p>请å°æå
³èªç±è½¯ä»¶åºéä¼(FSF) &
GNUçä¸è¬æ§é®é¢åéå°<a
@@ -193,13 +196,13 @@
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and contributing translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
æ们尽æ大åªåæ¥æä¾ç²¾ååé«è´¨éçç¿»è¯ï¼ä½é¾å
ä¼åå¨é误åä¸è¶³ãå¦ææ¨å¨è¿æ¹é¢æè¯è®ºæä¸è¬æ§ç建议ï¼è¯·åéè³
<a
href="mailto:web-translators@gnu.org";><web-translators@gnu.org></a>ã</p><p>å
³äºè¿è¡åè°ä¸æ交翻è¯çæ´å¤ä¿¡æ¯åè§
-<a href="/server/standards/README.translators.html">ãè¯è
æåã</a>ã</p>
+<a href="/server/standards/README.translations.html">ãè¯è
æåã</a>ã</p>
</div>
<!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -218,7 +221,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2016, 2018, 2020 Free Software Foundation, Inc.</p>
+<p>Copyright © 2016, 2018, 2020, 2021 Free Software Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨ <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -229,12 +232,12 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2020ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2020ï¼2021ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2020/11/24 04:29:49 $
+$Date: 2021/12/30 02:29:57 $
<!-- timestamp end -->
</p>
Index: po/license-compatibility.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/license-compatibility.zh-cn-en.html 24 Nov 2020 04:29:49 -0000
1.2
+++ po/license-compatibility.zh-cn-en.html 30 Dec 2021 02:29:58 -0000
1.3
@@ -1,20 +1,22 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
<title>License Compatibility and Relicensing
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/licenses/po/license-compatibility.translist" -->
<!--#include virtual="/server/banner.html" -->
+<div class="article reduced-width">
<h2>License Compatibility and Relicensing</h2>
-<p>by Richard Stallman</p>
+<address class="byline">by Richard Stallman</address>
<p>If you want to combine two free programs into one, or merge code from
one into the other, this raises the question of whether their licenses
-allow combining them, or prohibit combining them.<a href="#f1">(*)</a></p>
+allow combining them, or prohibit combining them.<a href="#f1">[1]</a></p>
<p>There is no problem merging programs that have the same license, if it
is a reasonably behaved license, as nearly all free licenses
-are.<a href="#f2">(**)</a></p>
+are.<a href="#f2">[2]</a></p>
<p>What then when the licenses are different? In general we say that
several licenses are <em>compatible</em> if there is a way to merge
@@ -46,7 +48,7 @@
parts can't be distinguished any more, that merged code should carry
all the licenses of the merged parts. Since all the licenses are lax
anyway, this causes no practical problem except that the list of
-licenses gets long.<a href="#f3">(***)</a></p>
+licenses gets long.<a href="#f3">[3]</a></p>
<p>By the same token, lax licenses are usually compatible with any
copyleft license. In the combined program, the parts that came in
@@ -97,9 +99,9 @@
“GNU GPL version N or any later version.” This licensing is
compatible with version N, and also with N+1 (because it offers
version N+1 as an option). When you combine code under “GPL 3 or
-later” with code under “GPL 2 or later”, the license
+later” with code under “GPL 2 or later,” the license
of the combination is their intersection, which is “GPL 3 or
-later”.</p>
+later.”</p>
<p>We hope we will never need to make a GNU GPL version 4, but nothing is
perfect and we can't assume we have anticipated all the issues. By
@@ -123,7 +125,7 @@
<p>Since then, I have come to question the wisdom of that decision.
Programs such as Linux, which allow only one GNU GPL version and
reject license upgrades, cause practical
-incompatibility.<a href="#f4">(****)</a> If we ever make a GPL version
+incompatibility.<a href="#f4">[4]</a> If we ever make a GPL version
4, perhaps we should include an upgrade clause that automatically
permits relicensing to higher-numbered versions, 5 and up.</p>
@@ -146,24 +148,24 @@
to release that combined program is under the appropriate GPL
version(s).</p>
-<p>Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified
+<p>Likewise, CC BY-SA 4.0 explicitly permits relicensing modified
versions to GNU GPL version 3, but GPL version 3 does not permit
-relicensing to CC-BY-SA. This issue should never arise for software
+relicensing to CC BY-SA. This issue should never arise for software
code; Creative Commons says its licenses are not meant for code, and
says that the license to use for code is the GNU GPL. But there are
other kinds of works, such as hardware designs or game art, where you
might have occasion to merge material released under CC-BY-SA with
material released under the GNU GPL. This can be done through
-CC-BY-SA's explicit relicensing permission.</p>
+CC BY-SA's explicit relicensing permission.</p>
-<p>Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL
+<p>Unfortunately, CC BY-SA 4.0 does not permit relicensing to future GPL
versions. What you should do, when you relicense material under
-CC-BY-SA 4.0 to the GPL, is <a
+CC BY-SA 4.0 to the GPL, is <a
href="/licenses/rms-why-gplv3.html#future-proofing">specify
yourself as a license version proxy</a> to indicate whether future GPL
versions have been authorized for that material. If someday there is
a GPL version 4 and Creative Commons decides to allow relicensing from
-CC-BY-SA to GPL version 4, you as proxy will be able to retroactively
+CC BY-SA to GPL version 4, you as proxy will be able to retroactively
authorize use of that relicensed material under GPL version 4.
(Alternatively, you can ask the authors of that material to give
permission right away.)</p>
@@ -204,7 +206,7 @@
the GNU GPL except when the code explicitly denies this
permission.</p>
-<p>Finally, what about dual licensing?<a href="#f5">(*****)</a> A dual
+<p>Finally, what about dual licensing?<a href="#f5">[5]</a> A dual
license is a disjunction: it means that the same program carries a
choice of two or more different licenses. For instance, older
versions of Perl carried a dual license: the disjunction of the
@@ -253,22 +255,23 @@
<p>The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0
licenses. BSD 3 clause subsumes BSD 2 clause. The BSD licenses
-subsume the Expat, X11 and ISC licenses and CC-0.</p>
+subsume the Expat, X11 and ISC licenses and CC0.</p>
<p>This is not meant to be a complete list, but if we are informed of
other cases worth mentioning, we will add them.</p>
<p>When some license is subsumed, you still need to include a copy
of it with all distribution of the combined program.</p>
+<div class="column-limit"></div>
-<h3 id="footnotes">Footnotes</h3>
-
-<p id="f1"><b>*</b> It is not inconceivable that other legal issues
+<h3 id="footnotes" class="footnote">Footnotes</h3>
+<ol>
+<li id="f1"><p>It is not inconceivable that other legal issues
might arise about a specific combination of programs, issues not
related to the copyright licenses of the programs to be combined. We
-discuss only the implications of the licenses themselves.</p>
+discuss only the implications of the licenses themselves.</p></li>
-<p id="f2"><b>**</b> The main license in actual use that isn't
+<li id="f2"><p>The main license in actual use that isn't
reasonably behaved is the license of TeX: if two programs are licensed
just the way TeX is, there is no authorized way to distribute a merged
version of them.</p>
@@ -282,29 +285,32 @@
<p>It is no coincidence that TeX was released in 1982: our community has
learned, since then, to write reasonably behaved licenses.</p>
+</li>
-<p id="f3"><b>***</b> When distributing in source code
+<li id="f3"><p>When distributing in source code
form, it is usually sufficient to leave the license notices in the
source code as they stand; extra license notice requirements typically
only come up for lax licenses when distributing binaries without the
-source code.</p>
+source code.</p></li>
-<p id="f4"><b>****</b> In addition, GPL version 2 still allows
+<li id="f4"><p>In addition, GPL version 2 still allows
binaries to be made nonfree by hardware that rejects all but special
signed binaries, and still does not allow distribution of binaries by
torrent. <a href="/licenses/rms-why-gplv3.html">We fixed those
-problems, and others, in version 3</a>, but we can't change version 2.</p>
+problems, and others, in version 3</a>, but we can't change version 2.</p></li>
-<p id="f5"><b>*****</b> Some use the term “dual licensing”
+<li id="f5"><p>Some use the term “dual licensing”
to refer to selling exceptions, but that is a misnomer.
See <a href="/philosophy/selling-exceptions.html"> Selling
Exceptions</a>. Note that if the program on which the license is sold
includes any code that is not in the free (libre) release, that's not
-selling exceptions, that's nonfree software.</p>
+selling exceptions, that's nonfree software.</p></li>
+</ol>
+</div>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
@@ -322,13 +328,13 @@
to <a href="mailto:web-translators@gnu.org";>
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and contributing translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
of this article.</p>
</div>
@@ -349,7 +355,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2016, 2018, 2020 Free Software Foundation, Inc.</p>
+<p>Copyright © 2016, 2018, 2020, 2021 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -359,7 +365,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/11/24 04:29:49 $
+$Date: 2021/12/30 02:29:58 $
<!-- timestamp end -->
</p>
</div>
Index: po/license-compatibility.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.zh-cn.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/license-compatibility.zh-cn.po 30 Dec 2021 02:11:28 -0000 1.10
+++ po/license-compatibility.zh-cn.po 30 Dec 2021 02:29:58 -0000 1.11
@@ -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: 2021-12-29 15:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -42,8 +41,8 @@
#. type: Content of: <div><p>
msgid ""
"There is no problem merging programs that have the same license, if it is a "
-"reasonably behaved license, as nearly all free licenses are.<a href="
-"\"#f2\">[2]</a>"
+"reasonably behaved license, as nearly all free licenses are.<a href=\"#f2\">"
+"[2]</a>"
msgstr ""
"å¦æ两个软件使ç¨åæ
·ç许å¯è¯ï¼åºè¯¥æ²¡æé®é¢ï¼åå®è¯¥è®¸å¯è¯è±¡å
ä¹ææçèªç±è½¯ä»¶"
"许å¯è¯ä¸æ ·é¡ºçæç« ã<a href=\"#f2\">[2]</a>"
@@ -105,8 +104,8 @@
msgstr ""
"å¨æ使ç¨æ¾æ£å许å¯è¯ç代ç
åå¨ä¸èµ·æ¶ï¼ç»åç¨åºçæ¯ä¸ªé¨åé½å¸¦æèªå·±ç许å¯è¯ã"
"å½è¿äºä»£ç 交ç»å¨ä¸èµ·æ
æ³å辨æ¶ï¼ç»åç¨åºåºè¯¥å¸¦ä¸ææ代ç
ç许å¯è¯ãç±äºè¿äºè®¸"
-"å¯è¯é½æ¯æ¾æ£åçï¼æ以å
¨é½å¸¦ä¸é¤äºå¤ªé¿ä¹å¤ä¹æ²¡æå«çé®é¢ã<a href="
-"\"#f3\">[3]</a>"
+"å¯è¯é½æ¯æ¾æ£åçï¼æ以å
¨é½å¸¦ä¸é¤äºå¤ªé¿ä¹å¤ä¹æ²¡æå«çé®é¢ã<a href=\"#f3\">[3]"
+"</a>"
#. type: Content of: <div><p>
msgid ""
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses license-compatibility.zh-cn.html p...,
GNUN <=