www-commits
[Top][All Lists]
Advanced

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

www distros/screenshot.de.html distros/screensh...


From: Yavor Doganov
Subject: www distros/screenshot.de.html distros/screensh...
Date: Mon, 08 Aug 2011 16:38:01 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   11/08/08 16:38:01

Modified files:
        distros        : screenshot.de.html screenshot.pl.html 
        education/po   : education.ca.po education.fr.po education.pot 
        fry            : happy-birthday-to-gnu-in-your-language.sq.html 
        fry/po         : happy-birthday-to-gnu-in-your-language.sq.po 
        graphics       : license-logos.es.html 
        graphics/po    : license-logos.es.po 
        licenses       : translations.pl.html 
        licenses/po    : translations.es.po 
        links/po       : links.es.po 
        server         : footer-text.es.html 
        software       : software.es.html 
        software/po    : software.es.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/screenshot.de.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/screenshot.pl.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ca.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.fr.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.pot?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/fry/happy-birthday-to-gnu-in-your-language.sq.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/fry/po/happy-birthday-to-gnu-in-your-language.sq.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/license-logos.es.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/license-logos.es.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/translations.pl.html?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.es.po?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.es.po?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/server/footer-text.es.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/software/software.es.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.es.po?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: distros/screenshot.de.html
===================================================================
RCS file: /web/www/www/distros/screenshot.de.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- distros/screenshot.de.html  23 Jul 2011 08:41:28 -0000      1.4
+++ distros/screenshot.de.html  8 Aug 2011 16:36:12 -0000       1.5
@@ -58,7 +58,7 @@
 <!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2011/07/23 08:41:28 $
+$Date: 2011/08/08 16:36:12 $
 
 <!-- timestamp end -->
 </p>
@@ -87,7 +87,7 @@
 <!-- English -->
 <li><a href="/distros/screenshot.html">English</a>&nbsp;[en]</li>
 <!-- Polish -->
-<li><a href="/distros/screenshot.plhtml">polski</a>&nbsp;[pl]</li>
+<li><a href="/distros/screenshot.pl.html">polski</a>&nbsp;[pl]</li>
 </ul>
 </div>
 </div>

Index: distros/screenshot.pl.html
===================================================================
RCS file: /web/www/www/distros/screenshot.pl.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- distros/screenshot.pl.html  14 Jul 2011 16:41:23 -0000      1.3
+++ distros/screenshot.pl.html  8 Aug 2011 16:36:12 -0000       1.4
@@ -65,7 +65,7 @@
 <!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2011/07/14 16:41:23 $
+$Date: 2011/08/08 16:36:12 $
 
 <!-- timestamp end -->
 </p>
@@ -94,7 +94,7 @@
 <!-- English -->
 <li><a href="/distros/screenshot.html">English</a>&nbsp;[en]</li>
 <!-- Polish -->
-<li><a href="/distros/screenshot.plhtml">polski</a>&nbsp;[pl]</li>
+<li><a href="/distros/screenshot.pl.html">polski</a>&nbsp;[pl]</li>
 </ul>
 </div>
 </div>

Index: education/po/education.ca.po
===================================================================
RCS file: /web/www/www/education/po/education.ca.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- education/po/education.ca.po        4 May 2011 16:28:18 -0000       1.21
+++ education/po/education.ca.po        8 Aug 2011 16:36:19 -0000       1.22
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: education.ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-30 12:27-0300\n"
+"POT-Creation-Date: 2011-08-08 12:25-0300\n"
 "PO-Revision-Date: 2011-05-04 13:00+0200\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -17,434 +17,145 @@
 
 # type: Content of: <title>
 #. type: Content of: <title>
-msgid "Free Software in Education - GNU Operating System"
+#, fuzzy
+#| msgid "Free Software in Education - GNU Operating System"
+msgid "Free Software and Education - GNU Project - Free Software Foundation"
 msgstr "El programari lliure a l'educació - GNU Operating System"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
-msgid "Free Software Universities"
-msgstr "El programari lliure i les universitats"
+#. type: Content of: <div><h2>
+#, fuzzy
+#| msgid "Free Software in Education"
+msgid "Free Software and Education"
+msgstr "El programari lliure a l'educació"
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"More and more students are considering whether a university teaches computer "
-"science and software development using Free Software when deciding where "
-"they will study. Free Software means that students are free to study how the "
-"programs they use work and to learn how to adapt them for their own needs. "
-"Learning about Free Software can also help in studying software development "
-"ethics and professional practice. If you know of a Free-Software-oriented "
-"university then email <a href=\"mailto:address@hidden";>address@hidden"
-"org</a> to tell us about it so we can list it here."
-msgstr ""
-"Cada cop més estudiants tenen en compte si una universitat ensenya "
-"informàtica i programació utilitzant programari lliure a l'hora de decidir "
-"on estudiaran. El programari lliure significa que els estudiants són lliures 
"
-"d'estudiar com funcionen els programes que utilitzen i d'aprendre com "
-"adaptar-los a les seves necessitats. Aprendre sobre el programari lliure "
-"també pot ajudar a conèixer l'ètica del desenvolupament del programari i 
de "
-"la pràctica professional. Si sabeu d'una universitat orientada al programari 
"
-"lliure escriviu a <a href=\"mailto:address@hidden";>address@hidden</"
-"a> per tal que puguem incloure-la aquí."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-contents.html\">Education Contents</a>"
+msgstr ""
 
-# type: Content of: <h2>
-#. type: Content of: <h2>
-msgid "Is Your School Committed To Free Software?"
-msgstr "La vostra escola està compromesa amb el programari lliure?"
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-cases.html\">Case Studies</a>"
+msgstr ""
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Free Horizon Montessori in Arvada, Colorado has 63 GNU/Linux user systems, "
-"plus 6 GNU/Linux servers. Their favorite apps are Ktouch, TuxTyping, and "
-"Tuxmath."
-msgstr ""
-"L'escola Free Horizon Montessori d'Arvada, Colorado, té 63 ordinadors i sis "
-"servidors amb el sistema GNU/Linux. Els seus programes favorits són Ktouch, "
-"TuxTyping i Tuxmath."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-resources.html\">Educational Resources</a>"
+msgstr ""
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"An elementary school in Ehlerange, in the Sanem commune of Luxembourg, has a "
-"classroom of 28 kids (6-8 years old) with 8 computers running GNU/Linux."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-projects.html\">Education Projects</a>"
 msgstr ""
-"Una escola de primària d'Ehlerange, a la comunitat de Sanem de Luxemburg, 
té "
-"una classe de 22 nens (de 6 a 8 anys) amb vuit ordinadors que funcionen amb "
-"GNU/Linux."
 
-#. type: Content of: <p>
-msgid ""
-"The ECEN (Escuela Cristiana Evang&eacute;lica de Neuqu&eacute;n) is a "
-"Christian school located in the capital city of Neuquen, in the Argentine "
-"Patagonia region.  The school has migrated all 40 student work stations as "
-"well as desktops in the school library and office to the GNU operating "
-"system."
-msgstr ""
-"La ECEN (Escola Cristiana Evangèlica de Neuquén) es una escola cristiana de 
"
-"la ciutat de Neuquén, a la Patagònia argentina. Els 40 ordinadors dels "
-"estudiants i els portàtils de la biblioteca i l'oficina han migrat al "
-"sistema operatiu GNU."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-faq.html\">FAQ</a>"
+msgstr ""
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"If your school is committed to Free Software then we want to hear from you "
-"so that we can list it here. Has your school migrated to GNU/Linux, or has "
-"your school adopted the firm policy of rejecting proprietary software? If "
-"so, contact <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
-"a> to let us know."
-msgstr ""
-"Si la vostra escola està compromesa amb el programari lliure, ens agradaria "
-"que ens ho diguéssiu per tal d'incloure-la aquí. Heu migrat al programari "
-"lliure, o ha adoptat la vostra escola la política de rebutjar fermament el "
-"programari propietari? Si és així, contacteu amb <a href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a> i feu-nos-ho saber."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-team.html\">The Education Team</a>"
+msgstr ""
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
-msgid "Free Software in Education"
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Free Software in Education"
+msgid "What Does Free Software Have To Do With Education?"
 msgstr "El programari lliure a l'educació"
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/philosophy/free-sw.html\">Free Software</a> can be a valuable "
-"resource in education.  Not only can it be technically or pedagogically "
-"superior to proprietary alternatives, but it can also promote the values of "
-"the GNU project in the schools:"
-msgstr ""
-"El <a href=\"/philosophy/free-sw.ca.html\">programari lliure</a> pot ser un "
-"recurs valuós a l'àmbit educatiu. No només pot ser tècnicament i "
-"pedagògicament superior a les alternatives de tipus propietari, sinó que a "
-"més pot promoure els valors del projecte GNU a les escoles:"
-
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
-msgid "Freedom"
-msgstr "Llibertat"
-
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
-msgid "Cooperation"
-msgstr "Cooperació"
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Today, many students and schools don't even know about Free Software or the "
-"great advantages it brings.  At the same time, software knowledgeability is "
-"required for more and more tasks, and Free Software has a distinct advantage "
-"in this field.  If you are one of those kept in the dark until now, please "
-"read some of the informational material we've put together here."
-msgstr ""
-"Avui dia, molts estudiants i escoles ni tan sols coneixen el programari "
-"lliure i els seus grans avantatges. Al mateix temps, cada vegada més tasques 
"
-"requereixen el coneixement del programari, i el programari lliure té un "
-"avantatge clar en aquest camp. Si sou un d'aquells que fins ara estaven a "
-"les fosques, llegiu si us plau algun dels materials informatius que hem "
-"reunit aquí."
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Here is some information we have collected about the relationship between "
-"the GNU project and education (you can see more relationships by reading the "
-"<a href=\"/gnu/thegnuproject.html\">history of the GNU project</a>).  Please "
-"send your comments and suggestions about this information to GNU &amp; "
-"Education mailing list <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>."
-msgstr ""
-"Aquí hi trobareu alguna informació que hem recollit sobre la relació entre 
"
-"el projecte GNU i l'educació (podeu veure altres relacions llegint la <a "
-"href=\"/gnu/thegnuproject.ca.html\">història del projecte GNU</a>). Envieu "
-"si us plau els vostres comentaris i suggeriments sobre aquest apartat a la "
-"llista de correu de GNU i Educació <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>."
-
-# type: Content of: <h3>
-#. type: Content of: <h3>
-msgid "Why?"
-msgstr "Per què?"
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"We're working closely with a new group, Free Software in Education, to "
-"produce these introductions. If you are not completely familiar with free "
-"software, learn why it's right for you!"
-msgstr ""
-"Estem treballant amb el grup Free Software in Education per produir aquests "
-"materials. Si no esteu familiaritzats amb el programari lliure, aprengueu "
-"per què és bo per vosaltres!"
-
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"Each distributable, easily chewable material, such as the Students bulletin "
-"posting, leads to an online portal, tailored to the particular group, at "
-"which the interested can find out more about what free software means, learn "
-"how to use it, and of course get it."
-msgstr ""
-"Cada material distribuïble, com ara el butlletí d'estudiants, condueix a un 
"
-"portal en línia mantingut per cert grup en particular, on els interessats "
-"poden trobar més informació sobre el sentit del programari lliure, aprendre 
"
-"a utilitzar-lo i, naturalment, obtenir-lo."
+"Software freedom has an especially important 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 students to be good members of "
+"their community. The source code and the methods of Free Software are part "
+"of human knowledge. On the contrary, proprietary software is secret, "
+"restricted knowledge, which is the opposite of the mission of educational "
+"institutions. Free Software supports education, proprietary software forbids "
+"education."
+msgstr ""
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"A GNU idea, the Free Universal Encyclopedia and Learning Resource, became <a "
-"href=\"http://www.wikipedia.org\";>Wikipedia</a>.  Learn about <a href=\"/"
-"encyclopedia/free-encyclopedia.html\">why we need such a resource, and why "
-"you should care about it</a>."
-msgstr ""
-"Una idea de GNU, la Free Universal Encyclopedia and Learning Resource, es va "
-"convertir en la <a href=\"http://www.wikipedia.org\";>Viquipèdia</a>. "
-"Sapigueu més sobre <a href=\"/encyclopedia/free-encyclopedia.html\">per què 
"
-"necessitem un recurs com aquest i per què hauríeu de posar-hi atenció</a>."
+"Free Software is not just a technical question; it is an ethical, social, "
+"and political question. It is a question of the human rights that the users "
+"of software ought to have. Freedom and cooperation are essential values of "
+"Free Software. The GNU System implements these values and the principle of "
+"sharing, since sharing is good and beneficial to human progress."
+msgstr ""
 
-# type: Content of: <p>
 #. type: Content of: <p>
-msgid "Articles:"
-msgstr "Articles:"
-
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
 msgid ""
-"<a href=\"/philosophy/schools.html\">Why schools should exclusively use free "
-"software</a>, by Richard Stallman."
+"To learn more, see the <a href=\" /philosophy/free-sw.html\">Free Software "
+"definition</a> and our article on <a href=\" /philosophy/shouldbefree.html"
+"\">why software should be free</a> (as in freedom)."
 msgstr ""
-"<a href=\"/philosophy/schools.ca.html\">Per què les escoles haurien "
-"d'utilitzar exclusivament programari lliure</a>, per Richard Stallman."
 
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://fsfeurope.org/projects/education/argumentation.en.html";
-"\">Why give precedence to free software at school?</a>, by Jean Peyratout."
+#. type: Content of: <div><div><h2>
+msgid "The Basics"
 msgstr ""
-"<a href=\"http://fsfeurope.org/projects/education/argumentation.en.html";
-"\">Per què donar preferència al programari lliure a l'escola?</a>, per Jean 
"
-"Peyratout."
-
-# type: Content of: <h3>
-#. type: Content of: <h3>
-msgid "How?"
-msgstr "Com?"
 
-# type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Even though the education demographic is relatively tech-savvy, it still "
-"needs help to learn free operating systems such as GNU.  Students, teachers, "
-"and administrators have some tools at their disposal with which to learn."
-msgstr ""
-"Tot i que la comunitat educativa és relativament competent en qüestions de "
-"tecnologia, encara necessita ajuda per aprendre el funcionament de sistemes "
-"operatius lliures com GNU. Els estudiants, els professors i els "
-"administradors tenen a la seva disposició algunes eines d'aprenentatge."
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Our advice is to simply install a free operating system, or find an existing "
-"installation, and learn how to use it simply by using it."
+"In this six-minutes video <a href=\"http://www.fsf.org/about/leadership/#rms";
+"\">Richard Stallman</a> explains briefly and to the point the principles of "
+"Free Software and how they connect to education."
 msgstr ""
-"El nostre consell és, simplement, instal·lar un sistema operatiu lliure, o "
-"buscar-ne algun d'instal·lat, i aprendre com funciona simplement utilitzant-"
-"lo."
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Mario Fux <a href=\"mailto:address@hidden";>&lt;address@hidden></a> writes "
-"<a href=\"http://fsfeurope.org/projects/education/tgs/tgs.en.html\";> &ldquo;"
-"TUX&amp;address@hidden&rdquo;</a> for <a 
href=\"http://fsfeurope.org/projects/";
-"education/education.en.html\">FSF Europe's education project</a>.  It "
-"reviews a piece of free education software in every issue."
-msgstr ""
-"Mario Fux <a href=\"mailto:address@hidden";>&lt;address@hidden></a> escriu "
-"el butlletí <a 
href=\"http://fsfeurope.org/projects/education/tgs/tgs.en.html";
-"\">&ldquo;TUX&amp;address@hidden&rdquo;</a> per al <a 
href=\"http://fsfeurope.";
-"org/projects/education/education.en.html\">projecte educació de la FSF "
-"Europa</a>. A cada número comenta un programa educatiu."
-
-# type: Content of: <h3>
-#. type: Content of: <h3>
-msgid "Events"
-msgstr "Esdeveniments"
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Some projects which promotes only free software and education are listed "
-"below.  Please let us know of other educational events that follow the <a "
-"href=\"/philosophy/\">GNU Philosophy</a>, by writing to GNU &amp; Education "
-"list at <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"A sota trobareu una llista d'alguns projectes que promouen el programari "
-"lliure a l'educació. Si us plau, envieu-nos notícies d'altres esdeveniments 
"
-"en l'àmbit educatiu que segueixin la <a 
href=\"/philosophy/philosophy.ca.html"
-"\">filosofia de GNU</a> escrivint a la llista de correu de GNU i Educació <a 
"
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-
-# type: Content of: <h3>
-#. type: Content of: <h3>
-msgid "Who's using it?"
-msgstr "Qui l'està utilitzant?"
 
-# type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"There are some groups that maintain statistics of schools that use free "
-"software in several regions of the world:"
+"Transcriptions of this video are available in <a href=\"/education/misc/rms-"
+"education-es-translation-to-en.txt\"> English</a> and <a href=\"/education/"
+"misc/rms-education-es-transcription.txt\"> Spanish.</a>"
 msgstr ""
-"Alguns grups mantenen estadístiques d'escoles que utilitzen programari "
-"lliure en algunes regions del món:"
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"We want to present some stories of classrooms and courses where free "
-"software is being used.  Whether your usage is creative or not, please share "
-"your story.  If you do, please send it to <a href=\"mailto:address@hidden";
-"\">&lt;address@hidden&gt;</a>."
-msgstr ""
-"Ens agradaria presentar algunes històries de classes i cursos on s'estigui "
-"utilitzant programari lliure. Tant si el vostre ús és creatiu com si no, "
-"compartiu si us plau la vostra història. Per fer-ho, envieu-la si us plau a "
-"<a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-
-# type: Content of: <h3>
-#. type: Content of: <h3>
-msgid "Advocacy"
-msgstr "Promoció"
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"Before we can advocate free software on a local level, as the Free Software "
-"in Education project would like to do, we need to figure out <em>how</em> to "
-"do that.  We are looking for articles in our area.  If you know a good link "
-"about free software and education, please contact us."
-msgstr ""
-"Abans de poder defensar el programari lliure a nivell local, com ens "
-"agradaria fer-ho al projecte Free Software in Education, necessitem pensar "
-"en com fer-ho. Estem buscant articles en aquesta àrea. Si sabeu d'algun bon "
-"enllaç sobre programari lliure i educació, contacteu si us plau amb "
-"nosaltres."
-
-# type: Content of: <h3>
-#. type: Content of: <h3>
-msgid "Free Education Software"
-msgstr "Programari educatiu lliure"
 
-# type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"We maintain a <a href=\"/education/software.html\">list of free software and "
-"free software projects for education</a>."
+"SubRip subtitle files are also available for download in <a href=\"/"
+"education/misc//rms-education-es-sub-en.srt\"> English</a> and <a href=\"/"
+"education/misc//rms-education-es-sub-es.srt\">Spanish.</a>"
 msgstr ""
-"Mantenim una <a href=\"/education/software.html\">llista de programari "
-"educatiu lliure i de projectes de programari educatiu lliure</a>."
-
-# type: Content of: <h3>
-#. type: Content of: <h3>
-msgid "Other Groups and Projects"
-msgstr "Altres grups i projectes"
 
-# type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"There are several groups and projects that are working with Free Software "
-"and Education.  A few of them are listed below. If your project supports "
-"only free software and it is not listed here, please send an email to <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Existeixen diversos grups i projectes que estan treballant amb Free Software "
-"in Education. Alguns d'ells es llisten a continuació. Si el vostre projecte "
-"dóna suport exclusivament al programari lliure i no està llistat aquí, "
-"envieu-nos si us plau un correu electrònic a <a href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>."
+"Download video as <a href=\"http://audio-video.gnu.org/video/rms-education-";
+"es-sub-en.ogv\"> Ogg Theora</a>."
+msgstr ""
 
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"/education/freelearning.html\">Free Learning Resources</a> is "
-"about bringing the principles of free software to educational materials and "
-"otherwise general knowledge."
-msgstr ""
-"<a href=\"/education/freelearning.html\">Free Learning Resources</a> intenta "
-"portar els principis del programari lliure als materials educatius i al "
-"coneixement en general."
-
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://ftacademy.org/\";>Free Technology Academy</a> \"offers an "
-"online master level programme with course modules about Free Technologies. "
-"Learners can choose to enrol in an individual course or register for the "
-"whole programme. Tuition takes place online in the FTA virtual campus and is "
-"performed by teaching staff from the partner universities. Credits obtained "
-"in the FTA programme are recognised by these universities. The full master "
-"programme can be concluded at one of the universities.\""
-msgstr ""
-"La <a href=\"http://ftacademy.org/\";>Free Technology Academy</a> \"ofereix "
-"un programa màster en línia en diferents mòduls sobre tecnologies lliures. 
"
-"Els estudiants poden escollir entre matricular-se en un curs individual o en "
-"el programa complet. L'ensenyament té lloc al campus virtual de la FTA i "
-"l'imparteixen professors d'universitats associades. Les universitats "
-"reconeixen i convaliden els crèdits aprovats. Es pot acabar el programa "
-"complet en una de les universitats asociades.\""
+"The GNU Project was <a href=\" /gnu/initial-announcement.html\">launched</a> "
+"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."
+msgstr ""
 
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://www.gleducar.org.ar\";>Gleducar</a>, a GNU at education "
-"Argentinian project."
+#. type: Content of: <div><div><h2>
+msgid "In Depth"
 msgstr ""
-"<a href=\"http://www.gleducar.org.ar\";>Gleducar</a>, un projecte argentí "
-"sobre GNU a l'educació."
 
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"http://www.ofset.org\";>OFSET</a>, The Organization for Free "
-"Software in Education and Teaching, promotes the use of free software in "
-"education. <a href=\"http://www.ofset.org/freeduc-cd\";>Take a look at "
-"Freeduc-cd</a>, a live-cd for education setup by Ofset."
-msgstr ""
-"<a href=\"http://www.ofset.org\";>OFSET</a>. L'Organització per al Programari 
"
-"Lliure a l'Educació i l'Ensenyament promou l'ús del programari lliure a "
-"l'àmbit educatiu. <a href=\"http://www.ofset.org/freeduc-cd\";>Doneu un cop "
-"d'ull a Freeduc-cd</a>, un CD educatiu autoarrancable preparat per Ofset."
+"Learn about the <a href=\"/education/edu-why.html\">Reasons Why</a> "
+"educational institutions should use and teach exclusively Free Software."
+msgstr ""
 
 # type: Content of: <ul><li>
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/schools.html\">Why schools should exclusively use "
+#| "free software</a>, by Richard Stallman."
 msgid ""
-"<a href=\"http://www.sugarlabs.org\";>Sugar Labs</a>, which provides the "
-"Sugar Learning Environment, promoting sharing, collaborative learning, and "
-"reflection."
-msgstr ""
-"<a href=\"http://www.sugarlabs.org\";>Sugar Labs</a>, que proporciona "
-"l'entorn d'aprenentatge Sugar, promou la reflexió i l'aprenentatge "
-"col·laboratiu."
-
-# type: Content of: <h3>
-#. type: Content of: <h3>
-msgid "You can help us"
-msgstr "Podeu ajudar-nos"
+"An article by Richard Stallman: <a href=\"/philosophy/schools.html\">Why "
+"Schools Should Exclusively Use Free Software</a>"
+msgstr ""
+"<a href=\"/philosophy/schools.ca.html\">Per què les escoles haurien "
+"d'utilitzar exclusivament programari lliure</a>, per Richard Stallman."
 
-# type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"If you know any educational project based on Free Software, please submit "
-"the project page and a brief description to <a href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>."
-msgstr ""
-"Si coneixeu algun projecte educatiu basat en programari lliure, envieu si us "
-"plau la pàgina del projecte i una breu descripció a <a href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a>."
+"An article by Dr. V. Sasi Kumar on the <a href=\"/education/edu-system-india."
+"html\">education system in India.</a>"
+msgstr ""
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -454,10 +165,15 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
-"contact</a> the FSF."
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
+#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
+#| "contact</a> the FSF."
+msgid ""
+"Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+"\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
+"to contact</a> the FSF."
 msgstr ""
 "Envieu les vostres preguntes sobre la FSF i GNU a <a 
href=\"mailto:address@hidden";
 "org\"><em>address@hidden</em></a>. També hi ha <a 
href=\"/contact/contact.ca."
@@ -487,17 +203,17 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2010 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010 Free Software Foundation, Inc."
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
-"Verbatim copying and distribution of this entire article is permitted in any "
-"medium, provided this notice is preserved."
+"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>."
 msgstr ""
-"Es permet realitzar i distribuir còpies literals d'aquest article en "
-"qualsevol medi sense pagament de drets, sempre que es conservi aquesta nota."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -516,6 +232,400 @@
 msgid "Translations of this page"
 msgstr "Traduccions d'aquesta pàgina"
 
+# type: Content of: <h2>
+#~ msgid "Free Software Universities"
+#~ msgstr "El programari lliure i les universitats"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "More and more students are considering whether a university teaches "
+#~ "computer science and software development using Free Software when "
+#~ "deciding where they will study. Free Software means that students are "
+#~ "free to study how the programs they use work and to learn how to adapt "
+#~ "them for their own needs. Learning about Free Software can also help in "
+#~ "studying software development ethics and professional practice. If you "
+#~ "know of a Free-Software-oriented university then email <a href=\"mailto:";
+#~ "address@hidden">address@hidden</a> to tell us about it so we can "
+#~ "list it here."
+#~ msgstr ""
+#~ "Cada cop més estudiants tenen en compte si una universitat ensenya "
+#~ "informàtica i programació utilitzant programari lliure a l'hora de "
+#~ "decidir on estudiaran. El programari lliure significa que els estudiants "
+#~ "són lliures d'estudiar com funcionen els programes que utilitzen i "
+#~ "d'aprendre com adaptar-los a les seves necessitats. Aprendre sobre el "
+#~ "programari lliure també pot ajudar a conèixer l'ètica del 
desenvolupament "
+#~ "del programari i de la pràctica professional. Si sabeu d'una universitat "
+#~ "orientada al programari lliure escriviu a <a href=\"mailto:address@hidden";
+#~ "org\">address@hidden</a> per tal que puguem incloure-la aquí."
+
+# type: Content of: <h2>
+#~ msgid "Is Your School Committed To Free Software?"
+#~ msgstr "La vostra escola està compromesa amb el programari lliure?"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Free Horizon Montessori in Arvada, Colorado has 63 GNU/Linux user "
+#~ "systems, plus 6 GNU/Linux servers. Their favorite apps are Ktouch, "
+#~ "TuxTyping, and Tuxmath."
+#~ msgstr ""
+#~ "L'escola Free Horizon Montessori d'Arvada, Colorado, té 63 ordinadors i "
+#~ "sis servidors amb el sistema GNU/Linux. Els seus programes favorits són "
+#~ "Ktouch, TuxTyping i Tuxmath."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "An elementary school in Ehlerange, in the Sanem commune of Luxembourg, "
+#~ "has a classroom of 28 kids (6-8 years old) with 8 computers running GNU/"
+#~ "Linux."
+#~ msgstr ""
+#~ "Una escola de primària d'Ehlerange, a la comunitat de Sanem de Luxemburg, 
"
+#~ "té una classe de 22 nens (de 6 a 8 anys) amb vuit ordinadors que "
+#~ "funcionen amb GNU/Linux."
+
+#~ msgid ""
+#~ "The ECEN (Escuela Cristiana Evang&eacute;lica de Neuqu&eacute;n) is a "
+#~ "Christian school located in the capital city of Neuquen, in the Argentine "
+#~ "Patagonia region.  The school has migrated all 40 student work stations "
+#~ "as well as desktops in the school library and office to the GNU operating "
+#~ "system."
+#~ msgstr ""
+#~ "La ECEN (Escola Cristiana Evangèlica de Neuquén) es una escola cristiana 
"
+#~ "de la ciutat de Neuquén, a la Patagònia argentina. Els 40 ordinadors 
dels "
+#~ "estudiants i els portàtils de la biblioteca i l'oficina han migrat al "
+#~ "sistema operatiu GNU."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "If your school is committed to Free Software then we want to hear from "
+#~ "you so that we can list it here. Has your school migrated to GNU/Linux, "
+#~ "or has your school adopted the firm policy of rejecting proprietary "
+#~ "software? If so, contact <a href=\"mailto:address@hidden";>&lt;"
+#~ "address@hidden&gt;</a> to let us know."
+#~ msgstr ""
+#~ "Si la vostra escola està compromesa amb el programari lliure, ens "
+#~ "agradaria que ens ho diguéssiu per tal d'incloure-la aquí. Heu migrat al 
"
+#~ "programari lliure, o ha adoptat la vostra escola la política de rebutjar "
+#~ "fermament el programari propietari? Si és així, contacteu amb <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a> i feu-nos-ho "
+#~ "saber."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "<a href=\"/philosophy/free-sw.html\">Free Software</a> can be a valuable "
+#~ "resource in education.  Not only can it be technically or pedagogically "
+#~ "superior to proprietary alternatives, but it can also promote the values "
+#~ "of the GNU project in the schools:"
+#~ msgstr ""
+#~ "El <a href=\"/philosophy/free-sw.ca.html\">programari lliure</a> pot ser "
+#~ "un recurs valuós a l'àmbit educatiu. No només pot ser tècnicament i "
+#~ "pedagògicament superior a les alternatives de tipus propietari, sinó que 
"
+#~ "a més pot promoure els valors del projecte GNU a les escoles:"
+
+# type: Content of: <ul><li>
+#~ msgid "Freedom"
+#~ msgstr "Llibertat"
+
+# type: Content of: <ul><li>
+#~ msgid "Cooperation"
+#~ msgstr "Cooperació"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Today, many students and schools don't even know about Free Software or "
+#~ "the great advantages it brings.  At the same time, software "
+#~ "knowledgeability is required for more and more tasks, and Free Software "
+#~ "has a distinct advantage in this field.  If you are one of those kept in "
+#~ "the dark until now, please read some of the informational material we've "
+#~ "put together here."
+#~ msgstr ""
+#~ "Avui dia, molts estudiants i escoles ni tan sols coneixen el programari "
+#~ "lliure i els seus grans avantatges. Al mateix temps, cada vegada més "
+#~ "tasques requereixen el coneixement del programari, i el programari lliure "
+#~ "té un avantatge clar en aquest camp. Si sou un d'aquells que fins ara "
+#~ "estaven a les fosques, llegiu si us plau algun dels materials informatius "
+#~ "que hem reunit aquí."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Here is some information we have collected about the relationship between "
+#~ "the GNU project and education (you can see more relationships by reading "
+#~ "the <a href=\"/gnu/thegnuproject.html\">history of the GNU project</a>).  "
+#~ "Please send your comments and suggestions about this information to GNU "
+#~ "&amp; Education mailing list <a href=\"mailto:address@hidden";>&lt;"
+#~ "address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Aquí hi trobareu alguna informació que hem recollit sobre la relació "
+#~ "entre el projecte GNU i l'educació (podeu veure altres relacions llegint "
+#~ "la <a href=\"/gnu/thegnuproject.ca.html\">història del projecte GNU</a>). 
"
+#~ "Envieu si us plau els vostres comentaris i suggeriments sobre aquest "
+#~ "apartat a la llista de correu de GNU i Educació <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>."
+
+# type: Content of: <h3>
+#~ msgid "Why?"
+#~ msgstr "Per què?"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "We're working closely with a new group, Free Software in Education, to "
+#~ "produce these introductions. If you are not completely familiar with free "
+#~ "software, learn why it's right for you!"
+#~ msgstr ""
+#~ "Estem treballant amb el grup Free Software in Education per produir "
+#~ "aquests materials. Si no esteu familiaritzats amb el programari lliure, "
+#~ "aprengueu per què és bo per vosaltres!"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Each distributable, easily chewable material, such as the Students "
+#~ "bulletin posting, leads to an online portal, tailored to the particular "
+#~ "group, at which the interested can find out more about what free software "
+#~ "means, learn how to use it, and of course get it."
+#~ msgstr ""
+#~ "Cada material distribuïble, com ara el butlletí d'estudiants, condueix a 
"
+#~ "un portal en línia mantingut per cert grup en particular, on els "
+#~ "interessats poden trobar més informació sobre el sentit del programari "
+#~ "lliure, aprendre a utilitzar-lo i, naturalment, obtenir-lo."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "A GNU idea, the Free Universal Encyclopedia and Learning Resource, became "
+#~ "<a href=\"http://www.wikipedia.org\";>Wikipedia</a>.  Learn about <a href="
+#~ "\"/encyclopedia/free-encyclopedia.html\">why we need such a resource, and "
+#~ "why you should care about it</a>."
+#~ msgstr ""
+#~ "Una idea de GNU, la Free Universal Encyclopedia and Learning Resource, es "
+#~ "va convertir en la <a href=\"http://www.wikipedia.org\";>Viquipèdia</a>. "
+#~ "Sapigueu més sobre <a href=\"/encyclopedia/free-encyclopedia.html\">per "
+#~ "què necessitem un recurs com aquest i per què hauríeu de posar-hi "
+#~ "atenció</a>."
+
+# type: Content of: <p>
+#~ msgid "Articles:"
+#~ msgstr "Articles:"
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"http://fsfeurope.org/projects/education/argumentation.en.html";
+#~ "\">Why give precedence to free software at school?</a>, by Jean Peyratout."
+#~ msgstr ""
+#~ "<a href=\"http://fsfeurope.org/projects/education/argumentation.en.html";
+#~ "\">Per què donar preferència al programari lliure a l'escola?</a>, per "
+#~ "Jean Peyratout."
+
+# type: Content of: <h3>
+#~ msgid "How?"
+#~ msgstr "Com?"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Even though the education demographic is relatively tech-savvy, it still "
+#~ "needs help to learn free operating systems such as GNU.  Students, "
+#~ "teachers, and administrators have some tools at their disposal with which "
+#~ "to learn."
+#~ msgstr ""
+#~ "Tot i que la comunitat educativa és relativament competent en qüestions "
+#~ "de tecnologia, encara necessita ajuda per aprendre el funcionament de "
+#~ "sistemes operatius lliures com GNU. Els estudiants, els professors i els "
+#~ "administradors tenen a la seva disposició algunes eines d'aprenentatge."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Our advice is to simply install a free operating system, or find an "
+#~ "existing installation, and learn how to use it simply by using it."
+#~ msgstr ""
+#~ "El nostre consell és, simplement, instal·lar un sistema operatiu lliure, 
"
+#~ "o buscar-ne algun d'instal·lat, i aprendre com funciona simplement "
+#~ "utilitzant-lo."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Mario Fux <a href=\"mailto:address@hidden";>&lt;address@hidden></a> "
+#~ "writes <a href=\"http://fsfeurope.org/projects/education/tgs/tgs.en.html";
+#~ "\"> &ldquo;TUX&amp;address@hidden&rdquo;</a> for <a 
href=\"http://fsfeurope.";
+#~ "org/projects/education/education.en.html\">FSF Europe's education "
+#~ "project</a>.  It reviews a piece of free education software in every "
+#~ "issue."
+#~ msgstr ""
+#~ "Mario Fux <a href=\"mailto:address@hidden";>&lt;address@hidden></a> "
+#~ "escriu el butlletí <a href=\"http://fsfeurope.org/projects/education/tgs/";
+#~ "tgs.en.html\">&ldquo;TUX&amp;address@hidden&rdquo;</a> per al <a href="
+#~ "\"http://fsfeurope.org/projects/education/education.en.html\";>projecte "
+#~ "educació de la FSF Europa</a>. A cada número comenta un programa 
educatiu."
+
+# type: Content of: <h3>
+#~ msgid "Events"
+#~ msgstr "Esdeveniments"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Some projects which promotes only free software and education are listed "
+#~ "below.  Please let us know of other educational events that follow the <a "
+#~ "href=\"/philosophy/\">GNU Philosophy</a>, by writing to GNU &amp; "
+#~ "Education list at <a href=\"mailto:address@hidden";>&lt;address@hidden"
+#~ "org&gt;</a>."
+#~ msgstr ""
+#~ "A sota trobareu una llista d'alguns projectes que promouen el programari "
+#~ "lliure a l'educació. Si us plau, envieu-nos notícies d'altres "
+#~ "esdeveniments en l'àmbit educatiu que segueixin la <a href=\"/philosophy/"
+#~ "philosophy.ca.html\">filosofia de GNU</a> escrivint a la llista de correu "
+#~ "de GNU i Educació <a href=\"mailto:address@hidden";>&lt;address@hidden"
+#~ "org&gt;</a>."
+
+# type: Content of: <h3>
+#~ msgid "Who's using it?"
+#~ msgstr "Qui l'està utilitzant?"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "There are some groups that maintain statistics of schools that use free "
+#~ "software in several regions of the world:"
+#~ msgstr ""
+#~ "Alguns grups mantenen estadístiques d'escoles que utilitzen programari "
+#~ "lliure en algunes regions del món:"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "We want to present some stories of classrooms and courses where free "
+#~ "software is being used.  Whether your usage is creative or not, please "
+#~ "share your story.  If you do, please send it to <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Ens agradaria presentar algunes històries de classes i cursos on "
+#~ "s'estigui utilitzant programari lliure. Tant si el vostre ús és creatiu "
+#~ "com si no, compartiu si us plau la vostra història. Per fer-ho, envieu-la 
"
+#~ "si us plau a <a href=\"mailto:address@hidden";>&lt;address@hidden"
+#~ "org&gt;</a>."
+
+# type: Content of: <h3>
+#~ msgid "Advocacy"
+#~ msgstr "Promoció"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Before we can advocate free software on a local level, as the Free "
+#~ "Software in Education project would like to do, we need to figure out "
+#~ "<em>how</em> to do that.  We are looking for articles in our area.  If "
+#~ "you know a good link about free software and education, please contact us."
+#~ msgstr ""
+#~ "Abans de poder defensar el programari lliure a nivell local, com ens "
+#~ "agradaria fer-ho al projecte Free Software in Education, necessitem "
+#~ "pensar en com fer-ho. Estem buscant articles en aquesta àrea. Si sabeu "
+#~ "d'algun bon enllaç sobre programari lliure i educació, contacteu si us "
+#~ "plau amb nosaltres."
+
+# type: Content of: <h3>
+#~ msgid "Free Education Software"
+#~ msgstr "Programari educatiu lliure"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "We maintain a <a href=\"/education/software.html\">list of free software "
+#~ "and free software projects for education</a>."
+#~ msgstr ""
+#~ "Mantenim una <a href=\"/education/software.html\">llista de programari "
+#~ "educatiu lliure i de projectes de programari educatiu lliure</a>."
+
+# type: Content of: <h3>
+#~ msgid "Other Groups and Projects"
+#~ msgstr "Altres grups i projectes"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "There are several groups and projects that are working with Free Software "
+#~ "and Education.  A few of them are listed below. If your project supports "
+#~ "only free software and it is not listed here, please send an email to <a "
+#~ "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Existeixen diversos grups i projectes que estan treballant amb Free "
+#~ "Software in Education. Alguns d'ells es llisten a continuació. Si el "
+#~ "vostre projecte dóna suport exclusivament al programari lliure i no està 
"
+#~ "llistat aquí, envieu-nos si us plau un correu electrònic a <a href="
+#~ "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"/education/freelearning.html\">Free Learning Resources</a> is "
+#~ "about bringing the principles of free software to educational materials "
+#~ "and otherwise general knowledge."
+#~ msgstr ""
+#~ "<a href=\"/education/freelearning.html\">Free Learning Resources</a> "
+#~ "intenta portar els principis del programari lliure als materials "
+#~ "educatius i al coneixement en general."
+
+#~ msgid ""
+#~ "<a href=\"http://ftacademy.org/\";>Free Technology Academy</a> \"offers an "
+#~ "online master level programme with course modules about Free "
+#~ "Technologies. Learners can choose to enrol in an individual course or "
+#~ "register for the whole programme. Tuition takes place online in the FTA "
+#~ "virtual campus and is performed by teaching staff from the partner "
+#~ "universities. Credits obtained in the FTA programme are recognised by "
+#~ "these universities. The full master programme can be concluded at one of "
+#~ "the universities.\""
+#~ msgstr ""
+#~ "La <a href=\"http://ftacademy.org/\";>Free Technology Academy</a> "
+#~ "\"ofereix un programa màster en línia en diferents mòduls sobre "
+#~ "tecnologies lliures. Els estudiants poden escollir entre matricular-se en "
+#~ "un curs individual o en el programa complet. L'ensenyament té lloc al "
+#~ "campus virtual de la FTA i l'imparteixen professors d'universitats "
+#~ "associades. Les universitats reconeixen i convaliden els crèdits "
+#~ "aprovats. Es pot acabar el programa complet en una de les universitats "
+#~ "asociades.\""
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"http://www.gleducar.org.ar\";>Gleducar</a>, a GNU at education "
+#~ "Argentinian project."
+#~ msgstr ""
+#~ "<a href=\"http://www.gleducar.org.ar\";>Gleducar</a>, un projecte argentí "
+#~ "sobre GNU a l'educació."
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"http://www.ofset.org\";>OFSET</a>, The Organization for Free "
+#~ "Software in Education and Teaching, promotes the use of free software in "
+#~ "education. <a href=\"http://www.ofset.org/freeduc-cd\";>Take a look at "
+#~ "Freeduc-cd</a>, a live-cd for education setup by Ofset."
+#~ msgstr ""
+#~ "<a href=\"http://www.ofset.org\";>OFSET</a>. L'Organització per al "
+#~ "Programari Lliure a l'Educació i l'Ensenyament promou l'ús del 
programari "
+#~ "lliure a l'àmbit educatiu. <a href=\"http://www.ofset.org/freeduc-cd";
+#~ "\">Doneu un cop d'ull a Freeduc-cd</a>, un CD educatiu autoarrancable "
+#~ "preparat per Ofset."
+
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"http://www.sugarlabs.org\";>Sugar Labs</a>, which provides the "
+#~ "Sugar Learning Environment, promoting sharing, collaborative learning, "
+#~ "and reflection."
+#~ msgstr ""
+#~ "<a href=\"http://www.sugarlabs.org\";>Sugar Labs</a>, que proporciona "
+#~ "l'entorn d'aprenentatge Sugar, promou la reflexió i l'aprenentatge "
+#~ "col·laboratiu."
+
+# type: Content of: <h3>
+#~ msgid "You can help us"
+#~ msgstr "Podeu ajudar-nos"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "If you know any educational project based on Free Software, please submit "
+#~ "the project page and a brief description to <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Si coneixeu algun projecte educatiu basat en programari lliure, envieu si "
+#~ "us plau la pàgina del projecte i una breu descripció a <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Verbatim copying and distribution of this entire article is permitted in "
+#~ "any medium, provided this notice is preserved."
+#~ msgstr ""
+#~ "Es permet realitzar i distribuir còpies literals d'aquest article en "
+#~ "qualsevol medi sense pagament de drets, sempre que es conservi aquesta "
+#~ "nota."
+
 # type: Content of: <ul><li>
 #~ msgid ""
 #~ "<a href=\"http://www.rittershofer.de/info/linux/linout.htm\";>Germany</a>, "

Index: education/po/education.fr.po
===================================================================
RCS file: /web/www/www/education/po/education.fr.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- education/po/education.fr.po        30 Jun 2011 23:53:24 -0000      1.29
+++ education/po/education.fr.po        8 Aug 2011 16:36:20 -0000       1.30
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: education.html\n"
-"POT-Creation-Date: 2011-03-30 12:27-0300\n"
+"POT-Creation-Date: 2011-08-08 12:25-0300\n"
 "PO-Revision-Date: 2009-04-26 12:51+0100\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -16,393 +16,142 @@
 "Language: fr\n"
 
 #. type: Content of: <title>
-msgid "Free Software in Education - GNU Operating System"
+#, fuzzy
+#| msgid "Free Software in Education - GNU Operating System"
+msgid "Free Software and Education - GNU Project - Free Software Foundation"
 msgstr "Les logiciels libres dans l'éducation - GNU Operating System"
 
-#. type: Content of: <h2>
-msgid "Free Software Universities"
-msgstr "Les logiciels libres et les universités"
-
-#. type: Content of: <p>
-msgid ""
-"More and more students are considering whether a university teaches computer "
-"science and software development using Free Software when deciding where "
-"they will study. Free Software means that students are free to study how the "
-"programs they use work and to learn how to adapt them for their own needs. "
-"Learning about Free Software can also help in studying software development "
-"ethics and professional practice. If you know of a Free-Software-oriented "
-"university then email <a href=\"mailto:address@hidden";>address@hidden"
-"org</a> to tell us about it so we can list it here."
-msgstr ""
-"De plus en plus d'étudiants se posent la question de savoir si une "
-"université enseigne l'informatique et le développement en utilisant des "
-"logiciels libres quand vient le moment de choisir leur université. Des "
-"logiciels libres signifient que les étudiants sont libres d'étudier la 
façon "
-"dont fonctionnent les logiciels qu'ils utilisent et d'apprendre à les "
-"adpater à leurs propres besoins. Apprendre sur les logiciels libres peut "
-"aussi aider dans l'apprentissage de l'éthique de développement et des "
-"pratiques professionnelles. Si vous connaissez une université qui s'oriente "
-"vers les logiciels libres, veuillez envoyer un courriel à <a href=\"mailto:";
-"address@hidden">address@hidden</a> pour nous le signaler afin que "
-"nous la citions ici."
-
-#. type: Content of: <h2>
-msgid "Is Your School Committed To Free Software?"
-msgstr "Votre école s'implique-t-elle dans les logiciels libres ?"
+#. type: Content of: <div><h2>
+#, fuzzy
+#| msgid "Free Software in Education"
+msgid "Free Software and Education"
+msgstr "Les logiciels libres dans l'éducation"
 
-#. type: Content of: <p>
-msgid ""
-"Free Horizon Montessori in Arvada, Colorado has 63 GNU/Linux user systems, "
-"plus 6 GNU/Linux servers. Their favorite apps are Ktouch, TuxTyping, and "
-"Tuxmath."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-contents.html\">Education Contents</a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"An elementary school in Ehlerange, in the Sanem commune of Luxembourg, has a "
-"classroom of 28 kids (6-8 years old) with 8 computers running GNU/Linux."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-cases.html\">Case Studies</a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"The ECEN (Escuela Cristiana Evang&eacute;lica de Neuqu&eacute;n) is a "
-"Christian school located in the capital city of Neuquen, in the Argentine "
-"Patagonia region.  The school has migrated all 40 student work stations as "
-"well as desktops in the school library and office to the GNU operating "
-"system."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-resources.html\">Educational Resources</a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"If your school is committed to Free Software then we want to hear from you "
-"so that we can list it here. Has your school migrated to GNU/Linux, or has "
-"your school adopted the firm policy of rejecting proprietary software? If "
-"so, contact <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
-"a> to let us know."
-msgstr ""
-"Si votre école s'implique dans les logiciels libres, alors nous aimerions le 
"
-"savoir pour la lister ici. Votre école a-t-elle migré vers GNU/Linux, ou 
a-t-"
-"elle adopté une politique ferme de rejet des logiciels propriétaires&nbsp;? 
"
-"Si c'est la cas, contactez <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a> pour nous le faire savoir."
-
-#. type: Content of: <h2>
-msgid "Free Software in Education"
-msgstr "Les logiciels libres dans l'éducation"
-
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/philosophy/free-sw.html\">Free Software</a> can be a valuable "
-"resource in education.  Not only can it be technically or pedagogically "
-"superior to proprietary alternatives, but it can also promote the values of "
-"the GNU project in the schools:"
-msgstr ""
-"<a href=\"/philosophy/free-sw.fr.html\">Le logiciel libre</a> peut "
-"constituer une ressource précieuse dans l'enseignement. En effet, il peut "
-"être non seulement supérieur aux alternatives propriétaires d'un point de "
-"vue technique ou pédagogique, mais il peut aussi faire passer les valeurs du 
"
-"projet GNU au sein des établissements scolaires&nbsp;:"
-
-#. type: Content of: <ul><li>
-msgid "Freedom"
-msgstr "Liberté"
-
-#. type: Content of: <ul><li>
-msgid "Cooperation"
-msgstr "Coopération"
-
-#. type: Content of: <p>
-msgid ""
-"Today, many students and schools don't even know about Free Software or the "
-"great advantages it brings.  At the same time, software knowledgeability is "
-"required for more and more tasks, and Free Software has a distinct advantage "
-"in this field.  If you are one of those kept in the dark until now, please "
-"read some of the informational material we've put together here."
-msgstr ""
-"Aujourd'hui, beaucoup d'étudiants et d'établissements scolaires ne "
-"connaissent même pas les logiciels libres ou les grands avantages qu'ils "
-"apportent. En même temps, des compétences en informatique sont requises 
pour "
-"de plus en plus de tâches, et les logiciels libres ont un avantage sérieux "
-"sans ce domaine. Si vous faites partie de ceux qui sont restés dans le noir "
-"jusqu'à présent, veuillez lire les quelques informations que nous avons "
-"rassemblées ici."
-
-#. type: Content of: <p>
-msgid ""
-"Here is some information we have collected about the relationship between "
-"the GNU project and education (you can see more relationships by reading the "
-"<a href=\"/gnu/thegnuproject.html\">history of the GNU project</a>).  Please "
-"send your comments and suggestions about this information to GNU &amp; "
-"Education mailing list <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>."
-msgstr ""
-"Voici des informations que nous avons réunies sur les relations entre le "
-"projet GNU et l'enseignement (vous pourrez en apprendre plus en lisant <a "
-"href=\"/gnu/thegnuproject.fr.html\">l'histoire du projet GNU</a>). Merci de "
-"faire part de vos commentaires et de vos suggestions à <a href=\"mailto:";
-"address@hidden"><em>address@hidden</em></a>."
-
-#. type: Content of: <h3>
-msgid "Why?"
-msgstr "Pourquoi&nbsp;?"
-
-#. type: Content of: <p>
-msgid ""
-"We're working closely with a new group, Free Software in Education, to "
-"produce these introductions. If you are not completely familiar with free "
-"software, learn why it's right for you!"
-msgstr ""
-"Nous travaillons en proche collaboration avec un nouveau groupe, les "
-"logiciels libres dans l'enseignement, pour produire ces introductions. Si "
-"vous n'êtes pas totalement familier avec les logiciels libres, découvrez "
-"pourquoi ils sont bons pour vous&nbsp;!"
-
-#. type: Content of: <p>
-msgid ""
-"Each distributable, easily chewable material, such as the Students bulletin "
-"posting, leads to an online portal, tailored to the particular group, at "
-"which the interested can find out more about what free software means, learn "
-"how to use it, and of course get it."
-msgstr ""
-"Chaque élément distribuable, facilement assimilable, comme les billets du "
-"journal des étudiants, mène à un portail en ligne, taillé sur mesure pour 
le "
-"groupe particulier, sur lequel l'intéressé peut en apprendre plus sur ce 
que "
-"signifie les logiciels libres, apprendre à les utiliser et bien sûr les "
-"télécharger."
-
-#. type: Content of: <p>
-msgid ""
-"A GNU idea, the Free Universal Encyclopedia and Learning Resource, became <a "
-"href=\"http://www.wikipedia.org\";>Wikipedia</a>.  Learn about <a href=\"/"
-"encyclopedia/free-encyclopedia.html\">why we need such a resource, and why "
-"you should care about it</a>."
-msgstr ""
-"Une idée de GNU, l'Encyclopédie libre universelle et des ressources "
-"d'apprentissage, est devenue <a 
href=\"http://www.wikipedia.org\";>Wikipédia</"
-"a>. Découvrez <a href=\"/encyclopedia/free-encyclopedia.html\">pourquoi nous 
"
-"avons besoin d'une telle ressource et pourquoi nous devons y faire "
-"attention</a>."
-
-#. type: Content of: <p>
-msgid "Articles:"
-msgstr "Articles&nbsp;:"
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-projects.html\">Education Projects</a>"
+msgstr ""
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/schools.html\">Why schools should exclusively use free "
-"software</a>, by Richard Stallman."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-faq.html\">FAQ</a>"
 msgstr ""
-"<a href=\"/philosophy/schools.fr.html\">Pourquoi les écoles devraient "
-"utiliser exclusivement des logiciels libres</a>, par Richard Stallman."
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://fsfeurope.org/projects/education/argumentation.en.html";
-"\">Why give precedence to free software at school?</a>, by Jean Peyratout."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-team.html\">The Education Team</a>"
 msgstr ""
-"<a href=\"http://fsfeurope.org/projects/education/argumentation.fr.html";
-"\">Pourquoi préférer l'utilisation de logiciels libres dans "
-"l'Éducation&nbsp;?</a>, par Jean Peyratout."
-
-#. type: Content of: <h3>
-msgid "How?"
-msgstr "Comment&nbsp;?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><h3>
 #, fuzzy
-#| msgid ""
-#| "Even though the education demographic is relatively tech-savvy, it still "
-#| "needs help to learn free operating systems such as GNU.  Students, "
-#| "teachers, and adminstrators have some tools at their disposal with which "
-#| "to learn."
-msgid ""
-"Even though the education demographic is relatively tech-savvy, it still "
-"needs help to learn free operating systems such as GNU.  Students, teachers, "
-"and administrators have some tools at their disposal with which to learn."
-msgstr ""
-"Bien que la tendance dans l'éducation est de devenir de plus en plus "
-"technique, elle a encore besoin d'aider à l'apprentissage de système "
-"d'exploitation libres tel que GNU. Les étudiants, les professeurs et les "
-"administrateurs ont des outils à leur disposition avec lesquels apprendre."
+#| msgid "Free Software in Education"
+msgid "What Does Free Software Have To Do With Education?"
+msgstr "Les logiciels libres dans l'éducation"
 
 #. type: Content of: <p>
 msgid ""
-"Our advice is to simply install a free operating system, or find an existing "
-"installation, and learn how to use it simply by using it."
+"Software freedom has an especially important 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 students to be good members of "
+"their community. The source code and the methods of Free Software are part "
+"of human knowledge. On the contrary, proprietary software is secret, "
+"restricted knowledge, which is the opposite of the mission of educational "
+"institutions. Free Software supports education, proprietary software forbids "
+"education."
 msgstr ""
-"Notre conseil est juste d'installer un système d'exploitation libre ou de "
-"trouver une installation existante, et d'apprendre à s'en servir, simplement 
"
-"en l'utilisant. Cependant, ces ressources peuvent vous aider à faciliter la "
-"transition."
 
 #. type: Content of: <p>
 msgid ""
-"Mario Fux <a href=\"mailto:address@hidden";>&lt;address@hidden></a> writes "
-"<a href=\"http://fsfeurope.org/projects/education/tgs/tgs.en.html\";> &ldquo;"
-"TUX&amp;address@hidden&rdquo;</a> for <a 
href=\"http://fsfeurope.org/projects/";
-"education/education.en.html\">FSF Europe's education project</a>.  It "
-"reviews a piece of free education software in every issue."
-msgstr ""
-"Mario Fux <a href=\"mailto:address@hidden";>&lt;address@hidden></a> écrit <a "
-"href=\"http://fsfeurope.org/projects/education/tgs/tgs.fr.html\";>TUX&amp;"
-"address@hidden</a> pour le <a href=\"http://fsfeurope.org/projects/education/";
-"education.fr.html\">projet éducation de la FSF Europe</a>. Il passe en revue 
"
-"des logiciels éducatifs libres pour chaque usage."
-
-#. type: Content of: <h3>
-msgid "Events"
-msgstr "Événements"
-
-#. type: Content of: <p>
-msgid ""
-"Some projects which promotes only free software and education are listed "
-"below.  Please let us know of other educational events that follow the <a "
-"href=\"/philosophy/\">GNU Philosophy</a>, by writing to GNU &amp; Education "
-"list at <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Certains projets qui ne font la promotion que de logiciels libres dans "
-"l'éducation sont listés ci-dessous. Veuillez nous signaler tout autre "
-"événement concernant l'éducation qui suit la <a href=\"/philosophy/"
-"philosophy.fr.html\">Philosophie GNU</a>, en écrivant à la liste de "
-"diffusion GNU &amp; Education à <a href=\"mailto:address@hidden";
-"\"><em>address@hidden</em></a>."
-
-#. type: Content of: <h3>
-msgid "Who's using it?"
-msgstr "Qui les utilisent&nbsp;?"
+"Free Software is not just a technical question; it is an ethical, social, "
+"and political question. It is a question of the human rights that the users "
+"of software ought to have. Freedom and cooperation are essential values of "
+"Free Software. The GNU System implements these values and the principle of "
+"sharing, since sharing is good and beneficial to human progress."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"There are some groups that maintain statistics of schools that use free "
-"software in several regions of the world:"
+"To learn more, see the <a href=\" /philosophy/free-sw.html\">Free Software "
+"definition</a> and our article on <a href=\" /philosophy/shouldbefree.html"
+"\">why software should be free</a> (as in freedom)."
 msgstr ""
-"Certains groupes maintiennent des statistiques sur les écoles qui utilisent "
-"des logiciels libres dans plusieurs régions du monde&nbsp;:"
 
-#. type: Content of: <p>
-msgid ""
-"We want to present some stories of classrooms and courses where free "
-"software is being used.  Whether your usage is creative or not, please share "
-"your story.  If you do, please send it to <a href=\"mailto:address@hidden";
-"\">&lt;address@hidden&gt;</a>."
-msgstr ""
-"Nous voulons présenter des expériences de classes ou de cours où les "
-"logiciels libres sont utilisés. Que votre utilisation soit créative ou pas, 
"
-"veuillez partager votre histoire. Si vous le faites, veuillez écrire à <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-
-#. type: Content of: <h3>
-msgid "Advocacy"
-msgstr "Plaidoyer"
+#. type: Content of: <div><div><h2>
+msgid "The Basics"
+msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Before we can advocate free software on a local level, as the Free Software "
-"in Education project would like to do, we need to figure out <em>how</em> to "
-"do that.  We are looking for articles in our area.  If you know a good link "
-"about free software and education, please contact us."
-msgstr ""
-"Avant de plaider pour les logiciels libres à un échelon local, comme le "
-"projet Logiciels libres dans l'éducation voudrait le faire, nous devons "
-"trouver <em>comment</em> faire cela. Nous recherchons des articles "
-"concernant votre région. Si vous connaissez un bon lien sur les logiciels "
-"libres et l'éducation, veuillez nous contacter."
-
-#. type: Content of: <h3>
-msgid "Free Education Software"
-msgstr "Logiciels libres dans l'éducation"
+"In this six-minutes video <a href=\"http://www.fsf.org/about/leadership/#rms";
+"\">Richard Stallman</a> explains briefly and to the point the principles of "
+"Free Software and how they connect to education."
+msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"We maintain a <a href=\"/education/software.html\">list of free software and "
-"free software projects for education</a>."
+"Transcriptions of this video are available in <a href=\"/education/misc/rms-"
+"education-es-translation-to-en.txt\"> English</a> and <a href=\"/education/"
+"misc/rms-education-es-transcription.txt\"> Spanish.</a>"
 msgstr ""
-"Nous maintenons une <a href=\"/education/software.html\">de logiciels libres "
-"et de projets de logiciels libres pour l'éducation</a>."
 
-#. type: Content of: <h3>
-msgid "Other Groups and Projects"
-msgstr "Autres groupes et projets"
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"There are several groups and projects that are working with Free Software "
-"and Education.  A few of them are listed below. If your project supports "
-"only free software and it is not listed here, please send an email to <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+"SubRip subtitle files are also available for download in <a href=\"/"
+"education/misc//rms-education-es-sub-en.srt\"> English</a> and <a href=\"/"
+"education/misc//rms-education-es-sub-es.srt\">Spanish.</a>"
 msgstr ""
-"Il existe plusieurs groupes et projets qui travaillent dans les logiciels "
-"libres et l'éducation. Certains d'entre-eux sont listés ci-dessous. Si 
votre "
-"projet ne soutient que les logiciels libres et qu'il n'est pas listé ici, "
-"veuillez envoyer un courriel à <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"/education/freelearning.html\">Free Learning Resources</a> is "
-"about bringing the principles of free software to educational materials and "
-"otherwise general knowledge."
+"Download video as <a href=\"http://audio-video.gnu.org/video/rms-education-";
+"es-sub-en.ogv\"> Ogg Theora</a>."
 msgstr ""
-"<a href=\"/education/freelearning.html\">Free Learning Resources</a>, dont "
-"le but est d'apporter les principes du logiciel libre sur les supports "
-"dédiés à l'éducation ou à la connaissance en général."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"http://ftacademy.org/\";>Free Technology Academy</a> \"offers an "
-"online master level programme with course modules about Free Technologies. "
-"Learners can choose to enrol in an individual course or register for the "
-"whole programme. Tuition takes place online in the FTA virtual campus and is "
-"performed by teaching staff from the partner universities. Credits obtained "
-"in the FTA programme are recognised by these universities. The full master "
-"programme can be concluded at one of the universities.\""
+"The GNU Project was <a href=\" /gnu/initial-announcement.html\">launched</a> "
+"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."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://www.gleducar.org.ar\";>Gleducar</a>, a GNU at education "
-"Argentinian project."
+#. type: Content of: <div><div><h2>
+msgid "In Depth"
 msgstr ""
-"<a href=\"http://www.gleducar.org.ar\";>Gleducar</a>, un projet argentin GNU "
-"dans l'éducation."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"http://www.ofset.org\";>OFSET</a>, The Organization for Free "
-"Software in Education and Teaching, promotes the use of free software in "
-"education. <a href=\"http://www.ofset.org/freeduc-cd\";>Take a look at "
-"Freeduc-cd</a>, a live-cd for education setup by Ofset."
+"Learn about the <a href=\"/education/edu-why.html\">Reasons Why</a> "
+"educational institutions should use and teach exclusively Free Software."
 msgstr ""
-"<a href=\"http://www.ofset.org\";>OFSET</a>, The Organization for Free "
-"Software in Education and Teaching (Organisation pour les logiciels libres "
-"dans l'éducation et l'enseignement), qui soutient l'utilisation des "
-"logiciels libres dans l'éducation. <a href=\"http://www.ofset.org/freeduc-cd";
-"\">Jetez un &oelig;il à Freeduc-cd</a>, un live-cd pour l'éducation créé 
par "
-"Ofset."
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/schools.html\">Why schools should exclusively use "
+#| "free software</a>, by Richard Stallman."
 msgid ""
-"<a href=\"http://www.sugarlabs.org\";>Sugar Labs</a>, which provides the "
-"Sugar Learning Environment, promoting sharing, collaborative learning, and "
-"reflection."
+"An article by Richard Stallman: <a href=\"/philosophy/schools.html\">Why "
+"Schools Should Exclusively Use Free Software</a>"
 msgstr ""
-"<a href=\"http://www.sugarlabs.org\";>Sugar Labs</a>, qui fournit le Sugar "
-"Learning Environment, soutien le partage et l'apprentissage collaboratif, et "
-"la réflexion."
-
-#. type: Content of: <h3>
-msgid "You can help us"
-msgstr "Vous pouvez nous aider"
+"<a href=\"/philosophy/schools.fr.html\">Pourquoi les écoles devraient "
+"utiliser exclusivement des logiciels libres</a>, par Richard Stallman."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"If you know any educational project based on Free Software, please submit "
-"the project page and a brief description to <a href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>."
+"An article by Dr. V. Sasi Kumar on the <a href=\"/education/edu-system-india."
+"html\">education system in India.</a>"
 msgstr ""
-"Si vous connaissez un projet éducatif basé sur les logiciels libres, "
-"veuillez nous soumettre la page du projet et une brève description à <a 
href="
-"\"mailto:address@hidden";>address@hidden</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -410,10 +159,15 @@
 msgstr " "
 
 #. type: Content of: <div><p>
-msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
-"contact</a> the FSF."
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
+#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
+#| "contact</a> the FSF."
+msgid ""
+"Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+"\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
+"to contact</a> the FSF."
 msgstr ""
 "Veuillez envoyer les requêtes concernant la FSF et GNU à <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>. Il existe aussi <a 
href=\"/contact/"
@@ -444,17 +198,17 @@
 "la soumission de traductions de cet article."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010 Free Software Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2010 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2010 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
-"Verbatim copying and distribution of this entire article is permitted in any "
-"medium, provided this notice is preserved."
+"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>."
 msgstr ""
-"La reproduction exacte et la distribution intégrale de cet article est "
-"permise sur n'importe quel support d'archivage, pourvu que cette notice soit "
-"préservée."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -472,6 +226,324 @@
 msgid "Translations of this page"
 msgstr "Traduction de cette page"
 
+#~ msgid "Free Software Universities"
+#~ msgstr "Les logiciels libres et les universités"
+
+#~ msgid ""
+#~ "More and more students are considering whether a university teaches "
+#~ "computer science and software development using Free Software when "
+#~ "deciding where they will study. Free Software means that students are "
+#~ "free to study how the programs they use work and to learn how to adapt "
+#~ "them for their own needs. Learning about Free Software can also help in "
+#~ "studying software development ethics and professional practice. If you "
+#~ "know of a Free-Software-oriented university then email <a href=\"mailto:";
+#~ "address@hidden">address@hidden</a> to tell us about it so we can "
+#~ "list it here."
+#~ msgstr ""
+#~ "De plus en plus d'étudiants se posent la question de savoir si une "
+#~ "université enseigne l'informatique et le développement en utilisant des "
+#~ "logiciels libres quand vient le moment de choisir leur université. Des "
+#~ "logiciels libres signifient que les étudiants sont libres d'étudier la "
+#~ "façon dont fonctionnent les logiciels qu'ils utilisent et d'apprendre à "
+#~ "les adpater à leurs propres besoins. Apprendre sur les logiciels libres "
+#~ "peut aussi aider dans l'apprentissage de l'éthique de développement et "
+#~ "des pratiques professionnelles. Si vous connaissez une université qui "
+#~ "s'oriente vers les logiciels libres, veuillez envoyer un courriel à <a "
+#~ "href=\"mailto:address@hidden";>address@hidden</a> pour nous le "
+#~ "signaler afin que nous la citions ici."
+
+#~ msgid "Is Your School Committed To Free Software?"
+#~ msgstr "Votre école s'implique-t-elle dans les logiciels libres ?"
+
+#~ msgid ""
+#~ "If your school is committed to Free Software then we want to hear from "
+#~ "you so that we can list it here. Has your school migrated to GNU/Linux, "
+#~ "or has your school adopted the firm policy of rejecting proprietary "
+#~ "software? If so, contact <a href=\"mailto:address@hidden";>&lt;"
+#~ "address@hidden&gt;</a> to let us know."
+#~ msgstr ""
+#~ "Si votre école s'implique dans les logiciels libres, alors nous aimerions 
"
+#~ "le savoir pour la lister ici. Votre école a-t-elle migré vers GNU/Linux, 
"
+#~ "ou a-t-elle adopté une politique ferme de rejet des logiciels "
+#~ "propriétaires&nbsp;? Si c'est la cas, contactez <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a> pour nous le faire "
+#~ "savoir."
+
+#~ msgid ""
+#~ "<a href=\"/philosophy/free-sw.html\">Free Software</a> can be a valuable "
+#~ "resource in education.  Not only can it be technically or pedagogically "
+#~ "superior to proprietary alternatives, but it can also promote the values "
+#~ "of the GNU project in the schools:"
+#~ msgstr ""
+#~ "<a href=\"/philosophy/free-sw.fr.html\">Le logiciel libre</a> peut "
+#~ "constituer une ressource précieuse dans l'enseignement. En effet, il peut 
"
+#~ "être non seulement supérieur aux alternatives propriétaires d'un point 
de "
+#~ "vue technique ou pédagogique, mais il peut aussi faire passer les valeurs 
"
+#~ "du projet GNU au sein des établissements scolaires&nbsp;:"
+
+#~ msgid "Freedom"
+#~ msgstr "Liberté"
+
+#~ msgid "Cooperation"
+#~ msgstr "Coopération"
+
+#~ msgid ""
+#~ "Today, many students and schools don't even know about Free Software or "
+#~ "the great advantages it brings.  At the same time, software "
+#~ "knowledgeability is required for more and more tasks, and Free Software "
+#~ "has a distinct advantage in this field.  If you are one of those kept in "
+#~ "the dark until now, please read some of the informational material we've "
+#~ "put together here."
+#~ msgstr ""
+#~ "Aujourd'hui, beaucoup d'étudiants et d'établissements scolaires ne "
+#~ "connaissent même pas les logiciels libres ou les grands avantages qu'ils "
+#~ "apportent. En même temps, des compétences en informatique sont requises "
+#~ "pour de plus en plus de tâches, et les logiciels libres ont un avantage "
+#~ "sérieux sans ce domaine. Si vous faites partie de ceux qui sont restés "
+#~ "dans le noir jusqu'à présent, veuillez lire les quelques informations 
que "
+#~ "nous avons rassemblées ici."
+
+#~ msgid ""
+#~ "Here is some information we have collected about the relationship between "
+#~ "the GNU project and education (you can see more relationships by reading "
+#~ "the <a href=\"/gnu/thegnuproject.html\">history of the GNU project</a>).  "
+#~ "Please send your comments and suggestions about this information to GNU "
+#~ "&amp; Education mailing list <a href=\"mailto:address@hidden";>&lt;"
+#~ "address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Voici des informations que nous avons réunies sur les relations entre le "
+#~ "projet GNU et l'enseignement (vous pourrez en apprendre plus en lisant <a "
+#~ "href=\"/gnu/thegnuproject.fr.html\">l'histoire du projet GNU</a>). Merci "
+#~ "de faire part de vos commentaires et de vos suggestions à <a href="
+#~ "\"mailto:address@hidden";><em>address@hidden</em></a>."
+
+#~ msgid "Why?"
+#~ msgstr "Pourquoi&nbsp;?"
+
+#~ msgid ""
+#~ "We're working closely with a new group, Free Software in Education, to "
+#~ "produce these introductions. If you are not completely familiar with free "
+#~ "software, learn why it's right for you!"
+#~ msgstr ""
+#~ "Nous travaillons en proche collaboration avec un nouveau groupe, les "
+#~ "logiciels libres dans l'enseignement, pour produire ces introductions. Si "
+#~ "vous n'êtes pas totalement familier avec les logiciels libres, découvrez 
"
+#~ "pourquoi ils sont bons pour vous&nbsp;!"
+
+#~ msgid ""
+#~ "Each distributable, easily chewable material, such as the Students "
+#~ "bulletin posting, leads to an online portal, tailored to the particular "
+#~ "group, at which the interested can find out more about what free software "
+#~ "means, learn how to use it, and of course get it."
+#~ msgstr ""
+#~ "Chaque élément distribuable, facilement assimilable, comme les billets 
du "
+#~ "journal des étudiants, mène à un portail en ligne, taillé sur mesure 
pour "
+#~ "le groupe particulier, sur lequel l'intéressé peut en apprendre plus sur 
"
+#~ "ce que signifie les logiciels libres, apprendre à les utiliser et bien "
+#~ "sûr les télécharger."
+
+#~ msgid ""
+#~ "A GNU idea, the Free Universal Encyclopedia and Learning Resource, became "
+#~ "<a href=\"http://www.wikipedia.org\";>Wikipedia</a>.  Learn about <a href="
+#~ "\"/encyclopedia/free-encyclopedia.html\">why we need such a resource, and "
+#~ "why you should care about it</a>."
+#~ msgstr ""
+#~ "Une idée de GNU, l'Encyclopédie libre universelle et des ressources "
+#~ "d'apprentissage, est devenue <a href=\"http://www.wikipedia.org";
+#~ "\">Wikipédia</a>. Découvrez <a 
href=\"/encyclopedia/free-encyclopedia.html"
+#~ "\">pourquoi nous avons besoin d'une telle ressource et pourquoi nous "
+#~ "devons y faire attention</a>."
+
+#~ msgid "Articles:"
+#~ msgstr "Articles&nbsp;:"
+
+#~ msgid ""
+#~ "<a href=\"http://fsfeurope.org/projects/education/argumentation.en.html";
+#~ "\">Why give precedence to free software at school?</a>, by Jean Peyratout."
+#~ msgstr ""
+#~ "<a href=\"http://fsfeurope.org/projects/education/argumentation.fr.html";
+#~ "\">Pourquoi préférer l'utilisation de logiciels libres dans "
+#~ "l'Éducation&nbsp;?</a>, par Jean Peyratout."
+
+#~ msgid "How?"
+#~ msgstr "Comment&nbsp;?"
+
+#, fuzzy
+#~| msgid ""
+#~| "Even though the education demographic is relatively tech-savvy, it still "
+#~| "needs help to learn free operating systems such as GNU.  Students, "
+#~| "teachers, and adminstrators have some tools at their disposal with which "
+#~| "to learn."
+#~ msgid ""
+#~ "Even though the education demographic is relatively tech-savvy, it still "
+#~ "needs help to learn free operating systems such as GNU.  Students, "
+#~ "teachers, and administrators have some tools at their disposal with which "
+#~ "to learn."
+#~ msgstr ""
+#~ "Bien que la tendance dans l'éducation est de devenir de plus en plus "
+#~ "technique, elle a encore besoin d'aider à l'apprentissage de système "
+#~ "d'exploitation libres tel que GNU. Les étudiants, les professeurs et les "
+#~ "administrateurs ont des outils à leur disposition avec lesquels 
apprendre."
+
+#~ msgid ""
+#~ "Our advice is to simply install a free operating system, or find an "
+#~ "existing installation, and learn how to use it simply by using it."
+#~ msgstr ""
+#~ "Notre conseil est juste d'installer un système d'exploitation libre ou de 
"
+#~ "trouver une installation existante, et d'apprendre à s'en servir, "
+#~ "simplement en l'utilisant. Cependant, ces ressources peuvent vous aider à 
"
+#~ "faciliter la transition."
+
+#~ msgid ""
+#~ "Mario Fux <a href=\"mailto:address@hidden";>&lt;address@hidden></a> "
+#~ "writes <a href=\"http://fsfeurope.org/projects/education/tgs/tgs.en.html";
+#~ "\"> &ldquo;TUX&amp;address@hidden&rdquo;</a> for <a 
href=\"http://fsfeurope.";
+#~ "org/projects/education/education.en.html\">FSF Europe's education "
+#~ "project</a>.  It reviews a piece of free education software in every "
+#~ "issue."
+#~ msgstr ""
+#~ "Mario Fux <a href=\"mailto:address@hidden";>&lt;address@hidden></a> écrit "
+#~ "<a href=\"http://fsfeurope.org/projects/education/tgs/tgs.fr.html";
+#~ "\">TUX&amp;address@hidden</a> pour le <a 
href=\"http://fsfeurope.org/projects/";
+#~ "education/education.fr.html\">projet éducation de la FSF Europe</a>. Il "
+#~ "passe en revue des logiciels éducatifs libres pour chaque usage."
+
+#~ msgid "Events"
+#~ msgstr "Événements"
+
+#~ msgid ""
+#~ "Some projects which promotes only free software and education are listed "
+#~ "below.  Please let us know of other educational events that follow the <a "
+#~ "href=\"/philosophy/\">GNU Philosophy</a>, by writing to GNU &amp; "
+#~ "Education list at <a href=\"mailto:address@hidden";>&lt;address@hidden"
+#~ "org&gt;</a>."
+#~ msgstr ""
+#~ "Certains projets qui ne font la promotion que de logiciels libres dans "
+#~ "l'éducation sont listés ci-dessous. Veuillez nous signaler tout autre "
+#~ "événement concernant l'éducation qui suit la <a href=\"/philosophy/"
+#~ "philosophy.fr.html\">Philosophie GNU</a>, en écrivant à la liste de "
+#~ "diffusion GNU &amp; Education à <a href=\"mailto:address@hidden";
+#~ "\"><em>address@hidden</em></a>."
+
+#~ msgid "Who's using it?"
+#~ msgstr "Qui les utilisent&nbsp;?"
+
+#~ msgid ""
+#~ "There are some groups that maintain statistics of schools that use free "
+#~ "software in several regions of the world:"
+#~ msgstr ""
+#~ "Certains groupes maintiennent des statistiques sur les écoles qui "
+#~ "utilisent des logiciels libres dans plusieurs régions du monde&nbsp;:"
+
+#~ msgid ""
+#~ "We want to present some stories of classrooms and courses where free "
+#~ "software is being used.  Whether your usage is creative or not, please "
+#~ "share your story.  If you do, please send it to <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Nous voulons présenter des expériences de classes ou de cours où les "
+#~ "logiciels libres sont utilisés. Que votre utilisation soit créative ou "
+#~ "pas, veuillez partager votre histoire. Si vous le faites, veuillez écrire 
"
+#~ "à <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+
+#~ msgid "Advocacy"
+#~ msgstr "Plaidoyer"
+
+#~ msgid ""
+#~ "Before we can advocate free software on a local level, as the Free "
+#~ "Software in Education project would like to do, we need to figure out "
+#~ "<em>how</em> to do that.  We are looking for articles in our area.  If "
+#~ "you know a good link about free software and education, please contact us."
+#~ msgstr ""
+#~ "Avant de plaider pour les logiciels libres à un échelon local, comme le "
+#~ "projet Logiciels libres dans l'éducation voudrait le faire, nous devons "
+#~ "trouver <em>comment</em> faire cela. Nous recherchons des articles "
+#~ "concernant votre région. Si vous connaissez un bon lien sur les logiciels 
"
+#~ "libres et l'éducation, veuillez nous contacter."
+
+#~ msgid "Free Education Software"
+#~ msgstr "Logiciels libres dans l'éducation"
+
+#~ msgid ""
+#~ "We maintain a <a href=\"/education/software.html\">list of free software "
+#~ "and free software projects for education</a>."
+#~ msgstr ""
+#~ "Nous maintenons une <a href=\"/education/software.html\">de logiciels "
+#~ "libres et de projets de logiciels libres pour l'éducation</a>."
+
+#~ msgid "Other Groups and Projects"
+#~ msgstr "Autres groupes et projets"
+
+#~ msgid ""
+#~ "There are several groups and projects that are working with Free Software "
+#~ "and Education.  A few of them are listed below. If your project supports "
+#~ "only free software and it is not listed here, please send an email to <a "
+#~ "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Il existe plusieurs groupes et projets qui travaillent dans les logiciels "
+#~ "libres et l'éducation. Certains d'entre-eux sont listés ci-dessous. Si "
+#~ "votre projet ne soutient que les logiciels libres et qu'il n'est pas "
+#~ "listé ici, veuillez envoyer un courriel à <a 
href=\"mailto:address@hidden";
+#~ "org\">&lt;address@hidden&gt;</a>."
+
+#~ msgid ""
+#~ "<a href=\"/education/freelearning.html\">Free Learning Resources</a> is "
+#~ "about bringing the principles of free software to educational materials "
+#~ "and otherwise general knowledge."
+#~ msgstr ""
+#~ "<a href=\"/education/freelearning.html\">Free Learning Resources</a>, "
+#~ "dont le but est d'apporter les principes du logiciel libre sur les "
+#~ "supports dédiés à l'éducation ou à la connaissance en général."
+
+#~ msgid ""
+#~ "<a href=\"http://www.gleducar.org.ar\";>Gleducar</a>, a GNU at education "
+#~ "Argentinian project."
+#~ msgstr ""
+#~ "<a href=\"http://www.gleducar.org.ar\";>Gleducar</a>, un projet argentin "
+#~ "GNU dans l'éducation."
+
+#~ msgid ""
+#~ "<a href=\"http://www.ofset.org\";>OFSET</a>, The Organization for Free "
+#~ "Software in Education and Teaching, promotes the use of free software in "
+#~ "education. <a href=\"http://www.ofset.org/freeduc-cd\";>Take a look at "
+#~ "Freeduc-cd</a>, a live-cd for education setup by Ofset."
+#~ msgstr ""
+#~ "<a href=\"http://www.ofset.org\";>OFSET</a>, The Organization for Free "
+#~ "Software in Education and Teaching (Organisation pour les logiciels "
+#~ "libres dans l'éducation et l'enseignement), qui soutient l'utilisation "
+#~ "des logiciels libres dans l'éducation. <a href=\"http://www.ofset.org/";
+#~ "freeduc-cd\">Jetez un &oelig;il à Freeduc-cd</a>, un live-cd pour "
+#~ "l'éducation créé par Ofset."
+
+#~ msgid ""
+#~ "<a href=\"http://www.sugarlabs.org\";>Sugar Labs</a>, which provides the "
+#~ "Sugar Learning Environment, promoting sharing, collaborative learning, "
+#~ "and reflection."
+#~ msgstr ""
+#~ "<a href=\"http://www.sugarlabs.org\";>Sugar Labs</a>, qui fournit le Sugar "
+#~ "Learning Environment, soutien le partage et l'apprentissage collaboratif, "
+#~ "et la réflexion."
+
+#~ msgid "You can help us"
+#~ msgstr "Vous pouvez nous aider"
+
+#~ msgid ""
+#~ "If you know any educational project based on Free Software, please submit "
+#~ "the project page and a brief description to <a href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>."
+#~ msgstr ""
+#~ "Si vous connaissez un projet éducatif basé sur les logiciels libres, "
+#~ "veuillez nous soumettre la page du projet et une brève description à <a "
+#~ "href=\"mailto:address@hidden";>address@hidden</a>."
+
+#~ msgid ""
+#~ "Verbatim copying and distribution of this entire article is permitted in "
+#~ "any medium, provided this notice is preserved."
+#~ msgstr ""
+#~ "La reproduction exacte et la distribution intégrale de cet article est "
+#~ "permise sur n'importe quel support d'archivage, pourvu que cette notice "
+#~ "soit préservée."
+
 #~ msgid ""
 #~ "<a href=\"http://www.rittershofer.de/info/linux/linout.htm\";>Germany</a>, "
 #~ "maintained by Andreas Rittershofer.  An out-of-date mirror exists at <a "

Index: education/po/education.pot
===================================================================
RCS file: /web/www/www/education/po/education.pot,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- education/po/education.pot  30 Mar 2011 16:28:07 -0000      1.19
+++ education/po/education.pot  8 Aug 2011 16:36:20 -0000       1.20
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-30 12:27-0300\n"
+"POT-Creation-Date: 2011-08-08 12:25-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -16,285 +16,133 @@
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <title>
-msgid "Free Software in Education - GNU Operating System"
+msgid "Free Software and Education - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Free Software Universities"
+#. type: Content of: <div><h2>
+msgid "Free Software and Education"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"More and more students are considering whether a university teaches computer "
-"science and software development using Free Software when deciding where "
-"they will study. Free Software means that students are free to study how the "
-"programs they use work and to learn how to adapt them for their own "
-"needs. Learning about Free Software can also help in studying software "
-"development ethics and professional practice. If you know of a "
-"Free-Software-oriented university then email <a "
-"href=\"mailto:address@hidden";>address@hidden</a> to tell us about "
-"it so we can list it here."
-msgstr ""
-
-#. type: Content of: <h2>
-msgid "Is Your School Committed To Free Software?"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"Free Horizon Montessori in Arvada, Colorado has 63 GNU/Linux user systems, "
-"plus 6 GNU/Linux servers. Their favorite apps are Ktouch, TuxTyping, and "
-"Tuxmath."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"An elementary school in Ehlerange, in the Sanem commune of Luxembourg, has a "
-"classroom of 28 kids (6-8 years old) with 8 computers running GNU/Linux."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"The ECEN (Escuela Cristiana Evang&eacute;lica de Neuqu&eacute;n) is a "
-"Christian school located in the capital city of Neuquen, in the Argentine "
-"Patagonia region.  The school has migrated all 40 student work stations as "
-"well as desktops in the school library and office to the GNU operating "
-"system."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"If your school is committed to Free Software then we want to hear from you "
-"so that we can list it here. Has your school migrated to GNU/Linux, or has "
-"your school adopted the firm policy of rejecting proprietary software? If "
-"so, contact <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> to let us "
-"know."
-msgstr ""
-
-#. type: Content of: <h2>
-msgid "Free Software in Education"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/philosophy/free-sw.html\">Free Software</a> can be a valuable "
-"resource in education.  Not only can it be technically or pedagogically "
-"superior to proprietary alternatives, but it can also promote the values of "
-"the GNU project in the schools:"
-msgstr ""
-
-#. type: Content of: <ul><li>
-msgid "Freedom"
-msgstr ""
-
-#. type: Content of: <ul><li>
-msgid "Cooperation"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"Today, many students and schools don't even know about Free Software or the "
-"great advantages it brings.  At the same time, software knowledgeability is "
-"required for more and more tasks, and Free Software has a distinct advantage "
-"in this field.  If you are one of those kept in the dark until now, please "
-"read some of the informational material we've put together here."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"Here is some information we have collected about the relationship between "
-"the GNU project and education (you can see more relationships by reading the "
-"<a href=\"/gnu/thegnuproject.html\">history of the GNU project</a>).  Please "
-"send your comments and suggestions about this information to GNU &amp; "
-"Education mailing list <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-
-#. type: Content of: <h3>
-msgid "Why?"
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-contents.html\">Education Contents</a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"We're working closely with a new group, Free Software in Education, to "
-"produce these introductions. If you are not completely familiar with free "
-"software, learn why it's right for you!"
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-cases.html\">Case Studies</a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"Each distributable, easily chewable material, such as the Students bulletin "
-"posting, leads to an online portal, tailored to the particular group, at "
-"which the interested can find out more about what free software means, learn "
-"how to use it, and of course get it."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-resources.html\">Educational Resources</a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"A GNU idea, the Free Universal Encyclopedia and Learning Resource, became <a "
-"href=\"http://www.wikipedia.org\";>Wikipedia</a>.  Learn about <a "
-"href=\"/encyclopedia/free-encyclopedia.html\">why we need such a resource, "
-"and why you should care about it</a>."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-projects.html\">Education Projects</a>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "Articles:"
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-faq.html\">FAQ</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/schools.html\">Why schools should exclusively use free "
-"software</a>, by Richard Stallman."
-msgstr ""
-
-#. type: Content of: <ul><li>
-msgid ""
-"<a "
-"href=\"http://fsfeurope.org/projects/education/argumentation.en.html\";>Why "
-"give precedence to free software at school?</a>, by Jean Peyratout."
+#. type: Content of: <div><ul><li>
+msgid "<a href=\"/education/edu-team.html\">The Education Team</a>"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "How?"
+#. type: Content of: <div><h3>
+msgid "What Does Free Software Have To Do With Education?"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"Even though the education demographic is relatively tech-savvy, it still "
-"needs help to learn free operating systems such as GNU.  Students, teachers, "
-"and administrators have some tools at their disposal with which to learn."
+"Software freedom has an especially important 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 students to be good members of "
+"their community. The source code and the methods of Free Software are part "
+"of human knowledge. On the contrary, proprietary software is secret, "
+"restricted knowledge, which is the opposite of the mission of educational "
+"institutions. Free Software supports education, proprietary software forbids "
+"education."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"Our advice is to simply install a free operating system, or find an existing "
-"installation, and learn how to use it simply by using it."
+"Free Software is not just a technical question; it is an ethical, social, "
+"and political question. It is a question of the human rights that the users "
+"of software ought to have. Freedom and cooperation are essential values of "
+"Free Software. The GNU System implements these values and the principle of "
+"sharing, since sharing is good and beneficial to human progress."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"Mario Fux <a href=\"mailto:address@hidden";>&lt;address@hidden></a> writes "
-"<a href=\"http://fsfeurope.org/projects/education/tgs/tgs.en.html\";> "
-"&ldquo;TUX&amp;address@hidden&rdquo;</a> for <a "
-"href=\"http://fsfeurope.org/projects/education/education.en.html\";>FSF "
-"Europe's education project</a>.  It reviews a piece of free education "
-"software in every issue."
+"To learn more, see the <a href=\" /philosophy/free-sw.html\">Free Software "
+"definition</a> and our article on <a href=\" "
+"/philosophy/shouldbefree.html\">why software should be free</a> (as in "
+"freedom)."
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Events"
+#. type: Content of: <div><div><h2>
+msgid "The Basics"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Some projects which promotes only free software and education are listed "
-"below.  Please let us know of other educational events that follow the <a "
-"href=\"/philosophy/\">GNU Philosophy</a>, by writing to GNU &amp; Education "
-"list at <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-
-#. type: Content of: <h3>
-msgid "Who's using it?"
+"In this six-minutes video <a "
+"href=\"http://www.fsf.org/about/leadership/#rms\";>Richard Stallman</a> "
+"explains briefly and to the point the principles of Free Software and how "
+"they connect to education."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"There are some groups that maintain statistics of schools that use free "
-"software in several regions of the world:"
+"Transcriptions of this video are available in <a "
+"href=\"/education/misc/rms-education-es-translation-to-en.txt\"> English</a> "
+"and <a href=\"/education/misc/rms-education-es-transcription.txt\"> "
+"Spanish.</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"We want to present some stories of classrooms and courses where free "
-"software is being used.  Whether your usage is creative or not, please share "
-"your story.  If you do, please send it to <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-
-#. type: Content of: <h3>
-msgid "Advocacy"
+"SubRip subtitle files are also available for download in <a "
+"href=\"/education/misc//rms-education-es-sub-en.srt\"> English</a> and <a "
+"href=\"/education/misc//rms-education-es-sub-es.srt\">Spanish.</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Before we can advocate free software on a local level, as the Free Software "
-"in Education project would like to do, we need to figure out <em>how</em> to "
-"do that.  We are looking for articles in our area.  If you know a good link "
-"about free software and education, please contact us."
+"Download video as <a "
+"href=\"http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv\";> Ogg "
+"Theora</a>."
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Free Education Software"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"We maintain a <a href=\"/education/software.html\">list of free software and "
-"free software projects for education</a>."
-msgstr ""
-
-#. type: Content of: <h3>
-msgid "Other Groups and Projects"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"There are several groups and projects that are working with Free Software "
-"and Education.  A few of them are listed below. If your project supports "
-"only free software and it is not listed here, please send an email to <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/education/freelearning.html\">Free Learning Resources</a> is "
-"about bringing the principles of free software to educational materials and "
-"otherwise general knowledge."
-msgstr ""
-
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"http://ftacademy.org/\";>Free Technology Academy</a> \"offers an "
-"online master level programme with course modules about Free "
-"Technologies. Learners can choose to enrol in an individual course or "
-"register for the whole programme. Tuition takes place online in the FTA "
-"virtual campus and is performed by teaching staff from the partner "
-"universities. Credits obtained in the FTA programme are recognised by these "
-"universities. The full master programme can be concluded at one of the "
-"universities.\""
+"The GNU Project was <a href=\" /gnu/initial-announcement.html\">launched</a> "
+"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."
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"http://www.gleducar.org.ar\";>Gleducar</a>, a GNU at education "
-"Argentinian project."
+#. type: Content of: <div><div><h2>
+msgid "In Depth"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"http://www.ofset.org\";>OFSET</a>, The Organization for Free "
-"Software in Education and Teaching, promotes the use of free software in "
-"education. <a href=\"http://www.ofset.org/freeduc-cd\";>Take a look at "
-"Freeduc-cd</a>, a live-cd for education setup by Ofset."
+"Learn about the <a href=\"/education/edu-why.html\">Reasons Why</a> "
+"educational institutions should use and teach exclusively Free Software."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"http://www.sugarlabs.org\";>Sugar Labs</a>, which provides the "
-"Sugar Learning Environment, promoting sharing, collaborative learning, and "
-"reflection."
-msgstr ""
-
-#. type: Content of: <h3>
-msgid "You can help us"
+"An article by Richard Stallman: <a href=\"/philosophy/schools.html\">Why "
+"Schools Should Exclusively Use Free Software</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"If you know any educational project based on Free Software, please submit "
-"the project page and a brief description to <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+"An article by Dr. V. Sasi Kumar on the <a "
+"href=\"/education/edu-system-india.html\">education system in India.</a>"
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -304,7 +152,7 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
+"Please send general FSF &amp; GNU inquiries to <a "
 "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a "
 "href=\"/contact/\">other ways to contact</a> the FSF."
 msgstr ""
@@ -323,13 +171,14 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2010 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
-"Verbatim copying and distribution of this entire article is permitted in any "
-"medium, provided this notice is preserved."
+"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>."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fry/happy-birthday-to-gnu-in-your-language.sq.html
===================================================================
RCS file: /web/www/www/fry/happy-birthday-to-gnu-in-your-language.sq.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- fry/happy-birthday-to-gnu-in-your-language.sq.html  14 Jul 2011 08:34:51 
-0000      1.3
+++ fry/happy-birthday-to-gnu-in-your-language.sq.html  8 Aug 2011 16:36:27 
-0000       1.4
@@ -65,9 +65,9 @@
 2004, 2005, 2006, 2007, 2008, 2009 <a href="http://www.fsf.org";>Free
 Software Foundation</a>, 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>Kjo faqe mund të përdoret sipas një <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Lejeje Creative
+Commons Attribution-NoDerivs 3.0 United States</a>.
 </p>
 
 
@@ -78,7 +78,7 @@
  <p><!-- timestamp start -->
 U përditësua:
 
-$Date: 2011/07/14 08:34:51 $
+$Date: 2011/08/08 16:36:27 $
 
 <!-- timestamp end -->
 </p>

Index: fry/po/happy-birthday-to-gnu-in-your-language.sq.po
===================================================================
RCS file: /web/www/www/fry/po/happy-birthday-to-gnu-in-your-language.sq.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fry/po/happy-birthday-to-gnu-in-your-language.sq.po 8 Aug 2011 10:09:54 
-0000       1.5
+++ fry/po/happy-birthday-to-gnu-in-your-language.sq.po 8 Aug 2011 16:36:33 
-0000       1.6
@@ -21,13 +21,23 @@
 
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
-msgid "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free 
Software, Operating System, GNU Kernel, HURD, GNU HURD, Hurd"
-msgstr "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Software 
i Lirë, Sistem Operativ, Kernel GNU, HURD, GNU HURD, Hurd"
+msgid ""
+"GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
+"Operating System, GNU Kernel, HURD, GNU HURD, Hurd"
+msgstr ""
+"GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Software i "
+"Lirë, Sistem Operativ, Kernel GNU, HURD, GNU HURD, Hurd"
 
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
-msgid "Since 1983, developing the free Unix style operating system GNU, so 
that computer users can have the freedom to share and improve the software they 
use."
-msgstr "Që prej 1983, hartim i sistemit operativ të lirë GNU, të ngjashëm 
me Unix-in, që përdoruesit e kompjuterit të jenë të lirë të shkëmbejnë 
dhe të përmirësojnë software-et që përdorin."
+msgid ""
+"Since 1983, developing the free Unix style operating system GNU, so that "
+"computer users can have the freedom to share and improve the software they "
+"use."
+msgstr ""
+"Që prej 1983, hartim i sistemit operativ të lirë GNU, të ngjashëm me 
Unix-"
+"in, që përdoruesit e kompjuterit të jenë të lirë të shkëmbejnë dhe 
të "
+"përmirësojnë software-et që përdorin."
 
 # type: Attribute 'title' of: <link>
 #. type: Attribute 'title' of: <link>
@@ -41,18 +51,32 @@
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
-msgid "&ldquo;<a href=\"/fry/\">Happy Birthday to GNU</a>&rdquo; in your 
language"
-msgstr "&ldquo;<a href=\"/fry/\">Gëzuar Datëlindjen GNU</a>&rdquo; në 
gjuhën tuaj"
+msgid ""
+"&ldquo;<a href=\"/fry/\">Happy Birthday to GNU</a>&rdquo; in your language"
+msgstr ""
+"&ldquo;<a href=\"/fry/\">Gëzuar Datëlindjen GNU</a>&rdquo; në gjuhën tuaj"
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid "We have translated subtitles of the film in <a 
href=\"happy-birthday-to-gnu-translation.html\">over 20 languages</a>, 
available for you to show on Software Freedom Day or at your local user group 
meetings."
-msgstr "Titrat e filmit i kemi të përkthyera në <a 
href=\"happy-birthday-to-gnu-translation.html\">mbi 20 gjuhë</a>, që të mund 
ta shfaqni në Ditën e Lirisë së Software-it ose në takimet e grupit tuaj 
vendor të përdoruesve."
+msgid ""
+"We have translated subtitles of the film in <a href=\"happy-birthday-to-gnu-"
+"translation.html\">over 20 languages</a>, available for you to show on "
+"Software Freedom Day or at your local user group meetings."
+msgstr ""
+"Titrat e filmit i kemi të përkthyera në <a href=\"happy-birthday-to-gnu-"
+"translation.html\">mbi 20 gjuhë</a>, që të mund ta shfaqni në Ditën e 
Lirisë "
+"së Software-it ose në takimet e grupit tuaj vendor të përdoruesve."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid "We're using the <a href=\"http://en.wikipedia.org/wiki/Subrip\";>SubRip 
format</a> for subtitles, which is compatible with all the major free software 
video players."
-msgstr "Për titrat përdorim <a 
href=\"http://en.wikipedia.org/wiki/Subrip\";>formatin SubRip</a>, që është i 
përputhshëm me të tërë lojtësit video software të lirë të njohur."
+msgid ""
+"We're using the <a href=\"http://en.wikipedia.org/wiki/Subrip\";>SubRip "
+"format</a> for subtitles, which is compatible with all the major free "
+"software video players."
+msgstr ""
+"Për titrat përdorim <a 
href=\"http://en.wikipedia.org/wiki/Subrip\";>formatin "
+"SubRip</a>, që është i përputhshëm me të tërë lojtësit video 
software të "
+"lirë të njohur."
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
@@ -61,28 +85,46 @@
 
 # type: Content of: <p><a>
 #. type: Content of: <p><a>
-msgid "<a href=\"happy-birthday-to-gnu-sfd-vlc.html\" title=\"Videolan 
Client\">"
-msgstr "<a href=\"happy-birthday-to-gnu-sfd-vlc.html\" title=\"Klienti 
Videolan\">"
+msgid ""
+"<a href=\"happy-birthday-to-gnu-sfd-vlc.html\" title=\"Videolan Client\">"
+msgstr ""
+"<a href=\"happy-birthday-to-gnu-sfd-vlc.html\" title=\"Klienti Videolan\">"
 
 # type: Content of: <p><a>
 #. type: Content of: <p><a>
-msgid "</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-totem.html\" 
title=\"Totem\">"
-msgstr "</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-totem.html\" 
title=\"Totem\">"
+msgid ""
+"</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-totem.html\" title="
+"\"Totem\">"
+msgstr ""
+"</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-totem.html\" title="
+"\"Totem\">"
 
 # type: Content of: <p><a>
 #. type: Content of: <p><a>
-msgid "</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-mplayer.html\" 
title=\"Mplayer Client\">"
-msgstr "</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-mplayer.html\" 
title=\"Klienti Mplayer\">"
+msgid ""
+"</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-mplayer.html\" title="
+"\"Mplayer Client\">"
+msgstr ""
+"</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-mplayer.html\" title="
+"\"Klienti Mplayer\">"
 
 # type: Content of: <p><a>
 #. type: Content of: <p><a>
-msgid "</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-xine.html\" 
title=\"Xine Client\">"
-msgstr "</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-xine.html\" 
title=\"Klienti Xine\">"
+msgid ""
+"</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-xine.html\" title=\"Xine "
+"Client\">"
+msgstr ""
+"</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-xine.html\" title="
+"\"Klienti Xine\">"
 
 # type: Content of: <p><a>
 #. type: Content of: <p><a>
-msgid "</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-kaffeine.html\" 
title=\"Kaffeine Client\">"
-msgstr "</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-kaffeine.html\" 
title=\"Klienti Kaffeine\">"
+msgid ""
+"</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-kaffeine.html\" title="
+"\"Kaffeine Client\">"
+msgstr ""
+"</a>&nbsp;&nbsp;<a href=\"happy-birthday-to-gnu-sfd-kaffeine.html\" title="
+"\"Klienti Kaffeine\">"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -116,8 +158,12 @@
 
 # type: Content of: <h4>
 #. type: Content of: <h4>
-msgid "Please send your photos and extra translations to <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr "Ju lutem, fotot tuaja dhe përkthimet dërgojini te <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+msgid ""
+"Please send your photos and extra translations to <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
+msgstr ""
+"Ju lutem, fotot tuaja dhe përkthimet dërgojini te <a href=\"mailto:";
+"address@hidden">&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -127,12 +173,24 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
2005, 2006, 2007, 2008, 2009 <a href=\"http://www.fsf.org\";>Free Software 
Foundation</a>, Inc."
-msgstr "Të drejta Kopjimi &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
2003, 2004, 2005, 2006, 2007, 2008, 2009 <a href=\"http://www.fsf.org\";>Free 
Software Foundation</a>, Inc."
+msgid ""
+"Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
+"2006, 2007, 2008, 2009 <a href=\"http://www.fsf.org\";>Free Software "
+"Foundation</a>, Inc."
+msgstr ""
+"Të drejta Kopjimi &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, "
+"2004, 2005, 2006, 2007, 2008, 2009 <a href=\"http://www.fsf.org\";>Free "
+"Software Foundation</a>, 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>."
-msgstr "Kjo faqe mund të përdoret sipas një <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Lejeje Creative 
Commons Attribution-NoDerivs 3.0 United States</a>."
+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>."
+msgstr ""
+"Kjo faqe mund të përdoret sipas një <a rel=\"license\" href=\"http://";
+"creativecommons.org/licenses/by-nd/3.0/us/\">Lejeje Creative Commons "
+"Attribution-NoDerivs 3.0 United States</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -150,4 +208,3 @@
 #. type: Content of: <div><h4>
 msgid "Translations of this page"
 msgstr "Përkthime të kësaj faqeje"
-

Index: graphics/license-logos.es.html
===================================================================
RCS file: /web/www/www/graphics/license-logos.es.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- graphics/license-logos.es.html      29 Jul 2011 08:35:25 -0000      1.7
+++ graphics/license-logos.es.html      8 Aug 2011 16:36:40 -0000       1.8
@@ -13,32 +13,36 @@
 <!--#include virtual="/server/banner.es.html" -->
 <h2>Logos de las licencias de GNU</h2>
 
-<p>Si libera un trabajo bajo la tercera versión de la <a
-href="/licenses/gpl.html" >GPL</a>, <a href="/licenses/lgpl.html">LGPL</a>,
-o <a href="/licenses/agpl.html">AGPL</a> de GNU, puede usar libremente los
+<p>Si libera un trabajo bajo la <a href="/licenses/fdl.html">GFDL</a>, la
+tercera versión de la <a href="/licenses/gpl.html" >GPL</a>, <a
+href="/licenses/lgpl.html">LGPL</a>, o <a
+href="/licenses/agpl.html">AGPL</a> de GNU, puede usar libremente los
 siguientes logos en su web o en su aplicación para publicitar la
 licencia. Estos logos son rápidamente reconocibles, y mostrará a sus
 usuarios que su libertad está siendo protegida.</p>
 
 <p>Aquí tiene algunos logos de la version vectorial: <a
 href="gpl-v3-logo.svg">GPLv3 SVG</a>, <a
-href="lgpl-agpl-v3-logos.svg">LGPLv3 y AGPLv3 SVG</a>.
-</p>
+href="lgpl-agpl-v3-logos.svg">LGPLv3 and AGPLv3 SVG</a>, <a
+href="gfdl-logo.svg">GFDL SVG</a>.</p>
 
 <table id="license-logos">
 <tr>
-<th>51 pixels de alto</th>
+<th><a href="gfdl-logo-small.png"><img src="gfdl-logo-small.png" alt="[Logo 
GFDL grande]" /></a></th>
 <td><a href="gplv3-127x51.png"><img src="gplv3-127x51.png" alt="[Logo GPLv3 
grande]" /></a></td>
 <td><a href="lgplv3-147x51.png"><img src="lgplv3-147x51.png" alt="[Logo LGPLv3 
Grande]" /></a></td>
 <td><a href="agplv3-155x51.png"><img src="agplv3-155x51.png" alt="[Logo AGPLv3 
de GNU grande]" /></a></td>
 </tr>
 <tr>
-<th>88x31 pixels</th>
+<th><a href="gfdl-logo-tiny.png"><img src="gfdl-logo-tiny.png" alt="[Logo 
GPLv3 pequeño]" /></a></th>
 <td><a href="gplv3-88x31.png"><img src="gplv3-88x31.png" alt="[Logo GPLv3 
pequeño]" /></a></td>
 <td><a href="lgplv3-88x31.png"><img src="lgplv3-88x31.png" alt="[Logo LGPLv3 
pequeño]" /></a></td>
 <td><a href="agplv3-88x31.png"><img src="agplv3-88x31.png" alt="[Logo AGPLv3 
de GNU pequeño]" /></a></td>
 </tr>
 </table>
+<p>Logotipo de la GFDL en otros tamaños: <a
+href="gfdl-logo-med.png">Grande</a>, <a href="gfdl-logo-large.png">incluso
+más grande</a></p>
 
 <!-- If needed, change the copyright block at the bottom. In general, -->
 <!-- all pages on the GNU web server should have the section about    -->
@@ -65,7 +69,7 @@
 </p>
 
 <p>
-Copyright &copy; 2010 Free Software Foundation, Inc.</p>
+Copyright &copy; 2010, 2011 Free Software Foundation, Inc.</p>
 <address>51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA</address>
 <p>Está página está bajo una <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.es";>licencia
@@ -86,7 +90,7 @@
 <!-- timestamp start -->
 Última actualización: 
 
-$Date: 2011/07/29 08:35:25 $
+$Date: 2011/08/08 16:36:40 $
 
 <!-- timestamp end -->
 </p>

Index: graphics/po/license-logos.es.po
===================================================================
RCS file: /web/www/www/graphics/po/license-logos.es.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- graphics/po/license-logos.es.po     8 Aug 2011 10:08:25 -0000       1.10
+++ graphics/po/license-logos.es.po     8 Aug 2011 16:36:48 -0000       1.11
@@ -51,15 +51,11 @@
 "assure your users that their freedom is being protected."
 msgstr ""
 "Si libera un trabajo bajo la <a href=\"/licenses/fdl.html\">GFDL</a>, la "
-"tercera "
-"versión de la <a href=\"/licenses/gpl.html\" >GPL</a>, <a "
-"href=\"/licenses/lgpl."
-"html\">LGPL</a>, o <a href=\"/licenses/agpl.html\">AGPL</a> de GNU, puede "
-"usar libremente los siguientes logos en su web o en su aplicación para "
-"publicitar "
-"la licencia. Estos logos son rápidamente reconocibles, y mostrará a sus "
-"usuarios "
-"que su libertad está siendo protegida."
+"tercera versión de la <a href=\"/licenses/gpl.html\" >GPL</a>, <a href=\"/"
+"licenses/lgpl.html\">LGPL</a>, o <a href=\"/licenses/agpl.html\">AGPL</a> de "
+"GNU, puede usar libremente los siguientes logos en su web o en su aplicación 
"
+"para publicitar la licencia. Estos logos son rápidamente reconocibles, y "
+"mostrará a sus usuarios que su libertad está siendo protegida."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -68,9 +64,9 @@
 "href=\"lgpl-agpl-v3-logos.svg\">LGPLv3 and AGPLv3 SVG</a>, <a href=\"gfdl-"
 "logo.svg\">GFDL SVG</a>."
 msgstr ""
-"Aquí tiene algunos logos de la version vectorial: <a 
href=\"gpl-v3-logo.svg\""
-">GPLv3 SVG</a>, <a href=\"lgpl-agpl-v3-logos.svg\">LGPLv3 and AGPLv3 SVG"
-"</a>, <a href=\"gfdl-logo.svg\">GFDL SVG</a>."
+"Aquí tiene algunos logos de la version vectorial: <a href=\"gpl-v3-logo.svg"
+"\">GPLv3 SVG</a>, <a href=\"lgpl-agpl-v3-logos.svg\">LGPLv3 and AGPLv3 SVG</"
+"a>, <a href=\"gfdl-logo.svg\">GFDL SVG</a>."
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><th><a>
@@ -157,8 +153,8 @@
 "GFDL logo in other sizes: <a href=\"gfdl-logo-med.png\">Bigger</a>, <a href="
 "\"gfdl-logo-large.png\">Even bigger</a>"
 msgstr ""
-"Logotipo de la GFDL en otros tamaños: <a href=\"gfdl-logo-med.png\">Grande<"
-"/a>, <a href=\"gfdl-logo-large.png\">incluso más grande</a>"
+"Logotipo de la GFDL en otros tamaños: <a href=\"gfdl-logo-med.png\">Grande</"
+"a>, <a href=\"gfdl-logo-large.png\">incluso más grande</a>"
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.

Index: licenses/translations.pl.html
===================================================================
RCS file: /web/www/www/licenses/translations.pl.html,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- licenses/translations.pl.html       7 Aug 2011 08:36:52 -0000       1.86
+++ licenses/translations.pl.html       8 Aug 2011 16:36:54 -0000       1.87
@@ -19,11 +19,12 @@
 społeczności wolnego oprogramowania. Tak długo jak tłumaczenia są
 nieoficjalne, nie zaszkodzą.</p>
 
-<p>Celem linków do&nbsp;tłumaczeń jest aby&nbsp;więcej ludzi zrozumiało 
nasze
-licencje. Aby&nbsp;to zrobić, tłumaczenia muszą być dokładne a&nbsp;nawet
-idealne. Aby&nbsp;stworzyć dobre tłumaczenie trzeba właściwie rozumieć 
takie
-podstawowe pojęcia jak  <a href="/copyleft/copyleft.html">copyleft</a>
-czy&nbsp;<a href="/philosophy/free-sw.html">definicja wolnego
+<p>Celem linków do&nbsp;tłumaczeń jest to, aby&nbsp;więcej ludzi 
zrozumiało
+nasze licencje. Żeby&nbsp;to zrobić, tłumaczenia muszą być dokładne
+a&nbsp;nawet idealne. Aby&nbsp;stworzyć dobre tłumaczenie, trzeba właściwie
+rozumieć takie podstawowe pojęcia jak  <a
+href="/copyleft/copyleft.html">copyleft</a> czy&nbsp;<a
+href="/philosophy/free-sw.html">definicja wolnego
 oprogramowania</a>. Z&nbsp;tego powodu tłumacze, którzy chcą dostarczyć
 tłumaczeń powinni się upewnić, że&nbsp;dobrze rozumieją te pojęcia jak
 i&nbsp;inne zasady filozofii wolnego oprogramowania zawarte
@@ -463,11 +464,11 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 Tłumaczenie: Wojciech Kotwica 2001, Daniel Oźminkowski 2010, poprawki:
 Wojciech Kotwica 2001, 2002, 2003, 2004, 2005, 2006, Jan Owoc 2010, 2011,
-Daniel Oźminkowski 2011, Marcin Wolak 2010.</div>
+Daniel Oźminkowski 2011, Marcin Wolak 2010, 2011.</div>
  <p><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2011/08/07 08:36:52 $
+$Date: 2011/08/08 16:36:54 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/translations.es.po
===================================================================
RCS file: /web/www/www/licenses/po/translations.es.po,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50

Index: links/po/links.es.po
===================================================================
RCS file: /web/www/www/links/po/links.es.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- links/po/links.es.po        8 Aug 2011 10:04:22 -0000       1.47
+++ links/po/links.es.po        8 Aug 2011 16:37:13 -0000       1.48
@@ -483,8 +483,7 @@
 "to make and distribute films."
 msgstr ""
 "pFFP - El plugincinema Free Film Project promociona el uso de software libre "
-"en la "
-"creación y distribución de películas."
+"en la creación y distribución de películas."
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -937,8 +936,7 @@
 "Please send broken links and other corrections or suggestions to <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
-"Por favor, envíe enlaces rotos y otras correcciones o sugerencias a 
<a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
+"Por favor, envíe enlaces rotos y otras correcciones o sugerencias a 
<a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
 "a>."
 
 # type: Content of: <div><p>

Index: server/footer-text.es.html
===================================================================
RCS file: /web/www/www/server/footer-text.es.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/footer-text.es.html  14 Jul 2011 08:37:03 -0000      1.19
+++ server/footer-text.es.html  8 Aug 2011 16:37:20 -0000       1.20
@@ -58,7 +58,7 @@
 propio software</a>.</li></ul></li>
        <li><a href="http://www.fsf.org/resources/service/";>Directorio de 
servicios de
 GNU</a></li>
-       <li><a href="/fun/fun.es.html">Humor de GNU</a></li>
+       <li><a href="/fun/fun.html">Humor de GNU</a></li>
        <li><a href="/graphics/graphics.es.html">Arte de GNU</a></li>
        <li><a href="/music/music.html">Música y canciones</a></li>
 

Index: software/software.es.html
===================================================================
RCS file: /web/www/www/software/software.es.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- software/software.es.html   6 Aug 2011 08:37:17 -0000       1.10
+++ software/software.es.html   8 Aug 2011 16:37:28 -0000       1.11
@@ -91,9 +91,10 @@
 tiene preguntas acerca de esta lista, envíe un correo electrónico <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>There are also comprehensive lists of <a
-href="/manual/manual.html">documentation for GNU packages</a> (arranged by
-category), and <a href="/graphics/package-logos.html">GNU package 
logos</a>.</p>
+<p>También existe una detallada lista de <a
+href="/manual/manual.html">documentación para paquetes de GNU</a> (ordenada
+por categoría) y <a href="/graphics/package-logos.html">logotipos de
+paquetes de GNU</a>.</p>
 
 <!-- regenerate when official list changes, via
        gm generate packages html  (or see the Makefile)
@@ -188,7 +189,7 @@
  <p><!-- timestamp start -->
 Última actualización: 
 
-$Date: 2011/08/06 08:37:17 $
+$Date: 2011/08/08 16:37:28 $
 
 <!-- timestamp end -->
 </p>

Index: software/po/software.es.po
===================================================================
RCS file: /web/www/www/software/po/software.es.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- software/po/software.es.po  8 Aug 2011 10:02:35 -0000       1.6
+++ software/po/software.es.po  8 Aug 2011 16:37:37 -0000       1.7
@@ -236,8 +236,8 @@
 "graphics/package-logos.html\">GNU package logos</a>."
 msgstr ""
 "También existe una detallada lista de <a href=\"/manual/manual.html"
-"\">documentación para paquetes de GNU</a> (ordenada por categoría) y <a "
-"href=\"/graphics/package-logos.html\">logotipos de paquetes de GNU</a>."
+"\">documentación para paquetes de GNU</a> (ordenada por categoría) y <a 
href="
+"\"/graphics/package-logos.html\">logotipos de paquetes de GNU</a>."
 
 # type: Content of: <h3>
 #. type: Content of: <h3>



reply via email to

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