www/philosophy/po compromise.zh-cn.po

[Wensheng XIE]

CVSROOT:        /web/www
Module name:    www
Changes by:     Wensheng XIE <wxie>     17/08/28 10:05:42

Modified files:
        philosophy/po  : compromise.zh-cn.po 

Log message:
        zh-cn: update translation

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn.po?cvsroot=www&r1=1.23&r2=1.24

Patches:
Index: compromise.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- compromise.zh-cn.po 27 Aug 2017 15:00:29 -0000      1.23
+++ compromise.zh-cn.po 28 Aug 2017 14:05:42 -0000      1.24
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: compromise.html\n"
 "POT-Creation-Date: 2017-08-27 14:56+0000\n"
-"PO-Revision-Date: 2017-08-07 20:27+0800\n"
+"PO-Revision-Date: 2017-08-28 20:48+0800\n"
 "Last-Translator: Wensheng Xie <address@hidden>, 2017\n"
 "Language-Team: Chinese <address@hidden>\n"
 "Language: zh_CN\n"
@@ -125,16 +125,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "But we reject certain compromises even though many others in our "
-#| "community are willing to make them.  For instance, we <a href=\"/"
-#| "philosophy/free-system-distribution-guidelines.html\"> endorse only the "
-#| "GNU/Linux distributions</a> that have policies not to include nonfree "
-#| "software or lead users to install it.  To endorse nonfree distributions "
-#| "would be a <acronym title=\"ruinous (r&#363;'&#601;-n&#601;s) adj. 1. "
-#| "Causing or apt to cause ruin; destructive.  2. Falling to ruin; "
-#| "dilapidated or decayed.\">ruinous</acronym> compromise."
 msgid ""
 "But we reject certain compromises even though many others in our community "
 "are willing to make them.  For instance, we <a href=\"/distros/free-system-"
@@ -147,8 +137,8 @@
 msgstr ""
 
"但是，我们也会反对某些妥协行为，尽管我们的社区里头很多人想要这æ
 ·çš„妥协。比"
 "如，我们仅仅
认同那些不含任何私有软件成分、或不会引导用户去安装
私有软件的<a "
-"href=\"/philosophy/free-system-distribution-guidelines.html\">GNU/Linux发行版"
-"</a>。我们认为，认同包
含私有软件成分的发行版是一种<acronym title=\"ruinous "
+"href=\"/distros/free-system-distribution-guidelines.html\">GNU/Linux发行版</"
+"a>。我们认为，认同包
含私有软件成分的发行版是一种<acronym title=\"ruinous "
 "(r&#363;'&#601;-n&#601;s) adj. 1. Causing or apt to cause ruin; "
 "destructive.  2. Falling to ruin; dilapidated or decayed.\">毁灭性的</"
 "acronym>妥协。"
@@ -357,18 +347,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "If you want to move to free software without compromising the goal of "
-#| "freedom, look at <a href=\"http://www.fsf.org/resources\";>the FSF's "
-#| "resources area</a>.  It lists hardware and machine configurations that "
-#| "work with free software, <a href=\"/distros\"> totally free GNU/Linux "
-#| "distros</a> to install, and <a href=\"http://directory.fsf.org/\";> "
-#| "thousands of free software packages</a> that work in a 100 percent free "
-#| "software environment.  If you want to help the community stay on the road "
-#| "to freedom, one important way is to publicly uphold citizen values.  When "
-#| "people are discussing what is good or bad, or what to do, cite the values "
-#| "of freedom and community and argue from them."
 msgid ""
 "If you want to move to free software without compromising the goal of "
 "freedom, look at <a href=\"http://www.fsf.org/resources\";>the FSF's "
@@ -383,11 +361,11 @@
 msgstr ""
 "å‡å¦‚ä½ æƒ³ä½¿ç”¨è‡ªç”±è½¯ä»¶ï¼ŒåŒæ—¶ä¹Ÿè¦è¿½æ±‚è‡ªç”±çš„è¯ï¼Œè¯·æµè§ˆ<a 
href=\"http://www.fsf.";
 
"org/resources\">自由软件基金会网站的资源页面</a>。那里列出了各种与自由软件相"
-"兼容的硬件配置，各种<a 
href=\"/distros\">只含自由软件的GNU/Linux发行版</a>，"
-"以及运行于100%自由软件环境下的<a 
href=\"http://directory.fsf.org/\";>数以千计"
-"的自由软件套装</a>ã€‚å‡å¦‚ä½ 
希望帮助我们的社区走向自由，最重要的是弘扬“公民价"
-"å€¼â€ã€‚å½“äººä»¬åœ¨è®¨è®ºä½•ä¸ºå–„ä¸Žæ¶ï¼Œä»¥åŠè¯¥åšäº›ä»€ä¹ˆæ—¶ï¼Œè¯·ä½ 
向人们阐发自由与社区的理"
-"念，并由此展开深入的讨论。"
+"兼容的硬件配置，各种<a 
href=\"/distros/distros.html\\\">只含自由软件的GNU/"
+"Linux发行版</a>，以及运行于100%自由软件环境下的<a 
href=\"http://directory.";
+"fsf.org/\">数以千计的自由软件套装</a>ã€‚å‡å¦‚ä½ 
希望帮助我们的社区走向自由，最重"
+"要的是弘扬“å…
¬æ°‘价值”。当人们在讨论何为善与恶，以及该做些什么时，请ä½
 向人们阐"
+"发自由与社区的理念，并由此展开深入的讨论。"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -452,38 +430,29 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Copyright &copy; 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
-#| "\">Richard Stallman</a>."
 msgid ""
 "Copyright &copy; 2008, 2009, 2014, 2015, 2017 <a href=\"http://www.stallman.";
 "org/\">Richard Stallman</a>."
 msgstr ""
-"Copyright &copy; 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
-"\">Richard Stallman</a>。"
+"Copyright &copy; 2008, 2009, 2014, 2015, 2017 <a href=\"http://www.stallman.";
+"org/\">Richard Stallman</a>。"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
-"本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
-"License</a> 许可证授权。"
+"本页面使用<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
+"nd/4.0/\">Creative Commons Attribution-NoDerivatives 4.0 International "
+"License</a>授权。"
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
-"<b>翻译</b>: Tony Yet，2010。\n"
+"<b>翻译</b>: Tony Yet，2010。<br></br>\n"
 "<b>翻译团队</b>：<a rel=\"team\" 
href=\"https://savannah.gnu.org/projects/";
 "www-zh-cn/\">&lt;CTT&gt;</a>，2017。"
 
@@ -519,14 +488,3 @@
 #~ msgstr ""
 #~ "发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方（或任何建议），请发送邮件至 <a "
 #~ "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。"
-
-# type: Content of: <div><p>
-#~ msgid ""
-#~ "Richard Stallman is the founder of the Free Software Foundation.  You can "
-#~ "copy and redistribute this article under the <a rel=\"license\" href="
-#~ "\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-#~ "Attribution Noderivs 3.0 license</a>."
-#~ msgstr ""
-#~ "理查德·斯托曼（Richard 
Stallman）是自由软件基金会的创始人。您可以依照<a "
-#~ "rel=\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/";
-#~ "\">共同创作协议署名-不可衍生许可3.0版</a>è‡ªç”±æ‹·è´å’Œä¼ 
播本文。"