www/philosophy assigning-copyright.zh-cn.html p...

www-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy assigning-copyright.zh-cn.html p...

From:	GNUN
Subject:	www/philosophy assigning-copyright.zh-cn.html p...
Date:	Thu, 16 Sep 2021 03:33:07 -0400 (EDT)
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/09/16 03:33:07

Modified files:
        philosophy     : assigning-copyright.zh-cn.html 
        philosophy/po  : assigning-copyright.zh-cn-en.html 
                         assigning-copyright.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

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

Patches:
Index: assigning-copyright.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/assigning-copyright.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- assigning-copyright.zh-cn.html      28 Jun 2020 02:58:39 -0000      1.1
+++ assigning-copyright.zh-cn.html      16 Sep 2021 07:33:05 -0000      1.2
@@ -1,24 +1,31 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/assigning-copyright.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays licensing copyleft" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>å½æä¸ªä¼ä¸æ³è¦ä½ ççææ¶ - GNU å·¥ç¨ - 
èªç±è½¯ä»¶åºéä¼</title>
 <link rel="canonical"
-      href="http://www.fsf.org/blogs/rms/assigning-copyright"; />
+      href="https://www.fsf.org/blogs/rms/assigning-copyright"; />
 
 <!--#include virtual="/philosophy/po/assigning-copyright.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<div class="article reduced-width">
 <h2>å½æä¸ªä¼ä¸æ³è¦ä½ ççææ¶</h2>
+<div class="thin"></div>
 
 <p>å¼åèªç±è½¯ä»¶çä¼ä¸ä¼æç§ GNU GPL
 åå¸è½¯ä»¶ï¼ææ¶ä¹ä¼ææäºä»£ç æç§å
¶ä»æ¹å¼åå¸ãå¦æä»ä»¬æåæ ·çä»£ç æç
§ä¸åçè®¸å¯è¯åå¸ç»æäºä»è´¹ç¨æ·ï¼éå¸¸æ¯åè®¸ä¸æè½¯ä»¶å
å«è¿äºä»£ç ï¼ï¼é£ä¹æä»¬ç§°ä¹ä¸º
 &ldquo;éå®ä¾å¤&rdquo;ãå¦æä»ä»¬ææäºä»£ç çæ¬åªæç
§ä¸æå½¢å¼åå¸ï¼é£ä¹æä»¬ç§°ä¹ä¸ºåå¸è¯¥ç¨åºçä¸ä¸ªçº¯ä¸æçæ¬ã</p>
 
-<p><a
-href="/philosophy/selling-exceptions.html">http://www.gnu.org/philosophy/selling-exceptions.html</a>
-è§£éäºä¸ºä»ä¹éå®ä¾å¤æ¯å¯ä»¥çï¼å°½ç®¡æ¯æä½éåº¦çå¯ä»¥ãåä¹ï¼åå¸çº¯ä¸æçæ¬åå®å
¨éè¯¯ï¼å°±åå¶ä»ä¸æè½¯ä»¶ä¸æ ·ã</p>
+<p>&ldquo;<a href="/philosophy/selling-exceptions.html">GNU GPL
+éå®ä¾å¤</a>&rdquo;è§£éäºä¸ºä»ä¹éå®ä¾å¤æ¯å¯ä»¥çï¼å°½ç®¡æ¯æä½éåº¦çå¯ä»¥ãåä¹ï¼åå¸çº¯ä¸æçæ¬åå®å
¨éè¯¯ï¼å°±åå¶ä»ä¸æè½¯ä»¶ä¸æ ·ã</p>
 
 <p>ä¼ä¸ä¸è¬å¯¹èªå·±å¼åçä»£ç æä¼è¿æ ·åãå 
ä¸ºä»ä»¬å¯¹è¿äºä»£ç 
æ¥æçæï¼æä»¥ä»ä»¬å¯ä»¥æä»»ä½åæ³çæ¹å¼åå¸è¿äºä»£ç 
ï¼çè³å¯ä»¥å¹¶è¡ä½¿ç¨å¤ç§æ¹å¼ãå½ä½ 
è¦åå¸è¿ä¸ªç¨åºçèªç±çæ¬çä¿®æ¹çï¼èè¯¥ä¼ä¸æ³è¦å¨å
¶çæ¬éåå«ä½ çä¿®æ¹æ¶ï¼ä¼åçä»ä¹å¢ï¼</p>
 
@@ -42,17 +49,17 @@
 <p>ä½ 
å¯ä»¥éè¿å¨ååä¸åæç¸åºçæ¡æ¬¾æ¥æ§å¶ä»¥ä¸ç»æãå¦æä½ å
è®¸å¸¦æä½ ä»£ç çéå®ä¾å¤ï¼ä½æ¯ä¸åè®¸ä¼ä¸åå¸å«æä½ 
çè´¡ç®çä¸æçæ¬ï¼é£ä¹ä½ å¯ä»¥åæä»¥ä¸æ¡æ¬¾ï¼<sup><a
 href="#TransNote1">1</a></sup></p>
 
-<blockquote>
-  <p>FOO åå¸çä»»ä½å¸¦æ Hacker ä»£ç çç¨åºï¼æç§ GNU éç¨å¬å
±æ§å¶çæ¬ 3 çå®ä¹ï¼åºè¯¥æç§ a) &ldquo;GNU
-éç¨å¬å±è®¸å¯è¯ï¼GPLï¼ï¼çæ¬ 2 æä»¥åçæ¬å¯å¾&rdquo;ï¼æè
 b) æç§ä»¥ä¸ (a) çè®¸å¯è¯å¯å¾ï¼ä½æ¯ç¨ &ldquo;2&rdquo;
-å·²ææ´é«çæ¬å·ç GPL çæ¬ãå¦æ FOO
+<blockquote class="emph-box">
+  <p>FOO åå¸çä»»ä½å¸¦æ Hacker ä»£ç çç¨åºï¼æç§ GNU éç¨å¬å
±æ§å¶çæ¬ 3 çå®ä¹ï¼åºè¯¥æç§ <b>(a)</b> &ldquo;GNU
+éç¨å¬å±è®¸å¯è¯ï¼GPLï¼ï¼çæ¬ 2 æä»¥åçæ¬å¯å¾&rdquo;ï¼æè
 <b>(b)</b> æç§ä»¥ä¸ (a) çè®¸å¯è¯å¯å¾ï¼ä½æ¯ç¨
+&ldquo;2&rdquo; å·²ææ´é«çæ¬å·ç GPL çæ¬ãå¦æ FOO
 æç§è¿æ ·çæ¹å¼æç¨åºä»¥æºä»£ç å½¢å¼åè´¹åå¸ç»å
¬ä¼ï¼é£ä¹å®ä¹å¯ä»¥æåæ 
·çç¨åºè¿æ¥éèªç±è½¯ä»¶å¹¶å°åå¹¶åçäºè¿å¶ç¨åºæç
§èªéè®¸å¯è¯åå¸ã</p>
 </blockquote>
 
 <p>æèï¼å¦æä½ åå¯¹ <em>ä½ çä»£ç </em> å¯è½ä¼è¢«ä»æç
§ä¸æè®¸å¯è¯åå¸ï¼é£ä¹ä½ å¯ä»¥åæä»¥ä¸æ¡æ¬¾ï¼<sup><a
 href="#TransNote1">1</a></sup></p>
 
-<blockquote>
+<blockquote class="emph-box">
   <p>FOO åå¸çä»»ä½å¸¦æ Hacker ä»£ç çç¨åºï¼æç§ GNU éç¨å¬å
±æ§å¶çæ¬ 3 çå®ä¹ï¼åºè¯¥æç§ a) &ldquo;GNU
 éç¨å¬å±è®¸å¯è¯ï¼GPLï¼ï¼çæ¬ 2 æä»¥åçæ¬å¯å¾&rdquo;ï¼æè
 b) æç§ä»¥ä¸ (a) çè®¸å¯è¯å¯å¾ï¼ä½æ¯ç¨ &ldquo;2&rdquo;
 å·²ææ´é«çæ¬å·ç GPL çæ¬ãå¦æ FOO æç§è¿æ 
·çæ¹å¼æç¨åºä»¥æºä»£ç å½¢å¼åè´¹åå¸ç»å
¬ä¼ï¼é£ä¹å®ä¹å¯ä»¥å¨å¶ä»ç¨åºä¸æåæ ·ç Hacker
@@ -67,6 +74,7 @@
 <p>FSF å·²ç»è®©å¾å¸çè¿è¿äºæåï¼ä¸è¿å¨ä½¿ç¨ä¹åï¼ä½ 
è¿æ¯åºè¯¥åå¨è¯¢ä¸ä¸å¾å¸ã</p>
 
 <p>å½ä¼ä¸åè¯ä½ å®ä¼æ¥ååªäºæ¡æ¬¾æ¶ï¼å®å°±æ¯å¨åä½ 
å±ç¤ºå®çè®¡åç©¶ç«åèªç±è½¯ä»¶ççå¿µå·®å«å¤å¤§ãç¶åä½ 
å°±å¯ä»¥ååºå³å®æ¥ä¿è¯ä½ 
çè´¡ç®æ¯ç»èªç±è½¯ä»¶ç¤¾åºçï¼èä¸æ¯ç»ä¸æè½¯ä»¶çã</p>
+</div>
 
 <div class="translators-notes">
 
@@ -79,7 +87,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>è¯·å°æå³èªç±è½¯ä»¶åºéä¼(FSF) &amp; 
GNUçä¸è¬æ§é®é¢åéå°<a
@@ -98,20 +106,20 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 æä»¬å°½æå¤§åªåæ¥æä¾ç²¾ååé«è´¨éçç¿»è¯ï¼ä½é¾å
ä¼åå¨éè¯¯åä¸è¶³ãå¦ææ¨å¨è¿æ¹é¢æè¯è®ºæä¸è¬æ§çå»ºè®®ï¼è¯·åéè³
 <a
 
href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>ã</p><p>å
³äºè¿è¡åè°ä¸æäº¤ç¿»è¯çæ´å¤ä¿¡æ¯åè§
-<a href="/server/standards/README.translators.html">ãè¯è
æåã</a>ã</p>
+<a href="/server/standards/README.translations.html">ãè¯è
æåã</a>ã</p>
 </div>
 
-<p>Copyright &copy; 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2010, 2014, 2021 Free Software Foundation, Inc.</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>
+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">
@@ -123,11 +131,12 @@
 <p class="unprintable"><!-- timestamp start -->
 æåæ´æ°ï¼
 
-$Date: 2020/06/28 02:58:39 $
+$Date: 2021/09/16 07:33:05 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/assigning-copyright.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/assigning-copyright.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/assigning-copyright.zh-cn-en.html        28 Jun 2020 02:58:40 -0000      
1.1
+++ po/assigning-copyright.zh-cn-en.html        16 Sep 2021 07:33:06 -0000      
1.2
@@ -1,22 +1,31 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays licensing copyleft" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>When a Company Asks For Your Copyright
 - GNU Project - Free Software Foundation</title>
 <link rel="canonical"
-      href="http://www.fsf.org/blogs/rms/assigning-copyright"; />
+      href="https://www.fsf.org/blogs/rms/assigning-copyright"; />
 <!--#include virtual="/philosophy/po/assigning-copyright.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="article reduced-width">
 <h2>When a Company Asks For Your Copyright</h2>
+<div class="thin"></div>
 
 <p>Companies that develop free software and release it under the GNU GPL
 sometimes distribute some copies of the code in other ways.  If they
 distribute the exact same code under a different license to certain
 users that pay for this, typically permitting including the code in
-proprietary programs, we call it &ldquo;selling exceptions&rdquo;.  If they
+proprietary programs, we call it &ldquo;selling exceptions.&rdquo;  If they
 distribute some version of the code solely in a proprietary manner, we
 call that releasing a purely proprietary version of the program.</p>
 
-<p><a 
href="/philosophy/selling-exceptions.html">http://www.gnu.org/philosophy/selling-exceptions.html</a>
 explains why
+<p>&ldquo;<a href="/philosophy/selling-exceptions.html">Selling exceptions
+to the GNU GPL</a>&rdquo; explains why
 selling exceptions is acceptable, though only barely.  By contrast,
 releasing a purely proprietary version is outright wrong, like
 any other proprietary software.</p>
@@ -83,11 +92,11 @@
 proprietary versions containing your code, you can insist on a
 condition more or less like this:</p>
 
-<blockquote>
+<blockquote class="emph-box">
   <p>Any program based on (as defined in GNU General Public License
   version 3) Hacker's code that FOO distributes shall be made
-  available by FOO under a) the &ldquo;GNU General Public License (GPL),
-  version 2 or later&rdquo;, or b) the licensing in (a), above, but with 
&ldquo;2&rdquo;
+  available by FOO under <b>(a)</b> the &ldquo;GNU General Public License 
(GPL),
+  version 2 or later,&rdquo; or <b>(b)</b> the licensing in (a), above, but 
with &ldquo;2&rdquo;
   replaced by any higher existing GPL version number.  Provided FOO
   makes the program available as source code gratis to the public in
   this way, it may also distribute the identical program to some of
@@ -100,11 +109,11 @@
 might be released solely in a proprietary version, you can insist on a
 condition more or less like this:</p>
 
-<blockquote>
+<blockquote class="emph-box">
   <p>Any program based on (as defined in GNU General Public License
   version 3) Hacker's code that FOO distributes shall be made
-  available by FOO under a) the &ldquo;GNU General Public License (GPL),
-  version 2 or later&rdquo;, or b) the licensing in (a), above, but with 
&ldquo;2&rdquo;
+  available by FOO under <b>(a)</b> the &ldquo;GNU General Public License 
(GPL),
+  version 2 or later,&rdquo; or <b>(b)</b> the licensing in (a), above, but 
with &ldquo;2&rdquo;
   replaced by any higher existing GPL version number.  Provided FOO
   makes the program available as source code gratis to the public in
   this way, it may also distribute the same version of Hacker's code
@@ -112,10 +121,10 @@
 </blockquote>
 
 <p>If the program is released under the GNU Affero GPL, then add 
&ldquo;Affero&rdquo;
-before &ldquo;General&rdquo;, change &ldquo;GPL&rdquo; to &ldquo;AGPL&rdquo;, 
change &ldquo;2 or&rdquo; to &ldquo;3 or&rdquo;, and
+before &ldquo;General,&rdquo; change &ldquo;GPL&rdquo; to &ldquo;AGPL,&rdquo; 
change &ldquo;2 or&rdquo; to &ldquo;3 or,&rdquo; and
 it could make sense to replace &ldquo;that FOO distributes&rdquo; with 
&ldquo;that FOO
 distributes, or deploys on a server accessible to users other than
-FOO&rdquo;.</p>
+FOO.&rdquo;</p>
 
 <p>The FSF has had these texts reviewed by a lawyer, but you should get
 your own legal advice before using them.</p>
@@ -125,10 +134,11 @@
 software.  Then you can respond to ensure your work will contribute to
 the free software community and not be diverted into proprietary
 software.</p>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -146,30 +156,30 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2010, 2014, 2021 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: 2020/06/28 02:58:40 $
+$Date: 2021/09/16 07:33:06 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/assigning-copyright.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/assigning-copyright.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/assigning-copyright.zh-cn.po     16 Sep 2021 06:57:03 -0000      1.7
+++ po/assigning-copyright.zh-cn.po     16 Sep 2021 07:33:06 -0000      1.8
@@ -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-09-02 08:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -166,8 +165,8 @@
 #. type: Content of: <div><blockquote><p>
 msgid ""
 "Any program based on (as defined in GNU General Public License version 3) "
-"Hacker's code that FOO distributes shall be made available by FOO under "
-"<b>(a)</b> the &ldquo;GNU General Public License (GPL), version 2 or later,"
+"Hacker's code that FOO distributes shall be made available by FOO under <b>"
+"(a)</b> the &ldquo;GNU General Public License (GPL), version 2 or later,"
 "&rdquo; or <b>(b)</b> the licensing in (a), above, but with &ldquo;2&rdquo; "
 "replaced by any higher existing GPL version number.  Provided FOO makes the "
 "program available as source code gratis to the public in this way, it may "
@@ -194,8 +193,8 @@
 #. type: Content of: <div><blockquote><p>
 msgid ""
 "Any program based on (as defined in GNU General Public License version 3) "
-"Hacker's code that FOO distributes shall be made available by FOO under "
-"<b>(a)</b> the &ldquo;GNU General Public License (GPL), version 2 or later,"
+"Hacker's code that FOO distributes shall be made available by FOO under <b>"
+"(a)</b> the &ldquo;GNU General Public License (GPL), version 2 or later,"
 "&rdquo; or <b>(b)</b> the licensing in (a), above, but with &ldquo;2&rdquo; "
 "replaced by any higher existing GPL version number.  Provided FOO makes the "
 "program available as source code gratis to the public in this way, it may "
[Prev in Thread]
Current Thread
[Next in Thread]
www/philosophy assigning-copyright.zh-cn.html p..., GNUN <=
Prev by Date: www/philosophy android-and-users-freedom.zh-cn....
Next by Date: www philosophy/po/europes-unitary-patent.ru.po ...
Previous by thread: www/philosophy android-and-users-freedom.zh-cn....
Next by thread: www philosophy/po/europes-unitary-patent.ru.po ...
Index(es):
- Date
- Thread