www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www education/edu-software.zh-cn.html education...


From: GNUN
Subject: www education/edu-software.zh-cn.html education...
Date: Thu, 2 May 2019 09:29:43 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     19/05/02 09:29:43

Modified files:
        education      : edu-software.zh-cn.html 
                         education-menu.zh-cn.html 
        education/po   : edu-software.zh-cn-en.html 
                         edu-software.zh-cn.po education-menu.zh-cn.po 
        philosophy     : open-source-misses-the-point.zh-cn.html 
        philosophy/po  : open-source-misses-the-point.zh-cn-en.html 
                         open-source-misses-the-point.zh-cn.po 
                         right-to-read.zh-cn-en.html 
                         right-to-read.zh-cn.po 
        server/standards: README.translations.zh-cn.html 
        server/standards/po: README.translations.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education-menu.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education-menu.zh-cn.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/open-source-misses-the-point.zh-cn.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.zh-cn-en.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.zh-cn.po?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/right-to-read.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/right-to-read.zh-cn.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/standards/README.translations.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/standards/po/README.translations.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: education/edu-software.zh-cn.html
===================================================================
RCS file: /web/www/www/education/edu-software.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- education/edu-software.zh-cn.html   13 Apr 2019 08:30:20 -0000      1.2
+++ education/edu-software.zh-cn.html   2 May 2019 13:29:41 -0000       1.3
@@ -11,7 +11,8 @@
 <!--#include virtual="/server/banner.zh-cn.html" -->
 <!--#include virtual="/education/education-menu.zh-cn.html" -->
 <p class="edu-breadcrumb">
-<a href="/education/education.html">教育</a> &rarr; 教育性自由软件</p>
+<a href="/education/education.html">教育</a> &rarr; <a
+href="/education/edu-resources.html">教育资源</a> &rarr; 
教育性自由软件</p>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -117,7 +118,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/04/13 08:30:20 $
+$Date: 2019/05/02 13:29:41 $
 
 <!-- timestamp end -->
 </p>

Index: education/education-menu.zh-cn.html
===================================================================
RCS file: /web/www/www/education/education-menu.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- education/education-menu.zh-cn.html 1 May 2019 01:01:06 -0000       1.5
+++ education/education-menu.zh-cn.html 2 May 2019 13:29:41 -0000       1.6
@@ -47,14 +47,14 @@
 <li class="active">
     
     <!--#echo encoding="none" var="MARK_START" -->
-<a href="/education/edu-software.html">EDUCATIONAL&nbsp;SOFTWARE</a>
+<a href="/education/edu-software.html">教育性软件</a>
     
     
   <!--#echo encoding="none" var="MARK_END" -->
 </li>
 
    <!--#else -->
-<li><a href="/education/edu-software.html">EDUCATIONAL&nbsp;SOFTWARE</a></li>
+<li><a href="/education/edu-software.html">教育性软件</a></li>
 
 <!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/education\/edu-faq/" -->

Index: education/po/edu-software.zh-cn-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-software.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- education/po/edu-software.zh-cn-en.html     13 Apr 2019 08:30:21 -0000      
1.2
+++ education/po/edu-software.zh-cn-en.html     2 May 2019 13:29:42 -0000       
1.3
@@ -9,6 +9,7 @@
 <!--#include virtual="/education/education-menu.html" -->              
 <p class="edu-breadcrumb">
 <a href="/education/education.html">Education</a> &rarr; 
+<a href="/education/edu-resources.html">Educational Resources</a> &rarr;
 Educational Free Software</p>
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
@@ -133,7 +134,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/04/13 08:30:21 $
+$Date: 2019/05/02 13:29:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education/po/edu-software.zh-cn.po
===================================================================
RCS file: /web/www/www/education/po/edu-software.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- education/po/edu-software.zh-cn.po  2 May 2019 13:09:30 -0000       1.7
+++ education/po/edu-software.zh-cn.po  2 May 2019 13:29:42 -0000       1.8
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-05-01 00:27+0000\n"
 
 #. type: Content of: <title>
 msgid "Educational Free Software - GNU Project - Free Software Foundation"

Index: education/po/education-menu.zh-cn.po
===================================================================
RCS file: /web/www/www/education/po/education-menu.zh-cn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- education/po/education-menu.zh-cn.po        2 May 2019 13:08:51 -0000       
1.3
+++ education/po/education-menu.zh-cn.po        2 May 2019 13:29:42 -0000       
1.4
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-04-30 22:58+0000\n"
 
 #. type: Content of: <div><ul><li>
 msgid "<a href=\"/education/edu-contents.html\">CONTENTS</a>"

Index: philosophy/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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- philosophy/open-source-misses-the-point.zh-cn.html  2 Mar 2019 12:30:22 
-0000       1.25
+++ philosophy/open-source-misses-the-point.zh-cn.html  2 May 2019 13:29:42 
-0000       1.26
@@ -49,9 +49,18 @@
 
<p>在实践中,开源的要求比自由软件宽松一些。据我们所知,迄今发布的自由软件源代ç
 éƒ½æ˜¯å¼€æºè½¯ä»¶ã€‚尽管大多数开源软件也同æ 
·æ˜¯è‡ªç”±è½¯ä»¶ï¼Œä½†ä¼šæœ‰ä¸€äº›ä¾‹å¤–。首å…
ˆï¼Œæœ‰äº›å¼€æºè®¸å¯è¯å¯¹ç”¨æˆ·è¿‡äºŽè‹›åˆ»ï¼Œå®ƒä»¬å°±æ²¡æœ‰è¢«åˆ—为自由软件。比如,&ldquo;Open
 Watcom&rdquo;就非自由的,因为其许可证不å…
è®¸ä¿®æ”¹è¯¥è½¯ä»¶å’Œç§è‡ªä½¿ç”¨è¯¥è½¯ä»¶ã€‚幸运的是,很少软件会使用这些许可证。</p>
 
-<p>另外,实际
操作时还有更重要的一点。很多产品带有检测可执行文件签名功能的计算机,它会禁止用户安è£
…或运行修改后的可执行文件,而只有一家特权å…
¬å¸æ‰èƒ½ç”Ÿäº§å¯æ‰§è¡Œæ–‡ä»¶æˆ–完å…
¨æŽ§åˆ¶è¯¥äº§å“ã€‚我们把这种设备称作&ldquo;tyrants&rdquo;,即&ldquo;专制暴君&rdquo;;把这种行为称为&ldquo;tivoization&rdquo;,该名称来自我们首å
…ˆçœ‹åˆ°TiVo公司使用该方法发布产品。在这æ 
·çš„产品上运行的可执行软件,哪怕是以自由软件许可证发布了源代ç
 ï¼Œä½†æ˜¯ç”¨æˆ·å´æ— æ³•è¿è¡Œä¿®æ”¹åŽçš„可执行文件,所以å…
¶å¯æ‰§è¡Œæ–‡ä»¶ä¸æ˜¯è‡ªç”±è½¯ä»¶ã€‚</p>
+<p>其次,当一个程序的源代码使用的是弱许可证,而非 
copyleft,那么其可执行文件就能够附加
额外的非自由条款。例如,<a
+href="https://code.visualstudio.com/License/";>微软对 Visual Studio
+就采取了这样的办法</a>。</p>
 
-<p>开源的标准没有意识到这个问题;它们只关心源代ç 
çš„许可证。这æ 
·ä»¥æ¥ï¼Œè¿™äº›ç¼–译自诸如Linux等开源和自由软件的可执行文件,原封未动,是开源的,但不是自由的。许多Android产品就åŒ
…含这样的非自由Linux可执行文件(tivoization)。</p>
+<p>如果这些可执行文件完全和发布的源代ç 
å¯¹åº”,那么它们是合æ 
¼çš„开源软件,但不是自由软件。不过,在这种情
况下,用户可以编译源代码来制作和发布可执行文件。</p>
+
+<p>最后,实际
操作时还有最重要的一点,很多产品带有检测可执行文件签名功能的计算机,它会禁止用户安è£
…另外不同的可执行文件;而只有一家特权å…
¬å¸æ‰èƒ½ç”Ÿäº§å¯æ‰§è¡Œæ–‡ä»¶æˆ–完å…
¨æŽ§åˆ¶è¯¥äº§å“ã€‚我们把这种设备称作&ldquo;tyrants&rdquo;,即&ldquo;专制暴君&rdquo;;把这种行为称为&ldquo;tivoization&rdquo;,该名称来自我们首å
…ˆçœ‹åˆ°TiVo公司使用该方法发布产品。在这æ 
·çš„产品上运行的可执行软件,哪怕是以自由软件许可证的名义发布了源代ç
 ï¼Œä½†æ˜¯ç”¨æˆ·å´æ— æ³•è¿è¡Œä¿®æ”¹åŽçš„可执行文件,所以å…
¶å¯æ‰§è¡Œæ–‡ä»¶ä¸æ˜¯è‡ªç”±è½¯ä»¶ã€‚</p>
+
+<p>许多Android产品就包
含非自由Linux可执行文件(tivoization),即使其源代码是按照 
GNU GPL 2 发布的。我们设计了 GNU
+GPL 3 来防止这样做。</p>
+
+<p>开源的标准没有意识到这个问题;它们只关心源代ç 
çš„许可证。这æ 
·ä»¥æ¥ï¼Œè¿™äº›ç¼–译自诸如Linux等开源和自由软件的可执行文件,原封未动,是开源的,但不是自由的。</p>
 
 <h3>关于&ldquo;自由软件&rdquo;和&ldquo;开源&rdquo;的常见误解</h3>
 
@@ -216,7 +225,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/03/02 12:30:22 $
+$Date: 2019/05/02 13:29:42 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/po/open-source-misses-the-point.zh-cn-en.html    2 Mar 2019 
12:30:22 -0000       1.16
+++ philosophy/po/open-source-misses-the-point.zh-cn-en.html    2 May 2019 
13:29:42 -0000       1.17
@@ -117,21 +117,34 @@
 because its license does not allow making a modified version and using
 it privately.  Fortunately, few programs use such licenses.</p>
 
-<p>Second, and more important in practice, many products containing
+<p>Second, when a program's source code carries a weak license, one
+without copyleft, its executables can carry additional nonfree
+conditions.  <a href="https://code.visualstudio.com/License/";>Microsoft
+does this with Visual Studio,</a> for example.</p>
+
+<p>If these executables fully correspond to the released sources, they
+qualify as open source but not as free software.  However, in that
+case users can compile the source code to make and distribute free
+executables.</p>
+
+<p>Finally, and most important in practice, many products containing
 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 &ldquo;tyrants&rdquo;, and the
 practice is called &ldquo;tivoization&rdquo; after the product (Tivo)
 where we first saw it.  Even if the executable is made from free
-source code, the users cannot run modified versions of it, so the
-executable is nonfree.</p>
+source code, and nominally carries a free license, the users cannot
+run modified versions of it, so the executable is de-facto nonfree.</p>
 
-<p>The criteria for open source do not recognize this issue; they are
-concerned solely with the licensing of the source code.  Thus, these
-unmodifiable executables, when made from source code such as Linux
-that is open source and free, are open source but not free.  Many
-Android products contain nonfree tivoized executables of Linux.</p>
+<p>Many Android products contain nonfree tivoized executables of
+Linux, even though its source code is under GNU GPL version 2.  We
+designed GNU GPL version 3 to prohibit this practice.</p>
+
+<p>The criteria for open source are concerned solely with the
+licensing of the source code.  Thus, these nonfree executables, when
+made from source code such as Linux that is open source and free, are
+open source but not free.</p>
 
 <h3>Common Misunderstandings of &ldquo;Free Software&rdquo; and
 &ldquo;Open Source&rdquo;</h3>
@@ -475,7 +488,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/03/02 12:30:22 $
+$Date: 2019/05/02 13:29:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/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.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- philosophy/po/open-source-misses-the-point.zh-cn.po 2 May 2019 13:14:06 
-0000       1.58
+++ philosophy/po/open-source-misses-the-point.zh-cn.po 2 May 2019 13:29:42 
-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: 2019-04-28 11:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -335,11 +334,11 @@
 "some respects.  Nonetheless, their definition agrees with our definition in "
 "most cases."
 msgstr ""
-"<a 
href=\"https://opensource.org/osd\";>&ldquo;开源软件&rdquo;的官方定义</"
-"a>(它是由开源促进会发布的,鉴于这个定义过长,就不在本文中å
…¨éƒ¨å¼•ç”¨äº†ï¼‰æ˜¯ç›´æŽ¥"
-"从我们对于自由软件的界定衍生而来。不过二者
也有不同,在某些方面,开源软件的定"
-"义比自由软件更宽松。不过总体而言,开源软件的定义和我们自由软件的定义在很多地"
-"方都是等价的。"
+"<a 
href=\"https://opensource.org/osd\";>&ldquo;开源软件&rdquo;的官方定义</a>"
+"(它是由开源促进会发布的,鉴于这个定义过长,就不在本文中å
…¨éƒ¨å¼•ç”¨äº†ï¼‰æ˜¯ç›´æŽ¥ä»Ž"
+"我们对于自由软件的界定衍生而来。不过二者
也有不同,在某些方面,开源软件的定义"
+"比自由软件更宽松。不过总体而言,开源软件的定义和我们自由软件的定义在很多地方"
+"都是等价的。"
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy/po/right-to-read.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/right-to-read.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/right-to-read.zh-cn-en.html   24 Mar 2019 02:30:13 -0000      
1.3
+++ philosophy/po/right-to-read.zh-cn-en.html   2 May 2019 13:29:42 -0000       
1.4
@@ -302,7 +302,7 @@
 downgrades.  It can also order all machines running Vista to refuse to
 run a certain device driver.  The main purpose of Vista's clampdown on
 users was to impose DRM that users can't overcome.  Of course, Windows
-10 is no better</p>
+10 is no better.</p>
 </div>
 <div class="column-limit"></div>
 </li>
@@ -546,7 +546,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/03/24 02:30:13 $
+$Date: 2019/05/02 13:29:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/right-to-read.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/right-to-read.zh-cn.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/po/right-to-read.zh-cn.po        2 May 2019 13:13:24 -0000       
1.11
+++ philosophy/po/right-to-read.zh-cn.po        2 May 2019 13:29:42 -0000       
1.12
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-04-30 19:26+0000\n"
 
 #. type: Content of: <title>
 msgid "The Right to Read - GNU Project - Free Software Foundation"

Index: server/standards/README.translations.zh-cn.html
===================================================================
RCS file: /web/www/www/server/standards/README.translations.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/standards/README.translations.zh-cn.html     7 Feb 2019 08:29:23 
-0000       1.3
+++ server/standards/README.translations.zh-cn.html     2 May 2019 13:29:42 
-0000       1.4
@@ -109,10 +109,10 @@
   </li>
 
   <li><p><strong>Digital Restriction Management 
(DRM)(数字限制管理)</strong>。我们在 gun.org
-里用这个短语来避免鼓吹性的“Rigital Rights
+里用这个短语来避免鼓吹性的“Digital Rights
 
Management”(“数字版权管理”)。它的意思是数字技术被用于向用户施åŠ
 å¼ºåˆ¶é™åˆ¶ï¼Œå¹¶ä¸”这些限制不仅用于数码,还用于实物。</p> 
 
-    <p>不过,英语短语“Right Restrictions 
Management”有一点小小的歧义,它可理解为以下两种意思:</p>
+    <p>不过,英语短语“Digital Restrictions 
Management”有一点小小的歧义,它可理解为以下两种意思:</p>
 
     <ol>
       <li> <strong>限制的数字化管理</strong>。</li>
@@ -506,7 +506,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/02/07 08:29:23 $
+$Date: 2019/05/02 13:29:42 $
 
 <!-- timestamp end -->
 </p>

Index: server/standards/po/README.translations.zh-cn.po
===================================================================
RCS file: /web/www/www/server/standards/po/README.translations.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/standards/po/README.translations.zh-cn.po    2 May 2019 13:12:32 
-0000       1.6
+++ server/standards/po/README.translations.zh-cn.po    2 May 2019 13:29:42 
-0000       1.7
@@ -508,8 +508,8 @@
 "Web Translators Manual</cite>."
 msgstr ""
 "特殊规则参见在<cite>《GNU Web Translators Manual》</cite>中的<a 
href=\"/"
-"software/trans-coord/manual/web-trans/html_node/Distribution-Terms.html"
-"\">《Distribution Terms》</a>"
+"software/trans-coord/manual/web-trans/html_node/Distribution-Terms.html\">"
+"《Distribution Terms》</a>"
 
 #. type: Content of: <h4>
 msgid "What to Translate"



reply via email to

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