[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www fun/humor.zh-cn.html fun/po/humor.zh-cn-en....
|
From: |
GNUN |
|
Subject: |
www fun/humor.zh-cn.html fun/po/humor.zh-cn-en.... |
|
Date: |
Mon, 12 Jul 2021 02:30:46 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 21/07/12 02:30:46
Modified files:
fun : humor.zh-cn.html
fun/po : humor.zh-cn-en.html humor.zh-cn.po
philosophy : linux-gnu-freedom.zh-cn.html
shouldbefree.zh-cn.html
when-free-software-isnt-practically-superior.zh-cn.html
philosophy/po : linux-gnu-freedom.zh-cn-en.html
linux-gnu-freedom.zh-cn.po
shouldbefree.zh-cn-en.html
shouldbefree.zh-cn.po
when-free-software-isnt-practically-superior.zh-cn-en.html
when-free-software-isnt-practically-superior.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.zh-cn.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.zh-cn-en.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.zh-cn.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/linux-gnu-freedom.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/shouldbefree.zh-cn.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/when-free-software-isnt-practically-superior.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/linux-gnu-freedom.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/linux-gnu-freedom.zh-cn.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/shouldbefree.zh-cn-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/shouldbefree.zh-cn.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/when-free-software-isnt-practically-superior.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/when-free-software-isnt-practically-superior.zh-cn.po?cvsroot=www&r1=1.3&r2=1.4
Patches:
Index: fun/humor.zh-cn.html
===================================================================
RCS file: /web/www/www/fun/humor.zh-cn.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- fun/humor.zh-cn.html 11 Nov 2020 10:00:01 -0000 1.18
+++ fun/humor.zh-cn.html 12 Jul 2021 06:30:45 -0000 1.19
@@ -1,14 +1,17 @@
<!--#set var="ENGLISH_PAGE" value="/fun/humor.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>åGNUä¸èµ·æ¬¢ç¬ - GNUå·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
<!--#include virtual="/fun/po/humor.translist" -->
<!--#include virtual="/server/banner.zh-cn.html" -->
+<div class="reduced-width">
<h2>åGNUä¸èµ·æ¬¢ç¬</h2>
+<div class="thin"></div>
<p>æ¬é¡µé¢ç¨æ¥ä¸ºæ£å¨å·¥ä½çé»å®¢ä»¬æä¾ä¸äºæ¬¢ç¬ãå®å
å«è½¯ä»¶ãææ¡£ãé³ä¹ãè¯æçï¼å¤å¹´æ¥ï¼å®ä»¬ç±GNUç¨æ·æ交并ç±GNUè´¡ç®è
æéæ´çã</p>
@@ -19,27 +22,48 @@
<p>许å¤ä¿åå¨<a
href="/graphics/graphics.html">GNUèºæ¯ç»å»</a>çç»ä½ä¹å¾æå¹½é»æã</p>
<!-- It would be nice to see alphabetical order be maintained -->
+<h3 id="Computing">计ç®</h3>
+
+<ul>
+ <li><a
href="/fun/jokes/10-kinds-of-people.html">ä¸çä¸ç10ç§äºº</a></li>
+ <li><a href="/fun/jokes/any-key.html">ä»»æé®å¨åªéï¼ï¼</a></li>
+ <li><a href="/fun/jokes/deadbeef.html">Dead Beef</a>ï¼</li>
+ <li>Dr. Emacsæä¹ç<a
href="/fun/jokes/doctor.manifesto.html">GNU宣è¨</a>ï¼</li>
+ <li><a href="/fun/jokes/evilmalware.html">为ä»ä¹GNU/Linuxç
æ¯ä¸é£ä¹å¸¸è§</a></li>
+ <li><a href="/fun/jokes/gcc_audio.html">ä¸ç¾¤å°é£è«ï¼</a></li>
+ <li><a href="/fun/jokes/gullibility.virus.html">轻信ç
æ¯</a></li>
+ <li><a
href="/fun/jokes/p5.delay.html">Intel延è¿åå¸P5ç10大çç±</a></li>
+ <li><a href="/fun/jokes/programmer.txt">ä½ ç¥éä½
æ¯ä¸ä¸ªç¨åºåï¼å½…</a></li>
+ <li><a href="/fun/jokes/unreliable.net.html">ç½ç»ä¸å¯é
ç10大çç±</a></li>
+ <li>The <a href="/fun/jokes/vaxorcist.html">Vaxorcist</a></li>
+ <li><a href="/fun/jokes/virus-warning.html">ç
æ¯è¦å</a></li>
+ <li><a href="/fun/jokes/xmodmap.html">Physical Xmodmap, or The Dvorak
Typewriter
+Hack</a></li>
+ <li><a
+href="https://web.archive.org/web/20150224010742/http://www.joke-archives.com/computers/deletedcharacters.html";>被å
é¤çå符ä¸åªéå»äºï¼</a></li>
+</ul>
+
<h3 id="Software">软件</h3>
<ul>
- <li><a href="/fun/jokes/gcc.html">GCCé项æè®®</a></li>
+ <li><a href="/fun/jokes/brainfuck.html">edç¼è¾å¨çBrainFuckè¯è¨æºä»£ç
;-)</a></li>
<li><a href="/fun/jokes/c+-.html">C+-</a></li>
<li>ä¸å¸é 人çGPLç<a href="/fun/jokes/dna.html">æºä»£ç </a></li>
<li><a href="/fun/jokes/ed.html">edç¼è¾å¨çæºä»£ç :-)</a></li>
- <li><a href="/fun/jokes/brainfuck.html">edç¼è¾å¨çBrainFuckè¯è¨æºä»£ç
;-)</a></li>
+ <li><a href="/fun/jokes/emacs.man">Plan9çEmacsç¨æ³è¯´æ</a></li>
<li><a href="/fun/jokes/errno.2.html">é误ç </a></li>
<li>俳å¥å¼<a href="/fun/jokes/error-haiku.html">é误信æ¯</a></li>
+ <li><a href="/fun/jokes/gcc.html">GCCé项æè®®</a></li>
+ <li><a href="/fun/jokes/gnuemacs.html">GNU Emacs</a></li>
+ <li><a href="/fun/jokes/gnu-overflow.html">GNU溢åºï¼</a></li>
<li><a
href="/fun/jokes/happy-new-year.html">åç§è¯è¨çæ°å¹´å¿«ä¹</a></li>
- <li><a href="/fun/jokes/merry-xmas.html">åç§è¯è¨çå£è¯å¿«ä¹</a></li>
+ <li><a href="/fun/jokes/helloworld.html">ä¸çä½ å¥½ï¼</a></li>
<li><a href="/fun/jokes/long-options.html">é¿é项ï¼</a></li>
- <li><a href="/fun/jokes/software.terms.html">软件æ¯è¯</a></li>
+ <li><a href="/fun/jokes/merry-xmas.html">åç§è¯è¨çå£è¯å¿«ä¹</a></li>
<li><a href="/fun/jokes/pasta.code.html">æµç³å¼ä»£ç </a></li>
- <li><a href="/fun/jokes/unix.errors.html">Unixé误信æ¯</a></li>
- <li><a href="/fun/jokes/gnu-overflow.html">GNU溢åºï¼</a></li>
- <li><a href="/fun/jokes/helloworld.html">ä¸çä½ å¥½ï¼</a></li>
- <li><a href="/fun/jokes/gnuemacs.html">GNU Emacs</a></li>
- <li><a href="/fun/jokes/emacs.man">Plan9çEmacsç¨æ³è¯´æ</a></li>
+ <li><a href="/fun/jokes/software.terms.html">软件æ¯è¯</a></li>
<li><a href="/fun/jokes/ubuntu.html">Ubuntu</a></li>
+ <li><a href="/fun/jokes/unix.errors.html">Unixé误信æ¯</a></li>
<li><a
href="https://twitter.com/1990sLinuxUser";>åå¸å¨Twitterä¸çç¬è¯</a></li>
</ul>
@@ -48,9 +72,17 @@
<ul>
<li><a href="/fun/jokes/echo-msg.html">GNU Echo</a></li>
<li><a href="/fun/jokes/ed-msg.html">Ed, man! !man ed</a></li>
- <li><a href="/fun/jokes/power.users.html">ç¹æç¨æ·æå</a></li>
- <li><a href="/fun/jokes/know.your.sysadmin.html">认è¯ä½
çç³»ç»ç®¡çå</a></li>
<li><a href="/fun/jokes/gnuemacs.acro.exp.html">GNU Emacsç缩åä¹å
¨ç§°</a></li>
+ <li><a href="/fun/jokes/know.your.sysadmin.html">认è¯ä½
çç³»ç»ç®¡çå</a></li>
+ <li><a href="/fun/jokes/power.users.html">ç¹æç¨æ·æå</a></li>
+</ul>
+
+<h3 id="ScienceAndEngineering">ç§å¦åå·¥ç¨</h3>
+
+<ul>
+ <li><a href="/fun/jokes/phone.features.html">çµè¯åè½</a></li>
+ <li><a href="/fun/jokes/physics.html">ç©çå¦ååºï¼</a></li>
+ <li>ä¸äº<a href="/fun/jokes/science.facts.html">ç§å¦äºå®</a></li>
</ul>
<h3 id="Music">é³ä¹ä½å</h3>
@@ -61,18 +93,16 @@
was set up in 10/99. -->
<!-- moved to its own page, mattl -->
<ul>
- <li><a href="/music/">GNUé³ä¹åææ²</a></li>
- <li><a href="/fun/jokes/lauper.html">Gnus åªæ¯è¦å¼å¿ä¸ä¸</a></li>
+ <li><a href="/music/music.html">GNU é³ä¹åææ²</a></li>
</ul>
<h3 id="Poems">è¯æ</h3>
<ul>
+ <li><a href="/fun/jokes/hakawatha.html">Hakawatha</a></li>
<li><a href="/fun/jokes/last.bug.html">æåçè«å/æ
é</a></li>
<li><a href="/fun/jokes/midnight.dreary.html">åå¤éªå®¢</a></li>
<li><a
href="/fun/jokes/networkologist.html">ä¸ä¸ªç½ç»ä¸å®¶çå£è¯è</a></li>
- <li><a href="/fun/jokes/hakawatha.html">Hakawatha</a></li>
- <li><a href="/fun/jokes/only-gnu.html">åªæG.N.U.</a></li>
</ul>
<h3 id="Philosophy">å²å¦</h3>
@@ -91,33 +121,15 @@
<li><a href="/fun/jokes/unix-hoax.html">Unixï¼ä¸ä¸ªéªå±ï¼</a></li>
</ul>
-<h3 id="Computing">计ç®</h3>
+<h3 id="Dictionary">åå
¸åæå游æ</h3>
<ul>
- <li><a href="/fun/jokes/programmer.txt">ä½ ç¥éä½
æ¯ä¸ä¸ªç¨åºåï¼å½…</a></li>
- <li><a href="/fun/jokes/any-key.html">ä»»æé®å¨åªéï¼ï¼</a></li>
- <li>Dr. Emacsæä¹ç<a
href="/fun/jokes/doctor.manifesto.html">GNU宣è¨</a>ï¼</li>
- <li><a
href="/fun/jokes/p5.delay.html">Intel延è¿åå¸P5ç10大çç±</a></li>
- <li><a href="/fun/jokes/unreliable.net.html">ç½ç»ä¸å¯é
ç10大çç±</a></li>
- <li>The <a href="/fun/jokes/vaxorcist.html">Vaxorcist</a></li>
- <li><a href="/fun/jokes/virus-warning.html">ç
æ¯è¦å</a></li>
- <li><a href="/fun/jokes/gullibility.virus.html">轻信ç
æ¯</a></li>
- <li><a href="/fun/jokes/deadbeef.html">Dead Beef</a>ï¼</li>
- <li><a href="/fun/jokes/gcc_audio.html">ä¸ç¾¤å°é£è«ï¼</a></li>
- <li><a
-href="https://web.archive.org/web/20150224010742/http://www.joke-archives.com/computers/deletedcharacters.html";>被å
é¤çå符ä¸åªéå»äºï¼</a></li>
- <li><a
href="/fun/jokes/10-kinds-of-people.html">ä¸çä¸ç10ç§äºº</a></li>
- <li><a href="/fun/jokes/xmodmap.html">Physical Xmodmap, or The Dvorak
Typewriter
-Hack</a></li>
- <li><a href="/fun/jokes/evilmalware.html">为ä»ä¹GNU/Linuxç
æ¯ä¸é£ä¹å¸¸è§</a></li>
-</ul>
-
-<h3 id="ScienceAndEngineering">ç§å¦åå·¥ç¨</h3>
-
-<ul>
- <li><a href="/fun/jokes/phone.features.html">çµè¯åè½</a></li>
- <li><a href="/fun/jokes/physics.html">ç©çå¦ååºï¼</a></li>
- <li>ä¸äº<a href="/fun/jokes/science.facts.html">ç§å¦äºå®</a></li>
+ <li>å
³äºæäºå¸¸è§åç<a
href="/fun/jokes/anagrams.html">è°è¯</a></li>
+ <li><a href="/fun/jokes/fundefinitions1.html">æ»ç¨½å®ä¹ 1</a></li>
+ <li><a href="/fun/jokes/fundefinitions2.html">æ»ç¨½å®ä¹ 2</a></li>
+ <li><a href="/fun/jokes/grammar-in-the-bar.html">é
å§éçè奶奶</a></li>
+ <li><a href="/fun/jokes/spilling-checker.html">æ¼æ³»æ£æ¥</a></li>
+ <li><a href="/fun/jokes/typoglycemia.html">Typoglycemia</a></li>
</ul>
<h3 id="Spam">åå¾é®ä»¶</h3>
@@ -127,13 +139,6 @@
<li><a
href="/fun/spam/warpgenerator.html">æ±è´æ¶ç©ºå¼¯æ²åçå¨</a></li>
</ul>
-<h3 id="Dictionary">åå
¸</h3>
-
-<ul>
- <li><a href="/fun/jokes/fundefinitions1.html">æ»ç¨½å®ä¹ 1</a></li>
- <li><a href="/fun/jokes/fundefinitions2.html">æ»ç¨½å®ä¹ 2</a></li>
-</ul>
-
<!-- Most readers like lists to be of manageable length. So try as
this Unclassified section grows, to add new sections above.
That is, classify some of the unclassified jokes into new
@@ -141,31 +146,29 @@
<h3 id="Unclassified">æªåç±»</h3>
<ul>
- <li><a href="/fun/jokes/grammar-in-the-bar.html">é
å§éçè奶奶</a></li>
- <li>æç¨æ·<a href="/fun/jokes/luser-vs-rms.html">对è¯</a><a href=
-"http://www.stallman.org/";>rms</a></li>
- <li>å
³äºæäºå¸¸è§åç<a
href="/fun/jokes/anagrams.html">è°è¯</a></li>
- <li>é对<a href="/fun/jokes/bug.war.html">è«å/æ
é</a>çæäºï¼</li>
+ <li><a href="/fun/jokes/bug.war.html">对æè«åçæäº</a>ï¼</li>
<li>å¯ç¬ç<a href="/fun/jokes/courtroom.quips.html">æ³åºéè¿°</a></li>
<li><a href="/fun/jokes/fsf-in-german.html">FSFçå¾·è¯ææ</a></li>
<li><a href="/fun/jokes/gospel.html">ç¦é³</a></li>
<li><a href="/fun/jokes/look-and-feel.html">å¤è§åæå</a></li>
+ <li>æç¨æ·<a href="/fun/jokes/luser-vs-rms.html">对è¯</a><a href=
+"http://www.stallman.org/";>rms</a></li>
+ <li><a href="/fun/jokes/musical-pickup.html">é³ä¹æå</a></li>
<li><a href="/fun/jokes/panama.html">Panama</a></li>
<li><a href="/fun/jokes/quotations.html">å¼ç¨</a></li>
- <li><a href="/fun/jokes/smileys.html">ç¬è¸:-)</a></li>
- <li><a href="/fun/jokes/spilling-checker.html">æ¼æ³»æ£æ¥</a></li>
<li><a href="/fun/jokes/santa_comes_to_town.html">å£è¯è人è¿å</a></li>
- <li><a href="/fun/jokes/typoglycemia.html">Typoglycemia</a></li>
- <li><a href="/fun/jokes/wolf-logo.html">ç¼å½¢å¾æ </a></li>
- <li><a href="/fun/jokes/filks.html">ä¸äºææ
ææ²</a></li>
+ <li><a href="/fun/jokes/smileys.html">ç¬è¸:-)</a></li>
<li><a
href="/fun/jokes/users-lightbulb.html">æå¤å°GNU/Linuxç¨æ·éè¦æ¢ç¯æ³¡ï¼</a></li>
+ <li><a href="/fun/jokes/wolf-logo.html">ç¼å½¢å¾æ </a></li>
</ul>
<!-- Most readers like lists to be of manageable length. So try as
this Unclassified section grows, to add new sections above.
That is, classify some of the unclassified jokes into new
categories. -->
-<h4 id="Guidelines">å¹½é»ä½åæ交æå</h4>
+<div class="infobox">
+<hr />
+<h3 id="Guidelines">å¹½é»ä½åæ交æå</h3>
<!-- See the README file under the /fun/ directory -->
<p>以ä¸æ¯æ们æ¶å½å¹½é»ä½åçæ¿çï¼</p>
@@ -178,12 +181,15 @@
<li>è½ç¶ä½åçå¹½é»ä¸å¿
éå¾å计ç®æºæå
³ï¼ä½æ们è¿æ¯å¼ºçåç±å¨æ¤ä¸ºå
³äºèªç±è½¯ä»¶ãGNUãUNIXç¯å¢åç¸å
³é¢åçç¬è¯ä¿ççé¢ã</li>
</ol>
-<h4 id="Disclaimer">å
责声æ</h4>
-
-<p>æ¬é¡µçå¤æ°ææï¼ä»¥åä»æ¤åå¤çé¾æ¥ï¼æ¥èªFSFçGNUå·¥ç¨ç<a
href= "ftp://lists.gnu.org/";>çµåé®ä»¶åæ¡£</a>ã</p>
+<div id="Disclaimer" role="contentinfo">
+<h3>å
责声æ</h3>
+<p>æ¬é¡µçå¤æ°ææï¼ä»¥åä»æ¤åå¤çé¾æ¥ï¼æ¥èªFSFçGNUå·¥ç¨ççµåé®ä»¶åæ¡£ãèªç±è½¯ä»¶åºéä¼å¯¹è¿äºä½åä¸ä¸»å¼
çæã</p>
+</div>
+</div>
-<p>èªç±è½¯ä»¶åºéä¼å¯¹æ¤ä¸ä¸»å¼ çæãæ¬é¡µä»¥å®ç¾ç<a
+<p class="comment">*** æ¬é¡µä»¥å®ç¾ç<a
href="/fun/jokes/purchase.agreement.html">å
责声æ</a>ç»å°¾ï¼</p>
+</div>
<div class="translators-notes">
@@ -196,7 +202,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
@@ -215,11 +221,13 @@
<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="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>ã</p>
+æ们尽æ大åªåæ¥æä¾ç²¾ååé«è´¨éçç¿»è¯ï¼ä½é¾å
ä¼åå¨é误åä¸è¶³ãå¦ææ¨å¨è¿æ¹é¢æè¯è®ºæä¸è¬æ§ç建议ï¼è¯·åéè³
<a
+href="mailto:web-translators@gnu.org";><web-translators@gnu.org></a>ã</p><p>å
³äºè¿è¡åè°ä¸æ交翻è¯çæ´å¤ä¿¡æ¯åè§
+<a href="/server/standards/README.translations.html">ãè¯è
æåã</a>ã</p>
</div>
<!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -238,7 +246,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2015, 2018, 2020 Richard M. Stallman</p>
+<p>Copyright © 1999-2021 Richard M. Stallman</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -250,12 +258,12 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯</b>ï¼æ±å»ºåï¼2014ã<br></br>
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2018ï¼2020ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2018ï¼2020ï¼2021ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2020/11/11 10:00:01 $
+$Date: 2021/07/12 06:30:45 $
<!-- timestamp end -->
</p>
Index: fun/po/humor.zh-cn-en.html
===================================================================
RCS file: /web/www/www/fun/po/humor.zh-cn-en.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- fun/po/humor.zh-cn-en.html 11 Nov 2020 10:00:01 -0000 1.13
+++ fun/po/humor.zh-cn-en.html 12 Jul 2021 06:30:45 -0000 1.14
@@ -1,12 +1,15 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
<title>Laugh along with GNU
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/fun/po/humor.translist" -->
<!--#include virtual="/server/banner.html" -->
+<div class="reduced-width">
<h2>Laugh along with GNU</h2>
+<div class="thin"></div>
-<p>This is a web page designed to provide some laughs to the working
+<p>This section is designed to provide some laughs to the working
hackers. It contains software, documentation, music, poems, etc. submitted
by GNU users and collected by GNU contributors over the years.</p>
@@ -22,30 +25,57 @@
<!-- It would be nice to see alphabetical order be maintained -->
+<h3 id="Computing">Computing</h3>
+
+<ul>
+ <li><a href="/fun/jokes/10-kinds-of-people.html">10 Kinds of People in
+ the World</a></li>
+ <li><a href="/fun/jokes/any-key.html">Where is any-key??</a></li>
+ <li><a href="/fun/jokes/deadbeef.html">Dead Beef</a>?</li>
+ <li>What does Dr. Emacs think of
+ the <a href="/fun/jokes/doctor.manifesto.html">GNU Manifesto</a>?</li>
+ <li><a href="/fun/jokes/evilmalware.html">Why GNU/Linux Viruses are
+ fairly uncommon</a></li>
+ <li><a href="/fun/jokes/gcc_audio.html">A Swarm of Gnats?</a></li>
+ <li><a href="/fun/jokes/gullibility.virus.html">The Gullibility
Virus</a></li>
+ <li><a href="/fun/jokes/p5.delay.html">Top 10 reasons why Intel
+ delayed announcing the P5</a></li>
+ <li><a href="/fun/jokes/programmer.txt">You know you're a programmer
+ when…</a></li>
+ <li><a href="/fun/jokes/unreliable.net.html">Top 10 Unreliable
+ Networks</a></li>
+ <li>The <a href="/fun/jokes/vaxorcist.html">Vaxorcist</a></li>
+ <li><a href="/fun/jokes/virus-warning.html">Virus Warning</a></li>
+ <li><a href="/fun/jokes/xmodmap.html">Physical Xmodmap, or The Dvorak
+ Typewriter Hack</a></li>
+ <li><a
href="https://web.archive.org/web/20150224010742/http://www.joke-archives.com/computers/deletedcharacters.html";>
+ Where Do Deleted Characters Go?</a></li>
+</ul>
+
<h3 id="Software">Software</h3>
<ul>
- <li><a href="/fun/jokes/gcc.html">Suggested GCC Options</a></li>
+ <li><a href="/fun/jokes/brainfuck.html">Source code for ed in
+ BrainFuck ;-)</a></li>
<li><a href="/fun/jokes/c+-.html">C more or less</a></li>
<li>GPL'd <a href="/fun/jokes/dna.html">source code</a> for humans</li>
<li><a href="/fun/jokes/ed.html">Source code for ed :-)</a></li>
- <li><a href="/fun/jokes/brainfuck.html">Source code for ed in
- BrainFuck ;-)</a></li>
+ <li><a href="/fun/jokes/emacs.man">Emacs man page from Plan9</a></li>
<li><a href="/fun/jokes/errno.2.html">Errno codes</a></li>
<li><a href="/fun/jokes/error-haiku.html">Error messages</a> in Haiku</li>
+ <li><a href="/fun/jokes/gcc.html">Suggested GCC Options</a></li>
+ <li><a href="/fun/jokes/gnuemacs.html">GNU Emacs</a></li>
+ <li><a href="/fun/jokes/gnu-overflow.html">GNU-Overflow?</a></li>
<li><a href="/fun/jokes/happy-new-year.html">Happy New Year in 4
languages</a></li>
+ <li><a href="/fun/jokes/helloworld.html">Hello World!</a></li>
+ <li><a href="/fun/jokes/long-options.html">Long Options?</a></li>
<li><a href="/fun/jokes/merry-xmas.html">Merry Christmas in 4
languages</a></li>
- <li><a href="/fun/jokes/long-options.html">Long Options?</a></li>
- <li><a href="/fun/jokes/software.terms.html">Software Terms</a></li>
<li><a href="/fun/jokes/pasta.code.html">Spaghetti Code</a></li>
- <li><a href="/fun/jokes/unix.errors.html">Unix Error Messages</a></li>
- <li><a href="/fun/jokes/gnu-overflow.html">GNU-Overflow?</a></li>
- <li><a href="/fun/jokes/helloworld.html">Hello World!</a></li>
- <li><a href="/fun/jokes/gnuemacs.html">GNU Emacs</a></li>
- <li><a href="/fun/jokes/emacs.man">Emacs man page from Plan9</a></li>
+ <li><a href="/fun/jokes/software.terms.html">Software Terms</a></li>
<li><a href="/fun/jokes/ubuntu.html">Ubuntu</a></li>
+ <li><a href="/fun/jokes/unix.errors.html">Unix Error Messages</a></li>
<li><a href="https://twitter.com/1990sLinuxUser";>Some humor via
Twitter</a></li>
</ul>
@@ -54,11 +84,19 @@
<ul>
<li><a href="/fun/jokes/echo-msg.html">GNU Echo</a></li>
<li><a href="/fun/jokes/ed-msg.html">Ed, man! !man ed</a></li>
- <li><a href="/fun/jokes/power.users.html">Power Users Guide</a></li>
- <li><a href="/fun/jokes/know.your.sysadmin.html">Know your system
- administrator</a></li>
<li><a href="/fun/jokes/gnuemacs.acro.exp.html">GNU Emacs acronym
expansions</a></li>
+ <li><a href="/fun/jokes/know.your.sysadmin.html">Know your system
+ administrator</a></li>
+ <li><a href="/fun/jokes/power.users.html">Power Users Guide</a></li>
+</ul>
+
+<h3 id="ScienceAndEngineering">Science and Engineering</h3>
+
+<ul>
+ <li><a href="/fun/jokes/phone.features.html">Phone Features</a></li>
+ <li><a href="/fun/jokes/physics.html">The Physics Store!</a></li>
+ <li>Some <a href="/fun/jokes/science.facts.html">Scientific Facts</a></li>
</ul>
<h3 id="Music">Music</h3>
@@ -70,19 +108,17 @@
<!-- moved to its own page, mattl -->
<ul>
- <li><a href="/music/">GNU music and songs</a></li>
- <li><a href="/fun/jokes/lauper.html">Gnus Just Wanna Have Fun</a></li>
+ <li><a href="/music/music.html">GNU Music and Songs</a></li>
</ul>
<h3 id="Poems">Poems</h3>
<ul>
+ <li><a href="/fun/jokes/hakawatha.html">Hakawatha</a></li>
<li><a href="/fun/jokes/last.bug.html">The Last Bug</a></li>
<li><a href="/fun/jokes/midnight.dreary.html">Midnight Dreary</a></li>
<li><a href="/fun/jokes/networkologist.html">A Networkologist's
Christmas</a></li>
- <li><a href="/fun/jokes/hakawatha.html">Hakawatha</a></li>
- <li><a href="/fun/jokes/only-gnu.html">Only G.N.U.</a></li>
</ul>
<h3 id="Philosophy">Philosophy</h3>
@@ -103,39 +139,16 @@
<li><a href="/fun/jokes/unix-hoax.html">Unix, a Hoax?</a></li>
</ul>
-<h3 id="Computing">Computing</h3>
+<h3 id="Dictionary">Dictionary and Word Play</h3>
<ul>
- <li><a href="/fun/jokes/programmer.txt">You know you're a programmer
- when…</a></li>
- <li><a href="/fun/jokes/any-key.html">Where is any-key??</a></li>
- <li>What does Dr. Emacs think of
- the <a href="/fun/jokes/doctor.manifesto.html">GNU Manifesto</a>?</li>
- <li><a href="/fun/jokes/p5.delay.html">Top 10 reasons why Intel
- delayed announcing the P5</a></li>
- <li><a href="/fun/jokes/unreliable.net.html">Top 10 Unreliable
- Networks</a></li>
- <li>The <a href="/fun/jokes/vaxorcist.html">Vaxorcist</a></li>
- <li><a href="/fun/jokes/virus-warning.html">Virus Warning</a></li>
- <li><a href="/fun/jokes/gullibility.virus.html">The Gullibility
Virus</a></li>
- <li><a href="/fun/jokes/deadbeef.html">Dead Beef</a>?</li>
- <li><a href="/fun/jokes/gcc_audio.html">A Swarm of Gnats?</a></li>
- <li><a
href="https://web.archive.org/web/20150224010742/http://www.joke-archives.com/computers/deletedcharacters.html";>
- Where Do Deleted Characters Go?</a></li>
- <li><a href="/fun/jokes/10-kinds-of-people.html">10 Kinds of People in
- the World</a></li>
- <li><a href="/fun/jokes/xmodmap.html">Physical Xmodmap, or The Dvorak
- Typewriter Hack</a></li>
- <li><a href="/fun/jokes/evilmalware.html">Why GNU/Linux Viruses are
- fairly uncommon</a></li>
-</ul>
-
-<h3 id="ScienceAndEngineering">Science and Engineering</h3>
-
-<ul>
- <li><a href="/fun/jokes/phone.features.html">Phone Features</a></li>
- <li><a href="/fun/jokes/physics.html">The Physics Store!</a></li>
- <li>Some <a href="/fun/jokes/science.facts.html">Scientific Facts</a></li>
+ <li><a href="/fun/jokes/anagrams.html">Anagrams</a> for some common
+ words</li>
+ <li><a href="/fun/jokes/fundefinitions1.html">Fun Definitions 1</a></li>
+ <li><a href="/fun/jokes/fundefinitions2.html">Fun Definitions 2</a></li>
+ <li><a href="/fun/jokes/grammar-in-the-bar.html">Grammar in the bar</a></li>
+ <li><a href="/fun/jokes/spilling-checker.html">Spilling Checker</a></li>
+ <li><a href="/fun/jokes/typoglycemia.html">Typoglycemia</a></li>
</ul>
<h3 id="Spam">Spam</h3>
@@ -146,13 +159,6 @@
Needed</a></li>
</ul>
-<h3 id="Dictionary">Dictionary</h3>
-
-<ul>
- <li><a href="/fun/jokes/fundefinitions1.html">Fun Definitions 1</a></li>
- <li><a href="/fun/jokes/fundefinitions2.html">Fun Definitions 2</a></li>
-</ul>
-
<!-- Most readers like lists to be of manageable length. So try as
this Unclassified section grows, to add new sections above.
That is, classify some of the unclassified jokes into new
@@ -161,35 +167,32 @@
<h3 id="Unclassified">Unclassified</h3>
<ul>
- <li><a href="/fun/jokes/grammar-in-the-bar.html">Grammar in the bar</a></li>
- <li>A luser's <a href="/fun/jokes/luser-vs-rms.html">interaction</a>
- with <a href= "http://www.stallman.org/";>rms</a></li>
- <li><a href="/fun/jokes/anagrams.html">Anagrams</a> for some common
- words</li>
- <li>A war against <a href="/fun/jokes/bug.war.html">Bugs</a>!</li>
+ <li><a href="/fun/jokes/bug.war.html">A war against bugs</a>!</li>
<li>Funny <a href="/fun/jokes/courtroom.quips.html">Court
Statements</a></li>
<li><a href="/fun/jokes/fsf-in-german.html">FSF in German</a></li>
<li><a href="/fun/jokes/gospel.html">Gospel</a></li>
<li><a href="/fun/jokes/look-and-feel.html">Look and Feel</a></li>
+ <li>A luser's <a href="/fun/jokes/luser-vs-rms.html">interaction</a>
+ with <a href= "http://www.stallman.org/";>rms</a></li>
+ <li><a href="/fun/jokes/musical-pickup.html">Musical pickup</a></li>
<li><a href="/fun/jokes/panama.html">Panama</a></li>
<li><a href="/fun/jokes/quotations.html">Quotations</a></li>
- <li><a href="/fun/jokes/smileys.html">Smileys :-)</a></li>
- <li><a href="/fun/jokes/spilling-checker.html">Spilling Checker</a></li>
<li><a href="/fun/jokes/santa_comes_to_town.html">Santa Claus comes to
town</a></li>
- <li><a href="/fun/jokes/typoglycemia.html">Typoglycemia</a></li>
- <li>The <a href="/fun/jokes/wolf-logo.html">Wolf Logo</a></li>
- <li><a href="/fun/jokes/filks.html">Some Filks</a></li>
+ <li><a href="/fun/jokes/smileys.html">Smileys :-)</a></li>
<li><a href="/fun/jokes/users-lightbulb.html">How many GNU/Linux users are
needed to change a light bulb?</a></li>
+ <li><a href="/fun/jokes/wolf-logo.html">The Wolf Logo</a></li>
</ul>
<!-- Most readers like lists to be of manageable length. So try as
this Unclassified section grows, to add new sections above.
That is, classify some of the unclassified jokes into new
categories. -->
-<h4 id="Guidelines">Humor Submission Guidelines</h4>
+<div class="infobox">
+<hr />
+<h3 id="Guidelines">Humor Submission Guidelines</h3>
<!-- See the README file under the /fun/ directory -->
@@ -207,19 +210,21 @@
fields.</li>
</ol>
-<h4 id="Disclaimer">Disclaimer</h4>
-
+<div id="Disclaimer" role="contentinfo">
+<h3>Disclaimer</h3>
<p>Much of the material on this page (and linked to from it) was
-obtained from the FSF's <a href= "ftp://lists.gnu.org/";>email
-archives</a> of the GNU Project.</p>
+obtained from the FSF's email archives of the GNU Project. The Free Software
+Foundation claims no copyrights on these.</p>
+</div>
+</div>
-<p>The Free Software Foundation claims no copyrights on these. And
-we'll end this page with a
-perfect <a href="/fun/jokes/purchase.agreement.html">Disclaimer</a>!</p>
+<p class="comment">*** And we'll end this page with a perfect <a
+href="/fun/jokes/purchase.agreement.html">Disclaimer</a>! ***</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
@@ -237,13 +242,13 @@
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>
@@ -264,7 +269,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2015, 2018, 2020 Richard M. Stallman</p>
+<p>Copyright © 1999-2021 Richard M. Stallman</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -274,7 +279,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/11/11 10:00:01 $
+$Date: 2021/07/12 06:30:45 $
<!-- timestamp end -->
</p>
</div>
Index: fun/po/humor.zh-cn.po
===================================================================
RCS file: /web/www/www/fun/po/humor.zh-cn.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- fun/po/humor.zh-cn.po 12 Jul 2021 06:20:32 -0000 1.21
+++ fun/po/humor.zh-cn.po 12 Jul 2021 06:30:45 -0000 1.22
@@ -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: 2021-07-11 17:25+0000\n"
#. type: Content of: <title>
msgid "Laugh along with GNU - GNU Project - Free Software Foundation"
Index: philosophy/linux-gnu-freedom.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/linux-gnu-freedom.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/linux-gnu-freedom.zh-cn.html 30 Dec 2019 12:08:30 -0000
1.7
+++ philosophy/linux-gnu-freedom.zh-cn.html 12 Jul 2021 06:30:45 -0000
1.8
@@ -1,7 +1,10 @@
<!--#set var="ENGLISH_PAGE" value="/philosophy/linux-gnu-freedom.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.90 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>LinuxãGNUåèªç± - GNUå·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
@@ -12,11 +15,15 @@
<!--#include virtual="/philosophy/po/linux-gnu-freedom.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="reduced-width">
<h2>LinuxãGNUåèªç±</h2>
-<p>
- <strong>Richard M. Stallman</strong> è</p>
+<address class="byline">Richard Stallman è</address>
+<div class="article">
<p>
ç±äº <a
href="https://web.archive.org/web/20190404115541/http://linux.sys-con.com/node/32755";>
@@ -44,7 +51,7 @@
å¨70年代ï¼è®¡ç®æºç¨æ·å
为没è½çæä»ä»¬çèªç±è失å»äºéæ°æ£å¸åæ´æ¹è½¯ä»¶çèªç±ã计ç®æºç¨æ·å¨80以å90年代éæ°è·å¾äºè¿äºèªç±ï¼å
为ä¸ç¾¤çæ³ä¸»ä¹è
ï¼ä¹å°±æ¯GNUå·¥ç¨ï¼ç¸ä¿¡æ£æ¯èªç±è®©è½¯ä»¶åå¾æ´å¥½ï¼å¹¶ä¸æ¿æ为äºè¿ä¸ªä¿¡ä»°èåªåã</p>
<p>
æ们ä»å¤©æ¥æäºä¸é¨ä»½èªç±ï¼ä½æ¯æ们çèªç±å¹¶ä¸å®å
¨ãå®åå°ç±å¹¿æ“ä¿æ¤”讨论群ï¼åç<a
-href="http://www.eff.org/";>http://www.eff.org/</a>ï¼ç»æåºç<abbr
title="Consumer
+href="https://www.eff.org/";>www.eff.org/</a>ï¼ç»æåºç<abbr
title="Consumer
Broadband and Digital Television Promotion Act">CBDTPA</abbr>ï¼ä»¥åç<abbr
title="Security Systems Standards and Certification
Act">SSSCA</abbr>ï¼æ³æ¡çå¨èï¼è¯¥ç¾¤ç»æè®®ç¦æ¢èªç±è½¯ä»¶æ¶è¶³çµè§å¹¿æï¼å®æéåçæ¹å¼æï¼è½¯ä»¶ä¸å©ï¼æ¬§æ´²æ£å¨èèæ¯å¦è¦æ软件ä¸å©ï¼ã微软å
³é®åè®®çä¿å¯å¥çº¦ã以åæ¯ä¸ªä»¥éèªç±è½¯ä»¶“ï¼å¨ææ¯ä¸ï¼æ´å¥½”æ¥è¯±ä½¿æ们è¿ç¦»å¯ç¨çèªç±è½¯ä»¶ç人ãå¦ææ们ä¸å¤å
³å¿å¦ä½å»ä¿æ¤å®ï¼æ们ä¼åæ们第ä¸æ¬¡å¤±å»å®ä»¬ä¸æ
·å°å次失å»æ们çèªç±ã</p>
@@ -52,7 +59,7 @@
å
³å¿ç人å¤å¤åï¼è¿åå³äºè®¸å¤äºæ
ï¼å
¶ä¸å
æ¬ï¼GNUå·¥ç¨æå¤å°å½±ååï¼Linus
Torvaldsæå¤å°å½±ååãGNUå·¥ç¨è¯´ï¼“çæä½
çèªç±ï¼”ãJoe
Barr说３ä»
å¨ææ¯å±é¢ä»éèªç±æèªç±è½¯ä»¶ä¸éæ©ï¼”ãå¦æ人们认å¯Torvalds为GNU/Linuxç³»ç»ç主è¦å¼åè
ï¼é£ä¸åªæ¯ä¸åç¡®ï¼èä¸ä¹åæ¶è®©ä»ç讯æ¯æ´å
·å½±åå—èé£è®¯æ¯æ¯“éèªç±è½¯ä»¶ä¹è¡ï¼æèªå·±å°±å¨ä½¿ç¨å¹¶å¼åå®”ãå¦æä»ä»¬æ¿è®¤æ们çè§è²ï¼ä»ä»¬å°±ä¼å¤å¬å¬æ们ï¼èæ们ç»ä»ä»¬ç讯æ¯å°æ¯“è¿ä¸ªç³»ç»ä¹æ以åå¨ï¼æ¯å
为人们å¨ä¹èªç±ãå å
¥æ们ï¼çæä½
çèªç±ï¼å¢ç»å¨ä¸èµ·æ们就è½ä¿æå®”ãåç<a
-href="/gnu/thegnuproject.html">http://www.gnu.org/gnu/thegnuproject.html</a>æ¥äºè§£ç¸å
³åå²ã</p>
+href="/gnu/thegnuproject.html">GNU å·¥ç¨</a>æ¥äºè§£ç¸å
³åå²ã</p>
<p>
å½æè¦æ±äººä»¬ç§°å¼è¿ä¸ªç³»ç»ä¸ºGNU/Linuxæ¶ï¼æäºäººä»¥<a
href="/gnu/gnu-linux-faq.html">å¯ç¬çèå£å稻è人</a>æ¥ååºãä½æ¯æ们å¯è½å¹¶æ²¡æ失å»ä»ä¹ï¼å
为ä»ä»¬å¾æå¯è½ä¸å¼å§å°±ä¸ååãå¨æ¤åæ¶ï¼å
¶ä»äººè®¤å¯äºæç»åºççç±ï¼å¹¶ä¸ä½¿ç¨é£ååãè¿æ
·ï¼ä»ä»¬å°±å¸®å©å
¶ä»äººäºè§£ä¸ºä»ä¹GNU/Linuxç³»ç»ç¡®å®åå¨ï¼è¿èä¹å°±æé«äºæ们ä¼
æ“èªç±æ¯ä¸ä¸ªéè¦çä»·å¼”è¿ä¸è§å¿µçè½åã</p>
@@ -75,17 +82,21 @@
<p>
å¨Linux“æºç
”æ件ä¸åºç°çè¿äºåªæäºè¿å¶å½¢å¼çç¨åºï¼é
æäºå¦ä¸ä¸ªé®é¢ï¼é£å°±æ¯ï¼Linuxçäºè¿å¶ç
å°åºæ¯å¦å¯ä»¥åæ³å°ååå¸ãGPLè¦æ±“å®å¤çç¸å
³æºç
”ï¼èæ°åå符串并éæºç ãæç
§ç¸åçç±ï¼æ·»å è¿æ
·çäºè¿å¶ç å°Linuxæºç è¿åäºGPLçè§å®ã</p>
<p>
- Linuxå¼åè
æ个项ç®æ¯å°è¿äºåºä»¶ç¨åºè½¬ç§»å°åç¬çæ件ä¸ï¼è¯¥é¡¹ç®éè¦æ°å¹´çæ¶é´æä¼æçï¼ä¸è¿å½å
¶å®ææ¶å°ä¼è§£å³è¿ä¸ªé®é¢ï¼æ们å¯ä»¥ä½åºä¸ä¸ª“èªç±çLinux”çæ¬ï¼èå
¶ä¸ä¸å
æ¬ä»»ä½éèªç±çåºä»¶ç¨åºãä½æ¯å¦æ大å¤æ°äººé½å¨ä½¿ç¨éèªç±ç“å®æ¹”Linuxçæ¬ï¼é£ä¹è¯¥é¡¹ç®æ¬èº«å¹¶æ²¡æä»ä¹ç¨å¤ãè¿å¾æå¯è½åçï¼å
为èªç±çæ¬å¨è®¸å¤å¹³å°ä¸ï¼å¦æ没æéèªç±çåºä»¶é½å°æ
æ³è¿è¡ã“èªç±çLinux”å·¥ç¨å°ä¸å¾ä¸å¼æç½è¿äºåºä»¶ç©¶ç«åäºä»ä¹ï¼å¹¶ä¸ä¸ºå®ä¹ç¼åæºç
ï¼ä¹è®¸è¦ä»¥æ±ç¼è¯è¨ä¸ºè¦è¿è¡çåµå
¥å¼å¤çå¨å¹³å°æ¥æ°åãè¿å°ä¼æ¯ä»¶æå
¶è°å·¨çå·¥ä½ãä½æ¯å¦ææ们å¨æ©å
å¹´å°±å¼å§ä¸ç¹ä¸æ»´å°è¿è¡ï¼èä¸æ¯çå®å
积起æ¥ï¼å®å°±ä¸é£ä¹è°å·¨äºãéè¿æå人åæ¥è¿è¡è¿é¡¹å·¥ä½ï¼æ们å°ä¸å¾ä¸å
æç±æäºLinuxå¼åè
ææ£æç“è¿ä»¶å·¥
ä½æ¯ä¸å¿
è¦ç”è§å¿µã</p>
+ Linuxå¼åè
æ个项ç®æ¯å°è¿äºåºä»¶ç¨åºè½¬ç§»å°åç¬çæ件ä¸ï¼è¯¥é¡¹ç®éè¦æ°å¹´çæ¶é´æä¼æçï¼ä¸è¿å½å
¶å®ææ¶å°ä¼è§£å³è¿ä¸ªé®é¢ï¼æ们å¯ä»¥ä½åºä¸ä¸ª“èªç±çLinux”çæ¬ï¼èå
¶ä¸ä¸å
æ¬ä»»ä½éèªç±çåºä»¶ç¨åºãä½æ¯å¦æ大å¤æ°äººé½å¨ä½¿ç¨éèªç±ç“å®æ¹”Linuxçæ¬ï¼é£ä¹è¯¥é¡¹ç®æ¬èº«å¹¶æ²¡æä»ä¹ç¨å¤ãè¿å¾æå¯è½åçï¼å
为èªç±çæ¬å¨è®¸å¤å¹³å°ä¸ï¼å¦æ没æéèªç±çåºä»¶é½å°æ
æ³è¿è¡ã“èªç±çLinux”å·¥ç¨å°ä¸å¾ä¸å¼æç½è¿äºåºä»¶ç©¶ç«åäºä»ä¹ï¼å¹¶ä¸ä¸ºå®ä¹ç¼åæºç
ï¼ä¹è®¸è¦ä»¥æ±ç¼è¯è¨ä¸ºè¦è¿è¡çåµå
¥å¼å¤çå¨å¹³å°æ¥æ°åãè¿å°ä¼æ¯ä»¶æå
¶è°å·¨çå·¥ä½ãä½æ¯å¦ææ们å¨æ©å
å¹´å°±å¼å§ä¸ç¹ä¸æ»´å°è¿è¡ï¼èä¸æ¯çå®å
积起æ¥ï¼å®å°±ä¸é£ä¹è°å·¨äºãéè¿æå人åæ¥è¿è¡è¿é¡¹å·¥ä½ï¼æ们å°ä¸å¾ä¸å
æç±æäºLinuxå¼åè
ææ£æçè§å¿µï¼è¿ä»¶å
·¥ä½æ¯ä¸å¿
è¦çã</p>
<p>
ä½ä¸ºå
æ
¸çLinuxé常被è§ä¸ºèªç±è½¯ä»¶çæè°ï¼ç¶èå®ç®åççæ¬å´æä¸é¨ä»½æ¯éèªç±çã为ä»ä¹ä¼è¿æ
·ï¼å°±åå³å®ä½¿ç¨Bitkeeperçé®é¢ä¸æ
·ï¼è¿ä¸ªé®é¢ååºåºäºLinuxåå§å¼åè
çæ度ï¼å°±æ¯è®¤ä¸º“ææ¯ä¸æ´å¥½”æ¯èªç±æ´éè¦ã</p>
<p>
åå²åè¯æ们ï¼çæä½ çèªç±ï¼å¦åä½
å°ä¼å¤±å»å®ã以“ä¸è¦ä»¥æ¿æ²»æ¥ç¦æ们”ä½ä¸ºååºç人ï¼æ¯é£äºä¸æ¿æ¥åæè®ç人ã</p>
+<div class="column-limit"></div>
<p id="update">
<strong>æåæ´æ°ï¼</strong>ä»2005å¹´èµ·ï¼Linuxå
æ ¸çæºä»£ç
ä¸å使ç¨BitKeeper管çãåçæç« ï¼<a
href="/philosophy/mcvoy.html">è´è°¢Larry
McVoy</a>ãLinuxæºä»£ç
ä»ç¶å«æéèªç±çåºä»¶blobsï¼ä½æ¯å¨2008å¹´1æï¼æ们维æ¤äºä¸ä¸ª<a
href="//directory.fsf.org/project/linux">èªç±ççLinux</a>ï¼å¹¶è¢«èªç±çGNU/Linuxåè¡ç使ç¨ã</p>
+</div>
+</div>
+
<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -94,7 +105,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
@@ -113,15 +124,16 @@
<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="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>è·åæå
³åè°åæ交翻è¯çç¸å
³äºé¡¹ã</p>
+æ们尽æ大åªåæ¥æä¾ç²¾ååé«è´¨éçç¿»è¯ï¼ä½é¾å
ä¼åå¨é误åä¸è¶³ãå¦ææ¨å¨è¿æ¹é¢æè¯è®ºæä¸è¬æ§ç建议ï¼è¯·åéè³
<a
+href="mailto:web-translators@gnu.org";><web-translators@gnu.org></a>ã</p><p>å
³äºè¿è¡åè°ä¸æ交翻è¯çæ´å¤ä¿¡æ¯åè§
+<a href="/server/standards/README.translations.html">ãè¯è
æåã</a>ã</p>
</div>
-<p>Copyright © 2002, 2017, 2019 Richard M. Stallman</p>
+<p>Copyright © 2002, 2017, 2019, 2021 Richard M. Stallman</p>
<p>æ¬é¡µé¢éç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -133,16 +145,17 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯</b>ï¼åæå®ï¼2012ã<br></br>
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2018-2019ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2018-2019ï¼2021ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/12/30 12:08:30 $
+$Date: 2021/07/12 06:30:45 $
<!-- timestamp end -->
</p>
</div>
</div>
+<!-- for class="inner", starts in the banner include -->
</body>
</html>
Index: philosophy/shouldbefree.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/shouldbefree.zh-cn.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/shouldbefree.zh-cn.html 26 Oct 2020 13:34:15 -0000 1.9
+++ philosophy/shouldbefree.zh-cn.html 12 Jul 2021 06:30:45 -0000 1.10
@@ -1,19 +1,26 @@
<!--#set var="ENGLISH_PAGE" value="/philosophy/shouldbefree.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>为ä»ä¹è½¯ä»¶åºè¯¥æ¯èªç±ç - GNUå·¥ç¨ -
èªç±è½¯ä»¶åºéä¼</title>
<!--#include virtual="/philosophy/po/shouldbefree.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="reduced-width">
<h2>为ä»ä¹è½¯ä»¶åºè¯¥æ¯èªç±ç</h2>
-<p>
-<a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a>
è</p>
-<h3 id="introduction">ç®ä»</h3>
-<p>
+<address class="byline"><a
href="https://www.stallman.org/";>çæ¥å¾·Â·æ¯ææ¼</a> è</address>
+
+<div class="article">
+<p id="introduction">
软件çåå¨ä¸å¯é¿å
å°å¼èµ·äºæå
³å®ç使ç¨åºè¯¥å¦ä½å³å®çé®é¢ã举ä¾æ¥è¯´ï¼å设ä¸ä¸ªäººæ¥æä¸ä¸ªç¨åºçä¸ä»½æ·è´ï¼èä»åéå°å¦ä¸ä¸ªæ³è¦æ·è´ç人ãä»ä»¬å°±æå¯è½å¤å¶è¿ä¸ªç¨åºï¼é£ä¹è¿ç§åæ³ç容许ä¸å¦åºè¯¥ç±è°æ¥å¤æå¢ï¼åä¸å
¶ä¸ç个人ï¼è¿æ¯è¢«ç§°ä½“ææè
”çå¦ä¸æ¹ï¼</p>
<p>
å
¸åç软件å¼å人åä¼ä»¥å¼å人åçå©æ¶¦æ大åè¿ä¸ªæ
åä½ä¸ºå设æ¥èèè¿äºé®é¢ãåä¸çæ¿æ²»åé使å¾æ¿åºé纳äºä¸è¿°æ
ååå¼å人å建议ççæ¡ï¼å³è½¯ä»¶é½æä¸ä¸ªææè
ï¼èè¿ä¸ªææè
ä¸è¬æ¯ä¸ä¸ªåä¸å
¶å¼åçå
¬å¸ã</p>
@@ -25,7 +32,7 @@
å¨è¿ç¯æç« ä¸ï¼æå°åè¿°æ¥æææè
带æ¥çå½±åï¼å¹¶æåºç»ææ¯ä¸å©çãæçç»è®ºæ¯ç¨åºåæä¹å¡å»é¼å±ä»äººå
±äº«ãååå¸ãç
究并æ¹è¿æ们ç¼åç软件ï¼æ¢å¥è¯è¯´ï¼å°±æ¯è¦å<a
href="/philosophy/free-sw.html">“èªç±”软件</a>ã<a
href="#f1">(1)</a></p>
-<h3 id="owner-justification">软件ææè
å¦ä½åçåä»ä»¬çæå</h3>
+<h3 id="owner-justification" class="subheader">软件ææè
å¦ä½åçåä»ä»¬çæå</h3>
<p>
å¨å½åçç³»ç»ä¸ï¼ç¨åºå°±æ¯è´¢äº§ï¼ä»ä¸è·å©ç人æåºäºä¸¤ä¸ªè®ºè¯ä»¥æ¯æä»ä»¬æ¥æç¨åºç声æï¼ææ
ä¸ç论è¯åç»æµä¸ç论è¯ã</p>
<p>
@@ -41,7 +48,7 @@
<p>
软件系ç»æäºçæï¼è½¯ä»¶å¼åé常就åå
¶ææè
çåå¨æå
³ï¼ä»ä»¬å¯ä»¥æ§å¶è¯¥è½¯ä»¶ç使ç¨ãåªè¦è¿ä¸ªèç³»åå¨ï¼æ们就ç»å¸¸è¦å¨ä¸æ软件å没æ软件ä¹é´ä½åºéæ©ãç¶èï¼è¿ä¸ªè系并ä¸æ¯åºææå¿
ç¶çï¼èæ¯ç¹å®ç社ä¼/æ³å¾æ¿çå³å®çåæï¼èè¿å³å®æ£æ¯æ们æè´¨ççï¼è½¯ä»¶è¯¥æææè
çå³å®ãå°äºæ
解éæåªè½å¨ä¸å©è½¯ä»¶å没æ软件两è
ä¸äºéä¸ç论ç¹ä¿ä½¿æ们æåºè´¨çã</p>
-<h3 id="against-having-owners">å对æ¥æææè
ç论è¯</h3>
+<h3 id="against-having-owners" class="subheader">å对æ¥æææè
ç论è¯</h3>
<p>
å½åçé®é¢æ¯ï¼“软件çå¼ååºè¯¥åéå¶å®ä»¬ä½¿ç¨çææè
èç³»å¨ä¸èµ·åï¼”</p>
<p>
@@ -202,7 +209,7 @@
Vaclav
Havel建议æ们“为æçä¹äºèå·¥ä½ï¼èä¸æ¯åªä¸ºè½å¤æåèå·¥ä½ã”å¶ä½ä¸å±è½¯ä»¶çåä¸å
¬å¸æå®èªå·±çéæä¹çæåï¼ä½é£ä¸æ¯å¯¹ç¤¾ä¼æççäºã</p>
-<h3 id="why-develop">人们为ä»ä¹è¦å¼å软件</h3>
+<h3 id="why-develop" class="subheader">人们为ä»ä¹è¦å¼å软件</h3>
<p>
å¦æä½ä¸ºé¼å±äººä»¬å¼å软件çæ¹æ³ï¼æ们åºé¤çæï¼é£ä¹ä¸å¼å§å¼åç软件ä¼è¾å°ï¼ä½è¿äºè½¯ä»¶ä¼æ´æç¨ãæ»ä½ä¸ç¨æ·ç满æ度ä¼ä¸ä¼æ´å°ä¸æ¸
æ¥ï¼ä½å¦ææ¯ï¼æè
æ们就æ¯å¸æå¢å 满æ度ï¼è¿æå
¶ä»çåæ³é¼å±å¼åï¼æ£åé¤äºæ¶è´¹ç«è¿æå
¶ä»æ¹æ³ä¸ºéè·¯ç¹éèµéä¸æ ·ãå¨æè°è®ºå¦ä½åä¹åï¼ææ³å
é®å¤å°äººä¸ºçé¼å±æ¯çæ£å¿
é¡»çã</p>
@@ -253,7 +260,7 @@
<p>
æç¸ä¿¡ï¼é¢å¯¹è¿æ ·ççç¾ï¼ä¸ä¸ªæéå¾·çå¼å人åå¿
é¡»ææè¡å¨ä»¥ä¾¿è·å¾æ¥é
¬ï¼ä½ä¹åºè¯¥è¯·æ±ç¨æ·ä»¬ç»äºèªæ¿çæå©ãæç»ï¼ç¨æ·ä»¬å°å¦ä¼æ¯«æ
强迫å°æ¯æå¼å人åï¼å°±åä»ä»¬æ¯æå
¬ä¼å¹¿æçµå°åçµè§å°é£æ ·ã</p>
-<h3 id="productivity">软件ç产åæ¯ä»ä¹ï¼ </h3>
+<h3 id="productivity" class="subheader">软件ç产åæ¯ä»ä¹ï¼ </h3>
<p>
å¦æ软件æ¯èªç±çï¼ä»ç¶ä¼æç¨åºåï¼ä½ä¹è®¸æ´å°ãè¿å¯¹ç¤¾ä¼æ害åï¼
</p>
<p>
@@ -271,7 +278,7 @@
<p>
“软件ç产å”å¯ä»¥ä»£è¡¨ä¸¤ä¸ªä¸åçä¸è¥¿ï¼ä¸å软件å¼åçæ»ä½ç产åæåç¬æ个项ç®çç产åãæ»ä½ç产åæ¯ç¤¾ä¼éè¦æé«çï¼èææç´æ¥çæ¹æ³è«è¿äºæ¸
é¤ä¼éä½ç产åãå对åä½ç人为éç¢ã体软件ç产å”é¢åçç
究人åå´ä¸æ³¨äºæ¤æ¯è¯ç次è¦çãå±éçå«ä¹ï¼å³æé«çååéè¦è°é¾çææ¯è¿æ¥ã</p>
-<h3 id="competition">ç«äºæ¯å¿
ç¶åï¼</h3>
+<h3 id="competition" class="subheader">ç«äºæ¯å¿
ç¶åï¼</h3>
<p>
人们è¯å¾ç«äºï¼è¶
è¿ä»ä»¬å¨ç¤¾ä¼ä¸çç«äºå¯¹æï¼è¿æ¯å¿
ç¶çåï¼ä¹è®¸æ¯å§ãä½ç«äºæ¬èº«ä¸æ¯åäºï¼æ害çäºæ
æ¯<em>æäº</em>ã</p>
<p>
@@ -286,7 +293,7 @@
åä¸çæ³æ²¡æ使人们å好åå¤æ¥æµå¾¡ä¸ºç«äºèæäºç诱æãæäºå½¢å¼çæäºå·²ç»è¢«åæææ¯æ³<sup><a
href="#TransNote1">1</a></sup>æç¦æ¢ï¼å¹¿åæ³å°±æ¯è¿æ
·ï¼è¿æå¾å¤ï¼ä½æ§è¡ç»ç们å´åé äºå
¶ä»æ²¡æ被ä¸é¨ç¦æ¢çæäºå½¢å¼ï¼èä¸æ¯æè¿å½çº³ä¸ºæ®éæç»æäºçååã社ä¼èµæºè¢«æµªè´¹å¨ç±»ä¼¼ç»æµæ´¾ç³»çå
æä¸ã</p>
-<h3 id="communism">“ä½ ä¸ºä»ä¹ä¸å»ä¿ç½æ¯ï¼”</h3>
+<h3 id="communism" class="subheader">“ä½
为ä»ä¹ä¸å»ä¿ç½æ¯ï¼”</h3>
<p>
å¨ç¾å½ï¼é¤äºæ¾ä»»èªç±çæ端形å¼ï¼å
¶ä»ä»»ä½ç念çæ¥æ¤è
é½ç»å¸¸å¬å°è¿æ
·çæè´£ãä¾å¦ï¼å½å®¶å¥åº·ä¿éç³»ç»çæ¯æè
就被贴ä¸è¿æ
·çåæ´¾æ ç¾ï¼å°±åå¨ææèªç±ä¸ççå
¶ä»å·¥ä¸å½å®¶ä¸æ ·ãå
¬ä¼æ¯æèºæ¯çæ¥æ¤è
ä¹è¢«è¿æ ·å对ï¼ä¹åå¨å
¶ä»ä¸çåè¾¾å½å®¶ä¸æ ·ãå¨ç¾å½ï¼è¿ç§å
¬æ°æä¹å¡å¯¹å
¬ä¼åè´¡ç®çææ³å°±è¢«çææ¯å
±äº§ä¸»ä¹ãä½è¿äºæ³æ³æ¯å¤ä¹ç¸ä¼¼åï¼</p>
<p>
@@ -298,7 +305,7 @@
<p>
å æ¤ï¼å¦ææ们è¦ä»ä¸ä¿å½å
±äº§ä¸»ä¹ç¸ä¼¼çè§åº¦åºåæ¥å¤æçè¯ï¼è½¯ä»¶ææè
å°±æ¯å
±äº§ä¸»ä¹è
ã</p>
-<h3 id="premises">å设åæçé®é¢</h3>
+<h3 id="premises" class="subheader">å设åæçé®é¢</h3>
<p>
å¨è¿ç¯æç« ä¸ï¼æå设äºè½¯ä»¶çç¨æ·å软件çä½è
ï¼çè³æ¯å软件ä½è
çé主ä¸æ
·éè¦ãæ¢å¥è¯è¯´ï¼å½æ们å¤æåªä¸ªè¡å¨æ¥éª¤æ好çæ¶åï¼ä»ä»¬çå©çåéæ±çåéæ¯å¹³ççã</p>
<p>
@@ -314,7 +321,7 @@
<p>
æ们ä¸éè¦åæ宪æ³ææé«æ³é¢ãï¼æä¸åº¦ï¼ä»ä»¬é½å®½å®¹äºå¥´é¶å¶ãï¼æ以ä»ä»¬çç«åºå¹¶æ²¡æè¯æææè
è³ä¸çå设æ¯ä¸æ£ç¡®çãä½æå¸æï¼å¤§å®¶æè¯å°ææè
è³ä¸æ¯ä¸ç§æ¿è¿çå³ç¿¼å设ï¼èä¸æ¯ä¼
ç»ä»¥æ¥å°±è¢«è®¤å¯çå设ï¼è¿å°±ä¼å弱该å设çå¸å¼åã</p>
-<h3 id="conclusion">ç»è®º</h3>
+<h3 id="conclusion" class="subheader">ç»è®º</h3>
<p>
æ们æ¿ææ³åæ们ç社ä¼é¼å±é»éäºå©ï¼ä½æ¯æ¬¡æ们å¥å±é£äºé»æ
ç人ï¼æè
羡æ
ä»ä»¬ä»¥è¿ç§æ¹å¼è·å¾çè´¢å¯ï¼æ们就æ¯ååºé误çä¿¡æ¯ã</p>
<p>
@@ -322,9 +329,10 @@
Cheneyï¼ä»Exxonå°Enronï¼ä»ç ´äº§çé¶è¡å°å¤±è´¥çå¦æ
¡é½å¯ä»¥æ¾å°è¿ç§æ¼ è§çç迹ãæ们å¯ä»¥ç¨æ
家å¯å½ç人å£å罪ç¯çæ°éæ¥è¡¡éãè¿ç§å社ä¼çç²¾ç¥ä¼èªæä¼
æï¼å 为æ们çå°çå
¶ä»äººä¸å¸®å©æ们çäºè¶å¤ï¼é£ä¹æ们就è¶è§å¾å¸®å©ä»ä»¬è¶æ
æä¹ãè¿æ ·ï¼æ们ç社ä¼å°±ä¼æºå为混乱ä¸å ªä¹ä¸æã</p>
<p>
å¦ææ们ä¸æ³çæ´»å¨ä¸æä¹ä¸ï¼é£ä¹æ们就å¿
é¡»æ¹åæ度ãæ们å¿
é¡»å¼å§ååºè¿æ ·çä¿¡æ¯ï¼å¥½å
¬æ°åºè¯¥å¨éå½çæ¶åäºç¸åä½ï¼èä¸æ¯ç±æ
夺ä»äººèè·å¾æåãæå¸æèªç±è½¯ä»¶è¿å¨ä¼æå©äºæ¤ï¼è³å°å¨ä¸ä¸ªå°åºï¼æ们å°ç¨ä¸ä¸ªæ´ä¸ºææçï¼é¼å±å¹¶ä¸è¿è¡å¨å¿æ¿åä½ä¸çç³»ç»æ¥å代混乱ä¸å
ªçä¸æã</p>
+<div class="column-limit"></div>
+</div>
-
-<h3 id="footnotes">è注</h3>
+<h3 id="footnotes" class="footnote">è注</h3>
<ol>
<li id="f1">“free
@@ -336,10 +344,13 @@
Marketplaceç个人信æ¯æ°æ®åºä¸æ ·ï¼å å
¬ä¼çå对èéåºå¸åºãæ说ç大é¨åè¯é½ä¸éç¨äºè¿ç§æ
åµï¼ä½æä¸ç§äºè®ºï¼è¯´å¨æææè
å°±å¯ä»¥ä½¿è¿ç§ç¨åºä¸å¤§å¯è½å¾å°ï¼è¿æ¯«æ
éçãå¦æä¸ä¸ªç¨åºçä½ç¨è¢«è®¤ä¸ºæ¯ç
´åæ§çï¼å°±åæ人å¸æçé£æ ·ï¼é£ä¹å
¶ææè
æ¯ä¸ä¼è®©å®<em>å®å
¨</em>å¾ä¸å°çã</li>
</ol>
-<hr />
-<blockquote id="fsfs"><p>æ¬æå表äº<a
-href="http://shop.fsf.org/product/free-software-free-society/";><cite>èªç±è½¯ä»¶ï¼èªç±ç¤¾ä¼ï¼Richard
-M. Stallmanéé</cite></a>ã</p></blockquote>
+<hr class="thin" />
+<div id="fsfs" role="complementary">
+<p>æ¬æå表äº<a
+href="https://shop.fsf.org/product/free-software-free-society/";><cite>èªç±è½¯ä»¶ï¼èªç±ç¤¾ä¼ï¼Richard
+M. Stallmanéé</cite></a>ã</p>
+</div>
+</div>
<div class="translators-notes">
@@ -352,7 +363,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
@@ -371,15 +382,17 @@
<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="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>ã</p>
+æ们尽æ大åªåæ¥æä¾ç²¾ååé«è´¨éçç¿»è¯ï¼ä½é¾å
ä¼åå¨é误åä¸è¶³ãå¦ææ¨å¨è¿æ¹é¢æè¯è®ºæä¸è¬æ§ç建议ï¼è¯·åéè³
<a
+href="mailto:web-translators@gnu.org";><web-translators@gnu.org></a>ã</p><p>å
³äºè¿è¡åè°ä¸æ交翻è¯çæ´å¤ä¿¡æ¯åè§
+<a href="/server/standards/README.translations.html">ãè¯è
æåã</a>ã</p>
</div>
<p>Copyright © 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017, 2018,
-2020 Free Software Foundation, Inc.</p>
+2020, 2021 Free Software Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -392,12 +405,12 @@
<b>ç¿»è¯</b>ï¼çæåï¼2011ã<a
href="mailto:liangmeng@tsinghua.org";><liangmeng@tsinghua.org></a><br></br>
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2018ï¼2020ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2018ï¼2020ï¼2021ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2020/10/26 13:34:15 $
+$Date: 2021/07/12 06:30:45 $
<!-- timestamp end -->
</p>
Index: philosophy/when-free-software-isnt-practically-superior.zh-cn.html
===================================================================
RCS file:
/web/www/www/philosophy/when-free-software-isnt-practically-superior.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/when-free-software-isnt-practically-superior.zh-cn.html 24 Mar
2019 13:32:57 -0000 1.1
+++ philosophy/when-free-software-isnt-practically-superior.zh-cn.html 12 Jul
2021 06:30:46 -0000 1.2
@@ -1,18 +1,26 @@
<!--#set var="ENGLISH_PAGE"
value="/philosophy/when-free-software-isnt-practically-superior.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title> å½èªç±è½¯ä»¶ï¼ä½¿ç¨èµ·æ¥ï¼å¹¶ä¸æ´å¥½æ¶ - GNUå·¥ç¨ -
èªç±è½¯ä»¶åºéä¼</title>
<!--#include
virtual="/philosophy/po/when-free-software-isnt-practically-superior.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="reduced-width">
<h2> å½èªç±è½¯ä»¶ï¼ä½¿ç¨èµ·æ¥ï¼å¹¶ä¸æ´å¥½æ¶</h2>
-<p>
-<a href="https://mako.cc/writing/";><strong>Benjamin Mako Hill</strong></a>
è</p>
+<address class="byline">
+<a href="https://mako.cc/writing/";><strong>Benjamin Mako Hill</strong></a>
è</address>
+<div class="article">
<p>å¼æºå¡è®®ç使å½åå¾æ¯ï¼“å¼æºæ¯ä¸ç§è½¯ä»¶å¼åçæ¹æ³ï¼å®å©ç¨çæ¯åå¸å¼åè¡è¯è®®åéæçæµç¨ãå¼æºæ¿è¯ºæ´å¥½çè´¨éãæ´é«çå¯é
æ§ãæ´å¤ççµæ´»æ§ãæ´ä½çææ¬ä»¥åæ¶çå榨å¼çä¾åºåç»å®ã”</p>
<p>åå¤å¹´æ¥ï¼èªç±è½¯ä»¶åºéä¼ä¸ç´å对è¿ç§å¯¹èªç±è½¯ä»¶è¿å¨ç“å¼æº”çå®ãèªç±è½¯ä»¶å¡å¯¼è
å对“å¼æº”æ¡æ¶ç主è¦åå
æ¯ï¼å¼æºæç¡®å°æ·¡åæ们å
³äºèªç±çæ
¸å¿ç念ã模ç³æ们å¨æå建ç«èªç±è½¯ä»¶è¿å¨ä¹ä¸çè§è²ãæ们认为“å¼æº”ä»æ
¹æ¬ä¸å°±æ¯ä¸å¥½çï¼å
为å®ä¼å¾é»æ¢äººä»¬è°è®ºè½¯ä»¶èªç±ãä½æ¯ï¼æ们è¿æå¦å¤ä¸ä¸ªåå
è¦å°å¿å¯¹å¾
å¼æºæ¶æã就以ä¸æè¿°ç使å½ï¼å¼æºçåºæ¬è§ç¹å¹¶ä¸æ£ç¡®ã</p>
@@ -32,7 +40,7 @@
“å¼æº”ï¼è®¸å¯è¯ç项ç®çå¼åå®è·µå¹¶æ
ç¸ä¼¼ä¹å¤ã</p>
<p>好å 个å
³äº<a
href="/software/repo-criteria.html">èªç±è½¯ä»¶æ管ç½ç«</a> SourceForge
å <a
-href="http://sv.gnu.org";>Savannah</a>
+href="https://sv.gnu.org";>Savannah</a>
çå¦æ¯ç
究é½æåºä¸ä¸ªä¼å¤æ软件æ管å°ç½ç»çèªç±è½¯ä»¶å¼åè
æ©å°±å·²ç»ç¥éçç°è±¡ãç»å¤§å¤æ°èªç±è½¯ä»¶é¡¹ç®å¹¶ä¸æ¯åä½å¼åç模å¼ãSourceForge
ä¸èªç±è½¯ä»¶é¡¹ç®è´¡ç®è
çä¸ä½æ°æ¯å¤å°?æ¯
1ãæ¯ä¸ä¸ªåç¬çå¼åè
ã95% ç SourceForge
项ç®çåä¸è
åªæ5个人ãå
¶ä¸è¶
è¿åæ°çèªç±è½¯ä»¶é¡¹ç®——çè³å¤§å¤æ°æååå¸äºå
ç并æä¸è²ä¸è½½éç项ç®é½æ¯ç±ä¸ä¸ªåä¸çå¼åè
å¨æ²¡æå¤ç帮å©çæ
åµä¸ååºçä½åã</p>
@@ -44,6 +52,8 @@
<p>å¼æºçæ¨å¨è
å¿
é¡»åºå®ä»ä»¬çè§ç¹ï¼èªç±å¼åç软件åºè¯¥ï¼æè
éçæ¶é´çæ¨ç§»åºè¯¥æ¯ä¸æ软件æ´å¥½ãèèªç±è½¯ä»¶çæ¯æè
ä¼é®ï¼“æ们ææ
·æè½ä½¿èªç±è½¯ä»¶æ´å¥½ï¼”å¨èªç±è½¯ä»¶çæ¡æ¶éï¼é«è´¨éç软件æ¯è¾¾å°ç®æ
çæ段èä¸æ¯ç®æ æ¬èº«ãèªç±è½¯ä»¶çå¼åè
åºè¯¥åªåå¼ååè½å¼ºå¤§ãçµæ´»åº¦é«ç软件æ¥æ´å¥½å°ä¸ºç¨æ·æå¡ãä½æ¯è¿æ
·å并ä¸æ¯è§£å³å®¹æç¶èæä¹æ´ä¸ºé大çç®æ
çå¯ä¸éå¾ï¼è¿ä¸ªç®æ å°±æ¯å°é并ä¿æ¤ç¨æ·çèªç±ã</p>
<p>å½ç¶ï¼æ们ä¹ä¸å¿
æå¼åä½æå©äºå¼åé«è´¨é软件çè§ç¹ãå¨ä¼å¤ææåçèªç±è½¯ä»¶é¡¹ç®ä¸ï¼åä½æ¾ç¶è¯æäºè¿ä¸ç¹ãåä½ç好å¤åºè¯¥æ为被ç解ãæ¯æåå
±ååªåçæ¹åï¼èä¸æ¯æ为é¢ä¸´ä¸ç念ä¸ç¬¦çè¯æ®æ¶çæ³å½ç¶ã</p>
+</div>
+</div>
<div class="translators-notes">
@@ -53,7 +63,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
@@ -72,11 +82,13 @@
<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="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>ã</p>
+æ们尽æ大åªåæ¥æä¾ç²¾ååé«è´¨éçç¿»è¯ï¼ä½é¾å
ä¼åå¨é误åä¸è¶³ãå¦ææ¨å¨è¿æ¹é¢æè¯è®ºæä¸è¬æ§ç建议ï¼è¯·åéè³
<a
+href="mailto:web-translators@gnu.org";><web-translators@gnu.org></a>ã</p><p>å
³äºè¿è¡åè°ä¸æ交翻è¯çæ´å¤ä¿¡æ¯åè§
+<a href="/server/standards/README.translations.html">ãè¯è
æåã</a>ã</p>
</div>
<!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -106,17 +118,17 @@
<!--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>ï¼2019ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2019ï¼2021ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/03/24 13:32:57 $
+$Date: 2021/07/12 06:30:46 $
<!-- timestamp end -->
</p>
</div>
</div>
+<!-- for class="inner", starts in the banner include -->
</body>
</html>
-
Index: philosophy/po/linux-gnu-freedom.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/linux-gnu-freedom.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/linux-gnu-freedom.zh-cn-en.html 30 Dec 2019 12:08:32
-0000 1.3
+++ philosophy/po/linux-gnu-freedom.zh-cn-en.html 12 Jul 2021 06:30:46
-0000 1.4
@@ -1,17 +1,24 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.90 -->
-<title>Linux, GNU, and freedom
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Linux, GNU, and Freedom
- GNU Project - Free Software Foundation</title>
<meta http-equiv="Keywords"
content="GNU, FSF, Free Software Foundation, Linux, freedom, software,
power, rights, Richard Stallman, rms, SIGLINUX, Joe Barr" />
<meta http-equiv="Description" content="In this essay, Linux, GNU, and
freedom, Richard M. Stallman responds to Joe Barr's account of the FSF's
dealings with the Austin Linux users group." />
<!--#include virtual="/philosophy/po/linux-gnu-freedom.translist" -->
<!--#include virtual="/server/banner.html" -->
-<h2>Linux, GNU, and freedom</h2>
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Linux, GNU, and Freedom</h2>
-<p>
- by <strong>Richard M. Stallman</strong></p>
+<address class="byline">by Richard M. Stallman</address>
+<div class="article">
<p>
Since <a
href="https://web.archive.org/web/20190404115541/http://linux.sys-con.com/node/32755";>Joe
Barr's
@@ -94,7 +101,7 @@
There are people like Barr, that want their software “free
from ideology” and criticize anyone that says freedom matters.
There are people like Torvalds that will pressure our community into
- use of a non-free program, and challenge anyone who complains to
+ use of a nonfree program, and challenge anyone who complains to
provide a (technically) better program immediately or shut up.
There are people who say that technical decisions should not be
“politicized” by consideration of their social
@@ -111,11 +118,11 @@
Television Promotion Act">CBDTPA</abbr>
(formerly <abbr title="Security Systems Standards and Certification
Act">SSSCA</abbr>),
by the Broadcast “Protection” Discussion Group
- (see <a href="http://www.eff.org/";>http://www.eff.org/</a>) which
+ (see <a href="https://www.eff.org/";>www.eff.org</a>) which
proposes to prohibit free software to access digital TV broadcasts,
by software patents (Europe is now considering whether to have
software patents), by Microsoft nondisclosure agreements for vital
- protocols, and by everyone who tempts us with a non-free program
+ protocols, and by everyone who tempts us with a nonfree program
that is “better” (technically) than available free
programs. We can lose our freedom again just as we lost it the
first time, if we don't care enough to protect it.</p>
@@ -123,17 +130,17 @@
Will enough of us care? That depends on many things; among them,
how much influence the GNU Project has, and how much influence Linus
Torvalds has. The GNU Project says, “Value your
- freedom!”. Joe Barr says, “Choose between non-free and
+ freedom!”. Joe Barr says, “Choose between nonfree and
free programs on technical grounds alone!”. If people credit
Torvalds as the main developer of the GNU/Linux system, that's not
just inaccurate, it also makes his message more
- influential—and that message says, “Non-free software is
- ok; I use it and develop it myself.” If they recognize our
+ influential—and that message says, “Nonfree software is
+ OK; I use it and develop it myself.” If they recognize our
role, they will listen to us more, and the message we will give them
is, “This system exists because of people who care about
freedom. Join us, value your freedom, and together we can preserve
it.”
- See <a
href="/gnu/thegnuproject.html">http://www.gnu.org/gnu/thegnuproject.html</a>
+ See <a href="/gnu/thegnuproject.html">The GNU Project</a>
for the history.</p>
<p>
When I ask people to call the system GNU/Linux, some of them respond
@@ -150,7 +157,7 @@
Project campaign for freedom.</p>
<p>
Since this came up in the context of Linux (the kernel) and Bitkeeper,
- the non-free version control system that Linus Torvalds now uses, I'd
+ the nonfree version control system that Linus Torvalds now uses, I'd
like to address that issue as well.</p>
<h3 id="bitkeeper">Bitkeeper issue</h3>
@@ -159,10 +166,10 @@
<p>
The use of Bitkeeper for the Linux sources has a grave effect on the
free software community, because anyone who wants to closely track
- patches to Linux can only do it by installing that non-free program.
+ patches to Linux can only do it by installing that nonfree program.
There must be dozens or even hundreds of kernel hackers who have done
this. Most of them are gradually convincing themselves that it is ok
- to use non-free software, in order to avoid a sense of cognitive
+ to use nonfree software, in order to avoid a sense of cognitive
dissonance about the presence of Bitkeeper on their machines. What
can be done about this?</p>
<p>
@@ -173,14 +180,14 @@
That update process could run automatically and frequently.</p>
<p>
The FSF cannot do this, because we cannot install Bitkeeper on our
- machines. We have no non-free systems or applications on them now,
+ machines. We have no nonfree systems or applications on them now,
and our principles say we must keep it that way. Operating this
repository would have to be done by someone else who is willing to
have Bitkeeper on his machine, unless someone can find or make a way
to do it using free software.</p>
<p>
The Linux sources themselves have an even more serious problem with
- non-free software: they actually contain some. Quite a few device
+ nonfree software: they actually contain some. Quite a few device
drivers contain series of numbers that represent firmware programs to
be installed in the device. These programs are not free software. A
few numbers to be deposited into device registers are one thing; a
@@ -196,11 +203,11 @@
The Linux developers have a plan to move these firmware programs
into separate files; it will take a few years to mature, but when
completed it will solve the secondary problem; we could make a
- “free Linux” version that doesn't have the non-free
+ “free Linux” version that doesn't have the nonfree
firmware files. That by itself won't do much good if most people
- use the non-free “official” version of Linux. That may
+ use the nonfree “official” version of Linux. That may
well occur, because on many platforms the free version won't run
- without the non-free firmware. The “free Linux” project
+ without the nonfree firmware. The “free Linux” project
will have to figure out what the firmware does and write source code
for it, perhaps in assembler language for whatever embedded
processor it runs on. It's a daunting job. It would be less
@@ -210,7 +217,7 @@
that the job is not necessary.</p>
<p>
Linux, the kernel, is often thought of as the flagship of free
- software, yet its current version is partially non-free. How did
+ software, yet its current version is partially nonfree. How did
this happen? This problem, like the decision to use Bitkeeper,
reflects the attitude of the original developer of Linux, a person
who thinks that “technically better” is more important
@@ -219,19 +226,23 @@
Value your freedom, or you will lose it, teaches history.
“Don't bother us with politics,” respond those who don't
want to learn.</p>
+<div class="column-limit"></div>
<p id="update">
<strong>Update:</strong> Since 2005, BitKeeper
is no longer used to manage the Linux kernel source tree. See the
article, <a href="/philosophy/mcvoy.html">Thank You, Larry
- McVoy</a>. The Linux sources still contain non-free firmware blobs,
+ McVoy</a>. The Linux sources still contain nonfree firmware blobs,
but as of January 2008,
a <a href="//directory.fsf.org/project/linux"> free version of
Linux</a> is now maintained for use in free GNU/Linux
distributions.</p>
+</div>
+</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 <a
@@ -249,16 +260,16 @@
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 of this article.</p>
+information on coordinating and contributing translations of this article.</p>
</div>
-<p>Copyright © 2002, 2017, 2019 Richard M. Stallman</p>
+<p>Copyright © 2002, 2017, 2019, 2021 Richard M. Stallman</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -268,10 +279,10 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/12/30 12:08:32 $
+$Date: 2021/07/12 06:30:46 $
<!-- timestamp end -->
</p>
</div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
</body>
</html>
Index: philosophy/po/linux-gnu-freedom.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/linux-gnu-freedom.zh-cn.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/po/linux-gnu-freedom.zh-cn.po 12 Jul 2021 06:08:30 -0000
1.10
+++ philosophy/po/linux-gnu-freedom.zh-cn.po 12 Jul 2021 06:30:46 -0000
1.11
@@ -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: 2021-07-11 08:56+0000\n"
#. type: Content of: <title>
msgid "Linux, GNU, and Freedom - GNU Project - Free Software Foundation"
Index: philosophy/po/shouldbefree.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/shouldbefree.zh-cn-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/shouldbefree.zh-cn-en.html 26 Oct 2020 13:34:18 -0000
1.5
+++ philosophy/po/shouldbefree.zh-cn-en.html 12 Jul 2021 06:30:46 -0000
1.6
@@ -1,15 +1,23 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<title>Why Software Should Be Free
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/shouldbefree.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="reduced-width">
<h2>Why Software Should Be Free</h2>
-<p>
-by <a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a></p>
-<h3 id="introduction">Introduction</h3>
-<p>
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
+
+<div class="article">
+<p id="introduction">
The existence of software inevitably raises the question of how
decisions about its use should be made. For example, suppose one
individual who has a copy of a program meets another who would like a
@@ -43,7 +51,7 @@
<a href="/philosophy/free-sw.html">“free”
software</a>.<a href="#f1">(1)</a></p>
-<h3 id="owner-justification">How Owners Justify Their Power</h3>
+<h3 id="owner-justification" class="subheader">How Owners Justify Their
Power</h3>
<p>
Those who benefit from the current system where programs are property
offer two arguments in support of their claims to own programs: the
@@ -91,7 +99,7 @@
have owners. To formulate the choice as between proprietary software
versus no software is begging the question.</p>
-<h3 id="against-having-owners">The Argument against Having Owners</h3>
+<h3 id="against-having-owners" class="subheader">The Argument against Having
Owners</h3>
<p>
The question at hand is, “Should development of software be linked
with having owners to restrict the use of it?”</p>
@@ -483,7 +491,7 @@
making proprietary software stands a chance of success in its own narrow
terms, but it is not what is good for society.</p>
-<h3 id="why-develop">Why People Will Develop Software</h3>
+<h3 id="why-develop" class="subheader">Why People Will Develop Software</h3>
<p>
If we eliminate copyright as a means of encouraging
people to develop software, at first less software will be developed,
@@ -629,7 +637,7 @@
developers without coercion, just as they have learned to support public
radio and television stations.</p>
-<h3 id="productivity">What Is Software Productivity? </h3>
+<h3 id="productivity" class="subheader">What Is Software Productivity? </h3>
<p>
If software were free, there would still be programmers, but perhaps
fewer of them. Would this be bad for society?</p>
@@ -664,7 +672,7 @@
productivity” focus only on the second, limited, sense of the
term, where improvement requires difficult technological advances.</p>
-<h3 id="competition">Is Competition Inevitable?</h3>
+<h3 id="competition" class="subheader">Is Competition Inevitable?</h3>
<p>
Is it inevitable that people will try to compete, to surpass their
rivals in society? Perhaps it is. But competition itself is not
@@ -708,7 +716,7 @@
prohibited. Society's resources are squandered on the economic
equivalent of factional civil war.</p>
-<h3 id="communism">“Why Don't You Move to Russia?”</h3>
+<h3 id="communism" class="subheader">“Why Don't You Move to
Russia?”</h3>
<p>
In the United States, any advocate of other than the most extreme
form of laissez-faire selfishness has often heard this accusation. For
@@ -738,7 +746,7 @@
Thus, if we are to judge views by their resemblance to Russian
Communism, it is the software owners who are the Communists.</p>
-<h3 id="premises">The Question of Premises</h3>
+<h3 id="premises" class="subheader">The Question of Premises</h3>
<p>
I make the assumption in this paper that a user of software is no
less important than an author, or even an author's employer. In other
@@ -780,7 +788,7 @@
awareness that this is a radical right-wing assumption rather than a
traditionally recognized one will weaken its appeal.</p>
-<h3 id="conclusion">Conclusion</h3>
+<h3 id="conclusion" class="subheader">Conclusion</h3>
<p>
We like to think that our society encourages helping your neighbor;
but each time we reward someone for obstructionism, or admire them for
@@ -802,9 +810,10 @@
others. I hope that the free software movement will contribute to
this: at least in one area, we will replace the jungle with a more
efficient system which encourages and runs on voluntary cooperation.</p>
+<div class="column-limit"></div>
+</div>
-
-<h3 id="footnotes">Footnotes</h3>
+<h3 id="footnotes" class="footnote">Footnotes</h3>
<ol>
<li id="f1">The word “free” in “free software”
@@ -831,15 +840,18 @@
destructive.</li>
</ol>
-<hr />
-<blockquote id="fsfs"><p>This essay is published
-in <a href="http://shop.fsf.org/product/free-software-free-society/";><cite>Free
+<hr class="thin" />
+<div id="fsfs" role="complementary">
+<p>This essay is published in
+<a href="https://shop.fsf.org/product/free-software-free-society/";><cite>Free
Software, Free Society: The Selected Essays of Richard
-M. Stallman</cite></a>.</p></blockquote>
+M. Stallman</cite></a>.</p>
+</div>
+</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 <a
@@ -857,16 +869,16 @@
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 of this article.</p>
+information on coordinating and contributing translations of this article.</p>
</div>
-<p>Copyright © 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017,
2018, 2020 Free
+<p>Copyright © 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017,
2018, 2020, 2021 Free
Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -877,7 +889,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/10/26 13:34:18 $
+$Date: 2021/07/12 06:30:46 $
<!-- 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/po/shouldbefree.zh-cn.po 12 Jul 2021 06:08:54 -0000 1.10
+++ philosophy/po/shouldbefree.zh-cn.po 12 Jul 2021 06:30:46 -0000 1.11
@@ -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: 2021-07-11 09:26+0000\n"
#. type: Content of: <title>
msgid "Why Software Should Be Free - GNU Project - Free Software Foundation"
Index: philosophy/po/when-free-software-isnt-practically-superior.zh-cn-en.html
===================================================================
RCS file:
/web/www/www/philosophy/po/when-free-software-isnt-practically-superior.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/when-free-software-isnt-practically-superior.zh-cn-en.html
24 Mar 2019 13:32:57 -0000 1.1
+++ philosophy/po/when-free-software-isnt-practically-superior.zh-cn-en.html
12 Jul 2021 06:30:46 -0000 1.2
@@ -1,13 +1,21 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<title> When Free Software Isn't (Practically) Superior - GNU Project - Free
Software Foundation</title>
<!--#include
virtual="/philosophy/po/when-free-software-isnt-practically-superior.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="reduced-width">
<h2> When Free Software Isn't (Practically) Superior</h2>
-<p>
-by <a href="https://mako.cc/writing/";><strong>Benjamin Mako
Hill</strong></a></p>
+<address class="byline">
+by <a href="https://mako.cc/writing/";>Benjamin Mako Hill</a></address>
+<div class="article">
<p>The Open Source Initiative's mission statement reads, “Open source
is a development method for software that harnesses the power of
distributed peer review and transparency of process. The promise of
@@ -74,7 +82,7 @@
<p>Several academic studies of <a href="/software/repo-criteria.html">
free software hosting sites</a> SourceForge and <a
-href="http://sv.gnu.org";>Savannah</a> have shown what many free
+href="https://sv.gnu.org";>Savannah</a> have shown what many free
software developers who have put a codebase online already know
first-hand. The vast majority of free software projects are not
particularly collaborative. The median number of contributors to a
@@ -122,10 +130,12 @@
understand, support, and work towards, rather than something to take
for granted in the face of evidence that refuses to conform to
ideology.</p>
+</div>
+</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
@@ -143,13 +153,13 @@
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>
@@ -180,11 +190,10 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/03/24 13:32:57 $
+$Date: 2021/07/12 06:30:46 $
<!-- timestamp end -->
</p>
</div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
</body>
</html>
-
Index: philosophy/po/when-free-software-isnt-practically-superior.zh-cn.po
===================================================================
RCS file:
/web/www/www/philosophy/po/when-free-software-isnt-practically-superior.zh-cn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/when-free-software-isnt-practically-superior.zh-cn.po 12 Jul
2021 06:10:19 -0000 1.3
+++ philosophy/po/when-free-software-isnt-practically-superior.zh-cn.po 12 Jul
2021 06:30:46 -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: 2021-07-11 09:56+0000\n"
#. type: Content of: <title>
msgid ""
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www fun/humor.zh-cn.html fun/po/humor.zh-cn-en....,
GNUN <=