www-commits
[Top][All Lists]
Advanced

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

www/philosophy apsl.ca.html bsd.ca.html essays-...


From: GNUN
Subject: www/philosophy apsl.ca.html bsd.ca.html essays-...
Date: Tue, 07 Jan 2014 10:34:22 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/01/07 10:34:22

Modified files:
        philosophy     : apsl.ca.html bsd.ca.html 
                         essays-and-articles.ca.html free-doc.ca.html 
                         fs-motives.ca.html fs-translations.ca.html 
                         nonsoftware-copyleft.ca.html philosophy.ca.html 
                         protecting.ca.html 
        philosophy/po  : apsl.ca-en.html apsl.ca.po bsd.ca-en.html 
                         bsd.ca.po essays-and-articles.ca-en.html 
                         essays-and-articles.ca.po free-doc.ca-en.html 
                         free-doc.ca.po fs-motives.ca-en.html 
                         fs-motives.ca.po fs-translations.ca-en.html 
                         fs-translations.ca.po 
                         nonsoftware-copyleft.ca-en.html 
                         nonsoftware-copyleft.ca.po 
                         philosophy.ca-en.html philosophy.ca.po 
                         protecting.ca-en.html protecting.ca.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/apsl.ca.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/bsd.ca.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.ca.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-doc.ca.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-motives.ca.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.ca.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/nonsoftware-copyleft.ca.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/philosophy.ca.html?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/protecting.ca.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/apsl.ca-en.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/apsl.ca.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/bsd.ca-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/bsd.ca.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ca-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ca.po?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.ca-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.ca.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-motives.ca-en.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-motives.ca.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ca-en.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ca.po?cvsroot=www&r1=1.68&r2=1.69
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonsoftware-copyleft.ca-en.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonsoftware-copyleft.ca.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.ca-en.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.ca.po?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/protecting.ca-en.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/protecting.ca.po?cvsroot=www&r1=1.15&r2=1.16

Patches:
Index: apsl.ca.html
===================================================================
RCS file: /web/www/www/philosophy/apsl.ca.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- apsl.ca.html        31 Aug 2013 20:11:36 -0000      1.27
+++ apsl.ca.html        7 Jan 2014 10:32:49 -0000       1.28
@@ -1,11 +1,13 @@
 
+
 <!--#include virtual="/server/header.ca.html" -->
+<!-- Parent-Version: 1.75 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
  <!--#set var="ENGLISH_PAGE" value="/philosophy/apsl.en.html" -->
 
 <title>L'opinió de la FSF sobre la Llicència de Codi Públic d'Apple (APSL) -
-Projecte GNU - Free Software Foundation (FSF)</title>
+Projecte GNU - Free Software Foundation</title>
 
 <!--#include virtual="/philosophy/po/apsl.translist" -->
 <!--#include virtual="/server/banner.ca.html" -->
@@ -63,25 +65,55 @@
  </div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ca.html" -->
 <div id="footer">
 
-<p>Envieu les vostres preguntes sobre la FSF i GNU a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
-href="/contact/contact.ca.html">altres formes de contactar</a> amb la FSF. 
-<br />
-Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>.</p>
-
-<p>Vegeu la <a href="/server/standards/README.translations.ca.html">Guia de
+<p>Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  També hi ha <a
+href="/contact/contact.ca.html">altres formes de contactar</a> amb la
+FSF. Envieu els enllaços trencats i altres correccions o suggeriments a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Vegeu la <a href="/server/standards/README.translations.ca.html">Guia de
 traducció</a> per informar-vos sobre la coordinació i publicació de les
 traduccions d'aquest article. <br />Contacteu amb l'<a
 href="/server/standards/translations/ca/">Equip de traducció</a> per
 col·laborar en la traducció al català del web de GNU.</p>
 
-<p>Copyright &copy; 1999, 2001, 2007, 2008 Free Software Foundation, Inc.,</p>
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 1999, 2001, 2007, 2008 Free Software Foundation, Inc.</p>
 
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
 
 <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
@@ -99,12 +131,11 @@
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2013/08/31 20:11:36 $
+$Date: 2014/01/07 10:32:49 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: bsd.ca.html
===================================================================
RCS file: /web/www/www/philosophy/bsd.ca.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- bsd.ca.html 31 Aug 2013 20:11:38 -0000      1.26
+++ bsd.ca.html 7 Jan 2014 10:32:50 -0000       1.27
@@ -1,22 +1,17 @@
 
+
 <!--#include virtual="/server/header.ca.html" -->
+<!-- Parent-Version: 1.75 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
  <!--#set var="ENGLISH_PAGE" value="/philosophy/bsd.en.html" -->
 
-<title>El problema de la llicència BSD - Projecte GNU - Free Software 
Foundation
-(FSF)</title>
+<title>El problema de la llicència BSD - Projecte GNU - Free Software 
Foundation</title>
 
 <!--#include virtual="/philosophy/po/bsd.translist" -->
 <!--#include virtual="/server/banner.ca.html" -->
 <h2>El problema de la llicència BSD</h2>
 
-<!-- This document uses XHTML 1.0 Strict, but may be served as -->
-<!-- text/html.  Please ensure that markup style considers -->
-<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
-<!-- Please ensure links are consistent with Apache's MultiView. -->
-<!-- Change include statements to be consistent with the relevant -->
-<!-- language, where necessary. -->
 <p>
     Les dues categories principals de llicències de programari lliure són <a
 href="/copyleft/copyleft.ca.html">amb copyleft</a> i <a
@@ -153,12 +148,7 @@
 "llicència BSD revisada".
 </p>
 
-<!-- If needed, change the copyright block at the bottom. In general, -->
-<!-- all pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. -->
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -169,33 +159,40 @@
 <!--#include virtual="/server/footer.ca.html" -->
 <div id="footer">
 
-<p>
-Envieu les vostres preguntes sobre la FSF i GNU a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
-href="/contact/contact.ca.html">altres formes de contactar</a> amb la FSF. 
-<br />
-Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
-
-<p>
+<p>Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  També hi ha <a
+href="/contact/contact.ca.html">altres formes de contactar</a> amb la
+FSF. Envieu els enllaços trencats i altres correccions o suggeriments a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 Vegeu la <a href="/server/standards/README.translations.ca.html">Guia de
 traducció</a> per informar-vos sobre la coordinació i publicació de les
 traduccions d'aquest article. <br />Contacteu amb l'<a
 href="/server/standards/translations/ca/">Equip de traducció</a> per
-col·laborar en la traducció al català del web de GNU.
-</p>
+col·laborar en la traducció al català del web de GNU.</p>
+
+<p>Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013 Free Software
+Foundation, Inc.</p>
 
-<p>
-Copyright &copy; 1998, 1999, 2001, 2003, 2007 Free Software Foundation,
-Inc.,
-</p>
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
 <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>
+d'Amèrica</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ca.html" -->
 <div class="translators-credits">
@@ -208,12 +205,11 @@
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2013/08/31 20:11:38 $
+$Date: 2014/01/07 10:32:50 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: essays-and-articles.ca.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.ca.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- essays-and-articles.ca.html 12 Nov 2013 13:12:40 -0000      1.37
+++ essays-and-articles.ca.html 7 Jan 2014 10:32:50 -0000       1.38
@@ -55,6 +55,7 @@
 bo!</li>
   <li><a href="/philosophy/categories.ca.html">Categories de programari lliure 
i
 no lliure</a></li>
+  <li><a href="/philosophy/floss-and-foss.html"> FLOSS i FOSS</a></li>
   <li><a href="/software/reliability.ca.html">El programari lliure és més
 fiable!</a></li>
 <li><a href="/philosophy/when_free_software_isnt_practically_better.html">Quan
@@ -561,7 +562,7 @@
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2013/11/12 13:12:40 $
+$Date: 2014/01/07 10:32:50 $
 
 <!-- timestamp end -->
 </p>

Index: free-doc.ca.html
===================================================================
RCS file: /web/www/www/philosophy/free-doc.ca.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- free-doc.ca.html    31 Aug 2013 20:11:59 -0000      1.27
+++ free-doc.ca.html    7 Jan 2014 10:32:50 -0000       1.28
@@ -1,12 +1,13 @@
 
 
 <!--#include virtual="/server/header.ca.html" -->
+<!-- Parent-Version: 1.75 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
  <!--#set var="ENGLISH_PAGE" value="/philosophy/free-doc.en.html" -->
 
 <title>Per què el programari lliure necessita documentació lliure - Projecte 
GNU -
-Free Software Foundation (FSF)</title>
+Free Software Foundation</title>
 
 <!--#include virtual="/philosophy/po/free-doc.translist" -->
 <!--#include virtual="/server/banner.ca.html" -->
@@ -157,26 +158,47 @@
  </div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ca.html" -->
 <div id="footer">
-<p>
-Envieu les vostres preguntes sobre la FSF i GNU a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
-href="/contact/contact.ca.html">altres formes de contactar</a> amb la FSF.
-<br /> 
-Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+
+<p>Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  També hi ha <a
+href="/contact/contact.ca.html">altres formes de contactar</a> amb la
+FSF. Envieu els enllaços trencats i altres correccions o suggeriments a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Vegeu si us plau la <a
+href="/server/standards/README.translations.ca.html">Guia de traducció</a>
+per informar-vos sobre la coordinació i publicació de les traduccions
+d'aquest article. <br />Contacteu amb l'<a
+href="/server/standards/translations/ca/">Equip de traducció</a> per
+col·laborar en la traducció al català del web de GNU.</p>
 
 <p>
 Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 2006, 2007, 2009 Free Software Foundation, Inc.
 </p>
+
 <p>Aquesta pàgina es troba sota la <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ca";>Llicència
 Creative Commons Reconeixement-SenseObraDerivada 3.0 Estats Units
-d'Amèrica</a>.
-</p>
+d'Amèrica</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ca.html" -->
 <div class="translators-credits">
@@ -189,17 +211,11 @@
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2013/08/31 20:11:59 $
+$Date: 2014/01/07 10:32:50 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
-<!-- All pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. -->
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
 </div>
 </body>
 </html>

Index: fs-motives.ca.html
===================================================================
RCS file: /web/www/www/philosophy/fs-motives.ca.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- fs-motives.ca.html  31 Aug 2013 20:12:03 -0000      1.24
+++ fs-motives.ca.html  7 Jan 2014 10:32:50 -0000       1.25
@@ -1,10 +1,13 @@
  
+
 <!--#include virtual="/server/header.ca.html" -->
+<!-- Parent-Version: 1.75 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
  <!--#set var="ENGLISH_PAGE" value="/philosophy/fs-motives.en.html" -->
 
-<title>Motivacions per escriure programari lliure</title>
+<title>Motivacions per escriure programari lliure - Projecte GNU - Free 
Software
+Foundation</title>
 
 <!--#include virtual="/philosophy/po/fs-motives.translist" -->
 <!--#include virtual="/server/banner.ca.html" -->
@@ -47,8 +50,8 @@
 <dt>Odi a Microsoft.</dt>
 <dd>
 És un error centrar les nostres crítiques <a
-href="/philosophy/microsoft.html">només en Microsoft</a>. Sí, Microsoft és
-maligna, ja que crea programari no lliure. I el que encara és pitjor,
+href="/philosophy/microsoft.ca.html">només en Microsoft</a>. Sí, Microsoft
+és maligna, ja que crea programari no lliure. I el que encara és pitjor,
 implementa la <a href="http://DefectiveByDesign.org";>Digital Restrictions
 Management</a> en el seu programari. Però moltes altres companyies fan una o
 les dues coses. <br />
@@ -103,31 +106,41 @@
 <!--#include virtual="/server/footer.ca.html" -->
 <div id="footer">
 
-<p>
-Envieu les vostres preguntes sobre la FSF i GNU a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
-href="/contact/contact.ca.html">altres formes de contactar</a> amb la FSF. 
-<br />
-Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+<p>Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  També hi ha <a
+href="/contact/contact.ca.html">altres formes de contactar</a> amb la
+FSF. Envieu els enllaços trencats i altres correccions o suggeriments a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
 <p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 Vegeu la <a href="/server/standards/README.translations.ca.html">Guia de
 traducció</a> per informar-vos sobre la coordinació i publicació de les
 traduccions d'aquest article. <br />Contacteu amb l'<a
 href="/server/standards/translations/ca/">Equip de traducció</a> per
-col·laborar en la traducció al català del web de GNU.
-</p>
+col·laborar en la traducció al català del web de GNU.</p>
 
 <p>
 Copyright &copy; 2009 Free Software Foundation, Inc.
 </p>
+
 <p>Aquesta pàgina es troba sota la <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ca";>Llicència
 Creative Commons Reconeixement-SenseObraDerivada 3.0 Estats Units
-d'Amèrica</a>.
-</p>
+d'Amèrica</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ca.html" -->
 <div class="translators-credits">
@@ -140,12 +153,11 @@
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2013/08/31 20:12:03 $
+$Date: 2014/01/07 10:32:50 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: fs-translations.ca.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.ca.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- fs-translations.ca.html     12 Nov 2013 13:28:50 -0000      1.33
+++ fs-translations.ca.html     7 Jan 2014 10:32:53 -0000       1.34
@@ -131,8 +131,9 @@
 </tr>
 <tr>
 <td>fa</td><td>Persa</td>
-<td lang="fa" xml:lang="fa">نرمافزارِ آزاد (nrmafzar azad)</td>
-<td>&nbsp;</td><td>&nbsp;</td>
+<td lang="fa" xml:lang="fa">نرم‌افزار آزاد (narmafzar azad)</td>
+<td lang="fa" xml:lang="fa">نرم‌افزار رایگان (narmafzar 
raygan)</td>
+<td>&nbsp;</td>
 </tr>
 <tr>
 <td>fi</td><td>Finès</td>
@@ -487,7 +488,7 @@
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2013/11/12 13:28:50 $
+$Date: 2014/01/07 10:32:53 $
 
 <!-- timestamp end -->
 </p>

Index: nonsoftware-copyleft.ca.html
===================================================================
RCS file: /web/www/www/philosophy/nonsoftware-copyleft.ca.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- nonsoftware-copyleft.ca.html        31 Aug 2013 20:12:25 -0000      1.24
+++ nonsoftware-copyleft.ca.html        7 Jan 2014 10:33:01 -0000       1.25
@@ -1,11 +1,13 @@
 
+
 <!--#include virtual="/server/header.ca.html" -->
+<!-- Parent-Version: 1.75 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
  <!--#set var="ENGLISH_PAGE" value="/philosophy/nonsoftware-copyleft.en.html" 
-->
 
 <title>Aplicar el copyleft fora de l'àmbit del programari - Projecte GNU - 
Free
-Software Foundation (FSF)</title>
+Software Foundation</title>
 
 <!--#include virtual="/philosophy/po/nonsoftware-copyleft.translist" -->
 <!--#include virtual="/server/banner.ca.html" -->
@@ -193,29 +195,56 @@
  </div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ca.html" -->
 <div id="footer">
 
-<p>
-Envieu les vostres preguntes sobre la FSF i GNU a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
-href="/contact/contact.ca.html">altres formes de contactar</a> amb la FSF. 
-<br />
-Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
-href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
-
-<p>
+<p>Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  També hi ha <a
+href="/contact/contact.ca.html">altres formes de contactar</a> amb la
+FSF. Envieu els enllaços trencats i altres correccions o suggeriments a <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 Vegeu la <a href="/server/standards/README.translations.ca.html">Guia de
 traducció</a> per informar-vos sobre la coordinació i publicació de les
 traduccions d'aquest article. <br />Contacteu amb l'<a
 href="/server/standards/translations/ca/">Equip de traducció</a> per
-col·laborar en la traducció al català del web de GNU.
-</p>
+col·laborar en la traducció al català del web de GNU.</p>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 1997 Michael Stutz</p>
 
 <p>
-Copyright &copy; 1997 Michael Stutz
-<br />
 Es permet realitzar i distribuir còpies literals d'aquest article en
 qualsevol medi sense pagament de drets, sempre que es conservi aquesta nota.
 </p>
@@ -230,12 +259,11 @@
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2013/08/31 20:12:25 $
+$Date: 2014/01/07 10:33:01 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: philosophy.ca.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy.ca.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- philosophy.ca.html  31 Aug 2013 20:12:28 -0000      1.59
+++ philosophy.ca.html  7 Jan 2014 10:33:14 -0000       1.60
@@ -50,9 +50,11 @@
 <!-- from philosophy.fr.html and the original documents. -mhatta -->
 <ul>
   <li><a href="/philosophy/free-sw.ca.html">Què és el programari 
lliure?</a></li>
+  <li><a href="/philosophy/free-software-even-more-important.html"> Per què 
hem
+d'insistir en el programari lliure</a></li>
+  <li><a href="/philosophy/proprietary.html"> El programari privatiu sovint és
+maliciós</a></li>
   <li><a href="/gnu/gnu.ca.html">Història de GNU/Linux</a></li>
-  <li><a href="/philosophy/why-free.ca.html">Per què el programari no hauria 
de
-tenir propietaris</a></li>
   <li><a href="/philosophy/pragmatic.ca.html">Copyleft: idealisme pragmà
tic</a></li>
   <li><a href="/philosophy/free-doc.ca.html">Per què el programari lliure
 necessita documentació lliure</a></li>
@@ -68,6 +70,7 @@
 el programari lliure no és (a la pràctica) millor</a></li>
   <li><a href="/philosophy/government-free-software.html">Mesures que els 
governs
 poden aplicar per promoure el programari lliure</a></li>       
+  <li><a href="/education/education.ca.html">El programari lliure a 
l'educació</a></li>
 </ul>
 
 <p>
@@ -147,14 +150,14 @@
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-Darrera actualització: <a href="http://www.puigpe.org/";>puigpe</a>, 29 de
-novembre de 2012.</div>
+Darrera actualització: <a href="http://www.puigpe.org/";>puigpe</a>, 7 de
+gener de 2014.</div>
 
 
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2013/08/31 20:12:28 $
+$Date: 2014/01/07 10:33:14 $
 
 <!-- timestamp end -->
 </p>

Index: protecting.ca.html
===================================================================
RCS file: /web/www/www/philosophy/protecting.ca.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- protecting.ca.html  31 Aug 2013 20:12:32 -0000      1.24
+++ protecting.ca.html  7 Jan 2014 10:33:39 -0000       1.25
@@ -11,7 +11,13 @@
 
 <!--#include virtual="/philosophy/po/protecting.translist" -->
 <!--#include virtual="/server/banner.ca.html" -->
-<h2>Ajudeu-nos a defensar el dret a escriure programari lliure o no lliure</h2>
+<h2>Ajudeu-nos a protegir el dret a escriure programari lliure o no lliure</h2>
+
+<blockquote><p>
+La Lliga per a la Llibertat de Programació es troba actualment inactiva.
+Uniu-vos si us plau a la nostra campanya  <a
+href="http://endsoftpatents.org";>End Software Patents</a>!
+</p></blockquote>
 
 <p>
 El dret a escriure programari, sigui lliure o no lliure, es troba amenaçat
@@ -89,7 +95,8 @@
 col·laborar en la traducció al català del web de GNU.</p>
 
 <p>
-Copyright &copy; 1996, 1997, 1998, 2007, 2008 Free Software Foundation, Inc.
+Copyright &copy; 1996, 1997, 1998, 2007, 2008, 2013 Free Software
+Foundation, Inc.
 </p>
 
 <p>Aquesta pàgina es troba sota la <a rel="license"
@@ -108,7 +115,7 @@
  <p><!-- timestamp start -->
 Actualització:
 
-$Date: 2013/08/31 20:12:32 $
+$Date: 2014/01/07 10:33:39 $
 
 <!-- timestamp end -->
 </p>

Index: po/apsl.ca-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/apsl.ca-en.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/apsl.ca-en.html  28 Feb 2013 19:12:20 -0000      1.11
+++ po/apsl.ca-en.html  7 Jan 2014 10:33:45 -0000       1.12
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>FSF's Opinion on the Apple Public Source License (APSL) - GNU Project - 
Free Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>FSF's Opinion on the Apple Public Source License (APSL)
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/apsl.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>FSF's Opinion of the Apple Public Source License (APSL) 2.0</h2>
@@ -49,27 +51,54 @@
 <p><a href="http://www.gnu-darwin.org";>GNU-Darwin</a> is a combination
 of GNU and Darwin that is supposed to include only free software.</p>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
 
-<p>Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+<p>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.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.</p>
-
-<p>Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
 
-<p>Copyright &copy; 1999, 2001, 2007, 2008 Free Software Foundation, Inc.,</p>
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+
+<p>Copyright &copy; 1999, 2001, 2007, 2008 Free Software Foundation, Inc.</p>
 
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
@@ -79,11 +108,10 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:12:20 $
+$Date: 2014/01/07 10:33:45 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: po/apsl.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/apsl.ca.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/apsl.ca.po       7 Jan 2014 10:08:41 -0000       1.16
+++ po/apsl.ca.po       7 Jan 2014 10:33:58 -0000       1.17
@@ -11,15 +11,13 @@
 "PO-Revision-Date: 2014-01-07 10:44+0100\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>
-#| msgid ""
-#| "FSF's Opinion on the Apple Public Source License (APSL) - GNU Project - "
-#| "Free Software Foundation (FSF)"
 msgid ""
 "FSF's Opinion on the Apple Public Source License (APSL)  - GNU Project - "
 "Free Software Foundation"
@@ -145,12 +143,6 @@
 msgstr " "
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
-#| "org\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/"
-#| "\">other ways to contact</a> the FSF.  Broken links and other corrections "
-#| "or suggestions can be sent to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 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 "
@@ -158,10 +150,10 @@
 "can be sent to <a href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>."
 msgstr ""
-"Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a 
href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>.  També hi ha <a 
href=\"/contact/contact.ca."
-"html\">altres formes de contactar</a> amb la FSF. Envieu els enllaços "
-"trencats i altres correccions o suggeriments a <a href=\"mailto:";
+"Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  També hi ha <a 
href=\"/"
+"contact/contact.ca.html\">altres formes de contactar</a> amb la FSF. Envieu "
+"els enllaços trencats i altres correccions o suggeriments a <a 
href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div><p>
@@ -190,8 +182,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1999, 2001, 2007, 2008 Free Software Foundation, Inc.,"
 msgid "Copyright &copy; 1999, 2001, 2007, 2008 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 1999, 2001, 2007, 2008 Free Software Foundation, Inc."
 

Index: po/bsd.ca-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/bsd.ca-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/bsd.ca-en.html   28 Feb 2013 19:12:22 -0000      1.8
+++ po/bsd.ca-en.html   7 Jan 2014 10:34:06 -0000       1.9
@@ -1,18 +1,11 @@
 <!--#include virtual="/server/header.html" -->
-<title>BSD License Problem - GNU Project - Free Software Foundation 
(FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>BSD License Problem
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/bsd.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>The BSD License Problem</h2>
 
-
-<!-- This document uses XHTML 1.0 Strict, but may be served as -->
-<!-- text/html.  Please ensure that markup style considers -->
-<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
-
-<!-- Please ensure links are consistent with Apache's MultiView. -->
-<!-- Change include statements to be consistent with the relevant -->
-<!-- language, where necessary. -->
-
 <p>
     The two major categories of free software license are <a
         href="/copyleft/copyleft.html">copyleft</a> and <a
@@ -147,51 +140,49 @@
     &ldquo;revised BSD license&rdquo;.
 </p>
 
-<!-- If needed, change the copyright block at the bottom. In general, -->
-<!-- all pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
 
-<p>
-Please send FSF &amp; GNU inquiries to 
+<p>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.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>
-Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+
+<p>Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013
+Free Software Foundation, Inc.</p>
 
-<p>
-Copyright &copy; 1998, 1999, 2001, 2003, 2007 Free Software Foundation, Inc.,
-</p>
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
 <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>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:12:22 $
+$Date: 2014/01/07 10:34:06 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: po/bsd.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/bsd.ca.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po/bsd.ca.po        7 Jan 2014 10:08:41 -0000       1.26
+++ po/bsd.ca.po        7 Jan 2014 10:34:10 -0000       1.27
@@ -11,13 +11,13 @@
 "PO-Revision-Date: 2014-01-07 10:45+0100\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>
-#| msgid "BSD License Problem - GNU Project - Free Software Foundation (FSF)"
 msgid "BSD License Problem - GNU Project - Free Software Foundation"
 msgstr ""
 "El problema de la llicència BSD - Projecte GNU - Free Software Foundation"
@@ -305,12 +305,6 @@
 msgstr " "
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
-#| "org\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/"
-#| "\">other ways to contact</a> the FSF.  Broken links and other corrections "
-#| "or suggestions can be sent to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 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 "
@@ -318,10 +312,10 @@
 "can be sent to <a href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>."
 msgstr ""
-"Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a 
href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>.  També hi ha <a 
href=\"/contact/contact.ca."
-"html\">altres formes de contactar</a> amb la FSF. Envieu els enllaços "
-"trencats i altres correccions o suggeriments a <a href=\"mailto:";
+"Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  També hi ha <a 
href=\"/"
+"contact/contact.ca.html\">altres formes de contactar</a> amb la FSF. Envieu "
+"els enllaços trencats i altres correccions o suggeriments a <a 
href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div><p>
@@ -350,9 +344,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1998, 1999, 2001, 2003, 2007 Free Software Foundation, "
-#| "Inc.,"
 msgid ""
 "Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013 Free Software "
 "Foundation, Inc."

Index: po/essays-and-articles.ca-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ca-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/essays-and-articles.ca-en.html   12 Nov 2013 13:12:45 -0000      1.18
+++ po/essays-and-articles.ca-en.html   7 Jan 2014 10:34:11 -0000       1.19
@@ -47,6 +47,7 @@
   <li><a href="/philosophy/selling.html">Selling Free Software</a> is OK!</li>
   <li><a href="/philosophy/categories.html">Categories of Free and
        Non-Free Software</a></li>
+  <li><a href="/philosophy/floss-and-foss.html"> FLOSS and FOSS</a></li>
   <li><a href="/software/reliability.html">Free Software is More 
Reliable!</a></li>
 <li><a href="/philosophy/when_free_software_isnt_practically_better.html">When 
Free Software Isn't (Practically) Better</a></li>
   <li><a href="/philosophy/open-source-misses-the-point.html">Why
@@ -507,7 +508,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/11/12 13:12:45 $
+$Date: 2014/01/07 10:34:11 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/essays-and-articles.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ca.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- po/essays-and-articles.ca.po        7 Jan 2014 10:08:41 -0000       1.73
+++ po/essays-and-articles.ca.po        7 Jan 2014 10:34:12 -0000       1.74
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2014-01-07 10:49+0100\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>
@@ -127,7 +128,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid "<a href=\"/philosophy/my_doom.html\">MyDoom and You</a>"
 msgid "<a href=\"/philosophy/floss-and-foss.html\"> FLOSS and FOSS</a>"
 msgstr "<a href=\"/philosophy/floss-and-foss.html\"> FLOSS i FOSS</a>"
 

Index: po/free-doc.ca-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.ca-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/free-doc.ca-en.html      28 Feb 2013 19:12:29 -0000      1.10
+++ po/free-doc.ca-en.html      7 Jan 2014 10:34:12 -0000       1.11
@@ -1,6 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-
-<title>Why Free Software needs Free Documentation - GNU Project - Free 
Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Why Free Software needs Free Documentation
+- GNU Project - Free Software Foundation</title>
 
 <!--#include virtual="/philosophy/po/free-doc.translist" -->
 <!--#include virtual="/server/banner.html" -->
@@ -143,43 +144,51 @@
 [Note: We maintain a <a href="/doc/other-free-books.html">page
 that lists free books available from other publishers</a>].</p>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-
 <div id="footer">
-<p>
-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.
-<br /> 
-Please send broken links and other corrections or suggestions
-to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+
+<p>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.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
 
 <p>
 Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
 </p>
+
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.
-</p>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:12:29 $
+$Date: 2014/01/07 10:34:12 $
 <!-- timestamp end -->
 </p>
 </div>
-<!-- All pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
-
 </div>
 </body>
 </html>

Index: po/free-doc.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.ca.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- po/free-doc.ca.po   7 Jan 2014 10:08:41 -0000       1.23
+++ po/free-doc.ca.po   7 Jan 2014 10:34:14 -0000       1.24
@@ -11,15 +11,13 @@
 "PO-Revision-Date: 2014-01-07 10:43+0100\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>
-#| msgid ""
-#| "Why Free Software needs Free Documentation - GNU Project - Free Software "
-#| "Foundation (FSF)"
 msgid ""
 "Why Free Software needs Free Documentation - GNU Project - Free Software "
 "Foundation"
@@ -324,12 +322,6 @@
 msgstr " "
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
-#| "org\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/"
-#| "\">other ways to contact</a> the FSF.  Broken links and other corrections "
-#| "or suggestions can be sent to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 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 "
@@ -337,10 +329,10 @@
 "can be sent to <a href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>."
 msgstr ""
-"Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a 
href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>.  També hi ha <a 
href=\"/contact/contact.ca."
-"html\">altres formes de contactar</a> amb la FSF. Envieu els enllaços "
-"trencats i altres correccions o suggeriments a <a href=\"mailto:";
+"Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  També hi ha <a 
href=\"/"
+"contact/contact.ca.html\">altres formes de contactar</a> amb la FSF. Envieu "
+"els enllaços trencats i altres correccions o suggeriments a <a 
href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div><p>
@@ -356,18 +348,14 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and submitting "
-#| "translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and submitting "
 "translations of this article."
 msgstr ""
-"Vegeu si us plau la <a 
href=\"/server/standards/README.translations.ca.html\">Guia de "
-"traducció</a> per informar-vos sobre la coordinació i publicació de les "
-"traduccions d'aquest article. <br />Contacteu amb l'<a href=\"/server/"
+"Vegeu si us plau la <a href=\"/server/standards/README.translations.ca.html"
+"\">Guia de traducció</a> per informar-vos sobre la coordinació i 
publicació "
+"de les traduccions d'aquest article. <br />Contacteu amb l'<a href=\"/server/"
 "standards/translations/ca/\">Equip de traducció</a> per col·laborar en la "
 "traducció al català del web de GNU."
 

Index: po/fs-motives.ca-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-motives.ca-en.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/fs-motives.ca-en.html    28 Feb 2013 19:12:33 -0000      1.11
+++ po/fs-motives.ca-en.html    7 Jan 2014 10:34:16 -0000       1.12
@@ -1,5 +1,7 @@
  <!--#include virtual="/server/header.html" -->
-<title>Motives For Writing Free Software</title>
+<!-- Parent-Version: 1.75 -->
+<title>Motives For Writing Free Software
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/fs-motives.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Motives For Writing Free Software</h2>
@@ -44,7 +46,7 @@
 <dd>
 It is a mistake to focus our
 criticism <a href="/philosophy/microsoft.html">narrowly on
-Microsoft</a>.  Indeed, Microsoft is evil, since it makes non-free
+Microsoft</a>.  Indeed, Microsoft is evil, since it makes nonfree
 software.  Even worse, it implements
 <a href="http://DefectiveByDesign.org";>Digital Restrictions Management</a>
 in that software.  But many other companies do one or both of these.<br />
@@ -94,40 +96,46 @@
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
 
-<p>
-Please send FSF &amp; GNU inquiries to 
+<p>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.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>
-Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
 
 <p>
 Copyright &copy; 2009 Free Software Foundation, Inc.
 </p>
+
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.
-</p>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:12:33 $
+$Date: 2014/01/07 10:34:16 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: po/fs-motives.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-motives.ca.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/fs-motives.ca.po 7 Jan 2014 10:08:41 -0000       1.18
+++ po/fs-motives.ca.po 7 Jan 2014 10:34:16 -0000       1.19
@@ -12,16 +12,18 @@
 "PO-Revision-Date: 2014-01-07 10:53+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan\n"
+"Language: \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: <h2>
 #. type: Content of: <title>
-#| msgid "Motives For Writing Free Software"
 msgid ""
 "Motives For Writing Free Software - GNU Project - Free Software Foundation"
-msgstr "Motivacions per escriure programari lliure - Projecte GNU - Free 
Software Foundation"
+msgstr ""
+"Motivacions per escriure programari lliure - Projecte GNU - Free Software "
+"Foundation"
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
@@ -115,12 +117,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <dl><dd>
-#| msgid ""
-#| "It is a mistake to focus our criticism <a href=\"/philosophy/microsoft."
-#| "html\">narrowly on Microsoft</a>.  Indeed, Microsoft is evil, since it "
-#| "makes non-free software.  Even worse, it implements <a href=\"http://";
-#| "DefectiveByDesign.org\">Digital Restrictions Management</a> in that "
-#| "software.  But many other companies do one or both of these."
 msgid ""
 "It is a mistake to focus our criticism <a href=\"/philosophy/microsoft.html"
 "\">narrowly on Microsoft</a>.  Indeed, Microsoft is evil, since it makes "
@@ -128,7 +124,11 @@
 "DefectiveByDesign.org\">Digital Restrictions Management</a> in that "
 "software.  But many other companies do one or both of these."
 msgstr ""
-"És un error centrar les nostres crítiques <a 
href=\"/philosophy/microsoft.ca.html\">només en Microsoft</a>. Sí, Microsoft 
és maligna, ja que crea programari no lliure. I el que encara és pitjor, 
implementa la <a href=\"http://DefectiveByDesign.org\";>Digital Restrictions 
Management</a> en el seu programari. Però moltes altres companyies fan una o 
les dues coses. "
+"És un error centrar les nostres crítiques <a 
href=\"/philosophy/microsoft.ca."
+"html\">només en Microsoft</a>. Sí, Microsoft és maligna, ja que crea "
+"programari no lliure. I el que encara és pitjor, implementa la <a href="
+"\"http://DefectiveByDesign.org\";>Digital Restrictions Management</a> en el "
+"seu programari. Però moltes altres companyies fan una o les dues coses. "
 
 #. type: Content of: <dl><dd>
 msgid ""
@@ -228,12 +228,6 @@
 msgstr " "
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
-#| "org\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/"
-#| "\">other ways to contact</a> the FSF.  Broken links and other corrections "
-#| "or suggestions can be sent to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 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 "
@@ -241,10 +235,10 @@
 "can be sent to <a href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>."
 msgstr ""
-"Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a 
href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>.  També hi ha <a 
href=\"/contact/contact.ca."
-"html\">altres formes de contactar</a> amb la FSF. Envieu els enllaços "
-"trencats i altres correccions o suggeriments a <a href=\"mailto:";
+"Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  També hi ha <a 
href=\"/"
+"contact/contact.ca.html\">altres formes de contactar</a> amb la FSF. Envieu "
+"els enllaços trencats i altres correccions o suggeriments a <a 
href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div><p>

Index: po/fs-translations.ca-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.ca-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/fs-translations.ca-en.html       12 Nov 2013 13:28:51 -0000      1.9
+++ po/fs-translations.ca-en.html       7 Jan 2014 10:34:17 -0000       1.10
@@ -126,8 +126,9 @@
 </tr>
 <tr>
 <td>fa</td><td>Persian (Farsi)</td>
-<td lang="fa" xml:lang="fa">نرمافزارِ آزاد (nrmafzar azad)</td>
-<td>&nbsp;</td><td>&nbsp;</td>
+<td lang="fa" xml:lang="fa">نرم‌افزار آزاد (narmafzar azad)</td>
+<td lang="fa" xml:lang="fa">نرم‌افزار رایگان (narmafzar 
raygan)</td>
+<td>&nbsp;</td>
 </tr>
 <tr>
 <td>fi</td><td>Finnish</td>
@@ -469,7 +470,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/11/12 13:28:51 $
+$Date: 2014/01/07 10:34:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/fs-translations.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.ca.po,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- po/fs-translations.ca.po    7 Jan 2014 10:08:41 -0000       1.68
+++ po/fs-translations.ca.po    7 Jan 2014 10:34:17 -0000       1.69
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2014-01-07 10:54+0100\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>
@@ -306,12 +307,10 @@
 msgstr "Persa"
 
 #. type: Content of: <table><tr><td>
-#| msgid "نرمافزارِ آزاد (nrmafzar azad)"
 msgid "نرم‌افزار آزاد (narmafzar azad)"
 msgstr "نرم‌افزار آزاد (narmafzar azad)"
 
 #. type: Content of: <table><tr><td>
-#| msgid "نرمافزارِ آزاد (nrmafzar azad)"
 msgid "نرم‌افزار رایگان (narmafzar raygan)"
 msgstr "نرم‌افزار رایگان (narmafzar raygan)"
 

Index: po/nonsoftware-copyleft.ca-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/nonsoftware-copyleft.ca-en.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/nonsoftware-copyleft.ca-en.html  28 Feb 2013 19:12:48 -0000      1.13
+++ po/nonsoftware-copyleft.ca-en.html  7 Jan 2014 10:34:18 -0000       1.14
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>Applying Copyleft To Non-Software Information - GNU Project - Free 
Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.75 -->
+<title>Applying Copyleft To Non-Software Information
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/nonsoftware-copyleft.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Applying Copyleft To Non-Software Information</h2>
@@ -177,31 +179,54 @@
 (literature, reviews, <a 
href="http://dsl.org/cookbook/cookbook_toc.html";>technical</a>)
 and music.</p>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
 
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+<p>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.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>
-Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 1997 Michael Stutz</p>
 
 <p>
-Copyright &copy; 1997 Michael Stutz
-<br />
 Verbatim copying and distribution of this entire article is
 permitted in any medium, provided this notice is preserved.
 </p>
@@ -210,11 +235,10 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:12:48 $
+$Date: 2014/01/07 10:34:18 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: po/nonsoftware-copyleft.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/nonsoftware-copyleft.ca.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po/nonsoftware-copyleft.ca.po       7 Jan 2014 10:08:41 -0000       1.21
+++ po/nonsoftware-copyleft.ca.po       7 Jan 2014 10:34:19 -0000       1.22
@@ -11,15 +11,13 @@
 "PO-Revision-Date: 2014-01-07 10:56+0100\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>
-#| msgid ""
-#| "Applying Copyleft To Non-Software Information - GNU Project - Free "
-#| "Software Foundation (FSF)"
 msgid ""
 "Applying Copyleft To Non-Software Information - GNU Project - Free Software "
 "Foundation"
@@ -419,12 +417,6 @@
 msgstr " "
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
-#| "org\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/"
-#| "\">other ways to contact</a> the FSF.  Broken links and other corrections "
-#| "or suggestions can be sent to <a href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>."
 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 "
@@ -432,10 +424,10 @@
 "can be sent to <a href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>."
 msgstr ""
-"Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a 
href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>.  També hi ha <a 
href=\"/contact/contact.ca."
-"html\">altres formes de contactar</a> amb la FSF. Envieu els enllaços "
-"trencats i altres correccions o suggeriments a <a href=\"mailto:";
+"Envieu si us plau les vostres preguntes sobre la FSF i GNU a <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  També hi ha <a 
href=\"/"
+"contact/contact.ca.html\">altres formes de contactar</a> amb la FSF. Envieu "
+"els enllaços trencats i altres correccions o suggeriments a <a 
href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>."
 
 # type: Content of: <div><p>

Index: po/philosophy.ca-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.ca-en.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- po/philosophy.ca-en.html    29 Aug 2013 07:07:29 -0000      1.17
+++ po/philosophy.ca-en.html    7 Jan 2014 10:34:19 -0000       1.18
@@ -48,9 +48,11 @@
 
 <ul>
   <li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
+  <li><a href="/philosophy/free-software-even-more-important.html">
+      Why we must insist on free software</a></li>
+  <li><a href="/philosophy/proprietary.html">
+      Proprietary software is often malware</a></li>
   <li><a href="/gnu/gnu.html">History of GNU/Linux</a></li>
-  <li><a href="/philosophy/why-free.html">Why
-       Software Should Not Have Owners</a></li>
   <li><a href="/philosophy/pragmatic.html">Copyleft: Pragmatic 
Idealism</a></li>
   <li><a href="/philosophy/free-doc.html">Why Free Software Needs
       Free Documentation</a></li>
@@ -63,6 +65,7 @@
        "Open Source" misses the point of Free Software</a></li>
  <li><a 
href="/philosophy/when_free_software_isnt_practically_better.html">When Free 
Software Isn't (Practically) Better</a></li>
   <li><a href="/philosophy/government-free-software.html">Measures governments 
can use to promote free software</a></li>       
+  <li><a href="/education/education.html">Free software in education</a></li>
 </ul>
 
 <p>
@@ -132,7 +135,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/08/29 07:07:29 $
+$Date: 2014/01/07 10:34:19 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/philosophy.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.ca.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- po/philosophy.ca.po 7 Jan 2014 10:08:41 -0000       1.73
+++ po/philosophy.ca.po 7 Jan 2014 10:34:20 -0000       1.74
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2014-01-07 11:01+0100\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>
@@ -95,24 +96,21 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"/philosophy/open-source-misses-the-point.html\">Why \"Open "
-#| "Source\" misses the point of Free Software</a>"
 msgid ""
 "<a href=\"/philosophy/free-software-even-more-important.html\"> Why we must "
 "insist on free software</a>"
 msgstr ""
-"<a href=\"/philosophy/free-software-even-more-important.html\"> Per què hem 
d'insistir en el programari lliure</a>"
+"<a href=\"/philosophy/free-software-even-more-important.html\"> Per què hem "
+"d'insistir en el programari lliure</a>"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"/philosophy/practical.html\">The advantages of free software</a>"
 msgid ""
 "<a href=\"/philosophy/proprietary.html\"> Proprietary software is often "
 "malware</a>"
 msgstr ""
-"<a href=\"/philosophy/proprietary.html\"> El programari privatiu sovint és 
maliciós</a>"
+"<a href=\"/philosophy/proprietary.html\"> El programari privatiu sovint és "
+"maliciós</a>"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -187,9 +185,10 @@
 "governs poden aplicar per promoure el programari lliure</a>"
 
 #. type: Content of: <ul><li>
-#| msgid "<a href=\"/education/edu-team.html\">The Education Team</a>"
 msgid "<a href=\"/education/education.html\">Free software in education</a>"
-msgstr "<a href=\"/education/education.ca.html\">El programari lliure a 
l'educació</a>"
+msgstr ""
+"<a href=\"/education/education.ca.html\">El programari lliure a l'educació</"
+"a>"
 
 # type: Content of: <p>
 #.  please leave both these ID attributes here. ... 

Index: po/protecting.ca-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/protecting.ca-en.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- po/protecting.ca-en.html    17 May 2013 18:59:21 -0000      1.12
+++ po/protecting.ca-en.html    7 Jan 2014 10:34:20 -0000       1.13
@@ -6,10 +6,16 @@
 <!--#include virtual="/philosophy/po/protecting.translist" -->
 <!--#include virtual="/server/banner.html" -->
 
-<h2>Help Protect the Rights to Write Both Non-Free and Free Software</h2>
+<h2>Help Protect the Rights to Write Both Nonfree and Free Software</h2>
+
+<blockquote><p>
+The League for Programming Freedom is inactive now.  Please join
+our <a href="http://endsoftpatents.org";>End Software Patents</a>
+campaign!
+</p></blockquote>
 
 <p>
-The right to write both non-free and free software is threatened by
+The right to write both nonfree and free software is threatened by
 <a href="http://progfree.org/Patents/patents.html";>software patents</a>
 and by
 <a 
href="http://progfree.org/Copyright/copyright.html";>&ldquo;look-and-feel&rdquo;
@@ -74,7 +80,8 @@
 of this article.</p>
 
 <p>
-Copyright &copy; 1996, 1997, 1998, 2007, 2008 Free Software Foundation, Inc.
+Copyright &copy; 1996, 1997, 1998, 2007, 2008, 2013
+Free Software Foundation, Inc.
 </p>
 
 <p>This page is licensed under a <a rel="license"
@@ -86,7 +93,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/05/17 18:59:21 $
+$Date: 2014/01/07 10:34:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/protecting.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/protecting.ca.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/protecting.ca.po 7 Jan 2014 10:08:41 -0000       1.15
+++ po/protecting.ca.po 7 Jan 2014 10:34:21 -0000       1.16
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2014-01-07 11:07+0100\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>
@@ -26,7 +27,6 @@
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
-#| msgid "Help Protect the Rights to Write Both Non-Free and Free Software"
 msgid "Help Protect the Rights to Write Both Nonfree and Free Software"
 msgstr "Ajudeu-nos a protegir el dret a escriure programari lliure o no lliure"
 
@@ -35,15 +35,12 @@
 "The League for Programming Freedom is inactive now.  Please join our <a href="
 "\"http://endsoftpatents.org\";>End Software Patents</a> campaign!"
 msgstr ""
-"La Lliga per a la Llibertat de Programació es troba actualment inactiva.  
Uniu-vos si us plau a la nostra campanya  <a 
href=\"http://endsoftpatents.org\";>End Software Patents</a>!"
+"La Lliga per a la Llibertat de Programació es troba actualment inactiva.  "
+"Uniu-vos si us plau a la nostra campanya  <a href=\"http://endsoftpatents.org";
+"\">End Software Patents</a>!"
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "The right to write both non-free and free software is threatened by <a "
-#| "href=\"http://progfree.org/Patents/patents.html\";>software patents</a> "
-#| "and by <a href=\"http://progfree.org/Copyright/copyright.html\";>&ldquo;"
-#| "look-and-feel&rdquo; interface copyright lawsuits</a>."
 msgid ""
 "The right to write both nonfree and free software is threatened by <a href="
 "\"http://progfree.org/Patents/patents.html\";>software patents</a> and by <a "
@@ -159,9 +156,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 2007, 2008 Free Software Foundation, "
-#| "Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 2007, 2008, 2013 Free Software "
 "Foundation, Inc."



reply via email to

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