www-commits
[Top][All Lists]
Advanced

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

www philosophy/apsl.de.html philosophy/po/apsl....


From: GNUN
Subject: www philosophy/apsl.de.html philosophy/po/apsl....
Date: Fri, 06 Apr 2012 16:32:03 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     12/04/06 16:32:02

Modified files:
        philosophy     : apsl.de.html 
        philosophy/po  : apsl.de-en.html apsl.de.po 
                         free-digital-society.fr.po 
                         free-digital-society.it.po 
                         free-digital-society.pot fs-translations.ca.po 
                         fs-translations.de.po fs-translations.fr.po 
                         fs-translations.ja.po fs-translations.ko.po 
                         fs-translations.pot fs-translations.sr.po 
                         historical-apsl.de.po historical-apsl.fr.po 
                         historical-apsl.pot historical-apsl.ru.po 
                         historical-apsl.translist 
        server/gnun/compendia: compendium.af.po compendium.ar.po 
                               compendium.bg.po compendium.ca.po 
                               compendium.cs.po compendium.de.po 
                               compendium.el.po compendium.es.po 
                               compendium.fa.po compendium.fr.po 
                               compendium.he.po compendium.id.po 
                               compendium.it.po compendium.ja.po 
                               compendium.ko.po compendium.ml.po 
                               compendium.nb.po compendium.nl.po 
                               compendium.pl.po compendium.pot 
                               compendium.pt-br.po compendium.pt.po 
                               compendium.ro.po compendium.ru.po 
                               compendium.sk.po compendium.sq.po 
                               compendium.sr.po compendium.sv.po 
                               compendium.ta.po compendium.tr.po 
                               compendium.uk.po compendium.vi.po 
                               compendium.zh-cn.po 
Added files:
        philosophy     : historical-apsl.de.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/apsl.de.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/historical-apsl.de.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/apsl.de-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/apsl.de.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-digital-society.fr.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-digital-society.it.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-digital-society.pot?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ca.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.de.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.fr.po?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ja.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ko.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.pot?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.sr.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/historical-apsl.de.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/historical-apsl.fr.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/historical-apsl.pot?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/historical-apsl.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/historical-apsl.translist?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.af.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ar.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.bg.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ca.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.cs.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.de.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.el.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.es.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fa.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fr.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.he.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.id.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.it.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ja.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ko.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ml.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.nb.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.nl.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pl.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pot?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pt-br.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pt.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ro.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ru.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sk.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sq.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sr.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sv.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ta.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.tr.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.uk.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.vi.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-cn.po?cvsroot=www&r1=1.2&r2=1.3

Patches:
Index: philosophy/apsl.de.html
===================================================================
RCS file: /web/www/www/philosophy/apsl.de.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/apsl.de.html     31 Mar 2012 16:30:55 -0000      1.6
+++ philosophy/apsl.de.html     6 Apr 2012 16:30:57 -0000       1.7
@@ -33,14 +33,16 @@
 
 <p>Die <abbr>FSF</abbr> betrachtet die <abbr>APSLv2</abbr> als eine freie
 Softwarelizenz, jedoch mit zwei erheblichen praktischen Problemen, die an
-die Netscape Public License (NPL) erinnert:</p>
+die <span xml:lang="en" lang="en">Netscape Public License</span> (NPL)
+erinnert:</p>
 
 <ul>
-<li>sie ist kein wirkliches Copyleft, weil die Verlinkung mit anderen
+<li>sie hat kein wirkliches Copyleft, weil die Verlinkung mit anderen
 Dateien&#160;&#8209;&#160;die völlig proprietär sein
 können!&#160;&#8209;&#160;erlaubt ist;</li>
 
-<li>sie ist mit der GNU General Public License (GPL) unvereinbar.</li>
+<li>sie ist mit der GNU <span xml:lang="en" lang="en">General Public
+License</span> (<abbr>GPL</abbr>) unvereinbar.</li>
 </ul>
 
 <p>Deshalb empfehlen wir, neue Software nicht unter APSLv2 freizugeben; es ist
@@ -54,7 +56,7 @@
 Quellcode überhaupt nicht freigegeben wird. Wir dürfen nicht das gesamte
 Unternehmen aufgrund nur eines Teils dessen beurteilen, was es macht.</p>
 
-<p><a href="http://www.gnu-darwin.org/";>GNU Darwin</a> ist eine Kombination aus
+<p><a href="http://www.gnu-darwin.org/";>GNU-Darwin</a> ist eine Kombination aus
 GNU und Darwin, das nur Freie Software enthalten soll.</p>
 
 
@@ -99,7 +101,7 @@
  <p><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/03/31 16:30:55 $
+$Date: 2012/04/06 16:30:57 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/apsl.de-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/apsl.de-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/apsl.de-en.html       31 Mar 2012 16:31:14 -0000      1.3
+++ philosophy/po/apsl.de-en.html       6 Apr 2012 16:31:15 -0000       1.4
@@ -77,7 +77,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/03/31 16:31:14 $
+$Date: 2012/04/06 16:31:15 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/apsl.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/apsl.de.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/apsl.de.po    6 Apr 2012 15:58:51 -0000       1.9
+++ philosophy/po/apsl.de.po    6 Apr 2012 16:31:15 -0000       1.10
@@ -128,7 +128,9 @@
 msgid ""
 "<a href=\"http://www.gnu-darwin.org\";>GNU-Darwin</a> is a combination of GNU "
 "and Darwin that is supposed to include only free software."
-msgstr "<a href=\"http://www.gnu-darwin.org/\";>GNU-Darwin</a> ist eine 
Kombination aus GNU und Darwin, das nur Freie Software enthalten soll."
+msgstr ""
+"<a href=\"http://www.gnu-darwin.org/\";>GNU-Darwin</a> ist eine Kombination "
+"aus GNU und Darwin, das nur Freie Software enthalten soll."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>

Index: philosophy/po/free-digital-society.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-digital-society.fr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/free-digital-society.fr.po    23 Jan 2012 01:37:25 -0000      
1.4
+++ philosophy/po/free-digital-society.fr.po    6 Apr 2012 16:31:15 -0000       
1.5
@@ -6,42 +6,158 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-digital-society\n"
-"POT-Creation-Date: 2011-12-12 04:25-0500\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: 2011-12-14 19:01+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
+"Outdated-Since: 2012-04-06 12:27-0300\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
-msgid "A Free Digital Society - GNU Project - Free Software Foundation"
+# | A Free Digital Society - {+What Makes Digital Inclusion Good or Bad? -+}
+# | GNU Project - Free Software Foundation
+#, fuzzy
+#| msgid "A Free Digital Society - GNU Project - Free Software Foundation"
+msgid ""
+"A Free Digital Society - What Makes Digital Inclusion Good or Bad? - GNU "
+"Project - Free Software Foundation"
 msgstr "Une société numérique libre - Projet GNU - Free Software Foundation"
 
 #. type: Content of: <h2>
-msgid "A Free Digital Society"
-msgstr "Une société numérique libre"
+msgid "A Free Digital Society - What Makes Digital Inclusion Good or Bad?"
+msgstr ""
+
+#. type: Content of: <p><em>
+msgid "<em>Transcription of a lecture by Richard M. Stallman"
+msgstr ""
 
 #. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "par <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+msgid "at Sciences Po in Paris, October 19, 2011.</em>"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"This is the <a href=\"http://www.libertesnumeriques.net/evenements/stallman-";
-"19octobre2011/a-free-digital-society\">transcription</a> of Richard "
-"Stallman's lecture at Sciences Po, Paris on October 19, 2011."
+"(A <a href=\"http://audio-video.gnu.org/video/stallman-sciencespo-";
+"freesociety.webm\"> video</a> of this lecture is available.)"
 msgstr ""
-"Ceci est la <a href=\"http://www.libertesnumeriques.net/evenements/stallman-";
-"19octobre2011/a-free-digital-society\">traduction</a> d'une conférence "
-"donnée par Richard Stallman à Sciences Po, Paris, le 19 octobre 2011."
 
 #. type: Content of: <p>
+# | [-<strong>[Censorship]</strong>-]{+<strong>Table of Contents</strong>+}
+#, fuzzy
+#| msgid "<strong>[Censorship]</strong>"
+msgid "<strong>Table of Contents</strong>"
+msgstr "<strong>[La censure]</strong>"
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#surveillance\">Surveillance</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#censorship\">Censorship</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+# | [-Restricted-]{+<a href=\"#formats\">Restricted+} data [-formats-]
+# | {+formats</a>+}
+#, fuzzy
+#| msgid "Restricted data formats"
+msgid "<a href=\"#formats\">Restricted data formats</a>"
+msgstr "Les formats de données restreints"
+
+#. type: Content of: <ul><li>
+# | [-Software-]{+<a href=\"#proprietary\">Software+} that isn't [-free-]
+# | {+free</a>+}
+#, fuzzy
+#| msgid "Software that isn't free"
+msgid "<a href=\"#proprietary\">Software that isn't free</a>"
+msgstr "Le logiciel qui n'est pas libre"
+
+#. type: Content of: <ul><li>
+# | [-The 4-]{+<a href=\"#four-freedoms\">The four+} freedoms of free
+# | [-software-] {+software</a>+}
+#, fuzzy
+#| msgid "The 4 freedoms of free software"
+msgid "<a href=\"#four-freedoms\">The four freedoms of free software</a>"
+msgstr "Les quatre libertés du logiciel libre"
+
+#. type: Content of: <ul><li>
+# | [-The-]{+<a href=\"#gnu\">The+} GNU [-p-]{+P+}roject and the [-free
+# | software movement-] {+Free Software movement</a>+}
+#, fuzzy
+#| msgid "The GNU project and the free software movement"
+msgid "<a href=\"#gnu\">The GNU Project and the Free Software movement</a>"
+msgstr "Le projet GNU et le mouvement du logiciel libre"
+
+#. type: Content of: <ul><li>
+# | [-Free-]{+<a href=\"#education\">Free+} software and [-education-]
+# | {+education</a>+}
+#, fuzzy
+#| msgid "Free software and education"
+msgid "<a href=\"#education\">Free software and education</a>"
+msgstr "Le logiciel libre dans l'enseignement"
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#services\">Internet services</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#voting\">Computers for voting</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+# | [-The-]{+<a href=\"#sharing\">The+} war on [-sharing-] {+sharing</a>+}
+#, fuzzy
+#| msgid "The war on sharing"
+msgid "<a href=\"#sharing\">The war on sharing</a>"
+msgstr "La guerre contre le partage"
+
+#. type: Content of: <ul><li>
+# | [-Supporting-]{+<a href=\"#arts\">Supporting+} the [-arts-] {+arts</a>+}
+#, fuzzy
+#| msgid "Supporting the arts"
+msgid "<a href=\"#arts\">Supporting the arts</a>"
+msgstr "Soutenir les arts"
+
+#. type: Content of: <ul><li>
+# | [-Rights-]{+<a href=\"#rights\">Rights+} in [-cyberspace-]
+# | {+cyberspace</a>+}
+#, fuzzy
+#| msgid "Rights in cyberspace"
+msgid "<a href=\"#rights\">Rights in cyberspace</a>"
+msgstr "Nos droits dans le cyberespace"
+
+#. type: Content of: <h3>
+msgid "Introduction"
+msgstr ""
+
+#. type: Content of: <p>
+# | Projects with the goal of digital inclusion are making a big assumption.
+# | They are assuming that participating in a digital society is
+# | good[-;-]{+,+} but that's not necessarily true. Being in a digital society
+# | can be good or bad, depending on whether that digital society is just or
+# | unjust. There are many ways in which our freedom is being attacked by
+# | digital technology. Digital technology can make things worse, and it will,
+# | unless we fight to prevent it.
+#, fuzzy
+#| msgid ""
+#| "Projects with the goal of digital inclusion are making a big assumption. "
+#| "They are assuming that participating in a digital society is good; but "
+#| "that's not necessarily true. Being in a digital society can be good or "
+#| "bad, depending on whether that digital society is just or unjust. There "
+#| "are many ways in which our freedom is being attacked by digital "
+#| "technology. Digital technology can make things worse, and it will, unless "
+#| "we fight to prevent it."
 msgid ""
 "Projects with the goal of digital inclusion are making a big assumption. "
-"They are assuming that participating in a digital society is good; but "
+"They are assuming that participating in a digital society is good, but "
 "that's not necessarily true. Being in a digital society can be good or bad, "
 "depending on whether that digital society is just or unjust. There are many "
 "ways in which our freedom is being attacked by digital technology. Digital "
@@ -56,11 +172,21 @@
 "c'est ce qui arrivera, à moins que nous nous battions pour l'empêcher."
 
 #. type: Content of: <p>
+# | Therefore, if we have an unjust digital society, we should cancel these
+# | projects for digital inclusion and launch projects for digital extraction.
+# | We have to extract people from digital society if it doesn't respect their
+# | freedom[-;-]{+,+} or we have to make it respect their freedom.
+#, fuzzy
+#| msgid ""
+#| "Therefore, if we have an unjust digital society, we should cancel these "
+#| "projects for digital inclusion and launch projects for digital "
+#| "extraction. We have to extract people from digital society if it doesn't "
+#| "respect their freedom; or we have to make it respect their freedom."
 msgid ""
 "Therefore, if we have an unjust digital society, we should cancel these "
 "projects for digital inclusion and launch projects for digital extraction. "
 "We have to extract people from digital society if it doesn't respect their "
-"freedom; or we have to make it respect their freedom."
+"freedom, or we have to make it respect their freedom."
 msgstr ""
 "Par conséquent, si notre société numérique est injuste, nous devrions "
 "arrêter ces projets d'inclusion numérique et lancer des projets 
d'extraction "
@@ -88,18 +214,43 @@
 "recherches, idéale pour tout tyran voulant écraser l'opposition."
 
 #. type: Content of: <p>
+# | Surveillance is sometimes done with our own computers. For instance, if
+# | you have a computer that's running Microsoft Windows, that system is doing
+# | surveillance. There are features in Windows that send data to some
+# | [-server. Data-] {+server, data+} about the use of the computer. A
+# | surveillance feature was discovered in the iPhone a few months ago, and
+# | people started calling it the &ldquo;spy-phone.&rdquo; Flash player has a
+# | surveillance feature too, and so does the Amazon &ldquo;Swindle.&rdquo;
+# | They call it the Kindle, but I call it [-the Swindle (l'escroc)-]
+# | {+&ldquo;the Swindle,&rdquo; <em>l'escroc</em>,+} because it's meant to
+# | swindle users out of their freedom. It makes people identify themselves
+# | whenever they buy a book, and that means Amazon has a giant list of all
+# | the books each user has read. Such a list must not exist anywhere.
+#, fuzzy
+#| msgid ""
+#| "Surveillance is sometimes done with our own computers. For instance, if "
+#| "you have a computer that's running Microsoft Windows, that system is "
+#| "doing surveillance. There are features in Windows that send data to some "
+#| "server. Data about the use of the computer. A surveillance feature was "
+#| "discovered in the iPhone a few months ago, and people started calling it "
+#| "the &ldquo;spy-phone.&rdquo; Flash player has a surveillance feature too, "
+#| "and so does the Amazon &ldquo;Swindle.&rdquo; They call it the Kindle, "
+#| "but I call it the Swindle (l'escroc) because it's meant to swindle users "
+#| "out of their freedom. It makes people identify themselves whenever they "
+#| "buy a book, and that means Amazon has a giant list of all the books each "
+#| "user has read. Such a list must not exist anywhere."
 msgid ""
 "Surveillance is sometimes done with our own computers. For instance, if you "
 "have a computer that's running Microsoft Windows, that system is doing "
-"surveillance. There are features in Windows that send data to some server. "
-"Data about the use of the computer. A surveillance feature was discovered in "
+"surveillance. There are features in Windows that send data to some server, "
+"data about the use of the computer. A surveillance feature was discovered in "
 "the iPhone a few months ago, and people started calling it the &ldquo;spy-"
 "phone.&rdquo; Flash player has a surveillance feature too, and so does the "
-"Amazon &ldquo;Swindle.&rdquo; They call it the Kindle, but I call it the "
-"Swindle (l'escroc) because it's meant to swindle users out of their freedom. "
-"It makes people identify themselves whenever they buy a book, and that means "
-"Amazon has a giant list of all the books each user has read. Such a list "
-"must not exist anywhere."
+"Amazon &ldquo;Swindle.&rdquo; They call it the Kindle, but I call it &ldquo;"
+"the Swindle,&rdquo; <em>l'escroc</em>, because it's meant to swindle users "
+"out of their freedom. It makes people identify themselves whenever they buy "
+"a book, and that means Amazon has a giant list of all the books each user "
+"has read. Such a list must not exist anywhere."
 msgstr ""
 "Quelquefois, la surveillance est le fait de nos propres ordinateurs. Par "
 "exemple, si  vous avez un ordinateur qui fonctionne sous Microsoft Windows, "
@@ -141,15 +292,34 @@
 "idée très précise de ses activités, simplement en regardant ces données."
 
 #. type: Content of: <p>
-msgid ""
-"We can stop our own computers from doing surveillance on us if we have "
-"control of the software that they run. But the software these people are "
-"running, they don't have control over. It's nonfree software, and that's why "
-"it has malicious features, such as surveillance. However, the surveillance "
-"is not always done with our own computers, it's also done at one remove. For "
-"instance ISPs in Europe are required to keep data about the user's internet "
-"communications for a long time, in case the State decides to investigate "
-"that person later for whatever imaginable reason."
+# | We can stop our own computers from doing surveillance on us if [-we-]
+# | {+<em>we</em>+} have control of the software that they run. But the
+# | software these people are running, they don't have control over. It's
+# | nonfree software, and that's why it has malicious features[-,-] such as
+# | surveillance. However, the surveillance is not always done with our own
+# | computers, it's also done at one remove. For instance ISPs in Europe are
+# | required to keep data about the user's [-i-]{+I+}nternet communications
+# | for a long time, in case the State decides to investigate that person
+# | later for whatever imaginable reason.
+#, fuzzy
+#| msgid ""
+#| "We can stop our own computers from doing surveillance on us if we have "
+#| "control of the software that they run. But the software these people are "
+#| "running, they don't have control over. It's nonfree software, and that's "
+#| "why it has malicious features, such as surveillance. However, the "
+#| "surveillance is not always done with our own computers, it's also done at "
+#| "one remove. For instance ISPs in Europe are required to keep data about "
+#| "the user's internet communications for a long time, in case the State "
+#| "decides to investigate that person later for whatever imaginable reason."
+msgid ""
+"We can stop our own computers from doing surveillance on us if <em>we</em> "
+"have control of the software that they run. But the software these people "
+"are running, they don't have control over. It's nonfree software, and that's "
+"why it has malicious features such as surveillance. However, the "
+"surveillance is not always done with our own computers, it's also done at "
+"one remove. For instance ISPs in Europe are required to keep data about the "
+"user's Internet communications for a long time, in case the State decides to "
+"investigate that person later for whatever imaginable reason."
 msgstr ""
 "Nous pouvons empêcher nos propres ordinateurs de nous surveiller si nous "
 "avons le contrôle des logiciels qui tournent dessus. Mais les logiciels dont 
"
@@ -164,12 +334,24 @@
 "telle personne, pour telle ou telle raison imaginable."
 
 #. type: Content of: <p>
-msgid ""
-"With a portable phone&mdash;even if you can stop the phone from transmitting "
-"your GPS location, the system can determine the phone's location "
-"approximately, by comparing the time when the signals arrive at different "
-"towers. So the phone system can do surveillance even without special "
-"cooperation from the phone itself."
+# | With a portable [-phone&mdash;even-] {+phone&hellip; even+} if you can
+# | stop the phone from transmitting your GPS location, the system can
+# | determine the phone's location approximately, by comparing the time when
+# | the signals arrive at different towers. So the phone system can do
+# | surveillance even without special cooperation from the phone itself.
+#, fuzzy
+#| msgid ""
+#| "With a portable phone&mdash;even if you can stop the phone from "
+#| "transmitting your GPS location, the system can determine the phone's "
+#| "location approximately, by comparing the time when the signals arrive at "
+#| "different towers. So the phone system can do surveillance even without "
+#| "special cooperation from the phone itself."
+msgid ""
+"With a portable phone&hellip; even if you can stop the phone from "
+"transmitting your GPS location, the system can determine the phone's "
+"location approximately, by comparing the time when the signals arrive at "
+"different towers. So the phone system can do surveillance even without "
+"special cooperation from the phone itself."
 msgstr ""
 "Avec un téléphone portable&hellip; même si vous pouvez empêcher le 
téléphone "
 "de transmettre votre localisation GPS, le système peut déterminer la "
@@ -236,15 +418,37 @@
 "nécessaire."
 
 #. type: Content of: <p>
+# | But computerized surveillance makes it possible to centralize and index
+# | all this information so that an unjust regime can find it all, and find
+# | out all about everyone. If a dictator takes power, which could happen
+# | anywhere, people realize this and they recognize that they should not
+# | communicate with other dissidents in a way that the State could find out
+# | about. But if the dictator has several years of stored records[-,-] of who
+# | talks with whom, it's too late to take any precautions [-then. Because-]
+# | {+then, because+} he already has everything he needs to realize:
+# | &ldquo;OK{+,+} this guy is a dissident, and he spoke with him. Maybe he is
+# | a dissident too. Maybe we should grab him and torture him.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "But computerized surveillance makes it possible to centralize and index "
+#| "all this information so that an unjust regime can find it all, and find "
+#| "out all about everyone. If a dictator takes power, which could happen "
+#| "anywhere, people realize this and they recognize that they should not "
+#| "communicate with other dissidents in a way that the State could find out "
+#| "about. But if the dictator has several years of stored records, of who "
+#| "talks with whom, it's too late to take any precautions then. Because he "
+#| "already has everything he needs to realize: &ldquo;OK this guy is a "
+#| "dissident, and he spoke with him. Maybe he is a dissident too. Maybe we "
+#| "should grab him and torture him.&rdquo;"
 msgid ""
 "But computerized surveillance makes it possible to centralize and index all "
 "this information so that an unjust regime can find it all, and find out all "
 "about everyone. If a dictator takes power, which could happen anywhere, "
 "people realize this and they recognize that they should not communicate with "
 "other dissidents in a way that the State could find out about. But if the "
-"dictator has several years of stored records, of who talks with whom, it's "
-"too late to take any precautions then. Because he already has everything he "
-"needs to realize: &ldquo;OK this guy is a dissident, and he spoke with him. "
+"dictator has several years of stored records of who talks with whom, it's "
+"too late to take any precautions then, because he already has everything he "
+"needs to realize: &ldquo;OK, this guy is a dissident, and he spoke with him. "
 "Maybe he is a dissident too. Maybe we should grab him and torture him.&rdquo;"
 msgstr ""
 "Mais la surveillance informatisée rend possible la centralisation et "
@@ -255,15 +459,27 @@
 "pas communiquer avec d'autres dissidents par des moyens que l'État peut "
 "repérer. Mais si le dictateur possède plusieurs années d'archives à 
propos "
 "de qui parle à qui, il est alors trop tard pour prendre des précautions. "
-"Parce qu'il a déjà tout ce dont il a besoin pour comprendre&nbsp;: 
«&nbsp;OK, "
-"ce mec est un dissident, et il lui a parlé. Peut-être que c'est un 
dissident "
-"également. Peut-être que nous devrions l'attraper et le torturer.&nbsp;»"
-
-#. type: Content of: <p>
-msgid ""
-"So we need to campaign to put an end to digital surveillance now. You can't "
-"wait until there is a dictator and it would really matter. And besides, it "
-"doesn't take an outright dictatorship to start attacking human rights."
+"Parce qu'il a déjà tout ce dont il a besoin pour comprendre&nbsp;: «&nbsp;"
+"OK, ce mec est un dissident, et il lui a parlé. Peut-être que c'est un "
+"dissident également. Peut-être que nous devrions l'attraper et le torturer."
+"&nbsp;»"
+
+#. type: Content of: <p>
+# | So we need to campaign to put an end to digital surveillance [-now.-]
+# | {+<em>now</em>.+} You can't wait until there is a dictator and it would
+# | really matter. And besides, it doesn't take an outright dictatorship to
+# | start attacking human rights.
+#, fuzzy
+#| msgid ""
+#| "So we need to campaign to put an end to digital surveillance now. You "
+#| "can't wait until there is a dictator and it would really matter. And "
+#| "besides, it doesn't take an outright dictatorship to start attacking "
+#| "human rights."
+msgid ""
+"So we need to campaign to put an end to digital surveillance <em>now</em>. "
+"You can't wait until there is a dictator and it would really matter. And "
+"besides, it doesn't take an outright dictatorship to start attacking human "
+"rights."
 msgstr ""
 "Donc nous devons faire campagne pour mettre fin à la surveillance numérique 
"
 "maintenant. On ne peut pas attendre d'être en dictature et que ce soit "
@@ -271,12 +487,25 @@
 "dictature pour que les droits de l'Homme subissent un début d'attaque."
 
 #. type: Content of: <p>
+# | I wouldn't quite call the government of the UK a dictatorship. It's not
+# | very democratic, and one way it crushes democracy is using surveillance. A
+# | few years ago, people believed to be on their way to a protest[-;-]{+,+}
+# | they were going to [-protest. They-] {+protest, they+} were arrested
+# | before they could get there[-,-] because their car was tracked through
+# | this universal car tracking system.
+#, fuzzy
+#| msgid ""
+#| "I wouldn't quite call the government of the UK a dictatorship. It's not "
+#| "very democratic, and one way it crushes democracy is using surveillance. "
+#| "A few years ago, people believed to be on their way to a protest; they "
+#| "were going to protest. They were arrested before they could get there, "
+#| "because their car was tracked through this universal car tracking system."
 msgid ""
 "I wouldn't quite call the government of the UK a dictatorship. It's not very "
 "democratic, and one way it crushes democracy is using surveillance. A few "
-"years ago, people believed to be on their way to a protest; they were going "
-"to protest. They were arrested before they could get there, because their "
-"car was tracked through this universal car tracking system."
+"years ago, people believed to be on their way to a protest, they were going "
+"to protest, they were arrested before they could get there because their car "
+"was tracked through this universal car tracking system."
 msgstr ""
 "Je ne qualifierais pas le gouvernement britannique de dictature. Il n'est "
 "pas très démocratique, et l'un des moyens dont il se sert pour écraser la "
@@ -290,12 +519,26 @@
 msgstr "La censure"
 
 #. type: Content of: <p>
+# | The second threat is censorship. Censorship is not new, it existed long
+# | before computers. But 15 years ago, we thought that the Internet would
+# | protect us from censorship, that it would defeat censorship. Then, China
+# | and some other obvious tyrannies went to great lengths to impose
+# | censorship on the Internet, and we said: &ldquo;[-w-]{+W+}ell that's not
+# | surprising, what else would governments like that do?&rdquo;
+#, fuzzy
+#| msgid ""
+#| "The second threat is censorship. Censorship is not new, it existed long "
+#| "before computers. But 15 years ago, we thought that the Internet would "
+#| "protect us from censorship, that it would defeat censorship. Then, China "
+#| "and some other obvious tyrannies went to great lengths to impose "
+#| "censorship on the Internet, and we said: &ldquo;well that's not "
+#| "surprising, what else would governments like that do?&rdquo;"
 msgid ""
 "The second threat is censorship. Censorship is not new, it existed long "
 "before computers. But 15 years ago, we thought that the Internet would "
 "protect us from censorship, that it would defeat censorship. Then, China and "
 "some other obvious tyrannies went to great lengths to impose censorship on "
-"the Internet, and we said: &ldquo;well that's not surprising, what else "
+"the Internet, and we said: &ldquo;Well that's not surprising, what else "
 "would governments like that do?&rdquo;"
 msgstr ""
 "La deuxième menace est la censure. La censure n'est pas nouvelle, elle "
@@ -317,12 +560,28 @@
 "le Royaume-Uni, la France, l'Espagne, l'Italie, le Danemark&hellip;"
 
 #. type: Content of: <p>
+# | They all have systems of blocking access to some websites. Denmark
+# | established a system that blocks access to a long list of web{+ +}pages,
+# | which was secret. The citizens were not supposed to know how the
+# | government was censoring them, but the list was leaked[-,-] and posted on
+# | WikiLeaks. At that point, Denmark added the WikiLeaks page to its
+# | censorship list. {+So, the whole rest of the world can find out how Danes
+# | are being censored, but Danes are not supposed to know.+}
+#, fuzzy
+#| msgid ""
+#| "They all have systems of blocking access to some websites. Denmark "
+#| "established a system that blocks access to a long list of webpages, which "
+#| "was secret. The citizens were not supposed to know how the government was "
+#| "censoring them, but the list was leaked, and posted on WikiLeaks. At that "
+#| "point, Denmark added the WikiLeaks page to its censorship list."
 msgid ""
 "They all have systems of blocking access to some websites. Denmark "
-"established a system that blocks access to a long list of webpages, which "
+"established a system that blocks access to a long list of web pages, which "
 "was secret. The citizens were not supposed to know how the government was "
-"censoring them, but the list was leaked, and posted on WikiLeaks. At that "
-"point, Denmark added the WikiLeaks page to its censorship list."
+"censoring them, but the list was leaked and posted on WikiLeaks. At that "
+"point, Denmark added the WikiLeaks page to its censorship list. So, the "
+"whole rest of the world can find out how Danes are being censored, but Danes "
+"are not supposed to know."
 msgstr ""
 "Ils possèdent tous un système pour bloquer l'accès à certains sites web. 
Le "
 "Danemark a établi un système qui bloque l'accès à une longue liste de 
pages "
@@ -333,14 +592,6 @@
 
 #. type: Content of: <p>
 msgid ""
-"So, the whole rest of the world can find out how Danes are being censored, "
-"but Danes are not supposed to know."
-msgstr ""
-"Ainsi, tout le reste du monde peut découvrir comment les Danois sont "
-"censurés, mais les Danois se sont pas censés le savoir."
-
-#. type: Content of: <p>
-msgid ""
 "A few months ago, Turkey, which claims to respect some human rights, "
 "announced that every Internet user would have to choose between censorship "
 "and more censorship. Four different levels of censorship they get to choose! "
@@ -352,24 +603,32 @@
 "choix&nbsp;! Mais la liberté ne fait pas partie des options."
 
 #. type: Content of: <p>
+# | {+Australia wanted to impose filtering on the Internet, but that was
+# | blocked. However Australia has a different kind of censorship: it has
+# | censorship of links. That is, if a website in Australia has a link to some
+# | censored site outside Australia, the one in Australia can be punished.+}
+# | Electronic Frontier{+s+} Australia, that is an organization that defends
+# | human rights in the digital domain in Australia, posted a link to a
+# | foreign political website. It was ordered to delete the link or face a
+# | penalty of $11,000 a day. So they deleted it, what else could they do?
+# | This is a very harsh system of censorship.
+#, fuzzy
+#| msgid ""
+#| "Electronic Frontier Australia, that is an organization that defends human "
+#| "rights in the digital domain in Australia, posted a link to a foreign "
+#| "political website. It was ordered to delete the link or face a penalty of "
+#| "$11,000 a day. So they deleted it, what else could they do? This is a "
+#| "very harsh system of censorship."
 msgid ""
 "Australia wanted to impose filtering on the Internet, but that was blocked. "
 "However Australia has a different kind of censorship: it has censorship of "
 "links. That is, if a website in Australia has a link to some censored site "
-"outside Australia, the one in Australia can be punished."
-msgstr ""
-"L'Australie a voulu imposer le filtrage d'Internet, mais cela a été 
bloqué. "
-"Cependant, l'Australie a un autre genre de censure&nbsp;: elle a la censure "
-"des liens. C'est-à-dire que, si en Australie un site web met en lien un site 
"
-"censuré en dehors de l'Australie, celui qui est en Australie peut être 
puni."
-
-#. type: Content of: <p>
-msgid ""
-"Electronic Frontier Australia, that is an organization that defends human "
-"rights in the digital domain in Australia, posted a link to a foreign "
-"political website. It was ordered to delete the link or face a penalty of "
-"$11,000 a day. So they deleted it, what else could they do? This is a very "
-"harsh system of censorship."
+"outside Australia, the one in Australia can be punished. Electronic "
+"Frontiers Australia, that is an organization that defends human rights in "
+"the digital domain in Australia, posted a link to a foreign political "
+"website. It was ordered to delete the link or face a penalty of $11,000 a "
+"day. So they deleted it, what else could they do? This is a very harsh "
+"system of censorship."
 msgstr ""
 "Electronic Frontier Australia, une organisation qui défend les droits de "
 "l'Homme dans le domaine numérique, mit en lien un site politique étranger. "
@@ -378,12 +637,25 @@
 "d'autre&nbsp;? C'est un système de censure très dur."
 
 #. type: Content of: <p>
+# | In Spain, the censorship that was adopted earlier this year allows
+# | officials to arbitrarily shut down an Internet site in Spain, or impose
+# | filtering to block access to a site outside of Spain. And they can do this
+# | without any kind of trial. This was one of the motivations for the
+# | [-<em>Indignados</em>,-] {+<cite>Indignados</cite>,+} who have been
+# | protesting in the street.
+#, fuzzy
+#| msgid ""
+#| "In Spain, the censorship that was adopted earlier this year allows "
+#| "officials to arbitrarily shut down an Internet site in Spain, or impose "
+#| "filtering to block access to a site outside of Spain. And they can do "
+#| "this without any kind of trial. This was one of the motivations for the "
+#| "<em>Indignados</em>, who have been protesting in the street."
 msgid ""
 "In Spain, the censorship that was adopted earlier this year allows officials "
 "to arbitrarily shut down an Internet site in Spain, or impose filtering to "
 "block access to a site outside of Spain. And they can do this without any "
-"kind of trial. This was one of the motivations for the <em>Indignados</em>, "
-"who have been protesting in the street."
+"kind of trial. This was one of the motivations for the <cite>Indignados</"
+"cite>, who have been protesting in the street."
 msgstr ""
 "En Espagne, la censure qui a été adoptée au début de cette année permet 
à "
 "l'administration de fermer arbitrairement un site internet en Espagne, ou "
@@ -412,9 +684,14 @@
 msgstr "Les formats de données restreints"
 
 #. type: Content of: <p>
+# | The next threat to our freedom comes from data formats that restrict
+# | [-the-] users.
+#, fuzzy
+#| msgid ""
+#| "The next threat to our freedom comes from data formats that restrict the "
+#| "users."
 msgid ""
-"The next threat to our freedom comes from data formats that restrict the "
-"users."
+"The next threat to our freedom comes from data formats that restrict users."
 msgstr ""
 "La menace suivante envers nos libertés vient des formats de données qui "
 "restreignent les utilisateurs."
@@ -432,12 +709,26 @@
 "autre programme. Le but est d'empêcher l'interopérabilité."
 
 #. type: Content of: <p>
-msgid ""
-"Now, evidently, if the program implements a secret format, that's because "
-"the program is not free software. So this is another kind of malicious "
-"feature. Surveillance is one kind of malicious feature that you find in some "
-"nonfree programs; using secret formats to restrict the users is another kind "
-"of malicious feature that you also find in some nonfree programs."
+# | Now, evidently, if [-the-] {+a+} program implements a secret format,
+# | that's because the program is not free software. So this is another kind
+# | of malicious feature. Surveillance is one kind of malicious feature that
+# | you find in some nonfree programs; using secret formats to restrict the
+# | users is another kind of malicious feature that you also find in some
+# | nonfree programs.
+#, fuzzy
+#| msgid ""
+#| "Now, evidently, if the program implements a secret format, that's because "
+#| "the program is not free software. So this is another kind of malicious "
+#| "feature. Surveillance is one kind of malicious feature that you find in "
+#| "some nonfree programs; using secret formats to restrict the users is "
+#| "another kind of malicious feature that you also find in some nonfree "
+#| "programs."
+msgid ""
+"Now, evidently, if a program implements a secret format, that's because the "
+"program is not free software. So this is another kind of malicious feature. "
+"Surveillance is one kind of malicious feature that you find in some nonfree "
+"programs; using secret formats to restrict the users is another kind of "
+"malicious feature that you also find in some nonfree programs."
 msgstr ""
 "Évidemment, si le programme met en œuvre un format secret, c'est parce que "
 "le programme n'est pas un logiciel libre. Voilà donc un autre type de "
@@ -448,12 +739,27 @@
 "également dans certains programmes non libres."
 
 #. type: Content of: <p>
+# | But if you have a free program that handles a certain format, <em>ipso
+# | facto</em> that format is not secret. This kind of malicious feature can
+# | only exist in a nonfree program. Surveillance [-features could-]
+# | {+features, well,+} theoretically {+they could+} exist in a free program
+# | but you don't find them happening. Because the users would fix [-it.-]
+# | {+it, you see.+} The users wouldn't like this, so they would fix it.
+#, fuzzy
+#| msgid ""
+#| "But if you have a free program that handles a certain format, <em>ipso "
+#| "facto</em> that format is not secret. This kind of malicious feature can "
+#| "only exist in a nonfree program. Surveillance features could "
+#| "theoretically exist in a free program but you don't find them happening. "
+#| "Because the users would fix it. The users wouldn't like this, so they "
+#| "would fix it."
 msgid ""
 "But if you have a free program that handles a certain format, <em>ipso "
 "facto</em> that format is not secret. This kind of malicious feature can "
-"only exist in a nonfree program. Surveillance features could theoretically "
-"exist in a free program but you don't find them happening. Because the users "
-"would fix it. The users wouldn't like this, so they would fix it."
+"only exist in a nonfree program. Surveillance features, well, theoretically "
+"they could exist in a free program but you don't find them happening. "
+"Because the users would fix it, you see. The users wouldn't like this, so "
+"they would fix it."
 msgstr ""
 "Mais s'il existe un programme libre qui manipule un certain format, <em>ipso "
 "facto</em> ce format n'est pas secret. Ce type de fonctionnalité "
@@ -464,12 +770,24 @@
 "ils le corrigeraient."
 
 #. type: Content of: <p>
+# | In any case, we also find secret data formats in use for publication of
+# | works. You find secret data formats in use for audio, such as music, for
+# | video, for books&hellip; And these secret formats are known as Digital
+# | Restrictions Management, or DRM, or digital handcuffs [-(les-]
+# | {+<em>(les+} menottes [-num&eacute;riques).-] {+num&eacute;riques)</em>.+}
+#, fuzzy
+#| msgid ""
+#| "In any case, we also find secret data formats in use for publication of "
+#| "works. You find secret data formats in use for audio, such as music, for "
+#| "video, for books&hellip; And these secret formats are known as Digital "
+#| "Restrictions Management, or DRM, or digital handcuffs (les menottes "
+#| "num&eacute;riques)."
 msgid ""
 "In any case, we also find secret data formats in use for publication of "
 "works. You find secret data formats in use for audio, such as music, for "
 "video, for books&hellip; And these secret formats are known as Digital "
-"Restrictions Management, or DRM, or digital handcuffs (les menottes "
-"num&eacute;riques)."
+"Restrictions Management, or DRM, or digital handcuffs <em>(les menottes "
+"num&eacute;riques)</em>."
 msgstr ""
 "En tout cas, il existe également des formats secrets de données en usage "
 "dans la publication des œuvres. Il y a des formats secrets de données pour "
@@ -492,23 +810,27 @@
 "naturel de faire."
 
 #. type: Content of: <p>
+# | {+And this is used even by public entities to communicate with the people.
+# | For instance Italian public television makes its programs available on the
+# | net in a format called VC-1, which is a standard supposedly, but it's a
+# | secret standard.+} Now I can't imagine how any publicly supported entity
+# | could justify using a secret format to communicate with the public. This
+# | should be illegal. In fact I think all use of Digital Restrictions
+# | Management should be illegal. No company should be allowed to do this.
+#, fuzzy
+#| msgid ""
+#| "Now I can't imagine how any publicly supported entity could justify using "
+#| "a secret format to communicate with the public. This should be illegal. "
+#| "In fact I think all use of Digital Restrictions Management should be "
+#| "illegal. No company should be allowed to do this."
 msgid ""
 "And this is used even by public entities to communicate with the people. For "
 "instance Italian public television makes its programs available on the net "
 "in a format called VC-1, which is a standard supposedly, but it's a secret "
-"standard."
-msgstr ""
-"Et ce système est même utilisé par des organismes publics pour communiquer 
"
-"avec les gens. Par exemple, la télévision publique italienne distribue ses "
-"programmes sur le net dans un format appelé VC-1, censé être un "
-"standard&nbsp;; mais c'est un standard secret."
-
-#. type: Content of: <p>
-msgid ""
-"Now I can't imagine how any publicly supported entity could justify using a "
-"secret format to communicate with the public. This should be illegal. In "
-"fact I think all use of Digital Restrictions Management should be illegal. "
-"No company should be allowed to do this."
+"standard. Now I can't imagine how any publicly supported entity could "
+"justify using a secret format to communicate with the public. This should be "
+"illegal. In fact I think all use of Digital Restrictions Management should "
+"be illegal. No company should be allowed to do this."
 msgstr ""
 "Maintenant, je ne peux pas imaginer comment un organisme financé "
 "publiquement pourrait justifier l'utilisation d'un format secret pour "
@@ -532,28 +854,38 @@
 "ce que [le format] soit secret."
 
 #. type: Content of: <p>
+# | {+Then there are the patented formats, such as MP3 for audio. It's bad to
+# | distribute audio in MP3 format. There is free software to handle MP3
+# | format, to play it and to generate it, but because it's patented in many
+# | countries, many distributors of free software don't dare include those
+# | programs; so if they distribute the GNU+Linux system, their system doesn't
+# | include a player for MP3.+} As a result if anyone distributes some music
+# | in MP3{+,+} that's putting pressure on people not to use GNU/Linux.  Sure,
+# | if you're an expert you can find a free software and install it, but there
+# | are lots of non experts, and they might see that they installed a version
+# | of GNU/Linux which doesn't have that software, and it won't play MP3
+# | files, and they think it's the system's fault. They don't realize it's
+# | MP3's fault. But this is the fact.
+#, fuzzy
+#| msgid ""
+#| "As a result if anyone distributes some music in MP3 that's putting "
+#| "pressure on people not to use GNU/Linux. Sure, if you're an expert you "
+#| "can find a free software and install it, but there are lots of non "
+#| "experts, and they might see that they installed a version of GNU/Linux "
+#| "which doesn't have that software, and it won't play MP3 files, and they "
+#| "think it's the system's fault. They don't realize it's MP3's fault. But "
+#| "this is the fact."
 msgid ""
 "Then there are the patented formats, such as MP3 for audio. It's bad to "
-"distribute audio in MP3 format! There is free software to handle MP3 format, "
+"distribute audio in MP3 format. There is free software to handle MP3 format, "
 "to play it and to generate it, but because it's patented in many countries, "
 "many distributors of free software don't dare include those programs; so if "
 "they distribute the GNU+Linux system, their system doesn't include a player "
-"for MP3."
-msgstr ""
-"Puis il y a les formats brevetés, comme MP3 pour l'audio. C'est mal de "
-"distribuer l'audio au format MP3&nbsp;! Il y a des logiciels libres qui "
-"manipulent le format MP3, qui le lisent et qui le génèrent, mais comme il "
-"est breveté dans de nombreux pays, beaucoup de distributeurs de logiciels "
-"libres n'osent pas inclure ces logiciels. Ainsi, s'ils distribuent le "
-"système GNU+Linux, leur système n'a pas de lecteur MP3."
-
-#. type: Content of: <p>
-msgid ""
-"As a result if anyone distributes some music in MP3 that's putting pressure "
-"on people not to use GNU/Linux. Sure, if you're an expert you can find a "
-"free software and install it, but there are lots of non experts, and they "
-"might see that they installed a version of GNU/Linux which doesn't have that "
-"software, and it won't play MP3 files, and they think it's the system's "
+"for MP3. As a result if anyone distributes some music in MP3, that's putting "
+"pressure on people not to use GNU/Linux.  Sure, if you're an expert you can "
+"find a free software and install it, but there are lots of non experts, and "
+"they might see that they installed a version of GNU/Linux which doesn't have "
+"that software, and it won't play MP3 files, and they think it's the system's "
 "fault. They don't realize it's MP3's fault. But this is the fact."
 msgstr ""
 "Le résultat, c'est que distribuer de la musique en MP3 revient à faire "
@@ -565,13 +897,33 @@
 "rendent pas compte que c'est la faute de MP3. Mais c'est un fait."
 
 #. type: Content of: <p>
+# | Therefore, if you want to support freedom, don't distribute MP3 files.
+# | That's why I say if you're recording my speech and you want to distribute
+# | copies, don't do it in a patented format such as MPEG-2, or MPEG-4, or
+# | MP3. Use a format friendly to free software, such as the [-Ogg format-]
+# | {+OGG formats+} or WebM. And by the way, if you are going to distribute
+# | copies of the recording, please put on it the Creative [-Commons-No
+# | derivatives-] {+Commons, No Derivatives+} license. This is a statement of
+# | my personal views. If it were a lecture for a course, if it were didactic,
+# | then it ought to be free, but statements of opinion are different.
+#, fuzzy
+#| msgid ""
+#| "Therefore, if you want to support freedom, don't distribute MP3 files. "
+#| "That's why I say if you're recording my speech and you want to distribute "
+#| "copies, don't do it in a patented format such as MPEG-2, or MPEG-4, or "
+#| "MP3. Use a format friendly to free software, such as the Ogg format or "
+#| "WebM. And by the way, if you are going to distribute copies of the "
+#| "recording, please put on it the Creative Commons-No derivatives license. "
+#| "This is a statement of my personal views. If it were a lecture for a "
+#| "course, if it were didactic, then it ought to be free, but statements of "
+#| "opinion are different."
 msgid ""
 "Therefore, if you want to support freedom, don't distribute MP3 files. "
 "That's why I say if you're recording my speech and you want to distribute "
 "copies, don't do it in a patented format such as MPEG-2, or MPEG-4, or MP3. "
-"Use a format friendly to free software, such as the Ogg format or WebM. And "
+"Use a format friendly to free software, such as the OGG formats or WebM. And "
 "by the way, if you are going to distribute copies of the recording, please "
-"put on it the Creative Commons-No derivatives license. This is a statement "
+"put on it the Creative Commons, No Derivatives license. This is a statement "
 "of my personal views. If it were a lecture for a course, if it were "
 "didactic, then it ought to be free, but statements of opinion are different."
 msgstr ""
@@ -590,19 +942,50 @@
 msgstr "Le logiciel qui n'est pas libre"
 
 #. type: Content of: <p>
+# | Now this leads me to the next threat which comes from software that the
+# | users don't have control over. In other words[-:-]{+,+} software that
+# | isn't free, that is not [-&ldquo;libre&rdquo;.-] {+<cite>libre</cite>.+}
+# | In this particular point French is clearer than English. The English word
+# | [-free-] {+&ldquo;free&rdquo;+} means [-&lsquo;libre&rsquo;-]
+# | {+<cite>libre</cite>+} and [-&lsquo;gratuit&rsquo;,-]
+# | {+<cite>gratuit</cite>,+} but what I mean when I say [-free software-]
+# | {+&ldquo;free software&rdquo;+} is [-&lsquo;logiciel libre&rsquo;.-]
+# | {+<cite>logiciel libre</cite>.+} I don't mean [-&lsquo;gratuit&rsquo;.-]
+# | {+<cite>gratuit</cite>.+} I'm not talking about price. Price is a side
+# | issue, just a detail, because it [-does'nt-] {+doesn't+} matter ethically.
+# | You know{+,+} if [-i-] {+I+} have a copy of a program and I sell it to you
+# | for one euro or a hundred euros, who cares? {+Right?+} Why should anyone
+# | think [-that-] that's good or bad? Or suppose I gave it to you
+# | [-&lsquo;gratuitement&rsquo;&hellip; still,-]
+# | {+<cite>gratuitement</cite>&hellip; Still,+} who cares? But whether this
+# | program respects your freedom, that's important!
+#, fuzzy
+#| msgid ""
+#| "Now this leads me to the next threat which comes from software that the "
+#| "users don't have control over. In other words: software that isn't free, "
+#| "that is not &ldquo;libre&rdquo;. In this particular point French is "
+#| "clearer than English. The English word free means &lsquo;libre&rsquo; and "
+#| "&lsquo;gratuit&rsquo;, but what I mean when I say free software is &lsquo;"
+#| "logiciel libre&rsquo;. I don't mean &lsquo;gratuit&rsquo;. I'm not "
+#| "talking about price. Price is a side issue, just a detail, because it "
+#| "does'nt matter ethically. You know if i have a copy of a program and I "
+#| "sell it to you for one euro or a hundred euros, who cares? Why should "
+#| "anyone think that that's good or bad? Or suppose I gave it to you &lsquo;"
+#| "gratuitement&rsquo;&hellip; still, who cares? But whether this program "
+#| "respects your freedom, that's important!"
 msgid ""
 "Now this leads me to the next threat which comes from software that the "
-"users don't have control over. In other words: software that isn't free, "
-"that is not &ldquo;libre&rdquo;. In this particular point French is clearer "
-"than English. The English word free means &lsquo;libre&rsquo; and &lsquo;"
-"gratuit&rsquo;, but what I mean when I say free software is &lsquo;logiciel "
-"libre&rsquo;. I don't mean &lsquo;gratuit&rsquo;. I'm not talking about "
-"price. Price is a side issue, just a detail, because it does'nt matter "
-"ethically. You know if i have a copy of a program and I sell it to you for "
-"one euro or a hundred euros, who cares? Why should anyone think that that's "
-"good or bad? Or suppose I gave it to you &lsquo;gratuitement&rsquo;&hellip; "
-"still, who cares? But whether this program respects your freedom, that's "
-"important!"
+"users don't have control over. In other words, software that isn't free, "
+"that is not <cite>libre</cite>. In this particular point French is clearer "
+"than English. The English word &ldquo;free&rdquo; means <cite>libre</cite> "
+"and <cite>gratuit</cite>, but what I mean when I say &ldquo;free "
+"software&rdquo; is <cite>logiciel libre</cite>. I don't mean <cite>gratuit</"
+"cite>. I'm not talking about price. Price is a side issue, just a detail, "
+"because it doesn't matter ethically. You know, if I have a copy of a program "
+"and I sell it to you for one euro or a hundred euros, who cares? Right? Why "
+"should anyone think that's good or bad? Or suppose I gave it to you "
+"<cite>gratuitement</cite>&hellip; Still, who cares? But whether this program "
+"respects your freedom, that's important!"
 msgstr ""
 "Cela m'amène à la menace suivante, qui provient des logiciels sur lesquels "
 "les utilisateurs n'ont pas de contrôle&nbsp;; en d'autres termes, des "
@@ -610,26 +993,44 @@
 "libres&nbsp;». Sur ce point particulier, le français est plus clair que "
 "l'anglais. Le mot anglais <em>free</em> veut dire «&nbsp;libre&nbsp;» ou "
 "«&nbsp;gratuit&nbsp;». Mais ce que j'entends par <em>free software</em>, 
est "
-"«&nbsp;logiciel libre&nbsp;». Je ne veux pas dire «&nbsp;gratuit&nbsp;». 
Je ne "
-"suis pas en train de parler de prix. Le prix est un problème annexe, juste "
-"un détail, parce que cela n'a pas d'importance du point de vue éthique. 
Vous "
-"savez, si j'ai une copie d'un programme, que je vous la vende pour un euro "
-"ou pour cent euros, qui s'en préoccupe&nbsp;? Pourquoi faudrait-il que "
-"quelqu'un pense que c'est bien ou mal&nbsp;? Ou bien, supposez que je vous "
-"le donne «&nbsp;gratuitement&nbsp;»<a href=\"#TransNote2\"><sup>2</sup></"
-"a>&hellip; Encore une fois, qui cela intéresse-t-il&nbsp;? Mais savoir si ce 
"
-"programme respecte votre liberté ou non, voilà qui est important&nbsp;!"
-
-#. type: Content of: <p>
+"«&nbsp;logiciel libre&nbsp;». Je ne veux pas dire «&nbsp;gratuit&nbsp;». 
Je "
+"ne suis pas en train de parler de prix. Le prix est un problème annexe, "
+"juste un détail, parce que cela n'a pas d'importance du point de vue "
+"éthique. Vous savez, si j'ai une copie d'un programme, que je vous la vende "
+"pour un euro ou pour cent euros, qui s'en préoccupe&nbsp;? Pourquoi 
faudrait-"
+"il que quelqu'un pense que c'est bien ou mal&nbsp;? Ou bien, supposez que je "
+"vous le donne «&nbsp;gratuitement&nbsp;»<a href=\"#TransNote2\"><sup>2</"
+"sup></a>&hellip; Encore une fois, qui cela intéresse-t-il&nbsp;? Mais savoir 
"
+"si ce programme respecte votre liberté ou non, voilà qui est 
important&nbsp;!"
+
+#. type: Content of: <p>
+# | So free software is software that respects users' freedom. What does this
+# | mean? Ultimately there are just two possibilities with software: either
+# | the users control the program or the program controls the users.  If the
+# | users have certain essential freedoms, then [-they-] {+<em>they</em>+}
+# | control the program, and those freedoms are the criterion for free
+# | software. But if the users [-don't-] {+<em>don't</em>+} fully have the
+# | essential freedoms, then the program controls the users. But somebody
+# | controls that program and, through it, has <em>power</em> over the users.
+#, fuzzy
+#| msgid ""
+#| "So free software is software that respects users' freedom. What does this "
+#| "mean? Ultimately there are just two possibilities with software: either "
+#| "the users control the program or the program controls the users.  If the "
+#| "users have certain essential freedoms, then they control the program, and "
+#| "those freedoms are the criterion for free software. But if the users "
+#| "don't fully have the essential freedoms, then the program controls the "
+#| "users. But somebody controls that program and, through it, has <em>power</"
+#| "em> over the users."
 msgid ""
 "So free software is software that respects users' freedom. What does this "
 "mean? Ultimately there are just two possibilities with software: either the "
 "users control the program or the program controls the users.  If the users "
-"have certain essential freedoms, then they control the program, and those "
-"freedoms are the criterion for free software. But if the users don't fully "
-"have the essential freedoms, then the program controls the users. But "
-"somebody controls that program and, through it, has <em>power</em> over the "
-"users."
+"have certain essential freedoms, then <em>they</em> control the program, and "
+"those freedoms are the criterion for free software. But if the users "
+"<em>don't</em> fully have the essential freedoms, then the program controls "
+"the users. But somebody controls that program and, through it, has "
+"<em>power</em> over the users."
 msgstr ""
 "Donc le logiciel libre est un logiciel qui respecte la liberté des "
 "utilisateurs. Qu'est-ce que cela veut dire&nbsp;? En fin de compte il n'y a "
@@ -643,12 +1044,25 @@
 "<em>pouvoir</em> sur les utilisateurs."
 
 #. type: Content of: <p>
+# | So, a nonfree program is an instrument to give somebody <em>power</em>
+# | over a lot of other people{+,+} and this is unjust power that nobody
+# | should ever have. This is why nonfree software [-(les-] {+<cite>(les+}
+# | logiciels privateurs, qui privent de la [-libert&eacute;),-]
+# | {+libert&eacute;)</cite>,+} why proprietary software is an injustice and
+# | should not exist; because it leaves the users without freedom.
+#, fuzzy
+#| msgid ""
+#| "So, a nonfree program is an instrument to give somebody <em>power</em> "
+#| "over a lot of other people and this is unjust power that nobody should "
+#| "ever have. This is why nonfree software (les logiciels privateurs, qui "
+#| "privent de la libert&eacute;), why proprietary software is an injustice "
+#| "and should not exist; because it leaves the users without freedom."
 msgid ""
 "So, a nonfree program is an instrument to give somebody <em>power</em> over "
-"a lot of other people and this is unjust power that nobody should ever have. "
-"This is why nonfree software (les logiciels privateurs, qui privent de la "
-"libert&eacute;), why proprietary software is an injustice and should not "
-"exist; because it leaves the users without freedom."
+"a lot of other people, and this is unjust power that nobody should ever "
+"have. This is why nonfree software <cite>(les logiciels privateurs, qui "
+"privent de la libert&eacute;)</cite>, why proprietary software is an "
+"injustice and should not exist; because it leaves the users without freedom."
 msgstr ""
 "Ainsi, un programme non libre est un instrument qui donne à quelqu'un du "
 "<em>pouvoir</em> sur de nombreuses autres personnes. C'est un pouvoir "
@@ -658,11 +1072,25 @@
 "exister&nbsp;; parce qu'ils enlèvent aux utilisateurs leur liberté."
 
 #. type: Content of: <p>
+# | Now, the developer who has control of the program often feels tempted to
+# | introduce malicious features to <em>further</em> exploit or abuse those
+# | users. He feels a temptation because he knows he can get away with [-it:
+# | because-] {+it. Because+} his program controls the users and the users do
+# | not have control of the program, if he puts in a malicious feature, the
+# | users can't fix it; they can't remove the malicious feature.
+#, fuzzy
+#| msgid ""
+#| "Now, the developer who has control of the program often feels tempted to "
+#| "introduce malicious features to <em>further</em> exploit or abuse those "
+#| "users.  He feels a temptation because he knows he can get away with it: "
+#| "because his program controls the users and the users do not have control "
+#| "of the program, if he puts in a malicious feature, the users can't fix "
+#| "it; they can't remove the malicious feature."
 msgid ""
 "Now, the developer who has control of the program often feels tempted to "
 "introduce malicious features to <em>further</em> exploit or abuse those "
-"users.  He feels a temptation because he knows he can get away with it: "
-"because his program controls the users and the users do not have control of "
+"users. He feels a temptation because he knows he can get away with it. "
+"Because his program controls the users and the users do not have control of "
 "the program, if he puts in a malicious feature, the users can't fix it; they "
 "can't remove the malicious feature."
 msgstr ""
@@ -676,13 +1104,29 @@
 "la fonctionnalité malveillante."
 
 #. type: Content of: <p>
+# | I've already told you about two kinds of malicious features: surveillance
+# | features, such as are found in Windows[-,-] and the [-Iphone-] {+iPhone+}
+# | and Flash player[-,-] and the [-&ldquo;Swindle&rdquo;.-] {+Swindle, sort
+# | of.+} And there are also features to restrict users, which work with
+# | secret data formats, and those are found in Windows, Macintosh, the
+# | [-Iphone,-] {+iPhone,+} Flash player, the Amazon
+# | [-&ldquo;Swindle&rdquo;,-] {+Swindle,+} the Playstation 3 and lots and
+# | lots of other programs.
+#, fuzzy
+#| msgid ""
+#| "I've already told you about two kinds of malicious features: surveillance "
+#| "features, such as are found in Windows, and the Iphone and Flash player, "
+#| "and the &ldquo;Swindle&rdquo;. And there are also features to restrict "
+#| "users, which work with secret data formats, and those are found in "
+#| "Windows, Macintosh, the Iphone, Flash player, the Amazon &ldquo;"
+#| "Swindle&rdquo;, the Playstation 3 and lots and lots of other programs."
 msgid ""
 "I've already told you about two kinds of malicious features: surveillance "
-"features, such as are found in Windows, and the Iphone and Flash player, and "
-"the &ldquo;Swindle&rdquo;. And there are also features to restrict users, "
-"which work with secret data formats, and those are found in Windows, "
-"Macintosh, the Iphone, Flash player, the Amazon &ldquo;Swindle&rdquo;, the "
-"Playstation 3 and lots and lots of other programs."
+"features, such as are found in Windows and the iPhone and Flash player and "
+"the Swindle, sort of. And there are also features to restrict users, which "
+"work with secret data formats, and those are found in Windows, Macintosh, "
+"the iPhone, Flash player, the Amazon Swindle, the Playstation 3 and lots and "
+"lots of other programs."
 msgstr ""
 "Je vous ai déjà parlé de deux types de fonctionnalités 
malveillantes&nbsp;: "
 "les fonctionnalités de surveillance, comme on en trouve dans Windows, "
@@ -693,20 +1137,51 @@
 "et bien d'autres programmes."
 
 #. type: Content of: <p>
+# | The other kind of malicious feature is the backdoor. That means something
+# | in that program is listening for remote commands and obeying them, and
+# | those commands can mistreat the user. We know of backdoors in Windows, in
+# | the [-Iphone,-] {+iPhone,+} in the Amazon [-&ldquo;Swindle&rdquo;.-]
+# | {+Swindle.+} The Amazon [-&ldquo;Swindle&rdquo;-] {+Swindle+} has a
+# | backdoor that can {+delete books,+} remotely delete books. We know this by
+# | observation, because Amazon did it: in 2009 Amazon remotely deleted
+# | thousands of copies of a particular book. Those were authorized copies,
+# | people had [-obtain-] {+obtained+} them directly from Amazon, and thus
+# | Amazon knew exactly where they were, which is how Amazon knew where to
+# | send the commands to delete those books. You know which book Amazon
+# | deleted? <em>1984</em> by George[-s-] Orwell. {+[laughter]+} It's a book
+# | everyone should read, because it discusses a totalitarian state that did
+# | things like delete books it didn't like. Everybody should read it, but not
+# | on the Amazon [-&ldquo;Swindle&rdquo;.-] {+Swindle. [laughter]+}
+#, fuzzy
+#| msgid ""
+#| "The other kind of malicious feature is the backdoor. That means something "
+#| "in that program is listening for remote commands and obeying them, and "
+#| "those commands can mistreat the user. We know of backdoors in Windows, in "
+#| "the Iphone, in the Amazon &ldquo;Swindle&rdquo;. The Amazon &ldquo;"
+#| "Swindle&rdquo; has a backdoor that can remotely delete books. We know "
+#| "this by observation, because Amazon did it: in 2009 Amazon remotely "
+#| "deleted thousands of copies of a particular book. Those were authorized "
+#| "copies, people had obtain them directly from Amazon, and thus Amazon knew "
+#| "exactly where they were, which is how Amazon knew where to send the "
+#| "commands to delete those books. You know which book Amazon deleted? "
+#| "<em>1984</em> by Georges Orwell. It's a book everyone should read, "
+#| "because it discusses a totalitarian state that did things like delete "
+#| "books it didn't like. Everybody should read it, but not on the Amazon "
+#| "&ldquo;Swindle&rdquo;."
 msgid ""
 "The other kind of malicious feature is the backdoor. That means something in "
 "that program is listening for remote commands and obeying them, and those "
 "commands can mistreat the user. We know of backdoors in Windows, in the "
-"Iphone, in the Amazon &ldquo;Swindle&rdquo;. The Amazon &ldquo;"
-"Swindle&rdquo; has a backdoor that can remotely delete books. We know this "
-"by observation, because Amazon did it: in 2009 Amazon remotely deleted "
-"thousands of copies of a particular book. Those were authorized copies, "
-"people had obtain them directly from Amazon, and thus Amazon knew exactly "
-"where they were, which is how Amazon knew where to send the commands to "
-"delete those books. You know which book Amazon deleted? <em>1984</em> by "
-"Georges Orwell. It's a book everyone should read, because it discusses a "
-"totalitarian state that did things like delete books it didn't like. "
-"Everybody should read it, but not on the Amazon &ldquo;Swindle&rdquo;."
+"iPhone, in the Amazon Swindle. The Amazon Swindle has a backdoor that can "
+"delete books, remotely delete books. We know this by observation, because "
+"Amazon did it: in 2009 Amazon remotely deleted thousands of copies of a "
+"particular book. Those were authorized copies, people had obtained them "
+"directly from Amazon, and thus Amazon knew exactly where they were, which is "
+"how Amazon knew where to send the commands to delete those books. You know "
+"which book Amazon deleted? <em>1984</em> by George Orwell. [laughter] It's a "
+"book everyone should read, because it discusses a totalitarian state that "
+"did things like delete books it didn't like. Everybody should read it, but "
+"not on the Amazon Swindle. [laughter]"
 msgstr ""
 "L'autre type de fonctionnalité malveillante est la «&nbsp;porte "
 "dérobée&nbsp;» [<em>backdoor</em>]. Cette expression signifie que quelque "
@@ -726,10 +1201,34 @@
 "monde devrait le lire, mais pas sur le <em>Swindle</em> d'Amazon."
 
 #. type: Content of: <p>
+# | Anyway, malicious features are present in the most widely used nonfree
+# | programs, but they are rare in free software, because with free software
+# | the users have [-control: they-] {+control. They+} can read the source
+# | code and they can change it. So, if there were a malicious feature,
+# | somebody would sooner or later spot it and fix it. This means that
+# | somebody who is considering introducing a malicious feature does not find
+# | it so tempting, because he knows he might get away with it for a while but
+# | somebody will spot it, will fix it, and everybody will loose trust in the
+# | perpetrator. It's not so tempting when you know you're going to fail. And
+# | that's why we find that malicious features are rare in free software, and
+# | common in proprietary software.
+#, fuzzy
+#| msgid ""
+#| "Anyway, malicious features are present in the most widely used nonfree "
+#| "programs, but they are rare in free software, because with free software "
+#| "the users have control: they can read the source code and they can change "
+#| "it. So, if there were a malicious feature, somebody would sooner or later "
+#| "spot it and fix it. This means that somebody who is considering "
+#| "introducing a malicious feature does not find it so tempting, because he "
+#| "knows he might get away with it for a while but somebody will spot it, "
+#| "will fix it, and everybody will loose trust in the perpetrator. It's not "
+#| "so tempting when you know you're going to fail. And that's why we find "
+#| "that malicious features are rare in free software, and common in "
+#| "proprietary software."
 msgid ""
 "Anyway, malicious features are present in the most widely used nonfree "
 "programs, but they are rare in free software, because with free software the "
-"users have control: they can read the source code and they can change it. "
+"users have control. They can read the source code and they can change it. "
 "So, if there were a malicious feature, somebody would sooner or later spot "
 "it and fix it. This means that somebody who is considering introducing a "
 "malicious feature does not find it so tempting, because he knows he might "
@@ -753,40 +1252,69 @@
 "logiciels libres et communes dans les logiciels propriétaires."
 
 #. type: Content of: <h3>
-msgid "The 4 freedoms of free software"
+# | The [-4-] {+four+} freedoms of free software
+#, fuzzy
+#| msgid "The 4 freedoms of free software"
+msgid "The four freedoms of free software"
 msgstr "Les quatre libertés du logiciel libre"
 
 #. type: Content of: <p>
-msgid "Now the essential freedoms are four:"
+# | [-Now the-]{+The+} essential freedoms are four:
+#, fuzzy
+#| msgid "Now the essential freedoms are four:"
+msgid "The essential freedoms are four:"
 msgstr ""
 "Voyons maintenant les libertés essentielles. Elles sont au nombre de "
 "quatre&nbsp;:"
 
 #. type: Content of: <ul><li>
-msgid "Freedom 0 is the freedom to run the program as you wish."
+# | [-Freedom 0-]{+Freedom 0+} is the freedom to run the program as you wish.
+#, fuzzy
+#| msgid "Freedom 0 is the freedom to run the program as you wish."
+msgid "Freedom 0 is the freedom to run the program as you wish."
 msgstr ""
 "La liberté 0 est la liberté de faire tourner le programme comme vous le "
 "souhaitez."
 
 #. type: Content of: <ul><li>
+# | [-Freedom 1-]{+Freedom 1+} is the freedom to study the source code and
+# | change it, so the program does your computing the way you wish.
+#, fuzzy
+#| msgid ""
+#| "Freedom 1 is the freedom to study the source code and change it, so the "
+#| "program does your computing the way you wish."
 msgid ""
-"Freedom 1 is the freedom to study the source code and change it, so the "
+"Freedom 1 is the freedom to study the source code and change it, so the "
 "program does your computing the way you wish."
 msgstr ""
 "La liberté 1 est la liberté d'étudier le code source et de le changer, 
pour "
 "que le programme fasse votre travail informatique comme vous le souhaitez."
 
 #. type: Content of: <ul><li>
+# | [-Freedom 2-]{+Freedom 2+} is the freedom to help others. That's the
+# | freedom to make exact copies and redistribute them when you wish.
+#, fuzzy
+#| msgid ""
+#| "Freedom 2 is the freedom to help others. That's the freedom to make exact "
+#| "copies and redistribute them when you wish."
 msgid ""
-"Freedom 2 is the freedom to help others. That's the freedom to make exact "
+"Freedom 2 is the freedom to help others. That's the freedom to make exact "
 "copies and redistribute them when you wish."
 msgstr ""
 "La liberté 2 est la liberté d'aider les autres. C'est la liberté de faire "
 "des copies exactes et de les redistribuer quand vous le souhaitez."
 
 #. type: Content of: <ul><li>
+# | [-Freedom 3-]{+Freedom 3+} is the freedom to contribute to your
+# | community. That's the freedom to make copies of your modified versions, if
+# | you have made any, and then distribute them to others when you wish.
+#, fuzzy
+#| msgid ""
+#| "Freedom 3 is the freedom to contribute to your community. That's the "
+#| "freedom to make copies of your modified versions, if you have made any, "
+#| "and then distribute them to others when you wish."
 msgid ""
-"Freedom 3 is the freedom to contribute to your community. That's the freedom "
+"Freedom 3 is the freedom to contribute to your community. That's the freedom 
"
 "to make copies of your modified versions, if you have made any, and then "
 "distribute them to others when you wish."
 msgstr ""
@@ -796,9 +1324,25 @@
 "vous le souhaitez."
 
 #. type: Content of: <p>
+# | These freedoms, in order to be adequate, must apply to all activities of
+# | life. For instance if it [-says: &ldquo;This-] {+says &ldquo;this+} is
+# | free for academic use,&rdquo; it's not free. Because that's too limited.
+# | It doesn't apply to all areas of life. In particular, if a program is
+# | free, that means it can be modified and distributed commercially, because
+# | commerce is an area of life, an activity in life. And this freedom has to
+# | apply to all activities.
+#, fuzzy
+#| msgid ""
+#| "These freedoms, in order to be adequate, must apply to all activities of "
+#| "life. For instance if it says: &ldquo;This is free for academic use,"
+#| "&rdquo; it's not free. Because that's too limited. It doesn't apply to "
+#| "all areas of life. In particular, if a program is free, that means it can "
+#| "be modified and distributed commercially, because commerce is an area of "
+#| "life, an activity in life. And this freedom has to apply to all "
+#| "activities."
 msgid ""
 "These freedoms, in order to be adequate, must apply to all activities of "
-"life. For instance if it says: &ldquo;This is free for academic use,&rdquo; "
+"life. For instance if it says &ldquo;this is free for academic use,&rdquo; "
 "it's not free. Because that's too limited. It doesn't apply to all areas of "
 "life. In particular, if a program is free, that means it can be modified and "
 "distributed commercially, because commerce is an area of life, an activity "
@@ -814,13 +1358,28 @@
 "activités."
 
 #. type: Content of: <p>
-msgid ""
-"Now however, it's not obligatory to do any of these things. The point is "
-"you're free to do them if you wish, when you wish. But you never have to do "
-"them. You don't have to do any of them. You don't have to run the program. "
-"You don't have to study or change the source code. You don't have to make "
-"any copies. You don't have to distribute your modified versions. The point "
-"is you should be free to do those things if you wish."
+# | [-Now however,-]{+However,+} it's not obligatory to do any of these
+# | things. The point is you're free to do them if you wish, when you wish.
+# | But you never have to do them. You don't have to do any of them. You don't
+# | have to run the program. You don't have to study or change the source
+# | code. You don't have to make any copies. You don't have to distribute your
+# | modified versions. The point is you should be free to do those things
+# | [-if-] {+<em>if+} you [-wish.-] {+wish</em>.+}
+#, fuzzy
+#| msgid ""
+#| "Now however, it's not obligatory to do any of these things. The point is "
+#| "you're free to do them if you wish, when you wish. But you never have to "
+#| "do them. You don't have to do any of them. You don't have to run the "
+#| "program. You don't have to study or change the source code. You don't "
+#| "have to make any copies. You don't have to distribute your modified "
+#| "versions. The point is you should be free to do those things if you wish."
+msgid ""
+"However, it's not obligatory to do any of these things. The point is you're "
+"free to do them if you wish, when you wish. But you never have to do them. "
+"You don't have to do any of them. You don't have to run the program. You "
+"don't have to study or change the source code. You don't have to make any "
+"copies. You don't have to distribute your modified versions. The point is "
+"you should be free to do those things <em>if you wish</em>."
 msgstr ""
 "Cependant, aucune de ces actions n'est obligatoire. L'important, c'est que "
 "vous êtes libres de les faire si vous le souhaitez, quand vous le souhaitez. 
"
@@ -832,18 +1391,44 @@
 "ces choses si vous le souhaitez."
 
 #. type: Content of: <p>
+# | Now, freedom [-number 1,-] {+number 1,+} the freedom to study and change
+# | the source code to make the program do your computing as you wish,
+# | includes something that might not be obvious at first. If the program
+# | comes in a product, and [-a-] {+the+} developer can provide an upgrade
+# | that will run, then you have to be able to make your version run in that
+# | product. If the product [-would-] {+will+} only run the developer's
+# | versions, and refuses to run yours, the executable in that product is not
+# | free software. Even if it was compiled from free source code, it's not
+# | free because you don't have the freedom to make the program do your
+# | computing the way you wish. So, [-freedom 1-] {+freedom 1+} has to be
+# | real, not just theoretical. It has to include the freedom to use [-your-]
+# | {+<em>your</em>+} version, not just the freedom to make some source code
+# | that won't run.
+#, fuzzy
+#| msgid ""
+#| "Now, freedom number 1, the freedom to study and change the source code to "
+#| "make the program do your computing as you wish, includes something that "
+#| "might not be obvious at first. If the program comes in a product, and a "
+#| "developer can provide an upgrade that will run, then you have to be able "
+#| "to make your version run in that product. If the product would only run "
+#| "the developer's versions, and refuses to run yours, the executable in "
+#| "that product is not free software. Even if it was compiled from free "
+#| "source code, it's not free because you don't have the freedom to make the "
+#| "program do your computing the way you wish. So, freedom 1 has to be real, "
+#| "not just theoretical. It has to include the freedom to use your version, "
+#| "not just the freedom to make some source code that won't run."
 msgid ""
-"Now, freedom number 1, the freedom to study and change the source code to "
+"Now, freedom number 1, the freedom to study and change the source code to "
 "make the program do your computing as you wish, includes something that "
-"might not be obvious at first. If the program comes in a product, and a "
+"might not be obvious at first. If the program comes in a product, and the "
 "developer can provide an upgrade that will run, then you have to be able to "
-"make your version run in that product. If the product would only run the "
+"make your version run in that product. If the product will only run the "
 "developer's versions, and refuses to run yours, the executable in that "
 "product is not free software. Even if it was compiled from free source code, "
 "it's not free because you don't have the freedom to make the program do your "
-"computing the way you wish. So, freedom 1 has to be real, not just "
-"theoretical. It has to include the freedom to use your version, not just the "
-"freedom to make some source code that won't run."
+"computing the way you wish. So, freedom 1 has to be real, not just "
+"theoretical. It has to include the freedom to use <em>your</em> version, not "
+"just the freedom to make some source code that won't run."
 msgstr ""
 "Une remarque sur la liberté numéro 1, la liberté d'étudier et de changer 
le "
 "code source pour que le programme fasse votre travail informatique comme "
@@ -860,16 +1445,33 @@
 "seulement la liberté de faire du code source qui ne fonctionne pas."
 
 #. type: Content of: <h3>
-msgid "The GNU project and the free software movement"
+# | The GNU [-p-]{+P+}roject and the [-free software-] {+Free Software+}
+# | movement
+#, fuzzy
+#| msgid "The GNU project and the free software movement"
+msgid "The GNU Project and the Free Software movement"
 msgstr "Le projet GNU et le mouvement du logiciel libre"
 
 #. type: Content of: <p>
+# | I launched the [-free software-] {+Free Software+} movement in 1983, when
+# | I announced the plan to develop a free software operating system whose
+# | name is GNU. Now GNU, the name GNU, is a joke; because part of the
+# | hacker's spirit is to have fun even when you're doing something [-very-]
+# | {+<em>very</em>+} serious. Now I can't think of anything more seriously
+# | important than defending freedom.
+#, fuzzy
+#| msgid ""
+#| "I launched the free software movement in 1983, when I announced the plan "
+#| "to develop a free software operating system whose name is GNU. Now GNU, "
+#| "the name GNU, is a joke; because part of the hacker's spirit is to have "
+#| "fun even when you're doing something very serious. Now I can't think of "
+#| "anything more seriously important than defending freedom."
 msgid ""
-"I launched the free software movement in 1983, when I announced the plan to "
+"I launched the Free Software movement in 1983, when I announced the plan to "
 "develop a free software operating system whose name is GNU. Now GNU, the "
 "name GNU, is a joke; because part of the hacker's spirit is to have fun even "
-"when you're doing something very serious. Now I can't think of anything more "
-"seriously important than defending freedom."
+"when you're doing something <em>very</em> serious. Now I can't think of "
+"anything more seriously important than defending freedom."
 msgstr ""
 "J'ai lancé le mouvement du logiciel libre en 1983, quand j'ai annoncé le "
 "projet de développer un système d'exploitation constitué de logiciel 
libre, "
@@ -879,10 +1481,20 @@
 "que de défendre la liberté."
 
 #. type: Content of: <p>
+# | But that didn't mean I couldn't give my system a name that's a joke.  So
+# | GNU is a joke because it's a recursive acronym, it stands for [-&ldquo;GNU
+# | is-] {+&ldquo;GNU's+} Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} so G.N.U.:
+# | GNU's Not Unix. So the G in GNU stands for GNU.
+#, fuzzy
+#| msgid ""
+#| "But that didn't mean I couldn't give my system a name that's a joke.  So "
+#| "GNU is a joke because it's a recursive acronym, it stands for &ldquo;GNU "
+#| "is Not Unix&rdquo;, so G.N.U.: GNU's Not Unix. So the G in GNU stands for "
+#| "GNU."
 msgid ""
 "But that didn't mean I couldn't give my system a name that's a joke.  So GNU "
-"is a joke because it's a recursive acronym, it stands for &ldquo;GNU is Not "
-"Unix&rdquo;, so G.N.U.: GNU's Not Unix. So the G in GNU stands for GNU."
+"is a joke because it's a recursive acronym, it stands for &ldquo;GNU's Not "
+"Unix,&rdquo; so G.N.U.: GNU's Not Unix. So the G in GNU stands for GNU."
 msgstr ""
 "Mais cela ne voulait pas dire que je ne pouvais pas donner à mon système un 
"
 "nom en forme de blague. Ainsi, GNU est une blague parce que c'est un "
@@ -890,23 +1502,28 @@
 "<em>GNU's Not Unix</em>. Le G de GNU veut dire GNU."
 
 #. type: Content of: <p>
-msgid ""
-"Now in fact that was a tradition at the time. The tradition was: if there "
-"was an existing program and you wrote something similar to it, inspired by "
-"it, you could give credit by giving your program a name that's a recursive "
-"acronym saying it's not the other one."
-msgstr ""
-"En fait, c'était une tradition à l'époque. La tradition voulait que, si 
vous "
-"vous inspiriez d'un programme existant pour écrire quelque chose de "
-"semblable, vous pouviez lui donner crédit en nommant votre programme par un "
-"acronyme récursif disant que ce n'était pas l'autre programme."
-
-#. type: Content of: <p>
-msgid ""
-"So I gave credit to Unix for the technical ideas of Unix, but with the name "
-"GNU, because I decided to make GNU a Unix-like system, with the same "
-"commands, the same system calls, so that it would be compatible, so that "
-"people who used Unix can switch over easily."
+# | {+In fact this was a tradition at the time. The tradition was: if there
+# | was an existing program and you wrote something similar to it, inspired by
+# | it, you could give credit by giving your program a name that's a recursive
+# | acronym saying it's not the other one.+} So I gave credit to Unix for the
+# | technical ideas of Unix, but with the name GNU, because I decided to make
+# | GNU a Unix-like system, with the same commands, the same system calls, so
+# | that it would be compatible, so that people who used Unix [-can-]
+# | {+could+} switch over easily.
+#, fuzzy
+#| msgid ""
+#| "So I gave credit to Unix for the technical ideas of Unix, but with the "
+#| "name GNU, because I decided to make GNU a Unix-like system, with the same "
+#| "commands, the same system calls, so that it would be compatible, so that "
+#| "people who used Unix can switch over easily."
+msgid ""
+"In fact this was a tradition at the time. The tradition was: if there was an "
+"existing program and you wrote something similar to it, inspired by it, you "
+"could give credit by giving your program a name that's a recursive acronym "
+"saying it's not the other one. So I gave credit to Unix for the technical "
+"ideas of Unix, but with the name GNU, because I decided to make GNU a Unix-"
+"like system, with the same commands, the same system calls, so that it would "
+"be compatible, so that people who used Unix could switch over easily."
 msgstr ""
 "Ainsi, j'ai donné crédit à Unix pour les idées techniques d'Unix, mais au 
"
 "moyen du nom GNU. J'avais en effet décidé de faire de GNU un système de la 
"
@@ -915,6 +1532,16 @@
 "facilement."
 
 #. type: Content of: <p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "But the reason for developing GNU, that was unique. GNU is the only "
+#| "operating system, as far as I know, ever developed for the purpose of "
+#| "freedom. Not for technical motivations, not for commercial motivations.  "
+#| "GNU was written for <em>your</em> freedom. Because without a free "
+#| "operating system, it's impossible to have freedom and use a computer. And "
+#| "there were none, and I wanted people to have freedom, so it was up to me "
+#| "to write one."
 msgid ""
 "But the reason for developing GNU, that was unique. GNU is the only "
 "operating system, as far as I know, ever developed for the purpose of "
@@ -932,30 +1559,66 @@
 "les gens aient la liberté, c'était à moi qu'il revenait d'en écrire un."
 
 #. type: Content of: <p>
+# | Nowadays there are millions of users of the GNU operating system and most
+# | of them don't <em>know</em> they are using the GNU operating system,
+# | because there is a widespread practice which is not nice. People call the
+# | system [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Many do, but some
+# | people don't, and I hope you'll be one of them. Please, since we started
+# | this, since we wrote the biggest piece of the code, please give us equal
+# | mention,[- -]please call the system [-GNU+Linux,-]
+# | {+&ldquo;GNU+Linux,&rdquo;+} or [-GNU/Linux.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} It's not much to ask[-!-]{+.+}
+#, fuzzy
+#| msgid ""
+#| "Nowadays there are millions of users of the GNU operating system and most "
+#| "of them don't <em>know</em> they are using the GNU operating system, "
+#| "because there is a widespread practice which is not nice. People call the "
+#| "system &ldquo;Linux&rdquo;. Many do, but some people don't, and I hope "
+#| "you'll be one of them. Please, since we started this, since we wrote the "
+#| "biggest piece of the code, please give us equal mention, please call the "
+#| "system GNU+Linux, or GNU/Linux. It's not much to ask!"
 msgid ""
 "Nowadays there are millions of users of the GNU operating system and most of "
 "them don't <em>know</em> they are using the GNU operating system, because "
 "there is a widespread practice which is not nice. People call the system "
-"&ldquo;Linux&rdquo;. Many do, but some people don't, and I hope you'll be "
+"&ldquo;Linux.&rdquo; Many do, but some people don't, and I hope you'll be "
 "one of them. Please, since we started this, since we wrote the biggest piece "
-"of the code, please give us equal mention, please call the system GNU+Linux, "
-"or GNU/Linux. It's not much to ask!"
+"of the code, please give us equal mention,please call the system &ldquo;GNU"
+"+Linux,&rdquo; or &ldquo;GNU/Linux.&rdquo; It's not much to ask."
 msgstr ""
 "De nos jours, il y a des millions d'utilisateurs du système d'exploitation "
 "GNU et la plupart ne savent pas qu'ils utilisent le système d'exploitation "
 "GNU, parce qu'il y a un usage répandu qui n'est pas sympa. Les gens "
-"appellent ce système «&nbsp;Linux&nbsp;». Beaucoup le font, mais 
quelques-uns "
-"ne le font pas, et j'espère que vous êtes l'un d'eux. Je vous en prie, "
+"appellent ce système «&nbsp;Linux&nbsp;». Beaucoup le font, mais quelques-"
+"uns ne le font pas, et j'espère que vous êtes l'un d'eux. Je vous en prie, "
 "puisque nous avons ouvert la voie, puisque nous avons écrit le plus gros "
 "morceau du code, veuillez nous donner mention équivalente, veuillez appeler "
 "le système «&nbsp;GNU+Linux&nbsp;», ou «&nbsp;GNU/Linux&nbsp;». Ce n'est 
pas "
 "beaucoup demander&nbsp;!"
 
 #. type: Content of: <p>
+# | But there is another reason to do this. It turns out that the person who
+# | wrote Linux, which is one component of the system as we use it today,
+# | {+he+} doesn't agree with the [-free software-] {+Free Software+}
+# | movement. And so if you call the whole system Linux, in effect you're
+# | steering people towards his ideas, and away from our ideas. Because he's
+# | not gonna say to them that they deserve freedom. He's going to say to them
+# | that he likes convenient, reliable, powerful software. He's going to tell
+# | people that those are the important values.
+#, fuzzy
+#| msgid ""
+#| "But there is another reason to do this. It turns out that the person who "
+#| "wrote Linux, which is one component of the system as we use it today, "
+#| "doesn't agree with the free software movement. And so if you call the "
+#| "whole system Linux, in effect you're steering people towards his ideas, "
+#| "and away from our ideas. Because he's not gonna say to them that they "
+#| "deserve freedom. He's going to say to them that he likes convenient, "
+#| "reliable, powerful software. He's going to tell people that those are the "
+#| "important values."
 msgid ""
 "But there is another reason to do this. It turns out that the person who "
-"wrote Linux, which is one component of the system as we use it today, "
-"doesn't agree with the free software movement. And so if you call the whole "
+"wrote Linux, which is one component of the system as we use it today, he "
+"doesn't agree with the Free Software movement. And so if you call the whole "
 "system Linux, in effect you're steering people towards his ideas, and away "
 "from our ideas. Because he's not gonna say to them that they deserve "
 "freedom. He's going to say to them that he likes convenient, reliable, "
@@ -965,21 +1628,38 @@
 "Mais il y a une autre raison à cela. Il se trouve que la personne qui a "
 "écrit Linux, un des composants du système tel que nous l'utilisons "
 "aujourd'hui, n'est pas d'accord avec le mouvement du logiciel libre. Ainsi, "
-"si vous appelez le système entier «&nbsp;Linux&nbsp;», vous conduisez de 
fait "
-"les gens vers ses idées, loin de nos idées. Parce qu'il ne va pas leur dire 
"
-"qu'ils méritent la liberté. Il va leur dire qu'il aime les logiciels "
+"si vous appelez le système entier «&nbsp;Linux&nbsp;», vous conduisez de "
+"fait les gens vers ses idées, loin de nos idées. Parce qu'il ne va pas leur 
"
+"dire qu'ils méritent la liberté. Il va leur dire qu'il aime les logiciels "
 "pratiques, fiables et puissants. Il va leur dire que là sont les valeurs "
 "importantes."
 
 #. type: Content of: <p>
-msgid ""
-"But if you tell them the system is GNU+Linux&mdash;the GNU operating system "
-"plus Linux the kernel&mdash;then they'll know about us, and then they might "
-"listen to what we say. You deserve freedom, and since freedom will be lost "
-"if we don't defend it&mdash;there's always going to be a Sarkozy to take it "
-"away&mdash;we need above all to teach people to demand freedom, to be ready "
-"to stand up for their freedom the next time someone threatens to take it "
-"away."
+# | But if you tell them the system is [-GNU+Linux&mdash;the-]
+# | {+GNU+Linux&mdash;it's the+} GNU operating system plus Linux the
+# | kernel&mdash;then they'll know about us, and then they might listen to
+# | what we [-say. You-] {+say: you+} deserve [-freedom, and-] {+freedom.
+# | And+} since freedom will be lost if we don't defend it&mdash;there's
+# | always going to be a Sarkozy to take it away&mdash;we need above all to
+# | teach people to demand freedom, to be ready to stand up for their freedom
+# | the next time someone threatens to take it away.
+#, fuzzy
+#| msgid ""
+#| "But if you tell them the system is GNU+Linux&mdash;the GNU operating "
+#| "system plus Linux the kernel&mdash;then they'll know about us, and then "
+#| "they might listen to what we say. You deserve freedom, and since freedom "
+#| "will be lost if we don't defend it&mdash;there's always going to be a "
+#| "Sarkozy to take it away&mdash;we need above all to teach people to demand "
+#| "freedom, to be ready to stand up for their freedom the next time someone "
+#| "threatens to take it away."
+msgid ""
+"But if you tell them the system is GNU+Linux&mdash;it's the GNU operating "
+"system plus Linux the kernel&mdash;then they'll know about us, and then they "
+"might listen to what we say: you deserve freedom. And since freedom will be "
+"lost if we don't defend it&mdash;there's always going to be a Sarkozy to "
+"take it away&mdash;we need above all to teach people to demand freedom, to "
+"be ready to stand up for their freedom the next time someone threatens to "
+"take it away."
 msgstr ""
 "Mais si vous leur dites que le système est GNU+Linux — le système "
 "d'exploitation GNU plus le noyau Linux — alors ils connaîtront notre "
@@ -991,15 +1671,35 @@
 "menacera de la leur enlever."
 
 #. type: Content of: <p>
-msgid ""
-"Nowadays, you can tell who does'nt want to discuss these ideas of freedom "
-"because they don't say &ldquo;logiciel libre&rdquo;. They don't say &ldquo;"
-"libre&rdquo;, they say &ldquo;open source&rdquo;. That term was coined by "
-"the people like Mr Torvalds who would prefer that these ethical issues don't "
-"get raised. And so the way you can help us raise them is by saying libre. "
-"You know, it's up to you where you stand, you're free to say what you think. "
-"If you agree with them, you can say open source. If you agree with us, show "
-"it: say libre!"
+# | Nowadays, you can tell who [-does'nt-] {+doesn't+} want to discuss these
+# | ideas of freedom because they don't say [-&ldquo;logiciel libre&rdquo;.-]
+# | {+<cite>logiciel libre</cite>.+} They don't say [-&ldquo;libre&rdquo;,-]
+# | {+<cite>libre</cite>,+} they say &ldquo;open [-source&rdquo;.-]
+# | {+source.&rdquo;+} That term was coined by the people like Mr Torvalds who
+# | would prefer that these ethical issues don't get raised. And so the way
+# | you can help us raise them is by saying [-libre.-] {+<cite>libre</cite>.+}
+# | You know, it's up to you where you stand, you're free to say what you
+# | think. If you agree with them, you can say open source. If you agree with
+# | us, show it[-:-]{+,+} say [-libre!-] {+<cite>libre</cite>!+}
+#, fuzzy
+#| msgid ""
+#| "Nowadays, you can tell who does'nt want to discuss these ideas of freedom "
+#| "because they don't say &ldquo;logiciel libre&rdquo;. They don't say "
+#| "&ldquo;libre&rdquo;, they say &ldquo;open source&rdquo;. That term was "
+#| "coined by the people like Mr Torvalds who would prefer that these ethical "
+#| "issues don't get raised. And so the way you can help us raise them is by "
+#| "saying libre. You know, it's up to you where you stand, you're free to "
+#| "say what you think. If you agree with them, you can say open source. If "
+#| "you agree with us, show it: say libre!"
+msgid ""
+"Nowadays, you can tell who doesn't want to discuss these ideas of freedom "
+"because they don't say <cite>logiciel libre</cite>. They don't say "
+"<cite>libre</cite>, they say &ldquo;open source.&rdquo; That term was coined "
+"by the people like Mr Torvalds who would prefer that these ethical issues "
+"don't get raised. And so the way you can help us raise them is by saying "
+"<cite>libre</cite>. You know, it's up to you where you stand, you're free to "
+"say what you think. If you agree with them, you can say open source. If you "
+"agree with us, show it, say <cite>libre</cite>!"
 msgstr ""
 "De nos jours, on peut reconnaître ceux qui ne veulent pas discuter de ces "
 "idées de liberté parce qu'ils ne disent pas «&nbsp;logiciel 
libre&nbsp;».<a "
@@ -1017,18 +1717,47 @@
 msgstr "Le logiciel libre dans l'enseignement"
 
 #. type: Content of: <p>
+# | [-Now the-]{+The+} most important point about free software is that
+# | schools [-must-] {+<em>must</em>+} teach exclusively free software. All
+# | levels of schools from kindergarten to university, it's their moral
+# | responsibility to teach only free software in their education, and all
+# | other educational activities as well, including those that say that
+# | they're spreading digital literacy. A lot of those activities teach
+# | Windows, which means they're teaching <em>dependence</em>. To teach people
+# | the use {+of+} proprietary software is to teach dependence, and
+# | educational activities must never do that because it's the opposite of
+# | their mission.  Educational activities have a social mission to educate
+# | good citizens of a strong, capable, cooperating, independent and free
+# | society. And in the area of computing, that means: teach free [-software.
+# | Never-] {+software; never+} teach a proprietary program because that's
+# | inculcating dependence.
+#, fuzzy
+#| msgid ""
+#| "Now the most important point about free software is that schools must "
+#| "teach exclusively free software. All levels of schools from kindergarten "
+#| "to university, it's their moral responsibility to teach only free "
+#| "software in their education, and all other educational activities as "
+#| "well, including those that say that they're spreading digital literacy.  "
+#| "A lot of those activities teach Windows, which means they're teaching "
+#| "<em>dependence</em>. To teach people the use proprietary software is to "
+#| "teach dependence, and educational activities must never do that because "
+#| "it's the opposite of their mission. Educational activities have a social "
+#| "mission to educate good citizens of a strong, capable, cooperating, "
+#| "independent and free society. And in the area of computing, that means: "
+#| "teach free software. Never teach a proprietary program because that's "
+#| "inculcating dependence."
 msgid ""
-"Now the most important point about free software is that schools must teach "
-"exclusively free software. All levels of schools from kindergarten to "
+"The most important point about free software is that schools <em>must</em> "
+"teach exclusively free software. All levels of schools from kindergarten to "
 "university, it's their moral responsibility to teach only free software in "
 "their education, and all other educational activities as well, including "
 "those that say that they're spreading digital literacy.  A lot of those "
 "activities teach Windows, which means they're teaching <em>dependence</em>. "
-"To teach people the use proprietary software is to teach dependence, and "
+"To teach people the use of proprietary software is to teach dependence, and "
 "educational activities must never do that because it's the opposite of their "
 "mission. Educational activities have a social mission to educate good "
 "citizens of a strong, capable, cooperating, independent and free society. "
-"And in the area of computing, that means: teach free software. Never teach a "
+"And in the area of computing, that means: teach free software; never teach a "
 "proprietary program because that's inculcating dependence."
 msgstr ""
 "S'agissant du logiciel libre, le point le plus important est que les écoles "
@@ -1048,20 +1777,51 @@
 "que cela inculque la dépendance."
 
 #. type: Content of: <p>
+# | Why do you think some proprietary developers offer gratis copies to
+# | schools? They want the schools to make the children dependent. And then,
+# | when they graduate, they're still dependent and{+,+} you know{+,+} the
+# | company is not going to offer them gratis copies. And some of them get
+# | jobs and go to work for companies. Not many of them anymore, but some of
+# | them.  And those companies are not going to be offered gratis copies. Oh
+# | no! The idea is{+:+} if the school directs the students down the path of
+# | permanent dependence, they can drag the rest of society with them into
+# | dependence. That's the plan! It's just like giving the school gratis
+# | needles full of addicting drugs, [-saying &ldquo;inject-] {+saying:
+# | &ldquo;Inject+} this into your students, the first dose is
+# | [-gratis.&rdquo;-] {+gratis.+} Once you're dependent, then you have to
+# | [-pay.-] {+pay.&rdquo;+} Well, the school would reject the drugs because
+# | it isn't right to teach the students to use addictive drugs{+,+} and it's
+# | got to reject the proprietary software also.
+#, fuzzy
+#| msgid ""
+#| "Why do you think some proprietary developers offer gratis copies to "
+#| "schools? They want the schools to make the children dependent. And then, "
+#| "when they graduate, they're still dependent and you know the company is "
+#| "not going to offer them gratis copies. And some of them get jobs and go "
+#| "to work for companies. Not many of them anymore, but some of them. And "
+#| "those companies are not going to be offered gratis copies. Oh no! The "
+#| "idea is if the school directs the students down the path of permanent "
+#| "dependence, they can drag the rest of society with them into dependence.  "
+#| "That's the plan! It's just like giving the school gratis needles full of "
+#| "addicting drugs, saying &ldquo;inject this into your students, the first "
+#| "dose is gratis.&rdquo; Once you're dependent, then you have to pay. Well, "
+#| "the school would reject the drugs because it isn't right to teach the "
+#| "students to use addictive drugs and it's got to reject the proprietary "
+#| "software also."
 msgid ""
 "Why do you think some proprietary developers offer gratis copies to schools? "
 "They want the schools to make the children dependent. And then, when they "
-"graduate, they're still dependent and you know the company is not going to "
+"graduate, they're still dependent and, you know, the company is not going to "
 "offer them gratis copies. And some of them get jobs and go to work for "
 "companies. Not many of them anymore, but some of them. And those companies "
-"are not going to be offered gratis copies. Oh no! The idea is if the school "
+"are not going to be offered gratis copies. Oh no! The idea is: if the school "
 "directs the students down the path of permanent dependence, they can drag "
 "the rest of society with them into dependence.  That's the plan! It's just "
-"like giving the school gratis needles full of addicting drugs, saying &ldquo;"
-"inject this into your students, the first dose is gratis.&rdquo; Once you're "
-"dependent, then you have to pay. Well, the school would reject the drugs "
-"because it isn't right to teach the students to use addictive drugs and it's "
-"got to reject the proprietary software also."
+"like giving the school gratis needles full of addicting drugs, saying: "
+"&ldquo;Inject this into your students, the first dose is gratis. Once you're "
+"dependent, then you have to pay.&rdquo; Well, the school would reject the "
+"drugs because it isn't right to teach the students to use addictive drugs, "
+"and it's got to reject the proprietary software also."
 msgstr ""
 "Pourquoi pensez-vous que certains développeurs de logiciel propriétaire "
 "offrent des copies gratuites aux écoles&nbsp;? Ils veulent que les écoles "
@@ -1080,13 +1840,30 @@
 "addictives. Elle doit de même rejeter les logiciels propriétaires."
 
 #. type: Content of: <p>
-msgid ""
-"Some people say &ldquo;let's have the school teach both proprietary software "
-"and free software, so the students become familiar with both.&rdquo; That's "
-"like saying &ldquo;for the lunch lets give the kids spinach and tabacco, so "
-"that they become accustomed to both.&rdquo; No! The schools are only "
-"supposed to teach good habits, not bad ones! So there should be no Windows "
-"in a school, no Macintosh, nothing proprietary in the education."
+# | Some people [-say &ldquo;let's-] {+say: &ldquo;Let's+} have the school
+# | teach both proprietary software and free software, so the students become
+# | familiar with both.&rdquo; That's like [-saying &ldquo;for-] {+saying:
+# | &ldquo;For+} the lunch let{+'+}s give the kids spinach and
+# | t[-a-]{+o+}bacco, so that they become accustomed to both.&rdquo; No! The
+# | schools are only supposed to teach good habits, not bad ones! So there
+# | should be no Windows in a school, no Macintosh, nothing proprietary in the
+# | education.
+#, fuzzy
+#| msgid ""
+#| "Some people say &ldquo;let's have the school teach both proprietary "
+#| "software and free software, so the students become familiar with both."
+#| "&rdquo; That's like saying &ldquo;for the lunch lets give the kids "
+#| "spinach and tabacco, so that they become accustomed to both.&rdquo; No! "
+#| "The schools are only supposed to teach good habits, not bad ones! So "
+#| "there should be no Windows in a school, no Macintosh, nothing proprietary "
+#| "in the education."
+msgid ""
+"Some people say: &ldquo;Let's have the school teach both proprietary "
+"software and free software, so the students become familiar with both."
+"&rdquo; That's like saying: &ldquo;For the lunch let's give the kids spinach "
+"and tobacco, so that they become accustomed to both.&rdquo; No! The schools "
+"are only supposed to teach good habits, not bad ones! So there should be no "
+"Windows in a school, no Macintosh, nothing proprietary in the education."
 msgstr ""
 "Quelques-uns disent «&nbsp;demandons aux écoles d'enseigner à la fois le "
 "logiciel propriétaire et le logiciel libre, pour que les élèves se "
@@ -1097,12 +1874,36 @@
 "de Macintosh, rien de propriétaire dans l'enseignement."
 
 #. type: Content of: <p>
+# | But also, for the sake of educating the programmers. You see, some people
+# | have a talent for programming. At ten to thirteen years old, typically,
+# | they're fascinated, and if they use a program, they want to [-know
+# | &ldquo;how-] {+know: &ldquo;How+} does it do this?&rdquo; But when they
+# | ask the teacher, if it's proprietary, the teacher has to say{+:+}
+# | &ldquo;I'm sorry, it's a secret, we can't find out.&rdquo; Which means
+# | education is forbidden. A proprietary program is the enemy of the spirit
+# | of education. It's knowledge withheld, so it should not be tolerated in a
+# | school, even though there may be plenty of people in the school who don't
+# | care about programming, don't want to learn this. Still, because it's the
+# | enemy of the spirit of education, it shouldn't be there in the school.
+#, fuzzy
+#| msgid ""
+#| "But also, for the sake of educating the programmers. You see, some people "
+#| "have a talent for programming. At ten to thirteen years old, typically, "
+#| "they're fascinated, and if they use a program, they want to know &ldquo;"
+#| "how does it do this?&rdquo; But when they ask the teacher, if it's "
+#| "proprietary, the teacher has to say &ldquo;I'm sorry, it's a secret, we "
+#| "can't find out.&rdquo; Which means education is forbidden. A proprietary "
+#| "program is the enemy of the spirit of education. It's knowledge withheld, "
+#| "so it should not be tolerated in a school, even though there may be "
+#| "plenty of people in the school who don't care about programming, don't "
+#| "want to learn this. Still, because it's the enemy of the spirit of "
+#| "education, it shouldn't be there in the school."
 msgid ""
 "But also, for the sake of educating the programmers. You see, some people "
 "have a talent for programming. At ten to thirteen years old, typically, "
-"they're fascinated, and if they use a program, they want to know &ldquo;how "
+"they're fascinated, and if they use a program, they want to know: &ldquo;How "
 "does it do this?&rdquo; But when they ask the teacher, if it's proprietary, "
-"the teacher has to say &ldquo;I'm sorry, it's a secret, we can't find out."
+"the teacher has to say: &ldquo;I'm sorry, it's a secret, we can't find out."
 "&rdquo; Which means education is forbidden. A proprietary program is the "
 "enemy of the spirit of education. It's knowledge withheld, so it should not "
 "be tolerated in a school, even though there may be plenty of people in the "
@@ -1125,9 +1926,21 @@
 "devrait pas exister à l'école."
 
 #. type: Content of: <p>
+# | But if the program is free, the teacher can explain what he knows, and
+# | then give out copies of the source code, saying: &ldquo;[-r-]{+R+}ead it
+# | and you'll understand everything.&rdquo; And those who are really
+# | fascinated, they will read it! And this gives them an opportunity to start
+# | to learn how to be good programmers.
+#, fuzzy
+#| msgid ""
+#| "But if the program is free, the teacher can explain what he knows, and "
+#| "then give out copies of the source code, saying: &ldquo;read it and "
+#| "you'll understand everything.&rdquo; And those who are really fascinated, "
+#| "they will read it! And this gives them an opportunity to start to learn "
+#| "how to be good programmers."
 msgid ""
 "But if the program is free, the teacher can explain what he knows, and then "
-"give out copies of the source code, saying: &ldquo;read it and you'll "
+"give out copies of the source code, saying: &ldquo;Read it and you'll "
 "understand everything.&rdquo; And those who are really fascinated, they will "
 "read it! And this gives them an opportunity to start to learn how to be good "
 "programmers."
@@ -1139,11 +1952,23 @@
 "bon programmeurs."
 
 #. type: Content of: <p>
+# | To learn to be a good programmer, you'll need to recognize that certain
+# | ways of writing code, even if they make sense to you and they are correct,
+# | they're not good because other people will have trouble understanding
+# | them. Good code is clear code[-,-] that others will have an easy time
+# | working on when they need to make further changes.
+#, fuzzy
+#| msgid ""
+#| "To learn to be a good programmer, you'll need to recognize that certain "
+#| "ways of writing code, even if they make sense to you and they are "
+#| "correct, they're not good because other people will have trouble "
+#| "understanding them. Good code is clear code, that others will have an "
+#| "easy time working on when they need to make further changes."
 msgid ""
 "To learn to be a good programmer, you'll need to recognize that certain ways "
 "of writing code, even if they make sense to you and they are correct, "
 "they're not good because other people will have trouble understanding them. "
-"Good code is clear code, that others will have an easy time working on when "
+"Good code is clear code that others will have an easy time working on when "
 "they need to make further changes."
 msgstr ""
 "Pour apprendre à être un bon programmeur, vous devez vous rendre compte que 
"
@@ -1154,10 +1979,22 @@
 "supplémentaires."
 
 #. type: Content of: <p>
+# | How do you learn to write good clear code? You do it by reading lots of
+# | code, and writing lots of code. [-And-] {+Well,+} only free software
+# | offers the chance to read the code of large programs that we really use.
+# | And then you have to write lots of code, which means you have to write
+# | changes in large programs.
+#, fuzzy
+#| msgid ""
+#| "How do you learn to write good clear code? You do it by reading lots of "
+#| "code, and writing lots of code. And only free software offers the chance "
+#| "to read the code of large programs that we really use. And then you have "
+#| "to write lots of code, which means you have to write changes in large "
+#| "programs."
 msgid ""
 "How do you learn to write good clear code? You do it by reading lots of "
-"code, and writing lots of code. And only free software offers the chance to "
-"read the code of large programs that we really use. And then you have to "
+"code, and writing lots of code. Well, only free software offers the chance "
+"to read the code of large programs that we really use. And then you have to "
 "write lots of code, which means you have to write changes in large programs."
 msgstr ""
 "Comment apprend-on à écrire un code bon et clair&nbsp;? On le fait en 
lisant "
@@ -1167,13 +2004,27 @@
 "dire qu'on doit écrire des modifications dans les grands programmes."
 
 #. type: Content of: <p>
+# | How do you learn to write good code for the large programs? You have to
+# | start small, which does [-not-] {+<em>not</em>+} mean small program, oh
+# | no! The challenges of the code for large programs don't even begin to
+# | appear in small programs. So the way you start small at writing code for
+# | large programs is by writing small changes in large programs. And only
+# | free software gives you the chance to do that[-!-]{+.+}
+#, fuzzy
+#| msgid ""
+#| "How do you learn to write good code for the large programs? You have to "
+#| "start small, which does not mean small program, oh no! The challenges of "
+#| "the code for large programs don't even begin to appear in small programs. "
+#| "So the way you start small at writing code for large programs is by "
+#| "writing small changes in large programs. And only free software gives you "
+#| "the chance to do that!"
 msgid ""
 "How do you learn to write good code for the large programs? You have to "
-"start small, which does not mean small program, oh no! The challenges of the "
-"code for large programs don't even begin to appear in small programs. So the "
-"way you start small at writing code for large programs is by writing small "
-"changes in large programs. And only free software gives you the chance to do "
-"that!"
+"start small, which does <em>not</em> mean small program, oh no! The "
+"challenges of the code for large programs don't even begin to appear in "
+"small programs. So the way you start small at writing code for large "
+"programs is by writing small changes in large programs. And only free "
+"software gives you the chance to do that."
 msgstr ""
 "Comment apprend-on à écrire le code des grands programmes&nbsp;? On doit "
 "commencer petit, ce qui ne veut pas dire «&nbsp;petit programme&nbsp;», oh "
@@ -1192,6 +2043,32 @@
 "de bons programmeurs doit être une école du logiciel libre."
 
 #. type: Content of: <p>
+# | But there is an even deeper reason, and that is for the sake of moral
+# | education, education in citizenship. It's not enough for a school to teach
+# | facts and skills, it has to teach the spirit of goodwill, the habit of
+# | helping others. Therefore, every class should have this rule:
+# | &ldquo;Students, if you bring software to class, you may not keep it for
+# | yourself, you must share copies with the rest of the class, including the
+# | source code in case anyone here wants to learn[-!-]{+.+} Because this
+# | class is a place where we share our knowledge. Therefore, bringing a
+# | proprietary program to class is not permitted.&rdquo; The school must
+# | follow its own rule to set a good example. Therefore, the school must
+# | bring only free software to class, and share copies, including the source
+# | code, with anyone in the class that wants copies.
+#, fuzzy
+#| msgid ""
+#| "But there is an even deeper reason, and that is for the sake of moral "
+#| "education, education in citizenship. It's not enough for a school to "
+#| "teach facts and skills, it has to teach the spirit of goodwill, the habit "
+#| "of helping others. Therefore, every class should have this rule: &ldquo;"
+#| "Students, if you bring software to class, you may not keep it for "
+#| "yourself, you must share copies with the rest of the class, including the "
+#| "source code in case anyone here wants to learn! Because this class is a "
+#| "place where we share our knowledge. Therefore, bringing a proprietary "
+#| "program to class is not permitted.&rdquo; The school must follow its own "
+#| "rule to set a good example. Therefore, the school must bring only free "
+#| "software to class, and share copies, including the source code, with "
+#| "anyone in the class that wants copies."
 msgid ""
 "But there is an even deeper reason, and that is for the sake of moral "
 "education, education in citizenship. It's not enough for a school to teach "
@@ -1199,7 +2076,7 @@
 "helping others. Therefore, every class should have this rule: &ldquo;"
 "Students, if you bring software to class, you may not keep it for yourself, "
 "you must share copies with the rest of the class, including the source code "
-"in case anyone here wants to learn! Because this class is a place where we "
+"in case anyone here wants to learn. Because this class is a place where we "
 "share our knowledge. Therefore, bringing a proprietary program to class is "
 "not permitted.&rdquo; The school must follow its own rule to set a good "
 "example. Therefore, the school must bring only free software to class, and "
@@ -1221,30 +2098,42 @@
 "code source, avec toute personne de la classe qui veut des copies."
 
 #. type: Content of: <p>
-msgid ""
-"Those of you who have a connection with a school, it's your duty to campaign "
-"and pressure that school to move to free software. And you have to be firm. "
-"It may take years, but you can succeed as long as you never give up. Keep "
-"seeking more allies among the students, the faculty, the staff, the parents, "
-"anyone!"
-msgstr ""
-"Ceux d'entre vous qui sont en relation avec une école, c'est votre devoir de 
"
-"faire campagne et de mettre la pression pour que l'école se tourne vers le "
-"logiciel libre. Et vous devez être fermes. Cela peut prendre des années, "
-"mais vous pouvez réussir si vous ne renoncez jamais. Cherchez toujours plus "
-"d'alliés parmi les étudiants, les enseignants, le personnel, les parents, "
-"n'importe qui&nbsp;!"
-
-#. type: Content of: <p>
-msgid ""
-"And always bring it up as an ethical issue. If someone else wants to "
-"sidetrack the discussion into this practical advantage and this practical "
-"disadvantage, which means they're ignoring the most important question, then "
-"you have to say: &ldquo;this is not about how to do the best job of "
-"educating, this is about how to do a good education instead of an evil one. "
-"It's how to do education right instead of wrong, not just how to make it a "
-"little more effective, or less.&rdquo; So don't get distracted with those "
-"secondary issues, and ignore what really matters!"
+# | {+Those of you who have a connection with a school, it's <em>your</em>
+# | duty to campaign and pressure that school to move to free software. And
+# | you have to be firm. It may take years, but you can succeed as long as you
+# | never give up. Keep seeking more allies among the students, the faculty,
+# | the staff, the parents, anyone!+} And always bring it up as an ethical
+# | issue. If someone else wants to sidetrack the discussion into this
+# | practical advantage and this practical disadvantage, which means they're
+# | ignoring the most important question, then you have to say:
+# | &ldquo;[-t-]{+T+}his is not about how to do the best job of educating,
+# | this is about how to do a good education instead of an evil one. It's how
+# | to do education right instead of wrong, not just how to make it a little
+# | more effective, or less.&rdquo; So don't get distracted with those
+# | secondary issues, and ignore what really matters!
+#, fuzzy
+#| msgid ""
+#| "And always bring it up as an ethical issue. If someone else wants to "
+#| "sidetrack the discussion into this practical advantage and this practical "
+#| "disadvantage, which means they're ignoring the most important question, "
+#| "then you have to say: &ldquo;this is not about how to do the best job of "
+#| "educating, this is about how to do a good education instead of an evil "
+#| "one. It's how to do education right instead of wrong, not just how to "
+#| "make it a little more effective, or less.&rdquo; So don't get distracted "
+#| "with those secondary issues, and ignore what really matters!"
+msgid ""
+"Those of you who have a connection with a school, it's <em>your</em> duty to "
+"campaign and pressure that school to move to free software. And you have to "
+"be firm. It may take years, but you can succeed as long as you never give "
+"up. Keep seeking more allies among the students, the faculty, the staff, the "
+"parents, anyone! And always bring it up as an ethical issue. If someone else "
+"wants to sidetrack the discussion into this practical advantage and this "
+"practical disadvantage, which means they're ignoring the most important "
+"question, then you have to say: &ldquo;This is not about how to do the best "
+"job of educating, this is about how to do a good education instead of an "
+"evil one. It's how to do education right instead of wrong, not just how to "
+"make it a little more effective, or less.&rdquo; So don't get distracted "
+"with those secondary issues, and ignore what really matters!"
 msgstr ""
 "Et présentez toujours le sujet sur le plan éthique. Si quelqu'un d'autre "
 "veut faire dévier la discussion vers tel avantage pratique et tel "
@@ -1262,9 +2151,18 @@
 msgstr "Les services sur Internet"
 
 #. type: Content of: <p>
+# | So, moving on to the next menace. There are two issues that arise from the
+# | use of [-i-]{+I+}nternet services. One of them is that the server could
+# | abuse your data, and another is that it could take control of your
+# | computing.
+#, fuzzy
+#| msgid ""
+#| "So, moving on to the next menace. There are two issues that arise from "
+#| "the use of internet services. One of them is that the server could abuse "
+#| "your data, and another is that it could take control of your computing."
 msgid ""
 "So, moving on to the next menace. There are two issues that arise from the "
-"use of internet services. One of them is that the server could abuse your "
+"use of Internet services. One of them is that the server could abuse your "
 "data, and another is that it could take control of your computing."
 msgstr ""
 "Passons à la menace suivante. Les services sur Internet soulèvent deux "
@@ -1273,9 +2171,23 @@
 "informatique."
 
 #. type: Content of: <p>
+# | The first issue, people already know about. They are aware that, if you
+# | upload data to an [-i-]{+I+}nternet service, there is a question of what
+# | it will do with that data. It might do things that mistreat you. What
+# | could it do? It could lose the data, it could change the data, it could
+# | refuse to let you get the data back. And it could also show the data to
+# | someone else you don't want to show it to. Four different possible things.
+#, fuzzy
+#| msgid ""
+#| "The first issue, people already know about. They are aware that, if you "
+#| "upload data to an internet service, there is a question of what it will "
+#| "do with that data. It might do things that mistreat you. What could it "
+#| "do? It could lose the data, it could change the data, it could refuse to "
+#| "let you get the data back. And it could also show the data to someone "
+#| "else you don't want to show it to. Four different possible things."
 msgid ""
 "The first issue, people already know about. They are aware that, if you "
-"upload data to an internet service, there is a question of what it will do "
+"upload data to an Internet service, there is a question of what it will do "
 "with that data. It might do things that mistreat you. What could it do? It "
 "could lose the data, it could change the data, it could refuse to let you "
 "get the data back. And it could also show the data to someone else you don't "
@@ -1290,20 +2202,54 @@
 "ne veulent pas les montrer. Quatre possibilités."
 
 #. type: Content of: <p>
-msgid ""
-"Now, here, I'm talking about the data that you knowingly gave to that site. "
-"Of course, many of those services do <em>surveillance</em> as well."
+# | Now, here, I'm talking about the data that you [-knowingly-]
+# | {+<em>knowingly</em>+} gave to that site. Of course, many of those
+# | services do <em>surveillance</em> as well.
+#, fuzzy
+#| msgid ""
+#| "Now, here, I'm talking about the data that you knowingly gave to that "
+#| "site. Of course, many of those services do <em>surveillance</em> as well."
+msgid ""
+"Now, here, I'm talking about the data that you <em>knowingly</em> gave to "
+"that site. Of course, many of those services do <em>surveillance</em> as "
+"well."
 msgstr ""
 "Je parle ici des données qu'ils savent avoir confiées à ce site. "
 "Naturellement, beaucoup de ces services font également de la "
 "<em>surveillance</em>."
 
 #. type: Content of: <p>
+# | For instance, consider Facebook. Users send lots of data to Facebook, and
+# | one of the bad things about Facebook is that it shows a lot of that data
+# | to lots of other people, and even if it offers them a setting to say
+# | [-&ldquo;no!&rdquo;,-] {+&ldquo;no,&rdquo;+} that may not really work.
+# | After all, if you say &ldquo;some other people can see this piece of
+# | information,&rdquo; one of them might publish it. Now, that's not
+# | Facebook's fault, there is nothing they could do to prevent that, but it
+# | ought to warn people. Instead of saying &ldquo;mark this as only to your
+# | so-called friends,&rdquo; it should say &ldquo;keep in mind that your
+# | so-called friends are not really your friends, and if they want to make
+# | trouble for you, they could publish this.&rdquo; Every time, it should say
+# | that, if they want to deal with people ethically.
+#, fuzzy
+#| msgid ""
+#| "For instance, consider Facebook. Users send lots of data to Facebook, and "
+#| "one of the bad things about Facebook is that it shows a lot of that data "
+#| "to lots of other people, and even if it offers them a setting to say "
+#| "&ldquo;no!&rdquo;, that may not really work. After all, if you say &ldquo;"
+#| "some other people can see this piece of information,&rdquo; one of them "
+#| "might publish it. Now, that's not Facebook's fault, there is nothing they "
+#| "could do to prevent that, but it ought to warn people. Instead of saying "
+#| "&ldquo;mark this as only to your so-called friends,&rdquo; it should say "
+#| "&ldquo;keep in mind that your so-called friends are not really your "
+#| "friends, and if they want to make trouble for you, they could publish "
+#| "this.&rdquo; Every time, it should say that, if they want to deal with "
+#| "people ethically."
 msgid ""
 "For instance, consider Facebook. Users send lots of data to Facebook, and "
 "one of the bad things about Facebook is that it shows a lot of that data to "
-"lots of other people, and even if it offers them a setting to say &ldquo;no!"
-"&rdquo;, that may not really work. After all, if you say &ldquo;some other "
+"lots of other people, and even if it offers them a setting to say &ldquo;no,"
+"&rdquo; that may not really work. After all, if you say &ldquo;some other "
 "people can see this piece of information,&rdquo; one of them might publish "
 "it. Now, that's not Facebook's fault, there is nothing they could do to "
 "prevent that, but it ought to warn people. Instead of saying &ldquo;mark "
@@ -1320,18 +2266,30 @@
 "information&nbsp;», l'une d'elles pourrait la publier. Cela dit, ce n'est "
 "pas la faute de Facebook, ils ne peuvent rien faire pour l'empêcher mais [le 
"
 "site] devrait prévenir les gens. Au lieu de dire «&nbsp;marquez ceci comme "
-"étant destiné uniquement à vos soi-disant amis&nbsp;», il devrait dire 
«&nbsp;"
-"gardez à l'esprit que vos soi-disant amis ne sont pas vraiment vos amis et "
-"que, s'ils veulent vous causer des ennuis, ils peuvent publier ceci&nbsp;». "
-"Le site devrait dire ça à chaque fois, s'ils voulaient traiter les gens de "
-"manière éthique."
-
-#. type: Content of: <p>
+"étant destiné uniquement à vos soi-disant amis&nbsp;», il devrait dire "
+"«&nbsp;gardez à l'esprit que vos soi-disant amis ne sont pas vraiment vos "
+"amis et que, s'ils veulent vous causer des ennuis, ils peuvent publier "
+"ceci&nbsp;». Le site devrait dire ça à chaque fois, s'ils voulaient 
traiter "
+"les gens de manière éthique."
+
+#. type: Content of: <p>
+# | As well as all the data users of Facebook voluntarily give to Facebook,
+# | Facebook is collecting [-through-] data about people's activities on the
+# | net through various methods of surveillance. But [-for-] {+that's the
+# | first menace. For+} now I am talking about the data that people
+# | <em>know</em> they are giving to these sites.
+#, fuzzy
+#| msgid ""
+#| "As well as all the data users of Facebook voluntarily give to Facebook, "
+#| "Facebook is collecting through data about people's activities on the net "
+#| "through various methods of surveillance. But for now I am talking about "
+#| "the data that people <em>know</em> they are giving to these sites."
 msgid ""
 "As well as all the data users of Facebook voluntarily give to Facebook, "
-"Facebook is collecting through data about people's activities on the net "
-"through various methods of surveillance. But for now I am talking about the "
-"data that people <em>know</em> they are giving to these sites."
+"Facebook is collecting data about people's activities on the net through "
+"various methods of surveillance. But that's the first menace. For now I am "
+"talking about the data that people <em>know</em> they are giving to these "
+"sites."
 msgstr ""
 "Outre les données que les utilisateurs de Facebook donnent volontairement à 
"
 "Facebook, Facebook collecte des données sur les activités des gens sur le "
@@ -1339,8 +2297,21 @@
 "données dont  les gens <em>savent</em> qu'ils les confient à ces sites."
 
 #. type: Content of: <p>
+# | [-Losing-]{+Now, losing+} data is something that could always happen by
+# | accident.  That possibility is always there, no matter how careful someone
+# | is.  Therefore, you need to keep multiple copies of data that matters. If
+# | you do that, then, even if someone decided to delete your data
+# | intentionally, it wouldn't hurt you that much, because you'd have other
+# | copies of it.
+#, fuzzy
+#| msgid ""
+#| "Losing data is something that could always happen by accident. That "
+#| "possibility is always there, no matter how careful someone is.  "
+#| "Therefore, you need to keep multiple copies of data that matters. If you "
+#| "do that, then, even if someone decided to delete your data intentionally, "
+#| "it wouldn't hurt you that much, because you'd have other copies of it."
 msgid ""
-"Losing data is something that could always happen by accident. That "
+"Now, losing data is something that could always happen by accident.  That "
 "possibility is always there, no matter how careful someone is.  Therefore, "
 "you need to keep multiple copies of data that matters. If you do that, then, "
 "even if someone decided to delete your data intentionally, it wouldn't hurt "
@@ -1369,22 +2340,25 @@
 "chez eux. Pour Facebook, notoirement, ce n'est pas le cas."
 
 #. type: Content of: <p>
+# | {+Of course in the case of Google, this only applies to the data the user
+# | <em>knows</em> Google has. Google does lots of surveillance, too, and that
+# | data is not included.+} But in any case, if you can get the data back,
+# | then you could track whether they have altered it. And [-they are-]
+# | {+they're+} not very likely to start altering people's data if the people
+# | can tell. So maybe we can keep a track on that particular kind of abuse.
+#, fuzzy
+#| msgid ""
+#| "But in any case, if you can get the data back, then you could track "
+#| "whether they have altered it. And they are not very likely to start "
+#| "altering people's data if the people can tell. So maybe we can keep a "
+#| "track on that particular kind of abuse."
 msgid ""
 "Of course in the case of Google, this only applies to the data the user "
 "<em>knows</em> Google has. Google does lots of surveillance, too, and that "
-"data is not included."
-msgstr ""
-"Naturellement, dans le cas de Google, cela s'applique seulement aux données "
-"dont l'utilisateur <em>sait</em> que Google les possède. Google fait par "
-"ailleurs beaucoup de surveillance, et ces données-là ne sont pas prises en "
-"compte."
-
-#. type: Content of: <p>
-msgid ""
-"But in any case, if you can get the data back, then you could track whether "
-"they have altered it. And they are not very likely to start altering "
-"people's data if the people can tell. So maybe we can keep a track on that "
-"particular kind of abuse."
+"data is not included. But in any case, if you can get the data back, then "
+"you could track whether they have altered it. And they're not very likely to "
+"start altering people's data if the people can tell. So maybe we can keep a "
+"track on that particular kind of abuse."
 msgstr ""
 "Mais en tout cas, si vous pouvez récupérer les données, alors vous pouvez "
 "détecter s'ils elles ont été altérées. Et il est peu probable qu'ils "
@@ -1392,6 +2366,35 @@
 "compte. Ainsi nous pouvons tracer ce genre particulier de maltraitance."
 
 #. type: Content of: <p>
+# | But the abuse of showing the data to someone you don't want it to be shown
+# | to is very common and almost impossible for you to prevent, especially if
+# | it's a US company. You see, the most hypocritically named law in US
+# | history, the so-called USA Patriot Act, says that Big Brother's police can
+# | collect just about all the data that companies maintain about individuals.
+# | Not just companies, but other organizations too, like public libraries.
+# | The police can get this massively, without even going to court. Now, in a
+# | country that was founded on an idea of freedom, [-there is-] {+there's+}
+# | nothing more unpatriotic than this. But this is what they did. So you
+# | mustn't ever trust any of your data to a US company.  And they say that
+# | foreign subsidiaries of US companies are subject to this as [-well, so-]
+# | {+well. So+} the company [-you are-] {+you're+} directly dealing with may
+# | be in Europe, but if it's owned by a US company, [-you-] {+you've+} got
+# | the same problem to deal with.
+#, fuzzy
+#| msgid ""
+#| "But the abuse of showing the data to someone you don't want it to be "
+#| "shown to is very common and almost impossible for you to prevent, "
+#| "especially if it's a US company. You see, the most hypocritically named "
+#| "law in US history, the so-called USA Patriot Act, says that Big Brother's "
+#| "police can collect just about all the data that companies maintain about "
+#| "individuals. Not just companies, but other organizations too, like public "
+#| "libraries. The police can get this massively, without even going to "
+#| "court. Now, in a country that was founded on an idea of freedom, there is "
+#| "nothing more unpatriotic than this. But this is what they did. So you "
+#| "mustn't ever trust any of your data to a US company.  And they say that "
+#| "foreign subsidiaries of US companies are subject to this as well, so the "
+#| "company you are directly dealing with may be in Europe, but if it's owned "
+#| "by a US company, you got the same problem to deal with."
 msgid ""
 "But the abuse of showing the data to someone you don't want it to be shown "
 "to is very common and almost impossible for you to prevent, especially if "
@@ -1400,11 +2403,11 @@
 "just about all the data that companies maintain about individuals. Not just "
 "companies, but other organizations too, like public libraries. The police "
 "can get this massively, without even going to court. Now, in a country that "
-"was founded on an idea of freedom, there is nothing more unpatriotic than "
+"was founded on an idea of freedom, there's nothing more unpatriotic than "
 "this. But this is what they did. So you mustn't ever trust any of your data "
 "to a US company.  And they say that foreign subsidiaries of US companies are "
-"subject to this as well, so the company you are directly dealing with may be "
-"in Europe, but if it's owned by a US company, you got the same problem to "
+"subject to this as well. So the company you're directly dealing with may be "
+"in Europe, but if it's owned by a US company, you've got the same problem to "
 "deal with."
 msgstr ""
 "Mais l'abus qui consiste à montrer vos données à quelqu'un à qui vous ne "
@@ -1424,13 +2427,29 @@
 "confrontés au même problème."
 
 #. type: Content of: <p>
+# | However, this is mainly [-a-] {+of+} concern when the data [-you are-]
+# | {+you're+} sending to the service is not for publication. There are some
+# | services where you publish things. Of course, if you publish something,
+# | you know everybody is gonna be able to see it. So, there is no way they
+# | can hurt you by showing it to somebody who wasn't supposed to see it.
+# | There is nobody who wasn't supposed to see it{+,+} if you [-publish-]
+# | {+published+} it. So in that case the problem doesn't exist.
+#, fuzzy
+#| msgid ""
+#| "However, this is mainly a concern when the data you are sending to the "
+#| "service is not for publication. There are some services where you publish "
+#| "things. Of course, if you publish something, you know everybody is gonna "
+#| "be able to see it. So, there is no way they can hurt you by showing it to "
+#| "somebody who wasn't supposed to see it. There is nobody who wasn't "
+#| "supposed to see it if you publish it. So in that case the problem doesn't "
+#| "exist."
 msgid ""
-"However, this is mainly a concern when the data you are sending to the "
+"However, this is mainly of concern when the data you're sending to the "
 "service is not for publication. There are some services where you publish "
 "things. Of course, if you publish something, you know everybody is gonna be "
 "able to see it. So, there is no way they can hurt you by showing it to "
 "somebody who wasn't supposed to see it. There is nobody who wasn't supposed "
-"to see it if you publish it. So in that case the problem doesn't exist."
+"to see it, if you published it. So in that case the problem doesn't exist."
 msgstr ""
 "Cependant c'est surtout un souci quand les données que vous envoyez au "
 "service ne sont pas destinées à la publication. Il y a des services où 
vous "
@@ -1458,9 +2477,17 @@
 "traditionnellement dans le monde physique."
 
 #. type: Content of: <p>
+# | The point here and in so many other issues is: as we start doing things
+# | digitally instead of physically, we shouldn't lose any of our
+# | rights[-,-]{+;+} because the general tendency is that we do lose rights.
+#, fuzzy
+#| msgid ""
+#| "The point here and in so many other issues is: as we start doing things "
+#| "digitally instead of physically, we shouldn't lose any of our rights, "
+#| "because the general tendency is that we do lose rights."
 msgid ""
 "The point here and in so many other issues is: as we start doing things "
-"digitally instead of physically, we shouldn't lose any of our rights, "
+"digitally instead of physically, we shouldn't lose any of our rights; "
 "because the general tendency is that we do lose rights."
 msgstr ""
 "Le point essentiel, sur ce sujet comme sur tant d'autres, est celui-"
@@ -1487,11 +2514,27 @@
 "raison est une opportunité, et ils vont en tirer parti si ça les arrange."
 
 #. type: Content of: <p>
+# | But the other issue with [-i-]{+I+}nternet services is that they can take
+# | control of your computing, and that's not so commonly known. But It's
+# | becoming more common. There are services that offer to do computing for
+# | you on data supplied by you&mdash;things that you should do [-o-]{+i+}n
+# | your own computer but they invite you to let somebody else's computer do
+# | that computing work for you. And the result is you lose control over it.
+# | It's just as if you used a nonfree program.
+#, fuzzy
+#| msgid ""
+#| "But the other issue with internet services is that they can take control "
+#| "of your computing, and that's not so commonly known. But It's becoming "
+#| "more common. There are services that offer to do computing for you on "
+#| "data supplied by you&mdash;things that you should do on your own computer "
+#| "but they invite you to let somebody else's computer do that computing "
+#| "work for you. And the result is you lose control over it. It's just as if "
+#| "you used a nonfree program."
 msgid ""
-"But the other issue with internet services is that they can take control of "
+"But the other issue with Internet services is that they can take control of "
 "your computing, and that's not so commonly known. But It's becoming more "
 "common. There are services that offer to do computing for you on data "
-"supplied by you&mdash;things that you should do on your own computer but "
+"supplied by you&mdash;things that you should do in your own computer but "
 "they invite you to let somebody else's computer do that computing work for "
 "you. And the result is you lose control over it. It's just as if you used a "
 "nonfree program."
@@ -1506,14 +2549,31 @@
 "exactement comme si vous utilisiez un programme non libre."
 
 #. type: Content of: <p>
+# | Two different scenarios but they lead to the same problem. If you do your
+# | computing with a nonfree [-program&mdash;well,-] {+program&hellip; well,+}
+# | the users don't control the nonfree program, it controls the users, which
+# | would include you. So you've lost control of the computing that's being
+# | done. But if you do your computing in his [-server&mdash;well,-]
+# | {+server&hellip; well,+} the programs that are doing it are the ones he
+# | chose. You can't touch them or see them, so you have no control over them.
+# | He has control over [-them&mdash;maybe.-] {+them, maybe.+}
+#, fuzzy
+#| msgid ""
+#| "Two different scenarios but they lead to the same problem. If you do your "
+#| "computing with a nonfree program&mdash;well, the users don't control the "
+#| "nonfree program, it controls the users, which would include you. So "
+#| "you've lost control of the computing that's being done. But if you do "
+#| "your computing in his server&mdash;well, the programs that are doing it "
+#| "are the ones he chose. You can't touch them or see them, so you have no "
+#| "control over them. He has control over them&mdash;maybe."
 msgid ""
 "Two different scenarios but they lead to the same problem. If you do your "
-"computing with a nonfree program&mdash;well, the users don't control the "
+"computing with a nonfree program&hellip; well, the users don't control the "
 "nonfree program, it controls the users, which would include you. So you've "
 "lost control of the computing that's being done. But if you do your "
-"computing in his server&mdash;well, the programs that are doing it are the "
+"computing in his server&hellip; well, the programs that are doing it are the "
 "ones he chose. You can't touch them or see them, so you have no control over "
-"them. He has control over them&mdash;maybe."
+"them. He has control over them, maybe."
 msgstr ""
 "Deux scénarios différents mais qui conduisent au même problème. Si vous "
 "faites vos travaux informatiques avec un programme non libre&hellip; Eh "
@@ -1538,11 +2598,21 @@
 "et vous non plus."
 
 #. type: Content of: <p>
+# | But suppose he installs a free program, then he has control over the
+# | computing being done in his computer, but you don't. So, either way, [-you
+# | don't!-] {+<em>you don't!</em>+} So the only way to have control over your
+# | computing is to do it with <em>your copy</em> of a free program.
+#, fuzzy
+#| msgid ""
+#| "But suppose he installs a free program, then he has control over the "
+#| "computing being done in his computer, but you don't. So, either way, you "
+#| "don't! So the only way to have control over your computing is to do it "
+#| "with <em>your copy</em> of a free program."
 msgid ""
 "But suppose he installs a free program, then he has control over the "
-"computing being done in his computer, but you don't. So, either way, you "
-"don't! So the only way to have control over your computing is to do it with "
-"<em>your copy</em> of a free program."
+"computing being done in his computer, but you don't. So, either way, <em>you "
+"don't!</em> So the only way to have control over your computing is to do it "
+"with <em>your copy</em> of a free program."
 msgstr ""
 "Mais supposez qu'il installe un programme libre, alors il a le contrôle des "
 "travaux faits sur son serveur, mais vous ne l'avez pas. Donc, dans les deux "
@@ -1551,8 +2621,24 @@
 "programme libre."
 
 #. type: Content of: <p>
+# | This practice is called &ldquo;Software as a [-Service&rdquo;.-]
+# | {+Service.&rdquo;+} It means doing your computing with your data in
+# | somebody else's server. And I don't know of anything that can make this
+# | acceptable. It's always something that takes away your freedom, and the
+# | only solution I know of is to refuse. For instance, there are servers that
+# | will do translation or voice recognition, and you are letting them have
+# | control over this computing activity, which we shouldn't ever do.
+#, fuzzy
+#| msgid ""
+#| "This practice is called &ldquo;Software as a Service&rdquo;. It means "
+#| "doing your computing with your data in somebody else's server. And I "
+#| "don't know of anything that can make this acceptable. It's always "
+#| "something that takes away your freedom, and the only solution I know of "
+#| "is to refuse. For instance, there are servers that will do translation or "
+#| "voice recognition, and you are letting them have control over this "
+#| "computing activity, which we shouldn't ever do."
 msgid ""
-"This practice is called &ldquo;Software as a Service&rdquo;. It means doing "
+"This practice is called &ldquo;Software as a Service.&rdquo; It means doing "
 "your computing with your data in somebody else's server. And I don't know of "
 "anything that can make this acceptable. It's always something that takes "
 "away your freedom, and the only solution I know of is to refuse. For "
@@ -1570,13 +2656,28 @@
 "ce qu'on ne devrait jamais faire."
 
 #. type: Content of: <p>
+# | Of course, we are also giving them data about ourselves which they
+# | shouldn't have. Imagine if you had a conversation with somebody through a
+# | voice-recognition translation system that was Software as as Service and
+# | it's really running on a server belonging to some company. [-That-]
+# | {+Well, that+} company also gets to know what was said in the
+# | conversation, and if it's a US company that means Big Brother also gets to
+# | know. This is no good.
+#, fuzzy
+#| msgid ""
+#| "Of course, we are also giving them data about ourselves which they "
+#| "shouldn't have. Imagine if you had a conversation with somebody through a "
+#| "voice-recognition translation system that was Software as as Service and "
+#| "it's really running on a server belonging to some company. That company "
+#| "also gets to know what was said in the conversation, and if it's a US "
+#| "company that means Big Brother also gets to know. This is no good."
 msgid ""
 "Of course, we are also giving them data about ourselves which they shouldn't "
 "have. Imagine if you had a conversation with somebody through a voice-"
 "recognition translation system that was Software as as Service and it's "
-"really running on a server belonging to some company. That company also gets "
-"to know what was said in the conversation, and if it's a US company that "
-"means Big Brother also gets to know. This is no good."
+"really running on a server belonging to some company. Well, that company "
+"also gets to know what was said in the conversation, and if it's a US "
+"company that means Big Brother also gets to know. This is no good."
 msgstr ""
 "Naturellement, nous leur fournissons aussi des données sur nous qu'ils ne "
 "devraient pas posséder. Imaginez que vous ayez une conversation avec "
@@ -1586,56 +2687,47 @@
 "conversation, et si c'est une société américaine, cela veut dire que Big "
 "Brother aussi. Ce n'est pas bon."
 
+#. type: Content of: <h3>
+msgid "Computers for voting"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "The next threat to our freedom in a digital society is using computers for "
 "voting. You can't trust computers for voting. Whoever controls the software "
-"in those computers has the power to commit undetectable fraud. Elections are "
-"special. Because there's nobody involved that we dare trust fully. Everybody "
-"has to be checked, crosschecked by others, so that nobody is in the position "
-"to falsify the results by himself. Because if anybody is in a position to do "
-"that, he might do it! So our traditional systems for voting were designed so "
-"that nobody was fully trusted, everybody was being checked by others. So "
-"that nobody could easily commit fraud. But once you introduce a program, "
-"this is impossible! How can you tell if a voting machine would honestly "
-"count the votes? You'd have to study the program that's running in it during "
-"the election, which of course nobody can do, and most people wouldn't even "
-"know how to do. But even the experts who might theoretically be capable of "
-"studying the program, they can't do it while people are voting. They'd have "
-"to do it in advance, and then how do they know that the program they studied "
-"is the one that's running while pople vote? Maybe it's been changed. Now, if "
-"this program is proprietary, that means some company controls it. The "
-"election authority can't even tell what that program is doing. Well, this "
-"company then could rig the election.  There are accusations that this was "
-"done in the US in the past ten years, that election results were falsified "
-"this way."
-msgstr ""
-"La menace suivante contre nos libertés dans la société numérique est "
-"l'utilisation d'ordinateurs pour le vote. Vous ne pouvez pas faire confiance "
-"à des ordinateurs pour voter. Toute personne qui contrôle le logiciel de 
ces "
-"ordinateurs a le pouvoir de commettre une fraude indécelable. Les élections 
"
-"ont une particularité&nbsp;: nous ne pouvons avoir entièrement confiance en 
"
-"aucun des intervenants. Chacun doit être surveillé, contre-surveillé par 
les "
-"autres, de sorte que personne ne soit en mesure de falsifier les résultats "
-"par lui-même. Car si quelqu'un en a la possibilité, il pourrait passer à "
-"l'action&nbsp;! C'est pourquoi nos systèmes de vote sont conçus pour ne "
-"faire entièrement confiance à personne, pour que chacun soit surveillé par 
"
-"les autres, de sorte que personne ne puisse frauder aisément. Mais une fois "
-"que vous avez introduit un programme, c'est impossible&nbsp;! Comment pouvez-"
-"vous savoir si une machine à voter compte honnêtement les votes&nbsp;? Il "
-"faudrait étudier le programme qui la fait fonctionner pendant l'élection, "
-"chose que naturellement personne ne peut faire, et que la plupart des gens "
-"ne sauraient même pas faire. Même les experts qui théoriquement seraient "
-"capables d'étudier le programme, ils ne peuvent pas le faire alors que les "
-"gens sont en train de voter. Ils devraient le faire à l'avance, et alors "
-"comment savoir que le programme qu'ils ont étudié est le même qui est en "
-"fonctionnement pendant que les gens votent&nbsp;? Peut-être qu'il a été "
-"modifié. De plus, si le programme est propriétaire, cela signifie qu'une "
-"société particulière le contrôle. L'autorité électorale ne peut même 
pas "
-"dire ce que fait ce programme. Eh bien, cette société pourrait alors 
truquer "
-"l'élection. Certains accusent que c'est arrivé aux États-Unis dans la "
-"dernière décennie et que des résultats d'élections ont été falsifiés 
de "
-"cette façon."
+"in those computers has the power to commit undetectable fraud."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Elections are special, because there's nobody involved that we dare trust "
+"fully. Everybody has to be checked, crosschecked by others, so that nobody "
+"is in a position to falsify the results by himself. Because if anybody is in "
+"a position to do that, he might do it. So our traditional systems for voting "
+"were designed so that nobody was fully trusted, everybody was being checked "
+"by others. So that nobody could easily commit fraud. But once you introduce "
+"a program, this is impossible."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"How can you tell if a voting machine will honestly count the votes? You'd "
+"have to study the program that's running in it during the election, which of "
+"course nobody can do, and most people wouldn't even know how to do. But even "
+"the experts who might theoretically be capable of studying the program, they "
+"can't do it while people are voting.  They'd have to do it in advance, and "
+"then how do they know that the program they studied is the one that's "
+"running while people vote? Maybe it's been changed."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Now, if this program is proprietary, that means some company controls it. "
+"The election authority can't even tell what that program is doing. Well, "
+"this company then could rig the election.  And there are accusations that "
+"this was done in the US within the past ten years, that election results "
+"were falsified this way."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -1655,12 +2747,29 @@
 "correctement comptés, et que des votes erronés n'ont pas été ajoutés."
 
 #. type: Content of: <p>
+# | In other activities of life, you can usually tell if somebody is trying to
+# | cheat you. Consider for instance buying something from a store. You order
+# | something, maybe you give a credit card number. If the product doesn't
+# | come, you can complain and you [-can&mdash;of-] {+can&hellip; of+} course
+# | if [-you-] {+you've+} got a good enough memory [-you will&mdash;notice-]
+# | {+you'll notice+} if that product doesn't come. You're not just giving
+# | total blind trust to the store, because you can check. But in elections
+# | you can't check.
+#, fuzzy
+#| msgid ""
+#| "In other activities of life, you can usually tell if somebody is trying "
+#| "to cheat you. Consider for instance buying something from a store. You "
+#| "order something, maybe you give a credit card number. If the product "
+#| "doesn't come, you can complain and you can&mdash;of course if you got a "
+#| "good enough memory you will&mdash;notice if that product doesn't come.  "
+#| "You're not just giving total blind trust to the store, because you can "
+#| "check. But in elections you can't check."
 msgid ""
 "In other activities of life, you can usually tell if somebody is trying to "
 "cheat you. Consider for instance buying something from a store. You order "
 "something, maybe you give a credit card number. If the product doesn't come, "
-"you can complain and you can&mdash;of course if you got a good enough memory "
-"you will&mdash;notice if that product doesn't come.  You're not just giving "
+"you can complain and you can&hellip; of course if you've got a good enough "
+"memory you'll notice if that product doesn't come. You're not just giving "
 "total blind trust to the store, because you can check. But in elections you "
 "can't check."
 msgstr ""
@@ -1674,9 +2783,37 @@
 "les élections vous ne pouvez pas vérifier."
 
 #. type: Content of: <p>
+# | I saw once a paper where someone described a theoretical system for voting
+# | which use[-s-]{+d+} some sophisticated mathematics so that people could
+# | check that their votes had been counted, even though everybody's vote was
+# | secret, and they could also verify that false votes hadn't been added. It
+# | was very exciting, powerful mathematics; but even if that mathematics is
+# | correct, that doesn't mean the system would be acceptable to use in
+# | practice, because the vulnerabilities of a real system might be outside of
+# | that mathematics. For instance, suppose you're voting over the Internet
+# | and suppose you're using a machine that's a zombie. It might tell you that
+# | the vote was sent for A while actually sending a vote for B. Who knows
+# | whether you'd ever find out? [-In practice,-] {+So, in practice+} the only
+# | way to see if these systems work and are honest is through years, in fact
+# | decades, of trying them and checking in other ways what happened.
+#, fuzzy
+#| msgid ""
+#| "I saw once a paper where someone described a theoretical system for "
+#| "voting which uses some sophisticated mathematics so that people could "
+#| "check that their votes had been counted, even though everybody's vote was "
+#| "secret, and they could also verify that false votes hadn't been added. It "
+#| "was very exciting, powerful mathematics; but even if that mathematics is "
+#| "correct, that doesn't mean the system would be acceptable to use in "
+#| "practice, because the vulnerabilities of a real system might be outside "
+#| "of that mathematics. For instance, suppose you're voting over the "
+#| "Internet and suppose you're using a machine that's a zombie. It might "
+#| "tell you that the vote was sent for A while actually sending a vote for "
+#| "B. Who knows whether you'd ever find out? In practice, the only way to "
+#| "see if these systems work and are honest is through years, in fact "
+#| "decades, of trying them and checking in other ways what happened."
 msgid ""
 "I saw once a paper where someone described a theoretical system for voting "
-"which uses some sophisticated mathematics so that people could check that "
+"which used some sophisticated mathematics so that people could check that "
 "their votes had been counted, even though everybody's vote was secret, and "
 "they could also verify that false votes hadn't been added. It was very "
 "exciting, powerful mathematics; but even if that mathematics is correct, "
@@ -1685,9 +2822,9 @@
 "For instance, suppose you're voting over the Internet and suppose you're "
 "using a machine that's a zombie. It might tell you that the vote was sent "
 "for A while actually sending a vote for B. Who knows whether you'd ever find "
-"out? In practice, the only way to see if these systems work and are honest "
-"is through years, in fact decades, of trying them and checking in other ways "
-"what happened."
+"out? So, in practice the only way to see if these systems work and are "
+"honest is through years, in fact decades, of trying them and checking in "
+"other ways what happened."
 msgstr ""
 "Une fois, j'ai vu un article où quelqu'un décrivait un système théorique 
de "
 "vote utilisant des calculs sophistiqués par lesquels les gens pouvaient "
@@ -1726,13 +2863,31 @@
 "de la guerre contre le partage."
 
 #. type: Content of: <p>
+# | One of the tremendous benefits of digital technology is that it is easy to
+# | copy published works and share these copies with others. Sharing is good,
+# | and with digital technology, sharing is easy. So, millions of people
+# | share. Those who profit by having power over the distribution of these
+# | works don't want us to share. And since they are businesses, governments
+# | which have betrayed their people and work for the [-e-]{+E+}mpire of
+# | mega-corporations try to serve those businesses, they are against their
+# | own people, they are for the businesses, for the publishers.
+#, fuzzy
+#| msgid ""
+#| "One of the tremendous benefits of digital technology is that it is easy "
+#| "to copy published works and share these copies with others. Sharing is "
+#| "good, and with digital technology, sharing is easy. So, millions of "
+#| "people share. Those who profit by having power over the distribution of "
+#| "these works don't want us to share. And since they are businesses, "
+#| "governments which have betrayed their people and work for the empire of "
+#| "mega-corporations try to serve those businesses, they are against their "
+#| "own people, they are for the businesses, for the publishers."
 msgid ""
 "One of the tremendous benefits of digital technology is that it is easy to "
 "copy published works and share these copies with others. Sharing is good, "
 "and with digital technology, sharing is easy. So, millions of people share. "
 "Those who profit by having power over the distribution of these works don't "
 "want us to share. And since they are businesses, governments which have "
-"betrayed their people and work for the empire of mega-corporations try to "
+"betrayed their people and work for the Empire of mega-corporations try to "
 "serve those businesses, they are against their own people, they are for the "
 "businesses, for the publishers."
 msgstr ""
@@ -1747,14 +2902,35 @@
 "l'industrie, pour les éditeurs."
 
 #. type: Content of: <p>
+# | Well, that's not good. And with the help of these governments, the
+# | companies have been waging <em>war</em> on sharing, and they've proposed a
+# | series of cruel draconian measures. Why do they propose cruel draconian
+# | measures? Because nothing less has a chance of success: when something is
+# | good and easy, people do [-it. The-] {+it, and the+} only way to stop them
+# | is by being very nasty. So of course, what they propose is nasty, nasty,
+# | and the next one is nastier. So they tried suing teenagers for hundreds of
+# | thousands of [-dollars — that-] {+dollars. That+} was pretty nasty. And
+# | they tried turning our technology against us, Digital Restrictions
+# | Management that means, digital handcuffs.
+#, fuzzy
+#| msgid ""
+#| "Well, that's not good. And with the help of these governments, the "
+#| "companies have been waging <em>war</em> on sharing, and they've proposed "
+#| "a series of cruel draconian measures. Why do they propose cruel draconian "
+#| "measures? Because nothing less has a chance of success: when something is "
+#| "good and easy, people do it. The only way to stop them is by being very "
+#| "nasty. So of course, what they propose is nasty, nasty, and the next one "
+#| "is nastier. So they tried suing teenagers for hundreds of thousands of "
+#| "dollars — that was pretty nasty. And they tried turning our technology "
+#| "against us, Digital Restrictions Management that means, digital handcuffs."
 msgid ""
 "Well, that's not good. And with the help of these governments, the companies "
 "have been waging <em>war</em> on sharing, and they've proposed a series of "
 "cruel draconian measures. Why do they propose cruel draconian measures? "
 "Because nothing less has a chance of success: when something is good and "
-"easy, people do it. The only way to stop them is by being very nasty. So of "
-"course, what they propose is nasty, nasty, and the next one is nastier. So "
-"they tried suing teenagers for hundreds of thousands of dollars — that was "
+"easy, people do it, and the only way to stop them is by being very nasty. So "
+"of course, what they propose is nasty, nasty, and the next one is nastier. "
+"So they tried suing teenagers for hundreds of thousands of dollars. That was "
 "pretty nasty. And they tried turning our technology against us, Digital "
 "Restrictions Management that means, digital handcuffs."
 msgstr ""
@@ -1771,14 +2947,33 @@
 "numériques."
 
 #. type: Content of: <p>
+# | But among the people there were clever programmers too and they found ways
+# | to break the handcuffs. [-For-] {+So for+} instance, DVDs were designed to
+# | have encrypted movies in a secret encryption format, and the idea was that
+# | all the programs to decrypt the video would be proprietary with digital
+# | handcuffs. They would all be designed to restrict the users. And their
+# | scheme worked [-okay-] {+OK+} for a while. But some people in Europe
+# | figured out the encryption and they released a free program that could
+# | actually play the video on a DVD.
+#, fuzzy
+#| msgid ""
+#| "But among the people there were clever programmers too and they found "
+#| "ways to break the handcuffs. For instance, DVDs were designed to have "
+#| "encrypted movies in a secret encryption format, and the idea was that all "
+#| "the programs to decrypt the video would be proprietary with digital "
+#| "handcuffs. They would all be designed to restrict the users. And their "
+#| "scheme worked okay for a while. But some people in Europe figured out the "
+#| "encryption and they released a free program that could actually play the "
+#| "video on a DVD."
 msgid ""
 "But among the people there were clever programmers too and they found ways "
-"to break the handcuffs. For instance, DVDs were designed to have encrypted "
-"movies in a secret encryption format, and the idea was that all the programs "
-"to decrypt the video would be proprietary with digital handcuffs. They would "
-"all be designed to restrict the users. And their scheme worked okay for a "
-"while. But some people in Europe figured out the encryption and they "
-"released a free program that could actually play the video on a DVD."
+"to break the handcuffs. So for instance, DVDs were designed to have "
+"encrypted movies in a secret encryption format, and the idea was that all "
+"the programs to decrypt the video would be proprietary with digital "
+"handcuffs. They would all be designed to restrict the users. And their "
+"scheme worked OK for a while. But some people in Europe figured out the "
+"encryption and they released a free program that could actually play the "
+"video on a DVD."
 msgstr ""
 "Mais dans la population il y avait aussi des programmeurs habiles qui ont "
 "trouvé moyen de casser les menottes. Par exemple, les DVD ont été conçus "
@@ -1790,19 +2985,46 @@
 "et publié un programme libre qui pouvait parfaitement jouer la vidéo du 
DVD."
 
 #. type: Content of: <p>
+# | Well, the movie companies didn't leave it there. They went to the US
+# | congress and bought a law making that software illegal. The United States
+# | invented censorship of software in 1998, with the Digital Millennium
+# | Copyright Act (DMCA). So the distribution of that free program was
+# | forbidden in the United States. Unfortunately it didn't stop with the
+# | United States. The European Union adopted a directive{+,+} in 2003 {+I
+# | believe,+} requiring such laws. The directive only says that commercial
+# | distribution has to be banned, but just about every country in the
+# | European Union has adopted a nastier law. In France, the mere possession
+# | of a copy of that program is an offense punished by imprisonment, thanks
+# | to Sarkozy. I believe that was done by the law DADVSI. I guess he hoped
+# | that with an unpronounceable name, people wouldn't be able to criticize
+# | it. {+[laughter]+}
+#, fuzzy
+#| msgid ""
+#| "Well, the movie companies didn't leave it there. They went to the US "
+#| "congress and bought a law making that software illegal. The United States "
+#| "invented censorship of software in 1998, with the Digital Millennium "
+#| "Copyright Act (DMCA). So the distribution of that free program was "
+#| "forbidden in the United States. Unfortunately it didn't stop with the "
+#| "United States. The European Union adopted a directive in 2003 requiring "
+#| "such laws. The directive only says that commercial distribution has to be "
+#| "banned, but just about every country in the European Union has adopted a "
+#| "nastier law. In France, the mere possession of a copy of that program is "
+#| "an offense punished by imprisonment, thanks to Sarkozy. I believe that "
+#| "was done by the law DADVSI. I guess he hoped that with an unpronounceable "
+#| "name, people wouldn't be able to criticize it."
 msgid ""
 "Well, the movie companies didn't leave it there. They went to the US "
 "congress and bought a law making that software illegal. The United States "
 "invented censorship of software in 1998, with the Digital Millennium "
 "Copyright Act (DMCA). So the distribution of that free program was forbidden "
 "in the United States. Unfortunately it didn't stop with the United States. "
-"The European Union adopted a directive in 2003 requiring such laws. The "
-"directive only says that commercial distribution has to be banned, but just "
-"about every country in the European Union has adopted a nastier law. In "
-"France, the mere possession of a copy of that program is an offense punished "
-"by imprisonment, thanks to Sarkozy. I believe that was done by the law "
-"DADVSI. I guess he hoped that with an unpronounceable name, people wouldn't "
-"be able to criticize it."
+"The European Union adopted a directive, in 2003 I believe, requiring such "
+"laws. The directive only says that commercial distribution has to be banned, "
+"but just about every country in the European Union has adopted a nastier "
+"law. In France, the mere possession of a copy of that program is an offense "
+"punished by imprisonment, thanks to Sarkozy. I believe that was done by the "
+"law DADVSI. I guess he hoped that with an unpronounceable name, people "
+"wouldn't be able to criticize it. [laughter]"
 msgstr ""
 "Eh bien, l'industrie cinématographique n'en est pas restée là. Elle est "
 "allée voir le Congrès et a acheté une loi qui rendait ce logiciel 
illégal. "
@@ -1830,14 +3052,31 @@
 "territoire moral perdu. Vous devez vous battre pour le regagner."
 
 #. type: Content of: <p>
-msgid ""
-"So, we still are fighting against digital handcuffs. The Amazon &ldquo;"
-"Swindle&rdquo; has digital handcuffs to take away the traditional freedoms "
-"of readers to do things such as: give a book to someone else, or lend a book "
-"to someone else. That's a vitally important social act. That is what builds "
-"society among people who read: lending books. Amazon doesn't want to let "
-"people lend books freely. And then there is also selling a book, perhaps to "
-"a used bookstore. You can't do that either."
+# | So, we still are fighting against digital handcuffs. The Amazon
+# | [-&ldquo;Swindle&rdquo;-] {+Swindle+} has digital handcuffs to take away
+# | the traditional freedoms of readers to do things such as: give a book to
+# | someone else, or lend a book to someone else. That's a vitally important
+# | social act. That is what builds society among people who read[-:-]{+,+}
+# | lending books. Amazon doesn't want to let people lend books freely. And
+# | then there is also selling a book, perhaps to a used bookstore. You can't
+# | do that either.
+#, fuzzy
+#| msgid ""
+#| "So, we still are fighting against digital handcuffs. The Amazon &ldquo;"
+#| "Swindle&rdquo; has digital handcuffs to take away the traditional "
+#| "freedoms of readers to do things such as: give a book to someone else, or "
+#| "lend a book to someone else. That's a vitally important social act. That "
+#| "is what builds society among people who read: lending books. Amazon "
+#| "doesn't want to let people lend books freely. And then there is also "
+#| "selling a book, perhaps to a used bookstore. You can't do that either."
+msgid ""
+"So, we still are fighting against digital handcuffs. The Amazon Swindle has "
+"digital handcuffs to take away the traditional freedoms of readers to do "
+"things such as: give a book to someone else, or lend a book to someone else. "
+"That's a vitally important social act. That is what builds society among "
+"people who read, lending books. Amazon doesn't want to let people lend books "
+"freely. And then there is also selling a book, perhaps to a used bookstore. "
+"You can't do that either."
 msgstr ""
 "Ainsi, nous continuons à combattre les menottes numériques. Le 
<em>Swindle</"
 "em> d'Amazon a des menottes numériques qui ôtent au lecteur ses libertés "
@@ -1849,18 +3088,43 @@
 "ne peut pas faire ça non plus."
 
 #. type: Content of: <p>
+# | It looked for a while as if DRM had disappeared on music, but now they're
+# | bringing it back with streaming services such as Spotify. These services
+# | all require proprietary client software, and the reason is so they can put
+# | digital handcuffs on the users. So, reject them! They already showed quite
+# | openly that you can't trust them, because first they said:
+# | &ldquo;[-y-]{+Y+}ou can listen as much as you [-like.&rdquo;, and-]
+# | {+like.&rdquo; And+} then they said: &ldquo;Oh, no! You can only listen a
+# | certain number of hours a month.&rdquo; The issue is not whether that
+# | particular change was good or bad, just or unjust; the point is, they have
+# | the power to impose any change in policies. So don't let them have that
+# | power. You should have your [-own-] {+<em>own</em>+} copy of any music you
+# | want to listen to.
+#, fuzzy
+#| msgid ""
+#| "It looked for a while as if DRM had disappeared on music, but now they're "
+#| "bringing it back with streaming services such as Spotify. These services "
+#| "all require proprietary client software, and the reason is so they can "
+#| "put digital handcuffs on the users. So, reject them! They already showed "
+#| "quite openly that you can't trust them, because first they said: &ldquo;"
+#| "you can listen as much as you like.&rdquo;, and then they said: &ldquo;"
+#| "Oh, no! You can only listen a certain number of hours a month.&rdquo; The "
+#| "issue is not whether that particular change was good or bad, just or "
+#| "unjust; the point is, they have the power to impose any change in "
+#| "policies. So don't let them have that power. You should have your own "
+#| "copy of any music you want to listen to."
 msgid ""
 "It looked for a while as if DRM had disappeared on music, but now they're "
 "bringing it back with streaming services such as Spotify. These services all "
 "require proprietary client software, and the reason is so they can put "
 "digital handcuffs on the users. So, reject them! They already showed quite "
-"openly that you can't trust them, because first they said: &ldquo;you can "
-"listen as much as you like.&rdquo;, and then they said: &ldquo;Oh, no! You "
+"openly that you can't trust them, because first they said: &ldquo;You can "
+"listen as much as you like.&rdquo; And then they said: &ldquo;Oh, no! You "
 "can only listen a certain number of hours a month.&rdquo; The issue is not "
 "whether that particular change was good or bad, just or unjust; the point "
 "is, they have the power to impose any change in policies. So don't let them "
-"have that power. You should have your own copy of any music you want to "
-"listen to."
+"have that power. You should have your <em>own</em> copy of any music you "
+"want to listen to."
 msgstr ""
 "Il a semblé pendant quelques temps que les DRM avaient disparu de la "
 "musique, mais maintenant ils réapparaissent avec les services de "
@@ -1877,15 +3141,33 @@
 "propre copie de toute musique que vous voulez écouter."
 
 #. type: Content of: <p>
+# | And then came the next assault on our freedom: HADOPI, basically
+# | punishment on accusation. It was started in France but it's been exported
+# | to many other countries. The United States now demand such unjust policies
+# | in its free exploitation treaties. A few months ago, Col[-u-]{+o+}mbia
+# | adopted such a law under orders from its masters in Washington.  Of
+# | course, the ones in Washington are not the real masters, they're just the
+# | ones who control the United States on behalf of the Empire. But they're
+# | the ones who also dictate to Col[-u-]{+o+}mbia on behalf of the Empire.
+#, fuzzy
+#| msgid ""
+#| "And then came the next assault on our freedom: HADOPI, basically "
+#| "punishment on accusation. It was started in France but it's been exported "
+#| "to many other countries. The United States now demand such unjust "
+#| "policies in its free exploitation treaties. A few months ago, Columbia "
+#| "adopted such a law under orders from its masters in Washington.  Of "
+#| "course, the ones in Washington are not the real masters, they're just the "
+#| "ones who control the United States on behalf of the Empire. But they're "
+#| "the ones who also dictate to Columbia on behalf of the Empire."
 msgid ""
 "And then came the next assault on our freedom: HADOPI, basically punishment "
 "on accusation. It was started in France but it's been exported to many other "
 "countries. The United States now demand such unjust policies in its free "
-"exploitation treaties. A few months ago, Columbia adopted such a law under "
+"exploitation treaties. A few months ago, Colombia adopted such a law under "
 "orders from its masters in Washington.  Of course, the ones in Washington "
 "are not the real masters, they're just the ones who control the United "
 "States on behalf of the Empire. But they're the ones who also dictate to "
-"Columbia on behalf of the Empire."
+"Colombia on behalf of the Empire."
 msgstr ""
 "Puis est arrivé l'assaut suivant contre notre liberté&nbsp;: HADOPI, "
 "essentiellement la punition basée sur l'accusation. Elle a débuté en 
France "
@@ -1898,15 +3180,35 @@
 "la Colombie au nom de l'Empire."
 
 #. type: Content of: <p>
+# | In France, since the Constitutional Council objected to explicit{+l+}y
+# | giving people punishment without trial, they invented a kind of trial
+# | which is not a real trial, [-which is-] {+it's+} just a form of a trial,
+# | so they can <em>pretend</em> that people have a trial before they're
+# | punished. But in other countries they don't bother with that, it's
+# | explicit punishment on accusation only. Which means that for the sake of
+# | their war on sharing, they're prepared to abolish the basic principles of
+# | justice. It shows how thoroughly anti-freedom anti-justice they are. These
+# | are not legitimate governments.
+#, fuzzy
+#| msgid ""
+#| "In France, since the Constitutional Council objected to explicity giving "
+#| "people punishment without trial, they invented a kind of trial which is "
+#| "not a real trial, which is just a form of a trial, so they can "
+#| "<em>pretend</em> that people have a trial before they're punished. But in "
+#| "other countries they don't bother with that, it's explicit punishment on "
+#| "accusation only. Which means that for the sake of their war on sharing, "
+#| "they're prepared to abolish the basic principles of justice. It shows how "
+#| "thoroughly anti-freedom anti-justice they are. These are not legitimate "
+#| "governments."
 msgid ""
-"In France, since the Constitutional Council objected to explicity giving "
+"In France, since the Constitutional Council objected to explicitly giving "
 "people punishment without trial, they invented a kind of trial which is not "
-"a real trial, which is just a form of a trial, so they can <em>pretend</em> "
-"that people have a trial before they're punished. But in other countries "
-"they don't bother with that, it's explicit punishment on accusation only. "
-"Which means that for the sake of their war on sharing, they're prepared to "
-"abolish the basic principles of justice. It shows how thoroughly anti-"
-"freedom anti-justice they are. These are not legitimate governments."
+"a real trial, it's just a form of a trial, so they can <em>pretend</em> that "
+"people have a trial before they're punished. But in other countries they "
+"don't bother with that, it's explicit punishment on accusation only. Which "
+"means that for the sake of their war on sharing, they're prepared to abolish "
+"the basic principles of justice. It shows how thoroughly anti-freedom anti-"
+"justice they are. These are not legitimate governments."
 msgstr ""
 "En France, depuis que le Conseil constitutionnel a objecté au fait de punir "
 "les gens sans procès, ils ont inventé un genre de procès qui n'est pas un "
@@ -1919,14 +3221,35 @@
 "liberté et contre la justice. Ce ne sont pas des gouvernements légitimes."
 
 #. type: Content of: <p>
+# | And I'm sure they'll come up with more nasty ideas because they're paid to
+# | defeat the people no matter what it takes. Now, when they do this, they
+# | always say that it's for the sake of the artists, that they have
+# | [-“protect”-] {+&ldquo;protect&rdquo;+} the [-“creators.”-]
+# | {+&ldquo;creators.&rdquo;+} Now those are both propaganda terms. I
+# | [-‘m-] {+am+} convinced that the reason they love the word
+# | [-“creators“-] {+&ldquo;creators&rdquo;+} is because it is a
+# | comparison with a deity. They want us to think of artists as super-human,
+# | and thus deserving special privileges and power over us, which is
+# | something I disagree with.
+#, fuzzy
+#| msgid ""
+#| "And I'm sure they'll come up with more nasty ideas because they're paid "
+#| "to defeat the people no matter what it takes. Now, when they do this, "
+#| "they always say that it's for the sake of the artists, that they have "
+#| "“protect” the “creators.” Now those are both propaganda terms. I 
‘m "
+#| "convinced that the reason they love the word “creators“ is because it 
is "
+#| "a comparison with a deity. They want us to think of artists as super-"
+#| "human, and thus deserving special privileges and power over us, which is "
+#| "something I disagree with."
 msgid ""
 "And I'm sure they'll come up with more nasty ideas because they're paid to "
 "defeat the people no matter what it takes. Now, when they do this, they "
-"always say that it's for the sake of the artists, that they have 
“protect” "
-"the “creators.” Now those are both propaganda terms. I ‘m convinced 
that the "
-"reason they love the word “creators“ is because it is a comparison with a 
"
-"deity. They want us to think of artists as super-human, and thus deserving "
-"special privileges and power over us, which is something I disagree with."
+"always say that it's for the sake of the artists, that they have &ldquo;"
+"protect&rdquo; the &ldquo;creators.&rdquo; Now those are both propaganda "
+"terms. I am convinced that the reason they love the word &ldquo;"
+"creators&rdquo; is because it is a comparison with a deity. They want us to "
+"think of artists as super-human, and thus deserving special privileges and "
+"power over us, which is something I disagree with."
 msgstr ""
 "Et je suis sûr qu'ils proposeront des idées encore plus vicieuses parce "
 "qu'ils sont payés pour vaincre le peuple quel qu'en soit le prix. Cela dit, "
@@ -1939,13 +3262,29 @@
 "nous&nbsp;; c'est une chose avec quoi je ne suis pas d'accord."
 
 #. type: Content of: <p>
+# | In fact [-,-] {+though,+} the only artists that benefit very much from
+# | this system are the big stars. The other artists are getting crushed into
+# | the ground by the heels of these same companies. But they treat the stars
+# | very well, because the stars have a lot of clout. If a star threatens to
+# | move to another company, the company says: &ldquo;[-o-]{+O+}h, we'll give
+# | you what you want.&rdquo; But for any other artist they say:
+# | &ldquo;[-y-]{+Y+}ou don't matter, we can treat you any way we like.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "In fact , the only artists that benefit very much from this system are "
+#| "the big stars. The other artists are getting crushed into the ground by "
+#| "the heels of these same companies. But they treat the stars very well, "
+#| "because the stars have a lot of clout. If a star threatens to move to "
+#| "another company, the company says: &ldquo;oh, we'll give you what you "
+#| "want.&rdquo; But for any other artist they say: &ldquo;you don't matter, "
+#| "we can treat you any way we like.&rdquo;"
 msgid ""
-"In fact , the only artists that benefit very much from this system are the "
-"big stars. The other artists are getting crushed into the ground by the "
+"In fact though, the only artists that benefit very much from this system are "
+"the big stars. The other artists are getting crushed into the ground by the "
 "heels of these same companies. But they treat the stars very well, because "
 "the stars have a lot of clout. If a star threatens to move to another "
-"company, the company says: &ldquo;oh, we'll give you what you want.&rdquo; "
-"But for any other artist they say: &ldquo;you don't matter, we can treat you "
+"company, the company says: &ldquo;Oh, we'll give you what you want.&rdquo; "
+"But for any other artist they say: &ldquo;You don't matter, we can treat you "
 "any way we like.&rdquo;"
 msgstr ""
 "De fait, les seuls artistes qui tirent un grand profit de ce système sont "
@@ -1954,17 +3293,32 @@
 "que les stars ont beaucoup de poids. Si une star menace de la quitter pour "
 "une autre société, la société dit&nbsp;: «&nbsp;c'est bon, nous vous "
 "donnerons ce que vous voulez&nbsp;». Mais pour n'importe quel autre artiste, 
"
-"ils disent&nbsp;: «&nbsp;vous ne comptez pas, nous pouvons vous traiter 
comme "
-"ça nous chante&nbsp;»."
+"ils disent&nbsp;: «&nbsp;vous ne comptez pas, nous pouvons vous traiter "
+"comme ça nous chante&nbsp;»."
 
 #. type: Content of: <p>
+# | So the superstars have been corrupted by the millions of dollars or euros
+# | that they get, to the point where they'll do almost anything for more
+# | money. For instance, [-J. K. Rowling-] {+J. K. Rowling+} is a good
+# | example. [-J. K.  Rowling,-] {+J. K. Rowling,+} a few years ago, went to
+# | court in Canada and obtained an order that people who had bought her books
+# | must not read them. She got an order telling people not to read her
+# | books[-.-]{+!+}
+#, fuzzy
+#| msgid ""
+#| "So the superstars have been corrupted by the millions of dollars or euros "
+#| "that they get, to the point where they'll do almost anything for more "
+#| "money. For instance, J. K. Rowling is a good example. J. K.  Rowling, a "
+#| "few years ago, went to court in Canada and obtained an order that people "
+#| "who had bought her books must not read them. She got an order telling "
+#| "people not to read her books."
 msgid ""
 "So the superstars have been corrupted by the millions of dollars or euros "
 "that they get, to the point where they'll do almost anything for more money. "
-"For instance, J. K. Rowling is a good example. J. K.  Rowling, a few years "
+"For instance, J. K. Rowling is a good example. J. K. Rowling, a few years 
"
 "ago, went to court in Canada and obtained an order that people who had "
 "bought her books must not read them. She got an order telling people not to "
-"read her books."
+"read her books!"
 msgstr ""
 "Ainsi les superstars ont été corrompues par les millions de dollars ou "
 "d'euros qu'elles reçoivent, au point qu'elles feraient à peu près 
n'importe "
@@ -1975,14 +3329,31 @@
 "pas lire ses livres."
 
 #. type: Content of: <p>
+# | Here's what happened. A bookstore put the books on display for sale too
+# | early, before the [-day-] {+date+} they were supposed to go on sale. And
+# | people came into the store and said: &ldquo;[-o-]{+O+}h, I want
+# | that!&rdquo; [-a-]{+A+}nd they bought it and took away their copies.
+# | [-Then,-] {+And then,+} they discovered the [-mistake and-] {+mistake, so
+# | they+} took the copies off of display. But Rowling wanted to crush any
+# | circulation of any information from those books, so she went to court, and
+# | the court ordered those people not to read the books that they now owned.
+#, fuzzy
+#| msgid ""
+#| "Here's what happened. A bookstore put the books on display for sale too "
+#| "early, before the day they were supposed to go on sale. And people came "
+#| "into the store and said: &ldquo;oh, I want that!&rdquo; and they bought "
+#| "it and took away their copies. Then, they discovered the mistake and took "
+#| "the copies off of display. But Rowling wanted to crush any circulation of "
+#| "any information from those books, so she went to court, and the court "
+#| "ordered those people not to read the books that they now owned."
 msgid ""
 "Here's what happened. A bookstore put the books on display for sale too "
-"early, before the day they were supposed to go on sale. And people came into "
-"the store and said: &ldquo;oh, I want that!&rdquo; and they bought it and "
-"took away their copies. Then, they discovered the mistake and took the "
-"copies off of display. But Rowling wanted to crush any circulation of any "
-"information from those books, so she went to court, and the court ordered "
-"those people not to read the books that they now owned."
+"early, before the date they were supposed to go on sale. And people came "
+"into the store and said: &ldquo;Oh, I want that!&rdquo; And they bought it "
+"and took away their copies. And then, they discovered the mistake, so they "
+"took the copies off of display. But Rowling wanted to crush any circulation "
+"of any information from those books, so she went to court, and the court "
+"ordered those people not to read the books that they now owned."
 msgstr ""
 "Voilà comment ça s'est passé. Un libraire a mis les livres en rayon trop "
 "tôt, avant qu'ils ne soient censés être en vente. Et les gens sont venus "
@@ -1994,16 +3365,37 @@
 "dont ils étaient dorénavant propriétaires."
 
 #. type: Content of: <p>
+# | In response, I call for a total boycott of Harry Potter. But I don't say
+# | you shouldn't read those books or watch the movies, I only say you
+# | shouldn't buy the books or pay for the movies. {+[laughter]+} I leave it
+# | to Rowling to tell people not to read the books. As far as [-I'm-] {+I
+# | am+} concerned, if you borrow the book and read it, that's [-okay.-] {+OK.
+# | [laughter]+} Just don't give her any money! But this happened with paper
+# | books. The court could make this order but it couldn't get the books back
+# | from the people who had bought them.  Imagine if they were ebooks. Imagine
+# | if they were ebooks on the [-&ldquo;Swindle&rdquo;.-] {+Swindle.+} Amazon
+# | could send commands to erase them.
+#, fuzzy
+#| msgid ""
+#| "In response, I call for a total boycott of Harry Potter. But I don't say "
+#| "you shouldn't read those books or watch the movies, I only say you "
+#| "shouldn't buy the books or pay for the movies. I leave it to Rowling to "
+#| "tell people not to read the books. As far as I'm concerned, if you borrow "
+#| "the book and read it, that's okay. Just don't give her any money! But "
+#| "this happened with paper books. The court could make this order but it "
+#| "couldn't get the books back from the people who had bought them.  Imagine "
+#| "if they were ebooks. Imagine if they were ebooks on the &ldquo;"
+#| "Swindle&rdquo;. Amazon could send commands to erase them."
 msgid ""
 "In response, I call for a total boycott of Harry Potter. But I don't say you "
 "shouldn't read those books or watch the movies, I only say you shouldn't buy "
-"the books or pay for the movies. I leave it to Rowling to tell people not to "
-"read the books. As far as I'm concerned, if you borrow the book and read it, "
-"that's okay. Just don't give her any money! But this happened with paper "
-"books. The court could make this order but it couldn't get the books back "
-"from the people who had bought them.  Imagine if they were ebooks. Imagine "
-"if they were ebooks on the &ldquo;Swindle&rdquo;. Amazon could send commands "
-"to erase them."
+"the books or pay for the movies. [laughter] I leave it to Rowling to tell "
+"people not to read the books. As far as I am concerned, if you borrow the "
+"book and read it, that's OK. [laughter] Just don't give her any money! But "
+"this happened with paper books. The court could make this order but it "
+"couldn't get the books back from the people who had bought them.  Imagine if "
+"they were ebooks. Imagine if they were ebooks on the Swindle. Amazon could "
+"send commands to erase them."
 msgstr ""
 "En réponse, j'appelle à un boycott complet de Harry Potter. Mais je ne dis "
 "pas que vous ne devez pas lire ces livres ni voir les films. Je dis "
@@ -2040,9 +3432,17 @@
 msgstr "Soutenir les arts"
 
 #. type: Content of: <p>
+# | I have two proposals for how to support artists, methods that are
+# | compatible with [-sharing. That-] {+sharing, that+} would allow us to end
+# | the war on sharing and still support artists.
+#, fuzzy
+#| msgid ""
+#| "I have two proposals for how to support artists, methods that are "
+#| "compatible with sharing. That would allow us to end the war on sharing "
+#| "and still support artists."
 msgid ""
 "I have two proposals for how to support artists, methods that are compatible "
-"with sharing. That would allow us to end the war on sharing and still "
+"with sharing, that would allow us to end the war on sharing and still "
 "support artists."
 msgstr ""
 "Je fais deux propositions pour soutenir les artistes, des méthodes "
@@ -2050,23 +3450,30 @@
 "guerre contre le partage tout en soutenant les artistes."
 
 #. type: Content of: <p>
+# | [-The-]{+One method uses tax money. We get a certain amount of public
+# | funds to distribute among artists. But, how much should each artist get?
+# | Well, we have to measure popularity. You see, the+} current system
+# | supposedly supports artists based on their popularity. So I'm saying{+:+}
+# | let's keep that, let's continue [-o-]{+i+}n this system {+to support
+# | them+} based on {+their+} popularity. We can measure the popularity of all
+# | the artists with some kind of polling or sampling, so that we don't have
+# | to do surveillance.  We can respect people's anonymity.
+#, fuzzy
+#| msgid ""
+#| "The current system supposedly supports artists based on their popularity. "
+#| "So I'm saying let's keep that, let's continue on this system based on "
+#| "popularity. We can measure the popularity of all the artists with some "
+#| "kind of polling or sampling, so that we don't have to do surveillance. We "
+#| "can respect people's anonymity."
 msgid ""
 "One method uses tax money. We get a certain amount of public funds to "
-"distribute among artists. But, how much should each artist get? We have to "
-"measure popularity."
-msgstr ""
-"L'une des méthodes est d'utiliser les recettes des taxes. Il y a une "
-"certaine quantité de fonds publics à distribuer entre les artistes. Mais "
-"combien devrait recevoir chaque artiste&nbsp;? Nous devons mesurer sa "
-"popularité."
-
-#. type: Content of: <p>
-msgid ""
-"The current system supposedly supports artists based on their popularity. So "
-"I'm saying let's keep that, let's continue on this system based on "
-"popularity. We can measure the popularity of all the artists with some kind "
-"of polling or sampling, so that we don't have to do surveillance. We can "
-"respect people's anonymity."
+"distribute among artists. But, how much should each artist get? Well, we "
+"have to measure popularity. You see, the current system supposedly supports "
+"artists based on their popularity. So I'm saying: let's keep that, let's "
+"continue in this system to support them based on their popularity. We can "
+"measure the popularity of all the artists with some kind of polling or "
+"sampling, so that we don't have to do surveillance.  We can respect people's "
+"anonymity."
 msgstr ""
 "Le système actuel est censé soutenir les artistes en se basant sur leur "
 "popularité. Je suggère que nous gardions ce principe. Continuons à 
utiliser "
@@ -2075,16 +3482,37 @@
 "avoir à faire de surveillance. Nous respectons l'anonymat des gens."
 
 #. type: Content of: <p>
-msgid ""
-"We get a raw popularity figure for each artist, how do we convert that into "
-"an amount of money? The obvious way is: distribute the money in proportion "
-"to popularity. So if A is a thousand times as popular as B, A will get a "
-"thousand times as much money as B. That's not efficient distribution of the "
-"money. It's not putting the money to good use. It's easy for a star A to be "
-"a thousand times as popular as a fairly successful artist B. If we use "
-"linear proportion, we'll give A a thousand times as much money as we give B. "
-"And that means that, either we have to make A tremendously rich, or we are "
-"not supporting B enough."
+# | [-We-]{+OK, we+} get a raw popularity figure for each artist, how do we
+# | convert that into an amount of money? [-The-] {+Well, the+} obvious way
+# | is: distribute the money in proportion to popularity. So if A is a
+# | thousand times as popular as B, A will get a thousand times as much money
+# | as B. That's not efficient distribution of the money. It's not putting the
+# | money to good use. [-It's-] {+You see, it's+} easy for a star A to be a
+# | thousand times as popular as a fairly successful artist B. [-If-] {+And
+# | if+} we use linear proportion, we'll give A a thousand times as much money
+# | as we give B. And that means that, either we have to make A tremendously
+# | rich, or we are not supporting B enough.
+#, fuzzy
+#| msgid ""
+#| "We get a raw popularity figure for each artist, how do we convert that "
+#| "into an amount of money? The obvious way is: distribute the money in "
+#| "proportion to popularity. So if A is a thousand times as popular as B, A "
+#| "will get a thousand times as much money as B. That's not efficient "
+#| "distribution of the money. It's not putting the money to good use. It's "
+#| "easy for a star A to be a thousand times as popular as a fairly "
+#| "successful artist B. If we use linear proportion, we'll give A a thousand "
+#| "times as much money as we give B. And that means that, either we have to "
+#| "make A tremendously rich, or we are not supporting B enough."
+msgid ""
+"OK, we get a raw popularity figure for each artist, how do we convert that "
+"into an amount of money? Well, the obvious way is: distribute the money in "
+"proportion to popularity. So if A is a thousand times as popular as B, A "
+"will get a thousand times as much money as B. That's not efficient "
+"distribution of the money. It's not putting the money to good use. You see, "
+"it's easy for a star A to be a thousand times as popular as a fairly "
+"successful artist B. And if we use linear proportion, we'll give A a "
+"thousand times as much money as we give B. And that means that, either we "
+"have to make A tremendously rich, or we are not supporting B enough."
 msgstr ""
 "Nous obtenons une mesure brute de la popularité de chaque artiste. Comment "
 "fait-on pour la convertir en quantité d'argent&nbsp;? La méthode évidente "
@@ -2097,15 +3525,34 @@
 "suffisamment."
 
 #. type: Content of: <p>
-msgid ""
-"The money we use to make A tremendously rich is failing to do an effective "
-"job of supporting the arts; so, it's inefficient. Therefore I say: let's use "
-"the cube root. Cube root looks sort of like this. The point is: if A is a "
-"thousand times as popular as B, with the cube root A will get ten times as "
-"much as B, not a thousand times as much, just ten times as much. The use of "
-"the cube root shifts a lot of the money from the stars to the artists of "
-"moderate popularity. And that means, with less money we can adequately "
-"support a much larger number of artists."
+# | [-The-]{+Well, the+} money we use to make A tremendously rich is failing
+# | to do an effective job of supporting the arts; so, it's inefficient.
+# | Therefore I say: let's use the cube root. Cube root looks sort of like
+# | this. The point is: if A is a thousand times as popular as B, with the
+# | cube root A will get ten times as much as B, not a thousand times as much,
+# | just ten times as much. [-The-] {+So the+} use of the cube root shifts a
+# | lot of the money from the stars to the artists of moderate popularity. And
+# | that means, with less money we can adequately support a much larger number
+# | of artists.
+#, fuzzy
+#| msgid ""
+#| "The money we use to make A tremendously rich is failing to do an "
+#| "effective job of supporting the arts; so, it's inefficient. Therefore I "
+#| "say: let's use the cube root. Cube root looks sort of like this. The "
+#| "point is: if A is a thousand times as popular as B, with the cube root A "
+#| "will get ten times as much as B, not a thousand times as much, just ten "
+#| "times as much. The use of the cube root shifts a lot of the money from "
+#| "the stars to the artists of moderate popularity. And that means, with "
+#| "less money we can adequately support a much larger number of artists."
+msgid ""
+"Well, the money we use to make A tremendously rich is failing to do an "
+"effective job of supporting the arts; so, it's inefficient. Therefore I say: "
+"let's use the cube root. Cube root looks sort of like this. The point is: if "
+"A is a thousand times as popular as B, with the cube root A will get ten "
+"times as much as B, not a thousand times as much, just ten times as much. So "
+"the use of the cube root shifts a lot of the money from the stars to the "
+"artists of moderate popularity. And that means, with less money we can "
+"adequately support a much larger number of artists."
 msgstr ""
 "L'argent que nous utilisons pour rendre A immensément riche n'est pas "
 "utilisé de manière effective au soutien des arts, donc il est inefficace. "
@@ -2118,13 +3565,27 @@
 "grand d'artistes de manière adéquate."
 
 #. type: Content of: <p>
+# | There are two reasons why this system would use less money than we pay
+# | now. First of all because it would be supporting artists but not
+# | companies, second because it would shift the money from the stars to the
+# | artists of moderate popularity. Now, it would remain the case that the
+# | more popular you are, the more money you get. [-So-] {+And so+} the star A
+# | would still get more than B, but not astronomically more.
+#, fuzzy
+#| msgid ""
+#| "There are two reasons why this system would use less money than we pay "
+#| "now. First of all because it would be supporting artists but not "
+#| "companies, second because it would shift the money from the stars to the "
+#| "artists of moderate popularity. Now, it would remain the case that the "
+#| "more popular you are, the more money you get. So the star A would still "
+#| "get more than B, but not astronomically more."
 msgid ""
 "There are two reasons why this system would use less money than we pay now. "
 "First of all because it would be supporting artists but not companies, "
 "second because it would shift the money from the stars to the artists of "
 "moderate popularity. Now, it would remain the case that the more popular you "
-"are, the more money you get. So the star A would still get more than B, but "
-"not astronomically more."
+"are, the more money you get. And so the star A would still get more than B, "
+"but not astronomically more."
 msgstr ""
 "Il y a deux raisons pour lesquelles ce système utiliserait beaucoup moins "
 "d'argent que ce que nous payons actuellement. D'abord il soutiendrait les "
@@ -2134,11 +3595,23 @@
 "continuerait à recevoir plus que B, mais pas de manière astronomique."
 
 #. type: Content of: <p>
+# | That's one method, and because it won't be so much money it doesn't matter
+# | so much how we get the money. It could be from a special tax on Internet
+# | connectivity, it could just be some of the general budget that gets
+# | allocated to this purpose. We won't care because it won't be so much
+# | money[-;-]{+,+} much less than we're paying now.
+#, fuzzy
+#| msgid ""
+#| "That's one method, and because it won't be so much money it doesn't "
+#| "matter so much how we get the money. It could be from a special tax on "
+#| "Internet connectivity, it could just be some of the general budget that "
+#| "gets allocated to this purpose. We won't care because it won't be so much "
+#| "money; much less than we're paying now."
 msgid ""
 "That's one method, and because it won't be so much money it doesn't matter "
 "so much how we get the money. It could be from a special tax on Internet "
 "connectivity, it could just be some of the general budget that gets "
-"allocated to this purpose. We won't care because it won't be so much money; "
+"allocated to this purpose. We won't care because it won't be so much money, "
 "much less than we're paying now."
 msgstr ""
 "C'est l'une des méthodes. Comme cela ne représente pas tellement d'argent, "
@@ -2149,9 +3622,41 @@
 "moins que ce que nous payons actuellement."
 
 #. type: Content of: <p>
+# | The other method I've proposed is voluntary payments. Suppose each player
+# | had a button you could use to send one euro. A lot of people would send
+# | it[-,-]{+;+} after all it's not that much money. I think a lot of you
+# | might push that button every day, to give one euro to some artist who had
+# | made a work that you liked. But nothing would demand this, you wouldn't be
+# | required or ordered or pressured to send the money; you would do it
+# | because you felt like it. But there are some people who wouldn't do it
+# | because they're poor and they can't afford to give one euro. And it's good
+# | that they won't give it, we don't have to squeeze money out of poor people
+# | to support the artists. There are enough non[- -]{+-+}poor people who'll
+# | be happy to do it. Why wouldn't you give one euro to some artists today,
+# | if you appreciated their work? It's too inconvenient to give it to them.
+# | So my proposal is to remove the inconvenience. If the only reason not to
+# | give that euro is [-[that]-] you would have one euro less, you would do it
+# | fairly often.
+#, fuzzy
+#| msgid ""
+#| "The other method I've proposed is voluntary payments. Suppose each player "
+#| "had a button you could use to send one euro. A lot of people would send "
+#| "it, after all it's not that much money. I think a lot of you might push "
+#| "that button every day, to give one euro to some artist who had made a "
+#| "work that you liked. But nothing would demand this, you wouldn't be "
+#| "required or ordered or pressured to send the money; you would do it "
+#| "because you felt like it. But there are some people who wouldn't do it "
+#| "because they're poor and they can't afford to give one euro. And it's "
+#| "good that they won't give it, we don't have to squeeze money out of poor "
+#| "people to support the artists. There are enough non poor people who'll be "
+#| "happy to do it. Why wouldn't you give one euro to some artists today, if "
+#| "you appreciated their work? It's too inconvenient to give it to them. So "
+#| "my proposal is to remove the inconvenience. If the only reason not to "
+#| "give that euro is [that] you would have one euro less, you would do it "
+#| "fairly often."
 msgid ""
 "The other method I've proposed is voluntary payments. Suppose each player "
-"had a button you could use to send one euro. A lot of people would send it, "
+"had a button you could use to send one euro. A lot of people would send it; "
 "after all it's not that much money. I think a lot of you might push that "
 "button every day, to give one euro to some artist who had made a work that "
 "you liked. But nothing would demand this, you wouldn't be required or "
@@ -2159,11 +3664,11 @@
 "like it. But there are some people who wouldn't do it because they're poor "
 "and they can't afford to give one euro. And it's good that they won't give "
 "it, we don't have to squeeze money out of poor people to support the "
-"artists. There are enough non poor people who'll be happy to do it. Why "
+"artists. There are enough non-poor people who'll be happy to do it. Why "
 "wouldn't you give one euro to some artists today, if you appreciated their "
 "work? It's too inconvenient to give it to them. So my proposal is to remove "
-"the inconvenience. If the only reason not to give that euro is [that] you "
-"would have one euro less, you would do it fairly often."
+"the inconvenience. If the only reason not to give that euro is you would "
+"have one euro less, you would do it fairly often."
 msgstr ""
 "L'autre méthode que j'ai proposée consiste en paiements volontaires. "
 "Supposez que chaque lecteur multimédia ait un bouton dont on pourrait se "
@@ -2229,13 +3734,27 @@
 "et de la coopération de quelqu'un d'autre pour faire ça."
 
 #. type: Content of: <p>
-msgid ""
-"But, in the Internet, you do need that. For instance if want to distribute a "
-"text on the Internet, you need companies to help you do it.  You can't do it "
-"by yourself. So if you want to have a website, you need the support of an "
-"ISP or a hosting company, and you need a domain name registrar. You need "
-"them to continue to let you do what you're doing. So you're doing it "
-"effectively on sufferance, not by right."
+# | But, in the Internet, you [-do-] {+<em>do</em>+} need that. For instance
+# | if want to distribute a text on the Internet, you need companies to help
+# | you do it.  You can't do it by yourself. So if you want to have a website,
+# | you need the support of an ISP or a hosting company, and you need a domain
+# | name registrar. You need them to continue to let you do what you're doing.
+# | So you're doing it effectively on sufferance, not by right.
+#, fuzzy
+#| msgid ""
+#| "But, in the Internet, you do need that. For instance if want to "
+#| "distribute a text on the Internet, you need companies to help you do it.  "
+#| "You can't do it by yourself. So if you want to have a website, you need "
+#| "the support of an ISP or a hosting company, and you need a domain name "
+#| "registrar. You need them to continue to let you do what you're doing. So "
+#| "you're doing it effectively on sufferance, not by right."
+msgid ""
+"But, in the Internet, you <em>do</em> need that. For instance if want to "
+"distribute a text on the Internet, you need companies to help you do it.  "
+"You can't do it by yourself. So if you want to have a website, you need the "
+"support of an ISP or a hosting company, and you need a domain name "
+"registrar. You need them to continue to let you do what you're doing. So "
+"you're doing it effectively on sufferance, not by right."
 msgstr ""
 "Mais sur Internet, vous en avez besoin. Par exemple, si vous voulez "
 "distribuer un texte sur Internet, vous avez besoin de l'industrie pour vous "
@@ -2246,17 +3765,40 @@
 "Donc vous ne les faites pas par droit, mais par tolérance."
 
 #. type: Content of: <p>
+# | And if you want to receive money, you can't just hold out a can. You need
+# | the cooperation of a payment company. And we saw that this makes all of
+# | our digital activities vulnerable to suppression. We learned this when the
+# | United States government launched a &ldquo;distributed denial of service
+# | attack&rdquo; (DDoS) against WikiLeaks. Now I'm making a bit of joke
+# | because the words [-“distributed-] {+&ldquo;distributed+} denial of
+# | service [-attack”-] {+attack&rdquo;+} usually refer to a different kind
+# | of attack. But they fit perfectly with what the United States did. The
+# | United States went to the various kinds of network services that WikiLeaks
+# | depended on, and told them to cut off service to WikiLeaks. And they
+# | did[-.-]{+!+}
+#, fuzzy
+#| msgid ""
+#| "And if you want to receive money, you can't just hold out a can. You need "
+#| "the cooperation of a payment company. And we saw that this makes all of "
+#| "our digital activities vulnerable to suppression. We learned this when "
+#| "the United States government launched a &ldquo;distributed denial of "
+#| "service attack&rdquo; (DDoS) against WikiLeaks. Now I'm making a bit of "
+#| "joke because the words “distributed denial of service attack” usually "
+#| "refer to a different kind of attack. But they fit perfectly with what the "
+#| "United States did. The United States went to the various kinds of network "
+#| "services that WikiLeaks depended on, and told them to cut off service to "
+#| "WikiLeaks. And they did."
 msgid ""
 "And if you want to receive money, you can't just hold out a can. You need "
 "the cooperation of a payment company. And we saw that this makes all of our "
 "digital activities vulnerable to suppression. We learned this when the "
 "United States government launched a &ldquo;distributed denial of service "
 "attack&rdquo; (DDoS) against WikiLeaks. Now I'm making a bit of joke because "
-"the words “distributed denial of service attack” usually refer to a "
-"different kind of attack. But they fit perfectly with what the United States "
-"did. The United States went to the various kinds of network services that "
-"WikiLeaks depended on, and told them to cut off service to WikiLeaks. And "
-"they did."
+"the words &ldquo;distributed denial of service attack&rdquo; usually refer "
+"to a different kind of attack. But they fit perfectly with what the United "
+"States did. The United States went to the various kinds of network services "
+"that WikiLeaks depended on, and told them to cut off service to WikiLeaks. "
+"And they did!"
 msgstr ""
 "Et si vous voulez recevoir de l'argent, vous ne pouvez pas vous contenter de "
 "tendre une boîte de conserve. Vous avez besoin de la coopération d'une "
@@ -2264,18 +3806,32 @@
 "numériques vulnérables à la suppression. Nous l'avons appris quand le "
 "gouvernement des États-Unis a lancé une «&nbsp;attaque par déni de "
 "service&nbsp;» distribuée (DDoS) contre WikiLeaks. Ici je fais une sorte de 
"
-"jeu de mots parce que l'expression «&nbsp;déni de service 
distribué&nbsp;» se "
-"rapporte d'habitude à une autre sorte d'attaque. Mais cela s'applique "
+"jeu de mots parce que l'expression «&nbsp;déni de service 
distribué&nbsp;» "
+"se rapporte d'habitude à une autre sorte d'attaque. Mais cela s'applique "
 "parfaitement à ce qu'ont fait les États-Unis. Les États-Unis sont allés 
voir "
 "divers types de services réseau dont WiliLeaks dépendait, et leur ont "
 "enjoint de supprimer le service à WikiLeaks. Et ils l'ont fait&nbsp;!"
 
 #. type: Content of: <p>
+# | For instance, WikiLeaks had rented a virtual Amazon server, and the US
+# | government told Amazon: &ldquo;[-c-]{+C+}ut off service for
+# | WikiLeaks.&rdquo; And it did, arbitrarily. And then, Amazon had certain
+# | domain names such as [-as wikileaks.org, the-] {+wikileaks.org. The+} US
+# | government tried to get all those domains shut off. But it didn't succeed,
+# | some of them were outside its control and were not shut off.
+#, fuzzy
+#| msgid ""
+#| "For instance, WikiLeaks had rented a virtual Amazon server, and the US "
+#| "government told Amazon: &ldquo;cut off service for WikiLeaks.&rdquo; And "
+#| "it did, arbitrarily. And then, Amazon had certain domain names such as as "
+#| "wikileaks.org, the US government tried to get all those domains shut off. "
+#| "But it didn't succeed, some of them were outside its control and were not "
+#| "shut off."
 msgid ""
 "For instance, WikiLeaks had rented a virtual Amazon server, and the US "
-"government told Amazon: &ldquo;cut off service for WikiLeaks.&rdquo; And it "
-"did, arbitrarily. And then, Amazon had certain domain names such as as "
-"wikileaks.org, the US government tried to get all those domains shut off. "
+"government told Amazon: &ldquo;Cut off service for WikiLeaks.&rdquo; And it "
+"did, arbitrarily. And then, Amazon had certain domain names such as "
+"wikileaks.org. The US government tried to get all those domains shut off. "
 "But it didn't succeed, some of them were outside its control and were not "
 "shut off."
 msgstr ""
@@ -2287,16 +3843,42 @@
 "réussi. Certains étaient hors de son contrôle et n'ont pas été fermés."
 
 #. type: Content of: <p>
+# | Then, there were the payment companies. The US went to PayPal[-,-] and
+# | said: &ldquo;Stop transferring money to WikiLeaks or we'll make life
+# | difficult for you.&rdquo; And PayPal shut off payments to WikiLeaks. And
+# | then it went to Visa and Mastercard and got them to shut off payments to
+# | WikiLeaks.  Others started collecting money on WikiLeaks{+'+} behalf and
+# | their account{+s+} were shut off too. But in this case, maybe something
+# | can be done.  There's a company in Iceland which began collecting money on
+# | behalf of WikiLeaks, and so Visa and Mastercard shut off its account; it
+# | couldn't receive money from its customers either. [-Now,-] {+And now,+}
+# | that business is suing Visa and Mastercard apparently, under European
+# | Union law, because Visa and Mastercard together have a near-monopoly.
+# | They're not allowed to arbitrarily deny service to anyone.
+#, fuzzy
+#| msgid ""
+#| "Then, there were the payment companies. The US went to PayPal, and said: "
+#| "&ldquo;Stop transferring money to WikiLeaks or we'll make life difficult "
+#| "for you.&rdquo; And PayPal shut off payments to WikiLeaks. And then it "
+#| "went to Visa and Mastercard and got them to shut off payments to "
+#| "WikiLeaks.  Others started collecting money on WikiLeaks behalf and their "
+#| "account were shut off too. But in this case, maybe something can be "
+#| "done.  There's a company in Iceland which began collecting money on "
+#| "behalf of WikiLeaks, and so Visa and Mastercard shut off its account; it "
+#| "couldn't receive money from its customers either. Now, that business is "
+#| "suing Visa and Mastercard apparently, under European Union law, because "
+#| "Visa and Mastercard together have a near-monopoly. They're not allowed to "
+#| "arbitrarily deny service to anyone."
 msgid ""
-"Then, there were the payment companies. The US went to PayPal, and said: "
+"Then, there were the payment companies. The US went to PayPal and said: "
 "&ldquo;Stop transferring money to WikiLeaks or we'll make life difficult for "
 "you.&rdquo; And PayPal shut off payments to WikiLeaks. And then it went to "
 "Visa and Mastercard and got them to shut off payments to WikiLeaks.  Others "
-"started collecting money on WikiLeaks behalf and their account were shut off "
-"too. But in this case, maybe something can be done.  There's a company in "
-"Iceland which began collecting money on behalf of WikiLeaks, and so Visa and "
-"Mastercard shut off its account; it couldn't receive money from its "
-"customers either. Now, that business is suing Visa and Mastercard "
+"started collecting money on WikiLeaks' behalf and their accounts were shut "
+"off too. But in this case, maybe something can be done.  There's a company "
+"in Iceland which began collecting money on behalf of WikiLeaks, and so Visa "
+"and Mastercard shut off its account; it couldn't receive money from its "
+"customers either. And now, that business is suing Visa and Mastercard "
 "apparently, under European Union law, because Visa and Mastercard together "
 "have a near-monopoly. They're not allowed to arbitrarily deny service to "
 "anyone."
@@ -2317,16 +3899,42 @@
 "arbitrairement leurs services à quiconque."
 
 #. type: Content of: <p>
+# | Well, this is an example of how things need to be for all kinds of
+# | services that we use in the Internet. If you rented a store to hand out
+# | statements of what you think, or any other kind of information that you
+# | can lawfully distribute, the landlord couldn't kick you out just because
+# | he didn't like what you were saying. As long as you keep paying the rent,
+# | you have [-the-] {+a+} right to continue in that store for a certain
+# | agreed-on period of time that you signed. So you have some rights that you
+# | can enforce. And they couldn't shut off your telephone line because the
+# | phone company doesn't like what you said{+,+} or because some powerful
+# | entity didn't like what you said and threatened the phone company. No! As
+# | long as you pay the bills and obey certain basic rules, they can't shut
+# | off your phone line. This is what it's like to have some rights!
+#, fuzzy
+#| msgid ""
+#| "Well, this is an example of how things need to be for all kinds of "
+#| "services that we use in the Internet. If you rented a store to hand out "
+#| "statements of what you think, or any other kind of information that you "
+#| "can lawfully distribute, the landlord couldn't kick you out just because "
+#| "he didn't like what you were saying. As long as you keep paying the rent, "
+#| "you have the right to continue in that store for a certain agreed-on "
+#| "period of time that you signed. So you have some rights that you can "
+#| "enforce. And they couldn't shut off your telephone line because the phone "
+#| "company doesn't like what you said or because some powerful entity didn't "
+#| "like what you said and threatened the phone company. No! As long as you "
+#| "pay the bills and obey certain basic rules, they can't shut off your "
+#| "phone line. This is what it's like to have some rights!"
 msgid ""
 "Well, this is an example of how things need to be for all kinds of services "
 "that we use in the Internet. If you rented a store to hand out statements of "
 "what you think, or any other kind of information that you can lawfully "
 "distribute, the landlord couldn't kick you out just because he didn't like "
-"what you were saying. As long as you keep paying the rent, you have the "
-"right to continue in that store for a certain agreed-on period of time that "
-"you signed. So you have some rights that you can enforce. And they couldn't "
-"shut off your telephone line because the phone company doesn't like what you "
-"said or because some powerful entity didn't like what you said and "
+"what you were saying. As long as you keep paying the rent, you have a right "
+"to continue in that store for a certain agreed-on period of time that you "
+"signed. So you have some rights that you can enforce. And they couldn't shut "
+"off your telephone line because the phone company doesn't like what you "
+"said, or because some powerful entity didn't like what you said and "
 "threatened the phone company. No! As long as you pay the bills and obey "
 "certain basic rules, they can't shut off your phone line. This is what it's "
 "like to have some rights!"
@@ -2359,9 +3967,23 @@
 "Internet est la dernière des menaces dont je voulais parler."
 
 #. type: Content of: <p>
+# | Now I'd like to say that for more information about free software, look at
+# | [-GNU.org.-] {+gnu.org.+} Also look at fsf.org, which is the website of
+# | the Free Software Foundation. You can go there and find many ways you can
+# | help us, for instance. You can also become a member of the Free Software
+# | Foundation through that site. [&hellip;] There is also the Free Software
+# | Foundation of Europe fsfe.org. You can join FSF Europe also. [&hellip;]
+#, fuzzy
+#| msgid ""
+#| "Now I'd like to say that for more information about free software, look "
+#| "at GNU.org. Also look at fsf.org, which is the website of the Free "
+#| "Software Foundation. You can go there and find many ways you can help us, "
+#| "for instance. You can also become a member of the Free Software "
+#| "Foundation through that site. [&hellip;] There is also the Free Software "
+#| "Foundation of Europe fsfe.org. You can join FSF Europe also. [&hellip;]"
 msgid ""
 "Now I'd like to say that for more information about free software, look at "
-"GNU.org. Also look at fsf.org, which is the website of the Free Software "
+"gnu.org. Also look at fsf.org, which is the website of the Free Software "
 "Foundation. You can go there and find many ways you can help us, for "
 "instance. You can also become a member of the Free Software Foundation "
 "through that site. [&hellip;] There is also the Free Software Foundation of "
@@ -2442,8 +4064,164 @@
 msgid "Updated:"
 msgstr "Dernière mise à jour&nbsp;:"
 
+#~ msgid "A Free Digital Society"
+#~ msgstr "Une société numérique libre"
+
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "par <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+
+#~ msgid ""
+#~ "This is the <a href=\"http://www.libertesnumeriques.net/evenements/";
+#~ "stallman-19octobre2011/a-free-digital-society\">transcription</a> of "
+#~ "Richard Stallman's lecture at Sciences Po, Paris on October 19, 2011."
+#~ msgstr ""
+#~ "Ceci est la <a href=\"http://www.libertesnumeriques.net/evenements/";
+#~ "stallman-19octobre2011/a-free-digital-society\">traduction</a> d'une "
+#~ "conférence donnée par Richard Stallman à Sciences Po, Paris, le 19 "
+#~ "octobre 2011."
+
+#~ msgid ""
+#~ "So, the whole rest of the world can find out how Danes are being "
+#~ "censored, but Danes are not supposed to know."
+#~ msgstr ""
+#~ "Ainsi, tout le reste du monde peut découvrir comment les Danois sont "
+#~ "censurés, mais les Danois se sont pas censés le savoir."
+
+#~ msgid ""
+#~ "Australia wanted to impose filtering on the Internet, but that was "
+#~ "blocked. However Australia has a different kind of censorship: it has "
+#~ "censorship of links. That is, if a website in Australia has a link to "
+#~ "some censored site outside Australia, the one in Australia can be "
+#~ "punished."
+#~ msgstr ""
+#~ "L'Australie a voulu imposer le filtrage d'Internet, mais cela a été "
+#~ "bloqué. Cependant, l'Australie a un autre genre de censure&nbsp;: elle a "
+#~ "la censure des liens. C'est-à-dire que, si en Australie un site web met "
+#~ "en lien un site censuré en dehors de l'Australie, celui qui est en "
+#~ "Australie peut être puni."
+
+#~ msgid ""
+#~ "And this is used even by public entities to communicate with the people. "
+#~ "For instance Italian public television makes its programs available on "
+#~ "the net in a format called VC-1, which is a standard supposedly, but it's "
+#~ "a secret standard."
+#~ msgstr ""
+#~ "Et ce système est même utilisé par des organismes publics pour "
+#~ "communiquer avec les gens. Par exemple, la télévision publique italienne 
"
+#~ "distribue ses programmes sur le net dans un format appelé VC-1, censé "
+#~ "être un standard&nbsp;; mais c'est un standard secret."
+
+#~ msgid ""
+#~ "Then there are the patented formats, such as MP3 for audio. It's bad to "
+#~ "distribute audio in MP3 format! There is free software to handle MP3 "
+#~ "format, to play it and to generate it, but because it's patented in many "
+#~ "countries, many distributors of free software don't dare include those "
+#~ "programs; so if they distribute the GNU+Linux system, their system "
+#~ "doesn't include a player for MP3."
+#~ msgstr ""
+#~ "Puis il y a les formats brevetés, comme MP3 pour l'audio. C'est mal de "
+#~ "distribuer l'audio au format MP3&nbsp;! Il y a des logiciels libres qui "
+#~ "manipulent le format MP3, qui le lisent et qui le génèrent, mais comme 
il "
+#~ "est breveté dans de nombreux pays, beaucoup de distributeurs de logiciels 
"
+#~ "libres n'osent pas inclure ces logiciels. Ainsi, s'ils distribuent le "
+#~ "système GNU+Linux, leur système n'a pas de lecteur MP3."
+
+#~ msgid ""
+#~ "Now in fact that was a tradition at the time. The tradition was: if there "
+#~ "was an existing program and you wrote something similar to it, inspired "
+#~ "by it, you could give credit by giving your program a name that's a "
+#~ "recursive acronym saying it's not the other one."
+#~ msgstr ""
+#~ "En fait, c'était une tradition à l'époque. La tradition voulait que, si 
"
+#~ "vous vous inspiriez d'un programme existant pour écrire quelque chose de "
+#~ "semblable, vous pouviez lui donner crédit en nommant votre programme par "
+#~ "un acronyme récursif disant que ce n'était pas l'autre programme."
+
+#~ msgid ""
+#~ "Those of you who have a connection with a school, it's your duty to "
+#~ "campaign and pressure that school to move to free software. And you have "
+#~ "to be firm. It may take years, but you can succeed as long as you never "
+#~ "give up. Keep seeking more allies among the students, the faculty, the "
+#~ "staff, the parents, anyone!"
+#~ msgstr ""
+#~ "Ceux d'entre vous qui sont en relation avec une école, c'est votre devoir 
"
+#~ "de faire campagne et de mettre la pression pour que l'école se tourne "
+#~ "vers le logiciel libre. Et vous devez être fermes. Cela peut prendre des "
+#~ "années, mais vous pouvez réussir si vous ne renoncez jamais. Cherchez "
+#~ "toujours plus d'alliés parmi les étudiants, les enseignants, le "
+#~ "personnel, les parents, n'importe qui&nbsp;!"
+
+#~ msgid ""
+#~ "Of course in the case of Google, this only applies to the data the user "
+#~ "<em>knows</em> Google has. Google does lots of surveillance, too, and "
+#~ "that data is not included."
+#~ msgstr ""
+#~ "Naturellement, dans le cas de Google, cela s'applique seulement aux "
+#~ "données dont l'utilisateur <em>sait</em> que Google les possède. Google "
+#~ "fait par ailleurs beaucoup de surveillance, et ces données-là ne sont 
pas "
+#~ "prises en compte."
+
+#~ msgid ""
+#~ "The next threat to our freedom in a digital society is using computers "
+#~ "for voting. You can't trust computers for voting. Whoever controls the "
+#~ "software in those computers has the power to commit undetectable fraud. "
+#~ "Elections are special. Because there's nobody involved that we dare trust "
+#~ "fully. Everybody has to be checked, crosschecked by others, so that "
+#~ "nobody is in the position to falsify the results by himself. Because if "
+#~ "anybody is in a position to do that, he might do it! So our traditional "
+#~ "systems for voting were designed so that nobody was fully trusted, "
+#~ "everybody was being checked by others. So that nobody could easily commit "
+#~ "fraud. But once you introduce a program, this is impossible! How can you "
+#~ "tell if a voting machine would honestly count the votes? You'd have to "
+#~ "study the program that's running in it during the election, which of "
+#~ "course nobody can do, and most people wouldn't even know how to do. But "
+#~ "even the experts who might theoretically be capable of studying the "
+#~ "program, they can't do it while people are voting. They'd have to do it "
+#~ "in advance, and then how do they know that the program they studied is "
+#~ "the one that's running while pople vote? Maybe it's been changed. Now, if "
+#~ "this program is proprietary, that means some company controls it. The "
+#~ "election authority can't even tell what that program is doing. Well, this "
+#~ "company then could rig the election.  There are accusations that this was "
+#~ "done in the US in the past ten years, that election results were "
+#~ "falsified this way."
+#~ msgstr ""
+#~ "La menace suivante contre nos libertés dans la société numérique est "
+#~ "l'utilisation d'ordinateurs pour le vote. Vous ne pouvez pas faire "
+#~ "confiance à des ordinateurs pour voter. Toute personne qui contrôle le "
+#~ "logiciel de ces ordinateurs a le pouvoir de commettre une fraude "
+#~ "indécelable. Les élections ont une particularité&nbsp;: nous ne pouvons 
"
+#~ "avoir entièrement confiance en aucun des intervenants. Chacun doit être "
+#~ "surveillé, contre-surveillé par les autres, de sorte que personne ne 
soit "
+#~ "en mesure de falsifier les résultats par lui-même. Car si quelqu'un en a 
"
+#~ "la possibilité, il pourrait passer à l'action&nbsp;! C'est pourquoi nos "
+#~ "systèmes de vote sont conçus pour ne faire entièrement confiance à "
+#~ "personne, pour que chacun soit surveillé par les autres, de sorte que "
+#~ "personne ne puisse frauder aisément. Mais une fois que vous avez "
+#~ "introduit un programme, c'est impossible&nbsp;! Comment pouvez-vous "
+#~ "savoir si une machine à voter compte honnêtement les votes&nbsp;? Il "
+#~ "faudrait étudier le programme qui la fait fonctionner pendant 
l'élection, "
+#~ "chose que naturellement personne ne peut faire, et que la plupart des "
+#~ "gens ne sauraient même pas faire. Même les experts qui théoriquement "
+#~ "seraient capables d'étudier le programme, ils ne peuvent pas le faire "
+#~ "alors que les gens sont en train de voter. Ils devraient le faire à "
+#~ "l'avance, et alors comment savoir que le programme qu'ils ont étudié est 
"
+#~ "le même qui est en fonctionnement pendant que les gens votent&nbsp;? 
Peut-"
+#~ "être qu'il a été modifié. De plus, si le programme est propriétaire, 
cela "
+#~ "signifie qu'une société particulière le contrôle. L'autorité 
électorale "
+#~ "ne peut même pas dire ce que fait ce programme. Eh bien, cette société "
+#~ "pourrait alors truquer l'élection. Certains accusent que c'est arrivé 
aux "
+#~ "États-Unis dans la dernière décennie et que des résultats d'élections 
ont "
+#~ "été falsifiés de cette façon."
+
+#~ msgid ""
+#~ "One method uses tax money. We get a certain amount of public funds to "
+#~ "distribute among artists. But, how much should each artist get? We have "
+#~ "to measure popularity."
+#~ msgstr ""
+#~ "L'une des méthodes est d'utiliser les recettes des taxes. Il y a une "
+#~ "certaine quantité de fonds publics à distribuer entre les artistes. Mais 
"
+#~ "combien devrait recevoir chaque artiste&nbsp;? Nous devons mesurer sa "
+#~ "popularité."
+
 #~ msgid "<strong>[Surveillance]</strong>"
 #~ msgstr "<strong>[La surveillance]</strong>"
-
-#~ msgid "<strong>[Censorship]</strong>"
-#~ msgstr "<strong>[La censure]</strong>"

Index: philosophy/po/free-digital-society.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-digital-society.it.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/free-digital-society.it.po    10 Jan 2012 17:34:14 -0000      
1.9
+++ philosophy/po/free-digital-society.it.po    6 Apr 2012 16:31:15 -0000       
1.10
@@ -7,42 +7,155 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-digital-society.html\n"
-"POT-Creation-Date: 2011-12-12 04:25-0500\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: 2012-01-08 22:22+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-04-06 12:27-0300\n"
 
 #. type: Content of: <title>
-msgid "A Free Digital Society - GNU Project - Free Software Foundation"
+# | A Free Digital Society - {+What Makes Digital Inclusion Good or Bad? -+}
+# | GNU Project - Free Software Foundation
+#, fuzzy
+#| msgid "A Free Digital Society - GNU Project - Free Software Foundation"
+msgid ""
+"A Free Digital Society - What Makes Digital Inclusion Good or Bad? - GNU "
+"Project - Free Software Foundation"
 msgstr ""
 "Una società digitale libera  - Progetto GNU - Free Software Foundation (FSF)"
 
 #. type: Content of: <h2>
-msgid "A Free Digital Society"
-msgstr "Una società digitale libera"
+msgid "A Free Digital Society - What Makes Digital Inclusion Good or Bad?"
+msgstr ""
+
+#. type: Content of: <p><em>
+msgid "<em>Transcription of a lecture by Richard M. Stallman"
+msgstr ""
 
 #. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "di <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+msgid "at Sciences Po in Paris, October 19, 2011.</em>"
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"This is the <a href=\"http://www.libertesnumeriques.net/evenements/stallman-";
-"19octobre2011/a-free-digital-society\">transcription</a> of Richard "
-"Stallman's lecture at Sciences Po, Paris on October 19, 2011."
+"(A <a href=\"http://audio-video.gnu.org/video/stallman-sciencespo-";
+"freesociety.webm\"> video</a> of this lecture is available.)"
 msgstr ""
-"Questa è la trascrizione di una <a href=\"http://www.libertesnumeriques.net/";
-"evenements/stallman-19octobre2011/a-free-digital-society\">lezione di "
-"Richard Stallman</a> che si è tenuta a Sciences Po, Parigi, il 19 ottobre "
-"2011."
 
 #. type: Content of: <p>
+msgid "<strong>Table of Contents</strong>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#surveillance\">Surveillance</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#censorship\">Censorship</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+# | [-Restricted-]{+<a href=\"#formats\">Restricted+} data [-formats-]
+# | {+formats</a>+}
+#, fuzzy
+#| msgid "Restricted data formats"
+msgid "<a href=\"#formats\">Restricted data formats</a>"
+msgstr "Formati di dati proprietari"
+
+#. type: Content of: <ul><li>
+# | [-Software-]{+<a href=\"#proprietary\">Software+} that isn't [-free-]
+# | {+free</a>+}
+#, fuzzy
+#| msgid "Software that isn't free"
+msgid "<a href=\"#proprietary\">Software that isn't free</a>"
+msgstr "Software non libero"
+
+#. type: Content of: <ul><li>
+# | [-The 4-]{+<a href=\"#four-freedoms\">The four+} freedoms of free
+# | [-software-] {+software</a>+}
+#, fuzzy
+#| msgid "The 4 freedoms of free software"
+msgid "<a href=\"#four-freedoms\">The four freedoms of free software</a>"
+msgstr "Le 4 libertà del software libero"
+
+#. type: Content of: <ul><li>
+# | [-The-]{+<a href=\"#gnu\">The+} GNU [-p-]{+P+}roject and the [-free
+# | software movement-] {+Free Software movement</a>+}
+#, fuzzy
+#| msgid "The GNU project and the free software movement"
+msgid "<a href=\"#gnu\">The GNU Project and the Free Software movement</a>"
+msgstr "Il progetto GNU e il movimento del Software Libero"
+
+#. type: Content of: <ul><li>
+# | [-Free-]{+<a href=\"#education\">Free+} software and [-education-]
+# | {+education</a>+}
+#, fuzzy
+#| msgid "Free software and education"
+msgid "<a href=\"#education\">Free software and education</a>"
+msgstr "Software libero e istruzione"
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#services\">Internet services</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#voting\">Computers for voting</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+# | [-The-]{+<a href=\"#sharing\">The+} war on [-sharing-] {+sharing</a>+}
+#, fuzzy
+#| msgid "The war on sharing"
+msgid "<a href=\"#sharing\">The war on sharing</a>"
+msgstr "La guerra alla condivisione"
+
+#. type: Content of: <ul><li>
+# | [-Supporting-]{+<a href=\"#arts\">Supporting+} the [-arts-] {+arts</a>+}
+#, fuzzy
+#| msgid "Supporting the arts"
+msgid "<a href=\"#arts\">Supporting the arts</a>"
+msgstr "Sostenere l'arte"
+
+#. type: Content of: <ul><li>
+# | [-Rights-]{+<a href=\"#rights\">Rights+} in [-cyberspace-]
+# | {+cyberspace</a>+}
+#, fuzzy
+#| msgid "Rights in cyberspace"
+msgid "<a href=\"#rights\">Rights in cyberspace</a>"
+msgstr "Diritti nel cyberspazio"
+
+#. type: Content of: <h3>
+msgid "Introduction"
+msgstr ""
+
+#. type: Content of: <p>
+# | Projects with the goal of digital inclusion are making a big assumption.
+# | They are assuming that participating in a digital society is
+# | good[-;-]{+,+} but that's not necessarily true. Being in a digital society
+# | can be good or bad, depending on whether that digital society is just or
+# | unjust. There are many ways in which our freedom is being attacked by
+# | digital technology. Digital technology can make things worse, and it will,
+# | unless we fight to prevent it.
+#, fuzzy
+#| msgid ""
+#| "Projects with the goal of digital inclusion are making a big assumption. "
+#| "They are assuming that participating in a digital society is good; but "
+#| "that's not necessarily true. Being in a digital society can be good or "
+#| "bad, depending on whether that digital society is just or unjust. There "
+#| "are many ways in which our freedom is being attacked by digital "
+#| "technology. Digital technology can make things worse, and it will, unless "
+#| "we fight to prevent it."
 msgid ""
 "Projects with the goal of digital inclusion are making a big assumption. "
-"They are assuming that participating in a digital society is good; but "
+"They are assuming that participating in a digital society is good, but "
 "that's not necessarily true. Being in a digital society can be good or bad, "
 "depending on whether that digital society is just or unjust. There are many "
 "ways in which our freedom is being attacked by digital technology. Digital "
@@ -57,11 +170,21 @@
 "la situazione, e lo farà, a meno che non lottiamo per impedirlo. "
 
 #. type: Content of: <p>
+# | Therefore, if we have an unjust digital society, we should cancel these
+# | projects for digital inclusion and launch projects for digital extraction.
+# | We have to extract people from digital society if it doesn't respect their
+# | freedom[-;-]{+,+} or we have to make it respect their freedom.
+#, fuzzy
+#| msgid ""
+#| "Therefore, if we have an unjust digital society, we should cancel these "
+#| "projects for digital inclusion and launch projects for digital "
+#| "extraction. We have to extract people from digital society if it doesn't "
+#| "respect their freedom; or we have to make it respect their freedom."
 msgid ""
 "Therefore, if we have an unjust digital society, we should cancel these "
 "projects for digital inclusion and launch projects for digital extraction. "
 "We have to extract people from digital society if it doesn't respect their "
-"freedom; or we have to make it respect their freedom."
+"freedom, or we have to make it respect their freedom."
 msgstr ""
 "Quindi, se abbiamo una società digitale ingiusta, dovremmo annullare i "
 "progetti per l'inclusione digitale, e lanciare progetti per l'estrazione "
@@ -89,18 +212,43 @@
 "opposizioni. "
 
 #. type: Content of: <p>
+# | Surveillance is sometimes done with our own computers. For instance, if
+# | you have a computer that's running Microsoft Windows, that system is doing
+# | surveillance. There are features in Windows that send data to some
+# | [-server. Data-] {+server, data+} about the use of the computer. A
+# | surveillance feature was discovered in the iPhone a few months ago, and
+# | people started calling it the &ldquo;spy-phone.&rdquo; Flash player has a
+# | surveillance feature too, and so does the Amazon &ldquo;Swindle.&rdquo;
+# | They call it the Kindle, but I call it [-the Swindle (l'escroc)-]
+# | {+&ldquo;the Swindle,&rdquo; <em>l'escroc</em>,+} because it's meant to
+# | swindle users out of their freedom. It makes people identify themselves
+# | whenever they buy a book, and that means Amazon has a giant list of all
+# | the books each user has read. Such a list must not exist anywhere.
+#, fuzzy
+#| msgid ""
+#| "Surveillance is sometimes done with our own computers. For instance, if "
+#| "you have a computer that's running Microsoft Windows, that system is "
+#| "doing surveillance. There are features in Windows that send data to some "
+#| "server. Data about the use of the computer. A surveillance feature was "
+#| "discovered in the iPhone a few months ago, and people started calling it "
+#| "the &ldquo;spy-phone.&rdquo; Flash player has a surveillance feature too, "
+#| "and so does the Amazon &ldquo;Swindle.&rdquo; They call it the Kindle, "
+#| "but I call it the Swindle (l'escroc) because it's meant to swindle users "
+#| "out of their freedom. It makes people identify themselves whenever they "
+#| "buy a book, and that means Amazon has a giant list of all the books each "
+#| "user has read. Such a list must not exist anywhere."
 msgid ""
 "Surveillance is sometimes done with our own computers. For instance, if you "
 "have a computer that's running Microsoft Windows, that system is doing "
-"surveillance. There are features in Windows that send data to some server. "
-"Data about the use of the computer. A surveillance feature was discovered in "
+"surveillance. There are features in Windows that send data to some server, "
+"data about the use of the computer. A surveillance feature was discovered in "
 "the iPhone a few months ago, and people started calling it the &ldquo;spy-"
 "phone.&rdquo; Flash player has a surveillance feature too, and so does the "
-"Amazon &ldquo;Swindle.&rdquo; They call it the Kindle, but I call it the "
-"Swindle (l'escroc) because it's meant to swindle users out of their freedom. "
-"It makes people identify themselves whenever they buy a book, and that means "
-"Amazon has a giant list of all the books each user has read. Such a list "
-"must not exist anywhere."
+"Amazon &ldquo;Swindle.&rdquo; They call it the Kindle, but I call it &ldquo;"
+"the Swindle,&rdquo; <em>l'escroc</em>, because it's meant to swindle users "
+"out of their freedom. It makes people identify themselves whenever they buy "
+"a book, and that means Amazon has a giant list of all the books each user "
+"has read. Such a list must not exist anywhere."
 msgstr ""
 "La sorveglianza a volte è messa in atto dai nostri stessi computer. Ad "
 "esempio, se hai un computer con Microsoft Windows in esecuzione, quel "
@@ -141,15 +289,34 @@
 "semplicemente osservando questi dati. "
 
 #. type: Content of: <p>
-msgid ""
-"We can stop our own computers from doing surveillance on us if we have "
-"control of the software that they run. But the software these people are "
-"running, they don't have control over. It's nonfree software, and that's why "
-"it has malicious features, such as surveillance. However, the surveillance "
-"is not always done with our own computers, it's also done at one remove. For "
-"instance ISPs in Europe are required to keep data about the user's internet "
-"communications for a long time, in case the State decides to investigate "
-"that person later for whatever imaginable reason."
+# | We can stop our own computers from doing surveillance on us if [-we-]
+# | {+<em>we</em>+} have control of the software that they run. But the
+# | software these people are running, they don't have control over. It's
+# | nonfree software, and that's why it has malicious features[-,-] such as
+# | surveillance. However, the surveillance is not always done with our own
+# | computers, it's also done at one remove. For instance ISPs in Europe are
+# | required to keep data about the user's [-i-]{+I+}nternet communications
+# | for a long time, in case the State decides to investigate that person
+# | later for whatever imaginable reason.
+#, fuzzy
+#| msgid ""
+#| "We can stop our own computers from doing surveillance on us if we have "
+#| "control of the software that they run. But the software these people are "
+#| "running, they don't have control over. It's nonfree software, and that's "
+#| "why it has malicious features, such as surveillance. However, the "
+#| "surveillance is not always done with our own computers, it's also done at "
+#| "one remove. For instance ISPs in Europe are required to keep data about "
+#| "the user's internet communications for a long time, in case the State "
+#| "decides to investigate that person later for whatever imaginable reason."
+msgid ""
+"We can stop our own computers from doing surveillance on us if <em>we</em> "
+"have control of the software that they run. But the software these people "
+"are running, they don't have control over. It's nonfree software, and that's "
+"why it has malicious features such as surveillance. However, the "
+"surveillance is not always done with our own computers, it's also done at "
+"one remove. For instance ISPs in Europe are required to keep data about the "
+"user's Internet communications for a long time, in case the State decides to "
+"investigate that person later for whatever imaginable reason."
 msgstr ""
 "Possiamo impedire ai nostri computer di sorvegliarci, se abbiamo il "
 "controllo del software eseguito. Tuttavia, molti non hanno il controllo del "
@@ -161,12 +328,24 @@
 "qualunque ragione, lo Stato decida in seguito di investigare. "
 
 #. type: Content of: <p>
-msgid ""
-"With a portable phone&mdash;even if you can stop the phone from transmitting "
-"your GPS location, the system can determine the phone's location "
-"approximately, by comparing the time when the signals arrive at different "
-"towers. So the phone system can do surveillance even without special "
-"cooperation from the phone itself."
+# | With a portable [-phone&mdash;even-] {+phone&hellip; even+} if you can
+# | stop the phone from transmitting your GPS location, the system can
+# | determine the phone's location approximately, by comparing the time when
+# | the signals arrive at different towers. So the phone system can do
+# | surveillance even without special cooperation from the phone itself.
+#, fuzzy
+#| msgid ""
+#| "With a portable phone&mdash;even if you can stop the phone from "
+#| "transmitting your GPS location, the system can determine the phone's "
+#| "location approximately, by comparing the time when the signals arrive at "
+#| "different towers. So the phone system can do surveillance even without "
+#| "special cooperation from the phone itself."
+msgid ""
+"With a portable phone&hellip; even if you can stop the phone from "
+"transmitting your GPS location, the system can determine the phone's "
+"location approximately, by comparing the time when the signals arrive at "
+"different towers. So the phone system can do surveillance even without "
+"special cooperation from the phone itself."
 msgstr ""
 "Anche se è possibile impedire a un telefono cellulare la trasmissione della "
 "posizione geografica, il sistema può rilevare approssimatamente la posizione 
"
@@ -233,15 +412,37 @@
 "solo in circostanze particolari in cui sia necessario. "
 
 #. type: Content of: <p>
+# | But computerized surveillance makes it possible to centralize and index
+# | all this information so that an unjust regime can find it all, and find
+# | out all about everyone. If a dictator takes power, which could happen
+# | anywhere, people realize this and they recognize that they should not
+# | communicate with other dissidents in a way that the State could find out
+# | about. But if the dictator has several years of stored records[-,-] of who
+# | talks with whom, it's too late to take any precautions [-then. Because-]
+# | {+then, because+} he already has everything he needs to realize:
+# | &ldquo;OK{+,+} this guy is a dissident, and he spoke with him. Maybe he is
+# | a dissident too. Maybe we should grab him and torture him.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "But computerized surveillance makes it possible to centralize and index "
+#| "all this information so that an unjust regime can find it all, and find "
+#| "out all about everyone. If a dictator takes power, which could happen "
+#| "anywhere, people realize this and they recognize that they should not "
+#| "communicate with other dissidents in a way that the State could find out "
+#| "about. But if the dictator has several years of stored records, of who "
+#| "talks with whom, it's too late to take any precautions then. Because he "
+#| "already has everything he needs to realize: &ldquo;OK this guy is a "
+#| "dissident, and he spoke with him. Maybe he is a dissident too. Maybe we "
+#| "should grab him and torture him.&rdquo;"
 msgid ""
 "But computerized surveillance makes it possible to centralize and index all "
 "this information so that an unjust regime can find it all, and find out all "
 "about everyone. If a dictator takes power, which could happen anywhere, "
 "people realize this and they recognize that they should not communicate with "
 "other dissidents in a way that the State could find out about. But if the "
-"dictator has several years of stored records, of who talks with whom, it's "
-"too late to take any precautions then. Because he already has everything he "
-"needs to realize: &ldquo;OK this guy is a dissident, and he spoke with him. "
+"dictator has several years of stored records of who talks with whom, it's "
+"too late to take any precautions then, because he already has everything he "
+"needs to realize: &ldquo;OK, this guy is a dissident, and he spoke with him. "
 "Maybe he is a dissident too. Maybe we should grab him and torture him.&rdquo;"
 msgstr ""
 "Tuttavia, la sorveglianza digitale rende possibile la centralizzazione e "
@@ -257,10 +458,21 @@
 "torturare\". "
 
 #. type: Content of: <p>
-msgid ""
-"So we need to campaign to put an end to digital surveillance now. You can't "
-"wait until there is a dictator and it would really matter. And besides, it "
-"doesn't take an outright dictatorship to start attacking human rights."
+# | So we need to campaign to put an end to digital surveillance [-now.-]
+# | {+<em>now</em>.+} You can't wait until there is a dictator and it would
+# | really matter. And besides, it doesn't take an outright dictatorship to
+# | start attacking human rights.
+#, fuzzy
+#| msgid ""
+#| "So we need to campaign to put an end to digital surveillance now. You "
+#| "can't wait until there is a dictator and it would really matter. And "
+#| "besides, it doesn't take an outright dictatorship to start attacking "
+#| "human rights."
+msgid ""
+"So we need to campaign to put an end to digital surveillance <em>now</em>. "
+"You can't wait until there is a dictator and it would really matter. And "
+"besides, it doesn't take an outright dictatorship to start attacking human "
+"rights."
 msgstr ""
 "Quindi, c'è bisogno di condurre immediatamente una campagna per mettere fine 
"
 "alla sorveglianza digitale. Non possiamo permetterci di aspettare che arrivi "
@@ -268,12 +480,25 @@
 "palese dittatura affinché i diritti umani siano messi in discussione."
 
 #. type: Content of: <p>
+# | I wouldn't quite call the government of the UK a dictatorship. It's not
+# | very democratic, and one way it crushes democracy is using surveillance. A
+# | few years ago, people believed to be on their way to a protest[-;-]{+,+}
+# | they were going to [-protest. They-] {+protest, they+} were arrested
+# | before they could get there[-,-] because their car was tracked through
+# | this universal car tracking system.
+#, fuzzy
+#| msgid ""
+#| "I wouldn't quite call the government of the UK a dictatorship. It's not "
+#| "very democratic, and one way it crushes democracy is using surveillance. "
+#| "A few years ago, people believed to be on their way to a protest; they "
+#| "were going to protest. They were arrested before they could get there, "
+#| "because their car was tracked through this universal car tracking system."
 msgid ""
 "I wouldn't quite call the government of the UK a dictatorship. It's not very "
 "democratic, and one way it crushes democracy is using surveillance. A few "
-"years ago, people believed to be on their way to a protest; they were going "
-"to protest. They were arrested before they could get there, because their "
-"car was tracked through this universal car tracking system."
+"years ago, people believed to be on their way to a protest, they were going "
+"to protest, they were arrested before they could get there because their car "
+"was tracked through this universal car tracking system."
 msgstr ""
 "Non definirei il Regno Unito una dittatura. Comunque, non si tratta neanche "
 "di un paese molto democratico, infatti la sorveglianza è un modo di "
@@ -288,12 +513,26 @@
 msgstr "Censura"
 
 #. type: Content of: <p>
+# | The second threat is censorship. Censorship is not new, it existed long
+# | before computers. But 15 years ago, we thought that the Internet would
+# | protect us from censorship, that it would defeat censorship. Then, China
+# | and some other obvious tyrannies went to great lengths to impose
+# | censorship on the Internet, and we said: &ldquo;[-w-]{+W+}ell that's not
+# | surprising, what else would governments like that do?&rdquo;
+#, fuzzy
+#| msgid ""
+#| "The second threat is censorship. Censorship is not new, it existed long "
+#| "before computers. But 15 years ago, we thought that the Internet would "
+#| "protect us from censorship, that it would defeat censorship. Then, China "
+#| "and some other obvious tyrannies went to great lengths to impose "
+#| "censorship on the Internet, and we said: &ldquo;well that's not "
+#| "surprising, what else would governments like that do?&rdquo;"
 msgid ""
 "The second threat is censorship. Censorship is not new, it existed long "
 "before computers. But 15 years ago, we thought that the Internet would "
 "protect us from censorship, that it would defeat censorship. Then, China and "
 "some other obvious tyrannies went to great lengths to impose censorship on "
-"the Internet, and we said: &ldquo;well that's not surprising, what else "
+"the Internet, and we said: &ldquo;Well that's not surprising, what else "
 "would governments like that do?&rdquo;"
 msgstr ""
 "La seconda minaccia è la censura. La censura non è una novità, esisteva 
ben "
@@ -315,12 +554,28 @@
 "l'Italia, la Danimarca... "
 
 #. type: Content of: <p>
+# | They all have systems of blocking access to some websites. Denmark
+# | established a system that blocks access to a long list of web{+ +}pages,
+# | which was secret. The citizens were not supposed to know how the
+# | government was censoring them, but the list was leaked[-,-] and posted on
+# | WikiLeaks. At that point, Denmark added the WikiLeaks page to its
+# | censorship list. {+So, the whole rest of the world can find out how Danes
+# | are being censored, but Danes are not supposed to know.+}
+#, fuzzy
+#| msgid ""
+#| "They all have systems of blocking access to some websites. Denmark "
+#| "established a system that blocks access to a long list of webpages, which "
+#| "was secret. The citizens were not supposed to know how the government was "
+#| "censoring them, but the list was leaked, and posted on WikiLeaks. At that "
+#| "point, Denmark added the WikiLeaks page to its censorship list."
 msgid ""
 "They all have systems of blocking access to some websites. Denmark "
-"established a system that blocks access to a long list of webpages, which "
+"established a system that blocks access to a long list of web pages, which "
 "was secret. The citizens were not supposed to know how the government was "
-"censoring them, but the list was leaked, and posted on WikiLeaks. At that "
-"point, Denmark added the WikiLeaks page to its censorship list."
+"censoring them, but the list was leaked and posted on WikiLeaks. At that "
+"point, Denmark added the WikiLeaks page to its censorship list. So, the "
+"whole rest of the world can find out how Danes are being censored, but Danes "
+"are not supposed to know."
 msgstr ""
 "Questi paesi dispongono tutti di un sistema che impedisce l'accesso ad "
 "alcuni siti internet. La Danimarca ha predisposto un sistema che blocca "
@@ -331,14 +586,6 @@
 
 #. type: Content of: <p>
 msgid ""
-"So, the whole rest of the world can find out how Danes are being censored, "
-"but Danes are not supposed to know."
-msgstr ""
-"Quindi, il resto del mondo può rendersi conto di come i danesi siano "
-"censurati, ma i danesi stessi non possono farlo. "
-
-#. type: Content of: <p>
-msgid ""
 "A few months ago, Turkey, which claims to respect some human rights, "
 "announced that every Internet user would have to choose between censorship "
 "and more censorship. Four different levels of censorship they get to choose! "
@@ -350,24 +597,32 @@
 "censura tra cui scegliere. Ma la libertà non rientra tra le opzioni. "
 
 #. type: Content of: <p>
+# | {+Australia wanted to impose filtering on the Internet, but that was
+# | blocked. However Australia has a different kind of censorship: it has
+# | censorship of links. That is, if a website in Australia has a link to some
+# | censored site outside Australia, the one in Australia can be punished.+}
+# | Electronic Frontier{+s+} Australia, that is an organization that defends
+# | human rights in the digital domain in Australia, posted a link to a
+# | foreign political website. It was ordered to delete the link or face a
+# | penalty of $11,000 a day. So they deleted it, what else could they do?
+# | This is a very harsh system of censorship.
+#, fuzzy
+#| msgid ""
+#| "Electronic Frontier Australia, that is an organization that defends human "
+#| "rights in the digital domain in Australia, posted a link to a foreign "
+#| "political website. It was ordered to delete the link or face a penalty of "
+#| "$11,000 a day. So they deleted it, what else could they do? This is a "
+#| "very harsh system of censorship."
 msgid ""
 "Australia wanted to impose filtering on the Internet, but that was blocked. "
 "However Australia has a different kind of censorship: it has censorship of "
 "links. That is, if a website in Australia has a link to some censored site "
-"outside Australia, the one in Australia can be punished."
-msgstr ""
-"L'Australia intendeva imporre filtri su Internet, ciò è stato impedito. "
-"Comunque, l'Australia ha un diverso sistema di censura: la censura dei link. "
-"Ciò significa che, se un sito internet australiano ha un link a qualche sito 
"
-"censurato al di fuori dell'Australia, il sito australiano può essere punito. 
"
-
-#. type: Content of: <p>
-msgid ""
-"Electronic Frontier Australia, that is an organization that defends human "
-"rights in the digital domain in Australia, posted a link to a foreign "
-"political website. It was ordered to delete the link or face a penalty of "
-"$11,000 a day. So they deleted it, what else could they do? This is a very "
-"harsh system of censorship."
+"outside Australia, the one in Australia can be punished. Electronic "
+"Frontiers Australia, that is an organization that defends human rights in "
+"the digital domain in Australia, posted a link to a foreign political "
+"website. It was ordered to delete the link or face a penalty of $11,000 a "
+"day. So they deleted it, what else could they do? This is a very harsh "
+"system of censorship."
 msgstr ""
 "Electronic Frontier Australia, un'organizzazione in difesa dei diritti umani "
 "in ambito digitale in Australia ebbe a postare un link che puntava a un sito "
@@ -376,12 +631,25 @@
 "potuto fare? Questo è un sistema di censura parecchio rigido. "
 
 #. type: Content of: <p>
+# | In Spain, the censorship that was adopted earlier this year allows
+# | officials to arbitrarily shut down an Internet site in Spain, or impose
+# | filtering to block access to a site outside of Spain. And they can do this
+# | without any kind of trial. This was one of the motivations for the
+# | [-<em>Indignados</em>,-] {+<cite>Indignados</cite>,+} who have been
+# | protesting in the street.
+#, fuzzy
+#| msgid ""
+#| "In Spain, the censorship that was adopted earlier this year allows "
+#| "officials to arbitrarily shut down an Internet site in Spain, or impose "
+#| "filtering to block access to a site outside of Spain. And they can do "
+#| "this without any kind of trial. This was one of the motivations for the "
+#| "<em>Indignados</em>, who have been protesting in the street."
 msgid ""
 "In Spain, the censorship that was adopted earlier this year allows officials "
 "to arbitrarily shut down an Internet site in Spain, or impose filtering to "
 "block access to a site outside of Spain. And they can do this without any "
-"kind of trial. This was one of the motivations for the <em>Indignados</em>, "
-"who have been protesting in the street."
+"kind of trial. This was one of the motivations for the <cite>Indignados</"
+"cite>, who have been protesting in the street."
 msgstr ""
 "In Spagna le misure di censura che sono state adottate all'inizio di "
 "quest'anno permettono ufficialmente di chiudere in modo arbitrario un sito "
@@ -411,9 +679,14 @@
 msgstr "Formati di dati proprietari"
 
 #. type: Content of: <p>
+# | The next threat to our freedom comes from data formats that restrict
+# | [-the-] users.
+#, fuzzy
+#| msgid ""
+#| "The next threat to our freedom comes from data formats that restrict the "
+#| "users."
 msgid ""
-"The next threat to our freedom comes from data formats that restrict the "
-"users."
+"The next threat to our freedom comes from data formats that restrict users."
 msgstr ""
 "Una ulteriore minaccia alla nostra libertà proviene dai formati dei dati che 
"
 "pongono restrizioni agli utenti. "
@@ -431,12 +704,26 @@
 "programma. L'obiettivo è di prevenire l'interoperabilità."
 
 #. type: Content of: <p>
-msgid ""
-"Now, evidently, if the program implements a secret format, that's because "
-"the program is not free software. So this is another kind of malicious "
-"feature. Surveillance is one kind of malicious feature that you find in some "
-"nonfree programs; using secret formats to restrict the users is another kind "
-"of malicious feature that you also find in some nonfree programs."
+# | Now, evidently, if [-the-] {+a+} program implements a secret format,
+# | that's because the program is not free software. So this is another kind
+# | of malicious feature. Surveillance is one kind of malicious feature that
+# | you find in some nonfree programs; using secret formats to restrict the
+# | users is another kind of malicious feature that you also find in some
+# | nonfree programs.
+#, fuzzy
+#| msgid ""
+#| "Now, evidently, if the program implements a secret format, that's because "
+#| "the program is not free software. So this is another kind of malicious "
+#| "feature. Surveillance is one kind of malicious feature that you find in "
+#| "some nonfree programs; using secret formats to restrict the users is "
+#| "another kind of malicious feature that you also find in some nonfree "
+#| "programs."
+msgid ""
+"Now, evidently, if a program implements a secret format, that's because the "
+"program is not free software. So this is another kind of malicious feature. "
+"Surveillance is one kind of malicious feature that you find in some nonfree "
+"programs; using secret formats to restrict the users is another kind of "
+"malicious feature that you also find in some nonfree programs."
 msgstr ""
 "Ora, evidentemente, se il programma implementa un formato segreto è perché "
 "il programma non è un software libero. Quindi questo è un altro tipo di "
@@ -446,12 +733,27 @@
 "può trovare  in alcuni programmi non liberi. "
 
 #. type: Content of: <p>
+# | But if you have a free program that handles a certain format, <em>ipso
+# | facto</em> that format is not secret. This kind of malicious feature can
+# | only exist in a nonfree program. Surveillance [-features could-]
+# | {+features, well,+} theoretically {+they could+} exist in a free program
+# | but you don't find them happening. Because the users would fix [-it.-]
+# | {+it, you see.+} The users wouldn't like this, so they would fix it.
+#, fuzzy
+#| msgid ""
+#| "But if you have a free program that handles a certain format, <em>ipso "
+#| "facto</em> that format is not secret. This kind of malicious feature can "
+#| "only exist in a nonfree program. Surveillance features could "
+#| "theoretically exist in a free program but you don't find them happening. "
+#| "Because the users would fix it. The users wouldn't like this, so they "
+#| "would fix it."
 msgid ""
 "But if you have a free program that handles a certain format, <em>ipso "
 "facto</em> that format is not secret. This kind of malicious feature can "
-"only exist in a nonfree program. Surveillance features could theoretically "
-"exist in a free program but you don't find them happening. Because the users "
-"would fix it. The users wouldn't like this, so they would fix it."
+"only exist in a nonfree program. Surveillance features, well, theoretically "
+"they could exist in a free program but you don't find them happening. "
+"Because the users would fix it, you see. The users wouldn't like this, so "
+"they would fix it."
 msgstr ""
 "Però se abbiamo un programma libero che gestisce un certo formato, va da sé 
"
 "che quel formato non è segreto. Quel particolare tipo di caratteristica "
@@ -461,12 +763,24 @@
 "utenti la cosa non piacerebbe per cui la sistemerebbero. "
 
 #. type: Content of: <p>
+# | In any case, we also find secret data formats in use for publication of
+# | works. You find secret data formats in use for audio, such as music, for
+# | video, for books&hellip; And these secret formats are known as Digital
+# | Restrictions Management, or DRM, or digital handcuffs [-(les-]
+# | {+<em>(les+} menottes [-num&eacute;riques).-] {+num&eacute;riques)</em>.+}
+#, fuzzy
+#| msgid ""
+#| "In any case, we also find secret data formats in use for publication of "
+#| "works. You find secret data formats in use for audio, such as music, for "
+#| "video, for books&hellip; And these secret formats are known as Digital "
+#| "Restrictions Management, or DRM, or digital handcuffs (les menottes "
+#| "num&eacute;riques)."
 msgid ""
 "In any case, we also find secret data formats in use for publication of "
 "works. You find secret data formats in use for audio, such as music, for "
 "video, for books&hellip; And these secret formats are known as Digital "
-"Restrictions Management, or DRM, or digital handcuffs (les menottes "
-"num&eacute;riques)."
+"Restrictions Management, or DRM, or digital handcuffs <em>(les menottes "
+"num&eacute;riques)</em>."
 msgstr ""
 "In ogni caso, troviamo formati segreti di dati utilizzati per la "
 "pubblicazione di opere dell'ingegno. Si trovano formati segreti usati per "
@@ -487,23 +801,27 @@
 "impedendo loro di fare qualcosa che sarebbe naturale fare.  "
 
 #. type: Content of: <p>
+# | {+And this is used even by public entities to communicate with the people.
+# | For instance Italian public television makes its programs available on the
+# | net in a format called VC-1, which is a standard supposedly, but it's a
+# | secret standard.+} Now I can't imagine how any publicly supported entity
+# | could justify using a secret format to communicate with the public. This
+# | should be illegal. In fact I think all use of Digital Restrictions
+# | Management should be illegal. No company should be allowed to do this.
+#, fuzzy
+#| msgid ""
+#| "Now I can't imagine how any publicly supported entity could justify using "
+#| "a secret format to communicate with the public. This should be illegal. "
+#| "In fact I think all use of Digital Restrictions Management should be "
+#| "illegal. No company should be allowed to do this."
 msgid ""
 "And this is used even by public entities to communicate with the people. For "
 "instance Italian public television makes its programs available on the net "
 "in a format called VC-1, which is a standard supposedly, but it's a secret "
-"standard."
-msgstr ""
-"E questo è messo in pratica addirittura da enti pubblici per comunicare con "
-"le persone. Ad esempio, la televisione pubblica italiana rende i propri "
-"programmi disponibili sul web in un formato denominato VC-1, che "
-"presumibilmente è uno standard, ma uno standard tenuto segreto. "
-
-#. type: Content of: <p>
-msgid ""
-"Now I can't imagine how any publicly supported entity could justify using a "
-"secret format to communicate with the public. This should be illegal. In "
-"fact I think all use of Digital Restrictions Management should be illegal. "
-"No company should be allowed to do this."
+"standard. Now I can't imagine how any publicly supported entity could "
+"justify using a secret format to communicate with the public. This should be "
+"illegal. In fact I think all use of Digital Restrictions Management should "
+"be illegal. No company should be allowed to do this."
 msgstr ""
 "Non riesco ad immaginare come un'entità finanziata dal denaro pubblico possa 
"
 "giustificare l'utilizzo di un formato segreto per comunicare con i "
@@ -527,28 +845,38 @@
 "formati segreti. "
 
 #. type: Content of: <p>
+# | {+Then there are the patented formats, such as MP3 for audio. It's bad to
+# | distribute audio in MP3 format. There is free software to handle MP3
+# | format, to play it and to generate it, but because it's patented in many
+# | countries, many distributors of free software don't dare include those
+# | programs; so if they distribute the GNU+Linux system, their system doesn't
+# | include a player for MP3.+} As a result if anyone distributes some music
+# | in MP3{+,+} that's putting pressure on people not to use GNU/Linux.  Sure,
+# | if you're an expert you can find a free software and install it, but there
+# | are lots of non experts, and they might see that they installed a version
+# | of GNU/Linux which doesn't have that software, and it won't play MP3
+# | files, and they think it's the system's fault. They don't realize it's
+# | MP3's fault. But this is the fact.
+#, fuzzy
+#| msgid ""
+#| "As a result if anyone distributes some music in MP3 that's putting "
+#| "pressure on people not to use GNU/Linux. Sure, if you're an expert you "
+#| "can find a free software and install it, but there are lots of non "
+#| "experts, and they might see that they installed a version of GNU/Linux "
+#| "which doesn't have that software, and it won't play MP3 files, and they "
+#| "think it's the system's fault. They don't realize it's MP3's fault. But "
+#| "this is the fact."
 msgid ""
 "Then there are the patented formats, such as MP3 for audio. It's bad to "
-"distribute audio in MP3 format! There is free software to handle MP3 format, "
+"distribute audio in MP3 format. There is free software to handle MP3 format, "
 "to play it and to generate it, but because it's patented in many countries, "
 "many distributors of free software don't dare include those programs; so if "
 "they distribute the GNU+Linux system, their system doesn't include a player "
-"for MP3."
-msgstr ""
-"Inoltre ci sono i formati brevettati, come il formato MP3 per l'audio. È "
-"male distribuire file audio in formato MP3! Esiste software libero in grado "
-"di gestire file MP3, di leggerli e di crearne di nuovi. Tuttavia, poiché il "
-"formato è brevettato in molti paesi, molti distributori di software libero "
-"non osano distribuire questi programmi; quindi se si tratta di sistemi GNU/"
-"Linux, questi sistemi non includono un lettore per gli MP3. "
-
-#. type: Content of: <p>
-msgid ""
-"As a result if anyone distributes some music in MP3 that's putting pressure "
-"on people not to use GNU/Linux. Sure, if you're an expert you can find a "
-"free software and install it, but there are lots of non experts, and they "
-"might see that they installed a version of GNU/Linux which doesn't have that "
-"software, and it won't play MP3 files, and they think it's the system's "
+"for MP3. As a result if anyone distributes some music in MP3, that's putting "
+"pressure on people not to use GNU/Linux.  Sure, if you're an expert you can "
+"find a free software and install it, but there are lots of non experts, and "
+"they might see that they installed a version of GNU/Linux which doesn't have "
+"that software, and it won't play MP3 files, and they think it's the system's "
 "fault. They don't realize it's MP3's fault. But this is the fact."
 msgstr ""
 "Ne consegue che chiunque distribuisca musica in formato MP3 sta esercitando "
@@ -560,13 +888,33 @@
 "immaginare che la colpa è invece del formato MP3. I fatti sono questi."
 
 #. type: Content of: <p>
+# | Therefore, if you want to support freedom, don't distribute MP3 files.
+# | That's why I say if you're recording my speech and you want to distribute
+# | copies, don't do it in a patented format such as MPEG-2, or MPEG-4, or
+# | MP3. Use a format friendly to free software, such as the [-Ogg format-]
+# | {+OGG formats+} or WebM. And by the way, if you are going to distribute
+# | copies of the recording, please put on it the Creative [-Commons-No
+# | derivatives-] {+Commons, No Derivatives+} license. This is a statement of
+# | my personal views. If it were a lecture for a course, if it were didactic,
+# | then it ought to be free, but statements of opinion are different.
+#, fuzzy
+#| msgid ""
+#| "Therefore, if you want to support freedom, don't distribute MP3 files. "
+#| "That's why I say if you're recording my speech and you want to distribute "
+#| "copies, don't do it in a patented format such as MPEG-2, or MPEG-4, or "
+#| "MP3. Use a format friendly to free software, such as the Ogg format or "
+#| "WebM. And by the way, if you are going to distribute copies of the "
+#| "recording, please put on it the Creative Commons-No derivatives license. "
+#| "This is a statement of my personal views. If it were a lecture for a "
+#| "course, if it were didactic, then it ought to be free, but statements of "
+#| "opinion are different."
 msgid ""
 "Therefore, if you want to support freedom, don't distribute MP3 files. "
 "That's why I say if you're recording my speech and you want to distribute "
 "copies, don't do it in a patented format such as MPEG-2, or MPEG-4, or MP3. "
-"Use a format friendly to free software, such as the Ogg format or WebM. And "
+"Use a format friendly to free software, such as the OGG formats or WebM. And "
 "by the way, if you are going to distribute copies of the recording, please "
-"put on it the Creative Commons-No derivatives license. This is a statement "
+"put on it the Creative Commons, No Derivatives license. This is a statement "
 "of my personal views. If it were a lecture for a course, if it were "
 "didactic, then it ought to be free, but statements of opinion are different."
 msgstr ""
@@ -586,19 +934,50 @@
 msgstr "Software non libero"
 
 #. type: Content of: <p>
+# | Now this leads me to the next threat which comes from software that the
+# | users don't have control over. In other words[-:-]{+,+} software that
+# | isn't free, that is not [-&ldquo;libre&rdquo;.-] {+<cite>libre</cite>.+}
+# | In this particular point French is clearer than English. The English word
+# | [-free-] {+&ldquo;free&rdquo;+} means [-&lsquo;libre&rsquo;-]
+# | {+<cite>libre</cite>+} and [-&lsquo;gratuit&rsquo;,-]
+# | {+<cite>gratuit</cite>,+} but what I mean when I say [-free software-]
+# | {+&ldquo;free software&rdquo;+} is [-&lsquo;logiciel libre&rsquo;.-]
+# | {+<cite>logiciel libre</cite>.+} I don't mean [-&lsquo;gratuit&rsquo;.-]
+# | {+<cite>gratuit</cite>.+} I'm not talking about price. Price is a side
+# | issue, just a detail, because it [-does'nt-] {+doesn't+} matter ethically.
+# | You know{+,+} if [-i-] {+I+} have a copy of a program and I sell it to you
+# | for one euro or a hundred euros, who cares? {+Right?+} Why should anyone
+# | think [-that-] that's good or bad? Or suppose I gave it to you
+# | [-&lsquo;gratuitement&rsquo;&hellip; still,-]
+# | {+<cite>gratuitement</cite>&hellip; Still,+} who cares? But whether this
+# | program respects your freedom, that's important!
+#, fuzzy
+#| msgid ""
+#| "Now this leads me to the next threat which comes from software that the "
+#| "users don't have control over. In other words: software that isn't free, "
+#| "that is not &ldquo;libre&rdquo;. In this particular point French is "
+#| "clearer than English. The English word free means &lsquo;libre&rsquo; and "
+#| "&lsquo;gratuit&rsquo;, but what I mean when I say free software is &lsquo;"
+#| "logiciel libre&rsquo;. I don't mean &lsquo;gratuit&rsquo;. I'm not "
+#| "talking about price. Price is a side issue, just a detail, because it "
+#| "does'nt matter ethically. You know if i have a copy of a program and I "
+#| "sell it to you for one euro or a hundred euros, who cares? Why should "
+#| "anyone think that that's good or bad? Or suppose I gave it to you &lsquo;"
+#| "gratuitement&rsquo;&hellip; still, who cares? But whether this program "
+#| "respects your freedom, that's important!"
 msgid ""
 "Now this leads me to the next threat which comes from software that the "
-"users don't have control over. In other words: software that isn't free, "
-"that is not &ldquo;libre&rdquo;. In this particular point French is clearer "
-"than English. The English word free means &lsquo;libre&rsquo; and &lsquo;"
-"gratuit&rsquo;, but what I mean when I say free software is &lsquo;logiciel "
-"libre&rsquo;. I don't mean &lsquo;gratuit&rsquo;. I'm not talking about "
-"price. Price is a side issue, just a detail, because it does'nt matter "
-"ethically. You know if i have a copy of a program and I sell it to you for "
-"one euro or a hundred euros, who cares? Why should anyone think that that's "
-"good or bad? Or suppose I gave it to you &lsquo;gratuitement&rsquo;&hellip; "
-"still, who cares? But whether this program respects your freedom, that's "
-"important!"
+"users don't have control over. In other words, software that isn't free, "
+"that is not <cite>libre</cite>. In this particular point French is clearer "
+"than English. The English word &ldquo;free&rdquo; means <cite>libre</cite> "
+"and <cite>gratuit</cite>, but what I mean when I say &ldquo;free "
+"software&rdquo; is <cite>logiciel libre</cite>. I don't mean <cite>gratuit</"
+"cite>. I'm not talking about price. Price is a side issue, just a detail, "
+"because it doesn't matter ethically. You know, if I have a copy of a program "
+"and I sell it to you for one euro or a hundred euros, who cares? Right? Why "
+"should anyone think that's good or bad? Or suppose I gave it to you "
+"<cite>gratuitement</cite>&hellip; Still, who cares? But whether this program "
+"respects your freedom, that's important!"
 msgstr ""
 "Ora, questo mi porta ad un'altra insidia che proviene da software su cui "
 "l'utente non ha controllo. In altre parole: software che non è libero, "
@@ -614,15 +993,33 @@
 "libertà, quello sì che è importante!  "
 
 #. type: Content of: <p>
+# | So free software is software that respects users' freedom. What does this
+# | mean? Ultimately there are just two possibilities with software: either
+# | the users control the program or the program controls the users.  If the
+# | users have certain essential freedoms, then [-they-] {+<em>they</em>+}
+# | control the program, and those freedoms are the criterion for free
+# | software. But if the users [-don't-] {+<em>don't</em>+} fully have the
+# | essential freedoms, then the program controls the users. But somebody
+# | controls that program and, through it, has <em>power</em> over the users.
+#, fuzzy
+#| msgid ""
+#| "So free software is software that respects users' freedom. What does this "
+#| "mean? Ultimately there are just two possibilities with software: either "
+#| "the users control the program or the program controls the users.  If the "
+#| "users have certain essential freedoms, then they control the program, and "
+#| "those freedoms are the criterion for free software. But if the users "
+#| "don't fully have the essential freedoms, then the program controls the "
+#| "users. But somebody controls that program and, through it, has <em>power</"
+#| "em> over the users."
 msgid ""
 "So free software is software that respects users' freedom. What does this "
 "mean? Ultimately there are just two possibilities with software: either the "
 "users control the program or the program controls the users.  If the users "
-"have certain essential freedoms, then they control the program, and those "
-"freedoms are the criterion for free software. But if the users don't fully "
-"have the essential freedoms, then the program controls the users. But "
-"somebody controls that program and, through it, has <em>power</em> over the "
-"users."
+"have certain essential freedoms, then <em>they</em> control the program, and "
+"those freedoms are the criterion for free software. But if the users "
+"<em>don't</em> fully have the essential freedoms, then the program controls "
+"the users. But somebody controls that program and, through it, has "
+"<em>power</em> over the users."
 msgstr ""
 "Dunque il software libero è software che rispetta la libertà dell'utente. "
 "Che cosa vuol dire? Alla fine ci sono due possibilità con il software: o è "
@@ -635,12 +1032,25 @@
 "sugli utenti.  "
 
 #. type: Content of: <p>
+# | So, a nonfree program is an instrument to give somebody <em>power</em>
+# | over a lot of other people{+,+} and this is unjust power that nobody
+# | should ever have. This is why nonfree software [-(les-] {+<cite>(les+}
+# | logiciels privateurs, qui privent de la [-libert&eacute;),-]
+# | {+libert&eacute;)</cite>,+} why proprietary software is an injustice and
+# | should not exist; because it leaves the users without freedom.
+#, fuzzy
+#| msgid ""
+#| "So, a nonfree program is an instrument to give somebody <em>power</em> "
+#| "over a lot of other people and this is unjust power that nobody should "
+#| "ever have. This is why nonfree software (les logiciels privateurs, qui "
+#| "privent de la libert&eacute;), why proprietary software is an injustice "
+#| "and should not exist; because it leaves the users without freedom."
 msgid ""
 "So, a nonfree program is an instrument to give somebody <em>power</em> over "
-"a lot of other people and this is unjust power that nobody should ever have. "
-"This is why nonfree software (les logiciels privateurs, qui privent de la "
-"libert&eacute;), why proprietary software is an injustice and should not "
-"exist; because it leaves the users without freedom."
+"a lot of other people, and this is unjust power that nobody should ever "
+"have. This is why nonfree software <cite>(les logiciels privateurs, qui "
+"privent de la libert&eacute;)</cite>, why proprietary software is an "
+"injustice and should not exist; because it leaves the users without freedom."
 msgstr ""
 "Così, un programma non libero è uno strumento per dare a qualcuno "
 "<em>potere</em> su tante altre persone ed è un potere iniquo che nessuno "
@@ -649,11 +1059,25 @@
 "l'utente senza libertà."
 
 #. type: Content of: <p>
+# | Now, the developer who has control of the program often feels tempted to
+# | introduce malicious features to <em>further</em> exploit or abuse those
+# | users. He feels a temptation because he knows he can get away with [-it:
+# | because-] {+it. Because+} his program controls the users and the users do
+# | not have control of the program, if he puts in a malicious feature, the
+# | users can't fix it; they can't remove the malicious feature.
+#, fuzzy
+#| msgid ""
+#| "Now, the developer who has control of the program often feels tempted to "
+#| "introduce malicious features to <em>further</em> exploit or abuse those "
+#| "users.  He feels a temptation because he knows he can get away with it: "
+#| "because his program controls the users and the users do not have control "
+#| "of the program, if he puts in a malicious feature, the users can't fix "
+#| "it; they can't remove the malicious feature."
 msgid ""
 "Now, the developer who has control of the program often feels tempted to "
 "introduce malicious features to <em>further</em> exploit or abuse those "
-"users.  He feels a temptation because he knows he can get away with it: "
-"because his program controls the users and the users do not have control of "
+"users. He feels a temptation because he knows he can get away with it. "
+"Because his program controls the users and the users do not have control of "
 "the program, if he puts in a malicious feature, the users can't fix it; they "
 "can't remove the malicious feature."
 msgstr ""
@@ -665,13 +1089,29 @@
 "di metterla a posto, non possono togliere la funzione maligna."
 
 #. type: Content of: <p>
+# | I've already told you about two kinds of malicious features: surveillance
+# | features, such as are found in Windows[-,-] and the [-Iphone-] {+iPhone+}
+# | and Flash player[-,-] and the [-&ldquo;Swindle&rdquo;.-] {+Swindle, sort
+# | of.+} And there are also features to restrict users, which work with
+# | secret data formats, and those are found in Windows, Macintosh, the
+# | [-Iphone,-] {+iPhone,+} Flash player, the Amazon
+# | [-&ldquo;Swindle&rdquo;,-] {+Swindle,+} the Playstation 3 and lots and
+# | lots of other programs.
+#, fuzzy
+#| msgid ""
+#| "I've already told you about two kinds of malicious features: surveillance "
+#| "features, such as are found in Windows, and the Iphone and Flash player, "
+#| "and the &ldquo;Swindle&rdquo;. And there are also features to restrict "
+#| "users, which work with secret data formats, and those are found in "
+#| "Windows, Macintosh, the Iphone, Flash player, the Amazon &ldquo;"
+#| "Swindle&rdquo;, the Playstation 3 and lots and lots of other programs."
 msgid ""
 "I've already told you about two kinds of malicious features: surveillance "
-"features, such as are found in Windows, and the Iphone and Flash player, and "
-"the &ldquo;Swindle&rdquo;. And there are also features to restrict users, "
-"which work with secret data formats, and those are found in Windows, "
-"Macintosh, the Iphone, Flash player, the Amazon &ldquo;Swindle&rdquo;, the "
-"Playstation 3 and lots and lots of other programs."
+"features, such as are found in Windows and the iPhone and Flash player and "
+"the Swindle, sort of. And there are also features to restrict users, which "
+"work with secret data formats, and those are found in Windows, Macintosh, "
+"the iPhone, Flash player, the Amazon Swindle, the Playstation 3 and lots and "
+"lots of other programs."
 msgstr ""
 "Vi ho già parlato di due generi diversi di funzioni maligne: le "
 "caratteristiche di sorveglianza, come quelle che si trovano in Windows, "
@@ -681,20 +1121,51 @@
 "\", la Playstation 3 e in tantissimi altri programmi. "
 
 #. type: Content of: <p>
+# | The other kind of malicious feature is the backdoor. That means something
+# | in that program is listening for remote commands and obeying them, and
+# | those commands can mistreat the user. We know of backdoors in Windows, in
+# | the [-Iphone,-] {+iPhone,+} in the Amazon [-&ldquo;Swindle&rdquo;.-]
+# | {+Swindle.+} The Amazon [-&ldquo;Swindle&rdquo;-] {+Swindle+} has a
+# | backdoor that can {+delete books,+} remotely delete books. We know this by
+# | observation, because Amazon did it: in 2009 Amazon remotely deleted
+# | thousands of copies of a particular book. Those were authorized copies,
+# | people had [-obtain-] {+obtained+} them directly from Amazon, and thus
+# | Amazon knew exactly where they were, which is how Amazon knew where to
+# | send the commands to delete those books. You know which book Amazon
+# | deleted? <em>1984</em> by George[-s-] Orwell. {+[laughter]+} It's a book
+# | everyone should read, because it discusses a totalitarian state that did
+# | things like delete books it didn't like. Everybody should read it, but not
+# | on the Amazon [-&ldquo;Swindle&rdquo;.-] {+Swindle. [laughter]+}
+#, fuzzy
+#| msgid ""
+#| "The other kind of malicious feature is the backdoor. That means something "
+#| "in that program is listening for remote commands and obeying them, and "
+#| "those commands can mistreat the user. We know of backdoors in Windows, in "
+#| "the Iphone, in the Amazon &ldquo;Swindle&rdquo;. The Amazon &ldquo;"
+#| "Swindle&rdquo; has a backdoor that can remotely delete books. We know "
+#| "this by observation, because Amazon did it: in 2009 Amazon remotely "
+#| "deleted thousands of copies of a particular book. Those were authorized "
+#| "copies, people had obtain them directly from Amazon, and thus Amazon knew "
+#| "exactly where they were, which is how Amazon knew where to send the "
+#| "commands to delete those books. You know which book Amazon deleted? "
+#| "<em>1984</em> by Georges Orwell. It's a book everyone should read, "
+#| "because it discusses a totalitarian state that did things like delete "
+#| "books it didn't like. Everybody should read it, but not on the Amazon "
+#| "&ldquo;Swindle&rdquo;."
 msgid ""
 "The other kind of malicious feature is the backdoor. That means something in "
 "that program is listening for remote commands and obeying them, and those "
 "commands can mistreat the user. We know of backdoors in Windows, in the "
-"Iphone, in the Amazon &ldquo;Swindle&rdquo;. The Amazon &ldquo;"
-"Swindle&rdquo; has a backdoor that can remotely delete books. We know this "
-"by observation, because Amazon did it: in 2009 Amazon remotely deleted "
-"thousands of copies of a particular book. Those were authorized copies, "
-"people had obtain them directly from Amazon, and thus Amazon knew exactly "
-"where they were, which is how Amazon knew where to send the commands to "
-"delete those books. You know which book Amazon deleted? <em>1984</em> by "
-"Georges Orwell. It's a book everyone should read, because it discusses a "
-"totalitarian state that did things like delete books it didn't like. "
-"Everybody should read it, but not on the Amazon &ldquo;Swindle&rdquo;."
+"iPhone, in the Amazon Swindle. The Amazon Swindle has a backdoor that can "
+"delete books, remotely delete books. We know this by observation, because "
+"Amazon did it: in 2009 Amazon remotely deleted thousands of copies of a "
+"particular book. Those were authorized copies, people had obtained them "
+"directly from Amazon, and thus Amazon knew exactly where they were, which is "
+"how Amazon knew where to send the commands to delete those books. You know "
+"which book Amazon deleted? <em>1984</em> by George Orwell. [laughter] It's a "
+"book everyone should read, because it discusses a totalitarian state that "
+"did things like delete books it didn't like. Everybody should read it, but "
+"not on the Amazon Swindle. [laughter]"
 msgstr ""
 "L'altra tipologia di caratteristiche maligne è rappresentata dalle 
\"backdoor"
 "\". Ciò significa che qualcosa in un certo programma attende comandi remoti "
@@ -713,10 +1184,34 @@
 "Amazon. "
 
 #. type: Content of: <p>
+# | Anyway, malicious features are present in the most widely used nonfree
+# | programs, but they are rare in free software, because with free software
+# | the users have [-control: they-] {+control. They+} can read the source
+# | code and they can change it. So, if there were a malicious feature,
+# | somebody would sooner or later spot it and fix it. This means that
+# | somebody who is considering introducing a malicious feature does not find
+# | it so tempting, because he knows he might get away with it for a while but
+# | somebody will spot it, will fix it, and everybody will loose trust in the
+# | perpetrator. It's not so tempting when you know you're going to fail. And
+# | that's why we find that malicious features are rare in free software, and
+# | common in proprietary software.
+#, fuzzy
+#| msgid ""
+#| "Anyway, malicious features are present in the most widely used nonfree "
+#| "programs, but they are rare in free software, because with free software "
+#| "the users have control: they can read the source code and they can change "
+#| "it. So, if there were a malicious feature, somebody would sooner or later "
+#| "spot it and fix it. This means that somebody who is considering "
+#| "introducing a malicious feature does not find it so tempting, because he "
+#| "knows he might get away with it for a while but somebody will spot it, "
+#| "will fix it, and everybody will loose trust in the perpetrator. It's not "
+#| "so tempting when you know you're going to fail. And that's why we find "
+#| "that malicious features are rare in free software, and common in "
+#| "proprietary software."
 msgid ""
 "Anyway, malicious features are present in the most widely used nonfree "
 "programs, but they are rare in free software, because with free software the "
-"users have control: they can read the source code and they can change it. "
+"users have control. They can read the source code and they can change it. "
 "So, if there were a malicious feature, somebody would sooner or later spot "
 "it and fix it. This means that somebody who is considering introducing a "
 "malicious feature does not find it so tempting, because he knows he might "
@@ -738,36 +1233,65 @@
 "software libero, e comuni nel software proprietario."
 
 #. type: Content of: <h3>
-msgid "The 4 freedoms of free software"
+# | The [-4-] {+four+} freedoms of free software
+#, fuzzy
+#| msgid "The 4 freedoms of free software"
+msgid "The four freedoms of free software"
 msgstr "Le 4 libertà del software libero"
 
 #. type: Content of: <p>
-msgid "Now the essential freedoms are four:"
+# | [-Now the-]{+The+} essential freedoms are four:
+#, fuzzy
+#| msgid "Now the essential freedoms are four:"
+msgid "The essential freedoms are four:"
 msgstr "Dunque, le libertà essenziali sono quattro: "
 
 #. type: Content of: <ul><li>
-msgid "Freedom 0 is the freedom to run the program as you wish."
+# | [-Freedom 0-]{+Freedom 0+} is the freedom to run the program as you wish.
+#, fuzzy
+#| msgid "Freedom 0 is the freedom to run the program as you wish."
+msgid "Freedom 0 is the freedom to run the program as you wish."
 msgstr "Libertà 0 è la libertà di eseguire il programma come vuoi."
 
 #. type: Content of: <ul><li>
+# | [-Freedom 1-]{+Freedom 1+} is the freedom to study the source code and
+# | change it, so the program does your computing the way you wish.
+#, fuzzy
+#| msgid ""
+#| "Freedom 1 is the freedom to study the source code and change it, so the "
+#| "program does your computing the way you wish."
 msgid ""
-"Freedom 1 is the freedom to study the source code and change it, so the "
+"Freedom 1 is the freedom to study the source code and change it, so the "
 "program does your computing the way you wish."
 msgstr ""
 "Libertà 1 è la libertà di studiare il codice sorgente e modificarlo, in 
modo "
 "che il programma esegua i tuoi compiti nel modo che desideri; "
 
 #. type: Content of: <ul><li>
+# | [-Freedom 2-]{+Freedom 2+} is the freedom to help others. That's the
+# | freedom to make exact copies and redistribute them when you wish.
+#, fuzzy
+#| msgid ""
+#| "Freedom 2 is the freedom to help others. That's the freedom to make exact "
+#| "copies and redistribute them when you wish."
 msgid ""
-"Freedom 2 is the freedom to help others. That's the freedom to make exact "
+"Freedom 2 is the freedom to help others. That's the freedom to make exact "
 "copies and redistribute them when you wish."
 msgstr ""
 "Libertà 2 è la libertà di aiutare gli altri. E' la libertà di fare delle "
 "copie esatte e distribuirle nei tempi che vuoi; "
 
 #. type: Content of: <ul><li>
+# | [-Freedom 3-]{+Freedom 3+} is the freedom to contribute to your
+# | community. That's the freedom to make copies of your modified versions, if
+# | you have made any, and then distribute them to others when you wish.
+#, fuzzy
+#| msgid ""
+#| "Freedom 3 is the freedom to contribute to your community. That's the "
+#| "freedom to make copies of your modified versions, if you have made any, "
+#| "and then distribute them to others when you wish."
 msgid ""
-"Freedom 3 is the freedom to contribute to your community. That's the freedom "
+"Freedom 3 is the freedom to contribute to your community. That's the freedom 
"
 "to make copies of your modified versions, if you have made any, and then "
 "distribute them to others when you wish."
 msgstr ""
@@ -776,9 +1300,25 @@
 "e poi distribuirle agli altri quando desideri. "
 
 #. type: Content of: <p>
+# | These freedoms, in order to be adequate, must apply to all activities of
+# | life. For instance if it [-says: &ldquo;This-] {+says &ldquo;this+} is
+# | free for academic use,&rdquo; it's not free. Because that's too limited.
+# | It doesn't apply to all areas of life. In particular, if a program is
+# | free, that means it can be modified and distributed commercially, because
+# | commerce is an area of life, an activity in life. And this freedom has to
+# | apply to all activities.
+#, fuzzy
+#| msgid ""
+#| "These freedoms, in order to be adequate, must apply to all activities of "
+#| "life. For instance if it says: &ldquo;This is free for academic use,"
+#| "&rdquo; it's not free. Because that's too limited. It doesn't apply to "
+#| "all areas of life. In particular, if a program is free, that means it can "
+#| "be modified and distributed commercially, because commerce is an area of "
+#| "life, an activity in life. And this freedom has to apply to all "
+#| "activities."
 msgid ""
 "These freedoms, in order to be adequate, must apply to all activities of "
-"life. For instance if it says: &ldquo;This is free for academic use,&rdquo; "
+"life. For instance if it says &ldquo;this is free for academic use,&rdquo; "
 "it's not free. Because that's too limited. It doesn't apply to all areas of "
 "life. In particular, if a program is free, that means it can be modified and "
 "distributed commercially, because commerce is an area of life, an activity "
@@ -793,13 +1333,28 @@
 "tipi di attività.  "
 
 #. type: Content of: <p>
-msgid ""
-"Now however, it's not obligatory to do any of these things. The point is "
-"you're free to do them if you wish, when you wish. But you never have to do "
-"them. You don't have to do any of them. You don't have to run the program. "
-"You don't have to study or change the source code. You don't have to make "
-"any copies. You don't have to distribute your modified versions. The point "
-"is you should be free to do those things if you wish."
+# | [-Now however,-]{+However,+} it's not obligatory to do any of these
+# | things. The point is you're free to do them if you wish, when you wish.
+# | But you never have to do them. You don't have to do any of them. You don't
+# | have to run the program. You don't have to study or change the source
+# | code. You don't have to make any copies. You don't have to distribute your
+# | modified versions. The point is you should be free to do those things
+# | [-if-] {+<em>if+} you [-wish.-] {+wish</em>.+}
+#, fuzzy
+#| msgid ""
+#| "Now however, it's not obligatory to do any of these things. The point is "
+#| "you're free to do them if you wish, when you wish. But you never have to "
+#| "do them. You don't have to do any of them. You don't have to run the "
+#| "program. You don't have to study or change the source code. You don't "
+#| "have to make any copies. You don't have to distribute your modified "
+#| "versions. The point is you should be free to do those things if you wish."
+msgid ""
+"However, it's not obligatory to do any of these things. The point is you're "
+"free to do them if you wish, when you wish. But you never have to do them. "
+"You don't have to do any of them. You don't have to run the program. You "
+"don't have to study or change the source code. You don't have to make any "
+"copies. You don't have to distribute your modified versions. The point is "
+"you should be free to do those things <em>if you wish</em>."
 msgstr ""
 "Comunque, non è necessario mettere in atto nessuno di questi comportamenti. "
 "Il cuore della questione riguarda  la libertà di metterli in atto se si "
@@ -810,18 +1365,44 @@
 "dovresti essere libero di farlo, se lo desideri. "
 
 #. type: Content of: <p>
+# | Now, freedom [-number 1,-] {+number 1,+} the freedom to study and change
+# | the source code to make the program do your computing as you wish,
+# | includes something that might not be obvious at first. If the program
+# | comes in a product, and [-a-] {+the+} developer can provide an upgrade
+# | that will run, then you have to be able to make your version run in that
+# | product. If the product [-would-] {+will+} only run the developer's
+# | versions, and refuses to run yours, the executable in that product is not
+# | free software. Even if it was compiled from free source code, it's not
+# | free because you don't have the freedom to make the program do your
+# | computing the way you wish. So, [-freedom 1-] {+freedom 1+} has to be
+# | real, not just theoretical. It has to include the freedom to use [-your-]
+# | {+<em>your</em>+} version, not just the freedom to make some source code
+# | that won't run.
+#, fuzzy
+#| msgid ""
+#| "Now, freedom number 1, the freedom to study and change the source code to "
+#| "make the program do your computing as you wish, includes something that "
+#| "might not be obvious at first. If the program comes in a product, and a "
+#| "developer can provide an upgrade that will run, then you have to be able "
+#| "to make your version run in that product. If the product would only run "
+#| "the developer's versions, and refuses to run yours, the executable in "
+#| "that product is not free software. Even if it was compiled from free "
+#| "source code, it's not free because you don't have the freedom to make the "
+#| "program do your computing the way you wish. So, freedom 1 has to be real, "
+#| "not just theoretical. It has to include the freedom to use your version, "
+#| "not just the freedom to make some source code that won't run."
 msgid ""
-"Now, freedom number 1, the freedom to study and change the source code to "
+"Now, freedom number 1, the freedom to study and change the source code to "
 "make the program do your computing as you wish, includes something that "
-"might not be obvious at first. If the program comes in a product, and a "
+"might not be obvious at first. If the program comes in a product, and the "
 "developer can provide an upgrade that will run, then you have to be able to "
-"make your version run in that product. If the product would only run the "
+"make your version run in that product. If the product will only run the "
 "developer's versions, and refuses to run yours, the executable in that "
 "product is not free software. Even if it was compiled from free source code, "
 "it's not free because you don't have the freedom to make the program do your "
-"computing the way you wish. So, freedom 1 has to be real, not just "
-"theoretical. It has to include the freedom to use your version, not just the "
-"freedom to make some source code that won't run."
+"computing the way you wish. So, freedom 1 has to be real, not just "
+"theoretical. It has to include the freedom to use <em>your</em> version, not "
+"just the freedom to make some source code that won't run."
 msgstr ""
 "La libertà numero 1, cioè la libertà di studiare e modificare per far sì 
che "
 "il programma funzioni come si desidera, include qualcosa che potrebbe non "
@@ -837,16 +1418,33 @@
 "la libertà di creare del codice non funzionante. "
 
 #. type: Content of: <h3>
-msgid "The GNU project and the free software movement"
+# | The GNU [-p-]{+P+}roject and the [-free software-] {+Free Software+}
+# | movement
+#, fuzzy
+#| msgid "The GNU project and the free software movement"
+msgid "The GNU Project and the Free Software movement"
 msgstr "Il progetto GNU e il movimento del Software Libero"
 
 #. type: Content of: <p>
+# | I launched the [-free software-] {+Free Software+} movement in 1983, when
+# | I announced the plan to develop a free software operating system whose
+# | name is GNU. Now GNU, the name GNU, is a joke; because part of the
+# | hacker's spirit is to have fun even when you're doing something [-very-]
+# | {+<em>very</em>+} serious. Now I can't think of anything more seriously
+# | important than defending freedom.
+#, fuzzy
+#| msgid ""
+#| "I launched the free software movement in 1983, when I announced the plan "
+#| "to develop a free software operating system whose name is GNU. Now GNU, "
+#| "the name GNU, is a joke; because part of the hacker's spirit is to have "
+#| "fun even when you're doing something very serious. Now I can't think of "
+#| "anything more seriously important than defending freedom."
 msgid ""
-"I launched the free software movement in 1983, when I announced the plan to "
+"I launched the Free Software movement in 1983, when I announced the plan to "
 "develop a free software operating system whose name is GNU. Now GNU, the "
 "name GNU, is a joke; because part of the hacker's spirit is to have fun even "
-"when you're doing something very serious. Now I can't think of anything more "
-"seriously important than defending freedom."
+"when you're doing something <em>very</em> serious. Now I can't think of "
+"anything more seriously important than defending freedom."
 msgstr ""
 "Ho lanciato il movimento del software libero nel 1983, quando ho annunciato "
 "il piano di sviluppare un sistema operativo libero dal nome GNU. La "
@@ -855,34 +1453,48 @@
 "niente di più serio e importante della difesa della libertà. "
 
 #. type: Content of: <p>
+# | But that didn't mean I couldn't give my system a name that's a joke.  So
+# | GNU is a joke because it's a recursive acronym, it stands for [-&ldquo;GNU
+# | is-] {+&ldquo;GNU's+} Not [-Unix&rdquo;,-] {+Unix,&rdquo;+} so G.N.U.:
+# | GNU's Not Unix. So the G in GNU stands for GNU.
+#, fuzzy
+#| msgid ""
+#| "But that didn't mean I couldn't give my system a name that's a joke.  So "
+#| "GNU is a joke because it's a recursive acronym, it stands for &ldquo;GNU "
+#| "is Not Unix&rdquo;, so G.N.U.: GNU's Not Unix. So the G in GNU stands for "
+#| "GNU."
 msgid ""
 "But that didn't mean I couldn't give my system a name that's a joke.  So GNU "
-"is a joke because it's a recursive acronym, it stands for &ldquo;GNU is Not "
-"Unix&rdquo;, so G.N.U.: GNU's Not Unix. So the G in GNU stands for GNU."
+"is a joke because it's a recursive acronym, it stands for &ldquo;GNU's Not "
+"Unix,&rdquo; so G.N.U.: GNU's Not Unix. So the G in GNU stands for GNU."
 msgstr ""
 "Ma ciò non significa che io non potessi dare al mio sistema un nome "
 "divertente. GNU è un gioco di parole perché è un acronimo ricorsivo: sta 
per "
 "\"GNU is Not Unix\", GNU Non è Unix. Quindi la \"G\" sta per GNU. "
 
 #. type: Content of: <p>
-msgid ""
-"Now in fact that was a tradition at the time. The tradition was: if there "
-"was an existing program and you wrote something similar to it, inspired by "
-"it, you could give credit by giving your program a name that's a recursive "
-"acronym saying it's not the other one."
-msgstr ""
-"In effetti, all'epoca, c'era una tradizione: chi scriveva un programma "
-"ispirandosi ad un altro programma, producendo qualcosa di simile al primo, "
-"riconosceva il merito del programma da cui si era ispirato dando al nuovo "
-"programma un nome con un acronimo ricorsivo, affermando che quel programma "
-"non era l'altro. "
-
-#. type: Content of: <p>
-msgid ""
-"So I gave credit to Unix for the technical ideas of Unix, but with the name "
-"GNU, because I decided to make GNU a Unix-like system, with the same "
-"commands, the same system calls, so that it would be compatible, so that "
-"people who used Unix can switch over easily."
+# | {+In fact this was a tradition at the time. The tradition was: if there
+# | was an existing program and you wrote something similar to it, inspired by
+# | it, you could give credit by giving your program a name that's a recursive
+# | acronym saying it's not the other one.+} So I gave credit to Unix for the
+# | technical ideas of Unix, but with the name GNU, because I decided to make
+# | GNU a Unix-like system, with the same commands, the same system calls, so
+# | that it would be compatible, so that people who used Unix [-can-]
+# | {+could+} switch over easily.
+#, fuzzy
+#| msgid ""
+#| "So I gave credit to Unix for the technical ideas of Unix, but with the "
+#| "name GNU, because I decided to make GNU a Unix-like system, with the same "
+#| "commands, the same system calls, so that it would be compatible, so that "
+#| "people who used Unix can switch over easily."
+msgid ""
+"In fact this was a tradition at the time. The tradition was: if there was an "
+"existing program and you wrote something similar to it, inspired by it, you "
+"could give credit by giving your program a name that's a recursive acronym "
+"saying it's not the other one. So I gave credit to Unix for the technical "
+"ideas of Unix, but with the name GNU, because I decided to make GNU a Unix-"
+"like system, with the same commands, the same system calls, so that it would "
+"be compatible, so that people who used Unix could switch over easily."
 msgstr ""
 "Quindi, utilizzai Unix per le proprie caratteristiche tecniche, ma con il "
 "nome GNU, perché decisi di rendere GNU un sistema simile a Unix, con gli "
@@ -891,6 +1503,16 @@
 "GNU. "
 
 #. type: Content of: <p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "But the reason for developing GNU, that was unique. GNU is the only "
+#| "operating system, as far as I know, ever developed for the purpose of "
+#| "freedom. Not for technical motivations, not for commercial motivations.  "
+#| "GNU was written for <em>your</em> freedom. Because without a free "
+#| "operating system, it's impossible to have freedom and use a computer. And "
+#| "there were none, and I wanted people to have freedom, so it was up to me "
+#| "to write one."
 msgid ""
 "But the reason for developing GNU, that was unique. GNU is the only "
 "operating system, as far as I know, ever developed for the purpose of "
@@ -908,14 +1530,32 @@
 "arrivato il momento di scrivere questo sistema operativo. "
 
 #. type: Content of: <p>
+# | Nowadays there are millions of users of the GNU operating system and most
+# | of them don't <em>know</em> they are using the GNU operating system,
+# | because there is a widespread practice which is not nice. People call the
+# | system [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+} Many do, but some
+# | people don't, and I hope you'll be one of them. Please, since we started
+# | this, since we wrote the biggest piece of the code, please give us equal
+# | mention,[- -]please call the system [-GNU+Linux,-]
+# | {+&ldquo;GNU+Linux,&rdquo;+} or [-GNU/Linux.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+} It's not much to ask[-!-]{+.+}
+#, fuzzy
+#| msgid ""
+#| "Nowadays there are millions of users of the GNU operating system and most "
+#| "of them don't <em>know</em> they are using the GNU operating system, "
+#| "because there is a widespread practice which is not nice. People call the "
+#| "system &ldquo;Linux&rdquo;. Many do, but some people don't, and I hope "
+#| "you'll be one of them. Please, since we started this, since we wrote the "
+#| "biggest piece of the code, please give us equal mention, please call the "
+#| "system GNU+Linux, or GNU/Linux. It's not much to ask!"
 msgid ""
 "Nowadays there are millions of users of the GNU operating system and most of "
 "them don't <em>know</em> they are using the GNU operating system, because "
 "there is a widespread practice which is not nice. People call the system "
-"&ldquo;Linux&rdquo;. Many do, but some people don't, and I hope you'll be "
+"&ldquo;Linux.&rdquo; Many do, but some people don't, and I hope you'll be "
 "one of them. Please, since we started this, since we wrote the biggest piece "
-"of the code, please give us equal mention, please call the system GNU+Linux, "
-"or GNU/Linux. It's not much to ask!"
+"of the code, please give us equal mention,please call the system &ldquo;GNU"
+"+Linux,&rdquo; or &ldquo;GNU/Linux.&rdquo; It's not much to ask."
 msgstr ""
 "Oggi GNU ha milioni di utenti, la maggior parte dei quali purtroppo non sa "
 "che sta utilizzando il sistema operativo GNU a causa della pratica, molto "
@@ -924,10 +1564,28 @@
 "non è una richiesta eccessiva!"
 
 #. type: Content of: <p>
+# | But there is another reason to do this. It turns out that the person who
+# | wrote Linux, which is one component of the system as we use it today,
+# | {+he+} doesn't agree with the [-free software-] {+Free Software+}
+# | movement. And so if you call the whole system Linux, in effect you're
+# | steering people towards his ideas, and away from our ideas. Because he's
+# | not gonna say to them that they deserve freedom. He's going to say to them
+# | that he likes convenient, reliable, powerful software. He's going to tell
+# | people that those are the important values.
+#, fuzzy
+#| msgid ""
+#| "But there is another reason to do this. It turns out that the person who "
+#| "wrote Linux, which is one component of the system as we use it today, "
+#| "doesn't agree with the free software movement. And so if you call the "
+#| "whole system Linux, in effect you're steering people towards his ideas, "
+#| "and away from our ideas. Because he's not gonna say to them that they "
+#| "deserve freedom. He's going to say to them that he likes convenient, "
+#| "reliable, powerful software. He's going to tell people that those are the "
+#| "important values."
 msgid ""
 "But there is another reason to do this. It turns out that the person who "
-"wrote Linux, which is one component of the system as we use it today, "
-"doesn't agree with the free software movement. And so if you call the whole "
+"wrote Linux, which is one component of the system as we use it today, he "
+"doesn't agree with the Free Software movement. And so if you call the whole "
 "system Linux, in effect you're steering people towards his ideas, and away "
 "from our ideas. Because he's not gonna say to them that they deserve "
 "freedom. He's going to say to them that he likes convenient, reliable, "
@@ -943,14 +1601,31 @@
 "sono i valori più importanti. "
 
 #. type: Content of: <p>
-msgid ""
-"But if you tell them the system is GNU+Linux&mdash;the GNU operating system "
-"plus Linux the kernel&mdash;then they'll know about us, and then they might "
-"listen to what we say. You deserve freedom, and since freedom will be lost "
-"if we don't defend it&mdash;there's always going to be a Sarkozy to take it "
-"away&mdash;we need above all to teach people to demand freedom, to be ready "
-"to stand up for their freedom the next time someone threatens to take it "
-"away."
+# | But if you tell them the system is [-GNU+Linux&mdash;the-]
+# | {+GNU+Linux&mdash;it's the+} GNU operating system plus Linux the
+# | kernel&mdash;then they'll know about us, and then they might listen to
+# | what we [-say. You-] {+say: you+} deserve [-freedom, and-] {+freedom.
+# | And+} since freedom will be lost if we don't defend it&mdash;there's
+# | always going to be a Sarkozy to take it away&mdash;we need above all to
+# | teach people to demand freedom, to be ready to stand up for their freedom
+# | the next time someone threatens to take it away.
+#, fuzzy
+#| msgid ""
+#| "But if you tell them the system is GNU+Linux&mdash;the GNU operating "
+#| "system plus Linux the kernel&mdash;then they'll know about us, and then "
+#| "they might listen to what we say. You deserve freedom, and since freedom "
+#| "will be lost if we don't defend it&mdash;there's always going to be a "
+#| "Sarkozy to take it away&mdash;we need above all to teach people to demand "
+#| "freedom, to be ready to stand up for their freedom the next time someone "
+#| "threatens to take it away."
+msgid ""
+"But if you tell them the system is GNU+Linux&mdash;it's the GNU operating "
+"system plus Linux the kernel&mdash;then they'll know about us, and then they "
+"might listen to what we say: you deserve freedom. And since freedom will be "
+"lost if we don't defend it&mdash;there's always going to be a Sarkozy to "
+"take it away&mdash;we need above all to teach people to demand freedom, to "
+"be ready to stand up for their freedom the next time someone threatens to "
+"take it away."
 msgstr ""
 "Al contrario, se dici che il sistema è GNU+Linux - il sistema operativo GNU "
 "più il kernel Linux - allora sapranno di noi, e potrebbero ascoltare la "
@@ -961,15 +1636,35 @@
 "discussione. "
 
 #. type: Content of: <p>
-msgid ""
-"Nowadays, you can tell who does'nt want to discuss these ideas of freedom "
-"because they don't say &ldquo;logiciel libre&rdquo;. They don't say &ldquo;"
-"libre&rdquo;, they say &ldquo;open source&rdquo;. That term was coined by "
-"the people like Mr Torvalds who would prefer that these ethical issues don't "
-"get raised. And so the way you can help us raise them is by saying libre. "
-"You know, it's up to you where you stand, you're free to say what you think. "
-"If you agree with them, you can say open source. If you agree with us, show "
-"it: say libre!"
+# | Nowadays, you can tell who [-does'nt-] {+doesn't+} want to discuss these
+# | ideas of freedom because they don't say [-&ldquo;logiciel libre&rdquo;.-]
+# | {+<cite>logiciel libre</cite>.+} They don't say [-&ldquo;libre&rdquo;,-]
+# | {+<cite>libre</cite>,+} they say &ldquo;open [-source&rdquo;.-]
+# | {+source.&rdquo;+} That term was coined by the people like Mr Torvalds who
+# | would prefer that these ethical issues don't get raised. And so the way
+# | you can help us raise them is by saying [-libre.-] {+<cite>libre</cite>.+}
+# | You know, it's up to you where you stand, you're free to say what you
+# | think. If you agree with them, you can say open source. If you agree with
+# | us, show it[-:-]{+,+} say [-libre!-] {+<cite>libre</cite>!+}
+#, fuzzy
+#| msgid ""
+#| "Nowadays, you can tell who does'nt want to discuss these ideas of freedom "
+#| "because they don't say &ldquo;logiciel libre&rdquo;. They don't say "
+#| "&ldquo;libre&rdquo;, they say &ldquo;open source&rdquo;. That term was "
+#| "coined by the people like Mr Torvalds who would prefer that these ethical "
+#| "issues don't get raised. And so the way you can help us raise them is by "
+#| "saying libre. You know, it's up to you where you stand, you're free to "
+#| "say what you think. If you agree with them, you can say open source. If "
+#| "you agree with us, show it: say libre!"
+msgid ""
+"Nowadays, you can tell who doesn't want to discuss these ideas of freedom "
+"because they don't say <cite>logiciel libre</cite>. They don't say "
+"<cite>libre</cite>, they say &ldquo;open source.&rdquo; That term was coined "
+"by the people like Mr Torvalds who would prefer that these ethical issues "
+"don't get raised. And so the way you can help us raise them is by saying "
+"<cite>libre</cite>. You know, it's up to you where you stand, you're free to "
+"say what you think. If you agree with them, you can say open source. If you "
+"agree with us, show it, say <cite>libre</cite>!"
 msgstr ""
 "Quindi, puoi immediatamente identificare chi non vuole parlare di queste "
 "idee di libertà: questi non parlano di software libero. Preferiscono usare "
@@ -985,18 +1680,47 @@
 msgstr "Software libero e istruzione"
 
 #. type: Content of: <p>
+# | [-Now the-]{+The+} most important point about free software is that
+# | schools [-must-] {+<em>must</em>+} teach exclusively free software. All
+# | levels of schools from kindergarten to university, it's their moral
+# | responsibility to teach only free software in their education, and all
+# | other educational activities as well, including those that say that
+# | they're spreading digital literacy. A lot of those activities teach
+# | Windows, which means they're teaching <em>dependence</em>. To teach people
+# | the use {+of+} proprietary software is to teach dependence, and
+# | educational activities must never do that because it's the opposite of
+# | their mission.  Educational activities have a social mission to educate
+# | good citizens of a strong, capable, cooperating, independent and free
+# | society. And in the area of computing, that means: teach free [-software.
+# | Never-] {+software; never+} teach a proprietary program because that's
+# | inculcating dependence.
+#, fuzzy
+#| msgid ""
+#| "Now the most important point about free software is that schools must "
+#| "teach exclusively free software. All levels of schools from kindergarten "
+#| "to university, it's their moral responsibility to teach only free "
+#| "software in their education, and all other educational activities as "
+#| "well, including those that say that they're spreading digital literacy.  "
+#| "A lot of those activities teach Windows, which means they're teaching "
+#| "<em>dependence</em>. To teach people the use proprietary software is to "
+#| "teach dependence, and educational activities must never do that because "
+#| "it's the opposite of their mission. Educational activities have a social "
+#| "mission to educate good citizens of a strong, capable, cooperating, "
+#| "independent and free society. And in the area of computing, that means: "
+#| "teach free software. Never teach a proprietary program because that's "
+#| "inculcating dependence."
 msgid ""
-"Now the most important point about free software is that schools must teach "
-"exclusively free software. All levels of schools from kindergarten to "
+"The most important point about free software is that schools <em>must</em> "
+"teach exclusively free software. All levels of schools from kindergarten to "
 "university, it's their moral responsibility to teach only free software in "
 "their education, and all other educational activities as well, including "
 "those that say that they're spreading digital literacy.  A lot of those "
 "activities teach Windows, which means they're teaching <em>dependence</em>. "
-"To teach people the use proprietary software is to teach dependence, and "
+"To teach people the use of proprietary software is to teach dependence, and "
 "educational activities must never do that because it's the opposite of their "
 "mission. Educational activities have a social mission to educate good "
 "citizens of a strong, capable, cooperating, independent and free society. "
-"And in the area of computing, that means: teach free software. Never teach a "
+"And in the area of computing, that means: teach free software; never teach a "
 "proprietary program because that's inculcating dependence."
 msgstr ""
 "L'aspetto più importante riguardo al software libero è che nelle scuole si "
@@ -1015,20 +1739,51 @@
 "programmi proprietari che equivale ad addestrare alla dipendenza. "
 
 #. type: Content of: <p>
+# | Why do you think some proprietary developers offer gratis copies to
+# | schools? They want the schools to make the children dependent. And then,
+# | when they graduate, they're still dependent and{+,+} you know{+,+} the
+# | company is not going to offer them gratis copies. And some of them get
+# | jobs and go to work for companies. Not many of them anymore, but some of
+# | them.  And those companies are not going to be offered gratis copies. Oh
+# | no! The idea is{+:+} if the school directs the students down the path of
+# | permanent dependence, they can drag the rest of society with them into
+# | dependence. That's the plan! It's just like giving the school gratis
+# | needles full of addicting drugs, [-saying &ldquo;inject-] {+saying:
+# | &ldquo;Inject+} this into your students, the first dose is
+# | [-gratis.&rdquo;-] {+gratis.+} Once you're dependent, then you have to
+# | [-pay.-] {+pay.&rdquo;+} Well, the school would reject the drugs because
+# | it isn't right to teach the students to use addictive drugs{+,+} and it's
+# | got to reject the proprietary software also.
+#, fuzzy
+#| msgid ""
+#| "Why do you think some proprietary developers offer gratis copies to "
+#| "schools? They want the schools to make the children dependent. And then, "
+#| "when they graduate, they're still dependent and you know the company is "
+#| "not going to offer them gratis copies. And some of them get jobs and go "
+#| "to work for companies. Not many of them anymore, but some of them. And "
+#| "those companies are not going to be offered gratis copies. Oh no! The "
+#| "idea is if the school directs the students down the path of permanent "
+#| "dependence, they can drag the rest of society with them into dependence.  "
+#| "That's the plan! It's just like giving the school gratis needles full of "
+#| "addicting drugs, saying &ldquo;inject this into your students, the first "
+#| "dose is gratis.&rdquo; Once you're dependent, then you have to pay. Well, "
+#| "the school would reject the drugs because it isn't right to teach the "
+#| "students to use addictive drugs and it's got to reject the proprietary "
+#| "software also."
 msgid ""
 "Why do you think some proprietary developers offer gratis copies to schools? "
 "They want the schools to make the children dependent. And then, when they "
-"graduate, they're still dependent and you know the company is not going to "
+"graduate, they're still dependent and, you know, the company is not going to "
 "offer them gratis copies. And some of them get jobs and go to work for "
 "companies. Not many of them anymore, but some of them. And those companies "
-"are not going to be offered gratis copies. Oh no! The idea is if the school "
+"are not going to be offered gratis copies. Oh no! The idea is: if the school "
 "directs the students down the path of permanent dependence, they can drag "
 "the rest of society with them into dependence.  That's the plan! It's just "
-"like giving the school gratis needles full of addicting drugs, saying &ldquo;"
-"inject this into your students, the first dose is gratis.&rdquo; Once you're "
-"dependent, then you have to pay. Well, the school would reject the drugs "
-"because it isn't right to teach the students to use addictive drugs and it's "
-"got to reject the proprietary software also."
+"like giving the school gratis needles full of addicting drugs, saying: "
+"&ldquo;Inject this into your students, the first dose is gratis. Once you're "
+"dependent, then you have to pay.&rdquo; Well, the school would reject the "
+"drugs because it isn't right to teach the students to use addictive drugs, "
+"and it's got to reject the proprietary software also."
 msgstr ""
 "Perché pensate che alcuni sviluppatori di software proprietario offrano "
 "copie gratis alle scuole? Vogliono che le scuole rendano dipendenti i "
@@ -1046,13 +1801,30 @@
 "rifiutare l'impiego di software proprietario. "
 
 #. type: Content of: <p>
-msgid ""
-"Some people say &ldquo;let's have the school teach both proprietary software "
-"and free software, so the students become familiar with both.&rdquo; That's "
-"like saying &ldquo;for the lunch lets give the kids spinach and tabacco, so "
-"that they become accustomed to both.&rdquo; No! The schools are only "
-"supposed to teach good habits, not bad ones! So there should be no Windows "
-"in a school, no Macintosh, nothing proprietary in the education."
+# | Some people [-say &ldquo;let's-] {+say: &ldquo;Let's+} have the school
+# | teach both proprietary software and free software, so the students become
+# | familiar with both.&rdquo; That's like [-saying &ldquo;for-] {+saying:
+# | &ldquo;For+} the lunch let{+'+}s give the kids spinach and
+# | t[-a-]{+o+}bacco, so that they become accustomed to both.&rdquo; No! The
+# | schools are only supposed to teach good habits, not bad ones! So there
+# | should be no Windows in a school, no Macintosh, nothing proprietary in the
+# | education.
+#, fuzzy
+#| msgid ""
+#| "Some people say &ldquo;let's have the school teach both proprietary "
+#| "software and free software, so the students become familiar with both."
+#| "&rdquo; That's like saying &ldquo;for the lunch lets give the kids "
+#| "spinach and tabacco, so that they become accustomed to both.&rdquo; No! "
+#| "The schools are only supposed to teach good habits, not bad ones! So "
+#| "there should be no Windows in a school, no Macintosh, nothing proprietary "
+#| "in the education."
+msgid ""
+"Some people say: &ldquo;Let's have the school teach both proprietary "
+"software and free software, so the students become familiar with both."
+"&rdquo; That's like saying: &ldquo;For the lunch let's give the kids spinach "
+"and tobacco, so that they become accustomed to both.&rdquo; No! The schools "
+"are only supposed to teach good habits, not bad ones! So there should be no "
+"Windows in a school, no Macintosh, nothing proprietary in the education."
 msgstr ""
 "Qualcuno dice: \"facciamo in modo che le scuole insegnino sia software "
 "libero che proprietario, cosicchè gli studenti prendano confidenza con "
@@ -1062,12 +1834,36 @@
 "niente di proprietario in campo educativo. "
 
 #. type: Content of: <p>
+# | But also, for the sake of educating the programmers. You see, some people
+# | have a talent for programming. At ten to thirteen years old, typically,
+# | they're fascinated, and if they use a program, they want to [-know
+# | &ldquo;how-] {+know: &ldquo;How+} does it do this?&rdquo; But when they
+# | ask the teacher, if it's proprietary, the teacher has to say{+:+}
+# | &ldquo;I'm sorry, it's a secret, we can't find out.&rdquo; Which means
+# | education is forbidden. A proprietary program is the enemy of the spirit
+# | of education. It's knowledge withheld, so it should not be tolerated in a
+# | school, even though there may be plenty of people in the school who don't
+# | care about programming, don't want to learn this. Still, because it's the
+# | enemy of the spirit of education, it shouldn't be there in the school.
+#, fuzzy
+#| msgid ""
+#| "But also, for the sake of educating the programmers. You see, some people "
+#| "have a talent for programming. At ten to thirteen years old, typically, "
+#| "they're fascinated, and if they use a program, they want to know &ldquo;"
+#| "how does it do this?&rdquo; But when they ask the teacher, if it's "
+#| "proprietary, the teacher has to say &ldquo;I'm sorry, it's a secret, we "
+#| "can't find out.&rdquo; Which means education is forbidden. A proprietary "
+#| "program is the enemy of the spirit of education. It's knowledge withheld, "
+#| "so it should not be tolerated in a school, even though there may be "
+#| "plenty of people in the school who don't care about programming, don't "
+#| "want to learn this. Still, because it's the enemy of the spirit of "
+#| "education, it shouldn't be there in the school."
 msgid ""
 "But also, for the sake of educating the programmers. You see, some people "
 "have a talent for programming. At ten to thirteen years old, typically, "
-"they're fascinated, and if they use a program, they want to know &ldquo;how "
+"they're fascinated, and if they use a program, they want to know: &ldquo;How "
 "does it do this?&rdquo; But when they ask the teacher, if it's proprietary, "
-"the teacher has to say &ldquo;I'm sorry, it's a secret, we can't find out."
+"the teacher has to say: &ldquo;I'm sorry, it's a secret, we can't find out."
 "&rdquo; Which means education is forbidden. A proprietary program is the "
 "enemy of the spirit of education. It's knowledge withheld, so it should not "
 "be tolerated in a school, even though there may be plenty of people in the "
@@ -1088,9 +1884,21 @@
 "spirito educativo, non dovrebbe trovarsi nella scuola. "
 
 #. type: Content of: <p>
+# | But if the program is free, the teacher can explain what he knows, and
+# | then give out copies of the source code, saying: &ldquo;[-r-]{+R+}ead it
+# | and you'll understand everything.&rdquo; And those who are really
+# | fascinated, they will read it! And this gives them an opportunity to start
+# | to learn how to be good programmers.
+#, fuzzy
+#| msgid ""
+#| "But if the program is free, the teacher can explain what he knows, and "
+#| "then give out copies of the source code, saying: &ldquo;read it and "
+#| "you'll understand everything.&rdquo; And those who are really fascinated, "
+#| "they will read it! And this gives them an opportunity to start to learn "
+#| "how to be good programmers."
 msgid ""
 "But if the program is free, the teacher can explain what he knows, and then "
-"give out copies of the source code, saying: &ldquo;read it and you'll "
+"give out copies of the source code, saying: &ldquo;Read it and you'll "
 "understand everything.&rdquo; And those who are really fascinated, they will "
 "read it! And this gives them an opportunity to start to learn how to be good "
 "programmers."
@@ -1102,11 +1910,23 @@
 "essere dei bravi programmatori. "
 
 #. type: Content of: <p>
+# | To learn to be a good programmer, you'll need to recognize that certain
+# | ways of writing code, even if they make sense to you and they are correct,
+# | they're not good because other people will have trouble understanding
+# | them. Good code is clear code[-,-] that others will have an easy time
+# | working on when they need to make further changes.
+#, fuzzy
+#| msgid ""
+#| "To learn to be a good programmer, you'll need to recognize that certain "
+#| "ways of writing code, even if they make sense to you and they are "
+#| "correct, they're not good because other people will have trouble "
+#| "understanding them. Good code is clear code, that others will have an "
+#| "easy time working on when they need to make further changes."
 msgid ""
 "To learn to be a good programmer, you'll need to recognize that certain ways "
 "of writing code, even if they make sense to you and they are correct, "
 "they're not good because other people will have trouble understanding them. "
-"Good code is clear code, that others will have an easy time working on when "
+"Good code is clear code that others will have an easy time working on when "
 "they need to make further changes."
 msgstr ""
 "Per imparare ad essere un buon programmatore, hai bisogno di distinguere che "
@@ -1116,10 +1936,22 @@
 "lavoreranno facilmente quando dovranno fare ulteriori modifiche. "
 
 #. type: Content of: <p>
+# | How do you learn to write good clear code? You do it by reading lots of
+# | code, and writing lots of code. [-And-] {+Well,+} only free software
+# | offers the chance to read the code of large programs that we really use.
+# | And then you have to write lots of code, which means you have to write
+# | changes in large programs.
+#, fuzzy
+#| msgid ""
+#| "How do you learn to write good clear code? You do it by reading lots of "
+#| "code, and writing lots of code. And only free software offers the chance "
+#| "to read the code of large programs that we really use. And then you have "
+#| "to write lots of code, which means you have to write changes in large "
+#| "programs."
 msgid ""
 "How do you learn to write good clear code? You do it by reading lots of "
-"code, and writing lots of code. And only free software offers the chance to "
-"read the code of large programs that we really use. And then you have to "
+"code, and writing lots of code. Well, only free software offers the chance "
+"to read the code of large programs that we really use. And then you have to "
 "write lots of code, which means you have to write changes in large programs."
 msgstr ""
 "Come si impara a scrivere codice buono e chiaro? Lo si fa leggendo un sacco "
@@ -1129,13 +1961,27 @@
 "cambiamenti in grandi programmi. "
 
 #. type: Content of: <p>
+# | How do you learn to write good code for the large programs? You have to
+# | start small, which does [-not-] {+<em>not</em>+} mean small program, oh
+# | no! The challenges of the code for large programs don't even begin to
+# | appear in small programs. So the way you start small at writing code for
+# | large programs is by writing small changes in large programs. And only
+# | free software gives you the chance to do that[-!-]{+.+}
+#, fuzzy
+#| msgid ""
+#| "How do you learn to write good code for the large programs? You have to "
+#| "start small, which does not mean small program, oh no! The challenges of "
+#| "the code for large programs don't even begin to appear in small programs. "
+#| "So the way you start small at writing code for large programs is by "
+#| "writing small changes in large programs. And only free software gives you "
+#| "the chance to do that!"
 msgid ""
 "How do you learn to write good code for the large programs? You have to "
-"start small, which does not mean small program, oh no! The challenges of the "
-"code for large programs don't even begin to appear in small programs. So the "
-"way you start small at writing code for large programs is by writing small "
-"changes in large programs. And only free software gives you the chance to do "
-"that!"
+"start small, which does <em>not</em> mean small program, oh no! The "
+"challenges of the code for large programs don't even begin to appear in "
+"small programs. So the way you start small at writing code for large "
+"programs is by writing small changes in large programs. And only free "
+"software gives you the chance to do that."
 msgstr ""
 "Come si impara a scrivere buon codice per programmi grandi? Devi cominciare "
 "dal piccolo, il che non significa un programmino, oh, no! Le sfide del "
@@ -1153,6 +1999,32 @@
 "bravo programmatore, è necessario che sia una scuola con software libero. "
 
 #. type: Content of: <p>
+# | But there is an even deeper reason, and that is for the sake of moral
+# | education, education in citizenship. It's not enough for a school to teach
+# | facts and skills, it has to teach the spirit of goodwill, the habit of
+# | helping others. Therefore, every class should have this rule:
+# | &ldquo;Students, if you bring software to class, you may not keep it for
+# | yourself, you must share copies with the rest of the class, including the
+# | source code in case anyone here wants to learn[-!-]{+.+} Because this
+# | class is a place where we share our knowledge. Therefore, bringing a
+# | proprietary program to class is not permitted.&rdquo; The school must
+# | follow its own rule to set a good example. Therefore, the school must
+# | bring only free software to class, and share copies, including the source
+# | code, with anyone in the class that wants copies.
+#, fuzzy
+#| msgid ""
+#| "But there is an even deeper reason, and that is for the sake of moral "
+#| "education, education in citizenship. It's not enough for a school to "
+#| "teach facts and skills, it has to teach the spirit of goodwill, the habit "
+#| "of helping others. Therefore, every class should have this rule: &ldquo;"
+#| "Students, if you bring software to class, you may not keep it for "
+#| "yourself, you must share copies with the rest of the class, including the "
+#| "source code in case anyone here wants to learn! Because this class is a "
+#| "place where we share our knowledge. Therefore, bringing a proprietary "
+#| "program to class is not permitted.&rdquo; The school must follow its own "
+#| "rule to set a good example. Therefore, the school must bring only free "
+#| "software to class, and share copies, including the source code, with "
+#| "anyone in the class that wants copies."
 msgid ""
 "But there is an even deeper reason, and that is for the sake of moral "
 "education, education in citizenship. It's not enough for a school to teach "
@@ -1160,7 +2032,7 @@
 "helping others. Therefore, every class should have this rule: &ldquo;"
 "Students, if you bring software to class, you may not keep it for yourself, "
 "you must share copies with the rest of the class, including the source code "
-"in case anyone here wants to learn! Because this class is a place where we "
+"in case anyone here wants to learn. Because this class is a place where we "
 "share our knowledge. Therefore, bringing a proprietary program to class is "
 "not permitted.&rdquo; The school must follow its own rule to set a good "
 "example. Therefore, the school must bring only free software to class, and "
@@ -1181,29 +2053,42 @@
 "copie all'interno della classe. "
 
 #. type: Content of: <p>
-msgid ""
-"Those of you who have a connection with a school, it's your duty to campaign "
-"and pressure that school to move to free software. And you have to be firm. "
-"It may take years, but you can succeed as long as you never give up. Keep "
-"seeking more allies among the students, the faculty, the staff, the parents, "
-"anyone!"
-msgstr ""
-"Chiunque tra voi abbia una connessione con una scuola dovrebbe intervenire "
-"ed esercitare pressione su quella scuola affinché adotti software libero. E "
-"dovete essere risoluti. Potrebbero volerci anni, ma il successo è possibile "
-"se non vi arrendete. Cercate alleati tra gli studenti, il corpo docente, il "
-"personale, i genitori, chiunque! "
-
-#. type: Content of: <p>
-msgid ""
-"And always bring it up as an ethical issue. If someone else wants to "
-"sidetrack the discussion into this practical advantage and this practical "
-"disadvantage, which means they're ignoring the most important question, then "
-"you have to say: &ldquo;this is not about how to do the best job of "
-"educating, this is about how to do a good education instead of an evil one. "
-"It's how to do education right instead of wrong, not just how to make it a "
-"little more effective, or less.&rdquo; So don't get distracted with those "
-"secondary issues, and ignore what really matters!"
+# | {+Those of you who have a connection with a school, it's <em>your</em>
+# | duty to campaign and pressure that school to move to free software. And
+# | you have to be firm. It may take years, but you can succeed as long as you
+# | never give up. Keep seeking more allies among the students, the faculty,
+# | the staff, the parents, anyone!+} And always bring it up as an ethical
+# | issue. If someone else wants to sidetrack the discussion into this
+# | practical advantage and this practical disadvantage, which means they're
+# | ignoring the most important question, then you have to say:
+# | &ldquo;[-t-]{+T+}his is not about how to do the best job of educating,
+# | this is about how to do a good education instead of an evil one. It's how
+# | to do education right instead of wrong, not just how to make it a little
+# | more effective, or less.&rdquo; So don't get distracted with those
+# | secondary issues, and ignore what really matters!
+#, fuzzy
+#| msgid ""
+#| "And always bring it up as an ethical issue. If someone else wants to "
+#| "sidetrack the discussion into this practical advantage and this practical "
+#| "disadvantage, which means they're ignoring the most important question, "
+#| "then you have to say: &ldquo;this is not about how to do the best job of "
+#| "educating, this is about how to do a good education instead of an evil "
+#| "one. It's how to do education right instead of wrong, not just how to "
+#| "make it a little more effective, or less.&rdquo; So don't get distracted "
+#| "with those secondary issues, and ignore what really matters!"
+msgid ""
+"Those of you who have a connection with a school, it's <em>your</em> duty to "
+"campaign and pressure that school to move to free software. And you have to "
+"be firm. It may take years, but you can succeed as long as you never give "
+"up. Keep seeking more allies among the students, the faculty, the staff, the "
+"parents, anyone! And always bring it up as an ethical issue. If someone else "
+"wants to sidetrack the discussion into this practical advantage and this "
+"practical disadvantage, which means they're ignoring the most important "
+"question, then you have to say: &ldquo;This is not about how to do the best "
+"job of educating, this is about how to do a good education instead of an "
+"evil one. It's how to do education right instead of wrong, not just how to "
+"make it a little more effective, or less.&rdquo; So don't get distracted "
+"with those secondary issues, and ignore what really matters!"
 msgstr ""
 "E parlatene sempre come di una questione etica. Se qualcuno vuole deviare la "
 "discussione  parlando dei vantaggi e degli svantaggi pratici, nei fatti sta "
@@ -1219,9 +2104,18 @@
 msgstr "Servizi internet"
 
 #. type: Content of: <p>
+# | So, moving on to the next menace. There are two issues that arise from the
+# | use of [-i-]{+I+}nternet services. One of them is that the server could
+# | abuse your data, and another is that it could take control of your
+# | computing.
+#, fuzzy
+#| msgid ""
+#| "So, moving on to the next menace. There are two issues that arise from "
+#| "the use of internet services. One of them is that the server could abuse "
+#| "your data, and another is that it could take control of your computing."
 msgid ""
 "So, moving on to the next menace. There are two issues that arise from the "
-"use of internet services. One of them is that the server could abuse your "
+"use of Internet services. One of them is that the server could abuse your "
 "data, and another is that it could take control of your computing."
 msgstr ""
 "Passando oltre, ci sono due problematiche che sorgono dall'utilizzo dei "
@@ -1229,9 +2123,23 @@
 "dati, un'altra è che potrebbe assumere il controllo del tuo computer. "
 
 #. type: Content of: <p>
+# | The first issue, people already know about. They are aware that, if you
+# | upload data to an [-i-]{+I+}nternet service, there is a question of what
+# | it will do with that data. It might do things that mistreat you. What
+# | could it do? It could lose the data, it could change the data, it could
+# | refuse to let you get the data back. And it could also show the data to
+# | someone else you don't want to show it to. Four different possible things.
+#, fuzzy
+#| msgid ""
+#| "The first issue, people already know about. They are aware that, if you "
+#| "upload data to an internet service, there is a question of what it will "
+#| "do with that data. It might do things that mistreat you. What could it "
+#| "do? It could lose the data, it could change the data, it could refuse to "
+#| "let you get the data back. And it could also show the data to someone "
+#| "else you don't want to show it to. Four different possible things."
 msgid ""
 "The first issue, people already know about. They are aware that, if you "
-"upload data to an internet service, there is a question of what it will do "
+"upload data to an Internet service, there is a question of what it will do "
 "with that data. It might do things that mistreat you. What could it do? It "
 "could lose the data, it could change the data, it could refuse to let you "
 "get the data back. And it could also show the data to someone else you don't "
@@ -1245,20 +2153,54 @@
 "Quattro diverse possibilità. "
 
 #. type: Content of: <p>
-msgid ""
-"Now, here, I'm talking about the data that you knowingly gave to that site. "
-"Of course, many of those services do <em>surveillance</em> as well."
+# | Now, here, I'm talking about the data that you [-knowingly-]
+# | {+<em>knowingly</em>+} gave to that site. Of course, many of those
+# | services do <em>surveillance</em> as well.
+#, fuzzy
+#| msgid ""
+#| "Now, here, I'm talking about the data that you knowingly gave to that "
+#| "site. Of course, many of those services do <em>surveillance</em> as well."
+msgid ""
+"Now, here, I'm talking about the data that you <em>knowingly</em> gave to "
+"that site. Of course, many of those services do <em>surveillance</em> as "
+"well."
 msgstr ""
 "Adesso, sto parlando dei dati che consapevolmente hai fornito ad un sito. "
 "Naturalmente, molti di questi servizi potrebbero anche <em>sorvegliarti</"
 "em>. "
 
 #. type: Content of: <p>
+# | For instance, consider Facebook. Users send lots of data to Facebook, and
+# | one of the bad things about Facebook is that it shows a lot of that data
+# | to lots of other people, and even if it offers them a setting to say
+# | [-&ldquo;no!&rdquo;,-] {+&ldquo;no,&rdquo;+} that may not really work.
+# | After all, if you say &ldquo;some other people can see this piece of
+# | information,&rdquo; one of them might publish it. Now, that's not
+# | Facebook's fault, there is nothing they could do to prevent that, but it
+# | ought to warn people. Instead of saying &ldquo;mark this as only to your
+# | so-called friends,&rdquo; it should say &ldquo;keep in mind that your
+# | so-called friends are not really your friends, and if they want to make
+# | trouble for you, they could publish this.&rdquo; Every time, it should say
+# | that, if they want to deal with people ethically.
+#, fuzzy
+#| msgid ""
+#| "For instance, consider Facebook. Users send lots of data to Facebook, and "
+#| "one of the bad things about Facebook is that it shows a lot of that data "
+#| "to lots of other people, and even if it offers them a setting to say "
+#| "&ldquo;no!&rdquo;, that may not really work. After all, if you say &ldquo;"
+#| "some other people can see this piece of information,&rdquo; one of them "
+#| "might publish it. Now, that's not Facebook's fault, there is nothing they "
+#| "could do to prevent that, but it ought to warn people. Instead of saying "
+#| "&ldquo;mark this as only to your so-called friends,&rdquo; it should say "
+#| "&ldquo;keep in mind that your so-called friends are not really your "
+#| "friends, and if they want to make trouble for you, they could publish "
+#| "this.&rdquo; Every time, it should say that, if they want to deal with "
+#| "people ethically."
 msgid ""
 "For instance, consider Facebook. Users send lots of data to Facebook, and "
 "one of the bad things about Facebook is that it shows a lot of that data to "
-"lots of other people, and even if it offers them a setting to say &ldquo;no!"
-"&rdquo;, that may not really work. After all, if you say &ldquo;some other "
+"lots of other people, and even if it offers them a setting to say &ldquo;no,"
+"&rdquo; that may not really work. After all, if you say &ldquo;some other "
 "people can see this piece of information,&rdquo; one of them might publish "
 "it. Now, that's not Facebook's fault, there is nothing they could do to "
 "prevent that, but it ought to warn people. Instead of saying &ldquo;mark "
@@ -1281,11 +2223,23 @@
 "modo etico con le persone. "
 
 #. type: Content of: <p>
+# | As well as all the data users of Facebook voluntarily give to Facebook,
+# | Facebook is collecting [-through-] data about people's activities on the
+# | net through various methods of surveillance. But [-for-] {+that's the
+# | first menace. For+} now I am talking about the data that people
+# | <em>know</em> they are giving to these sites.
+#, fuzzy
+#| msgid ""
+#| "As well as all the data users of Facebook voluntarily give to Facebook, "
+#| "Facebook is collecting through data about people's activities on the net "
+#| "through various methods of surveillance. But for now I am talking about "
+#| "the data that people <em>know</em> they are giving to these sites."
 msgid ""
 "As well as all the data users of Facebook voluntarily give to Facebook, "
-"Facebook is collecting through data about people's activities on the net "
-"through various methods of surveillance. But for now I am talking about the "
-"data that people <em>know</em> they are giving to these sites."
+"Facebook is collecting data about people's activities on the net through "
+"various methods of surveillance. But that's the first menace. For now I am "
+"talking about the data that people <em>know</em> they are giving to these "
+"sites."
 msgstr ""
 "Siccome tutti gli utenti affidano volontariamente i loro dati a Facebook, "
 "Facebook raccoglie attraverso i dati sulle attività in rete delle persone "
@@ -1293,8 +2247,21 @@
 "persone <em>sanno</em> che stanno dando a questi siti. "
 
 #. type: Content of: <p>
+# | [-Losing-]{+Now, losing+} data is something that could always happen by
+# | accident.  That possibility is always there, no matter how careful someone
+# | is.  Therefore, you need to keep multiple copies of data that matters. If
+# | you do that, then, even if someone decided to delete your data
+# | intentionally, it wouldn't hurt you that much, because you'd have other
+# | copies of it.
+#, fuzzy
+#| msgid ""
+#| "Losing data is something that could always happen by accident. That "
+#| "possibility is always there, no matter how careful someone is.  "
+#| "Therefore, you need to keep multiple copies of data that matters. If you "
+#| "do that, then, even if someone decided to delete your data intentionally, "
+#| "it wouldn't hurt you that much, because you'd have other copies of it."
 msgid ""
-"Losing data is something that could always happen by accident. That "
+"Now, losing data is something that could always happen by accident.  That "
 "possibility is always there, no matter how careful someone is.  Therefore, "
 "you need to keep multiple copies of data that matters. If you do that, then, "
 "even if someone decided to delete your data intentionally, it wouldn't hurt "
@@ -1323,21 +2290,25 @@
 "inserito al loro interno. Facebook, notoriamente, no. "
 
 #. type: Content of: <p>
+# | {+Of course in the case of Google, this only applies to the data the user
+# | <em>knows</em> Google has. Google does lots of surveillance, too, and that
+# | data is not included.+} But in any case, if you can get the data back,
+# | then you could track whether they have altered it. And [-they are-]
+# | {+they're+} not very likely to start altering people's data if the people
+# | can tell. So maybe we can keep a track on that particular kind of abuse.
+#, fuzzy
+#| msgid ""
+#| "But in any case, if you can get the data back, then you could track "
+#| "whether they have altered it. And they are not very likely to start "
+#| "altering people's data if the people can tell. So maybe we can keep a "
+#| "track on that particular kind of abuse."
 msgid ""
 "Of course in the case of Google, this only applies to the data the user "
 "<em>knows</em> Google has. Google does lots of surveillance, too, and that "
-"data is not included."
-msgstr ""
-"Ovviamente, nel caso di Google, questo si applica solo ai dati che l'utente "
-"<em>sa</em> che Google ha. Anche Google esercita parecchia sorveglianza, e "
-"quei dati non sono inclusi. "
-
-#. type: Content of: <p>
-msgid ""
-"But in any case, if you can get the data back, then you could track whether "
-"they have altered it. And they are not very likely to start altering "
-"people's data if the people can tell. So maybe we can keep a track on that "
-"particular kind of abuse."
+"data is not included. But in any case, if you can get the data back, then "
+"you could track whether they have altered it. And they're not very likely to "
+"start altering people's data if the people can tell. So maybe we can keep a "
+"track on that particular kind of abuse."
 msgstr ""
 "Ma comunque, se si possono avere nuovamente i dati, allora si potrebbe "
 "controllare se sono stati alterati. E non è molto probabile che si mettano "
@@ -1345,6 +2316,35 @@
 "possiamo mantenere un controllo su quel particolare tipo di abusi. "
 
 #. type: Content of: <p>
+# | But the abuse of showing the data to someone you don't want it to be shown
+# | to is very common and almost impossible for you to prevent, especially if
+# | it's a US company. You see, the most hypocritically named law in US
+# | history, the so-called USA Patriot Act, says that Big Brother's police can
+# | collect just about all the data that companies maintain about individuals.
+# | Not just companies, but other organizations too, like public libraries.
+# | The police can get this massively, without even going to court. Now, in a
+# | country that was founded on an idea of freedom, [-there is-] {+there's+}
+# | nothing more unpatriotic than this. But this is what they did. So you
+# | mustn't ever trust any of your data to a US company.  And they say that
+# | foreign subsidiaries of US companies are subject to this as [-well, so-]
+# | {+well. So+} the company [-you are-] {+you're+} directly dealing with may
+# | be in Europe, but if it's owned by a US company, [-you-] {+you've+} got
+# | the same problem to deal with.
+#, fuzzy
+#| msgid ""
+#| "But the abuse of showing the data to someone you don't want it to be "
+#| "shown to is very common and almost impossible for you to prevent, "
+#| "especially if it's a US company. You see, the most hypocritically named "
+#| "law in US history, the so-called USA Patriot Act, says that Big Brother's "
+#| "police can collect just about all the data that companies maintain about "
+#| "individuals. Not just companies, but other organizations too, like public "
+#| "libraries. The police can get this massively, without even going to "
+#| "court. Now, in a country that was founded on an idea of freedom, there is "
+#| "nothing more unpatriotic than this. But this is what they did. So you "
+#| "mustn't ever trust any of your data to a US company.  And they say that "
+#| "foreign subsidiaries of US companies are subject to this as well, so the "
+#| "company you are directly dealing with may be in Europe, but if it's owned "
+#| "by a US company, you got the same problem to deal with."
 msgid ""
 "But the abuse of showing the data to someone you don't want it to be shown "
 "to is very common and almost impossible for you to prevent, especially if "
@@ -1353,11 +2353,11 @@
 "just about all the data that companies maintain about individuals. Not just "
 "companies, but other organizations too, like public libraries. The police "
 "can get this massively, without even going to court. Now, in a country that "
-"was founded on an idea of freedom, there is nothing more unpatriotic than "
+"was founded on an idea of freedom, there's nothing more unpatriotic than "
 "this. But this is what they did. So you mustn't ever trust any of your data "
 "to a US company.  And they say that foreign subsidiaries of US companies are "
-"subject to this as well, so the company you are directly dealing with may be "
-"in Europe, but if it's owned by a US company, you got the same problem to "
+"subject to this as well. So the company you're directly dealing with may be "
+"in Europe, but if it's owned by a US company, you've got the same problem to "
 "deal with."
 msgstr ""
 "Purtroppo, l'abuso di visualizzare i dati a qualcuno a cui non vogliamo che "
@@ -1377,13 +2377,29 @@
 "problema. "
 
 #. type: Content of: <p>
+# | However, this is mainly [-a-] {+of+} concern when the data [-you are-]
+# | {+you're+} sending to the service is not for publication. There are some
+# | services where you publish things. Of course, if you publish something,
+# | you know everybody is gonna be able to see it. So, there is no way they
+# | can hurt you by showing it to somebody who wasn't supposed to see it.
+# | There is nobody who wasn't supposed to see it{+,+} if you [-publish-]
+# | {+published+} it. So in that case the problem doesn't exist.
+#, fuzzy
+#| msgid ""
+#| "However, this is mainly a concern when the data you are sending to the "
+#| "service is not for publication. There are some services where you publish "
+#| "things. Of course, if you publish something, you know everybody is gonna "
+#| "be able to see it. So, there is no way they can hurt you by showing it to "
+#| "somebody who wasn't supposed to see it. There is nobody who wasn't "
+#| "supposed to see it if you publish it. So in that case the problem doesn't "
+#| "exist."
 msgid ""
-"However, this is mainly a concern when the data you are sending to the "
+"However, this is mainly of concern when the data you're sending to the "
 "service is not for publication. There are some services where you publish "
 "things. Of course, if you publish something, you know everybody is gonna be "
 "able to see it. So, there is no way they can hurt you by showing it to "
 "somebody who wasn't supposed to see it. There is nobody who wasn't supposed "
-"to see it if you publish it. So in that case the problem doesn't exist."
+"to see it, if you published it. So in that case the problem doesn't exist."
 msgstr ""
 "Tuttavia, questo è essenzialmente un problema quando i dati che si sta "
 "inviando al servizio non sono da rendere pubblici. Ci sono alcuni servizi in "
@@ -1410,9 +2426,17 @@
 "gli stessi diritti di cui godresti tradizionalmente nel mondo reale. "
 
 #. type: Content of: <p>
+# | The point here and in so many other issues is: as we start doing things
+# | digitally instead of physically, we shouldn't lose any of our
+# | rights[-,-]{+;+} because the general tendency is that we do lose rights.
+#, fuzzy
+#| msgid ""
+#| "The point here and in so many other issues is: as we start doing things "
+#| "digitally instead of physically, we shouldn't lose any of our rights, "
+#| "because the general tendency is that we do lose rights."
 msgid ""
 "The point here and in so many other issues is: as we start doing things "
-"digitally instead of physically, we shouldn't lose any of our rights, "
+"digitally instead of physically, we shouldn't lose any of our rights; "
 "because the general tendency is that we do lose rights."
 msgstr ""
 "Il punto qui e in molte altre questioni è che nel momento in cui iniziamo a "
@@ -1439,11 +2463,27 @@
 "e sapranno approfittarne se questo è il loro generale desiderio."
 
 #. type: Content of: <p>
+# | But the other issue with [-i-]{+I+}nternet services is that they can take
+# | control of your computing, and that's not so commonly known. But It's
+# | becoming more common. There are services that offer to do computing for
+# | you on data supplied by you&mdash;things that you should do [-o-]{+i+}n
+# | your own computer but they invite you to let somebody else's computer do
+# | that computing work for you. And the result is you lose control over it.
+# | It's just as if you used a nonfree program.
+#, fuzzy
+#| msgid ""
+#| "But the other issue with internet services is that they can take control "
+#| "of your computing, and that's not so commonly known. But It's becoming "
+#| "more common. There are services that offer to do computing for you on "
+#| "data supplied by you&mdash;things that you should do on your own computer "
+#| "but they invite you to let somebody else's computer do that computing "
+#| "work for you. And the result is you lose control over it. It's just as if "
+#| "you used a nonfree program."
 msgid ""
-"But the other issue with internet services is that they can take control of "
+"But the other issue with Internet services is that they can take control of "
 "your computing, and that's not so commonly known. But It's becoming more "
 "common. There are services that offer to do computing for you on data "
-"supplied by you&mdash;things that you should do on your own computer but "
+"supplied by you&mdash;things that you should do in your own computer but "
 "they invite you to let somebody else's computer do that computing work for "
 "you. And the result is you lose control over it. It's just as if you used a "
 "nonfree program."
@@ -1457,14 +2497,31 @@
 "fosse stato utilizzato un programma non libero. "
 
 #. type: Content of: <p>
+# | Two different scenarios but they lead to the same problem. If you do your
+# | computing with a nonfree [-program&mdash;well,-] {+program&hellip; well,+}
+# | the users don't control the nonfree program, it controls the users, which
+# | would include you. So you've lost control of the computing that's being
+# | done. But if you do your computing in his [-server&mdash;well,-]
+# | {+server&hellip; well,+} the programs that are doing it are the ones he
+# | chose. You can't touch them or see them, so you have no control over them.
+# | He has control over [-them&mdash;maybe.-] {+them, maybe.+}
+#, fuzzy
+#| msgid ""
+#| "Two different scenarios but they lead to the same problem. If you do your "
+#| "computing with a nonfree program&mdash;well, the users don't control the "
+#| "nonfree program, it controls the users, which would include you. So "
+#| "you've lost control of the computing that's being done. But if you do "
+#| "your computing in his server&mdash;well, the programs that are doing it "
+#| "are the ones he chose. You can't touch them or see them, so you have no "
+#| "control over them. He has control over them&mdash;maybe."
 msgid ""
 "Two different scenarios but they lead to the same problem. If you do your "
-"computing with a nonfree program&mdash;well, the users don't control the "
+"computing with a nonfree program&hellip; well, the users don't control the "
 "nonfree program, it controls the users, which would include you. So you've "
 "lost control of the computing that's being done. But if you do your "
-"computing in his server&mdash;well, the programs that are doing it are the "
+"computing in his server&hellip; well, the programs that are doing it are the "
 "ones he chose. You can't touch them or see them, so you have no control over "
-"them. He has control over them&mdash;maybe."
+"them. He has control over them, maybe."
 msgstr ""
 "Due scenari differenti ma che conducono allo stesso problema. Se fate il "
 "vostro lavoro al computer con un programma non libero - bene, gli utenti non "
@@ -1488,11 +2545,21 @@
 "elaborazioni effettuate sul server. Né lui, né voi avete il controllo. "
 
 #. type: Content of: <p>
+# | But suppose he installs a free program, then he has control over the
+# | computing being done in his computer, but you don't. So, either way, [-you
+# | don't!-] {+<em>you don't!</em>+} So the only way to have control over your
+# | computing is to do it with <em>your copy</em> of a free program.
+#, fuzzy
+#| msgid ""
+#| "But suppose he installs a free program, then he has control over the "
+#| "computing being done in his computer, but you don't. So, either way, you "
+#| "don't! So the only way to have control over your computing is to do it "
+#| "with <em>your copy</em> of a free program."
 msgid ""
 "But suppose he installs a free program, then he has control over the "
-"computing being done in his computer, but you don't. So, either way, you "
-"don't! So the only way to have control over your computing is to do it with "
-"<em>your copy</em> of a free program."
+"computing being done in his computer, but you don't. So, either way, <em>you "
+"don't!</em> So the only way to have control over your computing is to do it "
+"with <em>your copy</em> of a free program."
 msgstr ""
 "Ma immaginiamo che questa persona installi un programma libero. Egli "
 "acquisisce controllo sulle elaborazioni effettuate sul proprio computer, ma "
@@ -1501,8 +2568,24 @@
 "del programma libero. "
 
 #. type: Content of: <p>
+# | This practice is called &ldquo;Software as a [-Service&rdquo;.-]
+# | {+Service.&rdquo;+} It means doing your computing with your data in
+# | somebody else's server. And I don't know of anything that can make this
+# | acceptable. It's always something that takes away your freedom, and the
+# | only solution I know of is to refuse. For instance, there are servers that
+# | will do translation or voice recognition, and you are letting them have
+# | control over this computing activity, which we shouldn't ever do.
+#, fuzzy
+#| msgid ""
+#| "This practice is called &ldquo;Software as a Service&rdquo;. It means "
+#| "doing your computing with your data in somebody else's server. And I "
+#| "don't know of anything that can make this acceptable. It's always "
+#| "something that takes away your freedom, and the only solution I know of "
+#| "is to refuse. For instance, there are servers that will do translation or "
+#| "voice recognition, and you are letting them have control over this "
+#| "computing activity, which we shouldn't ever do."
 msgid ""
-"This practice is called &ldquo;Software as a Service&rdquo;. It means doing "
+"This practice is called &ldquo;Software as a Service.&rdquo; It means doing "
 "your computing with your data in somebody else's server. And I don't know of "
 "anything that can make this acceptable. It's always something that takes "
 "away your freedom, and the only solution I know of is to refuse. For "
@@ -1519,13 +2602,28 @@
 "controllare questa attività di elaborazione. Ciò non dovrebbe mai accadere. 
"
 
 #. type: Content of: <p>
+# | Of course, we are also giving them data about ourselves which they
+# | shouldn't have. Imagine if you had a conversation with somebody through a
+# | voice-recognition translation system that was Software as as Service and
+# | it's really running on a server belonging to some company. [-That-]
+# | {+Well, that+} company also gets to know what was said in the
+# | conversation, and if it's a US company that means Big Brother also gets to
+# | know. This is no good.
+#, fuzzy
+#| msgid ""
+#| "Of course, we are also giving them data about ourselves which they "
+#| "shouldn't have. Imagine if you had a conversation with somebody through a "
+#| "voice-recognition translation system that was Software as as Service and "
+#| "it's really running on a server belonging to some company. That company "
+#| "also gets to know what was said in the conversation, and if it's a US "
+#| "company that means Big Brother also gets to know. This is no good."
 msgid ""
 "Of course, we are also giving them data about ourselves which they shouldn't "
 "have. Imagine if you had a conversation with somebody through a voice-"
 "recognition translation system that was Software as as Service and it's "
-"really running on a server belonging to some company. That company also gets "
-"to know what was said in the conversation, and if it's a US company that "
-"means Big Brother also gets to know. This is no good."
+"really running on a server belonging to some company. Well, that company "
+"also gets to know what was said in the conversation, and if it's a US "
+"company that means Big Brother also gets to know. This is no good."
 msgstr ""
 "Ovviamente, stiamo fornendo loro dei dati su noi stessi che non dovrebbero "
 "avere. Immagina di conversare con qualcuno attraverso un sistema di "
@@ -1535,54 +2633,47 @@
 "conservazione. Se è un'azienda statunitense ciò significa che anche il "
 "Grande Fratello ne verrà a conoscenza. Questo non è positivo. "
 
+#. type: Content of: <h3>
+msgid "Computers for voting"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "The next threat to our freedom in a digital society is using computers for "
 "voting. You can't trust computers for voting. Whoever controls the software "
-"in those computers has the power to commit undetectable fraud. Elections are "
-"special. Because there's nobody involved that we dare trust fully. Everybody "
-"has to be checked, crosschecked by others, so that nobody is in the position "
-"to falsify the results by himself. Because if anybody is in a position to do "
-"that, he might do it! So our traditional systems for voting were designed so "
-"that nobody was fully trusted, everybody was being checked by others. So "
-"that nobody could easily commit fraud. But once you introduce a program, "
-"this is impossible! How can you tell if a voting machine would honestly "
-"count the votes? You'd have to study the program that's running in it during "
-"the election, which of course nobody can do, and most people wouldn't even "
-"know how to do. But even the experts who might theoretically be capable of "
-"studying the program, they can't do it while people are voting. They'd have "
-"to do it in advance, and then how do they know that the program they studied "
-"is the one that's running while pople vote? Maybe it's been changed. Now, if "
-"this program is proprietary, that means some company controls it. The "
-"election authority can't even tell what that program is doing. Well, this "
-"company then could rig the election.  There are accusations that this was "
-"done in the US in the past ten years, that election results were falsified "
-"this way."
-msgstr ""
-"La minaccia successiva alla nostra libertà nella società digitale è l'uso "
-"dei computer per le elezioni. Non potete fidarvi delle macchine quando si "
-"tratta di votare. Chiunque controlli il software in questi computer ha il "
-"potere di mettere in pratica una frode non rilevabile. Le elezioni sono "
-"importanti. Perché non possiamo fidarci di nessuno che sia coinvolto. "
-"Chiunque deve essere controllato e ricontrollato da altri, in modo che "
-"nessuno sia in grado, da solo, di falsificare il risultato.Perché, chiunque "
-"fosse in grado di farlo potrebbe farlo. Ecco perché il nostro sistema di "
-"voto tradizionale fu designato affinché nessuno fosse degno di fiducia fino "
-"in fondo, tutti devono essere controllati dagli altri. In questo modo, "
-"nessuno può facilmente commettere frodi. Ma se le elezioni sono affidate ad "
-"un programma, questo controllo è impossibile! Come puoi essere sicuro che "
-"una macchina elettorale conti onestamente i voti? Dovresti studiare il "
-"programma in esecuzione durante le elezioni, cosa che ovviamente nessuno "
-"può, e che molti non saprebbero, fare. Ma anche gli esperti che potrebbero "
-"teoricamente essere capaci di studiare il programma, non possono farlo "
-"mentre la gente sta votando. Dovrebbero farlo in anticipo, ma come "
-"potrebbero essere sicuri che il programma da loro studiato è lo stesso in "
-"esecuzione durante le operazioni di voto? Potrebbe essere stato cambiato. "
-"Adesso, se il programma è proprietario, ciò significa che è controllato da 
"
-"qualche azienda. L'autorità elettorale non può neanche sapere cosa quel "
-"programma stia facendo. Questa azienda potrebbe manipolare le elezioni. Vi "
-"sono accuse che ciò sia stato fatto negli Stati Uniti durante gli ultimi 10 "
-"anni. "
+"in those computers has the power to commit undetectable fraud."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Elections are special, because there's nobody involved that we dare trust "
+"fully. Everybody has to be checked, crosschecked by others, so that nobody "
+"is in a position to falsify the results by himself. Because if anybody is in "
+"a position to do that, he might do it. So our traditional systems for voting "
+"were designed so that nobody was fully trusted, everybody was being checked "
+"by others. So that nobody could easily commit fraud. But once you introduce "
+"a program, this is impossible."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"How can you tell if a voting machine will honestly count the votes? You'd "
+"have to study the program that's running in it during the election, which of "
+"course nobody can do, and most people wouldn't even know how to do. But even "
+"the experts who might theoretically be capable of studying the program, they "
+"can't do it while people are voting.  They'd have to do it in advance, and "
+"then how do they know that the program they studied is the one that's "
+"running while people vote? Maybe it's been changed."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Now, if this program is proprietary, that means some company controls it. "
+"The election authority can't even tell what that program is doing. Well, "
+"this company then could rig the election.  And there are accusations that "
+"this was done in the US within the past ten years, that election results "
+"were falsified this way."
+msgstr ""
 
 #. type: Content of: <p>
 msgid ""
@@ -1602,12 +2693,29 @@
 "né essere sicuri che nessun falso voto sia stato aggiunto. "
 
 #. type: Content of: <p>
+# | In other activities of life, you can usually tell if somebody is trying to
+# | cheat you. Consider for instance buying something from a store. You order
+# | something, maybe you give a credit card number. If the product doesn't
+# | come, you can complain and you [-can&mdash;of-] {+can&hellip; of+} course
+# | if [-you-] {+you've+} got a good enough memory [-you will&mdash;notice-]
+# | {+you'll notice+} if that product doesn't come. You're not just giving
+# | total blind trust to the store, because you can check. But in elections
+# | you can't check.
+#, fuzzy
+#| msgid ""
+#| "In other activities of life, you can usually tell if somebody is trying "
+#| "to cheat you. Consider for instance buying something from a store. You "
+#| "order something, maybe you give a credit card number. If the product "
+#| "doesn't come, you can complain and you can&mdash;of course if you got a "
+#| "good enough memory you will&mdash;notice if that product doesn't come.  "
+#| "You're not just giving total blind trust to the store, because you can "
+#| "check. But in elections you can't check."
 msgid ""
 "In other activities of life, you can usually tell if somebody is trying to "
 "cheat you. Consider for instance buying something from a store. You order "
 "something, maybe you give a credit card number. If the product doesn't come, "
-"you can complain and you can&mdash;of course if you got a good enough memory "
-"you will&mdash;notice if that product doesn't come.  You're not just giving "
+"you can complain and you can&hellip; of course if you've got a good enough "
+"memory you'll notice if that product doesn't come. You're not just giving "
 "total blind trust to the store, because you can check. But in elections you "
 "can't check."
 msgstr ""
@@ -1620,9 +2728,37 @@
 "non puoi farlo. "
 
 #. type: Content of: <p>
+# | I saw once a paper where someone described a theoretical system for voting
+# | which use[-s-]{+d+} some sophisticated mathematics so that people could
+# | check that their votes had been counted, even though everybody's vote was
+# | secret, and they could also verify that false votes hadn't been added. It
+# | was very exciting, powerful mathematics; but even if that mathematics is
+# | correct, that doesn't mean the system would be acceptable to use in
+# | practice, because the vulnerabilities of a real system might be outside of
+# | that mathematics. For instance, suppose you're voting over the Internet
+# | and suppose you're using a machine that's a zombie. It might tell you that
+# | the vote was sent for A while actually sending a vote for B. Who knows
+# | whether you'd ever find out? [-In practice,-] {+So, in practice+} the only
+# | way to see if these systems work and are honest is through years, in fact
+# | decades, of trying them and checking in other ways what happened.
+#, fuzzy
+#| msgid ""
+#| "I saw once a paper where someone described a theoretical system for "
+#| "voting which uses some sophisticated mathematics so that people could "
+#| "check that their votes had been counted, even though everybody's vote was "
+#| "secret, and they could also verify that false votes hadn't been added. It "
+#| "was very exciting, powerful mathematics; but even if that mathematics is "
+#| "correct, that doesn't mean the system would be acceptable to use in "
+#| "practice, because the vulnerabilities of a real system might be outside "
+#| "of that mathematics. For instance, suppose you're voting over the "
+#| "Internet and suppose you're using a machine that's a zombie. It might "
+#| "tell you that the vote was sent for A while actually sending a vote for "
+#| "B. Who knows whether you'd ever find out? In practice, the only way to "
+#| "see if these systems work and are honest is through years, in fact "
+#| "decades, of trying them and checking in other ways what happened."
 msgid ""
 "I saw once a paper where someone described a theoretical system for voting "
-"which uses some sophisticated mathematics so that people could check that "
+"which used some sophisticated mathematics so that people could check that "
 "their votes had been counted, even though everybody's vote was secret, and "
 "they could also verify that false votes hadn't been added. It was very "
 "exciting, powerful mathematics; but even if that mathematics is correct, "
@@ -1631,9 +2767,9 @@
 "For instance, suppose you're voting over the Internet and suppose you're "
 "using a machine that's a zombie. It might tell you that the vote was sent "
 "for A while actually sending a vote for B. Who knows whether you'd ever find "
-"out? In practice, the only way to see if these systems work and are honest "
-"is through years, in fact decades, of trying them and checking in other ways "
-"what happened."
+"out? So, in practice the only way to see if these systems work and are "
+"honest is through years, in fact decades, of trying them and checking in "
+"other ways what happened."
 msgstr ""
 "Una volta ho visto un articolo in cui qualcuno descriveva un sistema teorico "
 "per il voto basato su complesse basi matematiche, in modo che gli elettori "
@@ -1670,13 +2806,31 @@
 "Un altro pericolo per la nostra libertà viene dalla guerra alla 
condivisione."
 
 #. type: Content of: <p>
+# | One of the tremendous benefits of digital technology is that it is easy to
+# | copy published works and share these copies with others. Sharing is good,
+# | and with digital technology, sharing is easy. So, millions of people
+# | share. Those who profit by having power over the distribution of these
+# | works don't want us to share. And since they are businesses, governments
+# | which have betrayed their people and work for the [-e-]{+E+}mpire of
+# | mega-corporations try to serve those businesses, they are against their
+# | own people, they are for the businesses, for the publishers.
+#, fuzzy
+#| msgid ""
+#| "One of the tremendous benefits of digital technology is that it is easy "
+#| "to copy published works and share these copies with others. Sharing is "
+#| "good, and with digital technology, sharing is easy. So, millions of "
+#| "people share. Those who profit by having power over the distribution of "
+#| "these works don't want us to share. And since they are businesses, "
+#| "governments which have betrayed their people and work for the empire of "
+#| "mega-corporations try to serve those businesses, they are against their "
+#| "own people, they are for the businesses, for the publishers."
 msgid ""
 "One of the tremendous benefits of digital technology is that it is easy to "
 "copy published works and share these copies with others. Sharing is good, "
 "and with digital technology, sharing is easy. So, millions of people share. "
 "Those who profit by having power over the distribution of these works don't "
 "want us to share. And since they are businesses, governments which have "
-"betrayed their people and work for the empire of mega-corporations try to "
+"betrayed their people and work for the Empire of mega-corporations try to "
 "serve those businesses, they are against their own people, they are for the "
 "businesses, for the publishers."
 msgstr ""
@@ -1691,14 +2845,35 @@
 "imprese, degli editori. "
 
 #. type: Content of: <p>
+# | Well, that's not good. And with the help of these governments, the
+# | companies have been waging <em>war</em> on sharing, and they've proposed a
+# | series of cruel draconian measures. Why do they propose cruel draconian
+# | measures? Because nothing less has a chance of success: when something is
+# | good and easy, people do [-it. The-] {+it, and the+} only way to stop them
+# | is by being very nasty. So of course, what they propose is nasty, nasty,
+# | and the next one is nastier. So they tried suing teenagers for hundreds of
+# | thousands of [-dollars — that-] {+dollars. That+} was pretty nasty. And
+# | they tried turning our technology against us, Digital Restrictions
+# | Management that means, digital handcuffs.
+#, fuzzy
+#| msgid ""
+#| "Well, that's not good. And with the help of these governments, the "
+#| "companies have been waging <em>war</em> on sharing, and they've proposed "
+#| "a series of cruel draconian measures. Why do they propose cruel draconian "
+#| "measures? Because nothing less has a chance of success: when something is "
+#| "good and easy, people do it. The only way to stop them is by being very "
+#| "nasty. So of course, what they propose is nasty, nasty, and the next one "
+#| "is nastier. So they tried suing teenagers for hundreds of thousands of "
+#| "dollars — that was pretty nasty. And they tried turning our technology "
+#| "against us, Digital Restrictions Management that means, digital handcuffs."
 msgid ""
 "Well, that's not good. And with the help of these governments, the companies "
 "have been waging <em>war</em> on sharing, and they've proposed a series of "
 "cruel draconian measures. Why do they propose cruel draconian measures? "
 "Because nothing less has a chance of success: when something is good and "
-"easy, people do it. The only way to stop them is by being very nasty. So of "
-"course, what they propose is nasty, nasty, and the next one is nastier. So "
-"they tried suing teenagers for hundreds of thousands of dollars — that was "
+"easy, people do it, and the only way to stop them is by being very nasty. So "
+"of course, what they propose is nasty, nasty, and the next one is nastier. "
+"So they tried suing teenagers for hundreds of thousands of dollars. That was "
 "pretty nasty. And they tried turning our technology against us, Digital "
 "Restrictions Management that means, digital handcuffs."
 msgstr ""
@@ -1714,14 +2889,33 @@
 "digitali. "
 
 #. type: Content of: <p>
+# | But among the people there were clever programmers too and they found ways
+# | to break the handcuffs. [-For-] {+So for+} instance, DVDs were designed to
+# | have encrypted movies in a secret encryption format, and the idea was that
+# | all the programs to decrypt the video would be proprietary with digital
+# | handcuffs. They would all be designed to restrict the users. And their
+# | scheme worked [-okay-] {+OK+} for a while. But some people in Europe
+# | figured out the encryption and they released a free program that could
+# | actually play the video on a DVD.
+#, fuzzy
+#| msgid ""
+#| "But among the people there were clever programmers too and they found "
+#| "ways to break the handcuffs. For instance, DVDs were designed to have "
+#| "encrypted movies in a secret encryption format, and the idea was that all "
+#| "the programs to decrypt the video would be proprietary with digital "
+#| "handcuffs. They would all be designed to restrict the users. And their "
+#| "scheme worked okay for a while. But some people in Europe figured out the "
+#| "encryption and they released a free program that could actually play the "
+#| "video on a DVD."
 msgid ""
 "But among the people there were clever programmers too and they found ways "
-"to break the handcuffs. For instance, DVDs were designed to have encrypted "
-"movies in a secret encryption format, and the idea was that all the programs "
-"to decrypt the video would be proprietary with digital handcuffs. They would "
-"all be designed to restrict the users. And their scheme worked okay for a "
-"while. But some people in Europe figured out the encryption and they "
-"released a free program that could actually play the video on a DVD."
+"to break the handcuffs. So for instance, DVDs were designed to have "
+"encrypted movies in a secret encryption format, and the idea was that all "
+"the programs to decrypt the video would be proprietary with digital "
+"handcuffs. They would all be designed to restrict the users. And their "
+"scheme worked OK for a while. But some people in Europe figured out the "
+"encryption and they released a free program that could actually play the "
+"video on a DVD."
 msgstr ""
 "Tuttavia tra la gente c'erano anche dei bravi programmatori che hanno "
 "trovato il modo di spezzare le manette. Per esempio, i DVD originariamente "
@@ -1734,19 +2928,46 @@
 "riprodurre il video su un DVD. "
 
 #. type: Content of: <p>
+# | Well, the movie companies didn't leave it there. They went to the US
+# | congress and bought a law making that software illegal. The United States
+# | invented censorship of software in 1998, with the Digital Millennium
+# | Copyright Act (DMCA). So the distribution of that free program was
+# | forbidden in the United States. Unfortunately it didn't stop with the
+# | United States. The European Union adopted a directive{+,+} in 2003 {+I
+# | believe,+} requiring such laws. The directive only says that commercial
+# | distribution has to be banned, but just about every country in the
+# | European Union has adopted a nastier law. In France, the mere possession
+# | of a copy of that program is an offense punished by imprisonment, thanks
+# | to Sarkozy. I believe that was done by the law DADVSI. I guess he hoped
+# | that with an unpronounceable name, people wouldn't be able to criticize
+# | it. {+[laughter]+}
+#, fuzzy
+#| msgid ""
+#| "Well, the movie companies didn't leave it there. They went to the US "
+#| "congress and bought a law making that software illegal. The United States "
+#| "invented censorship of software in 1998, with the Digital Millennium "
+#| "Copyright Act (DMCA). So the distribution of that free program was "
+#| "forbidden in the United States. Unfortunately it didn't stop with the "
+#| "United States. The European Union adopted a directive in 2003 requiring "
+#| "such laws. The directive only says that commercial distribution has to be "
+#| "banned, but just about every country in the European Union has adopted a "
+#| "nastier law. In France, the mere possession of a copy of that program is "
+#| "an offense punished by imprisonment, thanks to Sarkozy. I believe that "
+#| "was done by the law DADVSI. I guess he hoped that with an unpronounceable "
+#| "name, people wouldn't be able to criticize it."
 msgid ""
 "Well, the movie companies didn't leave it there. They went to the US "
 "congress and bought a law making that software illegal. The United States "
 "invented censorship of software in 1998, with the Digital Millennium "
 "Copyright Act (DMCA). So the distribution of that free program was forbidden "
 "in the United States. Unfortunately it didn't stop with the United States. "
-"The European Union adopted a directive in 2003 requiring such laws. The "
-"directive only says that commercial distribution has to be banned, but just "
-"about every country in the European Union has adopted a nastier law. In "
-"France, the mere possession of a copy of that program is an offense punished "
-"by imprisonment, thanks to Sarkozy. I believe that was done by the law "
-"DADVSI. I guess he hoped that with an unpronounceable name, people wouldn't "
-"be able to criticize it."
+"The European Union adopted a directive, in 2003 I believe, requiring such "
+"laws. The directive only says that commercial distribution has to be banned, "
+"but just about every country in the European Union has adopted a nastier "
+"law. In France, the mere possession of a copy of that program is an offense "
+"punished by imprisonment, thanks to Sarkozy. I believe that was done by the "
+"law DADVSI. I guess he hoped that with an unpronounceable name, people "
+"wouldn't be able to criticize it. [laughter]"
 msgstr ""
 "Le società di film non lasciarono cadere la questione. Andarono al Congresso 
"
 "degli Stati Uniti e comprarono una legge che rendeva quel software illegale. "
@@ -1774,14 +2995,31 @@
 "recuperarlo. "
 
 #. type: Content of: <p>
-msgid ""
-"So, we still are fighting against digital handcuffs. The Amazon &ldquo;"
-"Swindle&rdquo; has digital handcuffs to take away the traditional freedoms "
-"of readers to do things such as: give a book to someone else, or lend a book "
-"to someone else. That's a vitally important social act. That is what builds "
-"society among people who read: lending books. Amazon doesn't want to let "
-"people lend books freely. And then there is also selling a book, perhaps to "
-"a used bookstore. You can't do that either."
+# | So, we still are fighting against digital handcuffs. The Amazon
+# | [-&ldquo;Swindle&rdquo;-] {+Swindle+} has digital handcuffs to take away
+# | the traditional freedoms of readers to do things such as: give a book to
+# | someone else, or lend a book to someone else. That's a vitally important
+# | social act. That is what builds society among people who read[-:-]{+,+}
+# | lending books. Amazon doesn't want to let people lend books freely. And
+# | then there is also selling a book, perhaps to a used bookstore. You can't
+# | do that either.
+#, fuzzy
+#| msgid ""
+#| "So, we still are fighting against digital handcuffs. The Amazon &ldquo;"
+#| "Swindle&rdquo; has digital handcuffs to take away the traditional "
+#| "freedoms of readers to do things such as: give a book to someone else, or "
+#| "lend a book to someone else. That's a vitally important social act. That "
+#| "is what builds society among people who read: lending books. Amazon "
+#| "doesn't want to let people lend books freely. And then there is also "
+#| "selling a book, perhaps to a used bookstore. You can't do that either."
+msgid ""
+"So, we still are fighting against digital handcuffs. The Amazon Swindle has "
+"digital handcuffs to take away the traditional freedoms of readers to do "
+"things such as: give a book to someone else, or lend a book to someone else. "
+"That's a vitally important social act. That is what builds society among "
+"people who read, lending books. Amazon doesn't want to let people lend books "
+"freely. And then there is also selling a book, perhaps to a used bookstore. "
+"You can't do that either."
 msgstr ""
 "Quindi, stiamo ancora lottando contro le manette digitali. Lo \"Swindle\" di "
 "Amazon è dotato di manette digitali per privare i lettori di libertà "
@@ -1793,18 +3031,43 @@
 "questo. "
 
 #. type: Content of: <p>
+# | It looked for a while as if DRM had disappeared on music, but now they're
+# | bringing it back with streaming services such as Spotify. These services
+# | all require proprietary client software, and the reason is so they can put
+# | digital handcuffs on the users. So, reject them! They already showed quite
+# | openly that you can't trust them, because first they said:
+# | &ldquo;[-y-]{+Y+}ou can listen as much as you [-like.&rdquo;, and-]
+# | {+like.&rdquo; And+} then they said: &ldquo;Oh, no! You can only listen a
+# | certain number of hours a month.&rdquo; The issue is not whether that
+# | particular change was good or bad, just or unjust; the point is, they have
+# | the power to impose any change in policies. So don't let them have that
+# | power. You should have your [-own-] {+<em>own</em>+} copy of any music you
+# | want to listen to.
+#, fuzzy
+#| msgid ""
+#| "It looked for a while as if DRM had disappeared on music, but now they're "
+#| "bringing it back with streaming services such as Spotify. These services "
+#| "all require proprietary client software, and the reason is so they can "
+#| "put digital handcuffs on the users. So, reject them! They already showed "
+#| "quite openly that you can't trust them, because first they said: &ldquo;"
+#| "you can listen as much as you like.&rdquo;, and then they said: &ldquo;"
+#| "Oh, no! You can only listen a certain number of hours a month.&rdquo; The "
+#| "issue is not whether that particular change was good or bad, just or "
+#| "unjust; the point is, they have the power to impose any change in "
+#| "policies. So don't let them have that power. You should have your own "
+#| "copy of any music you want to listen to."
 msgid ""
 "It looked for a while as if DRM had disappeared on music, but now they're "
 "bringing it back with streaming services such as Spotify. These services all "
 "require proprietary client software, and the reason is so they can put "
 "digital handcuffs on the users. So, reject them! They already showed quite "
-"openly that you can't trust them, because first they said: &ldquo;you can "
-"listen as much as you like.&rdquo;, and then they said: &ldquo;Oh, no! You "
+"openly that you can't trust them, because first they said: &ldquo;You can "
+"listen as much as you like.&rdquo; And then they said: &ldquo;Oh, no! You "
 "can only listen a certain number of hours a month.&rdquo; The issue is not "
 "whether that particular change was good or bad, just or unjust; the point "
 "is, they have the power to impose any change in policies. So don't let them "
-"have that power. You should have your own copy of any music you want to "
-"listen to."
+"have that power. You should have your <em>own</em> copy of any music you "
+"want to listen to."
 msgstr ""
 "Per un po', è sembrato che i DRM fossero scomparsi dalla musica, ma adesso "
 "stanno risorgendo grazie ai servizi streaming come Spotify. Questi servizi "
@@ -1819,15 +3082,33 @@
 "di avere la tua copia di tutta la musica che vuoi ascoltare. "
 
 #. type: Content of: <p>
+# | And then came the next assault on our freedom: HADOPI, basically
+# | punishment on accusation. It was started in France but it's been exported
+# | to many other countries. The United States now demand such unjust policies
+# | in its free exploitation treaties. A few months ago, Col[-u-]{+o+}mbia
+# | adopted such a law under orders from its masters in Washington.  Of
+# | course, the ones in Washington are not the real masters, they're just the
+# | ones who control the United States on behalf of the Empire. But they're
+# | the ones who also dictate to Col[-u-]{+o+}mbia on behalf of the Empire.
+#, fuzzy
+#| msgid ""
+#| "And then came the next assault on our freedom: HADOPI, basically "
+#| "punishment on accusation. It was started in France but it's been exported "
+#| "to many other countries. The United States now demand such unjust "
+#| "policies in its free exploitation treaties. A few months ago, Columbia "
+#| "adopted such a law under orders from its masters in Washington.  Of "
+#| "course, the ones in Washington are not the real masters, they're just the "
+#| "ones who control the United States on behalf of the Empire. But they're "
+#| "the ones who also dictate to Columbia on behalf of the Empire."
 msgid ""
 "And then came the next assault on our freedom: HADOPI, basically punishment "
 "on accusation. It was started in France but it's been exported to many other "
 "countries. The United States now demand such unjust policies in its free "
-"exploitation treaties. A few months ago, Columbia adopted such a law under "
+"exploitation treaties. A few months ago, Colombia adopted such a law under "
 "orders from its masters in Washington.  Of course, the ones in Washington "
 "are not the real masters, they're just the ones who control the United "
 "States on behalf of the Empire. But they're the ones who also dictate to "
-"Columbia on behalf of the Empire."
+"Colombia on behalf of the Empire."
 msgstr ""
 "Veniamo al successivo assalto alla nostra libertà: HADOPI, cioè una "
 "punizione basata sull'accusa. Ciò è iniziato in Francia, ma lo stesso "
@@ -1840,15 +3121,35 @@
 "Columbia per conto dell'Impero."
 
 #. type: Content of: <p>
+# | In France, since the Constitutional Council objected to explicit{+l+}y
+# | giving people punishment without trial, they invented a kind of trial
+# | which is not a real trial, [-which is-] {+it's+} just a form of a trial,
+# | so they can <em>pretend</em> that people have a trial before they're
+# | punished. But in other countries they don't bother with that, it's
+# | explicit punishment on accusation only. Which means that for the sake of
+# | their war on sharing, they're prepared to abolish the basic principles of
+# | justice. It shows how thoroughly anti-freedom anti-justice they are. These
+# | are not legitimate governments.
+#, fuzzy
+#| msgid ""
+#| "In France, since the Constitutional Council objected to explicity giving "
+#| "people punishment without trial, they invented a kind of trial which is "
+#| "not a real trial, which is just a form of a trial, so they can "
+#| "<em>pretend</em> that people have a trial before they're punished. But in "
+#| "other countries they don't bother with that, it's explicit punishment on "
+#| "accusation only. Which means that for the sake of their war on sharing, "
+#| "they're prepared to abolish the basic principles of justice. It shows how "
+#| "thoroughly anti-freedom anti-justice they are. These are not legitimate "
+#| "governments."
 msgid ""
-"In France, since the Constitutional Council objected to explicity giving "
+"In France, since the Constitutional Council objected to explicitly giving "
 "people punishment without trial, they invented a kind of trial which is not "
-"a real trial, which is just a form of a trial, so they can <em>pretend</em> "
-"that people have a trial before they're punished. But in other countries "
-"they don't bother with that, it's explicit punishment on accusation only. "
-"Which means that for the sake of their war on sharing, they're prepared to "
-"abolish the basic principles of justice. It shows how thoroughly anti-"
-"freedom anti-justice they are. These are not legitimate governments."
+"a real trial, it's just a form of a trial, so they can <em>pretend</em> that "
+"people have a trial before they're punished. But in other countries they "
+"don't bother with that, it's explicit punishment on accusation only. Which "
+"means that for the sake of their war on sharing, they're prepared to abolish "
+"the basic principles of justice. It shows how thoroughly anti-freedom anti-"
+"justice they are. These are not legitimate governments."
 msgstr ""
 "In Francia, da quando il Consiglio Costituzionale ha obiettato quando si "
 "trattava di punire la gente senza processo, hanno inventato una forma di "
@@ -1862,14 +3163,35 @@
 "legittimi. "
 
 #. type: Content of: <p>
+# | And I'm sure they'll come up with more nasty ideas because they're paid to
+# | defeat the people no matter what it takes. Now, when they do this, they
+# | always say that it's for the sake of the artists, that they have
+# | [-“protect”-] {+&ldquo;protect&rdquo;+} the [-“creators.”-]
+# | {+&ldquo;creators.&rdquo;+} Now those are both propaganda terms. I
+# | [-‘m-] {+am+} convinced that the reason they love the word
+# | [-“creators“-] {+&ldquo;creators&rdquo;+} is because it is a
+# | comparison with a deity. They want us to think of artists as super-human,
+# | and thus deserving special privileges and power over us, which is
+# | something I disagree with.
+#, fuzzy
+#| msgid ""
+#| "And I'm sure they'll come up with more nasty ideas because they're paid "
+#| "to defeat the people no matter what it takes. Now, when they do this, "
+#| "they always say that it's for the sake of the artists, that they have "
+#| "“protect” the “creators.” Now those are both propaganda terms. I 
‘m "
+#| "convinced that the reason they love the word “creators“ is because it 
is "
+#| "a comparison with a deity. They want us to think of artists as super-"
+#| "human, and thus deserving special privileges and power over us, which is "
+#| "something I disagree with."
 msgid ""
 "And I'm sure they'll come up with more nasty ideas because they're paid to "
 "defeat the people no matter what it takes. Now, when they do this, they "
-"always say that it's for the sake of the artists, that they have 
“protect” "
-"the “creators.” Now those are both propaganda terms. I ‘m convinced 
that the "
-"reason they love the word “creators“ is because it is a comparison with a 
"
-"deity. They want us to think of artists as super-human, and thus deserving "
-"special privileges and power over us, which is something I disagree with."
+"always say that it's for the sake of the artists, that they have &ldquo;"
+"protect&rdquo; the &ldquo;creators.&rdquo; Now those are both propaganda "
+"terms. I am convinced that the reason they love the word &ldquo;"
+"creators&rdquo; is because it is a comparison with a deity. They want us to "
+"think of artists as super-human, and thus deserving special privileges and "
+"power over us, which is something I disagree with."
 msgstr ""
 "E sono sicuro che salteranno fuori altre idee cattive, perché queste persone 
"
 "sono pagate per sconfiggere il popolo, costi quel che costi. Quando lo "
@@ -1881,13 +3203,29 @@
 "condivido questo approccio."
 
 #. type: Content of: <p>
+# | In fact [-,-] {+though,+} the only artists that benefit very much from
+# | this system are the big stars. The other artists are getting crushed into
+# | the ground by the heels of these same companies. But they treat the stars
+# | very well, because the stars have a lot of clout. If a star threatens to
+# | move to another company, the company says: &ldquo;[-o-]{+O+}h, we'll give
+# | you what you want.&rdquo; But for any other artist they say:
+# | &ldquo;[-y-]{+Y+}ou don't matter, we can treat you any way we like.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "In fact , the only artists that benefit very much from this system are "
+#| "the big stars. The other artists are getting crushed into the ground by "
+#| "the heels of these same companies. But they treat the stars very well, "
+#| "because the stars have a lot of clout. If a star threatens to move to "
+#| "another company, the company says: &ldquo;oh, we'll give you what you "
+#| "want.&rdquo; But for any other artist they say: &ldquo;you don't matter, "
+#| "we can treat you any way we like.&rdquo;"
 msgid ""
-"In fact , the only artists that benefit very much from this system are the "
-"big stars. The other artists are getting crushed into the ground by the "
+"In fact though, the only artists that benefit very much from this system are "
+"the big stars. The other artists are getting crushed into the ground by the "
 "heels of these same companies. But they treat the stars very well, because "
 "the stars have a lot of clout. If a star threatens to move to another "
-"company, the company says: &ldquo;oh, we'll give you what you want.&rdquo; "
-"But for any other artist they say: &ldquo;you don't matter, we can treat you "
+"company, the company says: &ldquo;Oh, we'll give you what you want.&rdquo; "
+"But for any other artist they say: &ldquo;You don't matter, we can treat you "
 "any way we like.&rdquo;"
 msgstr ""
 "Nei fatti, i soli artisti che traggono beneficio da questo sistema sono le "
@@ -1899,13 +3237,28 @@
 "\". "
 
 #. type: Content of: <p>
+# | So the superstars have been corrupted by the millions of dollars or euros
+# | that they get, to the point where they'll do almost anything for more
+# | money. For instance, [-J. K. Rowling-] {+J. K. Rowling+} is a good
+# | example. [-J. K.  Rowling,-] {+J. K. Rowling,+} a few years ago, went to
+# | court in Canada and obtained an order that people who had bought her books
+# | must not read them. She got an order telling people not to read her
+# | books[-.-]{+!+}
+#, fuzzy
+#| msgid ""
+#| "So the superstars have been corrupted by the millions of dollars or euros "
+#| "that they get, to the point where they'll do almost anything for more "
+#| "money. For instance, J. K. Rowling is a good example. J. K.  Rowling, a "
+#| "few years ago, went to court in Canada and obtained an order that people "
+#| "who had bought her books must not read them. She got an order telling "
+#| "people not to read her books."
 msgid ""
 "So the superstars have been corrupted by the millions of dollars or euros "
 "that they get, to the point where they'll do almost anything for more money. "
-"For instance, J. K. Rowling is a good example. J. K.  Rowling, a few years "
+"For instance, J. K. Rowling is a good example. J. K. Rowling, a few years 
"
 "ago, went to court in Canada and obtained an order that people who had "
 "bought her books must not read them. She got an order telling people not to "
-"read her books."
+"read her books!"
 msgstr ""
 "Quindi le superstar sono corrotte dai milioni di dollari che ricavano, al "
 "punto che sono disposte a fare qualunque cosa per i soldi. J. K. Rowling è "
@@ -1915,14 +3268,31 @@
 "suoi libri. "
 
 #. type: Content of: <p>
+# | Here's what happened. A bookstore put the books on display for sale too
+# | early, before the [-day-] {+date+} they were supposed to go on sale. And
+# | people came into the store and said: &ldquo;[-o-]{+O+}h, I want
+# | that!&rdquo; [-a-]{+A+}nd they bought it and took away their copies.
+# | [-Then,-] {+And then,+} they discovered the [-mistake and-] {+mistake, so
+# | they+} took the copies off of display. But Rowling wanted to crush any
+# | circulation of any information from those books, so she went to court, and
+# | the court ordered those people not to read the books that they now owned.
+#, fuzzy
+#| msgid ""
+#| "Here's what happened. A bookstore put the books on display for sale too "
+#| "early, before the day they were supposed to go on sale. And people came "
+#| "into the store and said: &ldquo;oh, I want that!&rdquo; and they bought "
+#| "it and took away their copies. Then, they discovered the mistake and took "
+#| "the copies off of display. But Rowling wanted to crush any circulation of "
+#| "any information from those books, so she went to court, and the court "
+#| "ordered those people not to read the books that they now owned."
 msgid ""
 "Here's what happened. A bookstore put the books on display for sale too "
-"early, before the day they were supposed to go on sale. And people came into "
-"the store and said: &ldquo;oh, I want that!&rdquo; and they bought it and "
-"took away their copies. Then, they discovered the mistake and took the "
-"copies off of display. But Rowling wanted to crush any circulation of any "
-"information from those books, so she went to court, and the court ordered "
-"those people not to read the books that they now owned."
+"early, before the date they were supposed to go on sale. And people came "
+"into the store and said: &ldquo;Oh, I want that!&rdquo; And they bought it "
+"and took away their copies. And then, they discovered the mistake, so they "
+"took the copies off of display. But Rowling wanted to crush any circulation "
+"of any information from those books, so she went to court, and the court "
+"ordered those people not to read the books that they now owned."
 msgstr ""
 "Ecco cosa è successo. Una libreria ha esposto i libri per la vendita troppo "
 "presto, prima del giorno previsto per l'uscita. E la gente che entrava nel "
@@ -1933,16 +3303,37 @@
 "ordinato alla gente di non leggere il libro che era in loro possesso. "
 
 #. type: Content of: <p>
+# | In response, I call for a total boycott of Harry Potter. But I don't say
+# | you shouldn't read those books or watch the movies, I only say you
+# | shouldn't buy the books or pay for the movies. {+[laughter]+} I leave it
+# | to Rowling to tell people not to read the books. As far as [-I'm-] {+I
+# | am+} concerned, if you borrow the book and read it, that's [-okay.-] {+OK.
+# | [laughter]+} Just don't give her any money! But this happened with paper
+# | books. The court could make this order but it couldn't get the books back
+# | from the people who had bought them.  Imagine if they were ebooks. Imagine
+# | if they were ebooks on the [-&ldquo;Swindle&rdquo;.-] {+Swindle.+} Amazon
+# | could send commands to erase them.
+#, fuzzy
+#| msgid ""
+#| "In response, I call for a total boycott of Harry Potter. But I don't say "
+#| "you shouldn't read those books or watch the movies, I only say you "
+#| "shouldn't buy the books or pay for the movies. I leave it to Rowling to "
+#| "tell people not to read the books. As far as I'm concerned, if you borrow "
+#| "the book and read it, that's okay. Just don't give her any money! But "
+#| "this happened with paper books. The court could make this order but it "
+#| "couldn't get the books back from the people who had bought them.  Imagine "
+#| "if they were ebooks. Imagine if they were ebooks on the &ldquo;"
+#| "Swindle&rdquo;. Amazon could send commands to erase them."
 msgid ""
 "In response, I call for a total boycott of Harry Potter. But I don't say you "
 "shouldn't read those books or watch the movies, I only say you shouldn't buy "
-"the books or pay for the movies. I leave it to Rowling to tell people not to "
-"read the books. As far as I'm concerned, if you borrow the book and read it, "
-"that's okay. Just don't give her any money! But this happened with paper "
-"books. The court could make this order but it couldn't get the books back "
-"from the people who had bought them.  Imagine if they were ebooks. Imagine "
-"if they were ebooks on the &ldquo;Swindle&rdquo;. Amazon could send commands "
-"to erase them."
+"the books or pay for the movies. [laughter] I leave it to Rowling to tell "
+"people not to read the books. As far as I am concerned, if you borrow the "
+"book and read it, that's OK. [laughter] Just don't give her any money! But "
+"this happened with paper books. The court could make this order but it "
+"couldn't get the books back from the people who had bought them.  Imagine if "
+"they were ebooks. Imagine if they were ebooks on the Swindle. Amazon could "
+"send commands to erase them."
 msgstr ""
 "In risposta a ciò, chiedo un boicottaggio totale di Harry Potter. Ma non vi "
 "chiedo di non leggere i libri o guardare i film, dico solo che non dovreste "
@@ -1979,9 +3370,17 @@
 msgstr "Sostenere l'arte"
 
 #. type: Content of: <p>
+# | I have two proposals for how to support artists, methods that are
+# | compatible with [-sharing. That-] {+sharing, that+} would allow us to end
+# | the war on sharing and still support artists.
+#, fuzzy
+#| msgid ""
+#| "I have two proposals for how to support artists, methods that are "
+#| "compatible with sharing. That would allow us to end the war on sharing "
+#| "and still support artists."
 msgid ""
 "I have two proposals for how to support artists, methods that are compatible "
-"with sharing. That would allow us to end the war on sharing and still "
+"with sharing, that would allow us to end the war on sharing and still "
 "support artists."
 msgstr ""
 "Ho due proposte su come sostenere gli artisti, in modo compatibile con la "
@@ -1989,22 +3388,30 @@
 "condivisione, sostenendo gli artisti. "
 
 #. type: Content of: <p>
+# | [-The-]{+One method uses tax money. We get a certain amount of public
+# | funds to distribute among artists. But, how much should each artist get?
+# | Well, we have to measure popularity. You see, the+} current system
+# | supposedly supports artists based on their popularity. So I'm saying{+:+}
+# | let's keep that, let's continue [-o-]{+i+}n this system {+to support
+# | them+} based on {+their+} popularity. We can measure the popularity of all
+# | the artists with some kind of polling or sampling, so that we don't have
+# | to do surveillance.  We can respect people's anonymity.
+#, fuzzy
+#| msgid ""
+#| "The current system supposedly supports artists based on their popularity. "
+#| "So I'm saying let's keep that, let's continue on this system based on "
+#| "popularity. We can measure the popularity of all the artists with some "
+#| "kind of polling or sampling, so that we don't have to do surveillance. We "
+#| "can respect people's anonymity."
 msgid ""
 "One method uses tax money. We get a certain amount of public funds to "
-"distribute among artists. But, how much should each artist get? We have to "
-"measure popularity."
-msgstr ""
-"Un metodo usa denaro proveniente dalle tasse. Redistribuiamo una certa somma "
-"di denaro pubblico tra gli artisti. Ma quanto dovrebbe ottenere ogni "
-"artista? Si tratta di misurare la popolarità. "
-
-#. type: Content of: <p>
-msgid ""
-"The current system supposedly supports artists based on their popularity. So "
-"I'm saying let's keep that, let's continue on this system based on "
-"popularity. We can measure the popularity of all the artists with some kind "
-"of polling or sampling, so that we don't have to do surveillance. We can "
-"respect people's anonymity."
+"distribute among artists. But, how much should each artist get? Well, we "
+"have to measure popularity. You see, the current system supposedly supports "
+"artists based on their popularity. So I'm saying: let's keep that, let's "
+"continue in this system to support them based on their popularity. We can "
+"measure the popularity of all the artists with some kind of polling or "
+"sampling, so that we don't have to do surveillance.  We can respect people's "
+"anonymity."
 msgstr ""
 "Il sistema attuale in teoria sostiene gli artisti in base alla loro "
 "popolarità. Quindi, dico, prendiamo questo per buono, continuiamo questo "
@@ -2013,16 +3420,37 @@
 "dover sorvegliare nessuno. Si può rispettare l'anonimato delle persone. "
 
 #. type: Content of: <p>
-msgid ""
-"We get a raw popularity figure for each artist, how do we convert that into "
-"an amount of money? The obvious way is: distribute the money in proportion "
-"to popularity. So if A is a thousand times as popular as B, A will get a "
-"thousand times as much money as B. That's not efficient distribution of the "
-"money. It's not putting the money to good use. It's easy for a star A to be "
-"a thousand times as popular as a fairly successful artist B. If we use "
-"linear proportion, we'll give A a thousand times as much money as we give B. "
-"And that means that, either we have to make A tremendously rich, or we are "
-"not supporting B enough."
+# | [-We-]{+OK, we+} get a raw popularity figure for each artist, how do we
+# | convert that into an amount of money? [-The-] {+Well, the+} obvious way
+# | is: distribute the money in proportion to popularity. So if A is a
+# | thousand times as popular as B, A will get a thousand times as much money
+# | as B. That's not efficient distribution of the money. It's not putting the
+# | money to good use. [-It's-] {+You see, it's+} easy for a star A to be a
+# | thousand times as popular as a fairly successful artist B. [-If-] {+And
+# | if+} we use linear proportion, we'll give A a thousand times as much money
+# | as we give B. And that means that, either we have to make A tremendously
+# | rich, or we are not supporting B enough.
+#, fuzzy
+#| msgid ""
+#| "We get a raw popularity figure for each artist, how do we convert that "
+#| "into an amount of money? The obvious way is: distribute the money in "
+#| "proportion to popularity. So if A is a thousand times as popular as B, A "
+#| "will get a thousand times as much money as B. That's not efficient "
+#| "distribution of the money. It's not putting the money to good use. It's "
+#| "easy for a star A to be a thousand times as popular as a fairly "
+#| "successful artist B. If we use linear proportion, we'll give A a thousand "
+#| "times as much money as we give B. And that means that, either we have to "
+#| "make A tremendously rich, or we are not supporting B enough."
+msgid ""
+"OK, we get a raw popularity figure for each artist, how do we convert that "
+"into an amount of money? Well, the obvious way is: distribute the money in "
+"proportion to popularity. So if A is a thousand times as popular as B, A "
+"will get a thousand times as much money as B. That's not efficient "
+"distribution of the money. It's not putting the money to good use. You see, "
+"it's easy for a star A to be a thousand times as popular as a fairly "
+"successful artist B. And if we use linear proportion, we'll give A a "
+"thousand times as much money as we give B. And that means that, either we "
+"have to make A tremendously rich, or we are not supporting B enough."
 msgstr ""
 "Supponiamo di fare una stima approssimativa di popolarità per ogni artista, "
 "come facciamo a convertirla in una somma di denaro? Il modo più ovvio è: "
@@ -2036,15 +3464,34 @@
 "renderemo A ricco sfondato, o non stiamo sostenendo B abbastanza. "
 
 #. type: Content of: <p>
-msgid ""
-"The money we use to make A tremendously rich is failing to do an effective "
-"job of supporting the arts; so, it's inefficient. Therefore I say: let's use "
-"the cube root. Cube root looks sort of like this. The point is: if A is a "
-"thousand times as popular as B, with the cube root A will get ten times as "
-"much as B, not a thousand times as much, just ten times as much. The use of "
-"the cube root shifts a lot of the money from the stars to the artists of "
-"moderate popularity. And that means, with less money we can adequately "
-"support a much larger number of artists."
+# | [-The-]{+Well, the+} money we use to make A tremendously rich is failing
+# | to do an effective job of supporting the arts; so, it's inefficient.
+# | Therefore I say: let's use the cube root. Cube root looks sort of like
+# | this. The point is: if A is a thousand times as popular as B, with the
+# | cube root A will get ten times as much as B, not a thousand times as much,
+# | just ten times as much. [-The-] {+So the+} use of the cube root shifts a
+# | lot of the money from the stars to the artists of moderate popularity. And
+# | that means, with less money we can adequately support a much larger number
+# | of artists.
+#, fuzzy
+#| msgid ""
+#| "The money we use to make A tremendously rich is failing to do an "
+#| "effective job of supporting the arts; so, it's inefficient. Therefore I "
+#| "say: let's use the cube root. Cube root looks sort of like this. The "
+#| "point is: if A is a thousand times as popular as B, with the cube root A "
+#| "will get ten times as much as B, not a thousand times as much, just ten "
+#| "times as much. The use of the cube root shifts a lot of the money from "
+#| "the stars to the artists of moderate popularity. And that means, with "
+#| "less money we can adequately support a much larger number of artists."
+msgid ""
+"Well, the money we use to make A tremendously rich is failing to do an "
+"effective job of supporting the arts; so, it's inefficient. Therefore I say: "
+"let's use the cube root. Cube root looks sort of like this. The point is: if "
+"A is a thousand times as popular as B, with the cube root A will get ten "
+"times as much as B, not a thousand times as much, just ten times as much. So "
+"the use of the cube root shifts a lot of the money from the stars to the "
+"artists of moderate popularity. And that means, with less money we can "
+"adequately support a much larger number of artists."
 msgstr ""
 "Il denaro che usiamo per fare A enormemente ricco rappresenta un fallimento "
 "nel fare un lavoro effettivo di supporto delle arti; così, è inefficiente. "
@@ -2057,13 +3504,27 @@
 "adeguatamente un numero molto più grande di artisti. "
 
 #. type: Content of: <p>
+# | There are two reasons why this system would use less money than we pay
+# | now. First of all because it would be supporting artists but not
+# | companies, second because it would shift the money from the stars to the
+# | artists of moderate popularity. Now, it would remain the case that the
+# | more popular you are, the more money you get. [-So-] {+And so+} the star A
+# | would still get more than B, but not astronomically more.
+#, fuzzy
+#| msgid ""
+#| "There are two reasons why this system would use less money than we pay "
+#| "now. First of all because it would be supporting artists but not "
+#| "companies, second because it would shift the money from the stars to the "
+#| "artists of moderate popularity. Now, it would remain the case that the "
+#| "more popular you are, the more money you get. So the star A would still "
+#| "get more than B, but not astronomically more."
 msgid ""
 "There are two reasons why this system would use less money than we pay now. "
 "First of all because it would be supporting artists but not companies, "
 "second because it would shift the money from the stars to the artists of "
 "moderate popularity. Now, it would remain the case that the more popular you "
-"are, the more money you get. So the star A would still get more than B, but "
-"not astronomically more."
+"are, the more money you get. And so the star A would still get more than B, "
+"but not astronomically more."
 msgstr ""
 "Ci sono due ragioni per cui questo sistema utilizzerebbe meno denaro di "
 "quello che paghiamo ora. Prima di tutto perché significherebbe sostenere gli 
"
@@ -2073,11 +3534,23 @@
 "otterrebbe più di B, ma non astronomicamente di più. "
 
 #. type: Content of: <p>
+# | That's one method, and because it won't be so much money it doesn't matter
+# | so much how we get the money. It could be from a special tax on Internet
+# | connectivity, it could just be some of the general budget that gets
+# | allocated to this purpose. We won't care because it won't be so much
+# | money[-;-]{+,+} much less than we're paying now.
+#, fuzzy
+#| msgid ""
+#| "That's one method, and because it won't be so much money it doesn't "
+#| "matter so much how we get the money. It could be from a special tax on "
+#| "Internet connectivity, it could just be some of the general budget that "
+#| "gets allocated to this purpose. We won't care because it won't be so much "
+#| "money; much less than we're paying now."
 msgid ""
 "That's one method, and because it won't be so much money it doesn't matter "
 "so much how we get the money. It could be from a special tax on Internet "
 "connectivity, it could just be some of the general budget that gets "
-"allocated to this purpose. We won't care because it won't be so much money; "
+"allocated to this purpose. We won't care because it won't be so much money, "
 "much less than we're paying now."
 msgstr ""
 "Questo è un metodo, e poiché non sarà una quantità di denaro tanto grande 
"
@@ -2088,9 +3561,41 @@
 "sarebbe inferiore a quanto stiamo pagando ora. "
 
 #. type: Content of: <p>
+# | The other method I've proposed is voluntary payments. Suppose each player
+# | had a button you could use to send one euro. A lot of people would send
+# | it[-,-]{+;+} after all it's not that much money. I think a lot of you
+# | might push that button every day, to give one euro to some artist who had
+# | made a work that you liked. But nothing would demand this, you wouldn't be
+# | required or ordered or pressured to send the money; you would do it
+# | because you felt like it. But there are some people who wouldn't do it
+# | because they're poor and they can't afford to give one euro. And it's good
+# | that they won't give it, we don't have to squeeze money out of poor people
+# | to support the artists. There are enough non[- -]{+-+}poor people who'll
+# | be happy to do it. Why wouldn't you give one euro to some artists today,
+# | if you appreciated their work? It's too inconvenient to give it to them.
+# | So my proposal is to remove the inconvenience. If the only reason not to
+# | give that euro is [-[that]-] you would have one euro less, you would do it
+# | fairly often.
+#, fuzzy
+#| msgid ""
+#| "The other method I've proposed is voluntary payments. Suppose each player "
+#| "had a button you could use to send one euro. A lot of people would send "
+#| "it, after all it's not that much money. I think a lot of you might push "
+#| "that button every day, to give one euro to some artist who had made a "
+#| "work that you liked. But nothing would demand this, you wouldn't be "
+#| "required or ordered or pressured to send the money; you would do it "
+#| "because you felt like it. But there are some people who wouldn't do it "
+#| "because they're poor and they can't afford to give one euro. And it's "
+#| "good that they won't give it, we don't have to squeeze money out of poor "
+#| "people to support the artists. There are enough non poor people who'll be "
+#| "happy to do it. Why wouldn't you give one euro to some artists today, if "
+#| "you appreciated their work? It's too inconvenient to give it to them. So "
+#| "my proposal is to remove the inconvenience. If the only reason not to "
+#| "give that euro is [that] you would have one euro less, you would do it "
+#| "fairly often."
 msgid ""
 "The other method I've proposed is voluntary payments. Suppose each player "
-"had a button you could use to send one euro. A lot of people would send it, "
+"had a button you could use to send one euro. A lot of people would send it; "
 "after all it's not that much money. I think a lot of you might push that "
 "button every day, to give one euro to some artist who had made a work that "
 "you liked. But nothing would demand this, you wouldn't be required or "
@@ -2098,11 +3603,11 @@
 "like it. But there are some people who wouldn't do it because they're poor "
 "and they can't afford to give one euro. And it's good that they won't give "
 "it, we don't have to squeeze money out of poor people to support the "
-"artists. There are enough non poor people who'll be happy to do it. Why "
+"artists. There are enough non-poor people who'll be happy to do it. Why "
 "wouldn't you give one euro to some artists today, if you appreciated their "
 "work? It's too inconvenient to give it to them. So my proposal is to remove "
-"the inconvenience. If the only reason not to give that euro is [that] you "
-"would have one euro less, you would do it fairly often."
+"the inconvenience. If the only reason not to give that euro is you would "
+"have one euro less, you would do it fairly often."
 msgstr ""
 "L'altro metodo che propongo è di effettuare dei versamenti volontari. "
 "Supponiamo che ogni player sia fornito di un pulsante utilizzabile per "
@@ -2165,13 +3670,27 @@
 "cose. "
 
 #. type: Content of: <p>
-msgid ""
-"But, in the Internet, you do need that. For instance if want to distribute a "
-"text on the Internet, you need companies to help you do it.  You can't do it "
-"by yourself. So if you want to have a website, you need the support of an "
-"ISP or a hosting company, and you need a domain name registrar. You need "
-"them to continue to let you do what you're doing. So you're doing it "
-"effectively on sufferance, not by right."
+# | But, in the Internet, you [-do-] {+<em>do</em>+} need that. For instance
+# | if want to distribute a text on the Internet, you need companies to help
+# | you do it.  You can't do it by yourself. So if you want to have a website,
+# | you need the support of an ISP or a hosting company, and you need a domain
+# | name registrar. You need them to continue to let you do what you're doing.
+# | So you're doing it effectively on sufferance, not by right.
+#, fuzzy
+#| msgid ""
+#| "But, in the Internet, you do need that. For instance if want to "
+#| "distribute a text on the Internet, you need companies to help you do it.  "
+#| "You can't do it by yourself. So if you want to have a website, you need "
+#| "the support of an ISP or a hosting company, and you need a domain name "
+#| "registrar. You need them to continue to let you do what you're doing. So "
+#| "you're doing it effectively on sufferance, not by right."
+msgid ""
+"But, in the Internet, you <em>do</em> need that. For instance if want to "
+"distribute a text on the Internet, you need companies to help you do it.  "
+"You can't do it by yourself. So if you want to have a website, you need the "
+"support of an ISP or a hosting company, and you need a domain name "
+"registrar. You need them to continue to let you do what you're doing. So "
+"you're doing it effectively on sufferance, not by right."
 msgstr ""
 "Ma su Internet ne hai bisogno. Ad esempio, se vuoi distribuire un testo su "
 "Internet, hai bisogno di aziende che ti aiutino a farlo. Non puoi farlo da "
@@ -2181,17 +3700,40 @@
 "alla tolleranza, non grazie al diritto. "
 
 #. type: Content of: <p>
+# | And if you want to receive money, you can't just hold out a can. You need
+# | the cooperation of a payment company. And we saw that this makes all of
+# | our digital activities vulnerable to suppression. We learned this when the
+# | United States government launched a &ldquo;distributed denial of service
+# | attack&rdquo; (DDoS) against WikiLeaks. Now I'm making a bit of joke
+# | because the words [-“distributed-] {+&ldquo;distributed+} denial of
+# | service [-attack”-] {+attack&rdquo;+} usually refer to a different kind
+# | of attack. But they fit perfectly with what the United States did. The
+# | United States went to the various kinds of network services that WikiLeaks
+# | depended on, and told them to cut off service to WikiLeaks. And they
+# | did[-.-]{+!+}
+#, fuzzy
+#| msgid ""
+#| "And if you want to receive money, you can't just hold out a can. You need "
+#| "the cooperation of a payment company. And we saw that this makes all of "
+#| "our digital activities vulnerable to suppression. We learned this when "
+#| "the United States government launched a &ldquo;distributed denial of "
+#| "service attack&rdquo; (DDoS) against WikiLeaks. Now I'm making a bit of "
+#| "joke because the words “distributed denial of service attack” usually "
+#| "refer to a different kind of attack. But they fit perfectly with what the "
+#| "United States did. The United States went to the various kinds of network "
+#| "services that WikiLeaks depended on, and told them to cut off service to "
+#| "WikiLeaks. And they did."
 msgid ""
 "And if you want to receive money, you can't just hold out a can. You need "
 "the cooperation of a payment company. And we saw that this makes all of our "
 "digital activities vulnerable to suppression. We learned this when the "
 "United States government launched a &ldquo;distributed denial of service "
 "attack&rdquo; (DDoS) against WikiLeaks. Now I'm making a bit of joke because "
-"the words “distributed denial of service attack” usually refer to a "
-"different kind of attack. But they fit perfectly with what the United States "
-"did. The United States went to the various kinds of network services that "
-"WikiLeaks depended on, and told them to cut off service to WikiLeaks. And "
-"they did."
+"the words &ldquo;distributed denial of service attack&rdquo; usually refer "
+"to a different kind of attack. But they fit perfectly with what the United "
+"States did. The United States went to the various kinds of network services "
+"that WikiLeaks depended on, and told them to cut off service to WikiLeaks. "
+"And they did!"
 msgstr ""
 "E se vuoi ricevere denaro, non puoi semplicemente usare una lattina. Ti "
 "serve la cooperazione di un'azienda che gestisca i pagamenti. E ciò  rende "
@@ -2205,11 +3747,25 @@
 "il servizio a WikiLeaks. Ed essi lo fecero. "
 
 #. type: Content of: <p>
+# | For instance, WikiLeaks had rented a virtual Amazon server, and the US
+# | government told Amazon: &ldquo;[-c-]{+C+}ut off service for
+# | WikiLeaks.&rdquo; And it did, arbitrarily. And then, Amazon had certain
+# | domain names such as [-as wikileaks.org, the-] {+wikileaks.org. The+} US
+# | government tried to get all those domains shut off. But it didn't succeed,
+# | some of them were outside its control and were not shut off.
+#, fuzzy
+#| msgid ""
+#| "For instance, WikiLeaks had rented a virtual Amazon server, and the US "
+#| "government told Amazon: &ldquo;cut off service for WikiLeaks.&rdquo; And "
+#| "it did, arbitrarily. And then, Amazon had certain domain names such as as "
+#| "wikileaks.org, the US government tried to get all those domains shut off. "
+#| "But it didn't succeed, some of them were outside its control and were not "
+#| "shut off."
 msgid ""
 "For instance, WikiLeaks had rented a virtual Amazon server, and the US "
-"government told Amazon: &ldquo;cut off service for WikiLeaks.&rdquo; And it "
-"did, arbitrarily. And then, Amazon had certain domain names such as as "
-"wikileaks.org, the US government tried to get all those domains shut off. "
+"government told Amazon: &ldquo;Cut off service for WikiLeaks.&rdquo; And it "
+"did, arbitrarily. And then, Amazon had certain domain names such as "
+"wikileaks.org. The US government tried to get all those domains shut off. "
 "But it didn't succeed, some of them were outside its control and were not "
 "shut off."
 msgstr ""
@@ -2221,16 +3777,42 @@
 "proprio controllo, e non furono disattivati. "
 
 #. type: Content of: <p>
+# | Then, there were the payment companies. The US went to PayPal[-,-] and
+# | said: &ldquo;Stop transferring money to WikiLeaks or we'll make life
+# | difficult for you.&rdquo; And PayPal shut off payments to WikiLeaks. And
+# | then it went to Visa and Mastercard and got them to shut off payments to
+# | WikiLeaks.  Others started collecting money on WikiLeaks{+'+} behalf and
+# | their account{+s+} were shut off too. But in this case, maybe something
+# | can be done.  There's a company in Iceland which began collecting money on
+# | behalf of WikiLeaks, and so Visa and Mastercard shut off its account; it
+# | couldn't receive money from its customers either. [-Now,-] {+And now,+}
+# | that business is suing Visa and Mastercard apparently, under European
+# | Union law, because Visa and Mastercard together have a near-monopoly.
+# | They're not allowed to arbitrarily deny service to anyone.
+#, fuzzy
+#| msgid ""
+#| "Then, there were the payment companies. The US went to PayPal, and said: "
+#| "&ldquo;Stop transferring money to WikiLeaks or we'll make life difficult "
+#| "for you.&rdquo; And PayPal shut off payments to WikiLeaks. And then it "
+#| "went to Visa and Mastercard and got them to shut off payments to "
+#| "WikiLeaks.  Others started collecting money on WikiLeaks behalf and their "
+#| "account were shut off too. But in this case, maybe something can be "
+#| "done.  There's a company in Iceland which began collecting money on "
+#| "behalf of WikiLeaks, and so Visa and Mastercard shut off its account; it "
+#| "couldn't receive money from its customers either. Now, that business is "
+#| "suing Visa and Mastercard apparently, under European Union law, because "
+#| "Visa and Mastercard together have a near-monopoly. They're not allowed to "
+#| "arbitrarily deny service to anyone."
 msgid ""
-"Then, there were the payment companies. The US went to PayPal, and said: "
+"Then, there were the payment companies. The US went to PayPal and said: "
 "&ldquo;Stop transferring money to WikiLeaks or we'll make life difficult for "
 "you.&rdquo; And PayPal shut off payments to WikiLeaks. And then it went to "
 "Visa and Mastercard and got them to shut off payments to WikiLeaks.  Others "
-"started collecting money on WikiLeaks behalf and their account were shut off "
-"too. But in this case, maybe something can be done.  There's a company in "
-"Iceland which began collecting money on behalf of WikiLeaks, and so Visa and "
-"Mastercard shut off its account; it couldn't receive money from its "
-"customers either. Now, that business is suing Visa and Mastercard "
+"started collecting money on WikiLeaks' behalf and their accounts were shut "
+"off too. But in this case, maybe something can be done.  There's a company "
+"in Iceland which began collecting money on behalf of WikiLeaks, and so Visa "
+"and Mastercard shut off its account; it couldn't receive money from its "
+"customers either. And now, that business is suing Visa and Mastercard "
 "apparently, under European Union law, because Visa and Mastercard together "
 "have a near-monopoly. They're not allowed to arbitrarily deny service to "
 "anyone."
@@ -2250,16 +3832,42 @@
 "servizio a chi vogliono. "
 
 #. type: Content of: <p>
+# | Well, this is an example of how things need to be for all kinds of
+# | services that we use in the Internet. If you rented a store to hand out
+# | statements of what you think, or any other kind of information that you
+# | can lawfully distribute, the landlord couldn't kick you out just because
+# | he didn't like what you were saying. As long as you keep paying the rent,
+# | you have [-the-] {+a+} right to continue in that store for a certain
+# | agreed-on period of time that you signed. So you have some rights that you
+# | can enforce. And they couldn't shut off your telephone line because the
+# | phone company doesn't like what you said{+,+} or because some powerful
+# | entity didn't like what you said and threatened the phone company. No! As
+# | long as you pay the bills and obey certain basic rules, they can't shut
+# | off your phone line. This is what it's like to have some rights!
+#, fuzzy
+#| msgid ""
+#| "Well, this is an example of how things need to be for all kinds of "
+#| "services that we use in the Internet. If you rented a store to hand out "
+#| "statements of what you think, or any other kind of information that you "
+#| "can lawfully distribute, the landlord couldn't kick you out just because "
+#| "he didn't like what you were saying. As long as you keep paying the rent, "
+#| "you have the right to continue in that store for a certain agreed-on "
+#| "period of time that you signed. So you have some rights that you can "
+#| "enforce. And they couldn't shut off your telephone line because the phone "
+#| "company doesn't like what you said or because some powerful entity didn't "
+#| "like what you said and threatened the phone company. No! As long as you "
+#| "pay the bills and obey certain basic rules, they can't shut off your "
+#| "phone line. This is what it's like to have some rights!"
 msgid ""
 "Well, this is an example of how things need to be for all kinds of services "
 "that we use in the Internet. If you rented a store to hand out statements of "
 "what you think, or any other kind of information that you can lawfully "
 "distribute, the landlord couldn't kick you out just because he didn't like "
-"what you were saying. As long as you keep paying the rent, you have the "
-"right to continue in that store for a certain agreed-on period of time that "
-"you signed. So you have some rights that you can enforce. And they couldn't "
-"shut off your telephone line because the phone company doesn't like what you "
-"said or because some powerful entity didn't like what you said and "
+"what you were saying. As long as you keep paying the rent, you have a right "
+"to continue in that store for a certain agreed-on period of time that you "
+"signed. So you have some rights that you can enforce. And they couldn't shut "
+"off your telephone line because the phone company doesn't like what you "
+"said, or because some powerful entity didn't like what you said and "
 "threatened the phone company. No! As long as you pay the bills and obey "
 "certain basic rules, they can't shut off your phone line. This is what it's "
 "like to have some rights!"
@@ -2291,9 +3899,23 @@
 "è l'ultima delle minacce di cui vi volevo parlare. "
 
 #. type: Content of: <p>
+# | Now I'd like to say that for more information about free software, look at
+# | [-GNU.org.-] {+gnu.org.+} Also look at fsf.org, which is the website of
+# | the Free Software Foundation. You can go there and find many ways you can
+# | help us, for instance. You can also become a member of the Free Software
+# | Foundation through that site. [&hellip;] There is also the Free Software
+# | Foundation of Europe fsfe.org. You can join FSF Europe also. [&hellip;]
+#, fuzzy
+#| msgid ""
+#| "Now I'd like to say that for more information about free software, look "
+#| "at GNU.org. Also look at fsf.org, which is the website of the Free "
+#| "Software Foundation. You can go there and find many ways you can help us, "
+#| "for instance. You can also become a member of the Free Software "
+#| "Foundation through that site. [&hellip;] There is also the Free Software "
+#| "Foundation of Europe fsfe.org. You can join FSF Europe also. [&hellip;]"
 msgid ""
 "Now I'd like to say that for more information about free software, look at "
-"GNU.org. Also look at fsf.org, which is the website of the Free Software "
+"gnu.org. Also look at fsf.org, which is the website of the Free Software "
 "Foundation. You can go there and find many ways you can help us, for "
 "instance. You can also become a member of the Free Software Foundation "
 "through that site. [&hellip;] There is also the Free Software Foundation of "
@@ -2367,3 +3989,158 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
+
+#~ msgid "A Free Digital Society"
+#~ msgstr "Una società digitale libera"
+
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "di <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+
+#~ msgid ""
+#~ "This is the <a href=\"http://www.libertesnumeriques.net/evenements/";
+#~ "stallman-19octobre2011/a-free-digital-society\">transcription</a> of "
+#~ "Richard Stallman's lecture at Sciences Po, Paris on October 19, 2011."
+#~ msgstr ""
+#~ "Questa è la trascrizione di una <a href=\"http://www.libertesnumeriques.";
+#~ "net/evenements/stallman-19octobre2011/a-free-digital-society\">lezione di "
+#~ "Richard Stallman</a> che si è tenuta a Sciences Po, Parigi, il 19 ottobre 
"
+#~ "2011."
+
+#~ msgid ""
+#~ "So, the whole rest of the world can find out how Danes are being "
+#~ "censored, but Danes are not supposed to know."
+#~ msgstr ""
+#~ "Quindi, il resto del mondo può rendersi conto di come i danesi siano "
+#~ "censurati, ma i danesi stessi non possono farlo. "
+
+#~ msgid ""
+#~ "Australia wanted to impose filtering on the Internet, but that was "
+#~ "blocked. However Australia has a different kind of censorship: it has "
+#~ "censorship of links. That is, if a website in Australia has a link to "
+#~ "some censored site outside Australia, the one in Australia can be "
+#~ "punished."
+#~ msgstr ""
+#~ "L'Australia intendeva imporre filtri su Internet, ciò è stato impedito. "
+#~ "Comunque, l'Australia ha un diverso sistema di censura: la censura dei "
+#~ "link. Ciò significa che, se un sito internet australiano ha un link a "
+#~ "qualche sito censurato al di fuori dell'Australia, il sito australiano "
+#~ "può essere punito. "
+
+#~ msgid ""
+#~ "And this is used even by public entities to communicate with the people. "
+#~ "For instance Italian public television makes its programs available on "
+#~ "the net in a format called VC-1, which is a standard supposedly, but it's "
+#~ "a secret standard."
+#~ msgstr ""
+#~ "E questo è messo in pratica addirittura da enti pubblici per comunicare "
+#~ "con le persone. Ad esempio, la televisione pubblica italiana rende i "
+#~ "propri programmi disponibili sul web in un formato denominato VC-1, che "
+#~ "presumibilmente è uno standard, ma uno standard tenuto segreto. "
+
+#~ msgid ""
+#~ "Then there are the patented formats, such as MP3 for audio. It's bad to "
+#~ "distribute audio in MP3 format! There is free software to handle MP3 "
+#~ "format, to play it and to generate it, but because it's patented in many "
+#~ "countries, many distributors of free software don't dare include those "
+#~ "programs; so if they distribute the GNU+Linux system, their system "
+#~ "doesn't include a player for MP3."
+#~ msgstr ""
+#~ "Inoltre ci sono i formati brevettati, come il formato MP3 per l'audio. È "
+#~ "male distribuire file audio in formato MP3! Esiste software libero in "
+#~ "grado di gestire file MP3, di leggerli e di crearne di nuovi. Tuttavia, "
+#~ "poiché il formato è brevettato in molti paesi, molti distributori di "
+#~ "software libero non osano distribuire questi programmi; quindi se si "
+#~ "tratta di sistemi GNU/Linux, questi sistemi non includono un lettore per "
+#~ "gli MP3. "
+
+#~ msgid ""
+#~ "Now in fact that was a tradition at the time. The tradition was: if there "
+#~ "was an existing program and you wrote something similar to it, inspired "
+#~ "by it, you could give credit by giving your program a name that's a "
+#~ "recursive acronym saying it's not the other one."
+#~ msgstr ""
+#~ "In effetti, all'epoca, c'era una tradizione: chi scriveva un programma "
+#~ "ispirandosi ad un altro programma, producendo qualcosa di simile al "
+#~ "primo, riconosceva il merito del programma da cui si era ispirato dando "
+#~ "al nuovo programma un nome con un acronimo ricorsivo, affermando che quel "
+#~ "programma non era l'altro. "
+
+#~ msgid ""
+#~ "Those of you who have a connection with a school, it's your duty to "
+#~ "campaign and pressure that school to move to free software. And you have "
+#~ "to be firm. It may take years, but you can succeed as long as you never "
+#~ "give up. Keep seeking more allies among the students, the faculty, the "
+#~ "staff, the parents, anyone!"
+#~ msgstr ""
+#~ "Chiunque tra voi abbia una connessione con una scuola dovrebbe "
+#~ "intervenire ed esercitare pressione su quella scuola affinché adotti "
+#~ "software libero. E dovete essere risoluti. Potrebbero volerci anni, ma il "
+#~ "successo è possibile se non vi arrendete. Cercate alleati tra gli "
+#~ "studenti, il corpo docente, il personale, i genitori, chiunque! "
+
+#~ msgid ""
+#~ "Of course in the case of Google, this only applies to the data the user "
+#~ "<em>knows</em> Google has. Google does lots of surveillance, too, and "
+#~ "that data is not included."
+#~ msgstr ""
+#~ "Ovviamente, nel caso di Google, questo si applica solo ai dati che "
+#~ "l'utente <em>sa</em> che Google ha. Anche Google esercita parecchia "
+#~ "sorveglianza, e quei dati non sono inclusi. "
+
+#~ msgid ""
+#~ "The next threat to our freedom in a digital society is using computers "
+#~ "for voting. You can't trust computers for voting. Whoever controls the "
+#~ "software in those computers has the power to commit undetectable fraud. "
+#~ "Elections are special. Because there's nobody involved that we dare trust "
+#~ "fully. Everybody has to be checked, crosschecked by others, so that "
+#~ "nobody is in the position to falsify the results by himself. Because if "
+#~ "anybody is in a position to do that, he might do it! So our traditional "
+#~ "systems for voting were designed so that nobody was fully trusted, "
+#~ "everybody was being checked by others. So that nobody could easily commit "
+#~ "fraud. But once you introduce a program, this is impossible! How can you "
+#~ "tell if a voting machine would honestly count the votes? You'd have to "
+#~ "study the program that's running in it during the election, which of "
+#~ "course nobody can do, and most people wouldn't even know how to do. But "
+#~ "even the experts who might theoretically be capable of studying the "
+#~ "program, they can't do it while people are voting. They'd have to do it "
+#~ "in advance, and then how do they know that the program they studied is "
+#~ "the one that's running while pople vote? Maybe it's been changed. Now, if "
+#~ "this program is proprietary, that means some company controls it. The "
+#~ "election authority can't even tell what that program is doing. Well, this "
+#~ "company then could rig the election.  There are accusations that this was "
+#~ "done in the US in the past ten years, that election results were "
+#~ "falsified this way."
+#~ msgstr ""
+#~ "La minaccia successiva alla nostra libertà nella società digitale è 
l'uso "
+#~ "dei computer per le elezioni. Non potete fidarvi delle macchine quando si "
+#~ "tratta di votare. Chiunque controlli il software in questi computer ha il "
+#~ "potere di mettere in pratica una frode non rilevabile. Le elezioni sono "
+#~ "importanti. Perché non possiamo fidarci di nessuno che sia coinvolto. "
+#~ "Chiunque deve essere controllato e ricontrollato da altri, in modo che "
+#~ "nessuno sia in grado, da solo, di falsificare il risultato.Perché, "
+#~ "chiunque fosse in grado di farlo potrebbe farlo. Ecco perché il nostro "
+#~ "sistema di voto tradizionale fu designato affinché nessuno fosse degno di 
"
+#~ "fiducia fino in fondo, tutti devono essere controllati dagli altri. In "
+#~ "questo modo, nessuno può facilmente commettere frodi. Ma se le elezioni "
+#~ "sono affidate ad un programma, questo controllo è impossibile! Come puoi "
+#~ "essere sicuro che una macchina elettorale conti onestamente i voti? "
+#~ "Dovresti studiare il programma in esecuzione durante le elezioni, cosa "
+#~ "che ovviamente nessuno può, e che molti non saprebbero, fare. Ma anche "
+#~ "gli esperti che potrebbero teoricamente essere capaci di studiare il "
+#~ "programma, non possono farlo mentre la gente sta votando. Dovrebbero "
+#~ "farlo in anticipo, ma come potrebbero essere sicuri che il programma da "
+#~ "loro studiato è lo stesso in esecuzione durante le operazioni di voto? "
+#~ "Potrebbe essere stato cambiato. Adesso, se il programma è proprietario, "
+#~ "ciò significa che è controllato da qualche azienda. L'autorità 
elettorale "
+#~ "non può neanche sapere cosa quel programma stia facendo. Questa azienda "
+#~ "potrebbe manipolare le elezioni. Vi sono accuse che ciò sia stato fatto "
+#~ "negli Stati Uniti durante gli ultimi 10 anni. "
+
+#~ msgid ""
+#~ "One method uses tax money. We get a certain amount of public funds to "
+#~ "distribute among artists. But, how much should each artist get? We have "
+#~ "to measure popularity."
+#~ msgstr ""
+#~ "Un metodo usa denaro proveniente dalle tasse. Redistribuiamo una certa "
+#~ "somma di denaro pubblico tra gli artisti. Ma quanto dovrebbe ottenere "
+#~ "ogni artista? Si tratta di misurare la popolarità. "

Index: philosophy/po/free-digital-society.pot
===================================================================
RCS file: /web/www/www/philosophy/po/free-digital-society.pot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/free-digital-society.pot      12 Dec 2011 09:27:46 -0000      
1.2
+++ philosophy/po/free-digital-society.pot      6 Apr 2012 16:31:16 -0000       
1.3
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-12 04:25-0500\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -16,29 +16,95 @@
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <title>
-msgid "A Free Digital Society - GNU Project - Free Software Foundation"
+msgid ""
+"A Free Digital Society - What Makes Digital Inclusion Good or Bad? - GNU "
+"Project - Free Software Foundation"
 msgstr ""
 
 #. type: Content of: <h2>
-msgid "A Free Digital Society"
+msgid "A Free Digital Society - What Makes Digital Inclusion Good or Bad?"
+msgstr ""
+
+#. type: Content of: <p><em>
+msgid "<em>Transcription of a lecture by Richard M. Stallman"
 msgstr ""
 
 #. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+msgid "at Sciences Po in Paris, October 19, 2011.</em>"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"This is the <a "
-"href=\"http://www.libertesnumeriques.net/evenements/stallman-19octobre2011/a-free-digital-society\";>transcription</a>
 "
-"of Richard Stallman's lecture at Sciences Po, Paris on October 19, 2011."
+"(A <a "
+"href=\"http://audio-video.gnu.org/video/stallman-sciencespo-freesociety.webm\";>
 "
+"video</a> of this lecture is available.)"
+msgstr ""
+
+#. type: Content of: <p>
+msgid "<strong>Table of Contents</strong>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#intro\">Introduction</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#surveillance\">Surveillance</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#censorship\">Censorship</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#formats\">Restricted data formats</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#proprietary\">Software that isn't free</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#four-freedoms\">The four freedoms of free software</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#gnu\">The GNU Project and the Free Software movement</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#education\">Free software and education</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#services\">Internet services</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#voting\">Computers for voting</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#sharing\">The war on sharing</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#arts\">Supporting the arts</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid "<a href=\"#rights\">Rights in cyberspace</a>"
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "Introduction"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "Projects with the goal of digital inclusion are making a big "
 "assumption. They are assuming that participating in a digital society is "
-"good; but that's not necessarily true. Being in a digital society can be "
+"good, but that's not necessarily true. Being in a digital society can be "
 "good or bad, depending on whether that digital society is just or "
 "unjust. There are many ways in which our freedom is being attacked by "
 "digital technology. Digital technology can make things worse, and it will, "
@@ -50,7 +116,7 @@
 "Therefore, if we have an unjust digital society, we should cancel these "
 "projects for digital inclusion and launch projects for digital "
 "extraction. We have to extract people from digital society if it doesn't "
-"respect their freedom; or we have to make it respect their freedom."
+"respect their freedom, or we have to make it respect their freedom."
 msgstr ""
 
 #. type: Content of: <h3>
@@ -70,15 +136,15 @@
 msgid ""
 "Surveillance is sometimes done with our own computers. For instance, if you "
 "have a computer that's running Microsoft Windows, that system is doing "
-"surveillance. There are features in Windows that send data to some "
-"server. Data about the use of the computer. A surveillance feature was "
-"discovered in the iPhone a few months ago, and people started calling it the "
+"surveillance. There are features in Windows that send data to some server, "
+"data about the use of the computer. A surveillance feature was discovered in "
+"the iPhone a few months ago, and people started calling it the "
 "&ldquo;spy-phone.&rdquo; Flash player has a surveillance feature too, and so "
 "does the Amazon &ldquo;Swindle.&rdquo; They call it the Kindle, but I call "
-"it the Swindle (l'escroc) because it's meant to swindle users out of their "
-"freedom. It makes people identify themselves whenever they buy a book, and "
-"that means Amazon has a giant list of all the books each user has read. Such "
-"a list must not exist anywhere."
+"it &ldquo;the Swindle,&rdquo; <em>l'escroc</em>, because it's meant to "
+"swindle users out of their freedom. It makes people identify themselves "
+"whenever they buy a book, and that means Amazon has a giant list of all the "
+"books each user has read. Such a list must not exist anywhere."
 msgstr ""
 
 #. type: Content of: <p>
@@ -96,23 +162,23 @@
 
 #. type: Content of: <p>
 msgid ""
-"We can stop our own computers from doing surveillance on us if we have "
-"control of the software that they run. But the software these people are "
-"running, they don't have control over. It's nonfree software, and that's why "
-"it has malicious features, such as surveillance. However, the surveillance "
-"is not always done with our own computers, it's also done at one remove. For "
-"instance ISPs in Europe are required to keep data about the user's internet "
-"communications for a long time, in case the State decides to investigate "
-"that person later for whatever imaginable reason."
+"We can stop our own computers from doing surveillance on us if <em>we</em> "
+"have control of the software that they run. But the software these people "
+"are running, they don't have control over. It's nonfree software, and that's "
+"why it has malicious features such as surveillance. However, the "
+"surveillance is not always done with our own computers, it's also done at "
+"one remove. For instance ISPs in Europe are required to keep data about the "
+"user's Internet communications for a long time, in case the State decides to "
+"investigate that person later for whatever imaginable reason."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"With a portable phone&mdash;even if you can stop the phone from transmitting "
-"your GPS location, the system can determine the phone's location "
-"approximately, by comparing the time when the signals arrive at different "
-"towers. So the phone system can do surveillance even without special "
-"cooperation from the phone itself."
+"With a portable phone&hellip; even if you can stop the phone from "
+"transmitting your GPS location, the system can determine the phone's "
+"location approximately, by comparing the time when the signals arrive at "
+"different towers. So the phone system can do surveillance even without "
+"special cooperation from the phone itself."
 msgstr ""
 
 #. type: Content of: <p>
@@ -157,27 +223,28 @@
 "about everyone. If a dictator takes power, which could happen anywhere, "
 "people realize this and they recognize that they should not communicate with "
 "other dissidents in a way that the State could find out about. But if the "
-"dictator has several years of stored records, of who talks with whom, it's "
-"too late to take any precautions then. Because he already has everything he "
-"needs to realize: &ldquo;OK this guy is a dissident, and he spoke with "
+"dictator has several years of stored records of who talks with whom, it's "
+"too late to take any precautions then, because he already has everything he "
+"needs to realize: &ldquo;OK, this guy is a dissident, and he spoke with "
 "him. Maybe he is a dissident too. Maybe we should grab him and torture "
 "him.&rdquo;"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"So we need to campaign to put an end to digital surveillance now. You can't "
-"wait until there is a dictator and it would really matter. And besides, it "
-"doesn't take an outright dictatorship to start attacking human rights."
+"So we need to campaign to put an end to digital surveillance "
+"<em>now</em>. You can't wait until there is a dictator and it would really "
+"matter. And besides, it doesn't take an outright dictatorship to start "
+"attacking human rights."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "I wouldn't quite call the government of the UK a dictatorship. It's not very "
 "democratic, and one way it crushes democracy is using surveillance. A few "
-"years ago, people believed to be on their way to a protest; they were going "
-"to protest. They were arrested before they could get there, because their "
-"car was tracked through this universal car tracking system."
+"years ago, people believed to be on their way to a protest, they were going "
+"to protest, they were arrested before they could get there because their car "
+"was tracked through this universal car tracking system."
 msgstr ""
 
 #. type: Content of: <h3>
@@ -190,7 +257,7 @@
 "before computers. But 15 years ago, we thought that the Internet would "
 "protect us from censorship, that it would defeat censorship. Then, China and "
 "some other obvious tyrannies went to great lengths to impose censorship on "
-"the Internet, and we said: &ldquo;well that's not surprising, what else "
+"the Internet, and we said: &ldquo;Well that's not surprising, what else "
 "would governments like that do?&rdquo;"
 msgstr ""
 
@@ -204,16 +271,12 @@
 #. type: Content of: <p>
 msgid ""
 "They all have systems of blocking access to some websites. Denmark "
-"established a system that blocks access to a long list of webpages, which "
+"established a system that blocks access to a long list of web pages, which "
 "was secret. The citizens were not supposed to know how the government was "
-"censoring them, but the list was leaked, and posted on WikiLeaks. At that "
-"point, Denmark added the WikiLeaks page to its censorship list."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"So, the whole rest of the world can find out how Danes are being censored, "
-"but Danes are not supposed to know."
+"censoring them, but the list was leaked and posted on WikiLeaks. At that "
+"point, Denmark added the WikiLeaks page to its censorship list. So, the "
+"whole rest of the world can find out how Danes are being censored, but Danes "
+"are not supposed to know."
 msgstr ""
 
 #. type: Content of: <p>
@@ -229,16 +292,12 @@
 "Australia wanted to impose filtering on the Internet, but that was "
 "blocked. However Australia has a different kind of censorship: it has "
 "censorship of links. That is, if a website in Australia has a link to some "
-"censored site outside Australia, the one in Australia can be punished."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"Electronic Frontier Australia, that is an organization that defends human "
-"rights in the digital domain in Australia, posted a link to a foreign "
-"political website. It was ordered to delete the link or face a penalty of "
-"$11,000 a day. So they deleted it, what else could they do? This is a very "
-"harsh system of censorship."
+"censored site outside Australia, the one in Australia can be "
+"punished. Electronic Frontiers Australia, that is an organization that "
+"defends human rights in the digital domain in Australia, posted a link to a "
+"foreign political website. It was ordered to delete the link or face a "
+"penalty of $11,000 a day. So they deleted it, what else could they do? This "
+"is a very harsh system of censorship."
 msgstr ""
 
 #. type: Content of: <p>
@@ -246,8 +305,8 @@
 "In Spain, the censorship that was adopted earlier this year allows officials "
 "to arbitrarily shut down an Internet site in Spain, or impose filtering to "
 "block access to a site outside of Spain. And they can do this without any "
-"kind of trial. This was one of the motivations for the <em>Indignados</em>, "
-"who have been protesting in the street."
+"kind of trial. This was one of the motivations for the "
+"<cite>Indignados</cite>, who have been protesting in the street."
 msgstr ""
 
 #. type: Content of: <p>
@@ -267,9 +326,7 @@
 msgstr ""
 
 #. type: Content of: <p>
-msgid ""
-"The next threat to our freedom comes from data formats that restrict the "
-"users."
+msgid "The next threat to our freedom comes from data formats that restrict 
users."
 msgstr ""
 
 #. type: Content of: <p>
@@ -282,8 +339,8 @@
 
 #. type: Content of: <p>
 msgid ""
-"Now, evidently, if the program implements a secret format, that's because "
-"the program is not free software. So this is another kind of malicious "
+"Now, evidently, if a program implements a secret format, that's because the "
+"program is not free software. So this is another kind of malicious "
 "feature. Surveillance is one kind of malicious feature that you find in some "
 "nonfree programs; using secret formats to restrict the users is another kind "
 "of malicious feature that you also find in some nonfree programs."
@@ -293,9 +350,10 @@
 msgid ""
 "But if you have a free program that handles a certain format, <em>ipso "
 "facto</em> that format is not secret. This kind of malicious feature can "
-"only exist in a nonfree program. Surveillance features could theoretically "
-"exist in a free program but you don't find them happening. Because the users "
-"would fix it. The users wouldn't like this, so they would fix it."
+"only exist in a nonfree program. Surveillance features, well, theoretically "
+"they could exist in a free program but you don't find them "
+"happening. Because the users would fix it, you see. The users wouldn't like "
+"this, so they would fix it."
 msgstr ""
 
 #. type: Content of: <p>
@@ -303,8 +361,8 @@
 "In any case, we also find secret data formats in use for publication of "
 "works. You find secret data formats in use for audio, such as music, for "
 "video, for books&hellip; And these secret formats are known as Digital "
-"Restrictions Management, or DRM, or digital handcuffs (les menottes "
-"num&eacute;riques)."
+"Restrictions Management, or DRM, or digital handcuffs <em>(les menottes "
+"num&eacute;riques)</em>."
 msgstr ""
 
 #. type: Content of: <p>
@@ -320,15 +378,10 @@
 "And this is used even by public entities to communicate with the people. For "
 "instance Italian public television makes its programs available on the net "
 "in a format called VC-1, which is a standard supposedly, but it's a secret "
-"standard."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"Now I can't imagine how any publicly supported entity could justify using a "
-"secret format to communicate with the public. This should be illegal. In "
-"fact I think all use of Digital Restrictions Management should be "
-"illegal. No company should be allowed to do this."
+"standard. Now I can't imagine how any publicly supported entity could "
+"justify using a secret format to communicate with the public. This should be "
+"illegal. In fact I think all use of Digital Restrictions Management should "
+"be illegal. No company should be allowed to do this."
 msgstr ""
 
 #. type: Content of: <p>
@@ -343,20 +396,15 @@
 #. type: Content of: <p>
 msgid ""
 "Then there are the patented formats, such as MP3 for audio. It's bad to "
-"distribute audio in MP3 format! There is free software to handle MP3 format, "
+"distribute audio in MP3 format. There is free software to handle MP3 format, "
 "to play it and to generate it, but because it's patented in many countries, "
 "many distributors of free software don't dare include those programs; so if "
 "they distribute the GNU+Linux system, their system doesn't include a player "
-"for MP3."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"As a result if anyone distributes some music in MP3 that's putting pressure "
-"on people not to use GNU/Linux. Sure, if you're an expert you can find a "
-"free software and install it, but there are lots of non experts, and they "
-"might see that they installed a version of GNU/Linux which doesn't have that "
-"software, and it won't play MP3 files, and they think it's the system's "
+"for MP3. As a result if anyone distributes some music in MP3, that's putting "
+"pressure on people not to use GNU/Linux.  Sure, if you're an expert you can "
+"find a free software and install it, but there are lots of non experts, and "
+"they might see that they installed a version of GNU/Linux which doesn't have "
+"that software, and it won't play MP3 files, and they think it's the system's "
 "fault. They don't realize it's MP3's fault. But this is the fact."
 msgstr ""
 
@@ -365,9 +413,9 @@
 "Therefore, if you want to support freedom, don't distribute MP3 "
 "files. That's why I say if you're recording my speech and you want to "
 "distribute copies, don't do it in a patented format such as MPEG-2, or "
-"MPEG-4, or MP3. Use a format friendly to free software, such as the Ogg "
-"format or WebM. And by the way, if you are going to distribute copies of the "
-"recording, please put on it the Creative Commons-No derivatives "
+"MPEG-4, or MP3. Use a format friendly to free software, such as the OGG "
+"formats or WebM. And by the way, if you are going to distribute copies of "
+"the recording, please put on it the Creative Commons, No Derivatives "
 "license. This is a statement of my personal views. If it were a lecture for "
 "a course, if it were didactic, then it ought to be free, but statements of "
 "opinion are different."
@@ -380,17 +428,17 @@
 #. type: Content of: <p>
 msgid ""
 "Now this leads me to the next threat which comes from software that the "
-"users don't have control over. In other words: software that isn't free, "
-"that is not &ldquo;libre&rdquo;. In this particular point French is clearer "
-"than English. The English word free means &lsquo;libre&rsquo; and "
-"&lsquo;gratuit&rsquo;, but what I mean when I say free software is "
-"&lsquo;logiciel libre&rsquo;. I don't mean &lsquo;gratuit&rsquo;. I'm not "
-"talking about price. Price is a side issue, just a detail, because it "
-"does'nt matter ethically. You know if i have a copy of a program and I sell "
-"it to you for one euro or a hundred euros, who cares? Why should anyone "
-"think that that's good or bad? Or suppose I gave it to you "
-"&lsquo;gratuitement&rsquo;&hellip; still, who cares? But whether this "
-"program respects your freedom, that's important!"
+"users don't have control over. In other words, software that isn't free, "
+"that is not <cite>libre</cite>. In this particular point French is clearer "
+"than English. The English word &ldquo;free&rdquo; means <cite>libre</cite> "
+"and <cite>gratuit</cite>, but what I mean when I say &ldquo;free "
+"software&rdquo; is <cite>logiciel libre</cite>. I don't mean "
+"<cite>gratuit</cite>. I'm not talking about price. Price is a side issue, "
+"just a detail, because it doesn't matter ethically. You know, if I have a "
+"copy of a program and I sell it to you for one euro or a hundred euros, who "
+"cares? Right? Why should anyone think that's good or bad? Or suppose I gave "
+"it to you <cite>gratuitement</cite>&hellip; Still, who cares? But whether "
+"this program respects your freedom, that's important!"
 msgstr ""
 
 #. type: Content of: <p>
@@ -398,40 +446,40 @@
 "So free software is software that respects users' freedom. What does this "
 "mean? Ultimately there are just two possibilities with software: either the "
 "users control the program or the program controls the users.  If the users "
-"have certain essential freedoms, then they control the program, and those "
-"freedoms are the criterion for free software. But if the users don't fully "
-"have the essential freedoms, then the program controls the users. But "
-"somebody controls that program and, through it, has <em>power</em> over the "
-"users."
+"have certain essential freedoms, then <em>they</em> control the program, and "
+"those freedoms are the criterion for free software. But if the users "
+"<em>don't</em> fully have the essential freedoms, then the program controls "
+"the users. But somebody controls that program and, through it, has "
+"<em>power</em> over the users."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "So, a nonfree program is an instrument to give somebody <em>power</em> over "
-"a lot of other people and this is unjust power that nobody should ever "
-"have. This is why nonfree software (les logiciels privateurs, qui privent de "
-"la libert&eacute;), why proprietary software is an injustice and should not "
-"exist; because it leaves the users without freedom."
+"a lot of other people, and this is unjust power that nobody should ever "
+"have. This is why nonfree software <cite>(les logiciels privateurs, qui "
+"privent de la libert&eacute;)</cite>, why proprietary software is an "
+"injustice and should not exist; because it leaves the users without freedom."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "Now, the developer who has control of the program often feels tempted to "
 "introduce malicious features to <em>further</em> exploit or abuse those "
-"users.  He feels a temptation because he knows he can get away with it: "
-"because his program controls the users and the users do not have control of "
-"the program, if he puts in a malicious feature, the users can't fix it; they "
-"can't remove the malicious feature."
+"users. He feels a temptation because he knows he can get away with "
+"it. Because his program controls the users and the users do not have control "
+"of the program, if he puts in a malicious feature, the users can't fix it; "
+"they can't remove the malicious feature."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "I've already told you about two kinds of malicious features: surveillance "
-"features, such as are found in Windows, and the Iphone and Flash player, and "
-"the &ldquo;Swindle&rdquo;. And there are also features to restrict users, "
-"which work with secret data formats, and those are found in Windows, "
-"Macintosh, the Iphone, Flash player, the Amazon &ldquo;Swindle&rdquo;, the "
-"Playstation 3 and lots and lots of other programs."
+"features, such as are found in Windows and the iPhone and Flash player and "
+"the Swindle, sort of. And there are also features to restrict users, which "
+"work with secret data formats, and those are found in Windows, Macintosh, "
+"the iPhone, Flash player, the Amazon Swindle, the Playstation 3 and lots and "
+"lots of other programs."
 msgstr ""
 
 #. type: Content of: <p>
@@ -439,23 +487,23 @@
 "The other kind of malicious feature is the backdoor. That means something in "
 "that program is listening for remote commands and obeying them, and those "
 "commands can mistreat the user. We know of backdoors in Windows, in the "
-"Iphone, in the Amazon &ldquo;Swindle&rdquo;. The Amazon "
-"&ldquo;Swindle&rdquo; has a backdoor that can remotely delete books. We know "
-"this by observation, because Amazon did it: in 2009 Amazon remotely deleted "
-"thousands of copies of a particular book. Those were authorized copies, "
-"people had obtain them directly from Amazon, and thus Amazon knew exactly "
-"where they were, which is how Amazon knew where to send the commands to "
-"delete those books. You know which book Amazon deleted? <em>1984</em> by "
-"Georges Orwell. It's a book everyone should read, because it discusses a "
-"totalitarian state that did things like delete books it didn't "
-"like. Everybody should read it, but not on the Amazon &ldquo;Swindle&rdquo;."
+"iPhone, in the Amazon Swindle. The Amazon Swindle has a backdoor that can "
+"delete books, remotely delete books. We know this by observation, because "
+"Amazon did it: in 2009 Amazon remotely deleted thousands of copies of a "
+"particular book. Those were authorized copies, people had obtained them "
+"directly from Amazon, and thus Amazon knew exactly where they were, which is "
+"how Amazon knew where to send the commands to delete those books. You know "
+"which book Amazon deleted? <em>1984</em> by George Orwell. [laughter] It's a "
+"book everyone should read, because it discusses a totalitarian state that "
+"did things like delete books it didn't like. Everybody should read it, but "
+"not on the Amazon Swindle. [laughter]"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "Anyway, malicious features are present in the most widely used nonfree "
 "programs, but they are rare in free software, because with free software the "
-"users have control: they can read the source code and they can change "
+"users have control. They can read the source code and they can change "
 "it. So, if there were a malicious feature, somebody would sooner or later "
 "spot it and fix it. This means that somebody who is considering introducing "
 "a malicious feature does not find it so tempting, because he knows he might "
@@ -466,32 +514,32 @@
 msgstr ""
 
 #. type: Content of: <h3>
-msgid "The 4 freedoms of free software"
+msgid "The four freedoms of free software"
 msgstr ""
 
 #. type: Content of: <p>
-msgid "Now the essential freedoms are four:"
+msgid "The essential freedoms are four:"
 msgstr ""
 
 #. type: Content of: <ul><li>
-msgid "Freedom 0 is the freedom to run the program as you wish."
+msgid "Freedom 0 is the freedom to run the program as you wish."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"Freedom 1 is the freedom to study the source code and change it, so the "
+"Freedom 1 is the freedom to study the source code and change it, so the "
 "program does your computing the way you wish."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"Freedom 2 is the freedom to help others. That's the freedom to make exact "
+"Freedom 2 is the freedom to help others. That's the freedom to make exact "
 "copies and redistribute them when you wish."
 msgstr ""
 
 #. type: Content of: <ul><li>
 msgid ""
-"Freedom 3 is the freedom to contribute to your community. That's the freedom "
+"Freedom 3 is the freedom to contribute to your community. That's the freedom 
"
 "to make copies of your modified versions, if you have made any, and then "
 "distribute them to others when you wish."
 msgstr ""
@@ -499,7 +547,7 @@
 #. type: Content of: <p>
 msgid ""
 "These freedoms, in order to be adequate, must apply to all activities of "
-"life. For instance if it says: &ldquo;This is free for academic use,&rdquo; "
+"life. For instance if it says &ldquo;this is free for academic use,&rdquo; "
 "it's not free. Because that's too limited. It doesn't apply to all areas of "
 "life. In particular, if a program is free, that means it can be modified and "
 "distributed commercially, because commerce is an area of life, an activity "
@@ -508,63 +556,58 @@
 
 #. type: Content of: <p>
 msgid ""
-"Now however, it's not obligatory to do any of these things. The point is "
-"you're free to do them if you wish, when you wish. But you never have to do "
+"However, it's not obligatory to do any of these things. The point is you're "
+"free to do them if you wish, when you wish. But you never have to do "
 "them. You don't have to do any of them. You don't have to run the "
 "program. You don't have to study or change the source code. You don't have "
 "to make any copies. You don't have to distribute your modified versions. The "
-"point is you should be free to do those things if you wish."
+"point is you should be free to do those things <em>if you wish</em>."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"Now, freedom number 1, the freedom to study and change the source code to "
+"Now, freedom number 1, the freedom to study and change the source code to "
 "make the program do your computing as you wish, includes something that "
-"might not be obvious at first. If the program comes in a product, and a "
+"might not be obvious at first. If the program comes in a product, and the "
 "developer can provide an upgrade that will run, then you have to be able to "
-"make your version run in that product. If the product would only run the "
+"make your version run in that product. If the product will only run the "
 "developer's versions, and refuses to run yours, the executable in that "
 "product is not free software. Even if it was compiled from free source code, "
 "it's not free because you don't have the freedom to make the program do your "
-"computing the way you wish. So, freedom 1 has to be real, not just "
-"theoretical. It has to include the freedom to use your version, not just the "
-"freedom to make some source code that won't run."
+"computing the way you wish. So, freedom 1 has to be real, not just "
+"theoretical. It has to include the freedom to use <em>your</em> version, not "
+"just the freedom to make some source code that won't run."
 msgstr ""
 
 #. type: Content of: <h3>
-msgid "The GNU project and the free software movement"
+msgid "The GNU Project and the Free Software movement"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"I launched the free software movement in 1983, when I announced the plan to "
+"I launched the Free Software movement in 1983, when I announced the plan to "
 "develop a free software operating system whose name is GNU. Now GNU, the "
 "name GNU, is a joke; because part of the hacker's spirit is to have fun even "
-"when you're doing something very serious. Now I can't think of anything more "
-"seriously important than defending freedom."
+"when you're doing something <em>very</em> serious. Now I can't think of "
+"anything more seriously important than defending freedom."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "But that didn't mean I couldn't give my system a name that's a joke.  So GNU "
-"is a joke because it's a recursive acronym, it stands for &ldquo;GNU is Not "
-"Unix&rdquo;, so G.N.U.: GNU's Not Unix. So the G in GNU stands for GNU."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"Now in fact that was a tradition at the time. The tradition was: if there "
-"was an existing program and you wrote something similar to it, inspired by "
-"it, you could give credit by giving your program a name that's a recursive "
-"acronym saying it's not the other one."
+"is a joke because it's a recursive acronym, it stands for &ldquo;GNU's Not "
+"Unix,&rdquo; so G.N.U.: GNU's Not Unix. So the G in GNU stands for GNU."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"So I gave credit to Unix for the technical ideas of Unix, but with the name "
-"GNU, because I decided to make GNU a Unix-like system, with the same "
-"commands, the same system calls, so that it would be compatible, so that "
-"people who used Unix can switch over easily."
+"In fact this was a tradition at the time. The tradition was: if there was an "
+"existing program and you wrote something similar to it, inspired by it, you "
+"could give credit by giving your program a name that's a recursive acronym "
+"saying it's not the other one. So I gave credit to Unix for the technical "
+"ideas of Unix, but with the name GNU, because I decided to make GNU a "
+"Unix-like system, with the same commands, the same system calls, so that it "
+"would be compatible, so that people who used Unix could switch over easily."
 msgstr ""
 
 #. type: Content of: <p>
@@ -582,17 +625,17 @@
 "Nowadays there are millions of users of the GNU operating system and most of "
 "them don't <em>know</em> they are using the GNU operating system, because "
 "there is a widespread practice which is not nice. People call the system "
-"&ldquo;Linux&rdquo;. Many do, but some people don't, and I hope you'll be "
+"&ldquo;Linux.&rdquo; Many do, but some people don't, and I hope you'll be "
 "one of them. Please, since we started this, since we wrote the biggest piece "
-"of the code, please give us equal mention, please call the system GNU+Linux, "
-"or GNU/Linux. It's not much to ask!"
+"of the code, please give us equal mention,please call the system "
+"&ldquo;GNU+Linux,&rdquo; or &ldquo;GNU/Linux.&rdquo; It's not much to ask."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "But there is another reason to do this. It turns out that the person who "
-"wrote Linux, which is one component of the system as we use it today, "
-"doesn't agree with the free software movement. And so if you call the whole "
+"wrote Linux, which is one component of the system as we use it today, he "
+"doesn't agree with the Free Software movement. And so if you call the whole "
 "system Linux, in effect you're steering people towards his ideas, and away "
 "from our ideas. Because he's not gonna say to them that they deserve "
 "freedom. He's going to say to them that he likes convenient, reliable, "
@@ -602,25 +645,25 @@
 
 #. type: Content of: <p>
 msgid ""
-"But if you tell them the system is GNU+Linux&mdash;the GNU operating system "
-"plus Linux the kernel&mdash;then they'll know about us, and then they might "
-"listen to what we say. You deserve freedom, and since freedom will be lost "
-"if we don't defend it&mdash;there's always going to be a Sarkozy to take it "
-"away&mdash;we need above all to teach people to demand freedom, to be ready "
-"to stand up for their freedom the next time someone threatens to take it "
-"away."
+"But if you tell them the system is GNU+Linux&mdash;it's the GNU operating "
+"system plus Linux the kernel&mdash;then they'll know about us, and then they "
+"might listen to what we say: you deserve freedom. And since freedom will be "
+"lost if we don't defend it&mdash;there's always going to be a Sarkozy to "
+"take it away&mdash;we need above all to teach people to demand freedom, to "
+"be ready to stand up for their freedom the next time someone threatens to "
+"take it away."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"Nowadays, you can tell who does'nt want to discuss these ideas of freedom "
-"because they don't say &ldquo;logiciel libre&rdquo;. They don't say "
-"&ldquo;libre&rdquo;, they say &ldquo;open source&rdquo;. That term was "
-"coined by the people like Mr Torvalds who would prefer that these ethical "
-"issues don't get raised. And so the way you can help us raise them is by "
-"saying libre. You know, it's up to you where you stand, you're free to say "
-"what you think. If you agree with them, you can say open source. If you "
-"agree with us, show it: say libre!"
+"Nowadays, you can tell who doesn't want to discuss these ideas of freedom "
+"because they don't say <cite>logiciel libre</cite>. They don't say "
+"<cite>libre</cite>, they say &ldquo;open source.&rdquo; That term was coined "
+"by the people like Mr Torvalds who would prefer that these ethical issues "
+"don't get raised. And so the way you can help us raise them is by saying "
+"<cite>libre</cite>. You know, it's up to you where you stand, you're free to "
+"say what you think. If you agree with them, you can say open source. If you "
+"agree with us, show it, say <cite>libre</cite>!"
 msgstr ""
 
 #. type: Content of: <h3>
@@ -629,55 +672,55 @@
 
 #. type: Content of: <p>
 msgid ""
-"Now the most important point about free software is that schools must teach "
-"exclusively free software. All levels of schools from kindergarten to "
+"The most important point about free software is that schools <em>must</em> "
+"teach exclusively free software. All levels of schools from kindergarten to "
 "university, it's their moral responsibility to teach only free software in "
 "their education, and all other educational activities as well, including "
 "those that say that they're spreading digital literacy.  A lot of those "
 "activities teach Windows, which means they're teaching "
-"<em>dependence</em>. To teach people the use proprietary software is to "
+"<em>dependence</em>. To teach people the use of proprietary software is to "
 "teach dependence, and educational activities must never do that because it's "
 "the opposite of their mission. Educational activities have a social mission "
 "to educate good citizens of a strong, capable, cooperating, independent and "
-"free society. And in the area of computing, that means: teach free "
-"software. Never teach a proprietary program because that's inculcating "
-"dependence."
+"free society. And in the area of computing, that means: teach free software; "
+"never teach a proprietary program because that's inculcating dependence."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "Why do you think some proprietary developers offer gratis copies to schools? "
 "They want the schools to make the children dependent. And then, when they "
-"graduate, they're still dependent and you know the company is not going to "
+"graduate, they're still dependent and, you know, the company is not going to "
 "offer them gratis copies. And some of them get jobs and go to work for "
 "companies. Not many of them anymore, but some of them. And those companies "
-"are not going to be offered gratis copies. Oh no! The idea is if the school "
+"are not going to be offered gratis copies. Oh no! The idea is: if the school "
 "directs the students down the path of permanent dependence, they can drag "
 "the rest of society with them into dependence.  That's the plan! It's just "
-"like giving the school gratis needles full of addicting drugs, saying "
-"&ldquo;inject this into your students, the first dose is gratis.&rdquo; Once "
-"you're dependent, then you have to pay. Well, the school would reject the "
-"drugs because it isn't right to teach the students to use addictive drugs "
+"like giving the school gratis needles full of addicting drugs, saying: "
+"&ldquo;Inject this into your students, the first dose is gratis. Once you're "
+"dependent, then you have to pay.&rdquo; Well, the school would reject the "
+"drugs because it isn't right to teach the students to use addictive drugs, "
 "and it's got to reject the proprietary software also."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"Some people say &ldquo;let's have the school teach both proprietary software "
-"and free software, so the students become familiar with both.&rdquo; That's "
-"like saying &ldquo;for the lunch lets give the kids spinach and tabacco, so "
-"that they become accustomed to both.&rdquo; No! The schools are only "
-"supposed to teach good habits, not bad ones! So there should be no Windows "
-"in a school, no Macintosh, nothing proprietary in the education."
+"Some people say: &ldquo;Let's have the school teach both proprietary "
+"software and free software, so the students become familiar with "
+"both.&rdquo; That's like saying: &ldquo;For the lunch let's give the kids "
+"spinach and tobacco, so that they become accustomed to both.&rdquo; No! The "
+"schools are only supposed to teach good habits, not bad ones! So there "
+"should be no Windows in a school, no Macintosh, nothing proprietary in the "
+"education."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "But also, for the sake of educating the programmers. You see, some people "
 "have a talent for programming. At ten to thirteen years old, typically, "
-"they're fascinated, and if they use a program, they want to know &ldquo;how "
+"they're fascinated, and if they use a program, they want to know: &ldquo;How "
 "does it do this?&rdquo; But when they ask the teacher, if it's proprietary, "
-"the teacher has to say &ldquo;I'm sorry, it's a secret, we can't find "
+"the teacher has to say: &ldquo;I'm sorry, it's a secret, we can't find "
 "out.&rdquo; Which means education is forbidden. A proprietary program is the "
 "enemy of the spirit of education. It's knowledge withheld, so it should not "
 "be tolerated in a school, even though there may be plenty of people in the "
@@ -689,7 +732,7 @@
 #. type: Content of: <p>
 msgid ""
 "But if the program is free, the teacher can explain what he knows, and then "
-"give out copies of the source code, saying: &ldquo;read it and you'll "
+"give out copies of the source code, saying: &ldquo;Read it and you'll "
 "understand everything.&rdquo; And those who are really fascinated, they will "
 "read it! And this gives them an opportunity to start to learn how to be good "
 "programmers."
@@ -700,26 +743,26 @@
 "To learn to be a good programmer, you'll need to recognize that certain ways "
 "of writing code, even if they make sense to you and they are correct, "
 "they're not good because other people will have trouble understanding "
-"them. Good code is clear code, that others will have an easy time working on "
+"them. Good code is clear code that others will have an easy time working on "
 "when they need to make further changes."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "How do you learn to write good clear code? You do it by reading lots of "
-"code, and writing lots of code. And only free software offers the chance to "
-"read the code of large programs that we really use. And then you have to "
+"code, and writing lots of code. Well, only free software offers the chance "
+"to read the code of large programs that we really use. And then you have to "
 "write lots of code, which means you have to write changes in large programs."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "How do you learn to write good code for the large programs? You have to "
-"start small, which does not mean small program, oh no! The challenges of the "
-"code for large programs don't even begin to appear in small programs. So the "
-"way you start small at writing code for large programs is by writing small "
-"changes in large programs. And only free software gives you the chance to do "
-"that!"
+"start small, which does <em>not</em> mean small program, oh no! The "
+"challenges of the code for large programs don't even begin to appear in "
+"small programs. So the way you start small at writing code for large "
+"programs is by writing small changes in large programs. And only free "
+"software gives you the chance to do that."
 msgstr ""
 
 #. type: Content of: <p>
@@ -736,7 +779,7 @@
 "helping others. Therefore, every class should have this rule: "
 "&ldquo;Students, if you bring software to class, you may not keep it for "
 "yourself, you must share copies with the rest of the class, including the "
-"source code in case anyone here wants to learn! Because this class is a "
+"source code in case anyone here wants to learn. Because this class is a "
 "place where we share our knowledge. Therefore, bringing a proprietary "
 "program to class is not permitted.&rdquo; The school must follow its own "
 "rule to set a good example. Therefore, the school must bring only free "
@@ -746,23 +789,18 @@
 
 #. type: Content of: <p>
 msgid ""
-"Those of you who have a connection with a school, it's your duty to campaign "
-"and pressure that school to move to free software. And you have to be "
-"firm. It may take years, but you can succeed as long as you never give "
+"Those of you who have a connection with a school, it's <em>your</em> duty to "
+"campaign and pressure that school to move to free software. And you have to "
+"be firm. It may take years, but you can succeed as long as you never give "
 "up. Keep seeking more allies among the students, the faculty, the staff, the "
-"parents, anyone!"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"And always bring it up as an ethical issue. If someone else wants to "
-"sidetrack the discussion into this practical advantage and this practical "
-"disadvantage, which means they're ignoring the most important question, then "
-"you have to say: &ldquo;this is not about how to do the best job of "
-"educating, this is about how to do a good education instead of an evil "
-"one. It's how to do education right instead of wrong, not just how to make "
-"it a little more effective, or less.&rdquo; So don't get distracted with "
-"those secondary issues, and ignore what really matters!"
+"parents, anyone! And always bring it up as an ethical issue. If someone else "
+"wants to sidetrack the discussion into this practical advantage and this "
+"practical disadvantage, which means they're ignoring the most important "
+"question, then you have to say: &ldquo;This is not about how to do the best "
+"job of educating, this is about how to do a good education instead of an "
+"evil one. It's how to do education right instead of wrong, not just how to "
+"make it a little more effective, or less.&rdquo; So don't get distracted "
+"with those secondary issues, and ignore what really matters!"
 msgstr ""
 
 #. type: Content of: <h3>
@@ -772,14 +810,14 @@
 #. type: Content of: <p>
 msgid ""
 "So, moving on to the next menace. There are two issues that arise from the "
-"use of internet services. One of them is that the server could abuse your "
+"use of Internet services. One of them is that the server could abuse your "
 "data, and another is that it could take control of your computing."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "The first issue, people already know about. They are aware that, if you "
-"upload data to an internet service, there is a question of what it will do "
+"upload data to an Internet service, there is a question of what it will do "
 "with that data. It might do things that mistreat you. What could it do? It "
 "could lose the data, it could change the data, it could refuse to let you "
 "get the data back. And it could also show the data to someone else you don't "
@@ -788,8 +826,9 @@
 
 #. type: Content of: <p>
 msgid ""
-"Now, here, I'm talking about the data that you knowingly gave to that "
-"site. Of course, many of those services do <em>surveillance</em> as well."
+"Now, here, I'm talking about the data that you <em>knowingly</em> gave to "
+"that site. Of course, many of those services do <em>surveillance</em> as "
+"well."
 msgstr ""
 
 #. type: Content of: <p>
@@ -797,7 +836,7 @@
 "For instance, consider Facebook. Users send lots of data to Facebook, and "
 "one of the bad things about Facebook is that it shows a lot of that data to "
 "lots of other people, and even if it offers them a setting to say "
-"&ldquo;no!&rdquo;, that may not really work. After all, if you say "
+"&ldquo;no,&rdquo; that may not really work. After all, if you say "
 "&ldquo;some other people can see this piece of information,&rdquo; one of "
 "them might publish it. Now, that's not Facebook's fault, there is nothing "
 "they could do to prevent that, but it ought to warn people. Instead of "
@@ -811,14 +850,15 @@
 #. type: Content of: <p>
 msgid ""
 "As well as all the data users of Facebook voluntarily give to Facebook, "
-"Facebook is collecting through data about people's activities on the net "
-"through various methods of surveillance. But for now I am talking about the "
-"data that people <em>know</em> they are giving to these sites."
+"Facebook is collecting data about people's activities on the net through "
+"various methods of surveillance. But that's the first menace. For now I am "
+"talking about the data that people <em>know</em> they are giving to these "
+"sites."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"Losing data is something that could always happen by accident. That "
+"Now, losing data is something that could always happen by accident.  That "
 "possibility is always there, no matter how careful someone is.  Therefore, "
 "you need to keep multiple copies of data that matters. If you do that, then, "
 "even if someone decided to delete your data intentionally, it wouldn't hurt "
@@ -838,15 +878,10 @@
 msgid ""
 "Of course in the case of Google, this only applies to the data the user "
 "<em>knows</em> Google has. Google does lots of surveillance, too, and that "
-"data is not included."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"But in any case, if you can get the data back, then you could track whether "
-"they have altered it. And they are not very likely to start altering "
-"people's data if the people can tell. So maybe we can keep a track on that "
-"particular kind of abuse."
+"data is not included. But in any case, if you can get the data back, then "
+"you could track whether they have altered it. And they're not very likely to "
+"start altering people's data if the people can tell. So maybe we can keep a "
+"track on that particular kind of abuse."
 msgstr ""
 
 #. type: Content of: <p>
@@ -858,22 +893,22 @@
 "just about all the data that companies maintain about individuals. Not just "
 "companies, but other organizations too, like public libraries. The police "
 "can get this massively, without even going to court. Now, in a country that "
-"was founded on an idea of freedom, there is nothing more unpatriotic than "
+"was founded on an idea of freedom, there's nothing more unpatriotic than "
 "this. But this is what they did. So you mustn't ever trust any of your data "
 "to a US company.  And they say that foreign subsidiaries of US companies are "
-"subject to this as well, so the company you are directly dealing with may be "
-"in Europe, but if it's owned by a US company, you got the same problem to "
+"subject to this as well. So the company you're directly dealing with may be "
+"in Europe, but if it's owned by a US company, you've got the same problem to "
 "deal with."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"However, this is mainly a concern when the data you are sending to the "
+"However, this is mainly of concern when the data you're sending to the "
 "service is not for publication. There are some services where you publish "
 "things. Of course, if you publish something, you know everybody is gonna be "
 "able to see it. So, there is no way they can hurt you by showing it to "
 "somebody who wasn't supposed to see it. There is nobody who wasn't supposed "
-"to see it if you publish it. So in that case the problem doesn't exist."
+"to see it, if you published it. So in that case the problem doesn't exist."
 msgstr ""
 
 #. type: Content of: <p>
@@ -889,7 +924,7 @@
 #. type: Content of: <p>
 msgid ""
 "The point here and in so many other issues is: as we start doing things "
-"digitally instead of physically, we shouldn't lose any of our rights, "
+"digitally instead of physically, we shouldn't lose any of our rights; "
 "because the general tendency is that we do lose rights."
 msgstr ""
 
@@ -906,10 +941,10 @@
 
 #. type: Content of: <p>
 msgid ""
-"But the other issue with internet services is that they can take control of "
+"But the other issue with Internet services is that they can take control of "
 "your computing, and that's not so commonly known. But It's becoming more "
 "common. There are services that offer to do computing for you on data "
-"supplied by you&mdash;things that you should do on your own computer but "
+"supplied by you&mdash;things that you should do in your own computer but "
 "they invite you to let somebody else's computer do that computing work for "
 "you. And the result is you lose control over it. It's just as if you used a "
 "nonfree program."
@@ -918,12 +953,12 @@
 #. type: Content of: <p>
 msgid ""
 "Two different scenarios but they lead to the same problem. If you do your "
-"computing with a nonfree program&mdash;well, the users don't control the "
+"computing with a nonfree program&hellip; well, the users don't control the "
 "nonfree program, it controls the users, which would include you. So you've "
 "lost control of the computing that's being done. But if you do your "
-"computing in his server&mdash;well, the programs that are doing it are the "
+"computing in his server&hellip; well, the programs that are doing it are the "
 "ones he chose. You can't touch them or see them, so you have no control over "
-"them. He has control over them&mdash;maybe."
+"them. He has control over them, maybe."
 msgstr ""
 
 #. type: Content of: <p>
@@ -937,14 +972,14 @@
 #. type: Content of: <p>
 msgid ""
 "But suppose he installs a free program, then he has control over the "
-"computing being done in his computer, but you don't. So, either way, you "
-"don't! So the only way to have control over your computing is to do it with "
-"<em>your copy</em> of a free program."
+"computing being done in his computer, but you don't. So, either way, <em>you "
+"don't!</em> So the only way to have control over your computing is to do it "
+"with <em>your copy</em> of a free program."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"This practice is called &ldquo;Software as a Service&rdquo;. It means doing "
+"This practice is called &ldquo;Software as a Service.&rdquo; It means doing "
 "your computing with your data in somebody else's server. And I don't know of "
 "anything that can make this acceptable. It's always something that takes "
 "away your freedom, and the only solution I know of is to refuse. For "
@@ -958,34 +993,51 @@
 "Of course, we are also giving them data about ourselves which they shouldn't "
 "have. Imagine if you had a conversation with somebody through a "
 "voice-recognition translation system that was Software as as Service and "
-"it's really running on a server belonging to some company. That company also "
-"gets to know what was said in the conversation, and if it's a US company "
-"that means Big Brother also gets to know. This is no good."
+"it's really running on a server belonging to some company. Well, that "
+"company also gets to know what was said in the conversation, and if it's a "
+"US company that means Big Brother also gets to know. This is no good."
+msgstr ""
+
+#. type: Content of: <h3>
+msgid "Computers for voting"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "The next threat to our freedom in a digital society is using computers for "
 "voting. You can't trust computers for voting. Whoever controls the software "
-"in those computers has the power to commit undetectable fraud. Elections are "
-"special. Because there's nobody involved that we dare trust fully. Everybody "
-"has to be checked, crosschecked by others, so that nobody is in the position "
-"to falsify the results by himself. Because if anybody is in a position to do "
-"that, he might do it! So our traditional systems for voting were designed so "
-"that nobody was fully trusted, everybody was being checked by others. So "
-"that nobody could easily commit fraud. But once you introduce a program, "
-"this is impossible! How can you tell if a voting machine would honestly "
-"count the votes? You'd have to study the program that's running in it during "
-"the election, which of course nobody can do, and most people wouldn't even "
-"know how to do. But even the experts who might theoretically be capable of "
-"studying the program, they can't do it while people are voting. They'd have "
-"to do it in advance, and then how do they know that the program they studied "
-"is the one that's running while pople vote? Maybe it's been changed. Now, if "
-"this program is proprietary, that means some company controls it. The "
-"election authority can't even tell what that program is doing. Well, this "
-"company then could rig the election.  There are accusations that this was "
-"done in the US in the past ten years, that election results were falsified "
-"this way."
+"in those computers has the power to commit undetectable fraud."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Elections are special, because there's nobody involved that we dare trust "
+"fully. Everybody has to be checked, crosschecked by others, so that nobody "
+"is in a position to falsify the results by himself. Because if anybody is in "
+"a position to do that, he might do it. So our traditional systems for voting "
+"were designed so that nobody was fully trusted, everybody was being checked "
+"by others. So that nobody could easily commit fraud. But once you introduce "
+"a program, this is impossible."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"How can you tell if a voting machine will honestly count the votes? You'd "
+"have to study the program that's running in it during the election, which of "
+"course nobody can do, and most people wouldn't even know how to do. But even "
+"the experts who might theoretically be capable of studying the program, they "
+"can't do it while people are voting.  They'd have to do it in advance, and "
+"then how do they know that the program they studied is the one that's "
+"running while people vote? Maybe it's been changed."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Now, if this program is proprietary, that means some company controls "
+"it. The election authority can't even tell what that program is doing. Well, "
+"this company then could rig the election.  And there are accusations that "
+"this was done in the US within the past ten years, that election results "
+"were falsified this way."
 msgstr ""
 
 #. type: Content of: <p>
@@ -1003,8 +1055,8 @@
 "In other activities of life, you can usually tell if somebody is trying to "
 "cheat you. Consider for instance buying something from a store. You order "
 "something, maybe you give a credit card number. If the product doesn't come, "
-"you can complain and you can&mdash;of course if you got a good enough memory "
-"you will&mdash;notice if that product doesn't come.  You're not just giving "
+"you can complain and you can&hellip; of course if you've got a good enough "
+"memory you'll notice if that product doesn't come. You're not just giving "
 "total blind trust to the store, because you can check. But in elections you "
 "can't check."
 msgstr ""
@@ -1012,7 +1064,7 @@
 #. type: Content of: <p>
 msgid ""
 "I saw once a paper where someone described a theoretical system for voting "
-"which uses some sophisticated mathematics so that people could check that "
+"which used some sophisticated mathematics so that people could check that "
 "their votes had been counted, even though everybody's vote was secret, and "
 "they could also verify that false votes hadn't been added. It was very "
 "exciting, powerful mathematics; but even if that mathematics is correct, "
@@ -1021,8 +1073,8 @@
 "mathematics. For instance, suppose you're voting over the Internet and "
 "suppose you're using a machine that's a zombie. It might tell you that the "
 "vote was sent for A while actually sending a vote for B. Who knows whether "
-"you'd ever find out? In practice, the only way to see if these systems work "
-"and are honest is through years, in fact decades, of trying them and "
+"you'd ever find out? So, in practice the only way to see if these systems "
+"work and are honest is through years, in fact decades, of trying them and "
 "checking in other ways what happened."
 msgstr ""
 
@@ -1049,7 +1101,7 @@
 "and with digital technology, sharing is easy. So, millions of people "
 "share. Those who profit by having power over the distribution of these works "
 "don't want us to share. And since they are businesses, governments which "
-"have betrayed their people and work for the empire of mega-corporations try "
+"have betrayed their people and work for the Empire of mega-corporations try "
 "to serve those businesses, they are against their own people, they are for "
 "the businesses, for the publishers."
 msgstr ""
@@ -1060,22 +1112,23 @@
 "have been waging <em>war</em> on sharing, and they've proposed a series of "
 "cruel draconian measures. Why do they propose cruel draconian measures? "
 "Because nothing less has a chance of success: when something is good and "
-"easy, people do it. The only way to stop them is by being very nasty. So of "
-"course, what they propose is nasty, nasty, and the next one is nastier. So "
-"they tried suing teenagers for hundreds of thousands of dollars — that was "
-"pretty nasty. And they tried turning our technology against us, Digital "
-"Restrictions Management that means, digital handcuffs."
+"easy, people do it, and the only way to stop them is by being very nasty. So "
+"of course, what they propose is nasty, nasty, and the next one is "
+"nastier. So they tried suing teenagers for hundreds of thousands of "
+"dollars. That was pretty nasty. And they tried turning our technology "
+"against us, Digital Restrictions Management that means, digital handcuffs."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "But among the people there were clever programmers too and they found ways "
-"to break the handcuffs. For instance, DVDs were designed to have encrypted "
-"movies in a secret encryption format, and the idea was that all the programs "
-"to decrypt the video would be proprietary with digital handcuffs. They would "
-"all be designed to restrict the users. And their scheme worked okay for a "
-"while. But some people in Europe figured out the encryption and they "
-"released a free program that could actually play the video on a DVD."
+"to break the handcuffs. So for instance, DVDs were designed to have "
+"encrypted movies in a secret encryption format, and the idea was that all "
+"the programs to decrypt the video would be proprietary with digital "
+"handcuffs. They would all be designed to restrict the users. And their "
+"scheme worked OK for a while. But some people in Europe figured out the "
+"encryption and they released a free program that could actually play the "
+"video on a DVD."
 msgstr ""
 
 #. type: Content of: <p>
@@ -1085,13 +1138,13 @@
 "invented censorship of software in 1998, with the Digital Millennium "
 "Copyright Act (DMCA). So the distribution of that free program was forbidden "
 "in the United States. Unfortunately it didn't stop with the United "
-"States. The European Union adopted a directive in 2003 requiring such "
-"laws. The directive only says that commercial distribution has to be banned, "
-"but just about every country in the European Union has adopted a nastier "
-"law. In France, the mere possession of a copy of that program is an offense "
-"punished by imprisonment, thanks to Sarkozy. I believe that was done by the "
-"law DADVSI. I guess he hoped that with an unpronounceable name, people "
-"wouldn't be able to criticize it."
+"States. The European Union adopted a directive, in 2003 I believe, requiring "
+"such laws. The directive only says that commercial distribution has to be "
+"banned, but just about every country in the European Union has adopted a "
+"nastier law. In France, the mere possession of a copy of that program is an "
+"offense punished by imprisonment, thanks to Sarkozy. I believe that was done "
+"by the law DADVSI. I guess he hoped that with an unpronounceable name, "
+"people wouldn't be able to criticize it. [laughter]"
 msgstr ""
 
 #. type: Content of: <p>
@@ -1103,13 +1156,13 @@
 
 #. type: Content of: <p>
 msgid ""
-"So, we still are fighting against digital handcuffs. The Amazon "
-"&ldquo;Swindle&rdquo; has digital handcuffs to take away the traditional "
-"freedoms of readers to do things such as: give a book to someone else, or "
-"lend a book to someone else. That's a vitally important social act. That is "
-"what builds society among people who read: lending books. Amazon doesn't "
-"want to let people lend books freely. And then there is also selling a book, "
-"perhaps to a used bookstore. You can't do that either."
+"So, we still are fighting against digital handcuffs. The Amazon Swindle has "
+"digital handcuffs to take away the traditional freedoms of readers to do "
+"things such as: give a book to someone else, or lend a book to someone "
+"else. That's a vitally important social act. That is what builds society "
+"among people who read, lending books. Amazon doesn't want to let people lend "
+"books freely. And then there is also selling a book, perhaps to a used "
+"bookstore. You can't do that either."
 msgstr ""
 
 #. type: Content of: <p>
@@ -1118,13 +1171,13 @@
 "bringing it back with streaming services such as Spotify. These services all "
 "require proprietary client software, and the reason is so they can put "
 "digital handcuffs on the users. So, reject them! They already showed quite "
-"openly that you can't trust them, because first they said: &ldquo;you can "
-"listen as much as you like.&rdquo;, and then they said: &ldquo;Oh, no! You "
+"openly that you can't trust them, because first they said: &ldquo;You can "
+"listen as much as you like.&rdquo; And then they said: &ldquo;Oh, no! You "
 "can only listen a certain number of hours a month.&rdquo; The issue is not "
 "whether that particular change was good or bad, just or unjust; the point "
 "is, they have the power to impose any change in policies. So don't let them "
-"have that power. You should have your own copy of any music you want to "
-"listen to."
+"have that power. You should have your <em>own</em> copy of any music you "
+"want to listen to."
 msgstr ""
 
 #. type: Content of: <p>
@@ -1132,44 +1185,45 @@
 "And then came the next assault on our freedom: HADOPI, basically punishment "
 "on accusation. It was started in France but it's been exported to many other "
 "countries. The United States now demand such unjust policies in its free "
-"exploitation treaties. A few months ago, Columbia adopted such a law under "
+"exploitation treaties. A few months ago, Colombia adopted such a law under "
 "orders from its masters in Washington.  Of course, the ones in Washington "
 "are not the real masters, they're just the ones who control the United "
 "States on behalf of the Empire. But they're the ones who also dictate to "
-"Columbia on behalf of the Empire."
+"Colombia on behalf of the Empire."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"In France, since the Constitutional Council objected to explicity giving "
+"In France, since the Constitutional Council objected to explicitly giving "
 "people punishment without trial, they invented a kind of trial which is not "
-"a real trial, which is just a form of a trial, so they can <em>pretend</em> "
-"that people have a trial before they're punished. But in other countries "
-"they don't bother with that, it's explicit punishment on accusation "
-"only. Which means that for the sake of their war on sharing, they're "
-"prepared to abolish the basic principles of justice. It shows how thoroughly "
-"anti-freedom anti-justice they are. These are not legitimate governments."
+"a real trial, it's just a form of a trial, so they can <em>pretend</em> that "
+"people have a trial before they're punished. But in other countries they "
+"don't bother with that, it's explicit punishment on accusation only. Which "
+"means that for the sake of their war on sharing, they're prepared to abolish "
+"the basic principles of justice. It shows how thoroughly anti-freedom "
+"anti-justice they are. These are not legitimate governments."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "And I'm sure they'll come up with more nasty ideas because they're paid to "
 "defeat the people no matter what it takes. Now, when they do this, they "
-"always say that it's for the sake of the artists, that they have 
“protect” "
-"the “creators.” Now those are both propaganda terms. I ‘m convinced 
that the "
-"reason they love the word “creators“ is because it is a comparison with a 
"
-"deity. They want us to think of artists as super-human, and thus deserving "
-"special privileges and power over us, which is something I disagree with."
+"always say that it's for the sake of the artists, that they have "
+"&ldquo;protect&rdquo; the &ldquo;creators.&rdquo; Now those are both "
+"propaganda terms. I am convinced that the reason they love the word "
+"&ldquo;creators&rdquo; is because it is a comparison with a deity. They want "
+"us to think of artists as super-human, and thus deserving special privileges "
+"and power over us, which is something I disagree with."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"In fact , the only artists that benefit very much from this system are the "
-"big stars. The other artists are getting crushed into the ground by the "
+"In fact though, the only artists that benefit very much from this system are "
+"the big stars. The other artists are getting crushed into the ground by the "
 "heels of these same companies. But they treat the stars very well, because "
 "the stars have a lot of clout. If a star threatens to move to another "
-"company, the company says: &ldquo;oh, we'll give you what you want.&rdquo; "
-"But for any other artist they say: &ldquo;you don't matter, we can treat you "
+"company, the company says: &ldquo;Oh, we'll give you what you want.&rdquo; "
+"But for any other artist they say: &ldquo;You don't matter, we can treat you "
 "any way we like.&rdquo;"
 msgstr ""
 
@@ -1177,34 +1231,34 @@
 msgid ""
 "So the superstars have been corrupted by the millions of dollars or euros "
 "that they get, to the point where they'll do almost anything for more "
-"money. For instance, J. K. Rowling is a good example. J. K.  Rowling, a few "
+"money. For instance, J. K. Rowling is a good example. J. K. Rowling, a 
few "
 "years ago, went to court in Canada and obtained an order that people who had "
 "bought her books must not read them. She got an order telling people not to "
-"read her books."
+"read her books!"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "Here's what happened. A bookstore put the books on display for sale too "
-"early, before the day they were supposed to go on sale. And people came into "
-"the store and said: &ldquo;oh, I want that!&rdquo; and they bought it and "
-"took away their copies. Then, they discovered the mistake and took the "
-"copies off of display. But Rowling wanted to crush any circulation of any "
-"information from those books, so she went to court, and the court ordered "
-"those people not to read the books that they now owned."
+"early, before the date they were supposed to go on sale. And people came "
+"into the store and said: &ldquo;Oh, I want that!&rdquo; And they bought it "
+"and took away their copies. And then, they discovered the mistake, so they "
+"took the copies off of display. But Rowling wanted to crush any circulation "
+"of any information from those books, so she went to court, and the court "
+"ordered those people not to read the books that they now owned."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "In response, I call for a total boycott of Harry Potter. But I don't say you "
 "shouldn't read those books or watch the movies, I only say you shouldn't buy "
-"the books or pay for the movies. I leave it to Rowling to tell people not to "
-"read the books. As far as I'm concerned, if you borrow the book and read it, "
-"that's okay. Just don't give her any money! But this happened with paper "
-"books. The court could make this order but it couldn't get the books back "
-"from the people who had bought them.  Imagine if they were ebooks. Imagine "
-"if they were ebooks on the &ldquo;Swindle&rdquo;. Amazon could send commands "
-"to erase them."
+"the books or pay for the movies. [laughter] I leave it to Rowling to tell "
+"people not to read the books. As far as I am concerned, if you borrow the "
+"book and read it, that's OK. [laughter] Just don't give her any money! But "
+"this happened with paper books. The court could make this order but it "
+"couldn't get the books back from the people who had bought them.  Imagine if "
+"they were ebooks. Imagine if they were ebooks on the Swindle. Amazon could "
+"send commands to erase them."
 msgstr ""
 
 #. type: Content of: <p>
@@ -1225,49 +1279,45 @@
 #. type: Content of: <p>
 msgid ""
 "I have two proposals for how to support artists, methods that are compatible "
-"with sharing. That would allow us to end the war on sharing and still "
+"with sharing, that would allow us to end the war on sharing and still "
 "support artists."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "One method uses tax money. We get a certain amount of public funds to "
-"distribute among artists. But, how much should each artist get? We have to "
-"measure popularity."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"The current system supposedly supports artists based on their popularity. So "
-"I'm saying let's keep that, let's continue on this system based on "
-"popularity. We can measure the popularity of all the artists with some kind "
-"of polling or sampling, so that we don't have to do surveillance. We can "
-"respect people's anonymity."
+"distribute among artists. But, how much should each artist get? Well, we "
+"have to measure popularity. You see, the current system supposedly supports "
+"artists based on their popularity. So I'm saying: let's keep that, let's "
+"continue in this system to support them based on their popularity. We can "
+"measure the popularity of all the artists with some kind of polling or "
+"sampling, so that we don't have to do surveillance.  We can respect people's "
+"anonymity."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"We get a raw popularity figure for each artist, how do we convert that into "
-"an amount of money? The obvious way is: distribute the money in proportion "
-"to popularity. So if A is a thousand times as popular as B, A will get a "
-"thousand times as much money as B. That's not efficient distribution of the "
-"money. It's not putting the money to good use. It's easy for a star A to be "
-"a thousand times as popular as a fairly successful artist B. If we use "
-"linear proportion, we'll give A a thousand times as much money as we give "
-"B. And that means that, either we have to make A tremendously rich, or we "
-"are not supporting B enough."
+"OK, we get a raw popularity figure for each artist, how do we convert that "
+"into an amount of money? Well, the obvious way is: distribute the money in "
+"proportion to popularity. So if A is a thousand times as popular as B, A "
+"will get a thousand times as much money as B. That's not efficient "
+"distribution of the money. It's not putting the money to good use. You see, "
+"it's easy for a star A to be a thousand times as popular as a fairly "
+"successful artist B. And if we use linear proportion, we'll give A a "
+"thousand times as much money as we give B. And that means that, either we "
+"have to make A tremendously rich, or we are not supporting B enough."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"The money we use to make A tremendously rich is failing to do an effective "
-"job of supporting the arts; so, it's inefficient. Therefore I say: let's use "
-"the cube root. Cube root looks sort of like this. The point is: if A is a "
-"thousand times as popular as B, with the cube root A will get ten times as "
-"much as B, not a thousand times as much, just ten times as much. The use of "
-"the cube root shifts a lot of the money from the stars to the artists of "
-"moderate popularity. And that means, with less money we can adequately "
-"support a much larger number of artists."
+"Well, the money we use to make A tremendously rich is failing to do an "
+"effective job of supporting the arts; so, it's inefficient. Therefore I say: "
+"let's use the cube root. Cube root looks sort of like this. The point is: if "
+"A is a thousand times as popular as B, with the cube root A will get ten "
+"times as much as B, not a thousand times as much, just ten times as much. So "
+"the use of the cube root shifts a lot of the money from the stars to the "
+"artists of moderate popularity. And that means, with less money we can "
+"adequately support a much larger number of artists."
 msgstr ""
 
 #. type: Content of: <p>
@@ -1276,8 +1326,8 @@
 "now. First of all because it would be supporting artists but not companies, "
 "second because it would shift the money from the stars to the artists of "
 "moderate popularity. Now, it would remain the case that the more popular you "
-"are, the more money you get. So the star A would still get more than B, but "
-"not astronomically more."
+"are, the more money you get. And so the star A would still get more than B, "
+"but not astronomically more."
 msgstr ""
 
 #. type: Content of: <p>
@@ -1285,14 +1335,14 @@
 "That's one method, and because it won't be so much money it doesn't matter "
 "so much how we get the money. It could be from a special tax on Internet "
 "connectivity, it could just be some of the general budget that gets "
-"allocated to this purpose. We won't care because it won't be so much money; "
+"allocated to this purpose. We won't care because it won't be so much money, "
 "much less than we're paying now."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "The other method I've proposed is voluntary payments. Suppose each player "
-"had a button you could use to send one euro. A lot of people would send it, "
+"had a button you could use to send one euro. A lot of people would send it; "
 "after all it's not that much money. I think a lot of you might push that "
 "button every day, to give one euro to some artist who had made a work that "
 "you liked. But nothing would demand this, you wouldn't be required or "
@@ -1300,11 +1350,11 @@
 "like it. But there are some people who wouldn't do it because they're poor "
 "and they can't afford to give one euro. And it's good that they won't give "
 "it, we don't have to squeeze money out of poor people to support the "
-"artists. There are enough non poor people who'll be happy to do it. Why "
+"artists. There are enough non-poor people who'll be happy to do it. Why "
 "wouldn't you give one euro to some artists today, if you appreciated their "
 "work? It's too inconvenient to give it to them. So my proposal is to remove "
-"the inconvenience. If the only reason not to give that euro is [that] you "
-"would have one euro less, you would do it fairly often."
+"the inconvenience. If the only reason not to give that euro is you would "
+"have one euro less, you would do it fairly often."
 msgstr ""
 
 #. type: Content of: <p>
@@ -1336,12 +1386,12 @@
 
 #. type: Content of: <p>
 msgid ""
-"But, in the Internet, you do need that. For instance if want to distribute a "
-"text on the Internet, you need companies to help you do it.  You can't do it "
-"by yourself. So if you want to have a website, you need the support of an "
-"ISP or a hosting company, and you need a domain name registrar. You need "
-"them to continue to let you do what you're doing. So you're doing it "
-"effectively on sufferance, not by right."
+"But, in the Internet, you <em>do</em> need that. For instance if want to "
+"distribute a text on the Internet, you need companies to help you do it.  "
+"You can't do it by yourself. So if you want to have a website, you need the "
+"support of an ISP or a hosting company, and you need a domain name "
+"registrar. You need them to continue to let you do what you're doing. So "
+"you're doing it effectively on sufferance, not by right."
 msgstr ""
 
 #. type: Content of: <p>
@@ -1351,34 +1401,34 @@
 "digital activities vulnerable to suppression. We learned this when the "
 "United States government launched a &ldquo;distributed denial of service "
 "attack&rdquo; (DDoS) against WikiLeaks. Now I'm making a bit of joke because "
-"the words “distributed denial of service attack” usually refer to a "
-"different kind of attack. But they fit perfectly with what the United States "
-"did. The United States went to the various kinds of network services that "
-"WikiLeaks depended on, and told them to cut off service to WikiLeaks. And "
-"they did."
+"the words &ldquo;distributed denial of service attack&rdquo; usually refer "
+"to a different kind of attack. But they fit perfectly with what the United "
+"States did. The United States went to the various kinds of network services "
+"that WikiLeaks depended on, and told them to cut off service to "
+"WikiLeaks. And they did!"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
 "For instance, WikiLeaks had rented a virtual Amazon server, and the US "
-"government told Amazon: &ldquo;cut off service for WikiLeaks.&rdquo; And it "
-"did, arbitrarily. And then, Amazon had certain domain names such as as "
-"wikileaks.org, the US government tried to get all those domains shut "
+"government told Amazon: &ldquo;Cut off service for WikiLeaks.&rdquo; And it "
+"did, arbitrarily. And then, Amazon had certain domain names such as "
+"wikileaks.org. The US government tried to get all those domains shut "
 "off. But it didn't succeed, some of them were outside its control and were "
 "not shut off."
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"Then, there were the payment companies. The US went to PayPal, and said: "
+"Then, there were the payment companies. The US went to PayPal and said: "
 "&ldquo;Stop transferring money to WikiLeaks or we'll make life difficult for "
 "you.&rdquo; And PayPal shut off payments to WikiLeaks. And then it went to "
 "Visa and Mastercard and got them to shut off payments to WikiLeaks.  Others "
-"started collecting money on WikiLeaks behalf and their account were shut off "
-"too. But in this case, maybe something can be done.  There's a company in "
-"Iceland which began collecting money on behalf of WikiLeaks, and so Visa and "
-"Mastercard shut off its account; it couldn't receive money from its "
-"customers either. Now, that business is suing Visa and Mastercard "
+"started collecting money on WikiLeaks' behalf and their accounts were shut "
+"off too. But in this case, maybe something can be done.  There's a company "
+"in Iceland which began collecting money on behalf of WikiLeaks, and so Visa "
+"and Mastercard shut off its account; it couldn't receive money from its "
+"customers either. And now, that business is suing Visa and Mastercard "
 "apparently, under European Union law, because Visa and Mastercard together "
 "have a near-monopoly. They're not allowed to arbitrarily deny service to "
 "anyone."
@@ -1390,11 +1440,11 @@
 "that we use in the Internet. If you rented a store to hand out statements of "
 "what you think, or any other kind of information that you can lawfully "
 "distribute, the landlord couldn't kick you out just because he didn't like "
-"what you were saying. As long as you keep paying the rent, you have the "
-"right to continue in that store for a certain agreed-on period of time that "
-"you signed. So you have some rights that you can enforce. And they couldn't "
-"shut off your telephone line because the phone company doesn't like what you "
-"said or because some powerful entity didn't like what you said and "
+"what you were saying. As long as you keep paying the rent, you have a right "
+"to continue in that store for a certain agreed-on period of time that you "
+"signed. So you have some rights that you can enforce. And they couldn't shut "
+"off your telephone line because the phone company doesn't like what you "
+"said, or because some powerful entity didn't like what you said and "
 "threatened the phone company. No! As long as you pay the bills and obey "
 "certain basic rules, they can't shut off your phone line. This is what it's "
 "like to have some rights!"
@@ -1411,7 +1461,7 @@
 #. type: Content of: <p>
 msgid ""
 "Now I'd like to say that for more information about free software, look at "
-"GNU.org. Also look at fsf.org, which is the website of the Free Software "
+"gnu.org. Also look at fsf.org, which is the website of the Free Software "
 "Foundation. You can go there and find many ways you can help us, for "
 "instance. You can also become a member of the Free Software Foundation "
 "through that site. [&hellip;] There is also the Free Software Foundation of "

Index: philosophy/po/fs-translations.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.ca.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- philosophy/po/fs-translations.ca.po 2 Apr 2012 08:28:26 -0000       1.33
+++ philosophy/po/fs-translations.ca.po 6 Apr 2012 16:31:16 -0000       1.34
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: fs-translations.ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-02 04:25-0300\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: 2012-03-01 18:06+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -346,16 +346,10 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
-msgid ""
-"<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
-"&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
-"&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
-"&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
-msgstr ""
-"<strong>Rus:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
-"&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
-"&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
-"&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
+#, fuzzy
+#| msgid "<strong>Macedonian:</strong> слободен софтвер 
(sloboden softver)"
+msgid "<strong>Russian:</strong> свободные программы 
(svobodnie programmi)"
+msgstr "<strong>Macedònic:</strong> слободен софтвер (sloboden 
softver)"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -495,9 +489,13 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 "
+#| "Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
-"Software Foundation, Inc."
+"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
 "Software Foundation, Inc."
@@ -526,6 +524,18 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+# type: Content of: <ul><li>
+#~ msgid ""
+#~ "<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
+#~ "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
+#~ "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
+#~ "&#1095;&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
+#~ msgstr ""
+#~ "<strong>Rus:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
+#~ "&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
+#~ "&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
+#~ "&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
+
 # type: Content of: <div><h4>
 #~ msgid "Translations of this page"
 #~ msgstr "Traduccions d'aquesta pàgina"

Index: philosophy/po/fs-translations.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.de.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/po/fs-translations.de.po 2 Apr 2012 08:28:26 -0000       1.16
+++ philosophy/po/fs-translations.de.po 6 Apr 2012 16:31:16 -0000       1.17
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fs-translations.html\n"
-"POT-Creation-Date: 2012-04-02 04:25-0300\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: 2012-03-31 19:50+0200\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -304,16 +304,10 @@
 msgstr "<strong>Rumänisch:</strong> „software liber“"
 
 #. type: Content of: <ul><li>
-msgid ""
-"<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
-"&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
-"&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
-"&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
-msgstr ""
-"<strong>Russisch:</strong> 
„&#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
-"&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
-"&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
-"&#1077;&#1085;&#1080;&#1077;“ (svobodnoe programmnoe obespechenie)"
+#, fuzzy
+#| msgid "<strong>Macedonian:</strong> слободен софтвер 
(sloboden softver)"
+msgid "<strong>Russian:</strong> свободные программы 
(svobodnie programmi)"
+msgstr "<strong>Mazedonisch:</strong> „слободен софтвер“ 
(sloboden softver)"
 
 #. type: Content of: <ul><li>
 msgid "<strong>Sardinian:</strong> software liberu"
@@ -433,9 +427,13 @@
 "Koordinierung und Einsendung von Übersetzungen zu erhalten."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 "
+#| "Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
-"Software Foundation, Inc."
+"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
 "Software Foundation, Inc."
@@ -460,3 +458,14 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Aktualisierung:"
+
+#~ msgid ""
+#~ "<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
+#~ "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
+#~ "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
+#~ "&#1095;&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
+#~ msgstr ""
+#~ "<strong>Russisch:</strong> „&#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
+#~ "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
+#~ "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
+#~ "&#1095;&#1077;&#1085;&#1080;&#1077;“ (svobodnoe programmnoe 
obespechenie)"

Index: philosophy/po/fs-translations.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.fr.po,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- philosophy/po/fs-translations.fr.po 2 Apr 2012 08:28:26 -0000       1.45
+++ philosophy/po/fs-translations.fr.po 6 Apr 2012 16:31:16 -0000       1.46
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fs-translations.html\n"
-"POT-Creation-Date: 2012-04-02 04:25-0300\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: 2012-03-30 16:25+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -303,16 +303,13 @@
 msgstr "<strong>Roumain&nbsp;:</strong> software liber"
 
 #. type: Content of: <ul><li>
-msgid ""
-"<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
-"&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
-"&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
-"&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
-msgstr ""
-"<strong>Russe&nbsp;:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
-"&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
-"&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
-"&#1095;&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
+# | [-<strong>Macedonian:</strong> слободен софтвер (sloboden
+# | softver)-]{+<strong>Russian:</strong> свободные
+# | программы (svobodnie programmi)+}
+#, fuzzy
+#| msgid "<strong>Macedonian:</strong> слободен софтвер 
(sloboden softver)"
+msgid "<strong>Russian:</strong> свободные программы 
(svobodnie programmi)"
+msgstr "<strong>Macédonien&nbsp;:</strong> слободен софтвер 
(sloboden softver)"
 
 #. type: Content of: <ul><li>
 msgid "<strong>Sardinian:</strong> software liberu"
@@ -432,9 +429,15 @@
 "la soumission de traductions de cet article."
 
 #. type: Content of: <div><p>
+# | Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, [-2011-]
+# | {+2011, 2012+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 "
+#| "Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
-"Software Foundation, Inc."
+"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
 "Software Foundation, Inc."
@@ -460,3 +463,14 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour&nbsp;:"
+
+#~ msgid ""
+#~ "<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
+#~ "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
+#~ "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
+#~ "&#1095;&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
+#~ msgstr ""
+#~ "<strong>Russe&nbsp;:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
+#~ "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
+#~ "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
+#~ "&#1095;&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"

Index: philosophy/po/fs-translations.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.ja.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/fs-translations.ja.po 3 Apr 2012 01:14:54 -0000       1.6
+++ philosophy/po/fs-translations.ja.po 6 Apr 2012 16:31:16 -0000       1.7
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fs-translations.html\n"
-"POT-Creation-Date: 2012-04-02 04:25-0300\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: 2012-04-03 09:36+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-04-06 12:27-0300\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -289,16 +290,10 @@
 msgstr "<strong>ルーマニア語:</strong> software liber"
 
 #. type: Content of: <ul><li>
-msgid ""
-"<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
-"&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
-"&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
-"&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
-msgstr ""
-"<strong>ロシア語:</strong> 
&#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
-"&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
-"&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
-"&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
+#, fuzzy
+#| msgid "<strong>Macedonian:</strong> слободен софтвер 
(sloboden softver)"
+msgid "<strong>Russian:</strong> свободные программы 
(svobodnie programmi)"
+msgstr "<strong>マケドニア語:</strong> слободен софтвер 
(sloboden softver)"
 
 #. type: Content of: <ul><li>
 msgid "<strong>Sardinian:</strong> software liberu"
@@ -415,9 +410,13 @@
 "translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 "
+#| "Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
-"Software Foundation, Inc."
+"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
 "Software Foundation, Inc."
@@ -441,3 +440,14 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最終更新:"
+
+#~ msgid ""
+#~ "<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
+#~ "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
+#~ "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
+#~ "&#1095;&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
+#~ msgstr ""
+#~ "<strong>ロシア語:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
+#~ "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
+#~ "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
+#~ "&#1095;&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"

Index: philosophy/po/fs-translations.ko.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.ko.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/fs-translations.ko.po 5 Apr 2012 09:02:16 -0000       1.7
+++ philosophy/po/fs-translations.ko.po 6 Apr 2012 16:31:17 -0000       1.8
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fs-translations.html\n"
-"POT-Creation-Date: 2012-04-02 04:25-0300\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: 2012-04-04 17:48+0900\n"
 "Last-Translator: Chang-hun Song <address@hidden>\n"
 "Language-Team: Korean <address@hidden>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Outdated-Since: 2012-04-06 12:27-0300\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -287,16 +288,10 @@
 msgstr "<strong>Romanian:</strong> software liber"
 
 #. type: Content of: <ul><li>
-msgid ""
-"<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
-"&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
-"&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
-"&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
-msgstr ""
-"<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
-"&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
-"&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
-"&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
+#, fuzzy
+#| msgid "<strong>Macedonian:</strong> слободен софтвер 
(sloboden softver)"
+msgid "<strong>Russian:</strong> свободные программы 
(svobodnie programmi)"
+msgstr "<strong>Macedonian:</strong> слободен софтвер (sloboden 
softver)"
 
 #. type: Content of: <ul><li>
 msgid "<strong>Sardinian:</strong> software liberu"
@@ -413,9 +408,13 @@
 "standards/README.translations.html\">번역 안내</a>를 참고해 
주세요."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 "
+#| "Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
-"Software Foundation, Inc."
+"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 "
+"Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
 "Software Foundation, Inc."
@@ -439,3 +438,14 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "최종 수정일:"
+
+#~ msgid ""
+#~ "<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
+#~ "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
+#~ "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
+#~ "&#1095;&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
+#~ msgstr ""
+#~ "<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
+#~ "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
+#~ "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
+#~ "&#1095;&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"

Index: philosophy/po/fs-translations.pot
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.pot,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/po/fs-translations.pot   2 Apr 2012 08:28:26 -0000       1.22
+++ philosophy/po/fs-translations.pot   6 Apr 2012 16:31:17 -0000       1.23
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-02 04:25-0300\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -248,12 +248,7 @@
 msgstr ""
 
 #. type: Content of: <ul><li>
-msgid ""
-"<strong>Russian:</strong> "
-"&#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;&#1086;&#1077; "
-"&#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;&#1085;&#1086;&#1077; 
"
-"&#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;&#1077;&#1085;&#1080;&#1077; 
"
-"(svobodnoe programmnoe obespechenie)"
+msgid "<strong>Russian:</strong> свободные программы 
(svobodnie programmi)"
 msgstr ""
 
 #. type: Content of: <ul><li>
@@ -354,8 +349,8 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
-"Software Foundation, Inc."
+"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 "
+"Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: philosophy/po/fs-translations.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.sr.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/po/fs-translations.sr.po 2 Apr 2012 08:28:27 -0000       1.23
+++ philosophy/po/fs-translations.sr.po 6 Apr 2012 16:31:17 -0000       1.24
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fs-translations.html\n"
-"POT-Creation-Date: 2012-04-02 04:25-0300\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: 2008-11-26 18:15+0100\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -378,21 +378,8 @@
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
 #, fuzzy
-#| msgid ""
-#| "<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
-#| "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
-#| "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
-#| "&#1095;&#1077;&#1085;&#1080;&#1077;"
-msgid ""
-"<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
-"&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
-"&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
-"&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
-msgstr ""
-"<strong>руски:</strong> 
&#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
-"&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
-"&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
-"&#1077;&#1085;&#1080;&#1077;"
+msgid "<strong>Russian:</strong> свободные программы 
(svobodnie programmi)"
+msgstr "<strong>хрватски:</strong> slobodni softver"
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -553,8 +540,8 @@
 #. type: Content of: <div><p>
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free "
-"Software Foundation, Inc."
+"Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 "
+"Free Software Foundation, Inc."
 msgstr ""
 "<b>Ауторска права:</b><br />Copyright &copy; 1999, 2000, 2004, 
2006, 2007, "
 "2008 Free Software Foundation, Inc.,"
@@ -584,6 +571,24 @@
 msgid "Updated:"
 msgstr "Ажурирано:"
 
+# type: Content of: <ul><li>
+#, fuzzy
+#~| msgid ""
+#~| "<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
+#~| "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
+#~| "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
+#~| "&#1095;&#1077;&#1085;&#1080;&#1077;"
+#~ msgid ""
+#~ "<strong>Russian:</strong> &#1089;&#1074;&#1086;&#1073;&#1086;&#1076;"
+#~ "&#1085;&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;"
+#~ "&#1084;&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;"
+#~ "&#1095;&#1077;&#1085;&#1080;&#1077; (svobodnoe programmnoe obespechenie)"
+#~ msgstr ""
+#~ "<strong>руски:</strong> 
&#1089;&#1074;&#1086;&#1073;&#1086;&#1076;&#1085;"
+#~ "&#1086;&#1077; &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1084;"
+#~ "&#1085;&#1086;&#1077; &#1086;&#1073;&#1077;&#1089;&#1087;&#1077;&#1095;"
+#~ "&#1077;&#1085;&#1080;&#1077;"
+
 # type: Content of: <div><h4>
 #~ msgid "Translations of this page"
 #~ msgstr "Преводи ове странице"

Index: philosophy/po/historical-apsl.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/historical-apsl.de.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/historical-apsl.de.po 6 Apr 2012 16:02:15 -0000       1.1
+++ philosophy/po/historical-apsl.de.po 6 Apr 2012 16:31:17 -0000       1.2
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: historical-apsl.html\n"
-"POT-Creation-Date: 2011-09-20 12:29-0300\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: 2012-04-06 17:39+0200\n"
 "Last-Translator: Wesley Kohne <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-04-06 12:27-0300\n"
 
 #. type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "Problems with older versions of the Apple License (APSL) - GNU Project - "
+#| "Free Software Foundation"
 msgid ""
 "Problems with older versions of the Apple License (APSL) - GNU Project - "
 "Free Software Foundation"

Index: philosophy/po/historical-apsl.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/historical-apsl.fr.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/po/historical-apsl.fr.po 18 Mar 2012 20:48:26 -0000      1.13
+++ philosophy/po/historical-apsl.fr.po 6 Apr 2012 16:31:17 -0000       1.14
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: historical-apsl.html\n"
-"POT-Creation-Date: 2011-09-20 12:29-0300\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: 2012-03-05 18:05+0100\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -16,18 +16,30 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-04-06 12:27-0300\n"
 "Plural-Forms: \n"
 
 #. type: Content of: <title>
+# | Problems with older versions of the Apple License (APSL)  - GNU Project -
+# | Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Problems with older versions of the Apple License (APSL) - GNU Project - "
+#| "Free Software Foundation (FSF)"
 msgid ""
 "Problems with older versions of the Apple License (APSL) - GNU Project - "
-"Free Software Foundation (FSF)"
+"Free Software Foundation"
 msgstr ""
 "Les problèmes avec les anciennes versions de la licence Apple (APSL) - "
 "Projet GNU - Free Software Foundation (FSF)"
 
 #. type: Content of: <h2>
-msgid "The Problems with older versions of the Apple Public Source License"
+# | The Problems with older versions of the Apple Public Source License
+# | {+(APSL)+}
+#, fuzzy
+#| msgid "The Problems with older versions of the Apple Public Source License"
+msgid ""
+"The Problems with older versions of the Apple Public Source License (APSL)"
 msgstr ""
 "Les problèmes avec les anciennes versions de l'<em>Apple Public Source "
 "License</em>"
@@ -281,42 +293,55 @@
 msgstr " "
 
 #. type: Content of: <div><p>
-msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
-"\"><em>address@hidden</em></a>.  There are also <a href=\"/contact/\">other "
-"ways to contact</a> the FSF."
+# | Please send general FSF &amp; GNU inquiries to <a
+# | href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also 
<a
+# | href=\"/contact/\">other ways to contact</a> the FSF.  {+Broken links and
+# | other corrections or suggestions can be sent to <a
+# | href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+#| "org\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/"
+#| "\">other ways to contact</a> the FSF."
+msgid ""
+"Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+"\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
+"to contact</a> the FSF.  Broken links and other corrections or suggestions "
+"can be sent to <a href=\"mailto:address@hidden";>&lt;address@hidden"
+"org&gt;</a>."
 msgstr ""
 "Veuillez envoyer les requêtes concernant la FSF et GNU à <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>. Il existe aussi <a 
href=\"/contact/"
 "\">d'autres moyens de contacter</a> la FSF."
 
+#
+#
+#
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
-"Please send broken links and other corrections (or suggestions) to <a href="
-"\"mailto:address@hidden";><em>address@hidden</em></a>."
+"For information on coordinating and submitting translations of this article, "
+"see <a href=\"/server/standards/README.translations.html\">Translations "
+"README</a>."
 msgstr ""
-"Veuillez indiquer (en anglais) les liens orphelins et autres corrections (ou "
-"suggestions) à <a href=\"mailto:address@hidden";><em>address@hidden</"
-"em></a>."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
-"translations of this article."
-msgstr ""
-"Veuillez consulter le <a href=\"/server/standards/README.translations.html"
-"\">README des traductions</a> pour des informations sur la coordination et "
-"la soumission de traductions de cet article."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc.,"
+# | Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc.[-,-]
+#, fuzzy
+#| msgid "Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc.,"
+msgid "Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc.,"
 
-#. type: Content of: <div><address>
-msgid "51 Franklin St, Fifth Floor, Boston, MA 02110, USA"
-msgstr "51 Franklin St, Fifth Floor, Boston, MA 02110, USA"
-
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
@@ -338,3 +363,32 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour&nbsp;:"
+
+#~ msgid ""
+#~ "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#~ "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#~ "ways to contact</a> the FSF."
+#~ msgstr ""
+#~ "Veuillez envoyer les requêtes concernant la FSF et GNU à <a 
href=\"mailto:";
+#~ "address@hidden">&lt;address@hidden&gt;</a>. Il existe aussi <a 
href=\"/contact/"
+#~ "\">d'autres moyens de contacter</a> la FSF."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections (or suggestions) to <a "
+#~ "href=\"mailto:address@hidden";><em>address@hidden</em></a>."
+#~ msgstr ""
+#~ "Veuillez indiquer (en anglais) les liens orphelins et autres corrections "
+#~ "(ou suggestions) à <a href=\"mailto:address@hidden";
+#~ "\"><em>address@hidden</em></a>."
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Veuillez consulter le <a href=\"/server/standards/README.translations.html"
+#~ "\">README des traductions</a> pour des informations sur la coordination "
+#~ "et la soumission de traductions de cet article."
+
+#~ msgid "51 Franklin St, Fifth Floor, Boston, MA 02110, USA"
+#~ msgstr "51 Franklin St, Fifth Floor, Boston, MA 02110, USA"

Index: philosophy/po/historical-apsl.pot
===================================================================
RCS file: /web/www/www/philosophy/po/historical-apsl.pot,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/historical-apsl.pot   20 Sep 2011 17:17:23 -0000      1.5
+++ philosophy/po/historical-apsl.pot   6 Apr 2012 16:31:17 -0000       1.6
@@ -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-04-06 12:27-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -18,11 +18,11 @@
 #. type: Content of: <title>
 msgid ""
 "Problems with older versions of the Apple License (APSL) - GNU Project - "
-"Free Software Foundation (FSF)"
+"Free Software Foundation"
 msgstr ""
 
 #. type: Content of: <h2>
-msgid "The Problems with older versions of the Apple Public Source License"
+msgid "The Problems with older versions of the Apple Public Source License 
(APSL)"
 msgstr ""
 
 #. type: Content of: <h3>
@@ -201,30 +201,36 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>.  There are also <a 
"
-"href=\"/contact/\">other ways to contact</a> the FSF."
+"Please send general FSF &amp; GNU inquiries to <a "
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a "
+"href=\"/contact/\">other ways to contact</a> the FSF.  Broken links and "
+"other corrections or suggestions can be sent to <a "
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+msgstr ""
+
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#
+#.         &lt;address@hidden&gt;</a>.</p>
+#
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
+#. type: Content of: <div><p>
+msgid ""
+"For information on coordinating and submitting translations of this article, "
+"see <a href=\"/server/standards/README.translations.html\">Translations "
+"README</a>."
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections (or suggestions) to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please see the <a "
-"href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid "Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc.,"
-msgstr ""
-
-#. type: Content of: <div><address>
-msgid "51 Franklin St, Fifth Floor, Boston, MA 02110, USA"
+msgid "Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: philosophy/po/historical-apsl.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/historical-apsl.ru.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/historical-apsl.ru.po 26 Mar 2012 16:41:02 -0000      1.6
+++ philosophy/po/historical-apsl.ru.po 6 Apr 2012 16:31:17 -0000       1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: historical-apsl.html\n"
-"POT-Creation-Date: 2011-09-20 12:29-0300\n"
+"POT-Creation-Date: 2012-04-06 12:27-0300\n"
 "PO-Revision-Date: 2011-05-14 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -15,20 +15,32 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-04-06 12:27-0300\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"
 
 #. type: Content of: <title>
+# | Problems with older versions of the Apple License (APSL)  - GNU Project -
+# | Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid ""
+#| "Problems with older versions of the Apple License (APSL) - GNU Project - "
+#| "Free Software Foundation (FSF)"
 msgid ""
 "Problems with older versions of the Apple License (APSL) - GNU Project - "
-"Free Software Foundation (FSF)"
+"Free Software Foundation"
 msgstr ""
 "Проблемы старых версий лицензии Apple (APSL) - 
проект GNU - Фонд свободного "
 "программного обеспечения (ФСПО)"
 
 # type: Content of: <h2>
 #. type: Content of: <h2>
-msgid "The Problems with older versions of the Apple Public Source License"
+# | The Problems with older versions of the Apple Public Source License
+# | {+(APSL)+}
+#, fuzzy
+#| msgid "The Problems with older versions of the Apple Public Source License"
+msgid ""
+"The Problems with older versions of the Apple Public Source License (APSL)"
 msgstr ""
 "Проблемы старых версий Общественной 
лицензии исходных текстов Apple (APSL)"
 
@@ -307,46 +319,57 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
-"\"><em>address@hidden</em></a>.  There are also <a href=\"/contact/\">other "
-"ways to contact</a> the FSF."
+# | Please send general FSF &amp; GNU inquiries to <a
+# | href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also 
<a
+# | href=\"/contact/\">other ways to contact</a> the FSF.  {+Broken links and
+# | other corrections or suggestions can be sent to <a
+# | href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+#| "org\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/"
+#| "\">other ways to contact</a> the FSF."
+msgid ""
+"Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+"\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
+"to contact</a> the FSF.  Broken links and other corrections or suggestions "
+"can be sent to <a href=\"mailto:address@hidden";>&lt;address@hidden"
+"org&gt;</a>."
 msgstr ""
 "Пожалуйста, присылайте запросы фонду и GNU 
по адресу <a href=\"mailto:";
 "address@hidden">&lt;address@hidden&gt;</a>. Есть также <a 
href=\"/contact/"
 "\">другие способы связаться</a> с фондом."
 
-# type: Content of: <div><p>
+#
+#
+#
+#.  TRANSLATORS: Ignore the original text in this paragraph,
+#.         replace it with the translation of these two:
+#.         We work hard and do our best to provide accurate, good quality
+#.         translations.  However, we are not exempt from imperfection.
+#.         Please send your comments and general suggestions in this regard
+#.         to <a href="mailto:address@hidden";>
+#.         &lt;address@hidden&gt;</a>.</p>
+#.         <p>For information on coordinating and submitting translations of
+#.         our web pages, see <a
+#.         href="/server/standards/README.translations.html">Translations
+#.         README</a>. 
 #. type: Content of: <div><p>
 msgid ""
-"Please send broken links and other corrections (or suggestions) to <a href="
-"\"mailto:address@hidden";><em>address@hidden</em></a>."
+"For information on coordinating and submitting translations of this article, "
+"see <a href=\"/server/standards/README.translations.html\">Translations "
+"README</a>."
 msgstr ""
-"Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки или 
"
-"предложения по адресу <a 
href=\"mailto:address@hidden";>&lt;web-"
-"address@hidden&gt;</a>."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
-"translations of this article."
-msgstr ""
-"Сведения по координации и предложениям 
переводов этой статьи см. в <a href="
-"\"/server/standards/README.translations.html\">&ldquo;Руководстве 
по "
-"переводам&rdquo;</a>."
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc.,"
+# | Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc.[-,-]
+#, fuzzy
+#| msgid "Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc.,"
+msgid "Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1999, 2001, 2007, 2011 Free Software Foundation, Inc.,"
 
-# type: Content of: <div><address>
-#. type: Content of: <div><address>
-msgid "51 Franklin St, Fifth Floor, Boston, MA 02110, USA"
-msgstr "51 Franklin St, Fifth Floor, Boston, MA 02110, USA"
-
 #. type: Content of: <div><p>
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
@@ -373,6 +396,15 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections (or suggestions) to <a "
+#~ "href=\"mailto:address@hidden";><em>address@hidden</em></a>."
+#~ msgstr ""
+#~ "Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки "
+#~ "или предложения по адресу <a 
href=\"mailto:address@hidden";>&lt;"
+#~ "address@hidden&gt;</a>."
+
 # type: Content of: <div><h4>
 #~ msgid "Translations of this page"
 #~ msgstr "Переводы этой страницы"

Index: philosophy/po/historical-apsl.translist
===================================================================
RCS file: /web/www/www/philosophy/po/historical-apsl.translist,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/historical-apsl.translist     11 Mar 2012 11:50:06 -0000      
1.4
+++ philosophy/po/historical-apsl.translist     6 Apr 2012 16:31:17 -0000       
1.5
@@ -4,6 +4,8 @@
 <ul class="translations-list">
 <!-- English -->
 <li><a href="/philosophy/historical-apsl.en.html">English</a>&nbsp;[en]</li>
+<!-- German -->
+<li><a href="/philosophy/historical-apsl.de.html">Deutsch</a>&nbsp;[de]</li>
 <!-- Spanish -->
 <li><a href="/philosophy/historical-apsl.es.html">español</a>&nbsp;[es]</li>
 <!-- French -->

Index: server/gnun/compendia/compendium.af.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.af.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.af.po      25 Mar 2012 16:27:30 -0000      
1.2
+++ server/gnun/compendia/compendium.af.po      6 Apr 2012 16:31:49 -0000       
1.3
@@ -174,13 +174,6 @@
 "ander regstellings (of voorstelle) aan <a href=\"mailto:address@hidden";
 "org\"><em>address@hidden</em></a>."
 
-# type: Content of: <body><div><div><div><ul><li>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -255,3 +248,9 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <body><div><div><div><ul><li>
+#, fuzzy
+#~| msgid "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"

Index: server/gnun/compendia/compendium.ar.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ar.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/gnun/compendia/compendium.ar.po      2 Apr 2012 08:28:52 -0000       
1.3
+++ server/gnun/compendia/compendium.ar.po      6 Apr 2012 16:31:50 -0000       
1.4
@@ -195,11 +195,6 @@
 "وأي تصحيحات أو اقتراحات إلى <a 
href=\"mailto:address@hidden";
 "\"><em>address@hidden</em></a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "بقلم <a href=\"http://www.stallman.org/\";>ريتشارد ستولم
ن</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -286,3 +281,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr "ملاحظة حقوق النشر أعلاه."
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "بقلم <a href=\"http://www.stallman.org/\";>ريتشارد 
ستولمن</a>"

Index: server/gnun/compendia/compendium.bg.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.bg.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.bg.po      25 Mar 2012 16:27:30 -0000      
1.2
+++ server/gnun/compendia/compendium.bg.po      6 Apr 2012 16:31:50 -0000       
1.3
@@ -208,11 +208,6 @@
 "хипервръзки и други корекции или 
предложения на е-поща: <a href=\"mailto:web-";
 "address@hidden">&lt;address@hidden&gt;</a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "от <a href=\"http://www.stallman.org/\";>Ричард 
Столман</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -294,3 +289,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "от <a href=\"http://www.stallman.org/\";>Ричард 
Столман</a>"

Index: server/gnun/compendia/compendium.ca.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ca.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.ca.po      25 Mar 2012 16:27:31 -0000      
1.2
+++ server/gnun/compendia/compendium.ca.po      6 Apr 2012 16:31:50 -0000       
1.3
@@ -144,11 +144,6 @@
 "Envieu si us plau els enllaços trencats i altres correccions o suggeriments "
 "a <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "per <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -232,3 +227,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr "Nota de copyright a sobre."
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "per <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.cs.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.cs.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.cs.po      25 Mar 2012 16:27:31 -0000      
1.2
+++ server/gnun/compendia/compendium.cs.po      6 Apr 2012 16:31:50 -0000       
1.3
@@ -151,11 +151,6 @@
 "Ohledně nefunkčních odkazů, jiných oprav a návrhů se prosím obracejte 
na <a "
 "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "od <a href=\"http://www.stallman.org/\";>Richarda Stallmana</a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -230,3 +225,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "od <a href=\"http://www.stallman.org/\";>Richarda Stallmana</a>"

Index: server/gnun/compendia/compendium.de.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.de.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.de.po      25 Mar 2012 16:27:31 -0000      
1.2
+++ server/gnun/compendia/compendium.de.po      6 Apr 2012 16:31:50 -0000       
1.3
@@ -135,12 +135,6 @@
 "an <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;"
 "</a>."
 
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr ""
-"von <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></"
-"a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -219,3 +213,8 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr "Copyright-Hinweis siehe oben."
+
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr ""
+#~ "von <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
+#~ "strong></a>"

Index: server/gnun/compendia/compendium.el.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.el.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.el.po      25 Mar 2012 16:27:31 -0000      
1.2
+++ server/gnun/compendia/compendium.el.po      6 Apr 2012 16:31:50 -0000       
1.3
@@ -138,13 +138,6 @@
 "Παρακαλούμε στείλτε ανενεργούς συ
νδέσμους και άλλες διορθώσεις ή 
προτάσεις "
 "στο <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "by <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "από τον <a href=\"http://www.stallman.org/\";>Richard M. 
Stallman</a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -225,3 +218,10 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#~| msgid "by <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr ""
+#~ "από τον <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"

Index: server/gnun/compendia/compendium.es.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.es.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.es.po      25 Mar 2012 16:27:31 -0000      
1.2
+++ server/gnun/compendia/compendium.es.po      6 Apr 2012 16:31:50 -0000       
1.3
@@ -152,11 +152,6 @@
 "Por favor, envíe enlaces rotos y otras correcciones o sugerencias a <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "por <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -240,3 +235,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "por <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.fa.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fa.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.fa.po      25 Mar 2012 16:27:31 -0000      
1.2
+++ server/gnun/compendia/compendium.fa.po      6 Apr 2012 16:31:50 -0000       
1.3
@@ -202,11 +202,6 @@
 "href=\"mailto:address@hidden";><em>address@hidden</em></a> ارسال "
 "کنید."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "نوشتهٔ <a href=\"http://www.stallman.org/\";>ریچارد 
استالمن</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -289,3 +284,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "نوشتهٔ <a href=\"http://www.stallman.org/\";>ریچارد 
استالمن</a>"

Index: server/gnun/compendia/compendium.fr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/gnun/compendia/compendium.fr.po      25 Mar 2012 16:27:31 -0000      
1.3
+++ server/gnun/compendia/compendium.fr.po      6 Apr 2012 16:31:50 -0000       
1.4
@@ -134,10 +134,6 @@
 "suggestions à <a href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>."
 
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "par <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -222,3 +218,6 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr "Voir ci-dessus la notice de copyright."
+
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "par <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.he.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.he.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.he.po      25 Mar 2012 16:27:31 -0000      
1.2
+++ server/gnun/compendia/compendium.he.po      6 Apr 2012 16:31:50 -0000       
1.3
@@ -123,10 +123,6 @@
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr ""
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "

Index: server/gnun/compendia/compendium.id.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.id.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.id.po      25 Mar 2012 16:27:31 -0000      
1.2
+++ server/gnun/compendia/compendium.id.po      6 Apr 2012 16:31:50 -0000       
1.3
@@ -131,17 +131,6 @@
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 
-# type: Content of: <p>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
-#| "strong>"
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr ""
-"<strong>oleh <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
-"strong>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -230,3 +219,13 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#~| msgid ""
+#~| "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
+#~| "strong>"
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr ""
+#~ "<strong>oleh <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
+#~ "strong>"

Index: server/gnun/compendia/compendium.it.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.it.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/gnun/compendia/compendium.it.po      25 Mar 2012 16:27:31 -0000      
1.3
+++ server/gnun/compendia/compendium.it.po      6 Apr 2012 16:31:50 -0000       
1.4
@@ -139,11 +139,6 @@
 "suggerimenti relativi alle pagine web a <a href=\"mailto:address@hidden";
 "\">address@hidden</a>. Grazie."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "di <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -232,3 +227,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr "La nota di copyright è qui sopra."
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "di <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.ja.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ja.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/gnun/compendia/compendium.ja.po      25 Mar 2012 16:27:31 -0000      
1.4
+++ server/gnun/compendia/compendium.ja.po      6 Apr 2012 16:31:50 -0000       
1.5
@@ -129,10 +129,6 @@
 "リンク切れや他の修正、提案は、<a 
href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a>までお送りください。"
 
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "<a 
href=\"http://www.stallman.org/\";>リチャード・ストールマン</a>著"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -217,3 +213,6 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr "著作権表示は上述のとおり。"
+
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "<a 
href=\"http://www.stallman.org/\";>リチャード・ストールマン</a>著"

Index: server/gnun/compendia/compendium.ko.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ko.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/gnun/compendia/compendium.ko.po      25 Mar 2012 16:27:31 -0000      
1.3
+++ server/gnun/compendia/compendium.ko.po      6 Apr 2012 16:31:50 -0000       
1.4
@@ -154,12 +154,6 @@
 "끊어진 링크나 다른 수정 사항 또는 제안은 <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a> 앞으로 보내 주세요."
 
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "by <a href=\"http://www.stallman.org\";>Richard Stallman</a>"
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "글: <a href=\"http://www.stallman.org\";>리처드 스톨먼</a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -238,3 +232,8 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+#, fuzzy
+#~| msgid "by <a href=\"http://www.stallman.org\";>Richard Stallman</a>"
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "글: <a href=\"http://www.stallman.org\";>리처드 스톨먼</a>"

Index: server/gnun/compendia/compendium.ml.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ml.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.ml.po      25 Mar 2012 16:27:31 -0000      
1.2
+++ server/gnun/compendia/compendium.ml.po      6 Apr 2012 16:31:50 -0000       
1.3
@@ -197,11 +197,6 @@
 "നിര്‍ദ്ദേശങ്ങളും അ
ഭിപ്രായങ്ങളും <a href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a> എന്ന 
വിലാസത്തിലേയ്ക്കു് എഴുതുക"
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "എഴുതിയതു് <a 
href=\"http://www.stallman.org/\";>റിച്ചാര്‍ഡ് 
സ്റ്റാള്‍മാന്‍</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -285,3 +280,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "എഴുതിയതു് <a 
href=\"http://www.stallman.org/\";>റിച്ചാര്‍ഡ് 
സ്റ്റാള്‍മാന്‍</a>"

Index: server/gnun/compendia/compendium.nb.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.nb.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.nb.po      25 Mar 2012 16:27:31 -0000      
1.2
+++ server/gnun/compendia/compendium.nb.po      6 Apr 2012 16:31:50 -0000       
1.3
@@ -111,10 +111,6 @@
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr ""
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "

Index: server/gnun/compendia/compendium.nl.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.nl.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.nl.po      25 Mar 2012 16:27:31 -0000      
1.2
+++ server/gnun/compendia/compendium.nl.po      6 Apr 2012 16:31:51 -0000       
1.3
@@ -168,13 +168,6 @@
 "suggesties) te sturen aan: <a href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a>."
 
-# type: Content of: <ul><li><ul><li>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "<a href=\"http://www.es.gnu.org\";>GNU Espa&ntilde;a</a>"
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "<a href=\"http://www.es.gnu.org\";>GNU Spanje</a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -255,3 +248,9 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <ul><li><ul><li>
+#, fuzzy
+#~| msgid "<a href=\"http://www.es.gnu.org\";>GNU Espa&ntilde;a</a>"
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "<a href=\"http://www.es.gnu.org\";>GNU Spanje</a>"

Index: server/gnun/compendia/compendium.pl.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/gnun/compendia/compendium.pl.po      25 Mar 2012 16:27:31 -0000      
1.4
+++ server/gnun/compendia/compendium.pl.po      6 Apr 2012 16:31:51 -0000       
1.5
@@ -150,11 +150,6 @@
 "propozycje) prosimy wysyłać na&nbsp;adres <a href=\"mailto:web-";
 "address@hidden">&lt;address@hidden&gt;</a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "<a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -241,3 +236,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr "Notka o prawach autorskich powyżej."
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "<a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.pot
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.pot        25 Mar 2012 16:27:32 -0000      
1.2
+++ server/gnun/compendia/compendium.pot        6 Apr 2012 16:31:51 -0000       
1.3
@@ -109,10 +109,6 @@
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr ""
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "

Index: server/gnun/compendia/compendium.pt-br.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pt-br.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.pt-br.po   25 Mar 2012 16:27:32 -0000      
1.2
+++ server/gnun/compendia/compendium.pt-br.po   6 Apr 2012 16:31:51 -0000       
1.3
@@ -136,10 +136,6 @@
 "Por favor, envie links quebrados e outras correções ou sugestões para  <a "
 "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "por <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -216,3 +212,6 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "por <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.pt.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pt.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.pt.po      25 Mar 2012 16:27:32 -0000      
1.2
+++ server/gnun/compendia/compendium.pt.po      6 Apr 2012 16:31:51 -0000       
1.3
@@ -123,13 +123,6 @@
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 
-# type: Content of: <body><div><div><div><ul><li>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "<a href=\"http://www.fsf.org/\";>Fundação do Software Livre</a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -200,3 +193,9 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <body><div><div><div><ul><li>
+#, fuzzy
+#~| msgid "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "<a href=\"http://www.fsf.org/\";>Fundação do Software Livre</a>"

Index: server/gnun/compendia/compendium.ro.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ro.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.ro.po      25 Mar 2012 16:27:32 -0000      
1.2
+++ server/gnun/compendia/compendium.ro.po      6 Apr 2012 16:31:51 -0000       
1.3
@@ -169,13 +169,6 @@
 "href=\"mailto:address@hidden";>&lt;address@hidden&gt;"
 "</a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "by <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "de <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -253,3 +246,9 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#~| msgid "by <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "de <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"

Index: server/gnun/compendia/compendium.ru.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ru.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.ru.po      25 Mar 2012 16:27:32 -0000      
1.2
+++ server/gnun/compendia/compendium.ru.po      6 Apr 2012 16:31:51 -0000       
1.3
@@ -141,11 +141,6 @@
 "предложения по адресу <a 
href=\"mailto:address@hidden";>&lt;web-"
 "address@hidden&gt;</a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "<a href=\"http://www.stallman.org/\";>Ричард Столмен</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -233,3 +228,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr "Замечание об авторских правах дано 
выше."
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "<a href=\"http://www.stallman.org/\";>Ричард 
Столмен</a>"

Index: server/gnun/compendia/compendium.sk.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sk.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.sk.po      25 Mar 2012 16:27:32 -0000      
1.2
+++ server/gnun/compendia/compendium.sk.po      6 Apr 2012 16:31:51 -0000       
1.3
@@ -218,10 +218,6 @@
 "odkazy, chyby a možné vylepšenia na <a href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>."
 
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr ""
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""

Index: server/gnun/compendia/compendium.sq.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sq.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/gnun/compendia/compendium.sq.po      3 Apr 2012 16:29:54 -0000       
1.4
+++ server/gnun/compendia/compendium.sq.po      6 Apr 2012 16:31:51 -0000       
1.5
@@ -147,11 +147,6 @@
 "Ju lutem, lidhjet e dëmtuara, këshillat ose ndreqjet e tjera dërgojini te 
<a "
 "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -244,3 +239,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr "Shënim të drejtash kopjimi më sipër."
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.sr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sr.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.sr.po      25 Mar 2012 16:27:32 -0000      
1.2
+++ server/gnun/compendia/compendium.sr.po      6 Apr 2012 16:31:51 -0000       
1.3
@@ -214,11 +214,6 @@
 "неисправне везе и друге исправке (или 
предлоге) на адресу <a href=\"mailto:";
 "address@hidden"><em>address@hidden</em></a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "од <a href=\"http://www.stallman.org/\";>Ричарда 
Сталмана</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -301,3 +296,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "од <a href=\"http://www.stallman.org/\";>Ричарда 
Сталмана</a>"

Index: server/gnun/compendia/compendium.sv.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sv.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.sv.po      25 Mar 2012 16:27:32 -0000      
1.2
+++ server/gnun/compendia/compendium.sv.po      6 Apr 2012 16:31:51 -0000       
1.3
@@ -123,10 +123,6 @@
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr ""
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "

Index: server/gnun/compendia/compendium.ta.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ta.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.ta.po      25 Mar 2012 16:27:32 -0000      
1.2
+++ server/gnun/compendia/compendium.ta.po      6 Apr 2012 16:31:51 -0000       
1.3
@@ -217,13 +217,6 @@
 "உள்ளிட்டவற்றை <a 
href=\"mailto:address@hidden";><em>address@hidden</"
 "em></a> என்ற முகவரிக்கு அ
னுப்பவும்."
 
-# type: Content of: <div><div><div><div><ul><li>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "<a href=\"http://www.fsf.org/jfb\";>Join the FSF</a>"
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "<a href=\"http://www.fsf.org/jfb\";>FSF இல் சேர</a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -297,3 +290,9 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <div><div><div><div><ul><li>
+#, fuzzy
+#~| msgid "<a href=\"http://www.fsf.org/jfb\";>Join the FSF</a>"
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "<a href=\"http://www.fsf.org/jfb\";>FSF இல் சேர</a>"

Index: server/gnun/compendia/compendium.tr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.tr.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.tr.po      25 Mar 2012 16:27:32 -0000      
1.2
+++ server/gnun/compendia/compendium.tr.po      6 Apr 2012 16:31:51 -0000       
1.3
@@ -219,11 +219,6 @@
 "başka düzeltmeleri veya önerilerinizi <a href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a> adresine gönderin."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "Yazan: <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -307,3 +302,7 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <p>
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "Yazan: <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"

Index: server/gnun/compendia/compendium.uk.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.uk.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.uk.po      25 Mar 2012 16:27:32 -0000      
1.2
+++ server/gnun/compendia/compendium.uk.po      6 Apr 2012 16:31:51 -0000       
1.3
@@ -135,13 +135,6 @@
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 
-# type: Content of: <ul><li><ul><li>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "<a href=\"http://www.fsfe.org\";>FSF Europe</a>"
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "<a href=\"http://www.fsfe.org\";>FSF Європа</a>"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -209,3 +202,9 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <ul><li><ul><li>
+#, fuzzy
+#~| msgid "<a href=\"http://www.fsfe.org\";>FSF Europe</a>"
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "<a href=\"http://www.fsfe.org\";>FSF Європа</a>"

Index: server/gnun/compendia/compendium.vi.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.vi.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.vi.po      25 Mar 2012 16:27:33 -0000      
1.2
+++ server/gnun/compendia/compendium.vi.po      6 Apr 2012 16:31:51 -0000       
1.3
@@ -129,10 +129,6 @@
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr ""
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "

Index: server/gnun/compendia/compendium.zh-cn.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-cn.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/gnun/compendia/compendium.zh-cn.po   25 Mar 2012 16:27:33 -0000      
1.2
+++ server/gnun/compendia/compendium.zh-cn.po   6 Apr 2012 16:31:51 -0000       
1.3
@@ -163,13 +163,6 @@
 "发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方(或任何建议),请发送邮件至 <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。"
 
-# type: Content of: <p>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid "by <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
-msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr "<a href=\"http://www.stallman.org/\";>理查德·斯托曼</a> 著"
-
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
@@ -246,3 +239,9 @@
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
 msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#~| msgid "by <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
+#~ msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
+#~ msgstr "<a href=\"http://www.stallman.org/\";>理查德·斯托曼</a> 著"

Index: philosophy/historical-apsl.de.html
===================================================================
RCS file: philosophy/historical-apsl.de.html
diff -N philosophy/historical-apsl.de.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/historical-apsl.de.html  6 Apr 2012 16:30:57 -0000       1.1
@@ -0,0 +1,213 @@
+
+
+<!--#include virtual="/server/header.de.html" -->
+<!-- Parent-Version: 1.67 -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Problems with older versions of the Apple License (APSL)  - GNU Project 
-
+Free Software Foundation</title>
+
+<!--#include virtual="/server/banner.de.html" -->
+<!--#include virtual="/philosophy/po/historical-apsl.translist" -->
+<h2>Probleme mit älteren Versionen der <span xml:lang="en" lang="en">Apple
+Public Source License</span> (APSL)</h2>
+
+<h3>Position der FSF zu älteren Versionen der APSL</h3>
+
+<div class="announcement">
+<blockquote>
+<p>Die aktuelle Version 2.0 der <span xml:lang="en" lang="en">Apple Public
+Source License</span> (APSL) hat die angesprochenen Probleme nicht. Weitere
+Informationen finden Sie unter <a href="/philosophy/apsl"><em>Stellungnahme
+der FSF zur <span xml:lang="en" lang="en">Apple Public Source License</span>
+2.0</em></a>. Dieses Dokument ist nur aus historischen Gründen abrufbar.</p>
+</blockquote>
+</div>
+
+<p>
+Apple hat eine aktualisierte Version, APSLv1.1, freigegeben, die aber
+inakzeptabel blieb. Die Klausel zur Beendigung wurde in eine
+<em>Ausschluss</em>-Klausel geändert, sie hat aber immer noch die gleichen
+negativen Folgen.</p>
+
+<p>
+Im Januar 2001 hat Apple eine weitere Version, APSLv1.2, freigegeben. Diese
+Version behebt zwei schwerwiegende Formfehler, einer ist aber nach wie vor
+offen: jede modifizierte Version, die in einer Organisation
+<em>eingesetzt</em> wird, muss veröffentlicht werden. Die APSLv1.2 ist zwei
+große Schritte in Richtung einer freien Softwarelizenz gegangen, hat aber
+noch einen weiteren großen Schritt zu gehen, bevor sie sich qualifiziert.</p>
+
+<p>
+Im Folgenden der ursprüngliche Kommentar zur ersten Version der APSLv1.0.</p>
+
+<h3>Originalkommentar zur APSL</h3>
+
+<p>
+Nach eingehender Betrachtung von Apples neuer Quellcodelizenz, der APSL,
+stellte ich fest, dass sie hinter den Erwartungen einer freien
+Softwarelizenz zurückbleibt. Sie enthält drei schwerwiegende Fehler, von
+denen jeder ausreichen würde, die Software weniger als frei zu machen.</p>
+
+<h4>Missachtung der Privatsphäre</h4>
+<p>
+  Die APSL erlaubt nicht, eine modifizierte Version zu erstellen und für
+eigene private Zwecke zu nutzen, ohne die Änderungen zu veröffentlichen.</p>
+
+<h4>Zentrale Kontrolle</h4>
+<p>
+  Wer eine modifizierte Version freigibt (oder auch nur zu anderen Zwecken als
+der <em>Forschung und Entwicklung</em> nutzt), muss eine bestimmte
+Organisation darüber benachrichtigen, welche zufällig Apple ist.</p>
+
+<h4>Möglichkeit des jederzeitigen Widerrufs</h4>
+<p>
+  Die Beendigungsklausel besagt, dass Apple diese Lizenz widerrufen und Ihnen
+verbieten kann, den gesamten oder irgendeinen Teil der Software zu
+nutzen&#160;&#8209;&#160;jedes Mal wenn jemand eine Patent- oder
+Copyright-Verletzung beansprucht.</p>
+<p>
+  Dadurch ist die Möglichkeit genommen, wenn Apple es ablehnt ein
+zweifelhaftes Patent zu bekämpfen (oder dessen Ansprüche auf den
+vorliegenden Quellcode fragwürdig ist), einen eigenen Auftritt vor Gericht
+zu haben um dagegen anzukämpfen, weil man auch gegen Apples Copyright
+kämpfen müsste.</p>
+<p>
+  Solch eine Beendigungsklausel ist besonders für Benutzer außerhalb der USA
+schlecht, da es sie indirekt gegenüber dem wahnsinnigen US-Patentsystem und
+dem unfähigen US-Patentamt angreifbar macht, die ihnen normalerweise in
+ihren eigenen Ländern nichts hätten anhaben können.</p>
+<p>
+Jeder dieser Mängel macht eine Lizenz inakzeptabel.</p>
+<p>
+Wären diese drei Mängel behoben worden, würde die APSL einer freien
+Softwarelizenz mit drei größeren praktischen Problemen entsprechen, das an
+die <span xml:lang="en" lang="en">Netscape Public License</span> (NPL)
+erinnert:</p>
+
+<ul>
+<li>sie hat kein wirkliches Copyleft, weil die Verlinkung mit anderen
+Dateien&#160;&#8209;&#160;die völlig proprietär sein
+können!&#160;&#8209;&#160;erlaubt ist;</li>
+
+<li>sie ist unfair, da Apple die Übertragung der Rechte an den von Ihren
+gemachten Änderungen verlangt, das Apple für seinen Quellcode nicht
+einräumen muss;</li>
+
+<li>sie ist mit der GNU General Public License (GPL) unvereinbar.</li>
+</ul>
+
+<p>
+Natürlich ist der wesentlichste Unterschied zwischen NPL und APSL, dass die
+NPL eine freie Softwarelizenz <strong>ist</strong>. Diese Probleme sind im
+Falle der NPL bedeutsam, weil die NPL keine schwerwiegenden Mängel
+enthält. Würde dasselbe auch auf die APSL zutreffen&#8230;</p>
+
+<p>
+Auf einer fundamentalen Ebene macht die APSL einen Anspruch geltend, der,
+wenn angenommen, die Mächte des Copyright auf eine gefährliche Weise
+ausdehnt: sie beansprucht für sich in der Lage zu sein, die Bedingungen
+einfach durch das <strong>Ausführen</strong> der Software festzulegen. Nach
+meinem Verständnis erlaubt das Urheberrecht in den USA das nicht, es sei
+denn, es wird eine Verschlüsselung oder Lizenzverwaltung verwendet, um die
+Bedingungen durchzusetzen. Es wäre schrecklich ironisch, wenn ein
+misslungener Versuch, eine freie Softwarelizenz zu schaffen, zu einer
+Erweiterung der effektiven Reichweite der Copyrightmacht führt.</p>
+
+<p>
+Abgesehen davon darf nicht vergessen werden, dass nur ein Teil von Mac OS
+unter der APSL freigegeben wird. Selbst wenn die schwerwiegenden Mängel und
+praktische Probleme der APSL behoben wurden, selbst wenn sie in eine sehr
+gute freie Softwarelizenz geändert wurde, wäre das für die anderen Teile von
+Mac OS, dessen Quellcode überhaupt nicht freigegeben ist, nicht gut. Wir
+dürfen nicht das gesamte Unternehmen aufgrund nur eines Teils dessen
+beurteilen, was es macht.</p>
+
+<p>
+Insgesamt denke ich, dass <span xml:lang="en" lang="en">Apples</span>
+Vorgehen ein Beispiel für die Auswirkungen der ein Jahr alten <a
+href="/philosophy/open-source-misses-the-point">„Open Source“-Bewegung</a>
+ist: der Absicht, das Geschäft mit dem lediglich materialistischen Ziel
+einer schnelleren Entwicklung anzuziehen, während tiefere Fragen der
+Freiheit, Gemeinschaft, Zusammenarbeit und in was für einer Gesellschaft wir
+leben wollen beiseite gelegt werden.</p>
+
+<p>
+Apple hat das Konzept perfekt im Griff, mit welchem „Open Source“ 
gefördert
+wird, was <em>Nutzern den Quellcode sehen lässt und ihnen hilft,
+Programmfehler zu beseitigen</em>. Was Apple nicht
+begriffen&#160;&#8209;&#160;oder zurückgewiesen&#160;&#8209;&#160;hat, ist
+der Geist von Freie Software, was bedeutet, eine Gemeinschaft aufzubauen, um
+auf dem <em>Gemeingut</em> ‚Allmende‘ von Software zusammenzuarbeiten.</p>
+
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!--#include virtual="/server/footer.de.html" -->
+<div id="footer">
+
+<p>Bitte senden Sie Fragen zur FSF &amp; GNU an <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Sie können auch die 
<a
+href="/contact/">Free Software Foundation kontaktieren</a>. Ungültige
+Verweise und andere Korrekturen oder Vorschläge können an <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
+gesendet werden.</p>
+
+<p>
+
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Bei der Übersetzung der Werke bzw. Inhalte wurde mit größter Sorgfalt
+vorgegangen. Trotzdem können Fehler nicht völlig ausgeschlossen
+werden. Sollten Sie Fehler bemerken oder Vorschläge, Kommentare oder
+Anfragen zu dieser Webseite haben, setzen Sie sich mit unserem
+Übersetzungsteam <a
+href="mailto:address@hidden@gnu.org&amp;subject=[www-de-bug]:%20&lt;Bitte%20beziehen%20sich%20auf%20bestimmte%20Seiten%20oder%20Bereiche,%20wenn%20möglich.&gt;";>&lt;address@hidden&gt;</a>
+in Verbindung.</p>
+<p>Weitere Informationen über die Koordinierung und Einsendung von
+Übersetzungen unserer Webseiten finden Sie in der <a
+href="/server/standards/README.translations" hreflang="en">LIESMICH für
+Übersetzungen</a>.</p>
+
+<p>Copyright &copy; 1999, 2001, 2007 Free Software Foundation, Inc.</p>
+
+<p>Dieses Werk bzw. Inhalt steht unter einer <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.de";>Creative
+Commons Namensnennung-Keine Bearbeitung 3.0 Vereinigte Staaten von Amerika
+Lizenz</a>.</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<strong>Übersetzung:</strong> Wesley Kohne, 2012.</div>
+
+
+ <p>
+<!-- timestamp start -->
+Aktualisierung:
+
+$Date: 2012/04/06 16:30:57 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>



reply via email to

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