www-commits
[Top][All Lists]
Advanced

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

www gnu/gnu-linux-faq.ca.html gnu/linux-and-gnu...


From: Yavor Doganov
Subject: www gnu/gnu-linux-faq.ca.html gnu/linux-and-gnu...
Date: Tue, 20 Dec 2011 17:27:48 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   11/12/20 17:27:48

Modified files:
        gnu            : gnu-linux-faq.ca.html linux-and-gnu.ca.html 
        gnu/po         : gnu-linux-faq.ca.po linux-and-gnu.ca.po 
        licenses       : licenses.ca.html translations.ca.html 
        licenses/po    : licenses.ca.po translations.ca.po 
        philosophy     : using-gfdl.ca.html 
        philosophy/po  : using-gfdl.ca.po 
Added files:
        gnu/po         : gnu-linux-faq.ca-en.html 
                         linux-and-gnu.ca-en.html 
        licenses/po    : licenses.ca-en.html translations.ca-en.html 
        philosophy/po  : using-gfdl.ca-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.ca.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.ca.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ca.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ca.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ca-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ca-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ca.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/translations.ca.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ca.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.ca.po?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ca-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.ca-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/using-gfdl.ca.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/using-gfdl.ca.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/using-gfdl.ca-en.html?cvsroot=www&rev=1.1

Patches:
Index: gnu/gnu-linux-faq.ca.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ca.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gnu/gnu-linux-faq.ca.html   24 Oct 2011 16:36:10 -0000      1.19
+++ gnu/gnu-linux-faq.ca.html   20 Dec 2011 17:27:10 -0000      1.20
@@ -1101,7 +1101,7 @@
 <dd>
 <p>Ho reconegué al començament. En les notes de les primeres publicacions del
 Linux escrigué, <a
-href="http://www.kernel.org/pub/linux/kernel/Historic/old-versions/RELNOTES-0.01";>“La
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>“La
 majoria de les ferramentes utilitzades amb el linux són programari del GNU i
 tenen la llicència copyleft del GNU. Aquestes ferramentes no estan en la
 distribució - pregunteu-me (a mi o a GNU) per més informació”</a>.</p>
@@ -1364,10 +1364,12 @@
 Traducció: <a href="mailto:address@hidden";>puigcerver</a>, 2 d'abril
 de 2008.<br />Darrera actualització: <a
 href="http://www.puigpe.org/";>puigpe</a>, 2 de setembre de 2011.</div>
+
+
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2011/10/24 16:36:10 $
+$Date: 2011/12/20 17:27:10 $
 
 <!-- timestamp end -->
 </p>
@@ -1393,35 +1395,49 @@
 <!--      use the 3-letter ISO 639-2. -->
 <!--      Please use W3C normative character entities. -->
 <!--  -->
-<!-- <gnun>
-<ul class="translations-list"> -->
+<!-- <ul class="translations-list">
+ -->
 <!-- Arabic -->
-<!-- <li><a 
href="/gnu/gnu-linux-faq.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/gnu-linux-faq.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
 <!-- Catalan -->
-<!-- <li><a href="/gnu/gnu-linux-faq.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li> 
-->
+<!-- <li>
+<a href="/gnu/gnu-linux-faq.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li> -->
 <!-- German -->
-<!-- <li><a href="/gnu/gnu-linux-faq.de.html">Deutsch</a>&nbsp;[de]</li> -->
+<!-- <li>
+<a href="/gnu/gnu-linux-faq.de.html">Deutsch</a>&nbsp;[de]</li> -->
 <!-- English -->
-<!-- <li><a href="/gnu/gnu-linux-faq.html">English</a>&nbsp;[en]</li> -->
+<!-- <li>
+<a href="/gnu/gnu-linux-faq.html">English</a>&nbsp;[en]</li> -->
 <!-- Spanish -->
-<!-- <li><a 
href="/gnu/gnu-linux-faq.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> -->
+<!-- <li>
+<a href="/gnu/gnu-linux-faq.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> -->
 <!-- French -->
-<!-- <li><a 
href="/gnu/gnu-linux-faq.fr.html">fran&#x00e7;ais</a>&nbsp;[fr]</li> -->
+<!-- <li>
+<a href="/gnu/gnu-linux-faq.fr.html">fran&#x00e7;ais</a>&nbsp;[fr]</li> -->
 <!-- Hebrew -->
-<!-- <li><a 
href="/gnu/gnu-linux-faq.he.html">&#x05e2;&#x05d1;&#x05e8;&#x05d9;&#x05ea;</a>&nbsp;[he]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/gnu-linux-faq.he.html">&#x05e2;&#x05d1;&#x05e8;&#x05d9;&#x05ea;</a>&nbsp;[he]</li>
 -->
 <!-- Korean -->
-<!-- <li><a 
href="/gnu/gnu-linux-faq.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li> 
-->
+<!-- <li>
+<a 
href="/gnu/gnu-linux-faq.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li> 
-->
 <!-- Dutch -->
-<!-- <li><a href="/gnu/gnu-linux-faq.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
+<!-- <li>
+<a href="/gnu/gnu-linux-faq.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
 <!-- Polish -->
-<!-- <li><a href="/gnu/gnu-linux-faq.pl.html">polski</a>&nbsp;[pl]</li> -->
+<!-- <li>
+<a href="/gnu/gnu-linux-faq.pl.html">polski</a>&nbsp;[pl]</li> -->
 <!-- Russian -->
-<!-- <li><a 
href="/gnu/gnu-linux-faq.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/gnu-linux-faq.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
 -->
 <!-- Serbian -->
-<!-- <li><a 
href="/gnu/gnu-linux-faq.sr.html">&#x0441;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a>&nbsp;[sr]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/gnu-linux-faq.sr.html">&#x0441;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a>&nbsp;[sr]</li>
 -->
 <!-- Turkish -->
-<!-- <li><a 
href="/gnu/gnu-linux-faq.tr.html">T&uuml;rk&ccedil;e</a>&nbsp;[tr]</li> -->
-<!-- </ul></gnun> -->
+<!-- <li>
+<a href="/gnu/gnu-linux-faq.tr.html">T&uuml;rk&ccedil;e</a>&nbsp;[tr]</li> -->
+<!-- </ul>
+ -->
 <!-- </div>
  -->
 </div>

Index: gnu/linux-and-gnu.ca.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.ca.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gnu/linux-and-gnu.ca.html   25 Oct 2011 08:45:19 -0000      1.20
+++ gnu/linux-and-gnu.ca.html   20 Dec 2011 17:27:11 -0000      1.21
@@ -131,7 +131,7 @@
 Afortunadament no vam haver d'esperar que Hurd estigués enllestit, perquè
 Linux ja estava disponible. Quan Linus Torvalds va escriure Linux, va omplir
 el buit més important del sistema GNU. La gent podia llavors <a
-href="http://www.kernel.org/pub/linux/kernel/Historic/old-versions/RELNOTES-0.01";>unir
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>unir
 Linux i el sistema GNU</a> per tal d'obtenir un sistema operatiu complet i
 lliure: una versió del sistema GNU basada en Linux (o, abreujadament, un
 sistema GNU/Linux).</p>
@@ -293,10 +293,12 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 Darrera actualització: <a href="http://www.puigpe.org/";>puigpe</a>, 25 de
 juny de 2010.</div>
+
+
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2011/10/25 08:45:19 $
+$Date: 2011/12/20 17:27:11 $
 
 <!-- timestamp end -->
 </p>
@@ -322,67 +324,97 @@
 <!--      use the 3-letter ISO 639-2. -->
 <!--      Please use W3C normative character entities. -->
 <!--  -->
-<!-- <gnun>
-<ul class="translations-list"> -->
+<!-- <ul class="translations-list">
+ -->
 <!-- Arabic -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
 <!-- Bulgarian -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.bg.html">&#x431;&#x44A;&#x43B;&#x433;&#x430;&#x440;&#x441;&#x43A;&#x438;</a>&nbsp;[bg]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.bg.html">&#x431;&#x44A;&#x43B;&#x433;&#x430;&#x440;&#x441;&#x43A;&#x438;</a>&nbsp;[bg]</li>
 -->
 <!-- Bosnian -->
-<!-- <li><a href="/gnu/linux-and-gnu.bs.html">bosanski</a>&nbsp;[bs]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.bs.html">bosanski</a>&nbsp;[bs]</li> -->
 <!-- Catalan -->
-<!-- <li><a href="/gnu/linux-and-gnu.ca.html">catal&agrave;</a>&nbsp;[ca]</li> 
-->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.ca.html">catal&agrave;</a>&nbsp;[ca]</li> -->
 <!-- Czech -->
-<!-- <li><a href="/gnu/linux-and-gnu.cs.html">&#268;esky</a>&nbsp;[cs]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.cs.html">&#268;esky</a>&nbsp;[cs]</li> -->
 <!-- German -->
-<!-- <li><a href="/gnu/linux-and-gnu.de.html">Deutsch</a>&nbsp;[de]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.de.html">Deutsch</a>&nbsp;[de]</li> -->
 <!-- Greek -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.el.html">&#x03b5;&#x03bb;&#x03bb;&#x03b7;&#x03bd;&#x03b9;&#x03ba;&#x03ac;</a>&nbsp;[el]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.el.html">&#x03b5;&#x03bb;&#x03bb;&#x03b7;&#x03bd;&#x03b9;&#x03ba;&#x03ac;</a>&nbsp;[el]</li>
 -->
 <!-- English -->
-<!-- <li><a href="/gnu/linux-and-gnu.html">English</a>&nbsp;[en]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.html">English</a>&nbsp;[en]</li> -->
 <!-- Spanish -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.es.html">espa&ntilde;ol</a>&nbsp;[es]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.es.html">espa&ntilde;ol</a>&nbsp;[es]</li> -->
 <!-- Farsi/Persian -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.fa.html">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc;</a>&nbsp;[fa]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.fa.html">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc;</a>&nbsp;[fa]</li>
 -->
 <!-- French -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.fr.html">fran&ccedil;ais</a>&nbsp;[fr]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.fr.html">fran&ccedil;ais</a>&nbsp;[fr]</li> -->
 <!-- Hebrew -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.he.html">&#1506;&#1489;&#1512;&#1497;&#1514;</a>&nbsp;[he]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.he.html">&#1506;&#1489;&#1512;&#1497;&#1514;</a>&nbsp;[he]</li>
 -->
 <!-- Indonesian -->
-<!-- <li><a href="/gnu/linux-and-gnu.id.html">Bahasa 
Indonesia</a>&nbsp;[id]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.id.html">Bahasa Indonesia</a>&nbsp;[id]</li> -->
 <!-- Italian -->
-<!-- <li><a href="/gnu/linux-and-gnu.it.html">italiano</a>&nbsp;[it]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.it.html">italiano</a>&nbsp;[it]</li> -->
 <!-- Japanese -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.ja.html">&#26085;&#26412;&#35486;</a>&nbsp;[ja]</li> 
-->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.ja.html">&#26085;&#26412;&#35486;</a>&nbsp;[ja]</li> 
-->
 <!-- Korean -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.ko.html">&#54620;&#44397;&#50612;</a>&nbsp;[ko]</li> 
-->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.ko.html">&#54620;&#44397;&#50612;</a>&nbsp;[ko]</li> 
-->
 <!-- Malayalam -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.ml.html">&#3374;&#3378;&#3375;&#3390;&#3379;&#3330;</a>&nbsp;[ml]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.ml.html">&#3374;&#3378;&#3375;&#3390;&#3379;&#3330;</a>&nbsp;[ml]</li>
 -->
 <!-- Dutch -->
-<!-- <li><a href="/gnu/linux-and-gnu.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
 <!-- Polish -->
-<!-- <li><a href="/gnu/linux-and-gnu.pl.html">polski</a>&nbsp;[pl]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.pl.html">polski</a>&nbsp;[pl]</li> -->
 <!-- Brazilian Portuguese -->
-<!-- <li><a href="/gnu/linux-and-gnu.pt-br.html">portugu&ecirc;s do 
Brasil</a>&nbsp;[pt-br]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.pt-br.html">portugu&ecirc;s do 
Brasil</a>&nbsp;[pt-br]</li> -->
 <!-- Romanian -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.ro.html">rom&#x00e2;n&#x0103;</a>&nbsp;[ro]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.ro.html">rom&#x00e2;n&#x0103;</a>&nbsp;[ro]</li> 
-->
 <!-- Russian -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
 -->
 <!-- Serbo-Croatian -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.sh.html">srpsko-hrvatski</a>&nbsp;[sh]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.sh.html">srpsko-hrvatski</a>&nbsp;[sh]</li> -->
 <!-- Slovenian -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.sl.html">sloven&scaron;&#269;ina</a>&nbsp;[sl]</li> -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.sl.html">sloven&scaron;&#269;ina</a>&nbsp;[sl]</li> -->
 <!-- Serbian -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.sr.html">&#x0441;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a>&nbsp;[sr]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.sr.html">&#x0441;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a>&nbsp;[sr]</li>
 -->
 <!-- Tagalog -->
-<!-- <li><a href="/gnu/linux-and-gnu.tl.html">Tagalog</a>&nbsp;[tl]</li> -->
+<!-- <li>
+<a href="/gnu/linux-and-gnu.tl.html">Tagalog</a>&nbsp;[tl]</li> -->
 <!-- Tamil -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.ta.html">&#2980;&#2990;&#3007;&#2996;&#3021;</a>&nbsp;[ta]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.ta.html">&#2980;&#2990;&#3007;&#2996;&#3021;</a>&nbsp;[ta]</li>
 -->
 <!-- Chinese (Simplified) -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.zh-cn.html">&#31616;&#20307;&#20013;&#25991;</a>&nbsp;[zh-cn]</li>
 -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.zh-cn.html">&#31616;&#20307;&#20013;&#25991;</a>&nbsp;[zh-cn]</li>
 -->
 <!-- Chinese (Traditional) -->
-<!-- <li><a 
href="/gnu/linux-and-gnu.zh-tw.html">&#32321;&#39636;&#20013;&#25991;</a>&nbsp;[zh-tw]</li>
 -->
-<!-- </ul></gnun> -->
+<!-- <li>
+<a 
href="/gnu/linux-and-gnu.zh-tw.html">&#32321;&#39636;&#20013;&#25991;</a>&nbsp;[zh-tw]</li>
 -->
+<!-- </ul>
+ -->
 <!-- </div>
  -->
 </div>

Index: gnu/po/gnu-linux-faq.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ca.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gnu/po/gnu-linux-faq.ca.po  20 Dec 2011 11:21:08 -0000      1.23
+++ gnu/po/gnu-linux-faq.ca.po  20 Dec 2011 17:27:16 -0000      1.24
@@ -13,7 +13,7 @@
 "Language-Team: Catalan <address@hidden>\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>
@@ -2627,12 +2627,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "He recognized this at the beginning.  The earliest Linux release notes "
-#| "said, <a href=\"http://www.kernel.org/pub/linux/kernel/Historic/old-";
-#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
-#| "GNU software and are under the GNU copyleft. These tools aren't in the "
-#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
 "<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
@@ -2641,8 +2635,8 @@
 "me (or GNU)  for more info&rdquo;</a>."
 msgstr ""
 "Ho reconegué al començament. En les notes de les primeres publicacions del "
-"Linux escrigué, <a 
href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
-"RELNOTES-0.01\">“La majoria de les ferramentes utilitzades amb "
+"Linux escrigué, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/";
+"old-versions/RELNOTES-0.01\">“La majoria de les ferramentes utilitzades amb 
"
 "el linux són programari del GNU i tenen la llicència copyleft del GNU. "
 "Aquestes ferramentes no estan en la distribució - pregunteu-me (a mi o a "
 "GNU) per més informació”</a>."

Index: gnu/po/linux-and-gnu.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ca.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gnu/po/linux-and-gnu.ca.po  20 Dec 2011 11:21:08 -0000      1.25
+++ gnu/po/linux-and-gnu.ca.po  20 Dec 2011 17:27:16 -0000      1.26
@@ -13,7 +13,7 @@
 "Language-Team: Catalan <address@hidden>\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>
@@ -280,13 +280,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
-#| "Torvalds wrote Linux, it fit into the last major gap in the GNU system.  "
-#| "People could then <a href=\"http://www.kernel.org/pub/linux/kernel/";
-#| "Historic/old-versions/RELNOTES-0.01\"> combine Linux with the GNU system</"
-#| "a> to make a complete free system: a Linux-based version of the GNU "
-#| "system; the GNU/Linux system, for short."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds wrote Linux, it fit into the last major gap in the GNU system.  "
@@ -297,7 +290,10 @@
 msgstr ""
 "Afortunadament no vam haver d'esperar que Hurd estigués enllestit, perquè "
 "Linux ja estava disponible. Quan Linus Torvalds va escriure Linux, va omplir "
-"el buit més important del sistema GNU. La gent podia llavors <a 
href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>unir
 Linux i el sistema GNU</a> per tal d'obtenir un sistema operatiu complet i 
lliure: una versió del sistema GNU basada en Linux (o, "
+"el buit més important del sistema GNU. La gent podia llavors <a href="
+"\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";
+"\">unir Linux i el sistema GNU</a> per tal d'obtenir un sistema operatiu "
+"complet i lliure: una versió del sistema GNU basada en Linux (o, "
 "abreujadament, un sistema GNU/Linux)."
 
 # type: Content of: <p>

Index: licenses/licenses.ca.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ca.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- licenses/licenses.ca.html   20 Sep 2011 17:13:20 -0000      1.24
+++ licenses/licenses.ca.html   20 Dec 2011 17:27:23 -0000      1.25
@@ -410,10 +410,10 @@
 la <a href="#FDL">Llicència de Documentació Lliure de GNU</a> (GNU FDL).
 </p>
 
-<p>
-Per a assaigs d'opinió i articles científics, recomanem la senzilla
-llicència "verbatim copying only" ("només còpies literals") que s'utilitza
-en aquesta pàgina web.</p>
+<p>Per a articles d'opinió i estudis científics, recomanem la llicència <a
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
+Reconeixement-SenseObraDerivada 3.0 Estats Units d'Amèrica</a>, o la simple
+llicència &ldquo;només còpies literals&rdquo; abans esmentada.</p>
 
 <p>
 No sostenim que les obres artístiques o d'entreteniment hagin de ser
@@ -421,119 +421,57 @@
 <a href="http://artlibre.org/licence/lalgb.html";>Free Art License</a>
 (Llicència d'Art Lliure).</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." -->
+<!-- If needed, change the copyright block at the bottom. In general,
+     pages 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
+     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.-->
  </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
+
+<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 />
+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>
+href="mailto:address@hidden";><em>address@hidden</em></a>.</p>
 
-<p>
-Vegeu la <a href="/server/standards/README.translations.ca.html">Guia de
+<p>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; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-2007, 2008 Free Software Foundation, Inc.,</p>
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA</address>
-<p>
-Aquesta pàgina es troba sota la <a rel="license"
+<p>Copyright &copy; 2011 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>
 
 
 <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>, 25 de
-juliol de 2011.</div>
- <p>
-<!-- timestamp start -->
+Darrera actualització: <a href="http://www.puigpe.org/";>puigpe</a>, 20 de
+desembre de 2011.</div>
+
+
+ <p><!-- timestamp start -->
 Updated:
 
-$Date: 2011/09/20 17:13:20 $
+$Date: 2011/12/20 17:27:23 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
-<!-- <div id="translations">
- -->
-<!-- <h4>
-Translations of this page</h4> -->
-<!--  -->
-<!-- Please keep this list alphabetical by language code. -->
-<!-- Comment what the language is for each type, i.e. de is German. -->
-<!-- Write the language name in its own language (Deutsch) in the text. -->
-<!-- If you add a new language here, please -->
-<!-- advise address@hidden and add it to -->
-<!--  - /home/www/html/server/standards/README.translations.html -->
-<!--  - one of the lists under the section "Translations Underway" -->
-<!--  - if there is a translation team, you also have to add an alias -->
-<!--  to mail.gnu.org:/com/mailer/aliases -->
-<!-- Please also check you have the language code right; see: -->
-<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
-<!-- If the 2-letter ISO 639-1 code is not available, -->
-<!-- use the 3-letter ISO 639-2. -->
-<!-- Please use W3C normative character entities. -->
-<!--  -->
-<!-- <gnun>
-<ul class="translations-list"> -->
-<!-- Arabic -->
-<!-- <li><a 
href="/licenses/licenses.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
-<!-- Catalan -->
-<!-- <li><a href="/licenses/licenses.ca.html">Catal&#x00e0;</a>&nbsp;[ca]</li> 
-->
-<!-- German -->
-<!-- <li><a href="/licenses/licenses.de.html">Deutsch</a>&nbsp;[de]</li> -->
-<!-- Greek -->
-<!-- <li><a 
href="/licenses/licenses.el.html">&#x0395;&#x03bb;&#x03bb;&#x03b7;&#x03bd;&#x03b9;&#x03ba;&#x03ac;</a>&nbsp;[el]</li>
 -->
-<!-- English -->
-<!-- <li><a href="/licenses/licenses.html">English</a>&nbsp;[en]</li> -->
-<!-- Spanish -->
-<!-- <li><a 
href="/licenses/licenses.es.html">Espa&#x00f1;ol</a>&nbsp;[es]</li> -->
-<!-- French -->
-<!-- <li><a 
href="/licenses/licenses.fr.html">Fran&#x00e7;ais</a>&nbsp;[fr]</li> -->
-<!-- Italian -->
-<!-- <li><a href="/licenses/licenses.it.html">Italiano</a>&nbsp;[it]</li> -->
-<!-- Japanese -->
-<!-- <li><a 
href="/licenses/licenses.ja.html">&#x65e5;&#x672c;&#x8a9e;</a>&nbsp;[ja]</li> 
-->
-<!-- Dutch -->
-<!-- <li><a href="/licenses/licenses.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
-<!-- Polish -->
-<!-- <li><a href="/licenses/licenses.pl.html">polski</a>&nbsp;[pl]</li> -->
-<!-- Brazilian Portuguese -->
-<!-- <li><a href="/licenses/licenses.pt-br.html">portugu&#x0ea;s do 
Brasil</a>&nbsp;[pt-br]</li> -->
-<!-- Serbian -->
-<!-- <li><a 
href="/licenses/licenses.sr.html">&#x0421;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a>&nbsp;[sr]</li>
 -->
-<!-- Chinese (Simplified) -->
-<!-- <li><a 
href="/licenses/licenses.zh-cn.html">&#x7b80;&#x4f53;&#x4e2d;&#x6587;</a>&nbsp;[zh-cn]</li>
 -->
-<!-- Chinese (Traditional) -->
-<!-- <li><a 
href="/licenses/licenses.zh-tw.html">&#x7e41;&#x9ad4;&#x4e2d;&#x6587;</a>&nbsp;[zh-tw]</li>
 -->
-<!-- </ul></gnun> -->
-<!-- </div>
- -->
 </div>
 </body>
 </html>

Index: licenses/translations.ca.html
===================================================================
RCS file: /web/www/www/licenses/translations.ca.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- licenses/translations.ca.html       10 Oct 2011 16:33:13 -0000      1.17
+++ licenses/translations.ca.html       20 Dec 2011 17:27:23 -0000      1.18
@@ -144,14 +144,13 @@
  (<a href="http://www.zeuux.org/group/free-software/file/content/283/";>
 PDF</a>)</li>
 -->
-<!-- commercial site
-  <li>
-<code>[zh-tw]</code> <a 
href="http://www.certifiedchinesetranslation.com/openaccess/gnuv3-tc.html";>
-  Chinese (Traditional)</a> translation of the GPL</li>
--->
-<li><!-- RT #709555 -->
-<code>[cs]</code> <a href="http://www.gnugpl.cz/v3";>Traducció al Txec</a> de
-la GPL</li>
+<li><!-- RT #715288 -->
+<code>[zh-tw]</code> <a href="http://www.chinasona.org/gnu/gnuv3-tc.html";>
+Traducció al xinés (tradicional)</a> de la GPL</li>
+  <li><!-- RT #710854 -->
+<code>[cs]</code> <a
+href="http://jxself.org/translations/gpl-3.cz.shtml";>Traducció al txec</a>
+de la GPL</li>
   <li><code>[nl]</code> <a
 
href="http://bartbeuving.files.wordpress.com/2008/07/gpl-v3-nl-101.pdf";>Traducció
 a l'holandès</a> de la GPL (PDF)</li>
@@ -206,9 +205,10 @@
 href="http://alas.matf.bg.ac.rs/~mr99164/ojl-3.0.html";>HTML</a>, <a
 href="http://alas.matf.bg.ac.rs/~mr99164/gnu/ojl-3.0.pdf";>PDF</a>
   </li>
-  <li><!-- RT #707550 -->
-<code>[sk]</code> <a href="http://www.lgpl.sk/v3/";>Traducció a l'eslovac</a>
-de la GPL</li>
+  <li><!-- RT #710854 -->
+<code>[sk]</code> <a
+href="http://jxself.org/translations/gpl-3.sk.shtml";>Traducció a
+l'eslovac</a> de la GPL</li>
 
 <!-- commercial site
   <li>
@@ -222,12 +222,12 @@
 -->
 </ul>
 
-<h4>Traduccions en marxa</h4>
-<p>S'està treballant en les traduccions als següents idiomes; contacteu si us
-plau amb la persona o grup responsable si voleu col·laborar-hi.</p>
-
-<ul>
+<!-- <h4>
+Translations Underway</h4>
+<p>The following translation efforts are underway, please contact the
+  person/team if you are willing to help.</p>
 
+<ul> -->
 <!-- commercial site;
    since we have another translation by the FSFLA, we may want
    to drop this one
@@ -244,9 +244,6 @@
   <li>
 <code>[ca]</code> <a 
href="http://www.softcatala.cat/wiki/GPL3";>Catalan</a></li>
 -->
-<li><code>[fr]</code> Francès, <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a></li>
-
 <!-- ads
   <li>
 <code>[ko]</code> <a 
href="http://wiki.kldp.org/wiki.php/GNU/GPLV3Translation";>Korean</a></li>
@@ -268,8 +265,8 @@
 <code>[es]</code> <a href="http://www.fsfla.org/svnwiki/trad/GPLv3";>
   Spanish</a> &mdash; effort lead by FSFLA</li>
 -->
-</ul>
-
+<!-- </ul>
+ -->
 <h3 id="LGPL">La Llicència Pública General Reduïda (LGPL) de GNU, versió 
</h3>
 
 <p>
@@ -283,16 +280,14 @@
   <li><code>[zh-cn]</code> <a
 href="http://www.thebigfly.com/gnu/lgpl/lgpl-v3.php";> Traducció al xinès
 (simplificat)</a> de la LGPL</li>
-
-  <!-- commercial site
-  <li>
-<code>[zh-tw]</code> <a 
href="http://www.certifiedchinesetranslation.com/openaccess/gnulgpl-v3-tc.html";>
-  Chinese (Traditional)</a> translation of the LGPL</li>
--->
-<li><!-- RT #705085 -->
-<code>[cs]</code> Traducció al txec de la LGPL: <a
-href="http://www.lgpl.cz/cesky--preklad-licence--gnu-lesser--general-public-license--v-3-0.php";>
-HTML</a>, <a href="http://www.gnulicence.cz/GNU-LGPL-Czech.pdf";>PDF</a>.</li>
+  <li><!-- RT #715288 -->
+<code>[zh-tw]</code> <a
+href="http://www.chinasona.org/gnu/gnulgpl-v3-tc.html";>Traducció al xinés
+(tradicional)</a> de la LGPL</li>
+  <li><!-- RT #716430 -->
+<code>[cs]</code> <a
+href="http://jxself.org/translations/lgpl-3.cs.shtml";>Traducció al txec</a>
+de la LGPL</li>
 
   <!-- TODO: the page should say it is CC-BY-ND -->
 <li><code>[de]</code> <a href="http://www.gnu.de/documents/lgpl-3.0.de.html";>
@@ -302,26 +297,19 @@
 <li><code>[hu]</code> <a href="http://gnu.hu/lgplv3.html";>Traducció a
 l'hongarès</a> de la LGPL</li>
 
-<!-- commercial site
+  <!-- commercial site
   <li>
 <code>[it]</code>
   <a href="http://www.posterburner.com/IT_GNU_LESSER_GENERAL_PUBLIC_LICEN.htm";>
   Italian</a> translation of the LGPL</li>
 -->
-<!-- dead link as of 2011-06-26; confirmed 2011-07-08
-  <li>
-<code>[ja]</code> <a href="http://www.finecheats.com/lgpl.html";>
-  Japanese</a> translation of the LGPL</li>
-  <li><code>[mt]</code> <a href="http://www.dexxed.com/gnu/mt/v3/lgpl.html";>
-  Maltese</a> translation of the LGPL</li>
--->
 <li><code>[fa]</code> <a
 href="http://www.kaveh.org/gnu/lgplv3-fa.html";>Traducció al persa</a> de la
 LGPL</li>
-  <li><!-- RT #705085 -->
-<code>[sk]</code> Traducció a l'eslovac de la LGPL: <a
-href="http://www.lgpl.sk/slovensky--preklad-licencie--gnu-lesser--general-public-license--v-3-0.php";>
-HTML</a>, <a href="http://www.gnulicencie.sk/GNU-LGPL-Slovak.pdf";>PDF</a>.</li>
+  <li><!-- RT #716430 -->
+<code>[sk]</code> <a
+href="http://jxself.org/translations/lgpl-3.sk.shtml";>Traducció a
+l'eslovac</a> de la LGPL</li>
 
 <!-- links to hosting site
   <li>
@@ -372,24 +360,16 @@
 l'àrab</a> de la GFDL</li>
   <li><code>[zh-cn]</code> <a href="http://www.thebigfly.com/gnu/FDLv1.3/";>
 Traducció al xinès (simplificat)</a> de la GFDL</li>
+  <li><!-- RT #715288 -->
+<code>[zh-tw]</code> <a
+href="http://www.chinasona.org/gnu/gnufdl-v13-tc.html";>Traducció al xinés
+(tradicional)</a> de la GFDL</li>
+  <li><!-- RT #716430 -->
+<code>[cs]</code> <a
+href="http://jxself.org/translations/fdl-1.3.cs.shtml";>Traducció al txec</a>
+de la GFDL</li>
 
-  <!-- commercial site
-  <li>
-<code>[zh-tw]</code><a 
href="http://www.certifiedchinesetranslation.com/openaccess/gnufdl-v13-tc.html";>
-  Chinese (Traditional)</a> translation of the GFDL</li>
--->
-<li><!-- RT #705085 -->
-<code>[cs]</code> Traducció al txec de la GFDL: <a
-href="http://www.gnulicence.cz/cesky-preklad-licence-gnu-free-documentation-license-v-1-3.php";>
-HTML</a>, <a href="http://www.gnulicence.cz/GNU-FDL-Czech.pdf";>PDF</a>.</li>
-
-<!-- dead link as of 2011-06-26; confirmed 2011-07-08
-  <li>
-<code>[de]</code>
-  <a href="http://rybaczyk.freeunix.net/licenses/fdl-1.3.de.html";>
-  German</a> translation of the GFDL</li>
--->
-<!-- TODO: the page should say it is CC-BY-ND -->
+  <!-- TODO: the page should say it is CC-BY-ND -->
 <li><code>[it]</code> <a
 href="http://home.gna.org/www-it/fdl/1.3/fdl.it.html";>Traducció a
 l'Italià</a> de la GFDL (<a
@@ -400,16 +380,27 @@
 <code>[ml]</code> <a href="http://ml.wikipedia.org/wiki/WP:GFDL-ml";>
   Malayalam</a> translation of the GFDL</li>
 -->
-<li><!-- RT #705085 -->
-<code>[sk]</code> Traducció a l'eslovac de la GFDL: <a
-href="http://www.gnulicencie.sk/slovensky-preklad-licencie-gnu-free-documentation-license-v-1-3.php";>
-HTML</a>, <a href="http://www.gnulicencie.sk/GNU-FDL-Slovak.pdf";>PDF</a>.</li>
+<li><!-- RT #716430 -->
+<code>[sk]</code> <a
+href="http://jxself.org/translations/fdl-1.3.sk.shtml";>Traducció a
+l'eslovac</a> de la GFDL</li>
 
   <!-- TODO: the page should say it is CC-BY-ND -->
 <li><code>[es]</code> <a href="http://docs.danexlandia.com.mx/gfdl_es.html";>
 Traducció al castellà </a> de la GFDL</li>
 </ul>
 
+<h4>Traduccions en marxa</h4>
+
+<p>S'està treballant en les traduccions als següents idiomes; contacteu si us
+plau amb la persona o grup responsable si voleu col·laborar-hi.</p>
+
+<ul>
+  <li><!-- contact the OP from RT #715051 -->
+<code>[id]</code> Indonesi, <a href="mailto:address@hidden";>
+&lt;address@hidden&gt;</a></li>
+</ul>
+
 <!-- Please keep entries alphabetical by language name. -->
 <h3 id="Exceptions">Traduccions no oficials de les excepcions a les 
llicències de GNU</h3>
 
@@ -419,49 +410,40 @@
 S'asseguraran que la vostra traducció respecti les directives precedents i
 hi posaran una enllaç en aquesta pàgina.</p>
 
-<h4>Excepció GNU Runtime Library, versió 3.1</h4>
+<h4>Excepció GNU Runtime Library</h4>
 
 <ul>
 
-<!-- dead link as of 2011-06-26; confirmed 2011-07-08
+  <!-- dead link as of 2011-06-26; confirmed 2011-07-08
   <li>
 <code>[zh-cn]</code> <a href="http://hutuworm.blogspot.com/2009/01/gcc.html";>
   Chinese (Simplified)</a> translation of the GCC RLE</li>
 -->
-<!-- commercial site
-  <li>
-<code>[zh-tw]</code> <a 
href="http://www.certifiedchinesetranslation.com/openaccess/gnu-gcc.html";>
-  Chinese (Traditional)</a> translation of the GCC RLE</li>
--->
-<li><!-- RT #705085 -->
-<code>[cs]</code> Traducció al txec de GCC RLE: <a
-href="http://www.gnulicence.cz/cesky-preklad-licence-gnu-gcc-runtime-library-exception-v-3-1.php";>
-HTML</a>, <a
-href="http://www.gnulicence.cz/GCC-Runtime-Library-Exception-3-1-Czech.pdf";>
-PDF</a>.</li>
-  <li><!-- RT #705085 -->
-<code>[sk]</code> Traducció a l'eslovac de GCC RLE: <a
-href="http://www.gnulicencie.sk/slovensky-preklad-licencie-gnu-gcc-runtime-library-exception-v-3-1.php";>
-HTML</a>, <a
-href="http://www.gnulicencie.sk/GCC-Runtime-Library-Exception-3-1-Slovak.pdf";>
-PDF</a>.</li>
+<li><!-- RT #715288 -->
+<code>[zh-tw]</code> <a
+href="http://www.chinasona.org/gnu/gnu-gcc.html";>Traducció al xinés
+(tradicional)</a> de la GCC RLE 3</li>
+  <li><!-- RT #716430 -->
+<code>[cs]</code> <a
+href="http://jxself.org/translations/gcc-rtle-3.1.cs.shtml";>Traducció al
+txec</a> de la GCC RLE 3.1</li>
+  <li><!-- RT #716430 -->
+<code>[sk]</code> <a
+href="http://jxself.org/translations/gcc-rtle-3.1.sk.shtml";>Traducció a
+l'eslovac</a> de la GCC RLE 3.1</li>
 </ul>
 
 <h4>Excepció GNU Autoconf Configure Script, versió 3</h4>
 
 <ul>
-  <li><!-- RT #705085 -->
-<code>[cs]</code> Traducció al txec de GNU Autoconf CSE: <a
-href="http://www.gnulicence.cz/cesky-preklad-licence-gnu-autoconf-configure-script-exception-v-3-0.php";>
-HTML</a>, <a
-href="http://www.gnulicence.cz/Autoconf-Configure-Script-Exception-Czech.pdf";>
-PDF</a>.</li>
-  <li><!-- RT #705085 -->
-<code>[sk]</code> Traducció a l'eslovac de GNU Autoconf CSE: <a
-href="http://www.gnulicencie.sk/slovensky-preklad-licencie-gnu-autoconf-configure-script-exception-v-3-0.php";>
-HTML</a>, <a
-href="http://www.gnulicencie.sk/Autoconf-Configure-Script-Exception-Slovak.pdf";>
-PDF</a>.</li>
+  <li><!-- RT #716430 -->
+<code>[cs]</code> <a
+href="http://jxself.org/translations/autoconf-cse-3.cs.shtml";>Traducció al
+txec</a> de la GNU Autoconf CSE</li>
+  <li><!-- RT #716430 -->
+<code>[sk]</code> <a
+href="http://jxself.org/translations/autoconf-cse-3.sk.shtml";>Traducció a
+l'eslovac</a> de la GNU Autoconf CSE</li>
 </ul>
 
 
@@ -506,10 +488,12 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 Darrera actualització: <a href="http://www.puigpe.org/";>puigpe</a>, 10
 d'octubre de 2011.</div>
+
+
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2011/10/10 16:33:13 $
+$Date: 2011/12/20 17:27:23 $
 
 <!-- timestamp end -->
 </p>
@@ -539,33 +523,46 @@
 <!--      
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
 <!--      -->
 <!--  -->
-<!-- <gnun>
-<ul class="translations-list"> -->
+<!-- <ul class="translations-list">
+ -->
 <!-- Arabic -->
-<!-- <li><a 
href="/licenses/translations.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
+<!-- <li>
+<a 
href="/licenses/translations.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
 <!-- Catalan -->
-<!-- <li><a 
href="/licenses/translations.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li> -->
+<!-- <li>
+<a href="/licenses/translations.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li> -->
 <!-- German -->
-<!-- <li><a href="/licenses/translations.de.html">Deutsch</a>&nbsp;[de]</li> 
-->
+<!-- <li>
+<a href="/licenses/translations.de.html">Deutsch</a>&nbsp;[de]</li> -->
 <!-- English -->
-<!-- <li><a href="/licenses/translations.html">English</a>&nbsp;[en]</li> -->
+<!-- <li>
+<a href="/licenses/translations.html">English</a>&nbsp;[en]</li> -->
 <!-- Spanish -->
-<!-- <li><a 
href="/licenses/translations.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> -->
+<!-- <li>
+<a href="/licenses/translations.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> -->
 <!-- French -->
-<!-- <li><a 
href="/licenses/translations.fr.html">fran&#x00e7;ais</a>&nbsp;[fr]</li> -->
+<!-- <li>
+<a href="/licenses/translations.fr.html">fran&#x00e7;ais</a>&nbsp;[fr]</li> -->
 <!-- Japanese -->
-<!-- <li><a 
href="/licenses/translations.ja.html">&#x65e5;&#x672c;&#x8a9e;</a>&nbsp;[ja]</li>
 -->
+<!-- <li>
+<a 
href="/licenses/translations.ja.html">&#x65e5;&#x672c;&#x8a9e;</a>&nbsp;[ja]</li>
 -->
 <!-- Korean -->
-<!-- <li><a 
href="/licenses/translations.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
 -->
+<!-- <li>
+<a 
href="/licenses/translations.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
 -->
 <!-- Polish -->
-<!-- <li><a href="/licenses/translations.pl.html">polski</a>&nbsp;[pl]</li> -->
+<!-- <li>
+<a href="/licenses/translations.pl.html">polski</a>&nbsp;[pl]</li> -->
 <!-- Russian -->
-<!-- <li><a 
href="/licenses/translations.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
 -->
+<!-- <li>
+<a 
href="/licenses/translations.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
 -->
 <!-- Chinese (Simplified) -->
-<!-- <li><a 
href="/licenses/translations.zh-cn.html">&#x7b80;&#x4f53;&#x4e2d;&#x6587;</a>&nbsp;[zh-cn]</li>
 -->
+<!-- <li>
+<a 
href="/licenses/translations.zh-cn.html">&#x7b80;&#x4f53;&#x4e2d;&#x6587;</a>&nbsp;[zh-cn]</li>
 -->
 <!-- Chinese (Traditional) -->
-<!-- <li><a 
href="/licenses/translations.zh-tw.html">&#x7e41;&#x9ad4;&#x4e2d;&#x6587;</a>&nbsp;[zh-tw]</li>
 -->
-<!-- </ul></gnun> -->
+<!-- <li>
+<a 
href="/licenses/translations.zh-tw.html">&#x7e41;&#x9ad4;&#x4e2d;&#x6587;</a>&nbsp;[zh-tw]</li>
 -->
+<!-- </ul>
+ -->
 <!-- </div>
  -->
 </div>

Index: licenses/po/licenses.ca.po
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ca.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- licenses/po/licenses.ca.po  20 Dec 2011 11:47:03 -0000      1.27
+++ licenses/po/licenses.ca.po  20 Dec 2011 17:27:29 -0000      1.28
@@ -13,7 +13,7 @@
 "Language-Team: Catalan <address@hidden>\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>
@@ -854,10 +854,6 @@
 "la <a href=\"#FDL\">Llicència de Documentació Lliure de GNU</a> (GNU FDL)."
 
 #. type: Content of: <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 ""
 "For essays of opinion and scientific papers, we recommend either the <a href="
 "\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
@@ -866,7 +862,8 @@
 msgstr ""
 "Per a articles d'opinió i estudis científics, recomanem la llicència <a 
href="
 "\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons "
-"Reconeixement-SenseObraDerivada 3.0 Estats Units d'Amèrica</a>, o la simple 
llicència &ldquo;només còpies literals&rdquo; abans esmentada."
+"Reconeixement-SenseObraDerivada 3.0 Estats Units d'Amèrica</a>, o la simple "
+"llicència &ldquo;només còpies literals&rdquo; abans esmentada."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -888,10 +885,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></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 "

Index: licenses/po/translations.ca.po
===================================================================
RCS file: /web/www/www/licenses/po/translations.ca.po,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- licenses/po/translations.ca.po      20 Dec 2011 11:47:07 -0000      1.71
+++ licenses/po/translations.ca.po      20 Dec 2011 17:27:29 -0000      1.72
@@ -13,7 +13,7 @@
 "Language-Team: Catalan <address@hidden>\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>
@@ -229,22 +229,16 @@
 # type: Content of: <ul><li>
 #.  RT #715288 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[zh-tw]</code> <a href=\"http://www.certifiedchinesetranslation.com/";
-#| "openaccess/gnuv3-tc.html\"> Chinese (Traditional)</a> translation of the "
-#| "GPL"
 msgid ""
 "<code>[zh-tw]</code> <a href=\"http://www.chinasona.org/gnu/gnuv3-tc.html\";> "
 "Chinese (Traditional)</a> translation of the GPL"
 msgstr ""
-"<code>[zh-tw]</code> <a href=\"http://www.chinasona.org/gnu/gnuv3-tc.html\";> 
Traducció al xinés (tradicional)</a> de la GPL"
+"<code>[zh-tw]</code> <a href=\"http://www.chinasona.org/gnu/gnuv3-tc.html\";> "
+"Traducció al xinés (tradicional)</a> de la GPL"
 
 # type: Content of: <ul><li>
 #.  RT #710854 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sk]</code> <a href=\"http://www.gpl.sk/v3/\";> Slovak</a> "
-#| "translation of the GPL"
 msgid ""
 "<code>[cs]</code> <a href=\"http://jxself.org/translations/gpl-3.cz.shtml";
 "\">Czech</a> translation of the GPL"
@@ -348,9 +342,6 @@
 # type: Content of: <ul><li>
 #.  RT #710854 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sk]</code> <a href=\"http://www.gpl.sk/v3/\";> Slovak</a> "
-#| "translation of the GPL"
 msgid ""
 "<code>[sk]</code> <a href=\"http://jxself.org/translations/gpl-3.sk.shtml";
 "\">Slovak</a> translation of the GPL"
@@ -388,10 +379,6 @@
 # type: Content of: <ul><li>
 #.  RT #715288 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[zh-tw]</code> <a href=\"http://www.certifiedchinesetranslation.com/";
-#| "openaccess/gnulgpl-v3-tc.html\"> Chinese (Traditional)</a> translation of "
-#| "the LGPL"
 msgid ""
 "<code>[zh-tw]</code> <a href=\"http://www.chinasona.org/gnu/gnulgpl-v3-tc.";
 "html\"> Chinese (Traditional)</a> translation of the LGPL"
@@ -402,9 +389,6 @@
 # type: Content of: <ul><li>
 #.  RT #716430 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sk]</code> <a href=\"http://www.gpl.sk/v3/\";> Slovak</a> "
-#| "translation of the GPL"
 msgid ""
 "<code>[cs]</code> <a href=\"http://jxself.org/translations/lgpl-3.cs.shtml";
 "\">Czech</a> translation of the LGPL"
@@ -442,9 +426,6 @@
 # type: Content of: <ul><li>
 #.  RT #716430 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sk]</code> <a href=\"http://www.gpl.sk/v3/\";> Slovak</a> "
-#| "translation of the GPL"
 msgid ""
 "<code>[sk]</code> <a href=\"http://jxself.org/translations/lgpl-3.sk.shtml";
 "\">Slovak</a> translation of the LGPL"
@@ -512,10 +493,6 @@
 # type: Content of: <ul><li>
 #.  RT #715288 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[zh-tw]</code><a href=\"http://www.certifiedchinesetranslation.com/";
-#| "openaccess/gnufdl-v13-tc.html\"> Chinese (Traditional)</a> translation of "
-#| "the GFDL"
 msgid ""
 "<code>[zh-tw]</code> <a href=\"http://www.chinasona.org/gnu/gnufdl-v13-tc.";
 "html\"> Chinese (Traditional)</a> translation of the GFDL"
@@ -526,9 +503,6 @@
 # type: Content of: <ul><li>
 #.  RT #716430 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sk]</code> <a href=\"http://www.gpl.sk/v3/\";> Slovak</a> "
-#| "translation of the GPL"
 msgid ""
 "<code>[cs]</code> <a href=\"http://jxself.org/translations/fdl-1.3.cs.shtml";
 "\">Czech</a> translation of the GFDL"
@@ -550,9 +524,6 @@
 # type: Content of: <ul><li>
 #.  RT #716430 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sk]</code> <a href=\"http://www.gpl.sk/v3/\";> Slovak</a> "
-#| "translation of the GPL"
 msgid ""
 "<code>[sk]</code> <a href=\"http://jxself.org/translations/fdl-1.3.sk.shtml";
 "\">Slovak</a> translation of the GFDL"
@@ -572,15 +543,12 @@
 # type: Content of: <ul><li>
 #.  contact the OP from RT #715051 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[fr]</code> French, <a href=\"mailto:address@hidden";>&lt;trad-"
-#| "address@hidden&gt;</a>"
 msgid ""
 "<code>[id]</code> Indonesian, <a href=\"mailto:address@hidden";> "
 "&lt;address@hidden&gt;</a>"
 msgstr ""
-"<code>[id]</code> Indonesi, <a href=\"mailto:address@hidden";> "
-"&lt;address@hidden&gt;</a>"
+"<code>[id]</code> Indonesi, <a href=\"mailto:address@hidden";> &lt;"
+"address@hidden&gt;</a>"
 
 # type: Content of: <h3>
 #. type: Content of: <h3>
@@ -589,29 +557,22 @@
 
 # type: Content of: <h4>
 #. type: Content of: <h4>
-#| msgid "GNU Runtime Library Exception, version 3.1"
 msgid "GNU Runtime Library Exception"
 msgstr "Excepció GNU Runtime Library"
 
 # type: Content of: <ul><li>
 #.  RT #715288 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[zh-tw]</code> <a href=\"http://www.certifiedchinesetranslation.com/";
-#| "openaccess/gnu-gcc.html\"> Chinese (Traditional)</a> translation of the "
-#| "GCC RLE"
 msgid ""
 "<code>[zh-tw]</code> <a href=\"http://www.chinasona.org/gnu/gnu-gcc.html\";> "
 "Chinese (Traditional)</a> translation of the GCC RLE 3"
 msgstr ""
-"<code>[zh-tw]</code> <a 
href=\"http://www.chinasona.org/gnu/gnu-gcc.html\";>Traducció al xinés 
(tradicional)</a> de la GCC RLE 3"
+"<code>[zh-tw]</code> <a href=\"http://www.chinasona.org/gnu/gnu-gcc.html";
+"\">Traducció al xinés (tradicional)</a> de la GCC RLE 3"
 
 # type: Content of: <ul><li>
 #.  RT #716430 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sk]</code> <a href=\"http://www.gpl.sk/v3/\";> Slovak</a> "
-#| "translation of the GPL"
 msgid ""
 "<code>[cs]</code> <a href=\"http://jxself.org/translations/gcc-rtle-3.1.cs.";
 "shtml\">Czech</a> translation of the GCC RLE 3.1"
@@ -622,9 +583,6 @@
 # type: Content of: <ul><li>
 #.  RT #716430 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sk]</code> <a href=\"http://www.gpl.sk/v3/\";> Slovak</a> "
-#| "translation of the GPL"
 msgid ""
 "<code>[sk]</code> <a href=\"http://jxself.org/translations/gcc-rtle-3.1.sk.";
 "shtml\">Slovak</a> translation of the GCC RLE 3.1"
@@ -640,9 +598,6 @@
 # type: Content of: <ul><li>
 #.  RT #716430 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sk]</code> <a href=\"http://www.gpl.sk/v3/\";> Slovak</a> "
-#| "translation of the GPL"
 msgid ""
 "<code>[cs]</code> <a href=\"http://jxself.org/translations/autoconf-cse-3.cs.";
 "shtml\">Czech</a> translation of the GNU Autoconf CSE"
@@ -653,9 +608,6 @@
 # type: Content of: <ul><li>
 #.  RT #716430 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sk]</code> <a href=\"http://www.gpl.sk/v3/\";> Slovak</a> "
-#| "translation of the GPL"
 msgid ""
 "<code>[sk]</code> <a href=\"http://jxself.org/translations/autoconf-cse-3.sk.";
 "shtml\">Slovak</a> translation of the GNU Autoconf CSE"

Index: philosophy/using-gfdl.ca.html
===================================================================
RCS file: /web/www/www/philosophy/using-gfdl.ca.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/using-gfdl.ca.html       20 Sep 2011 17:15:53 -0000      1.11
+++ philosophy/using-gfdl.ca.html       20 Dec 2011 17:27:35 -0000      1.12
@@ -57,10 +57,11 @@
 projecte GNU el pot recomanar al públic. De manera que si els autors o
 l'editor publiquen una pàgina Web per descriure'l i/o per vendre'n còpies,
 podem posar un enllaç cap a aquesta pàgina des de <a
-href="/home.ca.html">www.gnu.org</a>, sempre que la pàgina s'avingui als
-nostres criteris habituals (per exemple, no ha de contenir enllaços cap a
-pàgines amb programari o documentació no lliure, i no ha d'intentar
-odiosament convèncer a la gent de comprar). Si us plau, informeu al <a
+href="/doc/other-free-books.html">www.gnu.org/doc/other-free-books.html</a>,
+sempre que la pàgina s'avingui als nostres criteris habituals (per exemple,
+no ha de contenir enllaços cap a pàgines amb programari o documentació no
+lliure, i no ha d'intentar odiosament convèncer a la gent de comprar). Si us
+plau, informeu al <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a> sobre
 pàgines d'aquesta mena.</p>
 
@@ -108,11 +109,13 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 Darrera actualització: <a href="http://www.puigpe.org/";>puigpe</a>, 15 de
 desembre de 2008.</div>
+
+
  <p>
 <!-- timestamp start -->
 Updated:
 
-$Date: 2011/09/20 17:15:53 $
+$Date: 2011/12/20 17:27:35 $
 
 <!-- timestamp end -->
 </p>
@@ -138,31 +141,43 @@
 <!-- use the 3-letter ISO 639-2. -->
 <!-- Please use W3C normative character entities. -->
 <!--  -->
-<!-- <gnun>
-<ul class="translations-list"> -->
+<!-- <ul class="translations-list">
+ -->
 <!-- Catalan -->
-<!-- <li><a 
href="/philosophy/using-gfdl.ca.html">Catal&agrave;</a>&nbsp;[ca]</li> -->
+<!-- <li>
+<a href="/philosophy/using-gfdl.ca.html">Catal&agrave;</a>&nbsp;[ca]</li> -->
 <!-- English -->
-<!-- <li><a href="/philosophy/using-gfdl.html">English</a>&nbsp;[en]</li> -->
+<!-- <li>
+<a href="/philosophy/using-gfdl.html">English</a>&nbsp;[en]</li> -->
 <!-- Spanish -->
-<!-- <li><a 
href="/philosophy/using-gfdl.es.html">Espa&ntilde;ol</a>&nbsp;[es]</li> -->
+<!-- <li>
+<a href="/philosophy/using-gfdl.es.html">Espa&ntilde;ol</a>&nbsp;[es]</li> -->
 <!-- French -->
-<!-- <li><a 
href="/philosophy/using-gfdl.fr.html">Fran&ccedil;ais</a>&nbsp;[fr]</li> -->
+<!-- <li>
+<a href="/philosophy/using-gfdl.fr.html">Fran&ccedil;ais</a>&nbsp;[fr]</li> -->
 <!-- Indonesian -->
-<!-- <li><a 
href="/philosophy/using-gfdl.id.html">Bahasa&nbsp;Indonesia</a>&nbsp;[id]</li> 
-->
+<!-- <li>
+<a 
href="/philosophy/using-gfdl.id.html">Bahasa&nbsp;Indonesia</a>&nbsp;[id]</li> 
-->
 <!-- Italian -->
-<!-- <li><a href="/philosophy/using-gfdl.it.html">Italiano</a>&nbsp;[it]</li> 
-->
+<!-- <li>
+<a href="/philosophy/using-gfdl.it.html">Italiano</a>&nbsp;[it]</li> -->
 <!-- Korean -->
-<!-- <li><a 
href="/philosophy/using-gfdl.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
 -->
+<!-- <li>
+<a 
href="/philosophy/using-gfdl.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
 -->
 <!-- Dutch -->
-<!-- <li><a 
href="/philosophy/using-gfdl.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
+<!-- <li>
+<a href="/philosophy/using-gfdl.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
 <!-- Polish -->
-<!-- <li><a href="/philosophy/using-gfdl.pl.html">polski</a>&nbsp;[pl]</li> -->
+<!-- <li>
+<a href="/philosophy/using-gfdl.pl.html">polski</a>&nbsp;[pl]</li> -->
 <!-- Chinese (Simplified) -->
-<!-- <li><a 
href="/philosophy/using-gfdl.zh-cn.html">&#31616;&#20307;&#20013;&#25991;</a>&nbsp;[zh-cn]</li>
 -->
+<!-- <li>
+<a 
href="/philosophy/using-gfdl.zh-cn.html">&#31616;&#20307;&#20013;&#25991;</a>&nbsp;[zh-cn]</li>
 -->
 <!-- Chinese (Traditional) -->
-<!-- <li><a 
href="/philosophy/using-gfdl.zh-tw.html">&#32321;&#39636;&#20013;&#25991;</a>&nbsp;[zh-tw]</li>
 -->
-<!-- </ul></gnun> -->
+<!-- <li>
+<a 
href="/philosophy/using-gfdl.zh-tw.html">&#32321;&#39636;&#20013;&#25991;</a>&nbsp;[zh-tw]</li>
 -->
+<!-- </ul>
+ -->
 <!-- </div>
  -->
 </div>

Index: philosophy/po/using-gfdl.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/using-gfdl.ca.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/po/using-gfdl.ca.po      20 Dec 2011 11:53:50 -0000      1.10
+++ philosophy/po/using-gfdl.ca.po      20 Dec 2011 17:27:41 -0000      1.11
@@ -13,7 +13,7 @@
 "Language-Team: Catalan <address@hidden>\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>
@@ -123,16 +123,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "When a commercial manual is free and relates to the GNU system, the GNU "
-#| "Project can recommend it to the public.  So if the authors or publisher "
-#| "set up a web page to describe it and/or sell copies, we can make a link "
-#| "to that page from <a href=\"/home.html\">www.gnu.org</a>, provided the "
-#| "page meets our usual criteria (for instance, it should not link to other "
-#| "pages about non-free software or documentation, and should not be "
-#| "obnoxious about trying to persuade people to buy).  Please inform <a href="
-#| "\"mailto:address@hidden";> &lt;address@hidden&gt;</a> about such "
-#| "pages."
 msgid ""
 "When a commercial manual is free and relates to the GNU system, the GNU "
 "Project can recommend it to the public.  So if the authors or publisher set "
@@ -147,11 +137,13 @@
 "Quan un manual comercial és lliure i tracta sobre el sistema GNU, el "
 "projecte GNU el pot recomanar al públic. De manera que si els autors o "
 "l'editor publiquen una pàgina Web per descriure'l i/o per vendre'n còpies, "
-"podem posar un enllaç cap a aquesta pàgina des de <a 
href=\"/doc/other-free-books.html\">www.gnu.org/doc/other-free-books.html</a>, 
sempre que la pàgina s'avingui als nostres criteris habituals (per exemple, no 
ha de contenir enllaços cap a pàgines amb "
-"programari o documentació no lliure, i no ha d'intentar odiosament 
convèncer "
-"a la gent de comprar). Si us plau, informeu al <a href=\"mailto:";
-"address@hidden">&lt;address@hidden&gt;</a> sobre pàgines d'aquesta "
-"mena."
+"podem posar un enllaç cap a aquesta pàgina des de <a 
href=\"/doc/other-free-"
+"books.html\">www.gnu.org/doc/other-free-books.html</a>, sempre que la pàgina 
"
+"s'avingui als nostres criteris habituals (per exemple, no ha de contenir "
+"enllaços cap a pàgines amb programari o documentació no lliure, i no ha "
+"d'intentar odiosament convèncer a la gent de comprar). Si us plau, informeu "
+"al <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> "
+"sobre pàgines d'aquesta mena."
 
 # type: Content of: <p>
 #. type: Content of: <p>

Index: gnu/po/gnu-linux-faq.ca-en.html
===================================================================
RCS file: gnu/po/gnu-linux-faq.ca-en.html
diff -N gnu/po/gnu-linux-faq.ca-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnu/po/gnu-linux-faq.ca-en.html     20 Dec 2011 17:27:16 -0000      1.1
@@ -0,0 +1,1409 @@
+<!--#include virtual="/server/header.html" -->
+
+<title>GNU/Linux FAQ - GNU Project - Free Software Foundation (FSF)</title>
+
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/po/gnu-linux-faq.translist" -->
+
+<h2>GNU/Linux FAQ by Richard Stallman</h2>
+
+<div class="announcement">
+  <blockquote><p>To learn more about this issue, you can also read
+our page on <a href="/gnu/linux-and-gnu.html">Linux and the GNU Project</a>, 
our
+ page on <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a> 
+and our page on <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU
+Users Who Have Never Heard of GNU</a>.</p></blockquote>
+</div>
+
+<p>
+When people see that we use and recommend the name GNU/Linux for a
+system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
+Here are common questions, and our answers.</p>
+
+<ul>
+
+<li><a href="#why" id="TOCwhy">Why do you call it GNU/Linux and not 
Linux?</a></li>
+
+<li><a href="#whycare" id="TOCwhycare">Why is the name important?</a></li>
+
+<li><a href="#howerror" id="TOChowerror">How did it come about that most
+    people call the system &ldquo;Linux&rdquo;?</a></li>
+
+<li><a href="#always" id="TOCalways">Should we always say
+&ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;?</a></li>
+
+<li><a href="#linuxalone" id="TOClinuxalone">Would Linux have achieved
+    the same success if there had been no GNU?</a></li>
+
+<li><a href="#divide" id="TOCdivide">Wouldn't it be better for the
+    community if you did not divide people with this request?</a></li>
+
+<li><a href="#freespeech" id="TOCfreespeech">Doesn't the GNU project
+    support an individual's free speech rights to call the system by
+    any name that individual chooses?</a></li>
+
+<li><a href="#everyoneknows" id="TOCeveryoneknows">Since everyone
+    knows the role of GNU in developing the system, doesn't the
+    &ldquo;GNU/&rdquo; in the name go without saying?</a></li>
+
+<li><a href="#everyoneknows2" id="TOCeveryoneknows2">Since I know the role of
+    GNU in this system, why does it matter what name I use?</a></li>
+
+<li><a href="#windows" id="TOCwindows">Isn't shortening
+    &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like
+    shortening &ldquo;Microsoft Windows&rdquo; to
+    &ldquo;Windows&rdquo;?</a></li>
+
+<li><a href="#tools" id="TOCtools">Isn't GNU a collection of programming
+    tools that were included in Linux?</a></li>
+
+<li><a href="#osvskernel" id="TOCosvskernel">What is the difference between an 
operating
+    system and a kernel?</a></li>
+
+<li><a href="#house" id="TOChouse">The kernel of a system is like the 
foundation
+    of a house.  How can a house be almost complete when it doesn't have a
+    foundation?</a></li>
+
+<li><a href="#brain" id="TOCbrain">Isn't the kernel the brain of the
+    system?</a></li>
+
+<li><a href="#kernelmost" id="TOCkernelmost">Isn't writing the kernel
+    most of the work in an operating system?</a></li>
+
+<li><a href="#afterkernel" id="TOCafterkernel">We're calling the whole
+    system after the kernel, Linux.  Isn't it normal to name an
+    operating system after a kernel?</a></li>
+
+<li><a href="#long" id="TOClong">The problem with
+    &ldquo;GNU/Linux&rdquo; is that it is too long.  How about
+    recommending a shorter name?</a></li>
+
+<li><a href="#justgnu" id="TOCjustgnu">Since Linux is a secondary
+    contribution, would it be false to the facts to call the system
+    simply &ldquo;GNU&rdquo;?</a></li>
+
+<li><a href="#trademarkfee" id="TOCtrademarkfee">I would have to pay a
+    fee if I use &ldquo;Linux&rdquo; in the name of a product, and
+    that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it
+    wrong if I use &ldquo;GNU&rdquo; without &ldquo;Linux&rdquo;, to
+    save the fee?</a></li>
+
+<li><a href="#many" id="TOCmany">Many other projects contributed to the
+    system as it is today; it includes TeX, X11, Apache, Perl, and many
+    more programs.  Don't your arguments imply we have to give them
+    credit too?  (But that would lead to a name so long it is
+    absurd.)</a></li>
+
+<li><a href="#others" id="TOCothers">Many other projects contributed to
+    the system as it is today, but they don't insist on calling it
+    XYZ/Linux.  Why should we treat GNU specially?</a></li>
+
+<li><a href="#allsmall" id="TOCallsmall">GNU is a small fraction of the system
+    nowadays, so why should we mention it?</a></li>
+
+<li><a href="#manycompanies" id="TOCmanycompanies">Many companies
+    contributed to the system as it is today; doesn't that mean
+    we ought to call it GNU/Red&nbsp;Hat/Novell/Linux?</a></li>
+
+<li><a href="#whyslash" id="TOCwhyslash">Why do you write
+    &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU
+    Linux&rdquo;?</a></li>
+
+<li><a href="#whyorder" id="TOCwhyorder">Why &ldquo;GNU/Linux&rdquo;
+rather than &ldquo;Linux/GNU&rdquo;?</a></li>
+
+<li><a href="#distronames" id="TOCdistronames">My distro is called
+    &ldquo;Foobar Linux&rdquo;; doesn't that show it's really
+    Linux?</a></li>
+
+<li><a href="#distronames1" id="TOCdistronames1">My distro's official
+    name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to call the
+    distro anything but &ldquo;Linux&rdquo;?</a></li>
+
+<li><a href="#companies" id="TOCcompanies">Wouldn't it be more
+    effective to ask companies such as Mandrake, Red Hat and IBM to
+    call their distributions &ldquo;GNU/Linux&rdquo; rather than
+    asking individuals?</a></li>
+
+<li><a href="#reserve" id="TOCreserve">Wouldn't it be better to
+    reserve the name &ldquo;GNU/Linux&rdquo; for distributions that
+    are purely free software?  After all, that is the ideal of
+    GNU.</a></li>
+
+<li><a href="#gnudist" id="TOCgnudist">Why not make a GNU distribution of
+    Linux (sic) and call that GNU/Linux?</a></li>
+
+<li><a href="#linuxgnu" id="TOClinuxgnu">Why not just say &ldquo;Linux
+    is the GNU kernel&rdquo; and release some existing version of
+    GNU/Linux under the name &ldquo;GNU&rdquo;?</a></li>
+
+<li><a href="#condemn" id="TOCcondemn">Did the GNU Project condemn and
+    oppose use of Linux in the early days?</a></li>
+
+<li><a href="#wait" id="TOCwait">Why did you wait so long before
+    asking people to use the name GNU/Linux?</a></li>
+
+<li><a href="#allgpled" id="TOCallgpled">Should the GNU/[name] convention
+    be applied to all programs that are GPL'ed?</a></li>
+    
+<li><a href="#unix" id="TOCunix">Since much of GNU comes from Unix,
+    shouldn't GNU give credit to Unix by using &ldquo;Unix&rdquo; in
+    its name?</a></li>
+
+<li><a href="#bsd" id="TOCbsd">Should we say &ldquo;GNU/BSD&rdquo;
+too?</a></li>
+
+<li><a href="#othersys" id="TOCothersys">If I install the GNU tools on
+    Windows, does that mean I am running a GNU/Windows system?</a></li>
+
+<li><a href="#justlinux" id="TOCjustlinux">Can't Linux be used without
+GNU?</a></li>
+
+<li><a href="#linuxsyswithoutgnu" id="TOClinuxsyswithoutgnu">Are there 
complete Linux systems without GNU?</a></li>
+
+<li><a href="#helplinus" id="TOChelplinus">Why not call the system
+    &ldquo;Linux&rdquo; anyway, and strengthen Linus Torvalds' role as
+    posterboy for our community?</a></li>
+
+<li><a href="#claimlinux" id="TOCclaimlinux">Isn't it wrong for us to label 
Linus
+    Torvalds' work as GNU?</a></li>
+
+<li><a href="#linusagreed" id="TOClinusagreed">Does Linus Torvalds
+    agree that Linux is just the kernel?</a></li>
+    
+<li><a href="#lost" id="TOClost">The battle is already
+    lost&mdash;society has made its decision and we can't change it,
+    so why even think about it?</a></li>
+    
+<li><a href="#whatgood" id="TOCwhatgood">Society has made its decision
+    and we can't change it, so what good does it do if I say
+    &ldquo;GNU/Linux&rdquo;?</a></li>
+    
+<li><a href="#explain" id="TOCexplain">Wouldn't it be better to call
+    the system &ldquo;Linux&rdquo; and teach people its real origin
+    with a ten-minute explanation?</a></li>
+    
+<li><a href="#treatment" id="TOCtreatment">Some people laugh at you when
+    you ask them to call the system GNU/Linux.  Why do you subject yourself
+    to this treatment?</a></li>
+
+<li><a href="#alienate" id="TOCalienate">Some people condemn you when you
+    ask them to call the system GNU/Linux.  Don't you lose by
+    alienating them?</a></li>
+
+<li><a href="#rename" id="TOCrename">Whatever you contributed,
+    is it legitimate to rename the operating system?</a></li>
+
+<li><a href="#force">Isn't it wrong to force people to call
+    the system &ldquo;GNU/Linux&rdquo;?</a></li>
+
+<li><a href="#whynotsue">Why not sue people who call
+    the whole system &ldquo;Linux&rdquo;?</a></li>
+
+<li><a href="#BSDlicense" id="TOCBSDlicense">Since you objected to the original
+    BSD license's advertising requirement to give credit to the University of 
+    California, isn't it hypocritical to demand credit for the GNU 
project?</a></li>
+
+<li><a href="#require" id="TOCrequire">Shouldn't you put something in
+    the GNU GPL to require people to call the system
+    &ldquo;GNU&rdquo;?</a></li>
+
+<li><a href="#deserve" id="TOCdeserve">Since you failed to put
+    something in the GNU GPL to require people to call the system
+    &ldquo;GNU&rdquo;, you deserve what happened; why are you
+    complaining now?</a></li>
+
+<li><a href="#contradict" id="TOCcontradict">Wouldn't you be better off
+    not contradicting what so many people believe?</a></li>
+
+<li><a href="#somanyright" id="TOCsomanyright">Since many people call it
+    &ldquo;Linux&rdquo;, doesn't that make it right?</a></li>
+
+<li><a href="#winning" id="TOCwinning">Many people care about what's 
convenient or
+    who's winning, not about arguments of right or wrong.  Couldn't you
+    get more of their support by a different road?</a></li>
+
+</ul>
+
+<dl>
+
+<dt id="why">Why do you call it GNU/Linux and not
+    Linux? <span class="anchor-reference-id">(<a 
href="#why">#why</a>)</span></dt>
+
+<dd>Most operating system distributions based on Linux as kernel are
+basically modified versions of the GNU operating system.  We began
+developing GNU in 1984, years before Linus Torvalds started to write
+his kernel.  Our goal was to develop a complete free operating system.
+Of course, we did not develop all the parts ourselves&mdash;but we led the way.
+We developed most of the central components, forming the largest single
+contribution to the whole system.  The basic vision was ours too.
+<p>
+In fairness, we ought to get at least equal mention.</p>
+
+<p>See <a href="/gnu/linux-and-gnu.html">Linux and the GNU Project</a>
+and <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU Users Who Have
+Never Heard of GNU</a> for more explanation, and <a
+href="/gnu/the-gnu-project.html">The GNU Project</a> for the
+history.</p> </dd>
+
+<dt id="whycare">Why is the name
+    important? <span class="anchor-reference-id">(<a 
href="#whycare">#whycare</a>)</span></dt>
+
+<dd>Although the developers of Linux, the kernel, are contributing to
+the free software community, many of them do not care about freedom.
+People who think the whole system is Linux tend to get confused and
+assign to those developers a role in the history of our community
+which they did not actually play.  Then they give inordinate weight to
+those developers' views.
+<p>
+Calling the system GNU/Linux recognizes the role that our idealism
+played in building our community, and
+<a href="/gnu/why-gnu-linux.html">helps the public recognize the
+practical importance of these ideals</a>.</p>
+</dd>
+
+<dt id="howerror">How did it come about that most
+    people call the system &ldquo;Linux&rdquo;? <span 
class="anchor-reference-id">(<a href="#howerror">#howerror</a>)</span></dt>
+
+<dd>Calling the system &ldquo;Linux&rdquo; is a confusion that has spread 
faster
+than the corrective information.
+<p>
+The people who combined Linux with the GNU system were not aware that
+that's what their activity amounted to.  They focused their attention
+on the piece that was Linux and did not realize that more of the
+combination was GNU.  They started calling it &ldquo;Linux&rdquo; even though 
that
+name did not fit what they had.  It took a few years for us to realize
+what a problem this was and ask people to correct the practice.  By
+that time, the confusion had a big head start.</p>
+<p>
+Most of the people who call the system &ldquo;Linux&rdquo; have never heard why
+that's not the right thing.  They saw others using that name and
+assume it must be right.  The name &ldquo;Linux&rdquo; also spreads a false
+picture of the system's origin, because people tend to suppose that
+the system's history was such as to fit that name.  For
+instance, they often believe its development was started by Linus
+Torvalds in 1991.  This false picture tends to reinforce the idea
+that the system should be called &ldquo;Linux&rdquo;.</p>
+<p>
+Many of the questions in this file represent people's attempts to
+justify the name they are accustomed to using.</p>
+</dd>
+
+<dt id="always">Should we always say
+    &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? <span 
class="anchor-reference-id">(<a href="#always">#always</a>)</span></dt>
+<dd>
+Not always&mdash;only when you're talking about the whole system.  When
+you're referring specifically to the kernel, you should call it
+&ldquo;Linux&rdquo;, the name its developer chose.
+<p>
+When people call the whole system &ldquo;Linux&rdquo;, as a consequence
+they call the whole system by the same name as the kernel.
+This causes many kinds of confusion, because only experts can tell
+whether a statement is about the kernel or the whole system.
+By calling the whole system &ldquo;GNU/Linux&rdquo;, and calling the kernel
+&ldquo;Linux&rdquo;, you avoid the ambiguity.</p>
+</dd>
+
+<dt id="linuxalone">Would Linux have
+    achieved the same success if there had been no
+    GNU? <span class="anchor-reference-id">(<a 
href="#linuxalone">#linuxalone</a>)</span></dt>
+
+<dd>
+In that alternative world, there would be nothing today like the
+GNU/Linux system, and probably no free operating system at all.  No
+one attempted to develop a free operating system in the 1980s except
+the GNU Project and (later) Berkeley CSRG, which had been specifically
+asked by the GNU Project to start freeing its code.
+<p>
+Linus Torvalds was partly influenced by a speech about GNU in Finland
+in 1990.  It's possible that even without this influence he might have
+written a Unix-like kernel, but it probably would not have been free
+software.  Linux became free in 1992 when Linus rereleased it under
+the GNU GPL.  (See the release notes for version 0.12.)</p>
+<p>
+Even if Torvalds had released Linux under some other free software
+license, a free kernel alone would not have made much difference to
+the world.  The significance of Linux came from  fitting into a larger
+framework, a complete free operating system: GNU/Linux.</p>
+</dd>
+
+<dt id="divide">Wouldn't it be better for the
+    community if you did not divide people with this request? <span 
class="anchor-reference-id">(<a href="#divide">#divide</a>)</span></dt>
+
+<dd>
+When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing people. 
 We
+are asking them to give the GNU Project credit for the GNU operating
+system.  This does not criticize anyone or push anyone away.
+<p>
+However, there are people who do not like our saying this.  Sometimes
+those people push us away in response.  On occasion they are so rude
+that one wonders if they are intentionally trying to intimidate us
+into silence.  It doesn't silence us, but it does tend to divide the
+community, so we hope you can convince them to stop.</p>
+<p>
+However, this is only a secondary cause of division in our community.
+The largest division in the community is between people who appreciate
+free software as a social and ethical issue and consider proprietary
+software a social problem (supporters of the free software movement),
+and those who cite only practical benefits and present free software
+only as an efficient development model (the open source movement).</p>
+<p>
+This disagreement is not just a matter of names&mdash;it is a matter
+of differing basic values.  It is essential for the community to see
+and think about this disagreement.  The names &ldquo;free
+software&rdquo; and &ldquo;open source&rdquo; are the banners of the
+two positions.
+See <a href="/philosophy/open-source-misses-the-point.html">Why Open
+Source misses the point of Free Software</a>.</p>
+<p>
+The disagreement over values partially aligns with the amount of
+attention people pay to the GNU Project's role in our community.
+People who value freedom are more likely to call the system
+&ldquo;GNU/Linux&rdquo;, and people who learn that the system is 
&ldquo;GNU/Linux&rdquo; are
+more likely to pay attention to our philosophical arguments for
+freedom and community (which is why the choice of name for the system
+makes a real difference for society).  However, the disagreement would
+probably exist even if everyone knew the system's real origin and its
+proper name, because the issue is a real one.  It can only go away if
+we who value freedom either persuade everyone (which won't be easy) or
+are defeated entirely (let's hope not).</p>
+</dd>
+
+<dt id="freespeech">Doesn't the GNU project
+          support an individual's free speech rights to call the system by
+          any name that individual chooses? <span 
class="anchor-reference-id">(<a href="#freespeech">#freespeech</a>)</span></dt>
+<dd>
+Yes, indeed, we believe you have a free speech right to call the
+operating system by any name you wish.  We ask that people call it
+GNU/Linux as a matter of doing justice to the GNU project, to promote
+the values of freedom that GNU stands for, and to inform others that
+those values of freedom brought the system into existence.
+</dd>
+
+<dt id="everyoneknows">Since everyone knows
+    GNU's role in developing the system, doesn't the &ldquo;GNU/&rdquo; in the
+    name go without saying? <span class="anchor-reference-id">(<a 
href="#everyoneknows">#everyoneknows</a>)</span></dt>
+
+<dd>Experience shows that the system's users, and the computer-using
+public in general, often know nothing about the GNU system.  Most
+articles about the system do not mention the name &ldquo;GNU&rdquo;, or the 
ideals
+that GNU stands for.  <a
+href="/gnu/gnu-users-never-heard-of-gnu.html">GNU Users Who Have Never
+Heard of GNU</a> explains further.
+<p>
+The people who say this are probably geeks thinking of the geeks they
+know.  Geeks often do know about GNU, but many have a completely wrong
+idea of what GNU is.  For instance, many think it is a collection
+of <a href="#tools">&ldquo;tools&rdquo;</a>, or a project to develop tools.</p>
+<p>
+The wording of this question, which is typical, illustrates another
+common misconception.  To speak of &ldquo;GNU's role&rdquo; in developing
+something assumes that GNU is a group of people.  GNU is an operating
+system.  It would make sense to talk about the GNU Project's role in
+this or some other activity, but not that of GNU.</p>
+</dd>
+
+<dt id="everyoneknows2">Since I know the role of GNU in this system,
+    why does it matter what name I use? <span class="anchor-reference-id">(<a 
href="#everyoneknows2">#everyoneknows2</a>)</span></dt>
+
+<dd>
+If your words don't reflect your knowledge, you don't teach others.
+Most people who have heard of the GNU/Linux system think it is
+&ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
+it was intended to be &ldquo;open source&rdquo;.  If you don't tell
+them, who will?
+</dd>
+
+<dt id="windows">Isn't shortening &ldquo;GNU/Linux&rdquo;
+    to &ldquo;Linux&rdquo; just like shortening &ldquo;Microsoft 
Windows&rdquo; to &ldquo;Windows&rdquo;? <span class="anchor-reference-id">(<a 
href="#windows">#windows</a>)</span></dt>
+
+<dd>
+It's useful to shorten a frequently-used name, but not if the
+abbreviation is misleading.
+<p>
+Almost everyone in developed countries really does know that the
+&ldquo;Windows&rdquo; system is made by Microsoft, so shortening 
&ldquo;Microsoft
+Windows&rdquo; to &ldquo;Windows&rdquo; does not mislead anyone as to that 
system's
+nature and origin.  Shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; 
does give the
+wrong idea of where the system comes from.</p>
+<p>
+The question is itself misleading because GNU and Microsoft are
+not the same kind of thing.  Microsoft is a company;
+GNU is an operating system.</p>
+</dd>
+
+<dt id="tools">Isn't GNU a collection of
+    programming tools that were included in Linux? <span 
class="anchor-reference-id">(<a href="#tools">#tools</a>)</span></dt>
+
+<dd>
+People who think that Linux is an entire operating system, if they
+hear about GNU at all, often get a wrong idea of what GNU is.  They
+may think that GNU is the name of a collection of programs&mdash;often they
+say &ldquo;programming tools&rdquo;, since some of our programming tools became
+popular on their own.  The idea that &ldquo;GNU&rdquo; is the name of an 
operating
+system is hard to fit into a conceptual framework in which that
+operating system is labeled &ldquo;Linux&rdquo;.
+<p>
+The GNU Project was named after the GNU operating system&mdash;it's the project
+to develop the GNU system.  (See <a
+href="/gnu/initial-announcement.html">the 1983 initial announcement</a>.)</p>
+<p>
+We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc.,
+because we needed them for the GNU operating system.  GCC, the GNU
+Compiler Collection is the compiler that we wrote for the GNU
+operating system.  We, the many people working on the GNU Project,
+developed Ghostscript, GNUCash, GNU Chess and GNOME for the GNU system
+too.</p>
+</dd>
+
+<dt id="osvskernel">What is the difference
+between an operating system and a kernel? <span 
class="anchor-reference-id">(<a href="#osvskernel">#osvskernel</a>)</span></dt>
+
+<dd>
+An operating system, as we use the term, means a collection of
+programs that are sufficient to use the computer to do a wide variety
+of jobs.  A general purpose operating system, to be complete, ought to
+handle all the jobs that many users may want to do.
+<p>
+The kernel is one of the programs in an operating system&mdash;the program
+that allocates the machine's resources to the other programs that are
+running.  The kernel also takes care of starting and stopping other
+programs.</p>
+<p>
+To confuse matters, some people use the term &ldquo;operating system&rdquo; to
+mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  The
+use of &ldquo;operating system&rdquo; to mean &ldquo;kernel&rdquo; is found in 
a number of
+textbooks on system design, going back to the 80s.  At the same time,
+in the 80s, the &ldquo;Unix operating system&rdquo; was understood to include 
all
+the system programs, and Berkeley's version of Unix included even
+games. Since we intended GNU to be a Unix-like operating system, we
+use the term &ldquo;operating system&rdquo; in the same way.</p>
+<p>
+Most of the time when people speak of the &ldquo;Linux operating system&rdquo;
+they are using &ldquo;operating system&rdquo; in the same sense we use: they 
mean
+the whole collection of programs.  If that's what you are referring
+to, please call it &ldquo;GNU/Linux&rdquo;.  If you mean just the kernel, then
+&ldquo;Linux&rdquo; is the right name for it, but please say 
&ldquo;kernel&rdquo; also to
+avoid ambiguity about which body of software you mean.</p>
+<p>
+If you prefer to use some other term such as &ldquo;system distribution&rdquo; 
for
+the entire collection of programs, instead of &ldquo;operating system&rdquo;,
+that's fine.  Then you would talk about GNU/Linux system
+distributions.</p>
+</dd>
+
+<dt id="house">The kernel of a system is like the foundation of a
+    house.  How can a house be almost complete when it doesn't have a
+    foundation? <span class="anchor-reference-id">(<a 
href="#house">#house</a>)</span></dt>
+
+<dd>
+A kernel is not much like the foundation of a house because building
+an operating system is not much like building a house.
+
+<p>A house is built from lots of little general parts that are cut and
+put together in situ.  They have to be put together from the bottom
+up.  Thus, when the foundation has not been built, no substantial part
+has been built; all you have is a hole in the ground.</p>
+
+<p>
+By contrast, an operating system consists of complex
+components that can be developed in any order.  When you have
+developed most of the components, most of the work is done.  This is
+much more like the International Space Station than like a house.  If
+most of the Space Station modules were in orbit but awaiting one other
+essential module, that would be like the GNU system in 1992.
+</p>
+</dd>
+
+<dt id="brain">Isn't the kernel the brain of the system? <span 
class="anchor-reference-id">(<a href="#brain">#brain</a>)</span></dt>
+
+<dd>
+A computer system is not much like a human body,
+and no part of it plays a role comparable to that of
+the brain in a human.
+</dd>
+
+<dt id="kernelmost">Isn't writing the kernel most of the work in an
+operating system? <span class="anchor-reference-id">(<a 
href="#kernelmost">#kernelmost</a>)</span></dt>
+
+<dd>
+No, many components take a lot of work.
+</dd>
+
+<dt id="afterkernel">We're calling the
+    whole system after the kernel, Linux.  Isn't it normal to name an
+    operating system after a kernel? <span class="anchor-reference-id">(<a 
href="#afterkernel">#afterkernel</a>)</span></dt>
+
+<dd>
+That practice seems to be very rare&mdash;we can't find any examples other
+than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating system 
is
+developed as a single unified project, and the developers choose a
+name for the system as a whole.  The kernel usually does not have a
+name of its own&mdash;instead, people say &ldquo;the kernel of 
such-and-such&rdquo; or
+&ldquo;the such-and-such kernel&rdquo;.
+<p>
+Because those two constructions are used synonymously, the expression
+&ldquo;the Linux kernel&rdquo; can easily be misunderstood as meaning 
&ldquo;the kernel
+of Linux&rdquo; and implying that Linux must be more than a kernel.  You can
+avoid the possibility of this misunderstanding by saying or writing
+&ldquo;the kernel, Linux&rdquo; or &ldquo;Linux, the kernel.&rdquo;</p>
+</dd>
+
+<dt id="long">The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.
+    How about recommending a shorter name? <span 
class="anchor-reference-id">(<a href="#long">#long</a>)</span></dt>
+
+<dd>
+For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words 
&ldquo;GNU&rdquo;
+and &ldquo;Linux&rdquo;.  The reaction was very bad.  People accept 
&ldquo;GNU/Linux&rdquo;
+much better.
+<p>
+The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we call 
it
+&ldquo;GNU/Linux&rdquo; for the reasons given below.</p>
+</dd>
+
+<dt id="justgnu">Since Linux is a secondary
+    contribution, would it be false to the facts to call the system simply
+    &ldquo;GNU&rdquo;? <span class="anchor-reference-id">(<a 
href="#justgnu">#justgnu</a>)</span></dt>
+
+<dd>
+It would not be false to the facts, but it is not the best thing to
+do.  Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo;
+rather than just &ldquo;GNU&rdquo;:
+
+<ul>
+<li>
+It's not exactly GNU&mdash;it has a different kernel (that is, Linux).
+Distinguishing GNU/Linux from GNU is useful.</li>
+<li>
+It would be ungentlemanly to ask people to <em>stop</em> giving any
+credit to Linus Torvalds.  He did write an important component of the
+system.  We want to get credit for launching and sustaining the
+system's development, but this doesn't mean we should treat Linus the
+same way those who call the system &ldquo;Linux&rdquo; treat us.  We strongly
+disagree with his political views, but we deal with that disagreement
+honorably and openly, rather than by trying to cut him out of the
+credit for his contribution to the system.</li>
+<li>
+Since many people know of the system as &ldquo;Linux&rdquo;, if we say 
&ldquo;GNU&rdquo; they
+may simply not recognize we're talking about the same system.  If we
+say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
+about.</li>
+</ul><p></p>
+</dd>
+
+<dt id="trademarkfee">I would have
+    to pay a fee if I use &ldquo;Linux&rdquo; in the name of a product, and 
that
+    would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it wrong if I use 
&ldquo;GNU&rdquo;
+    without &ldquo;Linux&rdquo;, to save the fee? <span 
class="anchor-reference-id">(<a 
href="#trademarkfee">#trademarkfee</a>)</span></dt>
+<dd>
+There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, 
that's
+what it is.  It is nice to give Linus Torvalds a share of the credit
+as well, but you have no obligation to pay for the privilege of doing
+so.
+<p>
+So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid 
paying
+the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you.</p>
+</dd>
+
+<dt id="many">Many other projects contributed to
+    the system as it is today; it includes TeX, X11, Apache, Perl, and many
+    more programs.  Don't your arguments imply we have to give them credit
+    too?  (But that would lead to a name so long it is
+    absurd.) <span class="anchor-reference-id">(<a 
href="#many">#many</a>)</span></dt>
+
+<dd>
+What we say is that you ought to give the system's principal developer
+a share of the credit.  The principal developer is the GNU Project,
+and the system is basically GNU.
+<p>
+If you feel even more strongly about giving credit where it is due,
+you might feel that some secondary contributors also deserve credit in
+the system's name.  If so, far be it from us to argue against it.  If
+you feel that X11 deserves credit in the system's name, and you want
+to call the system GNU/X11/Linux, please do.  If you feel that Perl
+simply cries out for mention, and you want to write GNU/Linux/Perl, go
+ahead.</p>
+<p>
+Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv
+becomes absurd, at some point you will have to set a threshold and
+omit the names of the many other secondary contributions.  There is no
+one obvious right place to set the threshold, so wherever you set it,
+we won't argue against it.</p>
+<p>
+Different threshold levels would lead to different choices of name for
+the system.  But one name that cannot result from concerns of fairness
+and giving credit, not for any possible threshold level, is 
&ldquo;Linux&rdquo;.
+It can't be fair to give all the credit to one secondary contribution
+(Linux) while omitting the principal contribution (GNU).</p>
+</dd>
+
+<dt id="others">Many other projects contributed to
+    the system as it is today, but they don't insist on calling it
+    XYZ/Linux.  Why should we treat GNU specially? <span 
class="anchor-reference-id">(<a href="#others">#others</a>)</span></dt>
+
+<dd>
+Thousands of projects have developed programs commonly included in
+today's GNU/Linux systems.  They all deserve credit for their
+contributions, but they aren't the principal developers of the system
+as a whole, so they don't ask to be credited as such.
+<p>
+GNU is different because it is more than just a contributed program,
+more than just a collection of contributed programs.  GNU is the
+framework on which the system was made.</p>
+</dd>
+
+<dt id="allsmall">GNU is a small fraction of the system nowadays,
+    so why should we mention it? <span class="anchor-reference-id">(<a 
href="#allsmall">#allsmall</a>)</span></dt>
+<dd>
+In 2008, we found that GNU packages made up 15% of the
+&ldquo;main&rdquo; repository of the gNewSense GNU/Linux distribution.
+Linux made up 1.5%.  So the same argument would apply even more
+strongly to calling it &ldquo;Linux&rdquo;.
+
+<p>
+GNU is a small fraction of the system nowadays, and Linux is an
+even smaller fraction.  But they are the system's core; the system
+was made by combining them.  Thus, the name &ldquo;GNU/Linux&rdquo;
+remains appropriate.
+</p>
+</dd>
+
+<dt id="manycompanies">Many companies
+    contributed to the system as it is today; doesn't that mean
+    we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span
+    class="anchor-reference-id">(<a
+    href="#manycompanies">#manycompanies</a>)</span></dt>
+
+<dd>
+<p>
+GNU is not comparable to Red Hat or Novell; it is not a company, or an
+organization, or even an activity.  GNU is an operating system.  (When
+we speak of the GNU Project, that refers to the project to develop the
+GNU system.)  The GNU/Linux system is based on GNU, and that's why GNU
+ought to appear in its name.
+</p>
+<p>
+Much of those companies' contribution to the GNU/Linux system lies in
+the code they have contributed to various GNU packages including GCC
+and GNOME.  Saying GNU/Linux gives credit to those companies along
+with all the rest of the GNU developers.
+</p>
+</dd>
+
+<dt id="whyslash">Why do you write &ldquo;GNU/Linux&rdquo;
+instead of &ldquo;GNU Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#whyslash">#whyslash</a>)</span></dt>
+
+<dd>
+Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; the
+word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean either 
&ldquo;GNU's version of
+Linux&rdquo; or &ldquo;Linux, which is a GNU package.&rdquo;  Neither of those 
meanings
+fits the situation at hand.
+<p>
+Linux is not a GNU package; that is, it wasn't developed under the GNU
+Project's aegis or contributed specifically to the GNU Project.  Linus
+Torvalds wrote Linux independently, as his own project.  So the
+&ldquo;Linux, which is a GNU package&rdquo; meaning is not right.</p>
+<p>
+We're not talking about a distinct GNU version of Linux, the kernel.
+The free GNU/Linux distros do have
+a <a href="http://directory.fsf.org/project/linux";>separate version of
+Linux</a>, since the &ldquo;standard&rdquo; version contains non-free
+firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
+it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
+to call it that, because it would be too confusing.</p>
+<p>
+We're talking about a version of GNU, the operating system,
+distinguished by having Linux as the kernel.  A slash fits the
+situation because it means &ldquo;combination.&rdquo; (Think of
+&ldquo;Input/Output&rdquo;.)  This system is the combination of GNU
+and Linux; hence, &ldquo;GNU/Linux&rdquo;.</p>
+<p>
+There are other ways to express &ldquo;combination&rdquo;.  If you
+think that a plus-sign is clearer, please use that.  In French, a
+hyphen is clear: &ldquo;GNU-Linux&rdquo;.  In Spanish, we sometimes
+say &ldquo;GNU con Linux&rdquo;.</p>
+</dd>
+
+<dt id="whyorder">Why &ldquo;GNU/Linux&rdquo; rather
+than &ldquo;Linux/GNU&rdquo;? <span class="anchor-reference-id">(<a 
href="#whyorder">#whyorder</a>)</span></dt>
+
+<dd>
+It is right and proper to mention the principal contribution first.
+The GNU contribution to the system is not only bigger than Linux and
+prior to Linux, we actually started the whole activity.
+<p>
+However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a 
lot
+better than what people usually do, which is to omit GNU entirely and
+make it seem that the whole system is Linux.</p>
+</dd>
+
+<dt id="distronames">My distro is called
+    &ldquo;Foobar Linux&rdquo;; doesn't that show it's really Linux? <span 
class="anchor-reference-id">(<a 
href="#distronames">#distronames</a>)</span></dt>
+
+<dd>
+<p>It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are
+repeating the common mistake. We appreciate that distributions like Debian, 
Dragora, Musix, Trisquel, and Venenux have adopted 
+GNU/Linux as part of their official name, and we hope that if you are involved 
with a different distribution, you will 
+encourage it to do the same.</p>
+</dd>
+
+<dt id="distronames1">My distro's official name is &ldquo;Foobar
+    Linux&rdquo;; isn't it wrong to call the distro 
+    anything but &ldquo;Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#distronames1">#distronames1</a>)</span></dt>
+
+<dd><p>If it's allowed for them to change &ldquo;GNU&rdquo; to
+&ldquo;Foobar Linux&rdquo;, it's allowed for you to change it back and
+call the distro &ldquo;Foobar GNU/Linux&rdquo;.  It can't be more wrong
+to correct the mistake than it was to make the mistake.</p></dd>
+
+<dt id="companies">Wouldn't it be more
+    effective to ask companies such as Mandrake, Red Hat and IBM to
+    call their distributions &ldquo;GNU/Linux&rdquo; rather than asking
+    individuals? <span class="anchor-reference-id">(<a 
href="#companies">#companies</a>)</span></dt>
+
+<dd>
+It isn't a choice of one or the other&mdash;we ask companies and
+organizations and individuals to help spread the word about this.  In
+fact, we have asked all three of those companies.  Mandrake said it
+would use the term &ldquo;GNU/Linux&rdquo; some of the time, but IBM
+and Red Hat were unwilling to help.  One executive said, &ldquo;This
+is a pure commercial decision; we expect to make more money calling it
+&lsquo;Linux&rsquo;.&rdquo; In other words, that company did not care
+what was right.
+<p>
+We can't make them do this right, but we're not the sort to give up
+just because the road isn't easy.  You may not have as much influence
+at your disposal as IBM or Red Hat, but you can still help.  Together
+we can change the situation to the point where companies will make
+more profit calling it &ldquo;GNU/Linux&rdquo;.</p>
+</dd>
+
+<dt id="reserve">Wouldn't it be better to
+    reserve the name &ldquo;GNU/Linux&rdquo; for distributions that are purely
+    free software?  After all, that is the ideal of GNU. <span 
class="anchor-reference-id">(<a href="#reserve">#reserve</a>)</span></dt>
+
+<dd>
+The widespread practice of adding non-free software to the GNU/Linux
+system is a major problem for our community.  It teaches the users
+that non-free software is ok, and that using it is part of the spirit
+of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
+help users use non-free add-ons, and may even invite salesmen to come
+and make sales pitches for them.  They adopt goals such as &ldquo;helping
+the users&rdquo; of GNU/Linux (including helping them use non-free
+applications and drivers), or making the system more popular even at
+the cost of freedom.
+<p>
+The question is how to try to change this.</p>
+<p>
+Given that most of the community which uses GNU with Linux already
+does not realize that's what it is, for us to disown these adulterated
+versions, saying they are not really GNU, would not teach the users to
+value freedom more.  They would not get the intended message.  They
+would only respond they never thought these systems were GNU in the
+first place.</p>
+<p>
+The way to lead these users to see a connection with freedom is
+exactly the opposite: to inform them that all these system
+versions <em>are</em> versions of GNU, that they all are based on a
+system that exists specifically for the sake of the users' freedom.
+With this understanding, they can start to recognize the distributions
+that include non-free software as perverted, adulterated versions of
+GNU, instead of thinking they are proper and appropriate &ldquo;versions of
+Linux&rdquo;.</p>
+<p>
+It is very useful to start GNU/Linux User Groups, which call the
+system GNU/Linux and adopt the ideals of the GNU Project as a basis
+for their activities.  If the Linux User Group in your area has the
+problems described above, we suggest you either campaign within the
+group to change its orientation (and name) or start a new group.  The
+people who focus on the more superficial goals have a right to their
+views, but don't let them drag you along!</p>
+</dd>
+
+<dt id="gnudist">Why not make a GNU
+    distribution of Linux (sic) and call that GNU/Linux? <span 
class="anchor-reference-id">(<a href="#gnudist">#gnudist</a>)</span></dt>
+
+<dd>
+All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU 
system
+with Linux as the kernel.  The purpose of the term &ldquo;GNU/Linux&rdquo; is 
to
+communicate this point.  To develop one new distribution and call that
+alone &ldquo;GNU/Linux&rdquo; would obscure the point we want to make.
+<p>
+As for developing a distribution of GNU/Linux, we already did this
+once, when we funded the early development of Debian GNU/Linux.  To do
+it again now does not seem useful; it would be a lot of work, and
+unless the new distribution had substantial practical advantages over
+other distributions, it would serve no purpose.</p>
+<p>
+Instead we help the developers of 100% free GNU/Linux distributions,
+such as gNewSense and Ututo.</p>
+</dd>
+
+<dt id="linuxgnu">Why not just say &ldquo;Linux is
+    the GNU kernel&rdquo; and release some existing version of GNU/Linux under
+    the name &ldquo;GNU&rdquo;? <span class="anchor-reference-id">(<a 
href="#linuxgnu">#linuxgnu</a>)</span></dt>
+
+<dd>
+It might have been a good idea to adopt Linux as the GNU kernel back
+in 1992.  If we had realized, then, how long it would take to get the
+GNU Hurd to work, we might have done that.  (Alas, that is hindsight.)
+<p>
+If we were to take an existing version of GNU/Linux and relabel it as
+&ldquo;GNU&rdquo;, that would be somewhat like making a version of the GNU 
system
+and labeling it &ldquo;Linux&rdquo;.  That wasn't right, and we don't
+want to act like that.</p>
+</dd>
+
+<dt id="condemn">Did the GNU Project condemn
+    and oppose use of Linux in the early days? <span 
class="anchor-reference-id">(<a href="#condemn">#condemn</a>)</span></dt>
+
+<dd>
+We did not adopt Linux as our kernel, but we didn't condemn or oppose
+it.  In 1993 we started discussing the arrangements to sponsor the
+development of Debian GNU/Linux.  We also sought to cooperate with the
+people who were changing some GNU packages for use with Linux.  We
+wanted to include their changes in the standard releases so that these
+GNU packages would work out-of-the-box in combination with Linux.  But
+the changes were often ad-hoc and nonportable; they needed to be cleaned
+up for installation.
+<p>
+The people who had made the changes showed little interest in
+cooperating with us.  One of them actually told us that he didn't care
+about working with the GNU Project because he was a &ldquo;Linux user&rdquo;.
+That came as a shock, because the people who ported GNU packages to
+other systems had generally wanted to work with us to get their
+changes installed.  Yet these people, developing a system that was
+primarily based on GNU, were the first (and still practically the
+only) group that was unwilling to work with us.</p>
+<p>
+It was this experience that first showed us that people were calling a
+version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was
+obstructing our work.  Asking you to call the system &ldquo;GNU/Linux&rdquo; is
+our response to that problem, and to the other problems caused by the
+&ldquo;Linux&rdquo; misnomer.</p>
+</dd>
+
+<dt id="wait">Why did you wait so
+    long before asking people to use the name GNU/Linux? <span 
class="anchor-reference-id">(<a href="#wait">#wait</a>)</span></dt>
+
+<dd>
+<p>Actually we didn't.  We began talking privately with developers and
+distributors about this in 1994, and made a more public campaign in
+1996.  We will continue for as long as it's necessary.</p>
+</dd>
+
+<dt id="allgpled">Should the GNU/<i>name</i>
+    convention be applied to all programs that are GPL'ed? <span 
class="anchor-reference-id">(<a href="#allgpled">#allgpled</a>)</span></dt>
+
+<dd>
+We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  When 
a program
+is a GNU package, we may call it &ldquo;GNU <i>name</i>&rdquo;.
+<p>
+GNU, the operating system, is made up of many different programs.
+Some of the programs in GNU were written as part of the GNU Project or
+specifically contributed to it; these are the GNU packages, and we
+often use &ldquo;GNU&rdquo; in their names.</p>
+<p>
+It's up to the developers of a program to decide if they want to contribute
+it and make it a GNU package.  If you have developed a program and you
+would like it to be a GNU package, please write to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>, so we can evaluate 
it
+and decide whether we want it.</p>
+<p>
+It wouldn't be fair to put the name GNU on every individual program
+that is released under the GPL.  If you write a program and release it
+under the GPL, that doesn't mean the GNU Project wrote it or that you
+wrote it for us.  For instance, the kernel, Linux, is released under
+the GNU GPL, but Linus did not write it as part of the GNU Project&mdash;he
+did the work independently.  If something is not a GNU package, the
+GNU Project can't take credit for it, and putting &ldquo;GNU&rdquo; in its name
+would be improper.</p>
+<p>
+In contrast, we do deserve the overall credit for the GNU operating
+system as a whole, even though not for each and every program in it.
+The system exists as a system because of our determination and
+persistence, starting in 1984, many years before Linux was begun.</p>
+<p>
+The operating system in which Linux became popular was basically the
+same as the GNU operating system.  It was not entirely the same,
+because it had a different kernel, but it was mostly the same system.
+It was a variant of GNU.  It was the GNU/Linux system.</p>
+<p>
+Linux continues to be used primarily in derivatives of that system&mdash;in
+today's versions of the GNU/Linux system.  What gives these systems
+their identity is GNU and Linux at the center of them, not particularly
+Linux alone.</p>
+</dd>
+
+<dt id="unix">Since much of GNU comes
+from Unix, shouldn't GNU give credit
+to Unix by using &ldquo;Unix&rdquo; in its name? <span 
class="anchor-reference-id">(<a href="#unix">#unix</a>)</span></dt>
+
+<dd>
+Actually, none of GNU comes from Unix.  Unix was proprietary software
+(and still is), so using any of its code in GNU would have been
+illegal.  This is not a coincidence; this is why we developed GNU:
+since you could not have freedom in using Unix, or any of the other
+operating systems of the day, we needed a free system to replace it.
+We could not copy programs, or even parts of them, from Unix;
+everything had to be written afresh.
+<p>
+No code in GNU comes from Unix, but GNU is a Unix-compatible system;
+therefore, many of the ideas and specifications of GNU do come from
+Unix.  The name &ldquo;GNU&rdquo;, which stands for &ldquo;GNU's Not
+Unix&rdquo;, is a humorous way of giving credit to Unix for this,
+following a hacker tradition of recursive acronyms that started in the
+70s.</p>
+<p>
+The first such recursive acronym was TINT, &ldquo;TINT Is Not
+TECO&rdquo;.  The author of TINT wrote another implementation of TECO
+(there were already many of them, for various systems), but instead of
+calling it by a dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he
+thought of a clever amusing name.  (That's what hacking
+means: <a href="http://stallman.org/articles/on-hacking.html";>playful
+cleverness</a>.)</p>
+<p>
+Other hackers enjoyed that name so much that we imitated the approach.
+It became a tradition that, when you were writing from scratch a
+program that was similar to some existing program (let's imagine its
+name was &ldquo;Klever&rdquo;), you could give it a recursive acronym name, 
such
+as &ldquo;MINK&rdquo; for &ldquo;MINK Is Not Klever.&rdquo;  In this same 
spirit we called our
+replacement for Unix &ldquo;GNU's Not Unix&rdquo;.</p>
+<p>
+Historically, AT&amp;T which developed Unix did not want anyone to
+give it credit by using &ldquo;Unix&rdquo; in the name of a similar
+system, not even in a system 99% copied from Unix.  AT&amp;T actually
+threatened to sue anyone giving AT&amp;T credit in that way.  This is
+why each of the various modified versions of Unix (all proprietary,
+like Unix) had a completely different name that didn't include
+&ldquo;Unix&rdquo;.</p>
+</dd>
+
+<dt id="bsd">Should we say &ldquo;GNU/BSD&rdquo;
+too? <span class="anchor-reference-id">(<a href="#bsd">#bsd</a>)</span></dt>
+
+<dd>
+We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
+because that term does not fit the history of the BSD systems.
+<p>
+The BSD system was developed by UC Berkeley as non-free software in
+the 80s, and became free in the early 90s.  A free operating system
+that exists today is almost certainly either a variant of the GNU
+system, or a kind of BSD system.</p>
+<p>
+People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux
+is.  It is not.  The BSD developers were inspired to make their code
+free software by the example of the GNU Project, and explicit appeals
+from GNU activists helped convince them to start, but the code had
+little overlap with GNU.</p>
+<p>
+BSD systems today use some GNU packages, just as the GNU system and
+its variants use some BSD programs; however, taken as wholes, they are
+two different systems that evolved separately.  The BSD developers did
+not write a kernel and add it to the GNU system, so a name like
+GNU/BSD would not fit the situation.</p>
+<p>
+The connection between GNU/Linux and GNU is much closer, and that's
+why the name &ldquo;GNU/Linux&rdquo; is appropriate for it.</p>
+<p>
+There is a version of GNU which uses the kernel from NetBSD.  Its
+developers call it &ldquo;Debian GNU/NetBSD&rdquo;, but 
&ldquo;GNU/kernelofNetBSD&rdquo;
+would be more accurate, since NetBSD is an entire system, not just
+the kernel.  This is not a BSD system, since most of the system
+is the same as the GNU/Linux system.</p>
+</dd>
+
+<dt id="othersys">If I install the GNU tools
+on Windows, does that mean I am running a GNU/Windows system? <span 
class="anchor-reference-id">(<a href="#othersys">#othersys</a>)</span></dt>
+
+<dd>
+Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
+are just a part of the GNU software, which is just a part of the GNU
+system, and underneath them you would still have another complete
+operating system which has no code in common with GNU.  All in all,
+that's a very different situation from GNU/Linux.
+</dd>
+
+<dt id="justlinux">Can't Linux be used without GNU? <span 
class="anchor-reference-id">(<a href="#justlinux">#justlinux</a>)</span></dt>
+
+<dd>
+Linux is used by itself, or with small other programs, in some
+appliances.  These small software systems are a far cry from the
+GNU/Linux system.  Users do not install them on PCs, for instance, and
+would find them rather disappointing.  It is useful to say that these
+appliances run just Linux, to show how different those small platforms
+are from GNU/Linux.
+</dd>
+
+<dt id="linuxsyswithoutgnu">Are there complete Linux systems without GNU? 
<span class="anchor-reference-id">(<a 
href="#linuxsyswithoutgnu">#linuxsyswithoutgnu</a>)</span></dt>
+
+<dd>
+There are complete systems that contain Linux and not GNU; Android is
+an example.  But it is a mistake to call them &ldquo;Linux&rdquo;
+systems.
+<p>
+Android is very different from the GNU/Linux system&mdash;because it
+contains very little of the GNU system, only Linux.  Overall, it's a
+different system.  If you call the whole system &ldquo;Linux&rdquo;,
+you will find it necessary to say things like, &ldquo;Android contains
+Linux, but it isn't Linux, because it doesn't have the usual Linux
+[sic] libraries and utilities [meaning the GNU system].&rdquo; Android
+contains just as much of Linux as GNU/Linux does.  What it doesn't
+have is the GNU system.  Instead it has a lot of Google software.</p>
+</dd>
+
+<dt id="helplinus">Why not call the system
+    &ldquo;Linux&rdquo; anyway, and strengthen Linus Torvalds' role as 
posterboy for our
+    community? <span class="anchor-reference-id">(<a 
href="#helplinus">#helplinus</a>)</span></dt>
+
+<dd>
+Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of word, 
not
+ours) for his goals, not ours.  His goal is to make the system more
+popular, and he believes its value to society lies merely in the
+practical advantages it offers: its power, reliability and easy
+availability.  He has never advocated
+<a href="/philosophy/why-free.html">freedom to cooperate</a> as an
+ethical principle, which is why the public does not connect the name
+&ldquo;Linux&rdquo; with that principle.
+<p>
+Linus publicly states his disagreement with the free software
+movement's ideals.  He developed non-free software in his job for many
+years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+publicly invited fellow developers of Linux, the kernel, to use
+non-free software to work on it with him.  He goes even further, and
+rebukes people who suggest that engineers and scientists should
+consider social consequences of our technical work&mdash;rejecting the
+lessons society learned from the development of the atom bomb.</p>
+<p>
+There is nothing wrong with writing a free program for the motivations
+of learning and having fun; the kernel Linus wrote for those reasons
+was an important contribution to our community.  But those motivations
+are not the reason why the complete free system, GNU/Linux, exists,
+and they won't secure our freedom in the future.  The public needs to
+know this.  Linus has the right to promote his views; however, people
+should be aware that the operating system in question 
+stems from ideals of freedom, not from his views.</p>
+</dd>
+
+<dt id="claimlinux">Isn't it wrong for us to label Linus Torvalds'
+    work as GNU? <span class="anchor-reference-id">(<a 
href="#claimlinux">#claimlinux</a>)</span></dt>
+
+<dd>
+It would be wrong, so we don't do that.  Torvalds' work is Linux, the
+kernel; we are careful not to attribute that work to the GNU Project
+or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
+system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
+credit.
+</dd>
+
+
+<dt id="linusagreed">Does Linus Torvalds
+    agree that Linux is just the kernel? <span class="anchor-reference-id">(<a 
href="#linusagreed">#linusagreed</a>)</span></dt>
+
+<dd>
+<p>He recognized this at the beginning.  The earliest Linux release notes
+said, <a
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
+&ldquo;Most of the tools used with linux are GNU software and are under the
+GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+for more info&rdquo;</a>.</p>
+</dd>
+
+<dt id="lost">The battle is already lost&mdash;society
+    has made its decision and we can't change it, so why even think about
+    it? <span class="anchor-reference-id">(<a 
href="#lost">#lost</a>)</span></dt>
+
+<dd>
+This isn't a battle, it is a campaign of education.  What to call the
+system is not a single decision, to be made at one moment by
+&ldquo;society&rdquo;: each person, each organization, can decide what
+name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
+you can decide to call the system &ldquo;GNU/Linux&rdquo;
+yourself&mdash;and by doing so, you will help educate others.
+</dd>
+
+<dt id="whatgood">Society has made its
+    decision and we can't change it, so what good does it do if I say
+    &ldquo;GNU/Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#whatgood">#whatgood</a>)</span></dt>
+
+<dd>
+This is not an all-or-nothing situation: correct and incorrect
+pictures are being spread more or less by various people.  If you call
+the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
+history, origin, and reason for being.  You can't correct the misnomer
+everywhere on your own, any more than we can, but you can help.  If
+only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
+have educated a substantial number of people with very little work.
+And some of them will spread the correction to others.
+</dd>
+
+<dt id="explain">Wouldn't it be better to call
+    the system &ldquo;Linux&rdquo; and teach people its real origin with a 
ten-minute
+    explanation? <span class="anchor-reference-id">(<a 
href="#explain">#explain</a>)</span></dt>
+
+<dd>
+If you help us by explaining to others in that way, we appreciate your
+effort, but that is not the best method.  It is not as effective as
+calling the system &ldquo;GNU/Linux&rdquo;, and uses your time inefficiently.
+<p>
+It is ineffective because it may not sink in, and surely will not
+propagate.  Some of the people who hear your explanation will pay
+attention, and they may learn a correct picture of the system's
+origin.  But they are unlikely to repeat the explanation to others
+whenever they talk about the system.  They will probably just call it
+&ldquo;Linux&rdquo;.  Without particularly intending to, they will help spread 
the
+incorrect picture.</p>
+<p>
+It is inefficient because it takes a lot more time.  Saying and
+writing &ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not
+minutes, so you can afford to reach far more people that way.
+Distinguishing between Linux and GNU/Linux when you write and speak is
+by far the easiest way to help the GNU Project effectively.</p>
+</dd>
+
+<dt id="treatment">Some people laugh at you
+    when you ask them to call the system GNU/Linux.  Why do you subject
+    yourself to this treatment? <span class="anchor-reference-id">(<a 
href="#treatment">#treatment</a>)</span></dt>
+
+<dd>
+Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken picture 
of
+the system's history and reason for existence.  People who laugh at
+our request probably have picked up that mistaken picture&mdash;they think
+our work was done by Linus, so they laugh when we ask for credit for
+it.  If they knew the truth, they probably wouldn't laugh.
+<p>
+Why do we take the risk of making a request that sometimes leads
+people to ridicule us?  Because often it has useful results that help
+the GNU Project.  We will run the risk of undeserved abuse to achieve
+our goals.</p>
+<p>
+If you see such an ironically unfair situation occurring, please don't
+sit idly by.  Please teach the laughing people the real history.  When
+they see why the request is justified, those who have any sense will
+stop laughing.</p>
+</dd>
+
+<dt id="alienate">Some people condemn you
+    when you ask them to call the system GNU/Linux.  Don't you lose by
+    alienating them? <span class="anchor-reference-id">(<a 
href="#alienate">#alienate</a>)</span></dt>
+
+<dd>
+Not much.  People who don't appreciate our role in developing the
+system are unlikely to make substantial efforts to help us.  If they
+do work that advances our goals, such as releasing free software, it
+is probably for other unrelated reasons, not because we asked them.
+Meanwhile, by teaching others to attribute our work to someone else,
+they are undermining our ability to recruit the help of others.
+<p>
+It makes no sense to worry about alienating people who are already
+mostly uncooperative, and it is self-defeating to be deterred from
+correcting a major problem lest we anger the people who perpetuate it.
+Therefore, we will continue trying to correct the misnomer.</p>
+</dd>
+
+<dt id="rename">Whatever you contributed,
+    is it legitimate to rename the operating system? <span 
class="anchor-reference-id">(<a href="#rename">#rename</a>)</span></dt>
+
+<dd>
+We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
+ever since we announced it in 1983.  The people who tried to rename
+it to &ldquo;Linux&rdquo; should not have done so.</dd>
+
+<dt id="force">Isn't it wrong to force people to call
+the system &ldquo;GNU/Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#force">#force</a>)</span></dt>
+
+<dd>
+It would be wrong to force them, and we don't try.  We call the system
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+</dd>
+
+<dt id="whynotsue">Why not sue people who call
+the whole system &ldquo;Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#whynotsue">#whynotsue</a>)</span></dt>
+
+<dd>
+There are no legal grounds to sue them, but since we believe in
+freedom of speech, we wouldn't want to do that anyway.  We ask people
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+</dd>
+
+<dt id="require">Shouldn't you put something in
+    the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? <span 
class="anchor-reference-id">(<a href="#require">#require</a>)</span></dt>
+
+<dd>
+The purpose of the GNU GPL is to protect the users' freedom from those
+who would make proprietary versions of free software.  While it is
+true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
+the users' freedom, such as bundling non-free software with the
+GNU/Linux system or even developing non-free software for such use,
+the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
+users their freedom.  It seems improper to make the GPL restrict what
+name people can use for the system.
+</dd>
+
+<dt id="BSDlicense">Since you objected to the original BSD license's
+advertising requirement to give credit to the University of California,
+isn't it hypocritical to demand credit for the GNU project? <span 
class="anchor-reference-id">(<a href="#BSDlicense">#BSDlicense</a>)</span></dt>
+
+<dd>
+It would be hypocritical to make the name GNU/Linux a license
+requirement, and we don't.  We only <em>ask</em> you to give us the
+credit we deserve.
+</dd>
+
+<dt id="deserve">Since you failed to put
+    something in the GNU GPL to require people to call the system 
&ldquo;GNU&rdquo;,
+    you deserve what happened; why are you complaining now? <span 
class="anchor-reference-id">(<a href="#deserve">#deserve</a>)</span></dt>
+
+<dd>
+The question presupposes a rather controversial general ethical
+premise: that if people do not force you to treat them fairly, you are
+entitled to take advantage of them as much as you like.  In other
+words, it assumes that might makes right.
+<p>
+We hope you disagree with that premise just as we do.</p>
+</dd>
+
+<dt id="contradict">Wouldn't you be better
+    off not contradicting what so many people believe? <span 
class="anchor-reference-id">(<a href="#contradict">#contradict</a>)</span></dt>
+
+<dd>
+We don't think we should go along with large numbers of people because
+they have been misled.  We hope you too will decide that truth is
+important.
+<p>
+We could never have developed a free operating system without first
+denying the belief, held by most people, that proprietary software
+was legitimate and acceptable.</p>
+</dd>
+
+<dt id="somanyright">Since many people call
+it &ldquo;Linux&rdquo;, doesn't that make it right? <span 
class="anchor-reference-id">(<a 
href="#somanyright">#somanyright</a>)</span></dt>
+
+<dd>
+We don't think that the popularity of an error makes it the truth.
+</dd>
+
+<dt id="winning">Many people care about what's
+    convenient or who's winning, not about arguments of right or wrong.
+    Couldn't you get more of their support by a different
+    road? <span class="anchor-reference-id">(<a 
href="#winning">#winning</a>)</span></dt>
+
+<dd>
+To care only about what's convenient or who's winning is an amoral
+approach to life.  Non-free software is an example of that amoral
+approach and thrives on it.  So in the long run it is self-defeating
+for us to bow to that approach.  We will continue talking in terms
+of right and wrong.
+<p>
+We hope that you are one of those for whom right and wrong do matter.</p>
+</dd>
+
+</dl>
+
+
+</div>
+
+<!--#include virtual="/server/footer.html" -->
+
+<!-- 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." -->
+
+
+<!-- Please keep this list alphabetical, and in the original -->
+<!-- language if possible, otherwise default to English -->
+<!-- If you do not have it English, please comment what the -->
+<!-- English is.  If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!--    - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
+<!--    - in /home/www/html/server/standards/README.translations.html -->
+<!--      one of the lists under the section "Translations Underway" -->
+<!--    - if there is a translation team, you also have to add an alias -->
+<!--      to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the 2 letter language code right versus -->
+<!--     http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
+
+<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 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; 2001, 2006, 2007, 2008, 2010, 2011 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>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/12/20 17:27:16 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!--  -->
+<!-- Please keep this list alphabetical by language code. -->
+<!--      Comment what the language is for each type, i.e. de is German. -->
+<!--      Write the language name in its own language (Deutsch) in the text. 
-->
+<!--      If you add a new language here, please -->
+<!--      advise address@hidden and add it to -->
+<!--       - /home/www/html/server/standards/README.translations.html -->
+<!--       - one of the lists under the section "Translations Underway" -->
+<!--       - if there is a translation team, you also have to add an alias -->
+<!--       to mail.gnu.org:/com/mailer/aliases -->
+<!--      Please also check you have the language code right; see: -->
+<!--      http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!--      If the 2-letter ISO 639-1 code is not available, -->
+<!--      use the 3-letter ISO 639-2. -->
+<!--      Please use W3C normative character entities. -->
+<!--  -->
+<!-- <ul class="translations-list"> -->
+<!-- Arabic -->
+<!-- <li><a 
href="/gnu/gnu-linux-faq.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
+<!-- Catalan -->
+<!-- <li><a href="/gnu/gnu-linux-faq.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li> 
-->
+<!-- German -->
+<!-- <li><a href="/gnu/gnu-linux-faq.de.html">Deutsch</a>&nbsp;[de]</li> -->
+<!-- English -->
+<!-- <li><a href="/gnu/gnu-linux-faq.html">English</a>&nbsp;[en]</li> -->
+<!-- Spanish -->
+<!-- <li><a 
href="/gnu/gnu-linux-faq.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> -->
+<!-- French -->
+<!-- <li><a 
href="/gnu/gnu-linux-faq.fr.html">fran&#x00e7;ais</a>&nbsp;[fr]</li> -->
+<!-- Hebrew -->
+<!-- <li><a 
href="/gnu/gnu-linux-faq.he.html">&#x05e2;&#x05d1;&#x05e8;&#x05d9;&#x05ea;</a>&nbsp;[he]</li>
 -->
+<!-- Korean -->
+<!-- <li><a 
href="/gnu/gnu-linux-faq.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li> 
-->
+<!-- Dutch -->
+<!-- <li><a href="/gnu/gnu-linux-faq.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
+<!-- Polish -->
+<!-- <li><a href="/gnu/gnu-linux-faq.pl.html">polski</a>&nbsp;[pl]</li> -->
+<!-- Russian -->
+<!-- <li><a 
href="/gnu/gnu-linux-faq.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
 -->
+<!-- Serbian -->
+<!-- <li><a 
href="/gnu/gnu-linux-faq.sr.html">&#x0441;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a>&nbsp;[sr]</li>
 -->
+<!-- Turkish -->
+<!-- <li><a 
href="/gnu/gnu-linux-faq.tr.html">T&uuml;rk&ccedil;e</a>&nbsp;[tr]</li> -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>

Index: gnu/po/linux-and-gnu.ca-en.html
===================================================================
RCS file: gnu/po/linux-and-gnu.ca-en.html
diff -N gnu/po/linux-and-gnu.ca-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnu/po/linux-and-gnu.ca-en.html     20 Dec 2011 17:27:16 -0000      1.1
@@ -0,0 +1,377 @@
+<!--#include virtual="/server/header.html" -->
+
+<title>Linux and GNU - GNU Project - Free Software Foundation (FSF)</title>
+
+<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" />
+<meta http-equiv="Description" content="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." />
+<link rel="alternate" title="What's New" 
href="http://www.gnu.org/rss/whatsnew.rss"; type="application/rss+xml" />
+<link rel="alternate" title="New Free Software" 
href="http://www.gnu.org/rss/quagga.rss"; type="application/rss+xml" />
+
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/po/linux-and-gnu.translist" -->
+
+<h2>Linux and the GNU Project</h2>
+
+<p><strong>by <a href="http://www.stallman.org/";>Richard 
Stallman</a></strong></p>
+
+<div class="announcement">
+  <blockquote><p>For more information see also
+the <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>,
+and <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a></p>
+  </blockquote>
+</div>
+
+<p>
+Many computer users run a modified version of
+<a href="/philosophy/categories.html#TheGNUsystem">the GNU system</a>
+every day, without realizing it.  Through a peculiar turn of events,
+the version of GNU which is widely used today is often called
+&ldquo;Linux&rdquo;, and many of its users
+are <a href="/gnu/gnu-users-never-heard-of-gnu.html"> not aware</a>
+that it is basically the GNU system, developed by the
+<a href="/gnu/gnu-history.html">GNU Project</a>.</p>
+
+<p>
+There really is a Linux, and these people are using it, but it is just
+a part of the system they use.  Linux is the kernel: the program in
+the system that allocates the machine's resources to the other
+programs that you run.  The kernel is an essential part of an
+operating system, but useless by itself; it can only function in the
+context of a complete operating system.  Linux is normally used in
+combination with the GNU operating system: the whole system is
+basically GNU with Linux added, or GNU/Linux.  All the so-called
+&ldquo;Linux&rdquo; distributions are really distributions of
+GNU/Linux.</p>
+
+<p>
+Many users do not understand the difference between the kernel, which
+is Linux, and the whole system, which they also call
+&ldquo;Linux&rdquo;.  The ambiguous use of the name doesn't help
+people understand.  These users often think that Linus Torvalds
+developed the whole operating system in 1991, with a bit of help.</p>
+
+<p>
+Programmers generally know that Linux is a kernel.  But since they
+have generally heard the whole system called &ldquo;Linux&rdquo; as well, they
+often envisage a history that would justify naming the whole system
+after the kernel.  For example, many believe that once Linus Torvalds
+finished writing Linux, the kernel, its users looked around for other
+free software to go with it, and found that (for no particular reason)
+most everything necessary to make a Unix-like system was already
+available.</p>
+
+<p>
+What they found was no accident&mdash;it was the not-quite-complete GNU
+system.  The available <a href="/philosophy/free-sw.html">free
+software</a> added up to a complete system because the GNU Project
+had been working since 1984 to make one.  In
+the <a href="/gnu/manifesto.html"> The GNU Manifesto</a> we set forth
+the goal of developing a free Unix-like
+system, called GNU.  The <a href="/gnu/initial-announcement.html">
+Initial Announcement</a> of the GNU Project also outlines some of the
+original plans for the GNU system. By the time Linux was started, GNU
+was almost finished.</p>
+
+<p>
+Most free software projects have the goal of developing a particular
+program for a particular job.  For example, Linus Torvalds set out to
+write a Unix-like kernel (Linux); Donald Knuth set out to write a text
+formatter (TeX); Bob Scheifler set out to develop a window system (the
+X Window System). It's natural to measure the contribution of this
+kind of project by specific programs that came from the project.</p>
+
+<p>
+If we tried to measure the GNU Project's contribution in this way,
+what would we conclude?  One CD-ROM vendor found that in their &ldquo;Linux
+distribution&rdquo;, <a href="/philosophy/categories.html#GNUsoftware">GNU
+software</a> was the largest single contingent, around 28% of the
+total source code, and this included some of the essential major
+components without which there could be no system.  Linux itself was
+about 3%.  (The proportions in 2008 are similar: in the &ldquo;main&rdquo;
+repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
+So if you were going to pick a name for the system based on
+who wrote the programs in the system, the most appropriate single
+choice would be &ldquo;GNU&rdquo;.</p>
+
+<p>
+But that is not the deepest way to consider the question.  The GNU
+Project was not, is not, a project to develop specific software
+packages.  It was not a project <a href="/software/gcc/"> to
+develop a C compiler</a>, although we did that.  It was not a project
+to develop a text editor, although we developed one.  The GNU Project
+set out to develop <em>a complete free Unix-like system</em>: GNU.</p>
+
+<p>
+Many people have made major contributions to the free software in the
+system, and they all deserve credit for their software.  But the
+reason it is <em>an integrated system</em>&mdash;and not just a
+collection of useful programs&mdash;is because the GNU Project set out
+to make it one.  We made a list of the programs needed to make
+a <em>complete</em> free system, and we systematically found, wrote,
+or found people to write everything on the list.  We wrote essential
+but unexciting
+<a href="#unexciting">(1)</a> components because you can't have a system
+without them.  Some of our system components, the programming tools,
+became popular on their own among programmers, but we wrote many
+components that are not tools  <a href="#nottools">(2)</a>.  We even
+developed a chess game, GNU Chess, because a complete system needs
+games too.</p>
+
+<p>
+By the early 90s we had put together the whole system aside from the
+kernel.  We had also started a kernel, the
+<a href="/software/hurd/hurd.html">GNU Hurd</a>, which runs on top of
+Mach.  Developing this kernel has been a lot harder than we expected;
+<a href="/software/hurd/hurd/documentation/hurd-and-linux.html">the
+GNU Hurd started working reliably in 2001</a>, but it is a long way
+from being ready for people to use in general.</p>
+
+<p>
+Fortunately, we didn't have to wait for the Hurd, because of Linux.
+Once Torvalds wrote Linux, it fit into the last major gap in the GNU
+system.  People could then <a
+href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
+combine Linux with the GNU system</a> to make a complete free
+system: a Linux-based version of the GNU system; the GNU/Linux system,
+for short.</p>
+
+<p>
+Making them work well together was not a trivial job.  Some GNU
+components<a href="#somecomponents">(3)</a> needed substantial change
+to work with Linux.  Integrating a complete system as a distribution
+that would work &ldquo;out of the box&rdquo; was a big job, too.  It
+required addressing the issue of how to install and boot the
+system&mdash;a problem we had not tackled, because we hadn't yet
+reached that point.  Thus, the people who developed the various system
+distributions did a lot of essential work.  But it was work that, in
+the nature of things, was surely going to be done by someone.</p>
+
+<p>
+The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+system.  The <a href="http://fsf.org/";>FSF</a> funded the rewriting of
+the Linux-related extensions to the GNU C library, so that now they
+are well integrated, and the newest GNU/Linux systems use the current
+library release with no changes.  The FSF also funded an early stage
+of the development of Debian GNU/Linux.</p>
+
+<p>
+Today there are many different variants of the GNU/Linux system (often
+called &ldquo;distros&rdquo;).  Most of them include non-free
+software&mdash;their developers follow the philosophy associated with
+Linux rather than that of GNU.  But there are also
+<a href="/distros/">completely free GNU/Linux distros</a>.  The FSF
+supports computer facilities for two of these
+distributions, <a href="http://ututo.org";>Ututo</a>
+and <a href="http://gnewsense.org/";>gNewSense</a>.</p>
+
+<p>Making a free GNU/Linux distribution is not just a matter of
+eliminating various non-free programs.  Nowadays, the usual version of
+Linux contains non-free programs too.  These programs are intended to
+be loaded into I/O devices when the system starts, and they are
+included, as long series of numbers, in the "source code" of Linux.
+Thus, maintaining free GNU/Linux distributions now entails maintaining
+a <a href="http://directory.fsf.org/project/linux";> free version of
+Linux</a> too.</p>
+
+<p>Whether you use GNU/Linux or not, please don't confuse the public
+by using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the
+kernel, one of the essential major components of the system.  The
+system as a whole is basically the GNU system, with Linux added.  When
+you're talking about this combination, please call it
+&ldquo;GNU/Linux&rdquo;.</p>
+
+<p>
+If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+reference, this page and <a href="/gnu/the-gnu-project.html">
+http://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+you mention Linux, the kernel, and want to add a link for further
+reference, <a href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?Linux";>
+http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?Linux</a> is a good URL
+to use.</p>
+
+<p>
+Addendum: Aside from GNU, one other project has independently produced
+a free Unix-like operating system.  This system is known as BSD, and
+it was developed at UC Berkeley.  It was non-free in the 80s, but
+became free in the early 90s.  A free operating system that exists
+today<a href="#newersystems">(4)</a> is almost certainly either a
+variant of the GNU system, or a kind of BSD system.</p>
+
+<p>
+People sometimes ask whether BSD too is a version of GNU, like
+GNU/Linux.  The BSD developers were inspired to make their code free
+software by the example of the GNU Project, and explicit appeals from
+GNU activists helped persuade them, but the code had little overlap
+with GNU.  BSD systems today use some GNU programs, just as the GNU
+system and its variants use some BSD programs; however, taken as
+wholes, they are two different systems that evolved separately.  The
+BSD developers did not write a kernel and add it to the GNU system,
+and a name like GNU/BSD would not fit the situation.<a
+href="#gnubsd">(5)</a></p>
+
+<h3>Notes:</h3>
+<ol>
+<li>
+<a id="unexciting"></a>These unexciting but essential components
+include the GNU assembler, GAS and the linker, GLD, both
+are now part of the <a href="/software/binutils/">GNU Binutils</a>
+package, <a href="/software/tar/">GNU tar</a>, and more.</li>
+
+<li>
+<a id="nottools"></a>For instance, The Bourne Again SHell (BASH),
+the PostScript interpreter
+<a href="/software/ghostscript/ghostscript.html">Ghostscript</a>, and the
+<a href="/software/libc/libc.html">GNU C library</a> are not
+programming tools.  Neither are GNUCash, GNOME, and GNU Chess.</li>
+
+<li>
+<a id="somecomponents"></a>For instance, the
+<a href="/software/libc/libc.html">GNU C library</a>.</li>
+
+<li>
+<a id="newersystems"></a>Since that was written, a nearly-all-free
+Windows-like system has been developed, but technically it is not at
+all like GNU or Unix, so it doesn't really affect this issue.  Most of
+the kernel of Solaris has been made free, but if you wanted to make a
+free system out of that, aside from replacing the missing parts of the
+kernel, you would also need to put it into GNU or BSD.</li>
+
+<li>
+<a id="gnubsd"></a>On the other hand, in the years since this article
+was written, the GNU C Library has been ported to several versions of
+the BSD kernel, which made it straightforward to combine the GNU system
+with that kernel.  Just as with GNU/Linux, these are indeed variants of
+GNU, and are therefore called, for instance, GNU/kFreeBSD and
+GNU/kNetBSD depending on the kernel of the system.  Ordinary users on
+typical desktops can hardly distinguish between GNU/Linux and
+GNU/*BSD.</li>
+
+</ol>
+
+<!-- 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>
+
+<!--#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 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; 1997, 1998, 1999, 2000, 2001, 2002, 2007 Richard M. Stallman
+<br />
+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>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/12/20 17:27:16 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!--  -->
+<!-- Please keep this list alphabetical by language code. -->
+<!--      Comment what the language is for each type, i.e. de is German. -->
+<!--      Write the language name in its own language (Deutsch) in the text. 
-->
+<!--      If you add a new language here, please -->
+<!--      advise address@hidden and add it to -->
+<!--       - /home/www/html/server/standards/README.translations.html -->
+<!--       - one of the lists under the section "Translations Underway" -->
+<!--       - if there is a translation team, you also have to add an alias -->
+<!--       to mail.gnu.org:/com/mailer/aliases -->
+<!--      Please also check you have the language code right; see: -->
+<!--      http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!--      If the 2-letter ISO 639-1 code is not available, -->
+<!--      use the 3-letter ISO 639-2. -->
+<!--      Please use W3C normative character entities. -->
+<!--  -->
+<!-- <ul class="translations-list"> -->
+<!-- Arabic -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
+<!-- Bulgarian -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.bg.html">&#x431;&#x44A;&#x43B;&#x433;&#x430;&#x440;&#x441;&#x43A;&#x438;</a>&nbsp;[bg]</li>
 -->
+<!-- Bosnian -->
+<!-- <li><a href="/gnu/linux-and-gnu.bs.html">bosanski</a>&nbsp;[bs]</li> -->
+<!-- Catalan -->
+<!-- <li><a href="/gnu/linux-and-gnu.ca.html">catal&agrave;</a>&nbsp;[ca]</li> 
-->
+<!-- Czech -->
+<!-- <li><a href="/gnu/linux-and-gnu.cs.html">&#268;esky</a>&nbsp;[cs]</li> -->
+<!-- German -->
+<!-- <li><a href="/gnu/linux-and-gnu.de.html">Deutsch</a>&nbsp;[de]</li> -->
+<!-- Greek -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.el.html">&#x03b5;&#x03bb;&#x03bb;&#x03b7;&#x03bd;&#x03b9;&#x03ba;&#x03ac;</a>&nbsp;[el]</li>
 -->
+<!-- English -->
+<!-- <li><a href="/gnu/linux-and-gnu.html">English</a>&nbsp;[en]</li> -->
+<!-- Spanish -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.es.html">espa&ntilde;ol</a>&nbsp;[es]</li> -->
+<!-- Farsi/Persian -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.fa.html">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc;</a>&nbsp;[fa]</li>
 -->
+<!-- French -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.fr.html">fran&ccedil;ais</a>&nbsp;[fr]</li> -->
+<!-- Hebrew -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.he.html">&#1506;&#1489;&#1512;&#1497;&#1514;</a>&nbsp;[he]</li>
 -->
+<!-- Indonesian -->
+<!-- <li><a href="/gnu/linux-and-gnu.id.html">Bahasa 
Indonesia</a>&nbsp;[id]</li> -->
+<!-- Italian -->
+<!-- <li><a href="/gnu/linux-and-gnu.it.html">italiano</a>&nbsp;[it]</li> -->
+<!-- Japanese -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.ja.html">&#26085;&#26412;&#35486;</a>&nbsp;[ja]</li> 
-->
+<!-- Korean -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.ko.html">&#54620;&#44397;&#50612;</a>&nbsp;[ko]</li> 
-->
+<!-- Malayalam -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.ml.html">&#3374;&#3378;&#3375;&#3390;&#3379;&#3330;</a>&nbsp;[ml]</li>
 -->
+<!-- Dutch -->
+<!-- <li><a href="/gnu/linux-and-gnu.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
+<!-- Polish -->
+<!-- <li><a href="/gnu/linux-and-gnu.pl.html">polski</a>&nbsp;[pl]</li> -->
+<!-- Brazilian Portuguese -->
+<!-- <li><a href="/gnu/linux-and-gnu.pt-br.html">portugu&ecirc;s do 
Brasil</a>&nbsp;[pt-br]</li> -->
+<!-- Romanian -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.ro.html">rom&#x00e2;n&#x0103;</a>&nbsp;[ro]</li> -->
+<!-- Russian -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
 -->
+<!-- Serbo-Croatian -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.sh.html">srpsko-hrvatski</a>&nbsp;[sh]</li> -->
+<!-- Slovenian -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.sl.html">sloven&scaron;&#269;ina</a>&nbsp;[sl]</li> -->
+<!-- Serbian -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.sr.html">&#x0441;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a>&nbsp;[sr]</li>
 -->
+<!-- Tagalog -->
+<!-- <li><a href="/gnu/linux-and-gnu.tl.html">Tagalog</a>&nbsp;[tl]</li> -->
+<!-- Tamil -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.ta.html">&#2980;&#2990;&#3007;&#2996;&#3021;</a>&nbsp;[ta]</li>
 -->
+<!-- Chinese (Simplified) -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.zh-cn.html">&#31616;&#20307;&#20013;&#25991;</a>&nbsp;[zh-cn]</li>
 -->
+<!-- Chinese (Traditional) -->
+<!-- <li><a 
href="/gnu/linux-and-gnu.zh-tw.html">&#32321;&#39636;&#20013;&#25991;</a>&nbsp;[zh-tw]</li>
 -->
+<!-- </ul> -->
+<!-- </div> -->
+
+</div>
+</body>
+</html>

Index: licenses/po/licenses.ca-en.html
===================================================================
RCS file: licenses/po/licenses.ca-en.html
diff -N licenses/po/licenses.ca-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ licenses/po/licenses.ca-en.html     20 Dec 2011 17:27:28 -0000      1.1
@@ -0,0 +1,441 @@
+<!--#include virtual="/server/header.html" -->
+<title>Licenses - GNU Project - Free Software Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/licenses/po/licenses.translist" -->
+<h2>Licenses</h2>
+
+<p>
+Published software should be <a href="/philosophy/free-sw.html">free
+software</a>.  To make it free software, you need to release it
+under a free software license.  We normally use the <a
+href="#GPL">GNU General Public License</a> (GNU GPL),
+but occasionally we use <a 
href="/licenses/license-list.html#SoftwareLicenses">other
+free software licenses</a>.  We use only licenses that are compatible
+with the GNU GPL for GNU software.
+</p>
+
+<p>
+Documentation for free software should be
+<a href="/philosophy/free-doc.html">free documentation</a>, so that
+people can redistribute it and improve it along with the software
+it describes.  To make it free documentation, you need to release
+it under a free documentation license.  We normally use the
+<a href="#FDL">GNU Free Documentation License</a> (GNU
+FDL), but occasionally we use
+<a href="/licenses/license-list.html#DocumentationLicenses">other free
+documentation licenses</a>.
+</p>
+
+<p>If you've started a new project and you're not sure what license to
+use, <a href="/licenses/license-recommendations.html">&ldquo;How to
+choose a license for your own work&rdquo;</a> details our
+recommendations in an easy-to-follow guide.  If you just want a quick
+list reference, we have a page that names
+our <a href="/licenses/recommended-copylefts.html">recommended
+copyleft licenses</a>.</p>
+
+<p>
+Our documentation licenses are currently being revised, and we welcome
+your comments on the proposed texts. Please
+visit <a href="http://gplv3.fsf.org";>our license update site</a> to
+read the current drafts and participate in the process.
+</p>
+
+<h3>Common Resources for our Software Licenses</h3>
+
+<p>We have a number of resources to help people understand and use our
+various licenses:</p>
+
+<ul>
+
+  <li><a href="/licenses/gpl-faq.html">Frequently Asked
+  Questions about the GNU licenses</a></li>
+  <li><a href="/licenses/gpl-howto.html">How to use GNU licenses for your
+  own software</a></li>
+  <li><a href="/licenses/gpl-violation.html">What to do if you see a
+  violation of a GNU license</a></li>
+  <li><a href="/philosophy/university.html">Releasing Free Software if
+  you work at a university</a></li>
+  <li><a href="/licenses/why-assign.html">Why the FSF gets copyright
+  assignments from contributors</a></li>
+  <li><a href="/graphics/license-logos.html">GNU license logos</a> to use
+  with your project</li>
+  <li><a
+href="/licenses/license-list.html#LicensingMailingList">&lt;address@hidden&gt;
+mailing list</a> for general licensing help
+  </li>
+
+</ul>
+
+<h3 id="GPL">The GNU General Public License</h3>
+
+<p>
+The GNU General Public License is often called the GNU GPL for short;
+it is used by most GNU programs, and by more than half of all free
+software packages.  The latest version is version 3.
+</p>
+
+<ul>
+  <li>The GNU General Public License is available in these formats:
+      <a href="/licenses/gpl.html">HTML</a>,
+      <a href="/licenses/gpl.txt">plain text</a>,
+      <a href="/licenses/gpl.odt">ODF</a>,
+      <a href="/licenses/gpl.dbk">Docbook</a>,
+      <a href="/licenses/gpl.texi">Texinfo</a>, and
+      <a href="/licenses/gpl.tex">LaTeX</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
+  <li><a href="/licenses/quick-guide-gplv3.html">A Quick Guide to
+      GPLv3</a></li>
+  <li><a href="/licenses/old-licenses/old-licenses.html#GPL">Older
+  versions of the GNU GPL</a></li>
+</ul>
+
+<h3 id="LGPL">The GNU Lesser General Public License</h3>
+
+<p>
+The GNU Lesser General Public License is used by a few (not by any means
+all) GNU libraries.  The latest version is version 3.
+</p>
+
+<ul>
+  <li>The GNU Lesser General Public License text is available in
+      these formats:
+      <a href="/licenses/lgpl.html">HTML</a>,
+      <a href="/licenses/lgpl.txt">plain text</a>,
+      <a href="/licenses/lgpl.dbk">Docbook</a>, and
+      <a href="/licenses/lgpl.texi">Texinfo</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
+  <li><a href="/licenses/why-not-lgpl.html">Why you shouldn't use
+  the Lesser GPL for your next library</a></li>
+  <li><a href="/licenses/old-licenses/old-licenses.html#GPL">Older
+  versions of the GNU LGPL</a></li>
+</ul>
+
+<h3 id="AGPL">The GNU Affero General Public License</h3>
+
+<p>
+The GNU Affero General Public License is based on the GNU GPL, but has an
+additional term to allow users who interact with the licensed software over
+a network to receive the source for that program.  We recommend that people
+consider using the GNU AGPL for any software which will commonly be run
+over a network.  The latest version is version 3.
+</p>
+
+<ul>
+  <li>The GNU Affero General Public License text is available in
+      these formats:
+      <a href="/licenses/agpl.html">HTML</a>,
+      <a href="/licenses/agpl.txt">plain text</a>,
+      <a href="/licenses/agpl.dbk">Docbook</a>,
+      <a href="/licenses/agpl.texi">Texinfo</a>, and
+      <a href="/licenses/agpl.tex">LaTeX</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
+  <li><a href="/licenses/why-affero-gpl.html">Why the Affero GPL</a></li>
+</ul>
+
+<h3 id="FDL">The GNU Free Documentation License</h3>
+
+<p>
+The GNU Free Documentation License is a form of copyleft intended
+for use on a manual, textbook or other document to assure everyone
+the effective freedom to copy and redistribute it, with or without
+modifications, either commercially or non-commercially.  The latest version
+is 1.3.
+</p>
+
+<ul>
+  <li>The GNU Free Documentation License text is available in these formats:
+      <a href="/licenses/fdl.html">HTML</a>,
+      <a href="/licenses/fdl.txt">plain text</a>,
+      <a href="/licenses/fdl.xml">Docbook</a>,
+      <a href="/licenses/fdl.texi">Texinfo</a>, and
+      <a href="/licenses/fdl.tex">LaTeX</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
+  <li><a href="/licenses/why-gfdl.html">Why publishers should use
+  the GNU FDL</a></li>
+  <li><a href="/licenses/fdl.html#addendum">How to use
+  the GNU FDL for your documentation</a></li>
+  <li><a href="/licenses/fdl-howto.html">Tips on using the GNU FDL</a></li>
+  <li><a href="/licenses/fdl-howto-opt.html">How to use the optional
+      features of the GNU FDL</a></li>
+      <li><a href="/licenses/old-licenses/old-licenses.html#FDL">
+      Older versions of the GNU FDL</a></li>
+</ul>
+
+<h3 id="Exceptions">Exceptions to GNU Licenses</h3>
+
+<p>Some GNU programs have additional permissions or special exceptions
+  to specific terms in one of the main licenses.  Since some of those
+  are commonly used or inspire a lot of questions on their own, we've
+  started collecting them on
+  our <a href="/licenses/exceptions.html">exceptions page</a>.</p>
+
+<h3 id="LicenseURLs">License URLs</h3>
+
+<p>When linking to our licenses, it's usually best to link to the latest
+version; hence the standard URLs such as
+<tt>http://www.gnu.org/licenses/gpl.html</tt> have no version number.
+Occasionally, however, you may want to link to a specific version of a
+given license.  In those situations, you can use the following links
+[<a href="#urlskip">skip links</a>]:</p>
+
+<dl>
+<dt>GNU General Public License (GPL)</dt>
+<!-- Please keep these links absolute.  I'm depending on that for the
+     XSLT to generate pages on fsf.org.  Thanks. -brett -->
+<dd><a href="http://www.gnu.org/licenses/gpl-3.0.html";>GPLv3</a>,
+<a href="http://www.gnu.org/licenses/gpl-2.0.html";>GPLv2</a>,
+<a href="http://www.gnu.org/licenses/gpl-1.0.html";>GPLv1</a></dd>
+
+<dt>GNU Lesser General Public License (LGPL)</dt>
+<dd><a href="http://www.gnu.org/licenses/lgpl-3.0.html";>LGPLv3</a>,
+<a href="http://www.gnu.org/licenses/lgpl-2.1.html";>LGPLv2.1</a></dd>
+
+<dt>GNU Affero General Public License (AGPL)</dt>
+<dd><a href="http://www.gnu.org/licenses/agpl-3.0.html";>GNU
+    AGPLv3</a>  (The <a
+    href="http://www.affero.org/oagpl.html";>Affero General 
+    Public License version 1</a> is not a GNU license, but it was
+    designed to serve a purpose much like the GNU AGPL's.)</dd>
+
+<dt>GNU Free Documentation License (FDL)</dt>
+<dd><a href="http://www.gnu.org/licenses/fdl-1.3.html";>FDLv1.3</a>,
+<a href="http://www.gnu.org/licenses/fdl-1.2.html";>FDLv1.2</a>,
+<a href="http://www.gnu.org/licenses/fdl-1.1.html";>FDLv1.1</a></dd>
+</dl>
+
+<p><a name="urlskip"></a>Stable links to each license's alternative
+  formats are available on its respective page.  Not every version of
+  every license is available in every format.  If you need one that is
+  missing, please <a href="mailto:address@hidden";>email us</a>.</p>
+
+<p>See also the <a href="old-licenses/">old licenses page</a>.</p>
+
+
+<h3>Unofficial Translations</h3>
+
+<p>
+Legally speaking, the original (English) version of the licenses is what
+specifies the actual distribution terms for GNU programs and others that
+use them. But to help people better understand the licenses, we give
+permission to publish translations into other languages provided that
+they follow our regulations for unofficial translations:
+</p>
+
+<ul>
+  <li>
+    <a href="/licenses/translations.html">List of unofficial translations</a>
+  </li>
+  <li><a href="/licenses/translations.html#rules">How to create an unofficial
+      translation</a></li>
+</ul>
+
+<h3 id="VerbatimCopying">Verbatim Copying and Distribution</h3>
+
+<p>The standard copyright terms for GNU web pages is now the <a
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.  It used to
+be (and for a few pages still is): <em><span class="highlight">Verbatim
+copying and distribution of this entire article are permitted worldwide,
+without royalty, in any medium, provided this notice is
+preserved</span>.</em> Please note the following commentary about this
+&ldquo;verbatim license&rdquo; by Eben Moglen:</p>
+
+<p>
+&ldquo;Our intention in using the phrase &lsquo;verbatim copying in
+any medium&rsquo; is not to require retention of page headings and
+footers or other formatting features.  Retention of weblinks in both
+hyperlinked and non-hyperlinked media (as notes or some other form of
+printed URL in non-HTML media) is required&rdquo;.
+</p>
+
+<h3>List of Free Software Licenses</h3>
+
+<ul>
+  <li>
+    <a href="/licenses/license-list.html">List of Free Software Licenses</a>
+
+<p> If you are contemplating writing a new license, please contact the
+FSF by writing to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. The
+proliferation of different free software licenses means increased work
+for users in understanding the licenses; we may be able to help you
+find an existing Free Software license that meets your needs.
+</p>
+
+<p>
+If that isn't possible, if you really need a new license, with our
+help you can ensure that the license really is a Free Software license
+and avoid various practical problems.
+</p>
+
+  </li>
+ </ul>
+
+
+<h3 id="WhatIsCopyleft">What Is Copyleft?</h3>
+
+<p>
+<a href="/copyleft/copyleft.html"><em>Copyleft</em></a> is a general
+method for making a program free
+software and requiring all modified and extended versions of the
+program to be free software as well.
+</p>
+
+<p>
+The simplest way to make a program free is to put it in the
+<a href="/philosophy/categories.html#PublicDomainSoftware">public
+domain</a>, uncopyrighted.  This allows people to share the program
+and their improvements, if they are so minded.  But it also allows
+uncooperative people to convert the program into
+<a href="/philosophy/categories.html#ProprietarySoftware">proprietary
+software</a>.  They can make changes, many or few, and distribute the
+result as a proprietary product.  People who receive the program in
+that modified form do not have the freedom that the original author
+gave them; the middleman has stripped it away.
+</p>
+
+<p>
+In the <a href="/gnu/thegnuproject.html">GNU project</a>, our aim is
+to give <em>all</em> users the freedom to redistribute and change GNU
+software.  If middlemen could strip off the freedom, we might have
+many users, but those users would not have freedom.  So instead of
+putting GNU software in the public domain, we &ldquo;copyleft&rdquo;
+it.  Copyleft says that anyone who redistributes the software, with or
+without changes, must pass along the freedom to further copy and
+change it.  Copyleft guarantees that every user has freedom.
+</p>
+
+<p>
+Copyleft also provides an
+<a href="/philosophy/pragmatic.html">incentive</a>
+for other programmers to add to free software.
+Important free programs such as the GNU C++ compiler exist
+only because of this.
+</p>
+
+<p>
+Copyleft also helps programmers who want to contribute
+<a href="/software/software.html#HelpWriteSoftware">improvements</a> to
+<a href="/philosophy/free-sw.html">free software</a> get permission to
+do that.  These programmers often work for companies or universities
+that would do almost anything to get more money.  A programmer may
+want to contribute her changes to the community, but her employer may
+want to turn the changes into a proprietary software product.
+</p>
+
+<p>
+When we explain to the employer that it is illegal to distribute the
+improved version except as free software, the employer usually decides
+to release it as free software rather than throw it away.
+</p>
+
+<p>
+To copyleft a program, we first state that it is copyrighted; then
+we add distribution terms, which are a legal instrument that gives
+everyone the rights to use, modify, and redistribute the program's
+code <em>or any program derived from it</em> but only if the
+distribution terms are unchanged.  Thus, the code and the freedoms
+become legally inseparable.
+</p>
+
+<p>
+Proprietary software developers use copyright to take away the users'
+freedom; we use copyright to guarantee their freedom.  That's why we
+reverse the name, changing &ldquo;copyright&rdquo; into
+&ldquo;copyleft&rdquo;.
+</p>
+
+<p>
+Copyleft is a general concept; there are many ways to fill in the
+details.  In the GNU Project, the specific distribution terms that we
+use are contained in the GNU General Public License, the GNU Lesser
+General Public License and the GNU Free Documentation License.
+</p>
+
+<p>
+The appropriate license is included in many manuals and in each GNU
+source code distribution.
+</p>
+
+<p>
+The GNU GPL is designed so that you can easily apply it to your own
+program if you are the copyright holder.  You don't have to modify the
+GNU GPL to do this, just add notices to your program which refer
+properly to the GNU GPL. Please note that you must use the
+entire text of the GPL, if you use it.  It is an integral whole, and
+partial copies are not permitted.  (Likewise for the LGPL, AGPL, and FDL.)
+</p>
+
+<p>
+Using the same distribution terms for many different programs makes it
+easy to copy code between various different programs.  Since they all
+have the same distribution terms, there is no need to think about
+whether the terms are compatible.  The Lesser GPL includes a
+provision that lets you alter the distribution terms to the ordinary
+GPL, so that you can copy code into another program covered by the GPL.
+</p>
+
+<h3>Licenses for Other Types of Works</h3>
+
+<p>
+We believe that published software and documentation should be
+<a href="/philosophy/free-doc.html">free software and free documentation</a>.
+We recommend making all sorts of educational and reference works free
+also, using free documentation licenses such as the
+<a href="#FDL">GNU Free Documentation License</a> (GNU FDL).
+</p>
+
+<p>For essays of opinion and scientific papers, we recommend
+either the <a
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>, or the
+simple &ldquo;verbatim copying only&rdquo; license stated above.</p>
+ 
+<p>
+We don't take the position that artistic or entertainment works must
+be free, but if you want to make one free, we recommend
+the <a href="http://artlibre.org/licence/lalgb.html";>Free Art
+License</a>.</p>
+
+<!-- If needed, change the copyright block at the bottom. In general,
+     pages 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
+     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 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>
+
+<p>Copyright &copy; 2011 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>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/12/20 17:27:28 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: licenses/po/translations.ca-en.html
===================================================================
RCS file: licenses/po/translations.ca-en.html
diff -N licenses/po/translations.ca-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ licenses/po/translations.ca-en.html 20 Dec 2011 17:27:29 -0000      1.1
@@ -0,0 +1,473 @@
+<!--#include virtual="/server/header.html" -->
+<title>Unofficial Translations - GNU Project - Free Software Foundation 
(FSF)</title>
+<meta http-equiv="keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Copyleft, Licenses" />
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/licenses/po/translations.translist" -->
+<h2>Unofficial Translations</h2>
+
+<h3 id="UnofficialTranslations">Information about unofficial
+translations</h3>
+
+<p>
+The reason the FSF does not approve these translations as officially
+valid is that checking them would be difficult and expensive (needing
+the help of bilingual lawyers in other countries).  Even worse, if an
+error did slip through, the results could be disastrous for the whole
+free software community.  As long as the translations are unofficial,
+they can't do any harm.</p>
+
+<p>The purpose of linking to translations is to help more people
+understand our licenses.  In order for them to do that, translations
+need to be basically accurate even if not perfect.  To produce a good
+translation, it is essential to have fully understood fundamental
+concepts such as <a href="/copyleft/copyleft.html">copyleft</a> and
+the <a href="/philosophy/free-sw.html">free software definition</a>.
+For this reason, those who wish to contribute translations should make
+sure they are well acquainted with these concepts as well as other
+philosophical principles that may appear in the document.</p>
+
+<p>We give permission to publish translations of the GNU GPL, LGPL,
+AGPL, and FDL into other languages, provided that:</p>
+
+<ol>
+
+<li>You label your translation as unofficial to inform people that
+they do not count legally as substitutes for the authentic version
+(see below for how to do this).</li>
+
+<li>You agree to install changes at our request, if we learn from other
+friends of GNU that changes are necessary to make the translation
+clearer.</li>
+
+<li>The translation is not hosted on a commercial site and does not
+refer to any company.</li>
+
+<li>The page containing the translation should have no links
+except to fsf.org and gnu.org.  We might accept links about
+other free software packages, but we prefer to avoid them.</li>
+
+<li>The page should say it is released under some version of the
+Creative Commons Attribution-NoDerivs license.</li>
+
+<li>We may accept small exceptions to these rules in
+legacy cases that are hard to fix.</li>
+
+</ol>
+
+<p>We do not necessarily link to all the unofficial translations that
+we know of in any given language.  For instance, if one unofficial
+translation was made by a free software organization that we know and
+have confidence in, we will link to that translation rather than others.
+We still can't make it official, but we expect it is probably mostly
+correct.</p>
+
+<p>
+To label your translations as unofficial, please add the
+following text at the beginning,
+both in English and in the language of the translation.  Replace
+<em>language</em> with the name of that language, and &ldquo;GNU
+General Public License&rdquo; and &ldquo;GPL&rdquo; with the name and
+abbreviation of the license you're translating, if it's not the
+GPL:</p>
+
+<blockquote dir="ltr"><p>
+<!--TRANSLATORS: If you translate this paragraph, retain the English
+text and put your translation below.  The entire <blockquote> element
+has dir="ltr" to work by default with RTL languages when the notice is
+not translated, so if your language is RTL, you *must* put your
+translation within <span dir="rtl">.-->
+This is an unofficial translation of the GNU General Public License
+into <tt>language</tt>.  It was not published by the Free Software
+Foundation, and does not legally state the distribution terms for
+software that uses the GNU GPL&mdash;only the original English text of
+the GNU GPL does that.  However, we hope that this translation will
+help <tt>language</tt> speakers understand the GNU GPL better.
+</p></blockquote>
+
+<h3 id="GPL">The GNU General Public License, version 3</h3>
+
+<!-- Please keep entries alphabetical by language name.         -->
+<!-- And to help users, include the language code in brackets.  -->
+
+<!-- The language is Portuguese, the dialect is Brazilian.      -->
+<!-- To be kind to the user, we list it under both "B" and "P"  -->
+<!-- this link is broken. I sent mail to Conectiva asking for   -->
+<!-- the new location but got no replies. Fortunately I found   -->
+<!-- another translation (fsl) LI A HREF=                       -->
+<!-- http://lie-br.conectiva.com.br/licenca_gnu.html Brazilian  -->
+
+<p>If you make a translation (of any license), please inform the GNU
+Translation Managers <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+They will check to make sure that your translation follows the above
+guidelines and make a link to it from this page.</p>
+
+<!-- Please keep entries alphabetical by language name. -->
+
+<ul>
+<!-- commercial site
+  <li><code>[es-ar]</code> <a 
href="http://www.spanish-translator-services.com/espanol/t/gnu/gpl-ar.html";>Argentinian
 Spanish</a>
+  translation of the GPL</li>
+-->
+<!-- TODO: the page should say it is CC-BY-ND -->
+  <li><code>[hy]</code> <a href="http://gnu.am/license/gpl.txt";>Armenian</a>
+  translation of the GPL</li>
+<!-- hidden problematic links (Visual Basic), commercial site, no distribution 
terms
+  <li><code>[be]</code> <a 
href="http://webhostingrating.com/libs/gpl3be";>Belarusian</a>
+  translation of the GPL</li>
+-->
+<!-- the "translation" doesn't serve its purpose
+  <li><code>[en-gb]</code> <a 
href="http://people.csse.uwa.edu.au/jmd/gpl_en.txt";>
+  British English</a> translation of the GPL</li>
+-->
+<!-- many links; some may be problematic - to suggest republishing
+  <li>
+<code>[zh-cn]</code> <a 
href="http://www.zeuux.org/group/free-software/bbs/content/50512/";>
+  Chinese (Simplified)</a> translation of the GPL
+-->
+<!-- PDF download requires registration
+ (<a 
href="http://www.zeuux.org/group/free-software/file/content/283/";>PDF</a>)</li>
+-->
+  <li><code>[zh-tw]</code> <!-- RT #715288 -->
+  <a href="http://www.chinasona.org/gnu/gnuv3-tc.html";>
+  Chinese (Traditional)</a> translation of the GPL</li>
+  <li><code>[cs]</code> <!-- RT #710854 -->
+  <a href="http://jxself.org/translations/gpl-3.cz.shtml";>Czech</a>
+  translation of the GPL</li>
+  <li><code>[nl]</code> <a 
href="http://bartbeuving.files.wordpress.com/2008/07/gpl-v3-nl-101.pdf";>
+  Dutch</a> translation of the GPL (PDF)</li>
+<!-- link to browsehappy.com; other links
+  <li><code>[eo]</code>
+  <a href="http://zooplah.farvista.net/eo/programado/gpl3.html";>Esperanto</a>
+  translation of the GPL</li>
+-->
+<!-- commercial site
+  <li><code>[fi]</code> <a href="http://www.turre.com/licenses/gpl_fi.html";>
+  Finnish</a> translation of the GPL</li>
+-->
+<!-- TODO: the page should say it is CC-BY-ND;
+     the HTML looks like an official www.gnu.org page (including contacts) -->
+  <li><code>[fr]</code> <a href="http://www.rodage.org/gpl-3.0.fr.txt";>
+  French</a> translation of the GPL</li>
+  <li><code>[fr]</code> <a href="http://dachary.org/loic/gpl-french.pdf";>
+  French</a> translation of the GPL (PDF)</li>
+  <li><code>[gl]</code> <a 
href="http://www.mancomun.org/GPL3_GL/gpl_gl_v3.html";>
+  Galician</a> translation of the GPL
+  (<a href="http://www.mancomun.org/GPL3_GL/gpl_gl_v3.txt";>plain
+  text</a>, <a 
href="http://www.mancomun.org/GPL3_GL/gpl_gl_v3.pdf";>PDF</a>)</li>
+<!-- TODO: the page should say it is CC-BY-ND -->
+  <li><code>[de]</code> <a href="http://www.gnu.de/documents/gpl-3.0.de.html";>
+  German</a> translation of the GPL</li>
+<!-- commercial site; too restrictive terms
+  <li><code>[he]</code> <a href="http://law.co.il/gplv3";>Hebrew</a>
+  translation of the GPL</li>
+-->
+<!-- TODO: the page should say it is CC-BY-ND -->
+  <li><code>[hu]</code> <a href="http://gnu.hu/gplv3.html";>Hungarian</a>
+  translation of the GPL</li>
+
+  <li><code>[it]</code> Italian translation of the GPL - 
+<a href="http://katolaz.homeunix.net/gplv3/gplv3-it-final.html";>HTML</a>, 
+<a href="http://katolaz.homeunix.net/gplv3/gplv3-it-final.ps";>PS</a>, 
+<a href="http://katolaz.homeunix.net/gplv3/gplv3-it-final.pdf";>PDF</a>, 
+<a href="http://katolaz.homeunix.net/gplv3/gplv3-it.tex";>LaTeX</a>
+</li>
+
+  <li><code>[fa]</code> <a 
href="http://www.kaveh.org/gnu/gplv3-fa.html";>Persian
+  (Farsi)</a> translation of the GPL</li>
+  <li><code>[sr]</code> <!-- RT #339241 -->
+  Serbian translation of the GPL:
+  <a href="http://alas.matf.bg.ac.rs/~mr99164/ojl-3.0.html";>HTML</a>,
+  <a href="http://alas.matf.bg.ac.rs/~mr99164/gnu/ojl-3.0.pdf";>PDF</a>
+  </li>
+  <li><code>[sk]</code> <!-- RT #710854 -->
+  <a href="http://jxself.org/translations/gpl-3.sk.shtml";>Slovak</a>
+  translation of the GPL</li>
+<!-- commercial site
+  <li><code>[es]</code> <a 
href="http://www.viti.es/gnu/licenses/gpl.html";>Spanish</a>
+  translation of the GPL</li>
+-->
+<!-- ads; many other links
+  <li><code>[uk]</code> <a 
href="http://www.linux.kiev.ua/ua/devel/licenses/gnu-gpl/";>
+  Ukrainian</a> translation of the GPL</li>
+-->
+</ul>
+
+<!-- <h4>Translations Underway</h4>
+<p>The following translation efforts are underway, please contact the
+  person/team if you are willing to help.</p>
+
+<ul> -->
+<!-- commercial site;
+   since we have another translation by the FSFLA, we may want
+   to drop this one
+  <li><code>[pt-br]</code> Brazilian Portuguese
+  (<a href="http://gpl3brasil.pbwiki.com/GPLv3";>1</a>),
+-->
+<!-- too many links
+  (<a href="http://www.fsfla.org/svnwiki/trad/GPLv3";>2</a> &mdash;
+  effort lead by FSFLA)</li>
+-->
+<!-- many links, some may be problematic; the licensing terms are CC-BY-SA,
+  <li><code>[ca]</code> <a 
href="http://www.softcatala.cat/wiki/GPL3";>Catalan</a></li>
+-->
+<!-- ads
+  <li><code>[ko]</code> <a 
href="http://wiki.kldp.org/wiki.php/GNU/GPLV3Translation";>Korean</a></li>
+-->
+<!-- mentions www.neoscopio.com; the distribution terms are the GFDL
+  <li><code>[pt]</code> <a href="http://gpl3.neoscopio.org";>Portuguese</a></li>
+-->
+<!-- wikipedia links; the distribution terms are CC-BY-SA
+  <li><code>[ro]</code> <a 
href="http://ro.wikipedia.org/wiki/GPL_(licen%C8%9Ba,_versiunea_3)">Romanian</a></li>
+-->
+<!-- commercial site
+  <li><code>[ru]</code> <a 
href="http://code.google.com/p/gpl3rus/wiki/LatestRelease";>Russian</a></li>
+-->
+<!-- too many links
+  <li><code>[es]</code> <a href="http://www.fsfla.org/svnwiki/trad/GPLv3";>
+  Spanish</a> &mdash; effort lead by FSFLA</li>
+-->
+<!-- </ul> -->
+
+<h3 id="LGPL">The GNU Lesser General Public License, version 3</h3>
+
+<p>
+If you make a translation, please inform the GNU Translation Managers
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+They will check to make sure that your translation follows the above
+guidelines and make a link to it from this page.</p>
+
+<ul>
+  <li><code>[zh-cn]</code> <a 
href="http://www.thebigfly.com/gnu/lgpl/lgpl-v3.php";>
+  Chinese (Simplified)</a> translation of the LGPL</li>
+  <li><code>[zh-tw]</code> <!-- RT #715288 -->
+  <a href="http://www.chinasona.org/gnu/gnulgpl-v3-tc.html";>
+  Chinese (Traditional)</a> translation of the LGPL</li>
+  <li><code>[cs]</code> <!-- RT #716430 -->
+  <a href="http://jxself.org/translations/lgpl-3.cs.shtml";>Czech</a>
+  translation of the LGPL</li>
+<!-- TODO: the page should say it is CC-BY-ND -->
+  <li><code>[de]</code> <a href="http://www.gnu.de/documents/lgpl-3.0.de.html";>
+  German</a> translation of the LGPL</li>
+<!-- TODO: the page should say it is CC-BY-ND -->
+  <li><code>[hu]</code> <a href="http://gnu.hu/lgplv3.html";>Hungarian</a>
+  translation of the LGPL</li>
+<!-- commercial site
+  <li><code>[it]</code>
+  <a href="http://www.posterburner.com/IT_GNU_LESSER_GENERAL_PUBLIC_LICEN.htm";>
+  Italian</a> translation of the LGPL</li>
+-->
+  <li><code>[fa]</code> <a 
href="http://www.kaveh.org/gnu/lgplv3-fa.html";>Persian
+  (Farsi)</a> translation of the LGPL</li>
+  <li><code>[sk]</code> <!-- RT #716430 -->
+  <a href="http://jxself.org/translations/lgpl-3.sk.shtml";>Slovak</a>
+  translation of the LGPL</li>
+<!-- links to hosting site
+  <li><code>[es]</code> <a 
href="http://www.viti.es/gnu/licenses/lgpl.html";>Spanish</a>
+  translation of the LGPL</li>
+-->
+</ul>
+
+<h4>Translations Underway</h4>
+<p>The following translation efforts are underway, please contact the
+  person/team if you are willing to help.</p>
+
+<!-- too many links
+<ul>
+  <li><code>[pt-br]</code> <a href="http://www.fsfla.org/svnwiki/trad/LGPLv3";>
+  Brazilian Portuguese</a></li>
+  <li><code>[es]</code> <a href="http://www.fsfla.org/svnwiki/trad/LGPLv3";>
+  Spanish</a> (both are lead by FSFLA)</li>
+</ul>
+-->
+
+<h3 id="FDL">The GNU Free Documentation License, version 1.3</h3>
+
+<!-- Please keep entries alphabetical by language name. -->
+<!-- PLEASE DO NOT HOST TRANSLATIONS OF ANY OF OUR LICENSES ON OUR WEBSERVER 
-->
+<!-- THIS MAY LEAD THEM TO BEING CONSTRUED AS 'OFFICIAL'   -->
+<!-- fdl.ja.html is NOT a translation of GFDL -->
+
+<p>
+If you make a translation, please inform the GNU Translation Managers
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+They will check to make sure that your translation follows the above
+guidelines and make a link to it from this page.</p>
+
+<p>FDL 1.3 was released on November 3, 2008 and is a relatively minor
+modification of FDL 1.2; the only major changes are the revision of
+section 9 and the addition of section 11.  Thus,
+the <a href="/licenses/old-licenses/fdl-1.2-translations.html">
+translations of FDL 1.2</a> may help you understand FDL 1.3 as well.
+You can learn more about the differences between these two versions
+in <a href="/licenses/fdl-1.3-faq.html">our FAQ</a>.</p>
+
+<!-- Please keep entries alphabetical by language name. -->
+<ul>
+  <li><code>[ar]</code> <!-- RT #700472 -->
+  <a href="http://muhammadsaied.webs.com/licenses/ar.fdlv13.html";>
+  Arabic</a> translation of the GFDL</li>
+  <li><code>[zh-cn]</code> <a href="http://www.thebigfly.com/gnu/FDLv1.3/";>
+  Chinese (Simplified)</a> translation of the GFDL</li>
+  <li><code>[zh-tw]</code> <!-- RT #715288 -->
+  <a href="http://www.chinasona.org/gnu/gnufdl-v13-tc.html";>
+  Chinese (Traditional)</a> translation of the GFDL</li>
+  <li><code>[cs]</code> <!-- RT #716430 -->
+  <a href="http://jxself.org/translations/fdl-1.3.cs.shtml";>Czech</a>
+  translation of the GFDL</li>
+<!-- TODO: the page should say it is CC-BY-ND -->
+  <li><code>[it]</code>
+  <a href="http://home.gna.org/www-it/fdl/1.3/fdl.it.html";>
+  Italian</a> translation of the GFDL
+  (<a href="http://home.gna.org/www-it/fdl/1.3/fdl.it.txt";>plain
+  text version</a>)</li>
+<!-- many links
+  <li><code>[ml]</code> <a href="http://ml.wikipedia.org/wiki/WP:GFDL-ml";>
+  Malayalam</a> translation of the GFDL</li>
+-->
+  <li><code>[sk]</code> <!-- RT #716430 -->
+  <a href="http://jxself.org/translations/fdl-1.3.sk.shtml";>Slovak</a>
+  translation of the GFDL</li>
+<!-- TODO: the page should say it is CC-BY-ND -->
+  <li><code>[es]</code> <a href="http://docs.danexlandia.com.mx/gfdl_es.html";>
+  Spanish</a> translation of the GFDL</li>
+</ul>
+
+<h4>Translations Underway</h4>
+
+<p>The following translation efforts are underway, please contact the
+  person/team if you are willing to help.</p>
+
+<ul>
+  <li><code>[id]</code> <!-- contact the OP from RT #715051 -->
+  Indonesian, <a href="mailto:address@hidden";>
+  &lt;address@hidden&gt;</a></li>
+</ul>
+
+<!-- Please keep entries alphabetical by language name. -->
+
+<h3 id="Exceptions">Unofficial translations of exceptions to GNU
+licenses</h3>
+
+<p>If you make a translation, please inform the GNU Translation
+Managers
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+They will check to make sure that your translation follows the above
+guidelines and make a link to it from this page.</p>
+
+<h4>GNU Runtime Library Exception</h4>
+
+<ul>
+<!-- dead link as of 2011-06-26; confirmed 2011-07-08
+  <li><code>[zh-cn]</code> <a 
href="http://hutuworm.blogspot.com/2009/01/gcc.html";>
+  Chinese (Simplified)</a> translation of the GCC RLE</li>
+-->
+  <li><code>[zh-tw]</code> <!-- RT #715288 -->
+  <a href="http://www.chinasona.org/gnu/gnu-gcc.html";>
+  Chinese (Traditional)</a> translation of the GCC RLE 3</li>
+  <li><code>[cs]</code>  <!-- RT #716430 -->
+  <a href="http://jxself.org/translations/gcc-rtle-3.1.cs.shtml";>Czech</a>
+  translation of the GCC RLE 3.1</li>
+  <li><code>[sk]</code> <!-- RT #716430 -->
+  <a href="http://jxself.org/translations/gcc-rtle-3.1.sk.shtml";>Slovak</a>
+  translation of the GCC RLE 3.1</li>
+</ul>
+
+<h4>GNU Autoconf Configure Script Exception, version 3</h4>
+
+<ul>
+  <li><code>[cs]</code> <!-- RT #716430 -->
+  <a href="http://jxself.org/translations/autoconf-cse-3.cs.shtml";>Czech</a>
+  translation of the GNU Autoconf CSE</li>
+  <li><code>[sk]</code> <!-- RT #716430 -->
+  <a href="http://jxself.org/translations/autoconf-cse-3.sk.shtml";>Slovak</a>
+  translation of the GNU Autoconf CSE</li>
+</ul>
+
+</div>
+<!--#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 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, 2004, 2005, 2006, 2008, 2009,
+2010, 2011 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>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/12/20 17:27:29 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!--  -->
+<!-- Please keep this list alphabetical by language code. -->
+<!--      Comment what the language is for each type, i.e. de is German. -->
+<!--      Write the language name in its own language (Deutsch) in the text. 
-->
+<!--      If you add a new language here, please -->
+<!--      advise address@hidden and add it to -->
+<!--       - /home/www/html/server/standards/README.translations.html -->
+<!--       - one of the lists under the section "Translations Underway" -->
+<!--       - if there is a translation team, you also have to add an alias -->
+<!--       to mail.gnu.org:/com/mailer/aliases -->
+<!--      Please also check you have the language code right; see: -->
+<!--      http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!--      If the 2-letter ISO 639-1 code is not available, -->
+<!--      use the 3-letter ISO 639-2. -->
+<!--      Please use W3C normative character entities. -->
+<!--  -->
+<!--      See also '(web-trans)Capitalization': -->
+<!--      
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
+<!--      -->
+<!--  -->
+<!-- <ul class="translations-list"> -->
+<!-- Arabic -->
+<!-- <li><a 
href="/licenses/translations.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
+<!-- Catalan -->
+<!-- <li><a 
href="/licenses/translations.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li> -->
+<!-- German -->
+<!-- <li><a href="/licenses/translations.de.html">Deutsch</a>&nbsp;[de]</li> 
-->
+<!-- English -->
+<!-- <li><a href="/licenses/translations.html">English</a>&nbsp;[en]</li> -->
+<!-- Spanish -->
+<!-- <li><a 
href="/licenses/translations.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> -->
+<!-- French -->
+<!-- <li><a 
href="/licenses/translations.fr.html">fran&#x00e7;ais</a>&nbsp;[fr]</li> -->
+<!-- Japanese -->
+<!-- <li><a 
href="/licenses/translations.ja.html">&#x65e5;&#x672c;&#x8a9e;</a>&nbsp;[ja]</li>
 -->
+<!-- Korean -->
+<!-- <li><a 
href="/licenses/translations.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
 -->
+<!-- Polish -->
+<!-- <li><a href="/licenses/translations.pl.html">polski</a>&nbsp;[pl]</li> -->
+<!-- Russian -->
+<!-- <li><a 
href="/licenses/translations.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
 -->
+<!-- Chinese (Simplified) -->
+<!-- <li><a 
href="/licenses/translations.zh-cn.html">&#x7b80;&#x4f53;&#x4e2d;&#x6587;</a>&nbsp;[zh-cn]</li>
 -->
+<!-- Chinese (Traditional) -->
+<!-- <li><a 
href="/licenses/translations.zh-tw.html">&#x7e41;&#x9ad4;&#x4e2d;&#x6587;</a>&nbsp;[zh-tw]</li>
 -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>

Index: philosophy/po/using-gfdl.ca-en.html
===================================================================
RCS file: philosophy/po/using-gfdl.ca-en.html
diff -N philosophy/po/using-gfdl.ca-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/po/using-gfdl.ca-en.html 20 Dec 2011 17:27:41 -0000      1.1
@@ -0,0 +1,144 @@
+<!--#include virtual="/server/header.html" -->
+<title>Using GNU FDL - GNU Project - Free Software Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/po/using-gfdl.translist" -->
+<h2>Using GNU FDL</h2>
+
+<p>by <a href="http://www.stallman.org";>Richard Stallman</a></p>
+
+<p>If you know someone who is writing a manual about free software,
+and looking towards commercial publication, you have a chance to help
+the Free Software Movement a great deal with a small amount of work:
+by suggesting the idea of publishing the manual under
+the <a href="/copyleft/fdl.html">GNU Free Documentation
+License</a>.</p>
+
+<p>Until recently, commercial book publication almost always implied a
+non-free book.  But just as free commercial software has been
+increasing for a while, now free commercial documentation is starting
+to take off as well.  Some of the major commercial publishers of
+documentation about the <a href= "/gnu/linux-and-gnu.html">GNU/Linux
+system</a>, and about free software in general, are now willing to
+publish books under the GNU FDL, and pay the authors in the usual
+way&mdash;IF the authors are firm about this.</p>
+
+<p>But publishers are likely to first propose an ordinary proprietary
+book. And if the authors agree, that's what it will be.  So it is
+essential for authors to take the lead; to say, &ldquo;We want to use
+the GNU FDL for this book&rdquo;.  So when your friend mentions
+writing a manual, you can influence the course of events simply by
+pointing out this possibility.</p>
+
+<p>If a publisher rejects the request at first, the GNU Project may be
+able to help the authors prevail.  They can contact us
+at <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p>There
+are <a href="/licenses/license-list.html#DocumentationLicenses">
+other</a> legitimate free documentation licenses, but sometimes using
+them requires care. For example, one license is equipped with two
+optional clauses that can be enabled; the license is free if neither
+optional clause is used, but enabling either of them makes the book
+non-free.  (See <a href="/licenses/license-list.html">
+http://www.gnu.org/licenses/license-list.html.</a>) Authors that want
+to publish free documentation, but using a license other than the GNU
+FDL, can contact us so we can check that the license really qualifies
+for free documentation.</p>
+
+<p>When a commercial manual is free and relates to the GNU system, the
+GNU Project can recommend it to the public.  So if the authors or
+publisher set up a web page to describe it and/or sell copies, we can
+make a link to that page from <a
+href="/doc/other-free-books.html">www.gnu.org/doc/other-free-books.html</a>,
+provided the page meets our usual criteria (for instance, it should
+not link to other pages about non-free software or documentation, and
+should not be obnoxious about trying to persuade people to buy).
+Please inform <a href="mailto:address@hidden";>
+&lt;address@hidden&gt;</a> about such pages.</p>
+
+<p>See also <a href="/philosophy/free-doc.html">Free Software and Free
+Manuals</a>.</p>
+
+</div>
+<!--#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>.
+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>
+
+<p>
+Copyright &copy; 1999 Richard M. Stallman
+<br />
+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>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2011/12/20 17:27:41 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!--  -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!--  - /home/www/html/server/standards/README.translations.html -->
+<!--  - one of the lists under the section "Translations Underway" -->
+<!--  - if there is a translation team, you also have to add an alias -->
+<!--  to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!--  -->
+<!-- <ul class="translations-list"> -->
+<!-- Catalan -->
+<!-- <li><a 
href="/philosophy/using-gfdl.ca.html">Catal&agrave;</a>&nbsp;[ca]</li> -->
+<!-- English -->
+<!-- <li><a href="/philosophy/using-gfdl.html">English</a>&nbsp;[en]</li> -->
+<!-- Spanish -->
+<!-- <li><a 
href="/philosophy/using-gfdl.es.html">Espa&ntilde;ol</a>&nbsp;[es]</li> -->
+<!-- French -->
+<!-- <li><a 
href="/philosophy/using-gfdl.fr.html">Fran&ccedil;ais</a>&nbsp;[fr]</li> -->
+<!-- Indonesian -->
+<!-- <li><a 
href="/philosophy/using-gfdl.id.html">Bahasa&nbsp;Indonesia</a>&nbsp;[id]</li> 
-->
+<!-- Italian -->
+<!-- <li><a href="/philosophy/using-gfdl.it.html">Italiano</a>&nbsp;[it]</li> 
-->
+<!-- Korean -->
+<!-- <li><a 
href="/philosophy/using-gfdl.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
 -->
+<!-- Dutch -->
+<!-- <li><a 
href="/philosophy/using-gfdl.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
+<!-- Polish -->
+<!-- <li><a href="/philosophy/using-gfdl.pl.html">polski</a>&nbsp;[pl]</li> -->
+<!-- Chinese (Simplified) -->
+<!-- <li><a 
href="/philosophy/using-gfdl.zh-cn.html">&#31616;&#20307;&#20013;&#25991;</a>&nbsp;[zh-cn]</li>
 -->
+<!-- Chinese (Traditional) -->
+<!-- <li><a 
href="/philosophy/using-gfdl.zh-tw.html">&#32321;&#39636;&#20013;&#25991;</a>&nbsp;[zh-tw]</li>
 -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>



reply via email to

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