[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses gpl-faq.zh-cn.html license-list.zh...
|
From: |
GNUN |
|
Subject: |
www/licenses gpl-faq.zh-cn.html license-list.zh... |
|
Date: |
Tue, 7 Mar 2023 09:31:03 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 23/03/07 09:31:03
Modified files:
licenses : gpl-faq.zh-cn.html license-list.zh-cn.html
licenses/po : gpl-faq.zh-cn-en.html gpl-faq.zh-cn.po
license-list.zh-cn-en.html
license-list.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.zh-cn.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.zh-cn.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.zh-cn-en.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.zh-cn.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.zh-cn-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.zh-cn.po?cvsroot=www&r1=1.41&r2=1.42
Patches:
Index: gpl-faq.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.zh-cn.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gpl-faq.zh-cn.html 27 Feb 2023 13:30:47 -0000 1.13
+++ gpl-faq.zh-cn.html 7 Mar 2023 14:31:02 -0000 1.14
@@ -483,11 +483,7 @@
<li><a
href="#SystemLibraryException">ææ¯å¦å¯ä»¥ç¨ä¸æç³»ç»åºè¿æ¥ä¸ä¸ªGPLç¨åºï¼</a></li>
- <li><a href="#AGPLPL">ææ¯å¦å¯ä»¥æä½¿ç¨ GPLv3 ç模åå使ç¨
AGPLv3 ç模åè¿æ¥æä¸ä¸ªå¯æ§è¡ç¨åºï¼</a></li>
-
- <li><a href="#AGPLLibrary">ææ¯å¦å¯ä»¥æä½¿ç¨ GPLv3
çç¨åºåä½¿ç¨ AGPLv3 çåºè¿æ¥èµ·æ¥ï¼</a></li>
-
- <li><a href="#AGPLAndGPLLibrary">ææ¯å¦å¯ä»¥æä½¿ç¨ AGPLv3
çç¨åºåä½¿ç¨ GPLv3 çåºè¿æ¥èµ·æ¥ï¼</a></li>
+ <li><a href="#AGPLGPL">æä¹æè½æ AGPLv3 代ç å GPLv3 代ç
è¿æ¥æç»åèµ·æ¥ï¼</a></li>
<li><a href="#GPLIncompatibleLibs">GPL软件使ç¨éGPLå
¼å®¹åºä¼æä»ä¹æ³å¾é®é¢ï¼</a></li>
@@ -845,25 +841,12 @@
<p>å
³äº“ç³»ç»åº”çæ
åï¼åçGPLææä¸åãGPLv3å¨ç¬¬1èæç¡®å®ä¹äº“ç³»ç»åº”ï¼ä»¥å°ä¹å“ç¸å
³æºä»£ç
”åºå«å¼æ¥ãGPLv2çå¤çç¥å¾®ä¸åï¼æ¾å¨å¨ç¬¬3èã</p>
</dd>
-<dt id="AGPLGPL">ææ¯å¦å¯ä»¥æä½¿ç¨ GPLv3 ç模ååä½¿ç¨ AGPLv3
ç模åè¿æ¥æä¸ä¸ªå¯æ§è¡ç¨åºï¼<span
-class="anchor-reference-id">(<a href="#AGPLGPL">#AGPLGPL</a>)</span></dt>
-<dd><p>
-ä½ æ»æ¯å¯ä»¥æä½¿ç¨ GPLv3 许å¯è¯ç模ååä½¿ç¨ AGPLv3
ç模åè¿æ¥èµ·æ¥ãè¿æ¯å 为è¿ä¸¤ä¸ªè®¸å¯è¯æç¡®å
许äºç¸è¿æ¥ã</p>
-</dd>
-
-<dt id="AGPLLibrary">ææ¯å¦å¯ä»¥æä½¿ç¨ GPLv3 çç¨åºåä½¿ç¨ AGPLv3
çåºè¿æ¥èµ·æ¥ï¼<span class="anchor-reference-id">(<a
-href="#AGPLLibrary">#AGPLLibrary</a>)</span></dt>
+<dt id="AGPLGPL">æä¹æè½æ AGPLv3 代ç å GPLv3 代ç
è¿æ¥æç»åèµ·æ¥ï¼<span class="anchor-reference-id">(<a
+href="#AGPLGPL">#AGPLGPL</a>)</span></dt>
<dd><p>
-ä½ æ»æ¯å¯ä»¥ <a href="#AGPLGPL">æä½¿ç¨ GPLv3 ç模ååä½¿ç¨ AGPLv3
ç模åè¿æ¥èµ·æ¥</a>ï¼æ 论è¿äºæ¨¡åæ¯å¦æ¯åºã</p>
+è¿ä¸¤ä¸ªè®¸å¯è¯é½æç¡®å
许äºç¸è¿æ¥ãä½ æ»æ¯å¯ä»¥æ GPLv3
模åå AGPLv3
模åè¿æ¥å¨ä¸èµ·ï¼åä¹äº¦ç¶ï¼ä¸è®ºè¿æ¥ç模åæ¯ä¸æ¯åºé½ä¸æ
·ã</p>
</dd>
-<dt id="AGPLAndGPLLibrary">ææ¯å¦å¯ä»¥æä½¿ç¨ AGPLv3 çç¨åºå使ç¨
GPLv3 çåºè¿æ¥èµ·æ¥ï¼<span class="anchor-reference-id">(<a
-href="#AGPLAndGPLLibrary">#AGPLAndGPLLibrary</a>)</span></dt>
-<dd><p>
-ä½ æ»æ¯å¯ä»¥ <a href="#AGPLGPL">æä½¿ç¨ GPLv3 ç模ååä½¿ç¨ AGPLv3
ç模åè¿æ¥èµ·æ¥</a>ï¼æ 论è¿äºæ¨¡åæ¯å¦æ¯åºã</p>
-</dd>
-
-
<dt id="GPLIncompatibleLibs">GPL软件使ç¨éGPLå
¼å®¹åºä¼æä»ä¹æ³å¾é®é¢ï¼<span class="anchor-reference-id">(<a
href="#GPLIncompatibleLibs" >#GPLIncompatibleLibs</a>)</span></dt>
<dd>
@@ -2384,7 +2367,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2023/02/27 13:30:47 $
+$Date: 2023/03/07 14:31:02 $
<!-- timestamp end -->
</p>
Index: license-list.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/license-list.zh-cn.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- license-list.zh-cn.html 13 Jan 2022 04:31:14 -0000 1.11
+++ license-list.zh-cn.html 7 Mar 2023 14:31:02 -0000 1.12
@@ -399,7 +399,7 @@
href="#Eiffel">#Eiffel</a>)</span></dt>
<dd>
<p>è¿æ¯ä¸ä¸ªèªç±è½¯ä»¶è®¸å¯è¯ï¼å®å
¼å®¹ GNU GPLãEiffel 许å¯è¯ç
<a
-href="https://opensource.org/licenses/ver1_eiffel";>åæåå¸ç</a> 并ä¸å
¼å®¹ GPLã</p></dd>
+href="https://opensource.org/license/efl-1-0";>åæåå¸ç</a> 并ä¸å
¼å®¹
GPLã</p></dd>
<dt><a id="EUDataGrid"
@@ -2039,7 +2039,7 @@
<a href="/server/standards/README.translations.html">ãè¯è
æåã</a>ã</p>
</div>
-<p>Copyright © 1999-2022 Free Software Foundation, Inc.</p>
+<p>Copyright © 1999-2023 Free Software Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨ <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -2057,7 +2057,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2022/01/13 04:31:14 $
+$Date: 2023/03/07 14:31:02 $
<!-- timestamp end -->
</p>
Index: po/gpl-faq.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.zh-cn-en.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/gpl-faq.zh-cn-en.html 27 Feb 2023 13:30:47 -0000 1.11
+++ po/gpl-faq.zh-cn-en.html 7 Mar 2023 14:31:02 -0000 1.12
@@ -668,14 +668,8 @@
<li><a href="#SystemLibraryException">Can I link a GPL program with
a proprietary system library?</a></li>
- <li><a href="#AGPLPL">Can I link GPLv3-covered modules and
- AGPLv3-covered modules into one executable?</a></li>
-
- <li><a href="#AGPLLibrary">Can I link a GPLv3-covered program with
- an AGPLv3-covered library?</a></li>
-
- <li><a href="#AGPLAndGPLLibrary">Can I link an AGPLv3-covered program with
- a GPLv3-covered library?</a></li>
+ <li><a href="#AGPLGPL">In what ways can I link or
+ combine AGPLv3-covered and GPLv3-covered code?</a></li>
<li><a href="#GPLIncompatibleLibs">What legal issues come up if I
use GPL-incompatible libraries with GPL software?</a></li>
@@ -1323,37 +1317,17 @@
issue slightly differently, near the end of section 3.</p>
</dd>
-<dt id="AGPLGPL">Can I link GPLv3-covered modules and
- AGPLv3-covered modules into one executable?
+<dt id="AGPLGPL">In what ways can I link or combine
+AGPLv3-covered and GPLv3-covered code?
<span class="anchor-reference-id">(<a
href="#AGPLGPL">#AGPLGPL</a>)</span></dt>
<dd><p>
-You can always link GPLv3-covered modules with AGPLv3-covered modules.
-That is because each of these licenses explicitly permits linking with
-code under the other license.</p>
-</dd>
-
-<dt id="AGPLLibrary">Can I link a GPLv3-covered program with
- an AGPLv3-covered library?
- <span class="anchor-reference-id">(<a
-href="#AGPLLibrary">#AGPLLibrary</a>)</span></dt>
-<dd><p>
-You can always <a href="#AGPLGPL">link GPLv3-covered modules with
-AGPLv3-covered modules</a>. That is true regardless of whether some of
-the modules are libraries.</p>
+Each of these licenses explicitly permits linking with code under the
+other license. You can always link GPLv3-covered modules with
+AGPLv3-covered modules, and vice versa. That is true regardless of
+whether some of the modules are libraries.</p>
</dd>
-<dt id="AGPLAndGPLLibrary">Can I link an AGPLv3-covered program with
- a GPLv3-covered library?
- <span class="anchor-reference-id">(<a
-href="#AGPLAndGPLLibrary">#AGPLAndGPLLibrary</a>)</span></dt>
-<dd><p>
-You can always <a href="#AGPLGPL">link GPLv3-covered modules with
-AGPLv3-covered modules</a>. That is true regardless of whether some of
-the modules are libraries.</p>
-</dd>
-
-
<dt id="GPLIncompatibleLibs">What legal issues
come up if I use GPL-incompatible libraries with GPL software?
<span class="anchor-reference-id">(<a href="#GPLIncompatibleLibs"
@@ -4044,7 +4018,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2023/02/27 13:30:47 $
+$Date: 2023/03/07 14:31:02 $
<!-- timestamp end -->
</p>
</div>
Index: po/gpl-faq.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.zh-cn.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- po/gpl-faq.zh-cn.po 7 Mar 2023 14:05:28 -0000 1.41
+++ po/gpl-faq.zh-cn.po 7 Mar 2023 14:31:03 -0000 1.42
@@ -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: 2023-03-01 16:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -1306,8 +1305,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>"
@@ -1325,8 +1324,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="
@@ -1421,8 +1420,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 ""
@@ -1548,8 +1547,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 ""
@@ -1658,8 +1657,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 ""
@@ -1873,8 +1872,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 ""
@@ -1993,8 +1992,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>"
@@ -2274,8 +2273,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 ""
@@ -2328,8 +2327,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 ""
@@ -2469,9 +2468,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éç¨å
Œ
±è®¸å¯è¯çæ¡æ¬¾ä¼è¦çå°æ´ä¸ªå并çå·¥"
@@ -2482,18 +2481,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çåå¸è¦æ±å
å«äºå
¶ä»ç¨åºçæºä»£ç }"
"使ç¨çç¸å
³è®¸å¯è¯ã"
@@ -2650,8 +2649,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\" "
@@ -2961,8 +2960,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 ""
@@ -3569,8 +3568,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 ""
@@ -3649,8 +3648,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 ""
@@ -3759,8 +3758,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 ""
@@ -3783,8 +3782,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>"
@@ -3965,11 +3964,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 ""
@@ -4089,8 +4088,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 ""
@@ -4427,8 +4426,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 ""
@@ -4536,8 +4535,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 ""
@@ -4756,11 +4755,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 ""
@@ -4872,8 +4871,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 ""
@@ -4943,8 +4942,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 ""
@@ -5177,8 +5176,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>"
@@ -5205,8 +5204,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 ""
@@ -5512,8 +5511,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 ""
@@ -5566,8 +5565,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 ""
@@ -5612,8 +5611,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 ""
@@ -5671,8 +5670,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>"
@@ -6013,8 +6012,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\" "
@@ -6254,8 +6253,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 ""
@@ -6720,13 +6719,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: <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>"
@@ -6736,15 +6735,15 @@
#. type: Content of: <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: <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>"
@@ -6753,8 +6752,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: <table><tbody><tr><td>
msgid ""
@@ -6781,16 +6780,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: <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: <table><tbody><tr><td>
msgid ""
@@ -6810,24 +6809,24 @@
#. type: Content of: <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: <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: <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>"
@@ -6841,8 +6840,8 @@
#. type: Content of: <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>"
@@ -7031,8 +7030,8 @@
#~ msgid ""
#~ "Can I link a GPLv3-covered program with an AGPLv3-covered library? <span "
-#~ "class=\"anchor-reference-id\">(<a href=\"#AGPLLibrary\">#AGPLLibrary</"
-#~ "a>)</span>"
+#~ "class=\"anchor-reference-id\">(<a href=\"#AGPLLibrary\">#AGPLLibrary</a>)"
+#~ "</span>"
#~ msgstr ""
#~ "ææ¯å¦å¯ä»¥æä½¿ç¨ GPLv3 çç¨åºåä½¿ç¨ AGPLv3
çåºè¿æ¥èµ·æ¥ï¼<span class="
#~ "\"anchor-reference-id\">(<a href=\"#AGPLLibrary\">#AGPLLibrary</a>)</span>"
@@ -7086,8 +7085,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: po/license-list.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.zh-cn-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/license-list.zh-cn-en.html 13 Jan 2022 04:31:14 -0000 1.10
+++ po/license-list.zh-cn-en.html 7 Mar 2023 14:31:03 -0000 1.11
@@ -513,7 +513,7 @@
(<a href="#Eiffel">#Eiffel</a>)</span></dt>
<dd>
<p>This is a free software license, compatible with the GNU GPL. <a
-href="https://opensource.org/licenses/ver1_eiffel";>Previous
+href="https://opensource.org/license/efl-1-0/";>Previous
releases</a> of the Eiffel license are not compatible with the
GPL.</p></dd>
@@ -2845,7 +2845,7 @@
information on coordinating and contributing translations of this article.</p>
</div>
-<p>Copyright © 1999-2022 Free Software Foundation, Inc.</p>
+<p>Copyright © 1999-2023 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
@@ -2855,7 +2855,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2022/01/13 04:31:14 $
+$Date: 2023/03/07 14:31:03 $
<!-- timestamp end -->
</p>
</div>
Index: po/license-list.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.zh-cn.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- po/license-list.zh-cn.po 7 Mar 2023 13:56:57 -0000 1.41
+++ po/license-list.zh-cn.po 7 Mar 2023 14:31:03 -0000 1.42
@@ -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: 2023-03-04 16:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -482,8 +481,8 @@
"\"#apache2\">#apache2</a>)</span>"
msgstr ""
"<a id=\"apache2\" href=\"https://directory.fsf.org/wiki/License:";
-"Apache2.0\">Apache 许å¯è¯ï¼çæ¬ 2.0</a> <span
class=\"anchor-reference-id"
-"\">(<a href=\"#apache2\">#apache2</a>)</span>"
+"Apache2.0\">Apache 许å¯è¯ï¼çæ¬ 2.0</a> <span
class=\"anchor-reference-id\">"
+"(<a href=\"#apache2\">#apache2</a>)</span>"
#. type: Content of: <div><dl><dd><p>
msgid ""
@@ -943,8 +942,8 @@
#. type: Content of: <div><dl><dt>
msgid ""
-"<a id=\"informal\"> Informal license</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#informal\">#informal</a>)</span>"
+"<a id=\"informal\"> Informal license</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#informal\">#informal</a>)</span>"
msgstr ""
"<a id=\"informal\">éæ£å¼è®¸å¯è¯</a> <span
class=\"anchor-reference-id\">(<a "
"href=\"#informal\">#informal</a>)</span>"
@@ -1306,8 +1305,8 @@
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"Ruby\" href=\"https://directory.fsf.org/wiki/License:Ruby\";> License "
-"of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</"
-"a>)</span>"
+"of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</a>)"
+"</span>"
msgstr ""
"<a id=\"Ruby\" href=\"https://directory.fsf.org/wiki/License:Ruby\";>Ruby
ç许"
"å¯è¯</a> <span class=\"anchor-reference-id\">(<a
href=\"#Ruby\">#Ruby</a>)</"
@@ -1481,8 +1480,8 @@
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"Vim\" href=\"https://directory.fsf.org/wiki/License:Vim7.2\";> "
-"License of Vim, Version 6.1 or later</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#Vim\">#Vim</a>)</span>"
+"License of Vim, Version 6.1 or later</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#Vim\">#Vim</a>)</span>"
msgstr ""
"<a id=\"Vim\" href=\"https://directory.fsf.org/wiki/License:Vim7.2\";>Vim
许å¯"
"è¯ï¼çæ¬ 6.1 å以åç</a> <span class=\"anchor-reference-id\">(<a
href=\"#Vim"
@@ -1503,14 +1502,14 @@
"href=\"#W3C\">#W3C</a>)</span>"
msgstr ""
"<a id=\"W3C\" href=\"https://directory.fsf.org/wiki/License:";
-"W3C_31Dec2002\">W3C 软件声æå许å¯è¯</a> <span
class=\"anchor-reference-id"
-"\">(<a href=\"#W3C\">#W3C</a>)</span>"
+"W3C_31Dec2002\">W3C 软件声æå许å¯è¯</a> <span
class=\"anchor-reference-id\">"
+"(<a href=\"#W3C\">#W3C</a>)</span>"
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"WebM\" href=\"https://directory.fsf.org/wiki/License:WebM\";> License "
-"of WebM</a> <span class=\"anchor-reference-id\">(<a href=\"#WebM\">#WebM</"
-"a>)</span>"
+"of WebM</a> <span class=\"anchor-reference-id\">(<a href=\"#WebM\">#WebM</a>)"
+"</span>"
msgstr ""
"<a id=\"WebM\" href=\"https://directory.fsf.org/wiki/License:WebM\";>WebM
ç许"
"å¯è¯</a> <span class=\"anchor-reference-id\">(<a
href=\"#WebM\">#WebM</a>)</"
@@ -1681,8 +1680,8 @@
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"ZLib\" href=\"https://directory.fsf.org/wiki/License:Zlib\";> License "
-"of ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</"
-"a>)</span>"
+"of ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</a>)"
+"</span>"
msgstr ""
"<a id=\"ZLib\" href=\"https://directory.fsf.org/wiki/License:Zlib\";>ZLib
ç许"
"å¯è¯</a> <span class=\"anchor-reference-id\">(<a
href=\"#ZLib\">#ZLib</a>)</"
@@ -2011,9 +2010,9 @@
"\">#CPAL</a>)</span>"
msgstr ""
"<a id=\"CPAL\" href=\"https://directory.fsf.org/wiki/License:";
-"Common_Public_Attribution_License_Version_1.0\">æ®éå
Œ
±å±æ§è®¸å¯è¯
1.0 "
-"(CPAL)</a> <span class=\"anchor-reference-id\"> (<a href=\"#CPAL\">#CPAL</"
-"a>)</span>"
+"Common_Public_Attribution_License_Version_1.0\">æ®éå
Œ
±å±æ§è®¸å¯è¯
1.0 (CPAL)"
+"</a> <span class=\"anchor-reference-id\"> (<a href=\"#CPAL\">#CPAL</a>)</"
+"span>"
#. type: Content of: <div><dl><dd><p>
msgid ""
@@ -2082,12 +2081,12 @@
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"EPL\" href=\"https://directory.fsf.org/wiki/License:EPLv1.0\";> "
-"Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#EPL\">#EPL</a>)</span>"
+"Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#EPL\">#EPL</a>)</span>"
msgstr ""
"<a id=\"EPL\" href=\"https://directory.fsf.org/wiki/License:";
-"EPLv1.0\">Eclipse å
Œ
±è®¸å¯è¯çæ¬ 1.0</a> <span
class=\"anchor-reference-id"
-"\">(<a href=\"#EPL\">#EPL</a>)</span>"
+"EPLv1.0\">Eclipse å
Œ
±è®¸å¯è¯çæ¬ 1.0</a> <span
class=\"anchor-reference-id\">"
+"(<a href=\"#EPL\">#EPL</a>)</span>"
#. type: Content of: <div><dl><dd><p>
msgid ""
@@ -2104,12 +2103,12 @@
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"EPL2\" href=\"https://directory.fsf.org/wiki/License:EPL-2.0\";> "
-"Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#EPL2\">#EPL2</a>)</span>"
+"Eclipse Public License Version 2.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#EPL2\">#EPL2</a>)</span>"
msgstr ""
"<a id=\"EPL2\" href=\"https://directory.fsf.org/wiki/License:";
-"EPL-2.0\">Eclipse å
Œ
±è®¸å¯è¯çæ¬ 2.0</a> <span
class=\"anchor-reference-id"
-"\">(<a href=\"#EPL2\">#EPL2</a>)</span>"
+"EPL-2.0\">Eclipse å
Œ
±è®¸å¯è¯çæ¬ 2.0</a> <span
class=\"anchor-reference-id\">"
+"(<a href=\"#EPL2\">#EPL2</a>)</span>"
#. type: Content of: <div><dl><dd><p>
msgid ""
@@ -2309,8 +2308,8 @@
"href=\"#IBMPL\">#IBMPL</a>)</span>"
msgstr ""
"<a id=\"IBMPL\" href=\"https://directory.fsf.org/wiki/License:";
-"IBMPLv1.0\">IBM å
Œ
±è®¸å¯è¯ï¼çæ¬ 1.0</a> <span
class=\"anchor-reference-id"
-"\">(<a href=\"#IBMPL\">#IBMPL</a>)</span>"
+"IBMPLv1.0\">IBM å
Œ
±è®¸å¯è¯ï¼çæ¬ 1.0</a> <span
class=\"anchor-reference-id\">"
+"(<a href=\"#IBMPL\">#IBMPL</a>)</span>"
#. type: Content of: <div><dl><dd><p>
msgid ""
@@ -2455,8 +2454,8 @@
msgid ""
"<a id=\"lucent102\" href=\"https://directory.fsf.org/wiki/License:";
"LucentPLv1.02\"> Lucent Public License Version 1.02 (Plan 9 license)</a> "
-"<span class=\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</"
-"a>)</span>"
+"<span class=\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</a>)"
+"</span>"
msgstr ""
"<a id=\"lucent102\" href=\"https://directory.fsf.org/wiki/License:";
"LucentPLv1.02\">Lucent å
Œ
±è®¸å¯è¯ 1.02ï¼Plan 9 许å¯è¯ï¼</a> <span
class="
@@ -2494,8 +2493,8 @@
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"ms-rl\" href=\"https://directory.fsf.org/wiki/License:MsRL\";> "
-"Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
+"Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
msgstr ""
"<a id=\"ms-rl\"
href=\"https://directory.fsf.org/wiki/License:MsRL\";>微软äºæ "
"许å¯è¯ï¼Ms-RLï¼</a> <span class=\"anchor-reference-id\">(<a
href=\"#ms-rl"
@@ -2804,8 +2803,8 @@
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"QPL\" href=\"https://directory.fsf.org/wiki/License:QPLv1.0\";> Q "
-"Public License (QPL), Version 1.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#QPL\">#QPL</a>)</span>"
+"Public License (QPL), Version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#QPL\">#QPL</a>)</span>"
msgstr ""
"<a id=\"QPL\" href=\"https://directory.fsf.org/wiki/License:QPLv1.0\";>Q å
Œ
±"
"许å¯è¯ï¼QPLï¼ï¼çæ¬ 1.0</a> <span class=\"anchor-reference-id\">(<a
href="
@@ -2915,8 +2914,8 @@
"\">#SPL</a>)</span>"
msgstr ""
"<a id=\"SPL\" href=\"https://directory.fsf.org/wiki/License:SPLv1.0\";>Sun å
¬"
-"å
±è®¸å¯è¯</a> <span class=\"anchor-reference-id\">(<a href=\"#SPL\">#SPL</"
-"a>)</span>"
+"å
±è®¸å¯è¯</a> <span class=\"anchor-reference-id\">(<a
href=\"#SPL\">#SPL</a>)"
+"</span>"
#. type: Content of: <div><dl><dd><p>
msgid ""
@@ -3625,8 +3624,8 @@
"\"anchor-reference-id\">(<a href=\"#Ms-SS\">#Ms-SS</a>)</span>"
msgstr ""
"<a id=\"Ms-SS\" href=
\"https://directory.fsf.org/wiki/License:Ms-SS\";>微软å
±"
-"享æºä»£ç CLIãC# å Jscript 许å¯è¯</a> <span
class=\"anchor-reference-id"
-"\">(<a href=\"#Ms-SS\">#Ms-SS</a>)</span>"
+"享æºä»£ç CLIãC# å Jscript 许å¯è¯</a> <span
class=\"anchor-reference-id\">"
+"(<a href=\"#Ms-SS\">#Ms-SS</a>)</span>"
#. type: Content of: <div><dl><dd><p>
msgid ""
@@ -3789,8 +3788,8 @@
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"PINE\" href=\"https://directory.fsf.org/wiki/License:PINE\";>License "
-"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</"
-"a>)</span>"
+"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)"
+"</span>"
msgstr ""
"<a id=\"PINE\" href=\"https://directory.fsf.org/wiki/License:PINE\";>PINE
ç许"
"å¯è¯</a> <span class=\"anchor-reference-id\">(<a
href=\"#PINE\">#PINE</a>)</"
@@ -3855,8 +3854,8 @@
"reference-id\">(<a href=\"#RPL\">#RPL</a>)</span>"
msgstr ""
"<a id=\"RPL\" href=\"https://directory.fsf.org/wiki/License:";
-"ReciprocalPLv1.3\">äºæ å
Œ
±è®¸å¯è¯</a> <span
class=\"anchor-reference-id"
-"\">(<a href=\"#RPL\">#RPL</a>)</span>"
+"ReciprocalPLv1.3\">äºæ å
Œ
±è®¸å¯è¯</a> <span
class=\"anchor-reference-id\">"
+"(<a href=\"#RPL\">#RPL</a>)</span>"
#. type: Content of: <div><dl><dd><p>
msgid ""
@@ -3925,8 +3924,8 @@
"\"#SML\">#SML</a>)</span>"
msgstr ""
"<a id=\"SML\"
href=\"https://directory.fsf.org/wiki/License:SimpleM\";>ç®åæº"
-"å¨è®¸å¯è¯</a> <span class=\"anchor-reference-id\">(<a href=\"#SML\">#SML</"
-"a>)</span>"
+"å¨è®¸å¯è¯</a> <span class=\"anchor-reference-id\">(<a
href=\"#SML\">#SML</a>)"
+"</span>"
#. type: Content of: <div><dl><dd><p>
msgid ""
@@ -4476,8 +4475,8 @@
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"GPLOther\" href=\"/licenses/gpl.html\"> GNU General Public License</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</a>)"
+"</span>"
msgstr ""
"<a id=\"GPLOther\" href=\"/licenses/gpl.html\">GNU éç¨å
Œ
±è®¸å¯è¯</a>
<span "
"class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</a>)</span>"
@@ -4760,8 +4759,8 @@
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"GPLFonts\" href=\"/licenses/gpl.html\"> GNU General Public License</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</a>)"
+"</span>"
msgstr ""
"<a id=\"GPLFonts\" href=\"/licenses/gpl.html\">GNU éç¨å
Œ
±è®¸å¯è¯</a>
<span "
"class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</a>)</span>"
@@ -4802,8 +4801,8 @@
#. type: Content of: <div><dl><dt>
msgid ""
"<a id=\"ecfonts\" href=\"https://directory.fsf.org/wiki/License:LaTeX_ecfonts";
-"\">License of the ec fonts for LaTeX</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ecfonts\">#ecfonts</a>)</span>"
+"\">License of the ec fonts for LaTeX</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ecfonts\">#ecfonts</a>)</span>"
msgstr ""
"<a id=\"ecfonts\" href=\"https://directory.fsf.org/wiki/License:LaTeX_ecfonts";
"\">LaTex ec åä½ç许å¯è¯</a> <span class=\"anchor-reference-id\">(<a
href="
@@ -5063,8 +5062,8 @@
#. type: Content of: <div><div>
msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
msgstr ""
-"<b>å®¡æ ¡</b>ï¼<a href=\"mailto:shankangke@gmail.com\";><Shankang Ke
(æ¯å"
-"康)></a>ï¼2020ã<br></br>\n"
+"<b>å®¡æ ¡</b>ï¼<a href=\"mailto:shankangke@gmail.com\";><Shankang Ke
(æ¯å康)"
+"></a>ï¼2020ã<br></br>\n"
"<b>ç¿»è¯å¢é</b>ï¼<a rel=\"team\"
href=\"https://savannah.gnu.org/projects/";
"www-zh-cn/\"><CTT></a>ï¼2021ï¼2022ã"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses gpl-faq.zh-cn.html license-list.zh...,
GNUN <=