www-commits
[Top][All Lists]
Advanced

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

www accessibility/po/accessibility.translist aw...


From: GNUN
Subject: www accessibility/po/accessibility.translist aw...
Date: Mon, 31 Jul 2017 09:29:07 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     17/07/31 09:29:07

Modified files:
        accessibility/po: accessibility.translist 
        award          : award.zh-cn.html 
        award/po       : award.zh-cn.po 
        bulletins/po   : bulletins.translist 
        education/po   : education.translist education.zh-cn.po 
        philosophy     : free-sw.zh-cn.html 
        philosophy/po  : free-sw.zh-cn-en.html free-sw.zh-cn.po 
        po             : keepingup.translist 
Added files:
        .              : keepingup.zh-cn.html 
        accessibility  : accessibility.zh-cn.html 
        accessibility/po: accessibility.zh-cn-en.html 
        bulletins      : bulletins.zh-cn.html 
        bulletins/po   : bulletins.zh-cn-en.html 
        education      : education.zh-cn.html 
        education/po   : education.zh-cn-en.html 
        po             : keepingup.zh-cn-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/keepingup.zh-cn.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/accessibility/accessibility.zh-cn.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/accessibility/po/accessibility.translist?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/accessibility/po/accessibility.zh-cn-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/award/award.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/award/po/award.zh-cn.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/bulletins/bulletins.zh-cn.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/bulletins/po/bulletins.translist?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/bulletins/po/bulletins.zh-cn-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.zh-cn.html?cvsroot=www&rev=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.translist?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.zh-cn.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.zh-cn-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn-en.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.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/po/keepingup.translist?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/po/keepingup.zh-cn-en.html?cvsroot=www&rev=1.1

Patches:
Index: accessibility/po/accessibility.translist
===================================================================
RCS file: /web/www/www/accessibility/po/accessibility.translist,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- accessibility/po/accessibility.translist    2 Jun 2015 02:35:06 -0000       
1.14
+++ accessibility/po/accessibility.translist    31 Jul 2017 13:29:05 -0000      
1.15
@@ -9,6 +9,7 @@
 <span dir="ltr"><a lang="ja" hreflang="ja" 
href="/accessibility/accessibility.ja.html">日本語</a>&nbsp;[ja]</span> 
&nbsp;
 <span dir="ltr"><a lang="ko" hreflang="ko" 
href="/accessibility/accessibility.ko.html">한국어</a>&nbsp;[ko]</span> 
&nbsp;
 <span dir="ltr"><a lang="sq" hreflang="sq" 
href="/accessibility/accessibility.sq.html">Shqip</a>&nbsp;[sq]</span> &nbsp;
+<span dir="ltr"><a lang="zh-cn" hreflang="zh-cn" 
href="/accessibility/accessibility.zh-cn.html">简体中文</a>&nbsp;[zh-cn]</span>
 &nbsp;
 </p>
 </div>' -->
 <link rel="alternate" type="text/html" 
href="/accessibility/accessibility.html" hreflang="x-default" />
@@ -19,4 +20,5 @@
 <link rel="alternate" type="text/html" lang="ja" hreflang="ja" 
href="/accessibility/accessibility.ja.html" title="日本語" />
 <link rel="alternate" type="text/html" lang="ko" hreflang="ko" 
href="/accessibility/accessibility.ko.html" title="한국어" />
 <link rel="alternate" type="text/html" lang="sq" hreflang="sq" 
href="/accessibility/accessibility.sq.html" title="Shqip" />
+<link rel="alternate" type="text/html" lang="zh-cn" hreflang="zh-cn" 
href="/accessibility/accessibility.zh-cn.html" title="简体中文" />
 <!-- end translist file -->

Index: award/award.zh-cn.html
===================================================================
RCS file: /web/www/www/award/award.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- award/award.zh-cn.html      12 Jun 2017 01:28:41 -0000      1.1
+++ award/award.zh-cn.html      31 Jul 2017 13:29:05 -0000      1.2
@@ -41,7 +41,7 @@
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
-翻译:<a rel="team" 
href="https://savannah.gnu.org/projects/www-zh-cn/";>CTT</a></div>
+ </div>
 </div>
 
 <!-- for id="content", starts in the include above -->
@@ -70,7 +70,7 @@
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 关于协调和提交本文的翻译,请参看 <a
-href="/server/standards/README.translations.html">Translations 
README</a>。</p>
+href="/server/standards/README.translations.html">翻译须知</a>。</p>
 </div>
 
 <p>Copyright &copy; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008,
@@ -89,7 +89,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2017/06/12 01:28:41 $
+$Date: 2017/07/31 13:29:05 $
 
 <!-- timestamp end -->
 </p>

Index: award/po/award.zh-cn.po
===================================================================
RCS file: /web/www/www/award/po/award.zh-cn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- award/po/award.zh-cn.po     31 Jul 2017 13:16:43 -0000      1.3
+++ award/po/award.zh-cn.po     31 Jul 2017 13:29:05 -0000      1.4
@@ -13,7 +13,7 @@
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
 msgid ""

Index: bulletins/po/bulletins.translist
===================================================================
RCS file: /web/www/www/bulletins/po/bulletins.translist,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- bulletins/po/bulletins.translist    16 Oct 2015 18:57:12 -0000      1.10
+++ bulletins/po/bulletins.translist    31 Jul 2017 13:29:06 -0000      1.11
@@ -4,9 +4,11 @@
 <p>
 <span dir="ltr" class="original"><a lang="en" hreflang="en" 
href="/bulletins/bulletins.en.html">English</a>&nbsp;[en]</span> &nbsp;
 <span dir="ltr"><a lang="de" hreflang="de" 
href="/bulletins/bulletins.de.html">Deutsch</a>&nbsp;[de]</span> &nbsp;
+<span dir="ltr"><a lang="zh-cn" hreflang="zh-cn" 
href="/bulletins/bulletins.zh-cn.html">简体中文</a>&nbsp;[zh-cn]</span> 
&nbsp;
 </p>
 </div>' -->
 <link rel="alternate" type="text/html" href="/bulletins/bulletins.html" 
hreflang="x-default" />
 <link rel="alternate" type="text/html" lang="en" hreflang="en" 
href="/bulletins/bulletins.en.html" title="English" />
 <link rel="alternate" type="text/html" lang="de" hreflang="de" 
href="/bulletins/bulletins.de.html" title="Deutsch" />
+<link rel="alternate" type="text/html" lang="zh-cn" hreflang="zh-cn" 
href="/bulletins/bulletins.zh-cn.html" title="简体中文" />
 <!-- end translist file -->

Index: education/po/education.translist
===================================================================
RCS file: /web/www/www/education/po/education.translist,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- education/po/education.translist    27 Mar 2016 17:28:48 -0000      1.26
+++ education/po/education.translist    31 Jul 2017 13:29:06 -0000      1.27
@@ -20,6 +20,7 @@
 <span dir="ltr"><a lang="ru" hreflang="ru" 
href="/education/education.ru.html">русский</a>&nbsp;[ru]</span> &nbsp;
 <span dir="ltr"><a lang="sq" hreflang="sq" 
href="/education/education.sq.html">Shqip</a>&nbsp;[sq]</span> &nbsp;
 <span dir="ltr"><a lang="uk" hreflang="uk" 
href="/education/education.uk.html">українська</a>&nbsp;[uk]</span> 
&nbsp;
+<span dir="ltr"><a lang="zh-cn" hreflang="zh-cn" 
href="/education/education.zh-cn.html">简体中文</a>&nbsp;[zh-cn]</span> 
&nbsp;
 </p>
 </div>' -->
 <link rel="alternate" type="text/html" href="/education/education.html" 
hreflang="x-default" />
@@ -41,4 +42,5 @@
 <link rel="alternate" type="text/html" lang="ru" hreflang="ru" 
href="/education/education.ru.html" title="русский" />
 <link rel="alternate" type="text/html" lang="sq" hreflang="sq" 
href="/education/education.sq.html" title="Shqip" />
 <link rel="alternate" type="text/html" lang="uk" hreflang="uk" 
href="/education/education.uk.html" title="українська" />
+<link rel="alternate" type="text/html" lang="zh-cn" hreflang="zh-cn" 
href="/education/education.zh-cn.html" title="简体中文" />
 <!-- end translist file -->

Index: education/po/education.zh-cn.po
===================================================================
RCS file: /web/www/www/education/po/education.zh-cn.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- education/po/education.zh-cn.po     31 Jul 2017 13:20:00 -0000      1.13
+++ education/po/education.zh-cn.po     31 Jul 2017 13:29:06 -0000      1.14
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-04-13 06:58+0000\n"
 "X-Generator: Poedit 1.5.5\n"
 
 #. type: Content of: <title>

Index: philosophy/free-sw.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/free-sw.zh-cn.html       20 Aug 2016 14:58:39 -0000      1.7
+++ philosophy/free-sw.zh-cn.html       31 Jul 2017 13:29:06 -0000      1.8
@@ -1,32 +1,31 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/free-sw.zh-cn.po">
- https://www.gnu.org/philosophy/po/free-sw.zh-cn.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/philosophy/free-sw.html"
- --><!--#set var="DIFF_FILE" value="/philosophy/po/free-sw.zh-cn-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2015-12-31" -->
+<!--#set var="ENGLISH_PAGE" value="/philosophy/free-sw.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.79 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>什么是自由软件? - GNU工程 - 自由软件基金会</title>
 
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
自由软件基金会, Linux, Emacs, GCC, Unix, Free
 Software, Operating System, GNU Kernel, HURD, GNU HURD, Hurd" />
-<meta http-equiv="Description" 
content="始于1983年,致力于开发自由的类UNIX系统:GNU操作系统。致力于帮助计算机用户自由使用并改进软件。"
 />
+<meta http-equiv="Description" 
content="始于1983年,致力于开发自由的类UNIX系统:GNU操作系统。捍卫计算机用户分享和改进软件的自由。"
 />
 
 <!--#include virtual="/philosophy/po/free-sw.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#include virtual="/server/outdated.zh-cn.html" -->
 <h2>什么是自由软件?</h2>
 
-<!--#include virtual="/licenses/fsf-licensing.zh-cn.html" -->
+<blockquote class="note" id="fsf-licensing"><p style="font-size: 80%">
+还有关于自由软件授权的其他问题?请参看其他 <a
+href="http://www.fsf.org/licensing";>授权资源</a>,如果必
要,请通过<a
+href="mailto:address@hidden";>address@hidden</a>联系 FSF 
合规实验室。</p>
+</blockquote>
+
 <h3>自由软件定义</h3>
 
 <blockquote>
 <p>
 
此处给出自由软件的定义,用以衡量一款软件是否为自由软件。一直以来,我们不断改进这个定义,以此澄æ¸
…并解决我们遇到的各种问题。参考下方的<a
-href="#History">修改历史</a>,详细列出了å…
¨éƒ¨çš„影响自由软件定义的修改记录。
+href="#History">修改历史</a>,我们详细列出了å…
¨éƒ¨çš„影响自由软件定义的修改记录。
 </p>
 </blockquote>
 
@@ -35,7 +34,7 @@
 
尊重用户的自由,并且尊重整个社区。粗略来讲,一个软件如果是自由软件,这意味着<b>用户可以自由地运行,拷贝,分发,学ä¹
 ï¼Œä¿®æ”¹å¹¶æ”¹è¿›è¯¥è½¯ä»¶</b>。因此,&ldquo;
 自由软件 &rdquo; 是关乎自由的问题,与价格无å…
³ï¼Œè½¯ä»¶å¦‚何定价并不影响它是否被归类为自由软件。英文中,我们使用Free
 Software。由于Free一词既有自由,也有免费的意思。而Free 
Software中的Free是指 &ldquo; 自由言论 &rdquo;
-中的自由,而非 &ldquo; 免费 &rdquo; 这一意项。为避å…
æ­§ä¹‰ï¼Œåœ¨ä½¿ç”¨è‹±æ–‡æ—¶ï¼Œæˆ‘们也会在用&ldquo;Libre
+中的自由,而非 &ldquo; 免费 &rdquo; 这一意项。为避å…
æ­§ä¹‰ï¼Œåœ¨ä½¿ç”¨è‹±æ–‡æ—¶ï¼Œæˆ‘们也会借用法语或西班牙语的&ldquo;Libre
 Software&rdquo; 来指自由软件。
 </p>
 
@@ -46,12 +45,14 @@
 href="/philosophy/free-software-even-more-important.html"> 
非正义力量的帮凶</a>。
 </p>
 
+<h4> 四项基本自由</h4>
+
 <p>
-我们说,如果一个软件是自由软件,那么它必
须为用户提供以下四项基本自由:
+如果一个软件是自由软件,那么它必
须为用户提供以下四项基本自由:
 </p>
 
 <ul>
-  <li>自由度0:无论用户出于何种目的,必须可以按ç…
§ç”¨æˆ·æ„æ„¿ï¼Œå¯ä»¥éšæ—¶éšå¤„自由地运行该软件。</li>
+  <li>自由度0:无论用户出于何种目的,必须可以按ç…
§ç”¨æˆ·æ„æ„¿ï¼Œè‡ªç”±åœ°è¿è¡Œè¯¥è½¯ä»¶ã€‚</li>
   <li>自由度1:用户可以自由地学习
并修改该软件,以此来帮助用户完成用户自己的计算。作为前提,用户å¿
…须可以访问到该软件的源代码。
   </li>
   <li>自由度2:用户可以自由地分发该软件的拷贝。
@@ -65,16 +66,16 @@
 
 <p>无论在哪种情况下,只有所有用户使用的代ç 
éƒ½æ»¡è¶³äº†è¿™å››é¡¹åŸºæœ¬è‡ªç”±ï¼Œè¯¥ç¨‹åºæ‰èƒ½è¢«è§†ä½œè‡ªç”±è½¯ä»¶ã€‚例如,有两个程序,甲程序运行的时候会自动调用乙程序。发布甲程序意味着用户å¿
…须使用到乙程序,那么必
须甲乙两个程序都是自由的,甲程序才是自由的。如果通过修改甲程序,使å
…¶ä¸å†ä¾èµ–乙程序,那么仅仅
以自由软件的形式发布甲程序即可。</p>
 
-<p>本文着重介绍在哪些情
况下,软件会被认为提供了或剥夺了某个自由度。</p>
-
-<p>自由分发(自由度2和3)意味着你
(即,软件用户)可以把软件原版或修改版再发布给å…
¶ä»–用户。你可以å…
è´¹å‘布,也可以收取费用。软件可以发布给<a
-href="#exportcontrol">任何地方的任何人</a>。所谓“自由”,意味着ä½
 çš„这些行为(发布软件原版或修改版给其他用户;或å…
¶ä»–自由度中提及的行为)不必事å…
ˆå¾å¾—任何人的许可,也不必为此额外支付任何费用。
-</p>
-
 <p>
-用户可以自由地运行该程序或对程序进行修改。如果仅仅
私下自己修改或运行该程序,那么你没有义务将该行为å…
¬å¼€ç»™ä»»ä½•äººã€‚如果你发布了自己修改后的程序,那么你
也没有任何义务将该修改行为告知给哪个或哪些指定的人或组织。
+&ldquo; 自由软件 &rdquo; 不等于 &ldquo; 非商业软件 &rdquo;
+。一个自由软件必须å…
è®¸å•†ä¸šç”¨æˆ·ï¼Œå•†ä¸šå¼€å‘,和商业发布。商业开发自由软件早就司空见惯了,这æ
 ·çš„自由软件非常重要。你
可能需要花钱购买自由软件的拷贝,也可能å…
è´¹æ‹¿åˆ°ã€‚但是无论你如何获得你的拷贝,作为用户,你
的四大自由都会被保证,你
可以自由地运行,修改,发布甚至<a
+href="/philosophy/selling.html">出售</a>你拿到的自由软件。
 </p>
 
+<p>本文着重介绍在哪些情
况下,软件会被认为提供了或剥夺了某个自由度。</p>
+
+<h4>自由度0:无论用户出于何种目的,必须可以按ç…
§ç”¨æˆ·æ„æ„¿è‡ªç”±åœ°è¿è¡Œè¯¥è½¯ä»¶ã€‚</h4>
+
 <p>
 
“自由地运行程序”(自由度0)意味着任何人或组织可以在任何(支持的)计算机系统上,出于任何目的去运行该程序,并且没有义务通知软件的开发è€
…
或任何个人或团体。此处,<em>用户</em>的目的是重点,而非<em>开发è€
…</em>的目的。如果你是该程序的用户,那么你
就可以自由地运行该程序。同理,如果你
把程序发布给别人,那么此人也成了软件的用户,他也可以出于自己的任何目的运行该软件。然而,ä½
 ä½œä¸ºè½¯ä»¶çš„发布者,不可将自己的目的强加于你的用户。
 </p>
@@ -82,9 +83,7 @@
 <p>
 
“自由地运行程序”意味着没有人可以阻止用户使用该程序做任何事æƒ
…。它并没有规定该程序必
须提供哪些功能特性,也并不意味着软件必
须迎合用户的所有需求。</p>
 
-<p>
-“自由地分发软件的拷贝”意味着必须å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的原版或用户自己的修改版。无
论那个版本,用户都可以选择发布程序的二进制或可执行文件,也可以发布程序的源代ç
 ã€‚(以可执行文件的形式发布程序可以让人方便安装
,这一点对于推广自由软件也至å…
³é‡è¦ã€‚)对于某些程序,也许无法或者不必
发布二进制或可执行文件(一些编程语言的实现可能并不支持,例如某些脚本语言),但是用户å¿
…
须有权利以任何方式生成二进制或可执行文件,并且发布这些生成的软件。
-</p>
+<h4>学习和更改程序源代码的自由</h4>
 
 <p>
 
自由度1和3(自由地修改软件;自由地发布修改后的软件)意味着用户å¿
…须有权访问程序的源代码。由此,访问源代ç 
æ˜¯æˆä¸ºè‡ªç”±è½¯ä»¶çš„必要条件。混编(Obfuscated)后的
@@ -92,9 +91,9 @@
 </p>
 
 <p>
-自由度1(自由地运行程序)包
括自由地运行自己修改后的程序以替代原版程序。如果程序是跑在某种设备上,并且时随设备一起出售的,那么该设备å¿
…
须给出一个方法,让用户可以将设备上的原有程序替换成用户自己的程序。否则,自由度1将被视为æ—
 æ³•æ»¡è¶³ï¼Œé‚£äº›è¢«
-&ldquo; 锁死 &rdquo; 
在设备中的程序也将不被视为自由软件。这种将程序锁死在设备中,禁止用户修改设备中的程序的做法,我们也称å
…¶ä¸º
-&ldquo; tivozation &rdquo;。
+自由度1(自由地运行程序)包
括自由地运行自己修改后的程序以替代原版程序。如果程序是跑在某种设备上,该设备可以运行别人修改的软件但不运行ä½
 ä¿®æ”¹çš„软件
+&mdash; 这个方法叫做 &ldquo;tivoization&rdquo; 或者 
&ldquo;锁死&rdquo;,或者(用其发明者的术语)叫做
+&ldquo;安全启动&rdquo; &mdash; 自由度1将被视为无
法满足。该设备中的程序也将不被视为自由软件,即使它们的源代ç
 æ˜¯è‡ªç”±çš„。
 </p>
 
 <p>
@@ -103,14 +102,30 @@
 </p>
 
 <p>
+对软件的修改可能是出于各种目的。某个特定的修改究竟是好是坏,这本身是个非常主观的事æƒ
…
。自由软件许可证不能对用户修改软件做任何限制,例如,不能ä»
…ä»…å› 
为某人觉得哪处修改不够好,就禁止用户自己做这个改动。
+</p>
+
+<h4>自由度2:用户可以自由地分发该软件的拷贝。</h4>
+
+<p>自由分发(自由度2和3)意味着你
(即,软件用户)可以把软件原版或修改版再发布给å…
¶ä»–用户。你可以å…
è´¹å‘布,也可以收取费用。软件可以发布给<a
+href="#exportcontrol">任何地方的任何人</a>。所谓“自由”,意味着ä½
 çš„这些行为(发布软件原版或修改版给其他用户;或å…
¶ä»–自由度中提及的行为)不必事å…
ˆå¾å¾—任何人的许可,也不必为此额外支付任何费用。
+</p>
+
+<p>
+用户可以自由地运行该程序或对程序进行修改。如果仅仅
私下自己修改或运行该程序,那么你没有义务将该行为å…
¬å¼€ç»™ä»»ä½•äººã€‚如果你发布了自己修改后的程序,那么你
也没有任何义务将该修改行为告知给哪个或哪些指定的人或组织。
+</p>
+
+<p>
 自由度3å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的修改版。自由软件不一定要求修改版å¿
…
须继续采用自由软件许可证。换句话说,自由软件许可证可以不å¿
…是<a
 
href="/copyleft/copyleft.html">copyleft</a>许可证。但是,如果一个软件许可证要求修改后的软件å¿
…
须以非自由软件的形式发布,那么该许可证则不被视为自由软件许可证。
 </p>
 
 <p>
-要让落实这些自由度,只要用户遵守许可证上的要求,那么这些自由度就å¿
…须是长久的,不可更改的。如果软件的开发者
有权利修改已发布软件的许可证,那么该软件也不被视为自由软件。
+“自由地分发软件的拷贝”意味着必须å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的原版或用户自己的修改版。无
论那个版本,用户都可以选择发布程序的二进制或可执行文件,也可以发布程序的源代ç
 ã€‚(以可执行文件的形式发布程序可以让人方便安装
,这一点对于推广自由软件也至å…
³é‡è¦ã€‚)对于某些程序,也许无法或者不必
发布二进制或可执行文件(一些编程语言的实现可能并不支持,例如某些脚本语言),但是用户å¿
…
须有权利以任何方式生成二进制或可执行文件,并且发布这些生成的软件。
 </p>
 
+<h4>Copyleft</h4>
+
 <p>
 当然,只要不违背这些æ 
¸å¿ƒè‡ªç”±ï¼Œè‡ªç”±è½¯ä»¶è®¸å¯è¯ä¹Ÿå¯ä»¥é¢å¤–添加
一些要求,限制软件的分发步骤。例如,<a
 
href="/copyleft/copyleft.html">copyleft</a>就是常见的一种限制。简言之,copyleft要求软件的修改版å¿
…须同样以自由软件的形式发布。这条限制与æ 
¸å¿ƒè‡ªç”±å¹¶ä¸å†²çªï¼Œç›¸åï¼Œcopyleft可以用来很好地保护软件用户的自由。
@@ -124,18 +139,10 @@
 &ldquo; copyleft软件 &rdquo; 以及其他分类和它们之间的关系。
 </p>
 
-<p>
-&ldquo; 自由软件 &rdquo; 不等于 &ldquo; 非商业软件 &rdquo;
-。一个自由软件必须å…
è®¸å•†ä¸šç”¨æˆ·ï¼Œå•†ä¸šå¼€å‘,和商业发布。商业开发自由软件早就司空见惯了,这æ
 ·çš„自由软件非常重要。你
可能需要花钱购买自由软件的拷贝,也可能å…
è´¹æ‹¿åˆ°ã€‚但是无论你如何获得你的拷贝,作为用户,你
的四大自由都会被保证,你
可以自由地运行,修改,发布甚至<a
-href="/philosophy/selling.html">出售</a>你拿到的自由软件。
-</p>
-
-<p>
-对软件的修改可能是出于各种目的。某个特定的修改究竟是好是坏,这本身是个非常主观的事æƒ
…
。自由软件许可证不能对用户修改软件做任何限制,例如,不能ä»
…ä»…å› 
为某人觉得哪处修改不够好,就禁止用户自己做这个改动。
-</p>
+<h4>打包和发行的详细规则</h4>
 
 <p>
-不过,自由软件可以对修改版的打包
或分发方式做一定的限制。这些限制不得与前面提到的四大自由相矛盾,不得直接或间接地限制用户运行,修改或发布软件。例如,某些自由软件可以要求修改版不得使用软件的原有名字发布;不能使用软件的原有商æ
 ‡ï¼›å¿…é¡»æ 
‡æ˜Žè½¯ä»¶æ¥è‡ªè°çš„修改等等。只要这些限制不会明显地限制用户再发布软件的修改版,那么它们就是可以接受的。既然已经对软件修改了,那么ä½
 ä¼°è®¡ä¹Ÿå°±ä¸ä¼šåœ¨ä¹Žè¿™äº›é¢å¤–的小限制了。
+自由软件可以对修改版的打包
或分发方式做一定的限制。这些限制不得与前面提到的四大自由相矛盾,不得直接或间接地限制用户运行,修改或发布软件。例如,某些自由软件可以要求修改版不得使用软件的原有名字发布;不能使用软件的原有商æ
 ‡ï¼›å¿…é¡»æ 
‡æ˜Žè½¯ä»¶æ¥è‡ªè°çš„修改等等。只要这些限制不会明显地限制用户再发布软件的修改版,那么它们就是可以接受的。既然已经对软件修改了,那么ä½
 ä¼°è®¡ä¹Ÿå°±ä¸ä¼šåœ¨ä¹Žé’ˆå¯¹è¿™äº›é¢å¤–的小限制再做一点修改了。
 </p>
 
 <p>
@@ -146,6 +153,8 @@
 <p>
 
有一些特例需要额外讨论:如果某软件许可证要求修改后的软件å¿
…须修改可执行文件的名字,那么必须保证软件运行的环境å…
è®¸ä¿®æ”¹æ–‡ä»¶åæˆ–å…
·å¤‡æŸç§åˆ«åæœºåˆ¶ï¼Œå¦åˆ™è¯¥è¦æ±‚将被视作与自由软件原则相背。å›
 ä¸ºè½¯ä»¶çš„可执行文件可能会被å…
¶ä»–第三方软件调用,而文件名则是这种调用的基础。别名机制可以保证用户在遵守该要求的前提下,顺利将原版软件替换成修改版,并且不会影响依赖该软件的第三方程序。</p>
 
+<h4>出口条例</h4>
+
 <p>
 一些政府的<a
 
id="exportcontrol">出口限制</a>或贸易制裁可能会影响到软件用户在国é™
…范围内发布软件的自由。软件开发者
也许没有能力去改变这些现实,但是我们可以拒绝自我审查。自由软件的开发è€
…不得在软件许可证中要求用户遵守哪条特定法律,因
为开发者无法保证用户所在国度或地区具备该法律条款。这æ 
·ï¼Œè‡ªç”±è½¯ä»¶è®¸å¯è¯å°±ä¸ä¼šç»™ç”¨æˆ·åœ¨æ³•å¾‹ä¹‹å¤–添加
额外的违反基本自由的限制。
@@ -155,6 +164,12 @@
 当然,自由软件可以仅仅
在许可证中提及某条出口条例或相å…
³æ³•å¾‹ï¼Œè€Œä¸å¼ºåˆ¶è¦æ±‚用户遵守。这æ 
·åšåªæ˜¯ä¸ºç”¨æˆ·æä¾›äº†ä¿¡æ¯è€Œæ²¡æœ‰å®žé™…
限制用户。如果某条出口限制法律是普遍存在,å…
¨éƒ¨ç”¨æˆ·æ‰€åœ¨çš„地区都做出该限制的,那么在许可证中要求用户遵守该条例也不会被视为限制用户的自由。然而,这会存在潜在问题:一旦该条出口限制法律在某个用户的所在地区做了修改,那么该许可证也就不被视作自由的。
 </p>
 
+<h4>法律考虑</h4>
+
+<p>
+要落实这些自由度,就应该保证:如果用户遵守许可证上的要求,那么这些自由度就å¿
…须是长久的,不可更改的。如果软件的开发者
有权利随意修改已发布软件的许可证,那么该软件也不被视为自由软件。
+</p>
+
 <p>
 
自由软件许可证不得要求用户额外遵守哪些非自由软件的许可证。例如,自由软件许可证不得要求用户å¿
…须遵守 &ldquo; 所有使用的软件的许可证
 &rdquo; 。因为用户可能使用非自由软件,而要求用户遵守å…
¨éƒ¨ä½¿ç”¨çš„软件的许可证则意味着需要遵守非自由软件许可证,这要的要求将被视作非自由的。
@@ -164,14 +179,18 @@
 自由软件许可证可以指定与软件相å…
³çš„诉讼需要遵守哪个地区的法律,或需要在哪里提起诉讼。
 </p>
 
+<h4>基于合同的许可证</h4>
+
 <p>
-绝大部分自由软件许可证是基于版权的,基于版权,能采取的限制往往相对有限。如果一个许可证基于版权并且遵ç
…
§ä¸Šè¿°çš„自由软件原则,那么它很可能被视作是自由软件许可证。当然,我们也见过一些例外,不过这些还很少见。然而有些自由软件许可证是基于合同的。合同可能会有更多的额外要求。这就意味着基于合同的许可证可能会在很多不经意的地方违背自由软件原则,导致软件不被视作自由软件。
+绝大部分自由软件许可证是基于版权的。基于版权,能采取的限制往往相对有限。如果一个许可证基于版权并且遵ç
…
§ä¸Šè¿°çš„自由软件原则,那么它很可能被视作是自由软件许可证。当然,我们也见过一些例外,不过这些还很少见。然而有些自由软件许可证是基于合同的。合同可能会有更多的额外要求。这就意味着基于合同的许可证可能会在很多不经意的地方违背自由软件原则,导致软件不被视作自由软件。
 </p>
 
 <p>
 很遗憾,我们无法列出所有可能的意外情
况。如果一份基于合同的许可证对用户做出了一些额外限制,并且这些限制是不可能åŒ
…
含在一份基于版权的许可证中的,那么我们就需要再三考虑它是否可以被视作自由许可证。很多æƒ
…况下,这些许可证都是非自由的。
 </p>
 
+<h4>在谈论自由软件时使用正确的词汇</h4>
+
 <p>
 在讨论自由软件的时候,尽量避免使用 &ldquo; 赠送 &rdquo; 或 
&ldquo; 免费 &rdquo;
 一类的词汇。因为这会让人们联想到价æ 
¼ï¼Œè€Œéžè‡ªç”±ã€‚一些常见的词汇,例如 &ldquo; 盗版 &rdquo;
@@ -181,10 +200,14 @@
 一词在不同语言中的推荐翻译。
 </p>
 
+<h4>我们如何诠释这些标准</h4>
+
 <p>
 最后请注意,在实践中,本文中提及的各种å…
³äºŽè‡ªç”±è½¯ä»¶çš„界定æ 
‡å‡†éƒ½éœ€è¦ä»”细思考后再做出解释。在决定一个软件许可证是否是自由软件的时候,我们会仔细查看该许可证的å†
…
涵和行文是否符合本文中涉及的原则,由此决定许可证是否为自由软件许可证。如果许可证中åŒ
…
含了一些不合理的限制,哪怕这些限制没有在本文中提及,我们也会拒绝承认它是自由的。有时候,某个许可证可能会引起一场大讨论,甚至需要专业律师参与。这时候,我们往往需要仔细定夺之后才能给出结论。遇到这æ
 
·çš„许可证,在做出结论之后,我们很可能会更新本文,把之前没有考虑到的å›
 ç´ æ·»åŠ è¿›æ¥ã€‚
 </p>
 
+<h4>获得关于自由许可证的帮助</h4>
+
 <p>
 如果你
想知道哪些许可证是自由软件许可证,可以参见我们的<a
 href="/licenses/license-list.html">许可证列表</a>。如果你å…
³æ³¨çš„许可证没有在这个列表中提及,你
也可以给我们发邮件来单独询问。我们的邮箱是:<a
@@ -227,13 +250,17 @@
 
 <h3 id="History">本文修改历史</h3>
 
-<p>随着时间的发展,我们也在不断对本文做出改进。此处列出历次的主要改动,并给出链接详细显示出哪里做出了修改。</p>
+<p>随着时间的发展,我们也在不断对本文做出改进。此处列出历次的主要改动,并给出链接,详细显示出哪里做出了修改。</p>
 
 <ul>
 
 <li><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>:强调自由度0是用户可以出于任何目的而运行软件。</li>
+
+<li><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>:  澄清了哪部分的代码需要是自由的。</li>
+1.141</a>:澄清了哪部分的代码需要是自由的。</li>
 
 <li><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
@@ -241,56 +268,55 @@
 
 <li><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>: 声明自由度0与软件功能无关。</li>
+1.134</a>:声明自由度0与软件功能无关。</li>
 
 <li><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>: 自由的许可证不得要求用户必
须遵守另外一个程序的非自由许可证。</li>
+1.131</a>:自由的许可证不得要求用户必
须遵守另外一个程序的非自由许可证。</li>
 
 <li><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>: 明确重申法律纠纷的起诉地可以由自由软件所有者
指定。(这一直都是我们的原则。)</li>
+1.129</a>:明确重申法律纠纷的起诉地可以由自由软件所有者
指定。(这一直都是我们的原则。)</li>
 
 <li><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>: 出口限制要求在一些特殊情
况下可能会生出麻烦。但是大部分的时候它只是个潜在问题。</li>
+1.122</a>:出口限制要求在一些特殊情
况下可能会生出麻烦。但是大部分的时候它只是个潜在问题。</li>
 
 <li><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>: 澄清修改不等于改进。</li>
+1.118</a>:澄清修改不等于改进。</li>
 
 <li><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>: 阐明自由软件许可证不得允许版权所有者
在软件发布之后对用户增加更多<em>限制</em>。版权所有者完å…
¨å¯ä»¥åœ¨äº‹åŽç»™ç”¨æˆ·æ›´å¤šæƒåˆ©ã€‚</li>
+1.111</a>:阐明自由软件许可证不得允许版权所有者
在软件发布之后对用户增加更多<em>限制</em>。版权所有者完å…
¨å¯ä»¥åœ¨äº‹åŽç»™ç”¨æˆ·æ›´å¤šæƒåˆ©ã€‚</li>
 
 <li><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>: 
在对自由度1的描述中,强调用户使用自己修改后的版本进行计算。</li>
+1.105</a>:在对自由度1的描述中,强调用户使用自己修改后的版本进行计算。</li>
 
 <li><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>: 阐明混淆(obfuscated)后的代码不被视作源代码。</li>
+1.92</a>:阐明混淆(obfuscated)后的代码不被视作源代ç 
ã€‚</li>
 
 <li><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>: 
阐明自由度3是指用户有权利去发布自己的修改版本,而不是有权利参与别人的开发。</li>
+1.90</a>:阐明自由度3是指用户有权利去发布自己的修改版本,而不是有权利参与别人的开发。</li>
 
 <li><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>: 自由度3包
括了用户有权利以自由软件的形式发布修改后的版本。</li>
+1.89</a>:自由度3包
括了用户有权利以自由软件的形式发布修改后的版本。</li>
 
 <li><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>:
-自由度1必须是可以实施的,而不仅仅停留在理论上。因
此如果出售的硬件包括了自由软件,那么该硬件必
须提供一种方法让用户可以运行自己修改后的软件。否则该硬件所携带的软件将不被视作自由软件。</li>
+1.80</a>:自由度1必须是可以实施的,而不仅仅
停留在理论上。因此如果出售的硬件包
括了自由软件,那么该硬件必
须提供一种方法让用户可以运行自己修改后的软件。否则该硬件所携带的软件将不被视作自由软件。</li>
 
 <li><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>: 声明已经发布给用户的软件,å…
¶è®¸å¯è¯å°†ä¸å¾—修改。</li>
+1.77</a>:声明已经发布给用户的软件,å…
¶è®¸å¯è¯å°†ä¸å¾—修改。</li>
 
 <li><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>: 此次修改重点强调四个要点:
+1.74</a>:此次修改重点强调四个要点:
 <ul>
 
<li>"改进"并不意味着许可证可以限制用户只能做哪些方面的修改。自由度3å
…è®¸ç”¨æˆ·å†å‘布修改后的完整软件,而非仅仅
是修改的部分。</li>
 <li>用户有权利在自由软件中使用第三方的代ç 
ï¼Œä½†æ˜¯å‰ææ˜¯ç¬¬ä¸‰æ–¹ä»£ç çš„许可证与该自由软件的许可证å…
¼å®¹ã€‚</li>
@@ -301,39 +327,39 @@
 
 <li><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>: 加入 &quot; 软件之外 &quot; 一节。</li>
+1.57</a>:加入 &quot; 软件之外 &quot; 一节。</li>
 
 <li><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>:  å…
³äºŽè‡ªç”±è¿è¡Œè½¯ä»¶çš„权利,用户的意图才是更重要的。</li>
+1.46</a>:å…
³äºŽè‡ªç”±è¿è¡Œè½¯ä»¶çš„权利,用户的意图才是更重要的。</li>
 
 <li><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>: 针对基于合同的许可证,修改了一些措辞。</li>
+1.41</a>:针对基于合同的许可证,修改了一些措辞。</li>
 
 <li><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>: 自由软件许可证必须å…
è®¸ç”¨æˆ·ä½¿ç”¨ç¬¬ä¸‰æ–¹è‡ªç”±è½¯ä»¶çš„代码来做出自己的修改。</li>
+1.40</a>:自由软件许可证必须å…
è®¸ç”¨æˆ·ä½¿ç”¨ç¬¬ä¸‰æ–¹è‡ªç”±è½¯ä»¶çš„代码来做出自己的修改。</li>
 
 <li><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>: 
如果用户发布了某个自由软件,那么自由软件的许可证有权利要求软件的发布è€
…提供源代码——哪怕该发布者不是软件的原作者。</li>
+1.39</a>:如果用户发布了某个自由软件,那么自由软件的许可证有权利要求软件的发布è€
…提供源代码——哪怕该发布者不是软件的原作者。</li>
 
 <li><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>: 自由软件的许可证有权利要求软件的修改者
在发布修改版本时提供自己的个人信息。其他几
处也做了小修改。</li>
+1.31</a>:自由软件的许可证有权利要求软件的修改者
在发布修改版本时提供自己的个人信息。其他几
处也做了小修改。</li>
 
 <li><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>: 
讨论了基于合同的自由软件许可证可能存在的潜在问题。</li>
+1.23</a>:讨论了基于合同的自由软件许可证可能存在的潜在问题。</li>
 
 <li><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>: 解释了为什么发布二进制可执行文件很重要。</li>
+1.16</a>:解释了为什么发布二进制可执行文件很重要。</li>
 
 <li><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>: 自由软件许可证可以要求软件发布者给原作者
提供一份发布的拷贝。该发布者
可以是发布原软件,也可能是发布修改后的版本。</li>
+1.11</a>:自由软件许可证可以要求软件发布者给原作者
提供一份发布的拷贝。该发布者
可以是发布原软件,也可能是发布修改后的版本。</li>
 
 </ul>
 
@@ -391,8 +417,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>版权所有 &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013, 2015 
自由软件基金会 (Free
-Software Foundation, Inc.)</p>
+<p>Copyright &copy; 1996, 2002, 2004-2007, 2009-2017 Free Software Foundation,
+Inc.</p>
 
 <p>本页面采用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -402,13 +428,14 @@
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-<b>翻译</b>: 邓楠<a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>,2015.</div>
+<b>翻译</b>:邓楠<a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>,2015。
+<a rel="team" href="https://savannah.gnu.org/projects/www-zh-cn/";>CTT</a></div>
 
 <p class="unprintable"><!-- timestamp start -->
-更新
+最后更新:
 
-$Date: 2016/08/20 14:58:39 $
+$Date: 2017/07/31 13:29:06 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/free-sw.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/free-sw.zh-cn-en.html 29 Sep 2015 08:28:29 -0000      1.1
+++ philosophy/po/free-sw.zh-cn-en.html 31 Jul 2017 13:29:06 -0000      1.2
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.79 -->
 <title>What is free software?
 - GNU Project - Free Software Foundation</title>
 
@@ -10,7 +10,13 @@
 <!--#include virtual="/server/banner.html" -->
 
 <h2>What is free software?</h2>
-<!--#include virtual="/licenses/fsf-licensing.html" -->
+
+<blockquote class="note" id="fsf-licensing"><p style="font-size: 80%">
+Have a question about free software licensing not answered here?
+See our other <a href="http://www.fsf.org/licensing";>licensing resources</a>,
+and if necessary contact the FSF Compliance Lab
+at <a href="mailto:address@hidden";>address@hidden</a>.</p>
+</blockquote>
 
 <h3>The Free Software Definition</h3>
 
@@ -33,7 +39,9 @@
 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.
+software,&rdquo; borrowing the French or Spanish word for
+&ldquo;free&rdquo; as in freedom, to show we do not mean the software
+is gratis.
 </p>
 
 <p>
@@ -47,6 +55,8 @@
 an instrument of unjust power</a>.
 </p>
 
+<h4> The four essential freedoms</h4>
+
 <p>
 A program is free software if the program's users have the
 four essential freedoms:
@@ -81,25 +91,23 @@
 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.</p>
+only A needs to be free; B is not pertinent to that plan.</p>
+
+<p>
+&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>.
+</p>
 
 <p>The rest of this page clarifies certain points about what makes
 specific freedoms adequate or not.</p>
 
-<p>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.
-</p>
-
-<p>
-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.
-</p>
+<h4>The freedom to run the program as you wish</h4>
 
 <p>
 The freedom to run the program means the freedom for any kind of person
@@ -114,20 +122,12 @@
 
 <p>
 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.</p>
+forbidden or stopped from making it run.  This has nothing to do with what
+functionality the program has, whether it is technically capable of
+functioning in any given environment, or whether it is useful for any
+particular computing activity.</p>
 
-<p>
-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.
-</p>
+<h4>The freedom to study the source code and make changes</h4>
 
 <p>
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -158,6 +158,29 @@
 </p>
 
 <p>
+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.
+</p>
+
+<h4>The freedom to redistribute if you wish: basic requirements</h4>
+
+<p>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.
+</p>
+
+<p>
+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.
+</p>
+
+<p>
 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
@@ -167,15 +190,20 @@
 </p>
 
 <p>
-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.
+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.
 </p>
 
+<h4>Copyleft</h4>
+
 <p>
-However, certain kinds of rules about the manner of distributing free
+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,
@@ -197,25 +225,10 @@
 relate to each other.
 </p>
 
-<p>
-&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>.
-</p>
-
-<p>
-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.
-</p>
+<h4>Rules about packaging and distribution details</h4>
 
 <p>
-However, rules about how to package a modified version are acceptable,
+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
@@ -247,6 +260,8 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.</p>
 
+<h4>Export regulations</h4>
+
 <p>
 Sometimes government <a id="exportcontrol">export control regulations</a>
 and trade sanctions can constrain your freedom to distribute copies of
@@ -269,6 +284,16 @@
 software nonfree.
 </p>
 
+<h4>Legal considerations</h4>
+
+<p>
+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.
+</p>
+
 <p>
 A free license may not require compliance with the license of a
 nonfree program.  Thus, for instance, if a license requires you to
@@ -283,6 +308,8 @@
 law applies, or where litigation must be done, or both.
 </p>
 
+<h4>Contract-based licenses</h4>
+
 <p>
 Most free software licenses are based on copyright, and there are limits
 on what kinds of requirements can be imposed through copyright.  If a
@@ -302,6 +329,8 @@
 it is nonfree.
 </p>
 
+<h4>Use the right words when talking about free software</h4>
+
 <p>
 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
@@ -313,6 +342,8 @@
 &ldquo;free software&rdquo;</a> into various languages.
 </p>
 
+<h4>How we interpret these criteria</h4>
+
 <p>
 Finally, note that criteria such as those stated in this free software
 definition require careful thought for their interpretation.  To decide
@@ -327,6 +358,8 @@
 it easier to see why certain licenses do or don't qualify.
 </p>
 
+<h4>Get help with free licenses</h4>
+
 <p>
 If you are interested in whether a specific license qualifies as a free
 software license, see our <a href="/licenses/license-list.html">list
@@ -374,7 +407,7 @@
 <h3 id="open-source">Open Source?</h3>
 
 <p>
-Another group has started using the term &ldquo;open source&rdquo; to mean
+Another group uses 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
@@ -390,6 +423,10 @@
 
 <ul>
 
+<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153";>Version
+1.153</a>: Clarify that freedom to run the program means nothing stops
+you from making it run.</li>
+
 <li><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.</li>
 
@@ -496,7 +533,7 @@
 
 <li><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.</li>
+versions you distribute to previous developers on request.</li>
 
 </ul>
 
@@ -556,7 +593,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013, 2015
+<p>Copyright &copy; 1996, 2002, 2004-2007, 2009-2017
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -567,7 +604,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/29 08:28:29 $
+$Date: 2017/07/31 13:29:06 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/free-sw.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/free-sw.zh-cn.po      31 Jul 2017 13:22:59 -0000      1.19
+++ philosophy/po/free-sw.zh-cn.po      31 Jul 2017 13:29:06 -0000      1.20
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-12-31 22:55+0000\n"
 "X-Generator: Poedit 1.7.5\n"
 
 #. type: Content of: <title>

Index: po/keepingup.translist
===================================================================
RCS file: /web/www/www/po/keepingup.translist,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/keepingup.translist      9 Jun 2015 22:47:13 -0000       1.13
+++ po/keepingup.translist      31 Jul 2017 13:29:06 -0000      1.14
@@ -13,6 +13,7 @@
 <span dir="ltr"><a lang="ru" hreflang="ru" 
href="/keepingup.ru.html">русский</a>&nbsp;[ru]</span> &nbsp;
 <span dir="ltr"><a lang="sq" hreflang="sq" 
href="/keepingup.sq.html">Shqip</a>&nbsp;[sq]</span> &nbsp;
 <span dir="ltr"><a lang="uk" hreflang="uk" 
href="/keepingup.uk.html">українська</a>&nbsp;[uk]</span> &nbsp;
+<span dir="ltr"><a lang="zh-cn" hreflang="zh-cn" 
href="/keepingup.zh-cn.html">简体中文</a>&nbsp;[zh-cn]</span> &nbsp;
 </p>
 </div>' -->
 <link rel="alternate" type="text/html" href="/keepingup.html" 
hreflang="x-default" />
@@ -27,4 +28,5 @@
 <link rel="alternate" type="text/html" lang="ru" hreflang="ru" 
href="/keepingup.ru.html" title="русский" />
 <link rel="alternate" type="text/html" lang="sq" hreflang="sq" 
href="/keepingup.sq.html" title="Shqip" />
 <link rel="alternate" type="text/html" lang="uk" hreflang="uk" 
href="/keepingup.uk.html" title="українська" />
+<link rel="alternate" type="text/html" lang="zh-cn" hreflang="zh-cn" 
href="/keepingup.zh-cn.html" title="简体中文" />
 <!-- end translist file -->

Index: keepingup.zh-cn.html
===================================================================
RCS file: keepingup.zh-cn.html
diff -N keepingup.zh-cn.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ keepingup.zh-cn.html        31 Jul 2017 13:29:05 -0000      1.1
@@ -0,0 +1,138 @@
+<!--#set var="ENGLISH_PAGE" value="/keepingup.en.html" -->
+
+<!--#include virtual="/server/header.zh-cn.html" -->
+<!-- Parent-Version: 1.77 -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>与 GNU 和 FSF 同步 - GNU 项目 - 自由软件基金会</title>
+
+<!--#include virtual="/po/keepingup.translist" -->
+<!--#include virtual="/server/banner.zh-cn.html" -->
+<h2>与 GNU 和 FSF 同步</h2>
+
+<p>
+本页列举了一些资源,它们帮你了解当前与 GNU 
项目和自由软件基金会相关的最新事件。
+</p>
+
+
+<h3 id="whatsnew">最新消息</h3>
+<p>请查看 <a href="http://planet.gnu.org/";>GNU 
项目的最新消息</a>。</p>
+
+<h3 id="takeaction">采取行动</h3>
+<p>
+请了解 <a href="/server/takeaction.html">如何行动</a> 
以维护软件自由和推动言论、出版以及网络结社的自由。
+</p>
+
+<h3 id="comingevents">敬请期待</h3>
+<p>请了解 <a href="/events.html">即将到来的 FSF 和 GNU 
的活动</a>。</p>
+
+<h3 id="pressrel">新闻简报</h3>
+<p>请阅读来自 GNU 工程和 FSF 的 <a 
href="//fsf.org/news">新闻简报</a>。<a
+href="/press/press.html#releases">较早的新闻简报</a></p>
+
+<h3 id="fsdirectory">自由软件目录</h3>
+<p><a
+href="http://directory.fsf.org";>自由软件目录</a>会不断增加
和更新。最近的更新列表应该去看最新消息(期待你
的贡献)。</p>
+
+<h3 id="maillist">邮件列表</h3>
+<p>GNU 项目和 FSF 有许多<a href="http://lists.gnu.org";>å…
¬å¼€çš„邮件列表</a>。订阅这些邮件列表可以了解关于 GNU
+项目/软件包的最新消息和开发进程,以及获得 GNU/FSF 
的常规信息。</p>
+
+<p>以下是一些获取常规信息邮件列表:</p>
+<ul>
+    <li><a
+href="//www.fsf.org/free-software-supporter/">自由软件支持者
</a>每月发布来自自由软件运动的新闻和事件。它以英语、西班牙语和法语三种语言发布。</li>
+    <li><a 
href="http://mail.gnu.org/mailman/listinfo/info-gnu";>info-gnu</a>:发布来自
+GNU 项目和自由软件基金会的声明和寻求帮助的请求。</li>
+    <li><a href="//www.fsf.org/events">FSF 事件</a>:发布关于Richard 
Stallman和其他 FSF
+人士的最新活动、演讲和会议精选。</li>
+    <li><a 
href="http://mail.gnu.org/mailman/listinfo/info-press";>info-press</a>:发布
+GNU 的媒体声明。</li>
+</ul>    
+
+<h3 id="usenet">Usenet</h3>
+<p>许多 gnu.* Usenet 新闻组是获取信息的优质渠
道。下列就是了解 GNU 最新动态的新闻组:</p>
+<ul>
+    <li>gnu.announce</li>
+</ul>
+
+<h3 id="news">西班牙语新闻</h3>
+<p>关于 GNU 和 FSF 的西班牙语新闻归档在 <a
+href="http://web.archive.org/web/20160913034809/http://gnuticias.es.gnu.org/";>GNUticias</a>。最近新闻的西班牙语翻译放在
+<a href="//www.fsf.org/free-software-supporter/">自由软件支持者
</a>。</p>
+
+<div class="translators-notes">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.zh-cn.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>请将对 FSF &amp; GNU 的一般询问发送到 <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。还有一些å…
¶ä»–联系 FSF 的<a
+href="/contact/"> 方式</a>。关于链接错误和”å…
¶ä»–更正或建议“请发信到 <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
+
+<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
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+关于协调和提交本文的翻译,请参看 <a
+href="/server/standards/README.translations.html">翻译须知</a>。</p>
+</div>
+
+<!-- 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 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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014, 2015, 2017 Free
+Software Foundation, Inc.</p>
+
+<p>本页基于 <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a>授权。</p>
+
+<!--#include virtual="/server/bottom-notes.zh-cn.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+翻译:<a rel="team" 
href="https://savannah.gnu.org/projects/www-zh-cn/";>CTT</a></div>
+
+<p class="unprintable"><!-- timestamp start -->
+最后更新:
+
+$Date: 2017/07/31 13:29:05 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: accessibility/accessibility.zh-cn.html
===================================================================
RCS file: accessibility/accessibility.zh-cn.html
diff -N accessibility/accessibility.zh-cn.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ accessibility/accessibility.zh-cn.html      31 Jul 2017 13:29:05 -0000      
1.1
@@ -0,0 +1,165 @@
+<!--#set var="ENGLISH_PAGE" value="/accessibility/accessibility.en.html" -->
+
+<!--#include virtual="/server/header.zh-cn.html" -->
+<!-- Parent-Version: 1.79 -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>GNU 无障碍声明 - GNU 项目 - 自由软件基金会</title>
+
+<!--#include virtual="/accessibility/po/accessibility.translist" -->
+<!--#include virtual="/server/banner.zh-cn.html" -->
+<h2>GNU 无障碍声明</h2>
+
+<p><a href="/gnu/">GNU 项目</a>敦促为自由软件工作的人们遵从æ 
‡å‡†å’ŒæŒ‡å—,以保证 GNU/Linux
+和其他自由操作系统的通用无
障碍性。多平台的项目应该使用跨平台的无
障碍接口,这些接口包括 GNU/Linux 发行版和 GNOME 
桌面系统。GNU
+项目还建议网站开发者遵循万维网联盟设立的网络无
障碍倡议。</p>
+
+<blockquote class="announcement">
+  <p>加入讨论</p>
+  <ul>
+    <li><a href="http://lists.gnu.org/mailman/listinfo/accessibility";>GNU
+无障碍邮件列表</a></li>
+  <li><a href="http://groups.fsf.org/wiki/Group:Accessibility";>LibrePlanet
+无障碍讨论组</a></li>
+  </ul>
+</blockquote>
+
+<p>依据联合国2005年的数据,å…
¨çƒçº¦æœ‰6亿人带有残疾。要使用电脑,这些人需要使用称为 
&ldquo;无障碍技术&rdquo;
+的软件。和其他软件一æ 
·ï¼Œè¿™äº›è½¯ä»¶ä¹Ÿåˆ†è‡ªç”±è½¯ä»¶å’Œä¸“有软件。其中,自由软件 <a
+href="/philosophy/free-sw.html">尊重使用者的自由</a>;å…
¶ä½™çš„,专有软件,使用户受制于软件的所有者
。和别的软件一样,无障碍软件道义上也必
须是自由软件。</p>
+
+<p>无障碍技术要和å…
¶ä»–软件合作才能一起正常工作。由于大多数计算机程序和网站(据估计是85%)不遵守æ—
 éšœç¢çš„标准和指导,所以它们无法和无
障碍技术协同工作。它们带来令人沮丧的体验,并限制用户进行工作和学ä¹
 ã€‚</p>
+
+<p>专有文件格式要求专有的阅读软件,这对无
障碍和自由软件所追求的自由都是一种毒药。最大的敌人是 
Flash
+格式;它通常需要不支持无障碍技术的专有软件。Microsoft 
Silverlight 也类似。<acronym title="Portable
+Document Format">PDF</acronym>
+也很困难;虽然有自由软件可以阅读其æ 
¼å¼ï¼Œä½†æ˜¯å®ƒå¹¶ä¸æ”¯æŒè‡ªç”±çš„æ— 
障碍技术软件。改善这些问题是一个重要的项目。</p>
+
+<p>残疾人也应该有控制他们自己的技术命运的权力。当他们使用专有的æ—
 
障碍技术时,他们就没有什么机会来改正该软件的错误。实é™
…上所有专有软件的开发决定都是由不需要无
障碍技术的人做出的;20年来,带有多种不寻常残疾的人们,他们需要相对不寻常的软件,或è€
…
他们遇到阻止他们正常工作的软件问题,但是他们从来没有获得他们所要求的改变。这些软件只有在开发商看到商业机会时才会变化和改进;他们把许多用户抛在脑后。另一个问题是,专有的æ—
 éšœç¢è½¯ä»¶è¿œæ¯”个人电脑还贵。许多用户没有放弃自由是因
为买不起专有软件。</p>
+
+<p>对残疾人用户来说,正如对所有用户一样,自由软件是 <a
+href="/philosophy/free-software-even-more-important.html">他们控制自已计算的唯一途径</a>,是他们摆脱被动接受开发è€
…提供的软件,从而主动使软件满足自己需求的唯一机会。</p>
+
+<p>人口大国往往也是残疾人人口众多。包
括巴西和俄罗斯在内的一些国家正在讨论是否使政府采购 
GNU/Linux
+平台标准化。这些国家都是联合国残疾人权益å…
¬çº¦çš„签署国,其中包
括为这些权益提供相应技术的日程。这就要求他们需要雇用开发人员为国人开发æ—
 éšœç¢è½¯ä»¶ã€‚如果这些是自由软件,那么å…
¨ä¸–界都可以使用它们。为自由无
障碍软件工作的能人可以提供工å…
·ï¼Œè€Œæ®‹ç–¾äººåˆ™å¯ä»¥ä½¿ç”¨è¿™äº›å·¥å…·æžå¤§åœ°æ‰©å±•ä»–们的视野。</p>
+
+<p>一个程序支持无
障碍并不表示它就是尊重用户的自由&mdash;它们是不同的问题&mdash;但是两个问题天然彼此契合。</p>
+
+
+<h3>建议</h3>
+
+<ul>
+<li>应用软件的开发者
应该学会如何使用他们构建用户界面的 <acronym title="Integrated 
Development
+Environment">IDE</acronym> 或工具箱的无障碍功能。</li>
+
+<li>需要实现无障碍技术或负责桌面和操作系统级的无
障碍开发的程序员应该了解合适的无障碍 <acronym 
title="Application
+Programming Interface">API</acronym>,并应该选择å…
¶ä¸­å’Œè‡ªç”±æ“ä½œç³»ç»Ÿ/桌面兼容的那个。它们包括 <a
+href="http://library.gnome.org/devel/accessibility-devel-guide/stable/index.html.en";>GNOME
+无障碍 API</a>(仅针对 GNU/Linux 平台)、<a
+href="http://docs.oracle.com/javase/7/docs/technotes/guides/access/jaapi.html";>Java
+无障碍 API</a>(GNU/Linux 和 Windows)和 <a
+href="http://www.linuxfoundation.org/collaborate/workgroups/accessibility/iaccessible2";>iAccessible2</a>
+(GNU/Linux 和 Windows)。</li>
+
+<li>网络开发者应该遵循 <a href="http://www.w3c.org/wai";>W3C
+网络无障碍指导</a>,并且对于复杂网络应用,开发者
应该遵循 <a href="http://www.w3.org/WAI/intro/aria";
+title="Accessible Rich Internet Applications">ARIA 标准</a>。另外,<a
+href="http://www.standards-schmandards.com/projects/fangs/";>FANGS</a>
+让网络开发者能够看到 <a 
href="http://en.wikipedia.org/wiki/Screen_reader";>屏幕阅读器</a>
+将如何处理他们开发的网页。</li>
+
+<li>在网络之外,开发者应该遵循 <a 
href="http://www.w3.org/WAI/intro/wcag2ict";>相关的 W3C
+无障碍指导</a>。</li>
+
+</ul>
+
+<h3>记住 GNU 原则</h3>
+
+<p>提醒:请遵循以下两条尊重用户自由的原则。</p>
+
+<ul>
+
+<li><a href="/philosophy/javascript-trap.html">发布到用户的非平凡 
JavaScript 代码</a>
+应该是自由软件。</li>
+
+<li>请不要让用户 <a
+href="/philosophy/who-does-that-server-really-serve.html">在服务器端做他们可以在自己电脑上做的事</a>。</li>
+</ul>
+
+<div class="translators-notes">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.zh-cn.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>请将对 FSF &amp; GNU 的一般询问发送到 <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。还有一些å…
¶ä»–联系 FSF 的<a
+href="/contact/"> 方式</a>。关于链接错误和”å…
¶ä»–更正或建议“请发信到 <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
+
+<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
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+关于协调和提交本文的翻译,请参看 <a
+href="/server/standards/README.translations.html">翻译须知</a>。</p>
+</div>
+
+<!-- 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 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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 2010, 2013, 2014, 2015, 2016 Free Software Foundation, 
Inc.</p>
+
+<p>本页基于 <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a>授权。</p>
+
+<p>本页的建议部分也可用 Creative Commons Attribution 
许可授权,它还可用 GNU Free Documentation
+许可1.3版及以后版本重新授权。</p>
+
+<!--#include virtual="/server/bottom-notes.zh-cn.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+翻译:<a rel="team" 
href="https://savannah.gnu.org/projects/www-zh-cn/";>CTT</a></div>
+
+<p class="unprintable"><!-- timestamp start -->
+最后更新:
+
+$Date: 2017/07/31 13:29:05 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: accessibility/po/accessibility.zh-cn-en.html
===================================================================
RCS file: accessibility/po/accessibility.zh-cn-en.html
diff -N accessibility/po/accessibility.zh-cn-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ accessibility/po/accessibility.zh-cn-en.html        31 Jul 2017 13:29:05 
-0000      1.1
@@ -0,0 +1,210 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.79 -->
+<title>GNU Accessibility Statement
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/accessibility/po/accessibility.translist" -->
+<!--#include virtual="/server/banner.html" -->
+
+<h2>GNU Accessibility Statement</h2>
+
+<p><a href="/gnu/">Project GNU</a> urges people working on free
+software to follow standards and guidelines for universal
+accessibility on GNU/Linux and other free operating systems.
+Multi-platform projects should use the cross platform accessibility
+interfaces available that include GNU/Linux distributions and the
+GNOME desktop.  Project GNU also advises developers of web sites to
+follow the guidelines set forth by the World Wide Web Consortium's Web
+Accessibility Initiative.</p>
+
+<blockquote class="announcement">
+  <p><strong>Join the conversation</strong></p>
+  <ul>
+    <li><a href="http://lists.gnu.org/mailman/listinfo/accessibility";>GNU 
accessibility mailing list</a></li>
+  <li><a href="http://groups.fsf.org/wiki/Group:Accessibility";>LibrePlanet 
accessibility group</a></li>
+  </ul>
+</blockquote>
+
+<p>According to the United Nations in 2005, there were 600 million
+people with disabilities in the world.  To use computers, many of them
+need special software known as &ldquo;access technology&rdquo;.  Like
+other programs, these can be free software or proprietary.  Those
+which are free software <a href="/philosophy/free-sw.html"> respect
+the freedom of their users</a>; the rest, proprietary programs,
+subject those users to the power of the program's owner.  Programs for
+accessibility ethically must be free software, like other
+programs.</p>
+
+<p>In order for access technology to work, the other software in use
+must interoperate with it.  The majority of computer programs and web
+sites (85% in one estimate) do not comply with accessibility standards
+and guidelines, so they do not work with access technology.  They
+provide a frustrating experience, and can bar users from job or school
+activities.</p>
+
+<p>Proprietary file formats that require proprietary reading programs
+are poison to both accessibility and to the freedoms that we as free
+software activists hope to establish.  The biggest offender is Flash
+format; it usually requires proprietary software that doesn't
+cooperate with accessibility.  Microsoft Silverlight is similar.
+<acronym title="Portable Document Format">PDF</acronym> is also
+difficult; though there is free software to view it, it does not
+support free access technology software.  Improving this is an
+important project.</p>
+
+<p>People with disabilities deserve to have control of their own
+technological destinies.  When they use proprietary access technology,
+they have little or no way to correct whatever is wrong with it.
+Virtually all major decisions of the proprietary developers are made
+by people who do not have the disability; 20 years' experience shows
+that people with unusual combinations of disabilities, who require
+relatively unusual software, or who encounter a bug that keeps them
+from doing their job have no way to obtain the changes they need.
+These products are only changed or improved when the vendors see a
+business reason for doing the work; this leaves many users behind.  As
+a secondary problem, proprietary access software is far more expensive
+than a PC.  Many users cannot afford to give up their freedom in this
+way.</p>
+
+<p>For users with disabilities, as for all other users, free software
+is <a href="/philosophy/free-software-even-more-important.html">the
+only way the users can control their own computing</a>, their only
+chance to make software fit their needs rather than passively
+accepting whatever developers choose to offer them.</p>
+
+<p>Nations with large populations also have large numbers of people
+with disabilities.  Countries including Brazil and Russia are
+discussing whether to standardize government purchases on GNU/Linux
+platforms.  These nations are all signatories to the UN Convention on
+the Rights of Persons with Disabilities, and include technology in
+their agenda for providing such rights.  This will require them to
+hire programmers to work on accessibility software for their
+populations.  If it is free software, the rest of the world will be
+able to use it too.  The hackers who work on free access technology
+will provide tools that people with disabilities can use to expand
+their horizons enormously.</p>
+
+<p>Making a program accessible is no substitute for making it respect
+users' freedom&mdash;these are separate issues&mdash;but the two
+fit naturally together.</p>
+
+
+<h3>Recommendations</h3>
+
+<ul>
+<li>Application software developers should learn how to use the
+accessibility features of the <acronym title="Integrated Development 
+Environment">IDE</acronym> or toolkit they employ to build their user
+interface.</li>
+
+<li>Programmers who need to implement access technology, or
+work on a desktop or OS-level accessibility problem, will need to
+understand the appropriate accessibility <acronym title="Application
+Programming Interface">API</acronym>, and should choose the one that is
+compatible with free OS/desktops.  These include the <a
+href="http://library.gnome.org/devel/accessibility-devel-guide/stable/index.html.en";>GNOME
+accessibility API</a> (GNU/Linux platforms only), the <a
+href="http://docs.oracle.com/javase/7/docs/technotes/guides/access/jaapi.html";>Java
+accessibility API</a> (GNU/Linux and Windows) and <a
+href="http://www.linuxfoundation.org/collaborate/workgroups/accessibility/iaccessible2";>iAccessible2</a>
+(GNU/Linux and Windows).</li>
+
+<li>Web developers should follow the <a
+href="http://www.w3c.org/wai";>W3C web accessibility guidelines</a>
+and, for complex web applications, the developers should follow the <a
+href="http://www.w3.org/WAI/intro/aria"; title="Accessible Rich
+Internet Applications">ARIA standard</a>.  Furthermore,
+<a
+href="http://www.standards-schmandards.com/projects/fangs/";>FANGS</a>
+enables web developers to see how a <a
+href="http://en.wikipedia.org/wiki/Screen_reader";>screen reader</a>
+will handle the web pages they are developing.</li>
+
+<li>Outside of the web, developers should follow the <a
+href="http://www.w3.org/WAI/intro/wcag2ict";>relevant W3C accessibility
+    guidelines</a>.</li>
+
+</ul>
+
+<h3>Remember GNU Principles</h3>
+
+<p>Reminder: Always follow these two principles to respect users' freedom.</p>
+
+<ul>
+
+<li><a href="/philosophy/javascript-trap.html">Nontrivial JavaScript
+code distributed to the user</a> should be free software.</li>
+
+<li>Please don't invite users to <a 
+href="/philosophy/who-does-that-server-really-serve.html">do something
+on a server that they could conceivably do on their own
+computers</a>.</li>
+</ul>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>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>.</p>
+
+<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
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- 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 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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 2010, 2013, 2014, 2015, 2016 Free Software Foundation, 
Inc.</p>
+
+<p>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>.</p>
+
+<p>The Recommendations section may also be used under the Creative
+Commons Attribution license, and may be relicensed to the GNU Free
+Documentation License version 1.3 or later.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2017/07/31 13:29:05 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: bulletins/bulletins.zh-cn.html
===================================================================
RCS file: bulletins/bulletins.zh-cn.html
diff -N bulletins/bulletins.zh-cn.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ bulletins/bulletins.zh-cn.html      31 Jul 2017 13:29:06 -0000      1.1
@@ -0,0 +1,174 @@
+<!--#set var="ENGLISH_PAGE" value="/bulletins/bulletins.en.html" -->
+
+<!--#include virtual="/server/header.zh-cn.html" -->
+<!-- Parent-Version: 1.79 -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>GNU 公报 - GNU 项目 - 自由软件基金会</title>
+<meta name="Keywords" content="GNU, GNU 项目, FSF, 自由软件, 
自由软件基金会, 公报" />
+
+<!--#include virtual="/bulletins/po/bulletins.translist" -->
+<!--#include virtual="/server/banner.zh-cn.html" -->
+<h2>GNU 公报</h2>
+
+<h3>GNU 状态报告</h3>
+
+<p>从2011年开始,不定期发布的 GNU 状态报告就会推出å…
³äºŽä¸€ç³»åˆ—软件包的新闻。这是原来的 <cite>GNU 公报</cite>
+(见下)的部分复活,其目的是在 GNU 范围内
提供尽可能多的软件包的信息。这个信息是 <a
+href="http://www.fsf.org/bulletin/";>FSF 公报</a> 和 <a
+href="http://www.fsf.org/free-software-supporter/";>自由软件支持者</a> 
通讯的补充。</p>
+
+<ul>
+<li><a href="gnustatus-2011-10.html">2011-10 GNU 状态报告</a> (<a
+href="gnustatus-2011-10.pdf">PDF</a>,<a
+href="gnustatus-2011-10.texi">Texinfo</a>)。</li>
+
+<li><a href="gnustatus-2011-01.html">2011-01 GNU 状态报告</a> (<a
+href="gnustatus-2011-01.pdf">PDF</a>,<a
+href="gnustatus-2011-01.texi">Texinfo</a>)。</li>
+</ul>
+
+
+<h3>FSF 公报</h3>
+
+<p>
+FSF 半年发布一次 FSF 公报。既然 FSF 
的活动已经扩展到远不仅是支持 GNU
+项目,我们也希望这个新的公报能够让捐赠者
和会员们对此有所了解。其电子版可以在下面å…
è´¹èŽ·å¾—。我们请求你成为持卡 <a
+href="http://member.fsf.org";>会员</a> 
来享有这些福利,同时也能支持 FSF 的活动。</p>
+
+<ul>
+<li><a href="http://www.fsf.org/bulletin";>较新的 FSF 公报</a> 可以在 
fsf.org 找到。</li>
+<li><a href="/bulletins/bulletin-002.html">FSF 公报 第二期</a>,2003å¹´å…
­æœˆ</li>
+<li><a href="/bulletins/bulletin-001.html">FSF 公报 
第一期</a>,2002年十一月</li>
+</ul>
+
+
+<h3>GNU 公报</h3>
+<p id="NoLongerPublished"><cite>GNU å…
¬æŠ¥</cite>,第一卷,不再发布。</p>
+
+<p>
+GNU
+å…
¬æŠ¥ï¼Œ<cite>第一卷</cite>,由自由软件基金会发布于1986年到1998年,å
…±24期半年刊。其中包括一份å…
³äºŽå’Œæ¥è‡ªGNU项目新闻的状态报告;关于å…
¶ä»–自由软件的新闻;在售自由软件出版物的信息;以及å…
¶ä»–自由软件关注者可能感兴趣的内容。</p>
+
+<p>
+电子版可以å…
è´¹åœ¨æ­¤èŽ·å–。大多数的分期单行版有纸质版;我们建议你
做些捐助。
+</p>
+
+<p>
+对特定软件感兴趣的人应该查看 <a href="/software/software.html">å…
³äºŽ GNU 软件包的信息</a>。</p>
+
+<ol>
+<li><a href="/bulletins/bull1.txt">1986年二月</a></li>
+<li><a href="/bulletins/bull2.txt">1987年一月</a></li>
+<li><a href="/bulletins/bull3.html">1987年六月</a></li>
+<li><a href="/bulletins/bull4.html">1988年二月</a></li>
+<li><a href="/bulletins/bull5.html">1988年六月</a></li>
+<li><a href="/bulletins/bull6.html">1989年一月</a></li>
+<li><a href="/bulletins/bull7.html">1989年六月</a></li>
+<li><a href="/bulletins/bull8.html">1990年一月</a></li>
+<li><a href="/bulletins/bull9.html">1990年六月</a></li>
+<li><a href="/bulletins/bull10.html">1991年一月</a></li>
+<li><a href="/bulletins/bull11.html">1991年六月</a></li>
+<li><a href="/bulletins/bull12.html">1992年一月</a></li>
+<li><a href="/bulletins/bull13.html">1992年六月</a></li>
+<li><a href="/bulletins/bull14.html">1993年一月</a></li>
+<li><a href="/bulletins/bull15.html">1993年六月</a></li>
+<li><a href="/bulletins/bull16.html">1994年一月</a></li>
+<li><a href="/bulletins/bull17.html">1994年六月</a></li>
+<li><a href="/bulletins/bull18.html">1995年一月</a></li>
+<li><a href="/bulletins/bull19.html">1995六月</a></li>
+<li><a href="/bulletins/bull20.html">1996年一月</a></li>
+<li><a href="/bulletins/bull21.html">1996年七月</a></li>
+<li><a href="/bulletins/bull22.html">1997年一月</a></li>
+<li><a href="/bulletins/bull23.html">1997年七月</a></li>
+<li><a href="/bulletins/bull24.html">1998三月</a></li>
+</ol>
+
+<p>GNU 公报有16期日语翻译版,</p>
+<ul>
+  <li>它们是 HTML 格式:<a
+href="https://web.archive.org/web/19970205205851/http://sra.co.jp/public/doc/gnu/Bull9j/";>1990å¹´å
…­æœˆ</a>
+(1997年二月五日归档)和 <a
+href="https://web.archive.org/web/20021202070141/http://www.sra.co.jp/public/doc/gnu/Bullj.html";>1991年一月至1998年三月</a>
+(2002年十二月二日归档),存放在 Wayback Machine,或者</li>
+  <li>是 Texinfo 格式:<a href="ftp://ftp.sra.co.jp/pub/gnu/sra/Bull-j/";>
+1990年六月至1998年三月</a>。</li>
+</ul>
+
+<p>关于 <a href="/bulletins/thankgnus-index.html">GNU 公报中的 GNU 
致谢</a> 也有列表。</p>
+
+<div class="translators-notes">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.zh-cn.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>请将对 FSF &amp; GNU 的一般询问发送到 <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。还有一些å…
¶ä»–联系 FSF 的<a
+href="/contact/"> 方式</a>。关于链接错误和”å…
¶ä»–更正或建议“请发信到 <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
+
+<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
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+关于协调和提交本文的翻译,请参看 <a
+href="/server/standards/README.translations.html">翻译须知</a>。</p>
+</div>
+
+<!-- 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 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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2008,
+2010, 2011, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.</p>
+
+<p>本页基于 <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a>授权。</p>
+
+<!--#include virtual="/server/bottom-notes.zh-cn.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+翻译:<a rel="team" 
href="https://savannah.gnu.org/projects/www-zh-cn/";>CTT</a></div>
+
+<p class="unprintable"><!-- timestamp start -->
+最后更新:
+
+$Date: 2017/07/31 13:29:06 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: bulletins/po/bulletins.zh-cn-en.html
===================================================================
RCS file: bulletins/po/bulletins.zh-cn-en.html
diff -N bulletins/po/bulletins.zh-cn-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ bulletins/po/bulletins.zh-cn-en.html        31 Jul 2017 13:29:06 -0000      
1.1
@@ -0,0 +1,180 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.79 -->
+<title>GNU's Bulletins - GNU Project - Free Software Foundation</title>
+<meta name="Keywords" content="GNU, GNU Project, FSF, Free Software, Free 
Software Foundation, Bulletins" />
+<!--#include virtual="/bulletins/po/bulletins.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>GNU's Bulletins</h2>
+
+<h3>GNU Status Reports</h3>
+
+<p>Starting in 2011, an occasional GNU Status Report has been published
+with news for a number of packages.  This is a partial revival of the
+original <cite>GNU's Bulletin</cite> (below), with the aim of providing
+GNU-wide information for as many packages as possible.  This
+package-specific information supplements the <a
+href="http://www.fsf.org/bulletin/";>FSF Bulletins</a> and <a
+href="http://www.fsf.org/free-software-supporter/";>Free Software
+Supporter</a> newsletter.</p>
+
+<ul>
+<li><a href="gnustatus-2011-10.html">2011-10 GNU Status report</a>
+    (<a href="gnustatus-2011-10.pdf">PDF</a>, <a
+     href="gnustatus-2011-10.texi">Texinfo</a>).</li>
+
+<li><a href="gnustatus-2011-01.html">2011-01 GNU Status report</a>
+    (<a href="gnustatus-2011-01.pdf">PDF</a>, <a
+     href="gnustatus-2011-01.texi">Texinfo</a>).</li>
+</ul>
+
+
+<h3>FSF Bulletins</h3>
+
+<p>
+FSF publishes a semi-annual FSF Bulletin.  We hope that this new
+bulletin will help keep our donors and associate members informed in a
+new way, now that FSF's activities extend far beyond just the GNU
+project that we help sponsor.  Electronic copies are available below
+at no cost.  We request you to become a
+card-carrying <a href="http://member.fsf.org";>associate member</a> to
+avail the benefits and also to support the activities of the FSF.</p>
+
+<ul>
+<li><a href="http://www.fsf.org/bulletin";>Newer FSF Bulletins</a> are
+available at fsf.org.</li>
+<li><a href="/bulletins/bulletin-002.html">FSF Bulletin Issue 2</a>,
+June 2003</li>
+<li><a href="/bulletins/bulletin-001.html">FSF Bulletin Issue 1</a>,
+November 2002</li>
+</ul>
+
+
+<h3>GNU's Bulletins</h3>
+<p id="NoLongerPublished"><cite>GNU's Bulletin</cite>, volume 1, is no
+longer published.</p>
+
+<p>
+The GNU's Bulletin, <cite>volume 1</cite>, was published by the
+Free Software Foundation in 24 semiannual numbers, 1986-1998.  It
+contained a status report from and news about the GNU Project; news
+about other free software and documentation; information about FSF
+publications for sale; and other items likely to interest those who
+care about free software.</p>
+
+<p>
+Electronic copies are available here at no charge.
+Single copies of most numbers are available on paper; we suggest that
+you make a small donation.
+</p>
+
+<p>
+Anyone interested in a particular program should consult
+the <a href="/software/software.html">information about GNU packages</a>.</p>
+
+<ol>
+<li><a href="/bulletins/bull1.txt">1986 February</a></li>
+<li><a href="/bulletins/bull2.txt">1987 January</a></li>
+<li><a href="/bulletins/bull3.html">1987 June</a></li>
+<li><a href="/bulletins/bull4.html">1988 February</a></li>
+<li><a href="/bulletins/bull5.html">1988 June</a></li>
+<li><a href="/bulletins/bull6.html">1989 January</a></li>
+<li><a href="/bulletins/bull7.html">1989 June</a></li>
+<li><a href="/bulletins/bull8.html">1990 January</a></li>
+<li><a href="/bulletins/bull9.html">1990 June</a></li>
+<li><a href="/bulletins/bull10.html">1991 January</a></li>
+<li><a href="/bulletins/bull11.html">1991 June</a></li>
+<li><a href="/bulletins/bull12.html">1992 January</a></li>
+<li><a href="/bulletins/bull13.html">1992 June</a></li>
+<li><a href="/bulletins/bull14.html">1993 January</a></li>
+<li><a href="/bulletins/bull15.html">1993 June</a></li>
+<li><a href="/bulletins/bull16.html">1994 January</a></li>
+<li><a href="/bulletins/bull17.html">1994 June</a></li>
+<li><a href="/bulletins/bull18.html">1995 January</a></li>
+<li><a href="/bulletins/bull19.html">1995 June</a></li>
+<li><a href="/bulletins/bull20.html">1996 January</a></li>
+<li><a href="/bulletins/bull21.html">1996 July</a></li>
+<li><a href="/bulletins/bull22.html">1997 January</a></li>
+<li><a href="/bulletins/bull23.html">1997 July</a></li>
+<li><a href="/bulletins/bull24.html">1998 March</a></li>
+</ol>
+
+<p>Japanese translations of 16 issues of the GNU's Bulletin are available</p>
+<ul>
+  <li>in HTML format: <a
+    
href="https://web.archive.org/web/19970205205851/http://sra.co.jp/public/doc/gnu/Bull9j/";>June
+    1990</a> (archived February 05, 1997), and <a
+    
href="https://web.archive.org/web/20021202070141/http://www.sra.co.jp/public/doc/gnu/Bullj.html";>January
+    1991 to March 1998</a> (archived December 02, 2002) at the Wayback Machine,
+    or</li>
+  <li>in Texinfo format: <a href="ftp://ftp.sra.co.jp/pub/gnu/sra/Bull-j/";>June
+    1990 to March 1998</a>.</li>
+</ul>
+
+<p>A list of <a href="/bulletins/thankgnus-index.html">Thank GNUs from
+the GNU's Bulletins</a> is available.</p>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>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>.</p>
+
+<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
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- 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 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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005,
+2007, 2008, 2010, 2011, 2013, 2014, 2015, 2016 Free Software Foundation, 
Inc.</p>
+
+<p>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>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2017/07/31 13:29:06 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: education/education.zh-cn.html
===================================================================
RCS file: education/education.zh-cn.html
diff -N education/education.zh-cn.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ education/education.zh-cn.html      31 Jul 2017 13:29:06 -0000      1.3
@@ -0,0 +1,181 @@
+<!--#set var="ENGLISH_PAGE" value="/education/education.en.html" -->
+
+<!--#include virtual="/server/html5-header.zh-cn.html" -->
+<!-- Parent-Version: 1.79 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>自由软件与教育 - GNU 工程 - 自由软件基金会</title>
+
+<!--#include virtual="/education/po/education.translist" -->
+<style type="text/css" media="screen">
+<!--
+#video-container {
+   width: 40em; max-width: 100%;
+   margin: 1.5em auto;
+}
+#video-container p { text-align: justify; }
+#rms-movie { width: 100%; }
address@hidden (min-width: 48em) {
+   #content .edu-note {
+      float: right;
+      max-width: 40%;
+      margin: 3.2em 0 2.5em 1.5em;
+   }
+}-->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
+<!--
address@hidden (min-width: 48em) {
+   #content .edu-note {
+      float: left;
+      margin: 3.4em 1.5em 2.5em 0;
+   }
+}-->
+<!--#endif -->
+
+
+
+
+</style>
+
+<!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" -->
+<!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<!--#endif -->
+<!--#endif -->
+<h2 class="c">自由软件与教育</h2>
+
+<h3>自由软件和教育有什么关系?</h3>
+
+<p>软件自由在教育中扮演了æ 
¹åŸºæ€§çš„角色。任何层次的教育机构都应该使用和教授自由软件,å›
 ä¸ºè¿™äº›æ˜¯å”¯ä¸€èƒ½å¸®åŠ©ä»–们契合教育的本质使命的软件:传
播人类知识,帮助学生成为他们所在团体的优秀成员。自由软件的源代ç
 å’Œå„种方法是人类知识的一部分。与此相反,商业软件中包
含的是商业机密和受限制的知识,这违背了教育机构的使命。自由软件支持教育,商业软件妨碍教育。</p>
+
+<p>自由软件不仅仅
是一个技术层面的问题;还是道德问题,社会问题和政治问题。它是å
…
³äºŽä¸€ä¸ªè½¯ä»¶ç”¨æˆ·åº”该拥有的权力的问题。自由和合作是自由软件的精华所在。GNU
+系统实现着这些价值和分享原则,分享令人愉快的且有利于推动人类进程。</p>
+
+<p>欲了解更多,请访问 <a 
href="/philosophy/free-sw.html">自由软件定义</a> 和 <a
+href="/philosophy/shouldbefree.html">软件为什么应该是自由的</a> 
页面。</p>
+
+<h3>基础</h3>
+<p>GNU 工程是 1983 年由理查德·斯托曼 <a
+href="/gnu/initial-announcement.html">发起</a>的,旨在开发一个自由的操作系统:GNU
+操作系统。时至如今,每个人都可以在计算机上自由的使用这个系统。</p>
+
+<p>在这段6分钟的视频中 <a 
href="http://www.fsf.org/about/leadership/#rms";>理查德·斯托曼</a>
+简要解释了自由软件是如何与教育联系的。</p>
+
+<div id="video-container">
+
+<!-- GNUN: localize URL /education/rms-education-es.ogv -->
+<video  id="rms-movie" controls="controls">
+  <source
+    src="http://www.gnu.org/education/rms-education-es.ogv";
+    type='video/ogg; codecs="theora, vorbis"' />
+</video>
+
+<div class="emph-box"><p>
+ 
+<!-- TRANSLATORS: Please replace the link to the video with subtitles in
+     English with a link to the video with subtitles in your language, 
+     if it exists. -->
+以自由的 Ogg Theora (ogv) 格式<a
+href="http://audio-video.gnu.org/video/rms-education-es-high-sub.en.ogv";>
+下载并观看这段视频</a>。
+
+<!-- TRANSLATORS: please add the link to your language here in the first 
+     place, followed by a comma. -->
+本视频的文字版本有 <a
+href="/education/misc/rms-education-es-translation-to-en.txt">英语</a>,<a
+href="/education/misc/rms-education-es-transcription.txt">西班牙语</a> 及 
<a
+href="/education/misc/edu-misc.html#transcription-rms-education"> å…
¶å®ƒè¯­è¨€</a>
+可用。 
+
+
+<!-- TRANSLATORS: please add the link to your language here in the first 
+     place, followed by a comma. -->
+SubRip 字幕有 <a 
href="/education/misc/rms-education-es-sub.en.srt">英语</a>,<a
+href="/education/misc/rms-education-es-sub.es.srt">西班牙语</a> 及 <a
+href="/education/misc/edu-misc.html#subtitles-rms-education">更多语言</a> 
可供下载。 
+</p></div> 
+<!-- /.emph-box -->
+</div>
+
+<div class="edu-note"><p>
+我们正寻找自由的教育游戏,或者是å…
³äºŽå¯ç”¨äºŽæ•™è‚²çš„自由游戏的信息。详情请联系 <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
+</p></div>
+
+<h3 id="indepth">较深层次</h3>
+<ul>
+<li>了解更多有关为什么教育机构应使用自由软件的 <a 
href="/education/edu-why.html">理由</a>。</li>
+
+<li>一篇由 Richard Stallman 撰写的文章:<a
+href="/education/edu-schools.html">为什么在学æ 
¡ä¸­åªåº”使用自由软件</a></li>
+
+<li>一篇由 V. Sasi Kumar 博士撰写的文章,<a
+href="/education/edu-system-india.html">印度的教育系统</a>。</li>
+</ul>
+<div class="translators-notes">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.zh-cn.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>请将有关自由软件基金会(FSF)&amp; GNU 
的一般性问题发送到<a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。也可以通过 <a
+href="/contact/">其他联系方法</a> 
联系自由软件基金会(FSF)。有关错误链接、å…
¶ä»–更正或建议,请联系 <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
+
+<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
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+请参考 <a href="/server/standards/README.translations.html">翻译说明</a>
+了解有关协调和提交文章翻译的信息。</p>
+</div>
+
+<p>Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc.</p>
+
+<p>本页面采用<a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a>许可证授权。</p>
+
+<!--#include virtual="/server/bottom-notes.zh-cn.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<b>翻译</b>:Christopher Meng, 封琪 2013<br />
+<b>审校</b>:李凡希 2013
+翻译:<a rel="team" 
href="https://savannah.gnu.org/projects/www-zh-cn/";>CTT</a></div>
+
+<p class="unprintable"><!-- timestamp start -->
+最后更新:
+
+$Date: 2017/07/31 13:29:06 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: education/po/education.zh-cn-en.html
===================================================================
RCS file: education/po/education.zh-cn-en.html
diff -N education/po/education.zh-cn-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ education/po/education.zh-cn-en.html        31 Jul 2017 13:29:06 -0000      
1.1
@@ -0,0 +1,189 @@
+<!--#include virtual="/server/html5-header.html" -->
+<!-- Parent-Version: 1.79 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+
+<title>Free Software and Education 
+- GNU Project - Free Software Foundation</title>
+
+<!--#include virtual="/education/po/education.translist" -->
+
+<style type="text/css" media="screen">
+<!--
+#video-container {
+   width: 40em; max-width: 100%;
+   margin: 1.5em auto;
+}
+#video-container p { text-align: justify; }
+#rms-movie { width: 100%; }
address@hidden (min-width: 48em) {
+   #content .edu-note {
+      float: right;
+      max-width: 40%;
+      margin: 3.2em 0 2.5em 1.5em;
+   }
+}-->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
+<!--
address@hidden (min-width: 48em) {
+   #content .edu-note {
+      float: left;
+      margin: 3.4em 1.5em 2.5em 0;
+   }
+}-->
+<!--#endif -->
+</style>
+<!--#include virtual="/server/banner.html" -->
+
+<!--#include virtual="/education/education-menu.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
+
+<h2 class="c">Free Software and Education</h2>
+
+<h3>How Does Free Software Relate to Education?</h3>
+
+<p>Software freedom plays a fundamental role in education. 
+Educational institutions of all levels should use and teach Free 
+Software because it is the only software that allows them to accomplish 
+their essential missions: to disseminate human knowledge and to prepare 
+students to be good members of their community. The source code and the 
+methods of Free Software are part of human knowledge. On the contrary, 
+proprietary software is secret, restricted knowledge, which is the 
+opposite of the mission of educational institutions. Free Software 
+supports education, proprietary software forbids education.</p>
+
+<p>Free Software is not just a technical question; it is an ethical,
+social, and political question. It is a question of the human rights
+that the users of software ought to have. Freedom and cooperation are
+essential values of Free Software. The GNU System implements these
+values and the principle of sharing, since sharing is good and
+beneficial to human progress.</p>
+
+<p>To learn more, see the 
+<a href="/philosophy/free-sw.html">Free Software definition</a> 
+and our article on 
+<a href="/philosophy/shouldbefree.html">why software should be free</a>
+(as in freedom).</p>
+
+<h3>The Basics</h3>
+<p>The GNU Project was 
+<a href="/gnu/initial-announcement.html">launched</a> in 1983 by 
+Richard Stallman to develop a Free Libre operating system: the GNU 
+operating system. As a result, today it is possible for anyone to use a 
+computer in freedom.</p>
+
+<p>In this six-minutes video 
+<a href="http://www.fsf.org/about/leadership/#rms";>Richard Stallman</a> 
+explains briefly and to the point the principles of Free Software and 
+how they connect to education.</p>
+
+<div id="video-container">
+<!-- GNUN: localize URL /education/rms-education-es.ogv -->
+<video  id="rms-movie" controls="controls">
+  <source
+    src="http://www.gnu.org/education/rms-education-es.ogv";
+    type='video/ogg; codecs="theora, vorbis"' />
+</video>
+
+<div class="emph-box"><p>
+<!-- TRANSLATORS: Please replace the link to the video with subtitles in
+     English with a link to the video with subtitles in your language, 
+     if it exists. --> 
+<a 
+href="http://audio-video.gnu.org/video/rms-education-es-high-sub.en.ogv";>
+Download and watch the video</a> at a higher definition in the Ogg Theora 
+(ogv) free format.<span class="gnun-split"></span>
+
+<!-- TRANSLATORS: please add the link to your language here in the first 
+     place, followed by a comma. -->
+
+Transcriptions of this video are available in
+
+<a href="/education/misc/rms-education-es-translation-to-en.txt">English</a>, 
+<a href="/education/misc/rms-education-es-transcription.txt">Spanish</a>, and 
+<a href="/education/misc/edu-misc.html#transcription-rms-education">
+   other languages</a>. 
+<span class="gnun-split"></span>
+
+<!-- TRANSLATORS: please add the link to your language here in the first 
+     place, followed by a comma. --> 
+
+SubRip subtitle files are also available for download in
+<a href="/education/misc/rms-education-es-sub.en.srt">English</a>, 
+<a href="/education/misc/rms-education-es-sub.es.srt">Spanish</a>, and
+<a href="/education/misc/edu-misc.html#subtitles-rms-education">other 
+   languages</a>. 
+</p></div> <!-- /.emph-box -->
+</div>
+
+<div class="edu-note"><p>
+We are looking for free educational games, or information about free games 
+that can be used for educational purposes. Contact 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p></div>
+
+<h3 id="indepth">In Depth</h3>
+<ul>
+<li>Learn about the <a href="/education/edu-why.html">Reasons Why</a> 
+educational institutions should use and teach exclusively Free Software.</li>
+
+<li>An article by Richard Stallman:
+<a href="/education/edu-schools.html">Why Schools Should Exclusively Use 
+Free Software</a></li>
+
+<li>An article by Dr. V. Sasi Kumar on the
+<a href="/education/edu-system-india.html">education system in India.</a></li>
+</ul>
+</div> <!-- for id="content", starts in the include above -->
+
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>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>.</p>
+
+<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
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<p>Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc.</p>
+
+<p>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>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2017/07/31 13:29:06 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: po/keepingup.zh-cn-en.html
===================================================================
RCS file: po/keepingup.zh-cn-en.html
diff -N po/keepingup.zh-cn-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ po/keepingup.zh-cn-en.html  31 Jul 2017 13:29:06 -0000      1.1
@@ -0,0 +1,144 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>Keeping Up With GNU and the FSF
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/po/keepingup.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Keeping Up With GNU and the FSF</h2>
+
+<p>
+This page contains a list of resources to help you keep up to date on
+what is happening with the GNU Project and the Free Software
+Foundation.
+</p>
+
+
+<h3 id="whatsnew">What's New</h3>
+<p>Find out <a href="http://planet.gnu.org/";>What's New in and about
+the GNU Project</a>.</p>
+
+<h3 id="takeaction">Take Action</h3>
+<p>
+Keep up on what <a href="/server/takeaction.html">you can
+do</a> to keep software free, and promote the freedoms of
+speech, press, and association on the Internet.
+</p>
+
+<h3 id="comingevents">Coming Events</h3>
+<p>Find out about <a href="/events.html">coming FSF and GNU Events</a>.</p>
+
+<h3 id="pressrel">Press Releases</h3>
+<p>Read the <a href="//fsf.org/news">press releases</a>
+from the GNU Project and the FSF.  <a
+href="/press/press.html#releases">Old press releases</a> are also
+available.</p>
+
+<h3 id="fsdirectory">Free Software Directory</h3>
+<p>Additions and updates are constantly made to
+the <a href="http://directory.fsf.org";>Free Software Directory</a>.
+Check the list of recent updates often to see what's new (and consider
+contributing).</p>
+
+<h3 id="maillist">Mailing Lists</h3>
+<p>There are many <a href="http://lists.gnu.org";>public mailing
+lists</a> related to the GNU Project and the FSF. You can subscribe to
+these lists to keep up with the latest news and developments on GNU
+Projects/Packages and to get general information about GNU/FSF.</p>
+
+<p>Here are some that are good for general info:</p>
+<ul>
+    <li><a href="//www.fsf.org/free-software-supporter/">
+        The Free Software Supporter</a> will keep you up-to-date each
+        month on news and events from the free software movement.  The Free
+        Software Supporter is published in English, Spanish, and
+        French.</li>
+    <li><a href="http://mail.gnu.org/mailman/listinfo/info-gnu";>
+        info-gnu</a>: Announcements and requests for help from the GNU
+        project and the Free Software Foundation.</li>
+    <li><a href="//www.fsf.org/events">FSF Events</a>: Keep
+        up-to-date with events, speeches and conferences featuring
+        Richard Stallman and the FSF staff.</li>
+    <li><a href="http://mail.gnu.org/mailman/listinfo/info-press";>
+        info-press</a>: GNU press announcements.</li>
+</ul>    
+
+<h3 id="usenet">Usenet</h3>
+<p>There are several gnu.* Usenet newsgroups that are good sources of
+information.  This group is useful in keeping up with what's going on
+with GNU:</p>
+<ul>
+    <li>gnu.announce</li>
+</ul>
+
+<h3 id="news">News in Spanish</h3>
+<p>You can get archived news in Spanish about GNU and the FSF
+at <a
+href="http://web.archive.org/web/20160913034809/http://gnuticias.es.gnu.org/";>
+GNUticias</a>. Recent news are available in the Spanish translation of the
+<a href="//www.fsf.org/free-software-supporter/">Free Software
+Supporter</a></p>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>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>.</p>
+
+<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
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations README</a> for
+information on coordinating and submitting translations of this article.</p>
+</div>
+
+<!-- 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 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
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014, 2015, 2017 Free 
Software
+Foundation, Inc.</p>
+
+<p>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>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2017/07/31 13:29:06 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>



reply via email to

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