www-commits
[Top][All Lists]
Advanced

[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>&ldquo;二十五年前,<a
+<div class="article">
+<p class="comment">二十五年前,<a
 
href="/gnu/initial-announcement.html">1983å¹´9月27日,我对外宣布了一个计划</a>,希望创é€
 ä¸€å¥—完全自由的操作系统,并将其命名为
 GNU&mdash;&mdash;意为 &lsquo;GNU 并非 UNIX&rsquo;(GNU's Not 
Unix)。作为 GNU 系统 25
 
周年纪念的一部分,我写下本文,提醒这个社区的朋友们,如何才能避å
…æ¯ç­æ€§çš„妥协。除了避免这些妥协以外,你
还有很多途径可以 <a
 href="/help/help.html">帮助 GNU</a> 和自由软件。å…
¶ä¸­ä¸€ä¸ªæ–¹å¼å°±æ˜¯å‘使用非自由软件或在线服务说不,尽可能多说,但是
 <a
-href="/philosophy/saying-no-even-once.html">说一次也好</a>。&rdquo;&mdash;&mdash;<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>也作出妥协 &mdash;
-甚至是重大的妥协。比如,我们在第三版<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="&nbsp;[GPL 标识]&nbsp;"
+class="imgright" />
+
+<p>因此, <a
+href="https://www.fsf.org/";>自由软件基金会</a>也作出妥协&mdash;&mdash;甚至是重大的妥协。比如,我们在第三版
+<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="&nbsp;[LGPL æ 
‡è¯†]&nbsp;"
+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>要建立一个系统的、长久
的自由软件社区,我们只吸引更多人使用自由软件还是远远不够的。我们需要宣扬一种理念,要号召人们æ
 ¹æ®è½¯ä»¶ï¼ˆä»¥åŠå…¶ä»–东西)的
 &ldquo;公民价值&rdquo;
@@ -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";>&ldquo;轻轻一推&rdquo;是不够的</a>。
+href="https://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change";>&ldquo;轻轻一推&rdquo;是不够的</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) &amp; GNU 
的一般性问题发送到<a
@@ -163,16 +145,16 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
-若您想翻译本文,请参看<a
-href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
+我们尽最大努力来提供精准和高质量的翻译,但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方面有评论或一般性的建议,请发送至
 <a
+href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>。</p><p>å
…³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信息参见
+<a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
-<p>Copyright &copy; 2008, 2009, 2014, 2015, 2017, 2018, 2019, 2020 <a
-href="http://www.stallman.org/";>Richard Stallman</a>.</p>
+<p>Copyright &copy; 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/";>&lt;CTT&gt;</a>,2017,2018,2020。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</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>&ldquo;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&mdash;for &lsquo;GNU's Not Unix&rsquo;.  As part of the
+called GNU&mdash;for &ldquo;GNU's Not Unix&rdquo;.  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>&rdquo;&mdash;<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="&nbsp;[GPL Logo]&nbsp;"
+class="imgright" />
+
+<p>Thus, the <a href="https://www.fsf.org/";>Free Software
 Foundation</a> makes compromises&mdash;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="&nbsp;[LGPL Logo]&nbsp;"
+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";>
 &ldquo;Nudge&rdquo; 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 &amp; GNU inquiries to <a
@@ -250,17 +230,16 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations README</a> for
-information on coordinating and submitting translations of this article.</p>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2008, 2009, 2014, 2015, 2017, 2018, 2019, 2020 
-<a href="http://www.stallman.org/";>Richard Stallman</a>.</p>
+<p>Copyright &copy; 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>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]