www/distros/po common-distros.zh-cn.po

[Wensheng XIE]

CVSROOT:        /web/www
Module name:    www
Changes by:     Wensheng XIE <wxie>     19/08/17 00:07:31

Modified files:
        distros/po     : common-distros.zh-cn.po 

Log message:
        zh-cn: update translation

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.zh-cn.po?cvsroot=www&r1=1.30&r2=1.31

Patches:
Index: common-distros.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.zh-cn.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- common-distros.zh-cn.po     14 Aug 2019 19:58:57 -0000      1.30
+++ common-distros.zh-cn.po     17 Aug 2019 04:07:31 -0000      1.31
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: common-distros.html\n"
 "POT-Creation-Date: 2019-08-14 19:55+0000\n"
-"PO-Revision-Date: 2019-08-03 21:16+0800\n"
+"PO-Revision-Date: 2019-08-17 11:07+0800\n"
 "Last-Translator: Wensheng Xie <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "Language: zh_CN\n"
@@ -131,12 +131,6 @@
 "体计划令人赞赏，Canaima却错误地包含了非自由软件。"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Its main menu has an option, &ldquo;Install nonfree software&rdquo;, "
-#| "which installs all the nonfree drivers (even the ones that are not "
-#| "necessary). The distro also provides blobs for the kernel, Linux, and "
-#| "invites installing nonfree applications including Flash Player."
 msgid ""
 "Its main menu has an option, &ldquo;Install nonfree software&rdquo;, which "
 "installs all the nonfree drivers (even the ones that are not necessary). The "
@@ -167,15 +161,6 @@
 msgstr "Debian GNU/Linux"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Debian's Social Contract states the goal of making Debian entirely free "
-#| "software, and Debian conscientiously keeps nonfree software out of the "
-#| "official Debian system.  However, Debian also provides a repository of "
-#| "nonfree software.  According to the project, this software is &ldquo;not "
-#| "part of the Debian system,&rdquo; but the repository is hosted on many of "
-#| "the project's main servers, and people can readily find these nonfree "
-#| "packages by browsing Debian's online package database and its wiki."
 msgid ""
 "Debian's Social Contract states the goal of making Debian entirely free "
 "software, and Debian conscientiously keeps nonfree software out of the "
@@ -186,10 +171,10 @@
 "packages by browsing Debian's online package database and its wiki."
 msgstr ""
 "Debiançš„ç¤¾ç¾¤å¥‘çº¦å£°æ˜Žå…¶ç›®æ ‡æ˜¯ä½¿Debian成为完å…
¨è‡ªç”±è½¯ä»¶ï¼Œå¹¶ä¸”Debian自觉地把非自"
-"由软件排除在å…
¶æ­£å¼å‘布之外。然而，Debian还是提供非自由软件的软件库。æ
 ¹æ®å…¶é¡¹"
-"目，这些软件&ldquo;不是Debian系统的一部分&rdquo;，但是该软件库由该项目的许多"
-"主要服务器托管，而且人们可以马上通过浏览Debian的在线软件åŒ
…数据库和其wiki找到"
-"这些非自由软件。"
+"由软件排除在å…
¶æ­£å¼å‘布之外。然而，Debian还是维护着非自由软件的软件库。æ
 ¹æ®å…¶"
+"项目，这些软件&ldquo;不是Debian系统的一部分&rdquo;，但是该软件库由该项目的许"
+"多主要服务器托管，而且人们可以马上通过浏览Debian的在线软件åŒ
…数据库和其wiki找"
+"到这些非自由软件。"
 
 #. type: Content of: <p>
 msgid ""
@@ -270,17 +255,12 @@
 "软件，尽管该许可证是非自由许可证。"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Mandriva also provides nonfree software through dedicated repositories."
 msgid "Mandriva also ships nonfree software through dedicated repositories."
 msgstr "Mandriva还提供专用的非自由软件库。"
 
 #. type: Content of: <h3>
-#, fuzzy
-#| msgid "Mandriva GNU/Linux"
 msgid "Manjaro GNU/Linux"
-msgstr "Mandriva GNU/Linux"
+msgstr "Manjaro GNU/Linux"
 
 #. type: Content of: <p>
 msgid ""
@@ -289,6 +269,9 @@
 "and proprietary games with DRM. The distro also recommends the installation "
 "of nonfree drivers."
 msgstr ""
+"Manjaro 在其常规的发布通道中带有非自由软件，并且在其 
Linux å†…æ ¸ä¸­åŒ…å«éžè‡ªç”±"
+"的 blobs。它还提供专有的办公套件和专有的带 DRM 
的游戏。该发行版还推荐安装非自"
+"由的驱动软件。"
 
 #. type: Content of: <h3>
 msgid "Mint GNU/Linux"
@@ -393,14 +376,6 @@
 msgstr "Ubuntu GNU/Linux"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
-#| "expressly promotes and recommends nonfree software under the Ubuntu name "
-#| "in some of their distribution channels.  Ubuntu offers the option to "
-#| "install only free packages, which means it also offers the option to "
-#| "install nonfree packages too.  In addition, the version of Linux, the "
-#| "kernel, included in Ubuntu contains firmware blobs."
 msgid ""
 "Ubuntu maintains specific repositories of nonfree software, and Canonical "
 "expressly promotes and recommends nonfree software under the Ubuntu name in "
@@ -409,9 +384,9 @@
 "packages too.  In addition, the version of Linux, the kernel, included in "
 "Ubuntu contains firmware blobs."
 msgstr ""
-"Ubuntu为非自由软件提供特别的软件库，而且Canonical以Ubuntu的名义在å
…¶å‘å¸ƒæ¸ 道明"
-"确表示推广和建议非自由软件。Ubuntu提供了仅安装
自由软件的选项，这表示它也提供"
-"了安装非自由软件的选项。另外，Ubuntu的Linuxå†…æ ¸åŒ…
含了固件blobs。"
+"Ubuntu为非自由软件维护着特别的软件库，而且Canonical以Ubuntu的名义在å
…¶å‘å¸ƒæ¸ 道"
+"明确表示推广和建议非自由软件。Ubuntu提供了仅安装
自由软件的选项，这表示它也提"
+"供了安装非自由软件的选项。另外，Ubuntu的Linuxå†…æ ¸åŒ…
含了固件blobs。"
 
 #. type: Content of: <p>
 msgid ""
@@ -692,10 +667,10 @@
 #~ "partly remains: 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被å…
¶ä¸»å‘布移除到分离的非自由"
+#~ "软件库。然而，问题还有遗留：其安装程序在某些情
况下会为电脑的外设推荐这些非"
+#~ "自由的固件。"
 
 #~ msgid ""
 #~ "Arch has the two usual problems: there's no clear policy about what "