www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www gnu/linux-and-gnu.zh-cn.html gnu/po/linux-a...


From: GNUN
Subject: www gnu/linux-and-gnu.zh-cn.html gnu/po/linux-a...
Date: Sat, 2 Mar 2019 07:30:23 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     19/03/02 07:30:22

Modified files:
        gnu            : linux-and-gnu.zh-cn.html 
        gnu/po         : linux-and-gnu.zh-cn-en.html 
                         linux-and-gnu.zh-cn.po 
        graphics       : philosophicalgnu.zh-cn.html 
        graphics/po    : philosophicalgnu.zh-cn-en.html 
                         philosophicalgnu.zh-cn.po 
        philosophy     : open-source-misses-the-point.zh-cn.html 
        philosophy/po  : open-source-misses-the-point.zh-cn-en.html 
                         open-source-misses-the-point.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.zh-cn.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.zh-cn.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/philosophicalgnu.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/philosophicalgnu.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/philosophicalgnu.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/open-source-misses-the-point.zh-cn.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.zh-cn-en.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.zh-cn.po?cvsroot=www&r1=1.55&r2=1.56

Patches:
Index: gnu/linux-and-gnu.zh-cn.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.zh-cn.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnu/linux-and-gnu.zh-cn.html        26 Dec 2017 11:00:37 -0000      1.8
+++ gnu/linux-and-gnu.zh-cn.html        2 Mar 2019 12:30:21 -0000       1.9
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.87 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Linux和GNU - GNU工程 - 自由软件基金会</title>
@@ -64,9 +64,9 @@
 <p>
 到了90年代初期,我们曾经把除了内æ 
¸ä»¥å¤–的东西放到一起组成了一个系统。我们也在开始开发一个å†
…核,称为<a
 href="/software/hurd/hurd.html">GNU Hurd</a>,运行在Mach<sup><a
-href="#TransNote1">1</a></sup>之上。开发这个内æ 
¸æ¯”我们预期的要难得多;<a
+href="#TransNote1">1</a></sup>之上。开发这个内æ 
¸æ¯”我们的预期要难得多;<a
 href="/software/hurd/hurd-and-linux.html">GNU
-Hurd在2001年开始可以稳定工作</a>,但是距离能够为人们正常使用还有很长的路要走。</p>
+Hurd在2001年开始可以稳定工作</a>,但是距离能够被人们正常使用还有很长的路要走。</p>
 
 <p>
 庆幸的是,我们不必再等Hurd了,因为有了Linux。当Linus
@@ -84,11 +84,12 @@
 GNU/Linux的开发提供资金。</p>
 
 <p>
-今天有很多不同的GNU/Linux系统(通常叫做&ldquo;发行版&rdquo;)。它们大多数åŒ
…含了非自由软件&mdash;它们的开发者遵循的是和Linux相å…
³çš„哲学,而不是GNU的哲学。然而,也有<a
-href="/distros/distros.html">完å…
¨è‡ªç”±çš„GNU/Linux发行版</a>。FSF支持和<a
-href="http://gnewsense.org/";>gNewSense</a>发行版相关的电脑及å…
¶å‘¨è¾¹ä»¶ã€‚</p>
+今天有很多不同的GNU/Linux系统(通常叫做&ldquo;发行版&rdquo;)。它们大多数åŒ
…含了非自由软件&mdash;它们的开发者遵循的是和Linux相关的<a
+href="/philosophy/open-source-misses-the-point.html">&ldquo;开源&rdquo;哲学</a>,而不是GNU的<a
+href="/philosophy/free-software-even-more-important.html">&ldquo;自由软件&rdquo;哲学</a>。然而,也有<a
+href="/distros/distros.html">完å…
¨è‡ªç”±çš„GNU/Linux发行版</a>。FSF支持其中一些发行版相å…
³çš„电脑及其周边件。</p>
 
-<p>制作一个自由的GNU/Linux发行版不止是剔除非自由软件。现在,常规的Linux版本也带有非自由程序。这些程序会在系统启动时åŠ
 è½½åˆ°I/O(输入输出)设备,它们以很长的数字形式包
含在Linux的&ldquo;源代ç 
&rdquo;中。所以,维护自由的GNU/Linux发行版现在承担
着维护一个<a
+<p>制作一个自由的GNU/Linux发行版不止是剔除非自由软件。现在,常规的Linux版本也带有非自由程序。这些程序会在系统启动时åŠ
 è½½åˆ°I/O(输入输出)设备,它们以很长的数字形式包
含在Linux的“源代ç 
â€ä¸­ã€‚所以,维护自由的GNU/Linux发行版现在承担
着维护一个<a
 
href="http://directory.fsf.org/project/linux";>自由版Linux</a>的责任。</p>
 
 <p>无论你是否使用GNU/Linux,请不要含糊不清
地使用&ldquo;Linux&rdquo;这一名称来混淆大众。Linux是一个内æ 
¸ï¼Œæ˜¯ç³»ç»Ÿçš„主要基本部件之一。整个系统基本上是GNU系统,åŠ
 ä¸ŠLinux。如果你
说的是这个组合,请称之为&ldquo;GNU/Linux&rdquo;。</p>
@@ -102,7 +103,7 @@
 
 <p>
 
除了GNU,还有一个独立进行的工程开发了一个自由的类似Unix的操作系统。这个系统是BSD,它是由UC
-Berkeley开发的。在80年代,BSD还不是自由的,但是它在90年代变成了自由软件。今天,一个自由的操作系统<a
+Berkeley开发的。在80年代,BSD还不是自由的,但是它在90年代初变成了自由软件。今天,一个自由的操作系统<a
 
href="#newersystems">(4)</a>差不多如果不是GNU系统的派生版本,就是BSD系统的派生版本。</p>
 
 <p>
@@ -189,7 +190,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 <p>Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, 2016,
-2017 Richard M. Stallman</p>
+2017, 2019 Richard M. Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -202,12 +203,12 @@
 <b>翻译</b>: 白若玉<br></br>
 <b>审校</b>: 刘昭宏<br></br>
 <b>翻译团队</b>:<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2017。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2017,2019。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2017/12/26 11:00:37 $
+$Date: 2019/03/02 12:30:21 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/linux-and-gnu.zh-cn-en.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/po/linux-and-gnu.zh-cn-en.html  26 Dec 2017 11:00:37 -0000      1.1
+++ gnu/po/linux-and-gnu.zh-cn-en.html  2 Mar 2019 12:30:22 -0000       1.2
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.87 -->
 <title>Linux and GNU
 - GNU Project - Free Software Foundation</title>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" />
@@ -152,16 +152,18 @@
 
 <p>
 Today there are many different variants of the GNU/Linux system (often
-called &ldquo;distros&rdquo;).  Most of them include non-free
-software&mdash;their developers follow the philosophy associated with
-Linux rather than that of GNU.  But there are also
-<a href="/distros/distros.html">completely free GNU/Linux distros</a>.  The FSF
-supports computer facilities
-for <a href="http://gnewsense.org/";>gNewSense</a>.</p>
+called &ldquo;distros&rdquo;).  Most of them include nonfree
+programs&mdash;their developers follow
+the <a href="/philosophy/open-source-misses-the-point.html">&ldquo;open
+source&rdquo; philosophy</a> associated with Linux rather than the
+<a href="/philosophy/free-software-even-more-important.html">&ldquo;free
+software&rdquo; philosophy</a> of GNU.  But there are also
+<a href="/distros/distros.html">completely free GNU/Linux distros</a>.
+The FSF supports computer facilities for a few of them.</p>
 
 <p>Making a free GNU/Linux distribution is not just a matter of
-eliminating various non-free programs.  Nowadays, the usual version of
-Linux contains non-free programs too.  These programs are intended to
+eliminating various nonfree programs.  Nowadays, the usual version of
+Linux contains nonfree programs too.  These programs are intended to
 be loaded into I/O devices when the system starts, and they are
 included, as long series of numbers, in the "source code" of Linux.
 Thus, maintaining free GNU/Linux distributions now entails maintaining
@@ -188,7 +190,7 @@
 <p>
 Aside from GNU, one other project has independently produced
 a free Unix-like operating system.  This system is known as BSD, and
-it was developed at UC Berkeley.  It was non-free in the 80s, but
+it was developed at UC Berkeley.  It was nonfree in the 80s, but
 became free in the early 90s.  A free operating system that exists
 today<a href="#newersystems">(4)</a> is almost certainly either a
 variant of the GNU system, or a kind of BSD system.</p>
@@ -292,7 +294,7 @@
      Information document, www.gnu.org/prep/maintain. -->
 
 <p>Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002,
-2007, 2014, 2015, 2016, 2017 Richard M. Stallman</p>
+2007, 2014, 2015, 2016, 2017, 2019 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -302,7 +304,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/12/26 11:00:37 $
+$Date: 2019/03/02 12:30:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/po/linux-and-gnu.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/po/linux-and-gnu.zh-cn.po       2 Mar 2019 12:15:16 -0000       1.5
+++ gnu/po/linux-and-gnu.zh-cn.po       2 Mar 2019 12:30:22 -0000       1.6
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-03-01 17:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Linux and GNU - GNU Project - Free Software Foundation"
@@ -249,12 +248,12 @@
 "it was work that, in the nature of things, was surely going to be done by "
 "someone."
 msgstr ""
-"把它们组合到一起并不是一个简单的工作。有些GNU部件<a 
href=\"#somecomponents"
-"\">(3)</a>需要作大量的修改才能适应Linux。把系统集成到一个完整的发行版本中、使"
-"之&ldquo;能够直接安装
并工作&rdquo;也是一项艰巨的工作。它需要考虑如何安装和启"
-"动系统&mdash;我们那时还未处理此问题,因
为我们还没有走到那一步。因此,那些开发"
-"了不同的发行版的人们作出了许多重要的工作。但是这些工作的属性是,它们终究会被"
-"某些人做的。"
+"把它们组合到一起并不是一个简单的工作。有些GNU部件<a 
href=\"#somecomponents\">"
+"(3)</a>需要作大量的修改才能适应Linux。把系统集成到一个完整的发行版本中、使之"
+"&ldquo;能够直接安装
并工作&rdquo;也是一项艰巨的工作。它需要考虑如何安装
和启动"
+"系统&mdash;我们那时还未处理此问题,因
为我们还没有走到那一步。因此,那些开发了"
+"不同的发行版的人们作出了许多重要的工作。但是这些工作的属性是,它们终究会被某"
+"些人做的。"
 
 #. type: Content of: <p>
 msgid ""

Index: graphics/philosophicalgnu.zh-cn.html
===================================================================
RCS file: /web/www/www/graphics/philosophicalgnu.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- graphics/philosophicalgnu.zh-cn.html        12 Feb 2019 14:28:42 -0000      
1.5
+++ graphics/philosophicalgnu.zh-cn.html        2 Mar 2019 12:30:22 -0000       
1.6
@@ -54,8 +54,8 @@
 https://commons.wikimedia.org/wiki/File:Philosophical-gnu-sm.png
 
https://web.archive.org/web/20090224214409/http://ngc224.gerwinski.de/~anja/gnuart/markus/index.html
 -->
-<p>本图片使用<a rel="license" href="/licenses/gpl.html">GNU 通用公å…
±è®¸å¯è¯</a>,版本&nbsp;2
-及以后版授权。</p>
+<p>本图片使用<a rel="license" 
href="/licenses/old-licenses/gpl-2.0.html">GNU
+通用公共许可证</a>,版本&nbsp;2 及以后版授权。</p>
 </div>
 </div>
 
@@ -110,7 +110,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/02/12 14:28:42 $
+$Date: 2019/03/02 12:30:22 $
 
 <!-- timestamp end -->
 </p>

Index: graphics/po/philosophicalgnu.zh-cn-en.html
===================================================================
RCS file: /web/www/www/graphics/po/philosophicalgnu.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- graphics/po/philosophicalgnu.zh-cn-en.html  12 Feb 2019 14:28:43 -0000      
1.2
+++ graphics/po/philosophicalgnu.zh-cn-en.html  2 Mar 2019 12:30:22 -0000       
1.3
@@ -52,8 +52,8 @@
 
https://web.archive.org/web/20090224214409/http://ngc224.gerwinski.de/~anja/gnuart/markus/index.html
 -->
 <p>This image is available under the <a rel="license"
-href="/licenses/gpl.html">GNU General Public License</a>, version&nbsp;2 or
-any later version.</p>
+href="/licenses/old-licenses/gpl-2.0.html">GNU General Public License</a>,
+version&nbsp;2 or any later version.</p>
 </div>
 </div>
 
@@ -98,7 +98,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/02/12 14:28:43 $
+$Date: 2019/03/02 12:30:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: graphics/po/philosophicalgnu.zh-cn.po
===================================================================
RCS file: /web/www/www/graphics/po/philosophicalgnu.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- graphics/po/philosophicalgnu.zh-cn.po       2 Mar 2019 12:13:41 -0000       
1.7
+++ graphics/po/philosophicalgnu.zh-cn.po       2 Mar 2019 12:30:22 -0000       
1.8
@@ -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: 2019-02-28 15:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""

Index: philosophy/open-source-misses-the-point.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/open-source-misses-the-point.zh-cn.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/open-source-misses-the-point.zh-cn.html  23 Feb 2019 10:31:34 
-0000      1.24
+++ philosophy/open-source-misses-the-point.zh-cn.html  2 Mar 2019 12:30:22 
-0000       1.25
@@ -32,10 +32,10 @@
 <p>并非全部的自由软件用户和开发者
都赞同自由软件运动的目æ 
‡ã€‚1998年,自由软件阵营中的部分成员分裂出来,并以&ldquo;开源&rdquo;为名继续开展活动。一开始,由于&ldquo;自由软件&rdquo;(free
 
software)一词可能引起歧义,这才提出开源这个说法。但是很快开源这词便开始异化,使得å
…¶èƒŒåŽçš„逻辑与自由软件运动的初衷相去甚远。</p>
 
-<p>一些开源的支持者会认为,所谓开源,无
非是用来&ldquo;为自由软件做市场营销&rdquo;的。å…
·ä½“说来,就是向那些商界人士展现自由软件的实际
好处。同时避免谈及什么对错正误,因
为商业大佬们普遍不太喜欢这调调。还有一些开源的支持者
干脆就抛弃自由软件道义上的价值观。无
论他们持哪种观点,一旦他们开始为开源营销的时候,自由软件运动所珍视的那些价值观就被抛诸脑后。于是,&ldquo;开源&rdquo;一词很快就单纯地和各种实用主义的价值观联系起来。比如说怎么能创é€
 ä¸€ä¸ªå¼ºå¤§ã€ç¨³å®šçš„软件。很多开源支持者
从一开始就把这些价值观推崇至极,也难怪局外人会有如此联系了。</p>
+<p>一些开源的支持者会认为,所谓开源,无
非是用来&ldquo;为自由软件做市场营销&rdquo;的。å…
·ä½“说来,就是向那些商界人士展现自由软件的实际
好处。同时避免谈及什么对错正误,因
为商业大佬们普遍不太喜欢这调调。还有一些开源的支持者
干脆就抛弃自由软件的道德观和社会价值。无
论他们持哪种观点,一旦他们开始为开源营销的时候,自由软件运动所珍视的那些价值观就被抛诸脑后。于是,&ldquo;开源&rdquo;一词很快就单纯地和各种实用主义的价值观联系起来。比如说怎么能创é€
 ä¸€ä¸ªå¼ºå¤§ã€ç¨³å®šçš„软件。很多开源支持者
从一开始就把这些价值观推崇至极,也难怪局外人会有如此联系了。大多数&ldquo;开源&rdquo;的讨论都绝口不谈是非对错,而只是讨论流行与成功;请看<a
+href="http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html";>一个å
…·ä½“的实例</a>。现在,少数开源的支持者
也把自由作为一个问题来讨论,但是他们的影响好似沧海一粟。</p>
 
-<p>开源软件和自由软件这两个词在很大程度上描述的是同一类软件,但是它们所基于的价值观却有着本质上的区别。开源是指一套开发方法;而自由软件则是一场社会运动。对于自由软件运动而言,自由软件是一个道德底线,是对用户自由的基本尊重。开源软件则与此不同,开源哲学考虑的是怎么做把软件做得&ldquo;更好&rdquo;&mdash;ä»
…ä»…
从实用的角度。开源的哲学里,非自由软件之所以不好,是å›
 ä¸ºä»–们采用了一种劣等的开发方式。开源的大多数讨论å…
³æ³¨çš„不是是非,而仅仅是是否流行和是否成功;<a
-href="http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html";>就是一个å
…¸åž‹çš„例子</a>。</p>
+<p>开源软件和自由软件这两个词在很大程度上描述的是同一类软件,但是它们所基于的价值观却有着本质上的区别。对于自由软件运动而言,自由软件是一个道德底线,是对用户自由的基本尊重。开源软件则与此不同,开源哲学考虑的是怎么做把软件做得&ldquo;更好&rdquo;&mdash;ä»
…ä»…
从实用的角度。开源的哲学里,非自由软件之所以不好,是å›
 ä¸ºä»–们采用了一种劣等的开发方式。</p>
 
 
<p>然而,对自由软件运动来说,非自由软件是一个社会问题,å
…¶è§£å†³æ–¹æ³•æ˜¯åœæ­¢ä½¿ç”¨éžè‡ªç”±è½¯ä»¶å¹¶å¼€å§‹ä½¿ç”¨è‡ªç”±è½¯ä»¶ã€‚</p>
 
@@ -216,7 +216,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/02/23 10:31:34 $
+$Date: 2019/03/02 12:30:22 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/open-source-misses-the-point.zh-cn-en.html
===================================================================
RCS file: 
/web/www/www/philosophy/po/open-source-misses-the-point.zh-cn-en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/open-source-misses-the-point.zh-cn-en.html    23 Feb 2019 
10:31:34 -0000      1.15
+++ philosophy/po/open-source-misses-the-point.zh-cn-en.html    2 Mar 2019 
12:30:22 -0000       1.16
@@ -72,21 +72,22 @@
 with ideas and arguments based only on practical values, such as
 making or having powerful, reliable software.  Most of the supporters
 of open source have come to it since then, and they make the same
-association.</p>
+association.  Most discussion of &ldquo;open source&rdquo; pays no
+attention to right and wrong, only to popularity and success; here's
+a <a 
href="http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html";>
+typical example</a>.  A minority of supporters of open source do
+nowadays say freedom is part of the issue, but they are not very visible
+among the many that don't.</p>
 
-<p>The two terms
+<p>The two now
 describe almost the same category of software, but they stand for
-views based on fundamentally different values.  Open source is a
-development methodology; free software is a social movement.  For the
+views based on fundamentally different values.  For the
 free software movement, free software is an ethical imperative,
 essential respect for the users' freedom.  By contrast,
 the philosophy of open source considers issues in terms of how to make
 software &ldquo;better&rdquo;&mdash;in a practical sense only.  It
 says that nonfree software is an inferior solution to the practical
-problem at hand.  Most discussion of &ldquo;open source&rdquo; pays no
-attention to right and wrong, only to popularity and success; here's
-a <a 
href="http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html";>
-typical example</a>.</p>
+problem at hand.</p>
 
 <p>For the free software movement, however, nonfree software is a
 social problem, and the solution is to stop using it and move to free
@@ -474,7 +475,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/02/23 10:31:34 $
+$Date: 2019/03/02 12:30:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/open-source-misses-the-point.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/open-source-misses-the-point.zh-cn.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- philosophy/po/open-source-misses-the-point.zh-cn.po 2 Mar 2019 12:14:39 
-0000       1.55
+++ philosophy/po/open-source-misses-the-point.zh-cn.po 2 Mar 2019 12:30:22 
-0000       1.56
@@ -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: 2019-03-02 03:26+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -308,11 +307,11 @@
 "some respects.  Nonetheless, their definition agrees with our definition in "
 "most cases."
 msgstr ""
-"<a 
href=\"https://opensource.org/osd\";>&ldquo;开源软件&rdquo;的官方定义</"
-"a>(它是由开源促进会发布的,鉴于这个定义过长,就不在本文中å
…¨éƒ¨å¼•ç”¨äº†ï¼‰æ˜¯ç›´æŽ¥"
-"从我们对于自由软件的界定衍生而来。不过二者
也有不同,在某些方面,开源软件的定"
-"义比自由软件更宽松。不过总体而言,开源软件的定义和我们自由软件的定义在很多地"
-"方都是等价的。"
+"<a 
href=\"https://opensource.org/osd\";>&ldquo;开源软件&rdquo;的官方定义</a>"
+"(它是由开源促进会发布的,鉴于这个定义过长,就不在本文中å
…¨éƒ¨å¼•ç”¨äº†ï¼‰æ˜¯ç›´æŽ¥ä»Ž"
+"我们对于自由软件的界定衍生而来。不过二者
也有不同,在某些方面,开源软件的定义"
+"比自由软件更宽松。不过总体而言,开源软件的定义和我们自由软件的定义在很多地方"
+"都是等价的。"
 
 #. type: Content of: <div><p>
 msgid ""



reply via email to

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