www/copyleft copyleft.zh-cn.html po/copyleft.zh...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/08/18 17:56:49

Modified files:
        copyleft       : copyleft.zh-cn.html 
        copyleft/po    : copyleft.zh-cn-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/copyleft/copyleft.zh-cn.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/copyleft/po/copyleft.zh-cn-en.html?cvsroot=www&r1=1.9&r2=1.10

Patches:
Index: copyleft.zh-cn.html
===================================================================
RCS file: /web/www/www/copyleft/copyleft.zh-cn.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- copyleft.zh-cn.html 12 Aug 2014 03:56:46 -0000      1.12
+++ copyleft.zh-cn.html 18 Aug 2014 17:56:48 -0000      1.13
@@ -1,28 +1,14 @@
-<!--#set var="PO_FILE"
- value='<a href="/copyleft/po/copyleft.zh-cn.po">
- http://www.gnu.org/copyleft/po/copyleft.zh-cn.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/copyleft/copyleft.html"
- --><!--#set var="DIFF_FILE" value="/copyleft/po/copyleft.zh-cn-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2013-02-11" -->
+<!--#set var="ENGLISH_PAGE" value="/copyleft/copyleft.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
+<!-- Parent-Version: 1.77 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
- <!--#set var="ENGLISH_PAGE" value="/copyleft/copyleft.en.html" -->
-
-<title>什么是Copyleft？ - GNU 工程 - 自由软件基金会 (FSF)</title>
-
-<!-- Fixed by hand on April 16, 2014:
-     - disable top addendum,
-     - translist before banner.
--->
+<title>什么是Copyleft？ - GNU 工程 - 自由软件基金会</title>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Copyleft, 自由软件基金会" />
 
 <!--#include virtual="/copyleft/po/copyleft.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#include virtual="/server/outdated.zh-cn.html" -->
- 
 <h2>什么是Copyleft？</h2>
 
 <p>
@@ -32,12 +18,13 @@
 
让程序成为自由软件最简单的方法是放弃对它的版权并把它放到
 <a
 href="/philosophy/categories.html#PublicDomainSoftware">公共领域</a>
 中。这使得他人在需要的时候可以共享这个软件及å…
¶å¯¹å®ƒçš„改进。但这也使得å…
¶å®ƒä¸€äº›ä¸æ„¿åˆä½œçš„人把它们转变成 <a
-href="/philosophy/categories.html#ProprietarySoftware">私有软件</a>
+href="/philosophy/categories.html#ProprietarySoftware">专有软件</a>
 
。他们可以或多或少的进行修改，并把成果作为商业产品发布。这些修改过的程序不再像它们的原始作è€
…æ‰€æœŸæœ›çš„é‚£æ ·å…
è®¸ç”¨æˆ·è‡ªç”±çš„使用，这种自由被中间商剥夺了。</p>
 
 <p>
 在 <a href="/gnu/thegnuproject.html">GNU 工程</a> 中，我们的目æ 
‡æ˜¯è®© <em>所有的</em>
-用户可以自由的重新分发或修改 GNU 
软件。如果中间商可以剥夺这种自由，我们可能会有很多的用户，但这些用户便不再拥有自由。所以我们并不把
 GNU
+用户可以自由地重新发布或修改 GNU
+软件。如果å…
è®¸ä¸­é—´å•†å‰¥å¤ºè¿™ç§è‡ªç”±ï¼Œæˆ‘们也许会以此获得更多中间商，借此吸引来有很多的用户，但这些用户便不再拥有自由。所以我们并不把
 GNU
 软件发布到公共领域，我们对它保留“Copyleft”。所谓 
Copyleft
 
是指任何人都可以重新分发软件，不管有没有进行修改，但å¿
…须同时保留软件所å…
·æœ‰çš„自由特性。Copyleft是为了保证所有用户都拥有自由的权力。</p>
 
@@ -66,19 +53,25 @@
 
变得不可操作。“Copyleft”中的“left”，并不使用它在英语中“保留”的意思，而是指它与通常的“版权(Copyright)”å
…·æœ‰ç›¸åçš„效果。</p>
 
 <p>
-Copyleft æ˜¯ä¸€ç§æŠ½è±¡çš„æ¦‚å¿µï¼Œé€šå¸¸ä½ 
ä¸èƒ½ç›´æŽ¥çš„åŽ»ä½¿ç”¨ä¸€ç§æŠ½è±¡çš„æ¦‚å¿µï¼Œä½ 
只能通过定义它的细节来使用它。在 GNU 
工程中，这个专用名词被称为 <a
-href="/copyleft/gpl.html">GNU 通用公共许可证 (HTMLæ ¼å¼</a>， <a
-href="/copyleft/gpl.txt">纯文本</a>， <a 
href="/copyleft/gpl.texi">Texinfo</a>
-æ ¼å¼)。 GNU 通用公共许可证通常被简写为 GNU GPL 
。这里有一个有关它的<a
-href="/copyleft/gpl-faq.html">常见问题</a> é¡µé¢ã€‚ä½ ä¹Ÿå¯ä»¥å‚è€ƒ <a
+Copyleft æ˜¯ä¸€ç§æŠ½è±¡çš„æ¦‚å¿µï¼ŒæŠ½è±¡çš„æ¦‚å¿µæ˜¯æ— 
法直接使用的。只有实现这个抽象概念，人们才能使用它。在
 GNU
+工程中，我们最常使用的一种实现Copyleft的法律文件是<a 
href="/copyleft/gpl.html">GNU 通用公共许可证
+(HTMLæ ¼å¼</a>， <a href="/copyleft/gpl.txt">纯文本</a>， <a
+href="/copyleft/gpl.texi">Texinfo</a> æ ¼å¼)。 GNU 通用公å…
±è®¸å¯è¯é€šå¸¸è¢«ç®€å†™ä¸º GNU GPL
+。这里有一个有关它的<a 
href="/copyleft/gpl-faq.html">常见问题</a> é¡µé¢ã€‚ä½ ä¹Ÿå¯ä»¥å‚è€ƒ <a
 href="/copyleft/why-assign.html">为什么FSF从软件作者
处获得版权转让</a>。</p>
 
 <p>
-另一种形式的 Copyleft，是<a href="/licenses/lgpl.html">GNU 宽通用å…
¬å…±è®¸å¯è¯ (LGPL)
+另一种实现Copyleft的法律文件，是<a 
href="/licenses/agpl.html">Affero通用公共许可证 (AGPL)
+(HTMLæ ¼å¼</a>， <a href="/licenses/lgpl.txt">纯文本</a>，<a
+href="/licenses/lgpl.texi">Texinfo</a>
+æ ¼å¼)。这个许可证的目æ 
‡ç”¨æˆ·æ˜¯é’ˆå¯¹æœåŠ¡å™¨çš„软件。如果一个以AGPL授权的软件被运行在向å
…¬ä¼—提供服务的服务器上，那么对该软件的任何修改也必
é¡»è¦ä»¥æºä»£ç çš„å½¢å¼å¯¹å¤–å‘å¸ƒã€‚</p>
+
+<p>
+除此以外，还有一种比较保守的Copyleft的许可证：<a 
href="/licenses/lgpl.html">GNU 宽通用公共许可证 (LGPL)
 (HTMLæ ¼å¼</a>， <a href="/licenses/lgpl.txt">纯文本</a>，<a
 href="/licenses/lgpl.texi">Texinfo</a> æ 
¼å¼)，它被应用于一部分（不是所有的）GNU 函数库。
 这个许可证以前被称为“函数库
-GPLâ€ï¼Œæˆ‘ä»¬ä¿®æ”¹äº†è®¸å¯è¯çš„åå­—ï¼ŒåŽŸå› 
是它原来的名字鼓励了开发人员过多的使用这个许可证。对于这个名字改变的å¿
…è¦æ€§ï¼Œè¯·å‚è€ƒè¿™ç¯‡æ–‡ç« ：<a
+GPLâ€ï¼Œæˆ‘ä»¬ä¿®æ”¹äº†è®¸å¯è¯çš„åå­—ï¼ŒåŽŸå› 
是它原来的名字鼓励了开发人员过多地使用这个许可证。对于这个名字改变的å¿
…è¦æ€§ï¼Œè¯·å‚è€ƒè¿™ç¯‡æ–‡ç« ：<a
 href="/philosophy/why-not-lgpl.html"><cite>ä¸ºä»€ä¹ˆä½ ä¸åº”è¯¥å¯¹ä½ 
的下一个函数库应用
 LGPL</cite></a>。</p>
 
@@ -96,7 +89,7 @@
 
 <p>
 
对很多不同的程序使用相同的发布条款可以使得在这些程序中相互复制代ç
 å˜å¾—å®¹æ˜“ã€‚å› ä¸ºå®ƒä»¬éƒ½å…·æœ‰ç›¸åŒçš„å‘å¸ƒæ¡æ¬¾ï¼Œä½ 
就不需要去考虑这些条款是否相互兼容。LGPL
-ç¬¬äºŒç‰ˆè®¸å¯è¯å…è®¸ä½ æŠŠå‘å¸ƒæ¡æ¬¾æ”¹ä¸ºæ ‡å‡†çš„ GPL 
è®¸å¯è¯ï¼Œæ‰€ä»¥ä½ å¯ä»¥æŠŠ LPGL çš„ä»£ç åº”ç”¨åˆ°å…¶å®ƒ GPL 
的程序中去。LGPL
+ç¬¬äºŒç‰ˆè®¸å¯è¯å…è®¸ä½ æŠŠå‘å¸ƒæ¡æ¬¾æ”¹ä¸ºæ ‡å‡†çš„ GPL 
è®¸å¯è¯ï¼Œæ‰€ä»¥ä½ å¯ä»¥æŠŠ LGPL çš„ä»£ç åº”ç”¨åˆ°å…¶å®ƒ GPL 
的程序中去。LGPL
 ç¬¬ä¸‰ç‰ˆæ˜¯åšä¸ºä¸€ä¸ªç‰¹ä¾‹åŠ å…¥åˆ° GPL 
第三版中，所以它们也是相互兼容的。</p>
 
 <p>
@@ -106,41 +99,76 @@
 
 <p>
 å¦‚æžœä½ å¸Œæœ›å¯¹ä½ æ’°å†™çš„æ‰‹å†Œé€šè¿‡åº”ç”¨GNU FDL保留 
Copyleft，请参考FDL <a
-href="/copyleft/fdl.html#SEC4">结尾部分</a> 的内容以及 <a
+href="/copyleft/fdl.html#addendum">结尾部分</a> 的内容以及 <a
 href="/copyleft/fdl-howto.html">GFDL指南</a> 页面上的内容。与GNU
 GPLä¸€æ ·ï¼Œä½ å¿…é¡»ä½¿ç”¨æ•´ä¸ªè®¸å¯è¯ï¼Œè€Œä¸èƒ½æ˜¯å…
¶ä¸­çš„一部分。</p>
 
+<p>
+经常会看到一些Copyleft的作品使用一个反着的C（<a
+href="http://en.wikipedia.org/wiki/Copyleft#mediaviewer/File:Copyleft.svg";>这个符号</a>）来表明该作品是Copyleft的。这æ
 ·åšåœ¨æ³•å¾‹ä¸Šæ˜¯ä¸ªå¸¸è§é”™è¯¯ã€‚Copyleft的作品实际
ä¹Ÿæ˜¯è¢«ç‰ˆæƒæ³•ä¿æŠ¤çš„ï¼Œå› 
此即便是Copyleft的作品，也应该使用版权æ 
‡å¿—（一个被圆圈套起来的字母C），或者æ 
‡æ˜Ž&ldquo;版权所有&rdquo;</p>
 
-<div style="font-size: small;">
+<p>
+如前所述，圆圈里套着一个开口向左的C，这个符号经常被用来表明Copyleft。但是这个符号并没有任何法律效力，也æ—
 
法取代版权符号。它也许可以出于娱乐的目的，使用在图书封面，海报或è€
…类似的材料上。但若要用在网页上，<a
+href="http://en.wikipedia.org/wiki/Copyleft#Symbol";>还需谨慎</a>。
+</p>
+
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
  </div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
-<p>
-请将有å…
³è‡ªç”±è½¯ä»¶åŸºé‡‘会与GNU的查询与问题（以英语）发送到<a
-href="mailto:address@hidden";><em>address@hidden</em></a>。您也可以通过 
<a
-href="/contact/">其它方法</a> 联系自由软件基金会。 
-<br />
-发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方（或任何建议），请发送邮件至 <a
-href="mailto:address@hidden";><em>address@hidden</em></a>。
-</p>
+<div class="unprintable">
+
+<p>请将有关自由软件基金会(FSF) &amp; GNU 的查询 &amp; 
问题发送到<a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。也可以通过 <a
+href="/contact/">其他联系方法</a> 
联系自由软件基金会(FSF)。错误链接请报告给<a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
 
 <p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 请参考 <a href="/server/standards/README.translations.html">翻译说明</a>
-äº†è§£æœ‰å…³åè°ƒå’Œæäº¤æ–‡ç« ç¿»è¯‘çš„ä¿¡æ¯ã€‚
-</p>
+äº†è§£æœ‰å…³åè°ƒå’Œæäº¤æ–‡ç« ç¿»è¯‘çš„ä¿¡æ¯ã€‚</p>
+</div>
 
-<p>
-版权所有 &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009 <a 
href="http://www.fsf.org";>自由软件基金会</a></p>
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>版权所有 &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
2005,
+2006, 2007, 2008, 2009, 2014 <a 
href="http://www.fsf.org";>自由软件基金会</a></p>
 
 <p>本页面采用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
-Attribution-NoDerivs 3.0 United States License</a> 许可证授权。
-</p>
+Attribution-NoDerivs 3.0 United States License</a> 许可证授权。</p>
 
 <!--#include virtual="/server/bottom-notes.zh-cn.html" -->
 <div class="translators-credits">
@@ -148,21 +176,14 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译</b>: 李凡希 2007, 2008, 2009, 2010, 2011, 2012</div>
 
-
- <p><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2014/08/12 03:56:46 $
+$Date: 2014/08/18 17:56:48 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
-<!-- All pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. -->
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
 </div>
 </body>
 </html>

Index: po/copyleft.zh-cn-en.html
===================================================================
RCS file: /web/www/www/copyleft/po/copyleft.zh-cn-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/copyleft.zh-cn-en.html   9 Feb 2013 07:44:30 -0000       1.9
+++ po/copyleft.zh-cn-en.html   18 Aug 2014 17:56:49 -0000      1.10
@@ -1,10 +1,10 @@
 <!--#include virtual="/server/header.html" -->
-
-<title>What is Copyleft? - GNU Project - Free Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.77 -->
+<title>What is Copyleft? - GNU Project - Free Software Foundation</title>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Copyleft" />
 
-<!--#include virtual="/server/banner.html" -->
 <!--#include virtual="/copyleft/po/copyleft.translist" -->
+<!--#include virtual="/server/banner.html" -->
    
 <h2>What is Copyleft?</h2>
 
@@ -93,7 +93,16 @@
 assignments from contributors</a>.</p>
 
 <p>
-An alternate form of copyleft, the <a href="/licenses/lgpl.html">GNU
+An alternate form of copyleft, the <a href="/licenses/agpl.html">GNU
+Affero General Public License (AGPL) (available in
+HTML</a>, <a href="/licenses/agpl.txt">text</a>,
+and <a href="/licenses/agpl.texi">Texinfo</a> format), is designed for
+programs that are likely to be used on servers.  It ensures that
+modified versions used to implement services available to the public
+are released as source code to the public.</p>
+
+<p>
+A compromise form of copyleft, the <a href="/licenses/lgpl.html">GNU
 Lesser General Public License (LGPL) (available in HTML</a>, <a
 href="/licenses/lgpl.txt">text</a>, and <a
 href="/licenses/lgpl.texi">Texinfo</a> format), applies to a few (but not
@@ -140,55 +149,87 @@
 <p>
 If you would like to copyleft your manual with the GNU FDL, please
 see the instructions at the
-<a href="/copyleft/fdl.html#SEC4">end</a> of the FDL text, and
+<a href="/copyleft/fdl.html#addendum">end</a> of the FDL text, and
 the <a href="/copyleft/fdl-howto.html">GFDL instructions page</a>.  Again,
 partial copies are not permitted.</p>
 
-</div>
+<p>
+It is a legal mistake to use a backwards C in a circle instead of a
+copyright symbol.  Copyleft is based legally on copyright, so the work
+should have a copyright notice.  A copyright notice requires either
+the copyright symbol (a C in a circle) or the word
+&ldquo;Copyright&rdquo;.</p>
 
-<!--#include virtual="/server/footer.html" -->
+<p>
+A backwards C in a circle has no special legal significance, so it
+doesn't make a copyright notice.  It may be amusing in book covers,
+posters, and such, but
+<a href="https://en.wikipedia.org/wiki/Copyleft#Symbol";> be
+careful how you represent it in a web page!</a>
+</p>
 
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+<div class="unprintable">
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a> 
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>
-Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
 
-<p>
-Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.,</p>
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+2005, 2006, 2007, 2008, 2009, 2014 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.
-</p>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2013/02/09 07:44:30 $
+$Date: 2014/08/18 17:56:49 $
 <!-- timestamp end -->
 </p>
 </div>
-<!-- All pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
-
 </div>
 </body>
 </html>