www/licenses identify-licenses-clearly.zh-cn.ht...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     20/07/24 08:32:44

Modified files:
        licenses       : identify-licenses-clearly.zh-cn.html 
        licenses/po    : identify-licenses-clearly.zh-cn-en.html 
                         identify-licenses-clearly.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/identify-licenses-clearly.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/identify-licenses-clearly.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/identify-licenses-clearly.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: identify-licenses-clearly.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/identify-licenses-clearly.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- identify-licenses-clearly.zh-cn.html        1 Sep 2019 09:29:49 -0000       
1.1
+++ identify-licenses-clearly.zh-cn.html        24 Jul 2020 12:32:43 -0000      
1.2
@@ -83,7 +83,9 @@
 
 <p>让开发者有权利选择 GPL 版本 &ldquo;仅 1&rdquo; 或者 GPL 
版本 &ldquo;1 或以后版&rdquo; 在 1989
 年看起来是必
须的，但是它带来的复杂性比没有这个选项更多。同时，好多æ—
 
条件给予用户选择升级到以后版的许可证被广泛的接受。它们åŒ
…括 Mozilla
-公共许可证，Eclipse 公共许可证以及全部的 Creative Commons 
许可证。每个版本都说明用户有自由选择以后版的该许可证，如果有的话。</p>
+公共许可证和 Eclipse 公å…
±è®¸å¯è¯ã€‚它们每个版本都说明用户有自由选择以后版的该许可证，如果有的话。Creative
 Commons 许可证，即
+CC BY-SA，允许用户在修改作品时升级许可证版本。
+</p>
 
 <p>我们也许在将来的 GNU GPL 版本上也采取这æ 
·çš„策略。但这是将来要考虑的事情。</p>
 
@@ -149,7 +151,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2017, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2017, 2018, 2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -160,12 +162,12 @@
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2019。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2019，2020。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2019/09/01 09:29:49 $
+$Date: 2020/07/24 12:32:43 $
 
 <!-- timestamp end -->
 </p>

Index: po/identify-licenses-clearly.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/identify-licenses-clearly.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/identify-licenses-clearly.zh-cn-en.html  1 Sep 2019 09:29:49 -0000       
1.1
+++ po/identify-licenses-clearly.zh-cn-en.html  24 Jul 2020 12:32:44 -0000      
1.2
@@ -126,13 +126,15 @@
 <li>GFDL-1.3.</li></ul>
 
 <p>Giving developers the choice of GPL version &ldquo;1 only&rdquo; or GPL 
version &ldquo;1
-or later&rdquo; seemed obligatory in 1989, but it has created a complexity
-that we would be better off without. Meanwhile, several licenses that
-unconditionally give users the choice to upgrade to later license
-versions have become widely accepted. These include the Mozilla
-Public License, the Eclipse Public License, and all the Creative
-Commons licenses. Each version says that a user is free to use the
-work under later versions, if any, of the same license.</p>
+or later&rdquo; seemed obligatory in 1989, but it has created a
+complexity that we would be better off without. Meanwhile, several
+licenses that unconditionally give users the choice to upgrade to
+later license versions have become widely accepted. These include the
+Mozilla Public License and the Eclipse Public License.  Each version
+says that a user is free to use the work under later versions, if any,
+of the same license.  The Creative Commons copyleft license, CC BY-SA,
+permits users to upgrade the license version when they modify the work.
+</p>
 
 <p>Perhaps we should switch to that approach for future versions of the
 GNU GPL. But that is something to think about in the future.</p>
@@ -195,7 +197,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2017, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2017, 2018, 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
@@ -205,7 +207,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/09/01 09:29:49 $
+$Date: 2020/07/24 12:32:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/identify-licenses-clearly.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/identify-licenses-clearly.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/identify-licenses-clearly.zh-cn.po       24 Jul 2020 12:21:57 -0000      
1.4
+++ po/identify-licenses-clearly.zh-cn.po       24 Jul 2020 12:32:44 -0000      
1.5
@@ -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-07-24 02:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""