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

[Wensheng XIE]

CVSROOT:        /web/www
Module name:    www
Changes by:     Wensheng XIE <wxie>     20/01/01 06:35:55

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.16&r2=1.17

Patches:
Index: license-recommendations.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.zh-cn.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- license-recommendations.zh-cn.po    28 Dec 2019 08:02:02 -0000      1.16
+++ license-recommendations.zh-cn.po    1 Jan 2020 11:35:55 -0000       1.17
@@ -1,15 +1,15 @@
 # Simplified Chinese translation of 
https://www.gnu.org/licenses/license-recommendations.html
-# Copyright (C) 2018, 2019 Free Software Foundation, Inc.
+# Copyright (C) 2020 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Iru Cai (vimacs) <address@hidden>, 2016.
 # Hagb（郭俊余） <address@hidden>, 2018, 2019.
-# Wensheng Xie <address@hidden>, 2019.
+# Wensheng Xie <address@hidden>, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
 "POT-Creation-Date: 2019-12-28 07:57+0000\n"
-"PO-Revision-Date: 2019-12-01 20:28+0800\n"
+"PO-Revision-Date: 2020-01-01 19:29+0800\n"
 "Last-Translator: Hagb (郭俊余) <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "Language: zh_CN\n"
@@ -232,14 +232,6 @@
 msgstr "对于库，我们分三种情形。"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Some libraries implement free data formats that are competing 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."
 msgid ""
 "Some libraries implement free data formats that are competing against "
 "restricted data formats, such as Ogg Vorbis (which competes against MP3 "
@@ -249,17 +241,12 @@
 "players, especially appliances, to include the code for Ogg Vorbis as well "
 "as MP3."
 msgstr ""
-"ä¸€äº›å®žçŽ°äº†è‡ªç”±æ ‡å‡†çš„åº“ä¸Žé‚£äº›é™åˆ¶æ€§æ ‡å‡†ç«žäº‰ï¼Œä¾‹å¦‚ Ogg 
Vorbis（和 MP3 音频竞"
-"争）和 WebM（和 MPEG-4 视频竞争）。自由æ 
‡å‡†çš„成功需要众多专有软件能够链接到自"
-"由æ 
‡å‡†çš„库来处理数据。例如，我们希望非自由的媒体播放器既可以处理
 Ogg 也可以处"
-"理 MP3。"
+"一些实现了自由数据æ 
¼å¼çš„库与那些限制性数据竞争，例如 Ogg Vorbis（与 MP3 音频"
+"竞争）和 WebM（与 MPEG-4 视频竞争）。自由æ 
‡å‡†çš„成功需要众多专有软件能够链接到"
+"自由æ 
‡å‡†çš„库来处理数据。例如，我们希望非自由的媒体播放器，尤å
…¶æ˜¯åº”用程序，既"
+"可以处理 Ogg Vorbis 也可以处理 MP3。"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "In these special situations, we recommend licensing the library that "
-#| "handles the free format under the <a href=\"http://www.apache.org/";
-#| "licenses/LICENSE-2.0\">Apache License 2.0</a>."
 msgid ""
 "In these special situations, if you are aiming to convince proprietary "
 "application developers to use the library for the free format, you would "
@@ -267,8 +254,9 @@
 "as the <a href=\"http://www.apache.org/licenses/LICENSE-2.0\";>Apache License "
 "2.0</a>."
 msgstr ""
-"åœ¨è¿™äº›ç‰¹æ®Šçš„æƒ…å†µï¼Œæˆ‘ä»¬å»ºè®®æ­¤ç±»å¤„ç†è‡ªç”±æ ¼å¼çš„åº“ä½¿ç”¨ 
<a href=\"http://www.";
-"apache.org/licenses/LICENSE-2.0\">Apache 2.0 许可证</a>。"
+"åœ¨è¿™äº›ç‰¹æ®Šçš„æƒ…å†µä¸‹ï¼Œå¦‚æžœä½ çš„ç›®çš„æ˜¯è¯´æœä¸“æœ‰åº”ç”¨å¼€å‘è€…
ä½¿ç”¨è‡ªç”±æ ‡å‡†çš„åº“ï¼Œé‚£ä¹ˆä½ "
+"就应该对这些库使用宽松的许可证，比如 <a 
href=\"http://www.apache.org/";
+"licenses/LICENSE-2.0\">Apache 2.0 许可证</a>，这æ 
·ä¸“有应用就容易包含这些库。"
 
 #. type: Content of: <p>
 msgid ""
@@ -278,6 +266,9 @@
 "generally did not include it.  The sacrifice made in the choice of license "
 "ultimately won us little."
 msgstr ""
+"然而，我们必须看到这种策略对 Ogg Vorbis 
并未奏效。即使我们修改版权许可证允许"
+"ä¸“æœ‰åº”ç”¨è½»æ˜“åœ°åŒ…å«è¯¥åº“çš„ä»£ç ï¼Œä¸“æœ‰åº”ç”¨çš„å¼€å‘è€…
一般来说还是没有包含该库。我们"
+"在许可证上的牺牲最终并没有让我们获益。"
 
 #. type: Content of: <p>
 msgid ""
@@ -318,8 +309,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"
@@ -535,7 +526,7 @@
 "\">BLUG</a> 的 Iru Cai (vimacs)，2016。<a href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a><br></br>\n"
 "<b>翻译团队</b>：<a rel=\"team\" 
href=\"https://savannah.gnu.org/projects/";
-"www-zh-cn/\">&lt;CTT&gt;</a>，2018-2019。"
+"www-zh-cn/\">&lt;CTT&gt;</a>，2018-2020。"
 
 #.  timestamp start 
 #. type: Content of: <div><p>