[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy compromise.zh-cn.html open-sourc...
|
From: |
GNUN |
|
Subject: |
www/philosophy compromise.zh-cn.html open-sourc... |
|
Date: |
Mon, 13 Sep 2021 22:02:45 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 21/09/13 22:02:45
Modified files:
philosophy : compromise.zh-cn.html
open-source-misses-the-point.zh-cn.html
philosophy/po : compromise.zh-cn-en.html compromise.zh-cn.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/philosophy/compromise.zh-cn.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/open-source-misses-the-point.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.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn.po?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.zh-cn-en.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.po?cvsroot=www&r1=1.76&r2=1.77
Patches:
Index: compromise.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/compromise.zh-cn.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- compromise.zh-cn.html 19 Aug 2021 08:13:18 -0000 1.36
+++ compromise.zh-cn.html 14 Sep 2021 02:02:45 -0000 1.37
@@ -21,13 +21,12 @@
<!--#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">
+<div class="article reduced-width">
<h2>é¿å
æ¯çæ§ç妥å</h2>
<address class="byline">Richard Stallman è</address>
-<div class="article">
-<p class="comment">äºåäºå¹´åï¼<a
+<p class="introduction">äºåäºå¹´åï¼<a
href="/gnu/initial-announcement.html">1983å¹´9æ27æ¥ï¼æ对å¤å®£å¸äºä¸ä¸ªè®¡å</a>ï¼å¸æåé
ä¸å¥å®å
¨èªç±çæä½ç³»ç»ï¼å¹¶å°å
¶å½å为
GNU——æ为 ‘GNU 并é UNIX’ï¼GNU's Not
Unixï¼ãä½ä¸º GNU ç³»ç» 25
å¨å¹´çºªå¿µçä¸é¨åï¼æåä¸æ¬æï¼æéè¿ä¸ªç¤¾åºçæå们ï¼å¦ä½æè½é¿å
æ¯çæ§ç妥åãé¤äºé¿å
è¿äºå¦¥å以å¤ï¼ä½
è¿æå¾å¤éå¾å¯ä»¥ <a
@@ -110,7 +109,6 @@
<p>è¦æ¯æ们åè¾åè¾ï¼èµ°å¾åå¿«ä¹æ¯«æ
æä¹ãè¦å®ç°ä¸ä¸ªä¼å¤§çç®æ
ï¼æ们éè¦ä½åºå¦¥åï¼ä½åè®°ä¸ä¸å¯ä½åºå离ç®æ
ç妥åã</p>
<hr class="column-limit"/>
-</div>
<p>
æå
³çæ´»ä¸å
¶å®é¢åä¸ç±»ä¼¼çè§ç¹ï¼è¯·åè <a
@@ -154,6 +152,22 @@
<a href="/server/standards/README.translations.html">ãè¯è
æåã</a>ã</p>
</div>
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
<p>Copyright © 2008, 2021 Richard Stallman</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
@@ -171,7 +185,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2021/08/19 08:13:18 $
+$Date: 2021/09/14 02:02:45 $
<!-- timestamp end -->
</p>
Index: 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.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- open-source-misses-the-point.zh-cn.html 19 Aug 2021 08:13:20 -0000
1.34
+++ open-source-misses-the-point.zh-cn.html 14 Sep 2021 02:02:45 -0000
1.35
@@ -14,12 +14,11 @@
<!--#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">
+<div class="article reduced-width">
<h2>为ä»ä¹å¼æºé失äºèªç±è½¯ä»¶çéç¹</h2>
<address class="byline">Richard Stallman è</address>
-<div class="article">
<div class="important"><p>
“èªç±è½¯ä»¶”å“å¼æº”åºæ¬ä¸æçæ¯åä¸èå´çç¨åºãç¶èï¼åºäºä¸åçä»·å¼è§ï¼å®ä»¬å¯¹è¿äºç¨åºççæ³å¤§ç¸å¾åºãèªç±è½¯ä»¶è¿å¨ä¸ºç¨æ·ç计ç®èªç±èææï¼è¿æ¯ä¸ä¸ªä¸ºèªç±åå
¬æ£èæçè¿å¨ãç¸åï¼å¼æºç念éè§çæ¯å®ç¨ä¼å¿èä¸æ¯ååå©å®³ãæ们å
æ¤ä¸èµåå¼æºè¿å¨ï¼ä¹ä¸ä½¿ç¨å¼æºè¿ä¸ªè¯ã
</p></div>
@@ -165,7 +164,6 @@
<p>å¼æºçæ¯æè
们æä¸ä¸ªä¸ªç¨æ·æå
¥ä»ä»¬çéµè¥ï¼èæéç¨æ·ç»´æ¤èªç±çä»»å¡ï¼åè½å°äºæ们èªç±è½¯ä»¶æ¯æè
们çè©èä¸ãæ们è¦æ¢äºç¨æ¯ä»¥å¾æ´å¤§ç声é³è¯´“è¿æ¯èªç±è½¯ä»¶ï¼å®ææ¯çæ£å°éä½
çèªç±ç软件４—æ¯å½ä½
æ“å¼æºè½¯ä»¶”ä¸è¯æ¿æ¢æ“èªç±è½¯ä»¶”çæ¶åï¼ä½
å°±æ¯å¨æ¯ææ们çç念ã</p>
<div class="column-limit"></div>
-</div>
<h3 class="footnote">注</h3>
@@ -218,6 +216,22 @@
<a href="/server/standards/README.translations.html">ãè¯è
æåã</a>ã</p>
</div>
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
<p>Copyright © 2007, 2010, 2012-2016, 2019-2021 Richard Stallman</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
@@ -236,7 +250,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2021/08/19 08:13:20 $
+$Date: 2021/09/14 02:02:45 $
<!-- 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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- po/compromise.zh-cn-en.html 19 Aug 2021 08:13:24 -0000 1.24
+++ po/compromise.zh-cn-en.html 14 Sep 2021 02:02:45 -0000 1.25
@@ -16,16 +16,15 @@
<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#include virtual="/server/top-addendum.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
<h2>Avoiding Ruinous Compromises</h2>
<address class="byline">by Richard Stallman</address>
-<div class="article">
-<p class="comment">Twenty-five years
+<p class="introduction">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">
@@ -128,7 +127,7 @@
<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
idea of judging software (and other things) on “citizen
-values”, based on whether it respects users' freedom and
+values,” based on whether it respects users' freedom and
community, not just in terms of convenience. Then people will not
fall into the trap of a proprietary program baited by an attractive,
convenient feature.</p>
@@ -200,7 +199,6 @@
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,
@@ -239,6 +237,23 @@
information on coordinating and contributing translations of this article.</p>
</div>
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
<p>Copyright © 2008, 2021 Richard Stallman</p>
<p>This page is licensed under a <a rel="license"
@@ -249,7 +264,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2021/08/19 08:13:24 $
+$Date: 2021/09/14 02:02:45 $
<!-- 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.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- po/compromise.zh-cn.po 14 Sep 2021 01:54:15 -0000 1.47
+++ po/compromise.zh-cn.po 14 Sep 2021 02:02:45 -0000 1.48
@@ -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-09-11 09:55+0000\n"
# type: Content of: <title>
#. type: Content of: <title>
Index: 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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- po/open-source-misses-the-point.zh-cn-en.html 19 Aug 2021 08:13:27
-0000 1.24
+++ po/open-source-misses-the-point.zh-cn-en.html 14 Sep 2021 02:02:45
-0000 1.25
@@ -10,12 +10,11 @@
<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#include virtual="/server/top-addendum.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
<h2>Why Open Source Misses the Point of Free Software</h2>
<address class="byline">by Richard Stallman</address>
-<div class="article">
<div class="important"><p>
The terms “free software” and “open
source” stand for almost the same range of programs. However,
@@ -47,7 +46,7 @@
operating system</a>. Most of these users, however, have never heard of
the ethical reasons for which we developed this system and built the free
software community, because nowadays this system and community are more
-often spoken of as “open source”, attributing them to a
+often spoken of as “open source,” attributing them to a
different philosophy in which these freedoms are hardly mentioned.</p>
<p>The free software movement has campaigned for computer users'
@@ -112,7 +111,7 @@
want people to know we stand for freedom, so we do not accept being
mislabeled as open source supporters. What we advocate is not
“open source,” and what we oppose is not “closed
-source”. To make this clear, we avoid using those terms.
+source.” To make this clear, we avoid using those terms.
</p>
<h3>Practical Differences between Free Software and Open Source</h3>
@@ -140,7 +139,7 @@
computers check signatures on their executable programs to block users
from installing different executables; only one privileged company can
make executables that can run in the device or can access its full
-capabilities. We call these devices “tyrants”, and the
+capabilities. We call these devices “tyrants,” and the
practice is called “tivoization” after the product (Tivo)
where we first saw it. Even if the executable is made from free
source code, and nominally carries a free license, the users cannot
@@ -246,7 +245,7 @@
criteria for software licensing are simply not pertinent. The only
thing these activities have in common is that they somehow invite
people to participate. They stretch the term so far that it only
-means “participatory” or “transparent”, or
+means “participatory” or “transparent,” or
less than that. At worst, it
has <a
href="https://www.nytimes.com/2013/03/17/opinion/sunday/morozov-open-and-closed.html";>
become a vacuous buzzword</a>.</p>
@@ -435,7 +434,6 @@
than ever. Every time you say “free software” rather than
“open source,” you help our cause.</p>
<div class="column-limit"></div>
-</div>
<h3 class="footnote">Note</h3>
@@ -486,6 +484,23 @@
of this article.</p>
</div>
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
<p>Copyright © 2007, 2010, 2012-2016, 2019-2021 Richard Stallman</p>
<p>This page is licensed under a <a rel="license"
@@ -496,7 +511,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2021/08/19 08:13:27 $
+$Date: 2021/09/14 02:02:45 $
<!-- timestamp end -->
</p>
</div>
Index: 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.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- po/open-source-misses-the-point.zh-cn.po 14 Sep 2021 01:34:45 -0000
1.76
+++ po/open-source-misses-the-point.zh-cn.po 14 Sep 2021 02:02:45 -0000
1.77
@@ -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-09-12 08:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -338,11 +337,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/philosophy compromise.zh-cn.html open-sourc...,
GNUN <=