[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy compromise.zh-cn.html po/comprom...
From: |
GNUN |
Subject: |
www/philosophy compromise.zh-cn.html po/comprom... |
Date: |
Thu, 22 Jul 2021 22:01:18 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 21/07/22 22:01:18
Modified files:
philosophy : compromise.zh-cn.html
philosophy/po : compromise.zh-cn-en.html compromise.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/compromise.zh-cn.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn.po?cvsroot=www&r1=1.44&r2=1.45
Patches:
Index: compromise.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/compromise.zh-cn.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- compromise.zh-cn.html 28 Oct 2020 06:59:35 -0000 1.34
+++ compromise.zh-cn.html 23 Jul 2021 02:01:17 -0000 1.35
@@ -1,79 +1,57 @@
<!--#set var="ENGLISH_PAGE" value="/philosophy/compromise.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.94 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="upholding" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>é¿å
æ¯çæ§ç妥å - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
-<style type="text/css" media="print,screen">
-<!--
- .quote {
- font-size: 90%;
- max-width: 30em;
- padding: .5em 1.5em;
- background-color: #ececec;
- border-radius: 1em;
- -moz-border-radius: 1em;
- -khtml-border-radius: 1em;
- -webkit-border-radius: 1em;
- -opera-border-radius: 1em;
- }
- .quote.imgright { margin: .3em 1em 1em 1em; }
- .quote {
- font-style: italic;
- }
- .quote b {
- font-style: normal;
- font-weight: normal;
- }
- .imgleft {
- width: 18em;
- max-width: 100%;
- }
-
-@media (max-width:50em) {
- .imgleft, .imgright {
- float: none;
- display: block;
- margin: auto;
- }
- .quote {
- max-width: none; width: auto;
- margin: 1em 10%;
- }
-}
-@media (min-width:50em) {
- .quote { max-width: 40%; }
+<style type="text/css" media="print,screen"><!--
+ .imgleft, .imgright { display: block; height: 4.25em; width: auto; }
+@media (max-width:25em) {
+ .imgleft, .imgright { float: none; margin: 0 auto; }
}
-->
-
</style>
<!--#include virtual="/philosophy/po/compromise.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>
<address class="byline">Richard Stallman è</address>
-<blockquote class="quote imgright"><p>“äºåäºå¹´åï¼<a
+<div class="article">
+<p class="comment">äºåäºå¹´åï¼<a
href="/gnu/initial-announcement.html">1983å¹´9æ27æ¥ï¼æ对å¤å®£å¸äºä¸ä¸ªè®¡å</a>ï¼å¸æåé
ä¸å¥å®å
¨èªç±çæä½ç³»ç»ï¼å¹¶å°å
¶å½å为
GNU——æ为 ‘GNU 并é UNIX’ï¼GNU's Not
Unixï¼ãä½ä¸º GNU ç³»ç» 25
å¨å¹´çºªå¿µçä¸é¨åï¼æåä¸æ¬æï¼æéè¿ä¸ªç¤¾åºçæå们ï¼å¦ä½æè½é¿å
æ¯çæ§ç妥åãé¤äºé¿å
è¿äºå¦¥å以å¤ï¼ä½
è¿æå¾å¤éå¾å¯ä»¥ <a
href="/help/help.html">å¸®å© GNU</a> åèªç±è½¯ä»¶ãå
¶ä¸ä¸ä¸ªæ¹å¼å°±æ¯å使ç¨éèªç±è½¯ä»¶æå¨çº¿æå¡è¯´ä¸ï¼å°½å¯è½å¤è¯´ï¼ä½æ¯
<a
-href="/philosophy/saying-no-even-once.html">说ä¸æ¬¡ä¹å¥½</a>ã”——<b>çæ¥å¾·Â·æ¯ææ¼</b></p></blockquote>
-
+href="/philosophy/saying-no-even-once.html">说ä¸æ¬¡ä¹å¥½</a>ã</p>
+<hr class="no-display" />
<p>èªç±è½¯ä»¶è¿å¨ç®çå¨äºæ¹åæ们ç社ä¼ï¼<a
href="/philosophy/free-sw.html">让ä¸å软件çèµ°åèªç±</a>ï¼åªæè¿æ
·ï¼ææç软件ç¨æ·æè½å®ç°èªç±ï¼å¹¶åä¸å°åä½ç社åºä¸æ¥ãä»»ä½éèªç±è½¯ä»¶é½èµäºå
¶å¼åè
å驾äºå
¶ç¨æ·ä¹ä¸çæåï¼è¿æ¯ä¸å
¬æ£çãæ们çä»»å¡å°±æ¯è¦æ¶é¤è¿ç§ä¸å
¬æ£çç°è±¡ã</p>
-<p>èªç±ä¹è·¯æ¯<a
-href="http://www.fsf.org/bulletin/2008/spring/the-last-mile-is-always-the-hardest/">漫é¿èé¥è¿</a>çãå¨æªæ¥çæ¥åéï¼æ们è¿éèµ°å¾æ´è¿ï¼æè½ä½¿ææç软件ç¨æ·äº«æèªç±ãæä¸äºæ¥éª¤å°ä¼æ¯è°é¾çï¼éè¦æ们ä»åºçºç²ãèåå¦æ们ä¸å
¶ä»ææä¸åç®æ
ç人士达æ妥åï¼æ们çè·¯ä¼èµ°å¾æ´å®¹æã</p>
-
-<p>å æ¤, <a
href="http://www.fsf.org/">èªç±è½¯ä»¶åºéä¼</a>ä¹ä½åºå¦¥å —
-çè³æ¯é大ç妥åãæ¯å¦ï¼æ们å¨ç¬¬ä¸ç<a
href="/licenses/gpl.html">GNU éç¨å
Œ
±è®¸å¯è¯</a> (ç®ç§°GPLv3)
-å°±ä¸å©æ¹é¢çè§å®ä½åºäºå¦¥åï¼ä½¿å¾ä¸äºå¤§å
¬å¸å¯ä»¥åä¸è¿æ¥ï¼å¹¶åå¸ä»¥GPLv3ææç软件ãå¨æ们çå议书éé¢å°±å
å«äºç¸å
³çä¸å©æ¡æ¬¾ã </p>
+<p>èªç±ä¹è·¯æ¯ <a
+href="https://www.fsf.org/bulletin/2008/spring/the-last-mile-is-always-the-hardest/">漫é¿èé¥è¿</a>
+çãå¨æªæ¥çæ¥åéï¼æ们è¿éèµ°å¾æ´è¿ï¼æè½ä½¿ææç软件ç¨æ·äº«æèªç±ãæä¸äºæ¥éª¤å°ä¼æ¯è°é¾çï¼éè¦æ们ä»åºçºç²ãèåå¦æ们ä¸å
¶ä»ææä¸åç®æ
ç人士达æ妥åï¼æ们çè·¯ä¼èµ°å¾æ´å®¹æã</p>
+
+<img src="/graphics/gplv3-with-text-136x68.png" alt=" [GPL æ è¯] "
+class="imgright" />
+
+<p>å æ¤, <a
+href="https://www.fsf.org/">èªç±è½¯ä»¶åºéä¼</a>ä¹ä½åºå¦¥å——çè³æ¯é大ç妥åãæ¯å¦ï¼æ们å¨ç¬¬ä¸ç
+<a href="/licenses/gpl.html">GNU éç¨å
Œ
±è®¸å¯è¯</a> (ç®ç§° GPLv3)
+å°±ä¸å©æ¹é¢çè§å®ä½åºäºå¦¥åï¼ä½¿å¾ä¸äºå¤§å
¬å¸å¯ä»¥åä¸è¿æ¥ï¼å¹¶åå¸ä»¥ GPLv3
ææç软件ãå¨æ们çå议书éé¢å°±å
å«äºç¸å
³çä¸å©æ¡æ¬¾ã </p>
-<img src="/graphics/gplv3-large.png" alt="[GPLv3 æ å¿]" class="imgleft" />
+<img src="/graphics/lgplv3-with-text-154x68.png" alt=" [LGPL æ
è¯] "
+class="imgleft" />
<p><a href="/licenses/lgpl.html">GNU
宽éç¨å
Œ
±è®¸å¯è¯</a>ï¼ç®ç§°LGPLï¼ä¹æ¯ä¸é¡¹å¦¥åï¼æ们éå®ä¸äºèªç±çåºï¼å¹¶å
许æå®ä»¬ç¨äºä¸æ软件å½ä¸ãå
为æ们认为è¦æ¯ä»æ³å¾ä¸ç¦æ¢è¿æ
·ç使ç¨çè¯ï¼åªä¼ä½¿å¾å¼åè
使ç¨ç§æçåºãæ们å
许å¼åè
å¨ç§æ软件éé¢ä½¿ç¨GNUçç¨åºï¼å¹¶éè¿ææ¡£è¿è¡è¯´æï¼è¡¨ææ们é¼å±ä½¿ç¨èªç±è½¯ä»¶çç«åºãæ们ä¼å¯¹æäºæ们认åçæ´»å¨è¿è¡æ¯æï¼å°½ç®¡æ们并ä¸å®å
¨è®¤åä»ä»¬æå±çå¢ä½ã</p>
@@ -99,8 +77,10 @@
<p>å¼æºè½¯ä»¶æ¯æè
çç念æ¯ä»¥æ¶è´¹è
çéè¦ä¸ºç¬¬ä¸è¿½æ±çç®æ
ï¼ä»ä»¬çè¡å¨ä¹å°è¯äºä»ä»¬çè¿ä¸ç念ãè¿æ°æ°æ¯æ们<a
href="/philosophy/open-source-misses-the-point.html">ä¸æå¡âå¼æºè½¯ä»¶â</a>çåå
ã</p>
+<div class="pict narrow">
<img src="/graphics/gnulaptop.png"
- alt="[æ¬æµ®ç Gnu åä¸ä¸ªç¬è®°æ¬]" class="imgright" />
+ alt="[æ¬æµ®ç Gnu åä¸ä¸ªç¬è®°æ¬]" />
+</div>
<p>è¦å»ºç«ä¸ä¸ªç³»ç»çãé¿ä¹
çèªç±è½¯ä»¶ç¤¾åºï¼æ们åªå¸å¼æ´å¤äººä½¿ç¨èªç±è½¯ä»¶è¿æ¯è¿è¿ä¸å¤çãæ们éè¦å®£æ¬ä¸ç§ç念,è¦å·å¬äººä»¬æ
¹æ®è½¯ä»¶ï¼ä»¥åå
¶ä»ä¸è¥¿ï¼ç
“å
¬æ°ä»·å¼”
@@ -122,19 +102,21 @@
<p>æ¯çæ§ç妥åä¸åä¼ç»å«äººå¸¦æ¥åçå½±åï¼å®è¿ä¼æ¹åä½
èªèº«çä»·å¼ï¼å ä¸ºä½ ç大èéåºç°äºä»·å¼éæ©çå²çªãä½
å¿éç¸ä¿¡çæ¯è¿ä¸å¥ä»·å¼ï¼èä½ çè¡å¨ååæ
åºå¦ä¸å¥ä»·å¼ï¼è¿æ¶ä½ é常ä¼äºè
éå
¶ä¸ï¼ä»¥å解è¿ä¸å²çªãæ们å¯ä»¥çå°ï¼é£äºåªå¼ºè°å®ç¨æ§ç软件项ç®ï¼ææ人们å¼åä¸æ软件ç项ç®ï¼å
ä¹æ
ä¸ä¾å¤çåªåä¸æä¸æ软件å¨éå¾·ä¸çä¸æ£å½æ§ã对äºç¨æ·ä»¥åæ´å¹¿ç大ä¼ï¼ä»ä»¬åªåå¤å¼ºè°æ¶è´¹è
为ä¸å¿çä»·å¼å¤æãæ们å¿
é¡»å对è¿æ
·ç妥åï¼ä»¥ä¿è¯æ们çä»·å¼è¯ä»·æ¯å§ç»å¦ä¸çã</p>
-<p>åå¦ä½
æ³ä½¿ç¨èªç±è½¯ä»¶ï¼åæ¶ä¹è¦è¿½æ±èªç±çè¯ï¼è¯·æµè§<a
-href="http://www.fsf.org/resources">èªç±è½¯ä»¶åºéä¼ç½ç«çèµæºé¡µé¢</a>ãé£éååºäºåç§ä¸èªç±è½¯ä»¶ç¸å
¼å®¹ç硬件é
ç½®ï¼åç§<a
-href="/distros/distros.html">åªå«èªç±è½¯ä»¶çGNU/Linuxåè¡ç</a>ï¼ä»¥åè¿è¡äº100%èªç±è½¯ä»¶ç¯å¢ä¸ç<a
-href="http://directory.fsf.org/">æ°ä»¥å计çèªç±è½¯ä»¶å¥è£
</a>ãåå¦ä½
å¸æ帮å©æ们ç社åºèµ°åèªç±ï¼æéè¦çæ¯å¼æ¬âå
¬æ°ä»·å¼âãå½äººä»¬å¨è®¨è®ºä½ä¸ºåä¸æ¶ï¼ä»¥å该åäºä»ä¹æ¶ï¼è¯·ä½
å人们éåèªç±ä¸ç¤¾åºçç念ï¼å¹¶ç±æ¤å±å¼æ·±å
¥ç讨论ã</p>
+<p>åå¦ä½ æ³ä½¿ç¨èªç±è½¯ä»¶ï¼åæ¶ä¹è¦è¿½æ±èªç±çè¯ï¼è¯·æµè§
<a
+href="https://www.fsf.org/resources">èªç±è½¯ä»¶åºéä¼ç½ç«çèµæºé¡µé¢</a>ãé£éååºäºåç§ä¸èªç±è½¯ä»¶ç¸å
¼å®¹ç硬件é
ç½®ï¼åç§
+<a
href="/distros/distros.html">åªå«èªç±è½¯ä»¶çGNU/Linuxåè¡ç</a>ï¼ä»¥åè¿è¡äº100%èªç±è½¯ä»¶ç¯å¢ä¸ç
<a
+href="https://directory.fsf.org/">æ°ä»¥å计çèªç±è½¯ä»¶å¥è£
</a>ãåå¦ä½
å¸æ帮å©æ们ç社åºèµ°åèªç±ï¼æéè¦çæ¯å¼æ¬âå
¬æ°ä»·å¼âãå½äººä»¬å¨è®¨è®ºä½ä¸ºåä¸æ¶ï¼ä»¥å该åäºä»ä¹æ¶ï¼è¯·ä½
å人们éåèªç±ä¸ç¤¾åºçç念ï¼å¹¶ç±æ¤å±å¼æ·±å
¥ç讨论ã</p>
<p>è¦æ¯æ们åè¾åè¾ï¼èµ°å¾åå¿«ä¹æ¯«æ
æä¹ãè¦å®ç°ä¸ä¸ªä¼å¤§çç®æ
ï¼æ们éè¦ä½åºå¦¥åï¼ä½åè®°ä¸ä¸å¯ä½åºå离ç®æ
ç妥åã</p>
<hr class="column-limit"/>
+</div>
<p>
æå
³çæ´»ä¸å
¶å®é¢åä¸ç±»ä¼¼çè§ç¹ï¼è¯·åè <a
-href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">“轻轻ä¸æ¨”æ¯ä¸å¤ç</a>ã
+href="https://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">“轻轻ä¸æ¨”æ¯ä¸å¤ç</a>ã
</p>
+</div>
<div class="translators-notes">
@@ -144,7 +126,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
@@ -163,16 +145,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 © 2008, 2009, 2014, 2015, 2017, 2018, 2019, 2020 <a
-href="http://www.stallman.org/">Richard Stallman</a>.</p>
+<p>Copyright © 2008, 2021 Richard Stallman</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative Commons
@@ -184,12 +166,12 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯</b>: Tony Yetï¼2010ã<br></br>
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/"><CTT></a>ï¼2017ï¼2018ï¼2020ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/"><CTT></a>ï¼2017ï¼2018ï¼2020ï¼2021ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2020/10/28 06:59:35 $
+$Date: 2021/07/23 02:01:17 $
<!-- timestamp end -->
</p>
Index: po/compromise.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn-en.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/compromise.zh-cn-en.html 28 Oct 2020 06:59:36 -0000 1.22
+++ po/compromise.zh-cn-en.html 23 Jul 2021 02:01:17 -0000 1.23
@@ -1,67 +1,39 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.94 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="upholding" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<title>Avoiding Ruinous Compromises
- GNU Project - Free Software Foundation</title>
-<style type="text/css" media="print,screen">
-<!--
- .quote {
- font-size: 90%;
- max-width: 30em;
- padding: .5em 1.5em;
- background-color: #ececec;
- border-radius: 1em;
- -moz-border-radius: 1em;
- -khtml-border-radius: 1em;
- -webkit-border-radius: 1em;
- -opera-border-radius: 1em;
- }
- .quote.imgright { margin: .3em 1em 1em 1em; }
- .quote {
- font-style: italic;
- }
- .quote b {
- font-style: normal;
- font-weight: normal;
- }
- .imgleft {
- width: 18em;
- max-width: 100%;
- }
-
-@media (max-width:50em) {
- .imgleft, .imgright {
- float: none;
- display: block;
- margin: auto;
- }
- .quote {
- max-width: none; width: auto;
- margin: 1em 10%;
- }
+<style type="text/css" media="print,screen"><!--
+ .imgleft, .imgright { display: block; height: 4.25em; width: auto; }
+@media (max-width:25em) {
+ .imgleft, .imgright { float: none; margin: 0 auto; }
}
-@media (min-width:50em) {
- .quote { max-width: 40%; }
-}
--->
-</style>
+--></style>
<!--#include virtual="/philosophy/po/compromise.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>Avoiding Ruinous Compromises</h2>
<address class="byline">by Richard Stallman</address>
-<blockquote class="quote imgright"><p>“Twenty-five years
+<div class="article">
+<p class="comment">Twenty-five years
ago <a href="/gnu/initial-announcement.html">on September 27, 1983, I
announced a plan</a> to create a completely free operating system
-called GNU—for ‘GNU's Not Unix’. As part of the
+called GNU—for “GNU's Not Unix”. As part of the
25th anniversary of the GNU system, I have written this article on how
our community can avoid ruinous compromises. In addition to avoiding
such compromises, there are many ways you can <a href="/help/help.html">
help GNU</a> and free software. One way is to say no to the use of a
nonfree program or an online disservice as often as you can or
<a href="/philosophy/saying-no-even-once.html">
-even once.</a>”—<b>Richard Stallman</b></p></blockquote>
-
+even once</a>.</p>
+<hr class="no-display" />
<p>The free software movement aims for a social
change: <a href="/philosophy/free-sw.html">to make all software
@@ -71,13 +43,16 @@
injustice.</p>
<p>The road to freedom
-is <a
href="http://www.fsf.org/bulletin/2008/spring/the-last-mile-is-always-the-hardest/">
+is <a
href="https://www.fsf.org/bulletin/2008/spring/the-last-mile-is-always-the-hardest/">
a long road</a>. It will take many steps and many years to reach a
world in which it is normal for software users to have freedom. Some
of these steps are hard, and require sacrifice. Some of them become
easier if we make compromises with people that have different goals.</p>
-<p>Thus, the <a href="http://www.fsf.org/">Free Software
+<img src="/graphics/gplv3-with-text-136x68.png" alt=" [GPL Logo] "
+class="imgright" />
+
+<p>Thus, the <a href="https://www.fsf.org/">Free Software
Foundation</a> makes compromises—even major ones. For
instance, we made compromises in the patent provisions of version 3 of
the <a href="/licenses/gpl.html">GNU General Public License</a>
@@ -85,7 +60,8 @@
GPLv3-covered software and thus bring some patents under the effect of
these provisions. </p>
-<img src="/graphics/gplv3-large.png" alt=" [GPLv3 Logo] " class="imgleft" />
+<img src="/graphics/lgplv3-with-text-154x68.png" alt=" [LGPL Logo] "
+class="imgleft" />
<p><a href="/licenses/lgpl.html">The Lesser GPL</a>'s purpose is a
compromise: we use it on certain chosen free libraries to permit their
@@ -144,8 +120,10 @@
<a href="/philosophy/open-source-misses-the-point.html">do not
advocate open source.</a></p>
+<div class="pict narrow">
<img src="/graphics/gnulaptop.png"
- alt=" [Levitating Gnu with a laptop] " class="imgright" />
+ alt=" [Levitating Gnu with a laptop] " />
+</div>
<p>To establish a free community fully and lastingly, we need to do
more than get people to use some free software. We need to spread the
@@ -207,10 +185,10 @@
to keep our values straight.</p>
<p>If you want to move to free software without compromising the goal
-of freedom, look at <a href="http://www.fsf.org/resources">the FSF's
+of freedom, look at <a href="https://www.fsf.org/resources">the FSF's
resources area</a>. It lists hardware and machine configurations that
work with free software, <a href="/distros/distros.html"> totally free
-GNU/Linux distros</a> to install, and <a href="http://directory.fsf.org/">
+GNU/Linux distros</a> to install, and <a href="https://directory.fsf.org/">
thousands of free software packages</a> that work in a 100 percent
free software environment. If you want to help the community stay on
the road to freedom, one important way is to publicly uphold citizen
@@ -222,17 +200,19 @@
but beware of compromises that lead away from the goal.</p>
<hr class="column-limit"/>
+</div>
<p>
For a similar point in a different area of life,
see <a
-href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">
+href="https://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">
“Nudge” is not enough</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 <a
@@ -250,17 +230,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 © 2008, 2009, 2014, 2015, 2017, 2018, 2019, 2020
-<a href="http://www.stallman.org/">Richard Stallman</a>.</p>
+<p>Copyright © 2008, 2021 Richard Stallman</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -270,7 +249,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/10/28 06:59:36 $
+$Date: 2021/07/23 02:01:17 $
<!-- timestamp end -->
</p>
</div>
Index: po/compromise.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn.po,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- po/compromise.zh-cn.po 23 Jul 2021 01:36:39 -0000 1.44
+++ po/compromise.zh-cn.po 23 Jul 2021 02:01:17 -0000 1.45
@@ -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-22 12:26+0000\n"
# type: Content of: <title>
#. type: Content of: <title>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy compromise.zh-cn.html po/comprom...,
GNUN <=