www-commits
[Top][All Lists]
Advanced

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

www/education po/education-menu.zh-cn.po po/edu...


From: Therese Godefroy
Subject: www/education po/education-menu.zh-cn.po po/edu...
Date: Sun, 31 May 2020 01:04:35 -0400 (EDT)

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 20/05/31 01:04:34

Modified files:
        education/po   : education-menu.zh-cn.po 
                         edu-cases-argentina-ecen.zh-cn.po 
                         edu-cases-argentina.zh-cn.po 
                         edu-cases-india-ambedkar.zh-cn.po 
                         edu-cases-india-irimpanam.zh-cn.po 
                         edu-cases-india.zh-cn.po edu-cases.zh-cn.po 
                         education.zh-cn.po edu-faq.zh-cn.po 
                         edu-free-learning-resources.zh-cn.po 
                         edu-projects.zh-cn.po edu-resources.zh-cn.po 
                         edu-schools.zh-cn.po 
                         edu-software-gcompris.zh-cn.po 
                         edu-software-gimp.zh-cn.po 
                         edu-software-tuxpaint.zh-cn.po 
                         edu-software.zh-cn.po edu-system-india.zh-cn.po 
                         edu-team.zh-cn.po edu-why.zh-cn.po 
        education/misc/po: edu-misc.zh-cn.po 
        education      : education-menu.zh-cn.html 
                         edu-cases-argentina-ecen.zh-cn.html 
                         edu-cases-argentina.zh-cn.html 
                         edu-cases-india-ambedkar.zh-cn.html 
                         edu-cases-india-irimpanam.zh-cn.html 
                         edu-cases-india.zh-cn.html edu-cases.zh-cn.html 
                         education.zh-cn.html edu-faq.zh-cn.html 
                         edu-free-learning-resources.zh-cn.html 
                         edu-projects.zh-cn.html 
                         edu-resources.zh-cn.html edu-schools.zh-cn.html 
                         edu-software-gcompris.zh-cn.html 
                         edu-software-gimp.zh-cn.html 
                         edu-software-tuxpaint.zh-cn.html 
                         edu-software.zh-cn.html 
                         edu-system-india.zh-cn.html edu-team.zh-cn.html 
                         edu-why.zh-cn.html 
        education/misc : edu-misc.zh-cn.html 

Log message:
        [zh-cn] Locally generate edu*.po + HTML after switch to side menu 
(update from existing strings).

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education-menu.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-cases-argentina-ecen.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-cases-argentina.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-cases-india-ambedkar.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-cases-india-irimpanam.zh-cn.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-cases-india.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-cases.zh-cn.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.zh-cn.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-faq.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-free-learning-resources.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-projects.zh-cn.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-resources.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.zh-cn.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software-gcompris.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software-gimp.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software-tuxpaint.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-system-india.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-team.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-why.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/education/misc/po/edu-misc.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education-menu.zh-cn.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-cases-argentina-ecen.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-cases-argentina.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-cases-india-ambedkar.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-cases-india-irimpanam.zh-cn.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-cases-india.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-cases.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-faq.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-free-learning-resources.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-projects.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-resources.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-schools.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-gcompris.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-gimp.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-tuxpaint.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-system-india.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-team.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-why.zh-cn.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/education/misc/edu-misc.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4

Patches:
Index: po/education-menu.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/education-menu.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/education-menu.zh-cn.po  2 May 2019 13:29:42 -0000       1.4
+++ po/education-menu.zh-cn.po  31 May 2020 05:04:29 -0000      1.5
@@ -2,11 +2,12 @@
 # Copyright (C) 2016-2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2019.
+# May 2020: update to new layout (T. Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: education-menu.html\n"
-"POT-Creation-Date: 2019-04-30 22:58+0000\n"
+"POT-Creation-Date: 2020-05-27 09:23+0200\n"
 "PO-Revision-Date: 2019-05-02 20:30+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -15,29 +16,124 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/education/edu-contents.html\">CONTENTS</a>"
-msgstr "<a href=\"/education/edu-contents.html\">内容</a>"
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/education/edu-cases.html\">CASE&nbsp;STUDIES</a>"
-msgstr "<a href=\"/education/edu-cases.html\">案例分析</a>"
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/education/edu-resources.html\">RESOURCES</a>"
-msgstr "<a href=\"/education/edu-resources.html\">教育资源</a>"
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/education/edu-software.html\">EDUCATIONAL&nbsp;SOFTWARE</a>"
-msgstr "<a href=\"/education/edu-software.html\">教育性软件</a>"
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/education/edu-faq.html\">FAQ</a>"
-msgstr "<a href=\"/education/edu-faq.html\">常见问题解答</a>"
-
-#. type: Content of: <div><ul><li>
-msgid "<a href=\"/education/edu-team.html\">OUR&nbsp;TEAM</a>"
-msgstr "<a href=\"/education/edu-team.html\">教育团队</a>"
+#. type: Content of: <div><div>
+msgid "<a href=\"#content\"><span>BACK TO TOP </span>&#11165;</a>"
+msgstr "<a href=\"#content\"><span>返回顶部</span>&#11165;</a>"
+
+#. type: Content of: <div><div><h3>
+msgid "Education"
+msgstr "教育"
+
+#. type: Content of: <div><div><dl><dt>
+msgid "<a href=\"/education/education.html#content\">Main page</a>"
+msgstr "<a href=\"/education/education.html#content\">教育主页</a>"
+
+#. type: Content of: <div><div><dl><dt>
+msgid "<a href=\"/education/edu-cases.html#content\">Case studies</a>"
+msgstr "<a href=\"/education/edu-cases.html#content\">案例分析</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><li><li>
+msgid "<a href=\"/education/edu-cases-argentina.html#content\">Argentina</a>"
+msgstr "<a href=\"/education/edu-cases-argentina.html#content\">阿根廷</a>"
 
-#~ msgid "<a href=\"/education/edu-projects.html\">PROJECTS</a>"
-#~ msgstr "<a href=\"/education/edu-projects.html\">相关项目</a>"
+#. type: Content of: <div><div><dl><dd><ul><li><li><ul><li>
+msgid ""
+"<a href=\"/education/edu-cases-argentina-ecen.html#content\">ECE Neuquén</a>"
+msgstr ""
+"<a href=\"/education/edu-cases-argentina-ecen.html#content\">ECE Neuquén</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><li><li><li>
+msgid "<a href=\"/education/edu-cases-india.html#content\">India</a>"
+msgstr "<a href=\"/education/edu-cases-india.html#content\">印度</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><li><li><li><ul><li>
+msgid ""
+"<a href=\"/education/edu-cases-india-ambedkar.html#content\">Ambedkar "
+"Center</a>"
+msgstr ""
+"<a 
href=\"/education/edu-cases-india-ambedkar.html#content\">Ambedkar社区计算"
+"中心</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><li><li><li><ul><li>
+msgid ""
+"<a href=\"/education/edu-cases-india-irimpanam.html#content\">VHSS "
+"Irimpanam</a>"
+msgstr ""
+"<a href=\"/education/edu-cases-india-irimpanam.html#content\">VHSS "
+"Irimpanam</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dt>
+msgid "<a href=\"/education/edu-resources.html#content\">Resources</a>"
+msgstr "<a href=\"/education/edu-resources.html#content\">教育资源</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><ul><li><li>
+msgid ""
+"<a href=\"/education/edu-software.html#content\">Educational Software</a>"
+msgstr "<a href=\"/education/edu-software.html#content\">教育性软件</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><ul><li><li><ul><li>
+msgid "<a href=\"/education/edu-software-gcompris.html#content\">Gcompris</a>"
+msgstr "<a href=\"/education/edu-software-gcompris.html#content\">Gcompris</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><ul><li><li><ul><li>
+msgid "<a href=\"/education/edu-software-gimp.html#content\">Gimp</a>"
+msgstr "<a href=\"/education/edu-software-gimp.html#content\">Gimp</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><ul><li><li><ul><li>
+msgid "<a href=\"/education/edu-software-tuxpaint.html#content\">Tux Paint</a>"
+msgstr ""
+"<a href=\"/education/edu-software-tuxpaint.html#content\">Tux Paint</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><ul><li><li>
+msgid ""
+"<a href=\"/education/edu-projects.html#content\">Groups &amp; projects</a>"
+msgstr "<a href=\"/education/edu-projects.html#content\">团体和项目</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><ul><li><li>
+msgid ""
+"<a href=\"/education/edu-free-learning-resources.html#content\">Free "
+"learning resources</a>"
+msgstr "<a href=\"/education/edu-resources.html#content\">教育资源</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><dt>
+msgid "<a href=\"/education/edu-faq.html#content\">FAQ</a>"
+msgstr "<a href=\"/education/edu-faq.html#content\">常见问题解答</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><dt>
+msgid "<a href=\"/education/edu-team.html#content\">Our team</a>"
+msgstr "<a href=\"/education/edu-team.html#content\">教育团队</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><dt>
+msgid "In depth"
+msgstr "深度分析"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><dd><ul><li>
+msgid ""
+"<a href=\"/education/edu-why.html#content\">Why educational institutions "
+"should use and teach free software</a>"
+msgstr ""
+"<a 
href=\"/education/edu-why.html#content\">为什么教育机构应该只使用和教授自"
+"由软件</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><dd><ul><li>
+msgid ""
+"<a href=\"/education/edu-schools.html#content\">Why schools should "
+"exclusively use free software</a>"
+msgstr ""
+"<a href=\"/education/edu-schools.html#content\">为什么学æ 
¡åº”该只使用自由软件"
+"</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><dd><ul><li>
+msgid ""
+"<a href=\"/education/edu-system-india.html#content\">The education system in "
+"India</a>"
+msgstr ""
+"<a 
href=\"/education/edu-system-india.html#content\">印度的教育体系</a>"
+
+#. type: Content of: <div><div><dl><dd><ul><dt><dd><dt>
+msgid ""
+"<a href=\"/education/misc/misc.html#content\">Miscellaneous materials</a>"
+msgstr "<a href=\"/education/misc/edu-misc.html#content\">å…
¶ä»–教育材料</a>"
+
+#~ msgid "<a href=\"/education/edu-team.html\">OUR&nbsp;TEAM</a>"
+#~ msgstr "<a href=\"/education/edu-team.html\">教育团队</a>"

Index: po/edu-cases-argentina-ecen.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-cases-argentina-ecen.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-cases-argentina-ecen.zh-cn.po        2 Dec 2017 01:44:16 -0000       
1.1
+++ po/edu-cases-argentina-ecen.zh-cn.po        31 May 2020 05:04:30 -0000      
1.2
@@ -2,11 +2,12 @@
 # Copyright (C) 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2017.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-cases-argentina-ecen.html\n"
-"POT-Creation-Date: 2016-09-13 15:55+0000\n"
+"POT-Creation-Date: 2020-05-27 11:13+0200\n"
 "PO-Revision-Date: 2017-12-02 09:39+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn.translators@gnu.org>\n"
@@ -22,23 +23,45 @@
 msgstr ""
 "Escuela Cristiana Evangélica de Neuquén (ECEN) - GNU工程 - 
自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-cases.html\">Case Studies</a> &rarr; <a href=\"/education/edu-"
-"cases-argentina.html\">Argentina</a> &rarr; Escuela Cristiana Evangélica de "
-"Neuquén (ECEN)"
-msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"edu-cases.html\">案例分析</a> &rarr; <a href=\"/education/edu-cases-"
-"argentina.html\">阿根廷</a> &rarr; Escuela Cristiana Evangélica de 
Neuquén "
-"(ECEN)"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/edu-cases.html\">Case&nbsp;Studies</a>&nbsp;/ <a href=\"/"
+"education/edu-cases-argentina.html\">Argentina</a>&nbsp;/"
+msgstr ""
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-cases.html\">案例分析</a>&nbsp;/ <a href=\"/education/edu-"
+"cases-argentina.html\">阿根廷</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Escuela Cristiana Evangélica de Neuquén (ECEN)"
 msgstr "Escuela Cristiana Evangélica de Neuquén (ECEN)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The following information was extracted from a report submitted to us by "
 "ECEN Elementary Teacher Debora Badilla Huento. Her commitment played a key "
@@ -48,11 +71,11 @@
 "以下信息摘自一份由ECEN小学教师Debora Badilla 
Huento提交给我们的报告。她的努力"
 "对自由软件的推广起了关键作用,从而最终使该学æ 
¡è½¬å‘自由软件。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Location"
 msgstr "地点"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "City of Neuquén, capital of the <a href=\"http://en.wikipedia.org/wiki/";
 "Neuquen_Province\"> Province of Neuquén</a>, in the Argentine Patagonia "
@@ -61,11 +84,11 @@
 "Neuquén市,<a 
href=\"http://en.wikipedia.org/wiki/Neuquen_Province\";>Neuquén"
 "省</a>的省会,处在阿根廷Patagonia地区。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "About"
 msgstr "关于"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We are a private Christian school providing education from pre-elementary to "
 "high school levels in accord with state educational requirements."
@@ -73,7 +96,7 @@
 "我们是一所私立的基督教学校,我们按ç…
§æ”¿åºœçš„教育要求提供学前到高中各阶段的教"
 "育。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In Argentina, each province develops its own educational policy. In the case "
 "of the province of Neuquén, teaching computer science at elementary schools "
@@ -82,11 +105,11 @@
 "在阿æ 
¹å»·ï¼Œæ¯ä¸ªçœä¼šå‘展自己的教育政策。就Neuquén省来说,在小学教授计算机科学并"
 "不是强制的。实际
上,计算机科学是教学大纲之外的科目。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Motivation"
 msgstr "动机"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Our school advocates the ideals of solidarity, honesty, excellence in "
 "education, the observance of law, the constant search for truth, justice and "
@@ -100,7 +123,7 @@
 "领导及教师也被软件许可证的管理和这些许可证带给学æ 
¡çš„诸多限制搞得焦头烂额、不"
 "知所措。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Educational quality and long term goals were also taken into account during "
 "the decision process. It is our understanding that training students on how "
@@ -109,11 +132,11 @@
 "教学质量和长期目æ 
‡ä¹Ÿåœ¨å†³ç­–过程中有所考量。我们一致认为训练学生使用某种品牌的"
 "软件远远背离了学校的使命。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "How We Did It"
 msgstr "我们如何做到"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The whole process lasted four years: we started in 2006 with all our work "
 "stations using proprietary software and concluded in 2010 with full free "
@@ -123,7 +146,7 @@
 
"整个过程持续了四年:从2006年开始时我们所有的服务器使用的都是专属软件,到2010"
 "年完成时学æ 
¡æ‰€æœ‰çš„计算机都使用自由的操作系统和程序,包括管理办å…
¬å®¤å’Œå›¾ä¹¦é¦†ã€‚"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The plan consisted mainly of several measures aimed at raising awareness "
 "about the philosophical, ethical and socio-political implications of the use "
@@ -135,7 +158,7 @@
 
"会政治方面的潜在影响的认知。这个基本点在整个过程中被维持和强调,并在用自由软"
 "件代替现有专属软件的活动中逐渐实施。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "During the first year we introduced some theoretical courses, namely "
 "\"Computer Science History\" and \"Introduction to Computer Architecture\".  "
@@ -147,7 +170,7 @@
 "涉及了软件相å…
³çš„法律,比如各种许可证,并探讨了自由软件用户和开发者
对社区的承"
 "诺。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Training courses were given to high school level teachers in the IT and all "
 "other areas, to teachers of the elementary level, to the Board of Directors "
@@ -156,11 +179,11 @@
 "我们的培训课程覆盖到高中IT教师和å…
¶ä»–所有科目的教师、小学教师、学校管理层和管"
 "理人员以及图书管理员。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The following human resources were employed to carry out the migration:"
 msgstr "以下人员参与了此项软件迁移活动:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "1 Computer Science teacher for the pre-elementary and elementary levels. "
 "This teacher is also in charge of maintaining the computers in the classroom "
@@ -170,31 +193,31 @@
 
"1个学前和小学班级的计算机科学教师。该教师还负责维护教室里的计算机和使学æ
 ¡å…¶ä»–"
 "雇员的计算机操作系统水平达标。"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "5 Computer Science teachers for the high school Level."
 msgstr "5个高中班级的计算机科学教师。"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "1 PC and network technician in charge of repairing the computers of the high "
 "school level."
 msgstr "1个电脑和网络技术员,负责维修高中班级的计算机。"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "1 Free Software programmer hired to write the Administrative Management "
 "System."
 msgstr "1个雇来的自由软件程序员,负责编写行政管理系统。"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "1 IT Professor hired to qualify the school staff."
 msgstr "1个雇来的IT教授,负责使学校员工达标。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Migration costs were affordable and well within the school's budget:"
 msgstr "系统迁移的花费完全在学校的预算可控范围, 
并且负担不大:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "PC Repairs: In 2006, ECEN hired a computer technician who was provided with "
 "Free Software documentation and a DVD of the operating system in use. The "
@@ -203,46 +226,46 @@
 
"电脑维修:在2006年,ECEN雇用了一个计算机技术员,他提供自由软件文档和一个要用"
 "的操作系统DVD。学校从此一直和他合作。"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "Training: 60 training hours to qualify the school staff."
 msgstr "培训:一共花费60个小时培训来使学校员工达标。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Commitment to Free Software"
 msgstr "对自由软件的承诺"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "As of 2010, we are using fully free operating systems, non in dual boot, as "
 "follows:"
 msgstr "在2010年,我们完å…
¨ä½¿ç”¨è‡ªç”±è½¯ä»¶ï¼Œæ²¡æœ‰åŒå¯åŠ¨ç³»ç»Ÿï¼Œå¦‚下:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "22 PC in the pre-elementary and primary classrooms (4-12 years old students)"
 msgstr "22台用于学前和小学班级的计算机(4-12岁的学生)"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "24 PC in the high school classrooms (13-17 years old students)"
 msgstr "24台用于高中班级的计算机(13-17岁的学生)"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "7 PC in the administration offices"
 msgstr "7台用于行政办公室的计算机"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "3 PC in the library"
 msgstr "3台用于图书馆的计算机"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "1 notebook in the video classroom"
 msgstr "1台用于视频教室的笔记本电脑"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Some of the Free Libre programs we use are:"
 msgstr "我们使用的部分自由软件是:"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Office automation: <a href=\"http://directory.fsf.org/wiki/LibreOffice";
 "\">LibreOffice</a>"
@@ -250,15 +273,15 @@
 "办公自动化:<a href=\"http://directory.fsf.org/wiki/LibreOffice";
 "\">LibreOffice</a>"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "Typing: <a href=\"http://directory.fsf.org/wiki/KTouch\";>KTouch</a>"
 msgstr "打字:<a href=\"http://directory.fsf.org/wiki/KTouch\";>KTouch</a>"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid "Graphic design: <a href=\"http://directory.fsf.org/wiki/GIMP\";>GIMP</a>"
 msgstr "图画设计:<a href=\"http://directory.fsf.org/wiki/GIMP\";>GIMP</a>"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Architectural design: <a href=\"http://directory.fsf.org/wiki/QCad_-";
 "_Community_Edition\">QCad</a>"
@@ -266,29 +289,29 @@
 "建筑设计:<a 
href=\"http://directory.fsf.org/wiki/QCad_-_Community_Edition";
 "\">QCad</a>"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Graphical design: <a href=\"http://directory.fsf.org/wiki/Scribus\";>Scribus</"
 "a>"
 msgstr ""
 "图形设计:<a href=\"http://directory.fsf.org/wiki/Scribus\";>Scribus</a>"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Video: <a href=\"http://www.openshotvideo.com/\";>OpenShot Video Editor</a>"
 msgstr "视频:<a 
href=\"http://www.openshotvideo.com/\";>OpenShot视频编辑器</a>"
 
-#. type: Content of: <div><ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "3D animation: <a href=\"http://directory.fsf.org/wiki/Blender\";>Blender</a>"
 msgstr ""
 "三维动画:<a href=\"http://directory.fsf.org/wiki/Blender\";>Blender</a>"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Results"
 msgstr "结果"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We found the migration experience quite positive and we decided to adopt a "
 "Free Software environment for all work stations. In October 2009 the school "
@@ -297,7 +320,7 @@
 
"我们发现迁移的体验非常正面。我们决定所有的工作站也采用自由软件系统。在2009年"
 "10月,学校在San Martín de los Andes市举办了自由软件日。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Although it required dedication and perseverance, the process was pleasant.  "
 "Now we disseminate what we've learned in order to help other educational "
@@ -306,18 +329,14 @@
 
"虽然它需要奉献和坚韧,整个过程还是令人愉悦的。现在我们ä¼
 æ’­æˆ‘们所学,以帮助其"
 "他教育社区。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We would like to express our appreciation for the excellent work done to all "
 "the people involved in the migration effort."
 msgstr "我们感谢所有在此迁移过程中做出努力的人,你
们的工作是卓越的。"
 
-#. type: Content of: <p>
-msgid "<a href=\"/education/edu-cases.html\">Back to Case Studies</a>"
-msgstr "<a href=\"/education/edu-cases.html\">返回案例分析</a>"
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -334,9 +353,7 @@
 "系方法</a>联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮件到"
 "<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -344,22 +361,22 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>获取有关协调和提交翻译的相关事项。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -382,3 +399,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最后更新:"
+
+#~ msgid "<a href=\"/education/edu-cases.html\">Back to Case Studies</a>"
+#~ msgstr "<a href=\"/education/edu-cases.html\">返回案例分析</a>"

Index: po/edu-cases-argentina.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-cases-argentina.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-cases-argentina.zh-cn.po     31 Aug 2018 13:57:51 -0000      1.1
+++ po/edu-cases-argentina.zh-cn.po     31 May 2020 05:04:30 -0000      1.2
@@ -2,11 +2,12 @@
 # Copyright (C) 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2018.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-cases-argentina.html\n"
-"POT-Creation-Date: 2016-09-13 15:55+0000\n"
+"POT-Creation-Date: 2020-05-27 11:13+0200\n"
 "PO-Revision-Date: 2018-08-30 21:10+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -16,22 +17,48 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Case Studies in Argentina - GNU Project - Free Software Foundation"
-msgstr "阿根廷的案例分析 - GNU工程 - 自由软件基金会"
+msgid ""
+"Education - Case Studies in Argentina - GNU Project - Free Software "
+"Foundation"
+msgstr "教育 - 阿根廷的案例分析 - GNU工程 - 自由软件基金会"
+
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-cases.html\">Case Studies</a> &rarr; Argentina"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/edu-cases.html\">Case&nbsp;Studies</a>&nbsp;/"
 msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"edu-cases.html\">案例分析</a> &rarr; 阿根廷"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-cases.html\">案例分析</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Case Studies in Argentina"
 msgstr "阿根廷的案例分析"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Argentina's administrative territory is divided into twenty three political "
 "autonomous states called provinces. These provinces develop their own "
@@ -46,13 +73,13 @@
 "Wikipedia学习更多关于<a href= \"http://en.wikipedia.org/wiki/";
 "Argentina#Education\">阿根廷教育系统</a>的知识。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Below are listed some of the educational institutions in Argentina who are "
 "using Free Software."
 msgstr "下面列举了一些使用自由软件的阿根廷教育机构。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href= \"/education/edu-cases-argentina-ecen.html\"> Escuela Cristiana "
 "Evang&eacute;lica de Neuqu&eacute;n (ECEN)</a>"
@@ -60,7 +87,7 @@
 "<a href= \"/education/edu-cases-argentina-ecen.html\"> Escuela Cristiana "
 "Evang&eacute;lica de Neuqu&eacute;n (ECEN)</a>"
 
-#. type: Content of: <ul><li><p>
+#. type: Content of: <div><div><ul><li><p>
 msgid ""
 "An elementary teacher with little technical skills manages to get her school "
 "to completely migrate to Free Software on the grounds that proprietary "
@@ -69,12 +96,8 @@
 "一个几乎没有什么技术的小学老师设法使她的学æ 
¡è¿ç§»åˆ°å®Œå…¨ä½¿ç”¨è‡ªç”±è½¯ä»¶ï¼Œå…¶å‡†åˆ™å°±"
 "是专属软件和学校所要促进的道德与伦理格格不入。"
 
-#. type: Content of: outside any tag (error?)
-msgid "<a href=\"/education/edu-cases.html\">Back to Case Studies</a>"
-msgstr "<a href=\"/education/edu-cases.html\">返回到案例分析</a>"
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -91,9 +114,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -101,22 +122,22 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011, 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2011, 2015, 2016, 2020 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011, 2015, 2016, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -139,3 +160,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最后更新:"
+
+#~ msgid "<a href=\"/education/edu-cases.html\">Back to Case Studies</a>"
+#~ msgstr "<a href=\"/education/edu-cases.html\">返回到案例分析</a>"

Index: po/edu-cases-india-ambedkar.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-cases-india-ambedkar.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/edu-cases-india-ambedkar.zh-cn.po        30 Aug 2018 12:57:48 -0000      
1.7
+++ po/edu-cases-india-ambedkar.zh-cn.po        31 May 2020 05:04:30 -0000      
1.8
@@ -2,11 +2,12 @@
 # Copyright (C) 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2017, 2018.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-cases-india-ambedkar.html\n"
-"POT-Creation-Date: 2018-08-26 15:57+0000\n"
+"POT-Creation-Date: 2020-05-27 10:41+0200\n"
 "PO-Revision-Date: 2018-08-30 20:47+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -21,31 +22,55 @@
 "Foundation"
 msgstr "Ambedkar社区计算中心(AC3) - GNU工程 - 
自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div><div><div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-cases.html\">Case Studies</a> &rarr; <a href=\"/education/edu-"
-"cases-india.html\">India</a> &rarr; Ambedkar Community Computing Center (AC3)"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/edu-cases.html\">Case&nbsp;Studies</a>&nbsp;/ <a href=\"/"
+"education/edu-cases-india.html\">India</a>&nbsp;/"
 msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"edu-cases.html\">案例分析</a> &rarr; <a 
href=\"/education/edu-cases-india."
-"html\">印度</a> &rarr; Ambedkar社区计算中心(AC3)"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-cases.html\">案例分析</a>&nbsp;/ <a href=\"/education/edu-"
+"cases-india.html\">印度</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Ambedkar Community Computing Center (AC3)"
 msgstr "Ambedkar社区计算中心(AC3)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The following information was submitted to us by the group of volunteers "
 "working at the Center."
 msgstr "以下信息是由在该计算中心工作的一组志愿者
提交给我们的。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Location"
 msgstr "地点"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The Center is located in the Sudharshan Layout off Bannerghatta Road in "
 "Bangalore, <a href=\"http://en.wikipedia.org/wiki/Karnataka#Education\";> "
@@ -54,11 +79,11 @@
 
"该中心位于Bangalore市Bannerghatta路外的Sudharshan规划区,属于印度的<a
 href="
 "\"http://en.wikipedia.org/wiki/Karnataka#Education\";>Karnataka省</a>。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "About"
 msgstr "关于"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The <a href=\"https://web.archive.org/web/20180216204910/http://slumdweller.";
 "wikispaces.com/Community+Computing+Center\"> Ambedkar Community Computing "
@@ -71,7 +96,7 @@
 "立、也不是å…
¬ç«‹æ•™è‚²æœºæž„,它是一个由一群年轻人运作的计算教育中心,这些年轻人来"
 "自一个名叫Ambedkar 
Sanga的本地组织,它在该地区的贫民区活动。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The Center was founded in 2007 in an effort to bring the world of computers "
 "close to underprivileged children and youths who otherwise would have little "
@@ -80,18 +105,18 @@
 
"该中心创立于2007年,致力于给社会底层的少年儿童打开计算机世界的大门,否则他们"
 "就极少有机会接触这项技术。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The group consists of around 15 children and young boys and girls from 13 to "
 "23 years old. They attend classes 3 times a week for 2 hours each session."
 msgstr ""
 
"该组织大约由从13岁到23岁的15个年轻男女构成。他们每周参åŠ
 ä¸‰æ¬¡è¯¾ç¨‹ï¼Œæ¯æ¬¡2小时。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Motivation"
 msgstr "动机"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The area in which this Center is located lacks even the most basic living "
 "conditions. We feel that the kids from this place should get a good thirst "
@@ -102,25 +127,21 @@
 
"的同时也会对自由有深深的渴望,自由软件正好可以用于此目的。自由软件就是谈论自"
 "由的方法之一。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "How We Did It"
 msgstr "我们如何做到"
 
-#. type: Content of: <div><div><a>
+#. type: Content of: <div><div><div><a>
 msgid "<a href=\"/education/misc/ambedkar.jpg\">"
 msgstr "<a href=\"/education/misc/ambedkar.jpg\">"
 
-#. type: Attribute 'alt' of: <div><div><a><img>
+#. type: Attribute 'alt' of: <div><div><div><a><img>
 msgid ""
 "Image of a student handing a copy of the essay 'The Future is Ours' to "
 "Richard Stallman."
 msgstr 
"图中,一位学生把‘未来是我们的’一文的复印件交给Richard
 Stallman。"
 
-#. type: Content of: <div><div>
-msgid "</a>"
-msgstr "</a>"
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "No migration process was involved. We are Free Software advocates so we "
 "started directly by installing Free Software in all computers in use; "
@@ -134,17 +155,17 @@
 
"题是缺乏硬件。我们只使用笔记本电脑,并且我们需要尽可能多的电脑。我们依é
 æåŠ©"
 "来完成这些工作。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Commitment to Free Software"
 msgstr "对自由软件的承诺"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We have five work stations, all of which are laptops and all of them run "
 "fully free operating systems."
 msgstr "我们有5个工作站,全部是笔记本电脑,并且å…
¨éƒ¨éƒ½è¿è¡Œå®Œå…¨çš„自由操作系统。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "All of the programs we use are Free Libre software. For example, we use <a "
 "href=\"http://www.libreoffice.org/\";>LibreOffice</a> for spreadsheets and "
@@ -155,11 +176,11 @@
 "\">LibreOffice</a>做电子表格和常规文档编辑,使用<a 
href=\"http://directory.";
 "fsf.org/wiki/GIMP\">GIMP</a>处理图形图像。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Results"
 msgstr "结果"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Browsing the web using Free Software helps these young boys and girls to "
 "have access to the external world in safety and confidence. Free Libre "
@@ -169,7 +190,7 @@
 "使用自由软件浏览网络帮助孩子们安å…
¨å’Œè‡ªä¿¡åœ°äº†è§£å¤–面的世界。像GIMP这样的自由图"
 "形图像处理软件让他们可以自由自在地展示自己的创造
力。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "<a href=\"/education/edu-software-gimp.html#Mani\">One of the "
 "underprivileged kids</a> who attends classes at the Center has achieved a "
@@ -183,7 +204,7 @@
 
"件会议上展示并出售。右边的图片就是他把一篇名为&ldquo;未来是我们的&rdquo;的文"
 "章副本献给Richard Stallman,照片拍摄于我们中心。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Some of the kids who attend our classes also take computing courses at "
 "school. They report that the skills they learn at the Center are of "
@@ -192,7 +213,7 @@
 "其中一些孩子在学校也参加
了计算课程。他们汇报说在中心学到的技术非常有价值,帮"
 "助他们学习并成功通过学校的课程。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We are informed that the outstanding effort of Free Software volunteers is "
 "expanding in these deprived areas of the city, with remarkable results. If "
@@ -203,7 +224,7 @@
 "意为该组织贡献或捐献笔记本电脑,请通过<a 
href=\"mailto:education@gnu.org";
 "\">&lt;education@gnu.org&gt;</a>联系我们。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The image on this page is licensed under the CC-BY-SA, <a rel=\"license\" "
 "href=\"http://creativecommons.org/licenses/by-sa/3.0/\";> Creative Commons "
@@ -213,17 +234,8 @@
 "org/licenses/by-sa/3.0/\"> Creative Commons Attribution-Share Alike 3.0 "
 "Unported License</a>授权。"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/education/edu-cases-india.html\">More Case Studies in India</a>"
-msgstr "<a 
href=\"/education/edu-cases-india.html\">更多印度的案例分析</a>"
-
-#. type: Content of: <p>
-msgid "<a href=\"/education/edu-cases.html\">Back to Case Studies</a>"
-msgstr "<a href=\"/education/edu-cases.html\">返回案例分析</a>"
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -240,9 +252,7 @@
 "系方法</a>联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮件到"
 "<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -250,23 +260,24 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>获取有关协调和提交翻译的相关事项。"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011, 2012, 2016, 2018 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2012, 2016, 2018 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2011, 2012, 2016, 2018, 2020 Free Software Foundation, Inc."
+msgstr ""
+"Copyright &copy; 2011, 2012, 2016, 2018, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -290,5 +301,12 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
+#~ msgid ""
+#~ "<a href=\"/education/edu-cases-india.html\">More Case Studies in India</a>"
+#~ msgstr "<a 
href=\"/education/edu-cases-india.html\">更多印度的案例分析</a>"
+
+#~ msgid "<a href=\"/education/edu-cases.html\">Back to Case Studies</a>"
+#~ msgstr "<a href=\"/education/edu-cases.html\">返回案例分析</a>"
+
 #~ msgid "Copyright &copy; 2011, 2012, 2016 Free Software Foundation, Inc."
 #~ msgstr "Copyright &copy; 2011, 2012, 2016 Free Software Foundation, Inc."

Index: po/edu-cases-india-irimpanam.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-cases-india-irimpanam.zh-cn.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/edu-cases-india-irimpanam.zh-cn.po       23 Nov 2019 14:29:13 -0000      
1.9
+++ po/edu-cases-india-irimpanam.zh-cn.po       31 May 2020 05:04:30 -0000      
1.10
@@ -2,11 +2,12 @@
 # Copyright (C) 2017-2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2017-2019.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-cases-india-irimpanam.html\n"
-"POT-Creation-Date: 2019-11-21 07:55+0000\n"
+"POT-Creation-Date: 2020-05-27 11:13+0200\n"
 "PO-Revision-Date: 2019-11-23 21:58+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -21,32 +22,55 @@
 "Foundation"
 msgstr "Irimpanam高级职业中学 - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div><div><div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-cases.html\">Case Studies</a> &rarr; <a href=\"/education/edu-"
-"cases-india.html\">India</a> &rarr; Vocational Higher Secondary School "
-"Irimpanam"
-msgstr ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-cases.html\">案例分析</a> &rarr; <a href=\"/education/edu-"
-"cases-india.html\">印度</a> &rarr; Irimpanam高级职业中学"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/edu-cases.html\">Case&nbsp;Studies</a>&nbsp;/ <a href=\"/"
+"education/edu-cases-india.html\">India</a>&nbsp;/"
+msgstr ""
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-cases.html\">案例分析</a>&nbsp;/ <a href=\"/education/edu-"
+"cases-india.html\">印度</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Vocational Higher Secondary School Irimpanam"
 msgstr "Irimpanam高级职业中学"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The following report is based on information provided to us by the school's "
 "staff."
 msgstr "下述报告æ 
¹æ®è¯¥ä¸­å­¦æ•™èŒå‘˜å·¥ä¸ºæˆ‘们提供的信息完成。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Location"
 msgstr "地点"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The school is located in Irimpanam, an area close to the city of "
 "Tripunithura, in the Ernakulam district of the <a href=\"http://en.wikipedia.";
@@ -55,13 +79,13 @@
 "我们中学位于Irimpanam,接近Tripunithura市,属于印度<a 
href=\"http://en.";
 "wikipedia.org/wiki/Kerala#Education\">Kerala州</a>的Ernakulam区。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "About"
 msgstr "关于"
 
 #. a href="http://vhssirimpanam.org/";
 #. /a
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Founded in 1940, the Vocational Higher Secondary School Irimpanam is a "
 "privately owned school aided by the State. It offers instruction from Upper "
@@ -72,11 +96,11 @@
 
"高年级到高中(分别是5年级到7年级和8年级到10年级)的教育。差不多有1,000名从10"
 "岁到15岁的学生在此求学。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Motivation"
 msgstr "动机"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Our institution took special interest in promoting the main aspects of the "
 "philosophy of the GNU Project, such as the freedom to share knowledge and "
@@ -94,11 +118,11 @@
 
"http://www.ilug-cochin.org/\";>印度自由用户组(ILUG-Cochin)</a>组织的一些学ä¹
 "
 "会议。参加
这些会议也帮助我们和自由软件社区保持紧密的联系。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "How We Did It"
 msgstr "我们如何做到"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The migration to Free Software in our school was the result of a project "
 "designed and established by the Government of Kerala, called <a href="
@@ -110,23 +134,19 @@
 "itschool.gov.in/otherprograms.php\">IT@School</a> 
项目。该项目始于2001年,涉"
 "及到Kerala的数千所学校,到2006年它完全使用自由软件。"
 
-#. type: Content of: <div><div><a>
+#. type: Content of: <div><div><div><a>
 msgid "<a href=\"/education/misc/irimpanam-school.jpg\">"
 msgstr "<a href=\"/education/misc/irimpanam-school.jpg\">"
 
-#. type: Attribute 'alt' of: <div><div><a><img>
+#. type: Attribute 'alt' of: <div><div><div><a><img>
 msgid "Image of students at a Free Software event."
 msgstr "学生们参加自由软件活动的图片。"
 
-#. type: Content of: <div><div>
-msgid "</a>"
-msgstr "</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><p>
 msgid "Students at a Free Software event organized by SSK VHSS Irimpanam."
 msgstr "学生们参加由SSK VHSS Irimpanam组织的自由软件活动。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Training courses for teachers were implemented by the government to teach us "
 "the basics of the new Free Operating System and how to install it. The new "
@@ -145,7 +165,7 @@
 "续的支持。在一次由SPACE组织的讲习
班上,他们帮助我们使用自由软件创建了学校的网"
 "站。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Training was not limited to software, it also included teaching the basics "
 "of hardware maintenance to teachers and students. In our school, 10 years "
@@ -154,7 +174,7 @@
 "培训不限于软件,也包
括向老师和学生讲授硬件维护的基本知识。在我æ 
¡ï¼Œ10岁的学生"
 "都知道如何装配个人电脑。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The use of Free programs in the classroom was facilitated by the "
 "implementation of training modules aimed at instructing teachers on the use "
@@ -170,7 +190,7 @@
 "的培训模块是如何使用<a 
href=\"http://directory.fsf.org/wiki/Chemtool";
 "\">Chemtool</a>来描画有机分子,还有更多其他的模块。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Other training activities were conducted jointly by the school and ILUG-"
 "Cochin to teach us the use of different Free Software applications such as "
@@ -179,7 +199,7 @@
 "其他一些培训活动由学æ 
¡å’ŒILUG-Cochin联合组织,教授我们各种自由软件应用程序,比"
 "如Blender、Inkscape以及命令行。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The school has also opened an <a href=\"http://en.wikipedia.org/wiki/";
 "Internet_Relay_Chat\">IRC</a> channel where students can ask questions about "
@@ -188,11 +208,11 @@
 "学校还开了一个<a 
href=\"http://en.wikipedia.org/wiki/Internet_Relay_Chat";
 "\">IRC</a>频道,学生们可以在此提问。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Commitment to Free Software"
 msgstr "保证使用自由软件"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "At the beginning the new system was used on a dual-boot basis, because we "
 "teachers were not familiar with Free Software, but we soon got acquainted "
@@ -205,7 +225,7 @@
 
"我们就熟悉了新系统的大部分功能。现在,我们的电脑没有安è£
…任何专有软件,我们也"
 "不再用任何专有软件。在课堂上、在管理办å…
¬å®¤ï¼Œæˆ‘们只用自由软件。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We use a wide range of free programs in the classroom, such as <a href= "
 "\"http://directory.fsf.org/wiki/GIMP/\";>GIMP</a>, <a href= \"http://";
@@ -220,27 +240,27 @@
 "<a href=\"http://directory.fsf.org/wiki/GPeriodic\";>GPeriodic</a>和<a href="
 "\"http://www.libreoffice.org/\";>LibreOffice</a>,还有很多å…
¶ä»–自由软件。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Students are also introduced to the programming language Python as from "
 "grade 8 (13 years old)."
 msgstr "从8年级(13岁)起,我们还向同学们介绍Python语言。"
 
-#. type: Content of: <div><h3>
+#. type: Content of: <div><div><h3>
 msgid "Results"
 msgstr "结果"
 
-#. type: Content of: <div><div><a>
+#. type: Content of: <div><div><div><a>
 msgid "<a href=\"/education/misc/tuxpaint.jpg\">"
 msgstr "<a href=\"/education/misc/tuxpaint.jpg\">"
 
-#. type: Attribute 'alt' of: <div><div><a><img>
+#. type: Attribute 'alt' of: <div><div><div><a><img>
 msgid ""
 "Image of the TuxPaint interface in Malayalam showing the stamp for the "
 "Adeenia flower."
 msgstr "马拉雅
拉姆语(Malayalam)的TuxPaint界面带有西藩莲花(Adeenia)图片。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><p>
 msgid ""
 "<a href=\"/education/misc/adeenia.ogg\">Listen</a> to a student pronounce "
 "the name of the Adeenia flower in Malayalam."
@@ -248,18 +268,19 @@
 "<a href=\"/education/misc/adeenia.ogg\">请听</a>一个学生用马拉雅
拉姆语"
 "(Malayalam)念西藩莲花(Adeenia)的名字。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Education in the State of Kerala has become \"IT-enabled\", meaning that "
-"students are getting first hand technology knowledge while learning regular "
-"curriculum subjects outside the IT Lab. This is possible due to the large "
-"number of high quality educational applications available in GNU/Linux."
-msgstr ""
-"Kerala州的教育已经变得\"IT-enabled\",意思是学生们在IT实验室之外学ä¹
 å¸¸è§„课程"
-"时就学到了第一手的计算机技术。因
为GNU/Linux提供了大量高水平的教育应用软件,这"
-"才成为可能。"
+"Education in the State of Kerala has become &ldquo;IT-enabled,&rdquo; "
+"meaning that students are getting first hand technology knowledge while "
+"learning regular curriculum subjects outside the IT Lab. This is possible "
+"due to the large number of high quality educational applications available "
+"in GNU/Linux."
+msgstr ""
+"Kerala州的教育已经变得&ldquo;IT-enabled&rdquo;,意思是学生们在IT实验室之外学"
+"习常规课程时就学到了第一手的计算机技术。因
为GNU/Linux提供了大量高水平的教育应"
+"用软件,这才成为可能。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The transparency and the cooperative method of Free Software helped students "
 "and teachers to dive deep into technology and made them capable of "
@@ -271,7 +292,7 @@
 "做贡献。其中一项重要贡献就是将<a 
href=\"/education/edu-software-tuxpaint.html"
 "\">Tux Paint</a>界面本地化到我们的母语,马拉雅拉姆语。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Another contribution was the addition of new stamps in TuxPaint. Native "
 "flowers were photographed and the pictures edited by 6th and 7th grade "
@@ -291,7 +312,7 @@
 #.  a link to the video with subtitles in your language, if it exists. 
Likewise, 
 #.  modify the link to SubRip subtitles accordingly, and replace the word 
"English" 
 #.  with the name of your language. 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "<a href=\"http://audio-video.gnu.org/video/irimpanam-high-sub.en.ogv\";>Watch "
 "and download the video</a>. <a href=\"/education/misc/irimpanam.en.srt"
@@ -301,7 +322,7 @@
 "下载视频</a>。<a href=\"/education/misc/irimpanam.en.srt\">阅
读和下载SubRip格"
 "式的(English)字幕</a>。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Both activities were promoted by Swathanthra Software Koottayma of VHSS "
 "Irimpanam <a href=\"http://sskvhssirimpanam.wordpress.com/\";> (SSK VHSS "
@@ -318,7 +339,7 @@
 
"向GNU/Linux介绍新应用为主要贡献方式。该团体组织月会和各种活动以推动å
…¶æˆå‘˜ä½“验"
 
"和探索自由软件,从而使大家能够在实践中体会自由软件带来的自由。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "As a way of keeping in touch and sharing experiences with other schools and "
 "with the Free Software community, teachers and students each year "
@@ -328,26 +349,23 @@
 "我校师生每年都参加诸如全国自由软件大会和网络安å…
¨æ—¥ç­‰æ´»åŠ¨ï¼Œè¿™æ ·æˆ‘们就和其他学"
 "校和自由软件社区保持联系并分享自由软件的经验。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The commitment and the collaboration of teachers, students and local groups "
 "was essential to the success of this large scale government project."
 msgstr ""
 "教师、学生和本地社团的全心投å…
¥ä¸Žåˆä½œæ˜¯æˆåŠŸè¿›è¡Œå¦‚此规模的政府项目的关键。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"(1) <a id=\"swathanthra\"></a>Swathanthra is the Sanskrit word for \"free\" "
-"as in freedom."
-msgstr ""
-"(1) <a 
id=\"swathanthra\"></a>Swathanthra是Sanskrit语,意思是freedom(自由)"
-"中的自由(free)。"
+"(1) Swathanthra is the Sanskrit word for &ldquo;free&rdquo; as in freedom."
+msgstr "(1) 
Swathanthra是Sanskrit语,意思是freedom(自由)中的自由(free)。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "Credits"
 msgstr "鸣谢"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Credits for both images shown on this page, as well as for the audio file, "
 "go to Swathanthra Software Koottayma of VHSS Irimpanam, who released them "
@@ -359,17 +377,8 @@
 "sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 
Unported</a>许可证发"
 "布。"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/education/edu-cases-india.html\">More Case Studies in India</a>"
-msgstr "<a href=\"/education/edu-cases-india.html\">印度的å…
¶ä»–案例分析</a>"
-
-#. type: Content of: <p>
-msgid "<a href=\"/education/edu-cases.html\">Back to Case Studies</a>"
-msgstr "<a href=\"/education/edu-cases.html\">返回到案例分析</a>"
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -386,9 +395,7 @@
 "联系方法</a> 联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮"
 "件到<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -396,25 +403,24 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>获取有关协调和提交翻译的相关事项。"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
-"Copyright &copy; 2011, 2012, 2016, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 2011, 2012, 2016, 2018, 2020 Free Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2011, 2012, 2016, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 2011, 2012, 2016, 2018, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -438,5 +444,9 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
-#~ msgid "Copyright &copy; 2011, 2012, 2016 Free Software Foundation, Inc."
-#~ msgstr "Copyright &copy; 2011, 2012, 2016 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "<a href=\"/education/edu-cases-india.html\">More Case Studies in India</a>"
+#~ msgstr "<a href=\"/education/edu-cases-india.html\">印度的å…
¶ä»–案例分析</a>"
+
+#~ msgid "<a href=\"/education/edu-cases.html\">Back to Case Studies</a>"
+#~ msgstr "<a href=\"/education/edu-cases.html\">返回到案例分析</a>"

Index: po/edu-cases-india.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-cases-india.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-cases-india.zh-cn.po 2 Sep 2018 07:21:40 -0000       1.1
+++ po/edu-cases-india.zh-cn.po 31 May 2020 05:04:30 -0000      1.2
@@ -2,11 +2,12 @@
 # Copyright (C) 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2018.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-cases-india.html\n"
-"POT-Creation-Date: 2016-09-13 15:55+0000\n"
+"POT-Creation-Date: 2020-05-27 11:13+0200\n"
 "PO-Revision-Date: 2018-09-02 14:16+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -16,22 +17,47 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Case Studies in India - GNU Project - Free Software Foundation"
-msgstr "案例分析 - GNU工程 - 自由软件基金会"
+msgid ""
+"Education - Case Studies in India - GNU Project - Free Software Foundation"
+msgstr "教育 - 案例分析 - GNU工程 - 自由软件基金会"
+
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-cases.html\">Case Studies</a> &rarr; India"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/edu-cases.html\">Case&nbsp;Studies</a>&nbsp;/"
 msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"edu-cases.html\">案例分析</a> &rarr; 印度"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-cases.html\">案例分析</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Case Studies in India"
 msgstr "印度的案例分析"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "An <a href=\"/education/edu-system-india.html\">article</a> by Indian "
 "scientist Dr. V. Sasi Kumar which explains in detail how the education "
@@ -46,7 +72,7 @@
 "Kerala,它通过政府项目<a 
href=\"https://www.itschool.gov.in/\";>IT@School</a>"
 "成功地在数千所学校实施了自由软件。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some notions on the <a href= \"http://en.wikipedia.org/wiki/";
 "Education_in_India\">education system of India</a> can also be found in "
@@ -55,13 +81,13 @@
 "Wikipedia也提供了一些关于<a href= \"http://en.wikipedia.org/wiki/";
 "Education_in_India\">印度教育系统</a>的介绍。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Below are listed some of the educational institutions in India who are using "
 "Free Software."
 msgstr "下面列举了一些使用自由软件的印度教育机构。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href= \"/education/edu-cases-india-ambedkar.html\">Ambedkar Community "
 "Computing Center (AC3)</a>"
@@ -69,7 +95,7 @@
 "<a href= 
\"/education/edu-cases-india-ambedkar.html\">Ambedkar社区计算中心"
 "(AC3)</a>"
 
-#. type: Content of: <ul><li><p>
+#. type: Content of: <div><ul><li><p>
 msgid ""
 "A group of Free Software advocates set up a computing center in a slum in "
 "Bangalore to teach computer skills to underprivileged children."
@@ -77,7 +103,7 @@
 "一群班加罗尔的自由软件倡导者
在贫民区创立了一个计算中心,教授社会底层的孩子们"
 "计算机技术。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href= \"/education/edu-cases-india-irimpanam.html\">Vocational Higher "
 "Secondary School Irimpanam (VHSS Irimpanam)</a>"
@@ -85,7 +111,7 @@
 "<a href= 
\"/education/edu-cases-india-irimpanam.html\">Irimpanam高级职业中学"
 "(VHSS Irimpanam)</a>"
 
-#. type: Content of: <ul><li><p>
+#. type: Content of: <div><ul><li><p>
 msgid ""
 "One of the several thousand schools that are using exclusively Free Software "
 "as the result of a <a href= \"https://www.itschool.gov.in/\";>project</a> "
@@ -94,12 +120,8 @@
 "这是经由Kerala政府发起的<a href= 
\"https://www.itschool.gov.in/\";>项目</a>而"
 "完全迁移到自由软件系统的数千所学校之一。"
 
-#. type: Content of: outside any tag (error?)
-msgid "<a href=\"/education/edu-cases.html\">Back to Case Studies</a>"
-msgstr "<a href=\"/education/edu-cases.html\">返回到案例分析</a>"
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -116,9 +138,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -126,22 +146,22 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011, 2015, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2011, 2015, 2016, 2020 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011, 2015, 2016, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -164,3 +184,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最后更新:"
+
+#~ msgid "<a href=\"/education/edu-cases.html\">Back to Case Studies</a>"
+#~ msgstr "<a href=\"/education/edu-cases.html\">返回到案例分析</a>"

Index: po/edu-cases.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-cases.zh-cn.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/edu-cases.zh-cn.po       26 Aug 2018 03:33:51 -0000      1.2
+++ po/edu-cases.zh-cn.po       31 May 2020 05:04:31 -0000      1.3
@@ -2,11 +2,12 @@
 # Copyright (C) 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2018.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-cases.html\n"
-"POT-Creation-Date: 2016-09-13 15:55+0000\n"
+"POT-Creation-Date: 2020-05-27 11:13+0200\n"
 "PO-Revision-Date: 2018-08-26 11:26+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -16,18 +17,42 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Case Studies - GNU Project - Free Software Foundation"
-msgstr "案例分析 - GNU工程 - 自由软件基金会"
+msgid "Education - Case Studies - GNU Project - Free Software Foundation"
+msgstr "教育 - 案例分析 - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <p>
-msgid "<a href=\"/education/education.html\">Education</a> &rarr; Case Studies"
-msgstr "<a href=\"/education/education.html\">教育</a> &rarr;案例分析"
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
 
-#. type: Content of: <h2>
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
+msgid "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/"
+msgstr "</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/"
+
+#. type: Content of: <div><h2>
 msgid "Case Studies"
 msgstr "案例分析"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We perform worldwide research to examine cases of private and public "
 "educational institutions as well as informal educational environments that "
@@ -40,7 +65,7 @@
 
"育环境。我们并不是要在这里要建立一个完备的数据库。反过来,我们会展示å
…·ä½“的成"
 "功案例,并相信这些明证能够激励那些第一次考虑安装
或迁移到自由软件的人们。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you know of a case that could be included here, please contact us <a href="
 "\"mailto:education@gnu.org\";>&lt;education@gnu.org&gt;</a> to let us know."
@@ -48,22 +73,19 @@
 "如果你知道一些可以放到这里的案例,请致信给我们<a 
href=\"mailto:education@gnu.";
 "org\">&lt;education@gnu.org&gt;</a>,让我们知晓。"
 
-#.  Begin country-wise Index. Add countries in alphabetical order  
-#.  End of Country-wise Index 
-#.  Begin country-wise Section. Add new countries in alphabetical order 
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"/education/edu-cases-argentina.html\">Argentina</a> | <a href=\"/"
-"education/edu-cases-india.html\">India</a>"
+"&nbsp;<a href=\"/education/edu-cases-argentina.html\">Argentina</a>&nbsp; "
+"&nbsp;<a href=\"/education/edu-cases-india.html\">India</a>&nbsp;"
 msgstr ""
-"<a href=\"/education/edu-cases-argentina.html\">阿根廷</a> | <a href=\"/"
-"education/edu-cases-india.html\">印度</a>"
+"&nbsp;<a href=\"/education/edu-cases-argentina.html\">阿根廷</a>&nbsp; 
&nbsp;"
+"<a href=\"/education/edu-cases-india.html\">印度</a>&nbsp;"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Argentina"
 msgstr "阿根廷"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/education/edu-cases-argentina-ecen.html\">Escuela Cristiana "
 "Evang&eacute;lica de Neuqu&eacute;n (ECEN)</a>"
@@ -71,7 +93,7 @@
 "<a href=\"/education/edu-cases-argentina-ecen.html\">Escuela Cristiana "
 "Evang&eacute;lica de Neuqu&eacute;n (ECEN)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "An elementary teacher with little technical skills manages to get her school "
 "to migrate all work stations, including the administration offices and the "
@@ -80,11 +102,11 @@
 "一个几乎没有什么技术的小学老师设法使学æ 
¡çš„所有工作站,包括行政办公室和图书"
 "馆,迁移到自由软件。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "India"
 msgstr "印度"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/education/edu-cases-india-ambedkar.html\">Ambedkar Community "
 "Computing Center (AC3)</a>"
@@ -92,7 +114,7 @@
 "<a 
href=\"/education/edu-cases-india-ambedkar.html\">Ambedkar社区计算中心"
 "(AC3)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A group of Free Software advocates in Bangalore teaches computer skills to "
 "underprivileged children using exclusively Free systems and programs."
@@ -100,7 +122,7 @@
 "一群班加罗尔的自由软件倡导者使用完å…
¨çš„自由软件和程序教授社会底层的孩子们计算"
 "机技术。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/education/edu-cases-india-irimpanam.html\">Vocational Higher "
 "Secondary School Irimpanam (VHSS Irimpanam)</a>"
@@ -108,14 +130,14 @@
 "<a 
href=\"/education/edu-cases-india-irimpanam.html\">Irimpanam高级职业中学"
 "(VHSS Irimpanam)</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One of the several thousand schools that migrated completely to Free "
 "Software under the government's project IT@School."
 msgstr "这是经由政府项目IT@School而完å…
¨è¿ç§»åˆ°è‡ªç”±è½¯ä»¶ç³»ç»Ÿçš„数千所学校之一。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -132,9 +154,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -142,22 +162,22 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: po/education.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/education.zh-cn.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/education.zh-cn.po       31 Jul 2017 13:29:06 -0000      1.14
+++ po/education.zh-cn.po       31 May 2020 05:04:31 -0000      1.15
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the original article.
 # Christopher Meng <cickumqt@gmail.com>, 2013.
 # Wensheng Xie <wxie@member.fsf.org>, 2017.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: education.html\n"
-"POT-Creation-Date: 2016-09-13 15:56+0000\n"
+"POT-Creation-Date: 2020-05-27 10:41+0200\n"
 "PO-Revision-Date: 2017-07-24 14:03+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -21,15 +22,43 @@
 msgid "Free Software and Education - GNU Project - Free Software Foundation"
 msgstr "自由软件与教育 - GNU 工程 - 自由软件基金会"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
+msgid "</a>&nbsp;/"
+msgstr "</a>&nbsp;/"
+
+#. type: Content of: <div><h2>
 msgid "Free Software and Education"
 msgstr "自由软件与教育"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "How Does Free Software Relate to Education?"
 msgstr "自由软件和教育有什么关系?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Software freedom plays a fundamental role in education.  Educational "
 "institutions of all levels should use and teach Free Software because it is "
@@ -47,7 +76,7 @@
 "此相反,商业软件中包
含的是商业机密和受限制的知识,这违背了教育机构的使命。自"
 "由软件支持教育,商业软件妨碍教育。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "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 "
@@ -59,7 +88,7 @@
 
"于一个软件用户应该拥有的权力的问题。自由和合作是自由软件的精华所在。GNU
 系统"
 
"实现着这些价值和分享原则,分享令人愉快的且有利于推动人类进程。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "To learn more, see the <a href=\"/philosophy/free-sw.html\">Free Software "
 "definition</a> and our article on <a href=\"/philosophy/shouldbefree.html"
@@ -68,11 +97,11 @@
 "欲了解更多,请访问 <a 
href=\"/philosophy/free-sw.html\">自由软件定义</a> 和 "
 "<a 
href=\"/philosophy/shouldbefree.html\">软件为什么应该是自由的</a> 
页面。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "The Basics"
 msgstr "基础"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "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 "
@@ -83,7 +112,7 @@
 "发起</a>的,旨在开发一个自由的操作系统:GNU 
操作系统。时至如今,每个人都可以"
 "在计算机上自由的使用这个系统。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "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 "
@@ -95,7 +124,7 @@
 #.  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. 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
 msgid ""
 "<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 "
@@ -106,7 +135,7 @@
 
 #.  TRANSLATORS: please add the link to your language here in the first 
 #.      place, followed by a comma. 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
 msgid ""
 "Transcriptions of this video are available in <a href=\"/education/misc/rms-"
 "education-es-translation-to-en.txt\">English</a>, <a href=\"/education/misc/"
@@ -120,7 +149,7 @@
 
 #.  TRANSLATORS: please add the link to your language here in the first 
 #.      place, followed by a comma. 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
 msgid ""
 "SubRip subtitle files are also available for download in <a href=\"/"
 "education/misc/rms-education-es-sub.en.srt\">English</a>, <a href=\"/"
@@ -132,7 +161,7 @@
 "<a 
href=\"/education/misc/edu-misc.html#subtitles-rms-education\">更多语言</"
 "a> 可供下载。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 msgid ""
 "We are looking for free educational games, or information about free games "
 "that can be used for educational purposes. Contact <a href=\"mailto:";
@@ -141,11 +170,11 @@
 "我们正寻找自由的教育游戏,或者是å…
³äºŽå¯ç”¨äºŽæ•™è‚²çš„自由游戏的信息。详情请联系 "
 "<a href=\"mailto:education@gnu.org\";>&lt;education@gnu.org&gt;</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "In Depth"
 msgstr "较深层次"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Learn about the <a href=\"/education/edu-why.html\">Reasons Why</a> "
 "educational institutions should use and teach exclusively Free Software."
@@ -153,28 +182,27 @@
 "了解更多有关为什么教育机构应使用自由软件的 <a 
href=\"/education/edu-why.html"
 "\">理由</a>。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "An article by Richard Stallman: <a href=\"/education/edu-schools.html\">Why "
-"Schools Should Exclusively Use Free Software</a>"
+"Schools Should Exclusively Use Free Software</a>."
 msgstr ""
 "一篇由 Richard Stallman 撰写的文章:<a 
href=\"/education/edu-schools.html\">"
-"为什么在学校中只应使用自由软件</a>"
+"为什么在学校中只应使用自由软件</a>。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "An article by Dr. V. Sasi Kumar on the <a href=\"/education/edu-system-india."
-"html\">education system in India.</a>"
+"html\">education system in India</a>."
 msgstr ""
 "一篇由 V. Sasi Kumar 博士撰写的文章,<a 
href=\"/education/edu-system-india."
 "html\">印度的教育系统</a>。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
-# type: Content of: <div><p>
 #. type: Content of: <div><div><p>
 msgid ""
 "Please send general FSF &amp; GNU inquiries to <a href=\"mailto:gnu@gnu.org";
@@ -188,6 +216,7 @@
 "联系方法</a> 联系自由软件基金会(FSF)。有关错误链接、å…
¶ä»–更正或建议,请联系 "
 "<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
+# TODO: submitting -> contributing.
 #.  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
@@ -195,22 +224,24 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
 "解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2011, 2012, 2014, 2016, 2020 Free Software Foundation, Inc."
+msgstr ""
+"Copyright &copy; 2011, 2012, 2014, 2016, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: po/edu-faq.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-faq.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-faq.zh-cn.po 10 Dec 2017 02:33:06 -0000      1.1
+++ po/edu-faq.zh-cn.po 31 May 2020 05:04:31 -0000      1.2
@@ -2,11 +2,12 @@
 # Copyright (C) 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2017.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-faq.html\n"
-"POT-Creation-Date: 2016-09-13 15:55+0000\n"
+"POT-Creation-Date: 2020-05-27 10:41+0200\n"
 "PO-Revision-Date: 2017-12-09 21:13+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -21,15 +22,39 @@
 "Free Software Foundation"
 msgstr "关于自由软件和教育的常见问题 - GNU工程 - 
自由软件基金会"
 
-#. type: Content of: <p>
-msgid "<a href=\"/education/education.html\">Education</a> &rarr; FAQ"
-msgstr "<a href=\"/education/education.html\">教育</a> &rarr; 常见问题"
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
 
-#. type: Content of: <h2>
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
+msgid "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/"
+msgstr "</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/"
+
+#. type: Content of: <div><h2>
 msgid "Frequently Asked Questions About Free Software and Education"
 msgstr "关于自由软件和教育的常见问题"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Many Free Software advocates encounter difficulties when talking to the "
 "administrators of educational institutions about the advantages of using and "
@@ -43,7 +68,7 @@
 
"&rdquo;,所以他们有很多疑虑。在此,我们收集了一些最常见的问题,并尽可能给出能"
 "够消除疑虑的最好回答。"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid ""
 "As a teacher, I've been trying hard to explain to the school's "
 "administrators the advantages that open source software can bring to our "
@@ -52,7 +77,7 @@
 "作为一名教师,我一直努力向学æ 
¡ç®¡ç†å±‚解释开源软件能够带给学校的好处,但是他们"
 "似乎并不感兴趣。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "&ldquo;Open source&rdquo; refers only to the technical advantages of "
 "software. Schools may not be interested in that aspect since most probably "
@@ -67,7 +92,7 @@
 "不是&ldquo;开源&rdquo;,这æ 
·å°±å¯ä»¥å‘他们解释为什么教育机构应该拒绝专属软件,"
 "解释这背后的哲学和道德原因。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "See the reasons <a href=\"/education/edu-why.html\">why educational "
 "institutions should use and teach exclusively Free Software.</a>"
@@ -75,7 +100,7 @@
 "请参看<a 
href=\"/education/edu-why.html\">为什么教育机构应该只使用和教授自由"
 "软件</a>。"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid ""
 "I would love to see all schools migrate to Free Software, but I think it's "
 "hopeless. Proprietary software companies have too much power, even over "
@@ -84,7 +109,7 @@
 "我渴望看到所有的学校都转向自由软件,但是我觉得毫无
希望。专属软件公司太强大"
 "了,甚至超过了学校。现实令人沮丧。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "While it is true that proprietary software corporations have managed to "
 "impose their products on society by using schools as propaganda agents, it "
@@ -96,7 +121,7 @@
 "上还有许多学æ 
¡é‡‡çº³äº†è‡ªç”±è½¯ä»¶å¹¶å–得了卓越的成绩。请参看<a 
href=\"/education/"
 "edu-cases.html\">案例分析</a>部分来了解一些例子。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "When we started the GNU Project back in 1983, the situation was very "
 "discouraging for us too. We started from zero, and today millions of people "
@@ -105,7 +130,7 @@
 
"当我们在1983年开始GNU工程时,我们面对的现实也是令人沮丧的。我们从零开始,今天"
 "全世界有几百万人在使用自由软件。"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid ""
 "I am the head of a technical institute and I would like to teach our "
 "students the use and administration of a Free Libre platform, but I have to "
@@ -115,7 +140,7 @@
 "我是技术ç 
”究所的领导,我愿意教我们的学生使用和掌握自由软件,但是我们å¿
…须遵循"
 
"由教育部设立的教学大纲,而它要求教授专属软件和程序。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "If you are literally forced to teach nonfree software, you should tell your "
 "students that you consider this software unethical, that you are doing this "
@@ -126,7 +151,7 @@
 "只是被迫教授这些软件,并且你会尽量少教,这样你
就可以朝着尊重自由的软件的方向"
 "努力。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "We must not forget that schools have a great influence on society, so making "
 "our students aware of the advantages of Free Software is a way of putting "
@@ -144,7 +169,7 @@
 
"libreplanet.org/wiki/Group_list\">自由软件群</a>。然后,该群可以写信给教育部"
 "表达自己的心声、可以举办传播自由软件的活动以及å…
¶ä»–类似的活动。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "When computer users will start demanding their rights, Governments will have "
 "to issue their laws accordingly. That is why political and social awareness "
@@ -155,7 +180,7 @@
 
"自由软件时不能把政治和社会的影响这一基本面放在一边的原å›
 ã€‚"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -172,9 +197,7 @@
 "系方法</a>联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮件到"
 "<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -182,22 +205,22 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>获取有关协调和提交翻译的相关事项。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: po/edu-free-learning-resources.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-free-learning-resources.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/edu-free-learning-resources.zh-cn.po     3 Mar 2020 23:58:53 -0000       
1.4
+++ po/edu-free-learning-resources.zh-cn.po     31 May 2020 05:04:31 -0000      
1.5
@@ -2,11 +2,12 @@
 # Copyright (C) 2020 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2020.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-free-learning-resources.html\n"
-"POT-Creation-Date: 2020-03-01 12:25+0000\n"
+"POT-Creation-Date: 2020-05-27 11:14+0200\n"
 "PO-Revision-Date: 2020-03-03 20:34+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: LANGUAGE <www-zh-cn-translators@gnu.org>\n"
@@ -19,20 +20,43 @@
 msgid "Free Learning Resources - GNU Project - Free Software Foundation"
 msgstr "自由教育资源 - GNU 工程 - 自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-resources.html\">Educational Resources</a> &rarr; Free "
-"Learning Resources"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"edu-resources.html\">教育资源</a> &rarr; 自由学习资源"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/  <a href="
+"\"/education/edu-resources.html\">教育资源</a>&nbsp;/ "
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Free Learning Resources"
 msgstr "自由学习资源"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Free learning resources, like free software, is a matter of freedom, not "
 "price. It's about bringing the principles of free software to general "
@@ -53,7 +77,7 @@
 
"有知识的衡量制度是为了防止人们获取、使用或分享知识而量身定做的伎俩,这是对人"
 "类进步的背叛。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "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="
@@ -64,11 +88,11 @@
 "encyclopedia/free-encyclopedia.html\">自由通用百科全书和自由学习
资源</a> 的概"
 "念,并发展成为 Wikipedia 工程。"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "<a href=\"http://www.wikipedia.org\";>Wikipedia</a>"
 msgstr "<a href=\"http://www.wikipedia.org\";>Wikipedia</a>"
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid ""
 "Written in collaboration by thousands of volunteers from all over the world, "
 "Wikipedia is nowadays the best example of knowledge made available to and "
@@ -82,12 +106,12 @@
 "说明出处并且最终的衍生作品按照同样的条款发布(参看 
<a href=\"/licenses/"
 "copyleft.html\">Copyleft</a>)。"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid ""
 "<a href=\"http://www.gutenberg.org/wiki/Main_Page\";>Project Gutenberg</a>"
 msgstr "<a href=\"http://www.gutenberg.org/wiki/Main_Page\";>Gutenberg 
项目</a>"
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid ""
 "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 "
@@ -96,7 +120,7 @@
 "本项目提供自由的通用知识书籍。它出版å…
¬æœ‰é¢†åŸŸçš„纯文本作品的数字版。如果你在寻"
 "找一部经典的著作,请从这里开始搜索。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "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 "
@@ -105,11 +129,11 @@
 "项目组非常明确地解释了和印刷品有关的 <a 
href=\"http://www.gutenberg.org/wiki/";
 "Gutenberg:No_Cost_or_Freedom%3f\"> 免费和自由的区别</a>。"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "GNU Project"
 msgstr "GNU 工程"
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid ""
 "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/"
@@ -122,11 +146,11 @@
 "a> 在线可得。<a 
href=\"http://shop.fsf.org/category/books/\";>自由软件基金会</"
 "a> 出版的所有书籍都是自由的。"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "<a href=\"http://ftacademy.org/\";>Free Technology Academy</a>"
 msgstr "<a href=\"http://ftacademy.org/\";>自由技术学院</a>"
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid ""
 "The Free Technology Academy (FTA) is a joint initiative from several "
 "educational institutions in various countries. It aims to contribute to a "
@@ -141,7 +165,7 @@
 "的项目,其课程涉及自由技术。这些课程完全在以互通性æ 
¡å›­é¡¹ç›®æž¶æž„为基础构建的虚"
 "拟校园里教授。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "The FTA is a collaboration between the Free Knowledge Institute, the Open "
 "University of Catalonia (Spain) and the Open University of the Netherlands. "
@@ -157,7 +181,7 @@
 "提供自由技术的课程。FTA 
一直在持续扩展合作伙伴网络并鼓励个人和组织为该社区做"
 "出贡献。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><div><p>
 msgid ""
 "We are looking for free educational games, or information about free games "
 "that can be used for educational purposes. Contact <a href=\"mailto:";
@@ -167,7 +191,7 @@
 "\"mailto:education@gnu.org\";>&lt;education@gnu.org&gt;</a>。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -183,9 +207,7 @@
 "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
 "他方法</a> 联系自由软件基金会。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -193,14 +215,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "我们尽最大努力来提供精准和高质量的翻译,但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方"

Index: po/edu-projects.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-projects.zh-cn.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/edu-projects.zh-cn.po    23 Nov 2019 14:29:13 -0000      1.13
+++ po/edu-projects.zh-cn.po    31 May 2020 05:04:31 -0000      1.14
@@ -2,11 +2,12 @@
 # Copyright (C) 2018-2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2018-2019.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-projects.html\n"
-"POT-Creation-Date: 2019-11-21 07:55+0000\n"
+"POT-Creation-Date: 2020-05-27 11:14+0200\n"
 "PO-Revision-Date: 2019-11-23 21:54+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -15,24 +16,49 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+# TODO: needs reviewing.
 #. type: Content of: <title>
-msgid "Groups and Projects - GNU Project - Free Software Foundation"
-msgstr "团体和项目 - GNU工程 - 自由软件基金会"
+msgid ""
+"Educational Groups and Projects - GNU Project - Free Software Foundation"
+msgstr "教育 - 团体和项目 - GNU工程 - 自由软件基金会"
+
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-resources.html\">Educational Resources</a> &rarr; Groups and "
-"Projects"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"edu-resources.html\">教育资源</a> &rarr; 团体和项目"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-resources.html\">教育资源</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Groups and Projects"
 msgstr "团体和项目"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "There are several groups and organizations around the world who follow the "
 "GNU philosophy and are working on projects aimed at bringing free software "
@@ -45,7 +71,7 @@
 "的项目。下面列举了一些。如果你
的项目只支持自由软件,而且没有列在下面,请联系"
 "我们<a href=\"mailto:education@gnu.org\";> &lt;education@gnu.org&gt;</a>。"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid ""
 "<a href=\"http://fsfeurope.org/projects/education/education.en.html\";> FSFE "
 "Education Project</a>"
@@ -53,7 +79,7 @@
 "<a href=\"http://fsfeurope.org/projects/education/education.en.html\";>FSFE教"
 "育项目</a>"
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid ""
 "&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 "
@@ -63,11 +89,11 @@
 "&ldquo;FSFE的教育团队致力于提高教育相å…
³å›¢ä½“对自由软件的认知,并把自由软件的好"
 "处带给他们。它还以建立禁止歧视自由软件及å…
¶ç”¨æˆ·çš„法律框架为目标。&rdquo;"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "<a href=\"http://guri.hipatia.net/\";>GURI</a>"
 msgstr "<a href=\"http://guri.hipatia.net/\";>GURI</a>"
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid ""
 "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 "
@@ -84,7 +110,7 @@
 "利、不å…
¬å¹³çš„版权法和接受专属与压制性软件之类的手段来向我们的自由施åŠ
 å±é™©çš„威"
 "胁,从而阻止我们实践一些最重要的人权。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "The goals of the Guri project are to convert the educational system so that "
 "it is based exclusively on free software and to extend the freedoms it "
@@ -99,7 +125,7 @@
 
"社会。它提倡并向着一个非金字塔式的知识分享系统努力,这是一个人人都能够积极参"
 "与并不受限制地获取知识的系统,这是一个从æ 
¹æœ¬ä¸Šæœ‰ç›ŠäºŽäººç±»çš„系统。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "To achieve its goals, the group takes action mainly in High School and "
 "University environments, organizing workshops and courses to promote "
@@ -108,11 +134,11 @@
 "为了实现目标,该团体主要在高中和大学组织ç 
”讨会和课程来推动大家对自由软件的道"
 "德准则的认知度。"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "<a href=\"http://hipatia.net/\";>Hipatia</a>"
 msgstr "<a href=\"http://hipatia.net/\";>Hipatia</a>"
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid ""
 "Hipatia is an international NGO (non-governmental organization)  that "
 "upholds the right of all human beings to access, use, create, modify and "
@@ -128,19 +154,19 @@
 
"成。Hipatia强调在教育中使用自由软件的重要性;为了这个目æ
 ‡ï¼Œå…¶æˆå‘˜ç»å¸¸åœ¨æ•™è‚²æœº"
 "构举行研讨会,特别是在小学和初级学校。"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "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>
+#. type: Content of: <div><div><dl><dt>
 msgid "<a href=\"https://itschool.gov.in/otherprograms.php\";>IT@School</a>"
 msgstr "<a href=\"https://itschool.gov.in/otherprograms.php\";>IT@School</a>"
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid ""
 "IT@School is a project of the government of Kerala, India, started in 2001 "
 "to introduce Information Communication Technologies into the State's "
@@ -154,7 +180,7 @@
 "已经被超过2,600所省内学校所使用。数千名教师、学æ 
¡åè°ƒå‘˜å’Œå­¦ç”ŸæŽ¥å—了使用自由软"
 "件的培训。"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid ""
 "<a href=\"https://web.archive.org/web/20150420025426/http://www.ofset.org/";
 "tiki-index.php\">OFSET</a>"
@@ -162,7 +188,7 @@
 "<a href=\"https://web.archive.org/web/20150420025426/http://www.ofset.org/";
 "tiki-index.php\">OFSET</a>"
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid ""
 "OFSET promotes the development and enhancement of Free Software for the "
 "educational system and the classroom. It was born in France but its members "
@@ -175,7 +201,7 @@
 "全世界,他们以互联网为沟通手段,为共同的目æ 
‡è€Œåˆä½œå¥‹æ–—。教师、开发人员、翻译"
 "人员和作者之间开诚布公的协作一直是OFSET活动成功的å…
³é”®ã€‚"
 
-#. type: Content of: <dl><dd><p>
+#. type: Content of: <div><div><dl><dd><p>
 msgid ""
 "One important achievement of the OFSET group is <a href=\"/software/dr-geo/"
 "\">Dr. Geo</a>, a program widely used for teaching geometry. OFSET has also "
@@ -186,11 +212,11 @@
 "被广泛使用的几何教学软件。OFSET还开发了<a 
href=\"http://usb.freeduc.org/";
 "index-en.html\">Freeduc-USB</a>,这是一个含有多个实用课å 
‚程序的可启动U盘。"
 
-#. type: Content of: <dl><dt>
+#. type: Content of: <div><div><dl><dt>
 msgid "<a href=\"http://www.sugarlabs.org/\";>Sugar Labs</a>"
 msgstr "<a href=\"http://www.sugarlabs.org/\";>Sugar Labs</a>"
 
-#. type: Content of: <dl><dd>
+#. type: Content of: <div><div><dl><dd>
 msgid ""
 "Sugar Labs is a project that provides the <a href=\"http://wiki.sugarlabs.";
 "org/go/What_is_Sugar\">Sugar learning platform</a>, an interface specially "
@@ -202,7 +228,7 @@
 "该平台专门为帮助孩子们使用电脑而设计界面,它尤å…
¶ä¸“注于在教育环境下的应用。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -219,9 +245,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -229,22 +253,22 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011, 2016, 2018, 2019 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2016, 2018, 2019 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2011, 2016, 2018-2020 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011, 2016, 2018-2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: po/edu-resources.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-resources.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/edu-resources.zh-cn.po   3 May 2019 06:59:53 -0000       1.8
+++ po/edu-resources.zh-cn.po   31 May 2020 05:04:32 -0000      1.9
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-resources.html\n"
-"POT-Creation-Date: 2019-05-01 10:56+0000\n"
+"POT-Creation-Date: 2020-05-27 11:14+0200\n"
 "PO-Revision-Date: 2019-05-03 13:48+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: LANGUAGE <www-zh-cn-translators@gnu.org>\n"
@@ -19,17 +19,39 @@
 msgid "Educational Resources - GNU Project - Free Software Foundation"
 msgstr "教育资源 - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; Educational "
-"Resources"
-msgstr "<a href=\"/education/education.html\">教育</a> &rarr; 教育资源"
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
+msgid "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/"
+msgstr "</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Educational Resources"
 msgstr "教育资源"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This section will help you find a variety of resources related to education, "
 "such as: free study materials, free programs for educational institutions of "
@@ -44,22 +66,22 @@
 "由软件的项目和平台、践行 GNU 
工程之原则并在教育领域弘扬自由软件的团体以及更"
 "多。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Table of Contents"
 msgstr "目录"
 
 # type: Content of: <body><div><div><div><ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/education/edu-software.html\">Educational Free Software</a>"
 msgstr "<a href=\"/education/edu-software.html\">教育性自由软件</a>"
 
 # type: Content of: <body><div><div><div><ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "<a href=\"/education/edu-projects.html\">Groups and Projects</a>"
 msgstr "<a href=\"/education/edu-projects.html\">团体和项目</a>"
 
 # type: Content of: <body><div><div><div><ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"/education/edu-free-learning-resources.html\">Free Learning "
 "Resources</a>"
@@ -67,7 +89,7 @@
 "<a href=\"/education/edu-free-learning-resources.html\">自由学习
资源</a>"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -84,9 +106,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -94,14 +114,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
@@ -109,9 +129,9 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Copyright &copy; 2011, 2012, 2016, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 2011, 2012, 2016, 2018-2020 Free Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2011, 2012, 2016, 2018, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 2011, 2012, 2016, 2018-2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -237,9 +257,6 @@
 #~ "他们非常清楚地解释了出版物中<a 
href=\"http://www.gutenberg.org/wiki/";
 #~ "Gutenberg:No_Cost_or_Freedom%3f\">免费和自由的不同</a>。"
 
-#~ msgid "GNU Project"
-#~ msgstr "GNU工程"
-
 #~ msgid ""
 #~ "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=\"/"

Index: po/edu-schools.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-schools.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/edu-schools.zh-cn.po     1 Jan 2020 08:31:33 -0000       1.5
+++ po/edu-schools.zh-cn.po     31 May 2020 05:04:32 -0000      1.6
@@ -2,11 +2,12 @@
 # Copyright (C) 2020 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2017, 2020.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-schools.html\n"
-"POT-Creation-Date: 2020-01-01 05:25+0000\n"
+"POT-Creation-Date: 2020-05-27 10:41+0200\n"
 "PO-Revision-Date: 2020-01-01 15:54+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -21,24 +22,47 @@
 "Software Foundation"
 msgstr "为什么在学校中只应使用自由软件 - GNU工程 - 
自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/education.html#indepth\">In Depth</a> &rarr; Why Schools Should "
-"Exclusively Use Free Software"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/education.html#indepth\">In&nbsp;Depth</a>&nbsp;/"
 msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"education.html#indepth\">深入讨论</a> &rarr; 为什么在学æ 
¡ä¸­åªåº”使用自由软件"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/education.html#indepth\">深入讨论</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Why Schools Should Exclusively Use Free Software"
 msgstr "为什么在学校中只应使用自由软件"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"http://www.stallman.org/\";>Richard Stallman</a> 著"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Educational activities, including schools of all levels from kindergarten to "
 "university, have a moral duty to <a href=\"/education/education.html\">teach "
@@ -47,7 +71,7 @@
 "教育活动,包括从幼儿园到大学的各级学校,有道德职责<a 
href=\"/education/"
 "education.html\">只教授自由软件。</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "All computer users ought to <a href=\"/philosophy/free-software-even-more-"
 "important.html\"> insist on free software</a>: it gives users the freedom to "
@@ -64,7 +88,7 @@
 "自由,这就是诚信的生活。这些道理同样适用于学æ 
¡ã€‚不过,本文的目的是展示特别针"
 "对教育的一些道理。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Free software can save schools money, but this is a secondary benefit.  "
 "Savings are possible because free software gives schools, like other users, "
@@ -76,7 +100,7 @@
 "制和重新发布自由软件,所以可以省钱;一个学校可以给å…
¶ä»–学校软件拷贝,这样所有"
 "学校的计算机都可以安装自由软件而不必因此付费。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "This benefit is useful, but we firmly refuse to give it first place, because "
 "it is shallow compared to the important ethical issues at stake.  Moving "
@@ -88,7 +112,7 @@
 "省钱太肤浅。让学校使用自由软件并不是让学æ 
¡çš„教育&ldquo;好一点&rdquo;:这是好"
 "教育和坏教育的区别。我们来深入探讨一下这个问题。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Schools have a social mission: to teach students to be citizens of a strong, "
 "capable, independent, cooperating and free society.  They should promote the "
@@ -102,7 +126,7 @@
 "培育能够生活在自由数字社会的公民。这æ 
·å°±å¯ä»¥å¸®åŠ©æ•´ä¸ªç¤¾ä¼šé¿å…ä¸ºè¶…级企业集团所"
 "主导。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In contrast, to teach a nonfree program is implanting dependence, which goes "
 "counter to the schools' social mission.  Schools should never do this."
@@ -110,7 +134,7 @@
 "反过来,教授非自由软件就是在培育依赖性,这和学æ 
¡çš„社会使命背道而驰。学校绝不"
 "应该这么做。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Why, after all, do some proprietary software developers offer gratis "
 "copies<a href=\"#note1\">(1)</a> of their nonfree programs to schools? "
@@ -127,7 +151,7 @@
 "就不会再得到å…
è´¹æ‹·è´ï¼Œä»–们的雇主也不会。一旦有了依赖性,你
就会付钱,而且升级"
 "换代也会很贵。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Free software permits students to learn how software works.  Some students, "
 "natural-born programmers, on reaching their teens yearn to learn everything "
@@ -138,7 +162,7 @@
 "求学习一切å…
³äºŽè®¡ç®—机和软件的知识。他们有强烈的好奇心,想要阅
读他们所用软件的"
 "源代码。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Proprietary software rejects their thirst for knowledge: it says, &ldquo;The "
 "knowledge you want is a secret&mdash;learning is forbidden!&rdquo; "
@@ -149,7 +173,7 @@
 "的!&rdquo;专属软件是教育精神的敌人,所以学æ 
¡ä¸åº”该容忍专属软件,除非是作为逆"
 "向工程的对象。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Free software encourages everyone to learn. The free software community "
 "rejects the &ldquo;priesthood of technology&rdquo;, which keeps the general "
@@ -161,7 +185,7 @@
 "\"#TransNote1\">1</a></sup>&rdquo;,拒绝让公众保持对技术的无
知;我们鼓励人"
 "们,无论年龄和处境,学习软件源代ç 
ä»¥äº†è§£ä»–们想知道的知识。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Schools that use free software will enable gifted programming students to "
 "advance.  How do natural-born programmers learn to be good programmers? They "
@@ -173,7 +197,7 @@
 "的呢?他们需要阅读和理解真正的应用程序。要写出优雅
、清晰的代码,你就要阅读大"
 "量的代码和编写大量的代码。只有自由软件才允许这æ 
·åšã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "How do you learn to write code for large programs? You do that by writing "
 "lots of changes in existing large programs.  Free Software lets you do this; "
@@ -185,7 +209,7 @@
 "软件支持你这样做;专属软件禁止你这样做。学习
能够为学生提供掌握编程技艺的机"
 "会,只要学校教授的是自由软件。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The deepest reason for using free software in schools is for moral "
 "education. We expect schools to teach students basic facts and useful "
@@ -205,7 +229,7 @@
 "学,你必须在班里展示源代码。所以带非自由软件到课å 
‚是不被允许的,除非是为了逆"
 "向工程。&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Of course, the school must practice what it preaches: it should bring only "
 "free software to class (except objects for reverse-engineering), and share "
@@ -215,7 +239,7 @@
 "当然,学校必须实践其教育:学æ 
¡åº”该只使用自由软件(除非是为了逆向工程),并且"
 "和学生分享带源码的软件拷贝,å…
è®¸å­¦ç”Ÿå¤åˆ¶ã€å¸¦å›žå®¶å’Œå†å‘布。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Teaching the students to use free software, and to participate in the free "
 "software community, is a hands-on civics lesson.  It also teaches students "
@@ -225,7 +249,7 @@
 "教育学生使用自由软件和参与自由软件社区是实实在在的å…
¬æ°‘课。它也教育学生公共服"
 "务的典范、而不是企业巨头的角色。各级学æ 
¡éƒ½åº”该使用自由软件。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you have a relationship with a school &mdash;if you are a student, a "
 "teacher, an employee, an administrator, a donor, or a parent&mdash; it's "
@@ -238,29 +262,27 @@
 "有义务为学校开展活动,让学æ 
¡ä½¿ç”¨è‡ªç”±è½¯ä»¶ã€‚如果个人力量无法实现该目标,请在社"
 "区公开提出这个目标;这样会让更多的人知晓这个目æ 
‡å¹¶ä¸”找到活动的志同道合者。"
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><div><ol><li>
 msgid ""
-"<cite><a id=\"note1\"></a>Warning: a school that accepts such an offer may "
-"find subsequent upgrades rather expensive.</cite>"
+"Warning: a school that accepts such an offer may find subsequent upgrades "
+"rather expensive."
+msgstr "警告:接受这种待遇的学æ 
¡å¯èƒ½ä¼šå‘现后续的升级相当昂贵。"
+
+#. type: Content of: <div><div><ol><li>
+msgid ""
+"RJ Reynolds Tobacco Company was fined $15m in 2002 for handing out free "
+"samples of cigarettes at events attended by children.  See <a href=\"http://";
+"www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm\"> "
+"http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.";
+"htm</a>."
 msgstr ""
-"<cite><a id=\"note1\"></a>警告:接受这种待遇的学æ 
¡å¯èƒ½ä¼šå‘现后续的升级相当昂"
-"贵。</cite>"
-
-#. type: Content of: <ol><li>
-msgid ""
-"<cite><a id=\"note2\"></a>RJ Reynolds Tobacco Company was fined $15m in 2002 "
-"for handing out free samples of cigarettes at events attended by children.  "
-"See <a href=\"http://www.bbc.co.uk/worldservice/sci_tech/features/health/";
+"RJ Reynolds烟草公司由于在儿童参与的活动中发放å…
è´¹é¦™çƒŸè€Œè¢«å¤„以1千5百万美元的罚"
+"款。参看<a 
href=\"http://www.bbc.co.uk/worldservice/sci_tech/features/health/";
 "tobaccotrial/usa.htm\"> http://www.bbc.co.uk/worldservice/sci_tech/features/";
-"health/tobaccotrial/usa.htm</a>.</cite>"
-msgstr ""
-"<cite><a id=\"note2\"></a>RJ Reynolds烟草å…
¬å¸ç”±äºŽåœ¨å„¿ç«¥å‚与的活动中发放免费香"
-"烟而被处以1千5百万美元的罚款。参看<a 
href=\"http://www.bbc.co.uk/";
-"worldservice/sci_tech/features/health/tobaccotrial/usa.htm\"> http://www.bbc.";
-"co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm</a>。</cite>"
+"health/tobaccotrial/usa.htm</a>。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 "<h3>译注</h3>\n"
@@ -282,9 +304,7 @@
 "联系方法</a> 联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮"
 "件到<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -292,24 +312,22 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>获取有关协调和提交翻译的相关事项。"
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2003, 2009, 2014, 2015, 2016, 2019, 2020 Richard Stallman"
-msgstr ""
-"Copyright &copy; 2003, 2009, 2014, 2015, 2016, 2019, 2020 Richard Stallman"
+msgid "Copyright &copy; 2003, 2009, 2014-2016, 2020 Richard Stallman"
+msgstr "Copyright &copy; 2003, 2009, 2014-2016, 2020 Richard Stallman"
 
 #. type: Content of: <div><p>
 msgid ""

Index: po/edu-software-gcompris.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-software-gcompris.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-software-gcompris.zh-cn.po   8 Dec 2017 13:08:50 -0000       1.1
+++ po/edu-software-gcompris.zh-cn.po   31 May 2020 05:04:32 -0000      1.2
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-software-gcompris.html\n"
-"POT-Creation-Date: 2016-09-13 15:56+0000\n"
+"POT-Creation-Date: 2020-05-27 10:42+0200\n"
 "PO-Revision-Date: 2017-12-08 21:05+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -19,37 +19,49 @@
 msgid "GCompris - GNU Project - Free Software Foundation"
 msgstr "GCompris - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div><div><div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-resources.html\">Educational Resources</a> &rarr; <a href=\"/"
-"education/edu-software.html\">Educational Free Software</a> &rarr; GCompris"
-msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"edu-resources.html\">教育资源</a> &rarr; <a 
href=\"/education/edu-software."
-"html\">教育性自由软件</a> &rarr; GCompris"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">Resources</a>&nbsp;/ <a href=\"/"
+"education/edu-software.html\">Educational&nbsp;software</a>&nbsp;/"
+msgstr ""
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-resources.html\">教育资源</a>&nbsp;/ <a 
href=\"/education/edu-"
+"software.html\">教育性自由软件</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GCompris"
 msgstr "GCompris"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Description"
 msgstr "描述"
 
-#. type: Content of: <div><a>
-msgid "<a href=\"/education/misc/gcompris.jpg\">"
-msgstr "<a href=\"/education/misc/gcompris.jpg\">"
-
-#. type: Attribute 'alt' of: <div><a><img>
-msgid "Screenshot of the GCompris interface showing the various activities."
-msgstr "展示GCompris操作界面的截图。"
-
-#. type: Content of: <div>
-msgid "</a>"
-msgstr "</a>"
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "GCompris is a cross-platform complete educational suite for children from 2 "
 "to 10 years old, and it is part of the GNU project. It includes more than "
@@ -69,7 +81,15 @@
 "动画工具,能够作为简单而有效地讲故事的辅
助手段,可以促进和孩子们的沟通,也有"
 "助于孩子们自我表达。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><div><a>
+msgid "<a href=\"/education/misc/gcompris.jpg\">"
+msgstr "<a href=\"/education/misc/gcompris.jpg\">"
+
+#. type: Attribute 'alt' of: <div><div><div><a><img>
+msgid "Screenshot of the GCompris interface showing the various activities."
+msgstr "展示GCompris操作界面的截图。"
+
+#. type: Content of: <div><div><p>
 msgid ""
 "GCompris includes several activities grouped on a yellow bar to the left of "
 "the screen, from which the child can choose as soon as the program is "
@@ -81,7 +101,7 @@
 "择。这样的设计使添加
新活动变得容易,也让修改程序适应特定的需求变得容易。程序"
 "本身和全部活动都支持多语言。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "To learn more: <a href=\"http://directory.fsf.org/project/gcompris/\";> FSF "
 "Directory</a>, <a href=\"http://gcompris.net/\";> GCompris Official Website</"
@@ -90,11 +110,11 @@
 "了解更多:<a 
href=\"http://directory.fsf.org/project/gcompris/\";>FSF目录</"
 "a>、<a href=\"http://gcompris.net/\";>GCompris官网</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Who's Using It and How"
 msgstr "谁在使用它和如何使用"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Gcompris activity-based design makes it highly and easily adaptable to "
 "particular environments. One example of innovative use of the program is in "
@@ -111,7 +131,7 @@
 
"善诸如自闭症儿童等思维障碍人士的沟通和活动能力的强大工å
…·ã€‚该项目使用并调整这"
 "个程序,使之服务于项目特定的目标社区。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The Insight team implemented a training module for teachers that provides "
 "instructions on how to use the different activities of GCompris when working "
@@ -128,7 +148,7 @@
 "该项目还向家长和专门的教育者
分发了手册,帮助他们理解如何使用该软件来提高孩子"
 "们的技能。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "GCompris is also used to help older children understand the relationship "
 "between numbers, learn basic arithmetic operations, train them in analytical "
@@ -138,11 +158,11 @@
 "GCompris还被用来帮助较大的孩子理解数字之间的关系、学习
算法操作、训练分析推"
 "理、提高沟通技巧和拼写、阅读及写作等。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Why"
 msgstr "为什么"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Teachers report that it is extremely easy for them to implement GCompris in "
 "their curriculum since children find it intuitive and fun to use. The "
@@ -152,7 +172,7 @@
 "教师们汇报说在他们的课程中采用GCompris极其容易,因
为孩子们能够自然使用并乐在"
 "其中。该程序也是针对智力障碍的孩子和大人的优秀工å…
·ã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "GCompris has become an important resource to speed up the child's learning "
 "process in the context of developing countries like India, where the only "
@@ -169,11 +189,11 @@
 "用,因为实际
上不需要花时间就能够理解如何使用该程序。使用GCompris,孩子们很快"
 "就学会了使用电脑所需要的肢体技能。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Results"
 msgstr "结果"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "GCompris respects the users' fundamental freedoms and this permitted the "
 "Insight developers and specialists to adapt the software to the children's "
@@ -191,7 +211,7 @@
 "是卓有成效的。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -208,9 +228,7 @@
 "系方法</a>联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮件到"
 "<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -218,22 +236,24 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>获取有关协调和提交翻译的相关事项。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2011, 2012, 2014, 2016, 2020 Free Software Foundation, Inc."
+msgstr ""
+"Copyright &copy; 2011, 2012, 2014, 2016, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: po/edu-software-gimp.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-software-gimp.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-software-gimp.zh-cn.po       14 Oct 2018 12:34:56 -0000      1.1
+++ po/edu-software-gimp.zh-cn.po       31 May 2020 05:04:32 -0000      1.2
@@ -2,11 +2,12 @@
 # Copyright (C) 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2018.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-software-gimp.html\n"
-"POT-Creation-Date: 2018-05-12 11:26+0000\n"
+"POT-Creation-Date: 2020-05-27 12:39+0200\n"
 "PO-Revision-Date: 2018-10-14 20:27+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -19,25 +20,49 @@
 msgid "GIMP - GNU Project - Free Software Foundation"
 msgstr "GIMP - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-resources.html\">Educational Resources</a> &rarr; <a href=\"/"
-"education/edu-software.html\">Educational Free Software</a> &rarr; GIMP"
-msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"edu-resources.html\">教育资源</a> &rarr; <a 
href=\"/education/edu-software."
-"html\">教育性自由软件</a> &rarr; GIMP"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">Resources</a>&nbsp;/ <a href=\"/"
+"education/edu-software.html\">Educational&nbsp;software</a>&nbsp;/"
+msgstr ""
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-resources.html\">教育资源</a>&nbsp;/ <a 
href=\"/education/edu-"
+"software.html\">教育性自由软件</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GIMP"
 msgstr "GIMP"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Description"
 msgstr "描述"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "GIMP stands for &ldquo;GNU Image Manipulation Program&rdquo;, a self-"
 "explanatory name for an application that processes digital graphics and is "
@@ -61,7 +86,7 @@
 "似的程序有一æ 
·çš„功能之外,GIMP为计算机图形专家们准备了一整套高度复杂的选项。"
 "它还跨平台,并能够处理多种文件格式和格式转化。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "To learn more: <a href=\"http://directory.fsf.org/wiki/GIMP\";> FSF "
 "Directory</a>, <a href=\"http://www.gimp.org/\";>GIMP Official Website</a>"
@@ -69,11 +94,11 @@
 "请了解更多信息:<a 
href=\"http://directory.fsf.org/wiki/GIMP\";>FSF目录</a>、"
 "<a href=\"http://www.gimp.org/\";>GIMP官网</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Who's Using It and How"
 msgstr "谁在用、怎么用"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The GIMP is used by a large number of artists, amateurs, Web developers, "
 "educators. At school it is a handy tool that assists students and teachers "
@@ -84,7 +109,7 @@
 "是一个便利的工å…
·ï¼Œå®ƒèƒ½å¤Ÿå¸®åŠ©å­¦ç”Ÿå’Œæ•™å¸ˆå‡†å¤‡å¹»ç¯ç‰‡ã€è®²ä¹‰ã€å­¦æ 
¡ç½‘站或海报等项目"
 "上的图片。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "French artist Isabel Saij describes how she uses GIMP for <a href=\"https://";
 "web.archive.org/web/20080516101605/http://www.saij-copyleft2.net/fragments1.";
@@ -94,18 +119,19 @@
 
"org/web/20080516101605/http://www.saij-copyleft2.net/fragments1.html\";>她的作"
 "品</a>:"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><blockquote><p>
 msgid ""
 "&ldquo;It's a program I use for different works: photo manipulation (mixing "
-"images together), drawings (my 'digital fragments' in relation to my 'real "
-"fragments' made on paper), teaching to teenagers, preparing images for "
-"video, etc.). In other words, one of my favorite programs.&rdquo;"
+"images together), drawings (my &lsquo;digital fragments&rsquo; in relation "
+"to my &lsquo;real fragments&rsquo; made on paper), teaching to teenagers, "
+"preparing images for video, etc.) In other words, one of my favorite "
+"programs.&rdquo;"
 msgstr ""
 "&ldquo;这是一个我在不同作品中都使用的程序:ç…
§ç‰‡å¤„理(将图片混合在一起)、绘画"
 "(和我用于画纸的‘实际画框’相å…
³è”的‘数字画框’)、为青少年讲课、为视频准备图片"
 "等等)。换句话说,这是我最爱的程序之一。&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "There are many interesting examples of how this program is put to use by "
 "professionals and amateurs alike to effectively bring to life their ideas "
@@ -115,11 +141,11 @@
 "就该程序如何让使用它的专业人士和业余爱好者
有效地实现他们的想法而无需放弃作为"
 "计算机用户的自由而言,有很多妙趣横生的例子。å…
¶ä¸­ä¸€ä¸ªå°¤ä¸ºå‡ºä¼—。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h4>
 msgid "How GIMP changed Mani's life."
 msgstr "GIMP如何改变了Mani的人生。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Mani began his journey towards liberation from social constraints as an "
 "enthusiastic and talented teenager. His awareness and commitment to freedom "
@@ -135,7 +161,7 @@
 
"罗尔的贫民区介绍计算机知识。这个活动给他的社区带来了持续的改善,并且最终给他"
 "的人生带来了翻天覆地的变化。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The group set up a Free Software computer lab in the slum dwelling and Mani "
 "learned fast, becoming a teacher himself to help his peers develop better "
@@ -150,7 +176,7 @@
 
"技巧,把技术知识和艺术天赋结合在一起,他制作图像艺术品,展示并销售它们。以下3"
 "分钟的视频展示了Mani学习自由软件的奋斗历程。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
 msgid ""
 "Watch and download the video as <a href=\"http://audio-video.gnu.org/video/";
 "we_use_gnu-linux_high.ogv\"> Ogg Theora</a> at a higher resolution."
@@ -158,7 +184,7 @@
 "请用<a href=\"http://audio-video.gnu.org/video/we_use_gnu-linux_high.ogv";
 "\">Ogg Theora</a>观赏和下载更高清晰度的视频。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
 msgid ""
 "<em>Note to the hearing-impaired:</em> the only audio in this video is the "
 "soundtrack, which is a piano version of the Free Software Song."
@@ -167,7 +193,7 @@
 #.  TRANSLATORS: please translate the written description of the video
 #.      and replace the link to the English version with the link to your 
 #.      translation 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
 msgid ""
 "<em>Note to the visually impaired:</em> A <a href=\"/education/misc/"
 "we_use_gnu-linux_description.en.txt\"> written description of the video</a> "
@@ -176,13 +202,13 @@
 "<em>致视力障碍者:</em>这里有<a href=\"/education/misc/we_use_gnu-"
 "linux_description.zh-cn.txt\">视频的书面介绍</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "At the time of writing (March 2012) Mani is a student of Computer Science in "
 "Bangalore. He says:"
 msgstr "此文撰写时(2012年3月)Mani是班加
罗尔的一名计算机科学学生。他说道:"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><blockquote><p>
 msgid ""
 "&ldquo;First I need to say thanks to the Free Software movement, it allowed "
 "me to start learning GIMP. It was my first achievement in life, and I sold "
@@ -204,23 +230,23 @@
 "机知识赋予穷人力量。我们要复制我们的æ 
·æ¿ï¼Œåœ¨æ­¤åœ°åŒºçš„其他贫民区,我们已经在运"
 "行3所计算中心。&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "Richard Stallman's comment on this case:"
 msgstr "Richard Stallman对此案例的评价:"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><blockquote><p>
 msgid ""
-"<strong>&ldquo;I am more proud that GNU has been adopted by Indian Dalits "
-"than of its use by famous corporations.&rdquo;</strong>"
+"&ldquo;I am more proud that GNU has been adopted by Indian Dalits than of "
+"its use by famous corporations.&rdquo;"
 msgstr ""
-"<strong>&ldquo;比之GNU被著名的大å…
¬å¸æ‰€ç”¨ï¼Œæˆ‘更为之被印度达利人<sup><a href="
-"\"#TransNote1\">1</a></sup>所用而自豪。&rdquo;</strong>"
+"&ldquo;比之GNU被著名的大å…
¬å¸æ‰€ç”¨ï¼Œæˆ‘更为之被印度达利人<sup><a href="
+"\"#TransNote1\">1</a></sup>所用而自豪。&rdquo;"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Why"
 msgstr "为什么"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The interests of nonfree software developers are at odds with the needs of "
 "users from all segments of society, given that they deny basic human values "
@@ -232,7 +258,7 @@
 "户需求都有兴趣。专有软件公司认为其产品对用户造
成的伤害和它们盈利的目标毫不相"
 "干。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In complex social structures such as that of India, exclusion of the "
 "underprivileged from access to information technologies is just one of the "
@@ -253,7 +279,7 @@
 "社区之中,并成为其宝贵的财富。å…
¶æˆå‘˜ä¹‹é—´çš„联系是坚固和强壮的,是防御外来入侵"
 "的堡垒。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In that scenario, the introduction of proprietary software would not be "
 "accepted by these socially committed people since that would result in the "
@@ -272,7 +298,7 @@
 "利,尤å…
¶æ˜¯ï¼Œä»–们不会放弃和友邻分享软件的权利。而所有这些自由只有<a
 href=\"/"
 "philosophy/free-sw.html\">自由软件</a>才能给他们。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The restrictions imposed on users by proprietary software developers serve "
 "to attack other layers of society as well, specially the upper spending "
@@ -289,13 +315,13 @@
 
"台上运行的产品升级&mdash;极可能是非自由的平台。如此,用户别æ—
 é€‰æ‹©ï¼Œåªèƒ½ä½¿ç”¨è€"
 "的版本或者投资新的系统。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Isabel Saij explains why she decided to break free from the trap by adopting "
 "Free Software:"
 msgstr "Isabel Saij解释了为什么她决定冲ç 
´è—©ç¯±ï¼Œæ‹¥æŠ±è‡ªç”±è½¯ä»¶ï¼š"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><blockquote><p>
 msgid ""
 "&ldquo;With proprietary programs the artist is at the mercy of the software "
 "development company. Early in 2003 I used LiveMotion to design my digital 2D "
@@ -318,11 +344,11 @@
 "之中。令人沮丧但又无
能为力。使用自由软件,社区拥有代ç 
ï¼Œå¥½çš„项目永远不会没"
 "落。总有人会继续开发该软件。&rdquo;"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Results"
 msgstr "结果"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The introduction of Free Software in the slum removed the barriers that "
 "prevented this marginalized sector of society from accessing knowledge in "
@@ -340,7 +366,7 @@
 "了如何克服不均衡的å…
¨çƒç»æµŽæ”¿ç­–带来的消极影响,并且现在可以开始富有成效的生"
 "活。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "With Free Software, users received all the benefits of digital education "
 "without being constrained to compromise their principles. The ethical values "
@@ -361,7 +387,7 @@
 "充分知识,如果必
要,他可以修改软件来满足社区的需要。自由软件导致智力和经济财"
 "富的再分配,而这在获取知识受限制的情
况下是不可能的。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In less disadvantaged contexts, users of GIMP have benefited from software "
 "freedom in many ways. They are no longer subject to arbitrary decisions by "
@@ -379,7 +405,7 @@
 "布了大量的指导材料,而且有了源代ç 
ï¼Œæœ‰ç¼–程技术的伙伴为该应用贡献了多个增强性"
 "能的插件。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "As a free program under the GNU GPL version 3 or later, no arbitrary "
 "decision by developers can ever stop the advancement of GIMP nor can the "
@@ -389,7 +415,7 @@
 "停止GIMP发展,也没有人能把它变成专有软件。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 "<h3>译注</h3>\n"
@@ -411,9 +437,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -421,22 +445,22 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2012, 2016, 2018 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2012, 2016, 2018 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2012, 2016, 2018, 2020 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2012, 2016, 2018, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: po/edu-software-tuxpaint.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-software-tuxpaint.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-software-tuxpaint.zh-cn.po   6 Oct 2017 13:19:38 -0000       1.1
+++ po/edu-software-tuxpaint.zh-cn.po   31 May 2020 05:04:32 -0000      1.2
@@ -2,11 +2,12 @@
 # Copyright (C) 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2017.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-software-tuxpaint.html\n"
-"POT-Creation-Date: 2016-09-13 15:56+0000\n"
+"POT-Creation-Date: 2020-05-27 11:14+0200\n"
 "PO-Revision-Date: 2017-10-06 21:08+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -19,38 +20,49 @@
 msgid "Tux Paint - GNU Project - Free Software Foundation"
 msgstr "Tux Paint - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div><div><div><div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-resources.html\">Educational Resources</a> &rarr; <a href=\"/"
-"education/edu-software.html\">Educational Free Software</a> &rarr; Tux Paint"
-msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"edu-resources.html\">教育资源</a> &rarr; <a 
href=\"/education/edu-software."
-"html\">教育相关的自由软件</a> &rarr; Tux Paint"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">Resources</a>&nbsp;/ <a href=\"/"
+"education/edu-software.html\">Educational&nbsp;software</a>&nbsp;/"
+msgstr ""
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-resources.html\">教育资源</a>&nbsp;/ <a 
href=\"/education/edu-"
+"software.html\">教育相关的自由软件</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Tux Paint"
 msgstr "Tux Paint"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Description"
 msgstr "描述"
 
-#.  GNUN: localize URL /education/misc/tuxpaint-start-sm.png, 
/education/misc/tuxpaint-start.png 
-#. type: Content of: <div><a>
-msgid "<a href=\"/education/misc/tuxpaint-start.png\">"
-msgstr "<a href=\"/education/misc/tuxpaint-start.png\">"
-
-#. type: Attribute 'alt' of: <div><a><img>
-msgid "Screenshot of the Tux Paint interface."
-msgstr "Tux Paint界面的截屏"
-
-#. type: Content of: <div><div>
-msgid "</a>"
-msgstr "</a>"
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Tux Paint is a cross-platform drawing program created specifically for "
 "children. Little kids as young as 3 years old have no difficulty in finding "
@@ -66,38 +78,47 @@
 "子们可以在此用画笔和各种工具尽情发挥。作为å…
¥é—¨ï¼Œå­©å­ä»¬å¯ä»¥ä¸ºé¢„先设计的图画上"
 "色,就像描红一样。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The program includes all of the most common drawing tools such as lines and "
 "brushes for free-hand drawing and coloring, geometric shapes, sizing, an "
-"eraser, the \"Redo\" and \"Undo\" options, plus sound that plays while "
-"painting and a special tool called \"Magic\" for impressive effects: "
-"rainbow, glitter, chalk, blur, flip, and more."
+"eraser, the &ldquo;Redo&rdquo; and &ldquo;Undo&rdquo; options, plus sound "
+"that plays while painting and a special tool called &ldquo;Magic&rdquo; for "
+"impressive effects: rainbow, glitter, chalk, blur, flip, and more."
 msgstr ""
 "该程序囊括了所有最常用的画图工å…
·ï¼Œæ¯”如线条、画笔、色彩、几何图形、缩放、橡皮"
-"擦、\"重做(Redo)\"和 
\"撤销(Undo)\"操作,以及画画时的声音和一个特殊的\"魔"
-"术(Magic)\"工具,它可以制造引人注目的效果:彩虹、闪å…
‰ã€ç²‰ç¬”效果、模糊效果、"
-"翻转等等。"
+"擦、&ldquo;重做(Redo)&rdquo;和 
&ldquo;撤销(Undo)&rdquo;操作,以及画画时的"
+"声音和一个特殊的&ldquo;魔术(Magic)&rdquo;å·¥å…
·ï¼Œå®ƒå¯ä»¥åˆ¶é€ å¼•äººæ³¨ç›®çš„效果:彩"
+"虹、闪光、粉笔效果、模糊效果、翻转等等。"
 
-#. type: Content of: <p>
+#.  GNUN: localize URL /education/misc/tuxpaint-start-sm.png, 
/education/misc/tuxpaint-start.png 
+#. type: Content of: <div><div><div><a>
+msgid "<a href=\"/education/misc/tuxpaint-start.png\">"
+msgstr "<a href=\"/education/misc/tuxpaint-start.png\">"
+
+#. type: Attribute 'alt' of: <div><div><div><a><img>
+msgid "Screenshot of the Tux Paint interface."
+msgstr "Tux Paint界面的截屏"
+
+#. type: Content of: <div><div><p>
 msgid ""
 "Along with the Magic tool, the other popular feature among children is "
-"\"Stamp\", which contains loads of pictures and clip art that can be "
-"\"stamped\" on the canvas, such as plants and flowers, animals, holiday art, "
-"planets, and much more. Many of these stamps are provided with the program "
-"out of the box, and others are available as separate collections to be "
-"installed. Many users contribute their own art work to be included as stamps "
-"in the program; here we are going to see an example of how this was done by "
-"a group of children from a school in India, thus putting into practice the "
-"software freedom that the program guarantees."
-msgstr ""
-"除了魔术工具,还有一个受孩子们喜爱的功能叫做\"印章
(Stamp)\",它包含许多图片"
-"和剪贴画,能够盖在画布上,比如花草、动物、节日艺术、星球等等,举不胜举。许多"
-"印章和程序一起发布,还有一些可以作为单独的软件包安装
。很多用户为该程序贡献了"
-"剪贴画作为印章;我们下面会看一个由印度学æ 
¡çš„小朋友制作的例子,它展示了自由软"
-"件提供的自由实践。"
+"&ldquo;Stamp,&rdquo; which contains loads of pictures and clip art that can "
+"be &ldquo;stamped&rdquo; on the canvas, such as plants and flowers, animals, "
+"holiday art, planets, and much more. Many of these stamps are provided with "
+"the program out of the box, and others are available as separate collections "
+"to be installed. Many users contribute their own art work to be included as "
+"stamps in the program; here we are going to see an example of how this was "
+"done by a group of children from a school in India, thus putting into "
+"practice the software freedom that the program guarantees."
+msgstr ""
+"除了魔术工å…
·ï¼Œè¿˜æœ‰ä¸€ä¸ªå—孩子们喜爱的功能叫做&ldquo;印章
(Stamp)&rdquo;,它包"
+"含许多图片和剪贴画,能够盖在画布上,比如花草、动物、节日艺术、星球等等,举不"
+"胜举。许多印章
和程序一起发布,还有一些可以作为单独的软件包安装
。很多用户为该"
+"程序贡献了剪贴画作为印章;我们下面会看一个由印度学æ 
¡çš„小朋友制作的例子,它展"
+"示了自由软件提供的自由实践。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Tux Paint is available in more than 80 languages, including minority and "
 "right-to-left languages. Such a large number of languages is the result of "
@@ -106,7 +127,7 @@
 "Tux Paint支持80多种语言,包
括小语种和从右向左的语言。这么丰富的语言支持得益于"
 "来自世界各地的用户贡献。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "To learn more: <a href=\"http://directory.fsf.org/project/TuxPaint/\";> FSF "
 "Directory</a>, <a href=\"http://tuxpaint.org\";> Tux Paint Official Website</"
@@ -115,19 +136,11 @@
 "了解更多:<a 
href=\"http://directory.fsf.org/project/TuxPaint/\";>FSF目录</"
 "a>、<a href=\"http://tuxpaint.org\";>Tux Paint官方网站</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Who's Using It and How"
 msgstr "谁在使用它以及用来做什么"
 
-#. type: Content of: <div><a>
-msgid "<a href=\"/education/misc/tuxpaint-stamps.jpg\">"
-msgstr "<a href=\"/education/misc/tuxpaint-stamps.jpg\">"
-
-#. type: Attribute 'alt' of: <div><a><img>
-msgid "Screenshot of the Tux Paint interface in Malayalam with native flowers."
-msgstr "Tux Paint的界面截图,这是带有地方花卉的马拉雅
拉姆语(Malayalam)。"
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Comments by <a href=\"http://tuxpaint.org/comments/\";>home users</a> and "
 "stories from <a href=\"http://tuxpaint.org/schools/\";>schools</a> using Tux "
@@ -149,7 +162,15 @@
 "列的自由。例如,其中一个自由是用户可以按需要安装
,多少台都行,这对学校尤为重"
 "要。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><div><a>
+msgid "<a href=\"/education/misc/tuxpaint-stamps.jpg\">"
+msgstr "<a href=\"/education/misc/tuxpaint-stamps.jpg\">"
+
+#. type: Attribute 'alt' of: <div><div><div><a><img>
+msgid "Screenshot of the Tux Paint interface in Malayalam with native flowers."
+msgstr "Tux Paint的界面截图,这是带有地方花卉的马拉雅
拉姆语(Malayalam)。"
+
+#. type: Content of: <div><div><p>
 msgid ""
 "Another significant freedom that Free Software guarantees is the freedom to "
 "modify the program so as to adapt it to the user's needs and to redistribute "
@@ -167,15 +188,31 @@
 "政策是æ 
¹æ®å¸‚场大小来制定的:如果市场的大小不能确保盈利,那么他们通常是不愿意"
 "投资开发的。"
 
-#. type: Content of: <div><div><a>
+#. type: Content of: <div><div><div><div><a>
+msgid "<a href=\"/education/misc/anthoorium.jpg\">"
+msgstr "<a href=\"/education/misc/anthoorium.jpg\">"
+
+#. type: Attribute 'alt' of: <div><div><div><div><a><img>
+msgid "Image of the Anthoorium flower."
+msgstr "火鹤花(Anthoorium)的图片。"
+
+#. type: Content of: <div><div><div><div><p>
+msgid ""
+"<a href=\"/education/misc/anthoorium.ogg\">Listen</a> to a student pronounce "
+"the name of the Anthoorium flower in Malayalam."
+msgstr ""
+"<a href=\"/education/misc/anthoorium.ogg\">请听</a>一个学生用马拉雅
拉姆语朗读"
+"火鹤花(Anthoorium)的名字。"
+
+#. type: Content of: <div><div><div><div><a>
 msgid "<a href=\"/education/misc/appooppanthaady.jpg\">"
 msgstr "<a href=\"/education/misc/appooppanthaady.jpg\">"
 
-#. type: Attribute 'alt' of: <div><div><a><img>
+#. type: Attribute 'alt' of: <div><div><div><div><a><img>
 msgid "Image of the Appooppan Thaady flower."
 msgstr "Appooppan Thaady花的图片。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><div><p>
 msgid ""
 "<a href=\"/education/misc/appooppanthady.ogg\">Listen</a> to a student "
 "pronounce the name of the Appooppan Thaady flower in Malayalam."
@@ -183,24 +220,8 @@
 "<a 
href=\"/education/misc/appooppanthady.ogg\">请听</a>一个学生用马拉雅
拉姆语"
 "朗读Appooppan Thaady花的名字。"
 
-#. type: Content of: <div><div><a>
-msgid "<a href=\"/education/misc/anthoorium.jpg\">"
-msgstr "<a href=\"/education/misc/anthoorium.jpg\">"
-
-#. type: Attribute 'alt' of: <div><div><a><img>
-msgid "Image of the Anthoorium flower."
-msgstr "火鹤花(Anthoorium)的图片。"
-
 #. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"/education/misc/anthoorium.ogg\">Listen</a> to a student pronounce "
-"the name of the Anthoorium flower in Malayalam."
-msgstr ""
-"<a href=\"/education/misc/anthoorium.ogg\">请听</a>一个学生用马拉雅
拉姆语朗读"
-"火鹤花(Anthoorium)的名字。"
-
-#. type: Content of: <p>
-msgid ""
 "A good example of how software freedom can be applied in Tux Paint is the "
 "work done by 11 and 12 years old students from the <a href=\"/education/edu-"
 "cases-india-irimpanam.html\">VHSS Irimpanam</a> school in the State of "
@@ -228,7 +249,7 @@
 
"\"http://audio-video.gnu.org/video/irimpanam-high-sub.en.ogv\";>请观看和下载视"
 "频</a>和<a href=\"/education/misc/irimpanam.en.srt\">SubRip字幕</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "An additional useful activity done by this school by applying the freedom to "
 "modify the program, was the translation of the Tux Paint interface into "
@@ -237,11 +258,11 @@
 "另外,该学校还把Tux Paint的界面翻译为马拉雅
拉姆语,Kerala州的当地语言。这是一"
 "项有益的活动,它是学校在实践修改软件的自由。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Why"
 msgstr "为什么"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to modify the program is an important resource that was used by "
 "the school to reach beyond the scope of teaching basic computer graphical "
@@ -254,7 +275,7 @@
 "形基础技术或使学生快乐的目æ 
‡ã€‚它可以用来向学生们展示我们不能受制于信息技术,"
 "信息技术也不应强加于用户,它只是服务于用户需求的工å…
·ã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The freedom to install the program in all computers in the Lab was also "
 "important, since the school has limited economical resources to invest in "
@@ -266,11 +287,11 @@
 "济资源有限。通过向学生们发放拷贝和修改后的拷贝,学æ 
¡ä¹Ÿå¸®åŠ©äº†ç»æµŽä¸Šæœ‰å›°éš¾çš„家"
 "庭。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Results"
 msgstr "结果"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Adding stamps to Tux Paint was an exciting and enriching experience for the "
 "students. First, they analyzed how the program works and discovered the "
@@ -290,11 +311,11 @@
 
"有了软件自由,任何人,即使不是程序员,甚至是孩子,实é™
…上也能够影响和改善信息"
 "技术。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><div><div><h3>
 msgid "Credits"
 msgstr "鸣谢"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><div><p>
 msgid ""
 "Images of the Tux Paint interface in Malayalam with native flowers, of the "
 "Appooppan Thaady and Anthoorium flowers, as well as both sound files are "
@@ -309,7 +330,7 @@
 "Creative Commons Attribution-ShareAlike 3.0 Unported</a>授权。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -326,9 +347,7 @@
 "联系方法</a> 联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮"
 "件到<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -336,22 +355,24 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>获取有关协调和提交翻译的相关事项。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2011, 2012, 2014, 2016, 2020 Free Software Foundation, Inc."
+msgstr ""
+"Copyright &copy; 2011, 2012, 2014, 2016, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: po/edu-software.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-software.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/edu-software.zh-cn.po    2 May 2019 13:29:42 -0000       1.8
+++ po/edu-software.zh-cn.po    31 May 2020 05:04:32 -0000      1.9
@@ -2,11 +2,12 @@
 # Copyright (C) 2017-2019 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2017-2019.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-software.html\n"
-"POT-Creation-Date: 2019-05-01 00:27+0000\n"
+"POT-Creation-Date: 2020-05-27 10:42+0200\n"
 "PO-Revision-Date: 2019-05-02 20:26+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -19,29 +20,52 @@
 msgid "Educational Free Software - GNU Project - Free Software Foundation"
 msgstr "教育性自由软件 - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/edu-resources.html\">Educational Resources</a> &rarr; Educational "
-"Free Software"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"edu-resources.html\">教育资源</a> &rarr; 教育性自由软件"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-resources.html\">教育资源</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Educational Free Software"
 msgstr "教育性自由软件"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"<strong>The GNU project maintains a <a href=\"/software/free-software-for-"
+"<em>The GNU project maintains a <a href=\"/software/free-software-for-"
 "education.html\">list of high quality free programs for education at all "
-"levels</a> that we recommend.</strong>"
+"levels</a> that we recommend.</em>"
 msgstr ""
-"<strong>GNU 工程维护着一个建议使用的 <a 
href=\"/software/free-software-for-"
-"education.html\">适合各种层级的高质量教育性自由软件列表</a>。</strong>"
+"<em>GNU 工程维护着一个建议使用的 <a 
href=\"/software/free-software-for-"
+"education.html\">适合各种层级的高质量教育性自由软件列表</a>。</em>"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Before addressing the subject in this section, we would like to remind our "
 "readers that the word &ldquo;free&rdquo; in &ldquo;free software&rdquo; "
@@ -57,11 +81,11 @@
 "拷贝、发布、学习
、修改和改善该软件。要了解更多,请看<a href=\"/philosophy/"
 "free-sw.html\">自由软件的定义</a>。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "What you will find in this section"
 msgstr "你在本节会得到什么"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This page does not constitute an exhaustive listing of available educational "
 "free programs. Our aim is to present some examples so as to illustrate how "
@@ -73,21 +97,21 @@
 "大家教育机构如何实际
使用自由软件以及如何有效地应用自由软件带来的自由。对每个"
 "例子,我们会展示这些自由是怎么应用的。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "The following are the examples that we present:"
 msgstr "以下是我们的例子:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"/education/edu-software-gcompris.html\">GCompris</a> | <a href=\"/"
-"education/edu-software-gimp.html\">GIMP</a> | <a href=\"/education/edu-"
-"software-tuxpaint.html\">Tux Paint</a>"
-msgstr ""
-"<a href=\"/education/edu-software-gcompris.html\">GCompris</a> | <a href=\"/"
-"education/edu-software-gimp.html\">GIMP</a> | <a href=\"/education/edu-"
-"software-tuxpaint.html\">Tux Paint</a>"
+"&nbsp;<a href=\"/education/edu-software-gcompris.html\">GCompris</a>&nbsp; "
+"&nbsp;<a href=\"/education/edu-software-gimp.html\">GIMP</a>&nbsp; &nbsp;<a "
+"href=\"/education/edu-software-tuxpaint.html\">Tux Paint</a>&nbsp;"
+msgstr ""
+"&nbsp;<a href=\"/education/edu-software-gcompris.html\">GCompris</a>&nbsp; "
+"&nbsp;<a href=\"/education/edu-software-gimp.html\">GIMP</a>&nbsp; &nbsp;<a "
+"href=\"/education/edu-software-tuxpaint.html\">Tux Paint</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Some of the programs presented here, like GCompris, are part of the GNU "
 "Project. This means that developers of these programs agree to pay attention "
@@ -105,7 +129,7 @@
 
"也不会让用户把任何非自由的自由软件文档当成我们在自由软件运动中定义的<a
 href="
 "\"/philosophy/free-doc.html\">自由文档</a>来参考。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "People who wish to migrate to free software or are looking for a free libre "
 "program to accomplish a particular task, should refer to the <a href="
@@ -124,7 +148,7 @@
 
"a>部分,我们列出了对应不同教育水平的程序,从学前班到专门的高等教育,åŒ
…括大学"
 "和研究院。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you know of a free software program that is being used by an educational "
 "institution for specific purposes, or has been modified or otherwise adapted "
@@ -136,7 +160,7 @@
 "个自由软件来契合他们的教育需要,请给我们来信<a 
href=\"mailto:education@gnu.";
 "org\">&lt;education@gnu.org&gt;</a>,让我们知道。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We are looking for free educational games, or information about free games "
 "that can be used for educational purposes. Contact <a href=\"mailto:";
@@ -146,7 +170,7 @@
 "\"mailto:education@gnu.org\";>&lt;education@gnu.org&gt;</a>。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -163,9 +187,7 @@
 "系方法</a>联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮件到"
 "<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -173,14 +195,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
@@ -188,9 +210,11 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Copyright &copy; 2011, 2012, 2016, 2017, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 2011, 2012, 2016, 2017, 2019, 2020 Free Software "
+"Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2011, 2012, 2016, 2017, 2019 Free Software Foundation, Inc."
+"Copyright &copy; 2011, 2012, 2016, 2017, 2019, 2020 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: po/edu-system-india.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-system-india.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-system-india.zh-cn.po        11 Oct 2018 02:15:52 -0000      1.1
+++ po/edu-system-india.zh-cn.po        31 May 2020 05:04:32 -0000      1.2
@@ -2,11 +2,12 @@
 # Copyright (C) 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2018.
-#
+# May 2020: update to new layout; mark some strings TODO instead of
+# fuzzy (T. Godefroy).
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-system-india.html\n"
-"POT-Creation-Date: 2017-08-07 15:26+0000\n"
+"POT-Creation-Date: 2020-05-28 14:02+0200\n"
 "PO-Revision-Date: 2018-10-11 10:11+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -19,28 +20,51 @@
 msgid "The Education System in India - GNU Project - Free Software Foundation"
 msgstr "印度的教育体系 - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/education.html#indepth\">In Depth</a> &rarr; The Education System "
-"in India"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/education.html#indepth\">In&nbsp;Depth</a>&nbsp;/"
 msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"education.html#indepth\">深度分析</a> &rarr; 印度的教育体系"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/education.html#indepth\">深度分析</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "The Education System in India"
 msgstr "印度的教育体系"
 
-#. type: Content of: <p>
-msgid "by <strong>Dr. V. Sasi Kumar</strong><a href=\"#sasi\"> (1)</a>"
-msgstr "<strong>Dr. V. Sasi Kumar</strong><a href=\"#sasi\"> (1)</a> 著"
+#. type: Content of: <div><p>
+msgid "by Dr. V. Sasi Kumar <a href=\"#sasi\">(1)</a>"
+msgstr "Dr. V. Sasi Kumar <a href=\"#sasi\">(1)</a> 著"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "In the Beginning"
 msgstr "开始"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In ancient times, India had the Gurukula system of education in which anyone "
 "who wished to study went to a teacher's (Guru) house and requested to be "
@@ -61,7 +85,7 @@
 "或者直到老师觉得已经把自己所知都教完了。所有的学习
活动都和自然与生活息息相"
 "关,而不局限于对信息的记忆。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The modern school system was brought to India, including the English "
 "language, originally by Lord Thomas Babington Macaulay in the 1830s. The "
@@ -76,7 +100,7 @@
 "上学不是必须的科目。教育在课å 
‚里进行,和自然界没什么联系,师生之间的关系也不"
 "那么紧密。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The Uttar Pradesh (a state in India) Board of High School and Intermediate "
 "Education was the first Board set up in India in the year 1921 with "
@@ -99,7 +123,7 @@
 "考试系统。现在,理事会管辖有数千所学校,包括印度学æ 
¡å’Œæ¥è‡ªå…¶ä»–国家如阿富汗和"
 "津巴布韦的学校。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Universal and compulsory education for all children in the age group of 6-14 "
 "was a cherished dream of the new government of the Republic of India. This "
@@ -119,12 +143,12 @@
 
"的压力和技术性劳动力的严重缺乏显然在促使政府采取该步骤上起了一定的作用。印度"
 "政府近年来在学校教育上的支出占
GDP的3%,这是一个很低的比例。"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><blockquote><p>
 msgid ""
-"&ldquo;In recent times, several major announcements were made for developing "
-"the poor state of affairs in education sector in India, the most notable "
-"ones being the National Common Minimum Programme (NCMP) of the United "
-"Progressive Alliance (UPA) government. The announcements are; (a) To "
+"<em>&ldquo;In recent times, several major announcements were made for "
+"developing the poor state of affairs in education sector in India, the most "
+"notable ones being the National Common Minimum Programme (NCMP) of the "
+"United Progressive Alliance (UPA) government. The announcements are; (a) To "
 "progressively increase expenditure on education to around 6 percent of GDP. "
 "(b) To support this increase in expenditure on education, and to increase "
 "the quality of education, there would be an imposition of an education cess "
@@ -132,22 +156,23 @@
 "education due to economic backwardness and poverty. (d) To make right to "
 "education a fundamental right for all children in the age group 6&ndash;14 "
 "years. (e) To universalize education through its flagship programmes such as "
-"Sarva Siksha Abhiyan and Mid Day Meal.&rdquo; <a href=\"http://en.wikipedia.";
-"org/wiki/Education_in_india\">Wikipedia: Education in India</a>."
+"Sarva Siksha Abhiyan and Mid Day Meal.&rdquo;</em> (<a href=\"http://en.";
+"wikipedia.org/wiki/Education_in_india\">Wikipedia: Education in India</a>)"
 msgstr ""
-"&ldquo;最近,针对印度贫困地区的教育发展已经出台了多个主要å
…¬å‘Šï¼Œå…¶ä¸­æœ€ä¸ºå¼•äººå…³"
-"注的是团结进步联盟(UPA)政府的国家最低å…
±åŒçº²é¢†ï¼ˆNCMP)。该公告称:(a)逐步将"
-"教育支出提高到GDP的6%。(b)为了支持提高教育支出和提高教育质量,会在中央税收之"
-"上再征收教育地方税。(c)确保没有人因
为经济落后和贫穷而被剥夺受教育的权利。(d)"
-"使受教育成为所有6&ndash;14岁儿童的基本权利。(e)通过诸如Sarva
 Siksha Abhiyan和"
-"午餐(Mid Day Meal)等标志性活动普及教育。&rdquo; <a 
href=\"http://en.";
-"wikipedia.org/wiki/Education_in_india\">Wikipedia:印度的教育</a>。"
+"<em>&ldquo;最近,针对印度贫困地区的教育发展已经出台了多个主要å
…¬å‘Šï¼Œå…¶ä¸­æœ€ä¸ºå¼•"
+"人关注的是团结进步联盟(UPA)政府的国家最低å…
±åŒçº²é¢†ï¼ˆNCMP)。该公告称:(a)逐"
+"步将教育支出提高到GDP的6%。(b)为了支持提高教育支出和提高教育质量,会在中央税"
+"收之上再征收教育地方税。(c)确保没有人因
为经济落后和贫穷而被剥夺受教育的权利。"
+"(d)使受教育成为所有6&ndash;14岁儿童的基本权利。(e)通过诸如Sarva
 Siksha "
+"Abhiyan和午餐(Mid Day Meal)等æ 
‡å¿—性活动普及教育。&rdquo;</em> (<a href="
+"\"http://en.wikipedia.org/wiki/Education_in_india\";>Wikipedia:印度的教育</"
+"a>)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "The School System"
 msgstr "学校体系"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "India is divided into 28 states and 7 so-called &ldquo;Union "
 "Territories&rdquo;. The states have their own elected governments while the "
@@ -175,7 +200,7 @@
 "年设立的中央教育咨询理事会(CABE)继续担
任着发展和监控教育政策和方案的领导角"
 "色。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "There is a national organization that plays a key role in developing "
 "policies and programmes, called the National Council for Educational "
@@ -193,7 +218,7 @@
 
"置、教学体制和评估手段。SCERT一般会遵循由NCERT设立的指南。但是各州有很大的自"
 "主性来实施自己的教育体系。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The National Policy on Education, 1986 and the Programme of Action (POA) "
 "1992 envisaged free and compulsory education of satisfactory quality for all "
@@ -208,7 +233,7 @@
 "育,其中一半将用于基础教育。教育支出在GDP中的占
比也从1951-52年度的0.7%提高到"
 "了1997-98年度的3.6%。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The school system in India has four levels: lower primary (age 6 to 10), "
 "upper primary (11 and 12), high (13 to 15) and higher secondary (17 and 18). "
@@ -227,7 +252,7 @@
 "语之外)。在高中阶段可以有一些专门教育。å…
¨å›½çš„学生都必须学3门语言(英语、印度"
 "语和母语),除非å…
¶æ¯è¯­å°±æ˜¯å°åº¦è¯­ï¼Œæˆ‘们下面会讲到这些地区。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "There are mainly three streams in school education in India. Two of these "
 "are coordinated at the national level, of which one is under the Central "
@@ -260,7 +285,7 @@
 "级的教学内容。CBSE还在21个其他国家有141所附属学æ 
¡ï¼Œä¸»è¦æ˜¯æ»¡è¶³å½“地的印度人员的"
 "需求。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The second central scheme is the Indian Certificate of Secondary Education "
 "(ICSE). It seems that this was started as a replacement for the Cambridge "
@@ -291,7 +316,7 @@
 "学校教育法案1973下挂牌。现在,全国有大量的学æ 
¡éš¶å±žäºŽè¯¥å§”员会。这些都是私立学"
 "校,通常为富家子弟服务的。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Both the CBSE and the ICSE council conduct their own examinations in schools "
 "across the country that are affiliated to them at the end of 10 years of "
@@ -306,11 +331,11 @@
 "种å…
¨å°åº¦è€ƒè¯•çš„成绩来定的。由于这给孩子们带来很大的学习
压力,已经有呼声要取消"
 "初中毕业时的考试。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Exclusive Schools"
 msgstr "贵族学校"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "In addition to the above, there are a relatively small number of schools "
 "that follow foreign curricula such as the so-called Senior Cambridge, though "
@@ -329,7 +354,7 @@
 "般有着超
级的实施、极低的学生-老师比和很少的学生。许多学æ 
¡çš„老师都来自海外。还"
 "有一些其他的贵族学æ 
¡ï¼Œæ¯”如Dehradun的杜恩中学,它的学生很少,收费奇高。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Apart from all of these, there are a handful of schools around the country, "
 "such as the Rishi Valley school in Andhra Pradesh, that try to break away "
@@ -345,11 +370,11 @@
 "有高的师生比并提供学生自主的学习环境。研究此类学æ 
¡å¯¹å…¶æ¯•ä¸šç”Ÿä¸€ç”Ÿçš„影响应该是"
 "一件有趣和有教育意义的事。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "State Schools"
 msgstr "州立学校"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Each state in the country has its own Department of Education that runs its "
 "own school system with its own textbooks and evaluation system.  As "
@@ -361,7 +386,7 @@
 
"统。如前所述,课程设置、教学方法和评价系统基本上是由州里的SCERT决定,同时遵循"
 "由NCERT提出的全国性指导。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Each state has three kinds of schools that follow the state curriculum. The "
 "government runs its own schools in land and buildings owned by the "
@@ -386,11 +411,11 @@
 
"资金是用来帮助降低收费,让穷人的孩子也可以来这里上学。在象Kerala这æ
 ·çš„州里,"
 "这些学校和公立学校非常类似,因
为教职工由政府发薪,学校收费也和公立学校一样。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "The Case of Kerala"
 msgstr "Kerala的案例"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The state of Kerala, a small state in the South Western coast of India, has "
 "been different from the rest of the country in many ways for the last few "
@@ -416,7 +441,7 @@
 "特有的发展模式,在教育和福利方面高投å…
¥ï¼Œç»æµŽå­¦å®¶æˆä¹‹ä¸º&ldquo;Kerala模式"
 "&ldquo;。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Kerala has also always shown interest in trying out ways of improving its "
 "school education system. Every time the NCERT came up with new ideas, it was "
@@ -454,7 +479,7 @@
 
"(CCE),该体系考虑了学生整体的个性,减少了单次最终考试结果对学生晋级的影响。"
 "目前,CBSE也实施了CCE,但是方式更加灵活。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Kerala was also the first state in the country to introduce Information "
 "Technology as a subject of study at the High School level.  It was started "
@@ -502,7 +527,7 @@
 "kde.org/kalzium/\"> Kalzium</a>和<a href=\"http://directory.fsf.org/project/";
 "ghemical/\"> Ghemical</a>之类的程序在师生之间也很流行。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The initiative taken by Kerala is now influencing other states and even the "
 "policies of the Government of India. States like Karnataka and Gujarat are "
@@ -521,38 +546,54 @@
 "育资源。一旦几
个大州成功迁移到了自由软件,整个国家都有希望在短时间å†
…跟风而"
 "动。如果那æ 
·ï¼Œå°åº¦å°±ä¼šå¤§ä½“上拥有GNU/Linux和自由软件的最大用户基础。"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "References"
 msgstr "参考资料"
 
-#. type: Content of: <p>
+# TODO: untranslated.
+#. type: Content of: <div><div><ul><li>
+msgid ""
+"<a href=\"http://www.columbia.edu/itc/mealac/pritchett/00generallinks/";
+"macaulay/txt_minute_education_1835.html\"> Minute by the Hon'ble T. B. "
+"Macaulay, dated the 2nd February 1835</a>"
+msgstr ""
+"<a href=\"http://www.columbia.edu/itc/mealac/pritchett/00generallinks/";
+"macaulay/txt_minute_education_1835.html\"> Minute by the Hon'ble T. B. "
+"Macaulay, dated the 2nd February 1835</a>"
+
+# TODO: untranslated.
+#. type: Content of: <div><div><ul><li>
 msgid ""
-"http://www.columbia.edu/itc/mealac/pritchett/00generallinks/macaulay/";
-"txt_minute_education_1835.html"
+"<a href=\"http://varnam.org/blog/2007/08/the_story_behind_macaulays_edu\";> "
+"The Story behind Macaulay's Education Policy: Part 1</a>"
 msgstr ""
-"http://www.columbia.edu/itc/mealac/pritchett/00generallinks/macaulay/";
-"txt_minute_education_1835.html"
+"<a href=\"http://varnam.org/blog/2007/08/the_story_behind_macaulays_edu\";> "
+"The Story behind Macaulay's Education Policy: Part 1</a>"
 
-#. type: Content of: <p>
-msgid "http://varnam.org/blog/2007/08/the_story_behind_macaulays_edu";
-msgstr "http://varnam.org/blog/2007/08/the_story_behind_macaulays_edu";
+# TODO: untranslated.
+#. type: Content of: <div><div><ul><li>
+msgid ""
+"<a href=\"http://en.wikipedia.org/wiki/Central_Board_of_Secondary_Education";
+"\"> Wikipedia: Central Board of Secondary Education</a>"
+msgstr ""
+"<a href=\"http://en.wikipedia.org/wiki/Central_Board_of_Secondary_Education";
+"\"> Wikipedia: Central Board of Secondary Education</a>"
 
-#. type: Content of: <p>
-msgid "http://en.wikipedia.org/wiki/Central_Board_of_Secondary_Education";
-msgstr "http://en.wikipedia.org/wiki/Central_Board_of_Secondary_Education";
+#. type: Content of: <div><div><h3>
+msgid "Footnote"
+msgstr "脚注"
 
-#. type: Content of: outside any tag (error?)
+#. type: Content of: <div><div><ol><li>
 msgid ""
-"<a id=\"sasi\"></a><a href=\"http://swatantryam.blogspot.com/\";>V. Sasi "
-"Kumar</a> is a doctor in physics and a member of the FSF India Board of "
-"Directors. He advocates for Free Software and freedom of knowledge."
+"<a href=\"http://swatantryam.blogspot.com/\";>V. Sasi Kumar</a> is a doctor "
+"in physics and a member of the FSF India Board of Directors.  He advocates "
+"for Free Software and freedom of knowledge."
 msgstr ""
-"<a id=\"sasi\"></a><a href=\"http://swatantryam.blogspot.com/\";>V. Sasi "
-"Kumar</a>是一位物理学博士,他是自由软件基金会印度董事会成员之一。他倡导自由软"
-"件和自由知识。"
+"<a href=\"http://swatantryam.blogspot.com/\";>V. Sasi 
Kumar</a>是一位物理学博"
+"士,他是自由软件基金会印度董事会成员之一。他倡导自由软件和自由知识。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -569,9 +610,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -579,14 +618,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"

Index: po/edu-team.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-team.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-team.zh-cn.po        11 Dec 2017 15:11:09 -0000      1.1
+++ po/edu-team.zh-cn.po        31 May 2020 05:04:32 -0000      1.2
@@ -2,11 +2,12 @@
 # Copyright (C) 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2017.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-team.html\n"
-"POT-Creation-Date: 2016-09-13 15:56+0000\n"
+"POT-Creation-Date: 2020-05-27 10:42+0200\n"
 "PO-Revision-Date: 2017-12-11 23:08+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -19,16 +20,39 @@
 msgid "The Education Team - GNU Project - Free Software Foundation"
 msgstr "教育团队 - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; The Education Team"
-msgstr "<a href=\"/education/education.html\">教育</a> &rarr; 教育团队"
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
+msgid "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/"
+msgstr "</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ "
+
+#. type: Content of: <div><h2>
 msgid "The Education Team"
 msgstr "教育团队"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The Education Team was initially created to carry out the task of building a "
 "section within the gnu.org website to specifically address the importance of "
@@ -42,7 +66,7 @@
 "影响,<a href=\"/gnu/the-gnu-project.html\">GNU工程</a>的成就必
须应用于所有的"
 "教育领域。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "The Team provides an answer to the need for a comprehensive approach to the "
 "adoption of <a href=\"/philosophy/free-sw.html\"> Free Software</a> by "
@@ -64,7 +88,7 @@
 "则,因
为它们和所有教育机构的目的是一致的。该方法将保证迁移的长期成功和有效。"
 "提高大家对这些原则的认知是我们团队的主要目标。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "We oppose any measures undertaken by governments or educational institutions "
 "to impose the use of proprietary software and standards in the school. We "
@@ -74,7 +98,7 @@
 "我们反对由政府或教育机构为强加专属软件及其标准于学æ 
¡è€Œé‡‡å–的任何措施。我们支"
 "持教师和学生在学校使用自由软件的权利。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "With our work, we also want to provide evidence that the freedoms granted by "
 "Free Software live not in the realm of abstract theories but can be "
@@ -86,43 +110,43 @@
 "抽象的理论王国,而是可以被所有用户,包
括教育机构,所实践的。大学和学校能够而"
 
"且应该好好使用这些自由,而我们的目的就是展示怎么做。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "With those objectives in mind, the Team intends to perform the following "
 "tasks:"
 msgstr "有了这些目标,本团队会进行以下任务:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Present cases of educational institutions around the world who are "
 "successfully using and teaching Free Software."
 msgstr "展示全世界范围内成功使用和教授自由软件的案例"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Show examples of how free programs are being used by educational "
 "institutions to improve the learning and teaching processes."
 msgstr "展示自由软件如何在教育机构改善教学的榜样"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Publish articles on the various aspects involved in the use of Free Software "
 "by educational institutions."
 msgstr "发表各种关于在教育机构使用自由软件的文章"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Maintain a dialogue with teachers, students and administrators of "
 "educational institutions to listen to their difficulties and provide support."
 msgstr "保持和教师、学生以及学æ 
¡ç®¡ç†å±‚的对话,倾听他们的困难并提供支持。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Keep in contact with other groups around the world committed to the "
 "promotion of Free Software in education."
 msgstr "联系全球其他致力于在教育领域推广自由软件的团队"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in our work and wish to help, if you have any "
 "questions or suggestions, or if you know of educational institutions around "
@@ -135,7 +159,7 @@
 "\">&lt;education@gnu.org&gt;</a>联系我们。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -152,9 +176,7 @@
 "系方法</a>联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮件到"
 "<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -162,22 +184,22 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>获取有关协调和提交翻译的相关事项。"
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2011, 2016 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2011, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: po/edu-why.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/po/edu-why.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/edu-why.zh-cn.po 1 Jan 2020 08:31:33 -0000       1.8
+++ po/edu-why.zh-cn.po 31 May 2020 05:04:32 -0000      1.9
@@ -2,11 +2,12 @@
 # Copyright (C) 2020 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2017, 2018, 2020.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-why.html\n"
-"POT-Creation-Date: 2020-01-01 05:25+0000\n"
+"POT-Creation-Date: 2020-05-27 10:42+0200\n"
 "PO-Revision-Date: 2020-01-01 15:55+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -21,39 +22,61 @@
 "Project - Free Software Foundation"
 msgstr "为什么教育机构应该使用和教授自由软件 - GNU工程 - 
自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/education.html#indepth\">In Depth</a> &rarr; Why Educational "
-"Institutions Should Use and Teach Free Software"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/education.html#indepth\">In&nbsp;Depth</a>&nbsp;/"
 msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"education.html#indepth\">较深层次</a> &rarr; 
为什么教育机构应该使用和教授自由"
-"软件"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/education.html#indepth\">较深层次</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Why Educational Institutions Should Use and Teach Free Software"
 msgstr "为什么教育机构应该使用和教授自由软件"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"<strong>\"Schools should teach their students to be citizens of a strong, "
-"capable, independent and free society.\"</strong>"
+"<em>&ldquo;Schools should teach their students to be citizens of a strong, "
+"capable, independent and free society.&rdquo;</em>"
 msgstr ""
-"<strong>\"学校应该教育å…
¶å­¦ç”Ÿæˆä¸ºå¼ºå¤§ã€æœ‰èƒ½åŠ›ã€ç‹¬ç«‹å’Œè‡ªç”±ç¤¾ä¼šçš„公民。\"</"
-"strong>"
+"<em>&ldquo;学校应该教育å…
¶å­¦ç”Ÿæˆä¸ºå¼ºå¤§ã€æœ‰èƒ½åŠ›ã€ç‹¬ç«‹å’Œè‡ªç”±ç¤¾ä¼šçš„公民。&rdquo;"
+"</em>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "These are the main reasons why universities and schools of all levels should "
 "use exclusively Free Software."
 msgstr "这是为什么大学和所有级别的学æ 
¡åº”该只使用自由软件的主要原因。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Sharing"
 msgstr "分享"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Schools should teach the value of sharing by setting an example. Free "
 "software supports education by allowing the sharing of knowledge and tools:"
@@ -61,7 +84,7 @@
 "学校应该通过做出榜样来教授分享的价值。自由软件通过å…
è®¸åˆ†äº«çŸ¥è¯†å’Œå·¥å…·æ¥æ”¯æŒæ•™"
 "育:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "<strong>Knowledge</strong>. Many young students have a talent for "
 "programming; they are fascinated with computers and eager to learn how their "
@@ -75,7 +98,7 @@
 "让学生了解å…
¶å·¥ä½œåŽŸç†ã€‚但是如果使用自由软件,老师们就可以讲解å…
¶åŸºæœ¬å†…容,然后"
 "把源代码交给学生去阅读和学习。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "<strong>Tools</strong>. Teachers can hand out to students copies of the "
 "programs they use in the classroom so that they can use them at home. With "
@@ -84,11 +107,11 @@
 "<strong>å·¥å…
·</strong>。教师们可以把程序的拷贝交给学生,这æ 
·ä»–们既可以在学校"
 "用,也可以带回家去用。对自由软件来说,复制不但是å…
è®¸çš„,而且是被鼓励的。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Social Responsibility"
 msgstr "社会责任"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Computing has become an essential part of everyday life. Digital technology "
 "is transforming society very quickly, and schools have an influence on the "
@@ -105,11 +128,11 @@
 "为这些开发者单方面做出决定,而其他人无
法改变。教育机构不应该允许软件公司将其"
 "权力强加于我们的社会和我们的未来。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Independence"
 msgstr "独立"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Schools have an ethical responsibility to teach strength, not dependency on "
 "a single product or a specific powerful company. Furthermore, by choosing to "
@@ -119,7 +142,7 @@
 "学校有道德义务来传
授力量,不依赖单一的产品或某个特殊的强大å…
¬å¸ã€‚更进一步,选"
 "择使用自由软件,学校就独立于商业利益之外,并且避å…
äº†ç»‘定供应商。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Proprietary software companies use schools and universities as a springboard "
 "to reach users and thus impose their software on society as a whole. They "
@@ -136,7 +159,7 @@
 "会得到打折的软件。本质上,这些公司在雇用学æ 
¡å’Œå¤§å­¦ä½œä¸ºå…¶ä»£ç†äººï¼Œä»Žè€Œå¼•å¯¼äººä»¬"
 "对其软件形成固定的终生依赖。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
 msgid ""
 "Free software licenses do not expire, which means that once Free Software is "
 "adopted, institutions remain independent from the vendor.  Moreover, Free "
@@ -153,11 +176,11 @@
 
"最后希望在该软件中实现某个特殊功能,它们可以联系任何开发è€
…来完成这个任务而无"
 "须依赖于最初的供应商。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Learning"
 msgstr "学习"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "When deciding where they will study, more and more students are considering "
 "whether a university teaches computer science and software development using "
@@ -171,11 +194,11 @@
 "改软件使之满足自己的需要。学习
自由软件还有助于他们学习软件开发的道德和职业操"
 "守。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Saving"
 msgstr "省钱"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "This is an obvious advantage that will appeal immediately to many school "
 "administrators, but it is a marginal benefit. The main point of this aspect "
@@ -187,11 +210,11 @@
 "点在于如果有权免费或花小钱分发软件拷贝,那么学校实际
上就可以帮助有财政困难的"
 "家庭,这样就促进了学生们学习的机会均等和公平。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Quality"
 msgstr "质量"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Stable, secure and easily installed Free Software solutions are available "
 "for education already. In any case, excellence of performance is a secondary "
@@ -201,7 +224,7 @@
 "只是次要的好处;我们的终极目标是计算机用户的自由。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -218,9 +241,7 @@
 "系方法</a>联系自由软件基金会(FSF)。有关失效链接或å…
¶ä»–错误和建议,请发送邮件"
 "到<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -228,26 +249,22 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
 "翻译须知</a>获取有关协调和提交翻译的相关事项。"
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2011, 2015, 2016, 2017, 2018, 2019, 2020 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2011, 2015, 2016, 2017, 2018, 2019, 2020 Free Software "
-"Foundation, Inc."
+msgid "Copyright &copy; 2011, 2015, 2016, 2020 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011, 2015, 2016, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -270,10 +287,3 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最后更新:"
-
-#~ msgid ""
-#~ "Copyright &copy; 2011, 2015, 2016, 2017, 2018 Free Software Foundation, "
-#~ "Inc."
-#~ msgstr ""
-#~ "Copyright &copy; 2011, 2015, 2016, 2017, 2018 Free Software Foundation, "
-#~ "Inc."

Index: misc/po/edu-misc.zh-cn.po
===================================================================
RCS file: /webcvs/www/www/education/misc/po/edu-misc.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- misc/po/edu-misc.zh-cn.po   11 Oct 2018 13:14:43 -0000      1.1
+++ misc/po/edu-misc.zh-cn.po   31 May 2020 05:04:34 -0000      1.2
@@ -2,11 +2,12 @@
 # Copyright (C) 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Wensheng Xie <wxie@member.fsf.org>, 2018.
+# May 2020: update to new layout. Unfuzzify a footer string: TODO (T. 
Godefroy).
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: edu-misc.html\n"
-"POT-Creation-Date: 2018-09-20 14:26+0000\n"
+"POT-Creation-Date: 2020-05-27 11:14+0200\n"
 "PO-Revision-Date: 2018-10-11 21:08+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -20,19 +21,43 @@
 "Education Miscellaneous Materials - GNU Project - Free Software Foundation"
 msgstr "其他教育资料 - GNU工程 - 自由软件基金会"
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+msgstr "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "Education Contents"
+msgstr "教育内容"
+
+#. type: Attribute 'alt' of: <div><a><img>
+msgid "&nbsp;[Education Contents]&nbsp;"
+msgstr "&nbsp;[教育内容]&nbsp;"
+
+#. type: Content of: <div>
+msgid "</a>"
+msgstr "</a>"
+
+#. type: Content of: <div><p><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><p><a><img>
+msgid "GNU Home"
+msgstr "GNU主页"
+
+#. type: Content of: <div><p>
 msgid ""
-"<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
-"education/misc/\">Misc</a> &rarr; Education Miscellaneous Materials"
+"</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+"href=\"/education/misc/\">Misc</a>&nbsp;/"
 msgstr ""
-"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
-"misc/\">其他</a> &rarr; 其他教育资料"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/misc/\">其他</a>&nbsp;/"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Education Miscellaneous Materials"
 msgstr "其他教育资料"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In these pages we keep various kinds of materials that we use in our "
 "Education pages such as pictures, transcriptions and subtitles of videos in "
@@ -41,19 +66,19 @@
 
"在这些页面中,我们存放着各种用于我们的教育页面的资料,比如图片、转抄和各类视"
 "频的多语言字幕等等。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Pictures"
 msgstr "图片"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Case Studies"
 msgstr "案例分析"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Ambedkar Community Computer Center (AC3) - Bangalore - India"
 msgstr "Ambedkar社区计算中心(AC3) - 班加罗尔 - 印度"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "RMS with Indian youth, jpeg <a href=\"/education/misc/ambedkar-sm.jpg\">97 "
 "KB</a>, <a href=\"/education/misc/ambedkar.jpg\">400 KB</a>"
@@ -61,11 +86,11 @@
 "RMS和印度青年在一起,jpeg <a 
href=\"/education/misc/ambedkar-sm.jpg\">97 KB</"
 "a>, <a href=\"/education/misc/ambedkar.jpg\">400 KB</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Vocational Higher Secondary School Irimpanam (VHSS Irimpanam)"
 msgstr "Irimpanam高级职业中学(VHSS Irimpanam)"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Students at a Free Software event, jpeg <a href=\"/education/misc/irimpanam-"
 "school-sm.jpg\">65 KB</a>, <a href=\"/education/misc/irimpanam-school.jpg"
@@ -74,7 +99,7 @@
 "学生们在参加自由软件活动,jpeg <a 
href=\"/education/misc/irimpanam-school-sm."
 "jpg\">65 KB</a>, <a href=\"/education/misc/irimpanam-school.jpg\">245 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Tux Paint interface in Malayalam, jpeg <a href=\"/education/misc/tuxpaint-sm."
 "jpg\">46 KB</a>, <a href=\"/education/misc/tuxpaint.jpg\">193 KB</a>"
@@ -82,15 +107,15 @@
 "Tux Paint的Malayalam语界面, jpeg <a 
href=\"/education/misc/tuxpaint-sm.jpg"
 "\">46 KB</a>, <a href=\"/education/misc/tuxpaint.jpg\">193 KB</a>"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Software"
 msgstr "软件"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Tux Paint"
 msgstr "Tux Paint"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Tux Paint interface English, png, <a href=\"/education/misc/tuxpaint-start-"
 "sm.png\">30 KB</a>, <a href=\"/education/misc/tuxpaint-start.png\">83 KB</a>"
@@ -98,7 +123,7 @@
 "Tux Paint interface English, png, <a href=\"/education/misc/tuxpaint-start-"
 "sm.png\">30 KB</a>, <a href=\"/education/misc/tuxpaint-start.png\">83 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Tux Paint interface German, png, <a href=\"/education/misc/tuxpaint-start-sm."
 "de.png\">45 KB</a>, <a href=\"/education/misc/tuxpaint-start.de.png\">86 KB</"
@@ -107,7 +132,7 @@
 "Tux Paint的德语界面,png, <a 
href=\"/education/misc/tuxpaint-start-sm.de.png"
 "\">45 KB</a>, <a href=\"/education/misc/tuxpaint-start.de.png\">86 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Tux Paint interface Greek, png, <a href=\"/education/misc/tuxpaint-start-sm."
 "el.png\">32 KB</a>, <a href=\"/education/misc/tuxpaint-start.el.png\">84 KB</"
@@ -116,7 +141,7 @@
 "Tux Paint的希腊语界面,png, <a 
href=\"/education/misc/tuxpaint-start-sm.el."
 "png\">32 KB</a>, <a href=\"/education/misc/tuxpaint-start.el.png\">84 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Tux Paint interface French, png, <a href=\"/education/misc/tuxpaint-start-sm."
 "fr.png\">31 KB</a>, <a href=\"/education/misc/tuxpaint-start.fr.png\">86 KB</"
@@ -125,7 +150,7 @@
 "Tux Paint的法语界面,png, <a 
href=\"/education/misc/tuxpaint-start-sm.fr.png"
 "\">31 KB</a>, <a href=\"/education/misc/tuxpaint-start.fr.png\">86 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Tux Paint interface Italian, png, <a href=\"/education/misc/tuxpaint-start-"
 "sm.it.png\">30 KB</a>, <a href=\"/education/misc/tuxpaint-start.it.png\">83 "
@@ -134,7 +159,7 @@
 "Tux Paint的意大利语界面,png, <a 
href=\"/education/misc/tuxpaint-start-sm.it."
 "png\">30 KB</a>, <a href=\"/education/misc/tuxpaint-start.it.png\">83 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Tux Paint interface Japanese, png, <a href=\"/education/misc/tuxpaint-start-"
 "sm.ja.png\">30 KB</a>, <a href=\"/education/misc/tuxpaint-start.ja.png\">85 "
@@ -143,7 +168,7 @@
 "Tux Paint的日语界面,png, <a 
href=\"/education/misc/tuxpaint-start-sm.ja.png"
 "\">30 KB</a>, <a href=\"/education/misc/tuxpaint-start.ja.png\">85 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Tux Paint interface Portuguese (Brazilian), png, <a href=\"/education/misc/"
 "tuxpaint-start-sm.pt-br.png\">31 KB</a>, <a href=\"/education/misc/tuxpaint-"
@@ -153,7 +178,7 @@
 "start-sm.pt-br.png\">31 KB</a>, <a href=\"/education/misc/tuxpaint-start.pt-"
 "br.png\">86 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Tux Paint interface Spanish, png, <a href=\"/education/misc/tuxpaint-start-"
 "sm.es.png\">31 KB</a>, <a href=\"/education/misc/tuxpaint-start.es.png\">86 "
@@ -162,7 +187,7 @@
 "Tux Paint的西班牙语界面,png, <a 
href=\"/education/misc/tuxpaint-start-sm.es."
 "png\">31 KB</a>, <a href=\"/education/misc/tuxpaint-start.es.png\">86 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Tux Paint interface in Malayalam with stamps, jpeg, <a href=\"/education/"
 "misc/tuxpaint-stamps-sm.jpg\">65 KB</a>, <a href=\"/education/misc/tuxpaint-"
@@ -172,7 +197,7 @@
 "stamps-sm.jpg\">65 KB</a>, <a href=\"/education/misc/tuxpaint-stamps.jpg"
 "\">298 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Appooppanthaady flower, jpeg, <a href=\"/education/misc/appooppanthaady-sm."
 "jpg\">9 KB</a>, <a href=\"/education/misc/appooppanthaady.jpg\">22 KB</a>"
@@ -180,7 +205,7 @@
 "Appooppanthaady花,jpeg, <a href=\"/education/misc/appooppanthaady-sm.jpg"
 "\">9 KB</a>, <a href=\"/education/misc/appooppanthaady.jpg\">22 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Anthoorium flower, jpeg, <a href=\"/education/misc/anthoorium-sm.jpg\">7 KB</"
 "a>, <a href=\"/education/misc/anthoorium.jpg\">25 KB</a>"
@@ -188,11 +213,11 @@
 "Anthoorium花,jpeg, <a href=\"/education/misc/anthoorium-sm.jpg\">7 KB</a>, 
"
 "<a href=\"/education/misc/anthoorium.jpg\">25 KB</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "GCompris"
 msgstr "GCompris"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "GCompris interface, jpeg <a href=\"/education/misc/gcompris-sm.jpg\">44 KB</"
 "a>, <a href=\"/education/misc/gcompris.jpg\">198 KB</a>"
@@ -200,15 +225,15 @@
 "GCompris界面,jpeg <a href=\"/education/misc/gcompris-sm.jpg\">44 KB</a>, 
<a "
 "href=\"/education/misc/gcompris.jpg\">198 KB</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Videos"
 msgstr "视频"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "&rarr; Richard Stallman's video on Education:"
 msgstr "&rarr;Richard Stallman关于教育的视频:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://audio-video.gnu.org/video/rms-education-es.ogv\";> Original "
 "version in Spanish without subtitles</a>, 20.7 MB."
@@ -216,12 +241,12 @@
 "<a 
href=\"http://audio-video.gnu.org/video/rms-education-es.ogv\";>不带字幕的"
 "西班牙语原版</a>,20.7 MB。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&nbsp; Other versions with embedded subtitles in the following languages:"
 msgstr "&nbsp;带有其他语言字幕的版本:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "English: <a href=\"http://audio-video.gnu.org/video/rms-education-es-high-";
 "sub.en.ogv\">47 MB</a> | <a href=\"http://audio-video.gnu.org/video/rms-";
@@ -231,7 +256,7 @@
 "en.ogv\">47 MB</a> | <a href=\"http://audio-video.gnu.org/video/rms-";
 "education-es-low-sub.en.ogv\">17 MB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "French: <a href=\"http://audio-video.gnu.org/video/rms-education-es-high-sub.";
 "fr.ogv\">56 MB</a> | <a href=\"http://audio-video.gnu.org/video/rms-";
@@ -241,7 +266,7 @@
 "fr.ogv\">56 MB</a> | <a href=\"http://audio-video.gnu.org/video/rms-";
 "education-es-low-sub.fr.ogv\">14 MB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Italian: <a href=\"http://audio-video.gnu.org/video/rms-education-es-high-";
 "sub.it.ogv\">47 MB</a> | <a href=\"http://audio-video.gnu.org/video/rms-";
@@ -251,7 +276,7 @@
 "sub.it.ogv\">47 MB</a> | <a href=\"http://audio-video.gnu.org/video/rms-";
 "education-es-low-sub.it.ogv\">11 MB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Portuguese (Brazilian): <a href=\"http://audio-video.gnu.org/video/rms-";
 "education-es-high-sub.pt-br.ogv\">46 MB</a> | <a href=\"http://audio-video.";
@@ -261,7 +286,7 @@
 "es-high-sub.pt-br.ogv\">46 MB</a> | <a href=\"http://audio-video.gnu.org/";
 "video/rms-education-es-low-sub.pt-br.ogv\">14 MB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Spanish: <a href=\"http://audio-video.gnu.org/video/rms-education-es-high-";
 "sub.es.ogv\">55 MB</a> | <a href=\"http://audio-video.gnu.org/video/rms-";
@@ -271,12 +296,12 @@
 "sub.es.ogv\">55 MB</a> | <a href=\"http://audio-video.gnu.org/video/rms-";
 "education-es-low-sub.es.ogv\">17 MB</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&rarr; Video &ldquo;How GIMP Changed Mani's Life - We Use GNU/Linux&rdquo;:"
 msgstr "&rarr;视频&ldquo;GIMP如何改变了Mani的人生 - 
我们使用GNU/Linux&rdquo;:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://audio-video.gnu.org/video/we_use_gnu-linux_high.ogv\";> High "
 "resolution</a>, 146 MB."
@@ -284,7 +309,7 @@
 "<a href=\"http://audio-video.gnu.org/video/we_use_gnu-linux_high.ogv\";>高清
</"
 "a>,146 MB。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://audio-video.gnu.org/video/we_use_gnu-linux_low.ogv\";> Low "
 "resolution</a>, 15 MB."
@@ -292,11 +317,11 @@
 "<a href=\"http://audio-video.gnu.org/video/we_use_gnu-linux_low.ogv\";>低清
</"
 "a>,15 MB。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "&rarr; Video &ldquo;Freedom in Practice at Irimpanam School&rdquo;:"
 msgstr "&rarr;视频&ldquo;在Irimpanam学校实践自由&rdquo;:"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "<a href=\"http://audio-video.gnu.org/video/irimpanam-high.ogv\";> Original "
 "version in Malayalam without subtitles</a>, 107 MB."
@@ -304,7 +329,7 @@
 "<a 
href=\"http://audio-video.gnu.org/video/irimpanam-high.ogv\";>不带字幕的马"
 "拉亚拉玛语原版</a>,107 MB。"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "English: <a href=\"http://audio-video.gnu.org/video/irimpanam-high-sub.en.ogv";
 "\">109 MB</a>"
@@ -312,7 +337,7 @@
 "英语:<a href=\"http://audio-video.gnu.org/video/irimpanam-high-sub.en.ogv";
 "\">109 MB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "French: <a href=\"http://audio-video.gnu.org/video/irimpanam-high-sub.fr.ogv";
 "\">110 MB</a>"
@@ -320,7 +345,7 @@
 "法语:<a href=\"http://audio-video.gnu.org/video/irimpanam-high-sub.fr.ogv";
 "\">110 MB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Portuguese (Brazilian): <a href=\"http://audio-video.gnu.org/video/irimpanam-";
 "high-sub.pt-br.ogv\">102 MB</a>"
@@ -328,15 +353,15 @@
 "(巴西)葡萄牙语:<a 
href=\"http://audio-video.gnu.org/video/irimpanam-high-";
 "sub.pt-br.ogv\">102 MB</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Video Transcriptions and Descriptions"
 msgstr "视频转抄和描述"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Transcriptions of Richard Stallman's video on education:"
 msgstr "Richard Stallman关于教育的视频转抄:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/education/misc/rms-education-es-transcription.sq.txt\">Albanian</"
 "a> | <a href=\"/education/misc/rms-education-es-translation-to-nl.txt"
@@ -358,13 +383,13 @@
 "pt-br.txt\">(巴西)葡萄牙语</a> | <a 
href=\"/education/misc/rms-education-"
 "es-transcription.txt\">西班牙语</a> |"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Descriptions of the video &ldquo;How GIMP Changed Mani's Life - We Use GNU/"
 "Linux&rdquo;:"
 msgstr "视频&ldquo;GIMP如何改变Mani的人生 - 
我们使用GNU/Linux&rdquo;的描述:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/education/misc/we_use_gnu-linux_description.hr.txt\">Croatian</a> "
 "| <a href=\"/education/misc/we_use_gnu-linux_description.en.txt\">English</"
@@ -379,15 +404,15 @@
 "a> | <a 
href=\"/education/misc/we_use_gnu-linux_description.pt-br.txt\">(巴"
 "西)葡萄牙语</a> |"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Video Subtitles in SubRip Format"
 msgstr "SubRip格式的视频字幕"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Subtitles for Richard Stallman's video on education:"
 msgstr "Richard Stallman关于教育视频的字幕:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/education/misc/rms-education-es-sub.sq.srt\">Albanian</a> | <a "
 "href=\"/education/misc/rms-education-es-sub.nl.srt\">Dutch</a> | <a href=\"/"
@@ -407,13 +432,13 @@
 "education-es-sub.pt-br.srt\">(巴西)葡萄牙语</a> | <a 
href=\"/education/"
 "misc/rms-education-es-sub.es.srt\">西班牙语</a> |"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Subtitles for the video &ldquo;Freedom in Practice at Irimpanam "
 "School&rdquo;:"
 msgstr "视频&ldquo;在Irimpanam学校实践自由&rdquo;的字幕:"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/education/misc/irimpanam.sq.srt\">Albanian</a> | <a href=\"/"
 "education/misc/irimpanam.en.srt\">English</a> | <a href=\"/education/misc/"
@@ -425,11 +450,11 @@
 "irimpanam.fr.srt\">法语</a> | <a href=\"/education/misc/irimpanam.pt-br.srt"
 "\">(巴西)葡萄牙语</a> |"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Audio"
 msgstr "音频"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Pronunciation in Malayalam: Appooppanthaady flower, Ogg Vorbis, <a href=\"/"
 "education/misc/appooppanthady.ogg\">35 KB</a>"
@@ -437,7 +462,7 @@
 "马拉亚拉玛语的发音:Appooppanthaady花,Ogg Vorbis,<a 
href=\"/education/misc/"
 "appooppanthady.ogg\">35 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Pronunciation in Malayalam: Anthoorium flower, Ogg Vorbis, <a href=\"/"
 "education/misc/anthoorium.ogg\">42 KB</a>"
@@ -445,7 +470,7 @@
 "马拉亚拉玛的发音:Anthoorium花,Ogg Vorbis,<a 
href=\"/education/misc/"
 "anthoorium.ogg\">42 KB</a>"
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid ""
 "Pronunciation in Malayalam: Adeenia flower, Ogg Vorbis, <a href=\"/education/"
 "misc/adeenia.ogg\">30 KB</a>"
@@ -454,7 +479,7 @@
 "ogg\">30 KB</a>"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#. type: Content of: <div>
+#. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
@@ -471,9 +496,7 @@
 "系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a href="
 "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
 
-#
-#
-#
+# TODO: submitting -> contributing.
 #.  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
@@ -481,14 +504,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</a>.</p>
-#.         <p>For information on coordinating and submitting translations of
+#.         <p>For information on coordinating and contributing translations of
 #.         our web pages, see <a
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "若您想翻译本文,请参看<a 
href=\"/server/standards/README.translations.html\">"
@@ -496,9 +519,9 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Copyright &copy; 2011, 2012, 2016, 2017, 2018 Free Software Foundation, Inc."
+"Copyright &copy; 2011, 2012, 2016-2018, 2020 Free Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2011, 2012, 2016, 2017, 2018 Free Software Foundation, Inc."
+"Copyright &copy; 2011, 2012, 2016-2018, 2020 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: education-menu.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/education-menu.zh-cn.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- education-menu.zh-cn.html   2 May 2019 13:29:41 -0000       1.6
+++ education-menu.zh-cn.html   31 May 2020 05:04:34 -0000      1.7
@@ -1,91 +1,240 @@
-<div id="education-content">           
-<ul id="edu-navigation">
-
-  <!--#if expr="$REQUEST_URI = /^\/education\/edu-contents/" -->
-<li class="active">
+<div id="navlinks">
+ <div class="backtotop">
+  <hr class="no-display" />
+  <a href="#content"><span>返回顶部</span>&#11165;</a>
+ </div>
+<div class="reduced-width">
+ <h3>教育</h3>
+ <dl>
+  <!--#if expr="$REQUEST_URI = /^\/education\/educ/" -->
+<dt class="current">
+    
+    <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/education.html#content">教育主页</a>
+    <!--#echo encoding="none" var="MARK_END" -->
+</dt><!--#else -->
+<dt>
+    <a href="/education/education.html#content">教育主页</a></dt>
+  <!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/education\/edu-cases[^-]/" -->
+<dt class="current">
+    
+    <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/edu-cases.html#content">案例分析</a>
+    <!--#echo encoding="none" var="MARK_END" -->
+</dt><!--#else -->
+<dt>
+    <a href="/education/edu-cases.html#content">案例分析</a></dt>
+  <!--#endif -->
+<dd>
+    <ul>
+      <!--#if expr="$REQUEST_URI = /^\/education\/edu-cases-argentina[^-]/" -->
+<li class="current">
+        
+        <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/edu-cases-argentina.html#content">阿根廷</a>
+        <!--#echo encoding="none" var="MARK_END" -->
+<!--#else -->
+<li>
+        <a href="/education/edu-cases-argentina.html#content">阿根廷</a>
+        <!--#endif -->
+<ul class="inline-list">
+          <!--#if expr="$REQUEST_URI = 
/^\/education\/edu-cases-argentina-ecen/" -->
+<li class="current">
+            
+            <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/edu-cases-argentina-ecen.html#content">ECE Neuquén</a>
+            <!--#echo encoding="none" var="MARK_END" -->
+</li><!--#else -->
+<li>
+            <a href="/education/edu-cases-argentina-ecen.html#content">ECE 
Neuquén</a></li>
+        <!--#endif -->
+</ul>
+      </li>
+      <!--#if expr="$REQUEST_URI = /^\/education\/edu-cases-india[^-]/" -->
+<li class="current">
+        
+        <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/edu-cases-india.html#content">印度</a>
+        <!--#echo encoding="none" var="MARK_END" -->
+<!--#else -->
+<li>
+        <a href="/education/edu-cases-india.html#content">印度</a>
+        <!--#endif -->
+<ul class="inline-list">
+          <!--#if expr="$REQUEST_URI = 
/^\/education\/edu-cases-india-ambedkar/" -->
+<li class="current">
+            
+            <!--#echo encoding="none" var="MARK_START" -->
+<a
+href="/education/edu-cases-india-ambedkar.html#content">Ambedkar社区计算中心</a>
+            <!--#echo encoding="none" var="MARK_END" -->
+</li><!--#else -->
+<li>
+            <a
+href="/education/edu-cases-india-ambedkar.html#content">Ambedkar社区计算中心</a></li>
+          <!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/education\/edu-cases-india-irimpanam/" -->
+<li class="current">
+            
+            <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/edu-cases-india-irimpanam.html#content">VHSS
+Irimpanam</a>
+            <!--#echo encoding="none" var="MARK_END" -->
+</li><!--#else -->
+<li>
+            <a href="/education/edu-cases-india-irimpanam.html#content">VHSS
+Irimpanam</a></li>
+        <!--#endif -->
+</ul>
+      </li>
+    </ul>
+  </dd>
+  <!--#if expr="$REQUEST_URI = /^\/education\/edu-resources/" -->
+<dt class="current">
     
     <!--#echo encoding="none" var="MARK_START" -->
-<a href="/education/edu-contents.html">内容</a>
-    
-    
+<a href="/education/edu-resources.html#content">教育资源</a>
   <!--#echo encoding="none" var="MARK_END" -->
-</li>
-
-   <!--#else -->
-<li><a href="/education/edu-contents.html">内容</a></li>
-
-<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/education\/edu-cases/" -->
-<li class="active">
+<!--#else -->
+<dt>
+    <a href="/education/edu-resources.html#content">教育资源</a><!--#endif 
-->
+</dt>
+  <dd>
+    <ul>
+      <!--#if expr="$REQUEST_URI = /edu-software[^-]/" -->
+<li class="current">
     
     <!--#echo encoding="none" var="MARK_START" -->
-<a href="/education/edu-cases.html">案例分析</a>
-    
-    
+<a href="/education/edu-software.html#content">教育性软件</a>
   <!--#echo encoding="none" var="MARK_END" -->
-</li>
-
-   <!--#else -->
-<li><a href="/education/edu-cases.html">案例分析</a></li>
-
-<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/education\/edu-resources/" -->
-<li class="active">
+<!--#else -->
+<li>
+        <a href="/education/edu-software.html#content">教育性软件</a>
+        <!--#endif -->
+<ul class="inline-list">
+          <!--#if expr="$REQUEST_URI = /^\/education\/edu-software-gcompris/" 
-->
+<li class="current">
     
     <!--#echo encoding="none" var="MARK_START" -->
-<a href="/education/edu-resources.html">教育资源</a>
-    
-    
+<a href="/education/edu-software-gcompris.html#content">Gcompris</a>
   <!--#echo encoding="none" var="MARK_END" -->
-</li>
-
-   <!--#else -->
-<li><a href="/education/edu-resources.html">教育资源</a></li>
-
-<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/education\/edu-software/" -->
-<li class="active">
+</li><!--#else -->
+<li>
+            <a 
href="/education/edu-software-gcompris.html#content">Gcompris</a></li>
+          <!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/education\/edu-software-gimp/" -->
+<li class="current">
     
     <!--#echo encoding="none" var="MARK_START" -->
-<a href="/education/edu-software.html">教育性软件</a>
-    
-    
+<a href="/education/edu-software-gimp.html#content">Gimp</a>
   <!--#echo encoding="none" var="MARK_END" -->
-</li>
-
-   <!--#else -->
-<li><a href="/education/edu-software.html">教育性软件</a></li>
-
-<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/education\/edu-faq/" -->
-<li class="active">
+</li><!--#else -->
+<li>
+            <a href="/education/edu-software-gimp.html#content">Gimp</a></li>
+          <!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/education\/edu-software-tuxpaint/" -->
+<li class="current">
     
     <!--#echo encoding="none" var="MARK_START" -->
-<a href="/education/edu-faq.html">常见问题解答</a>
-    
+<a href="/education/edu-software-tuxpaint.html#content">Tux Paint</a>
+            <!--#echo encoding="none" var="MARK_END" -->
+</li><!--#else -->
+<li>
+            <a href="/education/edu-software-tuxpaint.html#content">Tux 
Paint</a></li>
+        <!--#endif -->
+</ul>
+      </li>
+      <!--#if expr="$REQUEST_URI = /^\/education\/edu-projects/" -->
+<li class="current">
     
+        <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/edu-projects.html#content">团体和项目</a>
   <!--#echo encoding="none" var="MARK_END" -->
-</li>
+</li><!--#else -->
+<li>
+        <a href="/education/edu-projects.html#content">团体和项目</a></li>
+      <!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/education\/edu-free-learning-resources/" -->
+<li class="current">
 
-   <!--#else -->
-<li><a href="/education/edu-faq.html">常见问题解答</a></li>
+        <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/edu-resources.html#content">教育资源</a>
+        <!--#echo encoding="none" var="MARK_END" -->
+</li><!--#else -->
+<li>
+        <a href="/education/edu-resources.html#content">教育资源</a></li>
+    <!--#endif -->
+</ul>
+  </dd>
+  <!--#if expr="$REQUEST_URI = /^\/education\/edu-faq/" -->
+<dt class="current">
 
-<!--#endif -->
+    <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/edu-faq.html#content">常见问题解答</a>
+    <!--#echo encoding="none" var="MARK_END" -->
+</dt><!--#else -->
+<dt>
+    <a href="/education/edu-faq.html#content">常见问题解答</a></dt>
+  <!--#endif -->
 <!--#if expr="$REQUEST_URI = /^\/education\/edu-team/" -->
-<li class="active">
+<dt class="current">
     
     <!--#echo encoding="none" var="MARK_START" -->
-<a href="/education/edu-team.html">教育团队</a>
-    
+<a href="/education/edu-team.html#content">教育团队</a>
+    <!--#echo encoding="none" var="MARK_END" -->
+</dt><!--#else -->
+<dt>
+    <a href="/education/edu-team.html#content">教育团队</a></dt>
+  <!--#endif -->
+<dt class="nolink">深度分析</dt>
+  <dd>
+    <ul>
+      <!--#if expr="$REQUEST_URI = /^\/education\/edu-why/" -->
+<li class="current">
     
+        <!--#echo encoding="none" var="MARK_START" -->
+<a 
href="/education/edu-why.html#content">为什么教育机构应该只使用和教授自由软件</a>
   <!--#echo encoding="none" var="MARK_END" -->
-</li>
+</li><!--#else -->
+<li>
+        <a 
href="/education/edu-why.html#content">为什么教育机构应该只使用和教授自由软件</a></li>
+      <!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/education\/edu-schools/" -->
+<li class="current">
 
-   <!--#else -->
-<li><a href="/education/edu-team.html">教育团队</a></li>
+        <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/edu-schools.html#content">为什么学æ 
¡åº”该只使用自由软件</a>
+        <!--#echo encoding="none" var="MARK_END" -->
+</li><!--#else -->
+<li>
+        <a href="/education/edu-schools.html#content">为什么学æ 
¡åº”该只使用自由软件</a></li>
+      <!--#endif -->
+<!--#if expr="$REQUEST_URI = /^\/education\/edu-system-india/" -->
+<li class="current">
 
-<!--#endif -->
+        <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/edu-system-india.html#content">印度的教育体系</a>
+        <!--#echo encoding="none" var="MARK_END" -->
+</li><!--#else -->
+<li>
+        <a 
href="/education/edu-system-india.html#content">印度的教育体系</a></li>
+    <!--#endif -->
 </ul>
+  </dd>
+  <!--#if expr="$REQUEST_URI = /^\/education\/edu-faq/" -->
+<dt class="current">
+    
+    <!--#echo encoding="none" var="MARK_START" -->
+<a href="/education/misc/edu-misc.html#content">其他教育材料</a>
+    <!--#echo encoding="none" var="MARK_END" -->
+</dt><!--#else -->
+<dt>
+    <a href="/education/misc/edu-misc.html#content">其他教育材料</a></dt>
+ <!--#endif -->
+</dl>
+</div>
 </div> 
 
-<!-- id="education-content" -->
+</div>
+<!-- for id="content", starts in the include above -->

Index: edu-cases-argentina-ecen.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-cases-argentina-ecen.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-cases-argentina-ecen.zh-cn.html 2 Dec 2017 01:58:35 -0000       1.1
+++ edu-cases-argentina-ecen.zh-cn.html 31 May 2020 05:04:34 -0000      1.2
@@ -1,20 +1,39 @@
 <!--#set var="ENGLISH_PAGE" 
value="/education/edu-cases-argentina-ecen.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Escuela Cristiana Evangélica de Neuquén (ECEN) - GNU工程 - 
自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
+<style type="text/css" media="screen"><!--
+.article {
+   padding-bottom: .8em;
+   border-top: 3px ridge #3465a4;
+   border-bottom: 3px ridge #3465a4;
+   margin: 2em 0;
+}
+-->
+</style>
 
 <!--#include virtual="/education/po/edu-cases-argentina-ecen.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; <a
-href="/education/edu-cases.html">案例分析</a> &rarr; <a
-href="/education/edu-cases-argentina.html">阿根廷</a> &rarr; Escuela 
Cristiana
-Evangélica de Neuquén (ECEN)</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/edu-cases.html">案例分析</a>&nbsp;/ <a
+href="/education/edu-cases-argentina.html">阿根廷</a>&nbsp;/</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -24,13 +43,15 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>Escuela Cristiana Evangélica de Neuquén (ECEN)</h2>
 
-<p>以下信息摘自一份由ECEN小学教师Debora Badilla
+<p class="italic">
+以下信息摘自一份由ECEN小学教师Debora Badilla
 Huento提交给我们的报告。她的努力对自由软件的推广起了å…
³é”®ä½œç”¨ï¼Œä»Žè€Œæœ€ç»ˆä½¿è¯¥å­¦æ ¡è½¬å‘自由软件。</p>
 
-<div class="edu-cases">
-
+<div class="article">
 <h3>地点</h3>
 
 <p>Neuquén市,<a
@@ -106,21 +127,17 @@
 Andes市举办了自由软件日。</p>
 
 
<p>虽然它需要奉献和坚韧,整个过程还是令人愉悦的。现在我们ä¼
 æ’­æˆ‘们所学,以帮助其他教育社区。</p>
-
 </div>         
 
-<!-- class="edu-cases" -->
-<p>我们感谢所有在此迁移过程中做出努力的人,你
们的工作是卓越的。</p>
-
-<p class="back"><a href="/education/edu-cases.html">返回案例分析</a></p>
-
+<p class="italic">
+我们感谢所有在此迁移过程中做出努力的人,你
们的工作是卓越的。</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="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -141,7 +158,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -149,7 +166,7 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -165,7 +182,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2017/12/02 01:58:35 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-cases-argentina.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-cases-argentina.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-cases-argentina.zh-cn.html      31 Aug 2018 14:27:53 -0000      1.1
+++ edu-cases-argentina.zh-cn.html      31 May 2020 05:04:34 -0000      1.2
@@ -1,18 +1,30 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-cases-argentina.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>阿根廷的案例分析 - GNU工程 - 自由软件基金会</title>
+<title>教育 - 阿根廷的案例分析 - GNU工程 - 
自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/po/edu-cases-argentina.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; <a
-href="/education/edu-cases.html">案例分析</a> &rarr; 阿根廷</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/edu-cases.html">案例分析</a>&nbsp;/
+</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -22,8 +34,11 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>阿根廷的案例分析</h2>
 
+<div class="article">
 <p>阿根廷å…
±æœ‰23个称为省的行政自治区。这些省各自开发自己的教育政策,他们只需注意一些基本的å
…¨å›½æ€§æŒ‡å¯¼æ–¹é’ˆã€‚这就让教育机构能够æ 
¹æ®æœ¬åœ°éœ€è¦ä¿®æ”¹æ•™å­¦å¤§çº²ã€‚请在Wikipedia学习更多关于<a
 href= "http://en.wikipedia.org/wiki/Argentina#Education";>阿æ 
¹å»·æ•™è‚²ç³»ç»Ÿ</a>的知识。</p>
 
@@ -38,15 +53,14 @@
 <p>一个几乎没有什么技术的小学老师设法使她的学æ 
¡è¿ç§»åˆ°å®Œå…¨ä½¿ç”¨è‡ªç”±è½¯ä»¶ï¼Œå…¶å‡†åˆ™å°±æ˜¯ä¸“属软件和学æ 
¡æ‰€è¦ä¿ƒè¿›çš„道德与伦理格格不入。</p></li>
 </ul>
 
-<a href="/education/edu-cases.html">返回到案例分析</a>
-
+</div>
 <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="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -67,14 +81,14 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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, 2015, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2015, 2016, 2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -90,7 +104,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2018/08/31 14:27:53 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-cases-india-ambedkar.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-cases-india-ambedkar.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- edu-cases-india-ambedkar.zh-cn.html 15 Dec 2018 14:46:04 -0000      1.5
+++ edu-cases-india-ambedkar.zh-cn.html 31 May 2020 05:04:34 -0000      1.6
@@ -1,18 +1,39 @@
 <!--#set var="ENGLISH_PAGE" 
value="/education/edu-cases-india-ambedkar.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Ambedkar社区计算中心(AC3) - GNU工程 - 
自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
+<style type="text/css" media="screen"><!--
+.article {
+   padding-bottom: .8em;
+   border-top: 3px ridge #3465a4;
+   border-bottom: 3px ridge #3465a4;
+   margin: 2em 0;
+}
+-->
+</style>
 
 <!--#include virtual="/education/po/edu-cases-india-ambedkar.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; <a
-href="/education/edu-cases.html">案例分析</a> &rarr; <a
-href="/education/edu-cases-india.html">印度</a> &rarr; 
Ambedkar社区计算中心(AC3)</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/edu-cases.html">案例分析</a>&nbsp;/ <a
+href="/education/edu-cases-india.html">印度</a>&nbsp;/</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -22,12 +43,14 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div  id="last-div" class="reduced-width">
 <h2>Ambedkar社区计算中心(AC3)</h2>
 
-<p>以下信息是由在该计算中心工作的一组志愿者
提交给我们的。</p>
-
-<div class="edu-cases">
+<p class="italic">
+以下信息是由在该计算中心工作的一组志愿者
提交给我们的。</p>
 
+<div class="article">
 <h3>地点</h3>
 
 
<p>该中心位于Bangalore市Bannerghatta路外的Sudharshan规划区,属于印度的<a
@@ -75,27 +98,24 @@
 Stallman,照片拍摄于我们中心。</p>
 
 <p>其中一些孩子在学校也参加
了计算课程。他们汇报说在中心学到的技术非常有价值,帮助他们学ä¹
 å¹¶æˆåŠŸé€šè¿‡å­¦æ ¡çš„课程。</p> 
-
 </div>         
 
-<!-- class="edu-cases" -->
-<p>我们被告知引人注目的自由软件志愿者
正在该贫困地区扩展,而且成绩斐然。如果你
愿意为该组织贡献或捐献笔记本电脑,请通过<a
+<p class="italic">
+我们被告知引人注目的自由软件志愿者
正在该贫困地区扩展,而且成绩斐然。如果你
愿意为该组织贡献或捐献笔记本电脑,请通过<a
 
href="mailto:education@gnu.org";>&lt;education@gnu.org&gt;</a>联系我们。</p>
 
+<div class="infobox">
 <p>本页面的图片使用CC-BY-SA,<a rel="license"
 href="http://creativecommons.org/licenses/by-sa/3.0/";> Creative Commons
 Attribution-Share Alike 3.0 Unported License</a>授权。</p>   
-
-<p class="back"><a 
href="/education/edu-cases-india.html">更多印度的案例分析</a> <br />
-<a href="/education/edu-cases.html">返回案例分析</a></p>
-
+</div>
 <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="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -116,7 +136,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -124,7 +144,7 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016, 2018, 2020 Free Software Foundation, 
Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -140,7 +160,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2018/12/15 14:46:04 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-cases-india-irimpanam.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-cases-india-irimpanam.zh-cn.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- edu-cases-india-irimpanam.zh-cn.html        23 Nov 2019 14:29:13 -0000      
1.6
+++ edu-cases-india-irimpanam.zh-cn.html        31 May 2020 05:04:34 -0000      
1.7
@@ -1,18 +1,39 @@
 <!--#set var="ENGLISH_PAGE" 
value="/education/edu-cases-india-irimpanam.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Irimpanam高级职业中学 - GNU工程 - 自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
+<style type="text/css" media="screen"><!--
+.article {
+   padding-bottom: .8em;
+   border-top: 3px ridge #3465a4;
+   border-bottom: 3px ridge #3465a4;
+   margin: 2em 0;
+}
+-->
+</style>
 
 <!--#include virtual="/education/po/edu-cases-india-irimpanam.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">Education</a> 
&rarr; <a
-href="/education/edu-cases.html">案例分析</a> &rarr; <a
-href="/education/edu-cases-india.html">印度</a> &rarr; 
Irimpanam高级职业中学</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/edu-cases.html">案例分析</a>&nbsp;/ <a
+href="/education/edu-cases-india.html">印度</a>&nbsp;/</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -22,12 +43,14 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div  id="last-div" class="reduced-width">
 <h2>Irimpanam高级职业中学</h2>
 
-<p>下述报告æ 
¹æ®è¯¥ä¸­å­¦æ•™èŒå‘˜å·¥ä¸ºæˆ‘们提供的信息完成。</p>         
-
-<div class="edu-cases">
+<p class="italic">
+下述报告根据该中学教职员工为我们提供的信息完成。</p>   
      
 
+<div class="article">
 <h3>地点</h3>
 
 <p>我们中学位于Irimpanam,接近Tripunithura市,属于印度<a
@@ -101,7 +124,7 @@
 
 </div>
 
-<p>Kerala州的教育已经变得"IT-enabled",意思是学生们在IT实验室之外学ä¹
 å¸¸è§„课程时就学到了第一手的计算机技术。因
为GNU/Linux提供了大量高水平的教育应用软件,这才成为可能。</p>
+<p>Kerala州的教育已经变得&ldquo;IT-enabled&rdquo;,意思是学生们在IT实验室之外学ä¹
 å¸¸è§„课程时就学到了第一手的计算机技术。因
为GNU/Linux提供了大量高水平的教育应用软件,这才成为可能。</p>
 
 <p>自由软件的透明性和合作方式帮助老师和学生深å…
¥äº†è§£æŠ€æœ¯ï¼Œå¹¶èƒ½å¤Ÿä»¥å¤šç§æ–¹å¼ä¸ºç¤¾åŒºåšè´¡çŒ®ã€‚å…
¶ä¸­ä¸€é¡¹é‡è¦è´¡çŒ®å°±æ˜¯å°†<a
 href="/education/edu-software-tuxpaint.html">Tux
@@ -125,22 +148,19 @@
 Irimpanam)</a>推动的,它是一个由学æ 
¡æ•™å¸ˆå’Œå­¦ç”Ÿä¸ºä¸»çš„自由软件团体。其目的是传
播自由软件的理念,并以向GNU/Linux介绍新应用为主要贡献方式。该团体组织月会和各种活动以推动å
…
¶æˆå‘˜ä½“验和探索自由软件,从而使大家能够在实践中体会自由软件带来的自由。</p>
 
 <p>我校师生每年都参加诸如全国自由软件大会和网络安å…
¨æ—¥ç­‰æ´»åŠ¨ï¼Œè¿™æ ·æˆ‘们就和其他学æ 
¡å’Œè‡ªç”±è½¯ä»¶ç¤¾åŒºä¿æŒè”系并分享自由软件的经验。</p>
-
 </div> 
 
-<!-- class="edu-cases" -->
 <p>教师、学生和本地社团的全心投å…
¥ä¸Žåˆä½œæ˜¯æˆåŠŸè¿›è¡Œå¦‚此规模的政府项目的关键。</p> 
 
-<p>(1) <a 
id="swathanthra"></a>Swathanthra是Sanskrit语,意思是freedom(自由)中的自由(free)。</p>
-
-<h4>鸣谢</h4>
+<div class="infobox">
+<hr />
+<p id="swathanthra">(1) 
Swathanthra是Sanskrit语,意思是freedom(自由)中的自由(free)。</p>
 
+<h3>鸣谢</h3>
 <p>感谢VHSS Irimpanam的Swathanthra Software 
Koottayma提供图片和音频文件,并将这些内容以<a
 rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/";>Creative
 Commons Attribution-Share Alike 3.0 Unported</a>许可证发布。</p>    
-
-<p class="back"> <a href="/education/edu-cases-india.html">印度的å…
¶ä»–案例分析</a> <br />
-<a href="/education/edu-cases.html">返回到案例分析</a></p>
+</div>
 
 <div class="translators-notes">
 
@@ -148,7 +168,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -169,7 +189,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -177,7 +197,7 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2016, 2018, 2019 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016, 2018, 2020 Free Software Foundation, 
Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -193,7 +213,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/11/23 14:29:13 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-cases-india.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-cases-india.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-cases-india.zh-cn.html  2 Sep 2018 07:27:21 -0000       1.1
+++ edu-cases-india.zh-cn.html  31 May 2020 05:04:34 -0000      1.2
@@ -1,18 +1,29 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-cases-india.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>案例分析 - GNU工程 - 自由软件基金会</title>
+<title>教育 - 案例分析 - GNU工程 - 自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/po/edu-cases-india.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; <a
-href="/education/edu-cases.html">案例分析</a> &rarr; 印度</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/edu-cases.html">案例分析</a>&nbsp;/</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -22,6 +33,8 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>印度的案例分析</h2>
 
 <p>这是印度科学家Dr. V. Sasi Kumar写的一篇<a
@@ -49,15 +62,13 @@
 "https://www.itschool.gov.in/";>项目</a>而完å…
¨è¿ç§»åˆ°è‡ªç”±è½¯ä»¶ç³»ç»Ÿçš„数千所学校之一。</p></li>
 </ul>
 
-<a href="/education/edu-cases.html">返回到案例分析</a>
-
 <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="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -78,14 +89,14 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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, 2015, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2015, 2016, 2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -101,7 +112,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2018/09/02 07:27:21 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-cases.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-cases.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-cases.zh-cn.html        26 Aug 2018 03:57:51 -0000      1.2
+++ edu-cases.zh-cn.html        31 May 2020 05:04:34 -0000      1.3
@@ -1,17 +1,29 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-cases.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>案例分析 - GNU工程 - 自由软件基金会</title>
+<title>教育 - 案例分析 - GNU工程 - 自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/po/edu-cases.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>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/
+</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -21,6 +33,8 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>案例分析</h2>
 
 <p>我们进行全球性的ç 
”究,考察成功应用了自由软件的私利和å…
¬ç«‹æ•™è‚²æœºæž„以及非正式教育环境。我们并不是要在这里要建立一个完备的数据库。反过来,我们会展示å
…
·ä½“的成功案例,并相信这些明证能够激励那些第一次考虑安è£
…或迁移到自由软件的人们。</p>
@@ -29,15 +43,15 @@
 
href="mailto:education@gnu.org";>&lt;education@gnu.org&gt;</a>,让我们知晓。</p>
 
 <!-- Begin country-wise Index. Add countries in alphabetical order  -->
+<div class="toc-inline">
+<p>
+&nbsp;<a href="/education/edu-cases-argentina.html">阿根廷</a>&nbsp; 
&nbsp;<a
+href="/education/edu-cases-india.html">印度</a>&nbsp;
+</p>
+</div>
+
 <!-- End of Country-wise Index -->
 <!-- Begin country-wise Section. Add new countries in alphabetical order -->
-<a href="/education/edu-cases-argentina.html">阿根廷</a> | <a
-href="/education/edu-cases-india.html">印度</a>
-
-
-
-
-               
 <h3 id="Argentina">阿根廷</h3>
 
 <!-- Add entries under corresponding country in alphabetical order by the name 
of the school -->
@@ -60,7 +74,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -81,14 +95,14 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -104,7 +118,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2018/08/26 03:57:51 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: education.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/education.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- education.zh-cn.html        31 Jul 2017 13:29:06 -0000      1.3
+++ education.zh-cn.html        31 May 2020 05:04:34 -0000      1.4
@@ -1,13 +1,13 @@
 <!--#set var="ENGLISH_PAGE" value="/education/education.en.html" -->
 
 <!--#include virtual="/server/html5-header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>自由软件与教育 - GNU 工程 - 自由软件基金会</title>
-
-<!--#include virtual="/education/po/education.translist" -->
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 <style type="text/css" media="screen">
 <!--
 #video-container {
@@ -38,8 +38,22 @@
 
 </style>
 
+<!--#include virtual="/education/po/education.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#include virtual="/education/education-menu.zh-cn.html" -->
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/
+</p>
+</div>
+
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
 <!--#else -->
@@ -48,8 +62,11 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
-<h2 class="c">自由软件与教育</h2>
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
+<h2>自由软件与教育</h2>
 
+<div class=" article">
 <h3>自由软件和教育有什么关系?</h3>
 
 <p>软件自由在教育中扮演了æ 
¹åŸºæ€§çš„角色。任何层次的教育机构都应该使用和教授自由软件,å›
 ä¸ºè¿™äº›æ˜¯å”¯ä¸€èƒ½å¸®åŠ©ä»–们契合教育的本质使命的软件:传
播人类知识,帮助学生成为他们所在团体的优秀成员。自由软件的源代ç
 å’Œå„种方法是人类知识的一部分。与此相反,商业软件中包
含的是商业机密和受限制的知识,这违背了教育机构的使命。自由软件支持教育,商业软件妨碍教育。</p>
@@ -114,18 +131,20 @@
 <li>了解更多有关为什么教育机构应使用自由软件的 <a 
href="/education/edu-why.html">理由</a>。</li>
 
 <li>一篇由 Richard Stallman 撰写的文章:<a
-href="/education/edu-schools.html">为什么在学æ 
¡ä¸­åªåº”使用自由软件</a></li>
+href="/education/edu-schools.html">为什么在学æ 
¡ä¸­åªåº”使用自由软件</a>。</li>
 
 <li>一篇由 V. Sasi Kumar 博士撰写的文章,<a
 href="/education/edu-system-india.html">印度的教育系统</a>。</li>
 </ul>
+</div>
+
 <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="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -146,7 +165,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -154,7 +173,7 @@
 了解有关协调和提交文章翻译的信息。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2014, 2016, 2020 Free Software Foundation, 
Inc.</p>
 
 <p>本页面采用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -171,7 +190,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2017/07/31 13:29:06 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-faq.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-faq.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-faq.zh-cn.html  10 Dec 2017 02:58:58 -0000      1.1
+++ edu-faq.zh-cn.html  31 May 2020 05:04:34 -0000      1.2
@@ -1,16 +1,29 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-faq.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>关于自由软件和教育的常见问题 - GNU工程 - 
自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/po/edu-faq.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>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/
+</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -20,9 +33,13 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>关于自由软件和教育的常见问题</h2>
 
+<div class="article">
 <p>许多自由软件倡导者在和教育机构的管理者
谈论使用和教授自由软件的优势时都遇到了困难。学æ 
¡çš„管理者常常是从来没有听说过自由软件或者
是只听说过&ldquo;开源&rdquo;,所以他们有很多疑虑。在此,我们收集了一些最常见的问题,并尽可能给出能够消除疑虑的最好回答。</p>
+<div class="column-limit"></div>
 
 <dl>
   <dt>作为一名教师,我一直努力向学æ 
¡ç®¡ç†å±‚解释开源软件能够带给学æ 
¡çš„好处,但是他们似乎并不感兴趣。</dt>
@@ -53,6 +70,7 @@
     
<p>当软件用户开始要求自己的权利,政府就不得不发布相å…
³çš„法律。这就是为什么在谈论自由软件时不能把政治和社会的影响这一基本面放在一边的原å›
 ã€‚</p>
     </dd>
 </dl>
+</div>
 
 <div class="translators-notes">
 
@@ -60,7 +78,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -81,7 +99,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -89,7 +107,7 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -105,7 +123,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2017/12/10 02:58:58 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-free-learning-resources.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-free-learning-resources.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-free-learning-resources.zh-cn.html      3 Mar 2020 23:58:52 -0000       
1.2
+++ edu-free-learning-resources.zh-cn.html      31 May 2020 05:04:34 -0000      
1.3
@@ -1,18 +1,29 @@
 <!--#set var="ENGLISH_PAGE" 
value="/education/edu-free-learning-resources.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.87 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>自由教育资源 - GNU 工程 - 自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/po/edu-free-learning-resources.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; <a
-href="/education/edu-resources.html">教育资源</a> &rarr; 自由学习
资源</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/  <a
+href="/education/edu-resources.html">教育资源</a>&nbsp;/ </p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -22,8 +33,11 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>自由学习资源</h2>
 
+<div class="article">
 <p>自由学习资源,正如自由软件,关乎自由,无关价æ 
¼ã€‚它意在把自由软件的原则扩展到一般知识和教育资料。知识应该为所有人不受限制地所得和所用,而不应当作私产。知识并不像是鞋子那æ
 ·çš„消费品,它不因
为使用而消耗或损失。知识是天然丰富的资源并且随着使用改进:知识的应用和ä¼
 æ’­è¶Šå¤šï¼Œå®ƒå°±è¶Šå¢žé•¿ä¸”越惠及所有人。引入有利于占
有知识的衡量制度是为了防止人们获取、使用或分享知识而量身定做的伎俩,这是对人类进步的背叛。</p>
 
 <p>自由知识的原则一直是 GNU 工程的精髓。在 1999 年,GNU 
工程正式引入 <a
@@ -67,6 +81,7 @@
 我们在寻找自由的教育游戏,或者
是可用于教育的自由游戏。请联系 <a
 href="mailto:education@gnu.org";>&lt;education@gnu.org&gt;</a>。
 </p></div>
+</div>
 
 <div class="translators-notes">
 
@@ -74,7 +89,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -94,7 +109,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -136,7 +151,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2020/03/03 23:58:52 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-projects.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-projects.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- edu-projects.zh-cn.html     23 Nov 2019 14:29:13 -0000      1.5
+++ edu-projects.zh-cn.html     31 May 2020 05:04:34 -0000      1.6
@@ -1,18 +1,30 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-projects.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.87 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>团体和项目 - GNU工程 - 自由软件基金会</title>
+<title>教育 - 团体和项目 - GNU工程 - 自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#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; <a
-href="/education/edu-resources.html">教育资源</a> &rarr; 
团体和项目</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/edu-resources.html">教育资源</a>&nbsp;/
+</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -22,8 +34,11 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>团体和项目</h2>
 
+<div class="article">
 <p>世界上有好几
个团体和组织践行着GNU的哲学,它们从事着意在把自由软件带到教育领域的项目。下面列举了一些。如果ä½
 çš„项目只支持自由软件,而且没有列在下面,请联系我们<a
 href="mailto:education@gnu.org";> &lt;education@gnu.org&gt;</a>。</p>
 
@@ -69,6 +84,7 @@
    <dd>Sugar Labs是一个提供<a
 href="http://wiki.sugarlabs.org/go/What_is_Sugar";>Sugar学习
平台</a>的项目,该平台专门为帮助孩子们使用电脑而设计界面,它尤å
…¶ä¸“注于在教育环境下的应用。</dd> 
 </dl>
+</div>
 
 <div class="translators-notes">
 
@@ -76,7 +92,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -97,14 +113,14 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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, 2016, 2018, 2019 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2016, 2018-2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -121,7 +137,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/11/23 14:29:13 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-resources.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-resources.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- edu-resources.zh-cn.html    3 May 2019 06:59:52 -0000       1.5
+++ edu-resources.zh-cn.html    31 May 2020 05:04:34 -0000      1.6
@@ -1,17 +1,28 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-resources.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.87 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>教育资源 - GNU工程 - 自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/po/edu-resources.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>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -21,6 +32,8 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>教育资源</h2>
 
 <p>本小节可以帮助你找到各种各样的教育相å…
³çš„资源,比如:自由学习
的资料、适用于各个阶段教育的自由软件、提供有å…
³è‡ªç”±è½¯ä»¶çš„哲学和技术课程的教育机构、开发教育自由软件的项目和平台、践行
@@ -40,7 +53,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -61,7 +74,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -84,7 +97,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, 2019 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016, 2018-2020 Free Software Foundation, 
Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -100,7 +113,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/05/03 06:59:52 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-schools.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-schools.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-schools.zh-cn.html      1 Jan 2020 08:31:32 -0000       1.2
+++ edu-schools.zh-cn.html      31 May 2020 05:04:34 -0000      1.3
@@ -1,18 +1,29 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-schools.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>为什么在学校中只应使用自由软件 - GNU工程 - 
自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/po/edu-schools.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; <a
-href="/education/education.html#indepth">深入讨论</a> &rarr; 
为什么在学校中只应使用自由软件</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/education.html#indepth">深入讨论</a>&nbsp;/</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -22,14 +33,20 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>为什么在学校中只应使用自由软件</h2>
 
-<p><a href="http://www.stallman.org/";>Richard Stallman</a> 著</p>
-
-<p>教育活动,包括从幼儿园到大学的各级学æ 
¡ï¼Œæœ‰é“德职责<a 
href="/education/education.html">只教授自由软件。</a></p>
+<p class="byline">
+<a href="http://www.stallman.org/";>Richard Stallman</a> 著</p>
+<hr class="thin" />
+<div class="article">
+<p class="italic">
+教育活动,包括从幼儿园到大学的各级学校,有道德职责<a 
href="/education/education.html">只教授自由软件。</a></p>
 
-<p>所有计算机用户都应该<a
+<p class="italic">所有计算机用户都应该<a
 
href="/philosophy/free-software-even-more-important.html">坚持使用自由软件</a>:它赋予用户控制å
…¶è®¡ç®—的自由&mdash;专属软件,执行的是其所有者或开发者
的意愿,而不是å…
¶ç”¨æˆ·çš„意愿。自由软件还赋予用户互相合作的自由,这就是诚信的生活。这些道理同æ
 ·é€‚用于学æ 
¡ã€‚不过,本文的目的是展示特别针对教育的一些道理。</p>
+<div class="column-limit"></div>
 
 <p>自由软件可以为学校省钱,但这只是次要的好处。因
为学校和其他用户一æ 
·ï¼Œæœ‰è‡ªç”±å¤åˆ¶å’Œé‡æ–°å‘布自由软件,所以可以省钱;一个学æ
 ¡å¯ä»¥ç»™å…¶ä»–学校软件拷贝,这样所有学æ 
¡çš„计算机都可以安装自由软件而不必因此付费。</p>
 
@@ -61,14 +78,16 @@
 
<p>教育学生使用自由软件和参与自由软件社区是实实在在的å…
¬æ°‘课。它也教育学生公共服务的å…
¸èŒƒã€è€Œä¸æ˜¯ä¼ä¸šå·¨å¤´çš„角色。各级学æ 
¡éƒ½åº”该使用自由软件。</p>
 
 <p>如果你和学校有关&mdash;你是学生、教师、雇员、管理者
、资助者或是父母&mdash;你有义务为学校开展活动,让学æ 
¡ä½¿ç”¨è‡ªç”±è½¯ä»¶ã€‚如果个人力量无法实现该目标,请在社区å…
¬å¼€æå‡ºè¿™ä¸ªç›®æ ‡ï¼›è¿™æ ·ä¼šè®©æ›´å¤šçš„人知晓这个目æ 
‡å¹¶ä¸”找到活动的志同道合者。</p>
+<div class="column-limit"></div>
 
 <ol>
-<li><cite><a id="note1"></a>警告:接受这种待遇的学æ 
¡å¯èƒ½ä¼šå‘现后续的升级相当昂贵。</cite></li>
+<li id="note1">警告:接受这种待遇的学æ 
¡å¯èƒ½ä¼šå‘现后续的升级相当昂贵。</li>
 
-<li><cite><a id="note2"></a>RJ Reynolds烟草å…
¬å¸ç”±äºŽåœ¨å„¿ç«¥å‚与的活动中发放å…
è´¹é¦™çƒŸè€Œè¢«å¤„以1千5百万美元的罚款。参看<a
+<li id="note2">RJ Reynolds烟草公司由于在儿童参与的活动中发放å…
è´¹é¦™çƒŸè€Œè¢«å¤„以1千5百万美元的罚款。参看<a
 
href="http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm";>
-http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm</a>。</cite></li>
+http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm</a>。</li>
 </ol>
+</div>
 
 <div class="translators-notes">
 
@@ -80,7 +99,7 @@
 </ol></div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -101,7 +120,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -109,7 +128,7 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2003, 2009, 2014, 2015, 2016, 2019, 2020 Richard 
Stallman</p>
+<p>Copyright &copy; 2003, 2009, 2014-2016, 2020 Richard Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -125,7 +144,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2020/01/01 08:31:32 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-software-gcompris.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-software-gcompris.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-software-gcompris.zh-cn.html    8 Dec 2017 13:28:56 -0000       1.1
+++ edu-software-gcompris.zh-cn.html    31 May 2020 05:04:34 -0000      1.2
@@ -1,18 +1,37 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-software-gcompris.en.html" 
-->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>GCompris - GNU工程 - 自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
+<style type="text/css" media="screen"><!--
+.pict {
+   width: 25em;
+   margin: 1.5em auto;
+}
+-->
+</style>
 
 <!--#include virtual="/education/po/edu-software-gcompris.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; <a
-href="/education/edu-resources.html">教育资源</a> &rarr; <a
-href="/education/edu-software.html">教育性自由软件</a> &rarr; 
GCompris</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/edu-resources.html">教育资源</a>&nbsp;/ <a
+href="/education/edu-software.html">教育性自由软件</a>&nbsp;/</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -22,19 +41,21 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
-<h2 class="c">GCompris</h2>
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
+<h2>GCompris</h2>
 
+<div class="article">
 <h3>描述</h3>
 
-<div class="pict wide">
+<p>GCompris是适合2到10岁儿童的跨平台完整教育套件,它也是GNU工程的一部分。它åŒ
…含超过140个娱乐性活动,这些活动可以帮助孩子们学习
诸如辨认字母和数字、使用键盘和鼠æ 
‡ã€åŸºæœ¬ç®—术、看指针认时间、画矢量、做游戏学语言等等技能,还有更多。该程序还带有一个简单的字处理程序,它能够制作带有基本æ
 ¼å¼çš„文档。其另一项功能是带有动画工å…
·ï¼Œèƒ½å¤Ÿä½œä¸ºç®€å•è€Œæœ‰æ•ˆåœ°è®²æ•…事的辅
助手段,可以促进和孩子们的沟通,也有助于孩子们自我表达。</p>
 
 
+<div class="pict">
 <a href="/education/misc/gcompris.jpg">
 <img src="/education/misc/gcompris-sm.jpg" 
 alt="展示GCompris操作界面的截图。"/></a>
 </div>
 
-<p>GCompris是适合2到10岁儿童的跨平台完整教育套件,它也是GNU工程的一部分。它åŒ
…含超过140个娱乐性活动,这些活动可以帮助孩子们学习
诸如辨认字母和数字、使用键盘和鼠æ 
‡ã€åŸºæœ¬ç®—术、看指针认时间、画矢量、做游戏学语言等等技能,还有更多。该程序还带有一个简单的字处理程序,它能够制作带有基本æ
 ¼å¼çš„文档。其另一项功能是带有动画工å…
·ï¼Œèƒ½å¤Ÿä½œä¸ºç®€å•è€Œæœ‰æ•ˆåœ°è®²æ•…事的辅
助手段,可以促进和孩子们的沟通,也有助于孩子们自我表达。</p>
 
-
 <p>GCompris在其左边æ 
åˆ†é—¨åˆ«ç±»åœ°æ˜¾ç¤ºäº†æ´»åŠ¨é¡¹ç›®ï¼Œå­©å­ä»¬åœ¨ç¨‹åºä¸€å¼€å§‹å°±å¯ä»¥åœ¨æ­¤é€‰æ‹©ã€‚è¿™æ
 ·çš„设计使添加
新活动变得容易,也让修改程序适应特定的需求变得容易。程序本身和å
…¨éƒ¨æ´»åŠ¨éƒ½æ”¯æŒå¤šè¯­è¨€ã€‚</p>
 
 <p>了解更多:<a 
href="http://directory.fsf.org/project/gcompris/";>FSF目录</a>、<a
@@ -57,6 +78,7 @@
 <h3>结果</h3>
 
 <p>GCompris尊重其用户的基本自由,这就让Insight的开发者
和专家可以将该软件修改为适应孩子们需求的方式、创建新的活动,并且提出帮助自闭症儿童及å
…
¶å®¶é•¿ä½¿ç”¨è¯¥ç¨‹åºçš„创新思路。Insight团队还能够自由地向家长和教师发布修改后的软件,家长和教师可以不受限制地在家使用。å
…¶ä¿®æ”¹ç‰ˆå·²ç»è¢«è¯æ˜Žåœ¨æé«˜æ™ºåŠ›éšœç¢å„¿ç«¥çš„学习
和运动能力方面是卓有成效的。</p>
+</div>
 
 <div class="translators-notes">
 
@@ -64,7 +86,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -85,7 +107,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -93,7 +115,7 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2014, 2016, 2020 Free Software Foundation, 
Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -109,7 +131,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2017/12/08 13:28:56 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-software-gimp.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-software-gimp.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edu-software-gimp.zh-cn.html        15 Dec 2018 14:46:04 -0000      1.3
+++ edu-software-gimp.zh-cn.html        31 May 2020 05:04:34 -0000      1.4
@@ -1,13 +1,13 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-software-gimp.en.html" -->
 
 <!--#include virtual="/server/html5-header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>GIMP - GNU工程 - 自由软件基金会</title>
-
-<!--#include virtual="/education/po/edu-software-gimp.translist" -->
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 <style type="text/css" media="screen"><!--
 #mani-movie {
    width: 40em; max-width: 100%;
@@ -19,14 +19,23 @@
 -->
 </style>
 
+<!--#include virtual="/education/po/edu-software-gimp.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#include virtual="/education/education-menu.zh-cn.html" -->
-<!-- begin of breadcrumbs -->
-<p class="edu-breadcrumb"><a href="/education/education.html">教育</a> 
&rarr; <a
-href="/education/edu-resources.html">教育资源</a> &rarr; <a
-href="/education/edu-software.html">教育性自由软件</a> &rarr; GIMP</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/edu-resources.html">教育资源</a>&nbsp;/ <a
+href="/education/edu-software.html">教育性自由软件</a>&nbsp;/</p>
+</div>
 
-<!-- end of breadcrumbs -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
 <!--#else -->
@@ -35,8 +44,11 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
-<h2 class="c">GIMP</h2>
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
+<h2>GIMP</h2>
 
+<div class="article">
 <h3>描述</h3>
 
 <p>GIMP代表的是&ldquo;GNU图像处理程序(GNU Image Manipulation
@@ -54,7 +66,7 @@
 <p>法国艺术家Isabel Saij描述她如何使用GIMP完成了<a
 
href="https://web.archive.org/web/20080516101605/http://www.saij-copyleft2.net/fragments1.html";>她的作品</a>:</p>
 
-<blockquote>
+<blockquote class="italic">
 <p>&ldquo;这是一个我在不同作品中都使用的程序:ç…
§ç‰‡å¤„理(将图片混合在一起)、绘画(和我用于画纸的‘实é™
…画框’相å…
³è”的‘数字画框’)、为青少年讲课、为视频准备图片等等)。换句话说,这是我最爱的程序之一。&rdquo;</p>
 </blockquote>
 
@@ -94,15 +106,15 @@
 <!-- /#mani-movie -->
 <p>此文撰写时(2012年3月)Mani是班加
罗尔的一名计算机科学学生。他说道:</p>
 
-<blockquote>
+<blockquote class="italic">
 <p> &ldquo;首å…
ˆï¼Œæˆ‘要对自由软件运动说声谢谢,是它让我能够开始学习
GIMP。这是我生命中的第一个成就,并且我在一次自由软件会议上卖出了许多绘画。后来,我开始在很多会议上展示我的作品。å›
 ä¸ºGIMP,我的绘画技艺得以展现给世界。如你
所知,我们的才能通常为世界所忽略。我们在社区的目æ 
‡æ˜¯ï¼šåˆ†äº«è½¯ä»¶å’ŒçŸ¥è¯†ï¼Œäº’相学习
;弘扬自由软件的道德价值并在这个被边缘化的社会环境中提升软件自由之重要性的认知度;用计算机知识赋予穷人力量。我们要复制我们的æ
 ·æ¿ï¼Œåœ¨æ­¤åœ°åŒºçš„å…
¶ä»–贫民区,我们已经在运行3所计算中心。&rdquo; </p>
 </blockquote>
 
 <p>Richard Stallman对此案例的评价:</p>
 
-<blockquote>
-<p class="center"><strong>&ldquo;比之GNU被著名的大å…
¬å¸æ‰€ç”¨ï¼Œæˆ‘更为之被印度达利人<sup><a
-href="#TransNote1">1</a></sup>所用而自豪。&rdquo;</strong></p>
+<blockquote class="italic">
+<p>&ldquo;比之GNU被著名的大å…
¬å¸æ‰€ç”¨ï¼Œæˆ‘更为之被印度达利人<sup><a
+href="#TransNote1">1</a></sup>所用而自豪。&rdquo;</p>
 </blockquote>
 
 <h3>为什么</h3>
@@ -118,7 +130,7 @@
 
 <p>Isabel Saij解释了为什么她决定冲ç 
´è—©ç¯±ï¼Œæ‹¥æŠ±è‡ªç”±è½¯ä»¶ï¼š</p>
 
-<blockquote>
+<blockquote class="italic">
 <p> &ldquo;使用专有软件,艺术家们对软件开发商无
能为力。在2003年初,我使用LiveMotion来设计2D和3D的交互式艺术作品。当年晚些时候,该å
…¬å¸å†³å®šåœæ­¢è¯¥è½¯ä»¶ï¼Œå› 
此我就被撇下:我花费了时间和金钱学习
使用该软件,但是现在没有了技术支持。更有甚者,无
论何时,只要专有软件开发者决定引入新的功能,你
就不得不花钱购买通常只会运行在最新的专有操作系统上的升级版。这æ
 ·ï¼Œä½ å°±å®Œå…¨æ— åŠ©åœ°é™·å…¥äº†é‚ªæ¶çš„循环之中。令人沮丧但又无
能为力。使用自由软件,社区拥有代ç 
ï¼Œå¥½çš„项目永远不会没落。总有人会继续开发该软件。&rdquo;</p>
 </blockquote>
 
@@ -131,6 +143,7 @@
 <p>在较少不利因素的情
况下,GIMP的用户从自由软件获得了许多好处。他们不再受制于专有软件å
…
¬å¸çš„专横决定;反过来,他们成为广泛而强壮的社区成员,å
…¶ä¸­çš„开发者关心他们的需求,å…
¶ä»–的用户也会提供额外的支持。除了官方的手册和教程,热æƒ
…的用户发布了大量的指导材料,而且有了源代ç 
ï¼Œæœ‰ç¼–程技术的伙伴为该应用贡献了多个增强性能的插件。</p>
 
 
 <p>作为一个按照GNU 
GPL第三版及更高版本授权的自由软件,既没有开发者
的武断决定能够停止GIMP发展,也没有人能把它变成专有软件。</p>
+</div>
 
 <div class="translators-notes">
 
@@ -141,7 +154,7 @@
 </ol></div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -162,14 +175,14 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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; 2012, 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2012, 2016, 2018, 2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -186,7 +199,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2018/12/15 14:46:04 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-software-tuxpaint.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-software-tuxpaint.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-software-tuxpaint.zh-cn.html    6 Oct 2017 15:58:55 -0000       1.2
+++ edu-software-tuxpaint.zh-cn.html    31 May 2020 05:04:34 -0000      1.3
@@ -1,37 +1,59 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-software-tuxpaint.en.html" 
-->
 
-<!--#include virtual="/server/html5-header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!--#include virtual="/server/header.zh-cn.html" -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Tux Paint - GNU工程 - 自由软件基金会</title>
-
-<!--#include virtual="/education/po/edu-software-tuxpaint.translist" -->
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 <style type="text/css" media="screen,print"><!--
-.pict { margin-top: 2em; border: .2em solid #bbb; }
-.stamp { width: 12.5em; padding: 0 .6em 1.5em; }
-.stamp img, #content .stamp p {
-   width: 100%; padding: 0; margin: 0;
+.pict {
+   width: 27em;
+   max-width: 92%;
+   border: .2em solid #bbb;
+   margin: 2em auto;
 }
-.stamp p { font-style: italic; }
-#flowers { width: 14.5em; float: right; }
-.stamp { float: right; }
-@media (max-width: 33em) {
-   #flowers, .stamp { float: none; margin: auto; }
+.stamp {
+   display: inline-block;
+   vertical-align: top;
+   width: 12.3em;
+   padding: 0 .5em 1em;
 }
-@media (min-width: 55em) {
-   #flowers { width: 29em; }
-   .stamp { float: right; }
+.stamp img, #content .stamp p {
+   width: 100%;
+   padding: 0;
+   margin: 0;
 }
--->
+.stamp p {
+   font-size: .9em;
+   font-style: italic;
+}
+@media (max-width: 35em) {
+   #flowers {
+      width: 13.3em;
+   }
+}-->
+
 </style>
 
+<!--#include virtual="/education/po/edu-software-tuxpaint.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; <a
-href="/education/edu-resources.html">教育资源</a> &rarr; <a
-href="/education/edu-software.html">教育相关的自由软件</a> &rarr; Tux 
Paint</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/edu-resources.html">教育资源</a>&nbsp;/ <a
+href="/education/edu-software.html">教育相关的自由软件</a>&nbsp;/</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -41,25 +63,28 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
-<h2 class="c">Tux Paint</h2>
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
+<h2>Tux Paint</h2>
 
+<div class="article">
 <h3>描述</h3>
 
-<div class="pict wide">
-
-<!-- GNUN: localize URL /education/misc/tuxpaint-start-sm.zh-cn.png, 
/education/misc/tuxpaint-start.zh-cn.png -->
-<a href="/education/misc/tuxpaint-start.zh-cn.png">
-<img src="/education/misc/tuxpaint-start-sm.zh-cn.png" 
-alt="Tux Paint界面的截屏"/></a>
-</div>
-
 <p>Tux
 Paint是一个跨平台的画图软件,它专为儿童设计。它有清
晰和直觉化的界面,大大的按钮带有图标和æ 
‡ç­¾ï¼Œä¸‰å²å°å­©ç”¨èµ·æ¥ä¹Ÿæ²¡å•¥å›°éš¾ã€‚在å…
¶å±å¹•ä¸­é—´æ˜¯ç™½è‰²çš„画布,孩子们可以在此用画笔和各种工å…
·å°½æƒ…发挥。作为入门,孩子们可以为预å…
ˆè®¾è®¡çš„图画上色,就像描红一样。</p>
 
-<p>该程序囊括了所有最常用的画图工å…
·ï¼Œæ¯”如线条、画笔、色彩、几
何图形、缩放、橡皮擦、"重做(Redo)"和
-"撤销(Undo)"操作,以及画画时的声音和一个特殊的"魔术(Magic)"å·¥å
…·ï¼Œå®ƒå¯ä»¥åˆ¶é€ å¼•äººæ³¨ç›®çš„效果:彩虹、闪å…
‰ã€ç²‰ç¬”效果、模糊效果、翻转等等。</p>
+<p>该程序囊括了所有最常用的画图工å…
·ï¼Œæ¯”如线条、画笔、色彩、几
何图形、缩放、橡皮擦、&ldquo;重做(Redo)&rdquo;和
+&ldquo;撤销(Undo)&rdquo;操作,以及画画时的声音和一个特殊的&ldquo;魔术(Magic)&rdquo;å·¥å
…·ï¼Œå®ƒå¯ä»¥åˆ¶é€ å¼•äººæ³¨ç›®çš„效果:彩虹、闪å…
‰ã€ç²‰ç¬”效果、模糊效果、翻转等等。</p>
 
-<p>除了魔术工具,还有一个受孩子们喜爱的功能叫做"印章
(Stamp)",它包
含许多图片和剪贴画,能够盖在画布上,比如花草、动物、节日艺术、星球等等,举不胜举。许多印ç«
 å’Œç¨‹åºä¸€èµ·å‘布,还有一些可以作为单独的软件包安装
。很多用户为该程序贡献了剪贴画作为印章
;我们下面会看一个由印度学æ 
¡çš„小朋友制作的例子,它展示了自由软件提供的自由实践。</p>
 
+<div class="pict">
+
+<!-- GNUN: localize URL /education/misc/tuxpaint-start-sm.png, 
/education/misc/tuxpaint-start.png -->
+<a href="/education/misc/tuxpaint-start.png">
+<img src="/education/misc/tuxpaint-start-sm.png" 
+alt="Tux Paint界面的截屏"/></a>
+</div>
+
+<p>除了魔术工å…
·ï¼Œè¿˜æœ‰ä¸€ä¸ªå—孩子们喜爱的功能叫做&ldquo;印章
(Stamp)&rdquo;,它包
含许多图片和剪贴画,能够盖在画布上,比如花草、动物、节日艺术、星球等等,举不胜举。许多印ç«
 å’Œç¨‹åºä¸€èµ·å‘布,还有一些可以作为单独的软件包安装
。很多用户为该程序贡献了剪贴画作为印章
;我们下面会看一个由印度学æ 
¡çš„小朋友制作的例子,它展示了自由软件提供的自由实践。</p>
 
 
 <p>Tux Paint支持80多种语言,包
括小语种和从右向左的语言。这么丰富的语言支持得益于来自世界各地的用户贡献。</p>
 
@@ -68,30 +93,21 @@
 
 <h3>谁在使用它以及用来做什么</h3>
 
-<div class="pict wide">
-<a href="/education/misc/tuxpaint-stamps.jpg">
-<img src="/education/misc/tuxpaint-stamps-sm.jpg" 
-alt="Tux Paint的界面截图,这是带有地方花卉的马拉雅
拉姆语(Malayalam)。"/></a>
-</div>
-
 <p>来自Tux Paint<a 
href="http://tuxpaint.org/comments/";>家庭用户</a>的评论和<a
 href="http://tuxpaint.org/schools/";>学校用户</a>的故事都呈现在Tux
 
Paint的官方网站。还有报道说该程序是让孩子们了解计算机图形技术基础的最有帮助的工å
…·ä¹‹ä¸€ï¼Œå› ä¸ºå®ƒæœ‰éžå¸¸å¸å¼•å­©å­çš„使用环境。然而,和å…
¶ä»–儿童画图软件比起来,使Tux
 Paint更出色的因素
是它是一款自由软件,这意味着它没有任何限制,它的用户拥有一系列的自由。例如,å
…¶ä¸­ä¸€ä¸ªè‡ªç”±æ˜¯ç”¨æˆ·å¯ä»¥æŒ‰éœ€è¦å®‰è£…,多少台都行,这对学æ 
¡å°¤ä¸ºé‡è¦ã€‚</p>
 
+<div class="pict">
+<a href="/education/misc/tuxpaint-stamps.jpg">
+<img src="/education/misc/tuxpaint-stamps-sm.jpg" 
+alt="Tux Paint的界面截图,这是带有地方花卉的马拉雅
拉姆语(Malayalam)。"/></a>
+</div>
+
 
<p>另一个显著的自由是自由软件保证了用户按需要修改程序的自由、重新发布修改后版本的自由。正是这项自由使得Tux
 Paint可以支持如此众多的语言,包括超
小语种。事实上,那些小语种的翻译都是由用户自己提供的。大多数æƒ
…况下,开发非自由软件公司的政策是æ 
¹æ®å¸‚场大小来制定的:如果市场的大小不能确保盈利,那么他们通常是不愿意投资开发的。</p>
 
-<div id="flowers">
-<div class="stamp">
-<a href="/education/misc/appooppanthaady.jpg">
-<img src="/education/misc/appooppanthaady-sm.jpg"
-alt="Appooppan Thaady花的图片。" /></a>
-<p class="c"><a 
href="/education/misc/appooppanthady.ogg">请听</a>一个学生用马拉雅
拉姆语朗读Appooppan
-Thaady花的名字。</p>
-</div> 
-
-<!-- /stamp -->
+<div id="flowers" class="pict">
 <div class="stamp">
 <a href="/education/misc/anthoorium.jpg">
 <img src="/education/misc/anthoorium-sm.jpg"
@@ -99,6 +115,15 @@
 <p class="c"><a
 href="/education/misc/anthoorium.ogg">请听</a>一个学生用马拉雅
拉姆语朗读火鹤花(Anthoorium)的名字。</p>
 </div> 
+
+<!-- /stamp -->
+<div class="stamp">
+<a href="/education/misc/appooppanthaady.jpg">
+<img src="/education/misc/appooppanthaady-sm.jpg"
+alt="Appooppan Thaady花的图片。" /></a>
+<p class="c"><a 
href="/education/misc/appooppanthady.ogg">请听</a>一个学生用马拉雅
拉姆语朗读Appooppan
+Thaady花的名字。</p>
+</div> 
 <!-- /stamp -->
 </div> 
 
@@ -125,14 +150,16 @@
 <p>为Tux
 Paint添加印章是一个令学生们å…
´å¥‹å’Œä½¿å­¦ç”Ÿä»¬å¾—到发展的经历。首å…
ˆï¼Œä»–们分析了程序如何工作,发现了程序实现印章
的机制。然后,他们学习了该机制如何允许添加印章
和怎么添加。他们也通过修改图片更深入地学习
了GIMP的知识。整个过程不但是发展新技术能力的机会,也是辨认和欣赏本地花卉的机会。最重要的是,他们学到了一旦有了软件自由,任何人,即使不是程序员,甚至是孩子,实é™
…上也能够影响和改善信息技术。</p>
 
+<div class="infobox">
 <hr />
-
-<h4>鸣谢</h4>
+<h3>鸣谢</h3>
 
 <p>向提供带有本地花卉(Appooppan Thaady和Anthoorium)的Tux
 Paint马拉雅拉姆语界面图片及å…
¶å£°éŸ³æ–‡ä»¶çš„Irimpanam高级职业中学致谢,图片和声音文件都使用CC-BY-SA、<a
 rel="license"
 href="http://creativecommons.org/licenses/by-sa/3.0/";> Creative Commons
 Attribution-ShareAlike 3.0 Unported</a>授权。</p> 
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -140,7 +167,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -161,7 +188,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -169,7 +196,7 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2014, 2016, 2020 Free Software Foundation, 
Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -185,7 +212,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2017/10/06 15:58:55 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-software.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-software.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edu-software.zh-cn.html     2 May 2019 13:29:41 -0000       1.3
+++ edu-software.zh-cn.html     31 May 2020 05:04:34 -0000      1.4
@@ -1,18 +1,29 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-software.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>教育性自由软件 - GNU工程 - 自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/po/edu-software.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; <a
-href="/education/edu-resources.html">教育资源</a> &rarr; 
教育性自由软件</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/edu-resources.html">教育资源</a>&nbsp;/</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -22,12 +33,14 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>教育性自由软件</h2>
 
-<p><strong>GNU 工程维护着一个建议使用的 <a
-href="/software/free-software-for-education.html">适合各种层级的高质量教育性自由软件列表</a>。</strong></p>
+<p><em>GNU 工程维护着一个建议使用的 <a
+href="/software/free-software-for-education.html">适合各种层级的高质量教育性自由软件列表</a>。</em></p>
 
-<div class="emph-box">
+<div class="important">
 <p>在探讨本节内容之前,我们要提醒读者
,&ldquo;Free&rdquo;一词在&ldquo;Free
 Software&rdquo;中<strong>不是指价æ 
¼</strong>,而是指<strong>自由</strong>。自由软件(Free
 Software)是赋予你<strong>自由</strong>的软件,即你
有自由运行、拷贝、发布、学习
、修改和改善该软件。要了解更多,请看<a
@@ -42,11 +55,13 @@
 <p>以下是我们的例子:</p>
 
 <!-- begin adding programs in alphabetical order -->
+<div class="toc-inline">
 <p>
-<a href="/education/edu-software-gcompris.html">GCompris</a> | <a
-href="/education/edu-software-gimp.html">GIMP</a> | <a
+&nbsp;<a href="/education/edu-software-gcompris.html">GCompris</a>&nbsp;
+&nbsp;<a href="/education/edu-software-gimp.html">GIMP</a>&nbsp; &nbsp;<a
 href="/education/edu-software-tuxpaint.html">Tux Paint</a> 
 </p>
+</div>
 
 <!-- end adding programs -->
 <p>这里展示的一些程序,比如
@@ -66,14 +81,13 @@
 href="mailto:education@gnu.org";>&lt;education@gnu.org&gt;</a>。
 </p></div>
 
-
 <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="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -94,7 +108,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -102,7 +116,8 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2016, 2017, 2019 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016, 2017, 2019, 2020 Free Software
+Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -118,7 +133,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/05/02 13:29:41 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-system-india.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-system-india.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-system-india.zh-cn.html 31 Dec 2019 13:04:21 -0000      1.2
+++ edu-system-india.zh-cn.html 31 May 2020 05:04:34 -0000      1.3
@@ -1,18 +1,29 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-system-india.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>印度的教育体系 - GNU工程 - 自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/po/edu-system-india.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; <a
-href="/education/education.html#indepth">深度分析</a> &rarr; 
印度的教育体系</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/education.html#indepth">深度分析</a>&nbsp;/</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -22,10 +33,14 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>印度的教育体系</h2>
 
-<p><strong>Dr. V. Sasi Kumar</strong><a href="#sasi"> (1)</a> 著</p>
+<p>Dr. V. Sasi Kumar <a href="#sasi">(1)</a> 著</p>
+<hr class="thin" />
 
+<div class="article">
 <h3>开始</h3>
 
 <p>古时候,印度的教育是Gurukula体系,任何想学习
的人都可以到老师(Guru)家里去请求获得教育。如果老师接受了学生,那么学生就要呆在老师家里并帮助处理所有家务。这æ
 ·ä¸ä»…
在老师和学生之间建立了强大的联系,而且也教授了学生如何处理家务事。老师会教授学生想学的一切,从梵文到神å
…¸ï¼Œä»Žæ•°å­¦åˆ°å“²å­¦ã€‚学生愿意呆多久就呆多久,或者
直到老师觉得已经把自己所知都教完了。所有的学习
活动都和自然与生活息息相å…
³ï¼Œè€Œä¸å±€é™äºŽå¯¹ä¿¡æ¯çš„记忆。</p>
@@ -38,9 +53,9 @@
 
 <p>针对6到14岁儿童的全面义务教育一直是印度å…
±å’Œå›½æ–°æ”¿åºœçš„夙愿。这一点清
楚地体现在宪法的第45条。但是这个目æ 
‡åœ¨è¿‡äº†åŠä¸ªå¤šä¸–纪之后还远未实现。不过,不久
之前,政府明显认真对待
了这个失职,并且确认基础教育是每个印度å…
¬æ°‘的基本权利。经济增长的压力和技术性劳动力的严重缺乏显然在促使政府采取该步骤上起了一定的作用。印度政府近年来在学æ
 ¡æ•™è‚²ä¸Šçš„支出占GDP的3%,这是一个很低的比例。</p> 
 
-<blockquote><p>&ldquo;最近,针对印度贫困地区的教育发展已经出台了多个主要å
…¬å‘Šï¼Œå…¶ä¸­æœ€ä¸ºå¼•äººå…
³æ³¨çš„是团结进步联盟(UPA)政府的国家最低å…
±åŒçº²é¢†ï¼ˆNCMP)。该å…
¬å‘Šç§°ï¼š(a)逐步将教育支出提高到GDP的6%。(b)为了支持提高教育支出和提高教育质量,会在中央税收之上再征收教育地方税。(c)确保没有人å›
 
为经济落后和贫穷而被剥夺受教育的权利。(d)使受教育成为所有6&ndash;14岁儿童的基本权利。(e)通过诸如Sarva
-Siksha Abhiyan和午餐(Mid Day Meal)等æ 
‡å¿—性活动普及教育。&rdquo; <a
-href="http://en.wikipedia.org/wiki/Education_in_india";>Wikipedia:印度的教育</a>。</p></blockquote>
+<blockquote><p><em>&ldquo;最近,针对印度贫困地区的教育发展已经出台了多个主要å
…¬å‘Šï¼Œå…¶ä¸­æœ€ä¸ºå¼•äººå…
³æ³¨çš„是团结进步联盟(UPA)政府的国家最低å…
±åŒçº²é¢†ï¼ˆNCMP)。该å…
¬å‘Šç§°ï¼š(a)逐步将教育支出提高到GDP的6%。(b)为了支持提高教育支出和提高教育质量,会在中央税收之上再征收教育地方税。(c)确保没有人å›
 
为经济落后和贫穷而被剥夺受教育的权利。(d)使受教育成为所有6&ndash;14岁儿童的基本权利。(e)通过诸如Sarva
+Siksha Abhiyan和午餐(Mid Day Meal)等æ 
‡å¿—性活动普及教育。&rdquo;</em> (<a
+href="http://en.wikipedia.org/wiki/Education_in_india";>Wikipedia:印度的教育</a>)</p></blockquote>
 
 <h3>学校体系</h3>
 
@@ -92,16 +107,28 @@
 Ghemical</a>之类的程序在师生之间也很流行。</p>
 
 <p>Kerala的这些首创精神现在影响着å…
¶ä»–的州,甚至也影响着印度政府的政策。现在Karnataka和Gujarat州正在计划在学ä¹
 å¼•å…¥è‡ªç”±è½¯ä»¶ï¼Œè€Œè±¡Maharashtra等州也正在研究å…
¶å¯è¡Œæ€§ã€‚印度政府的新教育政策谈到了构建主义、基于IT的教育、自由软件和å
…±äº«æ•™è‚²èµ„源。一旦几
个大州成功迁移到了自由软件,整个国家都有希望在短时间å†
…跟风而动。如果那æ 
·ï¼Œå°åº¦å°±ä¼šå¤§ä½“上拥有GNU/Linux和自由软件的最大用户基础。</p>
+</div>
 
-<h4>参考资料</h4>
-
-<p>http://www.columbia.edu/itc/mealac/pritchett/00generallinks/macaulay/txt_minute_education_1835.html<br
 />
-http://varnam.org/blog/2007/08/the_story_behind_macaulays_edu<br />
-http://en.wikipedia.org/wiki/Central_Board_of_Secondary_Education</p>
-
+<div class="infobox">
 <hr />
-<a id="sasi"></a><a href="http://swatantryam.blogspot.com/";>V. Sasi
-Kumar</a>是一位物理学博士,他是自由软件基金会印度董事会成员之一。他倡导自由软件和自由知识。
+<h3>参考资料</h3>
+
+<ul>
+ <li><a
+href="http://www.columbia.edu/itc/mealac/pritchett/00generallinks/macaulay/txt_minute_education_1835.html";>
+Minute by the Hon'ble T. B. Macaulay, dated the 2nd February 1835</a></li>
+ <li><a href="http://varnam.org/blog/2007/08/the_story_behind_macaulays_edu";> 
The
+Story behind Macaulay's Education Policy: Part 1</a></li>
+ <li><a 
href="http://en.wikipedia.org/wiki/Central_Board_of_Secondary_Education";>
+Wikipedia: Central Board of Secondary Education</a></li>
+</ul>
+
+<h3>脚注</h3>
+<ol>
+ <li id="sasi"><a href="http://swatantryam.blogspot.com/";>V. Sasi
+Kumar</a>是一位物理学博士,他是自由软件基金会印度董事会成员之一。他倡导自由软件和自由知识。</li>
+</ol>
+</div>
 
 <div class="translators-notes">
 
@@ -109,7 +136,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -130,7 +157,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -155,7 +182,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/12/31 13:04:21 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-team.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-team.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-team.zh-cn.html 11 Dec 2017 15:28:57 -0000      1.1
+++ edu-team.zh-cn.html 31 May 2020 05:04:34 -0000      1.2
@@ -1,17 +1,28 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-team.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>教育团队 - GNU工程 - 自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/po/edu-team.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>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ </p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -21,8 +32,11 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>教育团队</h2>
 
+<div class="article">
 
<p>教育团队成立的初始目的是为了在gnu.org网站建立一个教育主题ç«
 èŠ‚,该章
节用来专门探讨在教育领域使用自由软件的重要性。我们认为,如果要对整个社会产生有效的正面影响,<a
 href="/gnu/the-gnu-project.html">GNU工程</a>的成就必
须应用于所有的教育领域。</p>
 
@@ -50,6 +64,7 @@
 
 <p>如果你对此感兴趣并想提供帮助、如果你
有任何建议和问题、或者如果你
知道有教育机构遵循了GNU哲学并成功实现了自由软件,请通过<a
 
href="mailto:education@gnu.org";>&lt;education@gnu.org&gt;</a>联系我们。</p>
+</div>
 
 <div class="translators-notes">
 
@@ -57,7 +72,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -78,7 +93,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -86,7 +101,7 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2016, 2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -102,7 +117,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2017/12/11 15:28:57 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: edu-why.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/edu-why.zh-cn.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- edu-why.zh-cn.html  1 Jan 2020 08:31:32 -0000       1.6
+++ edu-why.zh-cn.html  31 May 2020 05:04:34 -0000      1.7
@@ -1,18 +1,29 @@
 <!--#set var="ENGLISH_PAGE" value="/education/edu-why.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>为什么教育机构应该使用和教授自由软件 - GNU工程 - 
自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/po/edu-why.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; <a
-href="/education/education.html#indepth">较深层次</a> &rarr; 
为什么教育机构应该使用和教授自由软件</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/education.html#indepth">较深层次</a>&nbsp;/</p>
+</div>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
@@ -22,11 +33,13 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>为什么教育机构应该使用和教授自由软件</h2>
 
-<div class="center">
-<p><strong>"学校应该教育å…
¶å­¦ç”Ÿæˆä¸ºå¼ºå¤§ã€æœ‰èƒ½åŠ›ã€ç‹¬ç«‹å’Œè‡ªç”±ç¤¾ä¼šçš„å…
¬æ°‘。"</strong></p>
-</div>
+<div class="article">
+<p class="right-align">
+<em>&ldquo;学校应该教育å…
¶å­¦ç”Ÿæˆä¸ºå¼ºå¤§ã€æœ‰èƒ½åŠ›ã€ç‹¬ç«‹å’Œè‡ªç”±ç¤¾ä¼šçš„å…
¬æ°‘。&rdquo;</em></p>
 
 <p>这是为什么大学和所有级别的学æ 
¡åº”该只使用自由软件的主要原因。</p>
 
@@ -69,6 +82,7 @@
 <h3>质量</h3>
 
 <p>为教育服务的、稳定、安全和易安装
的自由软件已经准备好了。无
论如何,卓越的性能只是次要的好处;我们的终极目æ 
‡æ˜¯è®¡ç®—机用户的自由。</p>
+</div>
 
 <div class="translators-notes">
 
@@ -76,7 +90,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -97,7 +111,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -105,8 +119,7 @@
 href="/server/standards/README.translations.html">翻译须知</a>获取有å…
³åè°ƒå’Œæäº¤ç¿»è¯‘的相关事项。</p>
 </div>
 
-<p>Copyright &copy; 2011, 2015, 2016, 2017, 2018, 2019, 2020 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2015, 2016, 2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -122,7 +135,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2020/01/01 08:31:32 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>

Index: misc/edu-misc.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/education/misc/edu-misc.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- misc/edu-misc.zh-cn.html    15 Dec 2018 14:46:05 -0000      1.3
+++ misc/edu-misc.zh-cn.html    31 May 2020 05:04:34 -0000      1.4
@@ -1,21 +1,30 @@
 <!--#set var="ENGLISH_PAGE" value="/education/misc/edu-misc.en.html" -->
 
-<!--#include virtual="/server/html5-header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!--#include virtual="/server/header.zh-cn.html" -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>其他教育资料 - GNU工程 - 自由软件基金会</title>
+<link rel="stylesheet" type="text/css" href="/side-menu.css" media="screen" />
 
 <!--#include virtual="/education/misc/po/edu-misc.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#include virtual="/education/education-menu.zh-cn.html" -->
-<!-- begin edu-breadcrumbs -->
-<p class="edu-breadcrumb">
-   <a href="/education/education.html">教育</a> &rarr; <a
-href="/education/misc/">其他</a> &rarr; 其他教育资料</p>
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+      src="/graphics/icons/side-menu.png"
+      title="教育内容"
+      alt="&nbsp;[教育内容]&nbsp;" />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+    alt="GNU主页" title="GNU主页" /></a>&nbsp;/ <a 
href="/education/education.html">教育</a>&nbsp;/ <a
+href="/education/misc/">其他</a>&nbsp;/ </p>
+</div>
 
-<!-- end of edu-breadcrumbs -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
 <!--#else -->
@@ -24,6 +33,8 @@
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <!--#endif -->
 <!--#endif -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
 <h2>其他教育资料</h2>
 
 
<p>在这些页面中,我们存放着各种用于我们的教育页面的资料,比如图片、转抄和各类视频的多语言字幕等等。</p>
 
@@ -258,7 +269,7 @@
  </div>
 </div>
 
-<!-- for id="content", starts in the include above -->
+<!--#include virtual="/education/education-menu.zh-cn.html" -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
 <div class="unprintable">
@@ -279,7 +290,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -302,7 +313,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, 2017, 2018 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016-2018, 2020 Free Software Foundation, 
Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -318,7 +329,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2018/12/15 14:46:05 $
+$Date: 2020/05/31 05:04:34 $
 
 <!-- timestamp end -->
 </p>



reply via email to

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