www-commits
[Top][All Lists]
Advanced

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

www distros/common-distros.zh-cn.html distros/p...


From: GNUN
Subject: www distros/common-distros.zh-cn.html distros/p...
Date: Wed, 19 Sep 2018 08:57:30 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/09/19 08:57:30

Modified files:
        distros        : common-distros.zh-cn.html 
        distros/po     : common-distros.zh-cn-en.html 
                         common-distros.zh-cn.po 
        philosophy     : free-software-even-more-important.zh-cn.html 
                         fs-translations.zh-cn.html 
        philosophy/po  : free-software-even-more-important.zh-cn-en.html 
                         free-software-even-more-important.zh-cn.po 
                         fs-translations.zh-cn-en.html 
                         fs-translations.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-cn-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-cn.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-software-even-more-important.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-software-even-more-important.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-software-even-more-important.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: distros/common-distros.zh-cn.html
===================================================================
RCS file: /web/www/www/distros/common-distros.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- distros/common-distros.zh-cn.html   31 Aug 2018 14:27:52 -0000      1.5
+++ distros/common-distros.zh-cn.html   19 Sep 2018 12:57:29 -0000      1.6
@@ -138,27 +138,31 @@
 
 <p>下面我们讨论一些知名的或者
重要的非GNU/Linux系统发行版,它们都不是合æ 
¼çš„自由系统发布。</p>
 
+<h3 id="Android">Android</h3>
+
+<p>Google发布的<a
+href="/philosophy/android-and-users-freedom.html">Android</a>包
含了许多自由和非自由的部件。å…
¶å¤§å¤šæ•°è‡ªç”±éƒ¨åˆ†é‡‡ç”¨çš„是简单许可证(不是<a
+href="/licenses/copyleft.html">copyleft</a>),所以发布Android产品的制é€
 å•†æœ‰æ—¶ä¼šæŠŠè¿™éƒ¨åˆ†ä¹Ÿå˜æˆéžè‡ªç”±çš„。</p>
+
 <h3 id="BSD">BSD系统</h3>
 
 <p>FreeBSD、NetBSD和OpenBSD全部在其软件安装系统中包
含了获取非自由软件的指导。另外,其内核还包
含了非自由的固件blobs。</p>
 
 <p>Linux内æ 
¸ä½¿ç”¨çš„非自由固件程序被称做&ldquo;blobs&rdquo;,我们使用该术语描述此类程序。在BSD术语中,&ldquo;blob&rdquo;说的是另外的东西:非自由驱动。OpenBSD,还可能åŒ
…括其他BSD发行版(BSD开发者称之为&ldquo;项目&rdquo;)有不包
含这些非自由驱动的政策。对驱动,这是正确的政策;但是当开发è€
…说其发行版&ldquo;没有包
含blobs&rdquo;时,就形成了误解。他们说的不是固件blobs。</p>
 
-<p>没有BSD发行版声明å…
¶æœ‰é’ˆå¯¹ä¸“属二进制固件的政策,即使这些二进制固件可能会被自由驱动åŠ
 è½½ã€‚</p>
+<p>这些BSD发行版都没有声明它们有针对专属二进制固件的政策,即使这些二进制固件可能会被自由驱动åŠ
 è½½ã€‚</p>
 
-<h3 id="Haiku">Haiku</h3>
+<h3 id="ChromeOS">Chrome OS</h3>
 
-<p>Haiku包含有一些不允许你修改的软件。它也包
含了非自由的固件blobs。</p>
+<p>Chrome OS的æ 
¸å¿ƒéƒ¨åˆ†æ˜¯éžè‡ªç”±çš„Chrome浏览器。它可能还含有å…
¶ä»–的非自由软件。</p>
 
-<h3 id="Android">Android</h3>
+<h3 id="e">/e/</h3>
 
-<p>Google发布的<a
-href="/philosophy/android-and-users-freedom.html">Android</a>包
含了许多自由和非自由的部件。å…
¶å¤§å¤šæ•°è‡ªç”±éƒ¨åˆ†é‡‡ç”¨çš„是简单许可证(不是<a
-href="/licenses/copyleft.html">copyleft</a>),所以发布Android产品的制é€
 å•†æœ‰æ—¶ä¼šæŠŠè¿™éƒ¨åˆ†ä¹Ÿå˜æˆéžè‡ªç”±çš„。</p>
+<p>/e/ 
(原来叫做eelo)是Android的一种修改版,它带有非自由的软件库。</p>
 
-<h3 id="ChromeOS">Chrome OS</h3>
+<h3 id="Haiku">Haiku</h3>
 
-<p>Chrome OS的æ 
¸å¿ƒéƒ¨åˆ†æ˜¯éžè‡ªç”±çš„Chrome浏览器。它可能还含有å…
¶ä»–的非自由软件。</p>
+<p>Haiku包含有一些不允许你修改的软件。它也包
含了非自由的固件blobs。</p>
 
 <h3 id="LineageOS">LineageOS</h3>
 
@@ -235,7 +239,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2018/08/31 14:27:52 $
+$Date: 2018/09/19 12:57:29 $
 
 <!-- timestamp end -->
 </p>

Index: distros/po/common-distros.zh-cn-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-cn-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- distros/po/common-distros.zh-cn-en.html     31 Aug 2018 14:27:53 -0000      
1.5
+++ distros/po/common-distros.zh-cn-en.html     19 Sep 2018 12:57:29 -0000      
1.6
@@ -233,6 +233,15 @@
 <p>Here we discuss some well-known or significant non-GNU/Linux system
 distros that do not qualify as free.</p>
 
+<h3 id="Android">Android</h3>
+
+<p><a href="/philosophy/android-and-users-freedom.html">Android</a> as
+released by Google contains many nonfree parts as well as many free
+parts.  Most of the free parts are covered by a pushover license (not
+<a href="/licenses/copyleft.html">copyleft</a>), so manufacturers that
+distribute Android in a product sometimes make those parts nonfree as
+well.</p>
+
 <h3 id="BSD">BSD systems</h3>
 
 <p>FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining
@@ -248,27 +257,23 @@
 &ldquo;contain no blobs&rdquo;, it causes a misunderstanding.  They are not 
 talking about firmware blobs.</p>
 
-<p>No BSD distribution has policies against proprietary binary-only
-firmware that might be loaded even by free drivers.</p>
+<p>None of those BSD distributions has policies against proprietary
+binary-only firmware that might be loaded even by free drivers.</p>
 
-<h3 id="Haiku">Haiku</h3>
+<h3 id="ChromeOS">Chrome OS</h3>
 
-<p>Haiku includes some software that you're not allowed to modify.  It
-also includes nonfree firmware blobs.</p>
+<p>The central part of Chrome OS is the nonfree Chrome browser.
+It may contain other nonfree software as well.</p>
 
-<h3 id="Android">Android</h3>
+<h3 id="e">/e/</h3>
 
-<p><a href="/philosophy/android-and-users-freedom.html">Android</a> as
-released by Google contains many nonfree parts as well as many free
-parts.  Most of the free parts are covered by a pushover license (not
-<a href="/licenses/copyleft.html">copyleft</a>), so manufacturers that
-distribute Android in a product sometimes make those parts nonfree as
-well.</p>
+<p>/e/ (formerly eelo) is a modified version of Android,
+which contains nonfree libraries.</p>
 
-<h3 id="ChromeOS">Chrome OS</h3>
+<h3 id="Haiku">Haiku</h3>
 
-<p>The central part of Chrome OS is the nonfree Chrome browser.
-It may contain other nonfree software as well.</p>
+<p>Haiku includes some software that you're not allowed to modify.  It
+also includes nonfree firmware blobs.</p>
 
 <h3 id="LineageOS">LineageOS</h3>
 
@@ -339,7 +344,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/08/31 14:27:53 $
+$Date: 2018/09/19 12:57:29 $
 <!-- timestamp end -->
 </p>
 </div>

Index: distros/po/common-distros.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-cn.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- distros/po/common-distros.zh-cn.po  19 Sep 2018 12:53:20 -0000      1.14
+++ distros/po/common-distros.zh-cn.po  19 Sep 2018 12:57:29 -0000      1.15
@@ -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: 2018-09-18 13:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -204,8 +203,8 @@
 "the installer in some cases recommends these nonfree firmware files for the "
 "peripherals on the machine."
 msgstr ""
-"Debian以前的发布包括带非自由blobs的Linux内æ 
¸ã€‚从2011å¹´2月的Debian "
-"6.0(&ldquo;squeeze&rdquo;)发布起,这些blobs被å…
¶ä¸»å‘布移除到分离的非自由软件"
+"Debian以前的发布包括带非自由blobs的Linux内æ 
¸ã€‚从2011å¹´2月的Debian 6.0"
+"(&ldquo;squeeze&rdquo;)发布起,这些blobs被å…
¶ä¸»å‘布移除到分离的非自由软件"
 "库。然而,问题还有遗留:其安装程序在某些情
况下会为电脑的外设推荐这些非自由的"
 "固件。"
 

Index: philosophy/free-software-even-more-important.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-software-even-more-important.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/free-software-even-more-important.zh-cn.html     8 Nov 2017 
14:28:52 -0000       1.3
+++ philosophy/free-software-even-more-important.zh-cn.html     19 Sep 2018 
12:57:30 -0000      1.4
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" 
value="/philosophy/free-software-even-more-important.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.85 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>自由软件现在更加重要 - GNU工程 - 
自由软件基金会</title>
@@ -25,8 +25,9 @@
 
<p>我们有时也称之为&ldquo;libre(自由)软件&rdquo;,以强调我们说的是自由,而非价æ
 
¼ã€‚有些专属(非自由)程序,如Photoshop,很昂贵;另一些,如Flash
 Player,是免费的&mdash;但这些只是细枝末节。这两者
都赋予程序的开发者凌驾于å…
¶ç”¨æˆ·ä¹‹ä¸Šçš„权力,而任何人都不应该拥有这样的权力。</p>
 
-<p>这两种非自由软件还有一些å…
±åŒç‚¹ï¼šå®ƒä»¬éƒ½æ˜¯<em>恶意软件</em>。就是说,它们都带有损害用户的功能。当前的专属软件通常都是恶意软件,å›
 ä¸º<a
-href="/malware/">开发者
拥有的权力被滥用了</a>。这里列举了大约300种不同的恶意功能(截至2017年4月),但是可以肯定这些只是冰山一角。</p>
+<p>这两种非自由软件还有一些å…
±åŒç‚¹ï¼šå®ƒä»¬éƒ½æ˜¯<em>恶意软件</em>。就是说,它
+们都带有损害用户的功能。当今的专属软件通常都是恶意软件,å›
 ä¸º<a
+href="/malware/">开发者
拥有的权力被滥用了</a>。这里列举了大约400种不同的恶意功能(截至2018年9月),但是可以肯定这些只是冰山一角。</p>
 
 <p>使用自由软件,用户控制程序,无
论是单个用户还是集体用户。所以他们控制着计算机做什么(假设计算机是<a
 href="/philosophy/loyal-computers.html">听话的</a>并且按ç…
§ç”¨æˆ·çš„程序来执行)。</p>
@@ -183,7 +184,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2015, 2017 Richard Stallman</p>
+<p>Copyright &copy; 2015, 2017, 2018 Richard Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -195,12 +196,13 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译</b>:王志坤,2014。<br></br>
 <b>翻译团队</b>:<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2017。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,
+2017, 2018。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2017/11/08 14:28:52 $
+$Date: 2018/09/19 12:57:30 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/fs-translations.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/fs-translations.zh-cn.html       28 Mar 2018 22:58:13 -0000      
1.5
+++ philosophy/fs-translations.zh-cn.html       19 Sep 2018 12:57:30 -0000      
1.6
@@ -806,6 +806,32 @@
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="te">泰卢固语</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>语言代码</th>
+<td>te</td></tr>
+<tr><th>自由软件</th>
+<td lang="te" xml:lang="te">
+స్వేచ్ఛ సాఫ్ట్‌వేర్ (swechcha软件)
+</td></tr>
+<tr><th>免费软件</th>
+<td lang="te" xml:lang="te">
+ఉచిత సాఫ్ట్‌వేర్ (uchitha软件)
+</td></tr>
+<tr><th>专属软件</th>
+<td lang="te" xml:lang="te">
+యాజమాన్య సాఫ్ట్‌వేర్ (yaajamaanya软件)
+</td></tr>
+<tr><th>商业软件</th>
+<td lang="te" xml:lang="te">
+వాణిజ్య సాఫ్ట్‌వేర్ (vaanijya软件)
+</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
 <h3 id="ta">泰米尔语</h3>
 
 <!-- GNUN-SORT-END-KEY -->
@@ -1130,7 +1156,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2018/03/28 22:58:13 $
+$Date: 2018/09/19 12:57:30 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/free-software-even-more-important.zh-cn-en.html
===================================================================
RCS file: 
/web/www/www/philosophy/po/free-software-even-more-important.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/free-software-even-more-important.zh-cn-en.html       8 Nov 
2017 14:28:52 -0000       1.2
+++ philosophy/po/free-software-even-more-important.zh-cn-en.html       19 Sep 
2018 12:57:30 -0000      1.3
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.85 -->
 <title>Free Software Is Even More Important Now
 - GNU Project - Free Software Foundation</title>
  <!--#include 
virtual="/philosophy/po/free-software-even-more-important.translist" -->
@@ -35,8 +35,8 @@
 both <em>malware</em>.  That is, both have functionalities designed to
 mistreat the user.  Proprietary software nowadays is often malware
 because <a href="/malware/">the developers' power
-corrupts them</a>.  That directory lists around 300 different
-malicious functionalities (as of Apr 2017), but it is surely just the
+corrupts them</a>.  That directory lists around 400 different
+malicious functionalities (as of September, 2018), but it is surely just the
 tip of the iceberg.</p>
 
 <p>With free software, the users control the program, both individually
@@ -349,7 +349,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2015, 2017 Richard Stallman</p>
+<p>Copyright &copy; 2015, 2017, 2018 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -359,7 +359,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/11/08 14:28:52 $
+$Date: 2018/09/19 12:57:30 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/free-software-even-more-important.zh-cn.po
===================================================================
RCS file: 
/web/www/www/philosophy/po/free-software-even-more-important.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/free-software-even-more-important.zh-cn.po    19 Sep 2018 
12:54:13 -0000      1.7
+++ philosophy/po/free-software-even-more-important.zh-cn.po    19 Sep 2018 
12:57:30 -0000      1.8
@@ -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: 2018-09-18 07:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""

Index: philosophy/po/fs-translations.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/fs-translations.zh-cn-en.html 28 Mar 2018 13:58:27 -0000      
1.1
+++ philosophy/po/fs-translations.zh-cn-en.html 19 Sep 2018 12:57:30 -0000      
1.2
@@ -861,6 +861,34 @@
 </table>
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="te">Telugu</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>te</td></tr>
+<tr><th>Free Software</th>
+<td lang="te" xml:lang="te">
+స్వేచ్ఛ సాఫ్ట్‌వేర్
+(swechcha software)
+</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="te" xml:lang="te">
+ఉచిత సాఫ్ట్‌వేర్
+(uchitha software)
+</td></tr>
+<tr><th>Proprietary Software</th>
+<td lang="te" xml:lang="te">
+యాజమాన్య సాఫ్ట్‌వేర్
+(yaajamaanya software)
+</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="te" xml:lang="te">
+వాణిజ్య సాఫ్ట్‌వేర్
+(vaanijya software)
+</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
 <h3 id="th">Thai</h3>
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
@@ -1000,7 +1028,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/03/28 13:58:27 $
+$Date: 2018/09/19 12:57:30 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/fs-translations.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/fs-translations.zh-cn.po      19 Sep 2018 12:54:57 -0000      
1.4
+++ philosophy/po/fs-translations.zh-cn.po      19 Sep 2018 12:57:30 -0000      
1.5
@@ -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: 2018-09-17 15:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""



reply via email to

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