www/gnu/po linux-and-gnu.zh-cn.po

[Wensheng XIE]

CVSROOT:        /web/www
Module name:    www
Changes by:     Wensheng XIE <wxie>     19/03/02 07:15:16

Modified files:
        gnu/po         : linux-and-gnu.zh-cn.po 

Log message:
        zh-cn: update translation

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: linux-and-gnu.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- linux-and-gnu.zh-cn.po      1 Mar 2019 18:30:39 -0000       1.4
+++ linux-and-gnu.zh-cn.po      2 Mar 2019 12:15:16 -0000       1.5
@@ -1,14 +1,14 @@
 # Simplified Chinese translation of https://www.gnu.org/gnu/linux-and-gnu.html
-# Copyright (C) 2017 Free Software Foundation, Inc.
+# Copyright (C) 2017, 2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # 白若玉
-# Wensheng Xie <address@hidden>, 2017.
+# Wensheng Xie <address@hidden>, 2017, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
 "POT-Creation-Date: 2019-03-01 18:27+0000\n"
-"PO-Revision-Date: 2017-12-26 12:10+0800\n"
+"PO-Revision-Date: 2019-03-02 19:56+0800\n"
 "Last-Translator: Wensheng Xie <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "Language: zh_CN\n"
@@ -218,9 +218,9 @@
 msgstr ""
 "到了90年代初期，我们曾经把除了内æ 
¸ä»¥å¤–的东西放到一起组成了一个系统。我们也在"
 "å¼€å§‹å¼€å‘ä¸€ä¸ªå†…æ ¸ï¼Œç§°ä¸º<a href=\"/software/hurd/hurd.html\">GNU 
Hurd</a>，运行"
-"在Mach<sup><a href=\"#TransNote1\">1</a></sup>之上。开发这个内æ 
¸æ¯”我们预期的"
+"在Mach<sup><a href=\"#TransNote1\">1</a></sup>之上。开发这个内æ 
¸æ¯”我们的预期"
 "要难得多；<a href=\"/software/hurd/hurd-and-linux.html\">GNU 
Hurd在2001年开始"
-"可以稳定工作</a>，但是距离能够为人们正常使用还有很长的路要走。"
+"可以稳定工作</a>，但是距离能够被人们正常使用还有很长的路要走。"
 
 #. type: Content of: <p>
 msgid ""
@@ -249,12 +249,12 @@
 "it was work that, in the nature of things, was surely going to be done by "
 "someone."
 msgstr ""
-"把它们组合到一起并不是一个简单的工作。有些GNU部件<a 
href=\"#somecomponents\">"
-"(3)</a>需要作大量的修改才能适应Linux。把系统集成到一个完整的发行版本中、使之"
-"&ldquo;能够直接安装
并工作&rdquo;也是一项艰巨的工作。它需要考虑如何安装
和启动"
-"系统&mdash;æˆ‘ä»¬é‚£æ—¶è¿˜æœªå¤„ç†æ­¤é—®é¢˜ï¼Œå› 
ä¸ºæˆ‘ä»¬è¿˜æ²¡æœ‰èµ°åˆ°é‚£ä¸€æ­¥ã€‚å› æ­¤ï¼Œé‚£äº›å¼€å‘äº†"
-"不同的发行版的人们作出了许多重要的工作。但是这些工作的属性是，它们终究会被某"
-"些人做的。"
+"把它们组合到一起并不是一个简单的工作。有些GNU部件<a 
href=\"#somecomponents"
+"\">(3)</a>需要作大量的修改才能适应Linux。把系统集成到一个完整的发行版本中、使"
+"之&ldquo;能够直接安装
并工作&rdquo;也是一项艰巨的工作。它需要考虑如何安装和启"
+"动系统&mdash;æˆ‘ä»¬é‚£æ—¶è¿˜æœªå¤„ç†æ­¤é—®é¢˜ï¼Œå› 
ä¸ºæˆ‘ä»¬è¿˜æ²¡æœ‰èµ°åˆ°é‚£ä¸€æ­¥ã€‚å› æ­¤ï¼Œé‚£äº›å¼€å‘"
+"了不同的发行版的人们作出了许多重要的工作。但是这些工作的属性是，它们终究会被"
+"某些人做的。"
 
 #. type: Content of: <p>
 msgid ""
@@ -271,14 +271,6 @@
 "GNU/Linux的开发提供资金。"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Today there are many different variants of the GNU/Linux system (often "
-#| "called &ldquo;distros&rdquo;).  Most of them include non-free "
-#| "software&mdash;their developers follow the philosophy associated with "
-#| "Linux rather than that of GNU.  But there are also <a href=\"/distros/"
-#| "distros.html\">completely free GNU/Linux distros</a>.  The FSF supports "
-#| "computer facilities for <a href=\"http://gnewsense.org/\";>gNewSense</a>."
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -290,21 +282,13 @@
 "FSF supports computer facilities for a few of them."
 msgstr ""
 
"今天有很多不同的GNU/Linux系统（通常叫做&ldquo;发行版&rdquo;）。它们大多数åŒ
…含"
-"了非自由软件&mdash;它们的开发者遵循的是和Linux相å…
³çš„哲学，而不是GNU的哲学。然"
-"而，也有<a href=\"/distros/distros.html\">完å…
¨è‡ªç”±çš„GNU/Linux发行版</a>。FSF"
-"支持和<a href=\"http://gnewsense.org/\";>gNewSense</a>发行版相å…
³çš„电脑及其周边"
-"件。"
+"了非自由软件&mdash;它们的开发者遵循的是和Linux相关的<a 
href=\"/philosophy/"
+"open-source-misses-the-point.html\">&ldquo;开源&rdquo;哲学</a>，而不是GNU的"
+"<a 
href=\"/philosophy/free-software-even-more-important.html\">&ldquo;自由软"
+"件&rdquo;哲学</a>。然而，也有<a href=\"/distros/distros.html\">完å…
¨è‡ªç”±çš„GNU/"
+"Linux发行版</a>。FSF支持其中一些发行版相关的电脑及å…
¶å‘¨è¾¹ä»¶ã€‚"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
-#| "various non-free programs.  Nowadays, the usual version of Linux contains "
-#| "non-free programs too.  These programs are intended to be loaded into I/O "
-#| "devices when the system starts, and they are included, as long series of "
-#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
-#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
-#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
@@ -316,9 +300,9 @@
 msgstr ""
 
"制作一个自由的GNU/Linux发行版不止是剔除非自由软件。现在，常规的Linux版本也带"
 "æœ‰éžè‡ªç”±ç¨‹åºã€‚è¿™äº›ç¨‹åºä¼šåœ¨ç³»ç»Ÿå¯åŠ¨æ—¶åŠ è½½åˆ°I/O（输å…
¥è¾“出）设备，它们以很长的数"
-"字形式包含在Linux的&ldquo;源代ç 
&rdquo;中。所以，维护自由的GNU/Linux发行版现"
-"在承担着维护一个<a 
href=\"http://directory.fsf.org/project/linux\";>自由版"
-"Linux</a>的责任。"
+"字形式包含在Linux的“源代ç 
â€ä¸­ã€‚所以，维护自由的GNU/Linux发行版现在承担着维护"
+"一个<a 
href=\"http://directory.fsf.org/project/linux\";>自由版Linux</a>的责"
+"任。"
 
 #. type: Content of: <p>
 msgid ""
@@ -350,14 +334,6 @@
 msgstr "后记"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Aside from GNU, one other project has independently produced a free Unix-"
-#| "like operating system.  This system is known as BSD, and it was developed "
-#| "at UC Berkeley.  It was non-free in the 80s, but became free in the early "
-#| "90s.  A free operating system that exists today<a href=\"#newersystems\">"
-#| "(4)</a> is almost certainly either a variant of the GNU system, or a kind "
-#| "of BSD system."
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -367,9 +343,9 @@
 "system."
 msgstr ""
 
"除了GNU，还有一个独立进行的工程开发了一个自由的类似Unix的操作系统。这个系统是"
-"BSD，它是由UC 
Berkeley开发的。在80年代，BSD还不是自由的，但是它在90年代变成了"
-"自由软件。今天，一个自由的操作系统<a 
href=\"#newersystems\">(4)</a>差不多如果"
-"不是GNU系统的派生版本，就是BSD系统的派生版本。"
+"BSD，它是由UC 
Berkeley开发的。在80年代，BSD还不是自由的，但是它在90年代初变成"
+"了自由软件。今天，一个自由的操作系统<a 
href=\"#newersystems\">(4)</a>差不多如"
+"果不是GNU系统的派生版本，就是BSD系统的派生版本。"
 
 #. type: Content of: <p>
 msgid ""
@@ -503,16 +479,12 @@
 "翻译须知</a>。"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, "
-#| "2016, 2017 Richard M. Stallman"
 msgid ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, 2016, "
 "2017, 2019 Richard M. Stallman"
 msgstr ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, 2016, "
-"2017 Richard M. Stallman"
+"2017, 2019 Richard M. Stallman"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -531,7 +503,7 @@
 "<b>翻译</b>: 白若玉<br></br>\n"
 "<b>å®¡æ ¡</b>: 刘昭宏<br></br>\n"
 "<b>翻译团队</b>：<a rel=\"team\" 
href=\"https://savannah.gnu.org/projects/";
-"www-zh-cn/\">&lt;CTT&gt;</a>，2017。"
+"www-zh-cn/\">&lt;CTT&gt;</a>，2017，2019。"
 
 #.  timestamp start 
 #. type: Content of: <div><p>