www/licenses bsd.zh-cn.html po/bsd.zh-cn-en.htm...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/12/27 04:03:43

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

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/bsd.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/bsd.zh-cn-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/bsd.zh-cn.po?cvsroot=www&r1=1.13&r2=1.14

Patches:
Index: bsd.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/bsd.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- bsd.zh-cn.html      23 Nov 2021 08:39:13 -0000      1.5
+++ bsd.zh-cn.html      27 Dec 2021 09:03:43 -0000      1.6
@@ -1,24 +1,19 @@
 <!--#set var="ENGLISH_PAGE" value="/licenses/bsd.en.html" -->
 
-<!--#include virtual="/server/html5-header.zh-cn.html" -->
+<!--#include virtual="/server/header.zh-cn.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>BSD许可证的问题 - GNU工程 - 自由软件基金会</title>
 
 <!--#include virtual="/licenses/po/bsd.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<div class="article reduced-width">
 <h2>BSD许可证的问题</h2>
 
 <address class="byline">Richard Stallman 著</address>
 
-<hr class="no-display" />
-<div class="announcement"><p>
-参看<a
-href="/licenses/license-recommendations.html">&ldquo;å¦‚ä½•ä¸ºä½ 
的作品选择许可证&rdquo;</a>来了解选择许可证的一般建议。</p>
-</div>
-<hr class="thin" />
-
 <p>
     两个主要的自由软件许可证类别是 <a 
href="/licenses/copyleft.html">copyleft</a> 和 <a
 
href="/philosophy/categories.html#Non-CopyleftedFreeSoftware">非-copyleft</a>。<a
@@ -29,15 +24,21 @@
 copyleft</a>ï¼Œå› ä¸ºå®ƒä¿æŠ¤æ‰€æœ‰ç”¨æˆ·çš„è‡ªç”±ï¼Œä½†æ˜¯éž-copylefted 
的软件也可以是自由软件，而且也是对自由软件社区有用处的。
 </p>
 
+<div class="announcement comment">
+<hr class="no-display" />
+<p>参看<a
+href="/licenses/license-recommendations.html">&ldquo;å¦‚ä½•ä¸ºä½ 
的作品选择许可证&rdquo;</a>来了解选择许可证的一般建议。</p>
+<hr class="no-display" />
+</div>
+
 <p>有很多关于简单<a
 
href="/licenses/license-list.html#GPLCompatibleLicenses">非-copyleft自由软件许可证</a>的变形，比如Expat许可证、FreeBSD许可证、X10许可证、X11许可证和两种BSD（Berkeley
 Software
 
Distribution）许可证。它们中的大多数除了措辞之外都是等价的，但是1991年之前的BSD许可证有一个特别的问题：&ldquo;令人反感的BSD广告条款&rdquo;。它的要求是每个提到该软件的广告都å¿
…须包含一个特定的语句：</p>
 
-<pre>
-3. 所有提及该软件功能或者使用该软件的广告材料必
须展示以下致谢：
-     æœ¬äº§å“åŒ…å«ç”±åŠ å·žå¤§å­¦ä¼¯å…‹åˆ©åˆ†æ ¡åŠå…¶è´¡çŒ®è€…
开发的软件。
-</pre>
+<blockquote><p>
+3. 所有提及该软件功能或者使用该软件的广告材料必
é¡»å±•ç¤ºä»¥ä¸‹è‡´è°¢ï¼šæœ¬äº§å“åŒ…å«ç”±åŠ å·žå¤§å­¦ä¼¯å…‹åˆ©åˆ†æ ¡åŠå…
¶è´¡çŒ®è€…开发的软件。
+</p></blockquote>
 
 <p>
     最初，令人反感的BSD广告条款只是在伯å…
‹åˆ©è½¯ä»¶å‘è¡Œç‰ˆä¸­ä½¿ç”¨ã€‚å› 为在广告中包
含一句话并不是十分困难，所以此条款并没有引起特别的问题。
@@ -93,6 +94,7 @@
     
后来，还出现了BSD许可证的第三个版本，它只带原始BSD许可证四个条款中的前两条。我们称之为&ldquo;FreeBSD许可证&rdquo;。它是一个宽松的、非copyleft的自由许可证，和GNU
 GPL兼容，非常像修改版的BSD许可证。
 </p>
+</div>
 
 <div class="translators-notes">
 
@@ -130,8 +132,8 @@
 <a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
-<p>Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013-2015, 2020, 2021 Free
-Software Foundation, Inc.</p>
+<p>Copyright &copy; 1998, 1999, 2002, 2003, 2006, 2008, 2009, 2012, 2015, 2021
+Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -147,11 +149,12 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2021/11/23 08:39:13 $
+$Date: 2021/12/27 09:03:43 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/bsd.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/bsd.zh-cn-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/bsd.zh-cn-en.html        23 Nov 2021 08:39:14 -0000      1.5
+++ po/bsd.zh-cn-en.html        27 Dec 2021 09:03:43 -0000      1.6
@@ -1,21 +1,15 @@
-<!--#include virtual="/server/html5-header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
-<title>BSD License Problem
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<title>The BSD License Problem
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/licenses/po/bsd.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<div class="article reduced-width">
 <h2>The BSD License Problem</h2>
 
 <address class="byline">by Richard Stallman</address>
 
-<hr class="no-display" />
-<div class="announcement"><p>
-See <a href="/licenses/license-recommendations.html">&ldquo;How to
-choose a license for your own work&rdquo;</a> for general
-recommendations about choosing a license for your work.</p>
-</div>
-<hr class="thin" />
-
 <p>
     The two major categories of free software license are <a
         href="/licenses/copyleft.html">copyleft</a> and <a
@@ -31,6 +25,14 @@
     community.
 </p>
 
+<div class="announcement comment">
+<hr class="no-display" />
+<p>See <a href="/licenses/license-recommendations.html">&ldquo;How to
+choose a license for your own work&rdquo;</a> for general
+recommendations about choosing a license for your work.</p>
+<hr class="no-display" />
+</div>
+
 <p>There are many variants of simple <a
 href="/licenses/license-list.html#GPLCompatibleLicenses">non-copyleft
 free software licenses</a>, such as the Expat license, FreeBSD license,
@@ -41,12 +43,12 @@
 advertisement mentioning the software must include a particular
 sentence:</p>
 
-<pre>
+<blockquote><p>
 3. All advertising materials mentioning features or use of this software
    must display the following acknowledgement:
      This product includes software developed by the University of
      California, Berkeley and its contributors.
-</pre>
+</p></blockquote>
 
 <p>
     Initially the obnoxious BSD advertising clause was used only in the
@@ -147,7 +149,7 @@
 <p>
     When you want to refer specifically to one of the BSD licenses,
     please always state which one: the &ldquo;original BSD license&rdquo; or 
the
-    &ldquo;Modified BSD license.&rdquo;
+    &ldquo;modified BSD license.&rdquo;
 </p>
 
 <hr class="column-limit" />
@@ -159,6 +161,7 @@
     license, compatible with the GNU GPL, much like the modified BSD
     license.
 </p>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -190,7 +193,7 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013-2015, 2020, 2021
+<p>Copyright &copy; 1998, 1999, 2002, 2003, 2006, 2008, 2009, 2012, 2015, 2021
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -201,10 +204,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/11/23 08:39:14 $
+$Date: 2021/12/27 09:03:43 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/bsd.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/bsd.zh-cn.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/bsd.zh-cn.po     27 Dec 2021 08:50:17 -0000      1.13
+++ po/bsd.zh-cn.po     27 Dec 2021 09:03:43 -0000      1.14
@@ -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: 2021-12-25 21:25+0000\n"
 
 #. type: Content of: <title>
 msgid "The BSD License Problem - GNU Project - Free Software Foundation"