www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: GNUN
Subject: www/licenses copyleft.zh-cn.html po/copyleft.zh...
Date: Wed, 16 Aug 2017 08:59:36 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     17/08/16 08:59:36

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

Log message:
        Automatic update by GNUnited Nations.

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

Patches:
Index: copyleft.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/copyleft.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- copyleft.zh-cn.html 1 Nov 2016 14:27:58 -0000       1.3
+++ copyleft.zh-cn.html 16 Aug 2017 12:59:34 -0000      1.4
@@ -1,24 +1,19 @@
-<!--#set var="PO_FILE"
- value='<a href="/licenses/po/copyleft.zh-cn.po">
- https://www.gnu.org/licenses/po/copyleft.zh-cn.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/licenses/copyleft.html"
- --><!--#set var="DIFF_FILE" value="/licenses/po/copyleft.zh-cn-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2015-10-03" -->
+<!--#set var="ENGLISH_PAGE" value="/licenses/copyleft.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.83 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>什么是Copyleft? - GNU 工程 - 自由软件基金会</title>
-<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Copyleft, 自由软件基金会" />
+<meta http-equiv="Keywords" 
content="GNU,FSF,自由软件基金会,Linux,Copyleft" />
 
 <!--#include virtual="/licenses/po/copyleft.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#include virtual="/server/outdated.zh-cn.html" -->
 <h2>什么是Copyleft?</h2>
 
 <p>
-Copyleft 是一种让程序或å…
¶å®ƒä½œå“ä¿æŒè‡ªç”±çš„通用方法,并要求对Copyleft程序的任何修改和扩展都保持自由。</p>
+Copyleft 是一种让程序或其它作品保持自由(<a
+href="/philosophy/free-sw.html">是言论自由的自由,而不是&ldquo;零价æ
 
¼&rdquo;</a>)的通用方法,并要求对Copyleft程序的任何修改和扩展都保持自由。</p>
 
 <p>
 
让程序成为自由软件最简单的方法是放弃对它的版权并把它放到
 <a
@@ -30,9 +25,9 @@
 <p>
 在 <a href="/gnu/thegnuproject.html">GNU 工程</a> 中,我们的目æ 
‡æ˜¯è®© <em>所有的</em>
 用户可以自由地重新发布或修改 GNU
-软件。如果å…
è®¸ä¸­é—´å•†å‰¥å¤ºè¿™ç§è‡ªç”±ï¼Œæˆ‘们也许会以此获得更多中间商,借此吸引来有很多的用户,但这些用户便不再拥有自由。所以我们并不把
 GNU
-软件发布到公共领域,我们对它保留“Copyleft”。所谓 
Copyleft
-是指任何人都可以重新分发软件,不管有没有进行修改,但å¿
…须同时保留软件所å…
·æœ‰çš„自由特性。Copyleft是为了保证所有用户都拥有自由的权力。</p>
+软件。如果å…
è®¸ä¸­é—´å•†å‰¥å¤ºè¿™ç§è‡ªç”±ï¼Œæˆ‘们也许会以此&ldquo;获得很多的用户&rdquo;,但这些用户便不再拥有自由。所以我们并不把
 GNU
+软件发布到公å…
±é¢†åŸŸï¼Œæˆ‘们对它保留&ldquo;Copyleft&rdquo;。所谓 Copyleft
+是指任何人都可以重新分发软件,不管有没有进行修改,但å¿
…须同时保留软件所å…
·æœ‰çš„自由特性。Copyleft是为了保证所有用户都拥有自由。</p>
 
 <p>
 Copyleft 同时也 <a href="/philosophy/pragmatic.html">鼓励</a>
@@ -41,50 +36,43 @@
 <p>
 除此之外,Copyleft 也帮助那些希望对 <a 
href="/prep/tasks.html">完善</a> <a
 href="/philosophy/free-sw.html">自由软件</a>
-作出贡献的程序员得到贡献的权力。这些程序员通常是为那些一心想挣钱的å
…
¬å¸æˆ–大学工作。程序员可能希望把他的努力贡献到自由软件社区,但他的老板可能希望把这些工作变成商业的软件产品。</p>
+作出贡献的程序员得到贡献的许可。这些程序员通常是为那些一心想挣钱的å
…
¬å¸æˆ–大学工作。程序员可能希望把她的努力贡献到自由软件社区,但å
…¶è€æ¿å¯èƒ½å¸Œæœ›æŠŠè¿™äº›å·¥ä½œå˜æˆå•†ä¸šè½¯ä»¶äº§å“ã€‚</p>
 
 <p>
 
当我们向老板解释说如果不把这些改进的版本作为自由软件发布是非法的时候,他们往往会决定把它们作为自由软件发布而不是把它们抛弃。</p>
 
 <p>
 一个程序遵循
-Copyleft,我们首先声明它是有版权的;然后,我们给它加
上发布条款,这个条款就是一个法律声明,它赋与所有人有使用、修改和重新发布程序的代ç
 
-<em>及其衍生作品</em> 
的权力,但要求在这个过程中保持发布规则不变。这æ 
·çš„话,代码和自由权力在法律上就不可分割了。</p>
+Copyleft,我们首先声明它是有版权的;然后,我们给它加
上发布条款,这个条款就是一个法律声明,它赋予所有人有使用、修改和重新发布程序的代ç
 
+<em>及其衍生作品</em> 
的权利,但要求在这个过程中保持发布规则不变。这æ 
·çš„话,代码和自由权利在法律上就不可分割了。</p>
 
 <p>
 
商业软件开发人员通过版权剥夺了用户的自由,我们使用版权来给予他它自由。这就是为什么我们把“版权(Copyright)”改称为“Copyleft”。</p>
 
 <p>
 Copyleft 
是一种对程序进行版权保护的方法。它并不是放弃版权,因
为这样会使 Copyleft
-变得不可操作。“Copyleft”中的“left”,并不使用它在英语中“保留”的意思,而是指它与通常的“版权(Copyright)”å
…·æœ‰ç›¸åçš„效果。</p>
+变得不可操作。“Copyleft”中的“left”,并不使用它在英语中“保留”的意思,而是指它(left,左)与通常的“版权(Copyright)”中的&ldquo;right(右)&rdquo;å
…·æœ‰é•œåƒçš„关系。</p>
 
 <p>
 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/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 函数库。
-这个许可证以前被称为“函数库
+项目中,我们对大多数软件使用的一种实现Copyleft的法律文件是<a
 href="/license/gpl.html">GNU
+通用公共许可证</a>。GNU 通用公共许可证通常被简写为 GNU 
GPL 。这里有一个有关它的<a
+href="/license/gpl-faq.html">常见问题</a> 页面。你也可以参考 <a
+href="/license/why-assign.html">为什么FSF从软件作者
处获得版权转让</a>。</p>
+
+<p>
+另一种实现Copyleft的法律文件,是<a 
href="/licenses/agpl.html">Affero通用公共许可证
+(AGPL)</a>。这个许可证的目æ 
‡ç”¨æˆ·æ˜¯é’ˆå¯¹æœåŠ¡å™¨çš„软件。如果一个以AGPL授权的软件被运行在向å
…¬ä¼—提供服务的服务器上,那么对该软件的任何修改也必
须要以源代码的形式对外发布。</p>
+
+<p>
+除此以外,还有一种比较保守的Copyleft的许可证:<a 
href="/licenses/lgpl.html">GNU 宽通用公共许可证
+(LGPL)</a>,它被应用于一部分(不是所有的)GNU 函数库。 
这个许可证以前被称为“函数库
 GPL”,我们修改了许可证的名字,原因
是它原来的名字鼓励了开发人员过多地使用这个许可证。对于这个名字改变的å¿
…要性,请参考这篇文章:<a
 href="/philosophy/why-not-lgpl.html"><cite>为什么你不应该对你
的下一个函数库应用
 LGPL</cite></a>。</p>
 
 <p>
-<a href="/copyleft/fdl.html">GNU 自由文档许可证 (FDL)(HTML格式</a> 
, <a
-href="/copyleft/fdl.txt">纯文本</a> ,<a
-href="/copyleft/fdl.texi">Texinfo格式)</a> 
是一种面向手册、教科书和各种文档的 Copyleft
+<a href="/license/fdl.html">GNU 自由文档许可证 
(FDL)</a>是一种面向手册、教科书和各种文档的 Copyleft
 
许可证,它保证了所有人都可以自由的复制和重新发布这些文档,不管是否进了修改,也不管是商业的还是非商业的。</p>
 
 <p>
@@ -100,13 +88,13 @@
 
 <p>
 如果你希望对你的程序通过应用 GNU GPL 或 GNU LGPL 保留 
Copyleft ,请参考 <a
-href="/copyleft/gpl-howto.html">GPL 指南</a>
+href="/license/gpl-howto.html">许可证指南</a>
 页面上的内容。请注意,许可证是一个整体,你
在使用时只能整体引用,只引用其中的一部分是不å…
è®¸çš„。</p>
 
 <p>
 如果你希望对你撰写的手册通过应用GNU FDL保留 
Copyleft,请参考FDL <a
-href="/copyleft/fdl.html#addendum">结尾部分</a> 的内容以及 <a
-href="/copyleft/fdl-howto.html">GFDL指南</a> 页面上的内容。与GNU
+href="/license/fdl.html#addendum">结尾部分</a> 的内容以及 <a
+href="/license/fdl-howto.html">GFDL指南</a> 页面上的内容。与GNU
 GPL一样,你必须使用整个许可证,而不能是å…
¶ä¸­çš„一部分。</p>
 
 <p>
@@ -129,9 +117,9 @@
 <div id="footer">
 <div class="unprintable">
 
-<p>请将有关自由软件基金会(FSF) &amp; GNU 的查询 &amp; 
问题发送到<a
+<p>请将有关自由软件基金会(FSF) &amp; GNU 
的一般性问题发送到<a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。也可以通过 <a
-href="/contact/">其他联系方法</a> 
联系自由软件基金会(FSF)。错误链接请报告给<a
+href="/contact/">其他联系方法</a> 
联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮件到<a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
 
 <p>
@@ -149,13 +137,13 @@
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
-请参考 <a href="/server/standards/README.translations.html">翻译说明</a>
+请参考 <a href="/server/standards/README.translations.html">翻译须知</a>
 了解有关协调和提交文章翻译的信息。</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
+     be under CC BY-ND 4.0.  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
@@ -169,23 +157,26 @@
      
      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>
+<p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006, 2007, 2008, 2009, 2014, 2015, 2016, 2017 Free Software Foundation,
+Inc.</p>
+
+<p>本页面使用<a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a>授权。</p>
 
 <!--#include virtual="/server/bottom-notes.zh-cn.html" -->
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-<b>翻译</b>: 李凡希 2007, 2008, 2009, 2010, 2011, 2012</div>
+<b>翻译</b>: 李凡希 2007, 2008, 2009, 2010, 2011, 2012。
+<b>翻译团队</b>:<a rel="team"
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2017。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2016/11/01 14:27:58 $
+$Date: 2017/08/16 12:59:34 $
 
 <!-- timestamp end -->
 </p>

Index: po/copyleft.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/copyleft.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/copyleft.zh-cn-en.html   3 Oct 2015 17:04:39 -0000       1.1
+++ po/copyleft.zh-cn-en.html   16 Aug 2017 12:59:35 -0000      1.2
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.83 -->
 <title>What is Copyleft? - GNU Project - Free Software Foundation</title>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Copyleft" />
 
@@ -9,9 +9,10 @@
 <h2>What is Copyleft?</h2>
 
 <p>
-Copyleft is a general method for making a program (or
-other work) free, and requiring all modified and extended versions of the
-program to be free as well.</p>
+Copyleft is a general method for making a program (or other work) free
+(<a href="/philosophy/free-sw.html">in the sense of freedom, not
+&ldquo;zero price&rdquo;</a>), and requiring all modified and extended 
versions of
+the program to be free as well.</p>
 
 <p>
 The simplest way to make a program free software is to put it in the
@@ -28,8 +29,8 @@
 <p>
 In the <a href="/gnu/thegnuproject.html">GNU project</a>, our aim is
 to give <em>all</em> users the freedom to redistribute and change GNU
-software.  If middlemen could strip off the freedom, we might have
-many users, but those users would not have freedom.  So instead of
+software.  If middlemen could strip off the freedom, our code might &ldquo;have
+many users,&rdquo; but it would not give them freedom.  So instead of
 putting GNU software in the public domain, we &ldquo;copyleft&rdquo;
 it.  Copyleft says that anyone who redistributes the software, with or
 without changes, must pass along the freedom to further copy and
@@ -71,49 +72,42 @@
 &ldquo;copyleft.&rdquo;</p>
 
 <p>
-Copyleft is a way of using of the copyright on the program.  It
+Copyleft is a way of using the copyright on the program.  It
 doesn't mean abandoning the copyright; in fact, doing so would make
 copyleft impossible.  The &ldquo;left&rdquo; in
 &ldquo;copyleft&rdquo; is not a reference to the verb &ldquo;to
-leave&rdquo;&mdash;only to the direction which is the inverse of
+leave&rdquo;&mdash;only to the direction which is the mirror image of
 &ldquo;right&rdquo;.</p>
 
 <p>
 Copyleft is a general concept, and you can't use a general concept
 directly; you can only use a specific implementation of the concept.
 In the GNU Project, the specific distribution terms that we use for
-most software are contained in the
-<a href="/copyleft/gpl.html">GNU General Public License (available in
-HTML</a>, <a href="/copyleft/gpl.txt">text</a>, and
-<a href="/copyleft/gpl.texi">Texinfo</a> format).  The GNU General
+most software are contained in the <a href="/licenses/gpl.html">
+GNU General Public License</a>.  The GNU General
 Public License is often called the GNU GPL for short. There is also a
-<a href="/copyleft/gpl-faq.html">Frequently Asked Questions</a> page
+<a href="/licenses/gpl-faq.html">Frequently Asked Questions</a> page
 about the GNU GPL.  You can also read about
-<a href="/copyleft/why-assign.html">why the FSF gets copyright
+<a href="/licenses/why-assign.html">why the FSF gets copyright
 assignments from contributors</a>.</p>
 
 <p>
 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
+Affero General Public License (AGPL)</a> 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
+Lesser General Public License (LGPL)</a> applies to a few (but not
 all) GNU libraries. To learn more about properly using the LGPL, please
 read the article <a href="/philosophy/why-not-lgpl.html"><cite>Why you
 shouldn't use the Lesser GPL for your next library</cite></a>.</p>
 
 <p>
-The <a href="/copyleft/fdl.html">GNU Free Documentation License (FDL)
-(available in HTML</a>, <a href="/copyleft/fdl.txt">text</a> and
-<a href="/copyleft/fdl.texi">Texinfo)</a> is a form of copyleft intended
+The <a href="/licenses/fdl.html">GNU Free Documentation License (FDL)</a>
+is a form of copyleft intended
 for use on a manual, textbook or other document to assure everyone the
 effective freedom to copy and redistribute it, with or without
 modifications, either commercially or noncommercially.</p>
@@ -141,7 +135,7 @@
 
 <p>
 If you would like to copyleft your program with the GNU GPL or the GNU
-LGPL, please see the <a href="/copyleft/gpl-howto.html">license
+LGPL, please see the <a href="/licenses/gpl-howto.html">license
 instructions page</a> for advice.  Please note that you must use the entire
 text of the license you choose.  Each is an integral whole, and
 partial copies are not permitted.</p>
@@ -149,8 +143,8 @@
 <p>
 If you would like to copyleft your manual with the GNU FDL, please
 see the instructions at the
-<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,
+<a href="/licenses/fdl.html#addendum">end</a> of the FDL text, and
+the <a href="/licenses/fdl-howto.html">GFDL instructions page</a>.  Again,
 partial copies are not permitted.</p>
 
 <p>
@@ -200,7 +194,7 @@
 
 <!-- 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
+     be under CC BY-ND 4.0.  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
@@ -216,17 +210,17 @@
      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>
+2005, 2006, 2007, 2008, 2009, 2014, 2015, 2016, 2017 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>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/10/03 17:04:39 $
+$Date: 2017/08/16 12:59:35 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/copyleft.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/copyleft.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/copyleft.zh-cn.po        16 Aug 2017 12:43:59 -0000      1.7
+++ po/copyleft.zh-cn.po        16 Aug 2017 12:59:35 -0000      1.8
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-10-03 17:25+0000\n"
 "Plural-Forms: \n"
 
 # type: Content of: <title>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]