[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: |
Mon, 13 Sep 2021 21:32:55 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 21/09/13 21:32:55
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.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn-en.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn.po?cvsroot=www&r1=1.58&r2=1.59
Patches:
Index: free-sw.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.zh-cn.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- free-sw.zh-cn.html 1 Sep 2021 09:34:29 -0000 1.23
+++ free-sw.zh-cn.html 14 Sep 2021 01:32:54 -0000 1.24
@@ -30,10 +30,11 @@
<div class="important">
<p>
-“èªç±è½¯ä»¶”å°éç¨æ·çèªç±ï¼å¹¶ä¸å°éæ´ä¸ªç¤¾åºãç²ç¥æ¥è®²ï¼ä¸ä¸ªè½¯ä»¶å¦ææ¯èªç±è½¯ä»¶ï¼è¿æå³ç<b>ç¨æ·å¯ä»¥èªç±å°è¿è¡ï¼æ·è´ï¼ååï¼å¦ä¹
ï¼ä¿®æ¹å¹¶æ¹è¿è¯¥è½¯ä»¶</b>ãå æ¤ï¼“èªç±è½¯ä»¶”æ¯å
³ä¹èªç±çé®é¢ï¼ä¸ä»·æ ¼æ å
³ï¼è½¯ä»¶å¦ä½å®ä»·å¹¶ä¸å½±åå®æ¯å¦è¢«å½ç±»ä¸ºèªç±è½¯ä»¶ãè±æä¸ï¼æ们使ç¨Free
-Softwareãç±äºFreeä¸è¯æ¢æèªç±ï¼ä¹æå
è´¹çææãèFree
-Softwareä¸çFreeæ¯æ“èªç±è¨è®º”ä¸çèªç±ï¼èé“å
è´¹”è¿ä¸æ项ã为é¿å
æ§ä¹ï¼å¨ä½¿ç¨è±ææ¶ï¼æ们ä¹ä¼åç¨æ³è¯æ西ççè¯ç“Libre
-Software”æ¥æèªç±è½¯ä»¶ã
+“èªç±è½¯ä»¶”å°éç¨æ·çèªç±ï¼å¹¶ä¸å°éæ´ä¸ªç¤¾åºãç²ç¥æ¥è®²ï¼ä¸ä¸ªè½¯ä»¶å¦ææ¯èªç±è½¯ä»¶ï¼è¿æå³ç<b>ç¨æ·å¯ä»¥èªç±å°è¿è¡ï¼æ·è´ï¼ååï¼å¦ä¹
ï¼ä¿®æ¹å¹¶æ¹è¿è¯¥è½¯ä»¶</b>ãå æ¤ï¼“èªç±è½¯ä»¶”æ¯å
³ä¹èªç±çé®é¢ï¼ä¸ä»·æ ¼æ å
³ãè¦ç解è¿ä¸ªæ¦å¿µï¼ä½ è¦æç
§
+Free Software ä¸ç“Free”æ¯æ“èªç±è¨è®ºï¼free
+speechï¼”ä¸çèªç±ï¼èé“å
è´¹åé¤ï¼free
+lunchï¼”çå
è´¹è¿ä¸æ项ã为é¿å
æ§ä¹ï¼å¨ä½¿ç¨è±ææ¶ï¼æ们ä¹ä¼åç¨æ³è¯æ西ççè¯ç“Libre
+Software”æ¥æèªç±è½¯ä»¶ï¼è¿æ
·å¯ä»¥æ确表示æ们说å¾ä¸æ¯å
è´¹ã
</p>
<p>
@@ -176,7 +177,7 @@
</p>
<p>
-åè¥è¦ä¿®æ¹æ个ç¨åºï¼ä¸ç§å¾éè¦çæ¹æ³å°±æ¯ä»å«çç¨åºä¸æ¿æ¥ç°æçå½æ°ï¼æ模åæ¥ä½¿ç¨ãå¦ææ个ç¨åºç许å¯è¯ä¸ç¦æ¢ä½
使ç¨å
¶ä»åçææç软件ç代ç
æ¥ä¿®æ¹è¯¥ç¨åº—æ¯å¦ï¼å¦ææ个ç¨åºç许å¯è¯è¦æ±ä½
åªè½ä½¿ç¨ä½ æ¥æçæç代ç
—é£ä¹è¿ä¸ªç¨åºç许å¯è¯å°ä¸è¢«è§ä¸ºèªç±è½¯ä»¶è®¸å¯è¯ã
+åè¥è¦ä¿®æ¹æ个ç¨åºï¼ä¸ç§å¾éè¦çæ¹æ³å°±æ¯ä»å«çç¨åºä¸æ¿æ¥ç°æçå½æ°æ模åæ¥ä½¿ç¨ãå¦ææ个ç¨åºç许å¯è¯ä¸ç¦æ¢ä½
使ç¨å
¶ä»åçææç软件ç代ç
æ¥ä¿®æ¹è¯¥ç¨åº—æ¯å¦ï¼å¦ææ个ç¨åºç许å¯è¯è¦æ±ä½
åªè½ä½¿ç¨ä½ æ¥æçæç代ç
—é£ä¹è¿ä¸ªç¨åºç许å¯è¯å°ä¸è¢«è§ä¸ºèªç±è½¯ä»¶è®¸å¯è¯ã
</p>
<p>
@@ -253,7 +254,7 @@
</p>
<p>
-èªç±è½¯ä»¶è®¸å¯è¯ä¸å¾è¦æ±ç¨æ·é¢å¤éµå®åªäºéèªç±è½¯ä»¶ç许å¯è¯ãä¾å¦ï¼èªç±è½¯ä»¶è®¸å¯è¯ä¸å¾è¦æ±ç¨æ·å¿
é¡»éµå®“ææ使ç¨ç软件ç许å¯è¯”ãå
为ç¨æ·å¯è½ä½¿ç¨éèªç±è½¯ä»¶ï¼èè¦æ±ç¨æ·éµå®å
¨é¨ä½¿ç¨ç软件ç许å¯è¯åæå³çéè¦éµå®éèªç±è½¯ä»¶è®¸å¯è¯ï¼è¿è¦çè¦æ±å°è¢«è§ä½éèªç±çã
+èªç±è½¯ä»¶è®¸å¯è¯ä¸å¾è¦æ±ç¨æ·é¢å¤éµå®åªäºéèªç±è½¯ä»¶ç许å¯è¯ãä¾å¦ï¼èªç±è½¯ä»¶è®¸å¯è¯ä¸å¾è¦æ±ç¨æ·å¿
é¡»éµå®“ææ使ç¨ç软件ç许å¯è¯”ãå
为ç¨æ·å¯è½ä½¿ç¨éèªç±è½¯ä»¶ï¼èè¦æ±ç¨æ·éµå®å
¨é¨ä½¿ç¨ç软件ç许å¯è¯åæå³çéè¦éµå®éèªç±è½¯ä»¶è®¸å¯è¯ï¼è¿æ
·çè¦æ±å°è¢«è§ä½éèªç±çã
</p>
<p>
@@ -528,7 +529,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2021/09/01 09:34:29 $
+$Date: 2021/09/14 01:32:54 $
<!-- 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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/free-sw.zh-cn-en.html 1 Sep 2021 09:34:30 -0000 1.16
+++ po/free-sw.zh-cn-en.html 14 Sep 2021 01:32:54 -0000 1.17
@@ -29,7 +29,7 @@
software</b>. Thus, “free software” is a matter of
liberty, not price. To understand the concept, you should think of
“free” as in “free speech,” not as in
-“free beer”. We sometimes call it “libre
+“free beer.” We sometimes call it “libre
software,” borrowing the French or Spanish word for
“free” as in freedom, to show we do not mean the software
is gratis.
@@ -164,7 +164,7 @@
<h4 id="selling">Free software <em>can</em> be commercial</h4>
<p>
-“Free software” does not mean “noncommercial”.
+“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
@@ -254,10 +254,10 @@
<p>
Freedom 1 includes the freedom to use your changed version in place of
the original. If the program is delivered in a product designed to
-run someone else's modified versions but refuse to run yours — a
-practice known as “tivoization” or “lockdown”,
+run someone else's modified versions but refuse to run yours—a
+practice known as “tivoization” or “lockdown,”
or (in its practitioners' perverse terminology) as “secure
-boot” — freedom 1 becomes an empty pretense rather than a
+boot”—freedom 1 becomes an empty pretense rather than a
practical reality. These binaries are not free
software even if the source code they are compiled from is free.
</p>
@@ -265,8 +265,8 @@
<p>
One important way to modify a program is by merging in available free
subroutines and modules. If the program's license says that you
-cannot merge in a suitably licensed existing module — for instance, if it
-requires you to be the copyright holder of any code you add — then the
+cannot merge in a suitably licensed existing module—for instance, if it
+requires you to be the copyright holder of any code you add—then the
license is too restrictive to qualify as free.
</p>
@@ -417,7 +417,7 @@
<p>
A free license may not require compliance with the license of a
nonfree program. Thus, for instance, if a license requires you to
-comply with the licenses of “all the programs you use”, in
+comply with the licenses of “all the programs you use,” in
the case of a user that runs nonfree programs this would require
compliance with the licenses of those nonfree programs; that makes the
license nonfree.
@@ -506,7 +506,7 @@
<p id="open-source">
Another group uses the term “open source” to mean
-something close (but not identical) to “free software”. We
+something close (but not identical) to “free software.” We
prefer the term “free software” because, once you have heard that
it refers to freedom rather than price, it calls to mind freedom. The
word “open” never refers to freedom.
@@ -522,7 +522,7 @@
<p>
The same arguments also make sense for other kinds of works of
-practical use — that is to say, works that embody useful knowledge,
+practical use—that is to say, works that embody useful knowledge,
such as educational works and reference
works. <a href="https://wikipedia.org";>Wikipedia</a> is the best-known
example.
@@ -743,7 +743,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2021/09/01 09:34:30 $
+$Date: 2021/09/14 01:32:54 $
<!-- 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.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- po/free-sw.zh-cn.po 14 Sep 2021 01:20:43 -0000 1.58
+++ po/free-sw.zh-cn.po 14 Sep 2021 01:32:55 -0000 1.59
@@ -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:56+0000\n"
"X-Generator: Poedit 1.7.5\n"
#. type: Content of: <title>