www/licenses/po license-compatibility.zh-cn.po

[Wensheng XIE]

CVSROOT:        /web/www
Module name:    www
Changes by:     Wensheng XIE <wxie>     21/12/29 21:11:29

Modified files:
        licenses/po    : license-compatibility.zh-cn.po 

Log message:
        zh_CN: update translation

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.zh-cn.po?cvsroot=www&r1=1.9&r2=1.10

Patches:
Index: license-compatibility.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.zh-cn.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- license-compatibility.zh-cn.po      29 Dec 2021 16:01:03 -0000      1.9
+++ license-compatibility.zh-cn.po      30 Dec 2021 02:11:28 -0000      1.10
@@ -1,13 +1,13 @@
 # Simplified Chinese translation of 
https://www.gnu.org/licenses/license-compatibility.html
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2021 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
-# Wensheng Xie <wxie@member.fsf.org>, 2020.
+# Wensheng Xie <wxie@member.fsf.org>, 2020, 2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: license-compatibility.html\n"
 "POT-Creation-Date: 2021-12-29 15:55+0000\n"
-"PO-Revision-Date: 2020-11-24 10:01+0800\n"
+"PO-Revision-Date: 2021-12-30 09:54+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
 "Language: zh_CN\n"
@@ -31,32 +31,22 @@
 msgstr "Richard Stallman 著"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>"
 msgid ""
 "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\">[1]</a>"
 msgstr ""
 "å¦‚æžœä½ è¦æŠŠä¸¤ä¸ªè‡ªç”±ç¨‹åºåˆè€Œä¸ºä¸€ï¼Œæˆ–è€…æŠŠå…¶ä¸­ä¹‹ä¸€çš„ä»£ç 
å¹¶å…¥å¦ä¸€ä¸ªï¼Œé‚£ä¹ˆå°±ä¼šæœ‰ä¸€"
-"个它们的许可证是否允许/ç¦æ­¢è¿™æ ·åšçš„é—®é¢˜ã€‚<a 
href=\"#f1\">(*)</a>"
+"个它们的许可证是否允许/ç¦æ­¢è¿™æ ·åšçš„é—®é¢˜ã€‚<a 
href=\"#f1\">[1]</a>"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| 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\">(**)</a>"
 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\">(**)</a>"
+"è®¸å¯è¯ä¸€æ ·é¡ºç†æˆç« ã€‚<a href=\"#f2\">[2]</a>"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -105,14 +95,6 @@
 "是它们在用户的自由被否定时没有说 &ldquo;不&rdquo;。"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "In a combination of programs under lax licenses, each part carries the "
-#| "license it came with.  When the code is merged to the point that the "
-#| "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>"
 msgid ""
 "In a combination of programs under lax licenses, each part carries the "
 "license it came with.  When the code is merged to the point that the parts "
@@ -123,8 +105,8 @@
 msgstr ""
 "在把使用松散型许可证的代ç 
åˆåœ¨ä¸€èµ·æ—¶ï¼Œç»„合程序的每个部分都带有自己的许可证。"
 "å½“è¿™äº›ä»£ç äº¤ç»‡åœ¨ä¸€èµ·æ— 
法分辨时，组合程序应该带上所有代ç 
çš„许可证。由于这些许"
-"可证都是松散型的，所以å…
¨éƒ½å¸¦ä¸Šé™¤äº†å¤ªé•¿ä¹‹å¤–也没有别的问题。<a href=\"#f3\">"
-"(***)</a>"
+"可证都是松散型的，所以å…
¨éƒ½å¸¦ä¸Šé™¤äº†å¤ªé•¿ä¹‹å¤–也没有别的问题。<a href="
+"\"#f3\">[3]</a>"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -209,15 +191,6 @@
 msgstr "有两个方法来摆脱不同版本 copyleft 许可证带来的å…
ˆå¤©ä¸å…¼å®¹æ€§ã€‚"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "The FSF uses the approach of asking people to release programs under "
-#| "&ldquo;GNU GPL version N or any later version.&rdquo; 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 &ldquo;GPL 3 or "
-#| "later&rdquo; with code under &ldquo;GPL 2 or later&rdquo;, the license of "
-#| "the combination is their intersection, which is &ldquo;GPL 3 or "
-#| "later&rdquo;."
 msgid ""
 "The FSF uses the approach of asking people to release programs under &ldquo;"
 "GNU GPL version N or any later version.&rdquo; This licensing is compatible "
@@ -271,14 +244,6 @@
 "布。"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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 4, perhaps we should include an upgrade "
-#| "clause that automatically permits relicensing to higher-numbered "
-#| "versions, 5 and up."
 msgid ""
 "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 "
@@ -287,8 +252,8 @@
 "automatically permits relicensing to higher-numbered versions, 5 and up."
 msgstr ""
 "从那时起，我就在思量当时的决定是否明智。像 Linux 这æ 
·çš„程序，只允许一个版本"
-"的 GNU GPL 并拒绝升级许可证，这就导致实际上的不兼容。<a 
href=\"#f4\">(****)</"
-"a>或许我们应该在 GPL v4 的时侯包
含一个自动升级条款，如果我们需要版本 4 的话。"
+"的 GNU GPL 并拒绝升级许可证，这就导致实际上的不兼容。<a 
href=\"#f4\">[4]</a>"
+"或许我们应该在 GPL v4 的时侯包
含一个自动升级条款，如果我们需要版本 4 的话。"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -324,16 +289,6 @@
 "的合并程序只允许使用适当的 GPL 版本来发布。"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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 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."
 msgid ""
 "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-"
@@ -352,18 +307,6 @@
 "中明确说明的再次授权条款。"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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 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 authorize use of that relicensed material under GPL version "
-#| "4.  (Alternatively, you can ask the authors of that material to give "
-#| "permission right away.)"
 msgid ""
 "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 "
@@ -447,17 +390,6 @@
 "Mozilla å…¬å…±è®¸å¯è¯å…è®¸å°†ä»£ç å†æ¬¡æŽˆæƒåˆ° GNU GPL，除非该代ç 
æ˜Žç¡®æ‹’ç»è¿™æ ·åšã€‚"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Finally, what about dual licensing?<a href=\"#f5\">(*****)</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 Artistic License and the "
-#| "GNU General Public License.  This meant that each user could choose to "
-#| "use and redistribute Perl under one license or the other, or under both "
-#| "in disjunction like the Perl release itself.  A disjunction is compatible "
-#| "with a set of other licenses if any one of the license choices in the "
-#| "disjunction is compatible with that set."
 msgid ""
 "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 "
@@ -469,12 +401,12 @@
 "a set of other licenses if any one of the license choices in the disjunction "
 "is compatible with that set."
 msgstr ""
-"最后，双重许可证怎么办呢？<a 
href=\"#f5\">(*****)</a>双重许可证是一种或的关"
-"系：它的意思是同一个程序可以选择两个或多个许可证中的一个或å‡
 个。例如，老版本"
-"的 Perl 就带有双重许可证：或者是 Artistic 许可证，或者是 
GNU 通用公共许可证。"
-"这意味着每个用户都可以选择并按照其中一个许可证或者
就按照 Perl 原来的方式再次"
-"授权 Perl。如果双重许可证中的一个许可证和一组许可证å…
¼å®¹ï¼Œé‚£ä¹ˆè¯¥åŒé‡è®¸å¯è¯å°±å’Œ"
-"该组许可证兼容。"
+"最后，双重许可证怎么办呢？<a 
href=\"#f5\">[5]</a>双重许可证是一种或的关系：它"
+"的意思是同一个程序可以选择两个或多个许可证中的一个或å‡
 个。例如，老版本的 "
+"Perl 就带有双重许可证：或者是 Artistic 许可证，或者是 GNU 
通用公共许可证。这"
+"意味着每个用户都可以选择并按照其中一个许可证或者
就按照 Perl 原来的方式再次授"
+"权 Perl。如果双重许可证中的一个许可证和一组许可证å…
¼å®¹ï¼Œé‚£ä¹ˆè¯¥åŒé‡è®¸å¯è¯å°±å’Œè¯¥"
+"组许可证兼容。"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -555,11 +487,6 @@
 msgstr "GNU GPL 版本 N 包含了与之兼容的所有版本的 Mozilla 公å…
±è®¸å¯è¯ã€‚"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "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 "
@@ -587,34 +514,23 @@
 msgstr "脚注"
 
 #. type: Content of: <div><ol><li><p>
-#, fuzzy
-#| msgid ""
-#| "<b>*</b> 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."
 msgid ""
 "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."
 msgstr ""
-"<b>*</b> 可以想象还可能有关于合并程序的å…
¶ä»–法律问题，这些问题可能和合并程序的"
-"è®¸å¯è¯æ— å…³ã€‚æˆ‘ä»¬åªè®¨è®ºå’Œè®¸å¯è¯æœ¬èº«æœ‰å…³çš„é—®é¢˜ã€‚"
+"可以想象还可能有关于合并程序的å…
¶ä»–æ³•å¾‹é—®é¢˜ï¼Œè¿™äº›é—®é¢˜å¯èƒ½å’Œåˆå¹¶ç¨‹åºçš„è®¸å¯è¯æ— "
+"关。我们只讨论和许可证本身有关的问题。"
 
 #. type: Content of: <div><ol><li><p>
-#, fuzzy
-#| msgid ""
-#| "<b>**</b> 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."
 msgid ""
 "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."
 msgstr ""
-"<b>**</b> å®žé™…å½“ä¸­ç”¨åˆ°çš„ä¸é‚£ä¹ˆé¡ºç†æˆç« çš„è®¸å¯è¯ä¸»è¦æ˜¯ TeX 
的许可证：如果两个程"
-"序都按照 TeX çš„æ–¹å¼æŽˆæƒï¼Œé‚£ä¹ˆä½ 
就没有办法发布两个程序的组合程序。"
+"å®žé™…å½“ä¸­ç”¨åˆ°çš„ä¸é‚£ä¹ˆé¡ºç†æˆç« çš„è®¸å¯è¯ä¸»è¦æ˜¯ TeX 
的许可证：如果两个程序都按照 "
+"TeX çš„æ–¹å¼æŽˆæƒï¼Œé‚£ä¹ˆä½ 
就没有办法发布两个程序的组合程序。"
 
 #. type: Content of: <div><ol><li><p>
 msgid ""
@@ -639,29 +555,16 @@
 "证。"
 
 #. type: Content of: <div><ol><li><p>
-#, fuzzy
-#| msgid ""
-#| "<b>***</b> 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."
 msgid ""
 "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."
 msgstr ""
-"<b>***</b> å½“å‘å¸ƒæºä»£ç æ—¶ï¼Œåœ¨æºä»£ç é‡ŒåŠ å…
¥è®¸å¯è¯å£°æ˜Žé€šå¸¸å°±è¶³å¤Ÿäº†ï¼›åªæœ‰è±¡ä½¿ç”¨æ¾"
-"散型许可证的仅发布二进制而不带源代ç 
çš„程序才需要额外的许可证声明。"
+"å½“å‘å¸ƒæºä»£ç æ—¶ï¼Œåœ¨æºä»£ç é‡ŒåŠ å…
¥è®¸å¯è¯å£°æ˜Žé€šå¸¸å°±è¶³å¤Ÿäº†ï¼›åªæœ‰è±¡ä½¿ç”¨æ¾æ•£åž‹è®¸å¯è¯"
+"的仅发布二进制而不带源代ç 
çš„程序才需要额外的许可证声明。"
 
 #. type: Content of: <div><ol><li><p>
-#, fuzzy
-#| msgid ""
-#| "<b>****</b> 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."
 msgid ""
 "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 "
@@ -669,20 +572,12 @@
 "gplv3.html\">We fixed those problems, and others, in version 3</a>, but we "
 "can't change version 2."
 msgstr ""
-"<b>****</b> 另外，GPL v2 仍然å…
è®¸éžè‡ªç”±çš„二进制&mdash;&mdash;硬件只运行特别签"
-"名的二进制而拒绝其他二进制文件，而且仍然不允许使用 
torrent 发布二进制。<a "
-"href=\"/licenses/rms-why-gplv3.html\">我们在版本 3 
中修复了这些问题，还修复了"
-"其他问题</a>，但是我们不能改变版本 2。"
+"另外，GPL v2 仍然å…
è®¸éžè‡ªç”±çš„二进制&mdash;&mdash;硬件只运行特别签名的二进制而"
+"拒绝其他二进制文件，而且仍然不允许使用 torrent 
发布二进制。<a href=\"/"
+"licenses/rms-why-gplv3.html\">我们在版本 3 
中修复了这些问题，还修复了其他问题"
+"</a>，但是我们不能改变版本 2。"
 
 #. type: Content of: <div><ol><li><p>
-#, fuzzy
-#| msgid ""
-#| "<b>*****</b> Some use the term &ldquo;dual licensing&rdquo; 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."
 msgid ""
 "Some use the term &ldquo;dual licensing&rdquo; to refer to selling "
 "exceptions, but that is a misnomer.  See <a href=\"/philosophy/selling-"
@@ -690,10 +585,10 @@
 "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."
 msgstr ""
-"<b>*****</b> 有人使用 &ldquo;双重许可证&rdquo; 来å…
œå”®è®¸å¯è¯ä¾‹å¤–，但是词不达"
-"意。请参看 <a href=\"/philosophy/selling-exceptions.html\">å…
œå”®ä¾‹å¤–</a>。请注"
-"意，如果某个许可证兜售的程序包含了任何非自由的代ç 
ï¼Œé‚£ä¹ˆå®ƒå°±ä¸æ˜¯åœ¨å…œå”®ä¾‹å¤–，"
-"它就是非自由软件。"
+"有人使用 &ldquo;双重许可证&rdquo; 来å…
œå”®è®¸å¯è¯ä¾‹å¤–，但是词不达意。请参看 <a "
+"href=\"/philosophy/selling-exceptions.html\">å…
œå”®ä¾‹å¤–</a>。请注意，如果某个许"
+"可证兜售的程序包含了任何非自由的代ç 
ï¼Œé‚£ä¹ˆå®ƒå°±ä¸æ˜¯åœ¨å…œå”®ä¾‹å¤–，它就是非自由软"
+"件。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -726,18 +621,16 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-#, fuzzy
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
-"请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
-"è§£æœ‰å…³åè°ƒå’Œæäº¤æ–‡ç« ç¿»è¯‘çš„ä¿¡æ¯ã€‚"
+"我们尽最大努力来提供精准和高质量的翻译，但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方"
+"面有评论或一般性的建议，请发送至 <a 
href=\"mailto:web-translators@gnu.org";
+"\">&lt;web-translators@gnu.org&gt;</a>。</p><p>å…
³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信"
+"息参见 <a href=\"/server/standards/README.translations.html\">《译者
指南》</"
+"a>。"
 
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2016, 2018, 2020, 2021 Free Software Foundation, Inc."
@@ -758,7 +651,7 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
 "<b>翻译团队</b>：<a rel=\"team\" 
href=\"https://savannah.gnu.org/projects/";
-"www-zh-cn/\">&lt;CTT&gt;</a>，2020。"
+"www-zh-cn/\">&lt;CTT&gt;</a>，2020，2021。"
 
 #.  timestamp start 
 #. type: Content of: <div><p>