www-commits
[Top][All Lists]
Advanced

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

www/education edu-resources.fr.html education.f...


From: GNUN
Subject: www/education edu-resources.fr.html education.f...
Date: Sat, 6 Aug 2016 10:30:11 +0000 (UTC)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/08/06 10:30:11

Modified files:
        education      : edu-resources.fr.html education.fr.html 
        education/po   : edu-resources.fr-en.html education.fr-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-resources.fr.html?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.fr.html?cvsroot=www&r1=1.81&r2=1.82
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-resources.fr-en.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.fr-en.html?cvsroot=www&r1=1.45&r2=1.46

Patches:
Index: edu-resources.fr.html
===================================================================
RCS file: /web/www/www/education/edu-resources.fr.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- edu-resources.fr.html       3 May 2016 10:22:28 -0000       1.35
+++ edu-resources.fr.html       6 Aug 2016 10:30:11 -0000       1.36
@@ -6,6 +6,24 @@
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Ressources pédagogiques libres - Projet GNU - Free Software 
Foundation</title>
+<style type="text/css" media="screen">
+<!--
+/*This will move to layout.css eventually. */
+.edu-note {
+   width: 40em;
+   max-width: 100%;
+   font-style: italic;
+   margin: 2em auto;
+}
+.edu-note p {
+   text-align: center;
+   padding: .8em 1em;
+   margin: 0;
+   border: .15em dotted #6092d0;
+}
+-->
+
+</style>
 
 <!--#include virtual="/education/po/edu-resources.translist" -->
 <!--#include virtual="/server/banner.fr.html" -->
@@ -40,12 +58,6 @@
 <!--#endif -->
 <h2>Ressources pédagogiques libres</h2>
 
-<blockquote class="note"><p>
-Nous recherchons des jeux éducatifs libres, ou de l'information sur des jeux
-libres pouvant être utilisés dans un but éducatif. Veuillez contacter <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
-</p></blockquote>
-
 <h3>Logiciels libres éducatifs</h3>
 
 <p>Dans notre section <a href="/education/edu-software.html">Logiciels libres
@@ -54,6 +66,12 @@
 monde et comment sont mises en pratiques les quatre libertés que le logiciel
 libre procure à tous ses utilisateurs.</p>
 
+<div class="edu-note"><p>
+Nous recherchons des jeux éducatifs libres, ou de l'information sur des jeux
+libres pouvant être utilisés dans un but éducatif. Veuillez contacter <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
+</p></div>
+
 <h3>Autres ressources pédagogiques</h3>
 
 <p>Comme le logiciel libre, les ressources pédagogiques libres sont affaire de
@@ -186,7 +204,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  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.  For web pages, it is ok to list just the latest year the
@@ -200,13 +218,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2011, 2012 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016 Free Software Foundation, Inc.</p>
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";>Creative
-Commons attribution de paternité, pas de modification, 3.0 États-Unis
-(CC BY-ND 3.0 US)</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0 internationale (CC BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -218,7 +236,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2016/05/03 10:22:28 $
+$Date: 2016/08/06 10:30:11 $
 
 <!-- timestamp end -->
 </p>

Index: education.fr.html
===================================================================
RCS file: /web/www/www/education/education.fr.html,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- education.fr.html   6 Aug 2016 08:58:47 -0000       1.81
+++ education.fr.html   6 Aug 2016 10:30:11 -0000       1.82
@@ -10,22 +10,41 @@
 <!--#include virtual="/education/po/education.translist" -->
 <style type="text/css" media="screen">
 <!--
-#rms-movie { min-width: 60%; max-width: 100%; }
-
-#content #indepth {
-   text-align: left;
-   margin-top: 0;
+/*This will move to layout.css eventually. */
+.edu-note {
+   width: 40em;
+   max-width: 100%;
+   font-style: italic;
+   margin: 2em auto;
+}
+.edu-note p {
+   text-align: center;
+   padding: .8em 1em;
+   margin: 0;
+   border: .15em dotted #6092d0;
 }
-#content #indepth ul {
-   padding: 0 1em;
-   margin-top: 0;
+/* This will stay. */
+#video-container {
+   width: 40em; max-width: 100%;
+   margin: 1.5em auto;
 }
-#content #indepth li { padding-bottom: 1em; }
-#content #indepth h3 { padding: 1em; margin: 0; }-->
-<!--#if expr="$LANGUAGE_SUFFIX = /\.(ar|fa|he)/" -->
+#video-container p { text-align: justify; }
+#rms-movie { width: 100%; }
address@hidden (min-width: 48em) {
+   #content .edu-note {
+      float: right;
+      max-width: 40%;
+      margin: 3.2em 0 2.5em 1.5em;
+   }
+}-->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
 <!--
-#content #indepth { text-align: right; }
--->
address@hidden (min-width: 48em) {
+   #content .edu-note {
+      float: left;
+      margin: 3.4em 1.5em 2.5em 0;
+   }
+}-->
 <!--#endif -->
 
 
@@ -58,18 +77,10 @@
 <!--#include virtual="/server/top-addendum.fr.html" -->
 <!--#endif -->
 <!--#endif -->
-<div class="center">
-<h2>Logiciel libre et éducation</h2>
-</div>
+<h2 class="c">Logiciel libre et éducation</h2>
 
 <h3>Quel est le lien entre logiciel libre et éducation ?</h3>
 
-<blockquote class="note"><p>
-Nous recherchons des jeux éducatifs libres, ou de l'information sur des jeux
-libres pouvant être utilisés dans un but éducatif. Veuillez contacter <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
-</p></blockquote>
-
 <p>La liberté du logiciel joue un rôle fondamental dans l'éducation. Les
 établissements d'enseignement de tous niveaux doivent utiliser et enseigner
 le logiciel libre car seul celui-ci leur permet de remplir leurs missions
@@ -93,7 +104,6 @@
 article : <a href="/philosophy/shouldbefree.html">Pourquoi le logiciel doit
 être libre</a>.</p>
 
-
 <h3>Les principes</h3>
 <p>Le projet GNU a été <a href="/gnu/initial-announcement.html">initié</a> 
en
 1983 par Richard Stallman dans le but de développer un système libre, le
@@ -105,22 +115,7 @@
 explique brièvement et précisément les grands principes du logiciel libre et
 leurs rapports à l'éducation.</p>
 
-<blockquote class="note" id="indepth">
-<h3>Pour approfondir</h3>
-
-<ul>
-<li>Découvrez les <a href="/education/edu-why.html">raisons</a> pour 
lesquelles
-l'éducation doit se servir de logiciel libre et l'enseigner, à l'exclusion
-de tout autre.</li>
-
-<li>Un article de Richard Stallman : <a
-href="/education/edu-schools.html">Pourquoi les écoles doivent utiliser
-exclusivement du logiciel libre</a></li>
-
-<li>Un article du Dr V. Sasi Kumar sur le <a
-href="/education/edu-system-india.html">système éducatif en Inde.</a></li>
-</ul>
-</blockquote>
+<div id="video-container">
 
 <!-- GNUN: localize URL /education/rms-education-es.fr.ogv -->
 <video  id="rms-movie" controls="controls">
@@ -129,7 +124,7 @@
     type='video/ogg; codecs="theora, vorbis"' />
 </video>
 
-<p>
+<div class="emph-box"><p>
  
 <!-- TRANSLATORS: Please replace the link to the video with subtitles in
      English with a link to the video with subtitles in your language, 
@@ -138,9 +133,7 @@
 
href="http://audio-video.gnu.org/video/rms-education-es-high-sub.fr.ogv";>sous-titrée
 en français</a> ou <a
 href="http://audio-video.gnu.org/video/rms-education-es.ogv";>non
-sous-titrée</a>, au format libre Ogg Theora (ogv).</p>
-
-<p>
+sous-titrée</a>, au format libre Ogg Theora (ogv).
 
 <!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. -->
@@ -152,9 +145,7 @@
 <a href="/education/misc/rms-education-es-transcription.txt">espagnol</a> et
 <a href="/education/misc/edu-misc.html#transcription-rms-education">quelques
 autres langues</a>. 
-</p>
 
-<p>
 
 <!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. -->
@@ -164,8 +155,29 @@
 <a href="/education/misc/rms-education-es-sub.es.srt">espagnol</a> et
 <a href="/education/misc/edu-misc.html#subtitles-rms-education">quelques
 autres langues</a>. 
-</p>
+</p></div> 
+<!-- /.emph-box -->
+</div>
+
+<div class="edu-note"><p>
+Nous recherchons des jeux éducatifs libres, ou de l'information sur des jeux
+libres pouvant être utilisés dans un but éducatif. Veuillez contacter <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
+</p></div>
+
+<h3 id="indepth">Pour approfondir</h3>
+<ul>
+<li>Découvrez les <a href="/education/edu-why.html">raisons</a> pour 
lesquelles
+l'éducation doit se servir de logiciel libre et l'enseigner, à l'exclusion
+de tout autre.</li>
 
+<li>Un article de Richard Stallman : <a
+href="/education/edu-schools.html">Pourquoi les écoles doivent utiliser
+exclusivement du logiciel libre</a></li>
+
+<li>Un article du Dr V. Sasi Kumar sur le <a
+href="/education/edu-system-india.html">système éducatif en Inde.</a></li>
+</ul>
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -211,13 +223,13 @@
 href="/server/standards/README.translations.html">guide de traduction</a>.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc.</p>
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";>Creative
-Commons attribution de paternité, pas de modification, 3.0 États-Unis
-(CC BY-ND 3.0 US)</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0 internationale (CC BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -229,7 +241,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2016/08/06 08:58:47 $
+$Date: 2016/08/06 10:30:11 $
 
 <!-- timestamp end -->
 </p>

Index: po/edu-resources.fr-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-resources.fr-en.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/edu-resources.fr-en.html 18 Apr 2014 10:00:16 -0000      1.25
+++ po/edu-resources.fr-en.html 6 Aug 2016 10:30:11 -0000       1.26
@@ -3,6 +3,23 @@
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Free Educational Resources
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="screen">
+<!--
+/*This will move to layout.css eventually. */
+.edu-note {
+   width: 40em;
+   max-width: 100%;
+   font-style: italic;
+   margin: 2em auto;
+}
+.edu-note p {
+   text-align: center;
+   padding: .8em 1em;
+   margin: 0;
+   border: .15em dotted #6092d0;
+}
+-->
+</style>
 <!--#include virtual="/education/po/edu-resources.translist" -->
 <!--#include virtual="/server/banner.html" -->
 
@@ -33,12 +50,6 @@
 <!--#endif -->
 <h2>Free Learning Resources</h2>
 
-<blockquote class="note"><p>
-We are looking for free educational games, or information about free games 
-that can be used for educational purposes. Contact 
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p></blockquote>
-
 <h3>Educational Free Software</h3>
 
 <p>In our <a href="/education/edu-software.html">Educational 
@@ -47,6 +58,12 @@
 are putting into practice the four freedoms that Free Software grants to 
 all users.</p>
 
+<div class="edu-note"><p>
+We are looking for free educational games, or information about free games 
+that can be used for educational purposes. Contact 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p></div>
+
 <h3>Other Learning Resources</h3>
 
 <p>Free learning resources, like Free Software, is a matter of freedom, 
@@ -158,7 +175,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  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.  For web pages, it is ok to list just the latest year the
@@ -173,17 +190,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2011, 2012 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/18 10:00:16 $
+$Date: 2016/08/06 10:30:11 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/education.fr-en.html
===================================================================
RCS file: /web/www/www/education/po/education.fr-en.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- po/education.fr-en.html     9 Nov 2014 13:27:28 -0000       1.45
+++ po/education.fr-en.html     6 Aug 2016 10:30:11 -0000       1.46
@@ -9,22 +9,41 @@
 
 <style type="text/css" media="screen">
 <!--
-#rms-movie { min-width: 60%; max-width: 100%; }
-
-#content #indepth {
-   text-align: left;
-   margin-top: 0;
+/*This will move to layout.css eventually. */
+.edu-note {
+   width: 40em;
+   max-width: 100%;
+   font-style: italic;
+   margin: 2em auto;
+}
+.edu-note p {
+   text-align: center;
+   padding: .8em 1em;
+   margin: 0;
+   border: .15em dotted #6092d0;
 }
-#content #indepth ul {
-   padding: 0 1em;
-   margin-top: 0;
+/* This will stay. */
+#video-container {
+   width: 40em; max-width: 100%;
+   margin: 1.5em auto;
 }
-#content #indepth li { padding-bottom: 1em; }
-#content #indepth h3 { padding: 1em; margin: 0; }-->
-<!--#if expr="$LANGUAGE_SUFFIX = /\.(ar|fa|he)/" -->
+#video-container p { text-align: justify; }
+#rms-movie { width: 100%; }
address@hidden (min-width: 48em) {
+   #content .edu-note {
+      float: right;
+      max-width: 40%;
+      margin: 3.2em 0 2.5em 1.5em;
+   }
+}-->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
 <!--
-#content #indepth { text-align: right; }
--->
address@hidden (min-width: 48em) {
+   #content .edu-note {
+      float: left;
+      margin: 3.4em 1.5em 2.5em 0;
+   }
+}-->
 <!--#endif -->
 </style>
 <!--#include virtual="/server/banner.html" -->
@@ -52,18 +71,10 @@
 <!--#endif -->
 <!--#endif -->
 
-<div class="center">
-<h2>Free Software and Education</h2>
-</div>
+<h2 class="c">Free Software and Education</h2>
 
 <h3>How Does Free Software Relate to Education?</h3>
 
-<blockquote class="note"><p>
-We are looking for free educational games, or information about free games 
-that can be used for educational purposes. Contact 
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p></blockquote>
-
 <p>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 
@@ -87,7 +98,6 @@
 <a href="/philosophy/shouldbefree.html">why software should be free</a>
 (as in freedom).</p>
 
-
 <h3>The Basics</h3>
 <p>The GNU Project was 
 <a href="/gnu/initial-announcement.html">launched</a> in 1983 by 
@@ -100,22 +110,7 @@
 explains briefly and to the point the principles of Free Software and 
 how they connect to education.</p>
 
-<blockquote class="note" id="indepth">
-<h3>In Depth</h3>
-
-<ul>
-<li>Learn about the <a href="/education/edu-why.html">Reasons Why</a> 
-educational institutions should use and teach exclusively Free Software.</li>
-
-<li>An article by Richard Stallman:
-<a href="/education/edu-schools.html">Why Schools Should Exclusively Use 
-Free Software</a></li>
-
-<li>An article by Dr. V. Sasi Kumar on the
-<a href="/education/edu-system-india.html">education system in India.</a></li>
-</ul>
-</blockquote>
-
+<div id="video-container">
 <!-- GNUN: localize URL /education/rms-education-es.ogv -->
 <video  id="rms-movie" controls="controls">
   <source
@@ -123,16 +118,15 @@
     type='video/ogg; codecs="theora, vorbis"' />
 </video>
 
-<p>
+<div class="emph-box"><p>
 <!-- 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. --> 
 <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 Theora 
-(ogv) free format.</p>
+(ogv) free format.<span class="gnun-split"></span>
 
-<p>
 <!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. -->
 
@@ -142,9 +136,8 @@
 <a href="/education/misc/rms-education-es-transcription.txt">Spanish</a>, and 
 <a href="/education/misc/edu-misc.html#transcription-rms-education">
    other languages</a>. 
-</p>
+<span class="gnun-split"></span>
 
-<p> 
 <!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. --> 
 
@@ -153,8 +146,27 @@
 <a href="/education/misc/rms-education-es-sub.es.srt">Spanish</a>, and
 <a href="/education/misc/edu-misc.html#subtitles-rms-education">other 
    languages</a>. 
-</p>
+</p></div> <!-- /.emph-box -->
+</div>
+
+<div class="edu-note"><p>
+We are looking for free educational games, or information about free games 
+that can be used for educational purposes. Contact 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p></div>
 
+<h3 id="indepth">In Depth</h3>
+<ul>
+<li>Learn about the <a href="/education/edu-why.html">Reasons Why</a> 
+educational institutions should use and teach exclusively Free Software.</li>
+
+<li>An article by Richard Stallman:
+<a href="/education/edu-schools.html">Why Schools Should Exclusively Use 
+Free Software</a></li>
+
+<li>An article by Dr. V. Sasi Kumar on the
+<a href="/education/edu-system-india.html">education system in India.</a></li>
+</ul>
 </div> <!-- for id="content", starts in the include above -->
 
 <!--#include virtual="/server/footer.html" -->
@@ -186,17 +198,17 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2012, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/11/09 13:27:28 $
+$Date: 2016/08/06 10:30:11 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

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