[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy/po compromise.zh-cn.po
From: |
Wensheng XIE |
Subject: |
www/philosophy/po compromise.zh-cn.po |
Date: |
Mon, 7 Aug 2017 08:33:01 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: Wensheng XIE <wxie> 17/08/07 08:33:01
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.19&r2=1.20
Patches:
Index: compromise.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- compromise.zh-cn.po 10 Jan 2015 12:57:19 -0000 1.19
+++ compromise.zh-cn.po 7 Aug 2017 12:32:59 -0000 1.20
@@ -1,16 +1,17 @@
# Simplified Chinese translation of
http://www.gnu.org/philosophy/compromise.html
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2017 Free Software Foundation, Inc.
# This file is distributed under the same license as the gnu.org article.
# Tony Yes <address@hidden>, 2010.
+# Wensheng Xie <address@hidden>, 2017
#
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
"POT-Creation-Date: 2015-01-10 12:55+0000\n"
-"PO-Revision-Date: 2013-01-28 13:49-0500\n"
-"Last-Translator: Tony Yet <address@hidden>\n"
+"PO-Revision-Date: 2017-08-07 20:27+0800\n"
+"Last-Translator: Wensheng Xie <address@hidden>, 2017\n"
"Language-Team: Chinese <address@hidden>\n"
-"Language: zh\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -18,12 +19,8 @@
# type: Content of: <title>
#. type: Content of: <title>
-#, fuzzy
-#| msgid ""
-#| "Avoiding Ruinous Compromises - GNU Project - Free Software Foundation "
-#| "(FSF)"
msgid "Avoiding Ruinous Compromises - GNU Project - Free Software Foundation"
-msgstr "é¿å
æ¯çæ§ç妥å - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼ (FSF)"
+msgstr "é¿å
æ¯çæ§ç妥å - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼"
# type: Content of: <h2>
#. type: Content of: <h2>
@@ -37,18 +34,6 @@
# type: Content of: <div><p>
#. type: Content of: <blockquote><p>
-#, fuzzy
-#| msgid ""
-#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
-#| "free operating system called GNU—for ‘GNU's Not Unix’. "
-#| "As part of the 25th anniversary of the GNU system, I have written this "
-#| "article on how our community can avoid ruinous compromises. In addition "
-#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
-#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://"
-#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
-#| "Free Software Foundation</a> as an Associate Member.”</em>—"
-#| "<b>Richard Stallman</b>"
msgid ""
"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
"September 27, 1983, I announced a plan</a> to create a completely free "
@@ -61,14 +46,14 @@
"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
-"<em>“äºåäºå¹´åï¼<a
href=\"/gnu/initial-announcement.html\">1983å¹´9æ27"
-"æ¥ï¼æ对å¤å®£å¸äºä¸ä¸ªè®¡å</a>ï¼å¸æåé ä¸å¥å®å
¨èªç±çæä½ç³»ç»ï¼å¹¶å°å
¶å½å为"
-"GNU — æ为‘GNU并éUNIX’ï¼GNU's Not
Unixï¼ãä½ä¸ºGNUç³»ç»25å¨"
-"年纪念çä¸é¨åï¼æåä¸æ¬æï¼æéè¿ä¸ªç¤¾åºçæå们ï¼å¦ä½æè½é¿å
æ¯çæ§ç妥åã"
-"é¤äºé¿å
è¿äºå¦¥å以å¤ï¼ä½ è¿æå¾å¤éå¾å¯ä»¥<a
href=\"/help/\">帮å©GNU</a>åèªç±"
-"软件ãå
¶ä¸æç®åçä¸ä¸ªæ¹å¼æ¯<a
href=\"https://www.fsf.org/associate/"
+"“äºåäºå¹´åï¼<a
href=\"/gnu/initial-announcement.html\">1983å¹´9æ27æ¥ï¼"
+"æ对å¤å®£å¸äºä¸ä¸ªè®¡å</a>ï¼å¸æåé ä¸å¥å®å
¨èªç±çæä½ç³»ç»ï¼å¹¶å°å
¶å½å为GNU "
+"— æ为‘GNU并éUNIX’ï¼GNU's Not
Unixï¼ãä½ä¸ºGNUç³»ç»25å¨å¹´çºª"
+"念çä¸é¨åï¼æåä¸æ¬æï¼æéè¿ä¸ªç¤¾åºçæå们ï¼å¦ä½æè½é¿å
æ¯çæ§ç妥åãé¤äº"
+"é¿å
è¿äºå¦¥å以å¤ï¼ä½ è¿æå¾å¤éå¾å¯ä»¥<a
href=\"/help/help.html\">帮å©GNU</a>å"
+"èªç±è½¯ä»¶ãå
¶ä¸æç®åçä¸ä¸ªæ¹å¼æ¯<a
href=\"https://www.fsf.org/associate/"
"support_freedom/join_fsf?referrer=4052\">å å
¥èªç±è½¯ä»¶åºéä¼</a>æ为ä¼åã"
-"”</em>—<b>çæ¥å¾·Â·æ¯ææ¼</b>"
+"”—<b>çæ¥å¾·Â·æ¯ææ¼</b>"
# type: Content of: <p>
#. type: Content of: <p>
@@ -81,8 +66,8 @@
msgstr ""
"èªç±è½¯ä»¶è¿å¨ç®çå¨äºæ¹åæ们ç社ä¼ï¼<a
href=\"/philosophy/free-sw.html\">让ä¸"
"å软件çèµ°åèªç±</a>ï¼åªæè¿æ
·ï¼ææç软件ç¨æ·æè½å®ç°èªç±ï¼å¹¶åä¸å°åä½ç社"
-"åºä¸æ¥ãææçç§æ软件çå¼åè
é½æ¯ä»¥å±
é«ä¸´ä¸ç姿æ俯è§ç¨æ·çï¼è¿æ¯ä¸å
¬æ£çã"
-"æ们çä»»å¡å°±æ¯è¦æ¶é¤è¿ç§ä¸å
¬æ£çç°è±¡ã"
+"åºä¸æ¥ãä»»ä½éèªç±è½¯ä»¶é½èµäºå
¶å¼åè
å驾äºå
¶ç¨æ·ä¹ä¸çæåï¼è¿æ¯ä¸å
¬æ£çãæ"
+"们çä»»å¡å°±æ¯è¦æ¶é¤è¿ç§ä¸å
¬æ£çç°è±¡ã"
# type: Content of: <p>
#. type: Content of: <p>
@@ -110,14 +95,14 @@
"patents under the effect of these provisions."
msgstr ""
"å æ¤, <a
href=\"http://www.fsf.org/\">èªç±è½¯ä»¶åºéä¼</a>ä¹ä½åºå¦¥å —
ç"
-"è³æ¯é大ç妥åãæ¯å¦ï¼æ们å¨<a
href=\"http://www.gnu.org/licenses/gpl.html"
-"\">GNU éç¨å
Œ
±è®¸å¯è¯</a> (ç®ç§°GPLv3) å
³äºä¸å©æ¹é¢çè§å®ä½åºäºå¦¥åï¼ä½¿å¾ä¸äº"
-"大å
¬å¸å¯ä»¥åä¸è¿æ¥ï¼å¹¶åå¸ä»¥GPLv3ææç软件ãå¨æ们çå议书éé¢å°±å
å«äºç¸å
³ç"
-"ä¸å©æ¡æ¬¾ã"
+"è³æ¯é大ç妥åãæ¯å¦ï¼æ们å¨ç¬¬ä¸ç<a
href=\"http://www.gnu.org/licenses/gpl."
+"html\">GNU éç¨å
Œ
±è®¸å¯è¯</a> (ç®ç§°GPLv3)
å°±ä¸å©æ¹é¢çè§å®ä½åºäºå¦¥åï¼ä½¿å¾ä¸"
+"äºå¤§å
¬å¸å¯ä»¥åä¸è¿æ¥ï¼å¹¶åå¸ä»¥GPLv3ææç软件ãå¨æ们çå议书éé¢å°±å
å«äºç¸å
³"
+"çä¸å©æ¡æ¬¾ã"
#. type: Attribute 'alt' of: <img>
msgid "[GPLv3 Logo]"
-msgstr ""
+msgstr "[GPLv3 æ å¿]"
# type: Content of: <p>
#. type: Content of: <p>
@@ -136,7 +121,7 @@
"妥åï¼æ们éå®ä¸äºèªç±çåºï¼å¹¶å
许æå®ä»¬ç¨äºç§æ软件å½ä¸ãå 为æ们认为è¦æ¯ä»"
"æ³å¾ä¸ç¦æ¢è¿æ ·ç使ç¨çè¯ï¼åªä¼ä½¿å¾å¼åè
使ç¨ç§æçåºãæ们å
许å¼åè
å¨ç§æ软"
"件éé¢ä½¿ç¨GNUçç¨åºï¼å¹¶éè¿ææ¡£è¿è¡è¯´æï¼è¡¨ææ们é¼å±ä½¿ç¨èªç±è½¯ä»¶çç«åºãæ们"
-"ä¼å¯¹æäºæ们认åç群ä¼è¿å¨è¿è¡æ¯æï¼å°½ç®¡æ们并ä¸å®å
¨è®¤åä»ä»¬æå±çå¢ä½ã"
+"ä¼å¯¹æäºæ们认åçæ´»å¨è¿è¡æ¯æï¼å°½ç®¡æ们并ä¸å®å
¨è®¤åä»ä»¬æå±çå¢ä½ã"
# type: Content of: <p>
#. type: Content of: <p>
@@ -150,10 +135,13 @@
"ruin; destructive. 2. Falling to ruin; dilapidated or decayed.\">ruinous</"
"acronym> compromise."
msgstr ""
-"ä½æ¯ï¼æ们ä¹ä¼å对å«ç妥åè¡ä¸ºï¼å°½ç®¡æ们è¿ä¸ç¤¾åºé头å¾å¤äººèµåè¿æ
·ç妥åãæ¯"
-"å¦ï¼æ们ä»
ä»
认åé£äºä¸å«ä»»ä½ç§æ软件æåãæä¸ä¼å¼è¯±ç¨æ·å»å®è£
ç§æ软件ç<a "
+"ä½æ¯ï¼æ们ä¹ä¼å对æäºå¦¥åè¡ä¸ºï¼å°½ç®¡æ们ç社åºé头å¾å¤äººæ³è¦è¿æ
·ç妥åãæ¯"
+"å¦ï¼æ们ä»
ä»
认åé£äºä¸å«ä»»ä½ç§æ软件æåãæä¸ä¼å¼å¯¼ç¨æ·å»å®è£
ç§æ软件ç<a "
"href=\"/philosophy/free-system-distribution-guidelines.html\">GNU/Linuxåè¡ç"
-"</a>ãæ们认为ï¼è®¤åå
å«ç§æ软件æåçåè¡çæ¯ä¸ç§æ¯çæ§ç妥åã"
+"</a>ãæ们认为ï¼è®¤åå
å«ç§æ软件æåçåè¡çæ¯ä¸ç§<acronym title=\"ruinous "
+"(rū'ə-nəs) adj. 1. Causing or apt to cause ruin; "
+"destructive. 2. Falling to ruin; dilapidated or decayed.\">æ¯çæ§ç</"
+"acronym>妥åã"
# type: Content of: <p>
#. type: Content of: <p>
@@ -162,8 +150,8 @@
"term. That can occur either at the level of ideas or at the level of "
"actions."
msgstr ""
-"æ们认为ï¼é£äºä»é¿è¿æ¥çä¼ç»æ们çåè¿å½¢æé»ç¢ç妥åæ¯æ¯çæ§çãè¿ç±»å¦¥åå¯è½"
-"åçå¨ææ³ä¸ï¼ä¹å¯è½åçå¨è¡å¨ä¸ã"
+"æ们认为ï¼é£äºä»é¿è¿æ¥çåæ们çç®æ
èéèé©°ç妥åæ¯æ¯çæ§çãè¿ç±»å¦¥åå¯è½å"
+"çå¨ææ³ä¸ï¼ä¹å¯è½åçå¨è¡å¨ä¸ã"
# type: Content of: <p>
#. type: Content of: <p>
@@ -177,8 +165,8 @@
msgstr ""
"ææ³ä¸ç妥åå°±æ¯é£äºåªä¼å¯¹æ们çåªåå½¢æåä½ç¨åç妥åãæ们çç®æ
æ¯åé ä¸ä¸ª"
"ææ软件ç¨æ·é½äº«æèªç±çä¸çï¼ä½æ¯ï¼å°±ç°å¨èè¨ï¼å¤§å¤æ°ç计ç®æºç¨æ·è¿ä¸æèªç±"
-"å½ä½ä¸åäºãä»ä»¬çå¿è¢«ä¸ç§âæ¶è´¹è
主ä¹âçä»·å¼æå
å´ãæ¢è¨ä¹ï¼å¯¹äºä»»ä½ç软件ï¼"
-"ä»ä»¬åªèèå®ç¨çä¸é¢ï¼æ¯å¦ä»·æ ¼çé«ä½åæ¯å¦å¥½ç¨ã"
+"å½ä½ä¸åäºãä»ä»¬çå¿è¢«ä¸ç§ “æ¶è´¹è
主乔
çä»·å¼è§æå
å´ãæ¢è¨ä¹ï¼"
+"对äºä»»ä½ç软件ï¼ä»ä»¬åªèèå®ç¨çä¸é¢ï¼æ¯å¦ä»·æ
¼çé«ä½åæ¯å¦å¥½ç¨ã"
# type: Content of: <p>
#. type: Content of: <p>
@@ -193,9 +181,9 @@
"programs, some of which are now quite successful."
msgstr ""
"å¡å
åºåè¿ä¸æ¬èåçå±å¿ä¹¦<cite>ãå¦ä½èµ¢å¾æåä¸å½±åå«äººã</cite>ï¼ä¹¦éæå°ï¼"
-"è¦è¯´æå«äººåæ件äºæ
æä¸ç§æææçåæ³ï¼å°±æ¯åä»ä»¬å±ç¤ºåºè¿åä»ä»¬èªèº«ä»·å¼å¤æ"
-"ç论æ®ãå¨æ们è¿ä¸ªç¤¾ä¼ï¼æ们å¯ä»¥ä»¥å¾å¤çæ¹å¼æ¥è¿åæ¶è´¹è
çå£å³ãæ¯æ¹è¯´ï¼èªç±"
-"软件赢å¾æ¶è´¹è
éçï¼å
为使ç¨èªç±è½¯ä»¶æ´çé±ãä¹æå¾å¤çèªç±è½¯ä»¶æ¯å¥½ç¨ä¸å¯é "
+"è¦è¯´æå«äººåæ件äºæ
æä¸ç§æææçåæ³ï¼å°±æ¯åè¿äºäººå±ç¤ºåºè¿åä»ä»¬èªèº«ä»·å¼å¤"
+"æç论æ®ãå¨æ们è¿ä¸ªç¤¾ä¼ï¼æ们å¯ä»¥ä»¥å¾å¤çæ¹å¼æ¥è¿åæ¶è´¹è
çå£å³ãæ¯æ¹è¯´ï¼èª"
+"ç±è½¯ä»¶èµ¢å¾æ¶è´¹è
éçï¼å
为使ç¨èªç±è½¯ä»¶æ´çé±ãä¹æå¾å¤çèªç±è½¯ä»¶æ¯å¥½ç¨ä¸å¯é "
"çãéè¿å人们å±ç¤ºèªç±è½¯ä»¶çè¿äºç¹è²ï¼æ们æåå°å¸å¼å°äºå¾å¤ç¨æ·ã"
# type: Content of: <p>
@@ -208,7 +196,8 @@
"do."
msgstr ""
"åå¦å¸å¼æ´å¤äººä½¿ç¨èªç±è½¯ä»¶æ¯æ们çç»æç®æ
ï¼é£æ们就ä¸ä¼æåèªç±çæ¦å¿µï¼èåª"
-"ä¼æå°é£äºå®¹æ为æ¶è´¹è
ç解çå®ç¨æ§çç¹æ§ãè¿å°±æ¯âå¼æºâä¸è¯çææã"
+"ä¼æå°é£äºå®¹æ为æ¶è´¹è
ç解çå®ç¨æ§çç¹æ§ãè¿å°±æ¯
“å¼æº” ä¸è¯åå
¶"
+"é¼å¹è
çç¨æã"
# type: Content of: <p>
#. type: Content of: <p>
@@ -235,7 +224,7 @@
#. type: Attribute 'alt' of: <img>
msgid "[Levitating Gnu with a laptop]"
-msgstr ""
+msgstr "[æ¬æµ®ç Gnu åä¸ä¸ªç¬è®°æ¬]"
# type: Content of: <p>
#. type: Content of: <p>
@@ -248,9 +237,10 @@
"program baited by an attractive, convenient feature."
msgstr ""
"è¦å»ºç«ä¸ä¸ªç³»ç»çãé¿ä¹
çèªç±è½¯ä»¶ç¤¾åºï¼æ们åªå¸å¼æ´å¤äººä½¿ç¨èªç±è½¯ä»¶è¿æ¯è¿è¿ä¸"
-"å¤çãæ们éè¦å®£æ¬ä¸ç§ç念,è¦å·å¬äººä»¬æ
¹æ®è½¯ä»¶æ¯å¦å°éç¨æ·çâå
¬æ°ä»·å¼âæ¥è¿è¡é"
-"æ©ãè¦ç»è¾¨è½¯ä»¶æ¯å¦å°é使ç¨è
çèªç±ä»¥åç»å»ºä½¿ç¨è
社åºçæåï¼èä¸æ¯ä»¥åä¸ç好"
-"ç¨æ§ä½ä¸ºå¤ææ åãåªæè¿æ
·ï¼äººä»¬æä¸ä¼åå°é£äºä»¥å¥½ç¨ä¸ºè¯±é¥µçç§æ软件çèæã"
+"å¤çãæ们éè¦å®£æ¬ä¸ç§ç念,è¦å·å¬äººä»¬æ ¹æ®è½¯ä»¶ï¼ä»¥åå
¶ä»ä¸è¥¿ï¼ç “å
¬æ°ä»·"
+"å¼” æ¥è¿è¡éæ©ãè¦ç»è¾¨è½¯ä»¶æ¯å¦å°é使ç¨è
çèªç±ä»¥å使ç¨è
社åºï¼èä¸æ¯ä»¥"
+"åä¸çæç¨æ§ä½ä¸ºå¤ææ åãåªæè¿æ
·ï¼äººä»¬æä¸ä¼åå°é£äºä»¥æç¨ä¸ºè¯±é¥µçç§æ软件"
+"çèæã"
# type: Content of: <p>
#. type: Content of: <p>
@@ -260,8 +250,8 @@
"would influence their actions by endorsing their consumer values."
msgstr ""
"è¦æå¡âå
¬æ°ä»·å¼âï¼æ们就è¦å¯¹è¿æ
·çä»·å¼è¿è¡æ¼ç»ï¼å人们说æ为ä½è¿æ¯æ们è¡å¨ç"
-"åºç³ãæ们å¿
é¡»æµå¶å¡å
åºå¼ç妥åï¼å 为é£æ
·ç妥åæ¯ä»¥æ¶è´¹è
为导åçï¼è¿ä¼å¯¹æ"
-"们çè¡å¨äº§çå½±åã"
+"åºç³ãæ们å¿
é¡»æµå¶å¡å
åºå¼ç妥åï¼å 为é£æ
·ç妥åæ¯ä»¥æ¯ææ¶è´¹è
çä»·å¼è§ä¸ºåºç¡"
+"æ¥å½±åå
¶è¡ä¸ºçã"
# type: Content of: <p>
#. type: Content of: <p>
@@ -272,10 +262,10 @@
"the practical advantages of free software, we reiterate frequently that "
"those are just <em>additional, secondary</em> reasons to prefer it."
msgstr ""
-"ä½è¿ä¸æ¯è¯´æ们ä¸å¯æåèªç±è½¯ä»¶çå®ç¨æ§ãæ们æ¾ç¶æ¯å¯ä»¥è¿ä¹åçãä½ä¸æ¦äººä»¬å¿½"
-"è§äºèªç±ï¼è纯粹åªå¼ºè°å®ç¨æ§çæ¶åï¼é®é¢å°±åºç°äºãæ以å½æ们æå°èªç±è½¯ä»¶çå®"
-"ç¨æ§çæ¶åï¼æ们åå¤å¼ºè°çä¸ç¹æ¯ï¼æ¯èµ·æ们çä»·å¼éæ©ï¼å®ç¨æ§åªæ¯<em>次è¦ç</"
-"em>ã"
+"ä½è¿ä¸æ¯è¯´æ们ä¸å¯æåèªç±è½¯ä»¶çå®ç¨æ§ä¼å¿&mdashæ们æ¾ç¶æ¯å¯ä»¥è¿ä¹åçãä½ä¸"
+"æ¦äººä»¬å¿½è§äºèªç±ï¼è纯粹åªå¼ºè°å®ç¨æ§çæ¶åï¼é®é¢å°±åºç°äºãæ以å½æ们æå°èªç±"
+"软件çå®ç¨æ§ä¼å¿çæ¶åï¼æ们è¦åå¤å¼ºè°çä¸ç¹æ¯ï¼æ¯èµ·æ们çä»·å¼éæ©ï¼å®ç¨æ§åª"
+"æ¯<em>éå çå次è¦ç</em>ã"
# type: Content of: <p>
#. type: Content of: <p>
@@ -300,9 +290,9 @@
msgstr ""
"æ¯å¦ï¼ç»éªè¡¨æï¼è¦æ¯å¨<a
href=\"/gnu/why-gnu-linux.html\">GNU/Linux</a>çåè¡"
"çé头å å
¥ç§æ软件çæåï¼ä¼åå¾æ´å¤ç¨æ·çéçãæ¯å¦æ个带æç§æ软件æåçæ¼"
-"亮çç¨åºï¼æçæ¯å<a
href=\"/philosophy/java-trap.html\">Java</a>ï¼ä»¥åæ¯å¦"
-"æ¤ï¼, Flashè¿è¡ç¯å¢ï¼ç°å¨ä¾ç¶æ¯å¦æ¤ï¼è¿æ
·çç¼ç¨çå¹³å°ï¼åæè
æ¯æ个带ç§ææå"
-"ç驱å¨ï¼ä»¥è¿åæç§ç¡¬ä»¶çéè¦ã"
+"亮çç¨åºï¼æçæ¯å<a
href=\"/philosophy/java-trap.html\">Java</a>ï¼ä»¥åæ¯ï¼ã"
+"Flashè¿è¡ç¯å¢ï¼ç°å¨ä¾ç¶æ¯ï¼è¿æ
·çéèªç±ç¼ç¨å¹³å°ï¼åæè
æ¯æ个带ç§ææåç驱"
+"å¨ï¼ä»¥è¿åæç§ç¡¬ä»¶çéè¦ã"
# type: Content of: <p>
#. type: Content of: <p>
@@ -314,9 +304,9 @@
"words, your actions will undermine them."
msgstr ""
"å¾å¤äººä¼ä½åºè¿æ
·ç妥åï¼ä½æ¯è¿ä¹åå°±ä¼æ¹ææ们çåªåãåå¦ä½
æç§æ软件åå¸åº"
-"å»ï¼æè
诱导人们使ç¨è¿ç±»è½¯ä»¶ï¼ä½
å¾é¾è·äººä»¬è§£é说ï¼âç§æ软件æ¯ä¸å
¬æ£çï¼å®æ¯ä¸"
-"ç§ç¤¾ä¼é¡½ç¾ï¼æ们è¦æ¶çå®ãâå³ä¾¿ä½
åå¤å人们强è°è¿ä¸è®ºæ®µï¼ä½ çè¡ä¸ºæ¬èº«åªä¼åå¼±"
-"ä½ å£ä¸è¨è¯çåéã"
+"å»ï¼æè
诱导人们使ç¨è¿ç±»è½¯ä»¶ï¼ä½
å¾é¾è·äººä»¬è§£é说3ç§æ软件æ¯ä¸å
¬æ£çï¼"
+"å®æ¯ä¸ç§ç¤¾ä¼é¡½ç¾ï¼æ们è¦æ¶çå®ã”å³ä¾¿ä½
åå¤å人们强è°è¿ä¸è®ºæ®µï¼ä½ çè¡ä¸º"
+"æ¬èº«åªä¼åå¼±ä½ å£ä¸è¨è¯çåéã"
# type: Content of: <p>
#. type: Content of: <p>
@@ -332,7 +322,7 @@
"é®é¢ä¸å¨äºäººä»¬æ¯å¦<em>å¯ä»¥</em>æ<em>ææå©</em>使ç¨ç§æ软件ãæ们ç社ä¼ç³»ç»"
"为ç¨æ·æä¾åç§æ¹ä¾¿ï¼è®©ä»ä»¬åèªå·±æ³åçäºãé®é¢å¨äºæ们æ¯å¦å¨ä¸ºæ¶è´¹è
带æ¥æ"
"å¼ï¼è®©ä»ä»¬ä½¿ç¨èªç±è½¯ä»¶ãä»ä»¬èªèº«çéæ©æ¯ä»ä»¬èªå·±ç责任ï¼æ们为ä»ä»¬æä¾æå¼ï¼"
-"åæ¯æ们ç责任ãæ们è«ä¸å¯ææ¶è´¹è
å¼åç§æ软件ï¼é误å°ä»¥ä¸ºé£æ¯ä¸ä¸ªå¥½çéæ©ï¼"
+"åæ¯æ们ç责任ãæ们åä¸å¯ææ¶è´¹è
å¼åç§æ软件ï¼é误å°ä»¥ä¸ºé£æ¯ä¸ä¸ªå¥½çéæ©ï¼"
"äºå®ä¸ï¼ç§æ软件就æ¯é®é¢æ¬èº«ã"
# type: Content of: <p>
@@ -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 thousands of free software packages 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 "
@@ -384,17 +362,13 @@
"åå¦ä½ æ³ä½¿ç¨èªç±è½¯ä»¶ï¼åæ¶ä¹è¦è¿½æ±èªç±çè¯ï¼è¯·æµè§<a
href=\"http://www.fsf."
"org/resources\">èªç±è½¯ä»¶åºéä¼ç½ç«çèµæºé¡µé¢</a>ãé£éååºäºåç§ä¸èªç±è½¯ä»¶ç¸"
"å
¼å®¹ç硬件é
ç½®ï¼åç§<a
href=\"/distros\">åªå«èªç±è½¯ä»¶çGNU/Linuxåè¡ç</a>ï¼"
-"以åæ°ä»¥å计çè¿è¡äº100%èªç±è½¯ä»¶ç¯å¢ä¸çèªç±è½¯ä»¶å¥è£
ãåå¦ä½ å¸æ帮å©æ们ç社"
-"åºèµ°åèªç±ï¼æéè¦çæ¯å¼æ¬âå
¬æ°ä»·å¼âãå½äººä»¬å¨è®¨è®ºä½ä¸ºåä¸æ¶ï¼ä»¥å该åäºä»ä¹"
-"æ¶ï¼è¯·ä½ å人们éåèªç±ä¸ç¤¾åºçç念ï¼å¹¶ç±æ¤å±å¼æ·±å
¥ç讨论ã"
+"以åè¿è¡äº100%èªç±è½¯ä»¶ç¯å¢ä¸ç<a
href=\"http://directory.fsf.org/\">æ°ä»¥å计"
+"çèªç±è½¯ä»¶å¥è£
</a>ãåå¦ä½
å¸æ帮å©æ们ç社åºèµ°åèªç±ï¼æéè¦çæ¯å¼æ¬âå
¬æ°ä»·"
+"å¼âãå½äººä»¬å¨è®¨è®ºä½ä¸ºåä¸æ¶ï¼ä»¥å该åäºä»ä¹æ¶ï¼è¯·ä½
å人们éåèªç±ä¸ç¤¾åºçç"
+"念ï¼å¹¶ç±æ¤å±å¼æ·±å
¥ç讨论ã"
# type: Content of: <p>
#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "A road that lets you go faster is no improvement if it leads to the wrong "
-#| "place. Compromise is essential to achieve an ambitious goal, but beware "
-#| "of compromises that lead away from the goal."
msgid ""
"A road that lets you go faster is not better if it leads to the wrong "
"place. Compromise is essential to achieve an ambitious goal, but beware of "
@@ -404,19 +378,14 @@
"åï¼ä½åè®°ä¸ä¸å¯ä½åºå离ç®æ ç妥åã"
#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "For a similar point in a different area of life, see <a href=\"http://www."
-#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
-#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www."
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
"\"> “Nudge” is not enough</a>."
msgstr ""
"æå
³çæ´»ä¸å
¶å®é¢åä¸ç±»ä¼¼çè§ç¹ï¼è¯·åè <a
href=\"http://www.guardian.co.uk/"
-"commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\">\"'Nudge' "
-"is not enough\"</a>."
+"commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\">\"â轻轻ä¸"
+"æ¨âæ¯ä¸å¤ç\"</a>ã"
# type: Content of: <div>
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -426,11 +395,6 @@
# type: Content of: <div><p>
#. type: Content of: <div><div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send general FSF & GNU inquiries to <a
href=\"mailto:address@hidden"
-#| "org\"><address@hidden></a>. There are also <a href=\"/contact/"
-#| "\">other ways to contact</a> the FSF."
msgid ""
"Please send general FSF & GNU inquiries to <a
href=\"mailto:address@hidden"
"\"><address@hidden></a>. There are also <a href=\"/contact/\">other
ways "
@@ -438,9 +402,10 @@
"can be sent to <a href=\"mailto:address@hidden"><address@hidden"
"org></a>."
msgstr ""
-"请å°æå
³èªç±è½¯ä»¶åºéä¼(FSF) & GNU çæ¥è¯¢ &
é®é¢åéå°<a href="
-"\"mailto:address@hidden"><address@hidden></a>ãä¹å¯ä»¥éè¿ <a
href=\"/"
-"contact/\">å
¶ä»èç³»æ¹æ³</a> èç³»èªç±è½¯ä»¶åºéä¼(FSF)ã"
+"请å°æå
³èªç±è½¯ä»¶åºéä¼(FSF) & GNU
çä¸è¬æ§é®é¢åéå°<a href=\"mailto:"
+"address@hidden"><address@hidden></a>ãä¹å¯ä»¥éè¿ <a
href=\"/contact/\">å
¶ä»"
+"èç³»æ¹æ³</a> èç³»èªç±è½¯ä»¶åºéä¼(FSF)ãæå
³å¤±æé¾æ¥æå
¶ä»é误å建议ï¼è¯·åéé®"
+"件å°<a href=\"mailto:address@hidden"><address@hidden></a>ã"
# type: Content of: <div><p>
#. TRANSLATORS: Ignore the original text in this paragraph,
@@ -461,47 +426,41 @@
"translations of this article."
msgstr ""
"è¥æ¨æ³ç¿»è¯æ¬æï¼è¯·åç<a
href=\"/server/standards/README.translations.html\">"
-"ç¿»è¯æå</a>è·åæå
³åè°åæ交翻è¯çç¸å
³äºé¡¹"
+"ç¿»è¯é¡»ç¥</a>è·åæå
³åè°åæ交翻è¯çç¸å
³äºé¡¹ã"
# type: Content of: <div><p>
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Copyright © 2008, 2009 <a href=\"http://www.stallman.org/\">Richard "
-#| "Stallman</a>."
msgid ""
"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/"
"\">Richard Stallman</a>."
msgstr ""
-"çæææ © 2008, 2009 <a href=\"http://www.stallman.org/\">Richard "
-"Stallman</a>."
+"Copyright © 2008, 2009, 2014, 2015 <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/3.0/us/\">Creative Commons Attribution-"
"NoDerivs 3.0 United States License</a>."
msgstr ""
-"æ¬é¡µé¢éç¨ <a rel=\"license\"
href=\"http://creativecommons.org/licenses/by-"
+"æ¬é¡µé¢ä½¿ç¨ <a rel=\"license\"
href=\"http://creativecommons.org/licenses/by-"
"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
-"License</a> 许å¯è¯ææã"
+"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"
+msgstr ""
+"<b>ç¿»è¯</b>: Tony Yetï¼2010ã\n"
+"<b>ç¿»è¯å¢é</b>ï¼<a rel=\"team\"
href=\"https://savannah.gnu.org/projects/"
+"www-zh-cn/\"><CTT></a>ï¼2017ã"
# type: Content of: <div><p>
#. timestamp start
#. type: Content of: <div><p>
msgid "Updated:"
-msgstr "æ´æ°ï¼"
+msgstr "æåæ´æ°ï¼"
# type: Content of: <div><p>
#~ msgid ""
- www/philosophy/po compromise.zh-cn.po,
Wensheng XIE <=