[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ç³»ç»ï¼é常å«å“åè¡ç”ï¼ãå®ä»¬å¤§å¤æ°å
å«äºéèªç±è½¯ä»¶—å®ä»¬çå¼åè
éµå¾ªçæ¯åLinuxç¸å
³çå²å¦ï¼èä¸æ¯GNUçå²å¦ãç¶èï¼ä¹æ<a
-href="/distros/distros.html">å®å
¨èªç±çGNU/Linuxåè¡ç</a>ãFSFæ¯æå<a
-href="http://gnewsense.org/">gNewSense</a>åè¡çç¸å
³ççµèåå
¶å¨è¾¹ä»¶ã</p>
+ä»å¤©æå¾å¤ä¸åçGNU/Linuxç³»ç»ï¼é常å«å“åè¡ç”ï¼ãå®ä»¬å¤§å¤æ°å
å«äºéèªç±è½¯ä»¶—å®ä»¬çå¼åè
éµå¾ªçæ¯åLinuxç¸å
³ç<a
+href="/philosophy/open-source-misses-the-point.html">“å¼æº”å²å¦</a>ï¼èä¸æ¯GNUç<a
+href="/philosophy/free-software-even-more-important.html">“èªç±è½¯ä»¶”å²å¦</a>ãç¶èï¼ä¹æ<a
+href="/distros/distros.html">å®å
¨èªç±çGNU/Linuxåè¡ç</a>ãFSFæ¯æå
¶ä¸ä¸äºåè¡çç¸å
³ççµèåå
¶å¨è¾¹ä»¶ã</p>
-<p>å¶ä½ä¸ä¸ªèªç±çGNU/Linuxåè¡çä¸æ¢æ¯åé¤éèªç±è½¯ä»¶ãç°å¨ï¼å¸¸è§çLinuxçæ¬ä¹å¸¦æéèªç±ç¨åºãè¿äºç¨åºä¼å¨ç³»ç»å¯å¨æ¶å
è½½å°I/Oï¼è¾å
¥è¾åºï¼è®¾å¤ï¼å®ä»¬ä»¥å¾é¿çæ°åå½¢å¼å
å«å¨Linuxç“æºä»£ç
”ä¸ãæ以ï¼ç»´æ¤èªç±ç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ï¼è¯·ä¸è¦å«ç³ä¸æ¸
å°ä½¿ç¨“Linux”è¿ä¸å称æ¥æ··æ·å¤§ä¼ãLinuxæ¯ä¸ä¸ªå
æ
¸ï¼æ¯ç³»ç»ç主è¦åºæ¬é¨ä»¶ä¹ä¸ãæ´ä¸ªç³»ç»åºæ¬ä¸æ¯GNUç³»ç»ï¼å
ä¸Linuxãå¦æä½
说çæ¯è¿ä¸ªç»åï¼è¯·ç§°ä¹ä¸º“GNU/Linux”ã</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 © 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/"><CTT></a>ï¼2017ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/"><CTT></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 “distros”). Most of them include non-free
-software—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 “distros”). Most of them include nonfree
+programs—their developers follow
+the <a href="/philosophy/open-source-misses-the-point.html">“open
+source” philosophy</a> associated with Linux rather than the
+<a href="/philosophy/free-software-even-more-important.html">“free
+software” 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 © 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ãæç³»ç»éæå°ä¸ä¸ªå®æ´çåè¡çæ¬ä¸ã使"
-"乓è½å¤ç´æ¥å®è£
并工佔ä¹æ¯ä¸é¡¹è°å·¨çå·¥ä½ãå®éè¦èèå¦ä½å®è£
åå¯"
-"å¨ç³»ç»—æ们é£æ¶è¿æªå¤çæ¤é®é¢ï¼å
为æ们è¿æ²¡æèµ°å°é£ä¸æ¥ãå æ¤ï¼é£äºå¼å"
-"äºä¸åçåè¡çç人们ä½åºäºè®¸å¤éè¦çå·¥ä½ãä½æ¯è¿äºå·¥ä½çå±æ§æ¯ï¼å®ä»¬ç»ç©¶ä¼è¢«"
-"æäºäººåçã"
+"æå®ä»¬ç»åå°ä¸èµ·å¹¶ä¸æ¯ä¸ä¸ªç®åçå·¥ä½ãæäºGNUé¨ä»¶<a
href=\"#somecomponents\">"
+"(3)</a>éè¦ä½å¤§éçä¿®æ¹æè½éåºLinuxãæç³»ç»éæå°ä¸ä¸ªå®æ´çåè¡çæ¬ä¸ã使ä¹"
+"“è½å¤ç´æ¥å®è£
并工佔ä¹æ¯ä¸é¡¹è°å·¨çå·¥ä½ãå®éè¦èèå¦ä½å®è£
åå¯å¨"
+"系绗æ们é£æ¶è¿æªå¤çæ¤é®é¢ï¼å
为æ们è¿æ²¡æèµ°å°é£ä¸æ¥ãå æ¤ï¼é£äºå¼åäº"
+"ä¸åçåè¡çç人们ä½åºäºè®¸å¤éè¦çå·¥ä½ãä½æ¯è¿äºå·¥ä½çå±æ§æ¯ï¼å®ä»¬ç»ç©¶ä¼è¢«æ"
+"äºäººåçã"
#. 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>ï¼çæ¬ 2
-å以åçææã</p>
+<p>æ¬å¾ç使ç¨<a rel="license"
href="/licenses/old-licenses/gpl-2.0.html">GNU
+éç¨å
Œ
±è®¸å¯è¯</a>ï¼çæ¬ 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 2 or
-any later version.</p>
+href="/licenses/old-licenses/gpl-2.0.html">GNU General Public License</a>,
+version 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å¹´ï¼èªç±è½¯ä»¶éµè¥ä¸çé¨åæååè£åºæ¥ï¼å¹¶ä»¥“å¼æº”为å继ç»å¼å±æ´»å¨ãä¸å¼å§ï¼ç±äº“èªç±è½¯ä»¶”ï¼free
softwareï¼ä¸è¯å¯è½å¼èµ·æ§ä¹ï¼è¿ææåºå¼æºè¿ä¸ªè¯´æ³ãä½æ¯å¾å¿«å¼æºè¿è¯ä¾¿å¼å§å¼åï¼ä½¿å¾å
¶èåçé»è¾ä¸èªç±è½¯ä»¶è¿å¨çåè¡·ç¸å»çè¿ã</p>
-<p>ä¸äºå¼æºçæ¯æè
ä¼è®¤ä¸ºï¼æè°å¼æºï¼æ
éæ¯ç¨æ¥“为èªç±è½¯ä»¶åå¸åºè¥é”çãå
·ä½è¯´æ¥ï¼å°±æ¯åé£äºåç人士å±ç°èªç±è½¯ä»¶çå®é
好å¤ãåæ¶é¿å
è°åä»ä¹å¯¹éæ£è¯¯ï¼å
为åä¸å¤§ä½¬ä»¬æ®éä¸å¤ªå欢è¿è°è°ãè¿æä¸äºå¼æºçæ¯æè
å¹²èå°±æå¼èªç±è½¯ä»¶éä¹ä¸çä»·å¼è§ãæ
论ä»ä»¬æåªç§è§ç¹ï¼ä¸æ¦ä»ä»¬å¼å§ä¸ºå¼æºè¥éçæ¶åï¼èªç±è½¯ä»¶è¿å¨æçè§çé£äºä»·å¼è§å°±è¢«æ诸èåãäºæ¯ï¼“å¼æº”ä¸è¯å¾å¿«å°±å纯å°ååç§å®ç¨ä¸»ä¹çä»·å¼è§è系起æ¥ãæ¯å¦è¯´æä¹è½åé
ä¸ä¸ªå¼ºå¤§ã稳å®ç软件ãå¾å¤å¼æºæ¯æè
ä»ä¸å¼å§å°±æè¿äºä»·å¼è§æ¨å´è³æï¼ä¹é¾æªå±å¤äººä¼æå¦æ¤èç³»äºã</p>
+<p>ä¸äºå¼æºçæ¯æè
ä¼è®¤ä¸ºï¼æè°å¼æºï¼æ
éæ¯ç¨æ¥“为èªç±è½¯ä»¶åå¸åºè¥é”çãå
·ä½è¯´æ¥ï¼å°±æ¯åé£äºåç人士å±ç°èªç±è½¯ä»¶çå®é
好å¤ãåæ¶é¿å
è°åä»ä¹å¯¹éæ£è¯¯ï¼å
为åä¸å¤§ä½¬ä»¬æ®éä¸å¤ªå欢è¿è°è°ãè¿æä¸äºå¼æºçæ¯æè
å¹²èå°±æå¼èªç±è½¯ä»¶çéå¾·è§å社ä¼ä»·å¼ãæ
论ä»ä»¬æåªç§è§ç¹ï¼ä¸æ¦ä»ä»¬å¼å§ä¸ºå¼æºè¥éçæ¶åï¼èªç±è½¯ä»¶è¿å¨æçè§çé£äºä»·å¼è§å°±è¢«æ诸èåãäºæ¯ï¼“å¼æº”ä¸è¯å¾å¿«å°±å纯å°ååç§å®ç¨ä¸»ä¹çä»·å¼è§è系起æ¥ãæ¯å¦è¯´æä¹è½åé
ä¸ä¸ªå¼ºå¤§ã稳å®ç软件ãå¾å¤å¼æºæ¯æè
ä»ä¸å¼å§å°±æè¿äºä»·å¼è§æ¨å´è³æï¼ä¹é¾æªå±å¤äººä¼æå¦æ¤èç³»äºã大å¤æ°“å¼æº”ç讨论é½ç»å£ä¸è°æ¯é对éï¼èåªæ¯è®¨è®ºæµè¡ä¸æåï¼è¯·ç<a
+href="http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html">ä¸ä¸ªå
·ä½çå®ä¾</a>ãç°å¨ï¼å°æ°å¼æºçæ¯æè
ä¹æèªç±ä½ä¸ºä¸ä¸ªé®é¢æ¥è®¨è®ºï¼ä½æ¯ä»ä»¬çå½±å好似沧海ä¸ç²ã</p>
-<p>å¼æºè½¯ä»¶åèªç±è½¯ä»¶è¿ä¸¤ä¸ªè¯å¨å¾å¤§ç¨åº¦ä¸æè¿°çæ¯åä¸ç±»è½¯ä»¶ï¼ä½æ¯å®ä»¬æåºäºçä»·å¼è§å´æçæ¬è´¨ä¸çåºå«ãå¼æºæ¯æä¸å¥å¼åæ¹æ³ï¼èèªç±è½¯ä»¶åæ¯ä¸åºç¤¾ä¼è¿å¨ã对äºèªç±è½¯ä»¶è¿å¨èè¨ï¼èªç±è½¯ä»¶æ¯ä¸ä¸ªéå¾·åºçº¿ï¼æ¯å¯¹ç¨æ·èªç±çåºæ¬å°éãå¼æºè½¯ä»¶åä¸æ¤ä¸åï¼å¼æºå²å¦èèçæ¯æä¹åæ软件å従æ´å¥½”—ä»
ä»
ä»å®ç¨çè§åº¦ãå¼æºçå²å¦éï¼éèªç±è½¯ä»¶ä¹æ以ä¸å¥½ï¼æ¯å
为ä»ä»¬éç¨äºä¸ç§å£ççå¼åæ¹å¼ãå¼æºç大å¤æ°è®¨è®ºå
³æ³¨çä¸æ¯æ¯éï¼èä»
ä»
æ¯æ¯å¦æµè¡åæ¯å¦æåï¼<a
-href="http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html">å°±æ¯ä¸ä¸ªå
¸åçä¾å</a>ã</p>
+<p>å¼æºè½¯ä»¶åèªç±è½¯ä»¶è¿ä¸¤ä¸ªè¯å¨å¾å¤§ç¨åº¦ä¸æè¿°çæ¯åä¸ç±»è½¯ä»¶ï¼ä½æ¯å®ä»¬æåºäºçä»·å¼è§å´æçæ¬è´¨ä¸çåºå«ã对äºèªç±è½¯ä»¶è¿å¨èè¨ï¼èªç±è½¯ä»¶æ¯ä¸ä¸ªéå¾·åºçº¿ï¼æ¯å¯¹ç¨æ·èªç±çåºæ¬å°éãå¼æºè½¯ä»¶åä¸æ¤ä¸åï¼å¼æºå²å¦èèçæ¯æä¹åæ软件å従æ´å¥½”—ä»
ä»
ä»å®ç¨çè§åº¦ãå¼æºçå²å¦éï¼éèªç±è½¯ä»¶ä¹æ以ä¸å¥½ï¼æ¯å
为ä»ä»¬éç¨äºä¸ç§å£ççå¼åæ¹å¼ã</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 “open source” 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 “better”—in a practical sense only. It
says that nonfree software is an inferior solution to the practical
-problem at hand. Most discussion of “open source” 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\">“å¼æºè½¯ä»¶”çå®æ¹å®ä¹</"
-"a>ï¼å®æ¯ç±å¼æºä¿è¿ä¼åå¸çï¼é´äºè¿ä¸ªå®ä¹è¿é¿ï¼å°±ä¸å¨æ¬æä¸å
¨é¨å¼ç¨äºï¼æ¯ç´æ¥"
-"ä»æ们对äºèªç±è½¯ä»¶ççå®è¡çèæ¥ãä¸è¿äºè
ä¹æä¸åï¼å¨æäºæ¹é¢ï¼å¼æºè½¯ä»¶çå®"
-"ä¹æ¯èªç±è½¯ä»¶æ´å®½æ¾ãä¸è¿æ»ä½èè¨ï¼å¼æºè½¯ä»¶çå®ä¹åæ们èªç±è½¯ä»¶çå®ä¹å¨å¾å¤å°"
-"æ¹é½æ¯çä»·çã"
+"<a
href=\"https://opensource.org/osd\">“å¼æºè½¯ä»¶”çå®æ¹å®ä¹</a>"
+"ï¼å®æ¯ç±å¼æºä¿è¿ä¼åå¸çï¼é´äºè¿ä¸ªå®ä¹è¿é¿ï¼å°±ä¸å¨æ¬æä¸å
¨é¨å¼ç¨äºï¼æ¯ç´æ¥ä»"
+"æ们对äºèªç±è½¯ä»¶ççå®è¡çèæ¥ãä¸è¿äºè
ä¹æä¸åï¼å¨æäºæ¹é¢ï¼å¼æºè½¯ä»¶çå®ä¹"
+"æ¯èªç±è½¯ä»¶æ´å®½æ¾ãä¸è¿æ»ä½èè¨ï¼å¼æºè½¯ä»¶çå®ä¹åæ们èªç±è½¯ä»¶çå®ä¹å¨å¾å¤å°æ¹"
+"é½æ¯çä»·çã"
#. type: Content of: <div><p>
msgid ""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www gnu/linux-and-gnu.zh-cn.html gnu/po/linux-a...,
GNUN <=