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

[Wensheng XIE]

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

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

Log message:
        zh-cn: update translation

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

Patches:
Index: license-recommendations.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.zh-cn.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- license-recommendations.zh-cn.po    20 Nov 2020 17:30:05 -0000      1.20
+++ license-recommendations.zh-cn.po    24 Nov 2020 04:17:31 -0000      1.21
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
 "POT-Creation-Date: 2020-11-20 17:25+0000\n"
-"PO-Revision-Date: 2020-01-01 19:29+0800\n"
+"PO-Revision-Date: 2020-11-24 11:04+0800\n"
 "Last-Translator: Hagb (郭俊余) <hagb_green@qq.com>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
 "Language: zh_CN\n"
@@ -154,15 +154,6 @@
 "为什么它通常是最好的许可方案"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "For most programs, we recommend that you use the most recent version of "
-#| "the <a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> "
-#| "for your project.  Its strong copyleft is appropriate for all kinds of "
-#| "software, and includes numerous protections for users' freedom.  Please "
-#| "give permission to use future license versions as well&mdash;in other "
-#| "words, make the license notice say that your program is covered by GPL "
-#| "version 3 or later."
 msgid ""
 "For most programs, we recommend that you use the most recent version of the "
 "<a href=\"/licenses/gpl.html\">GNU General Public License (GPL)</a> for your "
@@ -176,8 +167,10 @@
 msgstr ""
 "å¯¹å¤§å¤šæ•°ç¨‹åºï¼Œæˆ‘ä»¬æŽ¨èä½ ä¸ºä½ çš„é¡¹ç›®ä½¿ç”¨æœ€æ–°ç‰ˆçš„ <a 
href=\"/licenses/gpl.html"
 "\">GPL</a>。它强大的 copyleft 
适合所有类型的软件，并对用户的自由有很多保护。"
-"也请允许使用 GPL 
的未来版本&mdash;æ¢å¥è¯è¯´ï¼Œåœ¨è®¸å¯å£°æ˜Žä¸­å†™ä¸Šä½ çš„ç¨‹åºè¢« 
GPL "
-"v3 或其更新版本覆盖。"
+"为了将来许可证的升级，<a 
href=\"/licenses/identify-licenses-clearly.html\">请"
+"声明 &ldquo;版本 3 或者任何新版本&rdquo;</a>ï¼Œè¿™æ ·ä½ 
的程序就 <a href=\"/"
+"licenses/license-compatibility.html\">在许可证层面兼容</a> å…
¶ä»–将来按照后续 "
+"GPL 版本发布的程序。"
 
 #. type: Content of: <p>
 msgid ""
@@ -210,16 +203,6 @@
 "软件的不便。"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "For those programs, we recommend the <a href=\"http://www.apache.org/";
-#| "licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a pushover (non-"
-#| "copyleft) software license that has terms to prevent contributors and "
-#| "distributors from suing for patent infringement.  This doesn't make the "
-#| "software immune to threats from patents (a software license can't do "
-#| "that), but it does prevent patent holders from setting up a &ldquo;bait "
-#| "and switch&rdquo; where they release the software under free terms then "
-#| "require recipients to agree to nonfree terms in a patent license."
 msgid ""
 "For those programs, we recommend the <a href=\"http://www.apache.org/";
 "licenses/LICENSE-2.0\">Apache License 2.0</a>.  This is a weak, lax, &ldquo;"
@@ -232,24 +215,19 @@
 "license."
 msgstr ""
 "对这些程序，我们推荐 <a href=\"http://www.apache.org/licenses/";
-"LICENSE-2.0\">Apache 2.0 许可证</a>。这是一个 
pushover（非copyleft）软件许可"
-"证，它有用于避免贡献者和分发者
起诉专利侵权的条目。这并不会让软件避免来自专利"
-"的威胁（一个软件许可证是做不到的），但它避å…
äº†ä¸“利持有者打着自由的幌子发布软"
-"件，这种情况下专利持有者
会相当于做了一次&ldquo;诱导转向&rdquo;，然后要求接受"
-"者同意专利证书中的非自由条目。"
+"LICENSE-2.0\">Apache 2.0 
许可证</a>。这是一个弱的、松散的、&ldquo;顺从型"
+"&rdquo;（非 copyleft）软件许可证，它有用于避免贡献者
和分发者起诉专利侵权的条"
+"目。这并不会让软件避å…
æ¥è‡ªä¸“利的威胁（一个软件许可证是做不到的），但它避å…
äº†"
+"专利持有者打着自由的幌子发布软件，这种情
况下专利持有者会相当于做了一次&ldquo;"
+"诱导转向&rdquo;，然后要求接受者
同意专利证书中的非自由条目。"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Among the lax pushover licenses, Apache 2.0 is best; so if you are going "
-#| "to use a lax pushover license, whatever the reason, we recommend using "
-#| "that one."
 msgid ""
 "Among the weak (pushover) licenses, Apache 2.0 is best; so if you are going "
 "to use a weak license, whatever the reason, we recommend using that one."
 msgstr ""
-"åœ¨ä¸ä¸¥æ ¼çš„ pushover 许可证中，Apache 2.0 
æ˜¯æœ€å¥½çš„ï¼›æ‰€ä»¥å¦‚æžœä½ è¦ç”¨ä¸€ä¸ªä¸ä¸¥æ ¼"
-"的 pushover è®¸å¯è¯ï¼Œä¸è®ºä»€ä¹ˆåŽŸå› ï¼Œæˆ‘ä»¬æŽ¨èç”¨è¿™ä¸€ä¸ªã€‚"
+"åœ¨ä¸ä¸¥æ ¼çš„ï¼ˆé¡ºä»Žåž‹ï¼‰è®¸å¯è¯ä¸­ï¼ŒApache 2.0 
æ˜¯æœ€å¥½çš„ï¼›æ‰€ä»¥å¦‚æžœä½ è¦ç”¨ä¸€ä¸ªä¸ä¸¥æ ¼çš„"
+"è®¸å¯è¯ï¼Œä¸è®ºä»€ä¹ˆåŽŸå› ï¼Œæˆ‘ä»¬æŽ¨èç”¨è¿™ä¸€ä¸ªã€‚"
 
 #. type: Content of: <h4>
 msgid "Libraries"
@@ -337,8 +315,8 @@
 "library&rdquo;</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"
@@ -515,30 +493,24 @@
 #.         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.translators.html\">《译者
指南》</"
+"a>。"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Copyright &copy; 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-#| "Foundation, Inc."
 msgid ""
 "Copyright &copy; 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
 "Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2011, 2013, 2014, 2015, 2017, 2018, 2019 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Free "
+"Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""