www-commits
[Top][All Lists]
Advanced

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

www/education education.ca.html education.ja.ht...


From: GNUN
Subject: www/education education.ca.html education.ja.ht...
Date: Wed, 15 Oct 2014 09:56:56 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/10/15 09:56:56

Modified files:
        education      : education.ca.html education.ja.html 
        education/po   : education.ca-diff.html education.ja-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.ca.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.ja.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ca-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ja-diff.html?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: education.ca.html
===================================================================
RCS file: /web/www/www/education/education.ca.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- education.ca.html   5 Jun 2014 14:29:23 -0000       1.32
+++ education.ca.html   15 Oct 2014 09:56:55 -0000      1.33
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/education/education.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/education/po/education.ca.po">
+ http://www.gnu.org/education/po/education.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/education/education.html"
+ --><!--#set var="DIFF_FILE" value="/education/po/education.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2014-08-16" --><!--#set 
var="ENGLISH_PAGE" value="/education/education.en.html" -->
 
 <!--#include virtual="/server/html5-header.ca.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -44,6 +49,7 @@
 
 <!-- id="education-content" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/outdated.ca.html" -->
 <!--#if expr="$OUTDATED_SINCE" -->
 <!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -209,7 +215,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2014/06/05 14:29:23 $
+$Date: 2014/10/15 09:56:55 $
 
 <!-- timestamp end -->
 </p>

Index: education.ja.html
===================================================================
RCS file: /web/www/www/education/education.ja.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- education.ja.html   23 May 2014 03:58:57 -0000      1.31
+++ education.ja.html   15 Oct 2014 09:56:55 -0000      1.32
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/education/education.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/education/po/education.ja.po">
+ http://www.gnu.org/education/po/education.ja.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/education/education.html"
+ --><!--#set var="DIFF_FILE" value="/education/po/education.ja-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2014-08-16" --><!--#set 
var="ENGLISH_PAGE" value="/education/education.en.html" -->
 
 <!--#include virtual="/server/html5-header.ja.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -44,6 +49,7 @@
 
 <!-- id="education-content" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/outdated.ja.html" -->
 <!--#if expr="$OUTDATED_SINCE" -->
 <!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -179,7 +185,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2014/05/23 03:58:57 $
+$Date: 2014/10/15 09:56:55 $
 
 <!-- timestamp end -->
 </p>

Index: po/education.ca-diff.html
===================================================================
RCS file: /web/www/www/education/po/education.ca-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/education.ca-diff.html   12 Jul 2012 00:26:59 -0000      1.1
+++ po/education.ca-diff.html   15 Oct 2014 09:56:55 -0000      1.2
@@ -11,16 +11,34 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/html5-header.html" --&gt;
-&lt;!-- Parent-Version: 1.57 --&gt;
+&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;
 
-&lt;title&gt;Free Software and Education - GNU Project - Free Software 
-Foundation&lt;/title&gt;
+&lt;title&gt;Free Software and Education 
+- GNU Project - Free Software Foundation&lt;/title&gt;
 
-&lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;!--#include virtual="/education/po/education.translist" --&gt;
 
+&lt;style type="text/css" media="screen"&gt;
+&lt;!--
+#rms-movie { min-width: 60%; max-width: 100%; }
+
+#content #indepth {
+   text-align: left;
+   margin-top: 0;
+}
+#content #indepth ul {
+   padding: 0 1em;
+   margin-top: 0;
+}
+#content #indepth li { padding-bottom: 1em; }
+#content #indepth h3 { padding: 1em; margin: 0; }
+--&gt;
+&lt;/style&gt;
+
+&lt;!--#include virtual="/server/banner.html" --&gt;
+
 &lt;div id="education-content"&gt;             
-&lt;h2&gt;Free Software and Education&lt;/h2&gt;
 
 &lt;!-- begin edu navigation bar --&gt;
 &lt;ul id="edu-navigation"&gt;
@@ -35,19 +53,27 @@
 
 &lt;/div&gt; &lt;!-- id="education-content" --&gt;
 
-&lt;div style="text-align: center; margin-top: 0.5em; margin-bottom: 0.5em; 
-background-color: #fcc76f; color: #000000; padding: 0.5em;"&gt;We are 
-looking for developers of free educational games, or information about 
-free games that can be used for educational purposes. Contact &lt;a 
-href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;&lt;/div&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#if expr="$OUTDATED_SINCE" --&gt;&lt;!--#else --&gt;
+&lt;!--#if expr="$LANGUAGE_SUFFIX" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="no" --&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;!--#endif --&gt;
+&lt;!--#endif --&gt;
                
 &lt;div class="center"&gt;
+&lt;h2&gt;Free Software and Education&lt;/h2&gt;
+&lt;/div&gt;
 
-&lt;h3&gt;What Does Free Software Have To Do With Education?&lt;/h3&gt;
+&lt;h3&gt;How Does Free Software Relate to Education?&lt;/h3&gt;
 
-&lt;/div&gt;
+&lt;blockquote class="note"&gt;&lt;p&gt;
+We are looking for free educational games, or information about free games 
+that can be used for educational purposes. Contact 
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+&lt;/p&gt;&lt;/blockquote&gt;
 
-&lt;p&gt;Software freedom has an especially important role in education. 
+&lt;p&gt;Software freedom plays a fundamental role in education. 
 Educational institutions of all levels should use and teach Free 
 Software because it is the only software that allows them to accomplish 
 their essential missions: to disseminate human knowledge and to prepare 
@@ -70,155 +96,120 @@
 &lt;a href="/philosophy/shouldbefree.html"&gt;why software should be 
free&lt;/a&gt;
 (as in freedom).&lt;/p&gt;
                
-&lt;div class="yui-gc"&gt;
-                  &lt;div class="yui-u first"&gt;
                        
-&lt;h2&gt;The Basics&lt;/h2&gt;
+&lt;h3&gt;The Basics&lt;/h3&gt;
+&lt;p&gt;The GNU Project was 
+&lt;a <span class="removed"><del><strong>href=" 
/gnu/initial-announcement.html"&gt;launched&lt;/a&gt;</strong></del></span> 
<span 
class="inserted"><ins><em>href="/gnu/initial-announcement.html"&gt;launched&lt;/a&gt;</em></ins></span>
 in 1983 by 
+Richard Stallman to develop a Free Libre operating system: the GNU 
+operating system. As a result, today it is possible for anyone to use a 
+computer in freedom.&lt;/p&gt;
 
 &lt;p&gt;In this six-minutes video 
 &lt;a href="http://www.fsf.org/about/leadership/#rms"&gt;Richard 
Stallman&lt;/a&gt; 
 explains briefly and to the point the principles of Free Software and 
 how they connect to education.&lt;/p&gt;
 
+&lt;blockquote class="note" id="indepth"&gt;
+&lt;h3&gt;In Depth&lt;/h3&gt;
+
+&lt;ul&gt;
+&lt;li&gt;Learn about the &lt;a href="/education/edu-why.html"&gt;Reasons 
Why&lt;/a&gt; 
+educational institutions should use and teach exclusively Free 
Software.&lt;/li&gt;
+
+&lt;li&gt;An article by Richard Stallman:
+&lt;a href="/education/edu-schools.html"&gt;Why Schools Should Exclusively Use 
+Free Software&lt;/a&gt;&lt;/li&gt;
+
+&lt;li&gt;An article by Dr. V. Sasi Kumar on the
+&lt;a href="/education/edu-system-india.html"&gt;education system in 
India.&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;/blockquote&gt;
+
+&lt;!-- GNUN: localize URL /education/rms-education-es.ogv --&gt;
+&lt;video  id="rms-movie" controls="controls"&gt;
+  &lt;source
+    src="http://www.gnu.org/education/rms-education-es.ogv";
+    type='video/ogg; codecs="theora, vorbis"' /&gt;
+&lt;/video&gt;
+
+&lt;p&gt;
+&lt;!-- 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. --&gt; 
+&lt;a 
+href="http://audio-video.gnu.org/video/rms-education-es-high-sub.en.ogv"&gt;
+Download and watch the video&lt;/a&gt; at a higher definition in the Ogg 
Theora 
+(ogv) free format.&lt;/p&gt;
+
 &lt;p&gt;
-<span class="removed"><del><strong>Transcriptions of this video are available 
in</strong></del></span>
 &lt;!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. --&gt;
 
-<span class="inserted"><ins><em>Transcriptions of this video are available 
in</em></ins></span>
+Transcriptions of this video are available in
 
 &lt;a 
href="/education/misc/rms-education-es-translation-to-en.txt"&gt;English&lt;/a&gt;,
 
 &lt;a 
href="/education/misc/rms-education-es-transcription.txt"&gt;Spanish&lt;/a&gt;, 
and 
-&lt;a href="/education/misc/edu-misc.html#transcriptions"&gt;other 
languages&lt;/a&gt;. 
+&lt;a href="/education/misc/edu-misc.html#transcription-rms-education"&gt;
+   other languages&lt;/a&gt;. 
 &lt;/p&gt;
 
-&lt;p&gt; <span class="removed"><del><strong>SubRip subtitle files are also 
available for download in</strong></del></span> 
+&lt;p&gt; 
 &lt;!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. --&gt; 
 
-<span class="inserted"><ins><em>SubRip subtitle files are also available for 
download in</em></ins></span>
+SubRip subtitle files are also available for download in
 &lt;a href="/education/misc/rms-education-es-sub.en.srt"&gt;English&lt;/a&gt;, 
 &lt;a href="/education/misc/rms-education-es-sub.es.srt"&gt;Spanish&lt;/a&gt;, 
and
-&lt;a href="/education/misc/edu-misc.html#subtitles"&gt;other 
languages&lt;/a&gt;. 
+&lt;a href="/education/misc/edu-misc.html#subtitles-rms-education"&gt;other 
+   languages&lt;/a&gt;. 
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;!-- GNUN: localize URL 
/education/rms-education-es.ogv --&gt;</em></ins></span>
-
-&lt;video id="rms-movie" width="512" height="288" controls="controls"&gt;
-  &lt;source
-    <span 
class="removed"><del><strong>src="http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv";</strong></del></span>
-    <span 
class="inserted"><ins><em>src="/education/rms-education-es.ogv"</em></ins></span>
-    type='video/ogg; codecs="theora, vorbis"' /&gt;
-&lt;/video&gt;
-                               
-<span class="removed"><del><strong>&lt;p&gt;Download</strong></del></span>
-                               
-<span class="inserted"><ins><em>&lt;p&gt;
-&lt;!-- TRANSLATORS: Please replace the link to the</em></ins></span> video 
<span class="removed"><del><strong>as</strong></del></span> <span 
class="inserted"><ins><em>with subtitles in
-     English with a link to the video with subtitles in your language, 
-     if it exists. --&gt;</em></ins></span> 
-
-&lt;a <span 
class="removed"><del><strong>href="http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv"&gt;</strong></del></span>
 
-<span 
class="inserted"><ins><em>href="http://audio-video.gnu.org/video/rms-education-es-high-sub.en.ogv"&gt;
-Download and watch the video&lt;/a&gt; at a higher definition in 
the</em></ins></span> Ogg <span 
class="removed"><del><strong>Theora&lt;/a&gt;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>Theora 
-(ogv) free format.&lt;/p&gt;</em></ins></span>
-
-&lt;p&gt;The GNU Project was 
-&lt;a href=" /gnu/initial-announcement.html"&gt;launched&lt;/a&gt; in 1983 by 
-Richard Stallman to develop a Free Libre operating system: the GNU 
-operating system. As a result, today it is possible for anyone to use a 
-computer in freedom.&lt;/p&gt;
-
-&lt;/div&gt;
-&lt;div class="yui-u"&gt;
-
-&lt;h2 id="indepth"&gt;In Depth&lt;/h2&gt;
-
-&lt;p&gt;Learn about the &lt;a href="/education/edu-why.html"&gt;Reasons 
Why&lt;/a&gt; 
-educational institutions should use and teach exclusively Free 
Software.&lt;/p&gt;
-
-&lt;p&gt;An article by Richard Stallman:
-&lt;a href="/education/edu-schools.html"&gt;Why Schools Should Exclusively Use 
-Free Software&lt;/a&gt;&lt;/p&gt;
-
-&lt;p&gt;An article by Dr. V. Sasi Kumar on the
-&lt;a href="/education/edu-system-india.html"&gt;education system in 
India.&lt;/a&gt;&lt;/p&gt;
-
-&lt;/div&gt;
-&lt;/div&gt;
-
-&lt;!-- If needed, change the copyright block at the bottom. In general,
-     pages on the GNU web server should be under CC BY-ND 3.0 US.
-     Please do NOT change or remove this without talking
-     with the webmasters or licensing team first.
-     Please make sure the copyright date is consistent with the document
-     and that it is like this: "2001, 2002", not this: "2001-2002". --&gt;
-
 &lt;/div&gt; &lt;!-- for id="content", starts in the include above --&gt;
 
 &lt;!--#include virtual="/server/footer.html" --&gt;
-
 &lt;div id="footer"&gt;
+&lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
 &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
-the FSF.
-&lt;br /&gt;
-Please send broken links and other corrections or suggestions to
-&lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;Please see the &lt;a
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;
+Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
 README&lt;/a&gt; for information on coordinating and submitting translations
 of this article.&lt;/p&gt;
+&lt;/div&gt;
 
-&lt;p&gt;Copyright &copy; 2011, 2012 Free Software Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2011, 2012, 2014 Free Software Foundation, 
Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
 Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;Updated:
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2012/07/12 00:26:59 $
+$Date: 2014/10/15 09:56:55 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-
-<span class="removed"><del><strong>&lt;!-- &lt;div id="translations"&gt; --&gt;
-&lt;!-- &lt;h4&gt;Translations of this page&lt;/h4&gt; --&gt;
-&lt;!--  --&gt;
-&lt;!-- Please keep this list alphabetical by language code. --&gt;
-&lt;!--      Comment what the language is for each type, i.e. de is German. 
--&gt;
-&lt;!--      Write the language name in its own language (Deutsch) in the 
text. --&gt;
-&lt;!--      If you add a new language here, please --&gt;
-&lt;!--      advise address@hidden and add it to --&gt;
-&lt;!--       - /home/www/html/server/standards/README.translations.html --&gt;
-&lt;!--       - one of the lists under the section "Translations Underway" 
--&gt;
-&lt;!--       - if there is a translation team, you also have to add an alias 
--&gt;
-&lt;!--       to mail.gnu.org:/com/mailer/aliases --&gt;
-&lt;!--      Please also check you have the language code right; see: --&gt;
-&lt;!--      http://www.loc.gov/standards/iso639-2/php/code_list.php --&gt;
-&lt;!--      If the 2-letter ISO 639-1 code is not available, --&gt;
-&lt;!--      use the 3-letter ISO 639-2. --&gt;
-&lt;!--      Please use W3C normative character entities. --&gt;
-&lt;!--  --&gt;
-&lt;!--      See also '(web-trans)Capitalization': --&gt;
-&lt;!--      
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 --&gt;
-&lt;!--      --&gt;
-&lt;!--  --&gt;
-&lt;!-- &lt;ul class="translations-list"&gt; --&gt;
-&lt;!-- German --&gt;
-&lt;!-- &lt;li&gt;&lt;a 
href="/education/education.de.html"&gt;Deutsch&lt;/a&gt;&nbsp;[de]&lt;/li&gt; 
--&gt;
-&lt;!-- English --&gt;
-&lt;!-- &lt;li&gt;&lt;a 
href="/education/education.html"&gt;English&lt;/a&gt;&nbsp;[en]&lt;/li&gt; 
--&gt;
-&lt;!-- Spanish --&gt;
-&lt;!-- &lt;li&gt;&lt;a 
href="/education/education.es.html"&gt;espa&#x00f1;ol&lt;/a&gt;&nbsp;[es]&lt;/li&gt;
 --&gt;
-&lt;!-- &lt;/ul&gt; --&gt;
-&lt;!-- &lt;/div&gt; --&gt;</strong></del></span>
 &lt;/div&gt;
 &lt;/body&gt;
 &lt;/html&gt;
-
 </pre></body></html>

Index: po/education.ja-diff.html
===================================================================
RCS file: /web/www/www/education/po/education.ja-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/education.ja-diff.html   2 Dec 2012 15:28:34 -0000       1.1
+++ po/education.ja-diff.html   15 Oct 2014 09:56:56 -0000      1.2
@@ -11,16 +11,34 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/html5-header.html" --&gt;
-&lt;!-- Parent-Version: 1.57 --&gt;
+&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;
 
-&lt;title&gt;Free Software and Education - GNU Project - Free Software 
-Foundation&lt;/title&gt;
+&lt;title&gt;Free Software and Education 
+- GNU Project - Free Software Foundation&lt;/title&gt;
 
-&lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;!--#include virtual="/education/po/education.translist" --&gt;
 
+&lt;style type="text/css" media="screen"&gt;
+&lt;!--
+#rms-movie { min-width: 60%; max-width: 100%; }
+
+#content #indepth {
+   text-align: left;
+   margin-top: 0;
+}
+#content #indepth ul {
+   padding: 0 1em;
+   margin-top: 0;
+}
+#content #indepth li { padding-bottom: 1em; }
+#content #indepth h3 { padding: 1em; margin: 0; }
+--&gt;
+&lt;/style&gt;
+
+&lt;!--#include virtual="/server/banner.html" --&gt;
+
 &lt;div id="education-content"&gt;             
-&lt;h2&gt;Free Software and Education&lt;/h2&gt;
 
 &lt;!-- begin edu navigation bar --&gt;
 &lt;ul id="edu-navigation"&gt;
@@ -35,19 +53,27 @@
 
 &lt;/div&gt; &lt;!-- id="education-content" --&gt;
 
-&lt;div style="text-align: center; margin-top: 0.5em; margin-bottom: 0.5em; 
-background-color: #fcc76f; color: #000000; padding: 0.5em;"&gt;We are 
-looking for developers of free educational games, or information about 
-free games that can be used for educational purposes. Contact &lt;a 
-href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;&lt;/div&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#if expr="$OUTDATED_SINCE" --&gt;&lt;!--#else --&gt;
+&lt;!--#if expr="$LANGUAGE_SUFFIX" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="no" --&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;!--#endif --&gt;
+&lt;!--#endif --&gt;
                
 &lt;div class="center"&gt;
+&lt;h2&gt;Free Software and Education&lt;/h2&gt;
+&lt;/div&gt;
 
-&lt;h3&gt;What Does Free Software Have To Do With Education?&lt;/h3&gt;
+&lt;h3&gt;How Does Free Software Relate to Education?&lt;/h3&gt;
 
-&lt;/div&gt;
+&lt;blockquote class="note"&gt;&lt;p&gt;
+We are looking for free educational games, or information about free games 
+that can be used for educational purposes. Contact 
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+&lt;/p&gt;&lt;/blockquote&gt;
 
-&lt;p&gt;Software freedom has an especially important role in education. 
+&lt;p&gt;Software freedom plays a fundamental role in education. 
 Educational institutions of all levels should use and teach Free 
 Software because it is the only software that allows them to accomplish 
 their essential missions: to disseminate human knowledge and to prepare 
@@ -70,44 +96,39 @@
 &lt;a href="/philosophy/shouldbefree.html"&gt;why software should be 
free&lt;/a&gt;
 (as in freedom).&lt;/p&gt;
                
-&lt;div class="yui-gc"&gt;
-                  &lt;div class="yui-u first"&gt;
                        
-&lt;h2&gt;The Basics&lt;/h2&gt;
+&lt;h3&gt;The Basics&lt;/h3&gt;
+&lt;p&gt;The GNU Project was 
+&lt;a <span class="removed"><del><strong>href=" 
/gnu/initial-announcement.html"&gt;launched&lt;/a&gt;</strong></del></span> 
<span 
class="inserted"><ins><em>href="/gnu/initial-announcement.html"&gt;launched&lt;/a&gt;</em></ins></span>
 in 1983 by 
+Richard Stallman to develop a Free Libre operating system: the GNU 
+operating system. As a result, today it is possible for anyone to use a 
+computer in freedom.&lt;/p&gt;
 
 &lt;p&gt;In this six-minutes video 
 &lt;a href="http://www.fsf.org/about/leadership/#rms"&gt;Richard 
Stallman&lt;/a&gt; 
 explains briefly and to the point the principles of Free Software and 
 how they connect to education.&lt;/p&gt;
 
-&lt;p&gt;
-&lt;!-- TRANSLATORS: please add the link to your language here in the first 
-     place, followed by a comma. --&gt;
-
-Transcriptions of this video are available in
+&lt;blockquote class="note" id="indepth"&gt;
+&lt;h3&gt;In Depth&lt;/h3&gt;
 
-&lt;a 
href="/education/misc/rms-education-es-translation-to-en.txt"&gt;English&lt;/a&gt;,
 
-&lt;a 
href="/education/misc/rms-education-es-transcription.txt"&gt;Spanish&lt;/a&gt;, 
and 
-&lt;a <span 
class="removed"><del><strong>href="/education/misc/edu-misc.html#transcriptions"&gt;other</strong></del></span>
 <span 
class="inserted"><ins><em>href="/education/misc/edu-misc.html#transcription-rms-education"&gt;
-   other</em></ins></span> languages&lt;/a&gt;. 
-&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;Learn about the &lt;a href="/education/edu-why.html"&gt;Reasons 
Why&lt;/a&gt; 
+educational institutions should use and teach exclusively Free 
Software.&lt;/li&gt;
 
-&lt;p&gt; 
-&lt;!-- TRANSLATORS: please add the link to your language here in the first 
-     place, followed by a comma. --&gt; 
+&lt;li&gt;An article by Richard Stallman:
+&lt;a href="/education/edu-schools.html"&gt;Why Schools Should Exclusively Use 
+Free Software&lt;/a&gt;&lt;/li&gt;
 
-SubRip subtitle files are also available for download in
-&lt;a href="/education/misc/rms-education-es-sub.en.srt"&gt;English&lt;/a&gt;, 
-&lt;a href="/education/misc/rms-education-es-sub.es.srt"&gt;Spanish&lt;/a&gt;, 
and
-&lt;a <span 
class="removed"><del><strong>href="/education/misc/edu-misc.html#subtitles"&gt;other</strong></del></span>
 <span 
class="inserted"><ins><em>href="/education/misc/edu-misc.html#subtitles-rms-education"&gt;other</em></ins></span>
 
-   languages&lt;/a&gt;. 
-&lt;/p&gt;
+&lt;li&gt;An article by Dr. V. Sasi Kumar on the
+&lt;a href="/education/edu-system-india.html"&gt;education system in 
India.&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;/blockquote&gt;
 
 &lt;!-- GNUN: localize URL /education/rms-education-es.ogv --&gt;
-
-&lt;video id="rms-movie" width="512" height="288" controls="controls"&gt;
+&lt;video  id="rms-movie" controls="controls"&gt;
   &lt;source
-    src="/education/rms-education-es.ogv"
+    src="http://www.gnu.org/education/rms-education-es.ogv";
     type='video/ogg; codecs="theora, vorbis"' /&gt;
 &lt;/video&gt;
                                
@@ -115,76 +136,80 @@
 &lt;!-- 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. --&gt; 
-
 &lt;a 
 href="http://audio-video.gnu.org/video/rms-education-es-high-sub.en.ogv"&gt;
 Download and watch the video&lt;/a&gt; at a higher definition in the Ogg 
Theora 
 (ogv) free format.&lt;/p&gt;
 
-&lt;p&gt;The GNU Project was 
-&lt;a href=" /gnu/initial-announcement.html"&gt;launched&lt;/a&gt; in 1983 by 
-Richard Stallman to develop a Free Libre operating system: the GNU 
-operating system. As a result, today it is possible for anyone to use a 
-computer in freedom.&lt;/p&gt;
-
-&lt;/div&gt;
-&lt;div class="yui-u"&gt;
-
-&lt;h2 id="indepth"&gt;In Depth&lt;/h2&gt;
-
-&lt;p&gt;Learn about the &lt;a href="/education/edu-why.html"&gt;Reasons 
Why&lt;/a&gt; 
-educational institutions should use and teach exclusively Free 
Software.&lt;/p&gt;
+&lt;p&gt;
+&lt;!-- TRANSLATORS: please add the link to your language here in the first 
+     place, followed by a comma. --&gt;
 
-&lt;p&gt;An article by Richard Stallman:
-&lt;a href="/education/edu-schools.html"&gt;Why Schools Should Exclusively Use 
-Free Software&lt;/a&gt;&lt;/p&gt;
+Transcriptions of this video are available in
 
-&lt;p&gt;An article by Dr. V. Sasi Kumar on the
-&lt;a href="/education/edu-system-india.html"&gt;education system in 
India.&lt;/a&gt;&lt;/p&gt;
+&lt;a 
href="/education/misc/rms-education-es-translation-to-en.txt"&gt;English&lt;/a&gt;,
 
+&lt;a 
href="/education/misc/rms-education-es-transcription.txt"&gt;Spanish&lt;/a&gt;, 
and 
+&lt;a href="/education/misc/edu-misc.html#transcription-rms-education"&gt;
+   other languages&lt;/a&gt;. 
+&lt;/p&gt;
 
-&lt;/div&gt;
-&lt;/div&gt;
+&lt;p&gt; 
+&lt;!-- TRANSLATORS: please add the link to your language here in the first 
+     place, followed by a comma. --&gt; 
 
-&lt;!-- If needed, change the copyright block at the bottom. In general,
-     pages on the GNU web server should be under CC BY-ND 3.0 US.
-     Please do NOT change or remove this without talking
-     with the webmasters or licensing team first.
-     Please make sure the copyright date is consistent with the document
-     and that it is like this: "2001, 2002", not this: "2001-2002". --&gt;
+SubRip subtitle files are also available for download in
+&lt;a href="/education/misc/rms-education-es-sub.en.srt"&gt;English&lt;/a&gt;, 
+&lt;a href="/education/misc/rms-education-es-sub.es.srt"&gt;Spanish&lt;/a&gt;, 
and
+&lt;a href="/education/misc/edu-misc.html#subtitles-rms-education"&gt;other 
+   languages&lt;/a&gt;. 
+&lt;/p&gt;
 
 &lt;/div&gt; &lt;!-- for id="content", starts in the include above --&gt;
 
 &lt;!--#include virtual="/server/footer.html" --&gt;
-
 &lt;div id="footer"&gt;
+&lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
 &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
-the FSF.
-&lt;br /&gt;
-Please send broken links and other corrections or suggestions to
-&lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
 
-&lt;p&gt;Please see the &lt;a
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;
+Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
 README&lt;/a&gt; for information on coordinating and submitting translations
 of this article.&lt;/p&gt;
+&lt;/div&gt;
 
-&lt;p&gt;Copyright &copy; 2011, 2012 Free Software Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2011, 2012, 2014 Free Software Foundation, 
Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
 Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;Updated:
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2012/12/02 15:28:34 $
+$Date: 2014/10/15 09:56:56 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
 &lt;/div&gt;
 &lt;/body&gt;
 &lt;/html&gt;
-
 </pre></body></html>



reply via email to

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