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

[Wensheng XIE]

CVSROOT:        /web/www
Module name:    www
Changes by:     Wensheng XIE <wxie>     20/11/23 23:18:07

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.5&r2=1.6

Patches:
Index: license-compatibility.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- license-compatibility.zh-cn.po      20 Nov 2020 16:30:39 -0000      1.5
+++ license-compatibility.zh-cn.po      24 Nov 2020 04:18:07 -0000      1.6
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: license-compatibility.html\n"
 "POT-Creation-Date: 2020-11-20 16:25+0000\n"
-"PO-Revision-Date: 2020-01-27 21:58+0800\n"
+"PO-Revision-Date: 2020-11-24 10:01+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"
@@ -42,8 +42,8 @@
 #. type: Content of: <p>
 msgid ""
 "There is no problem merging programs that have the same license, if it is a "
-"reasonably behaved license, as nearly all free licenses are.<a href=\"#f2\">"
-"(**)</a>"
+"reasonably behaved license, as nearly all free licenses are.<a href="
+"\"#f2\">(**)</a>"
 msgstr ""
 "如果两个软件使用同æ 
·çš„è®¸å¯è¯ï¼Œåº”è¯¥æ²¡æœ‰é—®é¢˜ï¼Œå‡å®šè¯¥è®¸å¯è¯è±¡å‡ 
乎所有的自由软件"
 "è®¸å¯è¯ä¸€æ ·é¡ºç†æˆç« ã€‚<a href=\"#f2\">(**)</a>"
@@ -105,8 +105,8 @@
 msgstr ""
 "在把使用松散型许可证的代ç 
åˆåœ¨ä¸€èµ·æ—¶ï¼Œç»„合程序的每个部分都带有自己的许可证。"
 "å½“è¿™äº›ä»£ç äº¤ç»‡åœ¨ä¸€èµ·æ— 
法分辨时，组合程序应该带上所有代ç 
çš„许可证。由于这些许"
-"可证都是松散型的，所以å…
¨éƒ½å¸¦ä¸Šé™¤äº†å¤ªé•¿ä¹‹å¤–也没有别的问题。<a href=\"#f3\">"
-"(***)</a>"
+"可证都是松散型的，所以å…
¨éƒ½å¸¦ä¸Šé™¤äº†å¤ªé•¿ä¹‹å¤–也没有别的问题。<a href="
+"\"#f3\">(***)</a>"
 
 #. type: Content of: <p>
 msgid ""
@@ -156,20 +156,6 @@
 "a>。"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "In general, two different copyleft licenses are unavoidably incompatible "
-#| "unless they have explicit compatibility provisions.  This is not due to a "
-#| "mistake in the details; it's inherent in the idea of copyleft.  The idea "
-#| "of copyleft is that &ldquo;Modified and extended versions must be under "
-#| "the same license.&rdquo; If license A says extended programs must be "
-#| "under license A, and license B says extended programs must be under "
-#| "license B, they have an irreconcilable disagreement; the license of the "
-#| "combined program would have to be A, <em>and</em> it would have to be B.  "
-#| "This is why GPL version 2 is incompatible with GPL version 3; it could "
-#| "not be avoided.  Likewise, the conditions of CC-BY-SA 4.0 would be "
-#| "inherently incompatible with those of CC-BY-SA 3.0, and the authors could "
-#| "not have avoided this."
 msgid ""
 "In general, two different copyleft licenses are unavoidably incompatible "
 "unless they have explicit compatibility provisions.  This is not due to a "
@@ -181,13 +167,12 @@
 "the combined program which includes code from P plus code from Q would have "
 "to be A, <em>and</em> it would have to be B."
 msgstr ""
-"一般来说，两个不同的 copyleft è®¸å¯è¯æ˜¯æ— å¯é¿å…çš„ä¸å…
¼å®¹ï¼Œé™¤éžä¸¤è€…之间有明确的"
+"一般来说，两个不同的 copyleft è®¸å¯è¯æ˜¯æ— å¯é¿å…åœ°ä¸å…
¼å®¹ï¼Œé™¤éžä¸¤è€…之间有明确的"
 "å…¼å®¹æ¡æ¬¾ã€‚è¿™ä¸æ˜¯å› ä¸ºç»†èŠ‚æœ‰è¯¯ï¼›è¿™æ˜¯ copyleft 
理念与生俱来的特点。copyleft 的理"
 "念是 &ldquo;修改和扩展的版本必须延用同æ 
·çš„许可证。&rdquo;如果使用许可证甲的扩"
-"展程序必须延用许可证甲，使用许可证乙的程序必
须延用许可证乙，那么它们之间就是"
-"不可调和；如果合并程序，许可证必须是甲，<em>也</em>必
须是乙。这就是为什么 "
-"GPL v2 和 GPL v3 ä¸å…¼å®¹ï¼›è¿™æ˜¯æ— æ³•é¿å…çš„ã€‚åŒæ ·åœ°ï¼ŒCC-BY-SA 
4.0 的要求就天生和 "
-"CC-BY-SA 3.0 ä¸å…¼å®¹ï¼Œè€Œä¸”ä½œè€…ä¹Ÿæ— æ³•é¿å…è¿™ä¸€ç‚¹ã€‚"
+"展程序 A 必须延用许可证甲，使用许可证乙的程序 B 必
须延用许可证乙，那么它们之"
+"间就是不可调和；如果合并程序包含 A 和 B 的代ç 
ï¼Œé‚£ä¹ˆåˆå¹¶ç¨‹åºçš„许可证必须是"
+"甲，<em>也</em>必须是乙。"
 
 #. type: Content of: <p>
 msgid ""
@@ -196,16 +181,14 @@
 "incompatible with those of CC-BY-SA 3.0, and the authors could not have "
 "avoided this."
 msgstr ""
+"这就是为什么 GPL v2 和 GPL v3 ä¸å…¼å®¹ï¼›è¿™ä¸ªæ— æ³•é¿å…ã€‚åŒæ 
·åœ°ï¼ŒCC-BY-SA 4.0 的条"
+"件也天然不兼容 CC-BY-SA 3.0 çš„æ¡ä»¶ï¼Œå…¶ä½œè€…ä¹Ÿæ— æ³•é¿å…
è¿™ä¸€ç‚¹ã€‚"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "There are two approaches for smoothing out the incompatibility inherent "
-#| "in new versions of copyleft licenses."
 msgid ""
 "There are two approaches for avoiding the incompatibility problem caused by "
 "different versions of copyleft licenses."
-msgstr "有两个方法来摆脱新版 copyleft 许可证带来的先天不å…
¼å®¹æ€§ã€‚"
+msgstr "有两个方法来摆脱不同版本 copyleft 许可证带来的å…
ˆå¤©ä¸å…¼å®¹æ€§ã€‚"
 
 #. type: Content of: <p>
 msgid ""
@@ -234,13 +217,6 @@
 "到 GNU GPL v4，一旦我们发布了 v4。"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "The other approach is to make each version of the license explicitly "
-#| "allow upgrading to later versions.  This is what Creative Commons does: "
-#| "for instance, CC-BY-SA version 4.0 (the current version)  explicitly "
-#| "permits any user to upgrade to later versions of CC-BY-SA once those "
-#| "exist.  The Mozilla Foundation also uses this approach."
 msgid ""
 "The other approach is to make each version of the license explicitly allow "
 "upgrading to later versions.  The Mozilla Foundation uses this approach, as "
@@ -248,9 +224,9 @@
 "version) explicitly permits any user to upgrade to later versions of CC-BY-"
 "SA for modified works."
 msgstr ""
-"另一个方法是让每一个版本都明确å…
è®¸å‡çº§åˆ°ä»¥åŽçš„版本。这就是 Creative Commons "
-"采用的办法：例如，CC-BY-SA 4.0 版（当前版）明确å…
è®¸ä»»ä½•ç”¨æˆ·å°†è®¸å¯è¯å‡çº§åˆ°ä»¥åŽ"
-"版本的 CC-BY-SA（一旦有了）。Mozilla 
基金会也是使用该方法。"
+"另一个方法是让每一个版本都明确å…
è®¸å‡çº§åˆ°ä»¥åŽçš„版本。Mozilla 基金会使用该方"
+"法，PHP 也使用该方法。Creative Commons 对 CC-BY-SA 4.0 
版（当前版）使用此方"
+"法：明确å…
è®¸ä»»ä½•ç”¨æˆ·å°†ä¿®æ”¹ç‰ˆä½œå“çš„许可证升级到以后版本的 
CC-BY-SA。"
 
 #. type: Content of: <p>
 msgid ""
@@ -268,13 +244,6 @@
 "布。"
 
 #. type: Content of: <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> Perhaps we should include an upgrade clause in GPL version 4, if we "
-#| "ever need a version 4."
 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 "
@@ -284,7 +253,7 @@
 msgstr ""
 "从那时起，我就在思量当时的决定是否明智。像 Linux 这æ 
·çš„程序，只允许一个版本"
 "的 GNU GPL 并拒绝升级许可证，这就导致实际上的不兼容。<a 
href=\"#f4\">(****)</"
-"a>或许我们应该在 GPL v4 的时侯包
含一个升级条款，如果我们需要版本 4 的话。"
+"a>或许我们应该在 GPL v4 的时侯包
含一个自动升级条款，如果我们需要版本 4 的话。"
 
 #. type: Content of: <p>
 msgid ""
@@ -666,10 +635,8 @@
 "a>。"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid "Copyright &copy; 2016, 2018 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2016, 2018 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2016, 2018, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""