www-commits
[Top][All Lists]
Advanced

[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 复制版本总是应该免费分发或者
收费很低。这绝不是初衷。后来,我意识到要在
+&ldquo;free&rdquo; 的自由之意和 &ldquo;free&rdquo;
+的价æ 
¼ä¹‹æ„é—´åšè®¤çœŸçš„区分。自由软件是用户有自由分发和修改的软件。有些用户也许拿到了没有花钱的复制版本,也有用户会付费获得复制版本&mdash;&mdash;如果这个资金对改进自由软件有助,当然越多越好。重点是每个拥有复制版本的人都有自由和å
…¶ä»–人合作使用该软件。
+</p>
+
+<p>&ldquo;给予&rdquo; 一词是另一个说明我还没有清
楚地区分自由和价æ 
¼é—®é¢˜çš„表现。现在我们建议在谈论自由软件时避å…
è¿™äº›ç”¨æ³•ã€‚请参看
+&ldquo;<a
+href="/philosophy/words-to-avoid.html#GiveAwaySoftware">造
成混淆的词语</a>&rdquo;
+了解更多解释。</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 &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 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/";>&lt;CTT&gt;</a>,2018,2021。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</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 &ldquo;free&rdquo; in the sense of
+freedom and &ldquo;free&rdquo; 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&mdash;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 &ldquo;give away&rdquo; 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
+&ldquo;<a href="/philosophy/words-to-avoid.html#GiveAwaySoftware">Confusing
+Words and Phrases</a>&rdquo; 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 &copy; 1983, 1999, 2007, 2009, 2021 Free Software Foundation,
+<p>Copyright &copy; 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"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]