www-commits
[Top][All Lists]
Advanced

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

www philosophy/plan-nine.es.html philosophy/po/...


From: Yavor Doganov
Subject: www philosophy/plan-nine.es.html philosophy/po/...
Date: Mon, 28 Sep 2009 20:26:27 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   09/09/28 20:26:27

Modified files:
        philosophy     : plan-nine.es.html 
        philosophy/po  : social-inertia.es.po social-inertia.fr.po 
                         social-inertia.ml.po words-to-avoid.es.po 
                         words-to-avoid.fr.po words-to-avoid.pot 
                         words-to-avoid.sr.po 
        software       : software.sk.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/plan-nine.es.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/social-inertia.es.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/social-inertia.fr.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/social-inertia.ml.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.es.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.fr.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.pot?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sr.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/software/software.sk.html?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: philosophy/plan-nine.es.html
===================================================================
RCS file: /web/www/www/philosophy/plan-nine.es.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/plan-nine.es.html        28 Sep 2009 08:26:05 -0000      1.3
+++ philosophy/plan-nine.es.html        28 Sep 2009 20:26:00 -0000      1.4
@@ -14,7 +14,7 @@
 <p><em>Nota:</em> Este texto se refiere a la anterior licencia usada por Plan
 9. La licencia actual de Plan 9 se considera de software libre (y también de
 código abierto). Por esto, el ejemplo específico de este artículo sólo 
tiene
-relevancia histórica. Sin embargo, el punto principalsigue siendo válido.</p>
+relevancia histórica. Sin embargo, el punto principal sigue siendo 
válido.</p>
 
 <hr />
 
@@ -134,8 +134,8 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
 Los extractos de la licencia de Plan 9 que aparecen en este texto se
 tradujeron para su mejor interpretación. Esta traducción no tiene validez
-legal. Para leer el texto original, vea
-<ahref="/philosophy/plan-nine.html">el artículo original en inglés</a>.</div>
+legal. Para leer el texto original, vea <a
+href="/philosophy/plan-nine.html">el artículo original en inglés</a>.</div>
 </div>
 
 <!--#include virtual="/server/footer.es.html" -->
@@ -175,7 +175,7 @@
 <!-- timestamp start -->
 Última actualización:
 
-$Date: 2009/09/28 08:26:05 $
+$Date: 2009/09/28 20:26:00 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/social-inertia.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/social-inertia.es.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/social-inertia.es.po  17 Nov 2008 09:26:59 -0000      1.2
+++ philosophy/po/social-inertia.es.po  28 Sep 2009 20:26:08 -0000      1.3
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: social-inertia.es\n"
-"POT-Creation-Date: 2008-08-25 16:26-0300\n"
+"POT-Creation-Date: 2009-09-27 16:25-0300\n"
 "PO-Revision-Date: 2008-11-17 00:23+0100\n"
 "Last-Translator: David <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -32,12 +32,19 @@
 "a>."
 
 # type: Content of: <p>
-msgid ""
-"15 years have passed since the combination of GNU and Linux first made it "
-"possible to use a PC in freedom.  During that time, we have come a long "
-"way.  You can even buy a laptop with GNU/Linux preinstalled from more than "
-"one hardware vendor, although the systems they ship are not entirely free "
-"software.  So what holds us back from total success?"
+#, fuzzy
+#| msgid ""
+#| "15 years have passed since the combination of GNU and Linux first made it "
+#| "possible to use a PC in freedom.  During that time, we have come a long "
+#| "way.  You can even buy a laptop with GNU/Linux preinstalled from more "
+#| "than one hardware vendor, although the systems they ship are not entirely "
+#| "free software.  So what holds us back from total success?"
+msgid ""
+"Almost two decades have passed since the combination of GNU and Linux first "
+"made it possible to use a PC in freedom.  We have come a long way since "
+"then.  Now you can even buy a laptop with GNU/Linux preinstalled from more "
+"than one hardware vendor&mdash;although the systems they ship are not "
+"entirely free software.  So what holds us back from total success?"
 msgstr ""
 "Han pasado 15 años desde que la combinación de GNU y Linux hizo posible 
usar "
 "un PC en libertad. Durante este tiempo, hemos recorrido un largo camino. "
@@ -47,17 +54,29 @@
 "conseguir el éxito total?"
 
 # type: Content of: <p>
-msgid ""
-"The main obstacle to the triumph of software freedom is social inertia.  You "
-"have surely seen its many forms.  Many commercial web sites are only "
-"accessible with Windows.  The BBC's iPlayer handcuffware runs only on "
+#, fuzzy
+#| msgid ""
+#| "The main obstacle to the triumph of software freedom is social inertia.  "
+#| "You have surely seen its many forms.  Many commercial web sites are only "
+#| "accessible with Windows.  The BBC's iPlayer handcuffware runs only on "
+#| "Windows.  If you value short-term convenience instead of freedom, you "
+#| "might consider these reasons to use Windows.  Most companies currently "
+#| "use Windows, so students who think short-term want to learn Windows, and "
+#| "ask schools to teach Windows, which they do, thus leading many other "
+#| "students to use Windows.  Microsoft actively nurtures this inertia: it "
+#| "encourages schools to inculcate dependency on Windows, and contracts to "
+#| "set up web sites, which then turn out to work only with Internet Explorer."
+msgid ""
+"The main obstacle to the triumph of software freedom is social inertia.  It "
+"exists in many forms, and you have surely seen some of them.  Examples "
+"include devices that only work on Windows, commercial Web sites accessible "
+"only with Windows, and the BBC's iPlayer handcuffware, which runs only on "
 "Windows.  If you value short-term convenience instead of freedom, you might "
-"consider these reasons to use Windows.  Most companies currently use "
-"Windows, so students who think short-term want to learn Windows, and ask "
-"schools to teach Windows, which they do, thus leading many other students to "
-"use Windows.  Microsoft actively nurtures this inertia: it encourages "
-"schools to inculcate dependency on Windows, and contracts to set up web "
-"sites, which then turn out to work only with Internet Explorer."
+"consider these reason enough to use Windows.  Most companies currently run "
+"Windows, so students who think short-term want to learn how to use it and "
+"ask their schools to teach it.  Schools teach Windows, produce graduates "
+"that are used to using Windows, and this encourages businesses to use "
+"Windows."
 msgstr ""
 "El principal obstáculo para el triunfo de la libertad del software es la "
 "inercia social. Seguramente lo ha visto de muchas formas. Muchos sitios web "
@@ -75,28 +94,50 @@
 
 # type: Content of: <p>
 msgid ""
+"Microsoft actively nurtures this inertia: it encourages schools to inculcate "
+"dependency on Windows, and contracts to set up Web sites that then turn out "
+"to work only with Internet Explorer."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A few years ago, Microsoft ads argued that Windows was cheaper to run "
+#| "than GNU/Linux.  Their comparisons were debunked, but it is worth noting "
+#| "the deeper flaw that their arguments reduce to social inertia: &ldquo;"
+#| "Currently, more technical people know Windows than GNU/Linux.&rdquo; "
+#| "People that value their freedom would not give it up to save money, but "
+#| "many business executives believe ideologically that everything they "
+#| "possess, even their freedom, should be for sale."
+msgid ""
 "A few years ago, Microsoft ads argued that Windows was cheaper to run than "
 "GNU/Linux.  Their comparisons were debunked, but it is worth noting the "
-"deeper flaw that their arguments reduce to social inertia: &ldquo;Currently, "
-"more technical people know Windows than GNU/Linux.&rdquo; People that value "
-"their freedom would not give it up to save money, but many business "
-"executives believe ideologically that everything they possess, even their "
-"freedom, should be for sale."
+"deeper flaw in their argument, the implicit premise which cites a form of "
+"social inertia: &ldquo;Currently, more technical people know Windows than "
+"GNU/Linux.&rdquo; People who value their freedom would not give it up to "
+"save money, but many business executives believe ideologically that "
+"everything they possess, even their freedom, should be for sale."
 msgstr ""
 "Hace unos pocos años, la publicidad de Microsoft argumentaba que Windows era 
"
 "más barato de hacer funcionar que GNU/Linux. Sus comparaciones era "
 "ridículas, pero merece la pena señalar que el mayor error de sus argumentos 
"
-"se reduce a la inercia social: «Actualmente, más técnicos conocen Windows "
-"que GNU/Linux». Las personas que valoran su libertad no se darían por "
-"vencidos para ahorrar, pero muchos ejecutivos creen ideológicamente que cada 
"
-"cosa que ellos poseen, incluso su libertad, debería estar a la venta."
-
-# type: Content of: <p>
-msgid ""
-"Social inertia consists of people giving in to social inertia.  When you "
-"give in to social inertia, you become part of it; when you resist it, you "
-"reduce it.  We conquer inertia by identifying it, and resolving not to be "
-"part of it."
+"se reduce a la inercia social: «Actualmente, más técnicos conocen Windows 
que "
+"GNU/Linux». Las personas que valoran su libertad no se darían por vencidos "
+"para ahorrar, pero muchos ejecutivos creen ideológicamente que cada cosa que 
"
+"ellos poseen, incluso su libertad, debería estar a la venta."
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Social inertia consists of people giving in to social inertia.  When you "
+#| "give in to social inertia, you become part of it; when you resist it, you "
+#| "reduce it.  We conquer inertia by identifying it, and resolving not to be "
+#| "part of it."
+msgid ""
+"Social inertia consists of people who have given in to social inertia.  When "
+"you surrender to social inertia, you become part of the pressure it exerts "
+"on others; when you resist it, you reduce it.  We conquer social inertia by "
+"identifying it, and resolving not to be part of it."
 msgstr ""
 "La inercia social consiste en gente que se deja llevar por la inercia "
 "social. Cuando se deja llevar por la inercia social, llega a ser parte de "
@@ -104,12 +145,19 @@
 "identificándola, y decidiendo no ser parte de ella."
 
 # type: Content of: <p>
-msgid ""
-"Here is where the philosophical weakness of most of our community holds us "
-"back.  Most GNU/Linux users have never even heard the ideas of freedom that "
-"motivated the development of GNU, so they still judge matters based on short-"
-"term convenience rather than on their freedom.  This makes them vulnerable "
-"to being led by the nose, through social inertia."
+#, fuzzy
+#| msgid ""
+#| "Here is where the philosophical weakness of most of our community holds "
+#| "us back.  Most GNU/Linux users have never even heard the ideas of freedom "
+#| "that motivated the development of GNU, so they still judge matters based "
+#| "on short-term convenience rather than on their freedom.  This makes them "
+#| "vulnerable to being led by the nose, through social inertia."
+msgid ""
+"Here a weakness holds our community back: most GNU/Linux users have never "
+"even heard the ideas of freedom that motivated the development of GNU, so "
+"they still judge matters based on short-term convenience rather than on "
+"their freedom.  This makes them vulnerable to being led by the nose by "
+"social inertia, so that they become part of the inertia."
 msgstr ""
 "Aquí es donde la debilidad filosófica de la mayor parte de nuestra 
comunidad "
 "nos retiene. La mayoría los usuarios de GNU/Linux no han escuchado nunca las 
"
@@ -118,10 +166,16 @@
 "libertad. Esto los hace vulnerables a sean dirigidos, por la inercia social."
 
 # type: Content of: <p>
-msgid ""
-"To change this, we need to talk about free software and freedom &mdash; not "
-"merely practical benefits such as cited by open source.  Thus we can build "
-"our community's strength and resolve to overcome social inertia."
+#, fuzzy
+#| msgid ""
+#| "To change this, we need to talk about free software and freedom &mdash; "
+#| "not merely practical benefits such as cited by open source.  Thus we can "
+#| "build our community's strength and resolve to overcome social inertia."
+msgid ""
+"To build our community's strength to resist, we need to talk about free "
+"software and freedom&mdash;not merely about the practical benefits that open "
+"source supporters cite.  As more people recognize what they need to do to "
+"overcome the inertia, we will make more progress."
 msgstr ""
 "Para cambiarlo, necesitamos hablar sobre el software libre y la libertad, no "
 "meramente de beneficios prácticos como los citados por el <span 
style=\"font-"

Index: philosophy/po/social-inertia.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/social-inertia.fr.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/social-inertia.fr.po  25 Nov 2008 21:26:41 -0000      1.2
+++ philosophy/po/social-inertia.fr.po  28 Sep 2009 20:26:08 -0000      1.3
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: social-inertia.html\n"
-"POT-Creation-Date: 2008-08-25 16:26-0300\n"
+"POT-Creation-Date: 2009-09-27 16:25-0300\n"
 "PO-Revision-Date: 2008-11-23 13:01+0100\n"
 "Last-Translator: Cédric Corazza <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
@@ -32,12 +32,19 @@
 "a>"
 
 # type: Content of: <p>
-msgid ""
-"15 years have passed since the combination of GNU and Linux first made it "
-"possible to use a PC in freedom.  During that time, we have come a long "
-"way.  You can even buy a laptop with GNU/Linux preinstalled from more than "
-"one hardware vendor, although the systems they ship are not entirely free "
-"software.  So what holds us back from total success?"
+#, fuzzy
+#| msgid ""
+#| "15 years have passed since the combination of GNU and Linux first made it "
+#| "possible to use a PC in freedom.  During that time, we have come a long "
+#| "way.  You can even buy a laptop with GNU/Linux preinstalled from more "
+#| "than one hardware vendor, although the systems they ship are not entirely "
+#| "free software.  So what holds us back from total success?"
+msgid ""
+"Almost two decades have passed since the combination of GNU and Linux first "
+"made it possible to use a PC in freedom.  We have come a long way since "
+"then.  Now you can even buy a laptop with GNU/Linux preinstalled from more "
+"than one hardware vendor&mdash;although the systems they ship are not "
+"entirely free software.  So what holds us back from total success?"
 msgstr ""
 "Quinze ans ont pass&eacute; depuis que la combinaison de GNU et de Linux a "
 "permis pour la premi&egrave;re fois l'utilisation d'un PC en toute "
@@ -49,17 +56,29 @@
 "succ&egrave;s total&nbsp;?"
 
 # type: Content of: <p>
-msgid ""
-"The main obstacle to the triumph of software freedom is social inertia.  You "
-"have surely seen its many forms.  Many commercial web sites are only "
-"accessible with Windows.  The BBC's iPlayer handcuffware runs only on "
+#, fuzzy
+#| msgid ""
+#| "The main obstacle to the triumph of software freedom is social inertia.  "
+#| "You have surely seen its many forms.  Many commercial web sites are only "
+#| "accessible with Windows.  The BBC's iPlayer handcuffware runs only on "
+#| "Windows.  If you value short-term convenience instead of freedom, you "
+#| "might consider these reasons to use Windows.  Most companies currently "
+#| "use Windows, so students who think short-term want to learn Windows, and "
+#| "ask schools to teach Windows, which they do, thus leading many other "
+#| "students to use Windows.  Microsoft actively nurtures this inertia: it "
+#| "encourages schools to inculcate dependency on Windows, and contracts to "
+#| "set up web sites, which then turn out to work only with Internet Explorer."
+msgid ""
+"The main obstacle to the triumph of software freedom is social inertia.  It "
+"exists in many forms, and you have surely seen some of them.  Examples "
+"include devices that only work on Windows, commercial Web sites accessible "
+"only with Windows, and the BBC's iPlayer handcuffware, which runs only on "
 "Windows.  If you value short-term convenience instead of freedom, you might "
-"consider these reasons to use Windows.  Most companies currently use "
-"Windows, so students who think short-term want to learn Windows, and ask "
-"schools to teach Windows, which they do, thus leading many other students to "
-"use Windows.  Microsoft actively nurtures this inertia: it encourages "
-"schools to inculcate dependency on Windows, and contracts to set up web "
-"sites, which then turn out to work only with Internet Explorer."
+"consider these reason enough to use Windows.  Most companies currently run "
+"Windows, so students who think short-term want to learn how to use it and "
+"ask their schools to teach it.  Schools teach Windows, produce graduates "
+"that are used to using Windows, and this encourages businesses to use "
+"Windows."
 msgstr ""
 "Le principal obstacle au triomphe des logiciels libres est l'inertie "
 "sociale. Vous avez s&ucirc;rement constat&eacute; ses multiples formes. "
@@ -78,13 +97,29 @@
 
 # type: Content of: <p>
 msgid ""
+"Microsoft actively nurtures this inertia: it encourages schools to inculcate "
+"dependency on Windows, and contracts to set up Web sites that then turn out "
+"to work only with Internet Explorer."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A few years ago, Microsoft ads argued that Windows was cheaper to run "
+#| "than GNU/Linux.  Their comparisons were debunked, but it is worth noting "
+#| "the deeper flaw that their arguments reduce to social inertia: &ldquo;"
+#| "Currently, more technical people know Windows than GNU/Linux.&rdquo; "
+#| "People that value their freedom would not give it up to save money, but "
+#| "many business executives believe ideologically that everything they "
+#| "possess, even their freedom, should be for sale."
+msgid ""
 "A few years ago, Microsoft ads argued that Windows was cheaper to run than "
 "GNU/Linux.  Their comparisons were debunked, but it is worth noting the "
-"deeper flaw that their arguments reduce to social inertia: &ldquo;Currently, "
-"more technical people know Windows than GNU/Linux.&rdquo; People that value "
-"their freedom would not give it up to save money, but many business "
-"executives believe ideologically that everything they possess, even their "
-"freedom, should be for sale."
+"deeper flaw in their argument, the implicit premise which cites a form of "
+"social inertia: &ldquo;Currently, more technical people know Windows than "
+"GNU/Linux.&rdquo; People who value their freedom would not give it up to "
+"save money, but many business executives believe ideologically that "
+"everything they possess, even their freedom, should be for sale."
 msgstr ""
 "Il y a quelques ann&eacute;es, les publicit&eacute;s de Microsoft "
 "soutenaient que Windows revenait moins cher que GNU/Linux. Leurs "
@@ -99,11 +134,17 @@
 "tre &agrave; vendre."
 
 # type: Content of: <p>
-msgid ""
-"Social inertia consists of people giving in to social inertia.  When you "
-"give in to social inertia, you become part of it; when you resist it, you "
-"reduce it.  We conquer inertia by identifying it, and resolving not to be "
-"part of it."
+#, fuzzy
+#| msgid ""
+#| "Social inertia consists of people giving in to social inertia.  When you "
+#| "give in to social inertia, you become part of it; when you resist it, you "
+#| "reduce it.  We conquer inertia by identifying it, and resolving not to be "
+#| "part of it."
+msgid ""
+"Social inertia consists of people who have given in to social inertia.  When "
+"you surrender to social inertia, you become part of the pressure it exerts "
+"on others; when you resist it, you reduce it.  We conquer social inertia by "
+"identifying it, and resolving not to be part of it."
 msgstr ""
 "L'inertie sociale se constitue de gens penchant vers l'inertie sociale. "
 "Quand vous vous laissez gagner par l'inertie sociale, vous "
@@ -112,12 +153,19 @@
 "faire partie."
 
 # type: Content of: <p>
-msgid ""
-"Here is where the philosophical weakness of most of our community holds us "
-"back.  Most GNU/Linux users have never even heard the ideas of freedom that "
-"motivated the development of GNU, so they still judge matters based on short-"
-"term convenience rather than on their freedom.  This makes them vulnerable "
-"to being led by the nose, through social inertia."
+#, fuzzy
+#| msgid ""
+#| "Here is where the philosophical weakness of most of our community holds "
+#| "us back.  Most GNU/Linux users have never even heard the ideas of freedom "
+#| "that motivated the development of GNU, so they still judge matters based "
+#| "on short-term convenience rather than on their freedom.  This makes them "
+#| "vulnerable to being led by the nose, through social inertia."
+msgid ""
+"Here a weakness holds our community back: most GNU/Linux users have never "
+"even heard the ideas of freedom that motivated the development of GNU, so "
+"they still judge matters based on short-term convenience rather than on "
+"their freedom.  This makes them vulnerable to being led by the nose by "
+"social inertia, so that they become part of the inertia."
 msgstr ""
 "Voici o&ugrave; la faiblesse philosophique de la plus grande partie de notre "
 "communaut&eacute; nous freine. La plupart des utilisateurs de GNU/Linux "
@@ -128,10 +176,16 @@
 "&agrave; &ecirc;tre men&eacute;s par le bout du nez, via l'inertiesociale."
 
 # type: Content of: <p>
-msgid ""
-"To change this, we need to talk about free software and freedom &mdash; not "
-"merely practical benefits such as cited by open source.  Thus we can build "
-"our community's strength and resolve to overcome social inertia."
+#, fuzzy
+#| msgid ""
+#| "To change this, we need to talk about free software and freedom &mdash; "
+#| "not merely practical benefits such as cited by open source.  Thus we can "
+#| "build our community's strength and resolve to overcome social inertia."
+msgid ""
+"To build our community's strength to resist, we need to talk about free "
+"software and freedom&mdash;not merely about the practical benefits that open "
+"source supporters cite.  As more people recognize what they need to do to "
+"overcome the inertia, we will make more progress."
 msgstr ""
 "Pour changer cela, nous devons parler de logiciels libres et de "
 "libert&eacute; &mdash; pas seulement des b&eacute;n&eacute;fices pratiques "

Index: philosophy/po/social-inertia.ml.po
===================================================================
RCS file: /web/www/www/philosophy/po/social-inertia.ml.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/social-inertia.ml.po  7 Oct 2008 20:28:21 -0000       1.3
+++ philosophy/po/social-inertia.ml.po  28 Sep 2009 20:26:08 -0000      1.4
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: social-inertia.html\n"
-"POT-Creation-Date: 2008-08-25 16:26-0300\n"
+"POT-Creation-Date: 2009-09-27 16:25-0300\n"
 "PO-Revision-Date: 2008-10-07 12:12+0300\n"
 "Last-Translator: Shyam Karnattu <address@hidden>\n"
 "Language-Team:Swathanthra Malayalam Computing <address@hidden"
@@ -31,12 +31,19 @@
 "strong></a>"
 
 # type: Content of: <p>
-msgid ""
-"15 years have passed since the combination of GNU and Linux first made it "
-"possible to use a PC in freedom.  During that time, we have come a long "
-"way.  You can even buy a laptop with GNU/Linux preinstalled from more than "
-"one hardware vendor, although the systems they ship are not entirely free "
-"software.  So what holds us back from total success?"
+#, fuzzy
+#| msgid ""
+#| "15 years have passed since the combination of GNU and Linux first made it "
+#| "possible to use a PC in freedom.  During that time, we have come a long "
+#| "way.  You can even buy a laptop with GNU/Linux preinstalled from more "
+#| "than one hardware vendor, although the systems they ship are not entirely "
+#| "free software.  So what holds us back from total success?"
+msgid ""
+"Almost two decades have passed since the combination of GNU and Linux first "
+"made it possible to use a PC in freedom.  We have come a long way since "
+"then.  Now you can even buy a laptop with GNU/Linux preinstalled from more "
+"than one hardware vendor&mdash;although the systems they ship are not "
+"entirely free software.  So what holds us back from total success?"
 msgstr ""
 "ഒരു പി.സി 
സ്വാതന്ത്ര്യത്തോടെ 
ഉപയോഗിക്കാറാക്കിയ 
ഗ്നൂവിന്റെയും 
ലിനക്സിന്റെയും സംയോഗം 
നടന്നിട്ടു് "
 "15 കൊല്ലങ്ങള്‍ 
കടന്നുപോയിരിക്കുന്നു. 
ഇക്കാലത്തിനിടയ്ക്കു് നാം 
വളരെ മുന്നോട്ടു 
പോയിരിക്കുന്നു. ഗ്നു/"
@@ -45,17 +52,29 @@
 "വിജയത്തില്‍ നിന്നും നമ്മെ 
തടയുന്നതെന്തു്?"
 
 # type: Content of: <p>
-msgid ""
-"The main obstacle to the triumph of software freedom is social inertia.  You "
-"have surely seen its many forms.  Many commercial web sites are only "
-"accessible with Windows.  The BBC's iPlayer handcuffware runs only on "
+#, fuzzy
+#| msgid ""
+#| "The main obstacle to the triumph of software freedom is social inertia.  "
+#| "You have surely seen its many forms.  Many commercial web sites are only "
+#| "accessible with Windows.  The BBC's iPlayer handcuffware runs only on "
+#| "Windows.  If you value short-term convenience instead of freedom, you "
+#| "might consider these reasons to use Windows.  Most companies currently "
+#| "use Windows, so students who think short-term want to learn Windows, and "
+#| "ask schools to teach Windows, which they do, thus leading many other "
+#| "students to use Windows.  Microsoft actively nurtures this inertia: it "
+#| "encourages schools to inculcate dependency on Windows, and contracts to "
+#| "set up web sites, which then turn out to work only with Internet Explorer."
+msgid ""
+"The main obstacle to the triumph of software freedom is social inertia.  It "
+"exists in many forms, and you have surely seen some of them.  Examples "
+"include devices that only work on Windows, commercial Web sites accessible "
+"only with Windows, and the BBC's iPlayer handcuffware, which runs only on "
 "Windows.  If you value short-term convenience instead of freedom, you might "
-"consider these reasons to use Windows.  Most companies currently use "
-"Windows, so students who think short-term want to learn Windows, and ask "
-"schools to teach Windows, which they do, thus leading many other students to "
-"use Windows.  Microsoft actively nurtures this inertia: it encourages "
-"schools to inculcate dependency on Windows, and contracts to set up web "
-"sites, which then turn out to work only with Internet Explorer."
+"consider these reason enough to use Windows.  Most companies currently run "
+"Windows, so students who think short-term want to learn how to use it and "
+"ask their schools to teach it.  Schools teach Windows, produce graduates "
+"that are used to using Windows, and this encourages businesses to use "
+"Windows."
 msgstr ""
 "സോഫ്റ്റ്‌വെയര്‍ 
സ്വാതന്ത്ര്യത്തിന്റെ  
വിജയകാഹളത്തിനു 
തടസ്സമായിനില്‍ക്കുന്നതു് 
സാമൂഹ്യ ജഡത്വമാണു്.  "
 "നിങ്ങളിതു പല രീതിയില്‍ 
തീര്‍ച്ചയായും കണ്ടിരിക്കും. 
പല വ്യാവസായിക 
വെബ്സൈറ്റുകളും "
@@ -70,13 +89,29 @@
 
 # type: Content of: <p>
 msgid ""
+"Microsoft actively nurtures this inertia: it encourages schools to inculcate "
+"dependency on Windows, and contracts to set up Web sites that then turn out "
+"to work only with Internet Explorer."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A few years ago, Microsoft ads argued that Windows was cheaper to run "
+#| "than GNU/Linux.  Their comparisons were debunked, but it is worth noting "
+#| "the deeper flaw that their arguments reduce to social inertia: &ldquo;"
+#| "Currently, more technical people know Windows than GNU/Linux.&rdquo; "
+#| "People that value their freedom would not give it up to save money, but "
+#| "many business executives believe ideologically that everything they "
+#| "possess, even their freedom, should be for sale."
+msgid ""
 "A few years ago, Microsoft ads argued that Windows was cheaper to run than "
 "GNU/Linux.  Their comparisons were debunked, but it is worth noting the "
-"deeper flaw that their arguments reduce to social inertia: &ldquo;Currently, "
-"more technical people know Windows than GNU/Linux.&rdquo; People that value "
-"their freedom would not give it up to save money, but many business "
-"executives believe ideologically that everything they possess, even their "
-"freedom, should be for sale."
+"deeper flaw in their argument, the implicit premise which cites a form of "
+"social inertia: &ldquo;Currently, more technical people know Windows than "
+"GNU/Linux.&rdquo; People who value their freedom would not give it up to "
+"save money, but many business executives believe ideologically that "
+"everything they possess, even their freedom, should be for sale."
 msgstr ""
 "കുറച്ചു വര്‍ഷങ്ങള്‍ക്കു 
മുമ്പു് വിന്‍ഡോസാണു് 
ഗ്നു/ലിനക്സിനെക്കാള്‍ 
വിലക്കുറവെന്നു 
മൈക്രോസോഫ്റ്റ് പരസ്യം "
 "ചെയ്തിരുന്നു. അവരുടെ വാദം 
പൊളിഞ്ഞു, പക്ഷേ അവരുടെ 
വാദങ്ങള്‍ സാമൂഹ്യ 
ജഡതയിലേയ്ക്കാണു വിരല്‍ "
@@ -86,23 +121,36 @@
 "ബിസിനസ് 
എക്സിക്യൂട്ടിവുകള്‍ ഉണ്ടു്."
 
 # type: Content of: <p>
-msgid ""
-"Social inertia consists of people giving in to social inertia.  When you "
-"give in to social inertia, you become part of it; when you resist it, you "
-"reduce it.  We conquer inertia by identifying it, and resolving not to be "
-"part of it."
+#, fuzzy
+#| msgid ""
+#| "Social inertia consists of people giving in to social inertia.  When you "
+#| "give in to social inertia, you become part of it; when you resist it, you "
+#| "reduce it.  We conquer inertia by identifying it, and resolving not to be "
+#| "part of it."
+msgid ""
+"Social inertia consists of people who have given in to social inertia.  When "
+"you surrender to social inertia, you become part of the pressure it exerts "
+"on others; when you resist it, you reduce it.  We conquer social inertia by "
+"identifying it, and resolving not to be part of it."
 msgstr ""
 "സാമൂഹ്യ ജഡത്വം അതുള്ള 
ജനങ്ങളെ കൂടി 
ഉള്‍ക്കൊള്ളുന്നു.  നിങ്ങള്‍ അ
തിന്റെ ഭാഗമാവുകയാണു്; അതിനെ "
 "പ്രതിരോധിയ്ക്കുമ്പോള്‍ അതു 
കുറയുന്നു. ജഡത്വത്തെ 
തിരിച്ചറിയുകയും അതിന്റെ 
ഭാഗമാവാതിരിക്കുകയും ചെയ്തു് 
"
 "അതിനെ തോല്‍പ്പിക്കുന്നു."
 
 # type: Content of: <p>
-msgid ""
-"Here is where the philosophical weakness of most of our community holds us "
-"back.  Most GNU/Linux users have never even heard the ideas of freedom that "
-"motivated the development of GNU, so they still judge matters based on short-"
-"term convenience rather than on their freedom.  This makes them vulnerable "
-"to being led by the nose, through social inertia."
+#, fuzzy
+#| msgid ""
+#| "Here is where the philosophical weakness of most of our community holds "
+#| "us back.  Most GNU/Linux users have never even heard the ideas of freedom "
+#| "that motivated the development of GNU, so they still judge matters based "
+#| "on short-term convenience rather than on their freedom.  This makes them "
+#| "vulnerable to being led by the nose, through social inertia."
+msgid ""
+"Here a weakness holds our community back: most GNU/Linux users have never "
+"even heard the ideas of freedom that motivated the development of GNU, so "
+"they still judge matters based on short-term convenience rather than on "
+"their freedom.  This makes them vulnerable to being led by the nose by "
+"social inertia, so that they become part of the inertia."
 msgstr ""
 "ഇവിടെയാണു് നമ്മുടെ 
കൂട്ടായ്മയുടെ 
തത്വശാസ്ത്രത്തിന്റെ ബലഹീനത 
വെളിവാകുന്നതു്. മിക്ക 
ഗ്നു/ലിനക്സ് "
 "ഉപയോക്താക്കളും ഗ്നു സംരംഭം 
തുടങ്ങാനുള്ള 
കാരണങ്ങളെക്കുറിച്ചു 
ബോധവാന്‍മാരല്ല, അതുകൊണ്ടു 
തന്നെ "
@@ -110,10 +158,16 @@
 "ചതിക്കുഴിക്കളിലേയ്ക്കു 
നയിക്കുന്നു."
 
 # type: Content of: <p>
-msgid ""
-"To change this, we need to talk about free software and freedom &mdash; not "
-"merely practical benefits such as cited by open source.  Thus we can build "
-"our community's strength and resolve to overcome social inertia."
+#, fuzzy
+#| msgid ""
+#| "To change this, we need to talk about free software and freedom &mdash; "
+#| "not merely practical benefits such as cited by open source.  Thus we can "
+#| "build our community's strength and resolve to overcome social inertia."
+msgid ""
+"To build our community's strength to resist, we need to talk about free "
+"software and freedom&mdash;not merely about the practical benefits that open "
+"source supporters cite.  As more people recognize what they need to do to "
+"overcome the inertia, we will make more progress."
 msgstr ""
 "ഇതിനൊരു മാറ്റം വരുത്താന്‍ 
നാം 
സ്വാതന്ത്ര്യത്തെക്കുറിച്ചും
  സ്വതന്ത്ര 
സോഫ്റ്റ്‌വെയറിനെക്കുറിച്ചും
 "
 "സംസാരിയ്ക്കണം &mdash; ഓപ്പണ്‍ 
സോഴ്സ് വിഭാവനം ചെയ്യുന്ന 
പ്രായോഗികതാവാദത്തിനപ്പുറം. അ
ങ്ങനെ "

Index: philosophy/po/words-to-avoid.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.es.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/words-to-avoid.es.po  8 Aug 2009 20:25:30 -0000       1.15
+++ philosophy/po/words-to-avoid.es.po  28 Sep 2009 20:26:08 -0000      1.16
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: words-to-avoid.es.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 16:26-0300\n"
+"POT-Creation-Date: 2009-09-28 16:25-0300\n"
 "PO-Revision-Date: 2009-08-08 12:19+0200\n"
 "Last-Translator: Hernan Giovagnoli <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -20,25 +20,37 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "Confusing Words and Phrases that are Worth Avoiding - GNU Project - Free "
+#| "Software Foundation (FSF)"
 msgid ""
-"Confusing Words and Phrases that are Worth Avoiding - GNU Project - Free "
+"Confusing Words and Phrases That Are Worth Avoiding - GNU Project - Free "
 "Software Foundation (FSF)"
 msgstr ""
 "Palabras y frases confusas que vale la pena evitar - Proyecto GNU - Free "
 "Software Foundation (FSF)"
 
 # type: Content of: <h2>
-msgid "Some Confusing or Loaded Words and Phrases to Avoid (or use with care)"
+#, fuzzy
+#| msgid ""
+#| "Some Confusing or Loaded Words and Phrases to Avoid (or use with care)"
+msgid "Some Confusing or Loaded Words and Phrases to Avoid (or Use with Care)"
 msgstr ""
 "Algunas palabras y frases confusas o injustas que vale la pena evitar (o "
 "utilizar con cuidado)"
 
 # type: Content of: <p>
-msgid ""
-"There are a number of words and phrases which we recommend avoiding, or "
-"avoiding in certain contexts and usages.  The reason is either that they are "
-"ambiguous, or that they imply an opinion that we hope you may not entirely "
-"agree with."
+#, fuzzy
+#| msgid ""
+#| "There are a number of words and phrases which we recommend avoiding, or "
+#| "avoiding in certain contexts and usages.  The reason is either that they "
+#| "are ambiguous, or that they imply an opinion that we hope you may not "
+#| "entirely agree with."
+msgid ""
+"There are a number of words and phrases that we recommend avoiding, or "
+"avoiding in certain contexts and usages.  Some are ambiguous or misleading; "
+"others presuppose a viewpoint that we hope you disagree with."
 msgstr ""
 "Existen varias palabras y frases que recomendamos evitar, o al menos en "
 "ciertos contextos y usos. La razón es  que son ambiguas o quwe implican una "
@@ -136,12 +148,19 @@
 msgstr "«Tipo BSD»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The expression &ldquo;BSD-style license&rdquo; leads to confusion because "
+#| "it <a href=\"/philosophy/bsd.html\">lumps together licenses that have "
+#| "important differences</a>.  For instance, the original BSD license with "
+#| "the advertising clause is incompatible with the GNU GPL, but the revised "
+#| "BSD license is compatible with the GPL."
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/philosophy/bsd.html\">lumps together licenses that have important "
 "differences</a>.  For instance, the original BSD license with the "
-"advertising clause is incompatible with the GNU GPL, but the revised BSD "
-"license is compatible with the GPL."
+"advertising clause is incompatible with the GNU General Public License, but "
+"the revised BSD license is compatible with the GPL."
 msgstr ""
 "La expresión «licencia de tipo BSD» presta a confusión porque <a href=\"/"
 "philosophy/bsd.es.html\">combina licencias que tienen diferencias "
@@ -164,14 +183,25 @@
 msgstr "«Cerrado»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Describing non-free software as &ldquo;closed&rdquo; clearly refers to "
+#| "the term &ldquo;open source&rdquo;.  In the free software movement, <a "
+#| "href=\"/philosophy/open-source-misses-the-point.html\"> we want to avoid "
+#| "being confused with the more recent open source movement</a>, so we are "
+#| "careful to avoid usage that would encourage people to lump us in with "
+#| "them.  Therefore, we avoid describing non-free software as &ldquo;"
+#| "closed&rdquo;.  We call it &ldquo;non-free&rdquo; or <a href=\"/"
+#| "philosophy/categories.html#ProprietarySoftware\"> &ldquo;"
+#| "proprietary&rdquo;</a>."
 msgid ""
-"Describing non-free software as &ldquo;closed&rdquo; clearly refers to the "
+"Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source&rdquo;.  In the free software movement, <a href=\"/"
-"philosophy/open-source-misses-the-point.html\"> we want to avoid being "
-"confused with the more recent open source movement</a>, so we are careful to "
-"avoid usage that would encourage people to lump us in with them.  Therefore, "
-"we avoid describing non-free software as &ldquo;closed&rdquo;.  We call it "
-"&ldquo;non-free&rdquo; or <a href=\"/philosophy/categories."
+"philosophy/open-source-misses-the-point.html\"> we do not want to be "
+"confused with the open source camp</a>, so we are careful to avoid saying "
+"things that would encourage people to lump us in with them.  For instance, "
+"we avoid describing nonfree software as &ldquo;closed&rdquo;.  We call it "
+"&ldquo;nonfree&rdquo; or <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\"> &ldquo;proprietary&rdquo;</a>."
 msgstr ""
 "Describir el software no-libre como «cerrado» refiere claramente al 
término "
@@ -189,12 +219,19 @@
 msgstr "«Computación en nube»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;cloud computing&rdquo; is marketing buzzword with no "
+#| "clear meaning.  It is used for a range of different activities whose only "
+#| "common quality is that they use the Internet for something beyond "
+#| "transmitting files.  Thus, the term is a nexus of confusion.  If you try "
+#| "to use it in your thinking, your thinking will be vague."
 msgid ""
-"The term &ldquo;cloud computing&rdquo; is marketing buzzword with no clear "
+"The term &ldquo;cloud computing&rdquo; is a marketing buzzword with no clear "
 "meaning.  It is used for a range of different activities whose only common "
-"quality is that they use the Internet for something beyond transmitting "
-"files.  Thus, the term is a nexus of confusion.  If you try to use it in "
-"your thinking, your thinking will be vague."
+"characteristic is that they use the Internet for something beyond "
+"transmitting files.  Thus, the term is a nexus of confusion.  If you base "
+"your thinking on it, your thinking will be vague."
 msgstr ""
 "El término «computación en nube» es una sonora palabra de marketing sin 
un "
 "claro significado. Se usa para diversas actividades cuyo punto en común es "
@@ -203,12 +240,19 @@
 "serán poco precisos."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "When thinking about or responding to a statement someone else made using "
+#| "this term, the first step is to clarify the topic.  Which kind of "
+#| "activity is the statement really about, and what is a good term for that "
+#| "activity? Pressing yourself (or the person who made the statement) to "
+#| "clarify the topic will direct the discussion towards a useful conclusion."
 msgid ""
-"When thinking about or responding to a statement someone else made using "
+"When thinking about or responding to a statement someone else has made using "
 "this term, the first step is to clarify the topic.  Which kind of activity "
-"is the statement really about, and what is a good term for that activity? "
-"Pressing yourself (or the person who made the statement) to clarify the "
-"topic will direct the discussion towards a useful conclusion."
+"is the statement really about, and what is a good, clear term for that "
+"activity? Once the topic is clear, the discussion can head for a useful "
+"conclusion."
 msgstr ""
 "Cuando esté pensando en esta palabra o en cómo responder a una afirmación "
 "que otra persona ha realizado usando esta palabra, el primer paso es aclarar "
@@ -218,12 +262,19 @@
 "dirigirá la conversación hacia una conclusión útil."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Curiously, Larry Ellison, a proprietary software developer, also <a href="
+#| "\"http://news.cnet.com/8301-13953_3-10052188-80.html\";> noted the vacuity "
+#| "of the term &ldquo;cloud computing&rdquo;</a>.  He decided to use the "
+#| "term anyway because, as a proprietary software developer, he isn't "
+#| "motivated by the same ideals we are."
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a href="
 "\"http://news.cnet.com/8301-13953_3-10052188-80.html\";> noted the vacuity of "
-"the term &ldquo;cloud computing&rdquo;</a>.  He decided to use the term "
+"the term &ldquo;cloud computing.&rdquo;</a> He decided to use the term "
 "anyway because, as a proprietary software developer, he isn't motivated by "
-"the same ideals we are."
+"the same ideals as we are."
 msgstr ""
 "Curiosamente, Larry Ellison, un programador de software privativo, también "
 "<a href=\"http://news.cnet.com/8301-13953_3-10052188-80.html\";>señaló la "
@@ -236,20 +287,33 @@
 msgstr "«Comercial»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;non-"
+#| "free.&rdquo; That confuses two entirely different issues."
 msgid ""
-"Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;non-free."
+"Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;nonfree."
 "&rdquo; That confuses two entirely different issues."
 msgstr ""
 "No use «comercial» como un sinónimo de «no libre», por favor. Eso 
confunde dos "
 "asuntos completamente diferentes."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is commercial if it is developed as a business activity.  A "
+#| "commercial program can be free or non-free, depending on its license.  "
+#| "Likewise, a program developed by a school or an individual can be free or "
+#| "non-free, depending on its license.  The two questions, what sort of "
+#| "entity developed the program and what freedom its users have, are "
+#| "independent."
 msgid ""
 "A program is commercial if it is developed as a business activity.  A "
-"commercial program can be free or non-free, depending on its license.  "
-"Likewise, a program developed by a school or an individual can be free or "
-"non-free, depending on its license.  The two questions, what sort of entity "
-"developed the program and what freedom its users have, are independent."
+"commercial program can be free or nonfree, depending on its manner of "
+"distribution.  Likewise, a program developed by a school or an individual "
+"can be free or nonfree, depending on its manner of distribution.  The two "
+"questions&mdash;what sort of entity developed the program and what freedom "
+"its users have&mdash;are independent."
 msgstr ""
 "Un programa es comercial si es desarrollado como una actividad económica. Un 
"
 "programa comercial puede ser libre o no, dependiendo de su licencia. Del "
@@ -273,10 +337,18 @@
 "empezó a aparecer software libre comercial."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Free commercial software is a contribution to our community, so we should "
+#| "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
+#| "&ldquo;non-free&rdquo; will tend to think that the &ldquo;free "
+#| "commercial&rdquo; combination is self-contradictory, and dismiss the "
+#| "possibility.  Let's be careful not to use the word &ldquo;"
+#| "commercial&rdquo; in that way."
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
-"&ldquo;non-free&rdquo; will tend to think that the &ldquo;free "
+"&ldquo;nonfree&rdquo; will tend to think that the &ldquo;free "
 "commercial&rdquo; combination is self-contradictory, and dismiss the "
 "possibility.  Let's be careful not to use the word &ldquo;commercial&rdquo; "
 "in that way."
@@ -312,20 +384,36 @@
 msgstr "«Consumidor»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;consumer&rdquo;, when used to refer to computer users, "
+#| "carries unfortunate assumptions."
 msgid ""
-"The term &ldquo;consumer&rdquo;, when used to refer to computer users, "
-"carries unfortunate assumptions."
+"The term &ldquo;consumer,&rdquo; when used to refer to computer users, is "
+"loaded with assumptions we should reject."
 msgstr ""
 "El término «consumidor», cuando es usado para referirse a los usuarios de "
 "computadoras, conlleva asunciones poco afortunadas."
 
 # type: Content of: <p>
 msgid ""
-"Economic theory uses the terms &ldquo;producer&rdquo; and &ldquo;"
-"consumer&rdquo;.  In that context these words are appropriate.  But "
-"describing the users of software as &ldquo;consumers&rdquo; presumes a "
-"narrow role for them.  It treats them like cattle that passively graze on "
-"what others make available to them."
+"The terms &ldquo;producer&rdquo; and &ldquo;consumer&rdquo; come from "
+"economic theory, and presuppose the assumptions and narrow prespective of "
+"economic theory.  That warps your thinking."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Economic theory uses the terms &ldquo;producer&rdquo; and &ldquo;"
+#| "consumer&rdquo;.  In that context these words are appropriate.  But "
+#| "describing the users of software as &ldquo;consumers&rdquo; presumes a "
+#| "narrow role for them.  It treats them like cattle that passively graze on "
+#| "what others make available to them."
+msgid ""
+"In addition, describing the users of software as &ldquo;consumers&rdquo; "
+"presumes a narrow role for them.  It treats them like cattle that passively "
+"graze on what others make available to them."
 msgstr ""
 "La teoría económica usa los términos «productor» y «consumidor». En 
ese "
 "contexto, esas palabras resultan apropiadas. Pero describir los usuarios de "
@@ -347,9 +435,14 @@
 "preocupar?"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The narrow economic vision of users as &ldquo;consumers&rdquo; tends to "
+#| "go hand in hand with the idea that published works are &ldquo;"
+#| "content&rdquo;."
 msgid ""
-"The narrow economic vision of users as &ldquo;consumers&rdquo; tends to go "
-"hand in hand with the idea that published works are &ldquo;content&rdquo;."
+"The narrow economic conception of users as &ldquo;consumers&rdquo; tends to "
+"go hand in hand with the idea that published works are &ldquo;content.&rdquo;"
 msgstr ""
 "La visión económica estrecha de los usuarios como «consumidores» tiende a 
ir "
 "de la mano con la idea que los trabajos publicados son «contenido»."
@@ -368,13 +461,20 @@
 msgstr "«Contenido»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If you want to describe a feeling of comfort and satisfaction, by all "
+#| "means say you are &ldquo;content&rdquo;, but using it as a noun to "
+#| "describe written and other works of authorship is worth avoiding.  That "
+#| "usage adopts a specific attitude towards those works: that they are an "
+#| "interchangeable commodity whose purpose is to fill a box and make money.  "
+#| "In effect, it disparages the works themselves."
 msgid ""
 "If you want to describe a feeling of comfort and satisfaction, by all means "
-"say you are &ldquo;content&rdquo;, but using it as a noun to describe "
-"written and other works of authorship is worth avoiding.  That usage adopts "
-"a specific attitude towards those works: that they are an interchangeable "
-"commodity whose purpose is to fill a box and make money.  In effect, it "
-"disparages the works themselves."
+"say you are &ldquo;content,&rdquo; but using the word as a noun to describe "
+"written and other works of authorship adopts an attitude you might rather "
+"avoid.  It regards these works as a commodity whose purpose is to fill a box "
+"and make money.  In effect, it disparages the works themselves."
 msgstr ""
 "Si quiere describir un sentimiento de comodidad y satisfacción, en todos los 
"
 "sentidos diría que está «contento»; pero vale la pena evitar usarlo como 
un "
@@ -387,15 +487,27 @@
 "realidad, es una falta de respeto a los propios trabajos."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Those who use this term are often the publishers that push for increased "
+#| "copyright power in the name of the authors (&ldquo;creators&rdquo;, as "
+#| "they say) of the works.  The term &ldquo;content&rdquo; reveals their "
+#| "real attitude towards these works and their authors.  (See <a href="
+#| "\"http://archive.salon.com/tech/feature/2000/06/14/love/print.html";
+#| "\">Courtney Love's open letter to Steve Case</a> and search for &ldquo;"
+#| "content provider&rdquo; in that page.  Alas, Ms. Love is unaware that the "
+#| "term &ldquo;intellectual property&rdquo; is also <a href="
+#| "\"#IntellectualProperty\"> misleading</a>.)"
 msgid ""
 "Those who use this term are often the publishers that push for increased "
-"copyright power in the name of the authors (&ldquo;creators&rdquo;, as they "
+"copyright power in the name of the authors (&ldquo;creators,&rdquo; as they "
 "say) of the works.  The term &ldquo;content&rdquo; reveals their real "
 "attitude towards these works and their authors.  (See <a href=\"http://";
 "archive.salon.com/tech/feature/2000/06/14/love/print.html\">Courtney Love's "
 "open letter to Steve Case</a> and search for &ldquo;content provider&rdquo; "
 "in that page.  Alas, Ms. Love is unaware that the term &ldquo;intellectual "
-"property&rdquo; is also <a href=\"#IntellectualProperty\"> misleading</a>.)"
+"property&rdquo; is also <a href=\"#IntellectualProperty\"> biased and "
+"confusing</a>.)"
 msgstr ""
 "Los que frecuentemente usan este término son los editores, que buscan "
 "incrementar el poder de los derechos de autor en nombre de los autores "
@@ -419,13 +531,21 @@
 "malcontenidos»."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
+#| "&ldquo;Content&rdquo; means &ldquo;some sort of information&rdquo;, and "
+#| "&ldquo;management&rdquo; in this context means &ldquo;doing something "
+#| "with it&rdquo;.  So a &ldquo;content management system&rdquo; is a system "
+#| "for doing something to some sort of information.  That description fits "
+#| "most programs."
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
-"&ldquo;Content&rdquo; means &ldquo;some sort of information&rdquo;, and "
+"&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
 "&ldquo;management&rdquo; in this context means &ldquo;doing something with "
-"it&rdquo;.  So a &ldquo;content management system&rdquo; is a system for "
-"doing something to some sort of information.  That description fits most "
-"programs."
+"it.&rdquo; So a &ldquo;content management system&rdquo; is a system for "
+"doing something to some sort of information.  Nearly all programs fit that "
+"description."
 msgstr ""
 "El término «gestión de contenidos» se lleva el premio a la vaguedad. "
 "«Contenido» significa «algún tipo de información», y en este contexto 
«gestión» "
@@ -434,9 +554,14 @@
 "descripción se ajusta a la mayoría de programas."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In most cases, that term really refers to a system for updating pages on "
+#| "a website.  For that, we recommend the term &ldquo;website revision "
+#| "system&rdquo; (WRS)."
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
-"website.  For that, we recommend the term &ldquo;website revision "
+"Web site.  For that, we recommend the term &ldquo;Web site revision "
 "system&rdquo; (WRS)."
 msgstr ""
 "En muchos casos, este término en realidad se refiere a un sistema para "
@@ -449,12 +574,21 @@
 msgstr "«Creador»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
+#| "them to a deity (&ldquo;the creator&rdquo;).  The term is used by "
+#| "publishers to elevate the authors' moral stature above that of ordinary "
+#| "people, to justify increased copyright power that the publishers can "
+#| "exercise in the name of the authors.  We recommend saying &ldquo;"
+#| "author&rdquo; instead.  However, in many cases &ldquo;copyright "
+#| "holder&rdquo; is what you really mean."
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
-"to elevate the authors' moral stature above that of ordinary people, to "
-"justify increased copyright power that the publishers can exercise in the "
-"name of the authors.  We recommend saying &ldquo;author&rdquo; instead.  "
+"to elevate authors' moral standing above that of ordinary people in order to "
+"justify giving them increased copyright power, which the publishers can then "
+"exercise in their name.  We recommend saying &ldquo;author&rdquo; instead.  "
 "However, in many cases &ldquo;copyright holder&rdquo; is what you really "
 "mean."
 msgstr ""
@@ -470,10 +604,20 @@
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr "«Bienes Digitales»"
 
+# type: Content of: outside any tag (error?)
+msgid "o"
+msgstr ""
+
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;digital goods&rdquo; as applied to copies of works of "
+#| "authorship forces them into the thought mold of physical goods &mdash; "
+#| "which cannot be copied, and which therefore have to be manufactured and "
+#| "sold."
 msgid ""
-"The term &ldquo;digital goods&rdquo; as applied to copies of works of "
-"authorship forces them into the thought mold of physical goods &mdash; which "
+"The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
+"authorship, erroneously identifies them with physical goods&mdash;which "
 "cannot be copied, and which therefore have to be manufactured and sold."
 msgstr ""
 "El término «bienes digitales», aplicado a las copias de trabajos con 
autoría, "
@@ -503,10 +647,14 @@
 "restricciones."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Good alternatives include &ldquo;Digital Restrictions Management&rdquo;, "
+#| "&ldquo;Digital Restrictions Malware&rdquo;, and &ldquo;digital "
+#| "handcuffs&rdquo;."
 msgid ""
-"Good alternatives include &ldquo;Digital Restrictions Management&rdquo;, "
-"&ldquo;Digital Restrictions Malware&rdquo;, and &ldquo;digital "
-"handcuffs&rdquo;."
+"Good alternatives include &ldquo;Digital Restrictions Management,&rdquo; and "
+"&ldquo;digital handcuffs.&rdquo;"
 msgstr ""
 "Buenas alternativas son «Gestión Digital de Restricciones», «Malware 
Digital "
 "de Restricciones» (ambos con siglas en inglés «DRM») y «esposas 
digitales»."
@@ -516,14 +664,24 @@
 msgstr "«Ecosistema»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "It is a mistake to describe the free software community, or any human "
+#| "community, as an &ldquo;ecosystem&rdquo;, because that word implies the "
+#| "absence of (1) intention and (2) ethics.  In an ecosystem, species evolve "
+#| "according to their fitness.  If something is weak, it goes extinct, and "
+#| "that's neither right nor wrong, merely an ecological phenomenon.  The "
+#| "term &ldquo;ecosystem&rdquo; implicitly suggests a passive attitude: "
+#| "&ldquo;Don't ask how things <em>should</em> be, just watch what happens "
+#| "to them&rdquo;."
 msgid ""
 "It is a mistake to describe the free software community, or any human "
-"community, as an &ldquo;ecosystem&rdquo;, because that word implies the "
+"community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
 "absence of (1) intention and (2) ethics.  In an ecosystem, species evolve "
-"according to their fitness.  If something is weak, it goes extinct, and "
-"that's neither right nor wrong, merely an ecological phenomenon.  The term "
-"&ldquo;ecosystem&rdquo; implicitly suggests a passive attitude: &ldquo;Don't "
-"ask how things <em>should</em> be, just watch what happens to them&rdquo;."
+"according to their fitness: if a species is weak and goes extinct, that's "
+"neither right nor wrong, merely an ecological phenomenon.  The term &ldquo;"
+"ecosystem&rdquo; implicitly suggests a attitude of passive observation: "
+"don't ask how what <em>should</em> happen, just study what does happen."
 msgstr ""
 "Es un error describir nuestra comunidad (o cualquier comunidad) como un "
 "«ecosistema», porque esa palabra implica la ausencia de intención (1) y 
ética "
@@ -534,12 +692,20 @@
 "lo que les pasa»."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "By contrast, beings that adopt an active stance towards their "
+#| "surroundings, and have ideas of ethical responsibility, can decide to "
+#| "preserve things that, on their own, would tend to vanish&mdash;such as "
+#| "civil society, democracy, human rights, peace, public health, clean air "
+#| "and water, endangered species, traditional arts, &hellip; and computer "
+#| "users' freedom."
 msgid ""
 "By contrast, beings that adopt an active stance towards their surroundings, "
 "and have ideas of ethical responsibility, can decide to preserve things "
 "that, on their own, would tend to vanish&mdash;such as civil society, "
 "democracy, human rights, peace, public health, clean air and water, "
-"endangered species, traditional arts, &hellip; and computer users' freedom."
+"endangered species, traditional arts&hellip;and computer users' freedom."
 msgstr ""
 "En contraste, los seres que adoptan una posición activa respecto a su "
 "entorno, y tienen ideas de responsabilidad ética; pueden decidir preservar "
@@ -585,16 +751,25 @@
 "software libre»."
 
 # type: Content of: <h4>
-msgid "&ldquo;Freely Available&rdquo;"
+#, fuzzy
+#| msgid "&ldquo;Freely Available&rdquo;"
+msgid "&ldquo;Freely available&rdquo;"
 msgstr "«Disponible Libremente»"
 
 # type: Content of: <p>
-msgid ""
-"Don't use &ldquo;freely available&rdquo; as a synonym for &ldquo;free "
-"software.&rdquo; They are not equivalent.  &ldquo;Freely available&rdquo; "
-"means that anyone can easily get a copy.  &ldquo;Free software&rdquo; is "
-"defined in terms of the freedom of users that have a copy.  These are "
-"answers to different questions."
+#, fuzzy
+#| msgid ""
+#| "Don't use &ldquo;freely available&rdquo; as a synonym for &ldquo;free "
+#| "software.&rdquo; They are not equivalent.  &ldquo;Freely available&rdquo; "
+#| "means that anyone can easily get a copy.  &ldquo;Free software&rdquo; is "
+#| "defined in terms of the freedom of users that have a copy.  These are "
+#| "answers to different questions."
+msgid ""
+"Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;"
+"free software.&rdquo; The terms are not equivalent.  Software is &ldquo;"
+"freely available&rdquo; if anyone can easily get a copy.  &ldquo;Free "
+"software&rdquo; is defined in terms of the freedom of users that have a copy "
+"of it.  These are answers to different questions."
 msgstr ""
 "No use «disponlible libremente» como un sinónimo de «software libre.» No 
son "
 "equivalentes entre sí. «Disponlible libremente» significa que cualquiera "
@@ -620,11 +795,18 @@
 "no tiene una definición particular consensuada."
 
 # type: Content of: <p>
-msgid ""
-"Also, if you use other languages than English, please try to avoid borrowing "
-"English terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; "
-"It is better to translate the term &ldquo;free software&rdquo; into <a href="
-"\"/philosophy/fs-translations.html\">your language</a>."
+#, fuzzy
+#| msgid ""
+#| "Also, if you use other languages than English, please try to avoid "
+#| "borrowing English terms such as &ldquo;free software&rdquo; or &ldquo;"
+#| "freeware.&rdquo; It is better to translate the term &ldquo;free "
+#| "software&rdquo; into <a href=\"/philosophy/fs-translations.html\">your "
+#| "language</a>."
+msgid ""
+"When using languages other than English, please avoid borrowing English "
+"terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; It is "
+"better to translate the term &ldquo;free software&rdquo; into <a href=\"/"
+"philosophy/fs-translations.html\">your language</a>."
 msgstr ""
 "Además, si usa otros idiomas que no sean inglés, por favor trate de evitar "
 "tomar prestados términos ingleses, tal como «free software» o 
«freeware». Es "
@@ -652,11 +834,19 @@
 msgstr "«Regalar software»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
+#| "distribute a program as free software.&rdquo; It has the same problem as "
+#| "&ldquo;for free&rdquo;: it implies the issue is price, not freedom.  One "
+#| "way to avoid the confusion is to say &ldquo;release as free software."
+#| "&rdquo;"
 msgid ""
 "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
-"distribute a program as free software.&rdquo; It has the same problem as "
-"&ldquo;for free&rdquo;: it implies the issue is price, not freedom.  One way "
-"to avoid the confusion is to say &ldquo;release as free software.&rdquo;"
+"distribute a program as free software.&rdquo; This locution has the same "
+"problem as &ldquo;for free&rdquo;: it implies the issue is price, not "
+"freedom.  One way to avoid the confusion is to say &ldquo;release as free "
+"software.&rdquo;"
 msgstr ""
 "Es desorientador usar el término «regalar» para significar «distribuir un 
"
 "programa como software libre». Tiene el mismo problema que «gratis»: 
implica "
@@ -668,14 +858,23 @@
 msgstr "Hacker"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+#| "html\"> enjoys playful cleverness</a>&mdash;not necessarily with "
+#| "computers.  The programmers in the old <abbr title=\"Massachusetts "
+#| "Institute of Technology\">MIT</abbr> free software community of the 60s "
+#| "and 70s referred to themselves as hackers.  Around 1980, journalists who "
+#| "discovered the hacker community mistakenly took the term to mean &ldquo;"
+#| "security breaker&rdquo;."
 msgid ""
 "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
 "html\"> enjoys playful cleverness</a>&mdash;not necessarily with computers.  "
 "The programmers in the old <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr> free software community of the 60s and 70s referred "
 "to themselves as hackers.  Around 1980, journalists who discovered the "
-"hacker community mistakenly took the term to mean &ldquo;security "
-"breaker&rdquo;."
+"hacker community mistakenly took the term to mean &ldquo;security breaker."
+"&rdquo;"
 msgstr ""
 "Un hacker es alguien que <a href=\"http://stallman.org/articles/on-hacking.";
 "html\">disfruta de jucar con la inteligencia</a> (texto en inglés), no "
@@ -686,9 +885,13 @@
 "equivocadamente el término para decir «rompen la seguridad»."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please don't spread this mistake.  People who break security are &ldquo;"
+#| "crackers&rdquo;."
 msgid ""
 "Please don't spread this mistake.  People who break security are &ldquo;"
-"crackers&rdquo;."
+"crackers.&rdquo;"
 msgstr ""
 "Por favor no difunda este error. Las personas que rompen la seguridad son "
 "«crackers»."
@@ -698,12 +901,20 @@
 msgstr "«Propiedad intelectual»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
+#| "property&rdquo;&mdash;a term that also includes patents, trademarks, and "
+#| "other more obscure areas of law.  These laws have so little in common, "
+#| "and differ so much, that it is ill-advised to generalize about them.  It "
+#| "is best to talk specifically about &ldquo;copyright,&rdquo; or about "
+#| "&ldquo;patents,&rdquo; or about &ldquo;trademarks.&rdquo;"
 msgid ""
 "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
-"property&rdquo;&mdash;a term that also includes patents, trademarks, and "
-"other more obscure areas of law.  These laws have so little in common, and "
-"differ so much, that it is ill-advised to generalize about them.  It is best "
-"to talk specifically about &ldquo;copyright,&rdquo; or about &ldquo;patents,"
+"property&rdquo;&mdash;a term also applied to patents, trademarks, and other "
+"more obscure areas of law.  These laws have so little in common, and differ "
+"so much, that it is ill-advised to generalize about them.  It is best to "
+"talk specifically about &ldquo;copyright,&rdquo; or about &ldquo;patents,"
 "&rdquo; or about &ldquo;trademarks.&rdquo;"
 msgstr ""
 "A los editores y abogados les gusta describir los derechos de autor como "
@@ -714,11 +925,17 @@
 "«marcas registradas»."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;intellectual property&rdquo; carries a hidden "
+#| "assumption&mdash;that the way to think about all these disparate issues "
+#| "is based on an analogy with physical objects, and our ideas of physical "
+#| "property."
 msgid ""
 "The term &ldquo;intellectual property&rdquo; carries a hidden "
 "assumption&mdash;that the way to think about all these disparate issues is "
-"based on an analogy with physical objects, and our ideas of physical "
-"property."
+"based on an analogy with physical objects, and our conception of them as "
+"physical property."
 msgstr ""
 "El término «propiedad intelectual» conlleva una asunción oculta; que la 
forma "
 "de pensar sobre todos estos asuntos dispares está basada en una analogía 
con "
@@ -736,20 +953,30 @@
 "no se puede."
 
 # type: Content of: <p>
-msgid ""
-"To avoid the bias and confusion of this term, it is best to make a firm "
-"decision <a href=\"/philosophy/not-ipr.html\"> not to speak or even think in "
-"terms of &ldquo;intellectual property&rdquo;</a>."
+#, fuzzy
+#| msgid ""
+#| "To avoid the bias and confusion of this term, it is best to make a firm "
+#| "decision <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
+#| "in terms of &ldquo;intellectual property&rdquo;</a>."
+msgid ""
+"To avoid spreading unnecessary bias and confusion, it is best to adopt a "
+"firm policy <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
+"in terms of &ldquo;intellectual property&rdquo;</a>."
 msgstr ""
 "Para evitar el sesgo y la confusión de este término, es mejor tomar una "
 "decisión firme, <a href=\"/philosophy/not-ipr.es.html\">no hablar o siquiera 
"
 "pensar en términos de «propiedad intelectual»</a>."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
+#| "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make "
+#| "WIPO embarrassed</a>."
 msgid ""
 "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
-"philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make "
-"WIPO embarrassed</a>."
+"philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make the "
+"World &ldquo;Intellectual Property&rdquo; Organization embarrassed</a>."
 msgstr ""
 "La hipocresía de llamar a estos poderes «derechos» está <a 
href=\"/philosophy/"
 "wipo-PublicAwarenessOfCopyright-2002.html\">compezando a avergonzar a la "
@@ -760,12 +987,19 @@
 msgstr "«Sistema LAMP»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
+#| "&mdash;a common combination of software to use on a web server, except "
+#| "that &ldquo;Linux&rdquo; really refers to the GNU/Linux system.  So "
+#| "instead of &ldquo;LAMP&rdquo; it should be &ldquo;GLAMP&rdquo;: &ldquo;"
+#| "GNU, Linux, Apache, MySQL and PHP&rdquo;."
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
-"&mdash;a common combination of software to use on a web server, except that "
-"&ldquo;Linux&rdquo; really refers to the GNU/Linux system.  So instead of "
-"&ldquo;LAMP&rdquo; it should be &ldquo;GLAMP&rdquo;: &ldquo;GNU, Linux, "
-"Apache, MySQL and PHP&rdquo;."
+"&mdash;a common combination of software to use on a Web server, except that "
+"&ldquo;Linux&rdquo; in this context really refers to the GNU/Linux system.  "
+"So instead of &ldquo;LAMP&rdquo; it should be &ldquo;GLAMP&rdquo;: &ldquo;"
+"GNU, Linux, Apache, MySQL and PHP.&rdquo;"
 msgstr ""
 "«LAMP» significa «Linux, Apache, MySQL y PHP», una combinación frecuente 
de "
 "software para usar en un servidor web; excepto que «Linux» se refiere en "
@@ -777,13 +1011,21 @@
 msgstr "Sistema Linux"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Linux is the name of the kernel that Linus Torvalds developed starting in "
+#| "1991.  The operating system in which Linux is used is basically GNU with "
+#| "Linux added.  To call the whole system &ldquo;Linux&rdquo; is both unfair "
+#| "and confusing.  Please call the complete system <a href=\"/gnu/linux-and-"
+#| "gnu.html\"> GNU/Linux</a>, both to give the GNU Project credit and "
+#| "distinguish the whole system from the kernel alone."
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
 "Linux added.  To call the whole system &ldquo;Linux&rdquo; is both unfair "
 "and confusing.  Please call the complete system <a href=\"/gnu/linux-and-gnu."
-"html\"> GNU/Linux</a>, both to give the GNU Project credit and distinguish "
-"the whole system from the kernel alone."
+"html\"> GNU/Linux</a>, both to give the GNU Project credit and to "
+"distinguish the whole system from the kernel alone."
 msgstr ""
 "Linux es el nombre del núcleo que empezó a programar en 1991 Linus 
Torvalds. "
 "Básicamente, el sistema operativo en que se usa Linux es el GNU con Linux "
@@ -797,19 +1039,29 @@
 msgstr "«Mercado»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "It is misleading to describe the users of free software, or the software "
+#| "users in general, as a &ldquo;market&rdquo;."
 msgid ""
 "It is misleading to describe the users of free software, or the software "
-"users in general, as a &ldquo;market&rdquo;."
+"users in general, as a &ldquo;market.&rdquo;"
 msgstr ""
 "Es desorientador describir a los usuarios de software libre, o a los "
 "usuarios de software en general, como un «mercado»."
 
 # type: Content of: <p>
-msgid ""
-"This is not to say we're against markets.  If you have a free software "
-"support business, then you have clients, and you trade with them in a "
-"market.  As long as you respect their freedom, we wish you success in your "
-"market."
+#, fuzzy
+#| msgid ""
+#| "This is not to say we're against markets.  If you have a free software "
+#| "support business, then you have clients, and you trade with them in a "
+#| "market.  As long as you respect their freedom, we wish you success in "
+#| "your market."
+msgid ""
+"This is not to say there is no room for markets in the free software "
+"community.  If you have a free software support business, then you have "
+"clients, and you trade with them in a market.  As long as you respect their "
+"freedom, we wish you success in your market."
 msgstr ""
 "Esto no quiere decir que estemos en contra de los mercados. Si tiene un "
 "negocio de soporte para software libre, usted tiene clientes; e intercambia "
@@ -817,12 +1069,20 @@
 "su mercado."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "But the free software movement is a social movement, not a business, and "
+#| "the success it aims for is not a market success.  We are trying to serve "
+#| "the public by giving it freedom&mdash;not competing to take them away "
+#| "from a rival.  To equate this campaign for freedom to a business' "
+#| "campaign for mere success is to diminish the significance of freedom."
 msgid ""
 "But the free software movement is a social movement, not a business, and the "
 "success it aims for is not a market success.  We are trying to serve the "
-"public by giving it freedom&mdash;not competing to take them away from a "
-"rival.  To equate this campaign for freedom to a business' campaign for mere "
-"success is to diminish the significance of freedom."
+"public by giving it freedom&mdash;not competing to draw business away from a "
+"rival.  To equate this campaign for freedom to a business' efforts for mere "
+"success is to deny the importance of freedom and legitimize proprietary "
+"software."
 msgstr ""
 "Pero el movimiento por el software libre es un movimiento social, no un "
 "negocio, y el éxito al que apunta no es un éxito de mercado. Tratamos de "
@@ -835,15 +1095,26 @@
 msgstr "«Reproductor MP3»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In the late 1990's it became feasible to make portable, solid-state "
+#| "digital audio players. Most support the patented MP3 codec, but not all.  "
+#| "Some support the patent-free audio codecs Ogg Vorbis and FLAC, and may "
+#| "not even support MP3-encoded files at all, precisely to avoid the "
+#| "patents.  To call such players &ldquo;MP3 players&rdquo; is not only "
+#| "confusing, it also puts MP3 in an undeserved position of privilege which "
+#| "helps the patent holders continue to attack our community.  We suggest "
+#| "the terms &ldquo;digital audio player&rdquo;, or simply &ldquo;audio "
+#| "player&rdquo; if context permits."
 msgid ""
 "In the late 1990's it became feasible to make portable, solid-state digital "
 "audio players. Most support the patented MP3 codec, but not all.  Some "
 "support the patent-free audio codecs Ogg Vorbis and FLAC, and may not even "
-"support MP3-encoded files at all, precisely to avoid the patents.  To call "
+"support MP3-encoded files at all, precisely to avoid these patents.  To call "
 "such players &ldquo;MP3 players&rdquo; is not only confusing, it also puts "
-"MP3 in an undeserved position of privilege which helps the patent holders "
-"continue to attack our community.  We suggest the terms &ldquo;digital audio "
-"player&rdquo;, or simply &ldquo;audio player&rdquo; if context permits."
+"MP3 in an undeserved position of privilege which encourages people to "
+"continue using that vulnerable format.  We suggest the terms &ldquo;digital "
+"audio player,&rdquo; or simply &ldquo;audio player&rdquo; if context permits."
 msgstr ""
 "A finales de los 90 se hizo factible hacer reproductores de audio digital "
 "portátiles y sólidos. La mayoría soporta el codificador patentado MP3, 
pero "
@@ -861,14 +1132,24 @@
 msgstr "«Abierto»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open "
+#| "source&rdquo; as a substitute for &ldquo;free software&rdquo;.  They "
+#| "refer to a <a href=\"/philosophy/open-source-misses-the-point.html\"> "
+#| "different position</a> based on different values.  Free software is a "
+#| "political movement; open source is a development model.  When referring "
+#| "to the open source position, using its name is appropriate; but please "
+#| "don't label us or our work with its slogan&mdash;that leads people to "
+#| "think we share those views."
 msgid ""
 "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open source&rdquo; "
-"as a substitute for &ldquo;free software&rdquo;.  They refer to a <a href=\"/"
-"philosophy/open-source-misses-the-point.html\"> different position</a> based "
-"on different values.  Free software is a political movement; open source is "
-"a development model.  When referring to the open source position, using its "
-"name is appropriate; but please don't label us or our work with its "
-"slogan&mdash;that leads people to think we share those views."
+"as a substitute for &ldquo;free software&rdquo;.  Those terms refer to a <a "
+"href=\"/philosophy/open-source-misses-the-point.html\"> different position</"
+"a> based on different values.  Free software is a political movement; open "
+"source is a development model.  When referring to the open source position, "
+"using its name is appropriate; but please use it to label us or our "
+"work&mdash;that leads people to think we share those views."
 msgstr ""
 "Por favor evite usar el término «abierto» o «código abierto» (del 
inglés <span "
 "style=\"font-style:italic;\">open source</span>) como substitutos de "
@@ -908,11 +1189,19 @@
 msgstr "«Photoshop»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;Photoshop&rdquo; as a verb, meaning "
+#| "any kind of photo manipulation or image editing in general.  Photoshop is "
+#| "just the name of one particular proprietary image editing program, and "
+#| "there are plenty of free alternatives, such as <a href=\"/software/gimp"
+#| "\">GIMP</a>."
 msgid ""
-"Please avoid using the term &ldquo;Photoshop&rdquo; as a verb, meaning any "
+"Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any "
 "kind of photo manipulation or image editing in general.  Photoshop is just "
-"the name of one particular proprietary image editing program, and there are "
-"plenty of free alternatives, such as <a href=\"/software/gimp\">GIMP</a>."
+"the name of one particular image editing program, which should be avoided "
+"since it is proprietary.  There are plenty of free alternatives, such as <a "
+"href=\"/software/gimp\">GIMP</a>."
 msgstr ""
 "Por favor evite usar el término «Photoshop» como un verbo, que signifique "
 "cualquier tipo de manipulación de fotografías o de edición de imágenes en 
"
@@ -963,12 +1252,19 @@
 msgstr "«PowerPoint»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
+#| "slide presentation.  PowerPoint is just the name of one particular "
+#| "proprietary program to make presentations, and there are plenty of free "
+#| "alternatives, such as the <tt>beamer</tt> class available with any (La)"
+#| "TeX distribution."
 msgid ""
 "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
 "slide presentation.  PowerPoint is just the name of one particular "
 "proprietary program to make presentations, and there are plenty of free "
-"alternatives, such as the <tt>beamer</tt> class available with any (La)TeX "
-"distribution."
+"alternatives, such as TeX's <tt>beamer</tt> class and OpenOffice.org's "
+"Impress."
 msgstr ""
 "Por favor evite usar el término «PowerPoint» para referirse a cualquier 
tipo "
 "de presentación de diapositivas. PowerPoint es sólo el nombre de un 
programa "
@@ -995,10 +1291,17 @@
 "autor, más que con los usuarios a quienes restringe."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms "
+#| "instead.  For example, instead of &ldquo;Copyright protection lasts a "
+#| "very long time,&rdquo; you can say, &ldquo;Copyright lasts a very long "
+#| "time.&rdquo;"
 msgid ""
 "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms instead.  "
-"For example, instead of &ldquo;Copyright protection lasts a very long time,"
-"&rdquo; you can say, &ldquo;Copyright lasts a very long time.&rdquo;"
+"For example, instead of saying, &ldquo;Copyright protection lasts a very "
+"long time,&rdquo; you can say, &ldquo;Copyright lasts a very long time."
+"&rdquo;"
 msgstr ""
 "Resulta fácil evitar «protección» y usar términos neutrales en su lugar. 
Por "
 "ejemplo, en lugar de «la protección de los derechos de autor permanece "
@@ -1006,10 +1309,15 @@
 "permanecen vigente durante un tiempo muy prolongado»."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If you want to criticize copyright instead of supporting it, you can use "
+#| "the term &ldquo;copyright restrictions.&rdquo; So you can say, &ldquo;"
+#| "Copyright restrictions last a very long time.&rdquo;"
 msgid ""
 "If you want to criticize copyright instead of supporting it, you can use the "
-"term &ldquo;copyright restrictions.&rdquo; So you can say, &ldquo;Copyright "
-"restrictions last a very long time.&rdquo;"
+"term &ldquo;copyright restrictions.&rdquo; Thus, you can say, &ldquo;"
+"Copyright restrictions last a very long time.&rdquo;"
 msgstr ""
 "Si quiere criticar a los derechos de autor en lugar de apoyarlos, puede usar "
 "el término «restricciones de los derechos de autor». De ese modo puede 
decir "
@@ -1017,11 +1325,18 @@
 "tiempo muy prolongado»."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;protection&rdquo; is also used to describe malicious "
+#| "features, as in &ldquo;copy protection&rdquo;, a feature that interferes "
+#| "with copying.  From the user's point of view, this is obstruction.  So we "
+#| "call that malicious feature &ldquo;copy obstruction&rdquo;."
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
-"features, as in &ldquo;copy protection&rdquo;, a feature that interferes "
-"with copying.  From the user's point of view, this is obstruction.  So we "
-"call that malicious feature &ldquo;copy obstruction&rdquo;."
+"features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
+"interferes with copying.  From the user's point of view, this is "
+"obstruction.  So we can call that malicious feature &ldquo;copy obstruction."
+"&rdquo;"
 msgstr ""
 "El término «protección» también es usado para describir características 
"
 "maliciosas; como en «protección de copia», una característica que se "
@@ -1030,7 +1345,9 @@
 "característica maliciosa."
 
 # type: Content of: <h4>
-msgid "&ldquo;RAND (reasonable and non-discriminatory)&rdquo;"
+#, fuzzy
+#| msgid "&ldquo;RAND (reasonable and non-discriminatory)&rdquo;"
+msgid "&ldquo;RAND (reasonable and nondiscriminatory)&rdquo;"
 msgstr "«RAND (razonable y no discriminatorio)»"
 
 # type: Content of: <p>
@@ -1050,12 +1367,20 @@
 "\">reasonable and non-discriminatory</span>)."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "That term white-washes a class of patent licenses that are normally "
+#| "neither reasonable nor non-discriminatory.  It is true that these "
+#| "licenses do not discriminate against any specific person, but they do "
+#| "discriminate against the free software community, and that makes them "
+#| "unreasonable.  Thus, half of &ldquo;RAND&rdquo; is deceptive and the "
+#| "other half is prejudiced."
 msgid ""
-"That term white-washes a class of patent licenses that are normally neither "
-"reasonable nor non-discriminatory.  It is true that these licenses do not "
+"That term whitewashes a class of patent licenses that are normally neither "
+"reasonable nor nondiscriminatory.  It is true that these licenses do not "
 "discriminate against any specific person, but they do discriminate against "
 "the free software community, and that makes them unreasonable.  Thus, half "
-"of &ldquo;RAND&rdquo; is deceptive and the other half is prejudiced."
+"of the term &ldquo;RAND&rdquo; is deceptive and the other half is prejudiced."
 msgstr ""
 "Este término es un lavado de cara para un tipo de licencia de patentes que "
 "normalmente no son ni razonables ni no son discriminatorias. Es cierto que "
@@ -1064,12 +1389,21 @@
 "mitad de «RAND» es engañosa y la otra mitad es prejuiciosa."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Standards bodies should recognize that these licenses are discriminatory, "
+#| "and drop the use of the term &ldquo;reasonable and non-"
+#| "discriminatory&rdquo; or &ldquo;RAND&rdquo; to describe them.  Until they "
+#| "do so, other writers who do not wish to join in the white-washing would "
+#| "do well to reject that term.  To accept and use it merely because patent-"
+#| "wielding companies have made it widespread is to let those companies "
+#| "dictate the views you express."
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
-"and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
-"or &ldquo;RAND&rdquo; to describe them.  Until they do so, other writers who "
-"do not wish to join in the white-washing would do well to reject that term.  "
-"To accept and use it merely because patent-wielding companies have made it "
+"and drop the use of the term &ldquo;reasonable and nondiscriminatory&rdquo; "
+"or &ldquo;RAND&rdquo; to describe them.  Until they do so, writers who do "
+"not wish to join in the whitewashing would do well to reject that term.  To "
+"accept and use it merely because patent-wielding companies have made it "
 "widespread is to let those companies dictate the views you express."
 msgstr ""
 "Los organismos de estandarización deberían reconocer que esas licencias son 
"
@@ -1096,15 +1430,24 @@
 msgstr "«Vender software»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
+#| "exchanging a copy of a free program for a sum of money is &ldquo;"
+#| "selling&rdquo;; but people usually associate the term &ldquo;sell&rdquo; "
+#| "with proprietary restrictions on the subsequent use of the software.  You "
+#| "can be more precise, and prevent confusion, by saying either &ldquo;"
+#| "distributing copies of a program for a fee&rdquo; or &ldquo;imposing "
+#| "proprietary restrictions on the use of a program,&rdquo; depending on "
+#| "what you mean."
 msgid ""
 "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
-"exchanging a copy of a free program for a sum of money is &ldquo;"
-"selling&rdquo;; but people usually associate the term &ldquo;sell&rdquo; "
-"with proprietary restrictions on the subsequent use of the software.  You "
-"can be more precise, and prevent confusion, by saying either &ldquo;"
-"distributing copies of a program for a fee&rdquo; or &ldquo;imposing "
-"proprietary restrictions on the use of a program,&rdquo; depending on what "
-"you mean."
+"exchanging a copy of a free program for a sum of money is selling; but "
+"people usually associate the term &ldquo;sell&rdquo; with proprietary "
+"restrictions on the subsequent use of the software.  You can be more "
+"precise, and prevent confusion, by saying either &ldquo;distributing copies "
+"of a program for a fee&rdquo; or &ldquo;imposing proprietary restrictions on "
+"the use of a program,&rdquo; depending on what you mean."
 msgstr ""
 "El término «vender software» es ambiguo. Estrictamente hablando, 
intercambiar "
 "una copia de un programa libre por una suma de dinero es «vender»; pero las 
"
@@ -1115,9 +1458,13 @@
 "lo que quiera decir."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
+#| "more discussion of this issue."
 msgid ""
-"See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for more "
-"discussion of this issue."
+"See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
+"further discussion of this issue."
 msgstr ""
 "Vea <a href=\"/philosophy/selling.es.html\">Vender Software Libre</a> para "
 "más argumentos acerca este asunto."
@@ -1127,12 +1474,21 @@
 msgstr "«Industria del Software»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;software industry&rdquo; encourages people to imagine "
+#| "that software is always developed by a sort of factory and then delivered "
+#| "to consumers.  The free software community shows this is not the case.  "
+#| "Software businesses exist, and various businesses develop free and/or non-"
+#| "free software, but those that develop free software are not like "
+#| "factories."
 msgid ""
 "The term &ldquo;software industry&rdquo; encourages people to imagine that "
 "software is always developed by a sort of factory and then delivered to "
 "consumers.  The free software community shows this is not the case.  "
-"Software businesses exist, and various businesses develop free and/or non-"
-"free software, but those that develop free software are not like factories."
+"Software businesses exist, and various businesses develop free and/or "
+"nonfree software, but those that develop free software are not run like "
+"factories."
 msgstr ""
 "El término «industria del software» incita a las personas a imaginar que 
el "
 "software siempre es programado por una especie de fábrica y luego entregado "
@@ -1142,14 +1498,23 @@
 "desarrollan software libre no se parecen a las fábricas."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;industry&rdquo; is being used as propaganda by advocates "
+#| "of software patents.  They call software development &ldquo;"
+#| "industry&rdquo; and then try to argue that this means it should be "
+#| "subject to patent monopolies.  <a href=\"http://swpat.ffii.org/papers/";
+#| "europarl0309/\"> The European Parliament, rejecting software patents in "
+#| "2003, voted to define &ldquo;industry&rdquo; as &ldquo;automated "
+#| "production of material goods&rdquo;.</a>"
 msgid ""
 "The term &ldquo;industry&rdquo; is being used as propaganda by advocates of "
 "software patents.  They call software development &ldquo;industry&rdquo; and "
 "then try to argue that this means it should be subject to patent "
 "monopolies.  <a href=\"http://swpat.ffii.org/papers/europarl0309/\";> The "
 "European Parliament, rejecting software patents in 2003, voted to define "
-"&ldquo;industry&rdquo; as &ldquo;automated production of material "
-"goods&rdquo;.</a>"
+"&ldquo;industry&rdquo; as &ldquo;automated production of material goods."
+"&rdquo;</a>"
 msgstr ""
 "El término «industria» está siendo usado como publicidad por defensores 
de "
 "las patentes de software. Ellos llaman «industria» a la programación de "
@@ -1176,10 +1541,16 @@
 "ética: si copiar está prohibido, debe ser malo."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "So it is pertinent to mention that the legal system&mdash;at least in the "
+#| "US&mdash;rejects the idea that copyright infringement is &ldquo;theft."
+#| "&rdquo; Copyright apologists are making an appeal to authority &hellip; "
+#| "and misrepresenting what authority says."
 msgid ""
 "So it is pertinent to mention that the legal system&mdash;at least in the "
 "US&mdash;rejects the idea that copyright infringement is &ldquo;theft."
-"&rdquo; Copyright apologists are making an appeal to authority &hellip; and "
+"&rdquo; Copyright apologists are making an appeal to authority&hellip;and "
 "misrepresenting what authority says."
 msgstr ""
 "Así, es pertinente mencionar que el sistema legal ─al menos en los 
EE.UU.─ "
@@ -1203,12 +1574,19 @@
 msgstr "«Computación confiable»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;"
+#| "</a> is the proponents name for a scheme to redesign computers so that "
+#| "application developers can trust your computer to obey them instead of "
+#| "you.  For their point of view, it is &ldquo;trusted&rdquo;.  From your "
+#| "point of view, it is &ldquo;treacherous&rdquo;."
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;</"
-"a> is the proponents name for a scheme to redesign computers so that "
+"a> is the proponents' name for a scheme to redesign computers so that "
 "application developers can trust your computer to obey them instead of you.  "
-"For their point of view, it is &ldquo;trusted&rdquo;.  From your point of "
-"view, it is &ldquo;treacherous&rdquo;."
+"For their point of view, it is &ldquo;trusted&rdquo;; from your point of "
+"view, it is &ldquo;treacherous.&rdquo;"
 msgstr ""
 "La <a href=\"can-you-trust.es.html\">«computación confiable»</a> es el 
nombre "
 "propuesto para un esquema que rediseña las computadoras, de modo que los "
@@ -1221,14 +1599,23 @@
 msgstr "«Vendedor»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please don't use the term &ldquo;vendor&rdquo; to refer generally to "
+#| "anyone that develops or packages a software package.  Many programs are "
+#| "developed in order to sell copies, and their developers are therefore "
+#| "their vendors; this includes some free software packages.  However, many "
+#| "programs are developed by volunteers or organizations which do not intend "
+#| "to sell copies.  These developers are not vendors.  Likewise, only some "
+#| "of the packagers of GNU/Linux distributions are vendors."
 msgid ""
 "Please don't use the term &ldquo;vendor&rdquo; to refer generally to anyone "
-"that develops or packages a software package.  Many programs are developed "
-"in order to sell copies, and their developers are therefore their vendors; "
-"this includes some free software packages.  However, many programs are "
-"developed by volunteers or organizations which do not intend to sell "
-"copies.  These developers are not vendors.  Likewise, only some of the "
-"packagers of GNU/Linux distributions are vendors."
+"that develops or packages software.  Many programs are developed in order to "
+"sell copies, and their developers are therefore their vendors; this even "
+"includes some free software packages.  However, many programs are developed "
+"by volunteers or organizations which do not intend to sell copies.  These "
+"developers are not vendors.  Likewise, only some of the packagers of GNU/"
+"Linux distributions are vendors."
 msgstr ""
 "No use el término  «vendedor» para referirse generalmente a cualquiera que 
"
 "desarrolle o empaquete un paquete de software, por favor. Muchos programas "

Index: philosophy/po/words-to-avoid.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.fr.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/po/words-to-avoid.fr.po  23 Aug 2009 20:26:18 -0000      1.21
+++ philosophy/po/words-to-avoid.fr.po  28 Sep 2009 20:26:08 -0000      1.22
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2009-08-02 16:26-0300\n"
+"POT-Creation-Date: 2009-09-28 16:25-0300\n"
 "PO-Revision-Date: 2009-08-23 18:33+0100\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -16,25 +16,37 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "Confusing Words and Phrases that are Worth Avoiding - GNU Project - Free "
+#| "Software Foundation (FSF)"
 msgid ""
-"Confusing Words and Phrases that are Worth Avoiding - GNU Project - Free "
+"Confusing Words and Phrases That Are Worth Avoiding - GNU Project - Free "
 "Software Foundation (FSF)"
 msgstr ""
 "Termes pr&ecirc;tant &agrave; confusion, que vous devriez &eacute;viter - "
 "GNU Project - Free Software Foundation (FSF)"
 
 # type: Content of: <h2>
-msgid "Some Confusing or Loaded Words and Phrases to Avoid (or use with care)"
+#, fuzzy
+#| msgid ""
+#| "Some Confusing or Loaded Words and Phrases to Avoid (or use with care)"
+msgid "Some Confusing or Loaded Words and Phrases to Avoid (or Use with Care)"
 msgstr ""
 "Termes pr&ecirc;tant &agrave; confusion, que vous devriez &eacute;viter (ou "
 "utiliser avec précaution)"
 
 # type: Content of: <p>
-msgid ""
-"There are a number of words and phrases which we recommend avoiding, or "
-"avoiding in certain contexts and usages.  The reason is either that they are "
-"ambiguous, or that they imply an opinion that we hope you may not entirely "
-"agree with."
+#, fuzzy
+#| msgid ""
+#| "There are a number of words and phrases which we recommend avoiding, or "
+#| "avoiding in certain contexts and usages.  The reason is either that they "
+#| "are ambiguous, or that they imply an opinion that we hope you may not "
+#| "entirely agree with."
+msgid ""
+"There are a number of words and phrases that we recommend avoiding, or "
+"avoiding in certain contexts and usages.  Some are ambiguous or misleading; "
+"others presuppose a viewpoint that we hope you disagree with."
 msgstr ""
 "Nous vous recommandons d'&eacute;viter un certain nombre de mots et de "
 "phrases, soit parce qu'ils sont ambigus, soit parce qu'ils sugg&egrave;rent "
@@ -136,12 +148,19 @@
 msgstr "&laquo;&nbsp;BSD-style&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The expression &ldquo;BSD-style license&rdquo; leads to confusion because "
+#| "it <a href=\"/philosophy/bsd.html\">lumps together licenses that have "
+#| "important differences</a>.  For instance, the original BSD license with "
+#| "the advertising clause is incompatible with the GNU GPL, but the revised "
+#| "BSD license is compatible with the GPL."
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/philosophy/bsd.html\">lumps together licenses that have important "
 "differences</a>.  For instance, the original BSD license with the "
-"advertising clause is incompatible with the GNU GPL, but the revised BSD "
-"license is compatible with the GPL."
+"advertising clause is incompatible with the GNU General Public License, but "
+"the revised BSD license is compatible with the GPL."
 msgstr ""
 "L'expression &laquo;&nbsp;BSD-style license&nbsp;&raquo; (n.d.t&nbsp;: "
 "licence de type BSD) pr&ecirc;te &agrave; confusion car elle <a href=\"/"
@@ -166,14 +185,25 @@
 msgstr "&laquo;&nbsp;Ferm&eacute;&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Describing non-free software as &ldquo;closed&rdquo; clearly refers to "
+#| "the term &ldquo;open source&rdquo;.  In the free software movement, <a "
+#| "href=\"/philosophy/open-source-misses-the-point.html\"> we want to avoid "
+#| "being confused with the more recent open source movement</a>, so we are "
+#| "careful to avoid usage that would encourage people to lump us in with "
+#| "them.  Therefore, we avoid describing non-free software as &ldquo;"
+#| "closed&rdquo;.  We call it &ldquo;non-free&rdquo; or <a href=\"/"
+#| "philosophy/categories.html#ProprietarySoftware\"> &ldquo;"
+#| "proprietary&rdquo;</a>."
 msgid ""
-"Describing non-free software as &ldquo;closed&rdquo; clearly refers to the "
+"Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source&rdquo;.  In the free software movement, <a href=\"/"
-"philosophy/open-source-misses-the-point.html\"> we want to avoid being "
-"confused with the more recent open source movement</a>, so we are careful to "
-"avoid usage that would encourage people to lump us in with them.  Therefore, "
-"we avoid describing non-free software as &ldquo;closed&rdquo;.  We call it "
-"&ldquo;non-free&rdquo; or <a href=\"/philosophy/categories."
+"philosophy/open-source-misses-the-point.html\"> we do not want to be "
+"confused with the open source camp</a>, so we are careful to avoid saying "
+"things that would encourage people to lump us in with them.  For instance, "
+"we avoid describing nonfree software as &ldquo;closed&rdquo;.  We call it "
+"&ldquo;nonfree&rdquo; or <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\"> &ldquo;proprietary&rdquo;</a>."
 msgstr ""
 "En d&eacute;crivant un logiciel non libre comme &laquo;&nbsp;ferm&eacute;"
@@ -193,12 +223,19 @@
 msgstr "&laquo;&nbsp;Cloud computing&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;cloud computing&rdquo; is marketing buzzword with no "
+#| "clear meaning.  It is used for a range of different activities whose only "
+#| "common quality is that they use the Internet for something beyond "
+#| "transmitting files.  Thus, the term is a nexus of confusion.  If you try "
+#| "to use it in your thinking, your thinking will be vague."
 msgid ""
-"The term &ldquo;cloud computing&rdquo; is marketing buzzword with no clear "
+"The term &ldquo;cloud computing&rdquo; is a marketing buzzword with no clear "
 "meaning.  It is used for a range of different activities whose only common "
-"quality is that they use the Internet for something beyond transmitting "
-"files.  Thus, the term is a nexus of confusion.  If you try to use it in "
-"your thinking, your thinking will be vague."
+"characteristic is that they use the Internet for something beyond "
+"transmitting files.  Thus, the term is a nexus of confusion.  If you base "
+"your thinking on it, your thinking will be vague."
 msgstr ""
 "Le terme «&nbsp;cloud computing&nbsp;» (informatique dans les nuages) est 
un "
 "terme de marketing sans signification claire. Il est utilisé pour un panel "
@@ -208,12 +245,19 @@
 "dans votre raisonnement, votre raisonnement sera vague."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "When thinking about or responding to a statement someone else made using "
+#| "this term, the first step is to clarify the topic.  Which kind of "
+#| "activity is the statement really about, and what is a good term for that "
+#| "activity? Pressing yourself (or the person who made the statement) to "
+#| "clarify the topic will direct the discussion towards a useful conclusion."
 msgid ""
-"When thinking about or responding to a statement someone else made using "
+"When thinking about or responding to a statement someone else has made using "
 "this term, the first step is to clarify the topic.  Which kind of activity "
-"is the statement really about, and what is a good term for that activity? "
-"Pressing yourself (or the person who made the statement) to clarify the "
-"topic will direct the discussion towards a useful conclusion."
+"is the statement really about, and what is a good, clear term for that "
+"activity? Once the topic is clear, the discussion can head for a useful "
+"conclusion."
 msgstr ""
 "En réfléchissant ou en répondant à une déclaration que quelqu'un d'autre 
a "
 "fait en utilisant ce terme, la première étape est de clarifier le sujet. De 
"
@@ -223,12 +267,19 @@
 "utile."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Curiously, Larry Ellison, a proprietary software developer, also <a href="
+#| "\"http://news.cnet.com/8301-13953_3-10052188-80.html\";> noted the vacuity "
+#| "of the term &ldquo;cloud computing&rdquo;</a>.  He decided to use the "
+#| "term anyway because, as a proprietary software developer, he isn't "
+#| "motivated by the same ideals we are."
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a href="
 "\"http://news.cnet.com/8301-13953_3-10052188-80.html\";> noted the vacuity of "
-"the term &ldquo;cloud computing&rdquo;</a>.  He decided to use the term "
+"the term &ldquo;cloud computing.&rdquo;</a> He decided to use the term "
 "anyway because, as a proprietary software developer, he isn't motivated by "
-"the same ideals we are."
+"the same ideals as we are."
 msgstr ""
 "Curieusement, Larry Ellison, un développeur de logiciel propriétaire, a "
 "également <a href=\"http://news.cnet.com/8301-13953_3-10052188-80.html";
@@ -241,8 +292,12 @@
 msgstr "&laquo;&nbsp;Commercial&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;non-"
+#| "free.&rdquo; That confuses two entirely different issues."
 msgid ""
-"Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;non-free."
+"Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;nonfree."
 "&rdquo; That confuses two entirely different issues."
 msgstr ""
 "N'utilisez pas le mot &laquo;&nbsp;commercial&nbsp;&raquo; comme synonyme de "
@@ -250,12 +305,21 @@
 "mes totalementdiff&eacute;rents."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is commercial if it is developed as a business activity.  A "
+#| "commercial program can be free or non-free, depending on its license.  "
+#| "Likewise, a program developed by a school or an individual can be free or "
+#| "non-free, depending on its license.  The two questions, what sort of "
+#| "entity developed the program and what freedom its users have, are "
+#| "independent."
 msgid ""
 "A program is commercial if it is developed as a business activity.  A "
-"commercial program can be free or non-free, depending on its license.  "
-"Likewise, a program developed by a school or an individual can be free or "
-"non-free, depending on its license.  The two questions, what sort of entity "
-"developed the program and what freedom its users have, are independent."
+"commercial program can be free or nonfree, depending on its manner of "
+"distribution.  Likewise, a program developed by a school or an individual "
+"can be free or nonfree, depending on its manner of distribution.  The two "
+"questions&mdash;what sort of entity developed the program and what freedom "
+"its users have&mdash;are independent."
 msgstr ""
 "Un programme est commercial s'il est d&eacute;velopp&eacute; en tant que "
 "partie d'une activit&eacute; commerciale.  Un programme commercial peut "
@@ -283,10 +347,18 @@
 "appara&icirc;tre."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Free commercial software is a contribution to our community, so we should "
+#| "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
+#| "&ldquo;non-free&rdquo; will tend to think that the &ldquo;free "
+#| "commercial&rdquo; combination is self-contradictory, and dismiss the "
+#| "possibility.  Let's be careful not to use the word &ldquo;"
+#| "commercial&rdquo; in that way."
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
-"&ldquo;non-free&rdquo; will tend to think that the &ldquo;free "
+"&ldquo;nonfree&rdquo; will tend to think that the &ldquo;free "
 "commercial&rdquo; combination is self-contradictory, and dismiss the "
 "possibility.  Let's be careful not to use the word &ldquo;commercial&rdquo; "
 "in that way."
@@ -325,9 +397,13 @@
 msgstr "&laquo;&nbsp;Consommateur&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;consumer&rdquo;, when used to refer to computer users, "
+#| "carries unfortunate assumptions."
 msgid ""
-"The term &ldquo;consumer&rdquo;, when used to refer to computer users, "
-"carries unfortunate assumptions."
+"The term &ldquo;consumer,&rdquo; when used to refer to computer users, is "
+"loaded with assumptions we should reject."
 msgstr ""
 "Le terme &laquo;&nbsp;consommateur&nbsp;&raquo;, quand il est utilis&eacute; "
 "pour parler des utilisateurs d'ordinateurs, apporte des assomptions "
@@ -335,11 +411,23 @@
 
 # type: Content of: <p>
 msgid ""
-"Economic theory uses the terms &ldquo;producer&rdquo; and &ldquo;"
-"consumer&rdquo;.  In that context these words are appropriate.  But "
-"describing the users of software as &ldquo;consumers&rdquo; presumes a "
-"narrow role for them.  It treats them like cattle that passively graze on "
-"what others make available to them."
+"The terms &ldquo;producer&rdquo; and &ldquo;consumer&rdquo; come from "
+"economic theory, and presuppose the assumptions and narrow prespective of "
+"economic theory.  That warps your thinking."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Economic theory uses the terms &ldquo;producer&rdquo; and &ldquo;"
+#| "consumer&rdquo;.  In that context these words are appropriate.  But "
+#| "describing the users of software as &ldquo;consumers&rdquo; presumes a "
+#| "narrow role for them.  It treats them like cattle that passively graze on "
+#| "what others make available to them."
+msgid ""
+"In addition, describing the users of software as &ldquo;consumers&rdquo; "
+"presumes a narrow role for them.  It treats them like cattle that passively "
+"graze on what others make available to them."
 msgstr ""
 "La th&eacute;orie &eacute;conomique utilise les termes &laquo;&nbsp;"
 "producteur&nbsp;&raquo; et &laquo;&nbsp;consommateur&nbsp;&raquo;. Dans ce "
@@ -366,9 +454,14 @@
 "ils&nbsp;?"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The narrow economic vision of users as &ldquo;consumers&rdquo; tends to "
+#| "go hand in hand with the idea that published works are &ldquo;"
+#| "content&rdquo;."
 msgid ""
-"The narrow economic vision of users as &ldquo;consumers&rdquo; tends to go "
-"hand in hand with the idea that published works are &ldquo;content&rdquo;."
+"The narrow economic conception of users as &ldquo;consumers&rdquo; tends to "
+"go hand in hand with the idea that published works are &ldquo;content.&rdquo;"
 msgstr ""
 "La vision &eacute;conomique obtuse des utilisateurs en tant que &laquo;&nbsp;"
 "consommateurs&nbsp;&raquo; va de pair avec l'id&eacute;e que les œuvres "
@@ -390,13 +483,20 @@
 msgstr "&laquo;&nbsp;Contenu&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If you want to describe a feeling of comfort and satisfaction, by all "
+#| "means say you are &ldquo;content&rdquo;, but using it as a noun to "
+#| "describe written and other works of authorship is worth avoiding.  That "
+#| "usage adopts a specific attitude towards those works: that they are an "
+#| "interchangeable commodity whose purpose is to fill a box and make money.  "
+#| "In effect, it disparages the works themselves."
 msgid ""
 "If you want to describe a feeling of comfort and satisfaction, by all means "
-"say you are &ldquo;content&rdquo;, but using it as a noun to describe "
-"written and other works of authorship is worth avoiding.  That usage adopts "
-"a specific attitude towards those works: that they are an interchangeable "
-"commodity whose purpose is to fill a box and make money.  In effect, it "
-"disparages the works themselves."
+"say you are &ldquo;content,&rdquo; but using the word as a noun to describe "
+"written and other works of authorship adopts an attitude you might rather "
+"avoid.  It regards these works as a commodity whose purpose is to fill a box "
+"and make money.  In effect, it disparages the works themselves."
 msgstr ""
 "Si vous voulez d&eacute;crire ce qui est &agrave; l'int&eacute;rieur d'une "
 "tasse, vous parlez du &laquo;&nbsp;contenu&nbsp;&raquo; de cette tasse, mais "
@@ -408,15 +508,27 @@
 "oeuvres elles-m&ecirc;mes."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Those who use this term are often the publishers that push for increased "
+#| "copyright power in the name of the authors (&ldquo;creators&rdquo;, as "
+#| "they say) of the works.  The term &ldquo;content&rdquo; reveals their "
+#| "real attitude towards these works and their authors.  (See <a href="
+#| "\"http://archive.salon.com/tech/feature/2000/06/14/love/print.html";
+#| "\">Courtney Love's open letter to Steve Case</a> and search for &ldquo;"
+#| "content provider&rdquo; in that page.  Alas, Ms. Love is unaware that the "
+#| "term &ldquo;intellectual property&rdquo; is also <a href="
+#| "\"#IntellectualProperty\"> misleading</a>.)"
 msgid ""
 "Those who use this term are often the publishers that push for increased "
-"copyright power in the name of the authors (&ldquo;creators&rdquo;, as they "
+"copyright power in the name of the authors (&ldquo;creators,&rdquo; as they "
 "say) of the works.  The term &ldquo;content&rdquo; reveals their real "
 "attitude towards these works and their authors.  (See <a href=\"http://";
 "archive.salon.com/tech/feature/2000/06/14/love/print.html\">Courtney Love's "
 "open letter to Steve Case</a> and search for &ldquo;content provider&rdquo; "
 "in that page.  Alas, Ms. Love is unaware that the term &ldquo;intellectual "
-"property&rdquo; is also <a href=\"#IntellectualProperty\"> misleading</a>.)"
+"property&rdquo; is also <a href=\"#IntellectualProperty\"> biased and "
+"confusing</a>.)"
 msgstr ""
 "Ceux qui utilisent ce terme sont souvent les &eacute;diteurs qui poussent "
 "&agrave; obtenir des pouvoirs de copyright accrus aux noms des auteurs "
@@ -443,13 +555,21 @@
 "&nbsp;fournisseurs m&eacute;contents&nbsp;&raquo; (malcontent providers)."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
+#| "&ldquo;Content&rdquo; means &ldquo;some sort of information&rdquo;, and "
+#| "&ldquo;management&rdquo; in this context means &ldquo;doing something "
+#| "with it&rdquo;.  So a &ldquo;content management system&rdquo; is a system "
+#| "for doing something to some sort of information.  That description fits "
+#| "most programs."
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
-"&ldquo;Content&rdquo; means &ldquo;some sort of information&rdquo;, and "
+"&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
 "&ldquo;management&rdquo; in this context means &ldquo;doing something with "
-"it&rdquo;.  So a &ldquo;content management system&rdquo; is a system for "
-"doing something to some sort of information.  That description fits most "
-"programs."
+"it.&rdquo; So a &ldquo;content management system&rdquo; is a system for "
+"doing something to some sort of information.  Nearly all programs fit that "
+"description."
 msgstr ""
 "Le terme de &laquo;&nbsp;gestion de contenu&nbsp;&raquo; remporte le prix de "
 "la vacuit&eacute;. &laquo;&nbsp;Contenu&nbsp;&raquo; signifie &laquo;&nbsp;"
@@ -460,9 +580,14 @@
 "d'information. Cette description correspond à la plupart des programmes."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In most cases, that term really refers to a system for updating pages on "
+#| "a website.  For that, we recommend the term &ldquo;website revision "
+#| "system&rdquo; (WRS)."
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
-"website.  For that, we recommend the term &ldquo;website revision "
+"Web site.  For that, we recommend the term &ldquo;Web site revision "
 "system&rdquo; (WRS)."
 msgstr ""
 "Dans la plupart des cas, le terme réfère vraiment à un système pour 
mettre à "
@@ -474,12 +599,21 @@
 msgstr "&laquo;&nbsp;Cr&eacute;ateur&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
+#| "them to a deity (&ldquo;the creator&rdquo;).  The term is used by "
+#| "publishers to elevate the authors' moral stature above that of ordinary "
+#| "people, to justify increased copyright power that the publishers can "
+#| "exercise in the name of the authors.  We recommend saying &ldquo;"
+#| "author&rdquo; instead.  However, in many cases &ldquo;copyright "
+#| "holder&rdquo; is what you really mean."
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
-"to elevate the authors' moral stature above that of ordinary people, to "
-"justify increased copyright power that the publishers can exercise in the "
-"name of the authors.  We recommend saying &ldquo;author&rdquo; instead.  "
+"to elevate authors' moral standing above that of ordinary people in order to "
+"justify giving them increased copyright power, which the publishers can then "
+"exercise in their name.  We recommend saying &ldquo;author&rdquo; instead.  "
 "However, in many cases &ldquo;copyright holder&rdquo; is what you really "
 "mean."
 msgstr ""
@@ -497,10 +631,20 @@
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr "&laquo;&nbsp;Biens num&eacute;riques&nbsp;&raquo;"
 
+# type: Content of: outside any tag (error?)
+msgid "o"
+msgstr ""
+
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;digital goods&rdquo; as applied to copies of works of "
+#| "authorship forces them into the thought mold of physical goods &mdash; "
+#| "which cannot be copied, and which therefore have to be manufactured and "
+#| "sold."
 msgid ""
-"The term &ldquo;digital goods&rdquo; as applied to copies of works of "
-"authorship forces them into the thought mold of physical goods &mdash; which "
+"The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
+"authorship, erroneously identifies them with physical goods&mdash;which "
 "cannot be copied, and which therefore have to be manufactured and sold."
 msgstr ""
 "Le terme &laquo;&nbsp;biens num&eacute;riques&nbsp;&raquo; tel qu'il est "
@@ -532,10 +676,14 @@
 "qui sont impos&eacute;es ces restrictions."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Good alternatives include &ldquo;Digital Restrictions Management&rdquo;, "
+#| "&ldquo;Digital Restrictions Malware&rdquo;, and &ldquo;digital "
+#| "handcuffs&rdquo;."
 msgid ""
-"Good alternatives include &ldquo;Digital Restrictions Management&rdquo;, "
-"&ldquo;Digital Restrictions Malware&rdquo;, and &ldquo;digital "
-"handcuffs&rdquo;."
+"Good alternatives include &ldquo;Digital Restrictions Management,&rdquo; and "
+"&ldquo;digital handcuffs.&rdquo;"
 msgstr ""
 "Parmi les bonnes alternatives&nbsp;: &laquo;&nbsp;Gestion des restrictions "
 "num&eacute;riques&nbsp;&raquo; (Digital Restrictions Management), &laquo;"
@@ -548,14 +696,24 @@
 msgstr "&laquo;&nbsp;Écosystème&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "It is a mistake to describe the free software community, or any human "
+#| "community, as an &ldquo;ecosystem&rdquo;, because that word implies the "
+#| "absence of (1) intention and (2) ethics.  In an ecosystem, species evolve "
+#| "according to their fitness.  If something is weak, it goes extinct, and "
+#| "that's neither right nor wrong, merely an ecological phenomenon.  The "
+#| "term &ldquo;ecosystem&rdquo; implicitly suggests a passive attitude: "
+#| "&ldquo;Don't ask how things <em>should</em> be, just watch what happens "
+#| "to them&rdquo;."
 msgid ""
 "It is a mistake to describe the free software community, or any human "
-"community, as an &ldquo;ecosystem&rdquo;, because that word implies the "
+"community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
 "absence of (1) intention and (2) ethics.  In an ecosystem, species evolve "
-"according to their fitness.  If something is weak, it goes extinct, and "
-"that's neither right nor wrong, merely an ecological phenomenon.  The term "
-"&ldquo;ecosystem&rdquo; implicitly suggests a passive attitude: &ldquo;Don't "
-"ask how things <em>should</em> be, just watch what happens to them&rdquo;."
+"according to their fitness: if a species is weak and goes extinct, that's "
+"neither right nor wrong, merely an ecological phenomenon.  The term &ldquo;"
+"ecosystem&rdquo; implicitly suggests a attitude of passive observation: "
+"don't ask how what <em>should</em> happen, just study what does happen."
 msgstr ""
 "C'est une erreur de d&eacute;crire notre communaut&eacute; (ou toute "
 "communaut&eacute;) comme un &laquo;&nbsp;&eacute;cosyst&egrave;me&nbsp;"
@@ -569,12 +727,20 @@
 "&raquo;."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "By contrast, beings that adopt an active stance towards their "
+#| "surroundings, and have ideas of ethical responsibility, can decide to "
+#| "preserve things that, on their own, would tend to vanish&mdash;such as "
+#| "civil society, democracy, human rights, peace, public health, clean air "
+#| "and water, endangered species, traditional arts, &hellip; and computer "
+#| "users' freedom."
 msgid ""
 "By contrast, beings that adopt an active stance towards their surroundings, "
 "and have ideas of ethical responsibility, can decide to preserve things "
 "that, on their own, would tend to vanish&mdash;such as civil society, "
 "democracy, human rights, peace, public health, clean air and water, "
-"endangered species, traditional arts, &hellip; and computer users' freedom."
+"endangered species, traditional arts&hellip;and computer users' freedom."
 msgstr ""
 "Par contraste, les &ecirc;tres vivants qui adoptent une attitude active sur "
 "leur environnement et qui ont une responsabilit&eacute; &eacute;thique, "
@@ -623,16 +789,25 @@
 "disponible &laquo;&nbsp;librement&nbsp;&raquo;."
 
 # type: Content of: <h4>
-msgid "&ldquo;Freely Available&rdquo;"
+#, fuzzy
+#| msgid "&ldquo;Freely Available&rdquo;"
+msgid "&ldquo;Freely available&rdquo;"
 msgstr "&laquo;&nbsp;Disponible gratuitement&nbsp;&raquo;"
 
 # type: Content of: <p>
-msgid ""
-"Don't use &ldquo;freely available&rdquo; as a synonym for &ldquo;free "
-"software.&rdquo; They are not equivalent.  &ldquo;Freely available&rdquo; "
-"means that anyone can easily get a copy.  &ldquo;Free software&rdquo; is "
-"defined in terms of the freedom of users that have a copy.  These are "
-"answers to different questions."
+#, fuzzy
+#| msgid ""
+#| "Don't use &ldquo;freely available&rdquo; as a synonym for &ldquo;free "
+#| "software.&rdquo; They are not equivalent.  &ldquo;Freely available&rdquo; "
+#| "means that anyone can easily get a copy.  &ldquo;Free software&rdquo; is "
+#| "defined in terms of the freedom of users that have a copy.  These are "
+#| "answers to different questions."
+msgid ""
+"Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;"
+"free software.&rdquo; The terms are not equivalent.  Software is &ldquo;"
+"freely available&rdquo; if anyone can easily get a copy.  &ldquo;Free "
+"software&rdquo; is defined in terms of the freedom of users that have a copy "
+"of it.  These are answers to different questions."
 msgstr ""
 "N'utilisez pas &laquo;&nbsp;disponible gratuitement&nbsp;&raquo; comme "
 "synonyme de &laquo;&nbsp;logiciel libre&nbsp;&raquo;. Ils ne sont pas "
@@ -661,11 +836,18 @@
 "vraiment de d&eacute;finition accept&eacute;e."
 
 # type: Content of: <p>
-msgid ""
-"Also, if you use other languages than English, please try to avoid borrowing "
-"English terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; "
-"It is better to translate the term &ldquo;free software&rdquo; into <a href="
-"\"/philosophy/fs-translations.html\">your language</a>."
+#, fuzzy
+#| msgid ""
+#| "Also, if you use other languages than English, please try to avoid "
+#| "borrowing English terms such as &ldquo;free software&rdquo; or &ldquo;"
+#| "freeware.&rdquo; It is better to translate the term &ldquo;free "
+#| "software&rdquo; into <a href=\"/philosophy/fs-translations.html\">your "
+#| "language</a>."
+msgid ""
+"When using languages other than English, please avoid borrowing English "
+"terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; It is "
+"better to translate the term &ldquo;free software&rdquo; into <a href=\"/"
+"philosophy/fs-translations.html\">your language</a>."
 msgstr ""
 "Si vous utilisez d'autres langues que l'anglais, essayez d'&eacute;viter "
 "&eacute;galement d'employer des mots emprunt&eacute;s &agrave; l'anglais "
@@ -697,11 +879,19 @@
 msgstr "&laquo;&nbsp;Donner des logiciels&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
+#| "distribute a program as free software.&rdquo; It has the same problem as "
+#| "&ldquo;for free&rdquo;: it implies the issue is price, not freedom.  One "
+#| "way to avoid the confusion is to say &ldquo;release as free software."
+#| "&rdquo;"
 msgid ""
 "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
-"distribute a program as free software.&rdquo; It has the same problem as "
-"&ldquo;for free&rdquo;: it implies the issue is price, not freedom.  One way "
-"to avoid the confusion is to say &ldquo;release as free software.&rdquo;"
+"distribute a program as free software.&rdquo; This locution has the same "
+"problem as &ldquo;for free&rdquo;: it implies the issue is price, not "
+"freedom.  One way to avoid the confusion is to say &ldquo;release as free "
+"software.&rdquo;"
 msgstr ""
 "Utiliser le terme &laquo;&nbsp;donner&nbsp;&raquo; au lieu de &laquo;&nbsp;"
 "distribuer un programme comme logiciel libre&nbsp;&raquo; induit en erreur. "
@@ -715,14 +905,23 @@
 msgstr "&laquo;&nbsp;Hacker&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+#| "html\"> enjoys playful cleverness</a>&mdash;not necessarily with "
+#| "computers.  The programmers in the old <abbr title=\"Massachusetts "
+#| "Institute of Technology\">MIT</abbr> free software community of the 60s "
+#| "and 70s referred to themselves as hackers.  Around 1980, journalists who "
+#| "discovered the hacker community mistakenly took the term to mean &ldquo;"
+#| "security breaker&rdquo;."
 msgid ""
 "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
 "html\"> enjoys playful cleverness</a>&mdash;not necessarily with computers.  "
 "The programmers in the old <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr> free software community of the 60s and 70s referred "
 "to themselves as hackers.  Around 1980, journalists who discovered the "
-"hacker community mistakenly took the term to mean &ldquo;security "
-"breaker&rdquo;."
+"hacker community mistakenly took the term to mean &ldquo;security breaker."
+"&rdquo;"
 msgstr ""
 "Un hacker est quelqu'un qui <a href=\"http://stallman.org/articles/on-";
 "hacking.html\">appr&eacute;cie l'intelligence enjou&eacute;e</a>&mdash;pas "
@@ -735,9 +934,13 @@
 "&nbsp;casseurs de s&eacute;curit&eacute;&nbsp;&raquo;."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please don't spread this mistake.  People who break security are &ldquo;"
+#| "crackers&rdquo;."
 msgid ""
 "Please don't spread this mistake.  People who break security are &ldquo;"
-"crackers&rdquo;."
+"crackers.&rdquo;"
 msgstr ""
 "Veuillez ne pas r&eacute;pandre cette erreur. Les personnes qui cassent la "
 "s&eacute;curit&eacute; sont des &laquo;&nbsp;crackers&nbsp;&raquo;."
@@ -747,12 +950,20 @@
 msgstr "&laquo;&nbsp;Propri&eacute;t&eacute; Intellectuelle&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
+#| "property&rdquo;&mdash;a term that also includes patents, trademarks, and "
+#| "other more obscure areas of law.  These laws have so little in common, "
+#| "and differ so much, that it is ill-advised to generalize about them.  It "
+#| "is best to talk specifically about &ldquo;copyright,&rdquo; or about "
+#| "&ldquo;patents,&rdquo; or about &ldquo;trademarks.&rdquo;"
 msgid ""
 "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
-"property&rdquo;&mdash;a term that also includes patents, trademarks, and "
-"other more obscure areas of law.  These laws have so little in common, and "
-"differ so much, that it is ill-advised to generalize about them.  It is best "
-"to talk specifically about &ldquo;copyright,&rdquo; or about &ldquo;patents,"
+"property&rdquo;&mdash;a term also applied to patents, trademarks, and other "
+"more obscure areas of law.  These laws have so little in common, and differ "
+"so much, that it is ill-advised to generalize about them.  It is best to "
+"talk specifically about &ldquo;copyright,&rdquo; or about &ldquo;patents,"
 "&rdquo; or about &ldquo;trademarks.&rdquo;"
 msgstr ""
 "Les &eacute;diteurs et les juristes aiment assimiler le copyright &agrave; "
@@ -766,11 +977,17 @@
 "&raquo;."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;intellectual property&rdquo; carries a hidden "
+#| "assumption&mdash;that the way to think about all these disparate issues "
+#| "is based on an analogy with physical objects, and our ideas of physical "
+#| "property."
 msgid ""
 "The term &ldquo;intellectual property&rdquo; carries a hidden "
 "assumption&mdash;that the way to think about all these disparate issues is "
-"based on an analogy with physical objects, and our ideas of physical "
-"property."
+"based on an analogy with physical objects, and our conception of them as "
+"physical property."
 msgstr ""
 "Le terme &laquo;&nbsp;propri&eacute;t&eacute; intellectuelle&nbsp;&raquo; "
 "contient un postulat cach&eacute;&nbsp;: que la fa&ccedil;on naturelle de "
@@ -790,10 +1007,15 @@
 "effort, alors que ce n'est pas possible avec les objets mat&eacute;riels."
 
 # type: Content of: <p>
-msgid ""
-"To avoid the bias and confusion of this term, it is best to make a firm "
-"decision <a href=\"/philosophy/not-ipr.html\"> not to speak or even think in "
-"terms of &ldquo;intellectual property&rdquo;</a>."
+#, fuzzy
+#| msgid ""
+#| "To avoid the bias and confusion of this term, it is best to make a firm "
+#| "decision <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
+#| "in terms of &ldquo;intellectual property&rdquo;</a>."
+msgid ""
+"To avoid spreading unnecessary bias and confusion, it is best to adopt a "
+"firm policy <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
+"in terms of &ldquo;intellectual property&rdquo;</a>."
 msgstr ""
 "M&ecirc;me le syst&egrave;me am&eacute;ricain n'accepte pas compl&egrave;"
 "tement cette analogie, dans le sens o&ugrave; il ne traite pas les &laquo;"
@@ -801,10 +1023,15 @@
 "de propri&eacute;t&eacute; sur un objet physique."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
+#| "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make "
+#| "WIPO embarrassed</a>."
 msgid ""
 "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
-"philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make "
-"WIPO embarrassed</a>."
+"philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make the "
+"World &ldquo;Intellectual Property&rdquo; Organization embarrassed</a>."
 msgstr ""
 "Pour &eacute;viter la m&eacute;prise et la confusion de ce terme, il est "
 "pr&eacute;f&eacute;rable <a href=\"/philosophy/not-ipr.fr.html\">de ne pas "
@@ -816,12 +1043,19 @@
 msgstr "&laquo;&nbsp;Syst&egrave;me LAMP&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
+#| "&mdash;a common combination of software to use on a web server, except "
+#| "that &ldquo;Linux&rdquo; really refers to the GNU/Linux system.  So "
+#| "instead of &ldquo;LAMP&rdquo; it should be &ldquo;GLAMP&rdquo;: &ldquo;"
+#| "GNU, Linux, Apache, MySQL and PHP&rdquo;."
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
-"&mdash;a common combination of software to use on a web server, except that "
-"&ldquo;Linux&rdquo; really refers to the GNU/Linux system.  So instead of "
-"&ldquo;LAMP&rdquo; it should be &ldquo;GLAMP&rdquo;: &ldquo;GNU, Linux, "
-"Apache, MySQL and PHP&rdquo;."
+"&mdash;a common combination of software to use on a Web server, except that "
+"&ldquo;Linux&rdquo; in this context really refers to the GNU/Linux system.  "
+"So instead of &ldquo;LAMP&rdquo; it should be &ldquo;GLAMP&rdquo;: &ldquo;"
+"GNU, Linux, Apache, MySQL and PHP.&rdquo;"
 msgstr ""
 "&laquo;&nbsp;LAMP&nbsp;&raquo; signifie &laquo;&nbsp;Linux, Apache, MySQL et "
 "PHP&nbsp;&raquo; &mdash;&nbsp;une combinaison courante de logiciels &agrave; "
@@ -835,13 +1069,21 @@
 msgstr "«&nbsp;Système Linux&nbsp;»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Linux is the name of the kernel that Linus Torvalds developed starting in "
+#| "1991.  The operating system in which Linux is used is basically GNU with "
+#| "Linux added.  To call the whole system &ldquo;Linux&rdquo; is both unfair "
+#| "and confusing.  Please call the complete system <a href=\"/gnu/linux-and-"
+#| "gnu.html\"> GNU/Linux</a>, both to give the GNU Project credit and "
+#| "distinguish the whole system from the kernel alone."
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
 "Linux added.  To call the whole system &ldquo;Linux&rdquo; is both unfair "
 "and confusing.  Please call the complete system <a href=\"/gnu/linux-and-gnu."
-"html\"> GNU/Linux</a>, both to give the GNU Project credit and distinguish "
-"the whole system from the kernel alone."
+"html\"> GNU/Linux</a>, both to give the GNU Project credit and to "
+"distinguish the whole system from the kernel alone."
 msgstr ""
 "Linux est le nom du noyau que Linus Torvalds a développé à partir de 1991. 
"
 "Le système d'exploitation dans lequel Linux est utiliséest basiquement GNU "
@@ -855,20 +1097,30 @@
 msgstr "&laquo;&nbsp;March&eacute;&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "It is misleading to describe the users of free software, or the software "
+#| "users in general, as a &ldquo;market&rdquo;."
 msgid ""
 "It is misleading to describe the users of free software, or the software "
-"users in general, as a &ldquo;market&rdquo;."
+"users in general, as a &ldquo;market.&rdquo;"
 msgstr ""
 "Il est trompeur de d&eacute;crire les utilisateurs de logiciels libres ou "
 "les utilisateurs de logiciels en g&eacute;n&eacute;ral en terme de &laquo;"
 "&nbsp;march&eacute;&nbsp;&raquo;."
 
 # type: Content of: <p>
-msgid ""
-"This is not to say we're against markets.  If you have a free software "
-"support business, then you have clients, and you trade with them in a "
-"market.  As long as you respect their freedom, we wish you success in your "
-"market."
+#, fuzzy
+#| msgid ""
+#| "This is not to say we're against markets.  If you have a free software "
+#| "support business, then you have clients, and you trade with them in a "
+#| "market.  As long as you respect their freedom, we wish you success in "
+#| "your market."
+msgid ""
+"This is not to say there is no room for markets in the free software "
+"community.  If you have a free software support business, then you have "
+"clients, and you trade with them in a market.  As long as you respect their "
+"freedom, we wish you success in your market."
 msgstr ""
 "Cela ne veut pas dire que nous sommes contre les march&eacute;s. Si vous "
 "avez une soci&eacute;t&eacute; de services sur les logiciels libres, alors "
@@ -877,12 +1129,20 @@
 "de r&eacute;ussir dans votre march&eacute;."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "But the free software movement is a social movement, not a business, and "
+#| "the success it aims for is not a market success.  We are trying to serve "
+#| "the public by giving it freedom&mdash;not competing to take them away "
+#| "from a rival.  To equate this campaign for freedom to a business' "
+#| "campaign for mere success is to diminish the significance of freedom."
 msgid ""
 "But the free software movement is a social movement, not a business, and the "
 "success it aims for is not a market success.  We are trying to serve the "
-"public by giving it freedom&mdash;not competing to take them away from a "
-"rival.  To equate this campaign for freedom to a business' campaign for mere "
-"success is to diminish the significance of freedom."
+"public by giving it freedom&mdash;not competing to draw business away from a "
+"rival.  To equate this campaign for freedom to a business' efforts for mere "
+"success is to deny the importance of freedom and legitimize proprietary "
+"software."
 msgstr ""
 "Mais le mouvement du logiciel libre est un mouvement social, pas une "
 "entreprise, et la r&eacute;ussite &agrave; laquelle il se destine n'est pas "
@@ -896,15 +1156,26 @@
 msgstr "&laquo;&nbsp;Lecteur MP3&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In the late 1990's it became feasible to make portable, solid-state "
+#| "digital audio players. Most support the patented MP3 codec, but not all.  "
+#| "Some support the patent-free audio codecs Ogg Vorbis and FLAC, and may "
+#| "not even support MP3-encoded files at all, precisely to avoid the "
+#| "patents.  To call such players &ldquo;MP3 players&rdquo; is not only "
+#| "confusing, it also puts MP3 in an undeserved position of privilege which "
+#| "helps the patent holders continue to attack our community.  We suggest "
+#| "the terms &ldquo;digital audio player&rdquo;, or simply &ldquo;audio "
+#| "player&rdquo; if context permits."
 msgid ""
 "In the late 1990's it became feasible to make portable, solid-state digital "
 "audio players. Most support the patented MP3 codec, but not all.  Some "
 "support the patent-free audio codecs Ogg Vorbis and FLAC, and may not even "
-"support MP3-encoded files at all, precisely to avoid the patents.  To call "
+"support MP3-encoded files at all, precisely to avoid these patents.  To call "
 "such players &ldquo;MP3 players&rdquo; is not only confusing, it also puts "
-"MP3 in an undeserved position of privilege which helps the patent holders "
-"continue to attack our community.  We suggest the terms &ldquo;digital audio "
-"player&rdquo;, or simply &ldquo;audio player&rdquo; if context permits."
+"MP3 in an undeserved position of privilege which encourages people to "
+"continue using that vulnerable format.  We suggest the terms &ldquo;digital "
+"audio player,&rdquo; or simply &ldquo;audio player&rdquo; if context permits."
 msgstr ""
 "Vers la fin des ann&eacute;es 90, il est devenu possible de fabriquer des "
 "lecteurs audio num&eacute;riques, portables et compacts. La plupart "
@@ -924,14 +1195,24 @@
 msgstr "&laquo;&nbsp;Ouvert&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open "
+#| "source&rdquo; as a substitute for &ldquo;free software&rdquo;.  They "
+#| "refer to a <a href=\"/philosophy/open-source-misses-the-point.html\"> "
+#| "different position</a> based on different values.  Free software is a "
+#| "political movement; open source is a development model.  When referring "
+#| "to the open source position, using its name is appropriate; but please "
+#| "don't label us or our work with its slogan&mdash;that leads people to "
+#| "think we share those views."
 msgid ""
 "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open source&rdquo; "
-"as a substitute for &ldquo;free software&rdquo;.  They refer to a <a href=\"/"
-"philosophy/open-source-misses-the-point.html\"> different position</a> based "
-"on different values.  Free software is a political movement; open source is "
-"a development model.  When referring to the open source position, using its "
-"name is appropriate; but please don't label us or our work with its "
-"slogan&mdash;that leads people to think we share those views."
+"as a substitute for &ldquo;free software&rdquo;.  Those terms refer to a <a "
+"href=\"/philosophy/open-source-misses-the-point.html\"> different position</"
+"a> based on different values.  Free software is a political movement; open "
+"source is a development model.  When referring to the open source position, "
+"using its name is appropriate; but please use it to label us or our "
+"work&mdash;that leads people to think we share those views."
 msgstr ""
 "Veuillez &eacute;viter d'utiliser le terme &laquo;&nbsp;open&nbsp;&raquo; "
 "(ouvert) ou &laquo;&nbsp;open source&nbsp;&raquo; comme synonyme de &laquo;"
@@ -972,11 +1253,19 @@
 msgstr "&laquo;&nbsp;Photoshop&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;Photoshop&rdquo; as a verb, meaning "
+#| "any kind of photo manipulation or image editing in general.  Photoshop is "
+#| "just the name of one particular proprietary image editing program, and "
+#| "there are plenty of free alternatives, such as <a href=\"/software/gimp"
+#| "\">GIMP</a>."
 msgid ""
-"Please avoid using the term &ldquo;Photoshop&rdquo; as a verb, meaning any "
+"Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any "
 "kind of photo manipulation or image editing in general.  Photoshop is just "
-"the name of one particular proprietary image editing program, and there are "
-"plenty of free alternatives, such as <a href=\"/software/gimp\">GIMP</a>."
+"the name of one particular image editing program, which should be avoided "
+"since it is proprietary.  There are plenty of free alternatives, such as <a "
+"href=\"/software/gimp\">GIMP</a>."
 msgstr ""
 "Veuillez &eacute;viter d'utiliser le terme &laquo;&nbsp;Phtoshop&nbsp;"
 "&raquo; comme un verbe, en voulant parler de manipulation d'image ou "
@@ -1027,12 +1316,19 @@
 msgstr "&laquo;&nbsp;PowerPoint&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
+#| "slide presentation.  PowerPoint is just the name of one particular "
+#| "proprietary program to make presentations, and there are plenty of free "
+#| "alternatives, such as the <tt>beamer</tt> class available with any (La)"
+#| "TeX distribution."
 msgid ""
 "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
 "slide presentation.  PowerPoint is just the name of one particular "
 "proprietary program to make presentations, and there are plenty of free "
-"alternatives, such as the <tt>beamer</tt> class available with any (La)TeX "
-"distribution."
+"alternatives, such as TeX's <tt>beamer</tt> class and OpenOffice.org's "
+"Impress."
 msgstr ""
 "Veuillez &eacute;viter d'utiliser le terme &laquo;&nbsp;PowerPoint&nbsp;"
 "&raquo; pour parler de pr&eacute;sentation par diapositives. PowerPoint "
@@ -1062,10 +1358,17 @@
 "lui."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms "
+#| "instead.  For example, instead of &ldquo;Copyright protection lasts a "
+#| "very long time,&rdquo; you can say, &ldquo;Copyright lasts a very long "
+#| "time.&rdquo;"
 msgid ""
 "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms instead.  "
-"For example, instead of &ldquo;Copyright protection lasts a very long time,"
-"&rdquo; you can say, &ldquo;Copyright lasts a very long time.&rdquo;"
+"For example, instead of saying, &ldquo;Copyright protection lasts a very "
+"long time,&rdquo; you can say, &ldquo;Copyright lasts a very long time."
+"&rdquo;"
 msgstr ""
 "Il est facile d'&eacute;viter le mot &laquo;&nbsp;protection&nbsp;&raquo; et "
 "d'utiliser des termes neutres &agrave; la place. Par exemple, au lieu de "
@@ -1074,20 +1377,32 @@
 "longtemps&nbsp;&raquo;."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If you want to criticize copyright instead of supporting it, you can use "
+#| "the term &ldquo;copyright restrictions.&rdquo; So you can say, &ldquo;"
+#| "Copyright restrictions last a very long time.&rdquo;"
 msgid ""
 "If you want to criticize copyright instead of supporting it, you can use the "
-"term &ldquo;copyright restrictions.&rdquo; So you can say, &ldquo;Copyright "
-"restrictions last a very long time.&rdquo;"
+"term &ldquo;copyright restrictions.&rdquo; Thus, you can say, &ldquo;"
+"Copyright restrictions last a very long time.&rdquo;"
 msgstr ""
 "Si vous voulez critiquer le copyright au lieu de le soutenir, vous pouvez "
 "utiliser le terme &laquo;&nbsp;restrictions du copyright&nbsp;&raquo;."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;protection&rdquo; is also used to describe malicious "
+#| "features, as in &ldquo;copy protection&rdquo;, a feature that interferes "
+#| "with copying.  From the user's point of view, this is obstruction.  So we "
+#| "call that malicious feature &ldquo;copy obstruction&rdquo;."
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
-"features, as in &ldquo;copy protection&rdquo;, a feature that interferes "
-"with copying.  From the user's point of view, this is obstruction.  So we "
-"call that malicious feature &ldquo;copy obstruction&rdquo;."
+"features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
+"interferes with copying.  From the user's point of view, this is "
+"obstruction.  So we can call that malicious feature &ldquo;copy obstruction."
+"&rdquo;"
 msgstr ""
 "Le terme &laquo;&nbsp;protection&nbsp;&raquo;est aussi utilisé pour décrire 
"
 "des fonctionnalités malicieuses, comme dans «&nbsp;protection contre la "
@@ -1096,7 +1411,9 @@
 "obstruction à la copie&nbsp;»."
 
 # type: Content of: <h4>
-msgid "&ldquo;RAND (reasonable and non-discriminatory)&rdquo;"
+#, fuzzy
+#| msgid "&ldquo;RAND (reasonable and non-discriminatory)&rdquo;"
+msgid "&ldquo;RAND (reasonable and nondiscriminatory)&rdquo;"
 msgstr "&laquo;&nbsp;RAND (Reasonable And Non-Discriminatory)&nbsp;&raquo;"
 
 # type: Content of: <p>
@@ -1115,12 +1432,20 @@
 "&raquo; (raisonnable et non discriminatoire)."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "That term white-washes a class of patent licenses that are normally "
+#| "neither reasonable nor non-discriminatory.  It is true that these "
+#| "licenses do not discriminate against any specific person, but they do "
+#| "discriminate against the free software community, and that makes them "
+#| "unreasonable.  Thus, half of &ldquo;RAND&rdquo; is deceptive and the "
+#| "other half is prejudiced."
 msgid ""
-"That term white-washes a class of patent licenses that are normally neither "
-"reasonable nor non-discriminatory.  It is true that these licenses do not "
+"That term whitewashes a class of patent licenses that are normally neither "
+"reasonable nor nondiscriminatory.  It is true that these licenses do not "
 "discriminate against any specific person, but they do discriminate against "
 "the free software community, and that makes them unreasonable.  Thus, half "
-"of &ldquo;RAND&rdquo; is deceptive and the other half is prejudiced."
+"of the term &ldquo;RAND&rdquo; is deceptive and the other half is prejudiced."
 msgstr ""
 "Ce terme blanchit une classe de licences de brevets qui ne sont normalement "
 "ni raisonnables, ni non-discriminatoires. Il est vrai que ces licences ne "
@@ -1131,12 +1456,21 @@
 "moiti&eacute; est partiale."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Standards bodies should recognize that these licenses are discriminatory, "
+#| "and drop the use of the term &ldquo;reasonable and non-"
+#| "discriminatory&rdquo; or &ldquo;RAND&rdquo; to describe them.  Until they "
+#| "do so, other writers who do not wish to join in the white-washing would "
+#| "do well to reject that term.  To accept and use it merely because patent-"
+#| "wielding companies have made it widespread is to let those companies "
+#| "dictate the views you express."
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
-"and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
-"or &ldquo;RAND&rdquo; to describe them.  Until they do so, other writers who "
-"do not wish to join in the white-washing would do well to reject that term.  "
-"To accept and use it merely because patent-wielding companies have made it "
+"and drop the use of the term &ldquo;reasonable and nondiscriminatory&rdquo; "
+"or &ldquo;RAND&rdquo; to describe them.  Until they do so, writers who do "
+"not wish to join in the whitewashing would do well to reject that term.  To "
+"accept and use it merely because patent-wielding companies have made it "
 "widespread is to let those companies dictate the views you express."
 msgstr ""
 "Les organismes de standards devraient reconna&icirc;tre que ces licences "
@@ -1165,15 +1499,24 @@
 msgstr "«&nbsp;Vendre des logiciels&nbsp;»"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
+#| "exchanging a copy of a free program for a sum of money is &ldquo;"
+#| "selling&rdquo;; but people usually associate the term &ldquo;sell&rdquo; "
+#| "with proprietary restrictions on the subsequent use of the software.  You "
+#| "can be more precise, and prevent confusion, by saying either &ldquo;"
+#| "distributing copies of a program for a fee&rdquo; or &ldquo;imposing "
+#| "proprietary restrictions on the use of a program,&rdquo; depending on "
+#| "what you mean."
 msgid ""
 "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
-"exchanging a copy of a free program for a sum of money is &ldquo;"
-"selling&rdquo;; but people usually associate the term &ldquo;sell&rdquo; "
-"with proprietary restrictions on the subsequent use of the software.  You "
-"can be more precise, and prevent confusion, by saying either &ldquo;"
-"distributing copies of a program for a fee&rdquo; or &ldquo;imposing "
-"proprietary restrictions on the use of a program,&rdquo; depending on what "
-"you mean."
+"exchanging a copy of a free program for a sum of money is selling; but "
+"people usually associate the term &ldquo;sell&rdquo; with proprietary "
+"restrictions on the subsequent use of the software.  You can be more "
+"precise, and prevent confusion, by saying either &ldquo;distributing copies "
+"of a program for a fee&rdquo; or &ldquo;imposing proprietary restrictions on "
+"the use of a program,&rdquo; depending on what you mean."
 msgstr ""
 "Le terme «&nbsp;vendre des logiciels&nbsp;» est ambigu. À strictement 
parler, "
 "échanger une copie d'un programme libre pour une somme d'argent est de la "
@@ -1186,9 +1529,13 @@
 "vous voulez dire."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
+#| "more discussion of this issue."
 msgid ""
-"See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for more "
-"discussion of this issue."
+"See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
+"further discussion of this issue."
 msgstr ""
 "Consulter <a href=\"/philosophy/selling.fr.html\">Vendre des logiciels "
 "libres</a> pour une discussion plsu détaillée sur le sujet."
@@ -1198,12 +1545,21 @@
 msgstr "&laquo;&nbsp;Industrie logicielle&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;software industry&rdquo; encourages people to imagine "
+#| "that software is always developed by a sort of factory and then delivered "
+#| "to consumers.  The free software community shows this is not the case.  "
+#| "Software businesses exist, and various businesses develop free and/or non-"
+#| "free software, but those that develop free software are not like "
+#| "factories."
 msgid ""
 "The term &ldquo;software industry&rdquo; encourages people to imagine that "
 "software is always developed by a sort of factory and then delivered to "
 "consumers.  The free software community shows this is not the case.  "
-"Software businesses exist, and various businesses develop free and/or non-"
-"free software, but those that develop free software are not like factories."
+"Software businesses exist, and various businesses develop free and/or "
+"nonfree software, but those that develop free software are not run like "
+"factories."
 msgstr ""
 "Le terme &laquo;&nbsp;industrie logicielle&nbsp;&raquo; encourage les gens "
 "&agrave; penser que le logiciel est toujours d&eacute;velopp&eacute; par une "
@@ -1215,14 +1571,23 @@
 "usines."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;industry&rdquo; is being used as propaganda by advocates "
+#| "of software patents.  They call software development &ldquo;"
+#| "industry&rdquo; and then try to argue that this means it should be "
+#| "subject to patent monopolies.  <a href=\"http://swpat.ffii.org/papers/";
+#| "europarl0309/\"> The European Parliament, rejecting software patents in "
+#| "2003, voted to define &ldquo;industry&rdquo; as &ldquo;automated "
+#| "production of material goods&rdquo;.</a>"
 msgid ""
 "The term &ldquo;industry&rdquo; is being used as propaganda by advocates of "
 "software patents.  They call software development &ldquo;industry&rdquo; and "
 "then try to argue that this means it should be subject to patent "
 "monopolies.  <a href=\"http://swpat.ffii.org/papers/europarl0309/\";> The "
 "European Parliament, rejecting software patents in 2003, voted to define "
-"&ldquo;industry&rdquo; as &ldquo;automated production of material "
-"goods&rdquo;.</a>"
+"&ldquo;industry&rdquo; as &ldquo;automated production of material goods."
+"&rdquo;</a>"
 msgstr ""
 "Le terme &laquo;&nbsp;industrie&nbsp;&raquo; a &eacute;t&eacute; "
 "utilis&eacute; comme propagande par les avocats en brevets logiciels. Ils "
@@ -1253,10 +1618,16 @@
 "qu'elle doit &ecirc;tre mauvaise."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "So it is pertinent to mention that the legal system&mdash;at least in the "
+#| "US&mdash;rejects the idea that copyright infringement is &ldquo;theft."
+#| "&rdquo; Copyright apologists are making an appeal to authority &hellip; "
+#| "and misrepresenting what authority says."
 msgid ""
 "So it is pertinent to mention that the legal system&mdash;at least in the "
 "US&mdash;rejects the idea that copyright infringement is &ldquo;theft."
-"&rdquo; Copyright apologists are making an appeal to authority &hellip; and "
+"&rdquo; Copyright apologists are making an appeal to authority&hellip;and "
 "misrepresenting what authority says."
 msgstr ""
 "Alors il est int&eacute;ressant de signaler que la loi (du moins aux &Eacute;"
@@ -1282,12 +1653,19 @@
 msgstr "&laquo;&nbsp;Informatique de confiance&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;"
+#| "</a> is the proponents name for a scheme to redesign computers so that "
+#| "application developers can trust your computer to obey them instead of "
+#| "you.  For their point of view, it is &ldquo;trusted&rdquo;.  From your "
+#| "point of view, it is &ldquo;treacherous&rdquo;."
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;</"
-"a> is the proponents name for a scheme to redesign computers so that "
+"a> is the proponents' name for a scheme to redesign computers so that "
 "application developers can trust your computer to obey them instead of you.  "
-"For their point of view, it is &ldquo;trusted&rdquo;.  From your point of "
-"view, it is &ldquo;treacherous&rdquo;."
+"For their point of view, it is &ldquo;trusted&rdquo;; from your point of "
+"view, it is &ldquo;treacherous.&rdquo;"
 msgstr ""
 "<a href=\"/philosophy/can-you-trust.fr.html\">&laquo;&nbsp;Informatique de "
 "confiance&nbsp;&raquo;</a> est le nom donn&eacute; &agrave; un sch&eacute;ma "
@@ -1302,14 +1680,23 @@
 msgstr "&laquo;&nbsp;Vendeur&nbsp;&raquo;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please don't use the term &ldquo;vendor&rdquo; to refer generally to "
+#| "anyone that develops or packages a software package.  Many programs are "
+#| "developed in order to sell copies, and their developers are therefore "
+#| "their vendors; this includes some free software packages.  However, many "
+#| "programs are developed by volunteers or organizations which do not intend "
+#| "to sell copies.  These developers are not vendors.  Likewise, only some "
+#| "of the packagers of GNU/Linux distributions are vendors."
 msgid ""
 "Please don't use the term &ldquo;vendor&rdquo; to refer generally to anyone "
-"that develops or packages a software package.  Many programs are developed "
-"in order to sell copies, and their developers are therefore their vendors; "
-"this includes some free software packages.  However, many programs are "
-"developed by volunteers or organizations which do not intend to sell "
-"copies.  These developers are not vendors.  Likewise, only some of the "
-"packagers of GNU/Linux distributions are vendors."
+"that develops or packages software.  Many programs are developed in order to "
+"sell copies, and their developers are therefore their vendors; this even "
+"includes some free software packages.  However, many programs are developed "
+"by volunteers or organizations which do not intend to sell copies.  These "
+"developers are not vendors.  Likewise, only some of the packagers of GNU/"
+"Linux distributions are vendors."
 msgstr ""
 "Veuillez ne pas utiliser le terme &laquo;&nbsp;vendeur&nbsp;&raquo; pour "
 "vous r&eacute;f&eacute;rer de mani&egrave;re g&eacute;n&eacute;rale &agrave; "

Index: philosophy/po/words-to-avoid.pot
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.pot,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/po/words-to-avoid.pot    2 Aug 2009 20:29:49 -0000       1.13
+++ philosophy/po/words-to-avoid.pot    28 Sep 2009 20:26:08 -0000      1.14
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-02 16:26-0300\n"
+"POT-Creation-Date: 2009-09-28 16:25-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"
@@ -17,20 +17,19 @@
 
 # type: Content of: <title>
 msgid ""
-"Confusing Words and Phrases that are Worth Avoiding - GNU Project - Free "
+"Confusing Words and Phrases That Are Worth Avoiding - GNU Project - Free "
 "Software Foundation (FSF)"
 msgstr ""
 
 # type: Content of: <h2>
-msgid "Some Confusing or Loaded Words and Phrases to Avoid (or use with care)"
+msgid "Some Confusing or Loaded Words and Phrases to Avoid (or Use with Care)"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"There are a number of words and phrases which we recommend avoiding, or "
-"avoiding in certain contexts and usages.  The reason is either that they are "
-"ambiguous, or that they imply an opinion that we hope you may not entirely "
-"agree with."
+"There are a number of words and phrases that we recommend avoiding, or "
+"avoiding in certain contexts and usages.  Some are ambiguous or misleading; "
+"others presuppose a viewpoint that we hope you disagree with."
 msgstr ""
 
 # type: Content of: <div>
@@ -91,8 +90,8 @@
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/philosophy/bsd.html\">lumps together licenses that have important "
 "differences</a>.  For instance, the original BSD license with the "
-"advertising clause is incompatible with the GNU GPL, but the revised BSD "
-"license is compatible with the GPL."
+"advertising clause is incompatible with the GNU General Public License, but "
+"the revised BSD license is compatible with the GPL."
 msgstr ""
 
 # type: Content of: <p>
@@ -108,13 +107,13 @@
 
 # type: Content of: <p>
 msgid ""
-"Describing non-free software as &ldquo;closed&rdquo; clearly refers to the "
+"Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source&rdquo;.  In the free software movement, <a "
-"href=\"/philosophy/open-source-misses-the-point.html\"> we want to avoid "
-"being confused with the more recent open source movement</a>, so we are "
-"careful to avoid usage that would encourage people to lump us in with them.  "
-"Therefore, we avoid describing non-free software as &ldquo;closed&rdquo;.  "
-"We call it &ldquo;non-free&rdquo; or <a "
+"href=\"/philosophy/open-source-misses-the-point.html\"> we do not want to be "
+"confused with the open source camp</a>, so we are careful to avoid saying "
+"things that would encourage people to lump us in with them.  For instance, "
+"we avoid describing nonfree software as &ldquo;closed&rdquo;.  We call it "
+"&ldquo;nonfree&rdquo; or <a "
 "href=\"/philosophy/categories.html#ProprietarySoftware\"> "
 "&ldquo;proprietary&rdquo;</a>."
 msgstr ""
@@ -125,29 +124,29 @@
 
 # type: Content of: <p>
 msgid ""
-"The term &ldquo;cloud computing&rdquo; is marketing buzzword with no clear "
+"The term &ldquo;cloud computing&rdquo; is a marketing buzzword with no clear "
 "meaning.  It is used for a range of different activities whose only common "
-"quality is that they use the Internet for something beyond transmitting "
-"files.  Thus, the term is a nexus of confusion.  If you try to use it in "
-"your thinking, your thinking will be vague."
+"characteristic is that they use the Internet for something beyond "
+"transmitting files.  Thus, the term is a nexus of confusion.  If you base "
+"your thinking on it, your thinking will be vague."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"When thinking about or responding to a statement someone else made using "
+"When thinking about or responding to a statement someone else has made using "
 "this term, the first step is to clarify the topic.  Which kind of activity "
-"is the statement really about, and what is a good term for that activity? "
-"Pressing yourself (or the person who made the statement) to clarify the "
-"topic will direct the discussion towards a useful conclusion."
+"is the statement really about, and what is a good, clear term for that "
+"activity? Once the topic is clear, the discussion can head for a useful "
+"conclusion."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a "
 "href=\"http://news.cnet.com/8301-13953_3-10052188-80.html\";> noted the "
-"vacuity of the term &ldquo;cloud computing&rdquo;</a>.  He decided to use "
-"the term anyway because, as a proprietary software developer, he isn't "
-"motivated by the same ideals we are."
+"vacuity of the term &ldquo;cloud computing.&rdquo;</a> He decided to use the "
+"term anyway because, as a proprietary software developer, he isn't motivated "
+"by the same ideals as we are."
 msgstr ""
 
 # type: Content of: <h4>
@@ -157,16 +156,17 @@
 # type: Content of: <p>
 msgid ""
 "Please don't use &ldquo;commercial&rdquo; as a synonym for "
-"&ldquo;non-free.&rdquo; That confuses two entirely different issues."
+"&ldquo;nonfree.&rdquo; That confuses two entirely different issues."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "A program is commercial if it is developed as a business activity.  A "
-"commercial program can be free or non-free, depending on its license.  "
-"Likewise, a program developed by a school or an individual can be free or "
-"non-free, depending on its license.  The two questions, what sort of entity "
-"developed the program and what freedom its users have, are independent."
+"commercial program can be free or nonfree, depending on its manner of "
+"distribution.  Likewise, a program developed by a school or an individual "
+"can be free or nonfree, depending on its manner of distribution.  The two "
+"questions&mdash;what sort of entity developed the program and what freedom "
+"its users have&mdash;are independent."
 msgstr ""
 
 # type: Content of: <p>
@@ -182,7 +182,7 @@
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
-"&ldquo;non-free&rdquo; will tend to think that the &ldquo;free "
+"&ldquo;nonfree&rdquo; will tend to think that the &ldquo;free "
 "commercial&rdquo; combination is self-contradictory, and dismiss the "
 "possibility.  Let's be careful not to use the word &ldquo;commercial&rdquo; "
 "in that way."
@@ -208,17 +208,22 @@
 
 # type: Content of: <p>
 msgid ""
-"The term &ldquo;consumer&rdquo;, when used to refer to computer users, "
-"carries unfortunate assumptions."
+"The term &ldquo;consumer,&rdquo; when used to refer to computer users, is "
+"loaded with assumptions we should reject."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Economic theory uses the terms &ldquo;producer&rdquo; and "
-"&ldquo;consumer&rdquo;.  In that context these words are appropriate.  But "
-"describing the users of software as &ldquo;consumers&rdquo; presumes a "
-"narrow role for them.  It treats them like cattle that passively graze on "
-"what others make available to them."
+"The terms &ldquo;producer&rdquo; and &ldquo;consumer&rdquo; come from "
+"economic theory, and presuppose the assumptions and narrow prespective of "
+"economic theory.  That warps your thinking."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"In addition, describing the users of software as &ldquo;consumers&rdquo; "
+"presumes a narrow role for them.  It treats them like cattle that passively "
+"graze on what others make available to them."
 msgstr ""
 
 # type: Content of: <p>
@@ -231,8 +236,9 @@
 
 # type: Content of: <p>
 msgid ""
-"The narrow economic vision of users as &ldquo;consumers&rdquo; tends to go "
-"hand in hand with the idea that published works are &ldquo;content&rdquo;."
+"The narrow economic conception of users as &ldquo;consumers&rdquo; tends to "
+"go hand in hand with the idea that published works are "
+"&ldquo;content.&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
@@ -249,24 +255,23 @@
 # type: Content of: <p>
 msgid ""
 "If you want to describe a feeling of comfort and satisfaction, by all means "
-"say you are &ldquo;content&rdquo;, but using it as a noun to describe "
-"written and other works of authorship is worth avoiding.  That usage adopts "
-"a specific attitude towards those works: that they are an interchangeable "
-"commodity whose purpose is to fill a box and make money.  In effect, it "
-"disparages the works themselves."
+"say you are &ldquo;content,&rdquo; but using the word as a noun to describe "
+"written and other works of authorship adopts an attitude you might rather "
+"avoid.  It regards these works as a commodity whose purpose is to fill a box "
+"and make money.  In effect, it disparages the works themselves."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "Those who use this term are often the publishers that push for increased "
-"copyright power in the name of the authors (&ldquo;creators&rdquo;, as they "
+"copyright power in the name of the authors (&ldquo;creators,&rdquo; as they "
 "say) of the works.  The term &ldquo;content&rdquo; reveals their real "
 "attitude towards these works and their authors.  (See <a "
 
"href=\"http://archive.salon.com/tech/feature/2000/06/14/love/print.html\";>Courtney
 "
 "Love's open letter to Steve Case</a> and search for &ldquo;content "
 "provider&rdquo; in that page.  Alas, Ms. Love is unaware that the term "
 "&ldquo;intellectual property&rdquo; is also <a "
-"href=\"#IntellectualProperty\"> misleading</a>.)"
+"href=\"#IntellectualProperty\"> biased and confusing</a>.)"
 msgstr ""
 
 # type: Content of: <p>
@@ -279,17 +284,17 @@
 # type: Content of: <p>
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
-"&ldquo;Content&rdquo; means &ldquo;some sort of information&rdquo;, and "
+"&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
 "&ldquo;management&rdquo; in this context means &ldquo;doing something with "
-"it&rdquo;.  So a &ldquo;content management system&rdquo; is a system for "
-"doing something to some sort of information.  That description fits most "
-"programs."
+"it.&rdquo; So a &ldquo;content management system&rdquo; is a system for "
+"doing something to some sort of information.  Nearly all programs fit that "
+"description."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
-"website.  For that, we recommend the term &ldquo;website revision "
+"Web site.  For that, we recommend the term &ldquo;Web site revision "
 "system&rdquo; (WRS)."
 msgstr ""
 
@@ -301,9 +306,9 @@
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
-"to elevate the authors' moral stature above that of ordinary people, to "
-"justify increased copyright power that the publishers can exercise in the "
-"name of the authors.  We recommend saying &ldquo;author&rdquo; instead.  "
+"to elevate authors' moral standing above that of ordinary people in order to "
+"justify giving them increased copyright power, which the publishers can then "
+"exercise in their name.  We recommend saying &ldquo;author&rdquo; instead.  "
 "However, in many cases &ldquo;copyright holder&rdquo; is what you really "
 "mean."
 msgstr ""
@@ -312,10 +317,14 @@
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr ""
 
+# type: Content of: outside any tag (error?)
+msgid "o"
+msgstr ""
+
 # type: Content of: <p>
 msgid ""
-"The term &ldquo;digital goods&rdquo; as applied to copies of works of "
-"authorship forces them into the thought mold of physical goods &mdash; which "
+"The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
+"authorship, erroneously identifies them with physical goods&mdash;which "
 "cannot be copied, and which therefore have to be manufactured and sold."
 msgstr ""
 
@@ -335,9 +344,8 @@
 
 # type: Content of: <p>
 msgid ""
-"Good alternatives include &ldquo;Digital Restrictions Management&rdquo;, "
-"&ldquo;Digital Restrictions Malware&rdquo;, and &ldquo;digital "
-"handcuffs&rdquo;."
+"Good alternatives include &ldquo;Digital Restrictions Management,&rdquo; and "
+"&ldquo;digital handcuffs.&rdquo;"
 msgstr ""
 
 # type: Content of: <h4>
@@ -347,12 +355,13 @@
 # type: Content of: <p>
 msgid ""
 "It is a mistake to describe the free software community, or any human "
-"community, as an &ldquo;ecosystem&rdquo;, because that word implies the "
+"community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
 "absence of (1) intention and (2) ethics.  In an ecosystem, species evolve "
-"according to their fitness.  If something is weak, it goes extinct, and "
-"that's neither right nor wrong, merely an ecological phenomenon.  The term "
-"&ldquo;ecosystem&rdquo; implicitly suggests a passive attitude: &ldquo;Don't "
-"ask how things <em>should</em> be, just watch what happens to them&rdquo;."
+"according to their fitness: if a species is weak and goes extinct, that's "
+"neither right nor wrong, merely an ecological phenomenon.  The term "
+"&ldquo;ecosystem&rdquo; implicitly suggests a attitude of passive "
+"observation: don't ask how what <em>should</em> happen, just study what does "
+"happen."
 msgstr ""
 
 # type: Content of: <p>
@@ -361,7 +370,7 @@
 "and have ideas of ethical responsibility, can decide to preserve things "
 "that, on their own, would tend to vanish&mdash;such as civil society, "
 "democracy, human rights, peace, public health, clean air and water, "
-"endangered species, traditional arts, &hellip; and computer users' freedom."
+"endangered species, traditional arts&hellip;and computer users' freedom."
 msgstr ""
 
 # type: Content of: <h4>
@@ -391,16 +400,16 @@
 msgstr ""
 
 # type: Content of: <h4>
-msgid "&ldquo;Freely Available&rdquo;"
+msgid "&ldquo;Freely available&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Don't use &ldquo;freely available&rdquo; as a synonym for &ldquo;free "
-"software.&rdquo; They are not equivalent.  &ldquo;Freely available&rdquo; "
-"means that anyone can easily get a copy.  &ldquo;Free software&rdquo; is "
-"defined in terms of the freedom of users that have a copy.  These are "
-"answers to different questions."
+"Don't use &ldquo;freely available software&rdquo; as a synonym for "
+"&ldquo;free software.&rdquo; The terms are not equivalent.  Software is "
+"&ldquo;freely available&rdquo; if anyone can easily get a copy.  &ldquo;Free "
+"software&rdquo; is defined in terms of the freedom of users that have a copy "
+"of it.  These are answers to different questions."
 msgstr ""
 
 # type: Content of: <h4>
@@ -417,9 +426,9 @@
 
 # type: Content of: <p>
 msgid ""
-"Also, if you use other languages than English, please try to avoid borrowing "
-"English terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; "
-"It is better to translate the term &ldquo;free software&rdquo; into <a "
+"When using languages other than English, please avoid borrowing English "
+"terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; It is "
+"better to translate the term &ldquo;free software&rdquo; into <a "
 "href=\"/philosophy/fs-translations.html\">your language</a>."
 msgstr ""
 
@@ -440,9 +449,10 @@
 # type: Content of: <p>
 msgid ""
 "It's misleading to use the term &ldquo;give away&rdquo; to mean "
-"&ldquo;distribute a program as free software.&rdquo; It has the same problem "
-"as &ldquo;for free&rdquo;: it implies the issue is price, not freedom.  One "
-"way to avoid the confusion is to say &ldquo;release as free software.&rdquo;"
+"&ldquo;distribute a program as free software.&rdquo; This locution has the "
+"same problem as &ldquo;for free&rdquo;: it implies the issue is price, not "
+"freedom.  One way to avoid the confusion is to say &ldquo;release as free "
+"software.&rdquo;"
 msgstr ""
 
 # type: Content of: <h4>
@@ -457,13 +467,13 @@
 "old <abbr title=\"Massachusetts Institute of Technology\">MIT</abbr> free "
 "software community of the 60s and 70s referred to themselves as hackers.  "
 "Around 1980, journalists who discovered the hacker community mistakenly took "
-"the term to mean &ldquo;security breaker&rdquo;."
+"the term to mean &ldquo;security breaker.&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "Please don't spread this mistake.  People who break security are "
-"&ldquo;crackers&rdquo;."
+"&ldquo;crackers.&rdquo;"
 msgstr ""
 
 # type: Content of: <h4>
@@ -473,10 +483,10 @@
 # type: Content of: <p>
 msgid ""
 "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
-"property&rdquo;&mdash;a term that also includes patents, trademarks, and "
-"other more obscure areas of law.  These laws have so little in common, and "
-"differ so much, that it is ill-advised to generalize about them.  It is best "
-"to talk specifically about &ldquo;copyright,&rdquo; or about "
+"property&rdquo;&mdash;a term also applied to patents, trademarks, and other "
+"more obscure areas of law.  These laws have so little in common, and differ "
+"so much, that it is ill-advised to generalize about them.  It is best to "
+"talk specifically about &ldquo;copyright,&rdquo; or about "
 "&ldquo;patents,&rdquo; or about &ldquo;trademarks.&rdquo;"
 msgstr ""
 
@@ -484,8 +494,8 @@
 msgid ""
 "The term &ldquo;intellectual property&rdquo; carries a hidden "
 "assumption&mdash;that the way to think about all these disparate issues is "
-"based on an analogy with physical objects, and our ideas of physical "
-"property."
+"based on an analogy with physical objects, and our conception of them as "
+"physical property."
 msgstr ""
 
 # type: Content of: <p>
@@ -497,16 +507,17 @@
 
 # type: Content of: <p>
 msgid ""
-"To avoid the bias and confusion of this term, it is best to make a firm "
-"decision <a href=\"/philosophy/not-ipr.html\"> not to speak or even think in "
-"terms of &ldquo;intellectual property&rdquo;</a>."
+"To avoid spreading unnecessary bias and confusion, it is best to adopt a "
+"firm policy <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
+"in terms of &ldquo;intellectual property&rdquo;</a>."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a "
 "href=\"/philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to "
-"make WIPO embarrassed</a>."
+"make the World &ldquo;Intellectual Property&rdquo; Organization "
+"embarrassed</a>."
 msgstr ""
 
 # type: Content of: <h4>
@@ -516,10 +527,10 @@
 # type: Content of: <p>
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and "
-"PHP&rdquo;&mdash;a common combination of software to use on a web server, "
-"except that &ldquo;Linux&rdquo; really refers to the GNU/Linux system.  So "
-"instead of &ldquo;LAMP&rdquo; it should be &ldquo;GLAMP&rdquo;: &ldquo;GNU, "
-"Linux, Apache, MySQL and PHP&rdquo;."
+"PHP&rdquo;&mdash;a common combination of software to use on a Web server, "
+"except that &ldquo;Linux&rdquo; in this context really refers to the "
+"GNU/Linux system.  So instead of &ldquo;LAMP&rdquo; it should be "
+"&ldquo;GLAMP&rdquo;: &ldquo;GNU, Linux, Apache, MySQL and PHP.&rdquo;"
 msgstr ""
 
 # type: Content of: <h4>
@@ -533,7 +544,7 @@
 "Linux added.  To call the whole system &ldquo;Linux&rdquo; is both unfair "
 "and confusing.  Please call the complete system <a "
 "href=\"/gnu/linux-and-gnu.html\"> GNU/Linux</a>, both to give the GNU "
-"Project credit and distinguish the whole system from the kernel alone."
+"Project credit and to distinguish the whole system from the kernel alone."
 msgstr ""
 
 # type: Content of: <h4>
@@ -543,24 +554,25 @@
 # type: Content of: <p>
 msgid ""
 "It is misleading to describe the users of free software, or the software "
-"users in general, as a &ldquo;market&rdquo;."
+"users in general, as a &ldquo;market.&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"This is not to say we're against markets.  If you have a free software "
-"support business, then you have clients, and you trade with them in a "
-"market.  As long as you respect their freedom, we wish you success in your "
-"market."
+"This is not to say there is no room for markets in the free software "
+"community.  If you have a free software support business, then you have "
+"clients, and you trade with them in a market.  As long as you respect their "
+"freedom, we wish you success in your market."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "But the free software movement is a social movement, not a business, and the "
 "success it aims for is not a market success.  We are trying to serve the "
-"public by giving it freedom&mdash;not competing to take them away from a "
-"rival.  To equate this campaign for freedom to a business' campaign for mere "
-"success is to diminish the significance of freedom."
+"public by giving it freedom&mdash;not competing to draw business away from a "
+"rival.  To equate this campaign for freedom to a business' efforts for mere "
+"success is to deny the importance of freedom and legitimize proprietary "
+"software."
 msgstr ""
 
 # type: Content of: <h4>
@@ -572,11 +584,12 @@
 "In the late 1990's it became feasible to make portable, solid-state digital "
 "audio players. Most support the patented MP3 codec, but not all.  Some "
 "support the patent-free audio codecs Ogg Vorbis and FLAC, and may not even "
-"support MP3-encoded files at all, precisely to avoid the patents.  To call "
+"support MP3-encoded files at all, precisely to avoid these patents.  To call "
 "such players &ldquo;MP3 players&rdquo; is not only confusing, it also puts "
-"MP3 in an undeserved position of privilege which helps the patent holders "
-"continue to attack our community.  We suggest the terms &ldquo;digital audio "
-"player&rdquo;, or simply &ldquo;audio player&rdquo; if context permits."
+"MP3 in an undeserved position of privilege which encourages people to "
+"continue using that vulnerable format.  We suggest the terms &ldquo;digital "
+"audio player,&rdquo; or simply &ldquo;audio player&rdquo; if context "
+"permits."
 msgstr ""
 
 # type: Content of: <h4>
@@ -586,13 +599,12 @@
 # type: Content of: <p>
 msgid ""
 "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open source&rdquo; "
-"as a substitute for &ldquo;free software&rdquo;.  They refer to a <a "
+"as a substitute for &ldquo;free software&rdquo;.  Those terms refer to a <a "
 "href=\"/philosophy/open-source-misses-the-point.html\"> different "
 "position</a> based on different values.  Free software is a political "
 "movement; open source is a development model.  When referring to the open "
-"source position, using its name is appropriate; but please don't label us or "
-"our work with its slogan&mdash;that leads people to think we share those "
-"views."
+"source position, using its name is appropriate; but please use it to label "
+"us or our work&mdash;that leads people to think we share those views."
 msgstr ""
 
 # type: Content of: <h4>
@@ -617,10 +629,11 @@
 
 # type: Content of: <p>
 msgid ""
-"Please avoid using the term &ldquo;Photoshop&rdquo; as a verb, meaning any "
+"Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any "
 "kind of photo manipulation or image editing in general.  Photoshop is just "
-"the name of one particular proprietary image editing program, and there are "
-"plenty of free alternatives, such as <a href=\"/software/gimp\">GIMP</a>."
+"the name of one particular image editing program, which should be avoided "
+"since it is proprietary.  There are plenty of free alternatives, such as <a "
+"href=\"/software/gimp\">GIMP</a>."
 msgstr ""
 
 # type: Content of: <h4>
@@ -657,8 +670,8 @@
 "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
 "slide presentation.  PowerPoint is just the name of one particular "
 "proprietary program to make presentations, and there are plenty of free "
-"alternatives, such as the <tt>beamer</tt> class available with any (La)TeX "
-"distribution."
+"alternatives, such as TeX's <tt>beamer</tt> class and OpenOffice.org's "
+"Impress."
 msgstr ""
 
 # type: Content of: <h4>
@@ -677,27 +690,29 @@
 # type: Content of: <p>
 msgid ""
 "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms instead.  "
-"For example, instead of &ldquo;Copyright protection lasts a very long "
-"time,&rdquo; you can say, &ldquo;Copyright lasts a very long time.&rdquo;"
+"For example, instead of saying, &ldquo;Copyright protection lasts a very "
+"long time,&rdquo; you can say, &ldquo;Copyright lasts a very long "
+"time.&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "If you want to criticize copyright instead of supporting it, you can use the "
-"term &ldquo;copyright restrictions.&rdquo; So you can say, &ldquo;Copyright "
-"restrictions last a very long time.&rdquo;"
+"term &ldquo;copyright restrictions.&rdquo; Thus, you can say, "
+"&ldquo;Copyright restrictions last a very long time.&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
-"features, as in &ldquo;copy protection&rdquo;, a feature that interferes "
-"with copying.  From the user's point of view, this is obstruction.  So we "
-"call that malicious feature &ldquo;copy obstruction&rdquo;."
+"features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
+"interferes with copying.  From the user's point of view, this is "
+"obstruction.  So we can call that malicious feature &ldquo;copy "
+"obstruction.&rdquo;"
 msgstr ""
 
 # type: Content of: <h4>
-msgid "&ldquo;RAND (reasonable and non-discriminatory)&rdquo;"
+msgid "&ldquo;RAND (reasonable and nondiscriminatory)&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
@@ -711,20 +726,21 @@
 
 # type: Content of: <p>
 msgid ""
-"That term white-washes a class of patent licenses that are normally neither "
-"reasonable nor non-discriminatory.  It is true that these licenses do not "
+"That term whitewashes a class of patent licenses that are normally neither "
+"reasonable nor nondiscriminatory.  It is true that these licenses do not "
 "discriminate against any specific person, but they do discriminate against "
 "the free software community, and that makes them unreasonable.  Thus, half "
-"of &ldquo;RAND&rdquo; is deceptive and the other half is prejudiced."
+"of the term &ldquo;RAND&rdquo; is deceptive and the other half is "
+"prejudiced."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
-"and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
-"or &ldquo;RAND&rdquo; to describe them.  Until they do so, other writers who "
-"do not wish to join in the white-washing would do well to reject that term.  "
-"To accept and use it merely because patent-wielding companies have made it "
+"and drop the use of the term &ldquo;reasonable and nondiscriminatory&rdquo; "
+"or &ldquo;RAND&rdquo; to describe them.  Until they do so, writers who do "
+"not wish to join in the whitewashing would do well to reject that term.  To "
+"accept and use it merely because patent-wielding companies have made it "
 "widespread is to let those companies dictate the views you express."
 msgstr ""
 
@@ -742,19 +758,18 @@
 # type: Content of: <p>
 msgid ""
 "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
-"exchanging a copy of a free program for a sum of money is "
-"&ldquo;selling&rdquo;; but people usually associate the term "
-"&ldquo;sell&rdquo; with proprietary restrictions on the subsequent use of "
-"the software.  You can be more precise, and prevent confusion, by saying "
-"either &ldquo;distributing copies of a program for a fee&rdquo; or "
-"&ldquo;imposing proprietary restrictions on the use of a program,&rdquo; "
-"depending on what you mean."
+"exchanging a copy of a free program for a sum of money is selling; but "
+"people usually associate the term &ldquo;sell&rdquo; with proprietary "
+"restrictions on the subsequent use of the software.  You can be more "
+"precise, and prevent confusion, by saying either &ldquo;distributing copies "
+"of a program for a fee&rdquo; or &ldquo;imposing proprietary restrictions on "
+"the use of a program,&rdquo; depending on what you mean."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for more "
-"discussion of this issue."
+"See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
+"further discussion of this issue."
 msgstr ""
 
 # type: Content of: <h4>
@@ -767,7 +782,7 @@
 "software is always developed by a sort of factory and then delivered to "
 "consumers.  The free software community shows this is not the case.  "
 "Software businesses exist, and various businesses develop free and/or "
-"non-free software, but those that develop free software are not like "
+"nonfree software, but those that develop free software are not run like "
 "factories."
 msgstr ""
 
@@ -779,7 +794,7 @@
 "monopolies.  <a href=\"http://swpat.ffii.org/papers/europarl0309/\";> The "
 "European Parliament, rejecting software patents in 2003, voted to define "
 "&ldquo;industry&rdquo; as &ldquo;automated production of material "
-"goods&rdquo;.</a>"
+"goods.&rdquo;</a>"
 msgstr ""
 
 # type: Content of: <h4>
@@ -798,8 +813,8 @@
 msgid ""
 "So it is pertinent to mention that the legal system&mdash;at least in the "
 "US&mdash;rejects the idea that copyright infringement is "
-"&ldquo;theft.&rdquo; Copyright apologists are making an appeal to authority "
-"&hellip; and misrepresenting what authority says."
+"&ldquo;theft.&rdquo; Copyright apologists are making an appeal to "
+"authority&hellip;and misrepresenting what authority says."
 msgstr ""
 
 # type: Content of: <p>
@@ -816,10 +831,10 @@
 # type: Content of: <p>
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted "
-"computing&rdquo;</a> is the proponents name for a scheme to redesign "
+"computing&rdquo;</a> is the proponents' name for a scheme to redesign "
 "computers so that application developers can trust your computer to obey "
-"them instead of you.  For their point of view, it is &ldquo;trusted&rdquo;.  "
-"From your point of view, it is &ldquo;treacherous&rdquo;."
+"them instead of you.  For their point of view, it is &ldquo;trusted&rdquo;; "
+"from your point of view, it is &ldquo;treacherous.&rdquo;"
 msgstr ""
 
 # type: Content of: <h4>
@@ -829,12 +844,12 @@
 # type: Content of: <p>
 msgid ""
 "Please don't use the term &ldquo;vendor&rdquo; to refer generally to anyone "
-"that develops or packages a software package.  Many programs are developed "
-"in order to sell copies, and their developers are therefore their vendors; "
-"this includes some free software packages.  However, many programs are "
-"developed by volunteers or organizations which do not intend to sell "
-"copies.  These developers are not vendors.  Likewise, only some of the "
-"packagers of GNU/Linux distributions are vendors."
+"that develops or packages software.  Many programs are developed in order to "
+"sell copies, and their developers are therefore their vendors; this even "
+"includes some free software packages.  However, many programs are developed "
+"by volunteers or organizations which do not intend to sell copies.  These "
+"developers are not vendors.  Likewise, only some of the packagers of "
+"GNU/Linux distributions are vendors."
 msgstr ""
 
 # type: Content of: <h4>

Index: philosophy/po/words-to-avoid.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.sr.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/po/words-to-avoid.sr.po  2 Aug 2009 20:29:49 -0000       1.18
+++ philosophy/po/words-to-avoid.sr.po  28 Sep 2009 20:26:09 -0000      1.19
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2009-08-02 16:26-0300\n"
+"POT-Creation-Date: 2009-09-28 16:25-0300\n"
 "PO-Revision-Date: 2009-01-08 17:23+0200\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -15,8 +15,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
+#, fuzzy
+#| msgid ""
+#| "Confusing Words and Phrases that are Worth Avoiding - GNU Project - Free "
+#| "Software Foundation (FSF)"
 msgid ""
-"Confusing Words and Phrases that are Worth Avoiding - GNU Project - Free "
+"Confusing Words and Phrases That Are Worth Avoiding - GNU Project - Free "
 "Software Foundation (FSF)"
 msgstr ""
 "Збуњујуће речи и синтагме које би требало 
избегавати — Пројекат ГНУ — "
@@ -24,15 +28,20 @@
 
 # type: Content of: <h2>
 #, fuzzy
-msgid "Some Confusing or Loaded Words and Phrases to Avoid (or use with care)"
+msgid "Some Confusing or Loaded Words and Phrases to Avoid (or Use with Care)"
 msgstr "Неке од збуњујућих или сувишних речи и 
синтагми које вреди избегавати"
 
 # type: Content of: <p>
-msgid ""
-"There are a number of words and phrases which we recommend avoiding, or "
-"avoiding in certain contexts and usages.  The reason is either that they are "
-"ambiguous, or that they imply an opinion that we hope you may not entirely "
-"agree with."
+#, fuzzy
+#| msgid ""
+#| "There are a number of words and phrases which we recommend avoiding, or "
+#| "avoiding in certain contexts and usages.  The reason is either that they "
+#| "are ambiguous, or that they imply an opinion that we hope you may not "
+#| "entirely agree with."
+msgid ""
+"There are a number of words and phrases that we recommend avoiding, or "
+"avoiding in certain contexts and usages.  Some are ambiguous or misleading; "
+"others presuppose a viewpoint that we hope you disagree with."
 msgstr ""
 "Постоје речи и синтагме које 
препоручујемо да избегавате, или их 
избегавате "
 "у одређеним контекстима и приликама. Р
азлог за ово је што су оне или "
@@ -131,12 +140,19 @@
 msgstr "„У стилу БСД-а“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The expression &ldquo;BSD-style license&rdquo; leads to confusion because "
+#| "it <a href=\"/philosophy/bsd.html\">lumps together licenses that have "
+#| "important differences</a>.  For instance, the original BSD license with "
+#| "the advertising clause is incompatible with the GNU GPL, but the revised "
+#| "BSD license is compatible with the GPL."
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/philosophy/bsd.html\">lumps together licenses that have important "
 "differences</a>.  For instance, the original BSD license with the "
-"advertising clause is incompatible with the GNU GPL, but the revised BSD "
-"license is compatible with the GPL."
+"advertising clause is incompatible with the GNU General Public License, but "
+"the revised BSD license is compatible with the GPL."
 msgstr ""
 "Израз „у стилу БСД-а“ доводи до забуне 
јер <a href=\"/philosophy/bsd.html"
 "\">изједначава лиценце које садрже битне 
разлике</a>. На пример, изворна "
@@ -158,14 +174,25 @@
 msgstr "„Затворено“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Describing non-free software as &ldquo;closed&rdquo; clearly refers to "
+#| "the term &ldquo;open source&rdquo;.  In the free software movement, <a "
+#| "href=\"/philosophy/open-source-misses-the-point.html\"> we want to avoid "
+#| "being confused with the more recent open source movement</a>, so we are "
+#| "careful to avoid usage that would encourage people to lump us in with "
+#| "them.  Therefore, we avoid describing non-free software as &ldquo;"
+#| "closed&rdquo;.  We call it &ldquo;non-free&rdquo; or <a href=\"/"
+#| "philosophy/categories.html#ProprietarySoftware\"> &ldquo;"
+#| "proprietary&rdquo;</a>."
 msgid ""
-"Describing non-free software as &ldquo;closed&rdquo; clearly refers to the "
+"Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source&rdquo;.  In the free software movement, <a href=\"/"
-"philosophy/open-source-misses-the-point.html\"> we want to avoid being "
-"confused with the more recent open source movement</a>, so we are careful to "
-"avoid usage that would encourage people to lump us in with them.  Therefore, "
-"we avoid describing non-free software as &ldquo;closed&rdquo;.  We call it "
-"&ldquo;non-free&rdquo; or <a href=\"/philosophy/categories."
+"philosophy/open-source-misses-the-point.html\"> we do not want to be "
+"confused with the open source camp</a>, so we are careful to avoid saying "
+"things that would encourage people to lump us in with them.  For instance, "
+"we avoid describing nonfree software as &ldquo;closed&rdquo;.  We call it "
+"&ldquo;nonfree&rdquo; or <a href=\"/philosophy/categories."
 "html#ProprietarySoftware\"> &ldquo;proprietary&rdquo;</a>."
 msgstr ""
 "Називање неслободног софтвера 
„затвореним“ јасно упућује на израз 
„отворени "
@@ -184,29 +211,29 @@
 
 # type: Content of: <p>
 msgid ""
-"The term &ldquo;cloud computing&rdquo; is marketing buzzword with no clear "
+"The term &ldquo;cloud computing&rdquo; is a marketing buzzword with no clear "
 "meaning.  It is used for a range of different activities whose only common "
-"quality is that they use the Internet for something beyond transmitting "
-"files.  Thus, the term is a nexus of confusion.  If you try to use it in "
-"your thinking, your thinking will be vague."
+"characteristic is that they use the Internet for something beyond "
+"transmitting files.  Thus, the term is a nexus of confusion.  If you base "
+"your thinking on it, your thinking will be vague."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"When thinking about or responding to a statement someone else made using "
+"When thinking about or responding to a statement someone else has made using "
 "this term, the first step is to clarify the topic.  Which kind of activity "
-"is the statement really about, and what is a good term for that activity? "
-"Pressing yourself (or the person who made the statement) to clarify the "
-"topic will direct the discussion towards a useful conclusion."
+"is the statement really about, and what is a good, clear term for that "
+"activity? Once the topic is clear, the discussion can head for a useful "
+"conclusion."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a href="
 "\"http://news.cnet.com/8301-13953_3-10052188-80.html\";> noted the vacuity of "
-"the term &ldquo;cloud computing&rdquo;</a>.  He decided to use the term "
+"the term &ldquo;cloud computing.&rdquo;</a> He decided to use the term "
 "anyway because, as a proprietary software developer, he isn't motivated by "
-"the same ideals we are."
+"the same ideals as we are."
 msgstr ""
 
 # type: Content of: <h4>
@@ -214,20 +241,33 @@
 msgstr "„Комерцијално“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;non-"
+#| "free.&rdquo; That confuses two entirely different issues."
 msgid ""
-"Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;non-free."
+"Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;nonfree."
 "&rdquo; That confuses two entirely different issues."
 msgstr ""
 "Молимо вас да не користите реч 
„комерцијално“ као синоним за 
„неслободно“. "
 "Тиме се мешају два потпуно различита 
питања."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is commercial if it is developed as a business activity.  A "
+#| "commercial program can be free or non-free, depending on its license.  "
+#| "Likewise, a program developed by a school or an individual can be free or "
+#| "non-free, depending on its license.  The two questions, what sort of "
+#| "entity developed the program and what freedom its users have, are "
+#| "independent."
 msgid ""
 "A program is commercial if it is developed as a business activity.  A "
-"commercial program can be free or non-free, depending on its license.  "
-"Likewise, a program developed by a school or an individual can be free or "
-"non-free, depending on its license.  The two questions, what sort of entity "
-"developed the program and what freedom its users have, are independent."
+"commercial program can be free or nonfree, depending on its manner of "
+"distribution.  Likewise, a program developed by a school or an individual "
+"can be free or nonfree, depending on its manner of distribution.  The two "
+"questions&mdash;what sort of entity developed the program and what freedom "
+"its users have&mdash;are independent."
 msgstr ""
 "Програм је комерцијалан ако је његов 
развој пословна активност. Комерцијални "
 "програм може да буде слободан или 
неслободан, у зависности од његове "
@@ -250,10 +290,18 @@
 "софтвер."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Free commercial software is a contribution to our community, so we should "
+#| "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
+#| "&ldquo;non-free&rdquo; will tend to think that the &ldquo;free "
+#| "commercial&rdquo; combination is self-contradictory, and dismiss the "
+#| "possibility.  Let's be careful not to use the word &ldquo;"
+#| "commercial&rdquo; in that way."
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
-"&ldquo;non-free&rdquo; will tend to think that the &ldquo;free "
+"&ldquo;nonfree&rdquo; will tend to think that the &ldquo;free "
 "commercial&rdquo; combination is self-contradictory, and dismiss the "
 "possibility.  Let's be careful not to use the word &ldquo;commercial&rdquo; "
 "in that way."
@@ -289,20 +337,36 @@
 msgstr "„Потрошач“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;consumer&rdquo;, when used to refer to computer users, "
+#| "carries unfortunate assumptions."
 msgid ""
-"The term &ldquo;consumer&rdquo;, when used to refer to computer users, "
-"carries unfortunate assumptions."
+"The term &ldquo;consumer,&rdquo; when used to refer to computer users, is "
+"loaded with assumptions we should reject."
 msgstr ""
 "Израз „потрошач“ носи са собом несрећне 
претпоставке када се употребљава за "
 "кориснике рачунара."
 
 # type: Content of: <p>
 msgid ""
-"Economic theory uses the terms &ldquo;producer&rdquo; and &ldquo;"
-"consumer&rdquo;.  In that context these words are appropriate.  But "
-"describing the users of software as &ldquo;consumers&rdquo; presumes a "
-"narrow role for them.  It treats them like cattle that passively graze on "
-"what others make available to them."
+"The terms &ldquo;producer&rdquo; and &ldquo;consumer&rdquo; come from "
+"economic theory, and presuppose the assumptions and narrow prespective of "
+"economic theory.  That warps your thinking."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Economic theory uses the terms &ldquo;producer&rdquo; and &ldquo;"
+#| "consumer&rdquo;.  In that context these words are appropriate.  But "
+#| "describing the users of software as &ldquo;consumers&rdquo; presumes a "
+#| "narrow role for them.  It treats them like cattle that passively graze on "
+#| "what others make available to them."
+msgid ""
+"In addition, describing the users of software as &ldquo;consumers&rdquo; "
+"presumes a narrow role for them.  It treats them like cattle that passively "
+"graze on what others make available to them."
 msgstr ""
 "У економској теорији се користе изрази 
„произвођач“ и „потрошач“. У том "
 "контексту ове речи су подесне. Али 
називање корисника софтвера 
„потрошачима“ "
@@ -324,9 +388,14 @@
 "би онда покретачи те уредбе били 
забринути?"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The narrow economic vision of users as &ldquo;consumers&rdquo; tends to "
+#| "go hand in hand with the idea that published works are &ldquo;"
+#| "content&rdquo;."
 msgid ""
-"The narrow economic vision of users as &ldquo;consumers&rdquo; tends to go "
-"hand in hand with the idea that published works are &ldquo;content&rdquo;."
+"The narrow economic conception of users as &ldquo;consumers&rdquo; tends to "
+"go hand in hand with the idea that published works are &ldquo;content.&rdquo;"
 msgstr ""
 "Уска економска визија корисника као 
„потрошача“ води ка идеји да су "
 "објављена дела „садржај“."
@@ -349,11 +418,10 @@
 #, fuzzy
 msgid ""
 "If you want to describe a feeling of comfort and satisfaction, by all means "
-"say you are &ldquo;content&rdquo;, but using it as a noun to describe "
-"written and other works of authorship is worth avoiding.  That usage adopts "
-"a specific attitude towards those works: that they are an interchangeable "
-"commodity whose purpose is to fill a box and make money.  In effect, it "
-"disparages the works themselves."
+"say you are &ldquo;content,&rdquo; but using the word as a noun to describe "
+"written and other works of authorship adopts an attitude you might rather "
+"avoid.  It regards these works as a commodity whose purpose is to fill a box "
+"and make money.  In effect, it disparages the works themselves."
 msgstr ""
 "Ако хоћете да опишете осећање удобности и 
задовољства, свакако реците да сте "
 "„задовољни“<sup><a href=\"#TransNote1\">[1]</a></sup>, али 
избегаваје "
@@ -366,13 +434,14 @@
 #, fuzzy
 msgid ""
 "Those who use this term are often the publishers that push for increased "
-"copyright power in the name of the authors (&ldquo;creators&rdquo;, as they "
+"copyright power in the name of the authors (&ldquo;creators,&rdquo; as they "
 "say) of the works.  The term &ldquo;content&rdquo; reveals their real "
 "attitude towards these works and their authors.  (See <a href=\"http://";
 "archive.salon.com/tech/feature/2000/06/14/love/print.html\">Courtney Love's "
 "open letter to Steve Case</a> and search for &ldquo;content provider&rdquo; "
 "in that page.  Alas, Ms. Love is unaware that the term &ldquo;intellectual "
-"property&rdquo; is also <a href=\"#IntellectualProperty\"> misleading</a>.)"
+"property&rdquo; is also <a href=\"#IntellectualProperty\"> biased and "
+"confusing</a>.)"
 msgstr ""
 "Овај израз често користе издавачи који на 
силу желе да увећају моћ ауторских "
 "права, а све у име аутора (или 
„стваралаца“, како их они називају) дела. "
@@ -397,11 +466,11 @@
 #, fuzzy
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
-"&ldquo;Content&rdquo; means &ldquo;some sort of information&rdquo;, and "
+"&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
 "&ldquo;management&rdquo; in this context means &ldquo;doing something with "
-"it&rdquo;.  So a &ldquo;content management system&rdquo; is a system for "
-"doing something to some sort of information.  That description fits most "
-"programs."
+"it.&rdquo; So a &ldquo;content management system&rdquo; is a system for "
+"doing something to some sort of information.  Nearly all programs fit that "
+"description."
 msgstr ""
 "Израз „управљање садржајем“ (енг. 
<em>„content management“</em>) је победник "
 "на такмичењу у бесмислености. Ниједна реч 
нема конкретно значење: „садржај“ "
@@ -414,7 +483,7 @@
 # type: Content of: <p>
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
-"website.  For that, we recommend the term &ldquo;website revision "
+"Web site.  For that, we recommend the term &ldquo;Web site revision "
 "system&rdquo; (WRS)."
 msgstr ""
 
@@ -423,12 +492,21 @@
 msgstr "„Творац“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
+#| "them to a deity (&ldquo;the creator&rdquo;).  The term is used by "
+#| "publishers to elevate the authors' moral stature above that of ordinary "
+#| "people, to justify increased copyright power that the publishers can "
+#| "exercise in the name of the authors.  We recommend saying &ldquo;"
+#| "author&rdquo; instead.  However, in many cases &ldquo;copyright "
+#| "holder&rdquo; is what you really mean."
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
-"to elevate the authors' moral stature above that of ordinary people, to "
-"justify increased copyright power that the publishers can exercise in the "
-"name of the authors.  We recommend saying &ldquo;author&rdquo; instead.  "
+"to elevate authors' moral standing above that of ordinary people in order to "
+"justify giving them increased copyright power, which the publishers can then "
+"exercise in their name.  We recommend saying &ldquo;author&rdquo; instead.  "
 "However, in many cases &ldquo;copyright holder&rdquo; is what you really "
 "mean."
 msgstr ""
@@ -442,10 +520,20 @@
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr "„Дигитална роба“"
 
+# type: Content of: outside any tag (error?)
+msgid "o"
+msgstr ""
+
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;digital goods&rdquo; as applied to copies of works of "
+#| "authorship forces them into the thought mold of physical goods &mdash; "
+#| "which cannot be copied, and which therefore have to be manufactured and "
+#| "sold."
 msgid ""
-"The term &ldquo;digital goods&rdquo; as applied to copies of works of "
-"authorship forces them into the thought mold of physical goods &mdash; which "
+"The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
+"authorship, erroneously identifies them with physical goods&mdash;which "
 "cannot be copied, and which therefore have to be manufactured and sold."
 msgstr ""
 "Израз „дигитална роба“ примењен на 
примерке ауторских дела их насилно смешта "
@@ -471,10 +559,14 @@
 "ограничења намеће, док занемарује 
гледиште већине којој се она намећу."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Good alternatives include &ldquo;Digital Restrictions Management&rdquo;, "
+#| "&ldquo;Digital Restrictions Malware&rdquo;, and &ldquo;digital "
+#| "handcuffs&rdquo;."
 msgid ""
-"Good alternatives include &ldquo;Digital Restrictions Management&rdquo;, "
-"&ldquo;Digital Restrictions Malware&rdquo;, and &ldquo;digital "
-"handcuffs&rdquo;."
+"Good alternatives include &ldquo;Digital Restrictions Management,&rdquo; and "
+"&ldquo;digital handcuffs.&rdquo;"
 msgstr ""
 "Добре алтернативе су „управљање 
дигиталним препрекама“, „уништавање "
 "дигиталних права“ и „дигиталне лисице“."
@@ -487,12 +579,12 @@
 #, fuzzy
 msgid ""
 "It is a mistake to describe the free software community, or any human "
-"community, as an &ldquo;ecosystem&rdquo;, because that word implies the "
+"community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
 "absence of (1) intention and (2) ethics.  In an ecosystem, species evolve "
-"according to their fitness.  If something is weak, it goes extinct, and "
-"that's neither right nor wrong, merely an ecological phenomenon.  The term "
-"&ldquo;ecosystem&rdquo; implicitly suggests a passive attitude: &ldquo;Don't "
-"ask how things <em>should</em> be, just watch what happens to them&rdquo;."
+"according to their fitness: if a species is weak and goes extinct, that's "
+"neither right nor wrong, merely an ecological phenomenon.  The term &ldquo;"
+"ecosystem&rdquo; implicitly suggests a attitude of passive observation: "
+"don't ask how what <em>should</em> happen, just study what does happen."
 msgstr ""
 "Погрешно је описивати нашу заједницу (или 
било коју заједницу) као "
 "„екосистем“, јер та реч подразумева 
одсуство (1) намере и (2) етике. У "
@@ -508,7 +600,7 @@
 "and have ideas of ethical responsibility, can decide to preserve things "
 "that, on their own, would tend to vanish&mdash;such as civil society, "
 "democracy, human rights, peace, public health, clean air and water, "
-"endangered species, traditional arts, &hellip; and computer users' freedom."
+"endangered species, traditional arts&hellip;and computer users' freedom."
 msgstr ""
 "Насупрот овоме, бића која су етички 
одговорна могу да одлуче да сачувају "
 "нешто чему прети нестајање – на пример, 
грађанско друштво, демократију, "
@@ -552,16 +644,25 @@
 "софтвер“ (енгл. <em>as free software</em>)."
 
 # type: Content of: <h4>
-msgid "&ldquo;Freely Available&rdquo;"
+#, fuzzy
+#| msgid "&ldquo;Freely Available&rdquo;"
+msgid "&ldquo;Freely available&rdquo;"
 msgstr "„Слободно доступан (енгл. <em>freely 
available</em>)“"
 
 # type: Content of: <p>
-msgid ""
-"Don't use &ldquo;freely available&rdquo; as a synonym for &ldquo;free "
-"software.&rdquo; They are not equivalent.  &ldquo;Freely available&rdquo; "
-"means that anyone can easily get a copy.  &ldquo;Free software&rdquo; is "
-"defined in terms of the freedom of users that have a copy.  These are "
-"answers to different questions."
+#, fuzzy
+#| msgid ""
+#| "Don't use &ldquo;freely available&rdquo; as a synonym for &ldquo;free "
+#| "software.&rdquo; They are not equivalent.  &ldquo;Freely available&rdquo; "
+#| "means that anyone can easily get a copy.  &ldquo;Free software&rdquo; is "
+#| "defined in terms of the freedom of users that have a copy.  These are "
+#| "answers to different questions."
+msgid ""
+"Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;"
+"free software.&rdquo; The terms are not equivalent.  Software is &ldquo;"
+"freely available&rdquo; if anyone can easily get a copy.  &ldquo;Free "
+"software&rdquo; is defined in terms of the freedom of users that have a copy "
+"of it.  These are answers to different questions."
 msgstr ""
 "Немојте користити израз „слободно 
доступан“ (енгл. <em>freely available</"
 "em>) као синоним за „слободни софтвер“. Та 
два израза нису еквивалентна. "
@@ -586,11 +687,18 @@
 "договорено значење."
 
 # type: Content of: <p>
-msgid ""
-"Also, if you use other languages than English, please try to avoid borrowing "
-"English terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; "
-"It is better to translate the term &ldquo;free software&rdquo; into <a href="
-"\"/philosophy/fs-translations.html\">your language</a>."
+#, fuzzy
+#| msgid ""
+#| "Also, if you use other languages than English, please try to avoid "
+#| "borrowing English terms such as &ldquo;free software&rdquo; or &ldquo;"
+#| "freeware.&rdquo; It is better to translate the term &ldquo;free "
+#| "software&rdquo; into <a href=\"/philosophy/fs-translations.html\">your "
+#| "language</a>."
+msgid ""
+"When using languages other than English, please avoid borrowing English "
+"terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; It is "
+"better to translate the term &ldquo;free software&rdquo; into <a href=\"/"
+"philosophy/fs-translations.html\">your language</a>."
 msgstr ""
 "Такође, уколико говорите неенглески 
језик, молимо вас да покушате да не "
 "позајмљујете енглеске речи као што је 
<em>free software</em> или "
@@ -618,11 +726,19 @@
 msgstr "„Софтвер на поклон (енгл. <em>give away</em>)“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
+#| "distribute a program as free software.&rdquo; It has the same problem as "
+#| "&ldquo;for free&rdquo;: it implies the issue is price, not freedom.  One "
+#| "way to avoid the confusion is to say &ldquo;release as free software."
+#| "&rdquo;"
 msgid ""
 "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
-"distribute a program as free software.&rdquo; It has the same problem as "
-"&ldquo;for free&rdquo;: it implies the issue is price, not freedom.  One way "
-"to avoid the confusion is to say &ldquo;release as free software.&rdquo;"
+"distribute a program as free software.&rdquo; This locution has the same "
+"problem as &ldquo;for free&rdquo;: it implies the issue is price, not "
+"freedom.  One way to avoid the confusion is to say &ldquo;release as free "
+"software.&rdquo;"
 msgstr ""
 "Варљиво је користити израз „на поклон“ у 
значењу „расподељивати програм као "
 "слободни софтвер“. Тај израз ствара исте 
проблеме као и „бесплатно“: наводи "
@@ -634,14 +750,23 @@
 msgstr "Хакер"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+#| "html\"> enjoys playful cleverness</a>&mdash;not necessarily with "
+#| "computers.  The programmers in the old <abbr title=\"Massachusetts "
+#| "Institute of Technology\">MIT</abbr> free software community of the 60s "
+#| "and 70s referred to themselves as hackers.  Around 1980, journalists who "
+#| "discovered the hacker community mistakenly took the term to mean &ldquo;"
+#| "security breaker&rdquo;."
 msgid ""
 "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
 "html\"> enjoys playful cleverness</a>&mdash;not necessarily with computers.  "
 "The programmers in the old <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr> free software community of the 60s and 70s referred "
 "to themselves as hackers.  Around 1980, journalists who discovered the "
-"hacker community mistakenly took the term to mean &ldquo;security "
-"breaker&rdquo;."
+"hacker community mistakenly took the term to mean &ldquo;security breaker."
+"&rdquo;"
 msgstr ""
 "Хакер је свако ко <a 
href=\"http://stallman.org/articles/on-hacking.html";
 "\">ужива у разиграној бистрини</a>, не 
обавезно укључујући и рачунаре. "
@@ -651,9 +776,13 @@
 "хакера су погрешно тим називом означили 
„разбијаче безбедности“."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please don't spread this mistake.  People who break security are &ldquo;"
+#| "crackers&rdquo;."
 msgid ""
 "Please don't spread this mistake.  People who break security are &ldquo;"
-"crackers&rdquo;."
+"crackers.&rdquo;"
 msgstr ""
 "Молимо вас да не увећавате ову грешку. 
Људи који разбијају безбедност су "
 "„кракери“ (енгл. <em>crackers</em>)."
@@ -663,12 +792,20 @@
 msgstr "„Интелектуална својина“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
+#| "property&rdquo;&mdash;a term that also includes patents, trademarks, and "
+#| "other more obscure areas of law.  These laws have so little in common, "
+#| "and differ so much, that it is ill-advised to generalize about them.  It "
+#| "is best to talk specifically about &ldquo;copyright,&rdquo; or about "
+#| "&ldquo;patents,&rdquo; or about &ldquo;trademarks.&rdquo;"
 msgid ""
 "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
-"property&rdquo;&mdash;a term that also includes patents, trademarks, and "
-"other more obscure areas of law.  These laws have so little in common, and "
-"differ so much, that it is ill-advised to generalize about them.  It is best "
-"to talk specifically about &ldquo;copyright,&rdquo; or about &ldquo;patents,"
+"property&rdquo;&mdash;a term also applied to patents, trademarks, and other "
+"more obscure areas of law.  These laws have so little in common, and differ "
+"so much, that it is ill-advised to generalize about them.  It is best to "
+"talk specifically about &ldquo;copyright,&rdquo; or about &ldquo;patents,"
 "&rdquo; or about &ldquo;trademarks.&rdquo;"
 msgstr ""
 "Издавачи и адвокати воле да називају 
ауторска права „интелектуалном "
@@ -678,11 +815,17 @@
 "говорити засебно о „ауторским правима“, 
„патентима“ или „робним маркама“."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;intellectual property&rdquo; carries a hidden "
+#| "assumption&mdash;that the way to think about all these disparate issues "
+#| "is based on an analogy with physical objects, and our ideas of physical "
+#| "property."
 msgid ""
 "The term &ldquo;intellectual property&rdquo; carries a hidden "
 "assumption&mdash;that the way to think about all these disparate issues is "
-"based on an analogy with physical objects, and our ideas of physical "
-"property."
+"based on an analogy with physical objects, and our conception of them as "
+"physical property."
 msgstr ""
 "Израз „интелектуална својина“ носи са 
собом скривену претпоставку — да је "
 "најприроднији начин да се размишља свим 
овим различитим питањима заснован на "
@@ -699,20 +842,30 @@
 "скоро без икаквог напора, док са 
материјалним стварима то није могуће 
чинити."
 
 # type: Content of: <p>
-msgid ""
-"To avoid the bias and confusion of this term, it is best to make a firm "
-"decision <a href=\"/philosophy/not-ipr.html\"> not to speak or even think in "
-"terms of &ldquo;intellectual property&rdquo;</a>."
+#, fuzzy
+#| msgid ""
+#| "To avoid the bias and confusion of this term, it is best to make a firm "
+#| "decision <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
+#| "in terms of &ldquo;intellectual property&rdquo;</a>."
+msgid ""
+"To avoid spreading unnecessary bias and confusion, it is best to adopt a "
+"firm policy <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
+"in terms of &ldquo;intellectual property&rdquo;</a>."
 msgstr ""
 "Да бисмо избегли двосмисленост и забуну 
коју проузрокује овај израз, најбоље "
 "је чврсто одлучити да <a 
href=\"/philosophy/not-ipr.sr.html\">не говоримо "
 "или чак и мислимо у категоријама 
„интелектуалне својине“</a>."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
+#| "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make "
+#| "WIPO embarrassed</a>."
 msgid ""
 "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
-"philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make "
-"WIPO embarrassed</a>."
+"philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make the "
+"World &ldquo;Intellectual Property&rdquo; Organization embarrassed</a>."
 msgstr ""
 "Лицемерје називања ових моћи „правима“ <a 
href=\"/philosophy/wipo-"
 "PublicAwarenessOfCopyright-2002.html\">почиње да брука СОИС 
(енг. <em>WIPO</"
@@ -726,10 +879,10 @@
 #, fuzzy
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
-"&mdash;a common combination of software to use on a web server, except that "
-"&ldquo;Linux&rdquo; really refers to the GNU/Linux system.  So instead of "
-"&ldquo;LAMP&rdquo; it should be &ldquo;GLAMP&rdquo;: &ldquo;GNU, Linux, "
-"Apache, MySQL and PHP&rdquo;."
+"&mdash;a common combination of software to use on a Web server, except that "
+"&ldquo;Linux&rdquo; in this context really refers to the GNU/Linux system.  "
+"So instead of &ldquo;LAMP&rdquo; it should be &ldquo;GLAMP&rdquo;: &ldquo;"
+"GNU, Linux, Apache, MySQL and PHP.&rdquo;"
 msgstr ""
 "„ЛАМП“ је скраћеница која значи „Линукс, 
Апаш, Мајескуел (енг. <em>MySQL</"
 "em>) и Пехапе“. То је честа комбинација 
софтвера на веб серверима. Проблем "
@@ -742,13 +895,21 @@
 msgstr "Линукс систем"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Linux is the name of the kernel that Linus Torvalds developed starting in "
+#| "1991.  The operating system in which Linux is used is basically GNU with "
+#| "Linux added.  To call the whole system &ldquo;Linux&rdquo; is both unfair "
+#| "and confusing.  Please call the complete system <a href=\"/gnu/linux-and-"
+#| "gnu.html\"> GNU/Linux</a>, both to give the GNU Project credit and "
+#| "distinguish the whole system from the kernel alone."
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
 "Linux added.  To call the whole system &ldquo;Linux&rdquo; is both unfair "
 "and confusing.  Please call the complete system <a href=\"/gnu/linux-and-gnu."
-"html\"> GNU/Linux</a>, both to give the GNU Project credit and distinguish "
-"the whole system from the kernel alone."
+"html\"> GNU/Linux</a>, both to give the GNU Project credit and to "
+"distinguish the whole system from the kernel alone."
 msgstr ""
 "Линукс је назив језгра које развија Линус 
Торвалдс од 1991. Оперативни "
 "систем у којем се користи Линукс је у 
основи ГНУ са доданим Линуксом. "
@@ -762,31 +923,49 @@
 msgstr "„Тржиште“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "It is misleading to describe the users of free software, or the software "
+#| "users in general, as a &ldquo;market&rdquo;."
 msgid ""
 "It is misleading to describe the users of free software, or the software "
-"users in general, as a &ldquo;market&rdquo;."
+"users in general, as a &ldquo;market.&rdquo;"
 msgstr ""
 "Називање корисника слободног софтвера, 
или корисника софтвера у општем "
 "смислу, „тржиштем“ наводи на погрешан 
закључак."
 
 # type: Content of: <p>
-msgid ""
-"This is not to say we're against markets.  If you have a free software "
-"support business, then you have clients, and you trade with them in a "
-"market.  As long as you respect their freedom, we wish you success in your "
-"market."
+#, fuzzy
+#| msgid ""
+#| "This is not to say we're against markets.  If you have a free software "
+#| "support business, then you have clients, and you trade with them in a "
+#| "market.  As long as you respect their freedom, we wish you success in "
+#| "your market."
+msgid ""
+"This is not to say there is no room for markets in the free software "
+"community.  If you have a free software support business, then you have "
+"clients, and you trade with them in a market.  As long as you respect their "
+"freedom, we wish you success in your market."
 msgstr ""
 "Ми нисмо против тржишта. Ако слободни 
софтвер подржава фирме, онда постоје и "
 "клијенти са којима тргујете на тржишту. 
Све док поштујете њихову слободу, "
 "желимо вам успех у вашем пословању."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "But the free software movement is a social movement, not a business, and "
+#| "the success it aims for is not a market success.  We are trying to serve "
+#| "the public by giving it freedom&mdash;not competing to take them away "
+#| "from a rival.  To equate this campaign for freedom to a business' "
+#| "campaign for mere success is to diminish the significance of freedom."
 msgid ""
 "But the free software movement is a social movement, not a business, and the "
 "success it aims for is not a market success.  We are trying to serve the "
-"public by giving it freedom&mdash;not competing to take them away from a "
-"rival.  To equate this campaign for freedom to a business' campaign for mere "
-"success is to diminish the significance of freedom."
+"public by giving it freedom&mdash;not competing to draw business away from a "
+"rival.  To equate this campaign for freedom to a business' efforts for mere "
+"success is to deny the importance of freedom and legitimize proprietary "
+"software."
 msgstr ""
 "Али покрет за слободни софтвер је 
друштвени покрет, а не фирма, и успех коме "
 "он тежи није тржишни успех. Ми покушавамо 
да помогнемо јавности "
@@ -799,15 +978,26 @@
 msgstr "„МП3 плејер“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In the late 1990's it became feasible to make portable, solid-state "
+#| "digital audio players. Most support the patented MP3 codec, but not all.  "
+#| "Some support the patent-free audio codecs Ogg Vorbis and FLAC, and may "
+#| "not even support MP3-encoded files at all, precisely to avoid the "
+#| "patents.  To call such players &ldquo;MP3 players&rdquo; is not only "
+#| "confusing, it also puts MP3 in an undeserved position of privilege which "
+#| "helps the patent holders continue to attack our community.  We suggest "
+#| "the terms &ldquo;digital audio player&rdquo;, or simply &ldquo;audio "
+#| "player&rdquo; if context permits."
 msgid ""
 "In the late 1990's it became feasible to make portable, solid-state digital "
 "audio players. Most support the patented MP3 codec, but not all.  Some "
 "support the patent-free audio codecs Ogg Vorbis and FLAC, and may not even "
-"support MP3-encoded files at all, precisely to avoid the patents.  To call "
+"support MP3-encoded files at all, precisely to avoid these patents.  To call "
 "such players &ldquo;MP3 players&rdquo; is not only confusing, it also puts "
-"MP3 in an undeserved position of privilege which helps the patent holders "
-"continue to attack our community.  We suggest the terms &ldquo;digital audio "
-"player&rdquo;, or simply &ldquo;audio player&rdquo; if context permits."
+"MP3 in an undeserved position of privilege which encourages people to "
+"continue using that vulnerable format.  We suggest the terms &ldquo;digital "
+"audio player,&rdquo; or simply &ldquo;audio player&rdquo; if context permits."
 msgstr ""
 "Касних деведесетих је постало изводљиво 
правити преносиве дигиталне звучне "
 "уређаје за репродукцију музике – плејере. 
Већина тих уређаја подржава "
@@ -825,14 +1015,24 @@
 msgstr "„Отворено“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open "
+#| "source&rdquo; as a substitute for &ldquo;free software&rdquo;.  They "
+#| "refer to a <a href=\"/philosophy/open-source-misses-the-point.html\"> "
+#| "different position</a> based on different values.  Free software is a "
+#| "political movement; open source is a development model.  When referring "
+#| "to the open source position, using its name is appropriate; but please "
+#| "don't label us or our work with its slogan&mdash;that leads people to "
+#| "think we share those views."
 msgid ""
 "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open source&rdquo; "
-"as a substitute for &ldquo;free software&rdquo;.  They refer to a <a href=\"/"
-"philosophy/open-source-misses-the-point.html\"> different position</a> based "
-"on different values.  Free software is a political movement; open source is "
-"a development model.  When referring to the open source position, using its "
-"name is appropriate; but please don't label us or our work with its "
-"slogan&mdash;that leads people to think we share those views."
+"as a substitute for &ldquo;free software&rdquo;.  Those terms refer to a <a "
+"href=\"/philosophy/open-source-misses-the-point.html\"> different position</"
+"a> based on different values.  Free software is a political movement; open "
+"source is a development model.  When referring to the open source position, "
+"using its name is appropriate; but please use it to label us or our "
+"work&mdash;that leads people to think we share those views."
 msgstr ""
 "Молимо вас да избегавате речи „отворено“ 
или „отворени изворни код“ као "
 "замену за „слободни софтвер“. Оне се 
односе на <a href=\"/philosophy/open-"
@@ -876,11 +1076,19 @@
 msgstr "„Фотошоп“ (енгл. <em>Photoshop</em>)"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;Photoshop&rdquo; as a verb, meaning "
+#| "any kind of photo manipulation or image editing in general.  Photoshop is "
+#| "just the name of one particular proprietary image editing program, and "
+#| "there are plenty of free alternatives, such as <a href=\"/software/gimp"
+#| "\">GIMP</a>."
 msgid ""
-"Please avoid using the term &ldquo;Photoshop&rdquo; as a verb, meaning any "
+"Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any "
 "kind of photo manipulation or image editing in general.  Photoshop is just "
-"the name of one particular proprietary image editing program, and there are "
-"plenty of free alternatives, such as <a href=\"/software/gimp\">GIMP</a>."
+"the name of one particular image editing program, which should be avoided "
+"since it is proprietary.  There are plenty of free alternatives, such as <a "
+"href=\"/software/gimp\">GIMP</a>."
 msgstr ""
 "Молимо вас да избегавате употребу израза 
„Фотошоп“ у својству глагола<sup><a "
 "href=\"#TransNote7\">[7]</a></sup> који означава било 
какву врсту "
@@ -930,12 +1138,19 @@
 msgstr "„Пауер поинт“ (енгл. <em>PowerPoint</em>)"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
+#| "slide presentation.  PowerPoint is just the name of one particular "
+#| "proprietary program to make presentations, and there are plenty of free "
+#| "alternatives, such as the <tt>beamer</tt> class available with any (La)"
+#| "TeX distribution."
 msgid ""
 "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
 "slide presentation.  PowerPoint is just the name of one particular "
 "proprietary program to make presentations, and there are plenty of free "
-"alternatives, such as the <tt>beamer</tt> class available with any (La)TeX "
-"distribution."
+"alternatives, such as TeX's <tt>beamer</tt> class and OpenOffice.org's "
+"Impress."
 msgstr ""
 "Молимо вас да избегавате употребу израза 
„Пауер поинт“ да бисте означили "
 "било какву врсту презентација<sup><a 
href=\"#TransNote8\">[8]</a></sup>. "
@@ -961,31 +1176,50 @@
 "ауторским правима, пре него са 
корисницима које она ограничавају."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms "
+#| "instead.  For example, instead of &ldquo;Copyright protection lasts a "
+#| "very long time,&rdquo; you can say, &ldquo;Copyright lasts a very long "
+#| "time.&rdquo;"
 msgid ""
 "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms instead.  "
-"For example, instead of &ldquo;Copyright protection lasts a very long time,"
-"&rdquo; you can say, &ldquo;Copyright lasts a very long time.&rdquo;"
+"For example, instead of saying, &ldquo;Copyright protection lasts a very "
+"long time,&rdquo; you can say, &ldquo;Copyright lasts a very long time."
+"&rdquo;"
 msgstr ""
 "Лако је избећи израз „заштита“ и уместо 
њега користити неутралне изразе. На "
 "пример, уместо „Заштита ауторским 
правима траје дуго“ можете рећи „Ауторска 
"
 "права трају дуго“."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If you want to criticize copyright instead of supporting it, you can use "
+#| "the term &ldquo;copyright restrictions.&rdquo; So you can say, &ldquo;"
+#| "Copyright restrictions last a very long time.&rdquo;"
 msgid ""
 "If you want to criticize copyright instead of supporting it, you can use the "
-"term &ldquo;copyright restrictions.&rdquo; So you can say, &ldquo;Copyright "
-"restrictions last a very long time.&rdquo;"
+"term &ldquo;copyright restrictions.&rdquo; Thus, you can say, &ldquo;"
+"Copyright restrictions last a very long time.&rdquo;"
 msgstr ""
 "Ако желите да критикујете ауторска права 
уместо да их подржите, можете "
 "користити израз „ограничења наметнута 
ауторским правима“. Дакле, рећи ћете: "
 "„Ограничења наметнута ауторским правима 
трају дуго.“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;protection&rdquo; is also used to describe malicious "
+#| "features, as in &ldquo;copy protection&rdquo;, a feature that interferes "
+#| "with copying.  From the user's point of view, this is obstruction.  So we "
+#| "call that malicious feature &ldquo;copy obstruction&rdquo;."
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
-"features, as in &ldquo;copy protection&rdquo;, a feature that interferes "
-"with copying.  From the user's point of view, this is obstruction.  So we "
-"call that malicious feature &ldquo;copy obstruction&rdquo;."
+"features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
+"interferes with copying.  From the user's point of view, this is "
+"obstruction.  So we can call that malicious feature &ldquo;copy obstruction."
+"&rdquo;"
 msgstr ""
 "Израз „заштита“ се користи и за 
описивање злонамерних одлика, као што је то 
"
 "у изразу „заштита од копирања“, одлика 
која спречава копирање. Са корисничке "
@@ -993,7 +1227,9 @@
 "одлику „опструкцијом копирања“."
 
 # type: Content of: <h4>
-msgid "&ldquo;RAND (reasonable and non-discriminatory)&rdquo;"
+#, fuzzy
+#| msgid "&ldquo;RAND (reasonable and non-discriminatory)&rdquo;"
+msgid "&ldquo;RAND (reasonable and nondiscriminatory)&rdquo;"
 msgstr ""
 "„РИН — разумно и недискриминирајуће 
(енгл. <em>RAND — reasonable and non-"
 "discriminatory</em>)“"
@@ -1014,12 +1250,20 @@
 "discriminatory</em>)."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "That term white-washes a class of patent licenses that are normally "
+#| "neither reasonable nor non-discriminatory.  It is true that these "
+#| "licenses do not discriminate against any specific person, but they do "
+#| "discriminate against the free software community, and that makes them "
+#| "unreasonable.  Thus, half of &ldquo;RAND&rdquo; is deceptive and the "
+#| "other half is prejudiced."
 msgid ""
-"That term white-washes a class of patent licenses that are normally neither "
-"reasonable nor non-discriminatory.  It is true that these licenses do not "
+"That term whitewashes a class of patent licenses that are normally neither "
+"reasonable nor nondiscriminatory.  It is true that these licenses do not "
 "discriminate against any specific person, but they do discriminate against "
 "the free software community, and that makes them unreasonable.  Thus, half "
-"of &ldquo;RAND&rdquo; is deceptive and the other half is prejudiced."
+"of the term &ldquo;RAND&rdquo; is deceptive and the other half is prejudiced."
 msgstr ""
 "Тај израз заташкава врсту патентних 
лиценци које у суштини нису ни разумне "
 "ни недискриминирајуће. Тачно је да те 
лиценце не дискриминишу ниједну "
@@ -1028,12 +1272,21 @@
 "предрасуда."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Standards bodies should recognize that these licenses are discriminatory, "
+#| "and drop the use of the term &ldquo;reasonable and non-"
+#| "discriminatory&rdquo; or &ldquo;RAND&rdquo; to describe them.  Until they "
+#| "do so, other writers who do not wish to join in the white-washing would "
+#| "do well to reject that term.  To accept and use it merely because patent-"
+#| "wielding companies have made it widespread is to let those companies "
+#| "dictate the views you express."
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
-"and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
-"or &ldquo;RAND&rdquo; to describe them.  Until they do so, other writers who "
-"do not wish to join in the white-washing would do well to reject that term.  "
-"To accept and use it merely because patent-wielding companies have made it "
+"and drop the use of the term &ldquo;reasonable and nondiscriminatory&rdquo; "
+"or &ldquo;RAND&rdquo; to describe them.  Until they do so, writers who do "
+"not wish to join in the whitewashing would do well to reject that term.  To "
+"accept and use it merely because patent-wielding companies have made it "
 "widespread is to let those companies dictate the views you express."
 msgstr ""
 "Тела за стандарде би требало да схвате да 
су те лиценце дискриминирајуће, и "
@@ -1058,15 +1311,24 @@
 msgstr "„Продаја софтвера“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
+#| "exchanging a copy of a free program for a sum of money is &ldquo;"
+#| "selling&rdquo;; but people usually associate the term &ldquo;sell&rdquo; "
+#| "with proprietary restrictions on the subsequent use of the software.  You "
+#| "can be more precise, and prevent confusion, by saying either &ldquo;"
+#| "distributing copies of a program for a fee&rdquo; or &ldquo;imposing "
+#| "proprietary restrictions on the use of a program,&rdquo; depending on "
+#| "what you mean."
 msgid ""
 "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
-"exchanging a copy of a free program for a sum of money is &ldquo;"
-"selling&rdquo;; but people usually associate the term &ldquo;sell&rdquo; "
-"with proprietary restrictions on the subsequent use of the software.  You "
-"can be more precise, and prevent confusion, by saying either &ldquo;"
-"distributing copies of a program for a fee&rdquo; or &ldquo;imposing "
-"proprietary restrictions on the use of a program,&rdquo; depending on what "
-"you mean."
+"exchanging a copy of a free program for a sum of money is selling; but "
+"people usually associate the term &ldquo;sell&rdquo; with proprietary "
+"restrictions on the subsequent use of the software.  You can be more "
+"precise, and prevent confusion, by saying either &ldquo;distributing copies "
+"of a program for a fee&rdquo; or &ldquo;imposing proprietary restrictions on "
+"the use of a program,&rdquo; depending on what you mean."
 msgstr ""
 "Израз „продаја софтвера“ је двосмислен. 
Строго говорећи, размена примерка "
 "слободног програма у замену за своту 
новца јесте „продаја“, али људи обично "
@@ -1076,9 +1338,13 @@
 "употребу програма“, у зависности од тога 
шта хоћете да кажете."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
+#| "more discussion of this issue."
 msgid ""
-"See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for more "
-"discussion of this issue."
+"See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
+"further discussion of this issue."
 msgstr ""
 "Погледајте чланак <a 
href=\"/philosophy/selling.sr.html\">Продаја слободног "
 "софтвера</a> за даљу дискусију о овом 
проблему."
@@ -1088,12 +1354,21 @@
 msgstr "„Индустрија софтвера“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;software industry&rdquo; encourages people to imagine "
+#| "that software is always developed by a sort of factory and then delivered "
+#| "to consumers.  The free software community shows this is not the case.  "
+#| "Software businesses exist, and various businesses develop free and/or non-"
+#| "free software, but those that develop free software are not like "
+#| "factories."
 msgid ""
 "The term &ldquo;software industry&rdquo; encourages people to imagine that "
 "software is always developed by a sort of factory and then delivered to "
 "consumers.  The free software community shows this is not the case.  "
-"Software businesses exist, and various businesses develop free and/or non-"
-"free software, but those that develop free software are not like factories."
+"Software businesses exist, and various businesses develop free and/or "
+"nonfree software, but those that develop free software are not run like "
+"factories."
 msgstr ""
 "Израз „индустрија софтвера“ подстиче 
људе да замишљају како се софтвер увек "
 "развија у некој врсти фабрике и онда 
испоручује потрошачима. Заједница "
@@ -1102,14 +1377,23 @@
 "софтвер не подсећају на фабрике."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;industry&rdquo; is being used as propaganda by advocates "
+#| "of software patents.  They call software development &ldquo;"
+#| "industry&rdquo; and then try to argue that this means it should be "
+#| "subject to patent monopolies.  <a href=\"http://swpat.ffii.org/papers/";
+#| "europarl0309/\"> The European Parliament, rejecting software patents in "
+#| "2003, voted to define &ldquo;industry&rdquo; as &ldquo;automated "
+#| "production of material goods&rdquo;.</a>"
 msgid ""
 "The term &ldquo;industry&rdquo; is being used as propaganda by advocates of "
 "software patents.  They call software development &ldquo;industry&rdquo; and "
 "then try to argue that this means it should be subject to patent "
 "monopolies.  <a href=\"http://swpat.ffii.org/papers/europarl0309/\";> The "
 "European Parliament, rejecting software patents in 2003, voted to define "
-"&ldquo;industry&rdquo; as &ldquo;automated production of material "
-"goods&rdquo;.</a>"
+"&ldquo;industry&rdquo; as &ldquo;automated production of material goods."
+"&rdquo;</a>"
 msgstr ""
 "Израз „индустрија“ се користи као вид 
пропаганде бранилаца софтверских "
 "патената. Они називају изградњу софтвера 
„индустријом“ и онда покушавају да "
@@ -1135,10 +1419,16 @@
 "је вероватно погрешно."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "So it is pertinent to mention that the legal system&mdash;at least in the "
+#| "US&mdash;rejects the idea that copyright infringement is &ldquo;theft."
+#| "&rdquo; Copyright apologists are making an appeal to authority &hellip; "
+#| "and misrepresenting what authority says."
 msgid ""
 "So it is pertinent to mention that the legal system&mdash;at least in the "
 "US&mdash;rejects the idea that copyright infringement is &ldquo;theft."
-"&rdquo; Copyright apologists are making an appeal to authority &hellip; and "
+"&rdquo; Copyright apologists are making an appeal to authority&hellip;and "
 "misrepresenting what authority says."
 msgstr ""
 "Значајно је напоменути да правни систем 
(бар у САД) одбацује идеју да је "
@@ -1163,10 +1453,10 @@
 #, fuzzy
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;</"
-"a> is the proponents name for a scheme to redesign computers so that "
+"a> is the proponents' name for a scheme to redesign computers so that "
 "application developers can trust your computer to obey them instead of you.  "
-"For their point of view, it is &ldquo;trusted&rdquo;.  From your point of "
-"view, it is &ldquo;treacherous&rdquo;."
+"For their point of view, it is &ldquo;trusted&rdquo;; from your point of "
+"view, it is &ldquo;treacherous.&rdquo;"
 msgstr ""
 "<a href=\"can-you-trust.html\">„Рачунарство са 
поверењем“</a> је пристрасни "
 "назив плана поновног дизајнирања 
рачунара како би градитељи апликација 
могли "
@@ -1178,14 +1468,23 @@
 msgstr "„Продавац“"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Please don't use the term &ldquo;vendor&rdquo; to refer generally to "
+#| "anyone that develops or packages a software package.  Many programs are "
+#| "developed in order to sell copies, and their developers are therefore "
+#| "their vendors; this includes some free software packages.  However, many "
+#| "programs are developed by volunteers or organizations which do not intend "
+#| "to sell copies.  These developers are not vendors.  Likewise, only some "
+#| "of the packagers of GNU/Linux distributions are vendors."
 msgid ""
 "Please don't use the term &ldquo;vendor&rdquo; to refer generally to anyone "
-"that develops or packages a software package.  Many programs are developed "
-"in order to sell copies, and their developers are therefore their vendors; "
-"this includes some free software packages.  However, many programs are "
-"developed by volunteers or organizations which do not intend to sell "
-"copies.  These developers are not vendors.  Likewise, only some of the "
-"packagers of GNU/Linux distributions are vendors."
+"that develops or packages software.  Many programs are developed in order to "
+"sell copies, and their developers are therefore their vendors; this even "
+"includes some free software packages.  However, many programs are developed "
+"by volunteers or organizations which do not intend to sell copies.  These "
+"developers are not vendors.  Likewise, only some of the packagers of GNU/"
+"Linux distributions are vendors."
 msgstr ""
 "Молимо вас да не користите израз 
„продавац“ када говорите о било коме ко "
 "изграђује или саставља неки софтверски 
пакет. Многи програми су изграђени са "

Index: software/software.sk.html
===================================================================
RCS file: /web/www/www/software/software.sk.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- software/software.sk.html   2 Aug 2009 20:30:42 -0000       1.4
+++ software/software.sk.html   28 Sep 2009 20:26:18 -0000      1.5
@@ -10,9 +10,9 @@
 
 <div style="width: 300px; padding: 15px; margin: 15px; float: right; border: 
6px solid #bd0;">
 <h4 class="center">Stiahnite si distribúcie</h4>
-<p><a href="/distros/free-distros.html"><img 
src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU a Linux" /></a></p>
+<p><a href="/distros/free-distros.sk.html"><img 
src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU a Linux" /></a></p>
 <p><span class="highlight">Ak hľadáte kompletný systém na inštaláciu, 
pozrite
-si <a href="/distros/free-distros.html">zoznam GNU/Linux distribúcií
+si <a href="/distros/free-distros.sk.html">zoznam GNU/Linux distribúcií
 obsahujúcich výlučne slobodný softvér</a>.</span></p>
 </div>
 
@@ -65,7 +65,7 @@
 ktoré túto možnosť ponúkajú.</li>
 
 <li>Získaním zdrojových kódov od vývojárov nejakého balíčka a ich 
následnou
-kompiláciou.Takýmto spôsobom máte možnosť vyskúšať najnovšie verzie. 
Mnohé
+kompiláciou. Takýmto spôsobom máte možnosť vyskúšať najnovšie 
verzie. Mnohé
 GNU balíčky majú svoje zdrojové súbory umiestnené na GNU hostingu <a
 href="http://savannah.gnu.org/";>savannah.gnu.org</a>. Niektoré balíčky
 využívajú iné možnosti uloženia zdrových súborov; bližšie 
informácie sa
@@ -76,24 +76,24 @@
 
 <h3>Vyradené GNU balíčky</h3>
 
-<p>GNU packages are occasionally decommissioned, generally because they've been
-superseded by, or integrated into, other packages.  Here is the list; we
-leave the old project pages up (when they existed): <a
+<p>GNU balíčky môžu byť príležitostne vyradené, najmä v prípadoch, 
ak boli
+nahradené iným alebo začlenené do iného balíčka.  Tu je ich zoznam; 
pôvodné
+stránky takýchto projektov ponechávame (ak existovali): <a
 href="gnu3dkit/">3dkit</a>, <a href="abcsh/">abcsh</a>, <a
 href="awacs/">awacs</a>, <a href="cfs-el/">cfs-el</a>, <a
 href="checker/">checker</a>, <a href="dgs/">dgs</a>
 (display&nbsp;ghostscript), <a href="dld/">dld</a>, <a
 href="http://directory.fsf.org/project/DrGenius/";>dr.genius</a>, <a
 href="elib/">elib</a>, <a href="ffp/">ffp</a>, <a href="fhp/">fhp</a>, <a
-href="free/">free&nbsp;(gnu.free)</a>, <a href="gcron/">gcron</a> (see <a
+href="free/">free&nbsp;(gnu.free)</a>, <a href="gcron/">gcron</a> (viď. <a
 href="mcron/">mcron</a>), <a href="gfe/">gfe</a>, <a
-href="http://directory.fsf.org/GNU/ggv.html";>ggv</a> (see <a
+href="http://directory.fsf.org/GNU/ggv.html";>ggv</a> (viď. <a
 href="gv/">gv</a>), <a
 href="http://www.ideacode.com//assets/gicqd/";>gicqd</a>, <a
 href="http://directory.fsf.org/project/giptables/";>giptables</a>, <a
 href="http://directory.fsf.org/project/gnochive/";>gnochive</a>, <a
 href="http://directory.fsf.org/project/gnotepad/";>gnotepad+</a>, gnubios,
-gnucad, gnupedia (see <a href="http://wikipedia.org";>wikipedia</a>), <a
+gnucad, gnupedia (viď. <a href="http://wikipedia.org";>wikipedia</a>), <a
 href="gnusql">gnusql</a>, <a href="gnustep-db/">gnustep-db</a>, <a
 href="gnuts/">gnuts</a>, <a href="goose/">goose</a>, <a
 href="gphoto/">gphoto</a>, <a href="graphics/">graphics</a>, <a
@@ -149,12 +149,14 @@
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
- </div>
+<strong>Preklad</strong>: <a
+href="https://savannah.gnu.org/users/dominiks";>Dominik Smatana</a> <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>, 2009.</div>
  <p>
 <!-- timestamp start -->
 Aktualizované:
 
-$Date: 2009/08/02 20:30:42 $
+$Date: 2009/09/28 20:26:18 $
 
 <!-- timestamp end -->
 </p>




reply via email to

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