www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www distros/free-distros.ca.html distros/po/fre...

From: GNUN
Subject: www distros/free-distros.ca.html distros/po/fre...
Date: Sat, 17 Sep 2016 07:13:33 +0000 (UTC) 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/09/17 07:13:33

Modified files:
        distros        : free-distros.ca.html 
        distros/po     : free-distros.ca-en.html free-distros.ca.po 
        education      : edu-software-tuxpaint.ru.html education.ca.html 
        education/po   : education.ca-en.html education.ca.po 
        licenses       : gpl-faq.ru.html quick-guide-gplv3.ru.html 
        licenses/old-licenses: gpl-2.0-faq.ru.html 
        philosophy     : categories.ru.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-distros.ca.html?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ca-en.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ca.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-tuxpaint.ru.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.ca.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ca-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ca.po?cvsroot=www&r1=1.67&r2=1.68
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.ru.html?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/quick-guide-gplv3.ru.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/gpl-2.0-faq.ru.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.ru.html?cvsroot=www&r1=1.48&r2=1.49

Patches:
Index: distros/free-distros.ca.html
===================================================================
RCS file: /web/www/www/distros/free-distros.ca.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- distros/free-distros.ca.html        11 Jul 2016 08:35:12 -0000      1.53
+++ distros/free-distros.ca.html        17 Sep 2016 07:13:31 -0000      1.54
@@ -1,9 +1,4 @@
-<!--#set var="PO_FILE"
- value='<a href="/distros/po/free-distros.ca.po">
- https://www.gnu.org/distros/po/free-distros.ca.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/distros/free-distros.html"
- --><!--#set var="DIFF_FILE" value="/distros/po/free-distros.ca-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2016-04-14" -->
+<!--#set var="ENGLISH_PAGE" value="/distros/free-distros.en.html" -->
 
 <!--#include virtual="/server/header.ca.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -17,7 +12,6 @@
 
 <!--#include virtual="/distros/po/free-distros.translist" -->
 <!--#include virtual="/server/banner.ca.html" -->
-<!--#include virtual="/server/outdated.ca.html" -->
 <h2>Distribucions GNU/Linux lliures</h2>
 
 <!--#include virtual="/licenses/fsf-licensing.ca.html" -->
@@ -99,7 +93,7 @@
    <td>BLAG Linux i GNU, una distribució GNU/Linux basada en Fedora.</td></tr>
 
  <tr class="even">
-   <td><a href="http://www.dragora.org/en/index.html";>
+   <td><a href="http://dragora.org";>
        <img src="/graphics/distros-dragora.png" alt="Dragora" /></a></td>
    <td>Dragora, una distribució GNU/Linux independent basada en conceptes de
 simplicitat.</td></tr>
@@ -111,18 +105,18 @@
 vídeo i àudio.</td></tr>
 
  <tr class="even">
+   <td><a href="http://www.gnewsense.org/";>
+       <img src="/graphics/distros-gnewsense.png" alt="gNewSense" /></a></td>
+   <td>gNewSense, una distribució GNU/Linux basada en Debian amb el patrocini 
de la
+FSF.</td></tr>
+
+ <tr class="odd">
    <td><a href="http://www.gnu.org/software/guix/";>
        <img src="/software/guix/graphics/GuixSD-V.png" alt="guix" /></a></td>
    <td>Guix System Distribution és una distribució avançada de GNU/Linux 
construïda
 sobre GNU Guix (es pronuncia com &ldquo;geeks&rdquo;), un gestor de paquets
 funcional per al sistema GNU. </td></tr>
 
- <tr class="odd">
-   <td><a href="http://www.gnewsense.org/";>
-       <img src="/graphics/distros-gnewsense.png" alt="gNewSense" /></a></td>
-   <td>gNewSense, una distribució GNU/Linux basada en Debian amb el patrocini 
de la
-FSF.</td></tr>
-
     
  <tr class="even">
    <td><a href="https://musixdistro.wordpress.com/";>
@@ -213,7 +207,7 @@
 href="/distros/free-system-distribution-guidelines.html">Criteris de les
 distribucions de sistemes lliures</a> i us agradaria que fos a la llista,
 escriviu-nos si us plau a <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a> amb una
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a> amb una
 presentació i un enllaç al web del projecte. Quan ho feu us donarem més
 informació sobre el procés d'avaluació i l'iniciarem de seguida. Esperem les
 vostres notícies!</p>
@@ -273,7 +267,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc.</p>
 
 <p>Aquesta pàgina es troba sota la <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Llicència Creative
@@ -289,7 +283,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2016/07/11 08:35:12 $
+$Date: 2016/09/17 07:13:31 $
 
 <!-- timestamp end -->
 </p>

Index: distros/po/free-distros.ca-en.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ca-en.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- distros/po/free-distros.ca-en.html  7 Sep 2015 07:04:59 -0000       1.21
+++ distros/po/free-distros.ca-en.html  17 Sep 2016 07:13:32 -0000      1.22
@@ -84,7 +84,7 @@
    <td>BLAG Linux and GNU, a GNU/Linux distribution based on Fedora.</td></tr>
 
  <tr class="even">
-   <td><a href="http://www.dragora.org/en/index.html";>
+   <td><a href="http://dragora.org";>
        <img src="/graphics/distros-dragora.png" alt="Dragora" /></a></td>
    <td>Dragora, an independent GNU/Linux distribution based on concepts of
        simplicity.</td></tr>
@@ -96,18 +96,18 @@
        and video editing.</td></tr>
 
  <tr class="even">
+   <td><a href="http://www.gnewsense.org/";>
+       <img src="/graphics/distros-gnewsense.png" alt="gNewSense" /></a></td>
+   <td>gNewSense, a GNU/Linux distribution based on Debian, with
+       sponsorship from the FSF.</td></tr>
+
+ <tr class="odd">
    <td><a href="http://www.gnu.org/software/guix/";>
        <img src="/software/guix/graphics/GuixSD-V.png" alt="guix" /></a></td>
    <td>Guix System Distribution is an advanced GNU/Linux distro built
        on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
        functional package manager for the GNU system. </td></tr>
 
- <tr class="odd">
-   <td><a href="http://www.gnewsense.org/";>
-       <img src="/graphics/distros-gnewsense.png" alt="gNewSense" /></a></td>
-   <td>gNewSense, a GNU/Linux distribution based on Debian, with
-       sponsorship from the FSF.</td></tr>
-
     
  <tr class="even">
    <td><a href="https://musixdistro.wordpress.com/";>
@@ -192,12 +192,11 @@
 let the distribution's maintainers know about this page and encourage
 them to get in touch&mdash;we'd like to hear from them.</p>
 
-<p>If you maintain a distribution that follows
-the <a href="/distros/free-system-distribution-guidelines.html">Free
-System Distribution Guidelines</a> and would like to be listed here,
-please write to us
-at <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
-with an introduction and a link to the project Web site.  When you do,
+<p>If you maintain a distribution that follows the <a
+href="/distros/free-system-distribution-guidelines.html">Free System
+Distribution Guidelines</a> and would like to be listed here, please
+write to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a> with
+an introduction and a link to the project Web site.  When you do,
 we'll explain more about our evaluation process to you, and get
 started on it quickly.  We look forward to hearing from you!</p>
 
@@ -248,7 +247,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016 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
@@ -258,7 +257,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/07 07:04:59 $
+$Date: 2016/09/17 07:13:32 $
 <!-- timestamp end -->
 </p>
 </div>

Index: distros/po/free-distros.ca.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ca.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- distros/po/free-distros.ca.po       17 Sep 2016 06:51:37 -0000      1.124
+++ distros/po/free-distros.ca.po       17 Sep 2016 07:13:32 -0000      1.125
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2016-09-17 08:50+0200\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -191,7 +192,6 @@
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
-#| msgid "<a href=\"http://librewrt.org/\";>"
 msgid "<a href=\"http://dragora.org\";>"
 msgstr "<a href=\"http://dragora.org\";>"
 
@@ -464,14 +464,6 @@
 "contactar amb nosaltres; ens agradarà saber d'ells."
 
 #. type: Content of: <p>
-#| msgid ""
-#| "If you maintain a distribution that follows the <a href=\"/distros/free-"
-#| "system-distribution-guidelines.html\">Free System Distribution "
-#| "Guidelines</a> and would like to be listed here, please write to us at <a "
-#| "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> with an "
-#| "introduction and a link to the project Web site.  When you do, we'll "
-#| "explain more about our evaluation process to you, and get started on it "
-#| "quickly.  We look forward to hearing from you!"
 msgid ""
 "If you maintain a distribution that follows the <a href=\"/distros/free-"
 "system-distribution-guidelines.html\">Free System Distribution Guidelines</"
@@ -483,8 +475,8 @@
 msgstr ""
 "Si manteniu una distribució que segueix els <a href=\"/distros/free-system-"
 "distribution-guidelines.html\">Criteris de les distribucions de sistemes "
-"lliures</a> i us agradaria que fos a la llista, escriviu-nos si us plau a <a 
href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a> amb una "
+"lliures</a> i us agradaria que fos a la llista, escriviu-nos si us plau a <a "
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> amb una "
 "presentació i un enllaç al web del projecte. Quan ho feu us donarem més "
 "informació sobre el procés d'avaluació i l'iniciarem de seguida. Esperem 
les "
 "vostres notícies!"
@@ -535,7 +527,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 

Index: education/edu-software-tuxpaint.ru.html
===================================================================
RCS file: /web/www/www/education/edu-software-tuxpaint.ru.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- education/edu-software-tuxpaint.ru.html     14 Sep 2016 06:29:29 -0000      
1.7
+++ education/edu-software-tuxpaint.ru.html     17 Sep 2016 07:13:32 -0000      
1.8
@@ -259,7 +259,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/09/14 06:29:29 $
+$Date: 2016/09/17 07:13:32 $
 
 <!-- timestamp end -->
 </p>

Index: education/education.ca.html
===================================================================
RCS file: /web/www/www/education/education.ca.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- education/education.ca.html 11 Jul 2016 08:35:12 -0000      1.37
+++ education/education.ca.html 17 Sep 2016 07:13:32 -0000      1.38
@@ -10,22 +10,27 @@
 <!--#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;
-}
-#content #indepth ul {
-   padding: 0 1em;
-   margin-top: 0;
+#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 -->
 
 
@@ -34,22 +39,7 @@
 </style>
 
 <!--#include virtual="/server/banner.ca.html" -->
-<div id="education-content">
-
-<!-- begin edu navigation bar -->
-<ul id="edu-navigation">
-  <li><a href="/education/edu-contents.html">Índex de continguts</a></li>
-  <li><a href="/education/edu-cases.html">Casos estudiats</a></li>
-  <li><a href="/education/edu-resources.html">Recursos educatius</a></li>
-  <li><a href="/education/edu-projects.html">Projectes educatius</a></li>
-  <li><a href="/education/edu-faq.html">Preguntes freqüents</a></li>
-  <li><a href="/education/edu-team.html">L'equip d'educació</a></li>
-</ul>
-
-<!-- end edu navigation bar -->
-</div>
-
-<!-- id="education-content" -->
+<!--#include virtual="/education/education-menu.ca.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" -->
 <!--#else -->
@@ -58,18 +48,10 @@
 <!--#include virtual="/server/top-addendum.ca.html" -->
 <!--#endif -->
 <!--#endif -->
-<div class="center">
-<h2>Programari lliure i educació</h2>
-</div>
+<h2 class="c">Programari lliure i educació</h2>
 
 <h3>Què té a veure el programari lliure amb l'educació?</h3>
 
-<blockquote class="note"><p>
-Estem buscant jocs educatius lliures, o informació sobre jocs lliures que
-puguin utilitzar-se amb finalitats educatives. Contacteu amb <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
-</p></blockquote>
-
 <p>La llibertat del programari té un paper fonamental a l'educació. Les
 institucions educatives de tots els nivells haurien d'utilitzar i ensenyar
 programari lliure perquè és l'únic que permet assolir les seves missions
@@ -92,7 +74,6 @@
 href="/philosophy/shouldbefree.html">per què el programari hauria de ser
 lliure</a> (en el sentit de llibertat).</p>
 
-
 <h3>Els fonaments</h3>
 <p>El projecte GNU va ser <a href=" /gnu/initial-announcement.html">iniciat</a>
 el 1983 per Richard Stallman per desenvolupar un sistema operatiu lliure: el
@@ -104,21 +85,7 @@
 breument i punt per punt els principis del programari lliure y la seva
 relació amb l'educació.</p>
 
-<blockquote class="note" id="indepth">
-<h3>A fons</h3>
-
-<ul>
-<li>Conegueu les <a href="/education/edu-why.html">raons</a> per les quals les
-institucions educatives haurien d'utilitzar i ensenyar exclusivament
-programari lliure.</li>
-
-<li>Un article de Richard Stallman: <a href="/education/edu-schools.html">Per
-què les escoles haurien d'utilitzar exclusivament programari lliure</a>.</li>
-
-<li>Un article del Dr. V. Sasi Kumar sobre <a
-href="/education/edu-system-india.html">el sistema educatiu a 
l'Índia.</a></li>
-</ul>
-</blockquote>
+<div id="video-container">
 
 <!-- GNUN: localize URL /education/rms-education-es.ogv -->
 <video  id="rms-movie" controls="controls">
@@ -127,7 +94,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, 
@@ -135,9 +102,7 @@
 <a
 
href="http://audio-video.gnu.org/video/rms-education-es-high-sub.en.ogv";>Descarregueu
 i vegeu el vídeo</a> en alta definició amb el format lliure Ogg Theora
-(ogv).</p>
-
-<p>
+(ogv).
 
 <!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. -->
@@ -146,9 +111,7 @@
 href="/education/misc/rms-education-es-transcription.txt">castellà</a> i <a
 href="/education/misc/edu-misc.html#transcription-rms-education">altres
 llengües</a>. 
-</p>
 
-<p>
 
 <!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. -->
@@ -157,8 +120,28 @@
 href="/education/misc//rms-education-es-sub-es.srt">castellà</a> i <a
 href="/education/misc/edu-misc.html#subtitles-rms-education">altres
 llengües</a>. 
-</p>
+</p></div> 
+<!-- /.emph-box -->
+</div>
+
+<div class="edu-note"><p>
+Estem buscant jocs educatius lliures, o informació sobre jocs lliures que
+puguin utilitzar-se amb finalitats educatives. Contacteu amb <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
+</p></div>
 
+<h3 id="indepth">A fons</h3>
+<ul>
+<li>Conegueu les <a href="/education/edu-why.html">raons</a> per les quals les
+institucions educatives haurien d'utilitzar i ensenyar exclusivament
+programari lliure.</li>
+
+<li>Un article de Richard Stallman: <a href="/education/edu-schools.html">Per
+què les escoles haurien d'utilitzar exclusivament programari lliure</a>.</li>
+
+<li>Un article del Dr. V. Sasi Kumar sobre <a
+href="/education/edu-system-india.html">el sistema educatiu a 
l'Índia.</a></li>
+</ul>
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -198,12 +181,11 @@
 col·laborar en la traducció al català del web de GNU.</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>Aquesta pàgina es troba sota la <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ca";>Llicència
-Creative Commons Reconeixement-SenseObraDerivada 3.0 Estats Units
-d'Amèrica</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Llicència Creative
+Commons Reconeixement-SenseObraDerivada 4.0 Internacional</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ca.html" -->
 <div class="translators-credits">
@@ -215,7 +197,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2016/07/11 08:35:12 $
+$Date: 2016/09/17 07:13:32 $
 
 <!-- timestamp end -->
 </p>

Index: education/po/education.ca-en.html
===================================================================
RCS file: /web/www/www/education/po/education.ca-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- education/po/education.ca-en.html   1 Dec 2014 09:58:52 -0000       1.19
+++ education/po/education.ca-en.html   17 Sep 2016 07:13:32 -0000      1.20
@@ -9,41 +9,32 @@
 
 <style type="text/css" media="screen">
 <!--
-#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;
+#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" -->
 
-<div id="education-content">           
-
-<!-- begin edu navigation bar -->
-<ul id="edu-navigation">
-  <li><a href="/education/edu-contents.html">Education Contents</a></li>
-  <li><a href="/education/edu-cases.html">Case Studies</a></li>
-  <li><a href="/education/edu-resources.html">Educational Resources</a></li>
-  <li><a href="/education/edu-projects.html">Education Projects</a></li>
-  <li><a href="/education/edu-faq.html">FAQ</a></li>
-  <li><a href="/education/edu-team.html">The Education Team</a></li>
-</ul>
-<!-- end edu navigation bar -->
-
-</div> <!-- id="education-content" -->
-
+<!--#include virtual="/education/education-menu.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -52,18 +43,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 +70,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 +82,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 +90,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 +108,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 +118,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 +170,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/12/01 09:58:52 $
+$Date: 2016/09/17 07:13:32 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education/po/education.ca.po
===================================================================
RCS file: /web/www/www/education/po/education.ca.po,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- education/po/education.ca.po        17 Sep 2016 06:46:58 -0000      1.67
+++ education/po/education.ca.po        17 Sep 2016 07:13:32 -0000      1.68
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2016-09-17 08:46+0200\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -232,21 +233,18 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid "Copyright &copy; 2011, 2012, 2014 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2011, 2012, 2014, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "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>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
-"Aquesta pàgina es troba sota la <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Llicència Creative 
Commons Reconeixement-SenseObraDerivada 4.0 Internacional</a>."
+"Aquesta pàgina es troba sota la <a rel=\"license\" href=\"http://";
+"creativecommons.org/licenses/by-nd/4.0/\">Llicència Creative Commons "
+"Reconeixement-SenseObraDerivada 4.0 Internacional</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: licenses/gpl-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.ru.html,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- licenses/gpl-faq.ru.html    14 Sep 2016 06:29:31 -0000      1.65
+++ licenses/gpl-faq.ru.html    17 Sep 2016 07:13:32 -0000      1.66
@@ -3826,7 +3826,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/09/14 06:29:31 $
+$Date: 2016/09/17 07:13:32 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/quick-guide-gplv3.ru.html
===================================================================
RCS file: /web/www/www/licenses/quick-guide-gplv3.ru.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- licenses/quick-guide-gplv3.ru.html  14 Sep 2016 06:29:32 -0000      1.30
+++ licenses/quick-guide-gplv3.ru.html  17 Sep 2016 07:13:32 -0000      1.31
@@ -391,7 +391,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/09/14 06:29:32 $
+$Date: 2016/09/17 07:13:32 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/old-licenses/gpl-2.0-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/old-licenses/gpl-2.0-faq.ru.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- licenses/old-licenses/gpl-2.0-faq.ru.html   14 Sep 2016 06:29:32 -0000      
1.37
+++ licenses/old-licenses/gpl-2.0-faq.ru.html   17 Sep 2016 07:13:32 -0000      
1.38
@@ -2485,7 +2485,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/09/14 06:29:32 $
+$Date: 2016/09/17 07:13:32 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/categories.ru.html
===================================================================
RCS file: /web/www/www/philosophy/categories.ru.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- philosophy/categories.ru.html       14 Sep 2016 06:29:32 -0000      1.48
+++ philosophy/categories.ru.html       17 Sep 2016 07:13:32 -0000      1.49
@@ -452,7 +452,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/09/14 06:29:32 $
+$Date: 2016/09/17 07:13:32 $
 
 <!-- timestamp end -->
 </p>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]