[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www gnu/gnu.zh-cn.html gnu/po/gnu.zh-cn-en.html...
|
From: |
GNUN |
|
Subject: |
www gnu/gnu.zh-cn.html gnu/po/gnu.zh-cn-en.html... |
|
Date: |
Wed, 1 Jan 2020 07:04:45 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 20/01/01 07:04:45
Modified files:
gnu : gnu.zh-cn.html
gnu/po : gnu.zh-cn-en.html gnu.zh-cn.po
licenses : gpl-faq.zh-cn.html
license-recommendations.zh-cn.html
licenses/po : gpl-faq.zh-cn-en.html gpl-faq.zh-cn.po
license-recommendations.zh-cn-en.html
license-recommendations.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu.zh-cn.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-recommendations.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.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.zh-cn.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.zh-cn-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.zh-cn.po?cvsroot=www&r1=1.17&r2=1.18
Patches:
Index: gnu/gnu.zh-cn.html
===================================================================
RCS file: /web/www/www/gnu/gnu.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/gnu.zh-cn.html 26 Aug 2017 13:59:13 -0000 1.1
+++ gnu/gnu.zh-cn.html 1 Jan 2020 12:04:44 -0000 1.2
@@ -148,7 +148,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014, 2015, 2016, 2019, 2020 Free Software Foundation,
Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -164,7 +164,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2017/08/26 13:59:13 $
+$Date: 2020/01/01 12:04:44 $
<!-- timestamp end -->
</p>
@@ -172,3 +172,4 @@
</div>
</body>
</html>
+
Index: gnu/po/gnu.zh-cn-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/po/gnu.zh-cn-en.html 26 Aug 2017 13:59:14 -0000 1.1
+++ gnu/po/gnu.zh-cn-en.html 1 Jan 2020 12:04:44 -0000 1.2
@@ -156,7 +156,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014, 2015, 2016, 2019, 2020 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
@@ -166,10 +166,11 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/08/26 13:59:14 $
+$Date: 2020/01/01 12:04:44 $
<!-- timestamp end -->
</p>
</div>
</div>
</body>
</html>
+
Index: gnu/po/gnu.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/po/gnu.zh-cn.po 1 Jan 2020 11:36:46 -0000 1.5
+++ gnu/po/gnu.zh-cn.po 1 Jan 2020 12:04:44 -0000 1.6
@@ -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-12-31 12:56+0000\n"
#. type: Content of: <title>
msgid "The GNU Operating System - GNU project - Free Software Foundation"
@@ -84,8 +83,8 @@
"<a href=\"/gnu/rms-lisp.html\">My Lisp Experiences and the Development of "
"GNU Emacs</a> (by Richard Stallman)"
msgstr ""
-"<a href=\"/gnu/rms-lisp.html\">æçLispç»ååGNU Emacsçå¼ååç¨</"
-"a>ï¼Richard Stallman èï¼"
+"<a href=\"/gnu/rms-lisp.html\">æçLispç»ååGNU
Emacsçå¼ååç¨</a>"
+"ï¼Richard Stallman èï¼"
#. type: Content of: <ul><li>
msgid ""
Index: licenses/gpl-faq.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- licenses/gpl-faq.zh-cn.html 31 Dec 2019 13:04:23 -0000 1.5
+++ licenses/gpl-faq.zh-cn.html 1 Jan 2020 12:04:44 -0000 1.6
@@ -2287,7 +2287,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software
+<p>Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Free Software
Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
@@ -2304,7 +2304,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/12/31 13:04:23 $
+$Date: 2020/01/01 12:04:44 $
<!-- timestamp end -->
</p>
Index: licenses/license-recommendations.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/license-recommendations.zh-cn.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- licenses/license-recommendations.zh-cn.html 1 Dec 2019 12:58:41 -0000
1.11
+++ licenses/license-recommendations.zh-cn.html 1 Jan 2020 12:04:44 -0000
1.12
@@ -1,7 +1,7 @@
<!--#set var="ENGLISH_PAGE" value="/licenses/license-recommendations.en.html"
-->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.90 -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>å¦ä½ä¸ºä½ çä½åéæ©ä¸ä»½è®¸å¯è¯ - GNU å·¥ç¨ -
èªç±è½¯ä»¶åºéä¼</title>
@@ -71,11 +71,16 @@
<p>对äºåºï¼æ们åä¸ç§æ
å½¢ã</p>
-<p>ä¸äºå®ç°äºèªç±æ åçåºä¸é£äºéå¶æ§æ åç«äºï¼ä¾å¦
Ogg Vorbisï¼å MP3 é³é¢ç«äºï¼å WebMï¼å MPEG-4
-è§é¢ç«äºï¼ãèªç±æ
åçæåéè¦ä¼å¤ä¸æ软件è½å¤é¾æ¥å°èªç±æ
åçåºæ¥å¤çæ°æ®ãä¾å¦ï¼æ们å¸æéèªç±çåªä½ææ¾å¨æ¢å¯ä»¥å¤ç
Ogg ä¹å¯ä»¥å¤ç MP3ã</p>
+<p>ä¸äºå®ç°äºèªç±æ°æ®æ
¼å¼çåºä¸é£äºéå¶æ§æ°æ®ç«äºï¼ä¾å¦ Ogg Vorbisï¼ä¸ MP3
é³é¢ç«äºï¼å WebMï¼ä¸ MPEG-4
+è§é¢ç«äºï¼ãèªç±æ
åçæåéè¦ä¼å¤ä¸æ软件è½å¤é¾æ¥å°èªç±æ
åçåºæ¥å¤çæ°æ®ãä¾å¦ï¼æ们å¸æéèªç±çåªä½ææ¾å¨ï¼å°¤å
¶æ¯åºç¨ç¨åºï¼æ¢å¯ä»¥å¤ç Ogg
+Vorbis ä¹å¯ä»¥å¤ç MP3ã</p>
+
+<p>å¨è¿äºç¹æ®çæ
åµä¸ï¼å¦æä½
çç®çæ¯è¯´æä¸æåºç¨å¼åè
使ç¨èªç±æ åçåºï¼é£ä¹ä½
å°±åºè¯¥å¯¹è¿äºåºä½¿ç¨å®½æ¾ç许å¯è¯ï¼æ¯å¦ <a
+href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 2.0
+许å¯è¯</a>ï¼è¿æ ·ä¸æåºç¨å°±å®¹æå
å«è¿äºåºã</p>
-<p>å¨è¿äºç¹æ®çæ
åµï¼æ们建议æ¤ç±»å¤çèªç±æ ¼å¼çåºä½¿ç¨
<a
-href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 2.0
许å¯è¯</a>ã</p>
+<p>ç¶èï¼æ们å¿
é¡»çå°è¿ç§çç¥å¯¹ Ogg Vorbis
+并æªå¥æãå³ä½¿æ们修æ¹çæ许å¯è¯å
许ä¸æåºç¨è½»æå°å
å«è¯¥åºç代ç ï¼ä¸æåºç¨çå¼åè
ä¸è¬æ¥è¯´è¿æ¯æ²¡æå
å«è¯¥åºãæ们å¨è®¸å¯è¯ä¸ççºç²æç»å¹¶æ²¡æ让æ们è·çã</p>
<p>对ææå
¶ä»çåºï¼æ们æ¨èæç§ copyleft
许å¯è¯ãå¦æå¼åè
å·²ç»ä½¿ç¨ç°æç以éèªç±æä¸ä¸¥æ ¼ç
pushover 许å¯è¯åå¸çåºï¼é£ä¹æ们建议使ç¨
<a href="/licenses/lgpl.html">GNU 宽éç¨å
Œ
±è®¸å¯è¯ï¼LGPLï¼</a>ã</p>
@@ -199,12 +204,12 @@
(vimacs)ï¼2016ã<a
href="mailto:address@hidden";><address@hidden></a><br></br>
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2018-2019ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2018-2020ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/12/01 12:58:41 $
+$Date: 2020/01/01 12:04:44 $
<!-- 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- licenses/po/gpl-faq.zh-cn-en.html 31 Dec 2019 13:04:23 -0000 1.5
+++ licenses/po/gpl-faq.zh-cn-en.html 1 Jan 2020 12:04:44 -0000 1.6
@@ -3956,7 +3956,7 @@
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software
Foundation, Inc.</p>
+<p>Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 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
@@ -3966,7 +3966,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/12/31 13:04:23 $
+$Date: 2020/01/01 12:04:44 $
<!-- 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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- licenses/po/gpl-faq.zh-cn.po 1 Jan 2020 11:36:17 -0000 1.18
+++ licenses/po/gpl-faq.zh-cn.po 1 Jan 2020 12:04:44 -0000 1.19
@@ -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: 2020-01-01 05:25+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 ""
@@ -1866,8 +1865,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 ""
@@ -1986,8 +1985,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>"
@@ -2267,8 +2266,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 ""
@@ -2302,8 +2301,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 ""
@@ -2443,9 +2442,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éç¨å
Œ
±è®¸å¯è¯çæ¡æ¬¾ä¼è¦çå°æ´ä¸ªå并çå·¥"
@@ -2456,18 +2455,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çåå¸è¦æ±å
å«äºå
¶ä»ç¨åºçæºä»£ç }"
"使ç¨çç¸å
³è®¸å¯è¯ã"
@@ -2624,8 +2623,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\" "
@@ -2935,8 +2934,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 ""
@@ -3543,8 +3542,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 ""
@@ -3623,8 +3622,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 ""
@@ -3733,8 +3732,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 ""
@@ -3757,8 +3756,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>"
@@ -3939,11 +3938,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 ""
@@ -4063,8 +4062,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 ""
@@ -4401,8 +4400,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 ""
@@ -4510,8 +4509,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 ""
@@ -4730,11 +4729,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 ""
@@ -4846,8 +4845,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 ""
@@ -4917,8 +4916,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 ""
@@ -5151,8 +5150,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>"
@@ -5179,8 +5178,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 ""
@@ -5486,8 +5485,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 ""
@@ -5540,8 +5539,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 ""
@@ -5586,8 +5585,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 ""
@@ -5645,8 +5644,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>"
@@ -5987,8 +5986,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\" "
@@ -6228,8 +6227,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 ""
@@ -6694,13 +6693,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>"
@@ -6710,15 +6709,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>"
@@ -6727,8 +6726,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 ""
@@ -6755,16 +6754,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 ""
@@ -6784,24 +6783,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>"
@@ -6815,8 +6814,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>"
@@ -6991,8 +6990,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: licenses/po/license-recommendations.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.zh-cn-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- licenses/po/license-recommendations.zh-cn-en.html 15 Oct 2019 23:58:14
-0000 1.4
+++ licenses/po/license-recommendations.zh-cn-en.html 1 Jan 2020 12:04:44
-0000 1.5
@@ -1,5 +1,5 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.90 -->
<title>How to choose a license for your own work
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/licenses/po/license-recommendations.translist" -->
@@ -123,15 +123,23 @@
against restricted data formats, such as Ogg Vorbis (which competes
against MP3 audio) and WebM (which competes against MPEG-4 video).
The success of the free format requires allowing many proprietary
-application programs to link in the code to handle the format.
-For instance, we would like nonfree media players to include the
-code for Ogg Vorbis as well as MP3.</p>
-
-<p>In these special situations, we recommend licensing the library
-that handles the free format under
+application programs to link in the code to handle the format. For
+instance, we wanted nonfree media players, especially appliances, to
+include the code for Ogg Vorbis as well as MP3.</p>
+
+<p>In these special situations, if you are aiming to convince
+proprietary application developers to use the library for the free
+format, you would need to make that easy by licensing the library
+under a weak license, such as
the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache
License 2.0</a>.</p>
+<p>However, we must recognize that this strategy did not succeed for
+Ogg Vorbis. Even after changing the copyright license to permit easy
+inclusion of that library code in proprietary applications,
+proprietary developers generally did not include it. The sacrifice
+made in the choice of license ultimately won us little.</p>
+
<p>For all other libraries, we recommend some kind of copyleft. If
developers are already using an established alternative library
released under a nonfree license or a lax pushover license, then we
@@ -290,7 +298,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/10/15 23:58:14 $
+$Date: 2020/01/01 12:04:44 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/license-recommendations.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.zh-cn.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- licenses/po/license-recommendations.zh-cn.po 1 Jan 2020 11:35:55
-0000 1.17
+++ licenses/po/license-recommendations.zh-cn.po 1 Jan 2020 12:04:44
-0000 1.18
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-12-22 10:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -309,8 +308,8 @@
"library”</a>."
msgstr ""
"对äºæä¾äºç¹å«è®¾è®¡ï¼å¹¶ä¸ä¸ä¼ä¸ç°æé copyleft
æéèªç±åºç«äºçï¼æ们æ¨è使ç¨"
-"åå§ç GNU GPLãè¦ç¥éåå ï¼è¯·é
读<a
href=\"/licenses/why-not-lgpl.html"
-"\">ã为ä»ä¹ä½ ä¸åºè¯¥å¨ä¸ä¸ä¸ªå½æ°åºä¸ä½¿ç¨ LGPLã</a>ã"
+"åå§ç GNU GPLãè¦ç¥éåå ï¼è¯·é
读<a
href=\"/licenses/why-not-lgpl.html\">"
+"ã为ä»ä¹ä½ ä¸åºè¯¥å¨ä¸ä¸ä¸ªå½æ°åºä¸ä½¿ç¨ LGPLã</a>ã"
#. type: Content of: <h4>
msgid "Server Software"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www gnu/gnu.zh-cn.html gnu/po/gnu.zh-cn-en.html...,
GNUN <=