[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/education edu-software.zh-cn.html po/edu-so...
|
From: |
GNUN |
|
Subject: |
www/education edu-software.zh-cn.html po/edu-so... |
|
Date: |
Sat, 13 Apr 2019 04:30:21 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 19/04/13 04:30:21
Modified files:
education : edu-software.zh-cn.html
education/po : edu-software.zh-cn-en.html
edu-software.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software.zh-cn-en.html?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.4&r2=1.5
Patches:
Index: edu-software.zh-cn.html
===================================================================
RCS file: /web/www/www/education/edu-software.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-software.zh-cn.html 5 Dec 2017 13:28:46 -0000 1.1
+++ edu-software.zh-cn.html 13 Apr 2019 08:30:20 -0000 1.2
@@ -1,7 +1,7 @@
<!--#set var="ENGLISH_PAGE" value="/education/edu-software.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.86 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
@@ -11,8 +11,7 @@
<!--#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> → <a
-href="/education/edu-resources.html">æè²èµæº</a> →
æè²æ§èªç±è½¯ä»¶</p>
+<a href="/education/education.html">æè²</a> → æè²æ§èªç±è½¯ä»¶</p>
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" -->
@@ -24,16 +23,20 @@
<!--#endif -->
<h2>æè²æ§èªç±è½¯ä»¶</h2>
+<p><strong>GNU å·¥ç¨ç»´æ¤çä¸ä¸ªå»ºè®®ä½¿ç¨ç <a
+href="/software/free-software-for-education.html">éååç§å±çº§çé«è´¨éæè²æ§èªç±è½¯ä»¶å表</a>ã</strong></p>
+
<div class="emph-box">
-<p>å¨æ¢è®¨æ¬èå
容ä¹åï¼æ们è¦æé读è
ï¼"Free"ä¸è¯å¨"Free
-Software"ä¸<strong>ä¸æ¯æä»·æ
¼</strong>ï¼èæ¯æ<strong>èªç±</strong>ãèªç±è½¯ä»¶ï¼Free
+<p>å¨æ¢è®¨æ¬èå
容ä¹åï¼æ们è¦æé读è
３Free”ä¸è¯å¨“Free
+Software”ä¸<strong>ä¸æ¯æä»·æ
¼</strong>ï¼èæ¯æ<strong>èªç±</strong>ãèªç±è½¯ä»¶ï¼Free
Softwareï¼æ¯èµäºä½ <strong>èªç±</strong>ç软件ï¼å³ä½
æèªç±è¿è¡ãæ·è´ãåå¸ãå¦ä¹
ãä¿®æ¹åæ¹å该软件ãè¦äºè§£æ´å¤ï¼è¯·ç<a
href="/philosophy/free-sw.html">èªç±è½¯ä»¶çå®ä¹</a>ã</p>
</div>
+
<h3>ä½ å¨æ¬èä¼å¾å°ä»ä¹</h3>
-<p>è¿äºé¡µé¢å¹¶æ²¡æååºææçæè²æ§èªç±è½¯ä»¶ãæ们çç®çæ¯å±ç¤ºä¸äºä¾åï¼ä»¥æ¤æ¥åè¯å¤§å®¶æè²æºæå¦ä½å®é
使ç¨èªç±è½¯ä»¶ä»¥åå¦ä½ææå°åºç¨èªç±è½¯ä»¶å¸¦æ¥çèªç±ã对æ¯ä¸ªä¾åï¼æ们ä¼å±ç¤ºè¿äºèªç±æ¯æä¹åºç¨çã
</p>
+<p>è¿äºé¡µé¢å¹¶æ²¡æååºææçæè²æ§èªç±è½¯ä»¶ãæ们çç®çæ¯å±ç¤ºä¸äºä¾åï¼ä»¥æ¤æ¥åè¯å¤§å®¶æè²æºæå¦ä½å®é
使ç¨èªç±è½¯ä»¶ä»¥åå¦ä½ææå°åºç¨èªç±è½¯ä»¶å¸¦æ¥çèªç±ã对æ¯ä¸ªä¾åï¼æ们ä¼å±ç¤ºè¿äºèªç±æ¯æä¹åºç¨çã</p>
<p>以ä¸æ¯æ们çä¾åï¼</p>
@@ -45,23 +48,23 @@
</p>
<!-- end adding programs -->
-<p>è¿éå±ç¤ºçä¸äºç¨åºï¼æ¯å¦GComprisï¼æ¯GNUå·¥ç¨çä¸é¨åãè¿æå³çè¿äºç¨åºçå¼åè
åæä¼ä½¿è¿äºç¨åºåGNUç³»ç»çå
¶ä»é¨åå¾å¥½å°ä¸èµ·å·¥ä½ã为äºä¿æ¤ç¨æ·çåºæ¬èªç±ï¼GNUç¨åºä½¿ç¨GNUå·¥ç¨å»ºè®®çææ°ç许å¯è¯ãGNUç¨åºä¸ä¼å»ºè®®ä½¿ç¨ä»»ä½éèªç±è½¯ä»¶ï¼èä¸ä¹ä¸ä¼è®©ç¨æ·æä»»ä½éèªç±çèªç±è½¯ä»¶ææ¡£å½ææ们å¨æ´»å¨ä¸å®ä¹ç<a
+<p>è¿éå±ç¤ºçä¸äºç¨åºï¼æ¯å¦
+GComprisï¼æ¯GNUå·¥ç¨çä¸é¨åãè¿æå³çè¿äºç¨åºçå¼åè
åæä¼ä½¿è¿äºç¨åºåGNUç³»ç»çå
¶ä»é¨åå¾å¥½å°ä¸èµ·å·¥ä½ã为äºä¿æ¤ç¨æ·çåºæ¬èªç±ï¼GNUç¨åºä½¿ç¨GNUå·¥ç¨å»ºè®®çææ°ç许å¯è¯ãGNUç¨åºä¸ä¼å»ºè®®ä½¿ç¨ä»»ä½éèªç±è½¯ä»¶ï¼èä¸ä¹ä¸ä¼è®©ç¨æ·æä»»ä½éèªç±çèªç±è½¯ä»¶ææ¡£å½ææ们å¨èªç±è½¯ä»¶è¿å¨ä¸å®ä¹ç<a
href="/philosophy/free-doc.html">èªç±ææ¡£</a>æ¥åèã</p>
-<p>ä½ è¿å¯ä»¥æ¥çæ们建议ç<a
href="/software/free-software-for-education.html">æè²æ§è½¯ä»¶å表</a>ã</p>
-
<p>æ³è¦ä½¿ç¨èªç±è½¯ä»¶ç人们æè
æ¯å¯»æ¾èªç±è½¯ä»¶æ¥å®ææç§å·¥ä½ç人们ï¼åºè¯¥åè<a
href="http://directory.fsf.org";>èªç±è½¯ä»¶ç®å½</a>ï¼å
¶ä¸å
å«äºè¶
è¿6,000个èªç±è½¯ä»¶ï¼å®ä»¬é½è¿è¡å¨<a
href="/distros/free-distros.html">èªç±æä½ç³»ç»</a>ä¸ãç¹å«å°ï¼å¨è¯¥ç®å½ç<a
href="http://directory.fsf.org/category/educ/";>æè²</a>é¨åï¼æ们ååºäºå¯¹åºä¸åæè²æ°´å¹³çç¨åºï¼ä»å¦åçå°ä¸é¨çé«çæè²ï¼å
æ¬å¤§å¦åç 究é¢ã</p>
+<p>å¦æä½
ç¥éææè²æºæ为ç¹å®çç®ç使ç¨äºä¸ä¸ªèªç±è½¯ä»¶ï¼æè
æç¨æ·ä¿®æ¹åæ¹ç¼äºä¸ä¸ªèªç±è½¯ä»¶æ¥å¥åä»ä»¬çæè²éè¦ï¼è¯·ç»æ们æ¥ä¿¡<a
+href="mailto:address@hidden";><address@hidden></a>ï¼è®©æ们ç¥éã</p>
+
<div class="edu-note"><p>
æ们å¨å¯»æ¾æè²ç¸å
³ç游æï¼æè
å¯ç¨äºæè²ç®ççèªç±æ¸¸æçä¿¡æ¯ã请èç³»<a
href="mailto:address@hidden";><address@hidden></a>ã
</p></div>
-<p>å¦æä½
ç¥éææè²æºæ为ç¹å®çç®ç使ç¨äºä¸ä¸ªèªç±è½¯ä»¶ï¼æè
æç¨æ·ä¿®æ¹åæ¹ç¼äºä¸ä¸ªèªç±è½¯ä»¶æ¥å¥åä»ä»¬çæè²éè¦ï¼è¯·ç»æ们æ¥ä¿¡<a
-href="mailto:address@hidden";><address@hidden></a>ï¼è®©æ们ç¥éã</p>
<div class="translators-notes">
@@ -98,7 +101,7 @@
href="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>è·åæå
³åè°åæ交翻è¯çç¸å
³äºé¡¹ã</p>
</div>
-<p>Copyright © 2011, 2012, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2016, 2017, 2019 Free Software Foundation,
Inc.</p>
<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -109,12 +112,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>ï¼2017ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017-2019ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2017/12/05 13:28:46 $
+$Date: 2019/04/13 08:30:20 $
<!-- timestamp end -->
</p>
Index: po/edu-software.zh-cn-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-software.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/edu-software.zh-cn-en.html 5 Dec 2017 13:28:46 -0000 1.1
+++ po/edu-software.zh-cn-en.html 13 Apr 2019 08:30:21 -0000 1.2
@@ -1,5 +1,5 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.86 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<title>Educational Free Software
@@ -9,7 +9,6 @@
<!--#include virtual="/education/education-menu.html" -->
<p class="edu-breadcrumb">
<a href="/education/education.html">Education</a> →
-<a href="/education/edu-resources.html">Educational Resources</a> →
Educational Free Software</p>
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
@@ -18,26 +17,34 @@
<!--#include virtual="/server/top-addendum.html" -->
<!--#endif -->
<!--#endif -->
+
<h2>Educational Free Software</h2>
+<p><strong>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></p>
+
<div class="emph-box">
<p>Before addressing the subject in this section, we would like to
-remind our readers that the word "Free" in "Free Software" <strong>does
+remind our readers that the word “free” in “free
+software” <strong>does
not refer to price</strong> but to <strong>liberty</strong>. Free
-Software is software that grants you <strong>freedom</strong>, namely
+software is software that grants you <strong>freedom</strong>, namely
the freedom to run, copy, distribute, study, change and improve the
software. To learn more, see the <a href="/philosophy/free-sw.html">
-Free Software definition</a>.</p>
+free software definition</a>.</p>
</div>
+
<h3>What you will find in this section</h3>
-<p>These pages do not constitute an exhaustive listing of available
+<p>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 educational institutions can put into practice and
-effectively apply the freedoms that Free Software grants them. For each
+effectively apply the freedoms that free software grants them. For each
program described, we will show how those freedoms were actually
-applied. </p>
+applied.</p>
<p>The following are the examples that we present:</p>
@@ -58,13 +65,10 @@
the GNU Project recommends in order to protect the users' fundamental
freedoms. A GNU program does not recommend the use of any nonfree
program, and it does not refer the user to any nonfree documentation
-for Free Software, as defined in our campaign for
+for free software, as defined in our campaign for
<a href="/philosophy/free-doc.html">free documentation</a>.</p>
-<p>You can also check the <a href="/software/free-software-for-education.html">
-list of educational software</a> that we recommend.</p>
-
-<p>People who wish to migrate to Free Software or are looking for a free
+<p>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="http://directory.fsf.org";>Free Software Directory</a>, which
consists of a catalog of more than 6,000 free programs that run on
@@ -75,17 +79,18 @@
education, from pre-elementary school to highly specialized levels,
including university and research.</p>
+<p>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 by its users to meet their own educational needs,
+please let us know by sending an email to
+<a href="mailto:address@hidden";><address@hidden></a>.</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>
-<p>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 by its users to meet their own educational needs,
-please let us know by sending an email to
-<a href="mailto:address@hidden";><address@hidden></a>.</p>
</div><!-- for id="content", starts in the include above -->
@@ -118,7 +123,7 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2016, 2017, 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
@@ -128,7 +133,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/12/05 13:28:46 $
+$Date: 2019/04/13 08:30:21 $
<!-- timestamp end -->
</p>
</div>
Index: po/edu-software.zh-cn.po
===================================================================
RCS file: /web/www/www/education/po/edu-software.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/edu-software.zh-cn.po 13 Apr 2019 08:11:13 -0000 1.4
+++ po/edu-software.zh-cn.po 13 Apr 2019 08:30:21 -0000 1.5
@@ -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-11 21:57+0000\n"
#. type: Content of: <title>
msgid "Educational Free Software - GNU Project - Free Software Foundation"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/education edu-software.zh-cn.html po/edu-so...,
GNUN <=