[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/gnu initial-announcement.zh-cn.html po/init...
From: |
GNUN |
Subject: |
www/gnu initial-announcement.zh-cn.html po/init... |
Date: |
Tue, 22 Feb 2022 01:01:05 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 22/02/22 01:01:05
Modified files:
gnu : initial-announcement.zh-cn.html
gnu/po : initial-announcement.zh-cn-en.html
initial-announcement.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/initial-announcement.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.zh-cn.po?cvsroot=www&r1=1.11&r2=1.12
Patches:
Index: initial-announcement.zh-cn.html
===================================================================
RCS file: /web/www/www/gnu/initial-announcement.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- initial-announcement.zh-cn.html 3 Nov 2021 16:00:56 -0000 1.3
+++ initial-announcement.zh-cn.html 22 Feb 2022 06:01:03 -0000 1.4
@@ -195,7 +195,18 @@
<h3 id="f1" class="footnote">è注</h3>
<ol>
-<li><em>è¿éçç¨è¯ä¸å¤ªä¸¥è°¨ã</em>å
¶åè¡·æ¯äººä»¬ä¸å¿
æ¯ä»è´¹ç¨æ¥è·å¾ä½¿ç¨GNUç³»ç»ç<b>许å¯</b>ãä½æ¯æ¤å¤ç¨è¯æ²¡ææç¡®è¿ä¸ç¹ï¼èä¸äººä»¬é常ä¼ç解æè¿æ¯å¨è¯´GNUçæ·è´æ»æ¯å»ä»·æä¸è±é±çãåæç»ä¸æ¯è¿æ
·çã</li>
+<li>
+<p><em>å½æ¶çç¨è¯å¹¶ä¸æ¯ç¹å«å°å¿ã</em>项ç®çåè¡·æ¯äººä»¬ä¸å¿
éå¾ä¸º <b>许å¯</b> ä»è´¹æè½ä½¿ç¨ GNU
+ç³»ç»ãä½æ¯ç¨è¯å¹¶æ²¡ææç¡®è¿ä¸ªåè¡·ï¼è人们ç»å¸¸ä¼è®¤ä¸ºè¿ä¸ªå£°æå°±æ¯è¯´
GNU å¤å¶çæ¬æ»æ¯åºè¯¥å
è´¹ååæè
æ¶è´¹å¾ä½ãè¿ç»ä¸æ¯åè¡·ãåæ¥ï¼ææè¯å°è¦å¨
+“free” çèªç±ä¹æå “free”
+çä»·æ
¼ä¹æé´å认ççåºåãèªç±è½¯ä»¶æ¯ç¨æ·æèªç±åååä¿®æ¹ç软件ãæäºç¨æ·ä¹è®¸æ¿å°äºæ²¡æè±é±çå¤å¶çæ¬ï¼ä¹æç¨æ·ä¼ä»è´¹è·å¾å¤å¶ç欗—å¦æè¿ä¸ªèµé对æ¹è¿èªç±è½¯ä»¶æå©ï¼å½ç¶è¶å¤è¶å¥½ãéç¹æ¯æ¯ä¸ªæ¥æå¤å¶çæ¬ç人é½æèªç±åå
¶ä»äººåä½ä½¿ç¨è¯¥è½¯ä»¶ã
+</p>
+
+<p>“ç»äº” ä¸è¯æ¯å¦ä¸ä¸ªè¯´ææè¿æ²¡ææ¸
æ¥å°åºåèªç±åä»·æ
¼é®é¢ç表ç°ãç°å¨æ们建议å¨è°è®ºèªç±è½¯ä»¶æ¶é¿å
è¿äºç¨æ³ã请åç
+“<a
+href="/philosophy/words-to-avoid.html#GiveAwaySoftware">é
ææ··æ·çè¯è¯</a>”
+äºè§£æ´å¤è§£éã</p>
+</li>
</ol>
</div>
@@ -252,7 +263,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1983, 1999, 2007, 2009, 2021 Free Software Foundation,
Inc.</p>
+<p>Copyright © 1983, 1999, 2007, 2009, 2021, 2022 Free Software
+Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨ <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative Commons
@@ -263,12 +275,12 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/"><CTT></a>ï¼2018ï¼2021ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/"><CTT></a>ï¼2018ï¼2021ï¼2022ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2021/11/03 16:00:56 $
+$Date: 2022/02/22 06:01:03 $
<!-- timestamp end -->
</p>
Index: po/initial-announcement.zh-cn-en.html
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/initial-announcement.zh-cn-en.html 3 Nov 2021 16:01:00 -0000
1.2
+++ po/initial-announcement.zh-cn-en.html 22 Feb 2022 06:01:05 -0000
1.3
@@ -234,11 +234,28 @@
<h3 id="f1" class="footnote">Footnote</h3>
<ol>
-<li><em>The wording here was careless.</em> The intention was that nobody
would
+<li>
+<p><em>The wording here was careless.</em> The intention was that nobody would
have to pay for <b>permission</b> to use the GNU system. But the
words don't make this clear, and people often interpret them as saying
that copies of GNU should always be distributed at little or no
-charge. That was never the intent.</li>
+charge. That was never the intent. Subsequently I have learned to
+distinguish carefully between “free” in the sense of
+freedom and “free” in the sense of price. Free software
+is software that users have the freedom to distribute and change.
+Some users may obtain copies at no charge, while others pay to obtain
+copies—and if the funds help support improving the software, so much
+the better. The important thing is that everyone who has a copy has
+the freedom to cooperate with others in using it.
+</p>
+
+<p>The expression “give away” is another
+indication that I had not yet clearly separated the issue of price
+from that of freedom. We now recommend avoiding this expression when
+talking about free software. See
+“<a href="/philosophy/words-to-avoid.html#GiveAwaySoftware">Confusing
+Words and Phrases</a>” for more explanation.</p>
+</li>
</ol>
</div>
@@ -290,7 +307,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1983, 1999, 2007, 2009, 2021 Free Software Foundation,
+<p>Copyright © 1983, 1999, 2007, 2009, 2021, 2022 Free Software
Foundation,
Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -301,7 +318,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2021/11/03 16:01:00 $
+$Date: 2022/02/22 06:01:05 $
<!-- timestamp end -->
</p>
</div>
Index: po/initial-announcement.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.zh-cn.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/initial-announcement.zh-cn.po 22 Feb 2022 05:54:40 -0000 1.11
+++ po/initial-announcement.zh-cn.po 22 Feb 2022 06:01:05 -0000 1.12
@@ -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: 2022-02-20 08:26+0000\n"
#. type: Content of: <title>
msgid "Initial Announcement - GNU Project - Free Software Foundation"
@@ -109,10 +108,10 @@
"one crashproof file system and two window systems for Lisp machines."
msgstr ""
"æå«Richard
Stallmanï¼æ¯é£ä¸ªè¢«å°å¤æ¨¡ä»¿çEMACSç¼è¾å¨çåå§åæè
ï¼æç°å¨å¨éº»ç"
-"çå·¥å¦é¢ç人工æºè½å®éªå®¤ãæä¸ç´ä¸æ³¨äºç¼è¯å¨ãç¼è¾å¨ãè°è¯å¨ãå½ä»¤è§£éå¨ã"
-"ITSï¼ä¸å
¼å®¹åæ¶ç³»ç»ï¼åLisp
Machineæä½ç³»ç»çå·¥ä½ãææ¯ITSç³»ç»ä¸ç»ç«¯æ å
³æ¾ç¤º"
-"æ¯æçå¼æè
ãæ¤å¤ï¼æå¨Lisp
machineä¸å®ç°äºä¸ä¸ªé²å´©æºçæ件系ç»å两个çªå£ç®¡"
-"çç³»ç»ã"
+"çå·¥å¦é¢ç人工æºè½å®éªå®¤ãæä¸ç´ä¸æ³¨äºç¼è¯å¨ãç¼è¾å¨ãè°è¯å¨ãå½ä»¤è§£éå¨ãITS"
+"ï¼ä¸å
¼å®¹åæ¶ç³»ç»ï¼åLisp
Machineæä½ç³»ç»çå·¥ä½ãææ¯ITSç³»ç»ä¸ç»ç«¯æ å
³æ¾ç¤ºæ¯æ"
+"çå¼æè
ãæ¤å¤ï¼æå¨Lisp
machineä¸å®ç°äºä¸ä¸ªé²å´©æºçæ件系ç»å两个çªå£ç®¡çç³»"
+"ç»ã"
#. type: Content of: <div><h3>
msgid "Why I Must Write GNU"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/gnu initial-announcement.zh-cn.html po/init...,
GNUN <=