www-commits
[Top][All Lists]
Advanced

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

www education/education.it.html education/po/ed...


From: Yavor Doganov
Subject: www education/education.it.html education/po/ed...
Date: Thu, 05 Jan 2012 17:29:29 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   12/01/05 17:29:28

Modified files:
        education      : education.it.html 
        education/po   : education.it-en.html education.it.po 
        licenses/po    : gpl-faq.fr.po gpl-faq.pot gpl-faq.ru.po 
                         gpl-faq.ta.po license-list.de.po 
                         license-list.fr.po license-list.it.po 
                         license-list.pot license-recommendations.pot 
                         license-recommendations.ru.po 
        philosophy     : essays-and-articles.ca.html 
                         essays-and-articles.de.html 
                         essays-and-articles.es.html 
                         essays-and-articles.pl.html 
        philosophy/po  : can-you-trust.translist 
                         essays-and-articles.ar.po 
                         essays-and-articles.bg.po 
                         essays-and-articles.ca-en.html 
                         essays-and-articles.ca.po 
                         essays-and-articles.de-en.html 
                         essays-and-articles.de.po 
                         essays-and-articles.es-en.html 
                         essays-and-articles.es.po 
                         essays-and-articles.fr.po 
                         essays-and-articles.pl-en.html 
                         essays-and-articles.pl.po 
                         essays-and-articles.pot 
                         essays-and-articles.pt-br.po 
                         essays-and-articles.ro.po 
                         essays-and-articles.sr.po 
                         essays-and-articles.translist java-trap.bg.po 
                         java-trap.fr.po java-trap.it.po java-trap.pl.po 
                         java-trap.pot java-trap.sr.po 
        software       : devel.pl.html 
Added files:
        philosophy     : can-you-trust.ru.html 
        philosophy/po  : can-you-trust.ru-en.html 
        software/po    : devel.pl-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.it.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.it-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.it.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.fr.po?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.pot?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ta.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.100&r2=1.101
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pot?cvsroot=www&r1=1.63&r2=1.64
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.pot?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.ca.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.de.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.es.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.pl.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/can-you-trust.ru.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/can-you-trust.translist?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ar.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.bg.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ca-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ca.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.de-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.de.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.es-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.es.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.fr.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.pl-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.pl.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.pot?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.pt-br.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ro.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.sr.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.translist?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.bg.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.fr.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.it.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.pl.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.pot?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.sr.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/can-you-trust.ru-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/software/devel.pl.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/devel.pl-en.html?cvsroot=www&rev=1.1

Patches:
Index: education/education.it.html
===================================================================
RCS file: /web/www/www/education/education.it.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- education/education.it.html 5 Jan 2012 09:27:52 -0000       1.3
+++ education/education.it.html 5 Jan 2012 17:28:33 -0000       1.4
@@ -4,12 +4,13 @@
 <!-- Parent-Version: 1.57 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>Software libero e istruzione - Progetto GNU - Free Software Foundation 
(FSF)</title>
+<title>Software libero ed istruzione - Progetto GNU - Free Software Foundation
+(FSF)</title>
 
 <!--#include virtual="/server/banner.it.html" -->
 <!--#include virtual="/education/po/education.translist" -->
 <div id="education-content">           
-<h2>Software libero e istruzione</h2>
+<h2>Software libero ed istruzione</h2>
 
 <!-- begin edu navigation bar -->
 <ul id="edu-navigation">
@@ -26,36 +27,35 @@
                
 <!-- id="education-content" -->
 <div class="center">
-<h3>Cosa lega il software libero e l'istruzione?</h3>
+<h3>Qual è la relazione tra software libero e istruzione?</h3>
 </div>
 
 <p>La libertà del software ha un ruolo particolarmente importante in ambito
-educativo. Le istituzioni didattiche di tutti i livelli dovrebbero
-utilizzare ed insegnare il software libero, poiché è l'unico software che
-permette di perseguire i loro intenti essenziali: diffondere la conoscenza
-umana e preparare gli studenti ad essere buoni membri della loro
-comunità. Il codice sorgente e i metodi del software libero fanno parte
-della conoscenza umana. Al contrario, il software proprietario è conoscenza
-riservata, segreta, che è l'opposto della missione delle istituzioni
-educative. Il software libero promuove l'istruzione, il software
-proprietario la preclude.</p>
+educativo. Le istituzioni didattiche di tutti i livelli devono utilizzare ed
+insegnare il software libero, poiché è l'unico software che permette ad esse
+di conseguire i propri scopi primari: diffondere la conoscenza umana e
+preparare gli studenti ad essere buoni membri della loro comunità. Il codice
+sorgente e i metodi del software libero fanno parte della conoscenza
+umana. Al contrario, il software proprietario è conoscenza riservata,
+segreta, che è l'opposto della missione delle istituzioni educative. Il
+software libero promuove l'istruzione, il software proprietario la vieta.</p>
 
 <p>Il software libero non è solo una questione tecnica; è una questione 
etica,
 sociale, e politica. Si tratta dei diritti umani che gli utenti di software
 devono avere. La libertà e  la cooperazione sono valori essenziali del
-software libero. Il sistema GNU mette in pratica questi valori e il
-principio della condivisione, siccome la condivisione è buona e vantaggiosa
+software libero. Il Sistema GNU mette in pratica questi valori e il
+principio della condivisione, perché la condivisione è buona e vantaggiosa
 per il progresso umano.</p>
 
 <p>Per saperne di più, si veda la <a
 href="/philosophy/free-sw.html">definizione di software libero</a> e il
 nostro articolo sul <a href="/philosophy/shouldbefree.html">perché il
-software dovrebbe essere libero</a>.</p>
+software deve essere libero</a>.</p>
                
 <div class="yui-gc">
                   <div class="yui-u first">
                        
-<h2>I principi base</h2>
+<h2>Le basi</h2>
 
 <p>In questo video di sei minuti <a
 href="http://www.fsf.org/about/leadership/#rms";>Richard Stallman</a> spiega
@@ -99,12 +99,11 @@
 <h2 id="indepth">Approfondimenti</h2>
 
 <p>Ecco le <a href="/education/edu-why.html">ragioni</a> per cui le istituzioni
-didattiche dovrebbero utilizzare ed insegnare esclusivamente il software
-libero.</p>
+didattiche devono utilizzare ed insegnare esclusivamente il software 
libero.</p>
 
 <p>Un articolo di Richard Stallman: <a
-href="/education/edu-schools.html">perché le scuole dovrebbero utilizzare
-esclusivamente il software libero</a>.</p>
+href="/education/edu-schools.html">perché le scuole devono utilizzare
+esclusivamente software libero</a>.</p>
 
 <p>Un articolo del Dr. V. Sasi Kumar sul <a
 href="/education/edu-system-india.html">sistema didattico in India</a>.</p>
@@ -155,13 +154,13 @@
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 Tradotto da Dario Fariello. Modifiche successive di Luca Padrin, Francesco
-Potortì, Andrea Pescetti.</div>
+Potortì, Andrea Pescetti, Dora Scilipoti.</div>
 
 
  <p><!-- timestamp start -->
 Ultimo aggiornamento:
 
-$Date: 2012/01/05 09:27:52 $
+$Date: 2012/01/05 17:28:33 $
 
 <!-- timestamp end -->
 </p>

Index: education/po/education.it-en.html
===================================================================
RCS file: /web/www/www/education/po/education.it-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- education/po/education.it-en.html   5 Jan 2012 09:27:58 -0000       1.1
+++ education/po/education.it-en.html   5 Jan 2012 17:28:39 -0000       1.2
@@ -143,7 +143,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/01/05 09:27:58 $
+$Date: 2012/01/05 17:28:39 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education/po/education.it.po
===================================================================
RCS file: /web/www/www/education/po/education.it.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: licenses/po/gpl-faq.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.fr.po,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- licenses/po/gpl-faq.fr.po   13 Dec 2011 01:26:27 -0000      1.44
+++ licenses/po/gpl-faq.fr.po   5 Jan 2012 17:28:46 -0000       1.45
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-faq.html\n"
-"POT-Creation-Date: 2011-12-12 20:25-0500\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2011-07-01 01:12+0200\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -281,9 +281,13 @@
 "copie de la GPL avec chaque copie du programme&nbsp;?</a>"
 
 #. type: Content of: <ul><li>
-msgid ""
-"<a href=\"#WhatIfWorkIsShort\">What if the work is not much longer than the "
-"license itself?</a>"
+# | <a href=\"#WhatIfWorkIsShort\">What if the work is not [-much longer than
+# | the license itself?</a>-] {+very long?</a>+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#WhatIfWorkIsShort\">What if the work is not much longer than "
+#| "the license itself?</a>"
+msgid "<a href=\"#WhatIfWorkIsShort\">What if the work is not very long?</a>"
 msgstr ""
 "<a href=\"#WhatIfWorkIsShort\">Et si le programme n'est guère plus long que "
 "la licence elle-même&nbsp;?</a>"
@@ -1067,6 +1071,9 @@
 "différentes licences GNU entre elles&nbsp;?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#IfLibraryIsGPL\">If a library is released under the GPL (not
+# | the LGPL), does that mean that any [-program-] {+software+} which uses it
+# | has to be under the GPL or a GPL-compatible license?</a>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#IfLibraryIsGPL\">If a library is released under the GPL (not "
@@ -1197,6 +1204,10 @@
 "GPL&nbsp;?</a>"
 
 #. type: Content of: <ul><li>
+# | <a href=\"#WindowsRuntimeAndGPL\">I'm writing a Windows application with
+# | Microsoft Visual C++ and I will be releasing it under the GPL.  Is
+# | dynamically linking my program with the Visual C++ run[---]time library
+# | permitted under the GPL?</a>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#WindowsRuntimeAndGPL\">I'm writing a Windows application with "
@@ -1410,6 +1421,10 @@
 "html\">certaines libertés spécifiques</a> est une licence de logiciel 
libre."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#WhyUseGPL\">Why-]{+Why+} should I use the GNU GPL rather than
+# | other free software [-licenses?</a>-] {+licenses? <span
+# | class=\"anchor-reference-id\">(<a href=\"#WhyUseGPL\"
+# | >#WhyUseGPL</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#WhyUseGPL\">Why should I use the GNU GPL rather than other "
@@ -1437,6 +1452,11 @@
 "<a href=\"/licenses/why-not-lgpl.fr.html\">licence plus permissive</a>."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does-]{+Does+}
+# | all GNU software use the GNU GPL as its [-license?</a>-] {+license? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\"
+# | >#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#DoesAllGNUSoftwareUseTheGNUGPLAsItsLicense\">Does all GNU "
@@ -1470,6 +1490,8 @@
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
+# | Anyone can release a program under the GNU GPL{+,+} but that does not make
+# | it a GNU package.
 #, fuzzy
 #| msgid ""
 #| "Anyone can release a program under the GNU GPL but that does not make it "
@@ -1522,6 +1544,12 @@
 "donc signalez- le au mainteneur."
 
 #. type: Content of: <dl><dt>
+# | [-<a
+# | 
href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why-]{+Why+}
+# | does the GPL permit users to publish their modified [-versions?</a>-]
+# | {+versions? <span class=\"anchor-reference-id\">(<a
+# | href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\"
+# | >#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#WhyDoesTheGPLPermitUsersToPublishTheirModifiedVersions\">Why "
@@ -1624,6 +1652,11 @@
 "regarde."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLAndNonfreeOnSameMachine\">Can-]{+Can+} I have a
+# | GPL-covered program and an unrelated non-free program on the same
+# | [-computer?</a>-] {+computer? <span class=\"anchor-reference-id\">(<a
+# | href=\"#GPLAndNonfreeOnSameMachine\"
+# | >#GPLAndNonfreeOnSameMachine</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLAndNonfreeOnSameMachine\">Can I have a GPL-covered program "
@@ -1642,6 +1675,10 @@
 msgstr "Oui."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#CanIDemandACopy\">If-]{+If+} I know someone has a copy of a
+# | GPL-covered program, can I demand he give me a [-copy?</a>-] {+copy? <span
+# | class=\"anchor-reference-id\">(<a href=\"#CanIDemandACopy\"
+# | >#CanIDemandACopy</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#CanIDemandACopy\">If I know someone has a copy of a GPL-"
@@ -1666,6 +1703,12 @@
 "pas redistribuer le programme, si c'est son choix."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#WhatDoesWrittenOfferValid\">What-]{+What+} does
+# | &ldquo;written offer valid for any third party&rdquo; mean in GPLv2? Does
+# | that mean everyone in the world can get the source to any GPL'ed program
+# | no matter [-what?</a>-] {+what? <span class=\"anchor-reference-id\">(<a
+# | href=\"#WhatDoesWrittenOfferValid\"
+# | >#WhatDoesWrittenOfferValid</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#WhatDoesWrittenOfferValid\">What does &ldquo;written offer "
@@ -1720,6 +1763,12 @@
 "de vous."
 
 #. type: Content of: <dl><dt>
+# | [-<b><a name=\"TheGPLSaysModifiedVersions\">GPLv2-]{+GPLv2+} says that
+# | modified versions, if released, must be &ldquo;licensed &hellip; to all
+# | third parties.&rdquo; Who are these third [-parties?</a></b>-] {+parties?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#TheGPLSaysModifiedVersions\"
+# | >#TheGPLSaysModifiedVersions</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<b><a name=\"TheGPLSaysModifiedVersions\">GPLv2 says that modified "
@@ -1771,6 +1820,10 @@
 "domaine public si vous ne voulez pas qu'elles soient sous copyright."
 
 #. type: Content of: <dl><dd><p>
+# | Whether you claim a copyright on your changes or not, either way you must
+# | release the modified version, as a whole, under the GPL[-.-] (<a
+# | href=\"#GPLRequireSourcePostedPublic\">if you release your modified
+# | version at all</a>){+.+}
 #, fuzzy
 #| msgid ""
 #| "Whether you claim a copyright on your changes or not, either way you must "
@@ -1788,6 +1841,11 @@
 "\"#GPLRequireSourcePostedPublic\">si vous la publiez</a>)."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#CombinePublicDomainWithGPL\">If-]{+If+} a program combines
+# | public-domain code with GPL-covered code, can I take the public-domain
+# | part and use it as public domain [-code?</a>-] {+code? <span
+# | class=\"anchor-reference-id\">(<a href=\"#CombinePublicDomainWithGPL\"
+# | >#CombinePublicDomainWithGPL</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#CombinePublicDomainWithGPL\">If a program combines public-"
@@ -1834,6 +1892,8 @@
 "définition du logiciel libre."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#DoesTheGPLAllowDownloadFee\">Does-]{+Does+} the GPL allow me
+# | to charge a fee for downloading the program from my [-site?</a>-] {+site?+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#DoesTheGPLAllowDownloadFee\">Does the GPL allow me to charge a "
@@ -1859,6 +1919,11 @@
 "doit pas être plus important que celui du téléchargement des exécutables."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#DoesTheGPLAllowRequireFee\">Does-]{+Does+} the GPL allow me
+# | to require that anyone who receives the software must pay me a fee and/or
+# | notify [-me?</a>-] {+me? <span class=\"anchor-reference-id\">(<a
+# | href=\"#DoesTheGPLAllowRequireFee\"
+# | >#DoesTheGPLAllowRequireFee</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#DoesTheGPLAllowRequireFee\">Does the GPL allow me to require "
@@ -1897,6 +1962,12 @@
 "payer de droit à quiconque pour cela."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#DoesTheGPLRequireAvailabilityToPublic\">If-]{+If+} I
+# | distribute GPL'd software for a fee, am I required to also make it
+# | available to the public without a [-charge?</a>-] {+charge? <span
+# | class=\"anchor-reference-id\"> (<a
+# | href=\"#DoesTheGPLRequireAvailabilityToPublic\"
+# | >#DoesTheGPLRequireAvailabilityToPublic</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#DoesTheGPLRequireAvailabilityToPublic\">If I distribute GPL'd "
@@ -1925,6 +1996,10 @@
 "site Web à disposition du public."
 
 #. type: Content of: <dl><dt>
+# | [-<b><a name=\"DoesTheGPLAllowNDA\">-]Does the GPL allow me to distribute
+# | copies under a nondisclosure [-agreement?</a></b>-] {+agreement? <span
+# | class=\"anchor-reference-id\">(<a href=\"#DoesTheGPLAllowNDA\"
+# | >#DoesTheGPLAllowNDA</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<b><a name=\"DoesTheGPLAllowNDA\"> Does the GPL allow me to distribute "
@@ -1970,6 +2045,10 @@
 "pour toute autre violation de la GPL."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#DoesTheGPLAllowModNDA\">Does-]{+Does+} the GPL allow me to
+# | distribute a modified or beta version under a nondisclosure
+# | [-agreement?</a>-] {+agreement? <span class=\"anchor-reference-id\">(<a
+# | href=\"#DoesTheGPLAllowModNDA\" >#DoesTheGPLAllowModNDA</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#DoesTheGPLAllowModNDA\">Does the GPL allow me to distribute a "
@@ -1996,6 +2075,10 @@
 "version de l'œuvre sur une base plus restrictive."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#DevelopChangesUnderNDA\">Does-]{+Does+} the GPL allow me to
+# | develop a modified version under a nondisclosure [-agreement?</a>-]
+# | {+agreement? <span class=\"anchor-reference-id\">(<a
+# | href=\"#DevelopChangesUnderNDA\" >#DevelopChangesUnderNDA</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#DevelopChangesUnderNDA\">Does the GPL allow me to develop a "
@@ -2044,6 +2127,10 @@
 "il <em>a</em> le droit de le faire"
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#IWantCredit\">I-]{+I+} want to get credit for my work.  I
+# | want people to know what I wrote.  Can I still get credit if I use the
+# | [-GPL?</a>-] {+GPL? <span class=\"anchor-reference-id\">(<a
+# | href=\"#IWantCredit\" >#IWantCredit</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#IWantCredit\">I want to get credit for my work. I want people "
@@ -2070,6 +2157,10 @@
 "requiert que chaque copie porte une mention de copyright appropriée."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#WhyMustIInclude\">Why-]{+Why+} does the GPL require including
+# | a copy of the GPL with every copy of the [-program?</a>-] {+program? <span
+# | class=\"anchor-reference-id\">(<a href=\"#WhyMustIInclude\"
+# | >#WhyMustIInclude</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#WhyMustIInclude\">Why does the GPL require including a copy of "
@@ -2114,21 +2205,35 @@
 "programme."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#WhatIfSchool\">What-]{+What+} if [-my school might want to
+# | make my program into its own proprietary software product?</a>-] {+the
+# | work is not very long? <span class=\"anchor-reference-id\">(<a
+# | href=\"#WhatIfWorkIsShort\" >#WhatIfWorkIsShort</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#WhatIfSchool\">What if my school might want to make my program "
+#| "into its own proprietary software product?</a>"
 msgid ""
-"What if the work is not much longer than the license itself? <span class="
-"\"anchor-reference-id\">(<a href=\"#WhatIfWorkIsShort\" >#WhatIfWorkIsShort</"
-"a>)</span>"
+"What if the work is not very long? <span class=\"anchor-reference-id\">(<a "
+"href=\"#WhatIfWorkIsShort\" >#WhatIfWorkIsShort</a>)</span>"
 msgstr ""
+"<a href=\"#WhatIfSchool\">Et si mon école décidait de mettre mon programme "
+"dans son propre logiciel propriétaire&nbsp;?</a>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If a single program is that short, you may as well use a simple all-"
-"permissive license for it, rather than the GNU GPL."
+"If a whole software package contains very little code&mdash;less than 300 "
+"lines is the benchmark we use&mdash;you may as well use a simple lax license "
+"for it, rather than a copyleft license like the GNU GPL.  We <a href=\"/"
+"licenses/license-recommendations.html#software\">recommend the Apache "
+"License 2.0</a> for such cases."
 msgstr ""
-"Si un programme est aussi court, vous pouvez aussi bien utiliser une licence "
-"sans restriction, plutôt que la GNU GPL."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLOmitPreamble\">Can-]{+Can+} I omit the preamble of the
+# | GPL, or the instructions for how to use it on your own programs, to save
+# | [-space?</a>-] {+space? <span class=\"anchor-reference-id\">(<a
+# | href=\"#GPLOmitPreamble\" >#GPLOmitPreamble</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLOmitPreamble\">Can I omit the preamble of the GPL, or the "
@@ -2169,6 +2274,10 @@
 "bien utiliser une licence totalement permissive au lieu de la GNU GPL."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#WhatIsCompatible\">What-]{+What+} does it mean to say that
+# | two licenses are [-&ldquo;compatible&rdquo;?</a>-]
+# | {+&ldquo;compatible&rdquo;? <span class=\"anchor-reference-id\">(<a
+# | href=\"#WhatIsCompatible\" >#WhatIsCompatible</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#WhatIsCompatible\">What does it mean to say that two licenses "
@@ -2216,6 +2325,10 @@
 "cela ne les combine pas dans une œuvre plus grande."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#WhatDoesCompatMean\">What-]{+What+} does it mean to say a
+# | license is &ldquo;compatible with the [-GPL&rdquo;?</a>-] {+GPL?&rdquo;
+# | <span class=\"anchor-reference-id\">(<a href=\"#WhatDoesCompatMean\"
+# | >#WhatDoesCompatMean</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#WhatDoesCompatMean\">What does it mean to say a license is "
@@ -2315,6 +2428,10 @@
 "programme, le libère d'abord de sa dépendance à la bibliothèque 
non-libre."
 
 #. type: Content of: <dl><dd><p>
+# | Note that there may also be legal issues with combining certain non-free
+# | libraries with GPL-covered [-Free Software.-] {+free software.+}  Please
+# | see <a href=\"#GPLIncompatibleLibs\">the question on GPL software with
+# | GPL-incompatible libraries</a> for more information.
 #, fuzzy
 #| msgid ""
 #| "Note that there may also be legal issues with combining certain non-free "
@@ -2334,6 +2451,10 @@
 "plus de renseignements."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLIncompatibleLibs\">What-]{+What+} legal issues come up if
+# | I use GPL-incompatible libraries with GPL [-software?</a>-] {+software?
+# | <span class=\"anchor-reference-id\">(<a href=\"#GPLIncompatibleLibs\"
+# | >#GPLIncompatibleLibs</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLIncompatibleLibs\">What legal issues come up if I use GPL-"
@@ -2655,6 +2776,10 @@
 "quiperpétue cette exception."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#HowIGetCopyright\">How-]{+How+} do I get a copyright on my
+# | program in order to release it under the [-GPL?</a>-] {+GPL? <span
+# | class=\"anchor-reference-id\">(<a href=\"#HowIGetCopyright\"
+# | >#HowIGetCopyright</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#HowIGetCopyright\">How do I get a copyright on my program in "
@@ -2719,6 +2844,10 @@
 "généralement PAS autorisés à signer de telles renonciations)."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#WhatIfSchool\">What-]{+What+} if my school might want to make
+# | my program into its own proprietary software [-product?</a>-] {+product?
+# | <span class=\"anchor-reference-id\">(<a href=\"#WhatIfSchool\"
+# | >#WhatIfSchool</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#WhatIfSchool\">What if my school might want to make my program "
@@ -2775,6 +2904,10 @@
 "«&nbsp;Mon programme sera libre, ou ne sera pas&nbsp;»."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#CouldYouHelpApplyGPL\">Could-]{+Could+} you give me step by
+# | step instructions on how to apply the GPL to my [-program?</a>-]
+# | {+program? <span class=\"anchor-reference-id\">(<a
+# | href=\"#CouldYouHelpApplyGPL\" >#CouldYouHelpApplyGPL</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#CouldYouHelpApplyGPL\">Could you give me step by step "
@@ -2795,6 +2928,10 @@
 "la GPL</a>."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#HeardOtherLicense\">I-]{+I+} heard that someone got a copy of
+# | a GPL'ed program under another license.  Is this [-possible?</a>-]
+# | {+possible? <span class=\"anchor-reference-id\">(<a
+# | href=\"#HeardOtherLicense\" >#HeardOtherLicense</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#HeardOtherLicense\">I heard that someone got a copy of a "
@@ -2830,6 +2967,11 @@
 "façon légitime, est la licence qui s'applique à votre copie."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#ReleaseUnderGPLAndNF\">I-]{+I+} would like to release a
+# | program I wrote under the GNU GPL, but I would like to use the same code
+# | in non-free [-programs.</a>-] {+programs.  <span
+# | class=\"anchor-reference-id\">(<a href=\"#ReleaseUnderGPLAndNF\"
+# | >#ReleaseUnderGPLAndNF</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#ReleaseUnderGPLAndNF\">I would like to release a program I "
@@ -2858,6 +3000,11 @@
 "différentes licences non-exclusives à différents moments."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#DeveloperViolate\">Is-]{+Is+} the developer of a GPL-covered
+# | program bound by the GPL? Could the developer's actions ever be a
+# | violation of the [-GPL?</a>-] {+GPL? <span
+# | class=\"anchor-reference-id\">(<a href=\"#DeveloperViolate\"
+# | >#DeveloperViolate</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#DeveloperViolate\">Is the developer of a GPL-covered program "
@@ -2896,6 +3043,10 @@
 "de son autorité morale dans la communauté."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#CanDeveloperThirdParty\">Can-]{+Can+} the developer of a
+# | program who distributed it under the GPL later license it to another party
+# | for exclusive [-use?</a>-] {+use? <span class=\"anchor-reference-id\">(<a
+# | href=\"#CanDeveloperThirdParty\" >#CanDeveloperThirdParty</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#CanDeveloperThirdParty\">Can the developer of a program who "
@@ -2920,6 +3071,11 @@
 "la GPL, et ce droit ne peut être retiré."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#CanIUseGPLToolsForNF\">Can-]{+Can+} I use GPL-covered editors
+# | such as GNU Emacs to develop non-free programs? Can I use GPL-covered
+# | tools such as GCC to compile [-them?</a>-] {+them? <span
+# | class=\"anchor-reference-id\">(<a href=\"#CanIUseGPLToolsForNF\"
+# | >#CanIUseGPLToolsForNF</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#CanIUseGPLToolsForNF\">Can I use GPL-covered editors such as "
@@ -2976,6 +3132,10 @@
 "autorisaient déjà une utilisation pour des programmes non-libres."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLFairUse\">Do-]{+Do+} I have &ldquo;fair use&rdquo; rights
+# | in using the source code of a GPL-covered [-program?</a>-] {+program?
+# | <span class=\"anchor-reference-id\">(<a href=\"#GPLFairUse\"
+# | >#GPLFairUse</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLFairUse\">Do I have &ldquo;fair use&rdquo; rights in using "
@@ -3054,6 +3214,10 @@
 "la GPL GNU."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLUSGovAdd\">Can-]{+Can+} the US Government release
+# | improvements to a GPL-covered [-program?</a>-] {+program? <span
+# | class=\"anchor-reference-id\">(<a href=\"#GPLUSGovAdd\"
+# | >#GPLUSGovAdd</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLUSGovAdd\">Can the US Government release improvements to a "
@@ -3087,6 +3251,12 @@
 "les améliorations elles-mêmes peuvent être couvertes par la GPL."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLOutput\">Is-]{+Is+} there some way that I can GPL the
+# | output people get from use of my program? For example, if my program is
+# | used to develop hardware designs, can I require [-these-] {+that+} these
+# | designs must be [-free?</a>-] {+free? <span
+# | class=\"anchor-reference-id\">(<a href=\"#GPLOutput\"
+# | >#GPLOutput</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLOutput\">Is there some way that I can GPL the output people "
@@ -3162,6 +3332,10 @@
 "Seulement quand le programme copie des portions de lui-même dans le 
résultat."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLModuleLicense\">If-]{+If+} I add a module to a GPL-covered
+# | program, do I have to use the GPL as the license for my [-module?</a>-]
+# | {+module? <span class=\"anchor-reference-id\">(<a
+# | href=\"#GPLModuleLicense\" >#GPLModuleLicense</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLModuleLicense\">If I add a module to a GPL-covered program, "
@@ -3196,6 +3370,11 @@
 "a> donne une liste partielle des licencescompatibles avec la GPL."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#IfLibraryIsGPL\">If-]{+If+} a library is released under the
+# | GPL (not the LGPL), does that mean that any [-program-] {+software+} which
+# | uses it has to be under the GPL or a GPL-compatible [-license?</a>-]
+# | {+license? <span class=\"anchor-reference-id\">(<a
+# | href=\"#IfLibraryIsGPL\" >#IfLibraryIsGPL</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#IfLibraryIsGPL\">If a library is released under the GPL (not "
@@ -3213,6 +3392,8 @@
 "GPL&nbsp;?</a>"
 
 #. type: Content of: <dl><dd><p>
+# | Yes, because the [-program-] {+software+} as it is actually run includes
+# | the library.
 #, fuzzy
 #| msgid "Yes, because the program as it is actually run includes the library."
 msgid "Yes, because the software as it is actually run includes the library."
@@ -3221,6 +3402,11 @@
 "bibliothèque."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#IfInterpreterIsGPL\">If-]{+If+} a programming language
+# | interpreter is released under the GPL, does that mean programs written to
+# | be interpreted by it must be under GPL-compatible [-licenses?</a>-]
+# | {+licenses? <span class=\"anchor-reference-id\">(<a
+# | href=\"#IfInterpreterIsGPL\" >#IfInterpreterIsGPL</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#IfInterpreterIsGPL\">If a programming language interpreter is "
@@ -3310,6 +3496,12 @@
 "programme combiné Perl ou Java."
 
 #. type: Content of: <dl><dt>
+# | [-<b><a name=\"WindowsRuntimeAndGPL\">I'm-]{+I'm+} writing a Windows
+# | application with Microsoft Visual C++ (or Visual Basic) and I will be
+# | releasing it under the GPL. Is dynamically linking my program with the
+# | Visual C++ (or Visual Basic) run[---]time library permitted under the
+# | [-GPL?</a></b>-] {+GPL? <span class=\"anchor-reference-id\">(<a
+# | href=\"#WindowsRuntimeAndGPL\" >#WindowsRuntimeAndGPL</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<b><a name=\"WindowsRuntimeAndGPL\">I'm writing a Windows application "
@@ -3329,6 +3521,15 @@
 "time de Visual C++&nbsp;?</a></b>"
 
 #. type: Content of: <dl><dd><p>
+# | [-The GPL permits this because that run-time library normally
+# | accompanies-]{+You may link your program to these libraries, and
+# | distribute+} the [-compiler or interpreter-] {+compiled program to others.
+# | When+} you [-are using.  The run-time-] {+do this, the runtime+} libraries
+# | [-here-] are &ldquo;System Libraries&rdquo; as GPLv3 defines [-them, and
+# | as such they are not considered part of-] {+them.  That means that you
+# | don't need to worry about including their source code with+} the
+# | {+program's+} Corresponding Source. GPLv2 [-has-] {+provides+} a similar
+# | exception in section 3.
 #, fuzzy
 #| msgid ""
 #| "The GPL permits this because that run-time library normally accompanies "
@@ -3362,6 +3563,12 @@
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
+# | [-That doesn't mean it-]{+It+} is [-a good idea-] {+possible+} to [-write
+# | the program so-] {+run free programs+} that [-it-] only run[-s-] on
+# | [-Windows.  Doing so results in a program that is free software-]
+# | {+Windows,+} but {+it is not a good idea.  These programs would be+}
+# | &ldquo;<a href=\"/philosophy/java-trap.html\">trapped</a>&rdquo; by
+# | [-Windows.-] {+Windows, and therefore contribute zero to the Free World.+}
 #, fuzzy
 #| msgid ""
 #| "That doesn't mean it is a good idea to write the program so that it only "
@@ -3380,6 +3587,9 @@
 "a> par Windows."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#OrigBSD\">Why-]{+Why+} is the original BSD license
+# | incompatible with the [-GPL?</a>-] {+GPL? <span
+# | class=\"anchor-reference-id\">(<a href=\"#OrigBSD\" >#OrigBSD</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#OrigBSD\">Why is the original BSD license incompatible with "
@@ -3428,6 +3638,10 @@
 "qui élimine le problème."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLAndPlugins\">If-]{+If+} a program released under the GPL
+# | uses plug-ins, what are the requirements for the licenses of a
+# | [-plug-in?</a>-] {+plug-in? <span class=\"anchor-reference-id\">(<a
+# | href=\"#GPLAndPlugins\" >#GPLAndPlugins</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLAndPlugins\">If a program released under the GPL uses plug-"
@@ -3526,6 +3740,10 @@
 "logiciel libre qui utilise des bibliothèques non-libres&nbsp;?&nbsp;»</a>"
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#NFUseGPLPlugins\">Can-]{+Can+} I release a non-free program
+# | that's designed to load a GPL-covered [-plug-in?</a>-] {+plug-in? <span
+# | class=\"anchor-reference-id\">(<a href=\"#NFUseGPLPlugins\"
+# | >#NFUseGPLPlugins</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#NFUseGPLPlugins\">Can I release a non-free program that's "
@@ -3578,6 +3796,11 @@
 "données complexes est pratiquement équivalent à une liaison dynamique."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#LinkingWithGPL\">You-]{+You+} have a GPL'ed program that I'd
+# | like to link with my code to build a proprietary program.  Does the fact
+# | that I link with your program mean I have to GPL my [-program?</a>-]
+# | {+program? <span class=\"anchor-reference-id\">(<a
+# | href=\"#LinkingWithGPL\" >#LinkingWithGPL</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#LinkingWithGPL\">You have a GPL'ed program that I'd like to "
@@ -3608,6 +3831,10 @@
 "sous ces versions de la GPL."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#SwitchToLGPL\">If-]{+If+} so, is there any chance I could get
+# | a license of your program under the Lesser [-GPL?</a>-] {+GPL? <span
+# | class=\"anchor-reference-id\">(<a href=\"#SwitchToLGPL\"
+# | >#SwitchToLGPL</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#SwitchToLGPL\">If so, is there any chance I could get a "
@@ -3639,6 +3866,11 @@
 "Vous disposez toujours de l'alternative légale de ne pas utiliser notre 
code."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#LinkingOverControlledInterface\">How-]{+How+} can I allow
+# | linking of proprietary modules with my GPL-covered library under a
+# | controlled interface [-only?</a>-] {+only? <span
+# | class=\"anchor-reference-id\">(<a href=\"#LinkingOverControlledInterface\"
+# | >#LinkingOverControlledInterface</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#LinkingOverControlledInterface\">How can I allow linking of "
@@ -3747,6 +3979,12 @@
 "l'autorisation des détenteurs de droit d'auteur pour ces programmes."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#ManyDifferentLicenses\">I-]{+I+} have written an application
+# | that links with many different components, that have different licenses. 
+# | I am very confused as to what licensing requirements are placed on my
+# | program.  Can you please tell me what licenses I may [-use?</a>-] {+use?
+# | <span class=\"anchor-reference-id\">(<a href=\"#ManyDifferentLicenses\"
+# | >#ManyDifferentLicenses</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#ManyDifferentLicenses\">I have written an application that "
@@ -3798,6 +4036,11 @@
 "exception spéciale autorisant une édition de liens avec QUUX&nbsp;»."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#MereAggregation\">What-]{+What+} is the difference between an
+# | &ldquo;aggregate&rdquo; and other kinds of &ldquo;modified
+# | [-versions&rdquo;?</a>-] {+versions&rdquo;? <span
+# | class=\"anchor-reference-id\">(<a href=\"#MereAggregation\"
+# | >#MereAggregation</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#MereAggregation\">What is the difference between an &ldquo;"
@@ -3874,6 +4117,11 @@
 "considérer les deux éléments combinés comme un seul et même programme."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#AssignCopyright\">Why-]{+Why+} does the FSF require that
+# | contributors to FSF-copyrighted programs assign copyright to the FSF? If I
+# | hold copyright on a GPL'ed program, should I do this, too? If so,
+# | [-how?</a>-] {+how? <span class=\"anchor-reference-id\">(<a
+# | href=\"#AssignCopyright\" >#AssignCopyright</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#AssignCopyright\">Why does the FSF require that contributors "
@@ -3992,6 +4240,12 @@
 "de différentes licences de logiciels libres est un fardeau en soi."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLCommercially\">If-]{+If+} I use a piece of software that
+# | has been obtained under the GNU GPL, am I allowed to modify the original
+# | code into a new program, then distribute and sell that new program
+# | [-commercially?</a>-] {+commercially? <span
+# | class=\"anchor-reference-id\">(<a href=\"#GPLCommercially\"
+# | >#GPLCommercially</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLCommercially\">If I use a piece of software that has been "
@@ -4071,6 +4325,13 @@
 "a>. Cela fonctionne comme c'est conçu, voulu et attendu."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#Consider\">Consider-]{+Consider+} this situation: 1) X
+# | releases V1 of a project under the GPL.  2) Y contributes to the
+# | development of V2 with changes and new code based [-on V1.-]
+# | {+on&nbsp;V1.+}  3) X wants to convert V2 to a non-GPL license.  Does X
+# | need Y's [-permission?</a>-] {+permission? <span
+# | class=\"anchor-reference-id\">(<a href=\"#Consider\"
+# | >#Consider</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#Consider\">Consider this situation: 1) X releases V1 of a "
@@ -4103,6 +4364,10 @@
 "permission de Y avant de distribuer ce code sous une autre licence."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLInProprietarySystem\">I'd-]{+I'd+} like to incorporate
+# | GPL-covered software in my proprietary system.  Can I do [-this?</a>-]
+# | {+this? <span class=\"anchor-reference-id\">(<a
+# | href=\"#GPLInProprietarySystem\" >#GPLInProprietarySystem</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLInProprietarySystem\">I'd like to incorporate GPL-covered "
@@ -4189,6 +4454,12 @@
 "comprenne bien le statut libre du logiciel de cet ensemble qui est sous GPL."
 
 #. type: Content of: <dl><dd><p>
+# | If people were to distribute GPL-covered software calling it [-&ldquo;part
+# | of&rdquo;-] {+&ldquo;part&nbsp;of&rdquo;+} a system that users know is
+# | partly proprietary, users might be uncertain of their rights regarding the
+# | GPL-covered software.  But if they know that what they have received is a
+# | free program plus another program, side by side, their rights will be
+# | clear.
 #, fuzzy
 #| msgid ""
 #| "If people were to distribute GPL-covered software calling it &ldquo;part "
@@ -4211,6 +4482,12 @@
 "côte à côte, leurs droits sont clairs."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLWrapper\">I'd-]{+I'd+} like to incorporate GPL-covered
+# | software in my proprietary system.  Can I do this by putting a
+# | &ldquo;wrapper&rdquo; module, under a GPL-compatible lax permissive
+# | license (such as the X11 license) in between the GPL-covered part and the
+# | proprietary [-part?</a>-] {+part? <span class=\"anchor-reference-id\">(<a
+# | href=\"#GPLWrapper\" >#GPLWrapper</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLWrapper\">I'd like to incorporate GPL-covered software in "
@@ -4274,6 +4551,13 @@
 msgstr ""
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#MoneyGuzzlerInc\">I'd-]{+I'd+} like to modify GPL-covered
+# | programs and link them with the portability libraries from Money Guzzler
+# | Inc.  I cannot distribute the source code for these libraries, so any user
+# | who wanted to change these versions would have to obtain those libraries
+# | separately.  Why doesn't the GPL permit [-this?</a>-] {+this? <span
+# | class=\"anchor-reference-id\">(<a href=\"#MoneyGuzzlerInc\"
+# | >#MoneyGuzzlerInc</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#MoneyGuzzlerInc\">I'd like to modify GPL-covered programs and "
@@ -4296,6 +4580,12 @@
 "Pourquoi la GPL ne le permet-elle pas&nbsp;?</a>"
 
 #. type: Content of: <dl><dd><p>
+# | {+There are two reasons for this.+}  First, a general one.  If we
+# | permitted company A to make a proprietary file, and company B to
+# | distribute GPL-covered software linked with that file, the effect would be
+# | to make a hole in the GPL big enough to drive a truck through.  This would
+# | be carte blanche for withholding the source code for all sorts of
+# | modifications and extensions to GPL-covered software.
 #, fuzzy
 #| msgid ""
 #| "First, a general one.  If we permitted company A to make a proprietary "
@@ -4341,6 +4631,13 @@
 "source qui permet aux utilisateurs de modifier et de recompiler le programme."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLIncompatibleAlone\">If-]{+If the+} license for a module Q
+# | has a requirement that's incompatible with the GPL, but the requirement
+# | applies only when Q is distributed by itself, not when Q is included in a
+# | larger program, does that make the license GPL-compatible? Can I combine
+# | or link Q with a GPL-covered [-program?</a>-] {+program? <span
+# | class=\"anchor-reference-id\">(<a href=\"#GPLIncompatibleAlone\"
+# | >#GPLIncompatibleAlone</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLIncompatibleAlone\">If license for a module Q has a "
@@ -4405,6 +4702,10 @@
 "pas lier ou combiner P avec Q."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#ModifiedJustBinary\">Can-]{+Can+} I release a modified
+# | version of a GPL-covered program in binary form [-only?</a>-] {+only?
+# | <span class=\"anchor-reference-id\">(<a href=\"#ModifiedJustBinary\"
+# | >#ModifiedJustBinary</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#ModifiedJustBinary\">Can I release a modified version of a GPL-"
@@ -4418,6 +4719,10 @@
 "programme sous GPL sous forme binaire uniquement&nbsp;?</a>"
 
 #. type: Content of: <dl><dd><p>
+# | No.  The whole point of the GPL is that all modified versions must be <a
+# | href=\"/philosophy/free-sw.html\">[- -]free software</a>&mdash;which
+# | means, in particular, that the source code of the modified version is
+# | available to the users.
 #, fuzzy
 #| msgid ""
 #| "No.  The whole point of the GPL is that all modified versions must be <a "
@@ -4436,6 +4741,11 @@
 "modifiée est disponible pour les utilisateurs."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#UnchangedJustBinary\">I-]{+I+} downloaded just the binary
+# | from the net.  If I distribute copies, do I have to get the source and
+# | distribute that [-too?</a>-] {+too? <span
+# | class=\"anchor-reference-id\">(<a href=\"#UnchangedJustBinary\"
+# | >#UnchangedJustBinary</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#UnchangedJustBinary\">I downloaded just the binary from the "
@@ -4463,6 +4773,11 @@
 "limitée."
 
 #. type: Content of: <dl><dt>
+# | [-<b><a name=\"DistributeWithSourceOnInternet\">I-]{+I+} want to
+# | distribute binaries via physical media without accompanying sources.  Can
+# | I provide source code by [-FTP?</a></b>-] {+FTP? <span
+# | class=\"anchor-reference-id\">(<a href=\"#DistributeWithSourceOnInternet\"
+# | >#DistributeWithSourceOnInternet</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<b><a name=\"DistributeWithSourceOnInternet\">I want to distribute "
@@ -4502,6 +4817,12 @@
 "\">vous devriez distribuer le source par FTP.</a>"
 
 #. type: Content of: <dl><dt>
+# | [-<b><a name=\"RedistributedBinariesGetSource\">My-]{+My+} friend got a
+# | GPL-covered binary with an offer to supply source, and made a copy for me.
+# |  Can I use the offer myself to obtain the [-source?</a></b>-] {+source?
+# | <span class=\"anchor-reference-id\">(<a
+# | href=\"#RedistributedBinariesGetSource\"
+# | >#RedistributedBinariesGetSource</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<b><a name=\"RedistributedBinariesGetSource\">My friend got a GPL-covered "
@@ -4531,6 +4852,11 @@
 "que vous puissiez en bénéficier."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#SourceAndBinaryOnDifferentSites\">Can-]{+Can+} I put the
+# | binaries on my Internet server and put the source on a different Internet
+# | [-site?</a>-] {+site? <span class=\"anchor-reference-id\">(<a
+# | href=\"#SourceAndBinaryOnDifferentSites\"
+# | >#SourceAndBinaryOnDifferentSites</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#SourceAndBinaryOnDifferentSites\">Can I put the binaries on my "
@@ -4558,6 +4884,11 @@
 "disponible tant que vous distribuez le code objet."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#DistributeExtendedBinary\">I-]{+I+} want to distribute an
+# | extended version of a GPL-covered program in binary form.  Is it enough to
+# | distribute the source for the original [-version?</a>-] {+version? <span
+# | class=\"anchor-reference-id\">(<a href=\"#DistributeExtendedBinary\"
+# | >#DistributeExtendedBinary</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#DistributeExtendedBinary\">I want to distribute an extended "
@@ -4584,6 +4915,10 @@
 "recompiler le même fichier binaire."
 
 #. type: Content of: <dl><dd><p>
+# | Part of the idea of free software is that users should have access to the
+# | source code for [-*the-] {+<em>the+} programs they [-use*.-] {+use</em>.+}
+# |  Those using your version should have access to the source code for your
+# | version.
 #, fuzzy
 #| msgid ""
 #| "Part of the idea of free software is that users should have access to the "
@@ -4611,6 +4946,13 @@
 "GPL, vous devez distribuer le code source amélioré sous GPL."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#DistributingSourceIsInconvenient\">I-]{+I+} want to
+# | distribute binaries, but distributing complete source is inconvenient.  Is
+# | it ok if I give users the diffs from the &ldquo;standard&rdquo; version
+# | along with the [-binaries?</a>-] {+binaries? <span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#DistributingSourceIsInconvenient\"
+# | >#DistributingSourceIsInconvenient</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#DistributingSourceIsInconvenient\">I want to distribute "
@@ -4658,6 +5000,10 @@
 "différences, avec les fichiers binaires."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#AnonFTPAndSendSources\">Can-]{+Can+} I make binaries
+# | available on a network server, but send sources only to people who order
+# | [-them?</a>-] {+them? <span class=\"anchor-reference-id\">(<a
+# | href=\"#AnonFTPAndSendSources\" >#AnonFTPAndSendSources</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#AnonFTPAndSendSources\">Can I make binaries available on a "
@@ -4733,6 +5079,11 @@
 "utilisateurs à le télécharger même s'ils ne le désirent pas."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#UnreleasedMods\">A-]{+A+} company is running a modified
+# | version of a GPL'ed program on a web site.  Does the GPL say they must
+# | release their modified [-sources?</a>-] {+sources? <span
+# | class=\"anchor-reference-id\">(<a href=\"#UnreleasedMods\"
+# | >#UnreleasedMods</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#UnreleasedMods\">A company is running a modified version of a "
@@ -4760,6 +5111,15 @@
 "sources modifiées."
 
 #. type: Content of: <dl><dd><p>
+# | It is essential for people to have the freedom to make modifications and
+# | use them privately, without ever publishing those modifications.  However,
+# | putting the program on a server machine for the public to talk to is
+# | hardly &ldquo;private&rdquo; use, so it would be legitimate to require
+# | release of the source code in that special case.  Developers who wish to
+# | address this might want to use the <a [-href=\"/licenses/agpl.html\">GNU
+# | Affero GPL</a>-]
+# | {+href=\"/licenses/agpl.html\">GNU&nbsp;Affero&nbsp;GPL</a>+} for programs
+# | designed for network server use.
 #, fuzzy
 #| msgid ""
 #| "It is essential for people to have the freedom to make modifications and "
@@ -4788,6 +5148,11 @@
 "des programmes conçus pour une utilisation sur des serveurs en réseau."
 
 #. type: Content of: <dl><dt>
+# | [-<b><a name=\"InternalDistribution\">Is-]{+Is+} making and using multiple
+# | copies within one organization or company
+# | [-&ldquo;distribution&rdquo;?</a></b>-] {+&ldquo;distribution&rdquo;?
+# | <span class=\"anchor-reference-id\">(<a href=\"#InternalDistribution\"
+# | >#InternalDistribution</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<b><a name=\"InternalDistribution\">Is making and using multiple copies "
@@ -4825,6 +5190,11 @@
 "une distribution."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#StolenCopy\">If-]{+If+} someone steals a CD containing a
+# | version of a GPL-covered program, does the GPL give him the right to
+# | redistribute that [-version?</a>-] {+version? <span
+# | class=\"anchor-reference-id\">(<a href=\"#StolenCopy\"
+# | >#StolenCopy</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#StolenCopy\">If someone steals a CD containing a version of a "
@@ -4889,6 +5259,10 @@
 "la société n'a pas violé la GPL."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#WhySomeGPLAndNotLGPL\">Why-]{+Why+} are some GNU libraries
+# | released under the ordinary GPL rather than the Lesser [-GPL?</a>-] {+GPL?
+# | <span class=\"anchor-reference-id\">(<a href=\"#WhySomeGPLAndNotLGPL\"
+# | >#WhySomeGPLAndNotLGPL</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#WhySomeGPLAndNotLGPL\">Why are some GNU libraries released "
@@ -4955,6 +5329,11 @@
 "explication</a> sur la façon dont nous procédons pour nous décider."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#WillYouMakeAnException\">Using-]{+Using+} a certain GNU
+# | program under the GPL does not fit our project to make proprietary
+# | software.  Will you make an exception for us? It would mean more users of
+# | that [-program.</a>-] {+program.  <span class=\"anchor-reference-id\">(<a
+# | href=\"#WillYouMakeAnException\" >#WillYouMakeAnException</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#WillYouMakeAnException\">Using a certain GNU program under the "
@@ -5048,6 +5427,17 @@
 "GNU serait nulle."
 
 #. type: Content of: <dl><dd><p>
+# | Suppose a program says &ldquo;Version 3 of the GPL or any later
+# | version&rdquo; and a new version of the GPL is released.  If the new GPL
+# | version gives additional permission, that permission will be available
+# | immediately to all the users of the program.  But if the new GPL version
+# | has a tighter requirement, it will not restrict use of the current version
+# | of the program, because it can still be used under GPL [-version 3.-]
+# | {+version&nbsp;3.+}  When a program says &ldquo;Version 3 of the GPL or
+# | any later version&rdquo;, users will always be permitted to use it, and
+# | even change it, according to the terms of GPL [-version 3&mdash;even-]
+# | {+version&nbsp;3&mdash;even+} after later versions of the GPL are
+# | available.
 #, fuzzy
 #| msgid ""
 #| "Suppose a program says &ldquo;Version 3 of the GPL or any later "
@@ -5085,6 +5475,14 @@
 "que d'autres versions de la GPL auront été rendues disponibles."
 
 #. type: Content of: <dl><dd><p>
+# | If a tighter requirement in a new version of the GPL need not be obeyed
+# | for existing software, how is it useful? Once GPL [-version 4-]
+# | {+version&nbsp;4+} is available, the developers of most GPL-covered
+# | programs will release subsequent versions of their programs specifying
+# | [-&ldquo;Version 4-] {+&ldquo;Version&nbsp;4+} of the GPL or any later
+# | version&rdquo;.  Then users will have to follow the tighter requirements
+# | in GPL [-version 4,-] {+version&nbsp;4,+} for subsequent versions of the
+# | program.
 #, fuzzy
 #| msgid ""
 #| "If a tighter requirement in a new version of the GPL need not be obeyed "
@@ -5119,6 +5517,11 @@
 "la GPL, si c'est leur souhait."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#OnlyLatestVersion\">Is-]{+Is+} it a good idea to use a
+# | license saying that a certain program can be used only under the latest
+# | version of the GNU [-GPL?</a>-] {+GPL? <span
+# | class=\"anchor-reference-id\">(<a href=\"#OnlyLatestVersion\"
+# | >#OnlyLatestVersion</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#OnlyLatestVersion\">Is it a good idea to use a license saying "
@@ -5296,6 +5699,13 @@
 "clause de votre version."
 
 #. type: Content of: <dl><dt>
+# | [-<b><a name=\"WMS\">I-]{+I+} am writing a website maintenance
+# | [-system</a>-] {+system+} (called a &ldquo;<a
+# | href=\"/philosophy/words-to-avoid.html\">content management
+# | system</a>&rdquo; by some), or some other application which generates web
+# | pages from templates.  What license should I use for those
+# | [-templates?</b>-] {+templates? <span class=\"anchor-reference-id\">(<a
+# | href=\"#WMS\" >#WMS</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<b><a name=\"WMS\">I am writing a website maintenance system</a> (called "
@@ -5332,6 +5742,12 @@
 "modèles."
 
 #. type: Content of: <dl><dd><p>
+# | Some templates make calls into Java[-s-]{+S+}cript functions.  Since
+# | Javascript is often non-trivial, it is worth copylefting.  Because the
+# | templates will be combined with user data, it's possible that
+# | template+user data+Java[-s-]{+S+}cript would be considered one work under
+# | copyright law.  A line needs to be drawn between the Java[-s-]{+S+}cript
+# | (copylefted), and the user code (usually under incompatible terms).
 #, fuzzy
 #| msgid ""
 #| "Some templates make calls into Javascript functions.  Since Javascript is "
@@ -5358,6 +5774,8 @@
 "termes incompatibles)."
 
 #. type: Content of: <dl><dd><p><a>
+# | <a [-href=\"template-diagram.png\">-]
+# | {+href=\"/licenses/template-diagram.png\">+}
 #, fuzzy
 #| msgid "<a href=\"template-diagram.png\">"
 msgid "<a href=\"/licenses/template-diagram.png\">"
@@ -5372,6 +5790,7 @@
 msgstr "</a>"
 
 #. type: Content of: <dl><dd><p>
+# | Here's an exception for Java[-s-]{+S+}cript code that does this:
 #, fuzzy
 #| msgid "Here's an exception for Javascript code that does this:"
 msgid "Here's an exception for JavaScript code that does this:"
@@ -5413,6 +5832,10 @@
 "déclaration d'exception de votre version."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#NonFreeTools\">Can-]{+Can+} I release a program under the GPL
+# | which I developed using non-free [-tools?</a>-] {+tools? <span
+# | class=\"anchor-reference-id\">(<a href=\"#NonFreeTools\"
+# | >#NonFreeTools</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#NonFreeTools\">Can I release a program under the GPL which I "
@@ -5436,6 +5859,15 @@
 "problèmes relatifs à la licence de ce code source."
 
 #. type: Content of: <dl><dd><p>
+# | However, if you link non-free libraries with the source code, that would
+# | be an issue you need to deal with.  It does not preclude releasing the
+# | source code under the GPL, but if the libraries don't fit under the
+# | &ldquo;system library&rdquo; exception, you should affix an explicit
+# | notice giving permission to link your program with them.  <a
+# | [-href=\"#GPLIncompatibleLibs\">Our-]
+# | {+href=\"#GPLIncompatibleLibs\">The+} FAQ {+entry+} about using
+# | GPL-incompatible libraries</a> provides more information about how to do
+# | that.
 #, fuzzy
 #| msgid ""
 #| "However, if you link non-free libraries with the source code, that would "
@@ -5623,6 +6055,11 @@
 "futur proche."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#InterpreterIncompat\">If-]{+If+} a programming language
+# | interpreter has a license that is incompatible with the GPL, can I run
+# | GPL-covered programs on [-it?</a>-] {+it? <span
+# | class=\"anchor-reference-id\">(<a href=\"#InterpreterIncompat\"
+# | >#InterpreterIncompat</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#InterpreterIncompat\">If a programming language interpreter "
@@ -5734,6 +6171,11 @@
 "violations de la GPL.</a>"
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#OOPLang\">In-]{+In+} an object-oriented language such as
+# | Java, if I use a class that is GPL'ed without modifying, and subclass it,
+# | in what way does the GPL affect the larger [-program?</a>-] {+program?
+# | <span class=\"anchor-reference-id\">(<a href=\"#OOPLang\"
+# | >#OOPLang</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#OOPLang\">In an object-oriented language such as Java, if I "
@@ -5759,6 +6201,11 @@
 "sous-classe d'une classe sous GPL."
 
 #. type: Content of: <dl><dt>
+# | [-<b><a name=\"PortProgramToGL\">If-]{+If+} I port my program to
+# | GNU/Linux, does that mean I have to release it as [-Free Software-] {+free
+# | software+} under the GPL or some other Free Software [-license?</a></b>-]
+# | {+license? <span class=\"anchor-reference-id\">(<a
+# | href=\"#PortProgramToGL\" >#PortProgramToGL</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<b><a name=\"PortProgramToGL\">If I port my program to GNU/Linux, does "
@@ -5834,6 +6281,11 @@
 "devrait vous inciter à rendre votre programme libre."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#CompanyGPLCostsMoney\">I-]{+I+} just found out that a company
+# | has a copy of a GPL'ed program, and it costs money to get it.  Aren't they
+# | violating the GPL by not making it available on the [-Internet?</a>-]
+# | {+Internet? <span class=\"anchor-reference-id\">(<a
+# | href=\"#CompanyGPLCostsMoney\" >#CompanyGPLCostsMoney</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#CompanyGPLCostsMoney\">I just found out that a company has a "
@@ -5878,6 +6330,11 @@
 "redistribuer le programme, ou à n'importe qui d'autre, comme ça lui 
convient."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#ReleaseNotOriginal\">Can-]{+Can+} I release a program with a
+# | license which says that you can distribute modified versions of it under
+# | the GPL but you can't distribute the original itself under the
+# | [-GPL?</a>-] {+GPL? <span class=\"anchor-reference-id\">(<a
+# | href=\"#ReleaseNotOriginal\" >#ReleaseNotOriginal</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#ReleaseNotOriginal\">Can I release a program with a license "
@@ -5935,6 +6392,11 @@
 "la GPL."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#DistributeSubsidiary\">Does-]{+Does+} moving a copy to a
+# | majority-owned, and controlled, subsidiary constitute
+# | [-distribution?</a>-] {+distribution? <span
+# | class=\"anchor-reference-id\">(<a href=\"#DistributeSubsidiary\"
+# | >#DistributeSubsidiary</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#DistributeSubsidiary\">Does moving a copy to a majority-owned, "
@@ -5977,6 +6439,11 @@
 "société mère ne le décide."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#ClickThrough\">Can-]{+Can+} software installers ask people to
+# | click to agree to the GPL? If I get some software under the GPL, do I have
+# | to agree to [-anything?</a>-] {+anything? <span
+# | class=\"anchor-reference-id\">(<a href=\"#ClickThrough\"
+# | >#ClickThrough</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#ClickThrough\">Can software installers ask people to click to "
@@ -6018,6 +6485,11 @@
 "logiciel pour passer outre."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GPLCompatInstaller\">I-]{+I+} would like to bundle GPLed
+# | software with some sort of installation software.  Does that installer
+# | need to have a GPL-compatible [-license?</a>-] {+license? <span
+# | class=\"anchor-reference-id\">(<a href=\"#GPLCompatInstaller\"
+# | >#GPLCompatInstaller</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GPLCompatInstaller\">I would like to bundle GPLed software "
@@ -6091,6 +6563,10 @@
 msgstr ""
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#SubscriptionFee\">Can-]{+Can+} I use GPLed software on a
+# | device that will stop operating if customers do not continue paying a
+# | subscription [-fee?</a>-] {+fee? <span class=\"anchor-reference-id\">(<a
+# | href=\"#SubscriptionFee\" >#SubscriptionFee</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#SubscriptionFee\">Can I use GPLed software on a device that "
@@ -6308,6 +6784,11 @@
 "de la portée du copyright at par conséquent, de la GPL elle-même."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#GiveUpKeys\">I-]{+I+} use public key cryptography to sign my
+# | code to assure its authenticity. Is it true that GPLv3 forces me to
+# | release my private signing [-keys?</a>-] {+keys? <span
+# | class=\"anchor-reference-id\">(<a href=\"#GiveUpKeys\"
+# | >#GiveUpKeys</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#GiveUpKeys\">I use public key cryptography to sign my code to "
@@ -6343,6 +6824,10 @@
 "acheteur la clé pour son appareil."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#v3VotingMachine\">Does-]{+Does+} GPLv3 require that voters be
+# | able to modify the software running in a voting [-machine?</a>-]
+# | {+machine? <span class=\"anchor-reference-id\">(<a
+# | href=\"#v3VotingMachine\" >#v3VotingMachine</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#v3VotingMachine\">Does GPLv3 require that voters be able to "
@@ -6403,6 +6888,11 @@
 "toutes autres licences de brevets l'accompagnant."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#SourceCodeInDocumentation\">Can-]{+Can+} I use snippets of
+# | GPL-covered source code within documentation that is licensed under some
+# | license that is incompatible with the [-GPL?</a>-] {+GPL? <span
+# | class=\"anchor-reference-id\">(<a href=\"#SourceCodeInDocumentation\"
+# | >#SourceCodeInDocumentation</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#SourceCodeInDocumentation\">Can I use snippets of GPL-covered "
@@ -6428,6 +6918,12 @@
 "similaires, alors oui. Autrement, non."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#v3Under4and5\">The-]{+The+} beginning of GPLv3 section 6 says
+# | that I can convey a covered work in object code form &ldquo;under the
+# | terms of sections 4 and 5&rdquo; provided I also meet the conditions of
+# | section 6.  What does that [-mean?</a>-] {+mean? <span
+# | class=\"anchor-reference-id\">(<a href=\"#v3Under4and5\"
+# | >#v3Under4and5</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#v3Under4and5\">The beginning of GPLv3 section 6 says that I "
@@ -6457,6 +6953,15 @@
 "copyright intactes, etc."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#v2OrLaterPatentLicense\">My-]{+My+} company owns a lot of
+# | patents.  Over the years we've contributed code to projects under
+# | &ldquo;GPL [-version 2-] {+version&nbsp;2+} or any later version&rdquo;,
+# | and the project itself has been distributed under the same terms. If a
+# | user decides to take the project's code (incorporating my contributions)
+# | under GPLv3, does that mean I've automatically granted GPLv3's explicit
+# | patent license to that [-user?</a>-] {+user? <span
+# | class=\"anchor-reference-id\">(<a href=\"#v2OrLaterPatentLicense\"
+# | >#v2OrLaterPatentLicense</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#v2OrLaterPatentLicense\">My company owns a lot of patents. "
@@ -6483,6 +6988,7 @@
 "utilisateur&nbsp;?</a>"
 
 #. type: Content of: <dl><dd><p>
+# || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
 #| msgid ""
 #| "No.  When you convey GPLed software, you must follow the terms and "
@@ -6523,6 +7029,14 @@
 "nous défendrons nous-mêmes contre une telle attaque."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#LGPLv3ContributorVersion\">If-]{+If+} I distribute a
+# | proprietary program that links against an LGPLv3-covered library that I've
+# | modified, what is the &ldquo;contributor version&rdquo; for purposes of
+# | determining the scope of the explicit patent license grant I'm
+# | making&mdash;is it just the library, or is it the whole
+# | [-combination?</a>-] {+combination? <span
+# | class=\"anchor-reference-id\">(<a href=\"#LGPLv3ContributorVersion\"
+# | >#LGPLv3ContributorVersion</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#LGPLv3ContributorVersion\">If I distribute a proprietary "
@@ -6580,6 +7094,9 @@
 "GPLv3 est une des options qu'elle permet."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#Cure\">What-]{+What+} does it mean to &ldquo;cure&rdquo; a
+# | violation of [-GPLv3?</a>-] {+GPLv3? <span
+# | class=\"anchor-reference-id\">(<a href=\"#Cure\" >#Cure</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#Cure\">What does it mean to &ldquo;cure&rdquo; a violation of "
@@ -6600,6 +7117,11 @@
 "conditions de la licence."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#v3InternationalDisclaimers\">The-]{+The+} warranty and
+# | liability disclaimers in GPLv3 seem specific to U.S. law. Can I add my own
+# | disclaimers to my own [-code?</a>-] {+code? <span
+# | class=\"anchor-reference-id\">(<a href=\"#v3InternationalDisclaimers\"
+# | >#v3InternationalDisclaimers</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#v3InternationalDisclaimers\">The warranty and liability "
@@ -6624,6 +7146,11 @@
 "spécifiquement 7(a)."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#NonvisualLegalNotices\">My-]{+My+} program has interactive
+# | user interfaces that are non-visual in nature. How can I comply with the
+# | Appropriate Legal Notices requirement in [-GPLv3?</a>-] {+GPLv3? <span
+# | class=\"anchor-reference-id\">(<a href=\"#NonvisualLegalNotices\"
+# | >#NonvisualLegalNotices</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#NonvisualLegalNotices\">My program has interactive user "
@@ -6651,6 +7178,11 @@
 "pourriez inclure une commande qui lisent les notices pour l'utilisateur."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#v3CoworkerConveying\">If-]{+If+} I give a copy of a
+# | GPLv3-covered program to a coworker at my company, have I
+# | &ldquo;conveyed&rdquo; the copy to [-him?</a>-] {+him? <span
+# | class=\"anchor-reference-id\">(<a href=\"#v3CoworkerConveying\"
+# | >#v3CoworkerConveying</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#v3CoworkerConveying\">If I give a copy of a GPLv3-covered "
@@ -6680,6 +7212,11 @@
 "les autres."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#v3ConditionalWarranty\">If-]{+If+} I distribute a
+# | GPLv3-covered program, can I provide a warranty that is voided if the user
+# | modifies the [-program?</a>-] {+program? <span
+# | class=\"anchor-reference-id\">(<a href=\"#v3ConditionalWarranty\"
+# | >#v3ConditionalWarranty</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#v3ConditionalWarranty\">If I distribute a GPLv3-covered "
@@ -6706,6 +7243,10 @@
 "quelqu'un pourrait faire avec un logiciel couvert par la GPLv3."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#SeparateAffero\">Why-]{+Why+} did you decide to write the GNU
+# | Affero GPLv3 as a separate [-license?</a>-] {+license? <span
+# | class=\"anchor-reference-id\">(<a href=\"#SeparateAffero\"
+# | >#SeparateAffero</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#SeparateAffero\">Why did you decide to write the GNU Affero "
@@ -6743,6 +7284,10 @@
 "obligation de publication des sources."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#WhyPropagateAndConvey\">Why-]{+Why+} did you invent the new
+# | terms &ldquo;propagate&rdquo; and &ldquo;convey&rdquo; in [-GPLv3?</a>-]
+# | {+GPLv3? <span class=\"anchor-reference-id\">(<a
+# | href=\"#WhyPropagateAndConvey\" >#WhyPropagateAndConvey</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#WhyPropagateAndConvey\">Why did you invent the new terms "
@@ -6776,6 +7321,11 @@
 "et nous avons fourni leurs définitions directement dans la licence."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#NoMilitary\">I'd-]{+I'd+} like to license my code under the
+# | GPL, but I'd also like to make it clear that it can't be used for military
+# | and/or commercial uses. Can I do [-this?</a>-] {+this? <span
+# | class=\"anchor-reference-id\">(<a href=\"#NoMilitary\"
+# | >#NoMilitary</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#NoMilitary\">I'd like to license my code under the GPL, but "
@@ -6804,6 +7354,10 @@
 "toute autre restriction ajoutée peut-être retirée par l'utilisateur."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#ConveyVsDistribute\">Is-]{+Is+} &ldquo;convey&rdquo; in GPLv3
+# | the same thing as what GPLv2 means by [-&ldquo;distribute&rdquo;?</a>-]
+# | {+&ldquo;distribute&rdquo;? <span class=\"anchor-reference-id\">(<a
+# | href=\"#ConveyVsDistribute\" >#ConveyVsDistribute</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#ConveyVsDistribute\">Is &ldquo;convey&rdquo; in GPLv3 the same "
@@ -6832,6 +7386,11 @@
 "claires et éviter tout problème pouvant être causé par ces différences."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#v3MakingAvailable\">GPLv3-]{+GPLv3+} gives &ldquo;making
+# | available to the public&rdquo; as an example of propagation.  What does
+# | this mean? Is making available a form of [-conveying?</a>-] {+conveying?
+# | <span class=\"anchor-reference-id\">(<a href=\"#v3MakingAvailable\"
+# | >#v3MakingAvailable</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#v3MakingAvailable\">GPLv3 gives &ldquo;making available to the "
@@ -6863,6 +7422,12 @@
 "pour y inclure cette activité."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#PropagationNotConveying\">Since-]{+Since+} distribution and
+# | making available to the public are forms of propagation that are also
+# | conveying in GPLv3, what are some examples of propagation that do not
+# | constitute [-conveying?</a>-] {+conveying? <span
+# | class=\"anchor-reference-id\">(<a href=\"#PropagationNotConveying\"
+# | >#PropagationNotConveying</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#PropagationNotConveying\">Since distribution and making "
@@ -6893,6 +7458,11 @@
 "sauvegardes."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#Prelinking\">Does-]{+Does+} prelinking a GPLed binary to
+# | various libraries on the system, to optimize its performance, count as
+# | [-modification?</a>-] {+modification? <span
+# | class=\"anchor-reference-id\">(<a href=\"#Prelinking\"
+# | >#Prelinking</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#Prelinking\">Does prelinking a GPLed binary to various "
@@ -6908,6 +7478,12 @@
 "comme une modification&nbsp;?</a>"
 
 #. type: Content of: <dl><dd><p>
+# | No.  Prelinking is part of a compilation process; it doesn't introduce any
+# | license requirements above and beyond what other aspects of compilation
+# | would.  If you're allowed to link the program to the libraries at all,
+# | then it's fine to prelink with them as well.  If you distribute prelinked
+# | object code, you need to follow the terms of [-section 6.-]
+# | {+section&nbsp;6.+}
 #, fuzzy
 #| msgid ""
 #| "No.  Prelinking is part of a compilation process; it doesn't introduce "
@@ -6930,6 +7506,11 @@
 "objet pré-lié, vous devez suivre les termes de la section 6."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#LaptopLoan\">If-]{+If+} someone installs GPLed software on a
+# | laptop, and then lends that laptop to a friend without providing source
+# | code for the software, have they violated the [-GPL?</a>-] {+GPL? <span
+# | class=\"anchor-reference-id\">(<a href=\"#LaptopLoan\"
+# | >#LaptopLoan</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#LaptopLoan\">If someone installs GPLed software on a laptop, "
@@ -6956,6 +7537,13 @@
 "portable n'aurait aucune obligation sous la GPL."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#TwoPartyTivoization\" >Suppose-]{+Suppose+} that two
+# | companies try to circumvent the requirement to provide Installation
+# | Information by having one company release signed software, and the other
+# | release a User Product that only runs signed software from the first
+# | company. Is this a violation of [-GPLv3?</a>-] {+GPLv3? <span
+# | class=\"anchor-reference-id\">(<a href=\"#TwoPartyTivoization\"
+# | >#TwoPartyTivoization</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#TwoPartyTivoization\" >Suppose that two companies try to "
@@ -6990,6 +7578,11 @@
 "rendraient quelqu'un responsable en second lieud'infraction."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#SourceInCVS\">Am-]{+Am+} I complying with GPLv3 if I offer
+# | binaries on an FTP server and sources by way of a link to a source code
+# | repository in a version control system, like CVS or [-Subversion?</a>-]
+# | {+Subversion? <span class=\"anchor-reference-id\">(<a
+# | href=\"#SourceInCVS\" >#SourceInCVS</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#SourceInCVS\">Am I complying with GPLv3 if I offer binaries on "
@@ -7026,6 +7619,11 @@
 "derniers développement du code après tout."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#RemoteAttestation\">Can-]{+Can+} someone who conveys
+# | GPLv3-covered software in a User Product use remote attestation to prevent
+# | a user from modifying that [-software?</a>-] {+software? <span
+# | class=\"anchor-reference-id\">(<a href=\"#RemoteAttestation\"
+# | >#RemoteAttestation</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#RemoteAttestation\">Can someone who conveys GPLv3-covered "
@@ -7061,6 +7659,10 @@
 "logiciel modifié soit authentifié comme légitime."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#RulesProtocols\">What-]{+What+} does &ldquo;rules and
+# | protocols for communication across the network&rdquo; mean in
+# | [-GPLv3?</a>-] {+GPLv3? <span class=\"anchor-reference-id\">(<a
+# | href=\"#RulesProtocols\" >#RulesProtocols</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#RulesProtocols\">What does &ldquo;rules and protocols for "
@@ -7102,6 +7704,12 @@
 "modifié le logiciel pour qu'il n'affiche pas les messages."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#SupportService\">Distributors-]{+Distributors+} that provide
+# | Installation Information under GPLv3 are not required to provide
+# | &ldquo;support service&rdquo; for the product. What kind of &ldquo;support
+# | service&rdquo;[- -]do you [-mean?</a>-] {+mean? <span
+# | class=\"anchor-reference-id\">(<a href=\"#SupportService\"
+# | >#SupportService</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#SupportService\">Distributors that provide Installation "
@@ -7135,6 +7743,11 @@
 "l'accès à un réseau."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#v3Notwithstanding\">In-]{+In+} GPLv3 and AGPLv3, what does it
+# | mean when it says &ldquo;notwithstanding any other provision of this
+# | [-License&rdquo;?</a>-] {+License&rdquo;? <span
+# | class=\"anchor-reference-id\">(<a href=\"#v3Notwithstanding\"
+# | >#v3Notwithstanding</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#v3Notwithstanding\">In GPLv3 and AGPLv3, what does it mean "
@@ -7182,6 +7795,11 @@
 "très limitées)."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#AGPLv3CorrespondingSource\">Under-]{+Under+} AGPLv3, when I
+# | modify the Program under section 13, what Corresponding Source does it
+# | have to [-offer?</a>-] {+offer? <span class=\"anchor-reference-id\">(<a
+# | href=\"#AGPLv3CorrespondingSource\"
+# | >#AGPLv3CorrespondingSource</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#AGPLv3CorrespondingSource\">Under AGPLv3, when I modify the "
@@ -7233,6 +7851,11 @@
 "exclus de la définition de la Source correspondante."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#AGPLv3InteractingRemotely\">In-]{+In+} AGPLv3, what counts as
+# | &ldquo;[- -]interacting with [the software] remotely through a computer
+# | [-network?&rdquo;</a>-] {+network?&rdquo; <span
+# | class=\"anchor-reference-id\">(<a href=\"#AGPLv3InteractingRemotely\"
+# | >#AGPLv3InteractingRemotely</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#AGPLv3InteractingRemotely\">In AGPLv3, what counts as &ldquo; "
@@ -7277,6 +7900,11 @@
 "l'utilisateur l'exécute via SSH ou une session X distante."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#ApacheLegalEntity\">How-]{+How+} does GPLv3's concept of
+# | &ldquo;you&rdquo; compare to the definition of &ldquo;Legal Entity&rdquo;
+# | in the Apache License [-2.0?</a>-] {+2.0? <span
+# | class=\"anchor-reference-id\">(<a href=\"#ApacheLegalEntity\"
+# | >#ApacheLegalEntity</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#ApacheLegalEntity\">How does GPLv3's concept of &ldquo;"
@@ -7309,6 +7937,10 @@
 "quand ils regardent la GPLv3 et considèrent qui est qualifié de licencié."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#v3TheProgram\">In-]{+In+} GPLv3, what does &ldquo;the
+# | Program&rdquo; refer to? Is it every program ever released under
+# | [-GPLv3?</a>-] {+GPLv3? <span class=\"anchor-reference-id\">(<a
+# | href=\"#v3TheProgram\" >#v3TheProgram</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#v3TheProgram\">In GPLv3, what does &ldquo;the Program&rdquo; "
@@ -7350,6 +7982,11 @@
 "Programme&nbsp;»</a> pour ceux qui voudraient en apprendre plus sur ce 
sujet."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#NoDistributionRequirements\">If-]{+If+} I only make copies of
+# | a GPL-covered program and run them, without distributing or conveying them
+# | to others, what does the license require of [-me?</a>-] {+me? <span
+# | class=\"anchor-reference-id\">(<a href=\"#NoDistributionRequirements\"
+# | >#NoDistributionRequirements</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#NoDistributionRequirements\">If I only make copies of a GPL-"
@@ -7370,6 +8007,11 @@
 msgstr "Rien. La GPL n'a pas de conditions pour cette activité."
 
 #. type: Content of: <dl><dt>
+# | [-<a href=\"#AGPLv3ServerAsUser\">If-]{+If+} some network client software
+# | is released under AGPLv3, does it have to be able to provide source to the
+# | servers it interacts [-with?</a>-] {+with? <span
+# | class=\"anchor-reference-id\">(<a href=\"#AGPLv3ServerAsUser\"
+# | >#AGPLv3ServerAsUser</a>)</span>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"#AGPLv3ServerAsUser\">If some network client software is "
@@ -7445,6 +8087,15 @@
 "récente."
 
 #. type: Content of: <dl><dd><p>
+# | Below is a detailed compatibility matrix for various combinations of the
+# | GNU licenses, to provide an easy-to-use reference for specific cases.  It
+# | assumes that someone else has written some software under one of these
+# | licenses, and you want to somehow incorporate code from that into a
+# | project that you're releasing (either your own original work, or a
+# | modified version of someone else's [-GPLed-] software). Find the license
+# | for your [-own work-] {+project+} in a column at the top of the table, and
+# | the license for the other code in a row on the left. The cell where they
+# | meet will tell you whether or not this combination is permitted.
 #, fuzzy
 #| msgid ""
 #| "Below is a detailed compatibility matrix for various combinations of the "
@@ -7545,6 +8196,8 @@
 msgstr "NON"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to GPLv2&nbsp;<a-]{+OK: Convey project under GPLv2
+# | only&nbsp;<a+} href=\"#compat-matrix-footnote-7\">[7]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv2&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
@@ -7557,6 +8210,9 @@
 "7\">[7]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to GPLv2&nbsp;<a-]{+OK: Convey project under GPLv2
+# | only&nbsp;<a+} href=\"#compat-matrix-footnote-7\">[7]</a><a
+# | href=\"#compat-matrix-footnote-2\">[2]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv2&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
@@ -7573,6 +8229,8 @@
 msgstr "OK&nbsp;<a href=\"#compat-matrix-footnote-1\">[1]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to GPLv2&nbsp;<a-]{+OK: Convey project under GPLv2 or
+# | later&nbsp;<a+} href=\"#compat-matrix-footnote-7\">[7]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv2&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
@@ -7585,6 +8243,8 @@
 "7\">[7]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to-]{+OK: Convey project under+} GPLv3&nbsp;<a
+# | href=\"#compat-matrix-footnote-8\">[8]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv3&nbsp;<a href=\"#compat-matrix-footnote-8\">[8]"
@@ -7601,6 +8261,8 @@
 msgstr "GPLv3"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you upgrade to-]{+OK: Convey project under+} GPLv3&nbsp;<a
+# | href=\"#compat-matrix-footnote-3\">[3]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you upgrade to GPLv3&nbsp;<a href=\"#compat-matrix-footnote-3\">[3]"
@@ -7613,6 +8275,8 @@
 "footnote-3\">[3]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to-]{+OK: Convey project under+} GPLv3&nbsp;<a
+# | href=\"#compat-matrix-footnote-7\">[7]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv3&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
@@ -7625,6 +8289,8 @@
 "7\">[7]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to-]{+OK: Convey code under+} GPLv2&nbsp;<a
+# | href=\"#compat-matrix-footnote-7\">[7]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv2&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
@@ -7637,6 +8303,8 @@
 "7\">[7]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to GPLv2&nbsp;<a-]{+OK: Convey code under GPLv2 or
+# | later&nbsp;<a+} href=\"#compat-matrix-footnote-7\">[7]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv2&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
@@ -7649,6 +8317,8 @@
 "7\">[7]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to-]{+OK: Convey code under+} GPLv3&nbsp;<a
+# | href=\"#compat-matrix-footnote-7\">[7]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv3&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
@@ -7661,12 +8331,16 @@
 "7\">[7]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | OK&nbsp;<a href=\"#com{+p+}at-matrix-footnote-6\">[6]</a>
 #, fuzzy
 #| msgid "OK&nbsp;<a href=\"#comat-matrix-footnote-6\">[6]</a>"
 msgid "OK&nbsp;<a href=\"#compat-matrix-footnote-6\">[6]</a>"
 msgstr "OK&nbsp;<a href=\"#comat-matrix-footnote-6\">[6]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to-]{+OK: Convey code under+} GPLv3&nbsp;<a
+# | href=\"#compat-matrix-footnote-7\">[7]</a><a
+# | href=\"#compat-matrix-footnote-8\">[8]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv3&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
@@ -7679,6 +8353,9 @@
 "7\">[7]</a><a href=\"#compat-matrix-footnote-8\">[8]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to-]{+OK: Convey code under+} GPLv2&nbsp;<a
+# | href=\"#compat-matrix-footnote-7\">[7]</a><a
+# | href=\"#compat-matrix-footnote-1\">[1]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv2&nbsp;<a href=\"#compat-matrix-footnote-7\">[7]"
@@ -7691,6 +8368,7 @@
 "7\">[7]</a><a href=\"#compat-matrix-footnote-1\">[1]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | OK&nbsp;<a href=\"#com{+p+}at-matrix-footnote-5\">[5]</a>
 #, fuzzy
 #| msgid "OK&nbsp;<a href=\"#comat-matrix-footnote-5\">[5]</a>"
 msgid "OK&nbsp;<a href=\"#compat-matrix-footnote-5\">[5]</a>"
@@ -7701,6 +8379,9 @@
 msgstr "LGPLv3"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you upgrade-]{+OK: Convey project+} and [-convert to-] {+code
+# | under+} GPLv3&nbsp;<a href=\"#compat-matrix-footnote-8\">[8]</a><a
+# | href=\"#compat-matrix-footnote-3\">[3]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you upgrade and convert to GPLv3&nbsp;<a href=\"#compat-matrix-"
@@ -7714,6 +8395,8 @@
 "[3]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to-]{+OK: Convey code under+} GPLv3&nbsp;<a
+# | href=\"#compat-matrix-footnote-8\">[8]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv3&nbsp;<a href=\"#compat-matrix-footnote-8\">[8]"
@@ -7726,6 +8409,11 @@
 "8\">[8]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you upgrade-]{+OK: Convey project+} and [-convert to-] {+code
+# | under+} GPLv3&nbsp;<a [-href=\"#compat-matrix-footnote-8\">[8]</a><a
+# | href=\"#compat-matrix-footnote-3\">[3]</a>-]
+# | {+href=\"#compat-matrix-footnote-7\">[7]</a><a
+# | href=\"#compat-matrix-footnote-8\">[8]</a>+}
 #, fuzzy
 #| msgid ""
 #| "OK if you upgrade and convert to GPLv3&nbsp;<a href=\"#compat-matrix-"
@@ -7739,6 +8427,8 @@
 "[3]</a>"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you upgrade to-]{+OK: Convey project under+} LGPLv3&nbsp;<a
+# | href=\"#com{+p+}at-matrix-footnote-4\">[4]</a>
 #, fuzzy
 #| msgid ""
 #| "OK if you upgrade to LGPLv3&nbsp;<a href=\"#comat-matrix-footnote-4\">[4]"
@@ -7755,6 +8445,9 @@
 msgstr "Je veux utiliser une bibliothèque sous&nbsp;:"
 
 #. type: Content of: <dl><dd><table><tbody><tr><td>
+# | [-OK if you convert to-]{+OK: Convey project under+} GPLv3&nbsp;<a
+# | [-href=\"#compat-matrix-footnote-8\">[8]</a>-]
+# | {+href=\"#compat-matrix-footnote-9\">[9]</a>+}
 #, fuzzy
 #| msgid ""
 #| "OK if you convert to GPLv3&nbsp;<a href=\"#compat-matrix-footnote-8\">[8]"
@@ -7771,6 +8464,9 @@
 msgstr "<a href=\"#matrix-skip-target\">Passez les notes</a>"
 
 #. type: Content of: <dl><dd><p>
+# | [-<a name=\"compat-matrix-footnote-1\">1</a>:-]{+1:+} You must follow the
+# | terms of GPLv2 when incorporating the code in this case. You cannot take
+# | advantage of terms in later versions of the GPL.
 #, fuzzy
 #| msgid ""
 #| "<a name=\"compat-matrix-footnote-1\">1</a>: You must follow the terms of "
@@ -7796,6 +8492,10 @@
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
+# | [-<a name=\"compat-matrix-footnote-3\">3</a>:-]{+3:+} If you have the
+# | ability to release the project under GPLv2 or any later version, you can
+# | choose to release it under GPLv3 or any later version&mdash;and once you
+# | do that, you'll be able to incorporate the code released under GPLv3.
 #, fuzzy
 #| msgid ""
 #| "<a name=\"compat-matrix-footnote-3\">3</a>: If you have the ability to "
@@ -7815,6 +8515,10 @@
 "publié sous GPLv3."
 
 #. type: Content of: <dl><dd><p>
+# | [-<a name=\"compat-matrix-footnote-4\">4</a>:-]{+4:+} If you have the
+# | ability to release the project under LGPLv2.1 or any later version, you
+# | can choose to release it under LGPLv3 or any later version&mdash;and once
+# | you do that, you'll be able to incorporate the code released under LGPLv3.
 #, fuzzy
 #| msgid ""
 #| "<a name=\"compat-matrix-footnote-4\">4</a>: If you have the ability to "
@@ -7834,6 +8538,9 @@
 "code publié sous LGPLv3."
 
 #. type: Content of: <dl><dd><p>
+# | [-<a name=\"compat-matrix-footnote-5\">5</a>:-]{+5:+} You must follow the
+# | terms of LGPLv2.1 when incorporating the code in this case. You cannot
+# | take advantage of terms in later versions of the LGPL.
 #, fuzzy
 #| msgid ""
 #| "<a name=\"compat-matrix-footnote-5\">5</a>: You must follow the terms of "
@@ -7848,6 +8555,9 @@
 "pas tirer avantage des termes des versions plus récentes de la LGPL."
 
 #. type: Content of: <dl><dd><p>
+# | [-<a name=\"compat-matrix-footnote-6\">6</a>:-]{+6:+} If you do this, as
+# | long as the project contains the code released under LGPLv2.1 only, you
+# | will not be able to upgrade the project's license to LGPLv3 or later.
 #, fuzzy
 #| msgid ""
 #| "<a name=\"compat-matrix-footnote-6\">6</a>: If you do this, as long as "
@@ -7863,6 +8573,11 @@
 "mettre à jour la licence du projet vers la LGPLv3 ou supérieure."
 
 #. type: Content of: <dl><dd><p>
+# | [-<a name=\"compat-matrix-footnote-7\">7</a>:-]{+7:+} LGPLv2.1 gives you
+# | permission to relicense the code under any version of the GPL since GPLv2.
+# |  If you can switch the LGPLed code in this case to using an appropriate
+# | version of the GPL instead (as noted in the table), you can make this
+# | combination.
 #, fuzzy
 #| msgid ""
 #| "<a name=\"compat-matrix-footnote-7\">7</a>: LGPLv2.1 gives you permission "
@@ -7882,6 +8597,9 @@
 "tableau), vous pouvez faire cette combinaison."
 
 #. type: Content of: <dl><dd><p>
+# | [-<a name=\"compat-matrix-footnote-8\">8</a>:-]{+8:+} LGPLv3 gives you
+# | permission to relicense the code under GPLv3.  In these cases, you can
+# | combine the code if you convert the LGPLed code to GPLv3.
 #, fuzzy
 #| msgid ""
 #| "<a name=\"compat-matrix-footnote-8\">8</a>: LGPLv3 gives you permission "
@@ -7918,6 +8636,9 @@
 "contact.fr.html\">d'autres moyens de contacter</a> la FSF."
 
 #. type: Content of: <div><p>
+# | Please send broken links and other corrections or suggestions to <a
+# | [-href=\"mailto:address@hidden";><em>address@hidden</em></a>.-]
+# | {+href=\"mailto:address@hidden";><em>address@hidden</em></a>.+}
 #, fuzzy
 #| msgid ""
 #| "Please send broken links and other corrections or suggestions to <a href="
@@ -7941,6 +8662,7 @@
 "la soumission de traductions de cet article."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 201[-0-]{+1+} Free Software Foundation, Inc.,
 #, fuzzy
 #| msgid "Copyright &copy; 2010 Free Software Foundation, Inc.,"
 msgid "Copyright &copy; 2011 Free Software Foundation, Inc.,"
@@ -7968,6 +8690,13 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour&nbsp;:"
 
+#~ msgid ""
+#~ "If a single program is that short, you may as well use a simple all-"
+#~ "permissive license for it, rather than the GNU GPL."
+#~ msgstr ""
+#~ "Si un programme est aussi court, vous pouvez aussi bien utiliser une "
+#~ "licence sans restriction, plutôt que la GNU GPL."
+
 #, fuzzy
 #~| msgid ""
 #~| "<a href=\"#WhatDoesGPLStandFor\">What does &ldquo;GPL&rdquo; stand for?</"

Index: licenses/po/gpl-faq.pot
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.pot,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- licenses/po/gpl-faq.pot     13 Dec 2011 01:26:27 -0000      1.27
+++ licenses/po/gpl-faq.pot     5 Jan 2012 17:28:47 -0000       1.28
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-12 20:25-0500\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -212,9 +212,7 @@
 
 #. type: Content of: <ul><li>
 #:  
-msgid ""
-"<a href=\"#WhatIfWorkIsShort\">What if the work is not much longer than the "
-"license itself?</a>"
+msgid "<a href=\"#WhatIfWorkIsShort\">What if the work is not very long?</a>"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -1441,15 +1439,17 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"What if the work is not much longer than the license itself? <span "
-"class=\"anchor-reference-id\">(<a href=\"#WhatIfWorkIsShort\" "
-">#WhatIfWorkIsShort</a>)</span>"
+"What if the work is not very long? <span class=\"anchor-reference-id\">(<a "
+"href=\"#WhatIfWorkIsShort\" >#WhatIfWorkIsShort</a>)</span>"
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If a single program is that short, you may as well use a simple "
-"all-permissive license for it, rather than the GNU GPL."
+"If a whole software package contains very little code&mdash;less than 300 "
+"lines is the benchmark we use&mdash;you may as well use a simple lax license "
+"for it, rather than a copyleft license like the GNU GPL.  We <a "
+"href=\"/licenses/license-recommendations.html#software\">recommend the "
+"Apache License 2.0</a> for such cases."
 msgstr ""
 
 #. type: Content of: <dl><dt>

Index: licenses/po/gpl-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- licenses/po/gpl-faq.ru.po   26 Dec 2011 07:21:40 -0000      1.4
+++ licenses/po/gpl-faq.ru.po   5 Jan 2012 17:28:47 -0000       1.5
@@ -11,13 +11,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpl-faq.html\n"
-"POT-Creation-Date: 2011-12-12 20:25-0500\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2011-12-13 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-01-05 12:25-0500\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -275,9 +276,13 @@
 "копии программы?</a>"
 
 #. type: Content of: <ul><li>
-msgid ""
-"<a href=\"#WhatIfWorkIsShort\">What if the work is not much longer than the "
-"license itself?</a>"
+# | <a href=\"#WhatIfWorkIsShort\">What if the work is not [-much longer than
+# | the license itself?</a>-] {+very long?</a>+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#WhatIfWorkIsShort\">What if the work is not much longer than "
+#| "the license itself?</a>"
+msgid "<a href=\"#WhatIfWorkIsShort\">What if the work is not very long?</a>"
 msgstr ""
 "<a href=\"#WhatIfWorkIsShort\">Что, если работа не 
намного больше самой "
 "лицензии?</a>"
@@ -2027,10 +2032,17 @@
 "программу."
 
 #. type: Content of: <dl><dt>
+# | What if the work is not [-much longer than the license itself?-] {+very
+# | long?+} <span class=\"anchor-reference-id\">(<a
+# | href=\"#WhatIfWorkIsShort\" >#WhatIfWorkIsShort</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "What if the work is not much longer than the license itself? <span class="
+#| "\"anchor-reference-id\">(<a href=\"#WhatIfWorkIsShort\" "
+#| ">#WhatIfWorkIsShort</a>)</span>"
 msgid ""
-"What if the work is not much longer than the license itself? <span class="
-"\"anchor-reference-id\">(<a href=\"#WhatIfWorkIsShort\" >#WhatIfWorkIsShort</"
-"a>)</span>"
+"What if the work is not very long? <span class=\"anchor-reference-id\">(<a "
+"href=\"#WhatIfWorkIsShort\" >#WhatIfWorkIsShort</a>)</span>"
 msgstr ""
 "Что, если работа не намного больше самой 
лицензии? <span class=\"anchor-"
 "reference-id\">(<a href=\"#WhatIfWorkIsShort\" >#WhatIfWorkIsShort</a>)</"
@@ -2038,11 +2050,12 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If a single program is that short, you may as well use a simple all-"
-"permissive license for it, rather than the GNU GPL."
+"If a whole software package contains very little code&mdash;less than 300 "
+"lines is the benchmark we use&mdash;you may as well use a simple lax license "
+"for it, rather than a copyleft license like the GNU GPL.  We <a href=\"/"
+"licenses/license-recommendations.html#software\">recommend the Apache "
+"License 2.0</a> for such cases."
 msgstr ""
-"Если отдельная программа настолько 
коротка, вы можете использовать для нее и "
-"простую всеразрешающую лицензию, а не GNU 
GPL."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -7295,3 +7308,10 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Обновлено:"
+
+#~ msgid ""
+#~ "If a single program is that short, you may as well use a simple all-"
+#~ "permissive license for it, rather than the GNU GPL."
+#~ msgstr ""
+#~ "Если отдельная программа настолько 
коротка, вы можете использовать для "
+#~ "нее и простую всеразрешающую лицензию, а 
не GNU GPL."

Index: licenses/po/gpl-faq.ta.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ta.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- licenses/po/gpl-faq.ta.po   13 Dec 2011 01:26:27 -0000      1.16
+++ licenses/po/gpl-faq.ta.po   5 Jan 2012 17:28:47 -0000       1.17
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-12-12 20:25-0500\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2010-06-20 15:55+0530\n"
 "Last-Translator: Amachu <address@hidden>\n"
 "Language-Team: Tamil <>\n"
@@ -265,10 +265,13 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-msgid ""
-"<a href=\"#WhatIfWorkIsShort\">What if the work is not much longer than the "
-"license itself?</a>"
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#WhoHasThePower\">Who has the power to enforce the GPL?</a>"
+msgid "<a href=\"#WhatIfWorkIsShort\">What if the work is not very long?</a>"
 msgstr ""
+"<a href=\"#WhoHasThePower\">GPLஐ சட்டரீதியாக 
செயல்படுத்தும் உரிமை 
யாருக்கு "
+"இருக்கிறது?</a>"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -1638,18 +1641,26 @@
 "happen in the network, is to include a copy of the license in the program."
 msgstr ""
 
+# type: Content of: <ul><li>
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#WhyUseGPL\">Why should I use the GNU GPL rather than other "
+#| "free software licenses?</a>"
 msgid ""
-"What if the work is not much longer than the license itself? <span class="
-"\"anchor-reference-id\">(<a href=\"#WhatIfWorkIsShort\" >#WhatIfWorkIsShort</"
-"a>)</span>"
+"What if the work is not very long? <span class=\"anchor-reference-id\">(<a "
+"href=\"#WhatIfWorkIsShort\" >#WhatIfWorkIsShort</a>)</span>"
 msgstr ""
+"<a href=\"#WhyUseGPL\">ஏனைய கட்டற்ற 
உரிமங்களை காட்டிலும் நான் 
ஏன் GNU GPLஐ பயன்படுத்த "
+"வேண்டும்?</a>"
 
-# type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
 msgid ""
-"If a single program is that short, you may as well use a simple all-"
-"permissive license for it, rather than the GNU GPL."
+"If a whole software package contains very little code&mdash;less than 300 "
+"lines is the benchmark we use&mdash;you may as well use a simple lax license "
+"for it, rather than a copyleft license like the GNU GPL.  We <a href=\"/"
+"licenses/license-recommendations.html#software\">recommend the Apache "
+"License 2.0</a> for such cases."
 msgstr ""
 
 #. type: Content of: <dl><dt>

Index: licenses/po/license-list.de.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- licenses/po/license-list.de.po      3 Jan 2012 17:26:57 -0000       1.15
+++ licenses/po/license-list.de.po      5 Jan 2012 17:28:47 -0000       1.16
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-01-03 12:25-0500\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2011-12-22 00:35+0100\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online (PUNKT) de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -1012,19 +1012,19 @@
 "This is a free software license.  Section 3.3 provides indirect "
 "compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
 "version 2.1, the GNU AGPL version 3.0, and all later versions of those "
-"licenses.  When you receive work under the MPL version 2.0, you may make a "
-"&ldquo;Larger Work&rdquo; that combines that work with work under one of "
-"those GNU licenses.  When you do, section 3.3 gives you permission to "
-"distribute the MPL-covered work under the terms of that same GNU license, "
-"with one condition: you must make sure that the files that were originally "
-"under the MPL are still available under the MPL's terms as well.  In other "
-"words, when you make a combination this way, the files that were originally "
-"under the MPL will be dual licensed under the MPL and the GNU license.  The "
-"end result is that the Larger Work, as a whole, will be covered under the "
-"GNU license.  People who receive that combination from you will have the "
-"option to use any files that were originally covered by the MPL under that "
-"license's terms, or distribute the Larger Work in whole or in part under the "
-"terms of the GNU license with no further restrictions."
+"licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
+"Work&rdquo; that combines that work with work under those GNU licenses.  "
+"When you do, section 3.3 gives you permission to distribute the MPL-covered "
+"work under the terms of the same GNU licenses, with one condition: you must "
+"make sure that the files that were originally under the MPL are still "
+"available under the MPL's terms as well.  In other words, when you make a "
+"combination this way, the files that were originally under the MPL will be "
+"dual licensed under the MPL and the GNU license(s).  The end result is that "
+"the Larger Work, as a whole, will be covered under the GNU license(s).  "
+"People who receive that combination from you will have the option to use any "
+"files that were originally covered by the MPL under that license's terms, or "
+"distribute the Larger Work in whole or in part under the GNU licenses' terms "
+"with no further restrictions."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -1032,7 +1032,7 @@
 "It's important to understand that the condition to distribute files under "
 "the MPL's terms only applies to the party that first creates and distributes "
 "the Larger Work.  If it applied to their recipients as well, it would be a "
-"further restriction and incompatible with the GNU licenses.  That said, when "
+"further restriction and incompatible with the GPL and AGPL.  That said, when "
 "you make contributions to an existing project, we usually <a href=\"/"
 "licenses/license-recommendations.html#contributing\">recommend that you keep "
 "your changes under the same license</a>, even when you're not required to do "
@@ -1044,11 +1044,11 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "Check the license notices on the MPL-covered software before you make a "
-"Larger Work this way.  Parties who release original work under the MPL "
-"version 2.0 may choose to opt out of this compatibility by including a "
-"sentence in the license notices that says that the work is &ldquo;"
-"Incompatible With Secondary Licenses.&rdquo; Any software that includes this "
-"notice is <strong>not</strong> compatible with the GPL or AGPL."
+"Larger Work this way.  Parties who release original work under MPL 2.0 may "
+"choose to opt out of this compatibility by including a sentence in the "
+"license notices that says that the work is &ldquo;Incompatible With "
+"Secondary Licenses.&rdquo; Any software that includes this notice is "
+"<strong>not</strong> compatible with the GPL or AGPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>

Index: licenses/po/license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- licenses/po/license-list.fr.po      5 Jan 2012 09:28:04 -0000       1.100
+++ licenses/po/license-list.fr.po      5 Jan 2012 17:28:47 -0000       1.101
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-01-03 12:25-0500\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2011-12-30 15:59+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -1024,19 +1024,19 @@
 "This is a free software license.  Section 3.3 provides indirect "
 "compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
 "version 2.1, the GNU AGPL version 3.0, and all later versions of those "
-"licenses.  When you receive work under the MPL version 2.0, you may make a "
-"&ldquo;Larger Work&rdquo; that combines that work with work under one of "
-"those GNU licenses.  When you do, section 3.3 gives you permission to "
-"distribute the MPL-covered work under the terms of that same GNU license, "
-"with one condition: you must make sure that the files that were originally "
-"under the MPL are still available under the MPL's terms as well.  In other "
-"words, when you make a combination this way, the files that were originally "
-"under the MPL will be dual licensed under the MPL and the GNU license.  The "
-"end result is that the Larger Work, as a whole, will be covered under the "
-"GNU license.  People who receive that combination from you will have the "
-"option to use any files that were originally covered by the MPL under that "
-"license's terms, or distribute the Larger Work in whole or in part under the "
-"terms of the GNU license with no further restrictions."
+"licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
+"Work&rdquo; that combines that work with work under those GNU licenses.  "
+"When you do, section 3.3 gives you permission to distribute the MPL-covered "
+"work under the terms of the same GNU licenses, with one condition: you must "
+"make sure that the files that were originally under the MPL are still "
+"available under the MPL's terms as well.  In other words, when you make a "
+"combination this way, the files that were originally under the MPL will be "
+"dual licensed under the MPL and the GNU license(s).  The end result is that "
+"the Larger Work, as a whole, will be covered under the GNU license(s).  "
+"People who receive that combination from you will have the option to use any "
+"files that were originally covered by the MPL under that license's terms, or "
+"distribute the Larger Work in whole or in part under the GNU licenses' terms "
+"with no further restrictions."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -1044,7 +1044,7 @@
 "It's important to understand that the condition to distribute files under "
 "the MPL's terms only applies to the party that first creates and distributes "
 "the Larger Work.  If it applied to their recipients as well, it would be a "
-"further restriction and incompatible with the GNU licenses.  That said, when "
+"further restriction and incompatible with the GPL and AGPL.  That said, when "
 "you make contributions to an existing project, we usually <a href=\"/"
 "licenses/license-recommendations.html#contributing\">recommend that you keep "
 "your changes under the same license</a>, even when you're not required to do "
@@ -1056,11 +1056,11 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "Check the license notices on the MPL-covered software before you make a "
-"Larger Work this way.  Parties who release original work under the MPL "
-"version 2.0 may choose to opt out of this compatibility by including a "
-"sentence in the license notices that says that the work is &ldquo;"
-"Incompatible With Secondary Licenses.&rdquo; Any software that includes this "
-"notice is <strong>not</strong> compatible with the GPL or AGPL."
+"Larger Work this way.  Parties who release original work under MPL 2.0 may "
+"choose to opt out of this compatibility by including a sentence in the "
+"license notices that says that the work is &ldquo;Incompatible With "
+"Secondary Licenses.&rdquo; Any software that includes this notice is "
+"<strong>not</strong> compatible with the GPL or AGPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>

Index: licenses/po/license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- licenses/po/license-list.it.po      5 Jan 2012 16:23:59 -0000       1.36
+++ licenses/po/license-list.it.po      5 Jan 2012 17:28:47 -0000       1.37
@@ -8,13 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2012-01-03 12:25-0500\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2012-01-05 17:23+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-01-05 12:25-0500\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -418,8 +419,8 @@
 msgid ""
 "<a id=\"AGPL\"></a> <a id=\"AGPLv3.0\" href=\"/licenses/agpl.html\"> GNU "
 "Affero General Public License (AGPL) version 3</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#AGPL\">#AGPL</a>)  (<a href="
-"\"#AGPLv3.0\">#AGPLv3.0</a>)</span>"
+"reference-id\"> (<a href=\"#AGPL\">#AGPL</a>)  (<a href=\"#AGPLv3.0"
+"\">#AGPLv3.0</a>)</span>"
 msgstr ""
 "<a id=\"AGPL\"></a> <a id=\"AGPLv3.0\" href=\"/licenses/agpl.html\"> Licenza "
 "Pubblica Generica GNU Affero (GNU Affero General Public License, AGPL) "
@@ -592,13 +593,13 @@
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#5\"> Modified BSD license</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
-msgstr ""
-"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#5\"> Licenza BSD modificata</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
+"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5";
+"\"> Modified BSD license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
+msgstr ""
+"<a id=\"ModifiedBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5";
+"\"> Licenza BSD modificata</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -648,12 +649,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CC0\" href=\"http://creativecommons.org/publicdomain/zero/1.0/";
-"legalcode\"> CC0</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#CC0\">#CC0</a>)</span>"
+"legalcode\"> CC0</a> <span class=\"anchor-reference-id\">(<a href=\"#CC0"
+"\">#CC0</a>)</span>"
 msgstr ""
 "<a id=\"CC0\" href=\"http://creativecommons.org/publicdomain/zero/1.0/";
-"legalcode\"> CC0</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#CC0\">#CC0</a>)</span>"
+"legalcode\"> CC0</a> <span class=\"anchor-reference-id\">(<a href=\"#CC0"
+"\">#CC0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1089,23 +1090,60 @@
 "\"#MPL-2.0\">#MPL-2.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+# | This is a free software license.  Section 3.3 provides indirect
+# | compatibility between this license and the GNU GPL version 2.0, the GNU
+# | LGPL version 2.1, the GNU AGPL version 3.0, and all later versions of
+# | those licenses.  When you receive work under [-the-] MPL [-version-] 2.0,
+# | you may make a &ldquo;Larger Work&rdquo; that combines that work with work
+# | under [-one of-] those GNU licenses.  When you do, section 3.3 gives you
+# | permission to distribute the MPL-covered work under the terms of [-that-]
+# | {+the+} same GNU license{+s+}, with one condition: you must make sure that
+# | the files that were originally under the MPL are still available under the
+# | MPL's terms as well.  In other words, when you make a combination this
+# | way, the files that were originally under the MPL will be dual licensed
+# | under the MPL and the GNU [-license.-] {+license(s).+}  The end result is
+# | that the Larger Work, as a whole, will be covered under the GNU
+# | [-license.-] {+license(s).+}  People who receive that combination from you
+# | will have the option to use any files that were originally covered by the
+# | MPL under that license's terms, or distribute the Larger Work in whole or
+# | in part under the [-terms of the-] GNU [-license-] {+licenses' terms+}
+# | with no further restrictions.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  Section 3.3 provides indirect "
+#| "compatibility between this license and the GNU GPL version 2.0, the GNU "
+#| "LGPL version 2.1, the GNU AGPL version 3.0, and all later versions of "
+#| "those licenses.  When you receive work under the MPL version 2.0, you may "
+#| "make a &ldquo;Larger Work&rdquo; that combines that work with work under "
+#| "one of those GNU licenses.  When you do, section 3.3 gives you permission "
+#| "to distribute the MPL-covered work under the terms of that same GNU "
+#| "license, with one condition: you must make sure that the files that were "
+#| "originally under the MPL are still available under the MPL's terms as "
+#| "well.  In other words, when you make a combination this way, the files "
+#| "that were originally under the MPL will be dual licensed under the MPL "
+#| "and the GNU license.  The end result is that the Larger Work, as a whole, "
+#| "will be covered under the GNU license.  People who receive that "
+#| "combination from you will have the option to use any files that were "
+#| "originally covered by the MPL under that license's terms, or distribute "
+#| "the Larger Work in whole or in part under the terms of the GNU license "
+#| "with no further restrictions."
 msgid ""
 "This is a free software license.  Section 3.3 provides indirect "
 "compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
 "version 2.1, the GNU AGPL version 3.0, and all later versions of those "
-"licenses.  When you receive work under the MPL version 2.0, you may make a "
-"&ldquo;Larger Work&rdquo; that combines that work with work under one of "
-"those GNU licenses.  When you do, section 3.3 gives you permission to "
-"distribute the MPL-covered work under the terms of that same GNU license, "
-"with one condition: you must make sure that the files that were originally "
-"under the MPL are still available under the MPL's terms as well.  In other "
-"words, when you make a combination this way, the files that were originally "
-"under the MPL will be dual licensed under the MPL and the GNU license.  The "
-"end result is that the Larger Work, as a whole, will be covered under the "
-"GNU license.  People who receive that combination from you will have the "
-"option to use any files that were originally covered by the MPL under that "
-"license's terms, or distribute the Larger Work in whole or in part under the "
-"terms of the GNU license with no further restrictions."
+"licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
+"Work&rdquo; that combines that work with work under those GNU licenses.  "
+"When you do, section 3.3 gives you permission to distribute the MPL-covered "
+"work under the terms of the same GNU licenses, with one condition: you must "
+"make sure that the files that were originally under the MPL are still "
+"available under the MPL's terms as well.  In other words, when you make a "
+"combination this way, the files that were originally under the MPL will be "
+"dual licensed under the MPL and the GNU license(s).  The end result is that "
+"the Larger Work, as a whole, will be covered under the GNU license(s).  "
+"People who receive that combination from you will have the option to use any "
+"files that were originally covered by the MPL under that license's terms, or "
+"distribute the Larger Work in whole or in part under the GNU licenses' terms "
+"with no further restrictions."
 msgstr ""
 "Questa è una licenza di software libero. La sezione 3.3 fornisce "
 "un'indiretta compatibilità tra questa licenza e la GNU GPL 2.0, la GNU LGPL "
@@ -1126,11 +1164,34 @@
 "restrizioni."
 
 #. type: Content of: <dl><dd><p>
+# | It's important to understand that the condition to distribute files under
+# | the MPL's terms only applies to the party that first creates and
+# | distributes the Larger Work.  If it applied to their recipients as well,
+# | it would be a further restriction and incompatible with the [-GNU
+# | licenses.-] {+GPL and AGPL.+}  That said, when you make contributions to
+# | an existing project, we usually <a
+# | href=\"/licenses/license-recommendations.html#contributing\">recommend
+# | that you keep your changes under the same license</a>, even when you're
+# | not required to do so.  If you receive a work under a GNU license where
+# | some files are also under the MPL, you should only remove the MPL from
+# | those files when there's a strong reason to justify it.
+#, fuzzy
+#| msgid ""
+#| "It's important to understand that the condition to distribute files under "
+#| "the MPL's terms only applies to the party that first creates and "
+#| "distributes the Larger Work.  If it applied to their recipients as well, "
+#| "it would be a further restriction and incompatible with the GNU "
+#| "licenses.  That said, when you make contributions to an existing project, "
+#| "we usually <a href=\"/licenses/license-recommendations.html#contributing"
+#| "\">recommend that you keep your changes under the same license</a>, even "
+#| "when you're not required to do so.  If you receive a work under a GNU "
+#| "license where some files are also under the MPL, you should only remove "
+#| "the MPL from those files when there's a strong reason to justify it."
 msgid ""
 "It's important to understand that the condition to distribute files under "
 "the MPL's terms only applies to the party that first creates and distributes "
 "the Larger Work.  If it applied to their recipients as well, it would be a "
-"further restriction and incompatible with the GNU licenses.  That said, when "
+"further restriction and incompatible with the GPL and AGPL.  That said, when "
 "you make contributions to an existing project, we usually <a href=\"/"
 "licenses/license-recommendations.html#contributing\">recommend that you keep "
 "your changes under the same license</a>, even when you're not required to do "
@@ -1150,13 +1211,28 @@
 "forti per farlo."
 
 #. type: Content of: <dl><dd><p>
+# | Check the license notices on the MPL-covered software before you make a
+# | Larger Work this way.  Parties who release original work under [-the-] MPL
+# | [-version-] 2.0 may choose to opt out of this compatibility by including a
+# | sentence in the license notices that says that the work is
+# | &ldquo;Incompatible With Secondary Licenses.&rdquo; Any software that
+# | includes this notice is <strong>not</strong> compatible with the GPL or
+# | AGPL.
+#, fuzzy
+#| msgid ""
+#| "Check the license notices on the MPL-covered software before you make a "
+#| "Larger Work this way.  Parties who release original work under the MPL "
+#| "version 2.0 may choose to opt out of this compatibility by including a "
+#| "sentence in the license notices that says that the work is &ldquo;"
+#| "Incompatible With Secondary Licenses.&rdquo; Any software that includes "
+#| "this notice is <strong>not</strong> compatible with the GPL or AGPL."
 msgid ""
 "Check the license notices on the MPL-covered software before you make a "
-"Larger Work this way.  Parties who release original work under the MPL "
-"version 2.0 may choose to opt out of this compatibility by including a "
-"sentence in the license notices that says that the work is &ldquo;"
-"Incompatible With Secondary Licenses.&rdquo; Any software that includes this "
-"notice is <strong>not</strong> compatible with the GPL or AGPL."
+"Larger Work this way.  Parties who release original work under MPL 2.0 may "
+"choose to opt out of this compatibility by including a sentence in the "
+"license notices that says that the work is &ldquo;Incompatible With "
+"Secondary Licenses.&rdquo; Any software that includes this notice is "
+"<strong>not</strong> compatible with the GPL or AGPL."
 msgstr ""
 "Controllate i dettagli nelle indicazioni di licenza del software sotto MPL "
 "prima di creare un'&ldquo;opera più ampia&rdquo; in questo modo. Chi "
@@ -1633,13 +1709,13 @@
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#3\"> X11 License</a> <span class=\"anchor-reference-id\"> (<a href="
+"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";
+"\"> X11 License</a> <span class=\"anchor-reference-id\"> (<a href="
 "\"#X11License\">#X11License</a>)</span>"
 msgstr ""
-"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#3\"> La licenza di X11</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#X11License\">#X11License</a>)</span>"
+"<a id=\"X11License\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";
+"\"> La licenza di X11</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#X11License\">#X11License</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -1923,13 +1999,13 @@
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#6\"> Original BSD license</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#OriginalBSD\">#OriginalBSD</a>)</span>"
-msgstr ""
-"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.";
-"html#6\"> Licenza BSD originale</a> <span class=\"anchor-reference-id\"> (<a "
-"href=\"#OriginalBSD\">#OriginalBSD</a>)</span>"
+"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#6";
+"\"> Original BSD license</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#OriginalBSD\">#OriginalBSD</a>)</span>"
+msgstr ""
+"<a id=\"OriginalBSD\" href=\"http://www.xfree86.org/3.3.6/COPYRIGHT2.html#6";
+"\"> Licenza BSD originale</a> <span class=\"anchor-reference-id\"> (<a href="
+"\"#OriginalBSD\">#OriginalBSD</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -2103,18 +2179,17 @@
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
 msgid ""
-"The Eclipse Public License is similar to the <a href="
-"\"#CommonPublicLicense10\">Common Public License</a>, and our comments on "
-"the CPL apply equally to the EPL.  The only change is that the EPL removes "
-"the broader patent retaliation language regarding patent infringement suits "
-"specifically against Contributors to the EPL'd program."
-msgstr ""
-"La Licenza Pubblica Eclipse è simile alla <a href="
-"\"#CommonPublicLicense10\">Licenza pubblica comune</a> e i nostri commenti "
-"sulla CPL si applicano nella stessa misura in questo caso. L'unica "
-"differenza è che la EPL elimina le frasi sulle azioni legali per violazioni "
-"di brevetti nei confronti di chi contribuisce al programma rilasciato sotto "
-"EPL."
+"The Eclipse Public License is similar to the <a href=\"#CommonPublicLicense10"
+"\">Common Public License</a>, and our comments on the CPL apply equally to "
+"the EPL.  The only change is that the EPL removes the broader patent "
+"retaliation language regarding patent infringement suits specifically "
+"against Contributors to the EPL'd program."
+msgstr ""
+"La Licenza Pubblica Eclipse è simile alla <a href=\"#CommonPublicLicense10"
+"\">Licenza pubblica comune</a> e i nostri commenti sulla CPL si applicano "
+"nella stessa misura in questo caso. L'unica differenza è che la EPL elimina "
+"le frasi sulle azioni legali per violazioni di brevetti nei confronti di chi "
+"contribuisce al programma rilasciato sotto EPL."
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
@@ -2710,8 +2785,8 @@
 "\"#PHP-3.01\">#PHP-3.01</a>)</span>"
 msgstr ""
 "<a id=\"PHP-3.01\" href=\"http://www.php.net/license/3_01.txt\";> La Licenza "
-"PHP, versione 3.01</a> <span class=\"anchor-reference-id\"> (<a href="
-"\"#PHP-3.01\">#PHP-3.01</a>)</span>"
+"PHP, versione 3.01</a> <span class=\"anchor-reference-id\"> (<a href=\"#PHP-"
+"3.01\">#PHP-3.01</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -2735,15 +2810,13 @@
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/";
-"python1.6_9-5-00.html\"> License of Python 1.6b1 through 2.0 and 2.1</a> "
-"<span class=\"anchor-reference-id\"> (<a href=\"#PythonOld\">#PythonOld</a>)"
-"</span>"
-msgstr ""
-"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/";
-"python1.6_9-5-00.html\"> Licenza di Python 1.6b1 fino alla 2.0 e 2.1</a> "
-"<span class=\"anchor-reference-id\"> (<a href=\"#PythonOld\">#PythonOld</a>)"
-"</span>"
+"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/python1.6_9-";
+"5-00.html\"> License of Python 1.6b1 through 2.0 and 2.1</a> <span class="
+"\"anchor-reference-id\"> (<a href=\"#PythonOld\">#PythonOld</a>)</span>"
+msgstr ""
+"<a id=\"PythonOld\" href=\"http://www.handle.net/python_licenses/python1.6_9-";
+"5-00.html\"> Licenza di Python 1.6b1 fino alla 2.0 e 2.1</a> <span class="
+"\"anchor-reference-id\"> (<a href=\"#PythonOld\">#PythonOld</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -2990,13 +3063,13 @@
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"Zimbra\" href=\"http://www.zimbra.com/license/zimbra-public-";
-"license-1-3.html\"> Zimbra Public License 1.3</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#Zimbra\">#Zimbra</a>)</span>"
-msgstr ""
-"<a id=\"Zimbra\" href=\"http://www.zimbra.com/license/zimbra-public-";
-"license-1-3.html\"> Zimbra Public License 1.3</a> <span class=\"anchor-"
-"reference-id\"> (<a href=\"#Zimbra\">#Zimbra</a>)</span>"
+"<a id=\"Zimbra\" href=\"http://www.zimbra.com/license/zimbra-public-license-";
+"1-3.html\"> Zimbra Public License 1.3</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#Zimbra\">#Zimbra</a>)</span>"
+msgstr ""
+"<a id=\"Zimbra\" href=\"http://www.zimbra.com/license/zimbra-public-license-";
+"1-3.html\"> Zimbra Public License 1.3</a> <span class=\"anchor-reference-id"
+"\"> (<a href=\"#Zimbra\">#Zimbra</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3144,13 +3217,13 @@
 msgid ""
 "<a id=\"apsl1\" href= \"https://fedoraproject.org/wiki/Licensing/";
 "Apple_Public_Source_License_1.2\"> Apple Public Source License (APSL), "
-"version 1.x</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#apsl1\">#apsl1</a>)</span>"
+"version 1.x</a> <span class=\"anchor-reference-id\">(<a href=\"#apsl1"
+"\">#apsl1</a>)</span>"
 msgstr ""
 "<a id=\"apsl1\" href= \"https://fedoraproject.org/wiki/Licensing/";
 "Apple_Public_Source_License_1.2\"> Apple Public Source License (APSL), "
-"versione 1.x</a> <span class=\"anchor-reference-id\">(<a href="
-"\"#apsl1\">#apsl1</a>)</span>"
+"versione 1.x</a> <span class=\"anchor-reference-id\">(<a href=\"#apsl1"
+"\">#apsl1</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -3608,8 +3681,8 @@
 "Please note that a successor to Pine, Alpine, is released under the <a href="
 "\"#apache2\">Apache License, version 2.0</a>."
 msgstr ""
-"Alpine, un successore di PINE, è rilasciato sotto la <a href="
-"\"#apache2\">Apache License, versione 2.0</a>."
+"Alpine, un successore di PINE, è rilasciato sotto la <a href=\"#apache2"
+"\">Apache License, versione 2.0</a>."
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -3769,8 +3842,8 @@
 "<a href=\"#apache2\">Apache License&nbsp;2.0</a>."
 msgstr ""
 "Le versioni recenti di Squeak (dalla 4.0) sono rilasciate sotto <a href="
-"\"#Expat\">Licenza Expat</a> con porzioni di codice sotto <a href="
-"\"#apache2\">Apache License 2.0</a>."
+"\"#Expat\">Licenza Expat</a> con porzioni di codice sotto <a href=\"#apache2"
+"\">Apache License 2.0</a>."
 
 #. type: Content of: <dl><dt>
 msgid ""

Index: licenses/po/license-list.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pot,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- licenses/po/license-list.pot        3 Jan 2012 17:26:58 -0000       1.63
+++ licenses/po/license-list.pot        5 Jan 2012 17:28:48 -0000       1.64
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-03 12:25-0500\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -709,19 +709,19 @@
 "This is a free software license.  Section 3.3 provides indirect "
 "compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
 "version 2.1, the GNU AGPL version 3.0, and all later versions of those "
-"licenses.  When you receive work under the MPL version 2.0, you may make a "
-"&ldquo;Larger Work&rdquo; that combines that work with work under one of "
-"those GNU licenses.  When you do, section 3.3 gives you permission to "
-"distribute the MPL-covered work under the terms of that same GNU license, "
-"with one condition: you must make sure that the files that were originally "
-"under the MPL are still available under the MPL's terms as well.  In other "
-"words, when you make a combination this way, the files that were originally "
-"under the MPL will be dual licensed under the MPL and the GNU license.  The "
-"end result is that the Larger Work, as a whole, will be covered under the "
-"GNU license.  People who receive that combination from you will have the "
-"option to use any files that were originally covered by the MPL under that "
-"license's terms, or distribute the Larger Work in whole or in part under the "
-"terms of the GNU license with no further restrictions."
+"licenses.  When you receive work under MPL 2.0, you may make a &ldquo;Larger "
+"Work&rdquo; that combines that work with work under those GNU licenses.  "
+"When you do, section 3.3 gives you permission to distribute the MPL-covered "
+"work under the terms of the same GNU licenses, with one condition: you must "
+"make sure that the files that were originally under the MPL are still "
+"available under the MPL's terms as well.  In other words, when you make a "
+"combination this way, the files that were originally under the MPL will be "
+"dual licensed under the MPL and the GNU license(s).  The end result is that "
+"the Larger Work, as a whole, will be covered under the GNU license(s).  "
+"People who receive that combination from you will have the option to use any "
+"files that were originally covered by the MPL under that license's terms, or "
+"distribute the Larger Work in whole or in part under the GNU licenses' terms "
+"with no further restrictions."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>
@@ -729,7 +729,7 @@
 "It's important to understand that the condition to distribute files under "
 "the MPL's terms only applies to the party that first creates and distributes "
 "the Larger Work.  If it applied to their recipients as well, it would be a "
-"further restriction and incompatible with the GNU licenses.  That said, when "
+"further restriction and incompatible with the GPL and AGPL.  That said, when "
 "you make contributions to an existing project, we usually <a "
 "href=\"/licenses/license-recommendations.html#contributing\">recommend that "
 "you keep your changes under the same license</a>, even when you're not "
@@ -741,12 +741,11 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "Check the license notices on the MPL-covered software before you make a "
-"Larger Work this way.  Parties who release original work under the MPL "
-"version 2.0 may choose to opt out of this compatibility by including a "
-"sentence in the license notices that says that the work is "
-"&ldquo;Incompatible With Secondary Licenses.&rdquo; Any software that "
-"includes this notice is <strong>not</strong> compatible with the GPL or "
-"AGPL."
+"Larger Work this way.  Parties who release original work under MPL 2.0 may "
+"choose to opt out of this compatibility by including a sentence in the "
+"license notices that says that the work is &ldquo;Incompatible With "
+"Secondary Licenses.&rdquo; Any software that includes this notice is "
+"<strong>not</strong> compatible with the GPL or AGPL."
 msgstr ""
 
 #. type: Content of: <dl><dd><p>

Index: licenses/po/license-recommendations.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.pot,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- licenses/po/license-recommendations.pot     23 Dec 2011 17:26:52 -0000      
1.6
+++ licenses/po/license-recommendations.pot     5 Jan 2012 17:28:48 -0000       
1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-23 12:25-0500\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -96,11 +96,11 @@
 #. type: Content of: <p>
 msgid ""
 "There are only a couple of kinds of projects that we think should not have "
-"any copyleft at all.  The first is very small projects.  As a rough "
-"benchmark, we compare the project's source code to the text of the GPL.  "
-"When the source code is not much longer than the license, the benefits "
-"provided by copyleft are usually too small to justify the inconvenience of "
-"making sure a copy of the license always accompanies the software."
+"any copyleft at all.  The first is very small projects.  We use 300 lines as "
+"our benchmark: when a software package's source code is shorter than that, "
+"the benefits provided by copyleft are usually too small to justify the "
+"inconvenience of making sure a copy of the license always accompanies the "
+"software."
 msgstr ""
 
 #. type: Content of: <p>

Index: licenses/po/license-recommendations.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- licenses/po/license-recommendations.ru.po   26 Dec 2011 07:21:42 -0000      
1.4
+++ licenses/po/license-recommendations.ru.po   5 Jan 2012 17:28:48 -0000       
1.5
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2011-12-23 12:25-0500\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2011-12-24 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-01-05 12:25-0500\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -135,13 +136,29 @@
 "рассказывается, почему это, как правило, 
наилучшая стратегия лицензирования."
 
 #. type: Content of: <p>
+# | There are only a couple of kinds of projects that we think should not have
+# | any copyleft at all.  The first is very small projects.  [-As-]  {+We use
+# | 300 lines as our benchmark: when+} a [-rough benchmark, we compare the
+# | project's source code to the text of the GPL.  When the-] {+software
+# | package's+} source code is [-not much longer-] {+shorter+} than [-the
+# | license,-] {+that,+} the benefits provided by copyleft are usually too
+# | small to justify the inconvenience of making sure a copy of the license
+# | always accompanies the software.
+#, fuzzy
+#| msgid ""
+#| "There are only a couple of kinds of projects that we think should not "
+#| "have any copyleft at all.  The first is very small projects.  As a rough "
+#| "benchmark, we compare the project's source code to the text of the GPL.  "
+#| "When the source code is not much longer than the license, the benefits "
+#| "provided by copyleft are usually too small to justify the inconvenience "
+#| "of making sure a copy of the license always accompanies the software."
 msgid ""
 "There are only a couple of kinds of projects that we think should not have "
-"any copyleft at all.  The first is very small projects.  As a rough "
-"benchmark, we compare the project's source code to the text of the GPL.  "
-"When the source code is not much longer than the license, the benefits "
-"provided by copyleft are usually too small to justify the inconvenience of "
-"making sure a copy of the license always accompanies the software."
+"any copyleft at all.  The first is very small projects.  We use 300 lines as "
+"our benchmark: when a software package's source code is shorter than that, "
+"the benefits provided by copyleft are usually too small to justify the "
+"inconvenience of making sure a copy of the license always accompanies the "
+"software."
 msgstr ""
 "Есть только пара разновидностей проектов, 
в которых, как мы думаем, вообще "
 "не должно быть авторского лева. 
Первый&nbsp;&mdash; очень небольшие проекты. "

Index: philosophy/essays-and-articles.ca.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.ca.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/essays-and-articles.ca.html      20 Nov 2011 17:27:14 -0000      
1.13
+++ philosophy/essays-and-articles.ca.html      5 Jan 2012 17:28:54 -0000       
1.14
@@ -410,9 +410,6 @@
 
   <li><a href="/philosophy/censoring-emacs.html">Censuro el meu programa</a>, 
per
 <a href="http://www.stallman.org";>Richard Stallman</a></li>
-
-  <li><a href="/philosophy/motivation.html">Els estudis proven que les 
recompenses
-no sempre són motivadores</a></li>
 </ul>
 
 <h3 id="terminology">Terminologia i definicions</h3>
@@ -509,7 +506,7 @@
 <!-- timestamp start -->
 Updated:
 
-$Date: 2011/11/20 17:27:14 $
+$Date: 2012/01/05 17:28:54 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/essays-and-articles.de.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.de.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/essays-and-articles.de.html      8 Dec 2011 01:26:23 -0000       
1.10
+++ philosophy/essays-and-articles.de.html      5 Jan 2012 17:28:54 -0000       
1.11
@@ -418,9 +418,6 @@
   <li><a href="/philosophy/censoring-emacs.html" hreflang="en">Zensur meiner
 Software (Emacs)</a>, von <a href="http://www.stallman.org";>Richard
 Stallman</a>, 1996. Datamation.</li>
-
-  <li><a href="/philosophy/motivation.html" hreflang="en">Studien zeigen: Lohn 
oft
-keine Motivation</a></li>
 </ul>
 
 <h3 id="terminology">Terminologie und Definitionen</h3>
@@ -516,7 +513,7 @@
 <!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2011/12/08 01:26:23 $
+$Date: 2012/01/05 17:28:54 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/essays-and-articles.es.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.es.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/essays-and-articles.es.html      20 Nov 2011 17:27:14 -0000      
1.20
+++ philosophy/essays-and-articles.es.html      5 Jan 2012 17:28:54 -0000       
1.21
@@ -425,9 +425,6 @@
 
   <li><a href="/philosophy/censoring-emacs.es.html">Censurando Mi Software</a>,
 por <a href="http://www.stallman.org";>Richard Stallman</a></li>
-
-  <li><a href="/philosophy/motivation.es.html">Estudios encuentran a la 
recompensa
-frecuentemente como no motivadora</a></li>
 </ul>
 
 <h3 id="terminology">Terminología y Definiciones</h3>
@@ -543,7 +540,7 @@
 <!-- timestamp start -->
 Última actualización: 
 
-$Date: 2011/11/20 17:27:14 $
+$Date: 2012/01/05 17:28:54 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/essays-and-articles.pl.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.pl.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/essays-and-articles.pl.html      20 Nov 2011 17:27:15 -0000      
1.15
+++ philosophy/essays-and-articles.pl.html      5 Jan 2012 17:28:54 -0000       
1.16
@@ -444,9 +444,6 @@
 
   <li><a href="/philosophy/censoring-emacs.pl.html">Cenzura mojego 
programu</a>,
 <a href="http://www.stallman.org";>Richard Stallman</a>.</li>
-
-  <li><a href="/philosophy/motivation.pl.html">Badania wykazują, 
że&nbsp;nagroda
-często nie&nbsp;jest czynnikiem motywującym</a>.</li>
 </ul>
 
 <h3 id="terminology">Terminologia i&nbsp;definicje</h3>
@@ -545,7 +542,7 @@
 <!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2011/11/20 17:27:15 $
+$Date: 2012/01/05 17:28:54 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/can-you-trust.translist
===================================================================
RCS file: /web/www/www/philosophy/po/can-you-trust.translist,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/can-you-trust.translist       25 Dec 2011 05:18:24 -0000      
1.2
+++ philosophy/po/can-you-trust.translist       5 Jan 2012 17:29:00 -0000       
1.3
@@ -2,37 +2,39 @@
 <div id="translations">
 <ul class="translations-list">
 <!-- Arabic -->
-<li><a 
href="/philosophy/can-you-trust.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
+<li><a 
href="/philosophy/can-you-trust.ar.html">العربية</a>&nbsp;[ar]</li>
 <!-- Bulgarian -->
-<li><a 
href="/philosophy/can-you-trust.bg.html">&#x431;&#x44A;&#x43B;&#x433;&#x430;&#x440;&#x441;&#x43A;&#x438;</a>&nbsp;[bg]</li>
+<li><a 
href="/philosophy/can-you-trust.bg.html">български</a>&nbsp;[bg]</li>
 <!-- German -->
 <li><a href="/philosophy/can-you-trust.de.html">Deutsch</a>&nbsp;[de]</li>
 <!-- English -->
 <li><a href="/philosophy/can-you-trust.en.html">English</a>&nbsp;[en]</li>
 <!-- Spanish -->
-<li><a 
href="/philosophy/can-you-trust.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li>
+<li><a href="/philosophy/can-you-trust.es.html">español</a>&nbsp;[es]</li>
 <!-- Farsi (Persian) -->
-<li><a 
href="/philosophy/can-you-trust.fa.html">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc;</a>&nbsp;[fa]</li>
+<li><a href="/philosophy/can-you-trust.fa.html">فارسی</a>&nbsp;[fa]</li>
 <!-- French -->
-<li><a 
href="/philosophy/can-you-trust.fr.html">fran&ccedil;ais</a>&nbsp;[fr]</li>
+<li><a href="/philosophy/can-you-trust.fr.html">français</a>&nbsp;[fr]</li>
 <!-- Hebrew -->
-<li><a 
href="/philosophy/can-you-trust.he.html">&#x05e2;&#x05d1;&#x05e8;&#x05d9;&#x05ea;</a>&nbsp;[he]</li>
+<li><a href="/philosophy/can-you-trust.he.html">עברית</a>&nbsp;[he]</li>
 <!-- Italian -->
 <li><a href="/philosophy/can-you-trust.it.html">italiano</a>&nbsp;[it]</li>
 <!-- Korean -->
-<li><a 
href="/philosophy/can-you-trust.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
+<li><a href="/philosophy/can-you-trust.ko.html">한국어</a>&nbsp;[ko]</li>
 <!-- Dutch -->
 <li><a href="/philosophy/can-you-trust.nl.html">Nederlands</a>&nbsp;[nl]</li>
 <!-- Polish -->
 <li><a href="/philosophy/can-you-trust.pl.html">polski</a>&nbsp;[pl]</li>
+<!-- Russian -->
+<li><a 
href="/philosophy/can-you-trust.ru.html">русский</a>&nbsp;[ru]</li>
 <!-- Tamil -->
-<li><a 
href="/philosophy/can-you-trust.ta.html">&#2980;&#2990;&#3007;&#2996;&#3021;</a>&nbsp;[ta]</li>
+<li><a 
href="/philosophy/can-you-trust.ta.html">தமிழ்</a>&nbsp;[ta]</li>
 <!-- Turkish -->
-<li><a 
href="/philosophy/can-you-trust.tr.html">T&uuml;rk&ccedil;e</a>&nbsp;[tr]</li>
+<li><a href="/philosophy/can-you-trust.tr.html">Türkçe</a>&nbsp;[tr]</li>
 <!-- Chinese (Simplified) -->
-<li><a 
href="/philosophy/can-you-trust.zh-cn.html">&#x7b80;&#x4f53;&#x4e2d;&#x6587;</a>&nbsp;[zh-cn]</li>
+<li><a 
href="/philosophy/can-you-trust.zh-cn.html">简体中文</a>&nbsp;[zh-cn]</li>
 <!-- Chinese (Traditional) -->
-<li><a 
href="/philosophy/can-you-trust.zh-tw.html">&#x7e41;&#x9ad4;&#x4e2d;&#x6587;</a>&nbsp;[zh-tw]</li>
+<li><a 
href="/philosophy/can-you-trust.zh-tw.html">繁體中文</a>&nbsp;[zh-tw]</li>
 </ul>
 </div> <!-- id="translations" -->
 <!-- end translinks file -->

Index: philosophy/po/essays-and-articles.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ar.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/po/essays-and-articles.ar.po     23 Oct 2011 16:35:07 -0000      
1.18
+++ philosophy/po/essays-and-articles.ar.po     5 Jan 2012 17:29:03 -0000       
1.19
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: essays-and-articles.html\n"
-"POT-Creation-Date: 2011-10-23 12:25-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2009-11-09 12:45+0200\n"
 "Last-Translator: Hossam Hossny <address@hidden>\n"
 "Language-Team: Arabic\n"
@@ -1166,15 +1166,6 @@
 "<a href=\"/philosophy/censoring-emacs.html\">مراقبة برم
جياتي</a>،بقلم <a "
 "href=\"http://www.stallman.org\";>ريتشارد ستولمن</a>"
 
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
-"Motivator</a>"
-msgstr ""
-"<a href=\"/philosophy/motivation.html\">دراسات تؤكد أن 
الجوائز ليست المحفّز "
-"عادة</a>"
-
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Terminology and Definitions"
@@ -1385,6 +1376,14 @@
 msgid "Updated:"
 msgstr "حُدّثت:"
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
+#~ "Motivator</a>"
+#~ msgstr ""
+#~ "<a href=\"/philosophy/motivation.html\">دراسات تؤكد أن 
الجوائز ليست "
+#~ "المحفّز عادة</a>"
+
 # type: Content of: <div><h4>
 #~ msgid "Translations of this page"
 #~ msgstr "ترجمات هذه الصفحة"

Index: philosophy/po/essays-and-articles.bg.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.bg.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/essays-and-articles.bg.po     23 Oct 2011 16:35:07 -0000      
1.15
+++ philosophy/po/essays-and-articles.bg.po     5 Jan 2012 17:29:03 -0000       
1.16
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: essays-and-articles.html\n"
-"POT-Creation-Date: 2011-10-23 12:25-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2009-11-09 12:44+0200\n"
 "Last-Translator: Yavor Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -1204,15 +1204,6 @@
 "<a href=\"/philosophy/censoring-emacs.html\">Цензуриране на 
моя софтуер</a>, "
 "от <a href=\"http://www.stallman.org\";>Ричард Столман</a>"
 
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
-"Motivator</a>"
-msgstr ""
-"<a href=\"/philosophy/motivation.html\">Проучванията 
показват, че "
-"възнаграждението често не е мотивиращ 
фактор</a>"
-
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Terminology and Definitions"
@@ -1438,6 +1429,14 @@
 msgid "Updated:"
 msgstr "Последно обновяване:"
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
+#~ "Motivator</a>"
+#~ msgstr ""
+#~ "<a href=\"/philosophy/motivation.html\">Проучванията 
показват, че "
+#~ "възнаграждението често не е мотивиращ 
фактор</a>"
+
 # type: Content of: <div><h4>
 #~ msgid "Translations of this page"
 #~ msgstr "Други преводи на тази страница"

Index: philosophy/po/essays-and-articles.ca-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ca-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/essays-and-articles.ca-en.html        20 Nov 2011 17:27:31 
-0000      1.1
+++ philosophy/po/essays-and-articles.ca-en.html        5 Jan 2012 17:29:04 
-0000       1.2
@@ -378,9 +378,6 @@
   <li><a href="/philosophy/censoring-emacs.html">Censoring My
   Software</a>, by <a href="http://www.stallman.org";>Richard
   Stallman</a></li>
-
-  <li><a href="/philosophy/motivation.html">Studies Find Reward Often No
-  Motivator</a></li>
 </ul>
 
 <h3 id="terminology">Terminology and Definitions</h3>
@@ -462,7 +459,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/11/20 17:27:31 $
+$Date: 2012/01/05 17:29:04 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/essays-and-articles.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ca.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- philosophy/po/essays-and-articles.ca.po     1 Nov 2011 16:34:59 -0000       
1.27
+++ philosophy/po/essays-and-articles.ca.po     5 Jan 2012 17:29:04 -0000       
1.28
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: essays-and-articles.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-23 12:25-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2011-11-01 12:10+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -1169,15 +1169,6 @@
 "<a href=\"/philosophy/censoring-emacs.html\">Censuro el meu programa</a>, "
 "per <a href=\"http://www.stallman.org\";>Richard Stallman</a>"
 
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
-"Motivator</a>"
-msgstr ""
-"<a href=\"/philosophy/motivation.html\">Els estudis proven que les "
-"recompenses no sempre són motivadores</a>"
-
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Terminology and Definitions"
@@ -1371,6 +1362,14 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
+#~ "Motivator</a>"
+#~ msgstr ""
+#~ "<a href=\"/philosophy/motivation.html\">Els estudis proven que les "
+#~ "recompenses no sempre són motivadores</a>"
+
 # type: Content of: <div><h4>
 #~ msgid "Translations of this page"
 #~ msgstr "Traduccions d'aquesta pàgina"

Index: philosophy/po/essays-and-articles.de-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.de-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/essays-and-articles.de-en.html        8 Dec 2011 01:26:30 
-0000       1.2
+++ philosophy/po/essays-and-articles.de-en.html        5 Jan 2012 17:29:04 
-0000       1.3
@@ -378,9 +378,6 @@
   <li><a href="/philosophy/censoring-emacs.html">Censoring My
   Software</a>, by <a href="http://www.stallman.org";>Richard
   Stallman</a></li>
-
-  <li><a href="/philosophy/motivation.html">Studies Find Reward Often No
-  Motivator</a></li>
 </ul>
 
 <h3 id="terminology">Terminology and Definitions</h3>
@@ -462,7 +459,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/12/08 01:26:30 $
+$Date: 2012/01/05 17:29:04 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/essays-and-articles.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.de.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/po/essays-and-articles.de.po     8 Dec 2011 00:11:15 -0000       
1.11
+++ philosophy/po/essays-and-articles.de.po     5 Jan 2012 17:29:04 -0000       
1.12
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: essays-and-articles.html\n"
-"POT-Creation-Date: 2011-10-23 12:25-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2011-12-07 20:50+0100\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online (PUNKT) de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -1046,14 +1046,6 @@
 "Software (Emacs)</a>, von <a href=\"http://www.stallman.org\";>Richard "
 "Stallman</a>, 1996. Datamation."
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
-"Motivator</a>"
-msgstr ""
-"<a href=\"/philosophy/motivation.html\" hreflang=\"en\">Studien zeigen: Lohn "
-"oft keine Motivation</a>"
-
 #. type: Content of: <h3>
 msgid "Terminology and Definitions"
 msgstr "Terminologie und Definitionen"
@@ -1221,5 +1213,12 @@
 msgid "Updated:"
 msgstr "Aktualisierung:"
 
+#~ msgid ""
+#~ "<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
+#~ "Motivator</a>"
+#~ msgstr ""
+#~ "<a href=\"/philosophy/motivation.html\" hreflang=\"en\">Studien zeigen: "
+#~ "Lohn oft keine Motivation</a>"
+
 #~ msgid "Translations of this page"
 #~ msgstr "Übersetzungen dieser Seite"

Index: philosophy/po/essays-and-articles.es-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.es-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/essays-and-articles.es-en.html        20 Nov 2011 17:27:31 
-0000      1.1
+++ philosophy/po/essays-and-articles.es-en.html        5 Jan 2012 17:29:05 
-0000       1.2
@@ -378,9 +378,6 @@
   <li><a href="/philosophy/censoring-emacs.html">Censoring My
   Software</a>, by <a href="http://www.stallman.org";>Richard
   Stallman</a></li>
-
-  <li><a href="/philosophy/motivation.html">Studies Find Reward Often No
-  Motivator</a></li>
 </ul>
 
 <h3 id="terminology">Terminology and Definitions</h3>
@@ -462,7 +459,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/11/20 17:27:31 $
+$Date: 2012/01/05 17:29:05 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/essays-and-articles.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.es.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- philosophy/po/essays-and-articles.es.po     24 Oct 2011 17:02:38 -0000      
1.31
+++ philosophy/po/essays-and-articles.es.po     5 Jan 2012 17:29:06 -0000       
1.32
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: essays-and-articles.es 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-23 12:25-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2011-10-24 19:00+0200\n"
 "Last-Translator: Xavier Reina <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -519,8 +519,8 @@
 "<a href=\"/philosophy/freedom-or-power.html\" id=\"FreedomOrPower\">Freedom "
 "or Power?</a>"
 msgstr ""
-"<a href=\"/philosophy/freedom-or-power.es.html\" id=\"FreedomOrPower\">"
-"¿Libertad o Poder?</a>"
+"<a href=\"/philosophy/freedom-or-power.es.html\" id=\"FreedomOrPower"
+"\">¿Libertad o Poder?</a>"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -1110,10 +1110,10 @@
 "Richard Stallman regarding the use of proprietary software in cultural "
 "development."
 msgstr ""
-"<a href=\"http://www.insnet.org/ins_headlines.rxml?cust=212&amp;";
-"id=967\">Software Libre y Desarrollo Sostenible</a> &mdash; Un artículo "
-"corto de Richard Stallman sobre el uso de software propietario en el "
-"desarrollo cultural (texto en inglés)."
+"<a href=\"http://www.insnet.org/ins_headlines.rxml?cust=212&amp;id=967";
+"\">Software Libre y Desarrollo Sostenible</a> &mdash; Un artículo corto de "
+"Richard Stallman sobre el uso de software propietario en el desarrollo "
+"cultural (texto en inglés)."
 
 # type: Content of: <h4>
 #. type: Content of: <h4>
@@ -1191,15 +1191,6 @@
 "<a href=\"/philosophy/censoring-emacs.es.html\">Censurando Mi Software</a>, "
 "por <a href=\"http://www.stallman.org\";>Richard Stallman</a>"
 
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
-"Motivator</a>"
-msgstr ""
-"<a href=\"/philosophy/motivation.es.html\">Estudios encuentran a la "
-"recompensa frecuentemente como no motivadora</a>"
-
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Terminology and Definitions"
@@ -1396,6 +1387,14 @@
 msgid "Updated:"
 msgstr "Última actualización: "
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
+#~ "Motivator</a>"
+#~ msgstr ""
+#~ "<a href=\"/philosophy/motivation.es.html\">Estudios encuentran a la "
+#~ "recompensa frecuentemente como no motivadora</a>"
+
 # type: Content of: <div><h4>
 #~ msgid "Translations of this page"
 #~ msgstr "Traducciones de esta página"

Index: philosophy/po/essays-and-articles.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.fr.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/po/essays-and-articles.fr.po     23 Oct 2011 16:35:08 -0000      
1.20
+++ philosophy/po/essays-and-articles.fr.po     5 Jan 2012 17:29:06 -0000       
1.21
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: essays-and-articles.html\n"
-"POT-Creation-Date: 2011-10-23 12:25-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2009-12-12 16:17+0100\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -189,6 +189,9 @@
 "libres</a>"
 
 #. type: Content of: <ul><li>
+# | <a [-href=\"/philosophy/fs-motives.html\">Motives For Writing-]
+# | {+href=\"/philosophy/gov-promote.html\">How Should Governments Promote+}
+# | Free Software{+?+}</a>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/philosophy/fs-motives.html\">Motives For Writing Free "
@@ -447,6 +450,9 @@
 "respecter la GPL GNU</a>"
 
 #. type: Content of: <ul><li>
+# | <a [-href=\"/philosophy/selling.html\">Selling Free Software</a> is OK!-]
+# | {+href=\"/philosophy/selling-exceptions.html\">On Selling Exceptions to
+# | the GNU GPL</a>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/philosophy/selling.html\">Selling Free Software</a> is OK!"
@@ -531,6 +537,9 @@
 msgstr "Copyright"
 
 #. type: Content of: <ul><li>
+# | <a [-href=\"/philosophy/wsis.html\">World Summit on-]
+# | {+href=\"/philosophy/public-domain-manifesto.html\">Why I Will Not Sign+}
+# | the [-Information Society</a>-] {+Public Domain Manifesto</a>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/philosophy/wsis.html\">World Summit on the Information "
@@ -652,6 +661,9 @@
 msgstr "Gestion des restrictions numériques"
 
 #. type: Content of: <ul><li>
+# | <a [-href=\"http://www.bostonreview.net/BR33.2/stallman.php\";>The root of
+# | this-] {+href=\"/philosophy/the-root-of-this-problem.html\">The+} problem
+# | is software controlled by its developer</a>, by Richard&nbsp;M. Stallman.
 #, fuzzy
 #| msgid ""
 #| "<a href=\"http://www.bostonreview.net/BR33.2/stallman.php\";>The root of "
@@ -806,6 +818,12 @@
 "non)"
 
 #. type: Content of: <ul><li>
+# | In <a
+# | 
[-href=\"http://www.eff.org/IP/DMCA/Felten_v_RIAA/20010606_eff_felten_pr.html\";>-]
+# | 
{+href=\"https://www.eff.org/press/releases/princeton-scientists-sue-over-squelched-research\";>+}
+# | Felten v. RIAA</a>, scientists are asking a court to rule that the Digital
+# | Millennium Copyright Act (DMCA) does not prohibit them from publishing
+# | their research.
 #, fuzzy
 #| msgid ""
 #| "In <a href=\"http://www.eff.org/IP/DMCA/";
@@ -825,6 +843,10 @@
 "Copyright Act (DMCA) ne les empêche pas de publier leur recherche."
 
 #. type: Content of: <ul><li>
+# | <a [-href=\"http://www.eff.org/IP/Video/MPAA_DVD_cases/\";>EFF-]
+# | {+href=\"https://www.eff.org/search/site/dvd cases/\">EFF+}
+# | &ldquo;Intellectual [-Property:-] {+Property&rdquo;:+} MPAA (Motion
+# | Picture Association of America) DVD [-Cases&rdquo;-] {+Cases+} Archive</a>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"http://www.eff.org/IP/Video/MPAA_DVD_cases/\";>EFF &ldquo;"
@@ -934,6 +956,9 @@
 msgstr ""
 
 #. type: Content of: <ul><li>
+# | <a href=\"/philosophy/digital-inclusion-in-freedom.html\">Is Digital
+# | Inclusion A Good Thing? How Can We Make Sure It Is?</a> {+by <a
+# | href=\"http://www.stallman.org\";>Richard Stallman</a>+}
 #, fuzzy
 #| msgid ""
 #| "<a href=\"/philosophy/digital-inclusion-in-freedom.html\">Is Digital "
@@ -1085,14 +1110,6 @@
 "<a href=\"/philosophy/censoring-emacs.fr.html\">Censurer mon logiciel</a>, "
 "par <a href=\"http://www.stallman.org\";>Richard Stallman</a>"
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
-"Motivator</a>"
-msgstr ""
-"<a href=\"/philosophy/motivation.fr.html\">Des études montrent que la "
-"rémunération n'est souvent pas une motivation</a>"
-
 #. type: Content of: <h3>
 msgid "Terminology and Definitions"
 msgstr "Terminologie et définitions"
@@ -1233,6 +1250,9 @@
 "la soumission de traductions de cet article."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# | 2005, 2006, 2007, 2008, [-2009-] {+2009, 2010+} Free Software Foundation,
+# | Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, "
@@ -1266,6 +1286,13 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour&nbsp;:"
 
+#~ msgid ""
+#~ "<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
+#~ "Motivator</a>"
+#~ msgstr ""
+#~ "<a href=\"/philosophy/motivation.fr.html\">Des études montrent que la "
+#~ "rémunération n'est souvent pas une motivation</a>"
+
 #~ msgid "Translations of this page"
 #~ msgstr "Traductions de cette page"
 

Index: philosophy/po/essays-and-articles.pl-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.pl-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/essays-and-articles.pl-en.html        20 Nov 2011 17:27:31 
-0000      1.1
+++ philosophy/po/essays-and-articles.pl-en.html        5 Jan 2012 17:29:07 
-0000       1.2
@@ -378,9 +378,6 @@
   <li><a href="/philosophy/censoring-emacs.html">Censoring My
   Software</a>, by <a href="http://www.stallman.org";>Richard
   Stallman</a></li>
-
-  <li><a href="/philosophy/motivation.html">Studies Find Reward Often No
-  Motivator</a></li>
 </ul>
 
 <h3 id="terminology">Terminology and Definitions</h3>
@@ -462,7 +459,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/11/20 17:27:31 $
+$Date: 2012/01/05 17:29:07 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/essays-and-articles.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.pl.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/essays-and-articles.pl.po     24 Oct 2011 00:34:10 -0000      
1.24
+++ philosophy/po/essays-and-articles.pl.po     5 Jan 2012 17:29:07 -0000       
1.25
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: essays-and-articles.html\n"
-"POT-Creation-Date: 2011-10-23 12:25-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2011-10-23 15:37-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <address@hidden>\n"
@@ -1198,15 +1198,6 @@
 "<a href=\"/philosophy/censoring-emacs.pl.html\">Cenzura mojego programu</a>, "
 "<a href=\"http://www.stallman.org\";>Richard Stallman</a>."
 
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
-"Motivator</a>"
-msgstr ""
-"<a href=\"/philosophy/motivation.pl.html\">Badania wykazują, 
że&nbsp;nagroda "
-"często nie&nbsp;jest czynnikiem motywującym</a>."
-
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Terminology and Definitions"
@@ -1401,6 +1392,14 @@
 msgid "Updated:"
 msgstr "Aktualizowane:"
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
+#~ "Motivator</a>"
+#~ msgstr ""
+#~ "<a href=\"/philosophy/motivation.pl.html\">Badania wykazują, że&nbsp;"
+#~ "nagroda często nie&nbsp;jest czynnikiem motywującym</a>."
+
 # type: Content of: <div><h4>
 #~ msgid "Translations of this page"
 #~ msgstr "Tłumaczenia tej strony"

Index: philosophy/po/essays-and-articles.pot
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.pot,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/po/essays-and-articles.pot       23 Oct 2011 16:35:08 -0000      
1.14
+++ philosophy/po/essays-and-articles.pot       5 Jan 2012 17:29:07 -0000       
1.15
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-23 12:25-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -776,12 +776,6 @@
 "<a href=\"http://www.stallman.org\";>Richard Stallman</a>"
 msgstr ""
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
-"Motivator</a>"
-msgstr ""
-
 #. type: Content of: <h3>
 msgid "Terminology and Definitions"
 msgstr ""

Index: philosophy/po/essays-and-articles.pt-br.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.pt-br.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/essays-and-articles.pt-br.po  23 Oct 2011 16:35:08 -0000      
1.15
+++ philosophy/po/essays-and-articles.pt-br.po  5 Jan 2012 17:29:07 -0000       
1.16
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: essays-and-articles.html\n"
-"POT-Creation-Date: 2011-10-23 12:25-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2009-11-09 12:47+0200\n"
 "Last-Translator: Leandro Guimarães Faria Corcete DUTRA <leandro.gfc."
 "address@hidden>\n"
@@ -932,13 +932,6 @@
 "<a href=\"http://www.stallman.org\";>Richard Stallman</a>"
 msgstr ""
 
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
-"Motivator</a>"
-msgstr ""
-
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Terminology and Definitions"

Index: philosophy/po/essays-and-articles.ro.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ro.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/po/essays-and-articles.ro.po     23 Oct 2011 16:35:08 -0000      
1.12
+++ philosophy/po/essays-and-articles.ro.po     5 Jan 2012 17:29:07 -0000       
1.13
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: essays-and-articles.ro.html\n"
-"POT-Creation-Date: 2011-10-23 12:25-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2010-09-27 19:14+0300\n"
 "Last-Translator: Cătălin Frâncu <address@hidden>\n"
 "Language-Team: Romanian <address@hidden>\n"
@@ -1072,14 +1072,6 @@
 "<a href=\"/philosophy/censoring-emacs.html\">Îmi cenzurez software-ul</a> "
 "(în engleză), de <a href=\"http://www.stallman.org\";>Richard Stallman</a>"
 
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
-"Motivator</a>"
-msgstr ""
-"<a href=\"/philosophy/motivation.html\">Unele studii arată că, adesea, "
-"răsplata nu este o motivație</a> (în engleză)"
-
 #. type: Content of: <h3>
 msgid "Terminology and Definitions"
 msgstr "Terminologie și Definiții"
@@ -1257,6 +1249,13 @@
 msgid "Updated:"
 msgstr "Actualizată:"
 
+#~ msgid ""
+#~ "<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
+#~ "Motivator</a>"
+#~ msgstr ""
+#~ "<a href=\"/philosophy/motivation.html\">Unele studii arată că, adesea, "
+#~ "răsplata nu este o motivație</a> (în engleză)"
+
 #~ msgid "Translations of this page"
 #~ msgstr "Traduceri ale acestei pagini"
 

Index: philosophy/po/essays-and-articles.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.sr.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/essays-and-articles.sr.po     23 Oct 2011 16:35:08 -0000      
1.15
+++ philosophy/po/essays-and-articles.sr.po     5 Jan 2012 17:29:07 -0000       
1.16
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: essays-and-articles.html\n"
-"POT-Creation-Date: 2011-10-23 12:25-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2009-11-09 12:48+0200\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -1202,15 +1202,6 @@
 "<a href=\"/philosophy/censoring-emacs.html\">Како сам 
цензурисао свој "
 "софтвер</a>, од <a href=\"http://www.stallman.org\";>Ричарда 
Сталмана</a>"
 
-# type: Content of: <ul><li>
-#. type: Content of: <ul><li>
-msgid ""
-"<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
-"Motivator</a>"
-msgstr ""
-"<a href=\"/philosophy/motivation.html\">Истраживања 
показују да награда "
-"често не пружа мотивацију</a>"
-
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Terminology and Definitions"
@@ -1433,6 +1424,14 @@
 msgid "Updated:"
 msgstr "Ажурирано:"
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<a href=\"/philosophy/motivation.html\">Studies Find Reward Often No "
+#~ "Motivator</a>"
+#~ msgstr ""
+#~ "<a href=\"/philosophy/motivation.html\">Истраживања 
показују да награда "
+#~ "често не пружа мотивацију</a>"
+
 # type: Content of: <div><h4>
 #~ msgid "Translations of this page"
 #~ msgstr "Преводи ове странице"

Index: philosophy/po/essays-and-articles.translist
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.translist,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/essays-and-articles.translist 25 Dec 2011 05:18:17 -0000      
1.2
+++ philosophy/po/essays-and-articles.translist 5 Jan 2012 17:29:07 -0000       
1.3
@@ -2,27 +2,27 @@
 <div id="translations">
 <ul class="translations-list">
 <!-- Arabic -->
-<li><a 
href="/philosophy/essays-and-articles.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
+<li><a 
href="/philosophy/essays-and-articles.ar.html">العربية</a>&nbsp;[ar]</li>
 <!-- Bulgarian -->
-<li><a 
href="/philosophy/essays-and-articles.bg.html">&#x431;&#x44A;&#x43B;&#x433;&#x430;&#x440;&#x441;&#x43A;&#x438;</a>&nbsp;[bg]</li>
+<li><a 
href="/philosophy/essays-and-articles.bg.html">български</a>&nbsp;[bg]</li>
 <!-- Catalan -->
-<li><a 
href="/philosophy/essays-and-articles.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li>
+<li><a href="/philosophy/essays-and-articles.ca.html">català
</a>&nbsp;[ca]</li>
 <!-- German -->
 <li><a 
href="/philosophy/essays-and-articles.de.html">Deutsch</a>&nbsp;[de]</li>
 <!-- English -->
 <li><a 
href="/philosophy/essays-and-articles.en.html">English</a>&nbsp;[en]</li>
 <!-- Spanish -->
-<li><a 
href="/philosophy/essays-and-articles.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li>
+<li><a 
href="/philosophy/essays-and-articles.es.html">español</a>&nbsp;[es]</li>
 <!-- French -->
-<li><a 
href="/philosophy/essays-and-articles.fr.html">fran&ccedil;ais</a>&nbsp;[fr]</li>
+<li><a 
href="/philosophy/essays-and-articles.fr.html">français</a>&nbsp;[fr]</li>
 <!-- Polish -->
 <li><a href="/philosophy/essays-and-articles.pl.html">polski</a>&nbsp;[pl]</li>
 <!-- Brazilian Portuguese -->
-<li><a href="/philosophy/essays-and-articles.pt-br.html">portugu&ecirc;s do 
Brasil</a>&nbsp;[pt-br]</li>
+<li><a href="/philosophy/essays-and-articles.pt-br.html">português do 
Brasil</a>&nbsp;[pt-br]</li>
 <!-- Romanian -->
-<li><a 
href="/philosophy/essays-and-articles.ro.html">rom&#x00e2;n&#x0103;</a>&nbsp;[ro]</li>
+<li><a 
href="/philosophy/essays-and-articles.ro.html">română</a>&nbsp;[ro]</li>
 <!-- Serbian -->
-<li><a 
href="/philosophy/essays-and-articles.sr.html">&#x0441;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a>&nbsp;[sr]</li>
+<li><a 
href="/philosophy/essays-and-articles.sr.html">српски</a>&nbsp;[sr]</li>
 </ul>
 </div> <!-- id="translations" -->
 <!-- end translinks file -->

Index: philosophy/po/java-trap.bg.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.bg.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/po/java-trap.bg.po       20 Sep 2011 17:17:24 -0000      1.16
+++ philosophy/po/java-trap.bg.po       5 Jan 2012 17:29:07 -0000       1.17
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2011-09-20 12:29-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2009-06-24 15:08+0300\n"
 "Last-Translator: Kaloian Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -123,7 +123,7 @@
 #| msgid ""
 #| "Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
 msgid ""
-"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
+"Please also see: <a href=\"javascript-trap.html\">The JavaScript Trap</a>."
 msgstr ""
 "Вижте също и <a href=\"javascript-trap.html\">Клопката на 
Javascript</a>"
 

Index: philosophy/po/java-trap.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.fr.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/po/java-trap.fr.po       5 Jan 2012 01:27:42 -0000       1.22
+++ philosophy/po/java-trap.fr.po       5 Jan 2012 17:29:07 -0000       1.23
@@ -8,13 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2011-09-20 12:29-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2012-01-04 21:18+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-01-05 12:25-0500\n"
 "Language: fr\n"
 "Plural-Forms:  \n"
 
@@ -104,8 +105,13 @@
 "l'histoire de Java de manière à éviter d'autres pièges à l'avenir."
 
 #. type: Content of: <div><p>
+# | Please also see: <a href=\"javascript-trap.html\">The Java[-s-]{+S+}cript
+# | Trap</a>.
+#, fuzzy
+#| msgid ""
+#| "Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
 msgid ""
-"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
+"Please also see: <a href=\"javascript-trap.html\">The JavaScript Trap</a>."
 msgstr ""
 "Veuillez aussi consulter&nbsp;: <a href=\"javascript-trap.html\">Le piège "
 "JavaScript</a>."

Index: philosophy/po/java-trap.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.it.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- philosophy/po/java-trap.it.po       20 Sep 2011 17:17:25 -0000      1.32
+++ philosophy/po/java-trap.it.po       5 Jan 2012 17:29:08 -0000       1.33
@@ -5,13 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2011-09-20 12:29-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2011-07-23 11:41+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-01-05 12:25-0500\n"
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
@@ -108,8 +109,13 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Please also see: <a href=\"javascript-trap.html\">The Java[-s-]{+S+}cript
+# | Trap</a>.
+#, fuzzy
+#| msgid ""
+#| "Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
 msgid ""
-"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
+"Please also see: <a href=\"javascript-trap.html\">The JavaScript Trap</a>."
 msgstr ""
 "Vedete anche: <a href=\"javascript-trap.html\">La trappola Javascript</a>."
 

Index: philosophy/po/java-trap.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.pl.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/po/java-trap.pl.po       20 Sep 2011 17:17:25 -0000      1.16
+++ philosophy/po/java-trap.pl.po       5 Jan 2012 17:29:08 -0000       1.17
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2011-09-20 12:29-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2010-08-19 00:39+0100\n"
 "Last-Translator: Daniel Oźminkowski <address@hidden>\n"
 "Language-Team: Polish <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-01-05 12:25-0500\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
@@ -113,8 +114,13 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Please also see: <a href=\"javascript-trap.html\">The Java[-s-]{+S+}cript
+# | Trap</a>.
+#, fuzzy
+#| msgid ""
+#| "Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
 msgid ""
-"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
+"Please also see: <a href=\"javascript-trap.html\">The JavaScript Trap</a>."
 msgstr "Zobacz też: <a href=\"javascript-trap.html\">Pułapka Javascript</a>."
 
 # type: Content of: <p>

Index: philosophy/po/java-trap.pot
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.pot,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/po/java-trap.pot 20 Sep 2011 17:17:25 -0000      1.14
+++ philosophy/po/java-trap.pot 5 Jan 2012 17:29:08 -0000       1.15
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-20 12:29-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -76,7 +76,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Please also see: <a href=\"javascript-trap.html\">The Javascript 
Trap</a>."
+msgid "Please also see: <a href=\"javascript-trap.html\">The JavaScript 
Trap</a>."
 msgstr ""
 
 #. type: Content of: <p>

Index: philosophy/po/java-trap.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.sr.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/java-trap.sr.po       20 Sep 2011 17:17:25 -0000      1.15
+++ philosophy/po/java-trap.sr.po       5 Jan 2012 17:29:08 -0000       1.16
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2011-09-20 12:29-0300\n"
+"POT-Creation-Date: 2012-01-05 12:25-0500\n"
 "PO-Revision-Date: 2009-07-05 20:52+0200\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -123,7 +123,7 @@
 #| msgid ""
 #| "Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
 msgid ""
-"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
+"Please also see: <a href=\"javascript-trap.html\">The JavaScript Trap</a>."
 msgstr "Погледајте и: <a href=\"javascript-trap.html\">Замка 
ЈаваСписа</a>"
 
 # type: Content of: <p>

Index: software/devel.pl.html
===================================================================
RCS file: /web/www/www/software/devel.pl.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- software/devel.pl.html      20 Oct 2011 16:39:02 -0000      1.8
+++ software/devel.pl.html      5 Jan 2012 17:29:13 -0000       1.9
@@ -142,7 +142,11 @@
 href="http://nixos.org/nix/";>Nix</a>. Administratorzy <a
 href="http://hydra.nixos.org/";>serwera Hydra na&nbsp;Politechnice
 w&nbsp;Delft</a> wspaniałomyślnie zgodzili się na&nbsp;udostępnienie <a
-href="http://hydra.nixos.org/project/gnu";>zasobów dla Projektu GNU</a>.</p>
+href="http://hydra.nixos.org/project/gnu";>zasobów dla Projektu
+GNU</a>. Projekty na&nbsp;Hydra są ponownie kompilowane <em>przy każdym
+commit</em> lub&nbsp;zmianie w&nbsp;zależnościach, którekolwiek nastąpi
+pierwsze (zależności to <em>też</em> środowisko kompilacji, które zawiera
+wydane wersje GCC, GNU&nbsp;make, itd.)</p>
 
 <p>Obecnie może ona budować programy na&nbsp;GNU/Linux (i686 
oraz&nbsp;x86_64),
 jak również FreeBSD, Darwin oraz&nbsp;Cygwin, a&nbsp;także budować 
skrośnie
@@ -152,9 +156,16 @@
 <code>deb</code> oraz&nbsp;<code>RPM</code>. Pakiety mogą być budowane
 w&nbsp;oparciu o najnowszą wersją swoich zależności. Na&nbsp;przykład 
GnuTLS
 jest budowane z&nbsp;użyciem najnowszych wersji GNU&nbsp;libtasn1
-oraz&nbsp;GNU&nbsp;libgrypt. Ponadto, oprócz interfejsu sieciowego, Hydra
-może wysyłać powiadomienia przez email kiedy zmieni się status budowy
-projektu (np. z&nbsp;<code>SUCCEEDED</code> na&nbsp;<code>FAILED</code>).</p>
+oraz&nbsp;GNU&nbsp;libgrypt.</p>
+
+<p>Oprócz <a href="http://hydra.nixos.org/project/gnu";>interfejsu 
webowego</a>,
+Hydra może wysyłać powiadomienia mailem kiedy zmieni się status kompilacji
+projektu (np. z&nbsp;<code>SUCCEEDED</code>
+na&nbsp;<code>FAILED</code>). Gdy pakiet ma status <code>FAILED</code>, log
+i&nbsp;drzewo kompilacji są dostępne z&nbsp;interfejsu sieciowego; to drugie
+pozwala na&nbsp;podejrzenie wygenerowanych plików (przykładowo
+<code>config.log</code> lub&nbsp;<code>testsuite.log</code>)
+i&nbsp;uzyskania podpowiedzi przy debugowaniu.</p>
 
 <p>Dowolny pakiet oprogramowania GNU może wnieść prośbę o zasoby
 na&nbsp;Hydra. Każdy pakiet musi dostarczyć swój własny &ldquo;przepis
@@ -165,7 +176,7 @@
 używających standardowych narzędzi GNU takich jak Automake
 oraz&nbsp;Autoconf, przepis jest całkiem prosty. Dla przykładu, <a
 
href="http://git.savannah.gnu.org/cgit/hydra-recipes.git/tree/patch/release.nix";>przepis
-dla Patch</a>. Proszę pytania o porady kierować na&nbsp;listę <a
+dla GNU&nbsp;Patch</a>. Proszę pytania o porady kierować na&nbsp;listę <a
 href="mailto:address@hidden";>address@hidden</a>.</p>
 
 <p>Po&nbsp;konsultacji Waszego przepisu budowy, napiszcie na&nbsp;listę <a
@@ -218,7 +229,7 @@
 chęci współpracy w&nbsp;tłumaczeniu prosimy kierować na&nbsp;adres <a
 href="mailto:address@hidden";>address@hidden</a>.</p>
 
-<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2012 Free Software Foundation, Inc.</p>
 
 <p>Ten utwór jest dostępny na&nbsp;<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.pl";>licencji
@@ -231,11 +242,13 @@
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 Tłumaczenie: Daniel Oźminkowski 2010; Poprawki: Jan Wieremjewicz 2010, Jan
-Owoc 2010, 2011.</div>
+Owoc 2010, 2011, 2012.</div>
+
+
  <p><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2011/10/20 16:39:02 $
+$Date: 2012/01/05 17:29:13 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/can-you-trust.ru.html
===================================================================
RCS file: philosophy/can-you-trust.ru.html
diff -N philosophy/can-you-trust.ru.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/can-you-trust.ru.html    5 Jan 2012 17:28:53 -0000       1.1
@@ -0,0 +1,377 @@
+
+<!--#include virtual="/server/header.ru.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Можете ли вы доверять своему 
компьютеру? - проект GNU - Фонд свободного
+программного обеспечения (ФСПО)</title>
+
+<!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/po/can-you-trust.translist" -->
+<h2>Можете ли вы доверять своему 
компьютеру?</h2>
+
+<!-- This document uses XHTML 1.0 Strict, but may be served as -->
+<!-- text/html.  Please ensure that markup style considers -->
+<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
+<!-- Please ensure links are consistent with Apache's MultiView. -->
+<!-- Change include statements to be consistent with the relevant -->
+<!-- language, where necessary. -->
+<p><a href="http://www.stallman.org/";>Ричард Столмен</a></p>
+
+<p>
+Чьим приказам должен подчиняться ваш 
компьютер? Большинство думает, что их
+компьютеры должны подчиняться им, а не 
кому-то другому. По плану, который
+они называют &ldquo;доверенными 
вычислениями&rdquo;, крупные записывающие
+компании (в том числе компании кино- и 
звукозаписи) вместе с такими
+компьютерными компаниями, как Intel и Microsoft, 
планируют заставить ваш
+компьютер подчиняться им вместо вас. 
(Версия этой схемы, предлагаемая
+компанией Microsoft, называется Palladium.) Раньше 
несвободные программы
+заключали в себе вредоносные особенности, 
но по этому плану они станут
+повсеместными.</p>
+<p>
+Несвободная программа означает, в 
принципе, что вы не контролируете то, что
+она делает; вы не можете изучить исходный 
текст или изменить ее. Нет ничего
+неожиданного в том, что хитроумные 
предприниматели находят способы
+воспользоваться своим контролем, чтобы 
поставить вас в невыгодное
+положение. Компания Microsoft делала это 
несколько раз: одна из версий
+Windows была спроектирована так, чтобы 
посылать в Microsoft отчеты обо всех
+программах на вашем жестком диске; 
недавнее обновление Windows Media Player,
+связанное с &ldquo;безопасностью&rdquo;, 
требовало, чтобы пользователи
+согласились с новыми ограничениями. Но 
компания Microsoft не одинока:
+программа для обмена музыкой KaZaa 
составлена так, чтобы деловой партнер
+KaZaa мог сдавать ваш компьютер в аренду 
своим клиентам. Эти вредоносные
+особенности часто секретны, но даже когда 
вы узнаете о них, их трудно
+удалить, поскольку у вас нет исходного 
текста.</p>
+<p>
+В прошлом это были отдельные случаи. 
&ldquo;Доверенные вычисления&rdquo;
+сделали бы эту практику всеобъемлющей. Для 
них больше подходит название
+&ldquo;вероломные вычисления&rdquo;, потому что 
план был составлен так,
+чтобы гарантировать, что ваш компьютер 
будет систематически выходить у вас
+из подчинения. Фактически он составлен для 
того, чтобы ваш компьютер
+перестал фунционировать как компьютер 
общего назначения. Любая операция
+может потребовать явного разрешения.</p>
+<p>
+Техническая идея, стоящая за вероломными 
вычислениями, состоит в том, что в
+компьютере есть устройство шифрования и 
проверки цифровых подписей, а ключи
+хранятся в секрете от вас. Несвободные 
программы будут пользоваться этим
+устройством, чтобы контролировать, какие 
из других программ вы можете
+выполнять, к каким документам или данным у 
вас может быть доступ и каким
+программам вы можете их передавать. Эти 
программы будут постоянно загружать
+по сети новые правила получения доступа и 
автоматически применять эти
+правила к вашей работе. Если вы не дадите 
своему компьютеру периодически
+получать новые правила из Интернета, 
некоторые возможности будут
+автоматически отключаться.</p>
+<p>
+Конечно, Голливуд и записывающие компании 
планируют применять вероломные
+вычисления для цифрового управления 
ограничениями, с тем чтобы полученные
+фильмы и музыка могли воспроизводиться 
только на одном обозначенном
+компьютере. Обмен будет совершенно 
невозможен, по крайней мере, теми
+подписанными файлами, которые вы получали 
бы от этих компаний. У вас,
+широкой общественности, должна быть как 
свобода, так и возможность
+обмениваться этим. (Я предполагаю, что 
кто-нибудь найдет способ создания
+незашифрованных версий и обмена ими, так 
что цифровое управление
+ограничениями не добьется полного успеха, 
но это не оправдывает эту
+систему.)</p>
+<p>
+Когда обмен делают невозможным, это уже 
достаточно плохо, но они идут
+дальше. Есть планы по применению той же тех
ники для электронной почты и
+документов&nbsp;&mdash; что приведет к 
сообщениям, исчезающим через две
+недели, или документам, которые можно 
прочесть только на компьютерах одной
+компании.</p>
+<p>
+Представьте себе, что вы получаете 
сообщение от своего шефа, в котором вам
+велят сделать что-нибудь, что вы считаете 
рискованным; через неделю, когда
+оно ушло в топку, вы не можете 
воспользоваться им, чтобы показать, что это
+было не ваше решение. &ldquo;Получение в 
письменном виде&rdquo; не защитит
+вас, когда приказ написан исчезающими 
чернилами.</p>
+<p>
+Представьте себе, что вы получаете 
сообщение от своего шефа, в котором
+устанавливаются правила, нарушающие закон 
или возмутительные с точки зрения
+нравственности, например, уничтожать 
отчетные документы вашей компании или
+бездействовать в обстоятельствах, которые 
могут представлять серьезную
+опасность для вашей страны. Сегодня вы 
можете переслать это журналисту, и об
+этой деятельности станет известно. При 
вероломных вычислениях журналист не
+сможет прочесть документ; его компьютер 
откажется ему
+подчиняться. Вероломные вычисления&nbsp;&mdash; 
рай для коррупции.</p>
+<p>
+В таких текстовых процессорах, как Microsoft 
Word, вероломные вычисления
+могли бы применяться при сохранении ваших 
документов, чтобы гарантировать,
+что никакой конкурирующий текстовый 
процессор не сможет их прочесть. Сегодня
+мы должны разузнавать секреты формата Word 
путем кропотливых экспериментов,
+чтобы свободные текстовые процессоры 
могли читать документы Word. Если Word
+при сохранении документов будет 
зашифровывать их с помощью вероломных
+вычислений, у сообщества свободного 
программного обеспечения не останется
+никакой возможности разработать 
программы для чтения их&nbsp;&mdash; и даже
+если бы мы могли это, такие программы могли 
бы быть запрещены Законом об
+авторском праве цифрового тысячелетия.</p>
+<p>
+Программы, применяющие вероломные 
вычисления, будут постоянно загружать из
+Интернета новые правила получения доступа 
и автоматически применять эти
+правила к вашей работе. Если Microsoft или 
правительство США не понравится
+то, что вы сказали в написанном вами 
документе, они смогли бы разослать
+новые указания, в которых всем компьютерам 
приказано не давать никому
+прочесть этот документ. Каждый компьютер 
стал бы подчиняться им, когда
+загрузит новые указания. Вашу запись можно 
было бы удалить задним числом в
+стиле &ldquo;1984&rdquo;. Вы сами не cмогли бы 
прочесть ее.</p>
+<p>
+Вы могли бы подумать, что вы можете 
разузнать, какие мерзости делает
+приложение, использующее вероломные 
вычисления, изучить, насколько они
+болезненны, и решить, идти ли на это. Даже 
если вы можете разузнать это,
+было бы глупо соглашаться на такую сделку, 
но вы не можете даже ожидать, что
+условия сделки будут оставаться 
неизменными. Как только вы становитесь
+зависимы от программы, вы сели на крючок, и 
они знают это; тогда они могут
+изменить условия сделки. Некоторые 
приложения станут автоматически загружать
+обновления, которые будут делать что-то 
другое&nbsp;&mdash; и они не дадут
+вам возможности решать, проводить ли 
обновление.</p>
+<p>
+Сегодня вы можете избежать ограничения 
несвободными программами, если не
+будете пользоваться ими. Если у вас GNU/Linux 
или другая свободная
+операционная система и если вы не 
устанавливаете на ней несвободные
+приложения, то вы управляете тем, что 
делает ваш компьютер. Если в свободной
+программе есть вредоносная особенность, 
другие разработчики сообщества ее
+удалят и вы сможете пользоваться 
исправленной версией. Вы также можете
+работать со свободными прикладными 
программами и средствами разработки на
+несвободных операционных системах; это не 
предоставляет вам полной свободы,
+но многие пользователи практикуют это.</p>
+<p>
+Вероломные вычисления создают угрозу 
существованию свободных операционных
+систем и свободных приложений, потому что 
вы, возможно, вообще не будете в
+состоянии выполнять их. В некоторых 
версиях вероломных вычислений от
+операционной системы потребовалось бы, 
чтобы она была одобрена конкретной
+компанией. Свободные операционные системы 
нельзя было бы установить. В
+некоторых версиях вероломных вычислений 
от каждой программы потребовалось
+бы, чтобы она была особым образом одобрена 
разработчиком операционной
+системы. В такой системе вы не смогли бы 
выполнять свободные
+приложения. Если бы вы нашли способ делать 
это и рассказали об этом
+кому-нибудь, это могло бы быть нарушением 
закона.</p>
+<p>
+Уже есть проекты законов США, которые 
потребовали бы, чтобы все компьютеры
+поддерживали вероломные вычисления. CBDTPA 
(мы называем его законом
+&ldquo;Потребляй, но не вздумай 
программировать&rdquo;)&nbsp;&mdash; один из
+них. Но даже если они не заставят вас 
перейти на вероломные вычисления
+законодательным путем, давление с целью 
заставить принять их может быть
+неимоверным. Сегодня люди часто 
пользуются форматом Word для переговоров,
+хотя это приводит к разного рода проблемам 
(см. <a
+href="/philosophy/no-word-attachments.html">&ldquo;Мы можем 
положить конец
+вложениям Word&rdquo;</a>). Если читать документы 
последней версии Word
+сможет только машина с вероломными 
вычислениями, многие перейдут на нее,
+если будут смотреть на ситуацию только как 
на личный выбор (принять или
+отказаться). Чтобы противостоять 
вероломным вычислениям, мы должны
+объединиться и рассматривать ситуацию как 
коллективное решение.</p>
+<p>
+Подробнее о вероломных вычислениях см. на <a
+href="http://www.cl.cam.ac.uk/users/rja14/tcpa-faq.html";>http://www.cl.cam.ac.uk/users/rja14/tcpa-faq.html</a>.</p>
+<p>
+Чтобы остановить вероломные вычисления, 
потребуется организация большого
+числа граждан. Нам нужна ваша помощь! 
Поддержите, пожалуйста, <a
+href="http://DefectiveByDesign.org";>&ldquo;Дефект 
гарантирован&rdquo;</a>,
+кампанию ФСПО против цифрового управления 
ограничениями.</p>
+
+<h3>Более поздние замечания</h3>
+
+<ol>
+<li>В отрасли компьютерной безопасности 
термин &ldquo;доверенные
+вычисления&rdquo; употребляют в другом 
смысле&nbsp;&mdash; не путайте два
+этих значения.
+</li>
+<li>Проект GNU распространяет программу GNU 
Privacy Guard, в которой реализовано
+шифрование с открытым ключом и цифровые 
подписи и которую вы можете
+применять для безопасной и 
конфиденциальной электронной переписки. 
Полезно
+рассмотреть, чем GPG отличается от 
вероломных вычислений и понять, что
+делает первую полезной, а вторые такими 
опасными.
+<p>
+Когда кто-то пользуется GPG, чтобы послать 
вам зашифрованный документ, а вы
+пользуетесь GPG, чтобы расшифровать его, в 
результате получается
+незашифрованный документ, который вы 
можете читать, пересылать, копировать и
+даже перезашифровать, чтобы безопасно 
переслать его кому-то еще. Приложение
+с вероломными вычислениями позволило бы 
вам читать слова с экрана, но не
+позволило бы вам создать незашифрованный 
документ, с которым вы могли бы
+делать что-то другое. GPG, пакет свободных 
программ, делает функции
+безопасности доступными пользователям; 
<em>они</em> пользуются
+<em>пакетом</em>. Техника вероломных 
вычислений задумана, чтобы налагать
+ограничения на пользователей; <em>она</em> 
пользуется <em>ими</em>.</p></li>
+
+<li>
+Сторонники вероломных вычислений 
сосредоточивают свои обзоры на их <a
+name="beneficial">полезных применениях</a>. То, что 
они говорят, часто
+верно, просто это не важно.
+<p>
+Как большинство аппаратуры, аппаратуру, 
реализующую вероломные вычисления,
+можно применять в безвредных целях. Но эти 
возможности можно реализовать
+по-другому, без аппаратной реализации 
вероломных вычислений. Принципиальная
+перемена, которую приносят пользователям 
вероломные вычисления, состоит в
+том, что ваш компьютер принуждают работать 
против вас.</p>
+<p>
+То, что они говорят, верно; верно и то, что 
говорю я. Сложим это вместе, и
+что получится? Вероломные 
вычисления&nbsp;&mdash; это план, с помощью
+которого у нас отберут свободу, предложив 
взамен незначительные выгоды,
+чтобы отвлечь нас от того, что мы 
потеряем.</p></li>
+
+<li>Microsoft представляет Palladium как меру 
безопасности и заявляет, что это
+защитит от вирусов, но ложность этого 
заявления очевидна. В докладе, который
+подготовили в Microsoft Research в октябре 
2002&nbsp;года, утверждалось, что
+одна из характеристик системы Palladium 
состоит в том, что существующие
+операционные системы и приложения будут 
выполняться по-прежнему;
+следовательно, вирусы по-прежнему смогут 
делать все, что они могут делать
+сегодня.
+<p>
+Когда сотрудники Microsoft говорят о 
&ldquo;безопасности&rdquo; в связи с
+системой Palladium, они не подразумевают того, 
что мы обычно подразумеваем
+под этим словом: защиту вашей машины от 
того, чего вы не желаете. Они
+подразумевают защиту ваших копий данных 
на вашей машине от того, чтобы они
+были доступны вам так, как они не желают. На 
одном слайде доклада было
+перечислено несколько типов секретов, для 
хранения которых можно было бы
+применять Palladium, в том числе &ldquo;секреты 
третьих сторон&rdquo; и
+&ldquo;секреты пользователя&rdquo;&nbsp;&mdash; но 
&ldquo;секреты
+пользователя&rdquo; были в кавычках. Этим они 
признают, что в контексте
+системы Palladium секреты пользователя&nbsp;&mdash; 
это нечто абсурдное.</p>
+<p>
+В докладе часто употреблялись другие 
термины, которые у нас нередко
+ассоциируются с безопасностью, такие, как 
&ldquo;атака&rdquo;,
+&ldquo;вредоносная программа&rdquo;, 
&ldquo;подлог&rdquo;, а также
+&ldquo;доверенный&rdquo;. Ни один из них не 
означает того, что он обычно
+означает. &ldquo;Атака&rdquo; не значит, что 
кто-то пытается повредить
+вам&nbsp;&mdash; это значит, что вы пытаетесь 
скопировать
+музыку. &ldquo;Вредоносной программой&rdquo; 
называется программа,
+установленная вами, чтобы делать то, что 
кто-то другой хочет помешать делать
+на вашей машине. &ldquo;Подлог&rdquo; не значит, 
что вас кто-то обводит
+вокруг пальца, это значит, что вы обводите 
вокруг пальца Palladium. И так
+далее.</p></li>
+
+<li>В предшествующем заявлении 
разработчиков Palladium содержалась
+принципиальная предпосылка, согласно 
которой у того, кто выработал или
+собрал информацию, должен быть полный 
контроль над тем, как вы пользуетесь
+ею. Это стало бы революционным 
переворотом, перечеркивающим этические и
+юридические идеи прошлого, и создало 
беспрецедентную системы
+контроля. Конкретные проблемы этой 
системы не случайны; они вытекают из
+основной цели. Именно эту цель мы должны 
отвергнуть.</li>
+</ol>
+
+<hr />
+<h4>Этот очерк публикуется в сборнике <a
+href="http://shop.fsf.org/product/free-software-free-society/";><cite>Свободные
+программы, свободное общество: избранные 
очерки Ричарда
+М. Столмена</cite></a></h4>
+
+<!-- If needed, change the copyright block at the bottom. In general, -->
+<!-- all pages on the GNU web server should have the section about    -->
+<!-- verbatim copying.  Please do NOT remove this without talking     -->
+<!-- with the webmasters first. -->
+<!-- Please make sure the copyright date is consistent with the document -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.ru.html" -->
+<div id="footer">
+
+<p>
+Пожалуйста, присылайте запросы фонду и GNU 
по адресу <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Есть также <a
+href="/contact/">другие способы связаться</a> с 
фондом.
+<br />
+Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки или
+предложения по адресу <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p>
+
+<p>
+Сведения по координации и предложениям 
переводов этой статьи см. в <a
+href="/server/standards/README.translations.html">&ldquo;Р
уководстве по
+переводам&rdquo;</a>.
+</p>
+
+<p>
+Copyright &copy; 2002, 2007 Richard Stallman</p><p>Copyright &copy; 2011
+Free Software Foundation, Inc. (translation)
+</p>
+<p>Это произведение доступно по <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
+производных произведений</em>) 3.0 США</a>.
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+ </div>
+
+
+ <p>
+<!-- timestamp start -->
+Обновлено:
+
+$Date: 2012/01/05 17:28:53 $
+
+<!-- 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="/philosophy/can-you-trust.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
+<!-- Bulgarian -->
+<!-- <li><a 
href="/philosophy/can-you-trust.bg.html">&#x431;&#x44A;&#x43B;&#x433;&#x430;&#x440;&#x441;&#x43A;&#x438;</a>&nbsp;[bg]</li>
 -->
+<!-- German -->
+<!-- <li><a 
href="/philosophy/can-you-trust.de.html">Deutsch</a>&nbsp;[de]</li> -->
+<!-- English -->
+<!-- <li><a href="/philosophy/can-you-trust.html">English</a>&nbsp;[en]</li> 
-->
+<!-- Spanish -->
+<!-- <li><a 
href="/philosophy/can-you-trust.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> -->
+<!-- Farsi (Persian) -->
+<!-- <li><a 
href="/philosophy/can-you-trust.fa.html">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc;</a>&nbsp;[fa]</li>
 -->
+<!-- French -->
+<!-- <li><a 
href="/philosophy/can-you-trust.fr.html">fran&#x00e7;ais</a>&nbsp;[fr]</li> -->
+<!-- Hebrew -->
+<!-- <li><a 
href="/philosophy/can-you-trust.he.html">&#x05e2;&#x05d1;&#x05e8;&#x05d9;&#x05ea;</a>&nbsp;[he]</li>
 -->
+<!-- Italian -->
+<!-- <li><a 
href="/philosophy/can-you-trust.it.html">italiano</a>&nbsp;[it]</li> -->
+<!-- Korean -->
+<!-- <li><a 
href="/philosophy/can-you-trust.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
 -->
+<!-- Dutch -->
+<!-- <li><a 
href="/philosophy/can-you-trust.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
+<!-- Polish -->
+<!-- <li><a href="/philosophy/can-you-trust.pl.html">polski</a>&nbsp;[pl]</li> 
-->
+<!-- Turkish -->
+<!-- <li><a 
href="/philosophy/can-you-trust.tr.html">T&#x00fc;rk&#x00e7;e</a>&nbsp;[tr]</li>
 -->
+<!-- Tamil -->
+<!-- <li><a 
href="/philosophy/can-you-trust.ta.html">&#2980;&#2990;&#3007;&#2996;&#3021;</a>&nbsp;[ta]</li>
 -->
+<!-- Turkish -->
+<!-- <li><a 
href="/philosophy/can-you-trust.tr.html">T&#x00fc;rk&#x00e7;e</a>&nbsp;[tr]</li>
 -->
+<!-- Chinese(Simplified) -->
+<!-- <li><a 
href="/philosophy/can-you-trust.zh-cn.html">&#x7b80;&#x4f53;&#x4e2d;&#x6587;</a>&nbsp;[zh-cn]</li>
 -->
+<!-- Chinese(Traditional) -->
+<!-- <li><a 
href="/philosophy/can-you-trust.zh-tw.html">&#x7e41;&#x9ad4;&#x4e2d;&#x6587;</a>&nbsp;[zh-tw]</li>
 -->
+<!-- </ul>
+</gnun> -->
+<!-- </div>
+ -->
+</div>
+</body>
+</html>

Index: philosophy/po/can-you-trust.ru-en.html
===================================================================
RCS file: philosophy/po/can-you-trust.ru-en.html
diff -N philosophy/po/can-you-trust.ru-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/po/can-you-trust.ru-en.html      5 Jan 2012 17:29:00 -0000       
1.1
@@ -0,0 +1,341 @@
+<!--#include virtual="/server/header.html" -->
+<title>Can You Trust Your Computer? - GNU Project - Free Software Foundation 
(FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/po/can-you-trust.translist" -->
+<h2>Can You Trust Your Computer?</h2>
+
+<!-- This document uses XHTML 1.0 Strict, but may be served as -->
+<!-- text/html.  Please ensure that markup style considers -->
+<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
+
+<!-- Please ensure links are consistent with Apache's MultiView. -->
+<!-- Change include statements to be consistent with the relevant -->
+<!-- language, where necessary. -->
+
+<p>by <a href="http://www.stallman.org/";>Richard Stallman</a></p>
+
+<p>
+Who should your computer take its orders from?  Most people think
+their computers should obey them, not obey someone else.  With a plan
+they call &ldquo;trusted computing&rdquo;, large media corporations
+(including the movie companies and record companies), together with
+computer companies such as Microsoft and Intel, are planning to make
+your computer obey them instead of you.  (Microsoft's version of this
+scheme is called Palladium.)  Proprietary programs have
+included malicious features before, but this plan would make it
+universal.</p>
+<p>
+Proprietary software means, fundamentally, that you don't control what
+it does; you can't study the source code, or change it.  It's not
+surprising that clever businessmen find ways to use their control to
+put you at a disadvantage.  Microsoft has done this several times: one
+version of Windows was designed to report to Microsoft all the
+software on your hard disk; a recent &ldquo;security&rdquo; upgrade in
+Windows Media Player required users to agree to new restrictions.  But
+Microsoft is not alone: the KaZaa music-sharing software is designed
+so that KaZaa's business partner can rent out the use of your computer
+to its clients.  These malicious features are often secret, but even
+once you know about them it is hard to remove them, since you don't
+have the source code.</p>
+<p>
+In the past, these were isolated incidents.  &ldquo;Trusted
+computing&rdquo; would make the practice pervasive.  &ldquo;Treacherous
+computing&rdquo; is a more appropriate name, because the plan is
+designed to make sure your computer will systematically disobey you.
+In fact, it is designed to stop your computer from functioning as a
+general-purpose computer.  Every operation may require explicit
+permission.</p>
+<p>
+The technical idea underlying treacherous computing is that the
+computer includes a digital encryption and signature device, and the
+keys are kept secret from you.  Proprietary programs will use this
+device to control which other programs you can run, which documents or
+data you can access, and what programs you can pass them to.  These
+programs will continually download new authorization rules through the
+Internet, and impose those rules automatically on your work.  If you
+don't allow your computer to obtain the new rules periodically from
+the Internet, some capabilities will automatically cease to function.</p>
+<p>
+Of course, Hollywood and the record companies plan to use treacherous
+computing for Digital Restrictions Management (DRM), so
+that downloaded videos and music can be played only on one specified
+computer.  Sharing will be entirely impossible, at least using the
+authorized files that you would get from those companies.  You, the
+public, ought to have both the freedom and the ability to share these
+things.  (I expect that someone will find a way to produce unencrypted
+versions, and to upload and share them, so DRM will not entirely
+succeed, but that is no excuse for the system.)</p>
+<p>
+Making sharing impossible is bad enough, but it gets worse.  There are
+plans to use the same facility for email and documents&mdash;resulting
+in email that disappears in two weeks, or documents that can only be
+read on the computers in one company.</p>
+<p>
+Imagine if you get an email from your boss telling you to do something
+that you think is risky; a month later, when it backfires, you can't
+use the email to show that the decision was not yours.  &ldquo;Getting
+it in writing&rdquo; doesn't protect you when the order is written in
+disappearing ink.</p>
+<p>
+Imagine if you get an email from your boss stating a policy that is
+illegal or morally outrageous, such as to shred your company's audit
+documents, or to allow a dangerous threat to your country to move
+forward unchecked.  Today you can send this to a reporter and expose
+the activity.  With treacherous computing, the reporter won't be able
+to read the document; her computer will refuse to obey her.
+Treacherous computing becomes a paradise for corruption.</p>
+<p>
+Word processors such as Microsoft Word could use treacherous computing
+when they save your documents, to make sure no competing word
+processors can read them.  Today we must figure out the secrets of
+Word format by laborious experiments in order to make free word
+processors read Word documents.  If Word encrypts documents using
+treacherous computing when saving them, the free software community
+won't have a chance of developing software to read them&mdash;and if
+we could, such programs might even be forbidden by the Digital
+Millennium Copyright Act.</p>
+<p>
+Programs that use treacherous computing will continually download new
+authorization rules through the Internet, and impose those rules
+automatically on your work.  If Microsoft, or the US government, does
+not like what you said in a document you wrote, they could post new
+instructions telling all computers to refuse to let anyone read that
+document.  Each computer would obey when it downloads the new
+instructions.  Your writing would be subject to 1984-style retroactive
+erasure.  You might be unable to read it yourself.</p>
+<p>
+You might think you can find out what nasty things a treacherous-computing
+application does, study how painful they are, and decide
+whether to accept them.  Even if you can find this out, it would
+be foolish to accept the deal, but you can't even expect the deal
+to stand still.  Once you come to depend on using the program, you are
+hooked and they know it; then they can change the deal.  Some
+applications will automatically download upgrades that will do
+something different&mdash;and they won't give you a choice about
+whether to upgrade.</p>
+<p>
+Today you can avoid being restricted by proprietary software by not
+using it.  If you run GNU/Linux or another free operating system, and
+if you avoid installing proprietary applications on it, then you are
+in charge of what your computer does.  If a free program has a
+malicious feature, other developers in the community will take it out,
+and you can use the corrected version.  You can also run free
+application programs and tools on nonfree operating systems; this
+falls short of fully giving you freedom, but many users do it.</p>
+<p>
+Treacherous computing puts the existence of free operating systems and
+free applications at risk, because you may not be able to run them at
+all.  Some versions of treacherous computing would require the
+operating system to be specifically authorized by a particular
+company.  Free operating systems could not be installed.  Some
+versions of treacherous computing would require every program to be
+specifically authorized by the operating system developer.  You could
+not run free applications on such a system.  If you did figure out
+how, and told someone, that could be a crime.</p>
+<p>
+There are proposals already for US laws that would require all computers to
+support treacherous computing, and to prohibit connecting old computers to
+the Internet.  The CBDTPA (we call it the Consume But Don't Try Programming
+Act) is one of them.  But even if they don't legally force you to switch to
+treacherous computing, the pressure to accept it may be enormous.  Today
+people often use Word format for communication, although this causes
+several sorts of problems (see
+<a href="/philosophy/no-word-attachments.html">&ldquo;We Can Put an End to Word
+Attachments&rdquo;</a>).  If only a treacherous-computing machine can read the
+latest Word documents, many people will switch to it, if they view the
+situation only in terms of individual action (take it or leave it).  To
+oppose treacherous computing, we must join together and confront the
+situation as a collective choice.</p>
+<p>
+For further information about treacherous computing, see
+<a 
href="http://www.cl.cam.ac.uk/users/rja14/tcpa-faq.html";>http://www.cl.cam.ac.uk/users/rja14/tcpa-faq.html</a>.</p>
+<p>
+To block treacherous computing will require large numbers of citizens
+to organize.  We need your help!  Please support
+<a href="http://DefectiveByDesign.org";>Defective by Design</a>, the
+FSF's campaign against Digital Restrictions Management.</p>
+
+<h3>Postscripts</h3>
+
+<ol>
+<li>The computer security field uses the term &ldquo;trusted
+computing&rdquo; in a different way&mdash;beware of confusion
+between the two meanings.
+</li>
+<li>The GNU Project distributes the GNU Privacy Guard, a program that
+implements public-key encryption and digital signatures, which you can
+use to send secure and private email.  It is useful to explore how GPG
+differs from treacherous computing, and see what makes one helpful and
+the other so dangerous.
+<p>
+When someone uses GPG to send you an encrypted document, and you use
+GPG to decode it, the result is an unencrypted document that you can
+read, forward, copy, and even reencrypt to send it securely to
+someone else.  A treacherous-computing application would let you read
+the words on the screen, but would not let you produce an unencrypted
+document that you could use in other ways.  GPG, a free software
+package, makes security features available to the users; <em>they</em> use 
<em>it</em>.
+Treacherous computing is designed to impose restrictions on the users;
+<em>it</em> uses <em>them</em>.</p></li>
+
+<li>
+The supporters of treacherous computing focus their discourse on its
+<a name="beneficial">beneficial uses</a>.  What they say is often
+correct, just not important.
+<p>
+Like most hardware, treacherous-computing hardware can be used for
+purposes which are not harmful.  But these features can be implemented in
+other ways, without treacherous-computing hardware.  The principal
+difference that treacherous computing makes for users is the nasty
+consequence: rigging your computer to work against you.</p>
+<p>
+What they say is true, and what I say is true.  Put them together and
+what do you get?  Treacherous computing is a plan to take away our
+freedom, while offering minor benefits to distract us from what we
+would lose.</p></li>
+
+<li>Microsoft presents Palladium as a security measure, and claims that
+it will protect against viruses, but this claim is evidently false.  A
+presentation by Microsoft Research in October 2002 stated that one of
+the specifications of Palladium is that existing operating systems and
+applications will continue to run; therefore, viruses will continue to
+be able to do all the things that they can do today.
+<p>
+When Microsoft employees speak of &ldquo;security&rdquo; in connection with
+Palladium, they do not mean what we normally mean by that word:
+protecting your machine from things you do not want.  They mean
+protecting your copies of data on your machine from access by you in
+ways others do not want.  A slide in the presentation listed several
+types of secrets Palladium could be used to keep, including
+&ldquo;third party secrets&rdquo; and &ldquo;user
+secrets&rdquo;&mdash;but it put &ldquo;user secrets&rdquo; in
+quotation marks, recognizing that this is somewhat of an absurdity in the
+context of Palladium.</p>
+<p>
+The presentation made frequent use of other terms that we frequently
+associate with the context of security, such as &ldquo;attack&rdquo;,
+&ldquo;malicious code&rdquo;, &ldquo;spoofing&rdquo;, as well as
+&ldquo;trusted&rdquo;.  None of them means what it normally means.
+&ldquo;Attack&rdquo; doesn't mean someone trying to hurt you, it means
+you trying to copy music.  &ldquo;Malicious code&rdquo; means code
+installed by you to do what someone else doesn't want your machine to
+do.  &ldquo;Spoofing&rdquo; doesn't mean someone's fooling you, it means
+your fooling Palladium.  And so on.</p></li>
+
+<li>A previous statement by the Palladium developers stated the basic
+premise that whoever developed or collected information should have
+total control of how you use it.  This would represent a revolutionary
+overturn of past ideas of ethics and of the legal system, and create
+an unprecedented system of control.  The specific problems of these
+systems are no accident; they result from the basic goal.  It is the
+goal we must reject.</li>
+</ol>
+
+<hr />
+<h4>This essay is published
+in <a href="http://shop.fsf.org/product/free-software-free-society/";><cite>Free
+Software, Free Society: The Selected Essays of Richard
+M. Stallman</cite></a></h4>
+
+
+<!-- If needed, change the copyright block at the bottom. In general, -->
+<!-- all pages on the GNU web server should have the section about    -->
+<!-- verbatim copying.  Please do NOT remove this without talking     -->
+<!-- with the webmasters first. --> 
+<!-- Please make sure the copyright date is consistent with the document -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<p>
+Please send FSF &amp; GNU inquiries to 
+<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; 2002, 2007 Richard Stallman
+</p>
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2012/01/05 17:29:00 $
+<!-- 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="/philosophy/can-you-trust.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
 -->
+<!-- Bulgarian -->
+<!-- <li><a 
href="/philosophy/can-you-trust.bg.html">&#x431;&#x44A;&#x43B;&#x433;&#x430;&#x440;&#x441;&#x43A;&#x438;</a>&nbsp;[bg]</li>
 -->
+<!-- German -->
+<!-- <li><a 
href="/philosophy/can-you-trust.de.html">Deutsch</a>&nbsp;[de]</li> -->
+<!-- English -->
+<!-- <li><a href="/philosophy/can-you-trust.html">English</a>&nbsp;[en]</li> 
-->
+<!-- Spanish -->
+<!-- <li><a 
href="/philosophy/can-you-trust.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> -->
+<!-- Farsi (Persian) -->
+<!-- <li><a 
href="/philosophy/can-you-trust.fa.html">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc;</a>&nbsp;[fa]</li>
 -->
+<!-- French -->
+<!-- <li><a 
href="/philosophy/can-you-trust.fr.html">fran&#x00e7;ais</a>&nbsp;[fr]</li> -->
+<!-- Hebrew -->
+<!-- <li><a 
href="/philosophy/can-you-trust.he.html">&#x05e2;&#x05d1;&#x05e8;&#x05d9;&#x05ea;</a>&nbsp;[he]</li>
 -->
+<!-- Italian -->
+<!-- <li><a 
href="/philosophy/can-you-trust.it.html">italiano</a>&nbsp;[it]</li> -->
+<!-- Korean -->
+<!-- <li><a 
href="/philosophy/can-you-trust.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
 -->
+<!-- Dutch -->
+<!-- <li><a 
href="/philosophy/can-you-trust.nl.html">Nederlands</a>&nbsp;[nl]</li> -->
+<!-- Polish -->
+<!-- <li><a href="/philosophy/can-you-trust.pl.html">polski</a>&nbsp;[pl]</li> 
-->
+<!-- Turkish -->
+<!-- <li><a 
href="/philosophy/can-you-trust.tr.html">T&#x00fc;rk&#x00e7;e</a>&nbsp;[tr]</li>
 -->
+<!-- Tamil -->
+<!-- <li><a 
href="/philosophy/can-you-trust.ta.html">&#2980;&#2990;&#3007;&#2996;&#3021;</a>&nbsp;[ta]</li>
 -->
+<!-- Turkish -->
+<!-- <li><a 
href="/philosophy/can-you-trust.tr.html">T&#x00fc;rk&#x00e7;e</a>&nbsp;[tr]</li>
 -->
+<!-- Chinese(Simplified) -->
+<!-- <li><a 
href="/philosophy/can-you-trust.zh-cn.html">&#x7b80;&#x4f53;&#x4e2d;&#x6587;</a>&nbsp;[zh-cn]</li>
 -->
+<!-- Chinese(Traditional) -->
+<!-- <li><a 
href="/philosophy/can-you-trust.zh-tw.html">&#x7e41;&#x9ad4;&#x4e2d;&#x6587;</a>&nbsp;[zh-tw]</li>
 -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>

Index: software/po/devel.pl-en.html
===================================================================
RCS file: software/po/devel.pl-en.html
diff -N software/po/devel.pl-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ software/po/devel.pl-en.html        5 Jan 2012 17:29:20 -0000       1.1
@@ -0,0 +1,272 @@
+<!--#include virtual="/server/header.html" -->
+<title>GNU Development Resources - GNU Project - Free Software
+Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/software/po/devel.translist" -->
+<h2>GNU Development Resources</h2>
+
+<p>This page describes the development services available for GNU
+developers on GNU Project machines.  For full details of the privileges
+and responsibilities of GNU maintainers, please see the <a
+href="/prep/maintain/">Information for GNU Maintainers</a> document, and
+also follow the <a href="/prep/standards/">GNU Coding Standards</a>.
+Also interesting to review may be the <a
+href="/help/evaluation.html#whatmeans">overview of what it means to be a
+GNU package</a>.</p>
+
+<p>With the abundance of inexpensive computers that can run <a
+href="/gnu/linux-and-gnu.html">GNU/Linux</a>, as well as the greater
+availability of Internet access, many GNU volunteers today have all the
+computer facilities they need. However, there are still advantages to
+having central computers where GNU volunteers can work together without
+having to make their own machines accessible to others.</p>
+
+<p>For that reason, the Free Software Foundation strongly encourages GNU
+software projects to use the machines at <code>gnu.org</code> as a home
+base.  Using these machines also benefits the GNU Project indirectly, by
+increasing public awareness of GNU, and spreading the idea of working
+together for the benefit of everyone.</p>
+
+
+<h3 id="CVS">Savannah and version control</h3>
+
+<p>If you are developing an official GNU package, we strongly recommend
+using a public source control repository on <a
+href="http://savannah.gnu.org/";>Savannah</a>, the GNU hosting server.
+To do this, first <a
+href="https://savannah.gnu.org/account/register.php";>create yourself an
+account</a> and then <a
+href="http://savannah.gnu.org/register/";>register your GNU package</a>.
+After it is created, you will be able to choose a version control
+system, create web pages for your package, manage permissions for
+contributors to the pages, and many other features.</p>
+
+
+<h3 id="MailLists">Mailing lists</h3>
+
+<p>We operate mailing lists for GNU software packages as needed,
+including both hand-managed lists and automatically managed lists.</p>
+
+<p>When a GNU package is registered on <a
+href="http://savannah.gnu.org/";>Savannah</a>, a web interface allows
+developers to create and manage mailing lists dedicated to their
+package.</p>
+
+<p>Each GNU package <em>name</em> ought to have at least a bug-reporting
+list with the canonical name <code>bug-<em>name</em>@gnu.org</code>,
+plus any aliases that may be useful. Using Savannah, you can create
+lists for your package with names like this.  Some packages share the
+list address@hidden but we now encourage packages to set up their
+own individual lists.</p>
+
+<p>Packages can have other lists for announcements, asking for help,
+posting source code, for discussion among users, or whatever the package
+maintainer finds to be useful.</p>
+
+<p>Mailing list archives for automatically-managed lists are available
+at <a href="http://lists.gnu.org/";>http://lists.gnu.org</a>, as well as
+through the list manager. Archives for hand-maintained lists are
+generally kept in <code>/com/archive</code> on the GNU machines.</p>
+
+<p>When a mailing list becomes large enough to justify it, we can set up
+a <code>gnu.*</code> newsgroup with a two-way link to the mailing
+list.</p>
+
+
+<h3 id="WebServer">Web pages</h3>
+
+<p>The master GNU web server is <a
+href="http://www.gnu.org/";>http://www.gnu.org/</a>.  We very strongly
+recommend that GNU packages use
+<tt>http://www.gnu.org/software/</tt><i>package</i> as their primary
+home page.</p>
+
+<p>Using Savannah, developers can create and maintain their own pages at
+that url via a CVS &ldquo;web repository&rdquo;, separate from the
+package's main source repository (which can use any supported version
+control system).  <a href="/prep/maintain/maintain.html#Web-Pages">More
+information on maintaining GNU web pages</a>.</p>
+
+
+<h3 id="FTP">FTP</h3>
+
+<p>The primary ftp site for GNU software on <a
+href="http://ftp.gnu.org/gnu";><code>http://ftp.gnu.org/</code></a>,
+which is <a href="/prep/ftp.html">mirrored worldwide</a>.  We very
+strongly recommend that all GNU packages upload their releases here (in
+addition to any other location you find convenient).</p>
+
+<p>We use a different server for test releases, so that people won't
+install them thinking they are ready for prime time. This server is <a
+href="ftp://alpha.gnu.org/";><code>ftp://alpha.gnu.org/</code></a>.</p>
+
+<p>The <a
+href="/prep/maintain/maintain.html#Automated-FTP-Uploads">Information
+for GNU Maintainers</a> document has complete details on the ftp upload
+process, which is the same for both servers.</p>
+
+
+<h3 id="LoginAccounts">Login accounts</h3>
+
+<p>We provide shell login access to GNU machines to people who need them
+for work on GNU software.  Having a login account is both a privilege and
+a responsibility, and they should be used only for your work on GNU.
+<a href="README.accounts.html">Instructions for obtaining an account
+machines</a> are written separately.</p>
+
+<p>On the general login machine, the <a href="/software/gsrc/">gsrc</a>
+package developers maintain a hierarchy of the current GNU package
+releases (<tt>/gd/gnu/gnusys/live</tt>), compiled from the original
+sources.  To use it, source <tt>/gd/gnu/gnusys/live/setup</tt>.</p>
+
+<p>You can also <a
+href="http://www.fsf.org/about/systems/sending-mail-via-fencepost";>use a
+GNU account for email</a>.</p>
+
+
+<h3 id="Hydra">Hydra: Continuous builds and portability testing</h3>
+
+<p>Continuous build tools (often referred to as continuous integration
+tools) allow programming errors to be spotted soon after they are
+introduced in a software project, which is particularly useful for
+cooperatively developed software.</p>
+
+<p><a href="http://nixos.org/hydra/";>Hydra</a> is a free continuous
+build tool based on the <a href="http://nixos.org/nix/";>Nix</a> package
+manager.  Administrators of the <a href="http://hydra.nixos.org/";>Hydra
+instance at the Delft University of Technology</a> have generously
+offered <a href="http://hydra.nixos.org/project/gnu";>slots for the GNU
+Project</a>.  Projects on Hydra get re-built <em>at each commit</em>
+or change in their dependencies, whichever comes first (dependencies
+<em>include</em> the standard build environment being used, which
+itself contains recent released versions of GCC, GNU&nbsp;make,
+etc.)</p>
+
+<p>Currently it can build software on GNU/Linux (<tt>i686</tt> and
+<tt>x86_64</tt>) as well as FreeBSD, Darwin, Solaris, and Cygwin, and
+can cross-build for GNU/Hurd, GNU/Linux on other architectures, and
+MinGW.  It can provide code coverage reports produced using LCOV.  In
+addition to source tarballs and Nix packages, it can build packages for
+<code>deb</code>- and <code>RPM</code>-based distributions.  Packages
+can be built against the latest versions of their dependencies; for
+instance, GnuTLS is built using GNU&nbsp;libtasn1 and GNU&nbsp;libgcrypt
+builds corresponding to their latest revision.</p>
+
+<p>In addition to the <a href="http://hydra.nixos.org/project/gnu";>web
+interface</a>, Hydra can send notifications by email when the build
+status of a project changes&mdash;e.g., from <code>SUCCEEDED</code> to
+<code>FAILED</code>.  When a build fails, its log and build tree are
+accessible from the web interface; the latter allows generated files
+(for example, <code>config.log</code> or <code>testsuite.log</code>) to
+be inspected, which provides debugging hints.</p>
+
+<p>Any GNU software package can request a slot on Hydra.  Each package
+must provide its own &ldquo;build recipe&rdquo; written in the Nix
+language (a <em>Nix expression</em>, in Nix parlance).  <a
+href="http://git.savannah.gnu.org/cgit/hydra-recipes.git";>Nix
+expressions for GNU projects</a> are available via Git.  For simple
+projects using standard GNU build tools such as Automake and Autoconf,
+the recipe is usually fairly simple.  For example, see the <a
+href="http://git.savannah.gnu.org/cgit/hydra-recipes.git/tree/patch/release.nix";>recipe
+for GNU&nbsp;Patch</a>.  You are welcome to ask for guidance on <a
+href="mailto:address@hidden";>address@hidden</a>.</p>
+
+<p>After constructing your build recipe, email <a
+href="http://lists.gnu.org/mailman/listinfo/hydra-users";>address@hidden</a>
+and ask to be included in Hydra.  Also make sure to become a member of
+the <a
+href="https://savannah.gnu.org/projects/hydra-recipes/";><code>hydra-recipes</code>
+project at Savannah</a>.  This will allow you to customize your
+project's build job directly.</p>
+
+<p> For technical information about Hydra, please consult the <a
+href="http://hydra.nixos.org/job/hydra/trunk/tarball/latest/download-by-type/doc/manual";>
+manual of Hydra</a> (<a
+href="http://hydra.nixos.org/job/hydra/trunk/tarball/latest/download-by-type/doc-pdf/manual";>PDF</a>).
+For more details, please refer to the <a
+href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download/1/nix/manual.html";>Nix
+manual</a> and <a
+href="http://hydra.nixos.org/job/nixpkgs/trunk/tarball/latest/download/2/manual.html";>the
+Nixpkgs manual</a>.</p>
+
+
+<!-- If needed, change the copyright block at the bottom. In general,
+     all pages on the GNU web server should have the section about
+     verbatim copying.  Please do NOT remove this without talking
+     with the webmasters first.
+     Please make sure the copyright date is consistent with the document
+     and that it is like this: "2001, 2002", not this: "2001-2002". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<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; 2012 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: 2012/01/05 17:29:20 $
+<!-- 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="/software/devel.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li> -->
+<!-- Czech -->
+<!-- <li><a href="/software/devel.cs.html">&#x010c;esky</a>&nbsp;[cs]</li> -->
+<!-- German -->
+<!-- <li><a href="/software/devel.de.html">Deutsch</a>&nbsp;[de]</li> -->
+<!-- English -->
+<!-- <li><a href="/software/devel.html">English</a>&nbsp;[en]</li> -->
+<!-- Spanish -->
+<!-- <li><a href="/software/devel.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> 
-->
+<!-- Polish -->
+<!-- <li><a href="/software/devel.pl.html">polski</a>&nbsp;[pl]</li> -->
+<!-- Brazilian Portuguese -->
+<!-- <li><a href="/software/devel.pt-br.html">portugu&#x0ea;s do 
Brasil</a>&nbsp;[pt-br]</li> -->
+<!-- Albanian -->
+<!-- <li><a href="/software/devel.sq.html">shqip</a>&nbsp;[sq]</li> -->
+<!-- Chinese (Simplified) -->
+<!-- <li><a 
href="/software/devel.zh-cn.html">&#x7b80;&#x4f53;&#x4e2d;&#x6587;</a>&nbsp;[zh-cn]</li>
 -->
+<!-- Chinese (Traditional) -->
+<!-- <li><a 
href="/software/devel.zh-tw.html">&#x7e41;&#x9ad4;&#x4e2d;&#x6587;</a>&nbsp;[zh-tw]</li>
 -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>



reply via email to

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