www-commits
[Top][All Lists]
Advanced

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

www philosophy/rms-nyu-2001-transcript.fr.html ...


From: GNUN
Subject: www philosophy/rms-nyu-2001-transcript.fr.html ...
Date: Tue, 15 Sep 2015 05:57:50 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/09/15 05:57:50

Modified files:
        philosophy     : rms-nyu-2001-transcript.fr.html 
                         rms-nyu-2001-transcript.pl.html 
        philosophy/po  : free-sw.zh-cn.po 
                         rms-nyu-2001-transcript.fr-en.html 
                         rms-nyu-2001-transcript.fr.po 
                         rms-nyu-2001-transcript.pl-en.html 
                         rms-nyu-2001-transcript.pl.po 
                         rms-nyu-2001-transcript.pot 
                         rms-nyu-2001-transcript.tr.po 
        server/gnun/compendia: compendium.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/rms-nyu-2001-transcript.fr.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/rms-nyu-2001-transcript.pl.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/rms-nyu-2001-transcript.fr-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/rms-nyu-2001-transcript.fr.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/rms-nyu-2001-transcript.pl-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/rms-nyu-2001-transcript.pl.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/rms-nyu-2001-transcript.pot?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/rms-nyu-2001-transcript.tr.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-cn.po?cvsroot=www&r1=1.61&r2=1.62

Patches:
Index: philosophy/rms-nyu-2001-transcript.fr.html
===================================================================
RCS file: /web/www/www/philosophy/rms-nyu-2001-transcript.fr.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/rms-nyu-2001-transcript.fr.html  15 Sep 2015 05:45:29 -0000      
1.1
+++ philosophy/rms-nyu-2001-transcript.fr.html  15 Sep 2015 05:57:48 -0000      
1.2
@@ -16,9 +16,10 @@
 York, NY) le 29 mai 2001.</p></blockquote>
 
 <div class="announcement">
-<blockquote><p>Une version <a 
href="/philosophy/rms-nyu-2001-transcript.txt">texte</a> de cette
-transcription et un <a 
href="/philosophy/rms-nyu-2001-summary.txt">résumé</a> du
-discours sont aussi disponibles en anglais.</p></blockquote>
+<blockquote><p>Une version <a 
href="/philosophy/rms-nyu-2001-transcript.txt">texte</a> de
+cette transcription et un <a
+href="/philosophy/rms-nyu-2001-summary.txt">résumé</a> du discours sont
+aussi disponibles en anglais.</p></blockquote>
 </div>
 
 <p><strong>URETSKY</strong> : Je suis Mike Uretsky. Je travaille à la
@@ -2090,7 +2091,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -2108,9 +2109,9 @@
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";>Creative
-Commons attribution de paternité, pas de modification, 3.0 États-Unis
-(CC BY-ND 3.0 US)</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0 internationale (CC BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -2122,7 +2123,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/09/15 05:45:29 $
+$Date: 2015/09/15 05:57:48 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/rms-nyu-2001-transcript.pl.html
===================================================================
RCS file: /web/www/www/philosophy/rms-nyu-2001-transcript.pl.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/rms-nyu-2001-transcript.pl.html  15 Sep 2015 05:45:30 -0000      
1.1
+++ philosophy/rms-nyu-2001-transcript.pl.html  15 Sep 2015 05:57:49 -0000      
1.2
@@ -2246,7 +2246,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -2262,12 +2262,10 @@
      Information document, www.gnu.org/prep/maintain. -->
 <p>Copyright &copy; 2001, 2005, 2006, 2014, 2015 Richard M. Stallman</p>
 
-<p>Ten utwór objęty jest licencją Creative Commons Uznanie autorstwa-Bez
-utworów zależnych 3.0 Stany Zjednoczone. Aby&nbsp;zobaczyć kopię niniejszej
-licencji przejdź na&nbsp;stronę <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>http://creativecommons.org/licenses/by-nd/3.0/us/</a>
-lub&nbsp;napisz do&nbsp;Creative Commons, 171 Second Street, Suite 300, San
-Francisco, California 94105, USA.</p>
+<p>Ta strona jest dostępna na&nbsp;<a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.pl";>licencji
+Creative Commons Uznanie autorstwa&nbsp;&ndash; Bez&nbsp;utworów zależnych
+4.0 Międzynarodowe</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.pl.html" -->
 <div class="translators-credits">
@@ -2279,7 +2277,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2015/09/15 05:45:30 $
+$Date: 2015/09/15 05:57:49 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/free-sw.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/free-sw.zh-cn.po      15 Sep 2015 05:37:55 -0000      1.1
+++ philosophy/po/free-sw.zh-cn.po      15 Sep 2015 05:57:49 -0000      1.2
@@ -6,14 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2015-02-17 23:25+0000\n"
+"POT-Creation-Date: 2015-09-01 20:55+0000\n"
 "PO-Revision-Date: 2015-09-14 22:09-0500\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
 "Last-Translator: Nan Deng <address@hidden>\n"
 "Language-Team: Simplified Chinese Translation Team\n"
 "Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-09-01 20:55+0000\n"
 "X-Generator: Poedit 1.7.5\n"
 
 #. type: Content of: <title>
@@ -21,15 +22,21 @@
 msgstr "什么是自由软件? - GNU工程 - 自由软件基金会"
 
 #. type: Attribute 'content' of: <meta>
-msgid "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free 
Software, Operating System, GNU Kernel, HURD, GNU HURD, Hurd"
+msgid ""
+"GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
+"Operating System, GNU Kernel, HURD, GNU HURD, Hurd"
 msgstr ""
-"GNU, FSF, Free Software Foundation, 自由软件基金会, Linux, Emacs, GCC, 
Unix, Free Software, Operating System, GNU Kernel, HURD, GNU HURD, Hurd"
+"GNU, FSF, Free Software Foundation, 自由软件基金会, Linux, Emacs, GCC, 
Unix, "
+"Free Software, Operating System, GNU Kernel, HURD, GNU HURD, Hurd"
 
 #. type: Attribute 'content' of: <meta>
 msgid ""
-"Since 1983, developing the free Unix style operating system GNU, so that 
computer users can have the freedom to share and improve the software "
-"they use."
-msgstr 
"始于1983年,致力于开发自由的类UNIX系统:GNU操作系统。致力于帮助计算机用户自由使用并改进软件。"
+"Since 1983, developing the free Unix style operating system GNU, so that "
+"computer users can have the freedom to share and improve the software they "
+"use."
+msgstr ""
+"始于1983年,致力于开发自由的类UNIX系统:GNU操作系统。致力于帮助计算机用户自由"
+"使用并改进软件。"
 
 #. type: Content of: <h2>
 msgid "What is free software?"
@@ -41,350 +48,523 @@
 
 #. type: Content of: <blockquote><p>
 msgid ""
-"The free software definition presents the criteria for whether a particular 
software program qualifies as free software.  From time to time we "
-"revise this definition, to clarify it or to resolve questions about subtle 
issues.  See the <a href=\"#History\">History section</a> below for a "
-"list of changes that affect the definition of free software."
-msgstr ""
-"此处给出自由软件的定义,用以衡量一款软件是否为自由软件。一直以来,我们不断改进这个定义,以此澄æ¸
…并解决我们遇到的各种问题。参考下方的<a href="
-"\"#History\">修改历史</a>,详细列出了å…
¨éƒ¨çš„影响自由软件定义的修改记录。"
+"The free software definition presents the criteria for whether a particular "
+"software program qualifies as free software.  From time to time we revise "
+"this definition, to clarify it or to resolve questions about subtle issues.  "
+"See the <a href=\"#History\">History section</a> below for a list of changes "
+"that affect the definition of free software."
+msgstr ""
+"此处给出自由软件的定义,用以衡量一款软件是否为自由软件。一直以来,我们不断改"
+"进这个定义,以此澄清
并解决我们遇到的各种问题。参考下方的<a href=\"#History\">"
+"修改历史</a>,详细列出了å…
¨éƒ¨çš„影响自由软件定义的修改记录。"
 
 #. type: Content of: <p>
 msgid ""
-"&ldquo;Free software&rdquo; means software that respects users' freedom and 
community.  Roughly, it means that <b>the users have the freedom to "
-"run, copy, distribute, study, change and improve the software</b>.  Thus, 
&ldquo;free software&rdquo; is a matter of liberty, not price.  To "
-"understand the concept, you should think of &ldquo;free&rdquo; as in 
&ldquo;free speech,&rdquo; not as in &ldquo;free beer&rdquo;.  We sometimes "
-"call it &ldquo;libre software&rdquo; to show we do not mean it is gratis."
-msgstr ""
-"&ldquo;自由软件&rdquo; 
尊重用户的自由,并且尊重整个社区。粗略来讲,一个软件如果是自由软件,这意味着<b>用户可以自由地运行,拷贝,分发,学ä¹
 ï¼Œä¿®æ”¹å¹¶"
-"改进该软件</b>。因此,&ldquo; 自由软件 &rdquo; 是å…
³ä¹Žè‡ªç”±çš„问题,与价格无å…
³ï¼Œè½¯ä»¶å¦‚何定价并不影响它是否被归类为自由软件。英文中,我们使用Free
 "
-"Software。由于Free一词既有自由,也有免费的意思。而Free 
Software中的Free是指 &ldquo; 自由言论 &rdquo; 中的自由,而非 
&ldquo; 免费 &rdquo; 这一意"
-"项。为避免歧义,在使用英文时,我们也会在用&ldquo;Libre 
Software&rdquo; 来指自由软件。"
+"&ldquo;Free software&rdquo; means software that respects users' freedom and "
+"community.  Roughly, it means that <b>the users have the freedom to run, "
+"copy, distribute, study, change and improve the software</b>.  Thus, &ldquo;"
+"free software&rdquo; is a matter of liberty, not price.  To understand the "
+"concept, you should think of &ldquo;free&rdquo; as in &ldquo;free speech,"
+"&rdquo; not as in &ldquo;free beer&rdquo;.  We sometimes call it &ldquo;"
+"libre software&rdquo; to show we do not mean it is gratis."
+msgstr ""
+"&ldquo;自由软件&rdquo; 
尊重用户的自由,并且尊重整个社区。粗略来讲,一个软件如"
+"果是自由软件,这意味着<b>用户可以自由地运行,拷贝,分发,学ä¹
 ï¼Œä¿®æ”¹å¹¶æ”¹è¿›è¯¥è½¯"
+"件</b>。因此,&ldquo; 自由软件 &rdquo; 是å…
³ä¹Žè‡ªç”±çš„问题,与价格无关,软件如何"
+"定价并不影响它是否被归类为自由软件。英文中,我们使用Free
 Software。由于Free一"
+"词既有自由,也有免费的意思。而Free Software中的Free是指 
&ldquo; 自由言论 "
+"&rdquo; 中的自由,而非 &ldquo; 免费 &rdquo; 这一意项。为避å…
æ­§ä¹‰ï¼Œåœ¨ä½¿ç”¨è‹±æ–‡"
+"时,我们也会在用&ldquo;Libre Software&rdquo; 来指自由软件。"
 
 #. type: Content of: <p>
 msgid ""
-"We campaign for these freedoms because everyone deserves them.  With these 
freedoms, the users (both individually and collectively) control the "
-"program and what it does for them.  When users don't control the program, we 
call it a &ldquo;nonfree&rdquo; or &ldquo;proprietary&rdquo; "
-"program.  The nonfree program controls the users, and the developer controls 
the program; this makes the program <a href=\"/philosophy/free-"
-"software-even-more-important.html\"> an instrument of unjust power</a>."
-msgstr ""
-"我们支持软件用户的自由,因
为我们坚信这是每个用户应得的。有了这些自由,软件用户,æ—
 
论是个人还是集体,都可以掌控所运行的软件,并决定这些程序如何为自"
-"己服务。如果一个软件令用户失去了这种控制权,我们则称它为
 &ldquo; 非自由 &rdquo; 的,或 &ldquo; 专有 &rdquo; 
的程序。与自由软件相反,非自由软件会操"
-"控它的用户,而软件的开发者则掌控着软件。 
这使得非自由软件成为了<a 
href=\"/philosophy/free-software-even-more-important.html\"> 
非正义力量的帮凶</"
-"a>。"
+"We campaign for these freedoms because everyone deserves them.  With these "
+"freedoms, the users (both individually and collectively) control the program "
+"and what it does for them.  When users don't control the program, we call it "
+"a &ldquo;nonfree&rdquo; or &ldquo;proprietary&rdquo; program.  The nonfree "
+"program controls the users, and the developer controls the program; this "
+"makes the program <a href=\"/philosophy/free-software-even-more-important."
+"html\"> an instrument of unjust power</a>."
+msgstr ""
+"我们支持软件用户的自由,因
为我们坚信这是每个用户应得的。有了这些自由,软件用"
+"户,无
论是个人还是集体,都可以掌控所运行的软件,并决定这些程序如何为自己服"
+"务。如果一个软件令用户失去了这种控制权,我们则称它为
 &ldquo; 非自由 &rdquo; "
+"的,或 &ldquo; 专有 &rdquo; 
的程序。与自由软件相反,非自由软件会操控它的用"
+"户,而软件的开发者则掌控着软件。 
这使得非自由软件成为了<a href=\"/philosophy/"
+"free-software-even-more-important.html\"> 非正义力量的帮凶</a>。"
 
 #. type: Content of: <p>
-msgid "A program is free software if the program's users have the four 
essential freedoms:"
+msgid ""
+"A program is free software if the program's users have the four essential "
+"freedoms:"
 msgstr "我们说,如果一个软件是自由软件,那么它必
须为用户提供以下四项基本自由:"
 
 #. type: Content of: <ul><li>
-msgid "The freedom to run the program as you wish, for any purpose (freedom 
0)."
-msgstr "自由度0:无论用户出于何种目的,必须可以按ç…
§ç”¨æˆ·æ„æ„¿ï¼Œå¯ä»¥éšæ—¶éšå¤„自由地运行该软件。"
+msgid ""
+"The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgstr ""
+"自由度0:无论用户出于何种目的,必须可以按ç…
§ç”¨æˆ·æ„æ„¿ï¼Œå¯ä»¥éšæ—¶éšå¤„自由地运行该"
+"软件。"
 
 #. type: Content of: <ul><li>
 msgid ""
-"The freedom to study how the program works, and change it so it does your 
computing as you wish (freedom 1). Access to the source code is a "
+"The freedom to study how the program works, and change it so it does your "
+"computing as you wish (freedom 1). Access to the source code is a "
 "precondition for this."
-msgstr "自由度1:用户可以自由地学习
并修改该软件。作为前提,用户必
须可以访问到该软件的源代码。"
+msgstr ""
+"自由度1:用户可以自由地学习
并修改该软件。作为前提,用户必须可以访问到该软件的"
+"源代码。"
 
 #. type: Content of: <ul><li>
-msgid "The freedom to redistribute copies so you can help your neighbor 
(freedom 2)."
+msgid ""
+"The freedom to redistribute copies so you can help your neighbor (freedom 2)."
 msgstr "自由度2:用户可以自由地分发该软件的拷贝。"
 
 #. type: Content of: <ul><li>
 msgid ""
-"The freedom to distribute copies of your modified versions to others (freedom 
3).  By doing this you can give the whole community a chance to "
-"benefit from your changes.  Access to the source code is a precondition for 
this."
+"The freedom to distribute copies of your modified versions to others "
+"(freedom 3).  By doing this you can give the whole community a chance to "
+"benefit from your changes.  Access to the source code is a precondition for "
+"this."
 msgstr ""
-"自由度3:用户可以自由地分发该软件修改后的拷贝。借此,用户可以把改进后的软件分享给整个社区令他人也从中受益。作为前提,用户å¿
…须可以访问到该软件的源"
-"代码。"
+"自由度3:用户可以自由地分发该软件修改后的拷贝。借此,用户可以把改进后的软件分"
+"享给整个社区令他人也从中受益。作为前提,用户必
须可以访问到该软件的源代码。"
 
 #. type: Content of: <p>
 msgid ""
-"A program is free software if it gives users adequately all of these 
freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
-"nonfree distribution schemes in terms of how far they fall short of being 
free, we consider them all equally unethical."
+"A program is free software if it gives users adequately all of these "
+"freedoms.  Otherwise, it is nonfree.  While we can distinguish various "
+"nonfree distribution schemes in terms of how far they fall short of being "
+"free, we consider them all equally unethical."
 msgstr ""
-"一个软件只有提供了以上所有的自由给它的用户,才可以被成为自由软件。否则,它就是非自由的。尽管我们也可以比较非自由软件为å
…¶ç”¨æˆ·æä¾›çš„自由度,但是我们"
-"认为,无论如何,非自由软件本身是不道德的。"
+"一个软件只有提供了以上所有的自由给它的用户,才可以被成为自由软件。否则,它就"
+"是非自由的。尽管我们也可以比较非自由软件为å…
¶ç”¨æˆ·æä¾›çš„自由度,但是我们认为,"
+"无论如何,非自由软件本身是不道德的。"
 
 #. type: Content of: <p>
-msgid "The rest of this page clarifies certain points about what makes 
specific freedoms adequate or not."
+msgid ""
+"In any given scenario, these freedoms must apply to whatever code we plan to "
+"make use of, or lead others to make use of.  For instance, consider a "
+"program A which automatically launches a program B to handle some cases.  If "
+"we plan to distribute A as it stands, that implies users will need B, so we "
+"need to judge whether both A and B are free.  However, if we plan to modify "
+"A so that it doesn't use B, only A needs to be free; we can ignore B."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr "本文着重介绍在哪些情
况下,软件会被认为提供了或剥夺了某个自由度。"
 
 #. type: Content of: <p>
 msgid ""
-"Freedom to distribute (freedoms 2 and 3) means you are free to redistribute 
copies, either with or without modifications, either gratis or "
-"charging a fee for distribution, to <a href=\"#exportcontrol\">anyone 
anywhere</a>.  Being free to do these things means (among other things) "
-"that you do not have to ask or pay for permission to do so."
+"Freedom to distribute (freedoms 2 and 3) means you are free to redistribute "
+"copies, either with or without modifications, either gratis or charging a "
+"fee for distribution, to <a href=\"#exportcontrol\">anyone anywhere</a>.  "
+"Being free to do these things means (among other things) that you do not "
+"have to ask or pay for permission to do so."
 msgstr ""
-"自由分发(自由度2和3)意味着你
(即,软件用户)可以把软件原版或修改版再发布给å…
¶ä»–用户。你可以å…
è´¹å‘布,也可以收取费用。软件可以发布给<a href="
-"\"#exportcontrol\">任何地方的任何人</a>。所谓“自由”,意味着ä½
 çš„这些行为(发布软件原版或修改版给其他用户;或å…
¶ä»–自由度中提及的行为)不必事先征得任"
-"何人的许可,也不必为此额外支付任何费用。"
+"自由分发(自由度2和3)意味着你
(即,软件用户)可以把软件原版或修改版再发布给"
+"其他用户。你可以å…
è´¹å‘布,也可以收取费用。软件可以发布给<a href="
+"\"#exportcontrol\">任何地方的任何人</a>。所谓“自由”,意味着ä½
 çš„这些行为(发布"
+"软件原版或修改版给其他用户;或å…
¶ä»–自由度中提及的行为)不必事先征得任何人的许"
+"可,也不必为此额外支付任何费用。"
 
 #. type: Content of: <p>
 msgid ""
-"You should also have the freedom to make modifications and use them privately 
in your own work or play, without even mentioning that they exist.  "
-"If you do publish your changes, you should not be required to notify anyone 
in particular, or in any particular way."
+"You should also have the freedom to make modifications and use them "
+"privately in your own work or play, without even mentioning that they "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
 msgstr ""
-"用户可以自由地运行该程序或对程序进行修改。如果仅仅
私下自己修改或运行该程序,那么你没有义务将该行为å…
¬å¼€ç»™ä»»ä½•äººã€‚如果你发布了自己修改后的程序,那么"
-"ä½ 
也没有任何义务将该修改行为告知给哪个或哪些指定的人或组织。"
+"用户可以自由地运行该程序或对程序进行修改。如果仅仅
私下自己修改或运行该程序,"
+"那么你没有义务将该行为公开给任何人。如果你
发布了自己修改后的程序,那么你也没"
+"有任何义务将该修改行为告知给哪个或哪些指定的人或组织。"
 
 #. type: Content of: <p>
 msgid ""
-"The freedom to run the program means the freedom for any kind of person or 
organization to use it on any kind of computer system, for any kind of "
-"overall job and purpose, without being required to communicate about it with 
the developer or any other specific entity.  In this freedom, it is "
-"the <em>user's</em> purpose that matters, not the <em>developer's</em> 
purpose; you as a user are free to run the program for your purposes, and "
-"if you distribute it to someone else, she is then free to run it for her 
purposes, but you are not entitled to impose your purposes on her."
+"The freedom to run the program means the freedom for any kind of person or "
+"organization to use it on any kind of computer system, for any kind of "
+"overall job and purpose, without being required to communicate about it with "
+"the developer or any other specific entity.  In this freedom, it is the "
+"<em>user's</em> purpose that matters, not the <em>developer's</em> purpose; "
+"you as a user are free to run the program for your purposes, and if you "
+"distribute it to someone else, she is then free to run it for her purposes, "
+"but you are not entitled to impose your purposes on her."
 msgstr ""
-"“自由地运行程序”(自由度0)意味着任何人或组织可以在任何(支持的)计算机系统上,出于任何目的去运行该程序,并且没有义务通知软件的开发è€
…或任何个人或"
-"团体。此处,<em>用户</em>的目的是重点,而非<em>开发者
</em>的目的。如果你是该程序的用户,那么你
就可以自由地运行该程序。同理,如果你把程序发布给别"
-"人,那么此人也成了软件的用户,他也可以出于自己的任何目的运行该软件。然而,ä½
 ä½œä¸ºè½¯ä»¶çš„发布者,不可将自己的目的强加于你的用户。"
+"“自由地运行程序”(自由度0)意味着任何人或组织可以在任何(支持的)计算机系统"
+"上,出于任何目的去运行该程序,并且没有义务通知软件的开发è€
…或任何个人或团体。"
+"此处,<em>用户</em>的目的是重点,而非<em>开发者
</em>的目的。如果你是该程序的"
+"用户,那么你就可以自由地运行该程序。同理,如果你
把程序发布给别人,那么此人也"
+"成了软件的用户,他也可以出于自己的任何目的运行该软件。然而,ä½
 ä½œä¸ºè½¯ä»¶çš„发布"
+"者,不可将自己的目的强加于你的用户。"
 
 #. type: Content of: <p>
 msgid ""
-"The freedom to run the program as you wish means that you are not forbidden 
or stopped from doing so.  It has nothing to do with what "
-"functionality the program has, or whether it is useful for what you want to 
do."
+"The freedom to run the program as you wish means that you are not forbidden "
+"or stopped from doing so.  It has nothing to do with what functionality the "
+"program has, or whether it is useful for what you want to do."
 msgstr ""
-"“自由地运行程序”意味着没有人可以阻止用户使用该程序做任何事æƒ
…。它并没有规定该程序必
须提供哪些功能特性,也并不意味着软件必
须迎合用户的所有需求。"
+"“自由地运行程序”意味着没有人可以阻止用户使用该程序做任何事æƒ
…。它并没有规定该"
+"程序必须提供哪些功能特性,也并不意味着软件必
须迎合用户的所有需求。"
 
 #. type: Content of: <p>
 msgid ""
-"The freedom to redistribute copies must include binary or executable forms of 
the program, as well as source code, for both modified and "
-"unmodified versions.  (Distributing programs in runnable form is necessary 
for conveniently installable free operating systems.)  It is OK if "
-"there is no way to produce a binary or executable form for a certain program 
(since some languages don't support that feature), but you must have "
-"the freedom to redistribute such forms should you find or develop a way to 
make them."
+"The freedom to redistribute copies must include binary or executable forms "
+"of the program, as well as source code, for both modified and unmodified "
+"versions.  (Distributing programs in runnable form is necessary for "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
 msgstr ""
-"“自由地分发软件的拷贝”意味着必须å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的原版或用户自己的修改版。无
论那个版本,用户都可以选择发布程序的二进制或可执行文件,也可以发"
-"布程序的源代ç 
ã€‚(以可执行文件的形式发布程序可以让人方便安装
,这一点对于推广自由软件也至å…
³é‡è¦ã€‚)对于某些程序,也许无法或者不必
发布二进制或可执行"
-"文件(一些编程语言的实现可能并不支持,例如某些脚本语言),但是用户å¿
…
须有权利以任何方式生成二进制或可执行文件,并且发布这些生成的软件。"
+"“自由地分发软件的拷贝”意味着必须å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的原版或用户自己的修改"
+"版。无
论那个版本,用户都可以选择发布程序的二进制或可执行文件,也可以发布程序"
+"的源代ç 
ã€‚(以可执行文件的形式发布程序可以让人方便安装
,这一点对于推广自由软"
+"件也至关重要。)对于某些程序,也许无法或者不必
发布二进制或可执行文件(一些编"
+"程语言的实现可能并不支持,例如某些脚本语言),但是用户å¿
…须有权利以任何方式生"
+"成二进制或可执行文件,并且发布这些生成的软件。"
 
 #. type: Content of: <p>
 msgid ""
-"In order for freedoms 1 and 3 (the freedom to make changes and the freedom to 
publish the changed versions) to be meaningful, you must have "
-"access to the source code of the program.  Therefore, accessibility of source 
code is a necessary condition for free software.  Obfuscated &ldquo;"
-"source code&rdquo; is not real source code and does not count as source code."
+"In order for freedoms 1 and 3 (the freedom to make changes and the freedom "
+"to publish the changed versions) to be meaningful, you must have access to "
+"the source code of the program.  Therefore, accessibility of source code is "
+"a necessary condition for free software.  Obfuscated &ldquo;source "
+"code&rdquo; is not real source code and does not count as source code."
 msgstr ""
-"自由度1和3(自由地修改软件;自由地发布修改后的软件)意味着用户å¿
…须有权访问程序的源代码。由此,访问源代ç 
æ˜¯æˆä¸ºè‡ªç”±è½¯ä»¶çš„必要条件。混编"
-"(Obfuscated)后的 &ldquo; 源代码 &rdquo; 
不能被算作此处讨论的源代码。"
+"自由度1和3(自由地修改软件;自由地发布修改后的软件)意味着用户å¿
…须有权访问程"
+"序的源代码。由此,访问源代码是成为自由软件的必
要条件。混编(Obfuscated)后的 "
+"&ldquo; 源代码 &rdquo; 不能被算作此处讨论的源代码。"
 
 # This part may need a tranlator's note explaining details about Tivo.
 #. type: Content of: <p>
 msgid ""
-"Freedom 1 includes the freedom to use your changed version in place of the 
original.  If the program is delivered in a product designed to run "
-"someone else's modified versions but refuse to run yours &mdash; a practice 
known as &ldquo;tivoization&rdquo; or &ldquo;lockdown&rdquo;, or (in "
-"its practitioners' perverse terminology) as &ldquo;secure boot&rdquo; &mdash; 
freedom 1 becomes an empty pretense rather than a practical "
-"reality.  These binaries are not free software even if the source code they 
are compiled from is free."
-msgstr ""
-"自由度1(自由地运行程序)包
括自由地运行自己修改后的程序以替代原版程序。如果程序是跑在某种设备上,并且时随设备一起出售的,那么该设备å¿
…须给出一个方"
-"法,让用户可以将设备上的原有程序替换成用户自己的程序。否则,自由度1将被视为æ—
 æ³•æ»¡è¶³ï¼Œé‚£äº›è¢« &ldquo; 锁死 &rdquo; 
在设备中的程序也将不被视为自由软"
-"件。这种将程序锁死在设备中,禁止用户修改设备中的程序的做法,我们也称å
…¶ä¸º &ldquo; tivozation &rdquo;。"
+"Freedom 1 includes the freedom to use your changed version in place of the "
+"original.  If the program is delivered in a product designed to run someone "
+"else's modified versions but refuse to run yours &mdash; a practice known as "
+"&ldquo;tivoization&rdquo; or &ldquo;lockdown&rdquo;, or (in its "
+"practitioners' perverse terminology) as &ldquo;secure boot&rdquo; &mdash; "
+"freedom 1 becomes an empty pretense rather than a practical reality.  These "
+"binaries are not free software even if the source code they are compiled "
+"from is free."
+msgstr ""
+"自由度1(自由地运行程序)包
括自由地运行自己修改后的程序以替代原版程序。如果程"
+"序是跑在某种设备上,并且时随设备一起出售的,那么该设备å¿
…须给出一个方法,让用"
+"户可以将设备上的原有程序替换成用户自己的程序。否则,自由度1将被视为æ—
 æ³•æ»¡è¶³ï¼Œ"
+"那些被 &ldquo; 锁死 &rdquo; 
在设备中的程序也将不被视为自由软件。这种将程序锁"
+"死在设备中,禁止用户修改设备中的程序的做法,我们也称å
…¶ä¸º &ldquo; tivozation "
+"&rdquo;。"
 
 # suitably licensed? How can I translate this in a short but meaningful phrase?
 #. type: Content of: <p>
 msgid ""
-"One important way to modify a program is by merging in available free 
subroutines and modules.  If the program's license says that you cannot "
-"merge in a suitably licensed existing module &mdash; for instance, if it 
requires you to be the copyright holder of any code you add &mdash; then "
-"the license is too restrictive to qualify as free."
+"One important way to modify a program is by merging in available free "
+"subroutines and modules.  If the program's license says that you cannot "
+"merge in a suitably licensed existing module &mdash; for instance, if it "
+"requires you to be the copyright holder of any code you add &mdash; then the "
+"license is too restrictive to qualify as free."
 msgstr ""
-"倘若要修改某个程序,一种很重要的方法就是从别的程序中拿来现成的函数,或模块来使用。如果某个程序的许可证中禁止ä½
 ä½¿ç”¨å…¶ä»–合理授权的软件的代码来修改该"
-"程序 &mdash; 比如,如果某个程序的许可证要求你只能使用你
拥有版权的代码 &mdash; 
那么这个程序的许可证将不被视为自由软件许可证。"
+"倘若要修改某个程序,一种很重要的方法就是从别的程序中拿来现成的函数,或模块来"
+"使用。如果某个程序的许可证中禁止你使用å…
¶ä»–合理授权的软件的代码来修改该程序 "
+"&mdash; 比如,如果某个程序的许可证要求你只能使用你
拥有版权的代码 &mdash; 那么"
+"这个程序的许可证将不被视为自由软件许可证。"
 
 #. type: Content of: <p>
 msgid ""
-"Freedom 3 includes the freedom to release your modified versions as free 
software.  A free license may also permit other ways of releasing them; "
-"in other words, it does not have to be a <a 
href=\"/copyleft/copyleft.html\">copyleft</a> license.  However, a license that 
requires modified "
-"versions to be nonfree does not qualify as a free license."
+"Freedom 3 includes the freedom to release your modified versions as free "
+"software.  A free license may also permit other ways of releasing them; in "
+"other words, it does not have to be a <a href=\"/copyleft/copyleft.html"
+"\">copyleft</a> license.  However, a license that requires modified versions "
+"to be nonfree does not qualify as a free license."
 msgstr ""
-"自由度3å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的修改版。自由软件不一定要求修改版å¿
…
须继续采用自由软件许可证。换句话说,自由软件许可证可以不å¿
…是<a href=\"/copyleft/"
-"copyleft.html\">copyleft</d>许可证。但是,如果一个软件许可证要求修改后的软件å¿
…
须以非自由软件的形式发布,那么该许可证则不被视为自由软件许可证。"
+"自由度3å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的修改版。自由软件不一定要求修改版å¿
…须继续采用自"
+"由软件许可证。换句话说,自由软件许可证可以不必是<a 
href=\"/copyleft/copyleft."
+"html\">copyleft</d>许可证。但是,如果一个软件许可证要求修改后的软件å¿
…须以非自"
+"由软件的形式发布,那么该许可证则不被视为自由软件许可证。"
 
 #. type: Content of: <p>
 msgid ""
-"In order for these freedoms to be real, they must be permanent and 
irrevocable as long as you do nothing wrong; if the developer of the software "
-"has the power to revoke the license, or retroactively add restrictions to its 
terms, without your doing anything wrong to give cause, the "
-"software is not free."
+"In order for these freedoms to be real, they must be permanent and "
+"irrevocable as long as you do nothing wrong; if the developer of the "
+"software has the power to revoke the license, or retroactively add "
+"restrictions to its terms, without your doing anything wrong to give cause, "
+"the software is not free."
 msgstr ""
-"要让落实这些自由度,只要用户遵守许可证上的要求,那么这些自由度就å¿
…须是长久的,不可更改的。如果软件的开发者
有权利修改已发布软件的许可证,那么该软件"
-"也不被视为自由软件。"
+"要让落实这些自由度,只要用户遵守许可证上的要求,那么这些自由度就å¿
…须是长久"
+"的,不可更改的。如果软件的开发者
有权利修改已发布软件的许可证,那么该软件也不"
+"被视为自由软件。"
 
 #. type: Content of: <p>
 msgid ""
-"However, certain kinds of rules about the manner of distributing free 
software are acceptable, when they don't conflict with the central "
-"freedoms.  For example, <a href=\"/copyleft/copyleft.html\">copyleft</a> 
(very simply stated) is the rule that when redistributing the program, "
-"you cannot add restrictions to deny other people the central freedoms.  This 
rule does not conflict with the central freedoms; rather it protects "
-"them."
+"However, certain kinds of rules about the manner of distributing free "
+"software are acceptable, when they don't conflict with the central "
+"freedoms.  For example, <a href=\"/copyleft/copyleft.html\">copyleft</a> "
+"(very simply stated) is the rule that when redistributing the program, you "
+"cannot add restrictions to deny other people the central freedoms.  This "
+"rule does not conflict with the central freedoms; rather it protects them."
 msgstr ""
-"当然,只要不违背这些æ 
¸å¿ƒè‡ªç”±ï¼Œè‡ªç”±è½¯ä»¶è®¸å¯è¯ä¹Ÿå¯ä»¥é¢å¤–添加
一些要求,限制软件的分发步骤。例如,<a 
href=\"/copyleft/copyleft.html\">copyleft</a>就是"
-"常见的一种限制。简言之,copyleft要求软件的修改版必
须同样以自由软件的形式发布。这条限制与æ 
¸å¿ƒè‡ªç”±å¹¶ä¸å†²çªï¼Œç›¸åï¼Œcopyleft可以用来很好地保护软件用户"
-"的自由。"
+"当然,只要不违背这些æ 
¸å¿ƒè‡ªç”±ï¼Œè‡ªç”±è½¯ä»¶è®¸å¯è¯ä¹Ÿå¯ä»¥é¢å¤–添加
一些要求,限制软件"
+"的分发步骤。例如,<a 
href=\"/copyleft/copyleft.html\">copyleft</a>就是常见的"
+"一种限制。简言之,copyleft要求软件的修改版必须同æ 
·ä»¥è‡ªç”±è½¯ä»¶çš„形式发布。这条"
+"限制与æ 
¸å¿ƒè‡ªç”±å¹¶ä¸å†²çªï¼Œç›¸åï¼Œcopyleft可以用来很好地保护软件用户的自由。"
 
 #. type: Content of: <p>
 msgid ""
-"In the GNU project, we use copyleft to protect the four freedoms legally for 
everyone.  We believe there are important reasons why <a href=\"/"
-"philosophy/pragmatic.html\">it is better to use copyleft</a>.  However, <a 
href=\"/philosophy/categories.html#Non-CopyleftedFreeSoftware\"> "
-"noncopylefted free software</a> is ethical too.  See <a 
href=\"/philosophy/categories.html\">Categories of Free Software</a> for a 
description of "
-"how &ldquo;free software,&rdquo; &ldquo;copylefted software&rdquo; and other 
categories of software relate to each other."
+"In the GNU project, we use copyleft to protect the four freedoms legally for "
+"everyone.  We believe there are important reasons why <a href=\"/philosophy/"
+"pragmatic.html\">it is better to use copyleft</a>.  However, <a href=\"/"
+"philosophy/categories.html#Non-CopyleftedFreeSoftware\"> noncopylefted free "
+"software</a> is ethical too.  See <a href=\"/philosophy/categories.html"
+"\">Categories of Free Software</a> for a description of how &ldquo;free "
+"software,&rdquo; &ldquo;copylefted software&rdquo; and other categories of "
+"software relate to each other."
 msgstr ""
-"在GNU项目中,我们使用copyleft这一规则来保护软件用户的四大自由。我们相信<a
 
href=\"/philosophy/pragmatic.html\">Copyleft是更好的选择</a>。然而,<a
 "
-"href=\"/philosophy/categories.html#Non-CopyleftedFreeSoftware\">非copyleft的自由软件</a>也同æ
 ·æ˜¯åˆä¹Žé“义的。参见<a href=\"/philosophy/categories."
-"html\">自由软件分类</a>来了解更多关于 &ldquo; 自由软件 
&rdquo; , &ldquo; copyleft软件 &rdquo; 以及其他分类和它们之间的å…
³ç³»ã€‚"
+"在GNU项目中,我们使用copyleft这一规则来保护软件用户的四大自由。我们相信<a
 "
+"href=\"/philosophy/pragmatic.html\">Copyleft是更好的选择</a>。然而,<a
 href="
+"\"/philosophy/categories.html#Non-CopyleftedFreeSoftware\">非copyleft的自由软"
+"件</a>也同样是合乎道义的。参见<a 
href=\"/philosophy/categories.html\">自由软"
+"件分类</a>来了解更多关于 &ldquo; 自由软件 &rdquo; , &ldquo; 
copyleft软件 "
+"&rdquo; 以及其他分类和它们之间的关系。"
 
 #. type: Content of: <p>
 msgid ""
-"&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A 
free program must be available for commercial use, commercial "
-"development, and commercial distribution.  Commercial development of free 
software is no longer unusual; such free commercial software is very "
-"important.  You may have paid money to get copies of free software, or you 
may have obtained copies at no charge.  But regardless of how you got "
-"your copies, you always have the freedom to copy and change the software, 
even to <a href=\"/philosophy/selling.html\">sell copies</a>."
+"&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  A "
+"free program must be available for commercial use, commercial development, "
+"and commercial distribution.  Commercial development of free software is no "
+"longer unusual; such free commercial software is very important.  You may "
+"have paid money to get copies of free software, or you may have obtained "
+"copies at no charge.  But regardless of how you got your copies, you always "
+"have the freedom to copy and change the software, even to <a href=\"/"
+"philosophy/selling.html\">sell copies</a>."
 msgstr ""
-"&ldquo; 自由软件 &rdquo; 不等于 &ldquo; 非商业软件 &rdquo; 
。一个自由软件必须å…
è®¸å•†ä¸šç”¨æˆ·ï¼Œå•†ä¸šå¼€å‘,和商业发布。商业开发自由软件早就司空见惯了,"
-"这样的自由软件非常重要。你
可能需要花钱购买自由软件的拷贝,也可能å…
è´¹æ‹¿åˆ°ã€‚但是无论你如何获得你的拷贝,作为用户,你
的四大自由都会被保证,你可以自由"
-"地运行,修改,发布甚至<a 
href=\"/philosophy/selling.html\">出售</a>你拿到的自由软件。"
+"&ldquo; 自由软件 &rdquo; 不等于 &ldquo; 非商业软件 &rdquo; 
。一个自由软件必须"
+"å…
è®¸å•†ä¸šç”¨æˆ·ï¼Œå•†ä¸šå¼€å‘,和商业发布。商业开发自由软件早就司空见惯了,这æ
 ·çš„自"
+"由软件非常重要。你
可能需要花钱购买自由软件的拷贝,也可能å…
è´¹æ‹¿åˆ°ã€‚但是无论你"
+"如何获得你的拷贝,作为用户,你
的四大自由都会被保证,你可以自由地运行,修改,"
+"发布甚至<a href=\"/philosophy/selling.html\">出售</a>你
拿到的自由软件。"
 
 #. type: Content of: <p>
 msgid ""
-"Whether a change constitutes an improvement is a subjective matter.  If your 
right to modify a program is limited, in substance, to changes that "
-"someone else considers an improvement, that program is not free."
+"Whether a change constitutes an improvement is a subjective matter.  If your "
+"right to modify a program is limited, in substance, to changes that someone "
+"else considers an improvement, that program is not free."
 msgstr ""
-"对软件的修改可能是出于各种目的。某个特定的修改究竟是好是坏,这本身是个非常主观的事æƒ
…
。自由软件许可证不能对用户修改软件做任何限制,例如,不能ä»
…ä»…å› "
-"为某人觉得哪处修改不够好,就禁止用户自己做这个改动。"
+"对软件的修改可能是出于各种目的。某个特定的修改究竟是好是坏,这本身是个非常主"
+"观的事情
。自由软件许可证不能对用户修改软件做任何限制,例如,不能ä»
…仅因为某人"
+"觉得哪处修改不够好,就禁止用户自己做这个改动。"
 
 #. type: Content of: <p>
 msgid ""
-"However, rules about how to package a modified version are acceptable, if 
they don't substantively limit your freedom to release modified "
-"versions, or your freedom to make and use modified versions privately.  Thus, 
it is acceptable for the license to require that you change the "
-"name of the modified version, remove a logo, or identify your modifications 
as yours.  As long as these requirements are not so burdensome that "
-"they effectively hamper you from releasing your changes, they are acceptable; 
you're already making other changes to the program, so you won't "
-"have trouble making a few more."
+"However, rules about how to package a modified version are acceptable, if "
+"they don't substantively limit your freedom to release modified versions, or "
+"your freedom to make and use modified versions privately.  Thus, it is "
+"acceptable for the license to require that you change the name of the "
+"modified version, remove a logo, or identify your modifications as yours.  "
+"As long as these requirements are not so burdensome that they effectively "
+"hamper you from releasing your changes, they are acceptable; you're already "
+"making other changes to the program, so you won't have trouble making a few "
+"more."
 msgstr ""
-"不过,自由软件可以对修改版的打包
或分发方式做一定的限制。这些限制不得与前面提到的四大自由相矛盾,不得直接或间接地限制用户运行,修改或发布软件。例"
-"如,某些自由软件可以要求修改版不得使用软件的原有名字发布;不能使用软件的原有商æ
 ‡ï¼›å¿…é¡»æ 
‡æ˜Žè½¯ä»¶æ¥è‡ªè°çš„修改等等。只要这些限制不会明显地限制用户再发"
-"布软件的修改版,那么它们就是可以接受的。既然已经对软件修改了,那么ä½
 ä¼°è®¡ä¹Ÿå°±ä¸ä¼šåœ¨ä¹Žè¿™äº›é¢å¤–的小限制了。"
+"不过,自由软件可以对修改版的打包
或分发方式做一定的限制。这些限制不得与前面提"
+"到的四大自由相矛盾,不得直接或间接地限制用户运行,修改或发布软件。例如,某些"
+"自由软件可以要求修改版不得使用软件的原有名字发布;不能使用软件的原有商æ
 ‡ï¼›å¿…"
+"é¡»æ 
‡æ˜Žè½¯ä»¶æ¥è‡ªè°çš„修改等等。只要这些限制不会明显地限制用户再发布软件的修改"
+"版,那么它们就是可以接受的。既然已经对软件修改了,那么ä½
 ä¼°è®¡ä¹Ÿå°±ä¸ä¼šåœ¨ä¹Žè¿™äº›"
+"额外的小限制了。"
 
 #. type: Content of: <p>
 msgid ""
-"Rules that &ldquo;if you make your version available in this way, you must 
make it available in that way also&rdquo; can be acceptable too, on "
-"the same condition.  An example of such an acceptable rule is one saying that 
if you have distributed a modified version and a previous developer "
-"asks for a copy of it, you must send one.  (Note that such a rule still 
leaves you the choice of whether to distribute your version at all.)  "
-"Rules that require release of source code to the users for versions that you 
put into public use are also acceptable."
+"Rules that &ldquo;if you make your version available in this way, you must "
+"make it available in that way also&rdquo; can be acceptable too, on the same "
+"condition.  An example of such an acceptable rule is one saying that if you "
+"have distributed a modified version and a previous developer asks for a copy "
+"of it, you must send one.  (Note that such a rule still leaves you the "
+"choice of whether to distribute your version at all.)  Rules that require "
+"release of source code to the users for versions that you put into public "
+"use are also acceptable."
 msgstr ""
-"同理,自由软件也可以要求用户 &ldquo; 
如果以这种方式发布,那么用户必须也可以从另外某一渠
道获得 &rdquo; 
。比如,某个自由软件可能会要求如果发布了修改"
-"版,那么必须也要给原作者
一份修改后的拷贝。(注意:此处前提是软件必
须发布,用户可以私下修改软件而不发布,这样也就不必
把修改版发给开发者了。)另外还"
-"有一些规则也不会与自由软件原则冲突,比如软件可以要求修改后的版本发布时需要附带相应的原版软件的代ç
 ã€‚"
+"同理,自由软件也可以要求用户 &ldquo; 
如果以这种方式发布,那么用户必须也可以从"
+"另外某一渠道获得 &rdquo; 
。比如,某个自由软件可能会要求如果发布了修改版,那么"
+"必须也要给原作者
一份修改后的拷贝。(注意:此处前提是软件必
须发布,用户可以私"
+"下修改软件而不发布,这样也就不必把修改版发给开发者
了。)另外还有一些规则也不"
+"会与自由软件原则冲突,比如软件可以要求修改后的版本发布时需要附带相应的原版软"
+"件的代码。"
 
 #. type: Content of: <p>
 msgid ""
-"A special issue arises when a license requires changing the name by which the 
program will be invoked from other programs.  That effectively "
-"hampers you from releasing your changed version so that it can replace the 
original when invoked by those other programs.  This sort of "
-"requirement is acceptable only if there's a suitable aliasing facility that 
allows you to specify the original program's name as an alias for the "
-"modified version."
+"A special issue arises when a license requires changing the name by which "
+"the program will be invoked from other programs.  That effectively hampers "
+"you from releasing your changed version so that it can replace the original "
+"when invoked by those other programs.  This sort of requirement is "
+"acceptable only if there's a suitable aliasing facility that allows you to "
+"specify the original program's name as an alias for the modified version."
 msgstr ""
-"有一些特例需要额外讨论:如果某软件许可证要求修改后的软件å¿
…须修改可执行文件的名字,那么必须保证软件运行的环境å…
è®¸ä¿®æ”¹æ–‡ä»¶åæˆ–具备某种别名机制,否则"
-"该要求将被视作与自由软件原则相背。因
为软件的可执行文件可能会被å…
¶ä»–第三方软件调用,而文件名则是这种调用的基础。别名机制可以保证用户在遵守该要求的前"
-"提下,顺利将原版软件替换成修改版,并且不会影响依赖该软件的第三方程序。"
+"有一些特例需要额外讨论:如果某软件许可证要求修改后的软件å¿
…须修改可执行文件的"
+"名字,那么必须保证软件运行的环境允许修改文件名或å…
·å¤‡æŸç§åˆ«åæœºåˆ¶ï¼Œå¦åˆ™è¯¥è¦æ±‚"
+"将被视作与自由软件原则相背。因
为软件的可执行文件可能会被其他第三方软件调用,"
+"而文件名则是这种调用的基础。别名机制可以保证用户在遵守该要求的前提下,顺利将"
+"原版软件替换成修改版,并且不会影响依赖该软件的第三方程序。"
 
 #. type: Content of: <p>
 msgid ""
-"Sometimes government <a id=\"exportcontrol\">export control regulations</a> 
and trade sanctions can constrain your freedom to distribute copies "
-"of programs internationally.  Software developers do not have the power to 
eliminate or override these restrictions, but what they can and must "
-"do is refuse to impose them as conditions of use of the program.  In this 
way, the restrictions will not affect activities and people outside the "
-"jurisdictions of these governments.  Thus, free software licenses must not 
require obedience to any nontrivial export regulations as a condition "
-"of exercising any of the essential freedoms."
+"Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
+"and trade sanctions can constrain your freedom to distribute copies of "
+"programs internationally.  Software developers do not have the power to "
+"eliminate or override these restrictions, but what they can and must do is "
+"refuse to impose them as conditions of use of the program.  In this way, the "
+"restrictions will not affect activities and people outside the jurisdictions "
+"of these governments.  Thus, free software licenses must not require "
+"obedience to any nontrivial export regulations as a condition of exercising "
+"any of the essential freedoms."
 msgstr ""
-"一些政府的<a 
id=\"exportcontrol\">出口限制</a>或贸易制裁可能会影响到软件用户在国é™
…范围内发布软件的自由。软件开发者
也许没有能力去改变这些现实,但是"
-"我们可以拒绝自我审查。自由软件的开发者
不得在软件许可证中要求用户遵守哪条特定法律,因
为开发者无法保证用户所在国度或地区具备该法律条款。这æ 
·ï¼Œè‡ªç”±è½¯"
-"件许可证就不会给用户在法律之外添加
额外的违反基本自由的限制。"
+"一些政府的<a 
id=\"exportcontrol\">出口限制</a>或贸易制裁可能会影响到软件用户"
+"在国际范围内发布软件的自由。软件开发者
也许没有能力去改变这些现实,但是我们可"
+"以拒绝自我审查。自由软件的开发者
不得在软件许可证中要求用户遵守哪条特定法律,"
+"因为开发者无法保证用户所在国度或地区å…
·å¤‡è¯¥æ³•å¾‹æ¡æ¬¾ã€‚这样,自由软件许可证就不"
+"会给用户在法律之外添加额外的违反基本自由的限制。"
 
 #. type: Content of: <p>
 msgid ""
-"Merely mentioning the existence of export regulations, without making them a 
condition of the license itself, is acceptable since it does not "
-"restrict users.  If an export regulation is actually trivial for free 
software, then requiring it as a condition is not an actual problem; "
-"however, it is a potential problem, since a later change in export law could 
make the requirement nontrivial and thus render the software nonfree."
+"Merely mentioning the existence of export regulations, without making them a "
+"condition of the license itself, is acceptable since it does not restrict "
+"users.  If an export regulation is actually trivial for free software, then "
+"requiring it as a condition is not an actual problem; however, it is a "
+"potential problem, since a later change in export law could make the "
+"requirement nontrivial and thus render the software nonfree."
 msgstr ""
-"当然,自由软件可以仅仅
在许可证中提及某条出口条例或相å…
³æ³•å¾‹ï¼Œè€Œä¸å¼ºåˆ¶è¦æ±‚用户遵守。这æ 
·åšåªæ˜¯ä¸ºç”¨æˆ·æä¾›äº†ä¿¡æ¯è€Œæ²¡æœ‰å®žé™…
限制用户。如果某条出口限制法"
-"律是普遍存在,å…
¨éƒ¨ç”¨æˆ·æ‰€åœ¨çš„地区都做出该限制的,那么在许可证中要求用户遵守该条例也不会被视为限制用户的自由。然而,这会存在潜在问题:一旦该条出口限"
-"制法律在某个用户的所在地区做了修改,那么该许可证也就不被视作自由的。"
+"当然,自由软件可以仅仅
在许可证中提及某条出口条例或相å…
³æ³•å¾‹ï¼Œè€Œä¸å¼ºåˆ¶è¦æ±‚用户"
+"遵守。这样做只是为用户提供了信息而没有实际
限制用户。如果某条出口限制法律是普"
+"遍存在,å…
¨éƒ¨ç”¨æˆ·æ‰€åœ¨çš„地区都做出该限制的,那么在许可证中要求用户遵守该条例也"
+"不会被视为限制用户的自由。然而,这会存在潜在问题:一旦该条出口限制法律在某个"
+"用户的所在地区做了修改,那么该许可证也就不被视作自由的。"
 
 # "may not" or "should not"?
 #. type: Content of: <p>
 msgid ""
-"A free license may not require compliance with the license of a nonfree 
program.  Thus, for instance, if a license requires you to comply with "
-"the licenses of &ldquo;all the programs you use&rdquo;, in the case of a user 
that runs nonfree programs this would require compliance with the "
-"licenses of those nonfree programs; that makes the license nonfree."
+"A free license may not require compliance with the license of a nonfree "
+"program.  Thus, for instance, if a license requires you to comply with the "
+"licenses of &ldquo;all the programs you use&rdquo;, in the case of a user "
+"that runs nonfree programs this would require compliance with the licenses "
+"of those nonfree programs; that makes the license nonfree."
 msgstr ""
-"自由软件许可证不得要求用户额外遵守哪些非自由软件的许可证。例如,自由软件许可证不得要求用户å¿
…须遵守 &ldquo; 所有使用的软件的许可证 &rdquo; 。因为用"
-"户可能使用非自由软件,而要求用户遵守å…
¨éƒ¨ä½¿ç”¨çš„软件的许可证则意味着需要遵守非自由软件许可证,这要的要求将被视作非自由的。"
+"自由软件许可证不得要求用户额外遵守哪些非自由软件的许可证。例如,自由软件许可"
+"证不得要求用户必须遵守 &ldquo; 所有使用的软件的许可证 
&rdquo; 。因为用户可能"
+"使用非自由软件,而要求用户遵守å…
¨éƒ¨ä½¿ç”¨çš„软件的许可证则意味着需要遵守非自由软"
+"件许可证,这要的要求将被视作非自由的。"
 
 #. type: Content of: <p>
-msgid "It is acceptable for a free license to specify which jurisdiction's law 
applies, or where litigation must be done, or both."
-msgstr "自由软件许可证可以指定与软件相å…
³çš„诉讼需要遵守哪个地区的法律,或需要在哪里提起诉讼。"
+msgid ""
+"It is acceptable for a free license to specify which jurisdiction's law "
+"applies, or where litigation must be done, or both."
+msgstr ""
+"自由软件许可证可以指定与软件相å…
³çš„诉讼需要遵守哪个地区的法律,或需要在哪里提"
+"起诉讼。"
 
 #. type: Content of: <p>
 msgid ""
-"Most free software licenses are based on copyright, and there are limits on 
what kinds of requirements can be imposed through copyright.  If a "
-"copyright-based license respects freedom in the ways described above, it is 
unlikely to have some other sort of problem that we never anticipated "
-"(though this does happen occasionally).  However, some free software licenses 
are based on contracts, and contracts can impose a much larger "
-"range of possible restrictions.  That means there are many possible ways such 
a license could be unacceptably restrictive and nonfree."
+"Most free software licenses are based on copyright, and there are limits on "
+"what kinds of requirements can be imposed through copyright.  If a copyright-"
+"based license respects freedom in the ways described above, it is unlikely "
+"to have some other sort of problem that we never anticipated (though this "
+"does happen occasionally).  However, some free software licenses are based "
+"on contracts, and contracts can impose a much larger range of possible "
+"restrictions.  That means there are many possible ways such a license could "
+"be unacceptably restrictive and nonfree."
 msgstr ""
-"绝大部分自由软件许可证是基于版权的,基于版权,能采取的限制往往相对有限。如果一个许可证基于版权并且遵ç
…§ä¸Šè¿°çš„自由软件原则,那么它很可能被视作是自由"
-"软件许可证。当然,我们也见过一些例外,不过这些还很少见。然而有些自由软件许可证是基于合同的。合同可能会有更多的额外要求。这就意味着基于合同的许可证"
-"可能会在很多不经意的地方违背自由软件原则,导致软件不被视作自由软件。"
+"绝大部分自由软件许可证是基于版权的,基于版权,能采取的限制往往相对有限。如果"
+"一个许可证基于版权并且遵ç…
§ä¸Šè¿°çš„自由软件原则,那么它很可能被视作是自由软件许"
+"可证。当然,我们也见过一些例外,不过这些还很少见。然而有些自由软件许可证是基"
+"于合同的。合同可能会有更多的额外要求。这就意味着基于合同的许可证可能会在很多"
+"不经意的地方违背自由软件原则,导致软件不被视作自由软件。"
 
 #. type: Content of: <p>
 msgid ""
-"We can't possibly list all the ways that might happen.  If a contract-based 
license restricts the user in an unusual way that copyright-based "
-"licenses cannot, and which isn't mentioned here as legitimate, we will have 
to think about it, and we will probably conclude it is nonfree."
+"We can't possibly list all the ways that might happen.  If a contract-based "
+"license restricts the user in an unusual way that copyright-based licenses "
+"cannot, and which isn't mentioned here as legitimate, we will have to think "
+"about it, and we will probably conclude it is nonfree."
 msgstr ""
-"很遗憾,我们无法列出所有可能的意外情
况。如果一份基于合同的许可证对用户做出了一些额外限制,并且这些限制是不可能åŒ
…含在一份基于版权的许可证中的,那么"
-"我们就需要再三考虑它是否可以被视作自由许可证。很多情
况下,这些许可证都是非自由的。"
+"很遗憾,我们无法列出所有可能的意外情
况。如果一份基于合同的许可证对用户做出了"
+"一些额外限制,并且这些限制是不可能包
含在一份基于版权的许可证中的,那么我们就"
+"需要再三考虑它是否可以被视作自由许可证。很多情
况下,这些许可证都是非自由的。"
 
 #. type: Content of: <p>
 msgid ""
-"When talking about free software, it is best to avoid using terms like 
&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms "
-"imply that the issue is about price, not freedom.  Some common terms such as 
&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See "
-"<a href=\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that 
are Worth Avoiding</a> for a discussion of these terms.  We also "
-"have a list of proper <a 
href=\"/philosophy/fs-translations.html\">translations of &ldquo;free 
software&rdquo;</a> into various languages."
+"When talking about free software, it is best to avoid using terms like "
+"&ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms imply "
+"that the issue is about price, not freedom.  Some common terms such as "
+"&ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See <a href="
+"\"/philosophy/words-to-avoid.html\">Confusing Words and Phrases that are "
+"Worth Avoiding</a> for a discussion of these terms.  We also have a list of "
+"proper <a href=\"/philosophy/fs-translations.html\">translations of &ldquo;"
+"free software&rdquo;</a> into various languages."
 msgstr ""
-"在讨论自由软件的时候,尽量避免使用 &ldquo; 赠送 &rdquo; 
或 &ldquo; 免费 &rdquo; 一类的词汇。因为这会让人们联想到价æ 
¼ï¼Œè€Œéžè‡ªç”±ã€‚一些常见的词汇,例"
-"如 &ldquo; 盗版 &rdquo; ,其中包含了或褒或贬的感情
色彩,而这些感情体现的价值观并不被我们接受。参见<a 
href=\"/philosophy/words-to-avoid.html\">歧义"
-"词汇列表</a>,里面列举了我们不推荐使用的词汇以及相å…
³çš„讨论。我们还有一个<a 
href=\"/philosophy/fs-translations.html\">列表</a>,包含了 &ldquo; 自由"
-"软件 &rdquo; 一词在不同语言中的推荐翻译。"
+"在讨论自由软件的时候,尽量避免使用 &ldquo; 赠送 &rdquo; 
或 &ldquo; 免费 "
+"&rdquo; 一类的词汇。因为这会让人们联想到价æ 
¼ï¼Œè€Œéžè‡ªç”±ã€‚一些常见的词汇,例如 "
+"&ldquo; 盗版 &rdquo; ,其中包含了或褒或贬的感情
色彩,而这些感情体现的价值观并"
+"不被我们接受。参见<a 
href=\"/philosophy/words-to-avoid.html\">歧义词汇列表</"
+"a>,里面列举了我们不推荐使用的词汇以及相å…
³çš„讨论。我们还有一个<a href=\"/"
+"philosophy/fs-translations.html\">列表</a>,包含了 &ldquo; 自由软件 
&rdquo; "
+"一词在不同语言中的推荐翻译。"
 
 #. type: Content of: <p>
 msgid ""
-"Finally, note that criteria such as those stated in this free software 
definition require careful thought for their interpretation.  To decide "
-"whether a specific software license qualifies as a free software license, we 
judge it based on these criteria to determine whether it fits their "
-"spirit as well as the precise words.  If a license includes unconscionable 
restrictions, we reject it, even if we did not anticipate the issue in "
-"these criteria.  Sometimes a license requirement raises an issue that calls 
for extensive thought, including discussions with a lawyer, before we "
-"can decide if the requirement is acceptable.  When we reach a conclusion 
about a new issue, we often update these criteria to make it easier to "
-"see why certain licenses do or don't qualify."
+"Finally, note that criteria such as those stated in this free software "
+"definition require careful thought for their interpretation.  To decide "
+"whether a specific software license qualifies as a free software license, we "
+"judge it based on these criteria to determine whether it fits their spirit "
+"as well as the precise words.  If a license includes unconscionable "
+"restrictions, we reject it, even if we did not anticipate the issue in these "
+"criteria.  Sometimes a license requirement raises an issue that calls for "
+"extensive thought, including discussions with a lawyer, before we can decide "
+"if the requirement is acceptable.  When we reach a conclusion about a new "
+"issue, we often update these criteria to make it easier to see why certain "
+"licenses do or don't qualify."
 msgstr ""
-"最后请注意,在实践中,本文中提及的各种å…
³äºŽè‡ªç”±è½¯ä»¶çš„界定æ 
‡å‡†éƒ½éœ€è¦ä»”细思考后再做出解释。在决定一个软件许可证是否是自由软件的时候,我们会仔细查看该"
-"许可证的内
涵和行文是否符合本文中涉及的原则,由此决定许可证是否为自由软件许可证。如果许可证中åŒ
…含了一些不合理的限制,哪怕这些限制没有在本文中提及,"
-"我们也会拒绝承认它是自由的。有时候,某个许可证可能会引起一场大讨论,甚至需要专业律师参与。这时候,我们往往需要仔细定夺之后才能给出结论。遇到这æ
 ·çš„"
-"许可证,在做出结论之后,我们很可能会更新本文,把之前没有考虑到的å›
 ç´ æ·»åŠ è¿›æ¥ã€‚"
+"最后请注意,在实践中,本文中提及的各种å…
³äºŽè‡ªç”±è½¯ä»¶çš„界定标准都需要仔细思考后"
+"再做出解释。在决定一个软件许可证是否是自由软件的时候,我们会仔细查看该许可证"
+"的内
涵和行文是否符合本文中涉及的原则,由此决定许可证是否为自由软件许可证。如"
+"果许可证中包
含了一些不合理的限制,哪怕这些限制没有在本文中提及,我们也会拒绝"
+"承认它是自由的。有时候,某个许可证可能会引起一场大讨论,甚至需要专业律师参"
+"与。这时候,我们往往需要仔细定夺之后才能给出结论。遇到这æ
 ·çš„许可证,在做出结"
+"论之后,我们很可能会更新本文,把之前没有考虑到的因素
添加进来。"
 
 #. type: Content of: <p>
 msgid ""
-"If you are interested in whether a specific license qualifies as a free 
software license, see our <a href=\"/licenses/license-list.html\">list of "
-"licenses</a>.  If the license you are concerned with is not listed there, you 
can ask us about it by sending us email at <a href=\"mailto:";
+"If you are interested in whether a specific license qualifies as a free "
+"software license, see our <a href=\"/licenses/license-list.html\">list of "
+"licenses</a>.  If the license you are concerned with is not listed there, "
+"you can ask us about it by sending us email at <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>."
 msgstr ""
-"如果你
想知道哪些许可证是自由软件许可证,可以参见我们的<a 
href=\"/licenses/license-list.html\">许可证列表</a>。如果你å…
³æ³¨çš„许可证没有在这个列表中提"
-"及,你也可以给我们发邮件来单独询问。我们的邮箱是:<a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。"
+"如果你
想知道哪些许可证是自由软件许可证,可以参见我们的<a 
href=\"/licenses/"
+"license-list.html\">许可证列表</a>。如果你å…
³æ³¨çš„许可证没有在这个列表中提及,"
+"你也可以给我们发邮件来单独询问。我们的邮箱是:<a 
href=\"mailto:address@hidden";
+"org\">&lt;address@hidden&gt;</a>。"
 
 #. type: Content of: <p>
 msgid ""
-"If you are contemplating writing a new license, please contact the Free 
Software Foundation first by writing to that address. The proliferation "
-"of different free software licenses means increased work for users in 
understanding the licenses; we may be able to help you find an existing "
-"free software license that meets your needs."
+"If you are contemplating writing a new license, please contact the Free "
+"Software Foundation first by writing to that address. The proliferation of "
+"different free software licenses means increased work for users in "
+"understanding the licenses; we may be able to help you find an existing free "
+"software license that meets your needs."
 msgstr ""
-"如果你打算起草一份新的自由软件许可证,那么请å…
ˆä¸è¦ç»™ä¸Šè¿°é‚®ç®±å‘邮件。希望您能å…
ˆè€ƒè™‘联系自由软件基金会。太多的自由软件许可证会增加
用户的选择难度,我"
-"们也许可以按ç…
§æ‚¨çš„要求,帮您找到一份现有的许可证,而不必
您亲自操刀起草一份新许可证。"
+"如果你打算起草一份新的自由软件许可证,那么请å…
ˆä¸è¦ç»™ä¸Šè¿°é‚®ç®±å‘邮件。希望您能"
+"先考虑联系自由软件基金会。太多的自由软件许可证会增加
用户的选择难度,我们也许"
+"可以按照您的要求,帮您找到一份现有的许可证,而不必
您亲自操刀起草一份新许可"
+"证。"
 
 #. type: Content of: <p>
 msgid ""
-"If that isn't possible, if you really need a new license, with our help you 
can ensure that the license really is a free software license and "
-"avoid various practical problems."
-msgstr "如果您真的需要自己创造
一个新许可证,那么我们会尽力帮助您。在我们的帮助下,我们会保证您的许可证是自由的,并且帮助您避å
…ä¸€äº›å¸¸è§çš„问题。"
+"If that isn't possible, if you really need a new license, with our help you "
+"can ensure that the license really is a free software license and avoid "
+"various practical problems."
+msgstr ""
+"如果您真的需要自己创造
一个新许可证,那么我们会尽力帮助您。在我们的帮助下,我"
+"们会保证您的许可证是自由的,并且帮助您避å…
ä¸€äº›å¸¸è§çš„问题。"
 
 #. type: Content of: <h3>
 msgid "Beyond Software"
@@ -392,25 +572,32 @@
 
 #. type: Content of: <p>
 msgid ""
-"<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for 
the same reasons that software must be free, and because the manuals "
-"are in effect part of the software."
-msgstr "基于同样的原则,<a 
href=\"/philosophy/free-doc.html\">自由软件的手册也必
须是自由的</a>,因为手册本身也应该被视作软件的一部分。"
+"<a href=\"/philosophy/free-doc.html\">Software manuals must be free</a>, for "
+"the same reasons that software must be free, and because the manuals are in "
+"effect part of the software."
+msgstr ""
+"基于同样的原则,<a 
href=\"/philosophy/free-doc.html\">自由软件的手册也必须是"
+"自由的</a>,因为手册本身也应该被视作软件的一部分。"
 
 #. type: Content of: <p>
 msgid ""
-"The same arguments also make sense for other kinds of works of practical use 
&mdash; that is to say, works that embody useful knowledge, such as "
-"educational works and reference works.  <a 
href=\"http://wikipedia.org\";>Wikipedia</a> is the best-known example."
+"The same arguments also make sense for other kinds of works of practical use "
+"&mdash; that is to say, works that embody useful knowledge, such as "
+"educational works and reference works.  <a href=\"http://wikipedia.org";
+"\">Wikipedia</a> is the best-known example."
 msgstr ""
-"同理,相同的原则也适用于其他的具有实用功能的作品中 
&mdash; 所谓实用功能的作品,是指作品中包
含实用的知识,例如教育材料或参考材料。<a href=\"http://";
+"同理,相同的原则也适用于其他的具有实用功能的作品中 
&mdash; 所谓实用功能的作"
+"品,是指作品中包
含实用的知识,例如教育材料或参考材料。<a href=\"http://";
 "wikipedia.org\">维基百科</a>就是其中一个广为人知的例子。"
 
 #. type: Content of: <p>
 msgid ""
-"Any kind of work <em>can</em> be free, and the definition of free software 
has been extended to a definition of <a href=\"http://freedomdefined.";
-"org/\"> free cultural works</a> applicable to any kind of works."
+"Any kind of work <em>can</em> be free, and the definition of free software "
+"has been extended to a definition of <a href=\"http://freedomdefined.org/\";> "
+"free cultural works</a> applicable to any kind of works."
 msgstr ""
-"任何作品都<em>可以</em>是自由的,自由软件的定义也可以延伸到å
…¶ä»–作品上。关于这方面的材料,请参见<a 
href=\"http://freedomdefined.org\";>自由文化作品"
-"</a>。"
+"任何作品都<em>可以</em>是自由的,自由软件的定义也可以延伸到å
…¶ä»–作品上。关于这"
+"方面的材料,请参见<a 
href=\"http://freedomdefined.org\";>自由文化作品</a>。"
 
 #. type: Content of: <h3>
 msgid "Open Source?"
@@ -418,13 +605,18 @@
 
 #. type: Content of: <p>
 msgid ""
-"Another group has started using the term &ldquo;open source&rdquo; to mean 
something close (but not identical) to &ldquo;free software&rdquo;.  "
-"We prefer the term &ldquo;free software&rdquo; because, once you have heard 
that it refers to freedom rather than price, it calls to mind "
-"freedom.  The word &ldquo;open&rdquo; <a 
href=\"/philosophy/open-source-misses-the-point.html\"> never refers to 
freedom</a>."
-msgstr ""
-"现在还有另外一伙人,使用 &ldquo; 开源 &rdquo; 
一词来表达与 &ldquo; 自由软件 &rdquo; 类似,但不完å…
¨ç›¸åŒçš„概念。我们更倾向于使用 &ldquo; 自由软件 "
-"&rdquo; 这个词。因为一旦你
看到自由二字,就明白了它所要表达的意思。而 &ldquo; 开放 
&rdquo; <a href=\"/philosophy/open-source-misses-the-point.html"
-"\">却并不意味着自由</a>。"
+"Another group has started using the term &ldquo;open source&rdquo; to mean "
+"something close (but not identical) to &ldquo;free software&rdquo;.  We "
+"prefer the term &ldquo;free software&rdquo; because, once you have heard "
+"that it refers to freedom rather than price, it calls to mind freedom.  The "
+"word &ldquo;open&rdquo; <a href=\"/philosophy/open-source-misses-the-point."
+"html\"> never refers to freedom</a>."
+msgstr ""
+"现在还有另外一伙人,使用 &ldquo; 开源 &rdquo; 
一词来表达与 &ldquo; 自由软件 "
+"&rdquo; 类似,但不完全相同的概念。我们更倾向于使用 
&ldquo; 自由软件 &rdquo; "
+"这个词。因为一旦你
看到自由二字,就明白了它所要表达的意思。而 &ldquo; 开放 "
+"&rdquo; <a 
href=\"/philosophy/open-source-misses-the-point.html\">却并不意味"
+"着自由</a>。"
 
 #. type: Content of: <h3>
 msgid "History"
@@ -432,106 +624,137 @@
 
 #. type: Content of: <p>
 msgid ""
-"From time to time we revise this Free Software Definition.  Here is the list 
of substantive changes, along with links to show exactly what was "
-"changed."
-msgstr 
"随着时间的发展,我们也在不断对本文做出改进。此处列出历次的主要改动,并给出链接详细显示出哪里做出了修改。"
+"From time to time we revise this Free Software Definition.  Here is the list "
+"of substantive changes, along with links to show exactly what was changed."
+msgstr ""
+"随着时间的发展,我们也在不断对本文做出改进。此处列出历次的主要改动,并给出链"
+"接详细显示出哪里做出了修改。"
+
+#. type: Content of: <ul><li>
+msgid ""
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.140&amp;r2=1.141\">Version 1.141</a>: Clarify which code "
+"needs to be free."
+msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135\";>Version
 1.135</a>: Say each "
-"time that freedom 0 is the freedom to run the program as you wish."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.134&amp;r2=1.135\">Version 1.135</a>: Say each time that "
+"freedom 0 is the freedom to run the program as you wish."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.133&amp;r2=1.134\";>Version
 1.134</a>: Freedom 0 is "
-"not a matter of the program's functionality."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.133&amp;r2=1.134\">Version 1.134</a>: Freedom 0 is not a "
+"matter of the program's functionality."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.130&amp;r2=1.131\";>Version
 1.131</a>: A free "
-"license may not require compliance with a nonfree license of another program."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.130&amp;r2=1.131\">Version 1.131</a>: A free license may "
+"not require compliance with a nonfree license of another program."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.128&amp;r2=1.129\";>Version
 1.129</a>: State "
-"explicitly that choice of law and choice of forum specifications are allowed. 
 (This was always our policy.)"
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.128&amp;r2=1.129\">Version 1.129</a>: State explicitly "
+"that choice of law and choice of forum specifications are allowed.  (This "
+"was always our policy.)"
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122\";>Version
 1.122</a>: An export "
-"control requirement is a real problem if the requirement is nontrivial; 
otherwise it is only a potential problem."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.121&amp;r2=1.122\">Version 1.122</a>: An export control "
+"requirement is a real problem if the requirement is nontrivial; otherwise it "
+"is only a potential problem."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118\";>Version
 1.118</a>: "
-"Clarification: the issue is limits on your right to modify, not on what 
modifications you have made.  And modifications are not limited to &ldquo;"
-"improvements&rdquo;"
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.117&amp;r2=1.118\">Version 1.118</a>: Clarification: the "
+"issue is limits on your right to modify, not on what modifications you have "
+"made.  And modifications are not limited to &ldquo;improvements&rdquo;"
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111\";>Version
 1.111</a>: Clarify 1.77 "
-"by saying that only retroactive <em>restrictions</em> are unacceptable.  The 
copyright holders can always grant additional <em>permission</em> "
-"for use of the work by releasing the work in another way in parallel."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.110&amp;r2=1.111\">Version 1.111</a>: Clarify 1.77 by "
+"saying that only retroactive <em>restrictions</em> are unacceptable.  The "
+"copyright holders can always grant additional <em>permission</em> for use of "
+"the work by releasing the work in another way in parallel."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.104&amp;r2=1.105\";>Version
 1.105</a>: Reflect, in "
-"the brief statement of freedom 1, the point (already stated in version 1.80) 
that it includes really using your modified version for your "
-"computing."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.104&amp;r2=1.105\">Version 1.105</a>: Reflect, in the "
+"brief statement of freedom 1, the point (already stated in version 1.80) "
+"that it includes really using your modified version for your computing."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.91&amp;r2=1.92\";>Version
 1.92</a>: Clarify that "
-"obfuscated code does not qualify as source code."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.91&amp;r2=1.92\">Version 1.92</a>: Clarify that obfuscated "
+"code does not qualify as source code."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.89&amp;r2=1.90\";>Version
 1.90</a>: Clarify that "
-"freedom 3 means the right to distribute copies of your own modified or 
improved version, not a right to participate in someone else's development "
-"project."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.89&amp;r2=1.90\">Version 1.90</a>: Clarify that freedom 3 "
+"means the right to distribute copies of your own modified or improved "
+"version, not a right to participate in someone else's development project."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.88&amp;r2=1.89\";>Version
 1.89</a>: Freedom 3 "
-"includes the right to release modified versions as free software."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.88&amp;r2=1.89\">Version 1.89</a>: Freedom 3 includes the "
+"right to release modified versions as free software."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.79&amp;r2=1.80\";>Version
 1.80</a>: Freedom 1 must "
-"be practical, not just theoretical; i.e., no tivoization."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.79&amp;r2=1.80\">Version 1.80</a>: Freedom 1 must be "
+"practical, not just theoretical; i.e., no tivoization."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.76&amp;r2=1.77\";>Version
 1.77</a>: Clarify that "
-"all retroactive changes to the license are unacceptable, even if it's not 
described as a complete replacement."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.76&amp;r2=1.77\">Version 1.77</a>: Clarify that all "
+"retroactive changes to the license are unacceptable, even if it's not "
+"described as a complete replacement."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.73&amp;r2=1.74\";>Version
 1.74</a>: Four "
-"clarifications of points not explicit enough, or stated in some places but 
not reflected everywhere:"
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.73&amp;r2=1.74\">Version 1.74</a>: Four clarifications of "
+"points not explicit enough, or stated in some places but not reflected "
+"everywhere:"
 msgstr ""
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
-"\"Improvements\" does not mean the license can substantively limit what kinds 
of modified versions you can release.  Freedom 3 includes "
-"distributing modified versions, not just changes."
+"\"Improvements\" does not mean the license can substantively limit what "
+"kinds of modified versions you can release.  Freedom 3 includes distributing "
+"modified versions, not just changes."
 msgstr ""
 
 #. type: Content of: <ul><li><ul><li>
-msgid "The right to merge in existing modules refers to those that are 
suitably licensed."
+msgid ""
+"The right to merge in existing modules refers to those that are suitably "
+"licensed."
 msgstr ""
 
 #. type: Content of: <ul><li><ul><li>
@@ -544,64 +767,80 @@
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.56&amp;r2=1.57\";>Version
 1.57</a>: Add &quot;"
-"Beyond Software&quot; section."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.56&amp;r2=1.57\">Version 1.57</a>: Add &quot;Beyond "
+"Software&quot; section."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.45&amp;r2=1.46\";>Version
 1.46</a>: Clarify whose "
-"purpose is significant in the freedom to run the program for any purpose."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.45&amp;r2=1.46\">Version 1.46</a>: Clarify whose purpose "
+"is significant in the freedom to run the program for any purpose."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.40&amp;r2=1.41\";>Version
 1.41</a>: Clarify wording "
-"about contract-based licenses."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.40&amp;r2=1.41\">Version 1.41</a>: Clarify wording about "
+"contract-based licenses."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.39&amp;r2=1.40\";>Version
 1.40</a>: Explain that a "
-"free license must allow to you use other available free software to create 
your modifications."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.39&amp;r2=1.40\">Version 1.40</a>: Explain that a free "
+"license must allow to you use other available free software to create your "
+"modifications."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.38&amp;r2=1.39\";>Version
 1.39</a>: Note that it is "
-"acceptable for a license to require you to provide source for versions of the 
software you put into public use."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.38&amp;r2=1.39\">Version 1.39</a>: Note that it is "
+"acceptable for a license to require you to provide source for versions of "
+"the software you put into public use."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.30&amp;r2=1.31\";>Version
 1.31</a>: Note that it is "
-"acceptable for a license to require you to identify yourself as the author of 
modifications.  Other minor clarifications throughout the text."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.30&amp;r2=1.31\">Version 1.31</a>: Note that it is "
+"acceptable for a license to require you to identify yourself as the author "
+"of modifications.  Other minor clarifications throughout the text."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23\";>Version
 1.23</a>: Address "
-"potential problems related to contract-based licenses."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.22&amp;r2=1.23\">Version 1.23</a>: Address potential "
+"problems related to contract-based licenses."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.15&amp;r2=1.16\";>Version
 1.16</a>: Explain why "
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.15&amp;r2=1.16\">Version 1.16</a>: Explain why "
 "distribution of binaries is important."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"<a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.10&amp;r2=1.11\";>Version
 1.11</a>: Note that a "
-"free license may require you to send a copy of versions you distribute to the 
author."
+"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
+"root=www&amp;r1=1.10&amp;r2=1.11\">Version 1.11</a>: Note that a free "
+"license may require you to send a copy of versions you distribute to the "
+"author."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"There are gaps in the version numbers shown above because there are other 
changes in this page that do not affect the definition or its "
-"interpretations.  For instance, the list does not include changes in asides, 
formatting, spelling, punctuation, or other parts of the page.  You "
-"can review the complete list of changes to the page through the <a 
href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?";
-"root=www&amp;view=log\">cvsweb interface</a>."
+"There are gaps in the version numbers shown above because there are other "
+"changes in this page that do not affect the definition or its "
+"interpretations.  For instance, the list does not include changes in asides, "
+"formatting, spelling, punctuation, or other parts of the page.  You can "
+"review the complete list of changes to the page through the <a href=\"http://";
+"web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;"
+"view=log\">cvsweb interface</a>."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -609,16 +848,25 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
+# type: Content of: <div><p>
 #. type: Content of: <div><div><p>
-msgid ""
-"Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a 
href=\"/contact/"
-"\">other ways to contact</a> the FSF.  Broken links and other corrections or 
suggestions can be sent to <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>."
-msgstr ""
+#, fuzzy
+#| msgid ""
+#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+#| "org\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/"
+#| "\">other ways to contact</a> the FSF."
+msgid ""
+"Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+"\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
+"to contact</a> the FSF.  Broken links and other corrections or suggestions "
+"can be sent to <a href=\"mailto:address@hidden";>&lt;address@hidden"
+"org&gt;</a>."
+msgstr ""
+"请将有关自由软件基金会(FSF) &amp; GNU 的查询 &amp; 
问题发送到<a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。也可以通过 <a 
href=\"/"
+"contact/\">其他联系方法</a> 联系自由软件基金会(FSF)。"
 
-#
-#
-#
+# type: Content of: <div><p>
 #. TRANSLATORS: Ignore the original text in this paragraph,
 #. replace it with the translation of these two:
 #. We work hard and do our best to provide accurate, good quality
@@ -631,27 +879,49 @@
 #. href="/server/standards/README.translations.html">Translations
 #. README</a>.
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and submitting "
+#| "translations of this article."
 msgid ""
-"Please see the <a 
href=\"/server/standards/README.translations.html\">Translations README</a> for 
information on coordinating and submitting "
+"Please see the <a href=\"/server/standards/README.translations.html"
+"\">Translations README</a> for information on coordinating and submitting "
 "translations of this article."
 msgstr ""
+"若您想翻译本文,请参看 <a 
href=\"/server/standards/README.translations.html"
+"\">翻译手册</a> 获取有关协调和提交翻译的相关事项。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013, 2015 
Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013, 2015 Free "
+"Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>
-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 ""
+#, 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> 许可证授权。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
 
+# type: Content of: <div><p>
 #. timestamp start
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid "Updated:"
 msgid "Updated:"
-msgstr ""
+msgstr "最后更新:"

Index: philosophy/po/rms-nyu-2001-transcript.fr-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/rms-nyu-2001-transcript.fr-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/rms-nyu-2001-transcript.fr-en.html    15 Sep 2015 05:45:26 
-0000      1.1
+++ philosophy/po/rms-nyu-2001-transcript.fr-en.html    15 Sep 2015 05:57:49 
-0000      1.2
@@ -2093,7 +2093,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -2111,14 +2111,14 @@
 <p>Copyright &copy; 2001, 2005, 2006, 2014, 2015 Richard M. Stallman</p>
 
 <p>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>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/15 05:45:26 $
+$Date: 2015/09/15 05:57:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/rms-nyu-2001-transcript.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/rms-nyu-2001-transcript.fr.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/rms-nyu-2001-transcript.fr.po 15 Sep 2015 05:45:27 -0000      
1.1
+++ philosophy/po/rms-nyu-2001-transcript.fr.po 15 Sep 2015 05:57:49 -0000      
1.2
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-nyu-2001-transcript.html\n"
-"POT-Creation-Date: 2015-02-20 15:55+0000\n"
+"POT-Creation-Date: 2015-09-15 05:55+0000\n"
 "PO-Revision-Date: 2015-02-20 18:09+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -42,9 +42,9 @@
 
 #. type: Content of: <div><blockquote><p>
 msgid ""
-"A <a href=\"/philosophy/rms-nyu-2001-transcript.txt\">plain text</a> version 
of "
-"this transcript and a <a 
href=\"/philosophy/rms-nyu-2001-summary.txt\">summary</"
-"a> of the speech are also available."
+"A <a href=\"/philosophy/rms-nyu-2001-transcript.txt\">plain text</a> version "
+"of this transcript and a <a href=\"/philosophy/rms-nyu-2001-summary.txt"
+"\">summary</a> of the speech are also available."
 msgstr ""
 "Une version <a href=\"/philosophy/rms-nyu-2001-transcript.txt\">texte</a> de "
 "cette transcription et un <a href=\"/philosophy/rms-nyu-2001-summary.txt"
@@ -4448,13 +4448,13 @@
 #. type: Content of: <div><p>
 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>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Cette page peut être utilisée suivant les conditions de la licence <a rel="
-"\"license\" href=\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";
-"\">Creative Commons attribution de paternité, pas de modification, 3.0 
États-"
-"Unis (CC BY-ND 3.0 US)</a>."
+"\"license\" href=\"http://creativecommons.org/licenses/by-nd/4.0/deed.fr";
+"\">Creative Commons attribution, pas de modification, 4.0 internationale "
+"(CC BY-ND 4.0)</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>

Index: philosophy/po/rms-nyu-2001-transcript.pl-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/rms-nyu-2001-transcript.pl-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/rms-nyu-2001-transcript.pl-en.html    15 Sep 2015 05:45:27 
-0000      1.1
+++ philosophy/po/rms-nyu-2001-transcript.pl-en.html    15 Sep 2015 05:57:49 
-0000      1.2
@@ -2093,7 +2093,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -2111,14 +2111,14 @@
 <p>Copyright &copy; 2001, 2005, 2006, 2014, 2015 Richard M. Stallman</p>
 
 <p>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>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/15 05:45:27 $
+$Date: 2015/09/15 05:57:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/rms-nyu-2001-transcript.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/rms-nyu-2001-transcript.pl.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/rms-nyu-2001-transcript.pl.po 15 Sep 2015 05:45:27 -0000      
1.1
+++ philosophy/po/rms-nyu-2001-transcript.pl.po 15 Sep 2015 05:57:49 -0000      
1.2
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-nyu-2001-transcript.html\n"
-"POT-Creation-Date: 2015-02-20 15:55+0000\n"
+"POT-Creation-Date: 2015-09-15 05:55+0000\n"
 "PO-Revision-Date: 2015-02-21 11:38-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <address@hidden>\n"
@@ -42,13 +42,13 @@
 
 #. type: Content of: <div><blockquote><p>
 msgid ""
-"A <a href=\"/philosophy/rms-nyu-2001-transcript.txt\">plain text</a> version 
of "
-"this transcript and a <a 
href=\"/philosophy/rms-nyu-2001-summary.txt\">summary</"
-"a> of the speech are also available."
-msgstr ""
-"Także dostępne jako <a 
href=\"/philosophy/rms-nyu-2001-transcript.txt\">czysty "
-"tekst</a> [<em>po&nbsp;angielski</em>] oraz&nbsp;<a href=\"/philosophy/rms-"
-"nyu-2001-summary.txt\">streszczenie</a>."
+"A <a href=\"/philosophy/rms-nyu-2001-transcript.txt\">plain text</a> version "
+"of this transcript and a <a href=\"/philosophy/rms-nyu-2001-summary.txt"
+"\">summary</a> of the speech are also available."
+msgstr ""
+"Także dostępne jako <a href=\"/philosophy/rms-nyu-2001-transcript.txt"
+"\">czysty tekst</a> [<em>po&nbsp;angielski</em>] oraz&nbsp;<a href=\"/"
+"philosophy/rms-nyu-2001-summary.txt\">streszczenie</a>."
 
 #. type: Content of: <p>
 msgid ""
@@ -4563,15 +4563,13 @@
 #. type: Content of: <div><p>
 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>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
-"Ten utwór objęty jest licencją Creative Commons Uznanie autorstwa-Bez "
-"utworów zależnych 3.0 Stany Zjednoczone. Aby&nbsp;zobaczyć kopię 
niniejszej "
-"licencji przejdź na&nbsp;stronę <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/3.0/us/\">http://creativecommons.org/";
-"licenses/by-nd/3.0/us/</a> lub&nbsp;napisz do&nbsp;Creative Commons, 171 "
-"Second Street, Suite 300, San Francisco, California 94105, USA."
+"Ta strona jest dostępna na&nbsp;<a rel=\"license\" href=\"http://";
+"creativecommons.org/licenses/by-nd/4.0/deed.pl\">licencji Creative Commons "
+"Uznanie autorstwa&nbsp;&ndash; Bez&nbsp;utworów zależnych 4.0 "
+"Międzynarodowe</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>

Index: philosophy/po/rms-nyu-2001-transcript.pot
===================================================================
RCS file: /web/www/www/philosophy/po/rms-nyu-2001-transcript.pot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/rms-nyu-2001-transcript.pot   15 Sep 2015 05:45:27 -0000      
1.1
+++ philosophy/po/rms-nyu-2001-transcript.pot   15 Sep 2015 05:57:50 -0000      
1.2
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-nyu-2001-transcript.html\n"
-"POT-Creation-Date: 2015-02-20 15:55+0000\n"
+"POT-Creation-Date: 2015-09-15 05:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -34,10 +35,10 @@
 
 #. type: Content of: <div><blockquote><p>
 msgid ""
-"A <a href=\"/philosophy/rms-nyu-2001-transcript.txt\">plain text</a> version 
of "
-"this transcript and a <a "
-"href=\"/philosophy/rms-nyu-2001-summary.txt\">summary</a> of the speech are 
also "
-"available."
+"A <a href=\"/philosophy/rms-nyu-2001-transcript.txt\">plain text</a> version "
+"of this transcript and a <a "
+"href=\"/philosophy/rms-nyu-2001-summary.txt\">summary</a> of the speech are "
+"also available."
 msgstr ""
 
 #. type: Content of: <p>
@@ -749,7 +750,6 @@
 msgstr ""
 
 #. type: Content of: <p>
-#:    
 msgid "<strong>QUESTION</strong>: <i>[Inaudible]</i>"
 msgstr ""
 
@@ -2697,8 +2697,8 @@
 #. type: Content of: <div><p>
 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>."
+"href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative Commons "
+"Attribution-NoDerivatives 4.0 International License</a>."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: philosophy/po/rms-nyu-2001-transcript.tr.po
===================================================================
RCS file: /web/www/www/philosophy/po/rms-nyu-2001-transcript.tr.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/rms-nyu-2001-transcript.tr.po 15 Sep 2015 05:45:28 -0000      
1.1
+++ philosophy/po/rms-nyu-2001-transcript.tr.po 15 Sep 2015 05:57:50 -0000      
1.2
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rms-nyu-2001-transcript.html\n"
-"POT-Creation-Date: 2015-02-20 15:55+0000\n"
+"POT-Creation-Date: 2015-09-15 05:55+0000\n"
 "PO-Revision-Date: 2010-01-12 00:31+0100\n"
 "Last-Translator: Tahir Emre Kalaycı <address@hidden>\n"
 "Language-Team: Turkish <address@hidden>\n"
@@ -20,6 +20,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-09-15 05:55+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 # type: Content of: <title>
@@ -49,12 +50,13 @@
 # type: Content of: <div><blockquote><p>
 #. type: Content of: <div><blockquote><p>
 msgid ""
-"A <a href=\"/philosophy/rms-nyu-2001-transcript.txt\">plain text</a> version 
of "
-"this transcript and a <a 
href=\"/philosophy/rms-nyu-2001-summary.txt\">summary</"
-"a> of the speech are also available."
-msgstr ""
-"Bu konuşmanın <a href=\"/philosophy/rms-nyu-2001-transcript.txt\">düz 
metin</a> "
-"sürümü ve <a href=\"/philosophy/rms-nyu-2001-summary.txt\">özeti</a> de 
vardır."
+"A <a href=\"/philosophy/rms-nyu-2001-transcript.txt\">plain text</a> version "
+"of this transcript and a <a href=\"/philosophy/rms-nyu-2001-summary.txt"
+"\">summary</a> of the speech are also available."
+msgstr ""
+"Bu konuşmanın <a href=\"/philosophy/rms-nyu-2001-transcript.txt\">düz 
metin</"
+"a> sürümü ve <a href=\"/philosophy/rms-nyu-2001-summary.txt\">özeti</a> 
de "
+"vardır."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -4636,10 +4638,15 @@
 msgstr "Copyright &copy; 2001, 2005, 2006, 2014, 2015 Richard M. Stallman"
 
 #. 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>."
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Bu sayfa a <a rel=\"license\" href=\"http://creativecommons.org/licenses/by-";
 "nd/3.0/us/deed.tr\">Creative Commons Attribution-NoDerivs 3.0 United States "
@@ -4687,3 +4694,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Son Güncelleme:"
+
+#~ 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 ""
+#~ "Bu sayfa a <a rel=\"license\" href=\"http://creativecommons.org/licenses/";
+#~ "by-nd/3.0/us/deed.tr\">Creative Commons Attribution-NoDerivs 3.0 United "
+#~ "States License</a> ile lisanslanmıştır."

Index: server/gnun/compendia/compendium.zh-cn.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-cn.po,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/gnun/compendia/compendium.zh-cn.po   13 Jul 2015 16:29:52 -0000      
1.61
+++ server/gnun/compendia/compendium.zh-cn.po   15 Sep 2015 05:57:50 -0000      
1.62
@@ -184,6 +184,8 @@
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
 "Operating System, GNU Kernel, HURD, GNU HURD, Hurd"
 msgstr ""
+"GNU, FSF, Free Software Foundation, 自由软件基金会, Linux, Emacs, GCC, 
Unix, "
+"Free Software, Operating System, GNU Kernel, HURD, GNU HURD, Hurd"
 
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>



reply via email to

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