www/education edu-contents.zh-cn.html edu-proje...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     19/05/03 02:59:53

Modified files:
        education      : edu-contents.zh-cn.html edu-projects.zh-cn.html 
                         edu-resources.zh-cn.html 
        education/po   : edu-contents.zh-cn-en.html 
                         edu-contents.zh-cn.po 
                         edu-projects.zh-cn-en.html 
                         edu-projects.zh-cn.po 
                         edu-resources.zh-cn-en.html 
                         edu-resources.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-contents.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-projects.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-resources.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-contents.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-contents.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-projects.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-projects.zh-cn.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-resources.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-resources.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: edu-contents.zh-cn.html
===================================================================
RCS file: /web/www/www/education/edu-contents.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-contents.zh-cn.html     2 Sep 2018 14:28:28 -0000       1.1
+++ edu-contents.zh-cn.html     3 May 2019 06:59:52 -0000       1.2
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-contents.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.87 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
@@ -31,7 +31,6 @@
 <p><a href="/education/edu-cases.html">案例分析</a></p>
 
 <ul>
-
   <li><a href="/education/edu-cases-argentina.html">é˜¿æ ¹å»·</a>
     <ul>
       <li><a href= "/education/edu-cases-argentina-ecen.html">Escuela Cristiana
@@ -48,26 +47,32 @@
     </ul>
   <!-- end list of cases in India -->
 </li>
-
 <!-- end of India -->
 </ul>
 
 <!-- end of Case Studies -->
-<p><a href="/education/edu-resources.html">è‡ªç”±å­¦ä¹ èµ„æº</a></p>
-
-<p><a href="/education/edu-software.html">教育相关的自由软件</a></p>
+<p><a href="/education/edu-resources.html">教育资源</a></p>
 
 <ul>
+  <li><a href="/education/edu-software.html">教育相关的自由软件</a>
+    <ul>
   <li><a href="/education/edu-software-gcompris.html">GCompris</a></li>
   <li><a href="/education/edu-software-gimp.html">GIMP</a></li>
   <li><a href="/education/edu-software-tuxpaint.html">Tux Paint</a></li>
-</ul>  
+    </ul>      
+  <!-- end list of educational free software -->
+</li>  
 
-<p><a href="/education/edu-projects.html">其他教育团体的项目</a></p>
+  <!-- end educational free software -->
+<li><a href="/education/edu-projects.html">团体和项目</a></li>
+  <li><a href="/education/edu-free-learning-resources.html">è‡ªç”±å­¦ä¹ 
资源</a></li>
+</ul>  
 
-<p><a href="/education/edu-team.html">教育团队</a> </p>
+<!-- end list of educational resources -->
+<p><a href="/education/edu-faq.html">常见问题解答</a></p>
+<p><a href="/education/edu-team.html">教育团队</a></p>
 
-<p><strong>æ–‡ç« </strong></p>
+<p><strong>深度分析</strong></p>
 
 <ul>
   <li><a 
href="/education/edu-why.html">为什么教育机构应该只使用和教授自由软件</a></li>
@@ -114,7 +119,7 @@
 若您想翻译本文，请参看<a 
href="/server/standards/README.translations.html">翻译须知</a>。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016, 2019 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -125,12 +130,12 @@
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2018。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2018-2019。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/09/02 14:28:28 $
+$Date: 2019/05/03 06:59:52 $
 
 <!-- timestamp end -->
 </p>

Index: edu-projects.zh-cn.html
===================================================================
RCS file: /web/www/www/education/edu-projects.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edu-projects.zh-cn.html     15 Dec 2018 14:46:04 -0000      1.3
+++ edu-projects.zh-cn.html     3 May 2019 06:59:52 -0000       1.4
@@ -1,16 +1,18 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-projects.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.87 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>其他教育团体和项目 - GNU工程 - 自由软件基金会</title>
+<title>团体和项目 - GNU工程 - 自由软件基金会</title>
 
 <!--#include virtual="/education/po/edu-projects.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
 <!--#include virtual="/education/education-menu.zh-cn.html" -->
-<p class="edu-breadcrumb"><a href="/education/education.html">教育</a> 
&rarr; 教育项目</p>
+<p class="edu-breadcrumb">
+<a href="/education/education.html">教育</a> &rarr; <a
+href="/education/edu-resources.html">教育资源</a> &rarr; 
团体和项目</p>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -20,17 +22,17 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
-<h2>其他教育团体和项目</h2>
+<h2>团体和项目</h2>
 
 <p>ä¸–ç•Œä¸Šæœ‰å¥½å‡ 
个团体和组织践行着GNU的哲学，它们从事着意在把自由软件带到教育领域的项目。下面列举了一些。如果ä½
 的项目只支持自由软件，而且没有列在下面，请联系我们<a
 href="mailto:address@hidden";> &lt;address@hidden&gt;</a>。</p>
 
-<!-- Add new entries in alphabetical order except for projects directly 
related to GNU who should be listed first -->
+<!-- Add new entries in alphabetical order except for projects directly 
related to GNU, which should be listed first -->
 <dl>
   <dt><a
 
href="http://fsfeurope.org/projects/education/education.en.html";>FSFE教育项目</a></dt>
 
-  <dd>FSFE的教育团队致力于提高教育相å…
³å›¢ä½“对自由软件的认知，并把自由软件的好处带给他们。它还以建立禁止歧视自由软件及å
…¶ç”¨æˆ·çš„æ³•å¾‹æ¡†æž¶ä¸ºç›®æ ‡ã€‚</dd>
+  <dd>&ldquo;FSFE的教育团队致力于提高教育相å…
³å›¢ä½“对自由软件的认知，并把自由软件的好处带给他们。它还以建立禁止歧视自由软件及å
…¶ç”¨æˆ·çš„æ³•å¾‹æ¡†æž¶ä¸ºç›®æ ‡ã€‚&rdquo;</dd>
 
   <dt><a href="http://guri.hipatia.net/";>GURI</a></dt>
 
@@ -48,7 +50,7 @@
    <p>其名字源自希腊哲学家<a 
href="http://en.wikipedia.org/wiki/Hypatia";>Hypatia（希帕提娅）。</a></p>
    </dd>
 
-   <dt><a href="https://www.itschool.gov.in";>address@hidden</a></dt>
+   <dt><a href="https://itschool.gov.in/activities.php";>address@hidden</a></dt>
 
    <dd>address@hidden/Linux操作系统，该系统目前已经被超
过2,600æ‰€çœå†…å­¦æ ¡æ‰€ä½¿ç”¨ã€‚æ•°åƒåæ•™å¸ˆã€å­¦æ 
¡åè°ƒå‘˜å’Œå­¦ç”ŸæŽ¥å—了使用自由软件的培训。</dd> 
 
@@ -58,8 +60,8 @@
    <dd>OFSET推动自由软件在教育系统和课å 
‚中的开发和增强。它诞生于法国，不过其成员来自å…
¨ä¸–界，他们以互联网为沟通手段，为共同的目æ 
‡è€Œåˆä½œå¥‹æ–—。教师、开发人员、翻译人员和作者
之间开诚布公的协作一直是OFSET活动成功的关键。
 
    <p>OFSET团体的一个重要成就是<a
-href="http://www.drgeo.eu";>Dr. Geo</a>ï¼Œè¿™æ˜¯ä¸€ä¸ªè¢«å¹¿æ³›ä½¿ç”¨çš„å‡ 
何教学软件。OFSET还开发了<a
-href="http://usb.freeduc.org";>Freeduc-USB</a>，这是一个含有多个实用课å
 ‚程序的可启动U盘。</p>
+href="/software/dr-geo/">Dr. Geo</a>ï¼Œè¿™æ˜¯ä¸€ä¸ªè¢«å¹¿æ³›ä½¿ç”¨çš„å‡ 
何教学软件。OFSET还开发了<a
+href="http://usb.freeduc.org/index-en.html";>Freeduc-USB</a>，这是一个含有多个实用课å
 ‚程序的可启动U盘。</p>
    </dd>
 
    <dt><a href="http://www.sugarlabs.org/";>Sugar Labs</a></dt>
@@ -102,7 +104,7 @@
 若您想翻译本文，请参看<a 
href="/server/standards/README.translations.html">翻译须知</a>。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2016, 2018, 2019 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -114,12 +116,12 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>å®¡æ ¡</b>：<a 
href="mailto:address@hidden";>&lt;尚卓燃（psiace）&gt;</a>，2018。
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2018。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2018-2019。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/12/15 14:46:04 $
+$Date: 2019/05/03 06:59:52 $
 
 <!-- timestamp end -->
 </p>

Index: edu-resources.zh-cn.html
===================================================================
RCS file: /web/www/www/education/edu-resources.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edu-resources.zh-cn.html    16 Feb 2019 12:59:25 -0000      1.4
+++ edu-resources.zh-cn.html    3 May 2019 06:59:52 -0000       1.5
@@ -1,11 +1,11 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-resources.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.87 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>自由教育资源 - GNU工程 - 自由软件基金会</title>
+<title>教育资源 - GNU工程 - 自由软件基金会</title>
 
 <!--#include virtual="/education/po/edu-resources.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
@@ -21,58 +21,18 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
-<h2>自由教育自由</h2>
+<h2>教育资源</h2>
 
-<h3>教育性的自由软件</h3>
+<p>æœ¬å°èŠ‚å¯ä»¥å¸®åŠ©ä½ æ‰¾åˆ°å„ç§å„æ ·çš„æ•™è‚²ç›¸å…
³çš„èµ„æºï¼Œæ¯”å¦‚ï¼šè‡ªç”±å­¦ä¹ 
的资料、适用于各个阶段教育的自由软件、提供有å…
³è‡ªç”±è½¯ä»¶çš„哲学和技术课程的教育机构、开发教育自由软件的项目和平台、践行
+GNU 
工程之原则并在教育领域弘扬自由软件的团体以及更多。</p> 
 
-<p>在<a
-href="/education/edu-software.html">教育性的自由软件</a>部分，我们会展示一些实例，看看来自å
…
¨ä¸–界的教育机构如何使用自由软件以及如何在实践中践行自由软件带给用户的四项自由。</p>
+<h3>目录</h3>
 
-<div class="edu-note"><p>
-我们在寻找自由的教育性游戏或者
是可用于教育目的的自由游戏的信息。请联系<a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。
-</p></div>
-
-<h3>å…¶ä»–å­¦ä¹ èµ„æº</h3>
-
-<p>è‡ªç”±å­¦ä¹ èµ„æºï¼Œæ­£å¦‚è‡ªç”±è½¯ä»¶ï¼Œå…³ä¹Žè‡ªç”±ï¼Œè€Œæ— å…³ä»·æ 
¼ã€‚它是把自由软件的原则推广到一般的知识和教育材料。知识应该为大众可得并所用，不应该有限制，也不应该被当作资产。知识不是消费品，它不会衰减；知识也不像一双鞋那æ
 ·ä¼šè¢«ç©¿åã€‚çŸ¥è¯†æ˜¯å¤©ç„¶ä¸°å¯Œçš„èµ„æºï¼Œå®ƒè¶Šç”¨è¶Šå¤šï¼šä½ 
è¶Šè¿ç”¨çŸ¥è¯†ã€è¶Šä¼ 
播知识，它对大众的益处就越多。有些政策是为鼓励拥有知识而设计的，有些措施是为阻止人们获得、应用或分享知识而量身定做的，它们都是阻止人类进步的阴谋。</p>
-
-<p>知识自由的原则一直是GNU工程的精髓。在1999年，GNU工程正式引å
…¥<a
-href="/encyclopedia/free-encyclopedia.html">è‡ªç”±ç™¾ç§‘å…¨ä¹¦å’Œå­¦ä¹ 
资源</a>的概念，并由Wikipedia实现。</p>
-
-<p>我们要在此页面列出遵循GNUåŽŸåˆ™çš„å­¦ä¹ èµ„æºå’Œé¡¹ç›®ã€‚å…
¶ä¸­æœ‰äº›æ•™è‚²æœºæž„，它们提供å…
³äºŽè‡ªç”±è½¯ä»¶çš„哲学和技术方面的课程。</p>  
-
-<dl>
-
-<dt><a href="http://www.wikipedia.org";>Wikipedia</a></dt>
-
-<dd>由数以千计来自世界各地的志愿者
合作撰写的Wikipedia就是当下一个最好的例证，它使知识人人可得、人人可用、没有限制。Wikipedia读è€
…å¯ä»¥å¤åˆ¶ã€ä½¿ç”¨å’Œæ”¹ç¼–æ–‡ç« 
，前提是说明来源并且改编后的作品使用和原文一æ 
·çš„发布条款（参看<a
-href="/licenses/copyleft.html">Copyleft</a>）。</dd> 
-
-<dt><a href="http://www.gutenberg.org/wiki/Main_Page";>Gutenberg项目</a></dt>
-
-<dd>该项目按照自由的原则提供通用知识书籍。它发布å…
¬æœ‰é¢†åŸŸä½œå“çš„çº¯æ–‡æœ¬æ•°å­—ç‰ˆã€‚å¦‚æžœä½ 要找一本经å…
¸è‘—作，请从这里开始。
-
-<p>他们非常清楚地解释了出版物中<a
-href="http://www.gutenberg.org/wiki/Gutenberg:No_Cost_or_Freedom%3f";>å…
è´¹å’Œè‡ªç”±çš„不同</a>。</p>
-</dd>
-
-<dt>GNU工程</dt>
-
-<dd>我们维护着一个<a 
href="/doc/other-free-books.html">自由书籍</a>的书单，它主要和自由软件文档有å
…³ï¼Œæˆ‘们还让<a
-href="/manual/manual.html">GNU手册</a>在线可得。所有由<a
-href="http://shop.fsf.org/category/books/";>自由软件基金会</a>出版的书籍都是自由的。</dd>
-
-<dt><a href="http://ftacademy.org/";>自由技术学院</a></dt>
-
-<dd>自由技术学院（FTA）是由多个国家的教育机构发起的联合倡议。å
…¶ç›®æ ‡æ˜¯ä¸ºä¸€ä¸ªå…è®¸å…¨éƒ¨ç”¨æˆ·ä¸å—é™åˆ¶åœ°å­¦ä¹ 
ã€å‚ä¸Žå’Œå‘å±•çŽ°æœ‰çŸ¥è¯†çš„ç¤¾ä¼šæ·»ç –åŠ 
瓦。FTA提供硕士水平的在线自由技术课程。这些课程基于æ 
¡å›­é¡¹ç›®å…¼å®¹æ¡†æž¶ï¼ˆCampus
-Project interoperability frameworkï¼‰å®Œå…¨ç”±åœ¨çº¿è™šæ‹Ÿæ ¡å›­è®²æŽˆã€‚
-
-<p>FTAæ˜¯è‡ªç”±çŸ¥è¯†ç ”ç©¶æ‰€ï¼ˆFree Knowledge Instituteï¼‰ã€è¥¿ç­ç‰™åŠ 
泰罗尼亚开放大学（Open University of
-Catalonia (Spain)）和荷兰开放大学（Open University of the
-Netherlands）之间的å…
±åŒåˆä½œæˆæžœã€‚更多的组织作为联合伙伴提供资金，这些组织的å
…
±åŒåˆ©ç›Šå°±æ˜¯æä¾›è‡ªç”±æŠ€æœ¯è¯¾ç¨‹ã€‚FTA正在不断拓展现有的网络合作伙伴，并鼓励个人和组织为这æ
 ·çš„社会做出贡献。</p></dd>
-
-</dl>
+<ul>
+   <li><a href="/education/edu-software.html">教育性自由软件</a></li>
+   <li><a href="/education/edu-projects.html">团体和项目</a></li>
+   <li><a href="/education/edu-free-learning-resources.html">è‡ªç”±å­¦ä¹ 
资源</a></li>
+</ul>
 
 <div class="translators-notes">
 
@@ -124,7 +84,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2011, 2012, 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016, 2018, 2019 Free Software Foundation, 
Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -140,7 +100,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2019/02/16 12:59:25 $
+$Date: 2019/05/03 06:59:52 $
 
 <!-- timestamp end -->
 </p>

Index: po/edu-contents.zh-cn-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-contents.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-contents.zh-cn-en.html       2 Sep 2018 14:28:28 -0000       1.1
+++ po/edu-contents.zh-cn-en.html       3 May 2019 06:59:52 -0000       1.2
@@ -1,14 +1,12 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.87 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-
 <title>Free Software and Education - Table of Contents
 - GNU Project - Free Software Foundation</title>
-
 <!--#include virtual="/education/po/edu-contents.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
 <!--#include virtual="/education/education-menu.html" -->
+
 <p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
 Education Contents</p>
 <!--GNUN: OUT-OF-DATE NOTICE-->
@@ -18,14 +16,15 @@
 <!--#include virtual="/server/top-addendum.html" -->
 <!--#endif -->
 <!--#endif -->
+
 <h2>Free Software and Education - Table of Contents</h2>
 
 <p>The Education section of the GNU Project is about the importance of 
-using and teaching exclusively Free Software in all educational 
+using and teaching exclusively free software in all educational 
 institutions. It presents articles on the subject, cases of success in 
-implementing Free Software in schools and universities around the world, 
-examples of Free programs used in the classroom to the benefit of 
-teachers and students alike, and Free Software education projects 
+implementing free software in schools and universities around the world, 
+examples of free programs used in the classroom to the benefit of 
+teachers and students alike, and free software education projects 
 carried out by organizations and governments worldwide.</p>
 
 <h3>Table of Contents</h3>
@@ -35,7 +34,6 @@
 <p><a href="/education/edu-cases.html">Case Studies</a></p>
 
 <ul>
-
   <li><a href="/education/edu-cases-argentina.html">Argentina</a>
     <ul>
       <li><a href= "/education/edu-cases-argentina-ecen.html">Escuela 
@@ -51,25 +49,27 @@
            Irimpanam</a></li>
     </ul><!-- end list of cases in India -->
   </li><!-- end of India -->
-
 </ul><!-- end of Case Studies -->
 
-<p><a href="/education/edu-resources.html">Free Learning Resources</a></p>
-
-<p><a href="/education/edu-software.html">Educational Free Software</a></p>
+<p><a href="/education/edu-resources.html">Educational Resources</a></p>
 
 <ul>
+  <li><a href="/education/edu-software.html">Educational Free Software</a>
+    <ul>
   <li><a href="/education/edu-software-gcompris.html">GCompris</a></li>
   <li><a href="/education/edu-software-gimp.html">GIMP</a></li>
   <li><a href="/education/edu-software-tuxpaint.html">Tux Paint</a></li>
-</ul>  
+    </ul><!-- end list of educational free software -->        
+  </li><!-- end educational free software -->  
 
-<p><a href="/education/edu-projects.html">Other Education Groups 
-   Projects</a></p>
+  <li><a href="/education/edu-projects.html">Groups and Projects</a></li>
+  <li><a href="/education/edu-free-learning-resources.html">Free Learning 
Resources</a></li>
+</ul><!-- end list of educational resources -->        
 
-<p><a href="/education/edu-team.html">The Education Team</a> </p>
+<p><a href="/education/edu-faq.html">Frequently Asked Questions</a></p>
+<p><a href="/education/edu-team.html">The Education Team</a></p>
 
-<p><strong>Articles</strong></p>
+<p><strong>In Depth</strong></p>
 
 <ul>
   <li><a href="/education/edu-why.html">Why Educational 
@@ -116,7 +116,7 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016, 2019 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
@@ -126,7 +126,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/09/02 14:28:28 $
+$Date: 2019/05/03 06:59:52 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/edu-contents.zh-cn.po
===================================================================
RCS file: /web/www/www/education/po/edu-contents.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/edu-contents.zh-cn.po    3 May 2019 06:27:06 -0000       1.7
+++ po/edu-contents.zh-cn.po    3 May 2019 06:59:52 -0000       1.8
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-04-30 22:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""

Index: po/edu-projects.zh-cn-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-projects.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/edu-projects.zh-cn-en.html       15 Dec 2018 14:46:06 -0000      1.3
+++ po/edu-projects.zh-cn-en.html       3 May 2019 06:59:52 -0000       1.4
@@ -1,15 +1,16 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.87 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
-<title>Other Education Groups and Projects
-- GNU Project - Free Software Foundation</title>
-
+<title>Groups and Projects - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/education/po/edu-projects.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <!--#include virtual="/education/education-menu.html" -->
-<p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
-Education Projects</p>
+
+<p class="edu-breadcrumb">
+<a href="/education/education.html">Education</a> &rarr; 
+<a href="/education/edu-resources.html">Educational Resources</a> &rarr;
+Groups and Projects</p>
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -17,31 +18,32 @@
 <!--#include virtual="/server/top-addendum.html" -->
 <!--#endif -->
 <!--#endif -->
-<h2>Other Education Groups and Projects</h2>
+
+<h2>Groups and Projects</h2>
 
 <p>There are several groups and organizations around the world who 
-follow the GNU Philosophy and are working on projects aimed at bringing 
-Free Software to the education field. A few of them are listed below. If 
-your project supports only Free Software and it is not listed here, 
+follow the GNU philosophy and are working on projects aimed at bringing 
+free software to the education field. A few of them are listed below. If 
+your project supports only free software and it is not listed here, 
 please contact us at <a href="mailto:address@hidden";>
 &lt;address@hidden&gt;</a> to let us know.</p>
 
-<!-- Add new entries in alphabetical order except for projects directly 
related to GNU who should be listed first -->
+<!-- Add new entries in alphabetical order except for projects directly 
related to GNU, which should be listed first -->
 
 <dl>
   <dt><a href="http://fsfeurope.org/projects/education/education.en.html";>
   FSFE Education Project</a></dt>
 
-  <dd>"FSFE's Education Team exists to raise awareness and bring the
-  benefits of Free Software to all groups involved in education. It aims
-  for a legal framework that prohibits discrimination against Free
-  Software and its users."</dd>
+  <dd>&ldquo;The FSFE's Education Team exists to raise awareness and bring the
+  benefits of free software to all groups involved in education. It aims
+  for a legal framework that prohibits discrimination against free
+  software and its users.&rdquo;</dd>
 
   <dt><a href="http://guri.hipatia.net/";>GURI</a></dt>
 
   <dd>Guri is a group which was born inside an Italian High School as 
   the result of a program carried out by NGO Hipatia to raise awareness 
-  about the role of Free Software in the education field. Guri opposes 
+  about the role of free software in the education field. Guri opposes 
   the growing practice of treating knowledge as if it were a tangible 
   object subject to ownership. It fights to change the mainstream 
   cultural framework in Italy which prevents the exercise of some of 
@@ -50,7 +52,7 @@
   adoption of proprietary, subjugating software.
 
    <p>The goals of the Guri project are to convert the educational 
-   system so that it is based exclusively on Free Software and to extend 
+   system so that it is based exclusively on free software and to extend 
    the freedoms it grants to every field of knowledge. Guri believes in 
    the power of education to shape a better society by teaching students 
    the values of sharing and cooperation. It advocates and works towards 
@@ -60,7 +62,7 @@
 
    <p>To achieve its goals, the group takes action mainly in High School 
    and University environments, organizing workshops and courses to 
-   promote awareness about the ethical principles of Free Software.</p>
+   promote awareness about the ethical principles of free software.</p>
    </dd>
 
    <dt><a href="http://hipatia.net/";>Hipatia</a></dt>
@@ -68,9 +70,9 @@
    <dd>Hipatia is an international NGO (non-governmental organization) 
    that upholds the right of all human beings to access, use, create,
    modify and distribute knowledge. It is formed by people from all 
-   around the world who advocate the ideals of the Free Software 
+   around the world who advocate the ideals of the free software 
    movement and work towards putting those principles into practice.
-   Hipatia emphasizes the importance of using Free Software in education;
+   Hipatia emphasizes the importance of using free software in education;
    to that end, its members often conduct workshops in educational
    institutions, specially in primary and secondary level schools.
 
@@ -78,7 +80,7 @@
    <a href="http://en.wikipedia.org/wiki/Hypatia";>Hypatia.</a></p>
    </dd>
 
-   <dt><a href="https://www.itschool.gov.in";>address@hidden</a></dt>
+   <dt><a href="https://itschool.gov.in/activities.php";>address@hidden</a></dt>
 
    <dd>address@hidden is a project of the government of Kerala, India, 
    started in 2001 to introduce Information Communication Technologies 
@@ -99,9 +101,9 @@
    to the success of OFSET's activities.
 
    <p>One important achievement of the OFSET group is 
-   <a href="http://www.drgeo.eu";>Dr. Geo</a>, a
+   <a href="/software/dr-geo/">Dr. Geo</a>, a
    program widely used for teaching geometry. OFSET has also developed
-   <a href="http://usb.freeduc.org";>
+   <a href="https://usb.freeduc.org/index-en.html";>
    Freeduc-USB</a>, a bootable USB stick that contains useful 
    applications for the classroom.</p>
    </dd>
@@ -146,7 +148,7 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2016, 2018, 2019 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
@@ -156,7 +158,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:06 $
+$Date: 2019/05/03 06:59:52 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/edu-projects.zh-cn.po
===================================================================
RCS file: /web/www/www/education/po/edu-projects.zh-cn.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/edu-projects.zh-cn.po    3 May 2019 06:27:29 -0000       1.9
+++ po/edu-projects.zh-cn.po    3 May 2019 06:59:52 -0000       1.10
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-04-30 22:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Groups and Projects - GNU Project - Free Software Foundation"
@@ -134,8 +133,8 @@
 "The name of the group refers to the Greek philosopher <a href=\"http://en.";
 "wikipedia.org/wiki/Hypatia\">Hypatia.</a>"
 msgstr ""
-"其名字源自希腊哲学家<a href=\"http://en.wikipedia.org/wiki/Hypatia";
-"\">Hypatia（希帕提娅）。</a>"
+"其名字源自希腊哲学家<a 
href=\"http://en.wikipedia.org/wiki/Hypatia\";>Hypatia"
+"（希帕提娅）。</a>"
 
 #. type: Content of: <dl><dt>
 msgid "<a href=\"https://itschool.gov.in/activities.php\";>address@hidden</a>"

Index: po/edu-resources.zh-cn-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-resources.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/edu-resources.zh-cn-en.html      15 Dec 2018 14:46:06 -0000      1.3
+++ po/edu-resources.zh-cn-en.html      3 May 2019 06:59:53 -0000       1.4
@@ -1,13 +1,15 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.87 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-<title>Free Educational Resources
+<title>Educational Resources
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/education/po/edu-resources.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <!--#include virtual="/education/education-menu.html" -->
+
 <p class="edu-breadcrumb">
-<a href="/education/education.html">Education</a> &rarr; Educational 
Resources</p>
+<a href="/education/education.html">Education</a> &rarr; 
+Educational Resources</p>
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -15,99 +17,25 @@
 <!--#include virtual="/server/top-addendum.html" -->
 <!--#endif -->
 <!--#endif -->
-<h2>Free Learning Resources</h2>
-
-<h3>Educational Free Software</h3>
 
-<p>In our <a href="/education/edu-software.html">Educational 
-Free Software</a> section we present some examples of how free programs 
-are being used by educational institutions around the world and how they
-are putting into practice the four freedoms that Free Software grants to 
-all users.</p>
-
-<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>Other Learning Resources</h3>
-
-<p>Free learning resources, like Free Software, is a matter of freedom, 
-not price. It's about bringing the principles of Free Software to 
-general knowledge and educational materials. Knowledge should be usable 
-and accessible to all without restrictions and should not be treated as 
-property. It is not an article of consumer goods that decays over time or 
-wears out with use like a pair of shoes. Knowledge is a naturally abundant 
-resource that improves with usage: the more it is used and passed around, 
-the more it grows for the benefit of all. The introduction of measures 
-designed to favor the ownership of knowledge, tailored to prevent people 
-from accessing, using or sharing knowledge, is a conspiracy to inhibit 
-human progress.</p>
-
-<p>These principles on the freedom of knowledge have always been in the 
-spirit of the GNU Project. In 1999 it formally introduced the concept of a 
-<a href="/encyclopedia/free-encyclopedia.html">Free Universal Encyclopedia 
-and Learning Resource</a>, which was fulfilled by the Wikipedia project.</p>
-
-<p>In these pages we want to list learning resources and projects that
-follow the principles of the GNU Project. Some of them are educational
-institutions who offer courses on the philosophical and technical
-aspects of Free Software.</p>  
-
-<dl>
-
-<dt><a href="http://www.wikipedia.org";>Wikipedia</a></dt>
-
-<dd>Written in collaboration by thousands of volunteers from all over 
-the world, Wikipedia is nowadays the best example of knowledge made 
-available to and usable by anyone without restrictions. Wikipedia readers 
-are allowed to copy, use, and adapt the articles, provided that the source 
-is mentioned and that eventual derivative works are released under the same 
-terms (see <a href="/licenses/copyleft.html">Copyleft</a>).</dd> 
-
-<dt><a href="http://www.gutenberg.org/wiki/Main_Page";>Project
-Gutenberg</a></dt>
-
-<dd>This project offers general knowledge books that are free as in freedom. 
-It publishes plain text digital versions of public-domain works. If you are 
-looking for a copy of a classic book, your search should start here.
-
-<p>They have a very clear explanation about the
-<a href="http://www.gutenberg.org/wiki/Gutenberg:No_Cost_or_Freedom%3f";>
-difference between free as in price and free as in freedom</a> related to 
-printed material.</p>
-</dd>
-
-<dt>GNU Project</dt>
-
-<dd>We maintain a list of <a href="/doc/other-free-books.html">free books</a> 
-mainly related to Free Software documentation, and we make
-<a href="/manual/manual.html">GNU manuals</a> available online. All books 
-published by the
-<a href="http://shop.fsf.org/category/books/";>Free Software Foundation</a> 
-are free as in freedom.</dd>
-
-<dt><a href="http://ftacademy.org/";>Free Technology Academy</a></dt>
-
-<dd>The Free Technology Academy (FTA) is a joint initiative from 
-several educational institutions in various countries. It aims to 
-contribute to a society that permits all users to study, participate and 
-build upon existing knowledge without restrictions. The FTA offers an 
-online master level programme with course modules about Free 
-Technologies. These courses are taught completely online in a virtual 
-campus based on the Campus Project interoperability framework.
-
-<p>The FTA is a collaboration between the Free Knowledge Institute, the 
-Open University of Catalonia (Spain) and the Open University of the 
-Netherlands. A larger group of Associate Partners adds to the founding 
-base with a network of organisations that share a common interest in 
-offering courses in the area of Free Technology. The FTA is extending 
-the current network of partners and collaborations continuously and 
-encourages both individuals and organizations to contribute to the 
-community.</p></dd>
+<h2>Educational Resources</h2>
 
-</dl>
+<p>This section will help you find a variety of resources related to 
+education, such as: free study materials, free programs for 
+educational institutions of all levels, educational institutions that 
+offer courses on the philosophical and technical aspects of free 
+software, projects that develop free programs and platforms for 
+education, groups of people who follow the principles of the GNU 
+Project to promote the use of free software in the educational field, 
+and more.</p> 
+
+<h3>Table of Contents</h3>
+
+<ul>
+   <li><a href="/education/edu-software.html">Educational Free 
Software</a></li>
+   <li><a href="/education/edu-projects.html">Groups and Projects</a></li>
+   <li><a href="/education/edu-free-learning-resources.html">Free Learning 
Resources</a></li>
+</ul>
 
 </div><!-- for id="content", starts in the include above -->
 
@@ -157,7 +85,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2011, 2012, 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016, 2018, 2019 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
@@ -167,7 +95,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:06 $
+$Date: 2019/05/03 06:59:53 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/edu-resources.zh-cn.po
===================================================================
RCS file: /web/www/www/education/po/edu-resources.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/edu-resources.zh-cn.po   3 May 2019 06:26:41 -0000       1.7
+++ po/edu-resources.zh-cn.po   3 May 2019 06:59:53 -0000       1.8
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-04-30 22:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Educational Resources - GNU Project - Free Software Foundation"