[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy free-sw.zh-cn.html po/free-sw.zh...
|
From: |
GNUN |
|
Subject: |
www/philosophy free-sw.zh-cn.html po/free-sw.zh... |
|
Date: |
Tue, 2 Feb 2021 22:59:31 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 21/02/02 22:59:31
Modified files:
philosophy : free-sw.zh-cn.html
philosophy/po : free-sw.zh-cn-en.html free-sw.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.zh-cn.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn-en.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn.po?cvsroot=www&r1=1.42&r2=1.43
Patches:
Index: free-sw.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.zh-cn.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- free-sw.zh-cn.html 3 Aug 2019 13:58:20 -0000 1.18
+++ free-sw.zh-cn.html 3 Feb 2021 03:59:31 -0000 1.19
@@ -75,15 +75,31 @@
<p>æ 论å¨åªç§æ
åµä¸ï¼åªæææç¨æ·ä½¿ç¨ç代ç
é½æ»¡è¶³äºè¿å项åºæ¬èªç±ï¼è¯¥ç¨åºæè½è¢«è§ä½èªç±è½¯ä»¶ãä¾å¦ï¼æ两个ç¨åºï¼ç²ç¨åºè¿è¡çæ¶åä¼èªå¨è°ç¨ä¹ç¨åºãåå¸ç²ç¨åºæå³çç¨æ·å¿
须使ç¨å°ä¹ç¨åºï¼é£ä¹å¿
é¡»ç²ä¹ä¸¤ä¸ªç¨åºé½æ¯èªç±çï¼ç²ç¨åºææ¯èªç±çãå¦æéè¿ä¿®æ¹ç²ç¨åºï¼ä½¿å
¶ä¸åä¾èµä¹ç¨åºï¼é£ä¹ä»
ä»
以èªç±è½¯ä»¶çå½¢å¼åå¸ç²ç¨åºå³å¯ã</p>
<p>
-“èªç±è½¯ä»¶”ä¸ç亓éåä¸è½¯ä»¶”ãä¸ä¸ªèªç±è½¯ä»¶å¿
é¡»å
许åä¸ç¨æ·ãåä¸å¼åååä¸åå¸ãåä¸å¼åèªç±è½¯ä»¶æ©å°±å¸ç©ºè§æ¯äºï¼è¿æ
·çèªç±è½¯ä»¶é常éè¦ãä½
å¯è½éè¦è±é±è´ä¹°èªç±è½¯ä»¶çæ·è´ï¼ä¹å¯è½å
è´¹æ¿å°ãä½æ¯æ è®ºä½ å¦ä½è·å¾ä½ çæ·è´ï¼ä½ä¸ºç¨æ·ï¼ä½
çå大èªç±é½ä¼è¢«ä¿è¯ï¼ä½
å¯ä»¥èªç±å°è¿è¡ï¼ä¿®æ¹ï¼åå¸çè³<a
-href="/philosophy/selling.html">åºå®</a>ä½ æ¿å°çèªç±è½¯ä»¶ã
+“èªç±è½¯ä»¶” ä¸è¡¨ç¤º
+“éåä¸å”ãä¸ä¹ç¸åï¼èªç±è½¯ä»¶å¿
é¡»å¯ä»¥åç¨ãå¯ä»¥åä¸å¼åãå¯ä»¥åä¸åå¸ãè¿ä¸ªæ¿çé常é覗缺ä¹è¿æ
·çæ¿çï¼èªç±è½¯ä»¶å°æ æ³å®ç°èªå·±çç®æ ã
</p>
<p>
-åå¦è·å¾èªç±è½¯ä»¶æ·è´çç¨æ·éµå®äºèªç±è½¯ä»¶ç许å¯è¯æ¡æ¬¾ï¼é£ä¹è¯¥èªç±è½¯ä»¶å¿
须为ç¨æ·æä¾èªç±è½¯ä»¶çå项åºæ¬èªç±ãå¨èªç±æ¹é¢å¯¹ç¨æ·å
以éå¶æè
è¦æ±ä»è´¹æè½å®è·µè¿äºèªç±åä¸èµäºç¨æ·èªç±æ²¡æä»ä¹ä¸¤æ
·ï¼å æ¤è¿æ ·çç¨åºä¸æ¯èªç±è½¯ä»¶ã
+æ们è¦é请ææäººä½¿ç¨ GNU
+ç³»ç»ï¼å
æ¬åä¸æºæåå
¶åå·¥ãè¿å°±éè¦å
许åç¨ãæ们æå¾
许å¤ç¨åºçèªç±æ¿ä»£å°æ¥å¯ä»¥æ¿æ¢æç¸åºçä¸æç¨åºï¼ä½æ¯å¦æç¦æ¢åç¨å°±æ
æ³åå°è¿äºãæ们æå¾
åä¸äº§åå
å«æ
+GNU
+ç³»ç»ç软件ï¼å¹¶ä¸æ为åä¸åå¸å®ä»·çä¸é¨åãèªç±è½¯ä»¶çåä¸å¼åä¸åé£ä¹ä¸å¯»å¸¸ï¼è¿äºèªç±çåä¸è½¯ä»¶é常éè¦ãä»è´¹çãä¸ä¸çèªç±è½¯ä»¶ææ¯æ¯æå¡«è¡¥äºéè¦çéæ±ç©ºç½ã
</p>
-<h3>æ¾æ¸
å ç¹</h3>
+<p>
+å
æ¤ï¼æåä¸ä½¿ç¨ãåä¸å¼åæåä¸åå¸æé¤å¨å¤ä¼ç¾ç»èªç±è½¯ä»¶ç¤¾åºå¹¶é»ç¢å
¶èµ°åæåä¹è·¯ãæ们ä¸å®è¦æ确使ç¨å¸¦æè¿ç§éå¶ç许å¯è¯åå¸ç软件ä¸æ¯èªç±è½¯ä»¶ã
+</p>
+
+<p>
+åå¦è·å¾èªç±è½¯ä»¶æ·è´çï¼æ½å¨ï¼ç¨æ·éµå®äºå
ååå¸çèªç±è½¯ä»¶ç许å¯è¯æ¡æ¬¾ï¼é£ä¹è¯¥èªç±è½¯ä»¶å¿
须为è·å¾è½¯ä»¶ç该ï¼æ½å¨ï¼ç¨æ·æä¾èªç±è½¯ä»¶çå项åºæ¬èªç±ãå¨èªç±æ¹é¢å¯¹ç¨æ·å
以éå¶æè
è¦æ±ä»è´¹æè½å®è·µè¿äºèªç±åä¸èµäºç¨æ·èªç±æ²¡æä»ä¹ä¸¤æ
·ï¼å æ¤è¿æ ·çç¨åºä¸æ¯èªç±è½¯ä»¶ã
+</p>
+
+<p>
+ä½ å¯è½è±é±è´ä¹°äºèªç±è½¯ä»¶çæ·è´ï¼ä¹å¯è½å
è´¹æ¿å°ãä½æ¯æ è®ºä½ å¦ä½è·å¾ä½ çæ·è´ï¼ä½
é½æèªç±å¤å¶åä¿®æ¹è¯¥è½¯ä»¶ï¼ä¹è³ <a
+href="/philosophy/selling.html">åºå®</a> 该软件çæ·è´ã
+</p>
+
+<h3>æ¾æ¸
èªç±åéèªç±çè¾¹ç</h3>
<p>å¨æ¬æç以ä¸é¨åï¼æ们ä¼è¿ä¸æ¥åç¡®å°è§£éè¿äºèªç±é对åç§é®é¢ä¼å¦ä½æ©å±æè½ä½¿è½¯ä»¶èªç±ã</p>
@@ -98,6 +114,9 @@
<p>ä¾å¦ï¼å¦æ代ç éæå°æç»æäºææä¹çè¾å
¥——æè
çè³æ
æ¡ä»¶å°å¤±æ——è¿å°±å¯è½ä½¿è¯¥ç¨åºä¸é£ä¹æç¨ï¼çè³å¯è½å®å
¨æ ç¨ï¼ä½æ¯è¿å¹¶ä¸å¦¨ç¢ç¨æ·è¿è¡è¯¥ç¨åºçèªç±ï¼å
æ¤ï¼è¿åèªç±ä¹é¶å¹¶æ çç¾ãå¦æ该ç¨åºæ¯èªç±çï¼é£ä¹å
¶ç¨æ·å¯ä»¥å
æè¿äºæ ç¨ä¹å¤ï¼å 为èªç±ä¹ä¸åèªç±ä¹ä¸å
许ç¨æ·å社åºä¿®æ¹åå表ä¸å¸¦æéæ代ç çæ¹è¿çæ¬ã</p>
+<p>“æç
§ä½ çææ¿” å¯ä»¥å
å«ãå¯éæ©å°å
å«ã“å®å
¨ä¸å
å«”ï¼å¦æä½ å¸æå¦æ¤ï¼ãæ以没æå¿
è¦åæä¸ä¸ªåç¬ç
+“ä¸è¿è¡ç¨åºçèªç±”ã</p>
+
<h4>å¦ä¹ åæ´æ¹ç¨åºæºä»£ç çèªç±</h4>
<p>
@@ -117,6 +136,11 @@
对软件çä¿®æ¹å¯è½æ¯åºäºåç§ç®çãæ个ç¹å®çä¿®æ¹ç©¶ç«æ¯å¥½æ¯åï¼è¿æ¬èº«æ¯ä¸ªé常主è§çäºæ
ãèªç±è½¯ä»¶è®¸å¯è¯ä¸è½å¯¹ç¨æ·ä¿®æ¹è½¯ä»¶åä»»ä½éå¶ï¼ä¾å¦ï¼ä¸è½ä»
ä»
å
为æ人è§å¾åªå¤ä¿®æ¹ä¸å¤å¥½ï¼å°±ç¦æ¢ç¨æ·èªå·±åè¿ä¸ªæ¹å¨ã
</p>
+<p>
+èªç±ä¹ä¸æä¸ä¸ªç¹æ®çæ¡ä¾å°±æ¯å é¤ç¨åºç代ç
让å®ä¸æ§è¡ä»»ä½å¨ä½ï¼æè
让å®ç´æ¥è°ç¨å¦å¤çç¨åºãå
æ¤ï¼èªç±ä¹ä¸å
å«æ
+“å é¤ç¨åºçèªç±”ã
+</p>
+
<h4>èªç±åº¦2ï¼ç¨æ·å¯ä»¥èªç±å°åå该软件çæ·è´ã</h4>
<p>èªç±ååï¼èªç±åº¦2å3ï¼æå³çä½
ï¼å³ï¼è½¯ä»¶ç¨æ·ï¼å¯ä»¥æ软件åçæä¿®æ¹çååå¸ç»å
¶ä»ç¨æ·ãä½ å¯ä»¥å
è´¹åå¸ï¼ä¹å¯ä»¥æ¶åè´¹ç¨ã软件å¯ä»¥åå¸ç»<a
@@ -260,6 +284,10 @@
<ul>
<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.168&r2=1.169";>Version
+1.169</a>ï¼è§£é为ä»ä¹å个èªç±å¿
须对åä¸æ´»å¨ä¹éç¨ã解é为ä»ä¹å个èªç±éå«æä¸è¿è¡ç¨åºçèªç±åå
é¤ç¨åºçèªç±ï¼å æ¤æ²¡æå¿
è¦ååç¬éè¿°è¿äºèªç±ã</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.164&r2=1.165";>Version
1.165</a>ï¼æ¾æ¸
ç¨åºä¸çéæ代ç
并没æå¦è®¤ç¨æ·çèªç±ä¹é¶ï¼è¿èèªç±ä¹ä¸åèªç±ä¹ä¸ä½¿ç¨æ·å¯ä»¥å
æè¿äºéæ代ç ã</li>
@@ -430,8 +458,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1996, 2002, 2004-2007, 2009-2019 Free Software Foundation,
-Inc.</p>
+<p>Copyright © 1996, 2002, 2004-2007, 2009-2019, 2021 Free Software
+Foundation, Inc.</p>
<p>æ¬é¡µé¢éç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -444,12 +472,12 @@
<b>ç¿»è¯</b>ï¼éæ¥ <a
href="mailto:monnand@gmail.com";><monnand@gmail.com></a>ï¼2015ã<br></br>
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017-2019ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017-2019ï¼2021ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/08/03 13:58:20 $
+$Date: 2021/02/03 03:59:31 $
<!-- timestamp end -->
</p>
Index: po/free-sw.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn-en.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/free-sw.zh-cn-en.html 3 Aug 2019 13:58:20 -0000 1.11
+++ po/free-sw.zh-cn-en.html 3 Feb 2021 03:59:31 -0000 1.12
@@ -109,26 +109,50 @@
only A needs to be free; B is not pertinent to that plan.</p>
<p>
-“Free software” does not mean “noncommercial”. A free
-program must be available for commercial use, commercial development,
-and commercial distribution. Commercial development of free software
-is no longer unusual; such free commercial software is very important.
-You may have paid money to get copies of free software, or you may have
-obtained copies at no charge. But regardless of how you got your copies,
-you always have the freedom to copy and change the software, even to
-<a href="/philosophy/selling.html">sell copies</a>.
+“Free software” does not mean “noncommercial”.
+On the contrary, a free program must be available for commercial use,
+commercial development, and commercial distribution. This policy is
+of fundamental importance—without this, free software could not
+achieve its aims.
</p>
<p>
-A free program must offer the four freedoms to any user that obtains a
-copy of the software, provided the user has complied thus far with the
-conditions of the free license covering the software. Putting some of
-the freedoms off limits to some users, or requiring that users pay, in
-money or in kind, to exercise them, is tantamount to not granting the
-freedoms in question, and thus renders the program nonfree.
+We want to invite everyone to use the GNU system, including businesses
+and their workers. That requires allowing commercial use. We hope
+that free replacement programs will supplant comparable proprietary
+programs, but they can't do that if businesses are forbidden to use
+them. We want commercial products that contain software to include
+the GNU system, and that would constitute commercial distribution for
+a price. Commercial development of free software is no longer
+unusual; such free commercial software is very important. Paid,
+professional support for free software fills an important need.
</p>
-<h3>Clarifying the line at various points</h3>
+<p>
+Thus, to exclude commercial use, commercial development or commercial
+distribution would hobble the free software community and obstruct its
+path to success. We must conclude that a program licensed with such
+restrictions does not qualify as free software.
+</p>
+
+<p>
+A free program must offer the four freedoms to any would-be user that
+obtains a copy of the software, who has complied thus far with the
+conditions of the free license covering the software in any previous
+distribution of it. Putting some of the freedoms off limits to some
+users, or requiring that users pay, in money or in kind, to exercise
+them, is tantamount to not granting the freedoms in question, and thus
+renders the program nonfree.
+</p>
+
+<p>
+You may have paid money to get copies of a free program, or you may
+have obtained copies at no charge. But regardless of how you got your
+copies, you always have the freedom to copy and change the software,
+even to <a href="/philosophy/selling.html">sell copies</a>.
+</p>
+
+<h3>Clarifying the boundary between free and nonfree</h3>
<p>In the rest of this article we explain more precisely how far the
various freedoms need to extend, on various issues, in order for a
@@ -163,6 +187,10 @@
communities to make and distribute modified versions without the
arbitrary nuisance code.</p>
+<p>“As you wish” includes, optonally, “not at
+all” if that is what you wish. So there is no need for a
+separate “freedom not to run a program.”</p>
+
<h4>The freedom to study the source code and make changes</h4>
<p>
@@ -199,6 +227,12 @@
someone else considers an improvement, that program is not free.
</p>
+<p>
+One special case of freedom 1 is to delete the program's code so it
+returns after doing nothing, or make it invoke some other program.
+Thus, freedom 1 includes the “freedom to delete the program.”
+</p>
+
<h4>The freedom to redistribute if you wish: basic requirements</h4>
<p>Freedom to distribute (freedoms 2 and 3) means you are free to
@@ -460,6 +494,12 @@
<ul>
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.168&r2=1.169";>Version
+1.169</a>: Explain why more clearly why the four freedoms must apply
+to commercial activity. Explain why the four freedoms imply the
+freedom not to run the program and the freedom to delete it, so there
+is no need to state those as separate requirements.</li>
+
<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.164&r2=1.165";>Version
1.165</a>: Clarify that arbitrary annoyances in the code do not
negate freedom 0, and that freedoms 1 and 3 enable users to remove them.</li>
@@ -642,7 +682,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1996, 2002, 2004-2007, 2009-2019
+<p>Copyright © 1996, 2002, 2004-2007, 2009-2019, 2021
Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -653,7 +693,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/08/03 13:58:20 $
+$Date: 2021/02/03 03:59:31 $
<!-- timestamp end -->
</p>
</div>
Index: po/free-sw.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn.po,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- po/free-sw.zh-cn.po 3 Feb 2021 03:45:28 -0000 1.42
+++ po/free-sw.zh-cn.po 3 Feb 2021 03:59:31 -0000 1.43
@@ -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-02-03 00:25+0000\n"
"X-Generator: Poedit 1.7.5\n"
#. type: Content of: <title>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy free-sw.zh-cn.html po/free-sw.zh...,
GNUN <=