[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/education edu-contents.zh-cn.html edu-proje...
From: |
GNUN |
Subject: |
www/education edu-contents.zh-cn.html edu-proje... |
Date: |
Fri, 3 May 2019 02:59:53 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 19/05/03 02:59:53
Modified files:
education : edu-contents.zh-cn.html edu-projects.zh-cn.html
edu-resources.zh-cn.html
education/po : edu-contents.zh-cn-en.html
edu-contents.zh-cn.po
edu-projects.zh-cn-en.html
edu-projects.zh-cn.po
edu-resources.zh-cn-en.html
edu-resources.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-contents.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-projects.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-resources.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-contents.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-contents.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-projects.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-projects.zh-cn.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-resources.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-resources.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
Patches:
Index: edu-contents.zh-cn.html
===================================================================
RCS file: /web/www/www/education/edu-contents.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-contents.zh-cn.html 2 Sep 2018 14:28:28 -0000 1.1
+++ edu-contents.zh-cn.html 3 May 2019 06:59:52 -0000 1.2
@@ -1,7 +1,7 @@
<!--#set var="ENGLISH_PAGE" value="/education/edu-contents.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.87 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
@@ -31,7 +31,6 @@
<p><a href="/education/edu-cases.html">æ¡ä¾åæ</a></p>
<ul>
-
<li><a href="/education/edu-cases-argentina.html">é¿æ ¹å»·</a>
<ul>
<li><a href= "/education/edu-cases-argentina-ecen.html">Escuela Cristiana
@@ -48,26 +47,32 @@
</ul>
<!-- end list of cases in India -->
</li>
-
<!-- end of India -->
</ul>
<!-- end of Case Studies -->
-<p><a href="/education/edu-resources.html">èªç±å¦ä¹ èµæº</a></p>
-
-<p><a href="/education/edu-software.html">æè²ç¸å
³çèªç±è½¯ä»¶</a></p>
+<p><a href="/education/edu-resources.html">æè²èµæº</a></p>
<ul>
+ <li><a href="/education/edu-software.html">æè²ç¸å
³çèªç±è½¯ä»¶</a>
+ <ul>
<li><a href="/education/edu-software-gcompris.html">GCompris</a></li>
<li><a href="/education/edu-software-gimp.html">GIMP</a></li>
<li><a href="/education/edu-software-tuxpaint.html">Tux Paint</a></li>
-</ul>
+ </ul>
+ <!-- end list of educational free software -->
+</li>
-<p><a href="/education/edu-projects.html">å
¶ä»æè²å¢ä½ç项ç®</a></p>
+ <!-- end educational free software -->
+<li><a href="/education/edu-projects.html">å¢ä½å项ç®</a></li>
+ <li><a href="/education/edu-free-learning-resources.html">èªç±å¦ä¹
èµæº</a></li>
+</ul>
-<p><a href="/education/edu-team.html">æè²å¢é</a> </p>
+<!-- end list of educational resources -->
+<p><a href="/education/edu-faq.html">常è§é®é¢è§£ç</a></p>
+<p><a href="/education/edu-team.html">æè²å¢é</a></p>
-<p><strong>æç« </strong></p>
+<p><strong>深度åæ</strong></p>
<ul>
<li><a
href="/education/edu-why.html">为ä»ä¹æè²æºæåºè¯¥åªä½¿ç¨åææèªç±è½¯ä»¶</a></li>
@@ -114,7 +119,7 @@
è¥æ¨æ³ç¿»è¯æ¬æï¼è¯·åç<a
href="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>ã</p>
</div>
-<p>Copyright © 2011, 2012, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2016, 2019 Free Software Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative Commons
@@ -125,12 +130,12 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/"><CTT></a>ï¼2018ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/"><CTT></a>ï¼2018-2019ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2018/09/02 14:28:28 $
+$Date: 2019/05/03 06:59:52 $
<!-- timestamp end -->
</p>
Index: edu-projects.zh-cn.html
===================================================================
RCS file: /web/www/www/education/edu-projects.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edu-projects.zh-cn.html 15 Dec 2018 14:46:04 -0000 1.3
+++ edu-projects.zh-cn.html 3 May 2019 06:59:52 -0000 1.4
@@ -1,16 +1,18 @@
<!--#set var="ENGLISH_PAGE" value="/education/edu-projects.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.87 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
-<title>å
¶ä»æè²å¢ä½åé¡¹ç® - GNUå·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
+<title>å¢ä½åé¡¹ç® - GNUå·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
<!--#include virtual="/education/po/edu-projects.translist" -->
<!--#include virtual="/server/banner.zh-cn.html" -->
<!--#include virtual="/education/education-menu.zh-cn.html" -->
-<p class="edu-breadcrumb"><a href="/education/education.html">æè²</a>
→ æè²é¡¹ç®</p>
+<p class="edu-breadcrumb">
+<a href="/education/education.html">æè²</a> → <a
+href="/education/edu-resources.html">æè²èµæº</a> →
å¢ä½å项ç®</p>
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" -->
@@ -20,17 +22,17 @@
<!--#include virtual="/server/top-addendum.zh-cn.html" -->
<!--#endif -->
<!--#endif -->
-<h2>å
¶ä»æè²å¢ä½å项ç®</h2>
+<h2>å¢ä½å项ç®</h2>
<p>ä¸çä¸æ好å
个å¢ä½åç»ç»è·µè¡çGNUçå²å¦ï¼å®ä»¬ä»äºçæå¨æèªç±è½¯ä»¶å¸¦å°æè²é¢åç项ç®ãä¸é¢å举äºä¸äºãå¦æä½
ç项ç®åªæ¯æèªç±è½¯ä»¶ï¼èä¸æ²¡æåå¨ä¸é¢ï¼è¯·èç³»æ们<a
href="mailto:address@hidden"> <address@hidden></a>ã</p>
-<!-- Add new entries in alphabetical order except for projects directly
related to GNU who should be listed first -->
+<!-- Add new entries in alphabetical order except for projects directly
related to GNU, which should be listed first -->
<dl>
<dt><a
href="http://fsfeurope.org/projects/education/education.en.html">FSFEæè²é¡¹ç®</a></dt>
- <dd>FSFEçæè²å¢éè´åäºæé«æè²ç¸å
³å¢ä½å¯¹èªç±è½¯ä»¶ç认ç¥ï¼å¹¶æèªç±è½¯ä»¶ç好å¤å¸¦ç»ä»ä»¬ãå®è¿ä»¥å»ºç«ç¦æ¢æ§è§èªç±è½¯ä»¶åå
¶ç¨æ·çæ³å¾æ¡æ¶ä¸ºç®æ ã</dd>
+ <dd>“FSFEçæè²å¢éè´åäºæé«æè²ç¸å
³å¢ä½å¯¹èªç±è½¯ä»¶ç认ç¥ï¼å¹¶æèªç±è½¯ä»¶ç好å¤å¸¦ç»ä»ä»¬ãå®è¿ä»¥å»ºç«ç¦æ¢æ§è§èªç±è½¯ä»¶åå
¶ç¨æ·çæ³å¾æ¡æ¶ä¸ºç®æ ã”</dd>
<dt><a href="http://guri.hipatia.net/">GURI</a></dt>
@@ -48,7 +50,7 @@
<p>å
¶ååæºèªå¸è
å²å¦å®¶<a
href="http://en.wikipedia.org/wiki/Hypatia">Hypatiaï¼å¸å¸æå¨
ï¼ã</a></p>
</dd>
- <dt><a href="https://www.itschool.gov.in">address@hidden</a></dt>
+ <dt><a href="https://itschool.gov.in/activities.php">address@hidden</a></dt>
<dd>address@hidden/Linuxæä½ç³»ç»ï¼è¯¥ç³»ç»ç®åå·²ç»è¢«è¶
è¿2,600æçå
å¦æ ¡æ使ç¨ãæ°ååæå¸ãå¦æ
¡åè°ååå¦çæ¥åäºä½¿ç¨èªç±è½¯ä»¶çå¹è®ã</dd>
@@ -58,8 +60,8 @@
<dd>OFSETæ¨å¨èªç±è½¯ä»¶å¨æè²ç³»ç»å课å
ä¸çå¼ååå¢å¼ºãå®è¯çäºæ³å½ï¼ä¸è¿å
¶æåæ¥èªå
¨ä¸çï¼ä»ä»¬ä»¥äºèç½ä¸ºæ²éæ段ï¼ä¸ºå
±åçç®æ
èåä½å¥æãæå¸ãå¼å人åãç¿»è¯äººååä½è
ä¹é´å¼è¯å¸å
¬çåä½ä¸ç´æ¯OFSETæ´»å¨æåçå
³é®ã
<p>OFSETå¢ä½çä¸ä¸ªéè¦æå°±æ¯<a
-href="http://www.drgeo.eu">Dr. Geo</a>ï¼è¿æ¯ä¸ä¸ªè¢«å¹¿æ³ä½¿ç¨çå
ä½æå¦è½¯ä»¶ãOFSETè¿å¼åäº<a
-href="http://usb.freeduc.org">Freeduc-USB</a>ï¼è¿æ¯ä¸ä¸ªå«æå¤ä¸ªå®ç¨è¯¾å
ç¨åºçå¯å¯å¨Uçã</p>
+href="/software/dr-geo/">Dr. Geo</a>ï¼è¿æ¯ä¸ä¸ªè¢«å¹¿æ³ä½¿ç¨çå
ä½æå¦è½¯ä»¶ãOFSETè¿å¼åäº<a
+href="http://usb.freeduc.org/index-en.html">Freeduc-USB</a>ï¼è¿æ¯ä¸ä¸ªå«æå¤ä¸ªå®ç¨è¯¾å
ç¨åºçå¯å¯å¨Uçã</p>
</dd>
<dt><a href="http://www.sugarlabs.org/">Sugar Labs</a></dt>
@@ -102,7 +104,7 @@
è¥æ¨æ³ç¿»è¯æ¬æï¼è¯·åç<a
href="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>ã</p>
</div>
-<p>Copyright © 2011, 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2016, 2018, 2019 Free Software Foundation, Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative Commons
@@ -114,12 +116,12 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>å®¡æ ¡</b>ï¼<a
href="mailto:address@hidden"><å°åçï¼psiaceï¼></a>ï¼2018ã
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/"><CTT></a>ï¼2018ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/"><CTT></a>ï¼2018-2019ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2018/12/15 14:46:04 $
+$Date: 2019/05/03 06:59:52 $
<!-- timestamp end -->
</p>
Index: edu-resources.zh-cn.html
===================================================================
RCS file: /web/www/www/education/edu-resources.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edu-resources.zh-cn.html 16 Feb 2019 12:59:25 -0000 1.4
+++ edu-resources.zh-cn.html 3 May 2019 06:59:52 -0000 1.5
@@ -1,11 +1,11 @@
<!--#set var="ENGLISH_PAGE" value="/education/edu-resources.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.87 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
-<title>èªç±æè²èµæº - GNUå·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
+<title>æè²èµæº - GNUå·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
<!--#include virtual="/education/po/edu-resources.translist" -->
<!--#include virtual="/server/banner.zh-cn.html" -->
@@ -21,58 +21,18 @@
<!--#include virtual="/server/top-addendum.zh-cn.html" -->
<!--#endif -->
<!--#endif -->
-<h2>èªç±æè²èªç±</h2>
+<h2>æè²èµæº</h2>
-<h3>æè²æ§çèªç±è½¯ä»¶</h3>
+<p>æ¬å°èå¯ä»¥å¸®å©ä½ æ¾å°åç§åæ ·çæè²ç¸å
³çèµæºï¼æ¯å¦ï¼èªç±å¦ä¹
çèµæãéç¨äºå个é¶æ®µæè²çèªç±è½¯ä»¶ãæä¾æå
³èªç±è½¯ä»¶çå²å¦åææ¯è¯¾ç¨çæè²æºæãå¼åæè²èªç±è½¯ä»¶ç项ç®åå¹³å°ãè·µè¡
+GNU
å·¥ç¨ä¹åå并å¨æè²é¢åå¼æ¬èªç±è½¯ä»¶çå¢ä½ä»¥åæ´å¤ã</p>
-<p>å¨<a
-href="/education/edu-software.html">æè²æ§çèªç±è½¯ä»¶</a>é¨åï¼æ们ä¼å±ç¤ºä¸äºå®ä¾ï¼ççæ¥èªå
¨ä¸ççæè²æºæå¦ä½ä½¿ç¨èªç±è½¯ä»¶ä»¥åå¦ä½å¨å®è·µä¸è·µè¡èªç±è½¯ä»¶å¸¦ç»ç¨æ·çå项èªç±ã</p>
+<h3>ç®å½</h3>
-<div class="edu-note"><p>
-æ们å¨å¯»æ¾èªç±çæè²æ§æ¸¸ææè
æ¯å¯ç¨äºæè²ç®ççèªç±æ¸¸æçä¿¡æ¯ã请èç³»<a
-href="mailto:address@hidden"><address@hidden></a>ã
-</p></div>
-
-<h3>å
¶ä»å¦ä¹ èµæº</h3>
-
-<p>èªç±å¦ä¹ èµæºï¼æ£å¦èªç±è½¯ä»¶ï¼å
³ä¹èªç±ï¼èæ å
³ä»·æ
¼ãå®æ¯æèªç±è½¯ä»¶çååæ¨å¹¿å°ä¸è¬çç¥è¯åæè²ææãç¥è¯åºè¯¥ä¸ºå¤§ä¼å¯å¾å¹¶æç¨ï¼ä¸åºè¯¥æéå¶ï¼ä¹ä¸åºè¯¥è¢«å½ä½èµäº§ãç¥è¯ä¸æ¯æ¶è´¹åï¼å®ä¸ä¼è¡°åï¼ç¥è¯ä¹ä¸åä¸åéé£æ
·ä¼è¢«ç©¿åãç¥è¯æ¯å¤©ç¶ä¸°å¯çèµæºï¼å®è¶ç¨è¶å¤ï¼ä½
è¶è¿ç¨ç¥è¯ãè¶ä¼
æç¥è¯ï¼å®å¯¹å¤§ä¼ççå¤å°±è¶å¤ãæäºæ¿çæ¯ä¸ºé¼å±æ¥æç¥è¯è设计çï¼æäºæªæ½æ¯ä¸ºé»æ¢äººä»¬è·å¾ãåºç¨æå享ç¥è¯èé身å®åçï¼å®ä»¬é½æ¯é»æ¢äººç±»è¿æ¥çé´è°ã</p>
-
-<p>ç¥è¯èªç±çååä¸ç´æ¯GNUå·¥ç¨çç²¾é«ãå¨1999å¹´ï¼GNUå·¥ç¨æ£å¼å¼å
¥<a
-href="/encyclopedia/free-encyclopedia.html">èªç±ç¾ç§å
¨ä¹¦åå¦ä¹
èµæº</a>çæ¦å¿µï¼å¹¶ç±Wikipediaå®ç°ã</p>
-
-<p>æ们è¦å¨æ¤é¡µé¢ååºéµå¾ªGNUååçå¦ä¹ èµæºå项ç®ãå
¶ä¸æäºæè²æºæï¼å®ä»¬æä¾å
³äºèªç±è½¯ä»¶çå²å¦åææ¯æ¹é¢ç课ç¨ã</p>
-
-<dl>
-
-<dt><a href="http://www.wikipedia.org">Wikipedia</a></dt>
-
-<dd>ç±æ°ä»¥å计æ¥èªä¸çåå°çå¿æ¿è
åä½æ°åçWikipediaå°±æ¯å½ä¸ä¸ä¸ªæ好çä¾è¯ï¼å®ä½¿ç¥è¯äººäººå¯å¾ã人人å¯ç¨ã没æéå¶ãWikipedia读è
å¯ä»¥å¤å¶ã使ç¨åæ¹ç¼æç«
ï¼åææ¯è¯´ææ¥æºå¹¶ä¸æ¹ç¼åçä½å使ç¨ååæä¸æ
·çåå¸æ¡æ¬¾ï¼åç<a
-href="/licenses/copyleft.html">Copyleft</a>ï¼ã</dd>
-
-<dt><a href="http://www.gutenberg.org/wiki/Main_Page">Gutenberg项ç®</a></dt>
-
-<dd>该项ç®æç
§èªç±çååæä¾éç¨ç¥è¯ä¹¦ç±ãå®åå¸å
¬æé¢åä½åç纯ææ¬æ°åçãå¦æä½ è¦æ¾ä¸æ¬ç»å
¸èä½ï¼è¯·ä»è¿éå¼å§ã
-
-<p>ä»ä»¬é常æ¸
æ¥å°è§£éäºåºçç©ä¸<a
-href="http://www.gutenberg.org/wiki/Gutenberg:No_Cost_or_Freedom%3f">å
è´¹åèªç±çä¸å</a>ã</p>
-</dd>
-
-<dt>GNUå·¥ç¨</dt>
-
-<dd>æ们维æ¤çä¸ä¸ª<a
href="/doc/other-free-books.html">èªç±ä¹¦ç±</a>ç书åï¼å®ä¸»è¦åèªç±è½¯ä»¶ææ¡£æå
³ï¼æ们è¿è®©<a
-href="/manual/manual.html">GNUæå</a>å¨çº¿å¯å¾ãææç±<a
-href="http://shop.fsf.org/category/books/">èªç±è½¯ä»¶åºéä¼</a>åºçç书ç±é½æ¯èªç±çã</dd>
-
-<dt><a href="http://ftacademy.org/">èªç±ææ¯å¦é¢</a></dt>
-
-<dd>èªç±ææ¯å¦é¢ï¼FTAï¼æ¯ç±å¤ä¸ªå½å®¶çæè²æºæåèµ·çèåå¡è®®ãå
¶ç®æ æ¯ä¸ºä¸ä¸ªå
许å
¨é¨ç¨æ·ä¸åéå¶å°å¦ä¹
ãåä¸ååå±ç°æç¥è¯ç社ä¼æ·»ç å
ç¦ãFTAæä¾ç¡å£«æ°´å¹³çå¨çº¿èªç±ææ¯è¯¾ç¨ãè¿äºè¯¾ç¨åºäºæ
¡å项ç®å
¼å®¹æ¡æ¶ï¼Campus
-Project interoperability frameworkï¼å®å
¨ç±å¨çº¿èææ ¡å讲æã
-
-<p>FTAæ¯èªç±ç¥è¯ç 究æï¼Free Knowledge Instituteï¼ã西ççå
æ³°ç½å°¼äºå¼æ¾å¤§å¦ï¼Open University of
-Catalonia (Spain)ï¼åè·å
°å¼æ¾å¤§å¦ï¼Open University of the
-Netherlandsï¼ä¹é´çå
±ååä½ææãæ´å¤çç»ç»ä½ä¸ºèåä¼ä¼´æä¾èµéï¼è¿äºç»ç»çå
±åå©çå°±æ¯æä¾èªç±ææ¯è¯¾ç¨ãFTAæ£å¨ä¸ææå±ç°æçç½ç»åä½ä¼ä¼´ï¼å¹¶é¼å±ä¸ªäººåç»ç»ä¸ºè¿æ
·ç社ä¼ååºè´¡ç®ã</p></dd>
-
-</dl>
+<ul>
+ <li><a href="/education/edu-software.html">æè²æ§èªç±è½¯ä»¶</a></li>
+ <li><a href="/education/edu-projects.html">å¢ä½å项ç®</a></li>
+ <li><a href="/education/edu-free-learning-resources.html">èªç±å¦ä¹
èµæº</a></li>
+</ul>
<div class="translators-notes">
@@ -124,7 +84,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2011, 2012, 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2016, 2018, 2019 Free Software Foundation,
Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative Commons
@@ -140,7 +100,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2019/02/16 12:59:25 $
+$Date: 2019/05/03 06:59:52 $
<!-- timestamp end -->
</p>
Index: po/edu-contents.zh-cn-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-contents.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-contents.zh-cn-en.html 2 Sep 2018 14:28:28 -0000 1.1
+++ po/edu-contents.zh-cn-en.html 3 May 2019 06:59:52 -0000 1.2
@@ -1,14 +1,12 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.87 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-
<title>Free Software and Education - Table of Contents
- GNU Project - Free Software Foundation</title>
-
<!--#include virtual="/education/po/edu-contents.translist" -->
<!--#include virtual="/server/banner.html" -->
-
<!--#include virtual="/education/education-menu.html" -->
+
<p class="edu-breadcrumb"><a href="/education/education.html">Education</a>
→
Education Contents</p>
<!--GNUN: OUT-OF-DATE NOTICE-->
@@ -18,14 +16,15 @@
<!--#include virtual="/server/top-addendum.html" -->
<!--#endif -->
<!--#endif -->
+
<h2>Free Software and Education - Table of Contents</h2>
<p>The Education section of the GNU Project is about the importance of
-using and teaching exclusively Free Software in all educational
+using and teaching exclusively free software in all educational
institutions. It presents articles on the subject, cases of success in
-implementing Free Software in schools and universities around the world,
-examples of Free programs used in the classroom to the benefit of
-teachers and students alike, and Free Software education projects
+implementing free software in schools and universities around the world,
+examples of free programs used in the classroom to the benefit of
+teachers and students alike, and free software education projects
carried out by organizations and governments worldwide.</p>
<h3>Table of Contents</h3>
@@ -35,7 +34,6 @@
<p><a href="/education/edu-cases.html">Case Studies</a></p>
<ul>
-
<li><a href="/education/edu-cases-argentina.html">Argentina</a>
<ul>
<li><a href= "/education/edu-cases-argentina-ecen.html">Escuela
@@ -51,25 +49,27 @@
Irimpanam</a></li>
</ul><!-- end list of cases in India -->
</li><!-- end of India -->
-
</ul><!-- end of Case Studies -->
-<p><a href="/education/edu-resources.html">Free Learning Resources</a></p>
-
-<p><a href="/education/edu-software.html">Educational Free Software</a></p>
+<p><a href="/education/edu-resources.html">Educational Resources</a></p>
<ul>
+ <li><a href="/education/edu-software.html">Educational Free Software</a>
+ <ul>
<li><a href="/education/edu-software-gcompris.html">GCompris</a></li>
<li><a href="/education/edu-software-gimp.html">GIMP</a></li>
<li><a href="/education/edu-software-tuxpaint.html">Tux Paint</a></li>
-</ul>
+ </ul><!-- end list of educational free software -->
+ </li><!-- end educational free software -->
-<p><a href="/education/edu-projects.html">Other Education Groups
- Projects</a></p>
+ <li><a href="/education/edu-projects.html">Groups and Projects</a></li>
+ <li><a href="/education/edu-free-learning-resources.html">Free Learning
Resources</a></li>
+</ul><!-- end list of educational resources -->
-<p><a href="/education/edu-team.html">The Education Team</a> </p>
+<p><a href="/education/edu-faq.html">Frequently Asked Questions</a></p>
+<p><a href="/education/edu-team.html">The Education Team</a></p>
-<p><strong>Articles</strong></p>
+<p><strong>In Depth</strong></p>
<ul>
<li><a href="/education/edu-why.html">Why Educational
@@ -116,7 +116,7 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2016, 2019 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -126,7 +126,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/09/02 14:28:28 $
+$Date: 2019/05/03 06:59:52 $
<!-- timestamp end -->
</p>
</div>
Index: po/edu-contents.zh-cn.po
===================================================================
RCS file: /web/www/www/education/po/edu-contents.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/edu-contents.zh-cn.po 3 May 2019 06:27:06 -0000 1.7
+++ po/edu-contents.zh-cn.po 3 May 2019 06:59:52 -0000 1.8
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-04-30 22:56+0000\n"
#. type: Content of: <title>
msgid ""
Index: po/edu-projects.zh-cn-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-projects.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/edu-projects.zh-cn-en.html 15 Dec 2018 14:46:06 -0000 1.3
+++ po/edu-projects.zh-cn-en.html 3 May 2019 06:59:52 -0000 1.4
@@ -1,15 +1,16 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.87 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-<title>Other Education Groups and Projects
-- GNU Project - Free Software Foundation</title>
-
+<title>Groups and Projects - GNU Project - Free Software Foundation</title>
<!--#include virtual="/education/po/edu-projects.translist" -->
<!--#include virtual="/server/banner.html" -->
<!--#include virtual="/education/education-menu.html" -->
-<p class="edu-breadcrumb"><a href="/education/education.html">Education</a>
→
-Education Projects</p>
+
+<p class="edu-breadcrumb">
+<a href="/education/education.html">Education</a> →
+<a href="/education/edu-resources.html">Educational Resources</a> →
+Groups and Projects</p>
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -17,31 +18,32 @@
<!--#include virtual="/server/top-addendum.html" -->
<!--#endif -->
<!--#endif -->
-<h2>Other Education Groups and Projects</h2>
+
+<h2>Groups and Projects</h2>
<p>There are several groups and organizations around the world who
-follow the GNU Philosophy and are working on projects aimed at bringing
-Free Software to the education field. A few of them are listed below. If
-your project supports only Free Software and it is not listed here,
+follow the GNU philosophy and are working on projects aimed at bringing
+free software to the education field. A few of them are listed below. If
+your project supports only free software and it is not listed here,
please contact us at <a href="mailto:address@hidden">
<address@hidden></a> to let us know.</p>
-<!-- Add new entries in alphabetical order except for projects directly
related to GNU who should be listed first -->
+<!-- Add new entries in alphabetical order except for projects directly
related to GNU, which should be listed first -->
<dl>
<dt><a href="http://fsfeurope.org/projects/education/education.en.html">
FSFE Education Project</a></dt>
- <dd>"FSFE's Education Team exists to raise awareness and bring the
- benefits of Free Software to all groups involved in education. It aims
- for a legal framework that prohibits discrimination against Free
- Software and its users."</dd>
+ <dd>“The FSFE's Education Team exists to raise awareness and bring the
+ benefits of free software to all groups involved in education. It aims
+ for a legal framework that prohibits discrimination against free
+ software and its users.”</dd>
<dt><a href="http://guri.hipatia.net/">GURI</a></dt>
<dd>Guri is a group which was born inside an Italian High School as
the result of a program carried out by NGO Hipatia to raise awareness
- about the role of Free Software in the education field. Guri opposes
+ about the role of free software in the education field. Guri opposes
the growing practice of treating knowledge as if it were a tangible
object subject to ownership. It fights to change the mainstream
cultural framework in Italy which prevents the exercise of some of
@@ -50,7 +52,7 @@
adoption of proprietary, subjugating software.
<p>The goals of the Guri project are to convert the educational
- system so that it is based exclusively on Free Software and to extend
+ system so that it is based exclusively on free software and to extend
the freedoms it grants to every field of knowledge. Guri believes in
the power of education to shape a better society by teaching students
the values of sharing and cooperation. It advocates and works towards
@@ -60,7 +62,7 @@
<p>To achieve its goals, the group takes action mainly in High School
and University environments, organizing workshops and courses to
- promote awareness about the ethical principles of Free Software.</p>
+ promote awareness about the ethical principles of free software.</p>
</dd>
<dt><a href="http://hipatia.net/">Hipatia</a></dt>
@@ -68,9 +70,9 @@
<dd>Hipatia is an international NGO (non-governmental organization)
that upholds the right of all human beings to access, use, create,
modify and distribute knowledge. It is formed by people from all
- around the world who advocate the ideals of the Free Software
+ around the world who advocate the ideals of the free software
movement and work towards putting those principles into practice.
- Hipatia emphasizes the importance of using Free Software in education;
+ Hipatia emphasizes the importance of using free software in education;
to that end, its members often conduct workshops in educational
institutions, specially in primary and secondary level schools.
@@ -78,7 +80,7 @@
<a href="http://en.wikipedia.org/wiki/Hypatia">Hypatia.</a></p>
</dd>
- <dt><a href="https://www.itschool.gov.in">address@hidden</a></dt>
+ <dt><a href="https://itschool.gov.in/activities.php">address@hidden</a></dt>
<dd>address@hidden is a project of the government of Kerala, India,
started in 2001 to introduce Information Communication Technologies
@@ -99,9 +101,9 @@
to the success of OFSET's activities.
<p>One important achievement of the OFSET group is
- <a href="http://www.drgeo.eu">Dr. Geo</a>, a
+ <a href="/software/dr-geo/">Dr. Geo</a>, a
program widely used for teaching geometry. OFSET has also developed
- <a href="http://usb.freeduc.org">
+ <a href="https://usb.freeduc.org/index-en.html">
Freeduc-USB</a>, a bootable USB stick that contains useful
applications for the classroom.</p>
</dd>
@@ -146,7 +148,7 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2016, 2018, 2019 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -156,7 +158,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/12/15 14:46:06 $
+$Date: 2019/05/03 06:59:52 $
<!-- timestamp end -->
</p>
</div>
Index: po/edu-projects.zh-cn.po
===================================================================
RCS file: /web/www/www/education/po/edu-projects.zh-cn.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/edu-projects.zh-cn.po 3 May 2019 06:27:29 -0000 1.9
+++ po/edu-projects.zh-cn.po 3 May 2019 06:59:52 -0000 1.10
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-04-30 22:56+0000\n"
#. type: Content of: <title>
msgid "Groups and Projects - GNU Project - Free Software Foundation"
@@ -134,8 +133,8 @@
"The name of the group refers to the Greek philosopher <a href=\"http://en."
"wikipedia.org/wiki/Hypatia\">Hypatia.</a>"
msgstr ""
-"å
¶ååæºèªå¸è
å²å¦å®¶<a href=\"http://en.wikipedia.org/wiki/Hypatia"
-"\">Hypatiaï¼å¸å¸æå¨
ï¼ã</a>"
+"å
¶ååæºèªå¸è
å²å¦å®¶<a
href=\"http://en.wikipedia.org/wiki/Hypatia\">Hypatia"
+"ï¼å¸å¸æå¨
ï¼ã</a>"
#. type: Content of: <dl><dt>
msgid "<a href=\"https://itschool.gov.in/activities.php\">address@hidden</a>"
Index: po/edu-resources.zh-cn-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-resources.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/edu-resources.zh-cn-en.html 15 Dec 2018 14:46:06 -0000 1.3
+++ po/edu-resources.zh-cn-en.html 3 May 2019 06:59:53 -0000 1.4
@@ -1,13 +1,15 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.87 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-<title>Free Educational Resources
+<title>Educational Resources
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/education/po/edu-resources.translist" -->
<!--#include virtual="/server/banner.html" -->
<!--#include virtual="/education/education-menu.html" -->
+
<p class="edu-breadcrumb">
-<a href="/education/education.html">Education</a> → Educational
Resources</p>
+<a href="/education/education.html">Education</a> →
+Educational Resources</p>
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -15,99 +17,25 @@
<!--#include virtual="/server/top-addendum.html" -->
<!--#endif -->
<!--#endif -->
-<h2>Free Learning Resources</h2>
-
-<h3>Educational Free Software</h3>
-<p>In our <a href="/education/edu-software.html">Educational
-Free Software</a> section we present some examples of how free programs
-are being used by educational institutions around the world and how they
-are putting into practice the four freedoms that Free Software grants to
-all users.</p>
-
-<div class="edu-note"><p>
-We are looking for free educational games, or information about free games
-that can be used for educational purposes. Contact
-<a href="mailto:address@hidden"><address@hidden></a>.
-</p></div>
-
-<h3>Other Learning Resources</h3>
-
-<p>Free learning resources, like Free Software, is a matter of freedom,
-not price. It's about bringing the principles of Free Software to
-general knowledge and educational materials. Knowledge should be usable
-and accessible to all without restrictions and should not be treated as
-property. It is not an article of consumer goods that decays over time or
-wears out with use like a pair of shoes. Knowledge is a naturally abundant
-resource that improves with usage: the more it is used and passed around,
-the more it grows for the benefit of all. The introduction of measures
-designed to favor the ownership of knowledge, tailored to prevent people
-from accessing, using or sharing knowledge, is a conspiracy to inhibit
-human progress.</p>
-
-<p>These principles on the freedom of knowledge have always been in the
-spirit of the GNU Project. In 1999 it formally introduced the concept of a
-<a href="/encyclopedia/free-encyclopedia.html">Free Universal Encyclopedia
-and Learning Resource</a>, which was fulfilled by the Wikipedia project.</p>
-
-<p>In these pages we want to list learning resources and projects that
-follow the principles of the GNU Project. Some of them are educational
-institutions who offer courses on the philosophical and technical
-aspects of Free Software.</p>
-
-<dl>
-
-<dt><a href="http://www.wikipedia.org">Wikipedia</a></dt>
-
-<dd>Written in collaboration by thousands of volunteers from all over
-the world, Wikipedia is nowadays the best example of knowledge made
-available to and usable by anyone without restrictions. Wikipedia readers
-are allowed to copy, use, and adapt the articles, provided that the source
-is mentioned and that eventual derivative works are released under the same
-terms (see <a href="/licenses/copyleft.html">Copyleft</a>).</dd>
-
-<dt><a href="http://www.gutenberg.org/wiki/Main_Page">Project
-Gutenberg</a></dt>
-
-<dd>This project offers general knowledge books that are free as in freedom.
-It publishes plain text digital versions of public-domain works. If you are
-looking for a copy of a classic book, your search should start here.
-
-<p>They have a very clear explanation about the
-<a href="http://www.gutenberg.org/wiki/Gutenberg:No_Cost_or_Freedom%3f">
-difference between free as in price and free as in freedom</a> related to
-printed material.</p>
-</dd>
-
-<dt>GNU Project</dt>
-
-<dd>We maintain a list of <a href="/doc/other-free-books.html">free books</a>
-mainly related to Free Software documentation, and we make
-<a href="/manual/manual.html">GNU manuals</a> available online. All books
-published by the
-<a href="http://shop.fsf.org/category/books/">Free Software Foundation</a>
-are free as in freedom.</dd>
-
-<dt><a href="http://ftacademy.org/">Free Technology Academy</a></dt>
-
-<dd>The Free Technology Academy (FTA) is a joint initiative from
-several educational institutions in various countries. It aims to
-contribute to a society that permits all users to study, participate and
-build upon existing knowledge without restrictions. The FTA offers an
-online master level programme with course modules about Free
-Technologies. These courses are taught completely online in a virtual
-campus based on the Campus Project interoperability framework.
-
-<p>The FTA is a collaboration between the Free Knowledge Institute, the
-Open University of Catalonia (Spain) and the Open University of the
-Netherlands. A larger group of Associate Partners adds to the founding
-base with a network of organisations that share a common interest in
-offering courses in the area of Free Technology. The FTA is extending
-the current network of partners and collaborations continuously and
-encourages both individuals and organizations to contribute to the
-community.</p></dd>
+<h2>Educational Resources</h2>
-</dl>
+<p>This section will help you find a variety of resources related to
+education, such as: free study materials, free programs for
+educational institutions of all levels, educational institutions that
+offer courses on the philosophical and technical aspects of free
+software, projects that develop free programs and platforms for
+education, groups of people who follow the principles of the GNU
+Project to promote the use of free software in the educational field,
+and more.</p>
+
+<h3>Table of Contents</h3>
+
+<ul>
+ <li><a href="/education/edu-software.html">Educational Free
Software</a></li>
+ <li><a href="/education/edu-projects.html">Groups and Projects</a></li>
+ <li><a href="/education/edu-free-learning-resources.html">Free Learning
Resources</a></li>
+</ul>
</div><!-- for id="content", starts in the include above -->
@@ -157,7 +85,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2011, 2012, 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2016, 2018, 2019 Free Software Foundation,
Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -167,7 +95,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/12/15 14:46:06 $
+$Date: 2019/05/03 06:59:53 $
<!-- timestamp end -->
</p>
</div>
Index: po/edu-resources.zh-cn.po
===================================================================
RCS file: /web/www/www/education/po/edu-resources.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/edu-resources.zh-cn.po 3 May 2019 06:26:41 -0000 1.7
+++ po/edu-resources.zh-cn.po 3 May 2019 06:59:53 -0000 1.8
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-04-30 22:56+0000\n"
#. type: Content of: <title>
msgid "Educational Resources - GNU Project - Free Software Foundation"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/education edu-contents.zh-cn.html edu-proje...,
GNUN <=