www/education edu-schools.ca.html po/edu-school...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/09/07 06:29:51

Modified files:
        education      : edu-schools.ca.html 
        education/po   : edu-schools.ca-en.html edu-schools.ca.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-schools.ca.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.ca-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.ca.po?cvsroot=www&r1=1.24&r2=1.25

Patches:
Index: edu-schools.ca.html
===================================================================
RCS file: /web/www/www/education/edu-schools.ca.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- edu-schools.ca.html 1 Aug 2015 12:57:05 -0000       1.19
+++ edu-schools.ca.html 7 Sep 2015 06:29:47 -0000       1.20
@@ -1,9 +1,4 @@
-<!--#set var="PO_FILE"
- value='<a href="/education/po/edu-schools.ca.po">
- http://www.gnu.org/education/po/edu-schools.ca.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/education/edu-schools.html"
- --><!--#set var="DIFF_FILE" value="/education/po/edu-schools.ca-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2015-06-02" --><!--#set 
var="ENGLISH_PAGE" value="/education/edu-schools.en.html" -->
+<!--#set var="ENGLISH_PAGE" value="/education/edu-schools.en.html" -->
 
 <!--#include virtual="/server/header.ca.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -37,7 +32,6 @@
 escoles haurien d'utilitzar exclusivament programari lliure</p>
 
 <!--GNUN: OUT-OF-DATE NOTICE-->
-<!--#include virtual="/server/outdated.ca.html" -->
 <!--#if expr="$OUTDATED_SINCE" -->
 <!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -49,7 +43,8 @@
 
 <p>per <a href="http://www.stallman.org/";>Richard Stallman</a></p>
 
-<p>Tota tasca educativa (incloent-hi les escoles) té el deure moral de <a
+<p>Tota tasca educativa (incloent-hi la de les escoles, des de les guarderies
+fins a la universitat) té el deure moral de <a
 href="/education/education.ca.html">ensenyar només programari lliure.</a></p>
 
 <p>Tots els usuaris d'ordinadors haurien d'<a
@@ -94,7 +89,8 @@
 estendre la dependència dels seus productes, igual que les companyies
 tabaqueres quan distribueixen gratuïtament cigarrets als escolars<a
 href="#note2">(2)</a>. No donaran còpies gratuïtes a aquests estudiants quan
-s'hagin graduat, ni a les empreses per les que treballaran.</p>
+s'hagin graduat, ni a les empreses per les que treballaran. Quan ja ets
+dependent, s'espera que paguis.</p>
 
 <p>El programari lliure permet als estudiants aprendre com funciona el
 programari. Alguns estudiants -que semblen haver nascut per ser
@@ -206,25 +202,24 @@
 col·laborar en la traducció al català del web de GNU.</p>
 </div>
 
-<p>Copyright &copy; 2003, 2009, 2014 Richard Stallman</p>
+<p>Copyright &copy; 2003, 2009, 2014, 2015 Richard Stallman</p>
 
 <p>Aquesta pà gina es troba sota la <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ca";>Llicència
-Creative Commons Reconeixement-SenseObraDerivada 3.0 Estats Units
-d'Amèrica</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Llicència Creative
+Commons Reconeixement-SenseObraDerivada 4.0 Internacional</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ca.html" -->
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 Traducció: Joan Lladonet i Pau Cabot, 9 de juliol de 2004<br />Darrera
-actualització: <a href="http://www.puigpe.org/";>puigpe</a>, 11 de gener de
+actualització: <a href="http://www.puigpe.org/";>puigpe</a>, 7 de setembre de
 2015</div>
 
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2015/08/01 12:57:05 $
+$Date: 2015/09/07 06:29:47 $
 
 <!-- timestamp end -->
 </p>

Index: po/edu-schools.ca-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-schools.ca-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/edu-schools.ca-en.html   11 Jan 2015 18:58:48 -0000      1.7
+++ po/edu-schools.ca-en.html   7 Sep 2015 06:29:49 -0000       1.8
@@ -38,7 +38,8 @@
 
 <p>by <a href="http://www.stallman.org/";>Richard Stallman</a></p>
 
-<p>Educational activities (including schools) have a moral duty
+<p>Educational activities, including schools of all levels from
+kindergarten to university, have a moral duty
 to <a href="/education/education.html">teach only free
 software.</a></p>
 
@@ -85,7 +86,8 @@
 dependence on their products, like tobacco companies distributing
 gratis cigarettes to school children<a href="#note2">(2)</a>.  They
 will not give gratis copies to these students once they've graduated,
-nor to the companies that they go to work for.</p>
+nor to the companies that they go to work for.  Once you're dependent,
+you're expected to pay.</p>
 
 <p>Free software permits students to learn how software works.  Some
 students, natural-born programmers, on reaching their teens yearn to
@@ -189,17 +191,17 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2003, 2009, 2014 Richard Stallman</p>
+<p>Copyright &copy; 2003, 2009, 2014, 2015 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/01/11 18:58:48 $
+$Date: 2015/09/07 06:29:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/edu-schools.ca.po
===================================================================
RCS file: /web/www/www/education/po/edu-schools.ca.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- po/edu-schools.ca.po        7 Sep 2015 06:16:01 -0000       1.24
+++ po/edu-schools.ca.po        7 Sep 2015 06:29:50 -0000       1.25
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2015-09-07 08:15+0200\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -69,15 +70,14 @@
 msgstr "per <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 
 #. type: Content of: <p>
-#| msgid ""
-#| "Educational activities (including schools) have a moral duty to <a href="
-#| "\"/education/education.html\">teach only free software.</a>"
 msgid ""
 "Educational activities, including schools of all levels from kindergarten to "
 "university, have a moral duty to <a href=\"/education/education.html\">teach "
 "only free software.</a>"
 msgstr ""
-"Tota tasca educativa (incloent-hi la de les escoles, des de les guarderies 
fins a la universitat) té el deure moral de <a 
href=\"/education/education.ca.html\">ensenyar només programari lliure.</a>"
+"Tota tasca educativa (incloent-hi la de les escoles, des de les guarderies "
+"fins a la universitat) té el deure moral de <a href=\"/education/education."
+"ca.html\">ensenyar només programari lliure.</a>"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -160,14 +160,6 @@
 "haurien de fer-ho."
 
 #. type: Content of: <p>
-#| msgid ""
-#| "Why, after all, do some proprietary software developers offer gratis "
-#| "copies<a href=\"#note1\">(1)</a> of their nonfree programs to schools? "
-#| "Because they want to <em>use</em> the schools to implant dependence on "
-#| "their products, like tobacco companies distributing gratis cigarettes to "
-#| "school children<a href=\"#note2\">(2)</a>.  They will not give gratis "
-#| "copies to these students once they've graduated, nor to the companies "
-#| "that they go to work for."
 msgid ""
 "Why, after all, do some proprietary software developers offer gratis "
 "copies<a href=\"#note1\">(1)</a> of their nonfree programs to schools? "
@@ -183,7 +175,8 @@
 "estendre la dependència dels seus productes, igual que les companyies "
 "tabaqueres quan distribueixen gratuïtament cigarrets als escolars<a href="
 "\"#note2\">(2)</a>. No donaran còpies gratuïtes a aquests estudiants quan "
-"s'hagin graduat, ni a les empreses per les que treballaran. Quan ja ets 
dependent, s'espera que paguis."
+"s'hagin graduat, ni a les empreses per les que treballaran. Quan ja ets "
+"dependent, s'espera que paguis."
 
 # 1\\">(1)</a>. No faran descomptes a aquests estudiants quan creixin i deixin 
l'escola."
 # type: Content of: <p>
@@ -394,22 +387,18 @@
 "traducció al català del web de GNU."
 
 #. type: Content of: <div><p>
-#| msgid "Copyright &copy; 2003, 2009, 2014 Richard Stallman"
 msgid "Copyright &copy; 2003, 2009, 2014, 2015 Richard Stallman"
 msgstr "Copyright &copy; 2003, 2009, 2014, 2015 Richard Stallman"
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-#| "NoDerivs 3.0 United States License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Aquesta pà gina es troba sota la <a rel=\"license\" href=\"http://";
-"creativecommons.org/licenses/by-nd/4.0/\">Llicència Creative Commons 
Reconeixement-SenseObraDerivada 4.0 Internacional</a>."
+"creativecommons.org/licenses/by-nd/4.0/\">Llicència Creative Commons "
+"Reconeixement-SenseObraDerivada 4.0 Internacional</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -417,8 +406,8 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
 "Traducció: Joan Lladonet i Pau Cabot, 9 de juliol de 2004<br />Darrera "
-"actualització: <a href=\"http://www.puigpe.org/\";>puigpe</a>, 7 de setembre 
de "
-"2015"
+"actualització: <a href=\"http://www.puigpe.org/\";>puigpe</a>, 7 de setembre "
+"de 2015"
 
 # type: Content of: <div><p>
 #.  timestamp start