[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses rms-why-gplv3.zh-cn.html po/rms-wh...
|
From: |
GNUN |
|
Subject: |
www/licenses rms-why-gplv3.zh-cn.html po/rms-wh... |
|
Date: |
Thu, 6 Jan 2022 04:09:40 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 22/01/06 04:09:40
Modified files:
licenses : rms-why-gplv3.zh-cn.html
licenses/po : rms-why-gplv3.zh-cn-en.html
rms-why-gplv3.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/rms-why-gplv3.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/rms-why-gplv3.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/rms-why-gplv3.zh-cn.po?cvsroot=www&r1=1.5&r2=1.6
Patches:
Index: rms-why-gplv3.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/rms-why-gplv3.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- rms-why-gplv3.zh-cn.html 26 May 2020 08:32:08 -0000 1.1
+++ rms-why-gplv3.zh-cn.html 6 Jan 2022 09:09:40 -0000 1.2
@@ -1,16 +1,18 @@
<!--#set var="ENGLISH_PAGE" value="/licenses/rms-why-gplv3.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.97 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>为ä»ä¹è¦åçº§å° GPLv3 - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
<!--#include virtual="/licenses/po/rms-why-gplv3.translist" -->
<!--#include virtual="/server/banner.zh-cn.html" -->
+<div class="article reduced-width">
<h2>为ä»ä¹è¦åçº§å° GPLv3</h2>
-<p><strong>Richard Stallman</strong> è</p>
+<address class="byline">Richard Stallman è</address>
<p><a href="/licenses/gpl.html">GNU éç¨å
Œ
±è®¸å¯è¯ç¬¬ä¸ç</a>ï¼GNU
GPLï¼åå¸äºï¼å®ä½¿èªç±è½¯ä»¶å
å¯ä»¥ä» GPL
çæ¬ 2 å级å°çæ¬
3ãæ¬æ解é为ä»ä¹è¿æ¬¡è®¸å¯è¯å级æ¯éè¦çã</p>
@@ -43,9 +45,8 @@
<p id="drm">
å¨æ°åéå¶ç®¡çï¼DRMï¼——è¿æ¯éå¶ä½
使ç¨èªå·±çµèä¸çæ°æ®çæ¶å£åè½——ç严é
·çé¢åï¼ç«äºæ²¡æç¨ï¼å 为ç¸å
³çç«äºè¢«ç¦æ¢äºãå¨è¯¸å¦æ°åå禧çææ³æ¡ä¹ç±»çæ³å¾ä¸ï¼å¨ç¾å½å许å¤å
¶ä»å½å®¶ï¼å¦æä½ æ²¡ææç
§âDVD
é´è°âçå®æ¹è§åï¼ç½ç« <a
-href="http://www.dvdcca.org/";>http://www.dvdcca.org/</a>ï¼ä½æ¯è§åçæ¥å¹¶æ²¡ææ¾ä¸å»ï¼åå¸éå¶ç¨æ·ç
-DVD ææ¾å¨ï¼é£ä¹ä½ æ¯éæ³çãå
¬ä¼æ æ³éè¿è´ä¹°é DRM
çææ¾å¨æ¥æç»
-DRMï¼å 为没æè¿æ ·çææ¾å¨ãæ 论æå¤å°ç§äº§åä¾ä½
éæ©ï¼å®ä»¬é½æ¯å¸¦ææ°åæ·éçã</p>
+href="https://www.dvdcca.org/";>www.dvdcca.org/</a>ï¼ä½æ¯è§åçæ¥å¹¶æ²¡ææ¾ä¸å»ï¼åå¸éå¶ç¨æ·ç
DVD
+ææ¾å¨ï¼é£ä¹ä½ æ¯éæ³çãå
¬ä¼æ æ³éè¿è´ä¹°é DRM
çææ¾å¨æ¥æç» DRMï¼å 为没æè¿æ ·çææ¾å¨ãæ
论æå¤å°ç§äº§åä¾ä½ éæ©ï¼å®ä»¬é½æ¯å¸¦ææ°åæ·éçã</p>
<p>GPLv3 ä¿è¯ä½ æå é¤æ·éçèªç±ãå®ä¸ç¦æ¢
DRMï¼ä¹ä¸ç¦æ¢ä»»ä½åè½ãå®ä¸éå¶ä½ 为ç¨åºæ·»å æå
é¤é大çåè½ãåè¿æ¥ï¼å®ä¿è¯ä½ æåæ ·çèªç±åå¸å
é¤å·®å²åè½ççæ¬åæ·»å å·®å²åè½ççæ¬ãTivoization
@@ -89,6 +90,7 @@
å
¶ä¸ä¸ä¸ªæ¹æ³æ¯è®©ç¨åºæç
§ “GPL çæ¬ 3
æä»»ä½ä»¥åç欔 åå¸ãå¦ä¸ä¸ªæ¹æ³æ¯ç¨åºçææè´¡ç®è
声æä¸ä¸ªè½å¤å³å®å级 GPL
å°æ¥çæ¬ç代çã第ä¸ä¸ªæ¹æ³æ¯ææè´¡ç®è
å°çæ转让ç»ä¸ä¸ªæå®ççæææè
ï¼è¯¥çæææè
å°å¤ç许å¯è¯çæ¬å级çé®é¢ãæ
论éååªä¸ç§æ¹æ³ï¼ç¨åºé½åºè¯¥æä¾åºå¯¹å°æ¥çæ¬ç
GPL 许å¯è¯ççµæ´»æ§ã</p>
+</div>
<div class="translators-notes">
@@ -98,7 +100,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) &
GNUçä¸è¬æ§é®é¢åéå°<a
@@ -117,18 +119,18 @@
<web-translators@gnu.org></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";><web-translators@gnu.org></a>ã</p><p>å
³äºè¿è¡åè°ä¸æ交翻è¯çæ´å¤ä¿¡æ¯åè§
-<a href="/server/standards/README.translators.html">ãè¯è
æåã</a>ã</p>
+<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
@@ -142,27 +144,28 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2007, 2009, 2014 Richard Stallman</p>
+<p>Copyright © 2007, 2009, 2022 Richard Stallman</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">
<!--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/";><CTT></a>ï¼2020ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2020ï¼2022ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2020/05/26 08:32:08 $
+$Date: 2022/01/06 09:09:40 $
<!-- timestamp end -->
</p>
</div>
</div>
+<!-- for class="inner", starts in the banner include -->
</body>
</html>
Index: po/rms-why-gplv3.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/rms-why-gplv3.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/rms-why-gplv3.zh-cn-en.html 26 May 2020 08:32:08 -0000 1.1
+++ po/rms-why-gplv3.zh-cn-en.html 6 Jan 2022 09:09:40 -0000 1.2
@@ -1,12 +1,14 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.97 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
<title>Why Upgrade to GPLv3
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/licenses/po/rms-why-gplv3.translist" -->
<!--#include virtual="/server/banner.html" -->
+<div class="article reduced-width">
<h2>Why Upgrade to GPLv3</h2>
-<p>by <strong>Richard Stallman</strong></p>
+<address class="byline">by Richard Stallman</address>
<p><a href="/licenses/gpl.html">Version 3 of the GNU General Public
License</a> (GNU GPL) has been released, enabling free software packages to
@@ -56,19 +58,20 @@
<p>Some argue that competition between appliances in a free market should
suffice to keep nasty features to a low level. Perhaps competition
alone would avoid arbitrary, pointless misfeatures like “Must shut
-down between 1pm and 5pm every Tuesday”, but even so, a choice of
+down between 1pm and 5pm every Tuesday,” but even so, a choice of
masters isn't freedom. Freedom means <em>you</em> control what your software
does, not merely that you can beg or threaten someone else who decides
for you.</p>
<p id="drm">
-In the crucial area of Digital Restrictions Management (DRM)—nasty
features
-designed to restrict your use of the data in your
+In the crucial area of Digital Restrictions Management (DRM)—nasty
+features designed to restrict your use of the data in your
computer—competition is no help, because relevant competition is
forbidden. Under the Digital Millennium Copyright Act and similar
laws, it is illegal, in the US and many other countries, to distribute
DVD players unless they restrict the user according to the official
-rules of the DVD conspiracy (its web site is <a
href="http://www.dvdcca.org/";>http://www.dvdcca.org/</a>,
+rules of the DVD conspiracy (its web site is <a
+href="https://www.dvdcca.org/";>www.dvdcca.org/</a>,
but the rules do not seem to be published there). The public can't
reject DRM by buying non-DRM players because none are available. No
matter how many products you can choose from, they all have equivalent
@@ -82,7 +85,8 @@
deny you that freedom; to protect your freedom, GPLv3 forbids
tivoization.</p>
-<p>The ban on tivoization applies to any product whose use by consumers is to
be expected, even occasionally. GPLv3 tolerates tivoization
+<p>The ban on tivoization applies to any product whose use by consumers
+is to be expected, even occasionally. GPLv3 tolerates tivoization
only for products that are almost exclusively meant for businesses and
organizations.</p>
@@ -100,7 +104,7 @@
<p>Microsoft's lawyers are not stupid, and next time they may manage to
avoid those mistakes. GPLv3 therefore says they don't get a “next
-time”. Releasing a program under GPL version 3 protects it from
+time.” Releasing a program under GPL version 3 protects it from
Microsoft's future attempts to make redistributors collect Microsoft
royalties from the program's users.</p>
@@ -138,14 +142,12 @@
explicit patent license of GPLv3 makes sure companies that use the GPL
to give users the four freedoms cannot turn around and use their
patents to tell some users, “That doesn't include you.”
-It also stops
-them from colluding with other patent holders to do this.</p>
+It also stops them from colluding with other patent holders to do this.</p>
<p id="further-advantages">
Further advantages of GPLv3 include better internationalization, gentler
termination, support for BitTorrent, and compatibility with the Apache
-license. All in all, plenty of
-reason to upgrade.</p>
+license. All in all, plenty of reason to upgrade.</p>
<p id="gpl4">
Change is unlikely to cease once GPLv3 is released. If new threats to
@@ -155,16 +157,17 @@
<p id="future-proofing">
One way to do this is to release a program under “GPL version 3 or any
-later version”. Another way is for all the contributors to a program
+later version.” Another way is for all the contributors to a program
to state a proxy who can decide on upgrading to future GPL versions.
The third way is for all the contributors to assign copyright to one
designated copyright holder, who will be in a position to upgrade the
license version. One way or another, programs should provide this
flexibility for future GPL versions.</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 & GNU inquiries to
@@ -182,19 +185,19 @@
to <a href="mailto:web-translators@gnu.org";>
<web-translators@gnu.org></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>
<!-- 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
@@ -209,20 +212,20 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2007, 2009, 2014 Richard Stallman</p>
+<p>Copyright © 2007, 2009, 2022 Richard Stallman</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/05/26 08:32:08 $
+$Date: 2022/01/06 09:09:40 $
<!-- timestamp end -->
</p>
</div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
</body>
</html>
Index: po/rms-why-gplv3.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/rms-why-gplv3.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/rms-why-gplv3.zh-cn.po 6 Jan 2022 08:30:03 -0000 1.5
+++ po/rms-why-gplv3.zh-cn.po 6 Jan 2022 09:09:40 -0000 1.6
@@ -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: 2022-01-02 17:25+0000\n"
#. type: Content of: <title>
msgid "Why Upgrade to GPLv3 - GNU Project - Free Software Foundation"
- www/licenses rms-why-gplv3.zh-cn.html po/rms-wh...,
GNUN <=