www philosophy/15-years-of-free-software.zh-cn....

www-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www philosophy/15-years-of-free-software.zh-cn....

From:	GNUN
Subject:	www philosophy/15-years-of-free-software.zh-cn....
Date:	Wed, 15 Jul 2020 05:31:57 -0400 (EDT)
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     20/07/15 05:31:56

Modified files:
        philosophy     : 15-years-of-free-software.zh-cn.html 
                         amazon-rms-tim.zh-cn.html amazon.zh-cn.html 
                         dat.zh-cn.html freedom-or-power.cs.html 
                         self-interest.zh-cn.html 
                         shouldbefree.zh-cn.html 
        philosophy/po  : 15-years-of-free-software.zh-cn-en.html 
                         15-years-of-free-software.zh-cn.po 
                         amazon-rms-tim.zh-cn-en.html 
                         amazon-rms-tim.zh-cn.po amazon.zh-cn-en.html 
                         amazon.zh-cn.po dat.zh-cn-en.html dat.zh-cn.po 
                         freedom-or-power.cs.po 
                         self-interest.zh-cn-en.html 
                         self-interest.zh-cn.po 
                         shouldbefree.zh-cn-en.html 
                         shouldbefree.zh-cn.po 
        proprietary    : proprietary.zh-cn.html 
        proprietary/po : proprietary.zh-cn-en.html proprietary.zh-cn.po 
Added files:
        philosophy/po  : freedom-or-power.cs-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/15-years-of-free-software.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/amazon-rms-tim.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/amazon.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/dat.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/freedom-or-power.cs.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/self-interest.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/shouldbefree.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/15-years-of-free-software.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/15-years-of-free-software.zh-cn.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/amazon-rms-tim.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/amazon-rms-tim.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/amazon.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/amazon.zh-cn.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/dat.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/dat.zh-cn.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/freedom-or-power.cs.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/self-interest.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/self-interest.zh-cn.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/shouldbefree.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/shouldbefree.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/freedom-or-power.cs-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary.zh-cn.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.zh-cn-en.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.zh-cn.po?cvsroot=www&r1=1.35&r2=1.36

Patches:
Index: philosophy/15-years-of-free-software.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/15-years-of-free-software.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/15-years-of-free-software.zh-cn.html     19 Jul 2018 13:01:04 
-0000      1.1
+++ philosophy/15-years-of-free-software.zh-cn.html     15 Jul 2020 09:31:55 
-0000      1.2
@@ -37,10 +37,10 @@
 </p>
 
 <p>
-  
å¨1991å¹´ï¼æåä¸ä¸ªç±»Unixç³»ç»çä¸»è¦é¨ä»¶è¢«å¼åäºåºæ¥ï¼Linuxï¼ç±Linus
-Torvaldsç¼åçåæ ¸ãä»å¤©ï¼å
¨ä¸çææ°ç¾ä¸äººä½¿ç¨GNUåLinuxçç»åï¼èä¸å
¶çåº¦è¿å¨æåãæ¬æï¼æä»¬åå¸äº<acronym
-title="GNU Network Object Model Environment">GNOME</acronym>
-1.0çï¼è¿æ¯GNUçå¾å½¢æ¡é¢ï¼æä»¬å¸æåæ¤ä½¿GNU/Linuxç³»ç»åå¾åå
¶ä»æä½ç³»ç»ä¸æ ·æç¨ã
+  å¨ 1991 å¹´ï¼æåä¸ä¸ªç±» Unix 
ç³»ç»çä¸»è¦é¨ä»¶è¢«å¼åäºåºæ¥ï¼Linuxï¼ç± Linus Torvalds 
ç¼åçåæ ¸ãä»å¤©ï¼å¨ä¸çææ°ç¾ä¸äººä½¿ç¨
+GNU å Linux çç»åï¼èä¸å
¶çåº¦è¿å¨æåãæ¬æï¼æä»¬åå¸äº <abbr title="GNU Network Object 
Model
+Environment">GNOME</abbr> 1.0 çï¼è¿æ¯ GNU 
çå¾å½¢æ¡é¢ï¼æä»¬å¸æåæ¤ä½¿ GNU/Linux
+ç³»ç»åå¾åå¶ä»æä½ç³»ç»ä¸æ ·æç¨ã
 </p>
 
 <p>
@@ -87,7 +87,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
@@ -101,23 +101,23 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999, 2014 Richard M. Stallman</p>
+<p>Copyright &copy; 1999, 2014, 2020 Richard M. 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>
+<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>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>ï¼2018ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>ï¼2018ï¼2020ã</div>
 
 <p class="unprintable"><!-- timestamp start -->
 æåæ´æ°ï¼
 
-$Date: 2018/07/19 13:01:04 $
+$Date: 2020/07/15 09:31:55 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/amazon-rms-tim.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/amazon-rms-tim.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/amazon-rms-tim.zh-cn.html        15 Jun 2020 09:31:45 -0000      
1.1
+++ philosophy/amazon-rms-tim.zh-cn.html        15 Jul 2020 09:31:55 -0000      
1.2
@@ -12,8 +12,8 @@
 
 <p>
 è¿æ¯ <a href="http://www.stallman.org/";>Richard M. Stallman</a> å¨ 2000 å¹´ 
3 æ
-11 æ¥åç» Tim O'Reilly çæ¶æ¯ï¼å¶ä¸è®¨è®ºçæ¯ Jeff 
Bezosï¼äºé©¬é <acronym title="Chief
-Executive Officer">CEO</acronym>ï¼å³äºæè¯·è½¯ä»¶ä¸å©åªä¿æ 3 å° 5 
å¹´çå£°æã</p>
+11 æ¥åç» Tim O'Reilly çæ¶æ¯ï¼å¶ä¸è®¨è®ºçæ¯ Jeff 
Bezosï¼äºé©¬é <abbr title="Chief Executive
+Officer">CEO</abbr>ï¼å³äºæè¯·è½¯ä»¶ä¸å©åªä¿æ 3 å° 5 
å¹´çå£°æã</p>
 
 <p>
 è¯· <a href="/philosophy/amazon.html">éè¯»æ´å¤</a> å
³äºæ¤æ¬¡æµå¶æ´»å¨çåå®¹ã
@@ -88,7 +88,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
@@ -102,11 +102,11 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999, 2007, 2008, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1999, 2007, 2008, 2014, 2020 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">
@@ -118,7 +118,7 @@
 <p class="unprintable"><!-- timestamp start -->
 æåæ´æ°ï¼
 
-$Date: 2020/06/15 09:31:45 $
+$Date: 2020/07/15 09:31:55 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/amazon.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/amazon.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/amazon.zh-cn.html        5 Jun 2020 03:59:20 -0000       1.1
+++ philosophy/amazon.zh-cn.html        15 Jul 2020 09:31:55 -0000      1.2
@@ -105,8 +105,8 @@
 
 <p>
 <a href="http://www.stallman.org/";>Richard M. Stallman</a> å <a
-href="/philosophy/amazon-rms-tim.html">ä¿¡ç» Tim O'Reilly</a> å°±äºé©¬é 
<acronym
-title="Chief Executive Officer">CEO</acronym> Jeff Bezos å
³äºæè¯·è½¯ä»¶ä¸å©ä¿æ 3 å¹´æ 5
+href="/philosophy/amazon-rms-tim.html">ä¿¡ç» Tim O'Reilly</a> å°±äºé©¬é 
<abbr
+title="Chief Executive Officer">CEO</abbr> Jeff Bezos å
³äºæè¯·è½¯ä»¶ä¸å©ä¿æ 3 å¹´æ 5
 å¹´çå£°æè¿è¡äº¤æµã</p>
 
 <p>
@@ -183,8 +183,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999, 2001, 2007, 2008, 2013, 2014, 2015, 2018, 2019 Free
-Software Foundation, Inc.</p>
+<p>Copyright &copy; 1999, 2001, 2007, 2008, 2013, 2014, 2015, 2018, 2019, 2020
+Free Software Foundation, Inc.</p>
 
 <p>æ¬é¡µé¢ä½¿ç¨ <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -200,7 +200,7 @@
 <p class="unprintable"><!-- timestamp start -->
 æåæ´æ°ï¼
 
-$Date: 2020/06/05 03:59:20 $
+$Date: 2020/07/15 09:31:55 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/dat.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/dat.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/dat.zh-cn.html   24 Jan 2018 12:33:20 -0000      1.4
+++ philosophy/dat.zh-cn.html   15 Jul 2020 09:31:55 -0000      1.5
@@ -22,8 +22,8 @@
 Muguetæåºï¼å¶ä¸åå«äºä¸äºæ¬æçæ³æ³ï¼è¢«ç§°ä¸ºå
¨çä¿æ¤ç³»ç»ï¼ç¨æ³è¯æ¥è¯´æ¯ï¼M&eacute;c&eacute;nat
 
Globalï¼ãè¿ä¸¤ä¸ªæ¹æ¡æé½æ¯æï¼å°±æ¯è¯´ï¼éç¨åªä¸ä¸ªï¼æé½èµåã]</em></p>
 
-<p>å±çå¬å¸çå·¨å¤´ä»¬å¹¶ä¸åæ¬¢æ°åé³é¢ç£å¸¦å½é³æºï¼<acronym 
title="Digital Audio
-Tape">DAT</acronym>ï¼ï¼å°½ç®¡å®ä»¬å¯ä»¥å¶ä½å®ç¾çé³ä¹å½é³å¸¦å¤å¶åãä»ä»¬æ
å¿é¡¾å®¢ä»¬ä¼èªå·±å¤å¶é³ä¹ï¼ä»èåæ¢è´ä¹°äºå
å½å¶çé³ä¹ã</p>
+<p>å±çå¬å¸çå·¨å¤´ä»¬å¹¶ä¸åæ¬¢æ°åé³é¢ç£å¸¦å½é³æºï¼<abbr 
title="Digital Audio
+Tape">DAT</abbr>ï¼ï¼å°½ç®¡å®ä»¬å¯ä»¥å¶ä½å®ç¾çé³ä¹å½é³å¸¦å¤å¶åãä»ä»¬æ
å¿é¡¾å®¢ä»¬ä¼èªå·±å¤å¶é³ä¹ï¼ä»èåæ¢è´ä¹°äºå
å½å¶çé³ä¹ã</p>
 
 
<p>éè¿è¯è®¼å¨èçææ®µï¼ä»ä»¬å·²ç»ä¸DATççäº§ååè¾¾æäºåè®®ï¼çäº§ååä¼ä¸ºä»ä»¬éå®ç»é¡¾å®¢çæ¯ä¸ªDATæºåæ¯çDATç£å¸¦æ¯ä»ä¸ç¬è´¹ç¨ãè¯¥è´¹ç¨å°åç»é³ä¹äº§ä¸ä¸ä¸åçåä¸è
ï¼é³ä¹å®¶ãä½æ²å®¶ãé³ä¹åè¡ååå±çå
¬å¸ãé¤æ¤ä»¥å¤ï¼DATçäº§ååæåå¼±DATæºä»¥ä¿è¯æ æ³å¶ä½äºå
å½å¶çç£å¸¦çæ·è´çæ·è´ã</p>
 
@@ -101,8 +101,10 @@
 
 <p>éæ¸åå°æ¶å¥çæææ¯ä½¿æ¶å¥åéå¾æ´å å¹¿æ³ï¼ä¾å
»æ´å¤é³ä¹å®¶è¿ä¸éå½æ°´å¹³ççæ´»ãè¿é¼å±äºå¤æ 
·åï¼æ£æ¯çæå¶åº¦åºè¯¥åçã</p>
 
-<p>ç¾å½æ¿åºå·²ç»å»ºç«äºèµå©èºæ¯å¤æ ·åçé¡¹ç®ï¼<acronym 
title="National Endowment for the
-Artsï¼å½å®¶èºæ¯åºé">NEA</acronym>ãç¶èï¼NEAåºéæ¥æèªç±è£å³çæå©ï¼è¿ä½¿å¾ä»ä»¬æä¸ºäºè®ºçä¸å¿ï¼ææ¶åå
 ä¸ºä¸é¨åå¬ä¼ä¼åå¾ä¸åæ¬¢æä½åï¼ææ¶åæ¯å ä¸ºå 
ä¹æ²¡æäººæç¡®åæ¬¢å®ãåéDATç¨æ¶æ¶å
¥ä¹ä¼ææ¯æéä¸»æµé³ä¹å®¶çææãç¶èï¼å®ä¸ä¼æ¯æä½åæ²¡äººåæ¬¢çé³ä¹å®¶ãæ¤å¤ï¼å
 ä¸ºå®å¹¶æ²¡æå
å«ä»»ä½èªç±è£å³ï¼ä¹æ²¡æä»»ä½æ¦æçå³å®ï¼æä»¥å®å 
ä¹æ²¡æå ä¸ºç¹å®åå èæç»æä½åçç©ºé´ã</p>
+<p>ç¾å½æ¿åºå·²ç»å»ºç«äºèµå©èºæ¯å¤æ ·åçé¡¹ç®ï¼<abbr 
title="National Endowment for the
+Artsï¼å½å®¶èºæ¯åºé">NEA</abbr>ãç¶èï¼NEA
+åºéæ¥æèªç±è£å³çæå©ï¼è¿ä½¿å¾ä»ä»¬æä¸ºäºè®ºçä¸å¿ï¼ææ¶åå
 ä¸ºä¸é¨åå¬ä¼ä¼åå¾ä¸åæ¬¢æä½åï¼ææ¶åæ¯å ä¸ºå 
ä¹æ²¡æäººæç¡®åæ¬¢å®ãåé DAT
+ç¨æ¶æ¶å
¥ä¹ä¼ææ¯æéä¸»æµé³ä¹å®¶çææãç¶èï¼å®ä¸ä¼æ¯æä½åæ²¡äººåæ¬¢çé³ä¹å®¶ãæ¤å¤ï¼å
 ä¸ºå®å¹¶æ²¡æå
å«ä»»ä½èªç±è£å³ï¼ä¹æ²¡æä»»ä½æ¦æçå³å®ï¼æä»¥å®å 
ä¹æ²¡æå ä¸ºç¹å®åå èæç»æä½åçç©ºé´ã</p>
 
 
<p><em>[åæ¥ï¼æäººé®æä¸ä¸ªæè¶£çé®é¢ï¼ä»ä¹æºæåºè¯¥æ¥&ldquo;ç®¡ç&rdquo;è¿äºèµéçåé
ãå ä¸ºè¿æ¯ç¨æ¶ï¼æ¿åºæºæåºè¯¥å¾æ¶ååé
è¿äºèµéãç§äººæºæä¸åºè¯¥ä»å¥ã]</em></p>
 
@@ -186,11 +188,11 @@
 è¥æ¨æ³ç¿»è¯æ¬æï¼è¯·åç<a 
href="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>ã</p>
 </div>
 
-<p>Copyright &copy; 1992, 2010, 2014 Richard M. Stallman</p>
+<p>Copyright &copy; 1992, 2010, 2014, 2020 Richard M. 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>
+<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">
@@ -200,12 +202,12 @@
 <b>å®¡æ ¡</b>: åæå® <a
 href="mailto:chliu@gnu.org";>&lt;chliu@gnu.org&gt;</a><br></br>
 <b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>ï¼2018ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>ï¼2018ï¼2020ã</div>
 
 <p class="unprintable"><!-- timestamp start -->
 æåæ´æ°ï¼
 
-$Date: 2018/01/24 12:33:20 $
+$Date: 2020/07/15 09:31:55 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/freedom-or-power.cs.html
===================================================================
RCS file: /web/www/www/philosophy/freedom-or-power.cs.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/freedom-or-power.cs.html 1 Feb 2017 17:03:11 -0000       1.3
+++ philosophy/freedom-or-power.cs.html 15 Jul 2020 09:31:55 -0000      1.4
@@ -1,9 +1,3 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/freedom-or-power.cs.po">
- https://www.gnu.org/philosophy/po/freedom-or-power.cs.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/philosophy/freedom-or-power.html"
- --><!--#set var="DIFF_FILE" value=""
- --><!--#set var="OUTDATED_SINCE" value="2009-09-27" -->
 <!--#set var="ENGLISH_PAGE" value="/philosophy/freedom-or-power.en.html" -->
 
 <!--#include virtual="/server/header.cs.html" -->
@@ -11,12 +5,14 @@
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Svoboda Äi moc? â Projekt GNU â Nadace pro svobodnÃ½ 
software</title>
-<meta http-equiv="Keywords" content="GNU, FSF, Nadace pro svobodnÃ½ software , 
Linux, obecnÃ©, veÅejnost, licence, gpl, general public license, svoboda, 
software, moc, prÃ¡va" />
-<meta http-equiv="Description" content="V eseji âSvoboda Äi moc?â 
diskutujÃ Bradley M. Kuhn a Richard M. Stallman o dÅ¯vodech, proÄ hnutÃ 
svobodnÃ©ho software neprosazuje takzvanou svobodu vÃ½bÄru jakÃ©koli licence 
pro software, kterÃ½ pÃÅ¡ete." />
+<meta http-equiv="Keywords" content="GNU, FSF, Nadace pro svobodnÃ½ software , 
Linux, obecnÃ©, veÅejnost, licence,
+gpl, general public license, svoboda, software, moc, prÃ¡va" />
+<meta http-equiv="Description" content="V eseji âSvoboda Äi moc?â 
diskutujÃ Bradley M. Kuhn a Richard M. Stallman o
+dÅ¯vodech, proÄ hnutÃ svobodnÃ©ho software neprosazuje takzvanou svobodu
+vÃ½bÄru jakÃ©koli licence pro software, kterÃ½ pÃÅ¡ete." />
 
 <!--#include virtual="/philosophy/po/freedom-or-power.translist" -->
 <!--#include virtual="/server/banner.cs.html" -->
-<!--#include virtual="/server/outdated.cs.html" -->
 <h2>Svoboda Äi moc?</h2>
 
 <p>
@@ -56,17 +52,17 @@
 svobodou, selÅ¾eme pÅi podporovÃ¡nÃ opravdovÃ© svobody.</p>
 
 <p>
-ProprietÃ¡rnÃ software znamenÃ¡ uplatÅovÃ¡nÃ moci. ZÃ¡kon o copyrightu 
zaruÄuje
-v dneÅ¡nÃ dobÄ tuto moc softwarovÃ½m vÃ½vojÃ¡ÅÅ¯m, takÅ¾e si pouze oni 
vybÃrajÃ
+ProprietÃ¡rnÃ software znamenÃ¡ uplatÅovÃ¡nÃ moci. ZÃ¡kon oÂ copyrightu 
zaruÄuje
+vÂ dneÅ¡nÃ dobÄ tuto moc softwarovÃ½m vÃ½vojÃ¡ÅÅ¯m, takÅ¾e si pouze oni 
vybÃrajÃ
 pravidla, kterÃ½mi se pak musÃ ÅÃdit vÅ¡ichni ostatnÃ. RelativnÄ malÃ¡ 
skupina
-lidÃ ÅeÅ¡Ã zÃ¡kladnÃ rozhodnutÃ tÃ½kajÃcÃ se software za vÅ¡echny 
ostatnÃ a to
+lidÃ ÅeÅ¡Ã zÃ¡kladnÃ rozhodnutÃ tÃ½kajÃcÃ se software za vÅ¡echny 
ostatnÃ aÂ to
 zpravidla odebrÃ¡nÃm jejich svobody. Pokud uÅ¾ivatelÃ© postrÃ¡dajÃ svobody,
 kterÃ© definuje svobodnÃ½ software, nemohou ÅÃci, jak software pracuje,
-nemohou nachÃ¡zet chyby v ochrannÃ½ch systÃ©mech, monitorovat moÅ¾nÃ© viry a
-wormy, ani nezjistÃ, jakÃ© osobnÃ informace jsou odesÃlÃ¡ny ven (pÅÃpadnÄ
-nemohou odesÃlÃ¡nÃ zabrÃ¡nit, pÅestoÅ¾e to zjistÃ). Dojde-li k problÃ©mu,
-nemohou jej opravit. MusÃ Äekat, aÅ¾ vÃ½vojÃ¡Å vyuÅ¾ije svou moc a udÄlÃ¡
-to. Pokud to jednoduÅ¡e nenÃ to, co potÅebujÃ, nic s tÃm nenadÄlajÃ. 
Nemohou
+zkoumat, zda neobsahuje zadnÃ vrÃ¡tka, nemohou monitorovat moÅ¾nÃ© viry
+aÂ Äervy, ani nezjistÃ, jakÃ© osobnÃ informace jsou odesÃlÃ¡ny ven 
(pÅÃpadnÄ
+nemohou odesÃlÃ¡nÃ zabrÃ¡nit, pÅestoÅ¾e to zjistÃ). Dojde-li kÂ problÃ©mu,
+nemohou jej opravit. MusÃ Äekat, aÅ¾ vÃ½vojÃ¡Å vyuÅ¾ije svou moc aÂ udÄlÃ¡
+to. Pokud to jednoduÅ¡e nenÃ to, co potÅebujÃ, nic sÂ tÃm nenadÄlajÃ. 
Nemohou
 si pomÃ¡hat vlastnÃmi vylepÅ¡enÃmi.</p>
 
 <p>
@@ -79,13 +75,13 @@
 svobodou.</p>
 
 <p>
-Diskuse o prÃ¡vech a pravidlech tÃ½kajÃcÃch se software se Äasto 
soustÅeÄujÃ
+Diskuse o prÃ¡vech a pravidlech tÃ½kajÃcÃch se softwaru se Äasto 
soustÅeÄujÃ
 na zÃ¡jmy samotnÃ½ch programÃ¡torÅ¯. Na svÄtÄ vÅ¡ak pravidelnÄ programuje 
jen
-mÃ¡lo lidÃ a jeÅ¡tÄ mÃ©nÄ jich vlastnÃ komerÄnÃ proprietÃ¡rnÃ firmu. 
Software
-dnes pouÅ¾ÃvÃ¡ a potÅebuje celÃ½ rozvinutÃ½ svÄt, takÅ¾e vÃ½vojÃ¡Åi nynÃ 
kontrolujÃ
-zpÅ¯sob, jakÃ½m svÄt Å¾ije, obchoduje, komunikuje a bavÃ se. Slogan 
âsvoboda
-vÃ½bÄru (pouze pro vÃ½vojÃ¡Åe)â zkrÃ¡tka etickÃ© a politickÃ© problÃ©my 
spojenÃ© se
-software neÅeÅ¡Ã.</p>
+mÃ¡lo lidÃ a jeÅ¡tÄ mÃ©nÄ jich vlastnÃ firmu vyvÃjejÃcÃ proprietÃ¡rnÃ
+software. Software dnes pouÅ¾ÃvÃ¡ a potÅebuje celÃ½ rozvinutÃ½ svÄt, takÅ¾e
+vÃ½vojÃ¡Åi nynÃ ovlÃ¡dajÃ zpÅ¯sob, jakÃ½m svÄt Å¾ije, obchoduje, 
komunikuje a bavÃ
+se. Slogan âsvoboda vÃ½bÄru (pouze pro vÃ½vojÃ¡Åe)â zkrÃ¡tka etickÃ© a 
politickÃ©
+problÃ©my spojenÃ© se softwarem neÅeÅ¡Ã.</p>
 
 <p>
 Je-li âzdrojovÃ½ kÃ³d zÃ¡konemâ, <a href="#f1">(1)</a> stojÃme pÅed 
nÃ¡sledujÃcÃ
@@ -165,7 +161,7 @@
 ÄlÃ¡nku.</p>
 </div>
 
-<p>Copyright &copy; 2001 Bradley M. Kuhn and Richard M. Stallman</p>
+<p>Copyright &copy; 2001, 2009 Bradley M. Kuhn and Richard M. Stallman</p>
 
 <p>DoslovnÃ© kopÃrovÃ¡nÃ a Å¡ÃÅenÃ tohoto dokumentu bez licenÄnÃho 
poplatku na
 jakÃ©mkoli mÃ©diu je dovoleno pod podmÃnkou, Å¾e bude zachovÃ¡no toto
@@ -180,7 +176,7 @@
 <p class="unprintable"><!-- timestamp start -->
 AktualizovÃ¡no:
 
-$Date: 2017/02/01 17:03:11 $
+$Date: 2020/07/15 09:31:55 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/self-interest.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/self-interest.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/self-interest.zh-cn.html 20 Apr 2018 14:29:14 -0000      1.4
+++ philosophy/self-interest.zh-cn.html 15 Jul 2020 09:31:55 -0000      1.5
@@ -1,38 +1,38 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/self-interest.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.92 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>å©å·±ä¸»ä¹ - GNUå·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
 
 <!--#include virtual="/philosophy/po/self-interest.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<div class="reduced-width">
 <h2>å©å·±ä¸»ä¹</h2>
 
-<p><strong>Loyd Fueston</strong> è</p>
+<p class="byline">Loyd Fueston è</p>
+<hr class="thin" />
 
+<div class="article">
 <p>
 å©å·±ä¸»ä¹è¶³å¤ç»ç»ä¸ä¸ªèªç±ç»æµåï¼</p>
 
 <p>
 
åçå°æ¯ï¼&ldquo;ä¸è½&rdquo;ãèä¸ï¼æ²¡æä¸ä¸ªç¥åçèªç±å¸åºçè®ºæ¹é¢çä¸å®¶ä¼è®¤ä¸ºå©å·±ä¸»ä¹æ¾ç»ãçè³æå¯è½è¶³ä»¥ç»ç»èªç±ç»æµï¼ææ¯å°å®ç»´æä¸æ®µæ¶é´ãå¨è¿äºçè®ºå®¶ä¸ï¼äºå½ï¼æ¯å¯ç»å¸¸è¢«è®¤ä¸ºæ¯å©å·±ä¸»ä¹çä¸»è¦å«éå£«ãä½æ¯å¨ä¸æ¬ç¨æ¥çº
 æ£å¯¹å
¶æä¹çè¯¯è§£çä¹¦ä¸ï¼æä»¬çå°äºå¯¹ä»çå©å·±ä¸»ä¹è§ç¹çå¦ä¸ç»¼è¿°ï¼</p>
 
-<blockquote><p>
+<blockquote class="italic"><p>
 ä¸æä¸ºä¸ªäººä¸»ä¹è
ç¸æ¯ï¼æ¯å¯è®¤ä¸ºæ¯ç¤¾ä¼çå½±åå°äººè½¬åä¸ºéå¾·ççç©ãä»è®¤ä¸ºäººä»¬ç»å¸¸é«ä¼°äºèªå·±çä¸ªäººå©çã
 </p></blockquote>
 
 <p>
 çè³è¿ææ´å¤ç´æ¥çè®ºè¿°ï¼</p>
 
-<blockquote><p>
-[äºå½ï¼æ¯å¯]è®¤ä¸ºåºäºå©å·±ä¸»ä¹æ¥è§£éäººç±»è¡ä¸ºçå°è¯æ¯åæä¸çè¢«è¯¯å¯¼ï¼å¹¶ä¸å¨éå¾·ä¸æ¯æå®³çã
+<blockquote class="italic"><p>
+[äºå½ï¼æ¯å¯]è®¤ä¸ºåºäºå©å·±ä¸»ä¹æ¥è§£éäººç±»è¡ä¸ºçå°è¯æ¯åæä¸çè¢«è¯¯å¯¼ï¼å¹¶ä¸å¨éå¾·ä¸æ¯æå®³çã<a
 href="#fn1">[1]</a>
 </p></blockquote>
 
 <p>
-[ä¸¤æçå¼èªJerry Z. 
Mullerç&ldquo;äºå½ï¼æ¯å¯ï¼ä»ä¸æä»¬çæ¶ä»£&rdquo;ï¼ç¬¬2é¡µï¼æ®ææ¯é¡¿ï¼æ®ææ¯é¡¿å¤§å¦åºçç¤¾ï¼1993ã]</p>
-
-<p>
 
äºå½ï¼æ¯å¯æ¾ç¶æè¯å°ï¼å©å·±ä¸»ä¹å¨ä»»ä½ç¤¾ä¼ä¸é½æ¯ç»ç»ç»æµæ´»å¨çé¦è¦åéä¹ä¸ï¼æ
 
è®ºå¨ç¸å¯¹èªç±å¼æ¾çç¤¾ä¼ä¸ï¼è¿æ¯å¨æåè¿«çè³æ¯ææ®æ´çç¤¾ä¼ä¸ãæä»¬å¤§å¤æ°äººé½ä¸ä¼åæ¬¢ç¼ºä¹å¯¹ä»äººå°æ¬çå©å·±ä¸»ä¹é
 æçåæãæ¯å¦å½ä¸ï¼èèå±äº§ååèèåäºåæ
æ¥æºæçå¤´å¤´ä»¬ï¼å¨åå±ä¸ªäººå©ççåæ¶ï¼æèèå¸¦å°äºå¯¹äººæ°ä¸å©çå¢å°ï¼è³å°æç
§ä»ä»¬å¯¹å©çççè§£æ¥è¯´æ¯è¿æ ·ã</p>
 <p>
 
é£äºç¾å½äººæ°æ¯èèäººæ°å¤å¾å°è¿çå¥½å¤ï¼ä»¥åæä»¬ç°å¨è¿æçãè¶
è¿æè°çä¿ç½æ¯åå¶ä»ä¸æ¬§å½å®¶çèªç±å
¬æ°çä¼å¿ï¼æ¥èªä¸ä¸ªç¤¾ä¼ï¼è¯¥ç¤¾ä¼ç»ç»å
è®¸å¤§å¤æ°ç¾å½äººè¡äºæ¶æ»¡è¶³ä¸ªäººå©çï¼åæ¶åä¸èç¦»åå®çéå¾·ååãä¸ä»
æä»¬çé£ä¿ä¹ 
æ¯ï¼èä¸æä»¬çæ£ç¡®æ³å¾&mdash;æ¯å¦è¯´é£äºå¯¹çæçè§å®&mdash;é½è¿å

¥å°æä»¬çç¤¾ä¼ç»ç»ä¸ï¼å®ä»¬æå¥½æåï¼ä½ç»ä¸æ¯éå¾·ä¸ç«ã</p>
@@ -44,16 +44,28 @@
 ææ¶åï¼å¥½äººä¼è®¤ä¸ºäºæ
åºäºå·®éï¼å¹¶å¼å§ä¸ºäºæä¸ªéå¾·ååèææï¼å³ä½¿æ¯æå¿
è¦çºç²æè
è³å°æ¯éå¶ä»ä»¬èªå·±çä¸ªäººå©çãç¨å½ä»£çèªç±å¸åºçè®ºå®¶Thomas
 Sowellçè¯æ¥è¯´ï¼</p>
 
-<blockquote><p>
-ä¸çä¸å½ç¶åå¨éç»æµçä»·å¼ãå®é
ä¸ï¼<em>åª</em>åå¨éç»æµçä»·å¼ãç»æµæ¬èº«ä¸æ¯ä»·å¼ï¼åªæ¯ä¸ç§ä»·å¼äº¤æ¢çææ®µãå¦ææå
³&lsquo;éç»æµä»·å¼&rsquo;ï¼æèæ´å
·ä½å°è¯´ï¼æ¯&lsquo;ç¤¾ä¼ä»·å¼&rsquo;æ&lsquo;äººç±»ä»·å¼&rsquo;ï¼çè®ºæï¼æ¯ä¸ºäºå¦è®¤è´¸æçå
å¨çå®æ§ï¼ææ¯ä¸ºäºå
é¤è´¸æè¿ç¨ä¸çä¸äºç¹æ®çä»·å¼ï¼é£ä¹è¿ç§æ 
ç§ççæ³åªæéè¿ä¸ºå
¶è·å©çäº¤ææè½æ´ææå°ä½ç°åºæ¥ãè¿å°±æ¯ç»æµçè´¸æã<tt>[å¼èªThomas
-Sowell&ldquo;ç¥è¯ä¸éæ©&rdquo;ç¬¬79é¡µï¼New Yorkï¼Basic 
Booksï¼1980ã]</tt>
+<blockquote class="italic"><p>
+ä¸çä¸å½ç¶åå¨éç»æµçä»·å¼ãå®é
ä¸ï¼<em>åª</em>åå¨éç»æµçä»·å¼ãç»æµæ¬èº«ä¸æ¯ä»·å¼ï¼åªæ¯ä¸ç§ä»·å¼äº¤æ¢çææ®µãå¦ææå
³&lsquo;éç»æµä»·å¼&rsquo;ï¼æèæ´å
·ä½å°è¯´ï¼æ¯&lsquo;ç¤¾ä¼ä»·å¼&rsquo;æ&lsquo;äººç±»ä»·å¼&rsquo;ï¼çè®ºæï¼æ¯ä¸ºäºå¦è®¤è´¸æçå
å¨çå®æ§ï¼ææ¯ä¸ºäºå
é¤è´¸æè¿ç¨ä¸çä¸äºç¹æ®çä»·å¼ï¼é£ä¹è¿ç§æ 
ç§ççæ³åªæéè¿ä¸ºå
¶è·å©çäº¤ææè½æ´ææå°ä½ç°åºæ¥ãè¿å°±æ¯ç»æµçè´¸æã<a
+href="#fn2">[2]</a>
 </p></blockquote>
 
 <p>
 å¨ä¸ä¸æä¸ï¼Sowellææå¹¶ä¸æ¯å¨åå¯¹é£äºä¸ºå©å·±ä¸»ä¹è¾å
¥éå¾·åéçäººï¼èæ¯å¨åå¯¹é£äºè®¤ä¸ºåå¨ä¸æ¡è½è½»ææ¹åæéå¾·ç¼ºé·çç¤¾ä¼çéè·¯çäººãä»ä»¬æ¯ä¸ä¸ªç¡¬å¸çä¸¤é¢&mdash;ç»´æ¤ä¸ªäººå©çå¯è½ä¼è®©äººé·å

¥ä¸éå¾·ä»·å¼çå²çªï¼èå°è¯ç»´æ¤éå¾·ä»·å¼åä¼å¯¼è´ä¸äºä¸ªäººå©çççºç²ã</p>
 <p>
 å©å·±ä¸»ä¹å¯ä»¥æ¯ç¤¾ä¼çå¼ºå²çæï¼è³å°å½ç¤¾ä¼å
¬æ°æ¯ç»è¿è¯å¥½æè²çä¸ªä½æ¶æ¯å¦æ¤ï¼ä½æ¯å©å·±ä¸»ä¹æ²¡ä»ä¹ç¥å¥æç¥ç§çç¹æ§è½ä¿è¯éå¾·çåæãå©å·±ä¸»ä¹äº§ççä¸è¬æ§éå¾·åæï¼åªè½è¾¾å°å¤é¨çãæ´å¤æ¯å
é¨çéå¾·çº¦æè½å¤æå¼è¯¥å©çå¢ä½è¡å¨çèå´ãä¸ä¸ªå
·æè¯å¥½çº¦æçç¤¾ä¼å¹¶ä¸é éæ¯èåå¨ï¼èæ¯é çç¼æ´é«ç®æ 
çäººä»¬çè¡å¨ï¼æ 
è®ºæ¯å¯¹æ´ä¸ªç¤¾ä¼èªç±çä¿æ¤ï¼è¿æ¯å¯¹ç¨åºåç¤¾åºåä½ç²¾ç¥çä¿çï¼äº¦ææ¯äºè
å¼èæä¹ã</p>
+</div>
 
+<div class="infobox">
+<h3>èæ³¨</h3>
+<ol>
+ <li id="fn1">[ä¸¤æçå¼èª Jerry Z. Muller
+ç&ldquo;äºå½ï¼æ¯å¯ï¼ä»ä¸æä»¬çæ¶ä»£&rdquo;ï¼ç¬¬2é¡µï¼æ®ææ¯é¡¿ï¼æ®ææ¯é¡¿å¤§å¦åºçç¤¾ï¼1993ã]</li>
+ <li id="fn2">å¼èª &ldquo;Knowledge &amp; Decisions&rdquo; ç¬¬ 79 
é¡µï¼Thomas Sowell, New York:
+Basic Books, 1980ã</li>
+</ol>
+</div>
+
+</div>
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -117,12 +129,12 @@
 href="mailto:bbbush@163.com";>&lt;bbbush@163.com&gt;</a><br></br>
 <b>å®¡æ ¡</b>ï¼é©¬éªè<br></br>
 <b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>ï¼2018ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>ï¼2018ï¼2020ã</div>
 
 <p class="unprintable"><!-- timestamp start -->
 æåæ´æ°ï¼
 
-$Date: 2018/04/20 14:29:14 $
+$Date: 2020/07/15 09:31:55 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/shouldbefree.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/shouldbefree.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/shouldbefree.zh-cn.html  15 Dec 2018 14:46:29 -0000      1.7
+++ philosophy/shouldbefree.zh-cn.html  15 Jul 2020 09:31:56 -0000      1.8
@@ -188,9 +188,8 @@
 
 <h4 id="does-not-matter-how">éå¶åäº«çæ¹å¼æ å³ç´§è¦</h4>
 <p>
-   æä¸ç´å¨è®¨è®ºé»æ¢äººä»¬å¤å¶ãä¿®æ¹åæå»ºç¨åºé 
æçå½±åãæå¹¶æ²¡æå·ä½æåºè¿ç§é»ç¢æ¯å¦ä½å®è¡çï¼å 
ä¸ºé£ä¸å½±åç»è®ºãæ è®ºæ¯æ·è´ä¿æ¤ãçæãè®¸å¯è¯ãå 
å¯ã<acronym
-title="Read-only
-Memory">åªè¯»å
å</acronym>å¡ï¼è¿æ¯ç¡¬ä»¶åºåå·ï¼åªè¦å®<em>æåå°</em>é»æ¢ä½¿ç¨ï¼å®å°±ææäºå±å®³ã</p>
+   æä¸ç´å¨è®¨è®ºé»æ¢äººä»¬å¤å¶ãä¿®æ¹åæå»ºç¨åºé 
æçå½±åãæå¹¶æ²¡æå·ä½æåºè¿ç§é»ç¢æ¯å¦ä½å®è¡çï¼å 
ä¸ºé£ä¸å½±åç»è®ºãæ è®ºæ¯æ·è´ä¿æ¤ãçæãè®¸å¯è¯ãå 
å¯ã<abbr
+title="Read-only Memory">åªè¯»å
å</abbr>å¡ï¼è¿æ¯ç¡¬ä»¶åºåå·ï¼åªè¦å®<em>æåå°</em>é»æ¢ä½¿ç¨ï¼å®å°±ææäºå±å®³ã</p>
 <p>
    ç¨æ·ä¼è§å¾å
¶ä¸æäºæ¹æ³æ¯å¦å¤ä¸äºæ´ä»¤äººè®¨åãæè®¤ä¸ºæéæ¨çæ¹æ³æ¯é£äºè¾¾å°ç®ççæ¹æ³ã</p>
 
@@ -379,8 +378,8 @@
 è¥æ¨æ³ç¿»è¯æ¬æï¼è¯·åç<a 
href="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>ã</p>
 </div>
 
-<p>Copyright &copy; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017, 2018
-Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017, 2018,
+2020 Free Software Foundation, Inc.</p>
 
 <p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -393,12 +392,12 @@
 <b>ç¿»è¯</b>ï¼çæåï¼2011ã<a
 
href="mailto:liangmeng@tsinghua.org";>&lt;liangmeng@tsinghua.org&gt;</a><br></br>
 <b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>ï¼2018ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>ï¼2018ï¼2020ã</div>
 
 <p class="unprintable"><!-- timestamp start -->
 æåæ´æ°ï¼
 
-$Date: 2018/12/15 14:46:29 $
+$Date: 2020/07/15 09:31:56 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/15-years-of-free-software.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/15-years-of-free-software.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/15-years-of-free-software.zh-cn-en.html       19 Jul 2018 
13:01:05 -0000      1.1
+++ philosophy/po/15-years-of-free-software.zh-cn-en.html       15 Jul 2020 
09:31:56 -0000      1.2
@@ -59,7 +59,7 @@
   Torvalds. Today, the combination of GNU and Linux is used by
   millions of people around the world, and its popularity is
   growing. This month, we announced release 1.0 of 
-  <acronym title="GNU Network Object Model Environment">GNOME</acronym>, 
+  <abbr title="GNU Network Object Model Environment">GNOME</abbr>, 
   the GNU graphical desktop, which we hope will make the GNU/Linux
   system as easy to use as any other operating system.
 </p>
@@ -114,7 +114,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
@@ -129,17 +129,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1999, 2014 Richard M. Stallman</p>
+<p>Copyright &copy; 1999, 2014, 2020 Richard M. 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: 2018/07/19 13:01:05 $
+$Date: 2020/07/15 09:31:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/15-years-of-free-software.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/15-years-of-free-software.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/15-years-of-free-software.zh-cn.po    15 Jul 2020 09:17:41 
-0000      1.5
+++ philosophy/po/15-years-of-free-software.zh-cn.po    15 Jul 2020 09:31:56 
-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: 2020-07-01 14:25+0000\n"
 
 #. type: Content of: <title>
 msgid "15 Years of Free Software - GNU Project - Free Software Foundation"

Index: philosophy/po/amazon-rms-tim.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/amazon-rms-tim.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/amazon-rms-tim.zh-cn-en.html  15 Jun 2020 09:31:45 -0000      
1.1
+++ philosophy/po/amazon-rms-tim.zh-cn-en.html  15 Jul 2020 09:31:56 -0000      
1.2
@@ -9,7 +9,7 @@
 <p>
 Here's a message that <a href="http://www.stallman.org/";>Richard
 M. Stallman</a> sent to Tim O'Reilly on March 11, 2000, in regard to
-the statement by Jeff Bezos, <acronym title="Chief Executive 
Officer">CEO</acronym> 
+the statement by Jeff Bezos, <abbr title="Chief Executive Officer">CEO</abbr> 
 of Amazon, which called for software patents to last just 3 or 5 years.</p>
 
 <p>
@@ -93,7 +93,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
@@ -108,17 +108,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1999, 2007, 2008, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1999, 2007, 2008, 2014, 2020 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/15 09:31:45 $
+$Date: 2020/07/15 09:31:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/amazon-rms-tim.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/amazon-rms-tim.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/amazon-rms-tim.zh-cn.po       15 Jul 2020 07:34:00 -0000      
1.4
+++ philosophy/po/amazon-rms-tim.zh-cn.po       15 Jul 2020 09:31:56 -0000      
1.5
@@ -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: 2020-07-04 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""

Index: philosophy/po/amazon.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/amazon.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/amazon.zh-cn-en.html  5 Jun 2020 03:59:21 -0000       1.1
+++ philosophy/po/amazon.zh-cn-en.html  15 Jul 2020 09:31:56 -0000      1.2
@@ -182,8 +182,8 @@
 <p>
 <a href="http://www.stallman.org/";>Richard M. Stallman</a> has written a
 <a href="/philosophy/amazon-rms-tim.html">letter to Tim O'Reilly</a>
-in regard to the statement by Jeff Bezos, <acronym title="Chief
-Executive Officer">CEO</acronym> of Amazon, which called for software
+in regard to the statement by Jeff Bezos, <abbr title="Chief
+Executive Officer">CEO</abbr> of Amazon, which called for software
 patents to last just 3 or 5 years.</p>
 
 <p>
@@ -261,7 +261,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1999, 2001, 2007, 2008, 2013, 2014, 2015, 2018, 2019
+<p>Copyright &copy; 1999, 2001, 2007, 2008, 2013, 2014, 2015, 2018, 2019, 2020
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -272,7 +272,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/06/05 03:59:21 $
+$Date: 2020/07/15 09:31:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/amazon.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/amazon.zh-cn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/amazon.zh-cn.po       15 Jul 2020 07:33:19 -0000      1.3
+++ philosophy/po/amazon.zh-cn.po       15 Jul 2020 09:31:56 -0000      1.4
@@ -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: 2020-07-01 15:25+0000\n"
 
 #. type: Content of: <title>
 msgid "(Formerly) Boycott Amazon! - GNU Project - Free Software Foundation"

Index: philosophy/po/dat.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/dat.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/dat.zh-cn-en.html     24 Jan 2018 12:33:20 -0000      1.1
+++ philosophy/po/dat.zh-cn-en.html     15 Jul 2020 09:31:56 -0000      1.2
@@ -31,7 +31,7 @@
 solutions; that is to say, I favor adopting either one.]</em></p>
 
 <p>Record company magnates don't like the digital audio tape recorder
-(<acronym title="Digital Audio Tape">DAT</acronym>), which can make
+(<abbr title="Digital Audio Tape">DAT</abbr>), which can make
 perfect copies of musical recordings.  They fear that customers will
 copy music themselves, and stop buying prerecorded music.</p>
 
@@ -244,7 +244,7 @@
 
 <p>The US government has already established a program to fund
 diversity in the arts: the 
-<acronym title="National Endowment for the Arts">NEA</acronym>.
+<abbr title="National Endowment for the Arts">NEA</abbr>.
 However, NEA grants involve discretionary power, which makes them a
 center for controversy, sometimes because a few members of the public
 strongly dislike the work, and sometimes because hardly anyone
@@ -390,17 +390,17 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 1992, 2010, 2014 Richard M. Stallman</p>
+<p>Copyright &copy; 1992, 2010, 2014, 2020 Richard M. 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: 2018/01/24 12:33:20 $
+$Date: 2020/07/15 09:31:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/dat.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/dat.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/dat.zh-cn.po  15 Jul 2020 07:34:32 -0000      1.5
+++ philosophy/po/dat.zh-cn.po  15 Jul 2020 09:31:56 -0000      1.6
@@ -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: 2020-07-01 15:25+0000\n"
 
 #. type: Content of: <title>
 msgid "The Right Way to Tax DAT - GNU Project - Free Software Foundation"

Index: philosophy/po/freedom-or-power.cs.po
===================================================================
RCS file: /web/www/www/philosophy/po/freedom-or-power.cs.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/freedom-or-power.cs.po        15 Jul 2020 08:19:24 -0000      
1.2
+++ philosophy/po/freedom-or-power.cs.po        15 Jul 2020 09:31:56 -0000      
1.3
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2009-09-27 02:20+0000\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Lokalize 2.0\n"
 
@@ -29,8 +28,8 @@
 "GNU, FSF, Free Software Foundation, Linux, general, public, license, gpl, "
 "general public license, freedom, software, power, rights"
 msgstr ""
-"GNU, FSF, Nadace pro svobodnÃ½ software , Linux, obecnÃ©, veÅejnost, 
licence,"
-" gpl, general public license, svoboda, software, moc, prÃ¡va"
+"GNU, FSF, Nadace pro svobodnÃ½ software , Linux, obecnÃ©, veÅejnost, 
licence, "
+"gpl, general public license, svoboda, software, moc, prÃ¡va"
 
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -38,9 +37,9 @@
 "discuss the reasons that the free software movement doesn't advocate the so-"
 "called freedom to choose any license you want for software you write."
 msgstr ""
-"V eseji âSvoboda Äi moc?â diskutujÃ Bradley M. Kuhn a Richard M. 
Stallman o"
-" dÅ¯vodech, proÄ hnutÃ svobodnÃ©ho software neprosazuje takzvanou svobodu"
-" vÃ½bÄru jakÃ©koli licence pro software, kterÃ½ pÃÅ¡ete."
+"V eseji âSvoboda Äi moc?â diskutujÃ Bradley M. Kuhn a Richard M. 
Stallman o "
+"dÅ¯vodech, proÄ hnutÃ svobodnÃ©ho software neprosazuje takzvanou svobodu "
+"vÃ½bÄru jakÃ©koli licence pro software, kterÃ½ pÃÅ¡ete."
 
 #. type: Content of: <h2>
 msgid "Freedom or Power?"
@@ -118,30 +117,6 @@
 "svobodou, selÅ¾eme pÅi podporovÃ¡nÃ opravdovÃ© svobody."
 
 #. type: Content of: <p>
-# | [-Proprietary software-]{+Making a program proprietary+} is an exercise of
-# | power.  Copyright law today grants software developers that power, so they
-# | and only they choose the rules to impose on everyone else&mdash;a
-# | relatively [-few-] {+small number of+} people make the basic software
-# | decisions for [-everyone,-] {+all users,+} typically by denying their
-# | freedom.  When users lack the freedoms that define free software, they
-# | can't tell what the software is doing, can't check for back doors, can't
-# | monitor possible viruses and worms, can't find out what personal
-# | information is being reported (or stop the reports, even if they do find
-# | out).  If it breaks, they can't fix it; they have to wait for the
-# | developer to exercise its power to do so.  If it simply isn't quite what
-# | they need, they are stuck with it.  They can't help each other improve it.
-#| msgid ""
-#| "Proprietary software is an exercise of power.  Copyright law today grants "
-#| "software developers that power, so they and only they choose the rules to "
-#| "impose on everyone else&mdash;a relatively few people make the basic "
-#| "software decisions for everyone, typically by denying their freedom.  "
-#| "When users lack the freedoms that define free software, they can't tell "
-#| "what the software is doing, can't check for back doors, can't monitor "
-#| "possible viruses and worms, can't find out what personal information is "
-#| "being reported (or stop the reports, even if they do find out).  If it "
-#| "breaks, they can't fix it; they have to wait for the developer to "
-#| "exercise its power to do so.  If it simply isn't quite what they need, "
-#| "they are stuck with it.  They can't help each other improve it."
 msgid ""
 "Making a program proprietary is an exercise of power.  Copyright law today "
 "grants software developers that power, so they and only they choose the "
@@ -155,18 +130,18 @@
 "its power to do so.  If it simply isn't quite what they need, they are stuck "
 "with it.  They can't help each other improve it."
 msgstr ""
-"ProprietÃ¡rnÃ software znamenÃ¡ uplatÅovÃ¡nÃ moci. ZÃ¡kon oÂ copyrightu 
zaruÄuje"
-" vÂ dneÅ¡nÃ dobÄ tuto moc softwarovÃ½m vÃ½vojÃ¡ÅÅ¯m, takÅ¾e si pouze oni 
vybÃrajÃ"
-" pravidla, kterÃ½mi se pak musÃ ÅÃdit vÅ¡ichni ostatnÃ. RelativnÄ malÃ¡ 
skupina"
-" lidÃ ÅeÅ¡Ã zÃ¡kladnÃ rozhodnutÃ tÃ½kajÃcÃ se software za vÅ¡echny 
ostatnÃ aÂ to"
-" zpravidla odebrÃ¡nÃm jejich svobody. Pokud uÅ¾ivatelÃ© postrÃ¡dajÃ 
svobody,"
-" kterÃ© definuje svobodnÃ½ software, nemohou ÅÃci, jak software pracuje,"
-" zkoumat, zda neobsahuje zadnÃ vrÃ¡tka, nemohou monitorovat moÅ¾nÃ© viry"
-" aÂ Äervy, ani nezjistÃ, jakÃ© osobnÃ informace jsou odesÃlÃ¡ny ven 
(pÅÃpadnÄ"
-" nemohou odesÃlÃ¡nÃ zabrÃ¡nit, pÅestoÅ¾e to zjistÃ). Dojde-li kÂ 
problÃ©mu,"
-" nemohou jej opravit. MusÃ Äekat, aÅ¾ vÃ½vojÃ¡Å vyuÅ¾ije svou moc aÂ 
udÄlÃ¡ to."
-" Pokud to jednoduÅ¡e nenÃ to, co potÅebujÃ, nic sÂ tÃm nenadÄlajÃ. 
Nemohou si"
-" pomÃ¡hat vlastnÃmi vylepÅ¡enÃmi."
+"ProprietÃ¡rnÃ software znamenÃ¡ uplatÅovÃ¡nÃ moci. ZÃ¡kon oÂ copyrightu 
zaruÄuje "
+"vÂ dneÅ¡nÃ dobÄ tuto moc softwarovÃ½m vÃ½vojÃ¡ÅÅ¯m, takÅ¾e si pouze oni 
vybÃrajÃ "
+"pravidla, kterÃ½mi se pak musÃ ÅÃdit vÅ¡ichni ostatnÃ. RelativnÄ malÃ¡ 
skupina "
+"lidÃ ÅeÅ¡Ã zÃ¡kladnÃ rozhodnutÃ tÃ½kajÃcÃ se software za vÅ¡echny 
ostatnÃ aÂ to "
+"zpravidla odebrÃ¡nÃm jejich svobody. Pokud uÅ¾ivatelÃ© postrÃ¡dajÃ svobody, 
"
+"kterÃ© definuje svobodnÃ½ software, nemohou ÅÃci, jak software pracuje, "
+"zkoumat, zda neobsahuje zadnÃ vrÃ¡tka, nemohou monitorovat moÅ¾nÃ© viry "
+"aÂ Äervy, ani nezjistÃ, jakÃ© osobnÃ informace jsou odesÃlÃ¡ny ven 
(pÅÃpadnÄ "
+"nemohou odesÃlÃ¡nÃ zabrÃ¡nit, pÅestoÅ¾e to zjistÃ). Dojde-li kÂ 
problÃ©mu, "
+"nemohou jej opravit. MusÃ Äekat, aÅ¾ vÃ½vojÃ¡Å vyuÅ¾ije svou moc aÂ 
udÄlÃ¡ to. "
+"Pokud to jednoduÅ¡e nenÃ to, co potÅebujÃ, nic sÂ tÃm nenadÄlajÃ. 
Nemohou si "
+"pomÃ¡hat vlastnÃmi vylepÅ¡enÃmi."
 
 #. type: Content of: <p>
 msgid ""
@@ -187,23 +162,6 @@
 "svobodou."
 
 #. type: Content of: <p>
-# | Discussions of rights and rules for software have often concentrated on
-# | the interests of programmers alone.  Few people in the world program
-# | regularly, and fewer still are owners of proprietary software businesses.
-# | But the entire developed world now needs and uses software, so software
-# | developers now control the way [-the world-] {+it+} lives, does business,
-# | communicates, and is entertained.  The ethical and political issues are
-# | not addressed by the slogan of &ldquo;freedom of choice (for developers
-# | only).&rdquo;
-#| msgid ""
-#| "Discussions of rights and rules for software have often concentrated on "
-#| "the interests of programmers alone.  Few people in the world program "
-#| "regularly, and fewer still are owners of proprietary software "
-#| "businesses.  But the entire developed world now needs and uses software, "
-#| "so software developers now control the way the world lives, does "
-#| "business, communicates, and is entertained.  The ethical and political "
-#| "issues are not addressed by the slogan of &ldquo;freedom of choice (for "
-#| "developers only).&rdquo;"
 msgid ""
 "Discussions of rights and rules for software have often concentrated on the "
 "interests of programmers alone.  Few people in the world program regularly, "
@@ -215,12 +173,11 @@
 msgstr ""
 "Diskuse o prÃ¡vech a pravidlech tÃ½kajÃcÃch se softwaru se Äasto 
soustÅeÄujÃ "
 "na zÃ¡jmy samotnÃ½ch programÃ¡torÅ¯. Na svÄtÄ vÅ¡ak pravidelnÄ programuje 
jen "
-"mÃ¡lo lidÃ a jeÅ¡tÄ mÃ©nÄ jich vlastnÃ firmu vyvÃjejÃcÃ proprietÃ¡rnÃ 
software."
-" Software "
-"dnes pouÅ¾ÃvÃ¡ a potÅebuje celÃ½ rozvinutÃ½ svÄt, takÅ¾e vÃ½vojÃ¡Åi nynÃ 
ovlÃ¡dajÃ "
-"zpÅ¯sob, jakÃ½m svÄt Å¾ije, obchoduje, komunikuje a bavÃ se. Slogan 
âsvoboda "
-"vÃ½bÄru (pouze pro vÃ½vojÃ¡Åe)â zkrÃ¡tka etickÃ© a politickÃ© problÃ©my 
spojenÃ© se "
-"softwarem neÅeÅ¡Ã."
+"mÃ¡lo lidÃ a jeÅ¡tÄ mÃ©nÄ jich vlastnÃ firmu vyvÃjejÃcÃ proprietÃ¡rnÃ 
software. "
+"Software dnes pouÅ¾ÃvÃ¡ a potÅebuje celÃ½ rozvinutÃ½ svÄt, takÅ¾e 
vÃ½vojÃ¡Åi nynÃ "
+"ovlÃ¡dajÃ zpÅ¯sob, jakÃ½m svÄt Å¾ije, obchoduje, komunikuje a bavÃ se. 
Slogan "
+"âsvoboda vÃ½bÄru (pouze pro vÃ½vojÃ¡Åe)â zkrÃ¡tka etickÃ© a politickÃ© 
problÃ©my "
+"spojenÃ© se softwarem neÅeÅ¡Ã."
 
 #. type: Content of: <p>
 msgid ""
@@ -360,4 +317,3 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "AktualizovÃ¡no:"
-

Index: philosophy/po/self-interest.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/self-interest.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/self-interest.zh-cn-en.html   20 Apr 2018 14:29:14 -0000      
1.1
+++ philosophy/po/self-interest.zh-cn-en.html   15 Jul 2020 09:31:56 -0000      
1.2
@@ -1,13 +1,16 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.92 -->
 <title>Self-Interest
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/self-interest.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<div class="reduced-width">
 <h2>Self-Interest</h2>
 
-<p>by <strong>Loyd Fueston</strong></p>
+<p class="byline">by Loyd Fueston</p>
+<hr class="thin" />
 
+<div class="article">
 <p>
 Is Self-Interest Sufficient to Organize a Free Economy?</p>
 
@@ -21,7 +24,7 @@
 we find the following summaries of Smith's view about
 self-interest:</p>
 
-<blockquote><p>
+<blockquote class="italic"><p>
 Far from being an individualist, Smith believed it is the influence
 of society that transforms people into moral beings. He thought that
 people often misjudge their own self-interest.
@@ -30,18 +33,13 @@
 <p>
 Even more directly to the point:</p>
 
-<blockquote><p>
+<blockquote class="italic"><p>
 [Adam Smith] regarded the attempt to explain all human behavior on
 the basis of self-interest as analytically misguided and morally
-pernicious.
+pernicious.&nbsp;<a href="#fn1">[1]</a>
 </p></blockquote>
 
 <p>
-[Both quotes are from page 2 of &ldquo;Adam Smith: In His Time and
-Ours&rdquo;, Jerry Z. Muller, Princeton: Princeton University Press,
-1993.]</p>
-
-<p>
 As Adam Smith certainly realized, self-interest will be one of the
 principal forces organizing economic activities in any society, but
 that is as true of the most repressive or brutal society as it is of
@@ -99,7 +97,7 @@
 to sacrifice, or at least qualify, their own self-interest. In the
 words of Thomas Sowell, a free-market theorist of our time:</p>
 
-<blockquote><p>
+<blockquote class="italic"><p>
 There are, of course, noneconomic values.  Indeed, there are
 <em>only</em> noneconomic values. Economics is not a value itself but
 merely a method of trading off one value against another.  If
@@ -109,8 +107,7 @@
 or to exempt some particular value from the trade-off process, then
 such selfless ideals can be no more effectively demonstrated than by
 trading off financial gains in the interest of such ideals. This is an
-economic trade-off. <tt>[from page 79 of &ldquo;Knowledge &amp;
-Decisions&rdquo;, Thomas Sowell, New York: Basic Books, 1980.]</tt>
+economic trade-off.&nbsp;<a href="#fn2">[2]</a>
 </p></blockquote>
 
 <p>
@@ -133,7 +130,20 @@
 the preservation of liberty in the society as a whole or the
 preservation of a cooperative spirit within communities of
 programmers, or maybe both of those at the same time.</p>
+</div>
 
+<div class="infobox">
+<h3>Footnotes</h3>
+<ol>
+ <li id="fn1">Both quotes are from page 2 of &ldquo;Adam Smith: In His Time and
+Ours&rdquo;, Jerry Z. Muller, Princeton: Princeton University Press,
+1993.</li>
+ <li id="fn2">From page 79 of &ldquo;Knowledge &amp; Decisions&rdquo;,
+Thomas Sowell, New York: Basic Books, 1980.</li>
+</ol>
+</div>
+
+</div>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -191,7 +201,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/04/20 14:29:14 $
+$Date: 2020/07/15 09:31:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/self-interest.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/self-interest.zh-cn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/self-interest.zh-cn.po        15 Jul 2020 07:35:04 -0000      
1.3
+++ philosophy/po/self-interest.zh-cn.po        15 Jul 2020 09:31:56 -0000      
1.4
@@ -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: 2020-07-08 12:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Self-Interest - GNU Project - Free Software Foundation"
@@ -180,8 +179,8 @@
 "ä»·å¼ï¼åªæ¯ä¸ç§ä»·å¼äº¤æ¢çææ®µãå¦ææå
³&lsquo;éç»æµä»·å¼&rsquo;ï¼æèæ´å·ä½å°"
 
"è¯´ï¼æ¯&lsquo;ç¤¾ä¼ä»·å¼&rsquo;æ&lsquo;äººç±»ä»·å¼&rsquo;ï¼çè®ºæï¼æ¯ä¸ºäºå¦è®¤è´¸æ"
 "çåå¨çå®æ§ï¼ææ¯ä¸ºäºå
é¤è´¸æè¿ç¨ä¸çä¸äºç¹æ®çä»·å¼ï¼é£ä¹è¿ç§æ ç§ççæ³åªæ"
-"éè¿ä¸ºå
¶è·å©çäº¤ææè½æ´ææå°ä½ç°åºæ¥ãè¿å°±æ¯ç»æµçè´¸æã<a 
href="
-"\"#fn2\">[2]</a>"
+"éè¿ä¸ºå
¶è·å©çäº¤ææè½æ´ææå°ä½ç°åºæ¥ãè¿å°±æ¯ç»æµçè´¸æã<a 
href=\"#fn2\">"
+"[2]</a>"
 
 #. type: Content of: <div><div><p>
 msgid ""

Index: philosophy/po/shouldbefree.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/shouldbefree.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/shouldbefree.zh-cn-en.html    15 Dec 2018 14:46:42 -0000      
1.3
+++ philosophy/po/shouldbefree.zh-cn-en.html    15 Jul 2020 09:31:56 -0000      
1.4
@@ -459,7 +459,7 @@
 copying, changing, and building on a program.  I have not specified
 how this obstruction is carried out, because that doesn't affect the
 conclusion.  Whether it is done by copy protection, or copyright, or
-licenses, or encryption, or <acronym title="Read-only Memory">ROM</acronym>
+licenses, or encryption, or <abbr title="Read-only Memory">ROM</abbr>
 cards, or hardware serial numbers, if it <em>succeeds</em> in
 preventing use, it does harm.</p>
 <p>
@@ -866,7 +866,7 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017, 2018 
Free
+<p>Copyright &copy; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017, 
2018, 2020 Free
 Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -877,7 +877,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:42 $
+$Date: 2020/07/15 09:31:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/shouldbefree.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/shouldbefree.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/shouldbefree.zh-cn.po 15 Jul 2020 07:35:58 -0000      1.6
+++ philosophy/po/shouldbefree.zh-cn.po 15 Jul 2020 09:31:56 -0000      1.7
@@ -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: 2020-07-01 15:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Why Software Should Be Free - GNU Project - Free Software Foundation"

Index: proprietary/proprietary.zh-cn.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary.zh-cn.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- proprietary/proprietary.zh-cn.html  27 Jun 2020 04:59:06 -0000      1.9
+++ proprietary/proprietary.zh-cn.html  15 Jul 2020 09:31:56 -0000      1.10
@@ -84,7 +84,7 @@
 <hr class="thin" />
 </div>
 
-<p>æªè³ 2020 å¹´ 1 æï¼æ¤ç®å½çé¡µé¢ä¸ååºäºå¤§çº¦ 450 
ä¸ªæ¶æåè½å®ä¾ï¼æ 500 
å¤ä»½è¯æ®æ¯æï¼ï¼ä½æ¯è¯å®è¿ææ°åä¸ªæä»¬ä¸ç¥éæåµã</p>
+<p>æªè³ 2020 å¹´ 7 æï¼æ¤ç®å½çé¡µé¢ä¸ååºäºå¤§çº¦ 450 
ä¸ªæ¶æåè½å®ä¾ï¼æ 520 
å¤ä»½è¯æ®æ¯æï¼ï¼ä½æ¯è¯å®è¿ææ°åä¸ªæä»¬ä¸ç¥éæåµã</p>
 
 <table id="TOC">
  <tr>
@@ -160,6 +160,29 @@
 <h3 id="latest">ææ°æ·»å </h3>
 
 <ul class="blurbs">
+  <li id="M202007010">
+    <p>BMWï¼å®é©¬æ±½è½¦ï¼ä¼éè¿å¨å±åé¨è¿ç¨ <a
+href="https://www.cnet.com/roadshow/news/bmw-vehicle-as-a-platform/";>å¯ç¨æç¦ç¨æ±½è½¦çåè½</a>ã</p>
+  </li>
+
+  <li id="M202006300">
+    <p>&ldquo;Bossware&rdquo;æ¯èæ¿ä»¬ <a
+href="https://www.eff.org/deeplinks/2020/06/inside-invasive-secretive-bossware-tracking-workers";>å¼ºå¶åå·¥å¨çµèä¸å®è£
</a>
+çæ¶æè½¯ä»¶ï¼è¿æ ·èçä»¬å°±å¯ä»¥çè§åå·¥ã</p>
+
+    <p>è¿è¡¨æè¦æ±ç¨æ· &ldquo;åæ&rdquo;
+å¹¶ä¸æ¯ä¿æ¤æ°åéç§çåååºç¡ãèæ¿å 
ä¹å¯ä»¥å¼ºå¶å¤§å¤æ°åå·¥åæä»»ä½äºæï¼çè³æ¯ç´é¢è´å½çä¼ 
æçãè¿æ ·çè½¯ä»¶æ¯è¿æ³çï¼è¦æ±å®è£
è½¯ä»¶çèçåºè¯¥è¢«èµ·è¯ã</p>
+  </li>
+
+  <li id="M201504210">
+    <p>Runescape æ¯ä¸æ¬¾åæ¬¢è¿çå¨çº¿æ¸¸æãå®ç <a
+href="https://www.reddit.com/r/runescape/comments/33cd8g/question_why_is_runescape_so_addicting/";>æç¾è®¾è®¡</a>
+æ¥èª <a
+href="/proprietary/proprietary-addictions.html#addictiveness">è¡ä¸ºæ§å¶ææ¯</a>ãè¯¥æ¸¸ææäºéå¤æ§åè½ï¼æ¯å¦
+<a
+href="https://en.wikipedia.org/wiki/Grinding_(video_games)">ä¿®ç¼</a>ï¼å¯ä»¥éè¿æä¸ºä»è´¹ä¼ååå°é¾åº¦åæ¬¡æ°ï¼å
 æ¤è¿æ¯å¨é¼å±å¿ç«¥åèªæ§è½åå·®çäººå¨æ¸¸æä¸è±è´¹ã</p>
+  </li>
+
   <li id="M202006260">
     <p>å¤§å¤æ°çåºç¨é½æ¯æ¶æè½¯ä»¶ï¼ä½æ¯å·æ®çç«éåºç¨å 
Modi çç«éåºç¨ç±»ä¼¼ï¼æ¯ <a
 
href="https://www.technologyreview.com/2020/06/21/1004228/trumps-data-hungry-invasive-app-is-a-voter-surveillance-tool-of-extraordinary-scope/
@@ -174,27 +197,6 @@
 1988 å¹´çè§é¢éç§ä¿æ¤æ³æ¡ï¼Video Privacy Protection Actï¼ï¼è¿æ 
·åæ¶è¿æ³çï¼ä½æ¯ååä»¬éè¿ EULA<sup><a
 href="#TransNote1">1</a></sup> è®¾æ³è§é¿è¿å»äºã</p>
   </li>
-
-  <li id="M202006160">
-    <p><a
-href="https://www.wired.com/story/ripple20-iot-vulnerabilities/?bxid=5bd66d4c2ddf9c619437e4b8&amp;cndid=9608804&amp;esrc=Wired_etl_load&amp;source=EDT_WIR_NEWSLETTER_0_DAILY_ZZ&amp;utm_bran%5C";>ä¸ä¸ªç¾é¾æ§å®å
¨ç¼ºé·</a>
-æ³¢åæ°ç¾ä¸ Internet of Stings<sup><a href="#TransNote2">2</a></sup> 
äº§åã</p>
-
-    <p>å
¶åææ¯ï¼æ¯ä¸ªäººé½å¯ä»¥ä¼¤å®³ç¨æ·ï¼èå¹¶éåªæè®¾å¤å¶é 
åã</p>
-  </li>
-
-  <li id="M201909061">
-    <p>ç¾æä¹°ï¼Best Buyï¼å¶é äºä¸äºå¯æ§å·¥å·å´ <a
-href="https://www.theverge.com/2019/9/6/20853671/best-buy-connect-insignia-smart-plug-wifi-freezer-mobile-app-shutdown-november-6";>å
³åäºæå¡æ¥æ§å¶å®ä»¬</a>ã</p>
-
-    
<p>è½ç¶ç¾æä¹°èªå·±ä¹æè¯å°è¿æ¯å¯¹ç¨æ·çä¼¤å®³ââè¿ä¸ç¹å¼å¾èµæ¬ï¼ä½æ¯è¿å¹¶æ²¡ææ¹åæè®¾å¤åæå¡å¨ç»å®æ¯ç©å¼ç¨æ·çäºå®ï¼èè¿æ£æ¯è®¾å¤ä¸ä½¿ç¨éèªç±è½¯ä»¶çåæã</p>
-  </li>
-
-  <li id="M202005070">
-    <p>Wink éå®ä¸ç§ &ldquo;æºè½&rdquo; 
å®¶åºä¸å¿ï¼å®åæå¡å¨ç»å®ãå¨ 2020 å¹´ 5 æï¼Wink å½ä»¤è´ä¹°è
å¼å§ <a
-href="https://www.techhive.com/article/3542631/wink-users-revolt-following-its-sudden-shift-to-a-subscription-model.html";>
-ææå¯¹ä½¿ç¨æå¡å¨ä»è´¹</a>ãç±äºæ¯ç»å®çæå¡å¨ï¼æä»¥è¿ä¸ªå®¶åºä¸å¿æ²¡ææå¡å¨çè¯å°±åå¾æ¯«æ
 ç¨å¤ã</p>
-  </li>
 </ul>
 
 </div>
@@ -275,7 +277,7 @@
 <p class="unprintable"><!-- timestamp start -->
 æåæ´æ°ï¼
 
-$Date: 2020/06/27 04:59:06 $
+$Date: 2020/07/15 09:31:56 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/po/proprietary.zh-cn-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.zh-cn-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- proprietary/po/proprietary.zh-cn-en.html    27 Jun 2020 04:59:07 -0000      
1.9
+++ proprietary/po/proprietary.zh-cn-en.html    15 Jul 2020 09:31:56 -0000      
1.10
@@ -89,8 +89,8 @@
 <hr class="thin" />
 </div>
 
-<p>As of January, 2020, the pages in this directory list around 450
-instances of malicious functionalities (with more than 500 references to
+<p>As of July, 2020, the pages in this directory list around 450
+instances of malicious functionalities (with more than 520 references to
 back them up), but there are surely thousands more we don't know about.</p>
 
 <table id="TOC">
@@ -173,6 +173,39 @@
 <h3 id="latest">Latest additions</h3>
 
 <ul class="blurbs">
+  <li id="M202007010">
+    <p>BMW will remotely <a
+    href="https://www.cnet.com/roadshow/news/bmw-vehicle-as-a-platform/";>
+    enable and disable functionality in cars</a> through a universal
+    back door.</p>
+  </li>
+
+  <li id="M202006300">
+    <p>&ldquo;Bossware&rdquo; is malware that bosses <a
+    
href="https://www.eff.org/deeplinks/2020/06/inside-invasive-secretive-bossware-tracking-workers";>
+    coerce workers into installing in their own computers</a>, so the
+    bosses can spy on them.</p>
+
+    <p>This shows why requiring the user's &ldquo;consent&rdquo; is not
+    an adequate basis for protecting digital privacy.  The boss can coerce
+    most workers into consenting to almost anything, even probable exposure
+    to contagious disease that can be fatal.  Software like this should
+    be illegal and bosses that demand it should be prosecuted for it.</p>
+  </li>
+
+  <li id="M201504210">
+    <p>Runescape is a popular online game with some <a
+    
href="https://www.reddit.com/r/runescape/comments/33cd8g/question_why_is_runescape_so_addicting/";>
+    addictive features</a> derived from <a
+    href="/proprietary/proprietary-addictions.html#addictiveness">
+    behavioral manipulation techniques</a>. Certain
+    repetitive aspects of the game, like <a
+    href="https://en.wikipedia.org/wiki/Grinding_(video_games)">
+    grinding</a>, can be minimised by becoming a paying member, and can
+    thus encourage children and impressionable people to spend money on
+    the game.</p>
+  </li>
+
   <li id="M202006260">
     <p>Most apps are malware, but
     Trump's campaign app, like Modi's campaign app, is <a
@@ -193,36 +226,6 @@
     the Video Privacy Protection Act of 1988, but they're circumventing
     it through EULAs.</p>
   </li>
-
-  <li id="M202006160">
-    <p><a
-    
href="https://www.wired.com/story/ripple20-iot-vulnerabilities/?bxid=5bd66d4c2ddf9c619437e4b8&amp;cndid=9608804&amp;esrc=Wired_etl_load&amp;source=EDT_WIR_NEWSLETTER_0_DAILY_ZZ&amp;utm_bran%5C";>
-    A disasterous security bug</a> touches millions of products in the
-    Internet of Stings.</p>
-
-    <p>As a result, anyone can sting the user, not only the
-    manufacturer.</p>
-  </li>
-
-  <li id="M201909061">
-    <p>Best Buy made controllable appliances and <a
-    
href="https://www.theverge.com/2019/9/6/20853671/best-buy-connect-insignia-smart-plug-wifi-freezer-mobile-app-shutdown-november-6";>
-    shut down the service to control them through</a>.</p>
-
-    <p>While it is laudable that Best Buy recognized it was mistreating
-    the customers by doing so, this doesn't alter the facts that
-    tethering the device to a particular server is a path to screwing the
-    users, and that it is a consequence of having nonfree software in the
-    device.</p>
-  </li>
-
-  <li id="M202005070">
-    <p>Wink sells a &ldquo;smart&rdquo; home hub that is tethered
-    to a server. In May 2020, it ordered the purchasers to start <a
-    
href="https://www.techhive.com/article/3542631/wink-users-revolt-following-its-sudden-shift-to-a-subscription-model.html";>
-    paying a monthly fee for the use of that server</a>.  Because of the
-    tethering, the hub is useless without that.</p>
-  </li>
 </ul>
 
 </div>
@@ -284,7 +287,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/06/27 04:59:07 $
+$Date: 2020/07/15 09:31:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary.zh-cn.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.zh-cn.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- proprietary/po/proprietary.zh-cn.po 15 Jul 2020 07:37:05 -0000      1.35
+++ proprietary/po/proprietary.zh-cn.po 15 Jul 2020 09:31:56 -0000      1.36
@@ -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: 2020-07-01 13:56+0000\n"
 "X-Generator: Poedit 2.3\n"
 
 #. type: Content of: <title>

Index: philosophy/po/freedom-or-power.cs-en.html
===================================================================
RCS file: philosophy/po/freedom-or-power.cs-en.html
diff -N philosophy/po/freedom-or-power.cs-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/po/freedom-or-power.cs-en.html   15 Jul 2020 09:31:56 -0000      
1.1
@@ -0,0 +1,166 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>Freedom Or Power?
+- GNU Project - Free Software Foundation</title>
+<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, general, public, license, gpl, general public license, freedom, 
software, power, rights" />
+<meta http-equiv="Description" content="In this essay, Freedom or Power?, 
Bradley M. Kuhn and Richard M. Stallman discuss the reasons that the free 
software movement doesn't advocate the so-called freedom to choose any license 
you want for software you write." />
+<!--#include virtual="/philosophy/po/freedom-or-power.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Freedom or Power?</h2>
+
+<p>
+by <strong>Bradley M. Kuhn</strong> and <strong>Richard
+M. Stallman</strong></p>
+
+<blockquote>
+<p>The love of liberty is the love of others; the love of power is the
+love of ourselves.<br />
+-- William Hazlitt</p>
+</blockquote>
+
+<p>
+In the free software movement, we stand for freedom for the users of
+software.  We formulated our views by looking at what freedoms are
+necessary for a good way of life, and permit useful programs to foster a
+community of goodwill, cooperation, and collaboration.  <a
+href="/philosophy/free-sw.html">Our criteria for free software</a> specify
+the freedoms that a program's users need so that they can cooperate in a
+community.</p>
+
+<p>
+We stand for freedom for programmers as well as for other users.
+Most of us are programmers, and we want freedom for ourselves as well
+as for you.  But each of us uses software written by others, and we
+want freedom when using that software, not just when using our own
+code.  We stand for freedom for all users, whether they program often,
+occasionally, or not at all.</p>
+
+<p>
+However, one so-called freedom that we do not advocate is the
+&ldquo;freedom to choose any license you want for software you
+write.&rdquo;  We reject this because it is really a form of power,
+not a freedom.</p>
+
+<p>
+This oft overlooked distinction is crucial.  Freedom is being able to make
+decisions that affect mainly you; power is being able to make decisions
+that affect others more than you.  If we confuse power with freedom, we
+will fail to uphold real freedom.</p>
+
+<p>
+Making a program proprietary is an exercise of power.  Copyright law
+today grants software developers that power, so they and only they
+choose the rules to impose on everyone else&mdash;a relatively small
+number of people make the basic software decisions for all users,
+typically by denying their freedom.  When users lack the
+freedoms that define free software, they can't tell what the
+software is doing, can't check for back doors, can't monitor possible
+viruses and worms, can't find out what personal information is being
+reported (or stop the reports, even if they do find out).  If it breaks,
+they can't fix it; they have to wait for the developer to exercise its
+power to do so.  If it simply isn't quite what they need, they are stuck
+with it.  They can't help each other improve it.</p>
+
+<p>
+Proprietary software developers are often businesses.  We in the free
+software movement are not opposed to business, but we have seen what
+happens when a software business has the &ldquo;freedom&rdquo; to
+impose arbitrary rules on the users of software.  Microsoft is an
+egregious example of how denying users' freedoms can lead to direct
+harm, but it is not the only example.  Even when there is no monopoly,
+proprietary software harms society.  A choice of masters is not
+freedom.</p>
+
+<p>
+Discussions of rights and rules for software have often concentrated
+on the interests of programmers alone.  Few people in the world
+program regularly, and fewer still are owners of proprietary software
+businesses.  But the entire developed world now needs and uses
+software, so software developers now control the way it lives,
+does business, communicates, and is entertained.  The ethical and
+political issues are not addressed by the slogan of &ldquo;freedom of
+choice (for developers only).&rdquo;</p>
+
+<p>
+If &ldquo;code is law,&rdquo; <a href="#f1">(1)</a> then the real question we 
face is: who should control the
+code you use&mdash;you, or an elite few?  We believe you are entitled
+to control the software you use, and giving you that control is the
+goal of free software.</p>
+
+<p>
+We believe you should decide what to do with the software you use;
+however, that is not what today's law says.  Current copyright law places
+us in the position of power over users of our code, whether we like it or
+not.  The ethical response to this situation is to proclaim freedom for
+each user, just as the Bill of Rights was supposed to exercise government
+power by guaranteeing each citizen's freedoms.  That is what the <a
+href="/copyleft/copyleft.html">GNU General Public License</a> is for:
+it puts you in control of your usage of the software while <a
+href="/philosophy/why-copyleft.html">protecting you from others</a> who would
+like to take control of your decisions.</p>
+
+<p>
+As more and more users realize that code is law, and come to feel that
+they too deserve freedom, they will see the importance of the freedoms
+we stand for, just as more and more users have come to appreciate the
+practical value of the free software we have developed.</p>
+
+<h4>Footnotes</h4>
+
+<a id="f1"></a> William J. Mitchell,
+<em>City of Bits: Space, Place, and the Infobahn </em> (Cambridge,
+Mass.: MIT Press, 1995), p. 111, as quoted by Lawrence Lessig in
+<em>Code and Other Laws of Cyberspace, Version 2.0</em> (New York, NY:
+Basic Books, 2006), p. 5.
+
+<hr />
+<blockquote id="fsfs"><p class="big">This essay is published
+in <a href="http://shop.fsf.org/product/free-software-free-society/";><cite>Free
+Software, Free Society: The Selected Essays of Richard
+M. Stallman</cite></a>.</p></blockquote>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF &amp; GNU inquiries to <a
+href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&gt;</a>.  There are also <a
+href="/contact/">other ways to contact</a> the FSF.  Broken links and other
+corrections or suggestions can be sent to <a
+href="mailto:webmasters@gnu.org";>&lt;webmasters@gnu.org&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:web-translators@gnu.org";>
+        &lt;web-translators@gnu.org&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>
+
+<p>Copyright &copy; 2001, 2009 Bradley M. Kuhn and Richard M. Stallman</p>
+
+<p>Verbatim copying and distribution of this entire article is permitted
+without royalty in any medium, provided this notice is preserved.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2020/07/15 09:31:56 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
[Prev in Thread]
Current Thread
[Next in Thread]
www philosophy/15-years-of-free-software.zh-cn...., GNUN <=
Prev by Date: www/server/banners sofar.html
Next by Date: www/server/banners sofar.html
Previous by thread: www/philosophy/po freedom-or-power.cs.po
Next by thread: www/server/staging body-include-1.html fundrais...
Index(es):
- Date
- Thread