www-commits
[Top][All Lists]
Advanced

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

www gnu/po/manifesto.ar.po gnu/po/manifesto.ca....


From: Yavor Doganov
Subject: www gnu/po/manifesto.ar.po gnu/po/manifesto.ca....
Date: Tue, 23 Mar 2010 20:25:56 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   10/03/23 20:25:56

Modified files:
        gnu/po         : manifesto.ar.po manifesto.ca.po manifesto.fr.po 
                         manifesto.pot manifesto.sr.po manifesto.tr.po 
        people/po      : people.es.po people.pot 
        philosophy/po  : freedom-or-copyright.fa.po 
                         freedom-or-copyright.fr.po 
                         freedom-or-copyright.pot 
Added files:
        philosophy/po  : who-does-that-server-really-serve.pot 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ar.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ca.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.fr.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.pot?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.sr.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.tr.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/people/po/people.es.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/people/po/people.pot?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/freedom-or-copyright.fa.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/freedom-or-copyright.fr.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/freedom-or-copyright.pot?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.pot?cvsroot=www&rev=1.1

Patches:
Index: gnu/po/manifesto.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ar.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/po/manifesto.ar.po      4 Mar 2010 21:26:02 -0000       1.7
+++ gnu/po/manifesto.ar.po      23 Mar 2010 20:25:47 -0000      1.8
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-03-23 16:25-0300\n"
 "PO-Revision-Date: 2009-09-21 10:50+0200\n"
 "Last-Translator: Hossam Hossny <address@hidden>\n"
 "Language-Team: Arabic\n"
@@ -69,10 +69,17 @@
 msgstr "ما هو غنو؟ غنو ليس يونكس!"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
+"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
 "volunteers are helping me.  Contributions of time, money, programs and "
 "equipment are greatly needed."
 msgstr ""
@@ -181,8 +188,8 @@
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI lab to deny MIT any legal excuse to prevent me from giving GNU away <a "
-"href=\"#f2a\">(2a)</a>."
+"AI lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
+"href=\"#f2a\">(2)</a>"
 msgstr ""
 "ولأستمر في استخدام الحواسيب دون عار، 
قرّرت أن أضع كيانًا كافيًا للبرمجيات الحرة "
 "لأتمكن من المضي قدمًا بدون أي برمجيات غير 
حرة. استقلت من معهد الذكاء "
@@ -343,9 +350,13 @@
 msgstr "لماذا سيستفيد كل مستخدمي الحاسوب"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(2)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(2)</a>"
+"free, just like air.<a href=\"#f2\">(3)</a>"
 msgstr ""
 "عندما ننتهي من كتابة غنو، سوف يتمكن الجميع 
من الحصول على نظام تشغيل برمجي "
 "جيد مجاني كالهواء.<a href=\"#f2\">(2)</a>"
@@ -446,10 +457,15 @@
 "&ldquo;</strong>"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(3)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(3)</a>"
+"free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgstr ""
 "إذا فضّل الناس الدفع مقابل غنو زائدًا 
الخدمة بدلًا من الحصول عليه بالمجان بدون "
 "الخدمة، فسوف تفي بالغرض شركة تقدم الخدمة 
للذين حصلوا عليه بالمجان وسوف تكون "
@@ -541,11 +557,17 @@
 "المستخدمون الذين يستفيدون من الإعلانات 
لها."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(4)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(4)</a>"
+"let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgstr ""
 "في المقابل، إذا حصل أشخاص كثر على غنو من 
أصدقائهم، ولم تنجح مثل هذه الشركات، "
 "فهذا سيثبت أن الإعلان ليس ضروريًا لنجاح 
غنو. لماذا لا يريد مؤيدو السوق الحرة "
@@ -576,9 +598,13 @@
 "في تجارة بيع أنظمة التشغيل المُكلفة."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
+"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgstr ""
 "إنني أتمنى أن أرى تطوير غنو مدعومًا بهبات م
ن المصانع والمستخدمين، بحيث تقل "
 "التكلفة على الجميع.<a href=\"#f5\">(5)</a>"
@@ -691,7 +717,7 @@
 #| "always numerous ways to organize any kind of business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis <a href=\"#f8\">(8)</a> because it brings in the most "
+"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
 "money.  If it were prohibited, or rejected by the customer, software "
 "business would move to other bases of organization which are now used less "
 "often.  There are always numerous ways to organize any kind of business."
@@ -732,9 +758,16 @@
 "أشخاص آخرين؛ وهو غالبًا يجعل حياة الأخرين 
أصعب."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(6)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
 msgid ""
 "People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(6)</a> carefully (such as lawyers) say that there is no intrinsic "
+"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
 "right to intellectual property.  The kinds of supposed intellectual property "
 "rights that the government recognizes were created by specific acts of "
 "legislation for specific purposes."
@@ -956,9 +989,15 @@
 msgstr "يمكن أيضًا أن يُوَظّف المبرمجون في خدم
ات التعليم والدعم الشخصي والصيانة."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href=\"#f7"
+#| "\">(7)</a>, asking for donations from satisfied users, or selling hand-"
+#| "holding services.  I have met people who are already working this way "
+#| "successfully."
 msgid ""
 "People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(7)</a>, asking for donations from satisfied users, or selling hand-holding "
+"(9)</a>, asking for donations from satisfied users, or selling hand-holding "
 "services.  I have met people who are already working this way successfully."
 msgstr ""
 "يستطيع الأشخاص الذين لديهم أفكار جديد 
توزيع البرامج كبرمجيات مجانية<a href="
@@ -1094,6 +1133,30 @@
 "التعاون مع الآخرين الذين يستخدمونه."
 
 # type: Content of: <ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f7\"></a>Subsequently we have learned to distinguish between "
+#| "&ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See <a href=\"/philosophy/words-to-avoid.html#Freeware"
+#| "\"> the Confusing Words and Phrases page</a> for more explanation."
+msgid ""
+"<a name=\"f2a\"></a>The expression &ldquo;give away&rdquo; is another "
+"indication that I had not yet clearly separated the issue of price from that "
+"of freedom.  We now recommend avoiding this expression when talking about "
+"free software.  See <a href=\"/philosophy/words-to-avoid."
+"html#GiveAwaySoftware\"> <q>Confusing Words and Phrases</q></a> for more "
+"explanation."
+msgstr ""
+"<a name=\"f7\"></a>تعلمنا لاحقًا التفريق بين 
&rdquo;البرمجيات الحرة&ldquo; "
+"(بالإنجليزية &rdquo;free software&ldquo;) و&rdquo;البرامج 
المجانية&ldquo; "
+"(بالإنجليزية &rdquo;freeware&ldquo;.) &rdquo;البرامج الم
جانية&ldquo; تعني "
+"البرمجيات التي أنت حر في إعادة توزيعها، 
لكنك لست حرًا عادة في دراسة وتغيير "
+"الكود المصدري، ولذا فإن معظمها ليس حرًا. 
راجع <a href=\"/philosophy/words-to-"
+"avoid.html#Freeware\">صفحة الكلمات والعبارات الم
ُضلّلة</a> لمزيد من التوضيح."
+
+# type: Content of: <ol><li>
 msgid ""
 "<a name=\"f2\"></a>This is another place I failed to distinguish carefully "
 "between the two different meanings of &ldquo;free&rdquo;.  The statement as "
@@ -1107,15 +1170,6 @@
 "لكنها لا تنفي الفهم الخاطئ."
 
 # type: Content of: <ol><li>
-msgid ""
-"<a name=\"f2a\"></a>The expression ``give away'' is another indication that "
-"I had not yet clearly separated the issue of price from that of freedom.  We "
-"now recommend avoiding this expression when talking about free software.  "
-"See <a href=\"/philosophy/words-to-avoid.html#GiveAwaySoftware\"> "
-"<q>Confusing Words and Phrases</q></a> for more explanation."
-msgstr ""
-
-# type: Content of: <ol><li>
 msgid "<a name=\"f3\"></a>Several such companies now exist."
 msgstr "<a name=\"f3\"></a>توجد شركات عديدة كهذه اليوم."
 
@@ -1145,6 +1199,18 @@
 "صيانة مصرّف غنو للسي."
 
 # type: Content of: <ol><li>
+msgid ""
+"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
+"software was the most common basis for making money in software.  It seems "
+"that actually the most common business model was and is development of "
+"custom software.  That does not offer the possibility of collecting rents, "
+"so the business has to keep doing real work in order to keep getting "
+"income.  The custom software business would continue to exist, more or less "
+"unchanged, in a free software world.  Therefore, I no longer expect that "
+"most paid programmers would earn less in a free software world."
+msgstr ""
+
+# type: Content of: <ol><li>
 #, fuzzy
 #| msgid ""
 #| "<a name=\"f6\"></a>In the 80s I had not yet realized how confusing it was "
@@ -1201,18 +1267,6 @@
 "الكود المصدري، ولذا فإن معظمها ليس حرًا. 
راجع <a href=\"/philosophy/words-to-"
 "avoid.html#Freeware\">صفحة الكلمات والعبارات الم
ُضلّلة</a> لمزيد من التوضيح."
 
-# type: Content of: <ol><li>
-msgid ""
-"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
-"software was the most common basis for making money in software.  It seems "
-"that actually the most common business model was and is development of "
-"custom software.  That does not offer the possibility of collecting rents, "
-"so the business has to keep doing real work in order to keep getting "
-"income.  The custom software business would continue to exist, more or less "
-"unchanged, in a free software world.  Therefore, I no longer expect that "
-"most paid programmers would earn less in a free software world."
-msgstr ""
-
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"

Index: gnu/po/manifesto.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ca.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/po/manifesto.ca.po      4 Mar 2010 21:26:02 -0000       1.5
+++ gnu/po/manifesto.ca.po      23 Mar 2010 20:25:48 -0000      1.6
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.ca\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-03-23 16:25-0300\n"
 "PO-Revision-Date: 2009-04-20 20:16+0200\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -71,10 +71,17 @@
 msgstr "Què és GNU? GNU no és Unix!"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
+"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
 "volunteers are helping me.  Contributions of time, money, programs and "
 "equipment are greatly needed."
 msgstr ""
@@ -197,8 +204,8 @@
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI lab to deny MIT any legal excuse to prevent me from giving GNU away <a "
-"href=\"#f2a\">(2a)</a>."
+"AI lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
+"href=\"#f2a\">(2)</a>"
 msgstr ""
 "Com que vull continuar emprant ordinadors sense perdre el meu honor, he "
 "decidit agrupar un cos suficient de programari lliure per tal de ser capaç "
@@ -381,9 +388,13 @@
 msgstr "Per què tots els usuaris d'ordinador se'n sortiran beneficiats"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(2)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(2)</a>"
+"free, just like air.<a href=\"#f2\">(3)</a>"
 msgstr ""
 "Una vegada el GNU estiga escrit, qualsevol serà capaç d'obtenir un bon "
 "sistema de programari lliure, igual que disposem d'aire per respirar. <a "
@@ -495,10 +506,15 @@
 "strong>"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(3)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(3)</a>"
+"free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgstr ""
 "Si la gent preferís pagar per tenir el GNU més assistència tècnica que "
 "obtenir el GNU de franc sense assistència, una empresa que oferís només "
@@ -601,11 +617,17 @@
 "reben benefici de la publicitat paguen per ella."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(4)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(4)</a>"
+"let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgstr ""
 "D'altra banda, si molta gent obté el GNU dels seus amics i aquestes "
 "companyies no tenen èxit, això mostrarà que la publicitat no era realment "
@@ -640,9 +662,13 @@
 "empès dins del costós negoci de la venta de sistemes operatius."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
+"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgstr ""
 "M'agradaria veure que el desenvolupament del GNU és finançat amb donacions "
 "de molts fabricants i usuaris, reduint els costos per a ells mateixos. <a "
@@ -767,7 +793,7 @@
 #| "always numerous ways to organize any kind of business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis <a href=\"#f8\">(8)</a> because it brings in the most "
+"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
 "money.  If it were prohibited, or rejected by the customer, software "
 "business would move to other bases of organization which are now used less "
 "often.  There are always numerous ways to organize any kind of business."
@@ -811,9 +837,16 @@
 "les seves vides."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(6)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
 msgid ""
 "People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(6)</a> carefully (such as lawyers) say that there is no intrinsic "
+"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
 "right to intellectual property.  The kinds of supposed intellectual property "
 "rights that the government recognizes were created by specific acts of "
 "legislation for specific purposes."
@@ -1061,9 +1094,15 @@
 "feina també als programadors."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href=\"#f7"
+#| "\">(7)</a>, asking for donations from satisfied users, or selling hand-"
+#| "holding services.  I have met people who are already working this way "
+#| "successfully."
 msgid ""
 "People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(7)</a>, asking for donations from satisfied users, or selling hand-holding "
+"(9)</a>, asking for donations from satisfied users, or selling hand-holding "
 "services.  I have met people who are already working this way successfully."
 msgstr ""
 "La gent amb idees noves podria distribuir programes com programari gratuït "
@@ -1217,6 +1256,31 @@
 "la llibertat de cooperar amb altres al utilitzar-lo."
 
 # type: Content of: <ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f7\"></a>Subsequently we have learned to distinguish between "
+#| "&ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See <a href=\"/philosophy/words-to-avoid.html#Freeware"
+#| "\"> the Confusing Words and Phrases page</a> for more explanation."
+msgid ""
+"<a name=\"f2a\"></a>The expression &ldquo;give away&rdquo; is another "
+"indication that I had not yet clearly separated the issue of price from that "
+"of freedom.  We now recommend avoiding this expression when talking about "
+"free software.  See <a href=\"/philosophy/words-to-avoid."
+"html#GiveAwaySoftware\"> <q>Confusing Words and Phrases</q></a> for more "
+"explanation."
+msgstr ""
+"<a name=\"f7\"></a>Posteriorment hem après a distingir entre \"programari "
+"lliure\" (free software) i \"programari gratuït\" (freeware). El terme "
+"\"programari gratuït\" significa programari que eres lliure de redistribuir, 
"
+"però que normalment no eres lliure d'estudiar o modificar el codi font, 
així "
+"que la majoria d'aquest programari no és lliure. Veieu <a 
href=\"/philosophy/"
+"words-to-avoid.ca.html#Freeware\"> la pàgina de Paraules i Frases confuses</"
+"a> per a més explicacions."
+
+# type: Content of: <ol><li>
 msgid ""
 "<a name=\"f2\"></a>This is another place I failed to distinguish carefully "
 "between the two different meanings of &ldquo;free&rdquo;.  The statement as "
@@ -1231,15 +1295,6 @@
 "Però l'afirmació suggereix la idea equivocada."
 
 # type: Content of: <ol><li>
-msgid ""
-"<a name=\"f2a\"></a>The expression ``give away'' is another indication that "
-"I had not yet clearly separated the issue of price from that of freedom.  We "
-"now recommend avoiding this expression when talking about free software.  "
-"See <a href=\"/philosophy/words-to-avoid.html#GiveAwaySoftware\"> "
-"<q>Confusing Words and Phrases</q></a> for more explanation."
-msgstr ""
-
-# type: Content of: <ol><li>
 msgid "<a name=\"f3\"></a>Several such companies now exist."
 msgstr "<a name=\"f3\"></a>Ja existeixen moltes d'aquestes companyies."
 
@@ -1271,6 +1326,18 @@
 "GNU."
 
 # type: Content of: <ol><li>
+msgid ""
+"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
+"software was the most common basis for making money in software.  It seems "
+"that actually the most common business model was and is development of "
+"custom software.  That does not offer the possibility of collecting rents, "
+"so the business has to keep doing real work in order to keep getting "
+"income.  The custom software business would continue to exist, more or less "
+"unchanged, in a free software world.  Therefore, I no longer expect that "
+"most paid programmers would earn less in a free software world."
+msgstr ""
+
+# type: Content of: <ol><li>
 #, fuzzy
 #| msgid ""
 #| "<a name=\"f6\"></a>In the 80s I had not yet realized how confusing it was "
@@ -1329,18 +1396,6 @@
 "words-to-avoid.ca.html#Freeware\"> la pàgina de Paraules i Frases confuses</"
 "a> per a més explicacions."
 
-# type: Content of: <ol><li>
-msgid ""
-"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
-"software was the most common basis for making money in software.  It seems "
-"that actually the most common business model was and is development of "
-"custom software.  That does not offer the possibility of collecting rents, "
-"so the business has to keep doing real work in order to keep getting "
-"income.  The custom software business would continue to exist, more or less "
-"unchanged, in a free software world.  Therefore, I no longer expect that "
-"most paid programmers would earn less in a free software world."
-msgstr ""
-
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"

Index: gnu/po/manifesto.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.fr.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gnu/po/manifesto.fr.po      4 Mar 2010 21:26:02 -0000       1.10
+++ gnu/po/manifesto.fr.po      23 Mar 2010 20:25:48 -0000      1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-03-23 16:25-0300\n"
 "PO-Revision-Date: 2010-02-14 15:17+0100\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -67,10 +67,17 @@
 msgstr "Qu'est ce que GNU&nbsp;? Gnu N'est pas Unix&nbsp;!"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
+"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
 "volunteers are helping me.  Contributions of time, money, programs and "
 "equipment are greatly needed."
 msgstr ""
@@ -192,12 +199,19 @@
 "volont&eacute;."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away <a href=\"#f2a\">(2a)</a>."
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI lab to deny MIT any legal excuse to prevent me from giving GNU away <a "
-"href=\"#f2a\">(2a)</a>."
+"AI lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
+"href=\"#f2a\">(2)</a>"
 msgstr ""
 "Pour pouvoir continuer &agrave; utiliser les ordinateurs en accord avec ma "
 "conscience, j'ai d&eacute;cid&eacute; de rassembler un ensemble suffisant de "
@@ -395,9 +409,13 @@
 msgstr "Pourquoi tous les utilisateurs en b&eacute;n&eacute;ficieront"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(2)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(2)</a>"
+"free, just like air.<a href=\"#f2\">(3)</a>"
 msgstr ""
 "Une fois GNU achev&eacute;, tout le monde pourra obtenir de bons logiciels "
 "libres comme l'air <a href=\"#f2\"><sup>2</sup></a>."
@@ -513,10 +531,15 @@
 "service apr&egrave;s-vente.&nbsp;&raquo;</strong>"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(3)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(3)</a>"
+"free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgstr ""
 "Il y a des gens qui pr&eacute;f&egrave;rent payer pour GNU et le service "
 "plut&ocirc;t que d'obtenir GNU sans service. Une soci&eacute;t&eacute; qui "
@@ -629,11 +652,17 @@
 "publicit&eacute; la payent."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(4)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(4)</a>"
+"let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgstr ""
 "En revanche, si de nombreuses personnes obtiennent GNU par leurs relations, "
 "de telles soci&eacute;t&eacute;s ne seraient pas rentables, et cela d&eacute;"
@@ -669,9 +698,13 @@
 "dans le domaine on&eacute;reux de la vente de syst&egrave;mes d'exploitation."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
+"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgstr ""
 "J'aimerais bien voir le d&eacute;veloppement de GNU financ&eacute; par des "
 "dons de fabricants et utilisateurs, r&eacute;duisant ainsi les co&ucirc;ts "
@@ -801,9 +834,17 @@
 "pour programmer; seulement, peut-&ecirc;tre pas autant qu'actuellement."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis <a href=\"#f8\">(8)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis <a href=\"#f8\">(8)</a> because it brings in the most "
+"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
 "money.  If it were prohibited, or rejected by the customer, software "
 "business would move to other bases of organization which are now used less "
 "often.  There are always numerous ways to organize any kind of business."
@@ -849,9 +890,16 @@
 "souvent utilis&eacute; pour leur rendre la vie plus difficile."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(6)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
 msgid ""
 "People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(6)</a> carefully (such as lawyers) say that there is no intrinsic "
+"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
 "right to intellectual property.  The kinds of supposed intellectual property "
 "rights that the government recognizes were created by specific acts of "
 "legislation for specific purposes."
@@ -1122,9 +1170,15 @@
 "permettre la cr&eacute;ation d'emplois."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href=\"#f7"
+#| "\">(7)</a>, asking for donations from satisfied users, or selling hand-"
+#| "holding services.  I have met people who are already working this way "
+#| "successfully."
 msgid ""
 "People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(7)</a>, asking for donations from satisfied users, or selling hand-holding "
+"(9)</a>, asking for donations from satisfied users, or selling hand-holding "
 "services.  I have met people who are already working this way successfully."
 msgstr ""
 "Les personnes avec des id&eacute;es nouvelles peuvent distribuer des "
@@ -1286,6 +1340,30 @@
 "l'utiliser en collaboration avec d'autres."
 
 # type: Content of: <ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f2a\"></a>The expression ``give away'' is another indication "
+#| "that I had not yet clearly separated the issue of price from that of "
+#| "freedom.  We now recommend avoiding this expression when talking about "
+#| "free software.  See <a href=\"/philosophy/words-to-avoid."
+#| "html#GiveAwaySoftware\"> <q>Confusing Words and Phrases</q></a> for more "
+#| "explanation."
+msgid ""
+"<a name=\"f2a\"></a>The expression &ldquo;give away&rdquo; is another "
+"indication that I had not yet clearly separated the issue of price from that "
+"of freedom.  We now recommend avoiding this expression when talking about "
+"free software.  See <a href=\"/philosophy/words-to-avoid."
+"html#GiveAwaySoftware\"> <q>Confusing Words and Phrases</q></a> for more "
+"explanation."
+msgstr ""
+"<a name=\"f2a\"></a>L'expression «&nbsp;give away&nbsp;»  est une autre "
+"indication qui n'avait pas encore clairement séparé le problème du prix de 
"
+"celui de la liberté.  Nous recommandons maintenant d'éviter cette 
expression "
+"lorsque l'on parle du logiciel. Consulter <a href=\"/philosophy/words-to-"
+"avoid.fr.html#GiveAwaySoftware\"> <q>Mots et expressions à éviter</q></a> "
+"pour d'autres explications."
+
+# type: Content of: <ol><li>
 msgid ""
 "<a name=\"f2\"></a>This is another place I failed to distinguish carefully "
 "between the two different meanings of &ldquo;free&rdquo;.  The statement as "
@@ -1302,21 +1380,6 @@
 "&laquo;&nbsp;gratuit&nbsp;&raquo; est &eacute;vidente.]"
 
 # type: Content of: <ol><li>
-msgid ""
-"<a name=\"f2a\"></a>The expression ``give away'' is another indication that "
-"I had not yet clearly separated the issue of price from that of freedom.  We "
-"now recommend avoiding this expression when talking about free software.  "
-"See <a href=\"/philosophy/words-to-avoid.html#GiveAwaySoftware\"> "
-"<q>Confusing Words and Phrases</q></a> for more explanation."
-msgstr ""
-"<a name=\"f2a\"></a>L'expression «&nbsp;give away&nbsp;»  est une autre "
-"indication qui n'avait pas encore clairement séparé le problème du prix de 
"
-"celui de la liberté.  Nous recommandons maintenant d'éviter cette 
expression "
-"lorsque l'on parle du logiciel. Consulter <a href=\"/philosophy/words-to-"
-"avoid.fr.html#GiveAwaySoftware\"> <q>Mots et expressions à éviter</q></a> "
-"pour d'autres explications."
-
-# type: Content of: <ol><li>
 msgid "<a name=\"f3\"></a>Several such companies now exist."
 msgstr ""
 "<a name=\"f3\"></a> De telles soci&eacute;t&eacute;s existent actuellement."
@@ -1344,6 +1407,27 @@
 
 # type: Content of: <ol><li>
 msgid ""
+"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
+"software was the most common basis for making money in software.  It seems "
+"that actually the most common business model was and is development of "
+"custom software.  That does not offer the possibility of collecting rents, "
+"so the business has to keep doing real work in order to keep getting "
+"income.  The custom software business would continue to exist, more or less "
+"unchanged, in a free software world.  Therefore, I no longer expect that "
+"most paid programmers would earn less in a free software world."
+msgstr ""
+"<a name=\"f8\"></a>Je pense que je me fourvoyait en disant que le logiciel "
+"propriétaire était le moyen le plus courant pour faire de l'argent dans le "
+"monde du logiciel. Il semble que le modèle le plus courant était et est le "
+"développement de logiciel sur mesure. Ceci n'offre pas la possiblité de "
+"collecter des rentes, donc la société est obligée de continuer à 
réellement "
+"travailler pour continuer à percevoir des revenus. Le modèle du logiciel 
sur "
+"mesure devrait continuer d'exister, plus ou moins inchangé, dans un monde de 
"
+"logiciels libres. Par conséquent, je ne m'attends plus à ce que les "
+"programmeurs payés gagnent moins dans un monde de logiciels libres."
+
+# type: Content of: <ol><li>
+msgid ""
 "<a name=\"f6\"></a>In the 1980s I had not yet realized how confusing it was "
 "to speak of &ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  "
 "That term is obviously biased; more subtle is the fact that it lumps "
@@ -1388,27 +1472,6 @@
 "words-to-avoid.fr.html#Freeware\">Termes pr&ecirc;tant &agrave; confusion, "
 "que vous devriez &eacute;viter</a> pour plus d'explications."
 
-# type: Content of: <ol><li>
-msgid ""
-"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
-"software was the most common basis for making money in software.  It seems "
-"that actually the most common business model was and is development of "
-"custom software.  That does not offer the possibility of collecting rents, "
-"so the business has to keep doing real work in order to keep getting "
-"income.  The custom software business would continue to exist, more or less "
-"unchanged, in a free software world.  Therefore, I no longer expect that "
-"most paid programmers would earn less in a free software world."
-msgstr ""
-"<a name=\"f8\"></a>Je pense que je me fourvoyait en disant que le logiciel "
-"propriétaire était le moyen le plus courant pour faire de l'argent dans le "
-"monde du logiciel. Il semble que le modèle le plus courant était et est le "
-"développement de logiciel sur mesure. Ceci n'offre pas la possiblité de "
-"collecter des rentes, donc la société est obligée de continuer à 
réellement "
-"travailler pour continuer à percevoir des revenus. Le modèle du logiciel 
sur "
-"mesure devrait continuer d'exister, plus ou moins inchangé, dans un monde de 
"
-"logiciels libres. Par conséquent, je ne m'attends plus à ce que les "
-"programmeurs payés gagnent moins dans un monde de logiciels libres."
-
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"

Index: gnu/po/manifesto.pot
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.pot,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/po/manifesto.pot        4 Mar 2010 21:26:02 -0000       1.5
+++ gnu/po/manifesto.pot        23 Mar 2010 20:25:48 -0000      1.6
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-03-23 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"
@@ -55,7 +55,7 @@
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete "
 "Unix-compatible software system which I am writing so that I can give it "
-"away free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
+"away free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
 "volunteers are helping me.  Contributions of time, money, programs and "
 "equipment are greatly needed."
 msgstr ""
@@ -125,8 +125,8 @@
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI lab to deny MIT any legal excuse to prevent me from giving GNU away <a "
-"href=\"#f2a\">(2a)</a>."
+"AI lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
+"href=\"#f2a\">(2)</a>"
 msgstr ""
 
 # type: Content of: <h3>
@@ -248,7 +248,7 @@
 # type: Content of: <p>
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(2)</a>"
+"free, just like air.<a href=\"#f2\">(3)</a>"
 msgstr ""
 
 # type: Content of: <p>
@@ -323,7 +323,7 @@
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(3)</a>"
+"free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgstr ""
 
 # type: Content of: <p>
@@ -391,7 +391,7 @@
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(4)</a>"
+"let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgstr ""
 
 # type: Content of: <p>
@@ -414,7 +414,7 @@
 # type: Content of: <p>
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
+"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgstr ""
 
 # type: Content of: <p>
@@ -493,7 +493,7 @@
 # type: Content of: <p>
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis <a href=\"#f8\">(8)</a> because it brings in the most "
+"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
 "money.  If it were prohibited, or rejected by the customer, software "
 "business would move to other bases of organization which are now used less "
 "often.  There are always numerous ways to organize any kind of business."
@@ -524,7 +524,7 @@
 # type: Content of: <p>
 msgid ""
 "People who have studied the issue of intellectual property rights<a "
-"href=\"#f6\">(6)</a> carefully (such as lawyers) say that there is no "
+"href=\"#f6\">(8)</a> carefully (such as lawyers) say that there is no "
 "intrinsic right to intellectual property.  The kinds of supposed "
 "intellectual property rights that the government recognizes were created by "
 "specific acts of legislation for specific purposes."
@@ -684,7 +684,7 @@
 # type: Content of: <p>
 msgid ""
 "People with new ideas could distribute programs as freeware<a "
-"href=\"#f7\">(7)</a>, asking for donations from satisfied users, or selling "
+"href=\"#f7\">(9)</a>, asking for donations from satisfied users, or selling "
 "hand-holding services.  I have met people who are already working this way "
 "successfully."
 msgstr ""
@@ -786,6 +786,16 @@
 
 # type: Content of: <ol><li>
 msgid ""
+"<a name=\"f2a\"></a>The expression &ldquo;give away&rdquo; is another "
+"indication that I had not yet clearly separated the issue of price from that "
+"of freedom.  We now recommend avoiding this expression when talking about "
+"free software.  See <a "
+"href=\"/philosophy/words-to-avoid.html#GiveAwaySoftware\"> <q>Confusing "
+"Words and Phrases</q></a> for more explanation."
+msgstr ""
+
+# type: Content of: <ol><li>
+msgid ""
 "<a name=\"f2\"></a>This is another place I failed to distinguish carefully "
 "between the two different meanings of &ldquo;free&rdquo;.  The statement as "
 "it stands is not false&mdash;you can get copies of GNU software at no "
@@ -794,15 +804,6 @@
 msgstr ""
 
 # type: Content of: <ol><li>
-msgid ""
-"<a name=\"f2a\"></a>The expression ``give away'' is another indication that "
-"I had not yet clearly separated the issue of price from that of freedom.  We "
-"now recommend avoiding this expression when talking about free software.  "
-"See <a href=\"/philosophy/words-to-avoid.html#GiveAwaySoftware\"> "
-"<q>Confusing Words and Phrases</q></a> for more explanation."
-msgstr ""
-
-# type: Content of: <ol><li>
 msgid "<a name=\"f3\"></a>Several such companies now exist."
 msgstr ""
 
@@ -822,6 +823,18 @@
 
 # type: Content of: <ol><li>
 msgid ""
+"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
+"software was the most common basis for making money in software.  It seems "
+"that actually the most common business model was and is development of "
+"custom software.  That does not offer the possibility of collecting rents, "
+"so the business has to keep doing real work in order to keep getting "
+"income.  The custom software business would continue to exist, more or less "
+"unchanged, in a free software world.  Therefore, I no longer expect that "
+"most paid programmers would earn less in a free software world."
+msgstr ""
+
+# type: Content of: <ol><li>
+msgid ""
 "<a name=\"f6\"></a>In the 1980s I had not yet realized how confusing it was "
 "to speak of &ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  "
 "That term is obviously biased; more subtle is the fact that it lumps "
@@ -844,18 +857,6 @@
 "Phrases</q></a> for more explanation."
 msgstr ""
 
-# type: Content of: <ol><li>
-msgid ""
-"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
-"software was the most common basis for making money in software.  It seems "
-"that actually the most common business model was and is development of "
-"custom software.  That does not offer the possibility of collecting rents, "
-"so the business has to keep doing real work in order to keep getting "
-"income.  The custom software business would continue to exist, more or less "
-"unchanged, in a free software world.  Therefore, I no longer expect that "
-"most paid programmers would earn less in a free software world."
-msgstr ""
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 # type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"

Index: gnu/po/manifesto.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.sr.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/po/manifesto.sr.po      4 Mar 2010 21:26:02 -0000       1.9
+++ gnu/po/manifesto.sr.po      23 Mar 2010 20:25:48 -0000      1.10
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-03-23 16:25-0300\n"
 "PO-Revision-Date: 2008-08-13 20:12+0200\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -69,10 +69,17 @@
 msgstr "Шта је ГНУ? Гну није Уникс!"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
+"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
 "volunteers are helping me.  Contributions of time, money, programs and "
 "equipment are greatly needed."
 msgstr ""
@@ -189,8 +196,8 @@
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI lab to deny MIT any legal excuse to prevent me from giving GNU away <a "
-"href=\"#f2a\">(2a)</a>."
+"AI lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
+"href=\"#f2a\">(2)</a>"
 msgstr ""
 "Како бих могао да наставим да користим 
рачунаре чиста образа, одлучио сам да "
 "саставим довољан корпус слободног 
софтвера како бих био у могућности да "
@@ -366,9 +373,13 @@
 msgstr "Зашто ће сви корисници рачунара имати 
користи"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(2)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(2)</a>"
+"free, just like air.<a href=\"#f2\">(3)</a>"
 msgstr ""
 "Када се једном направи ГНУ, свако ће моћи 
да набави добар системски софтвер "
 "бесплатно, баш као што дише ваздух.<a 
href=\"#f2\">(2)</a>"
@@ -476,10 +487,15 @@
 "strong>"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(3)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(3)</a>"
+"free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgstr ""
 "Ако би људи радије платили за ГНУ и 
подршку него набавили ГНУ бесплатно без "
 "подршке, фирма која обезбеђује само 
подршку људима који су набавили ГНУ "
@@ -577,11 +593,17 @@
 "имају користи од рекламирања."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(4)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(4)</a>"
+"let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgstr ""
 "Са друге стране, уколико много људи добије 
ГНУ од својих пријатеља, и такве "
 "фирме не успеју, ово ће показати да 
реклама није била стварно потребна за "
@@ -615,9 +637,13 @@
 "увлачења у скупи посао продаје 
оперативних система."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
+"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgstr ""
 "Волео бих да видим како се изградња ГНУ-а 
подржава поклонима великог броја "
 "произвођача и корисника, смањујући 
трошкове за све.<a href=\"#f5\">(5)</a>"
@@ -736,7 +762,7 @@
 #| "always numerous ways to organize any kind of business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis <a href=\"#f8\">(8)</a> because it brings in the most "
+"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
 "money.  If it were prohibited, or rejected by the customer, software "
 "business would move to other bases of organization which are now used less "
 "often.  There are always numerous ways to organize any kind of business."
@@ -778,9 +804,16 @@
 "других људи, и обично се користи да им 
загорча живот."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(6)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
 msgid ""
 "People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(6)</a> carefully (such as lawyers) say that there is no intrinsic "
+"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
 "right to intellectual property.  The kinds of supposed intellectual property "
 "rights that the government recognizes were created by specific acts of "
 "legislation for specific purposes."
@@ -1013,9 +1046,15 @@
 msgstr "Продаја услуга обуке и одржавања може 
такође да упосли програмере."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href=\"#f7"
+#| "\">(7)</a>, asking for donations from satisfied users, or selling hand-"
+#| "holding services.  I have met people who are already working this way "
+#| "successfully."
 msgid ""
 "People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(7)</a>, asking for donations from satisfied users, or selling hand-holding "
+"(9)</a>, asking for donations from satisfied users, or selling hand-holding "
 "services.  I have met people who are already working this way successfully."
 msgstr ""
 "Људи са новим идејама би могли да 
расподељују програме као фривер<a href="
@@ -1160,6 +1199,30 @@
 "има слободу да сарађује у његовом 
коришћењу са другима."
 
 # type: Content of: <ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f7\"></a>Subsequently we have learned to distinguish between "
+#| "&ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+#| "freeware&rdquo; means software you are free to redistribute, but usually "
+#| "you are not free to study and change the source code, so most of it is "
+#| "not free software.  See <a href=\"/philosophy/words-to-avoid.html#Freeware"
+#| "\"> the Confusing Words and Phrases page</a> for more explanation."
+msgid ""
+"<a name=\"f2a\"></a>The expression &ldquo;give away&rdquo; is another "
+"indication that I had not yet clearly separated the issue of price from that "
+"of freedom.  We now recommend avoiding this expression when talking about "
+"free software.  See <a href=\"/philosophy/words-to-avoid."
+"html#GiveAwaySoftware\"> <q>Confusing Words and Phrases</q></a> for more "
+"explanation."
+msgstr ""
+"<a name=\"f7\"></a>Накнадно смо научили да 
разликујемо „слободан софтвер“ и "
+"„фривер“. Израз „фривер“ означава 
софтвер који можете да поново "
+"расподељујете, али обично вам није 
дозвољено да га проучавате и мењате његов "
+"изворни код, па већина фривера није 
слободан софтвер. Погледајте <a href=\"/"
+"philosophy/words-to-avoid.sr.html#Freeware\">страницу 
„збуњујуће речи и "
+"синтагме“</a> за више информација."
+
+# type: Content of: <ol><li>
 msgid ""
 "<a name=\"f2\"></a>This is another place I failed to distinguish carefully "
 "between the two different meanings of &ldquo;free&rdquo;.  The statement as "
@@ -1174,15 +1237,6 @@
 "преко мреже. Али она наводи на погрешан 
закључак."
 
 # type: Content of: <ol><li>
-msgid ""
-"<a name=\"f2a\"></a>The expression ``give away'' is another indication that "
-"I had not yet clearly separated the issue of price from that of freedom.  We "
-"now recommend avoiding this expression when talking about free software.  "
-"See <a href=\"/philosophy/words-to-avoid.html#GiveAwaySoftware\"> "
-"<q>Confusing Words and Phrases</q></a> for more explanation."
-msgstr ""
-
-# type: Content of: <ol><li>
 msgid "<a name=\"f3\"></a>Several such companies now exist."
 msgstr "<a name=\"f3\"></a>Данас постоји неколико 
таквих фирми."
 
@@ -1213,6 +1267,18 @@
 "одржавање ГНУ-овог преводиоца за Це."
 
 # type: Content of: <ol><li>
+msgid ""
+"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
+"software was the most common basis for making money in software.  It seems "
+"that actually the most common business model was and is development of "
+"custom software.  That does not offer the possibility of collecting rents, "
+"so the business has to keep doing real work in order to keep getting "
+"income.  The custom software business would continue to exist, more or less "
+"unchanged, in a free software world.  Therefore, I no longer expect that "
+"most paid programmers would earn less in a free software world."
+msgstr ""
+
+# type: Content of: <ol><li>
 #, fuzzy
 #| msgid ""
 #| "<a name=\"f6\"></a>In the 80s I had not yet realized how confusing it was "
@@ -1270,18 +1336,6 @@
 "philosophy/words-to-avoid.sr.html#Freeware\">страницу 
„збуњујуће речи и "
 "синтагме“</a> за више информација."
 
-# type: Content of: <ol><li>
-msgid ""
-"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
-"software was the most common basis for making money in software.  It seems "
-"that actually the most common business model was and is development of "
-"custom software.  That does not offer the possibility of collecting rents, "
-"so the business has to keep doing real work in order to keep getting "
-"income.  The custom software business would continue to exist, more or less "
-"unchanged, in a free software world.  Therefore, I no longer expect that "
-"most paid programmers would earn less in a free software world."
-msgstr ""
-
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"

Index: gnu/po/manifesto.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.tr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/po/manifesto.tr.po      4 Mar 2010 21:26:02 -0000       1.3
+++ gnu/po/manifesto.tr.po      23 Mar 2010 20:25:48 -0000      1.4
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-03-23 16:25-0300\n"
 "PO-Revision-Date: 2010-01-08 16:08+0100\n"
 "Last-Translator: Tahir Emre Kalaycı <address@hidden>\n"
 "Language-Team: Turkish <address@hidden>\n"
@@ -70,10 +70,17 @@
 msgstr "GNU nedir? Gnu Unix Değildir!"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
+#| "compatible software system which I am writing so that I can give it away "
+#| "free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
+#| "volunteers are helping me.  Contributions of time, money, programs and "
+#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
-"free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
+"free to everyone who can use it.<a href=\"#f1\">(1)</a> Several other "
 "volunteers are helping me.  Contributions of time, money, programs and "
 "equipment are greatly needed."
 msgstr ""
@@ -182,12 +189,19 @@
 "kurumda kalamazdım."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "So that I can continue to use computers without dishonor, I have decided "
+#| "to put together a sufficient body of free software so that I will be able "
+#| "to get along without any software that is not free.  I have resigned from "
+#| "the AI lab to deny MIT any legal excuse to prevent me from giving GNU "
+#| "away <a href=\"#f2a\">(2a)</a>."
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
 "get along without any software that is not free.  I have resigned from the "
-"AI lab to deny MIT any legal excuse to prevent me from giving GNU away <a "
-"href=\"#f2a\">(2a)</a>."
+"AI lab to deny MIT any legal excuse to prevent me from giving GNU away.<a "
+"href=\"#f2a\">(2)</a>"
 msgstr ""
 "Bilgisayarları onurlu bir biçimde kullanabilmek amacıyla, yeterli bir 
bütünü "
 "oluşturacak özgür yazılımları bir araya getirmeye karar verdim. Bunu 
özgür "
@@ -373,9 +387,13 @@
 msgstr "Niçin Tüm Bilgisayar Kullanıcıları Yarar Sağlayacaktır?"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Once GNU is written, everyone will be able to obtain good system software "
+#| "free, just like air.<a href=\"#f2\">(2)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
-"free, just like air.<a href=\"#f2\">(2)</a>"
+"free, just like air.<a href=\"#f2\">(3)</a>"
 msgstr ""
 "GNU yazıldıktan sonra, aynen hava almak gibi herkes iyi sistem 
yazılımını "
 "ücretsiz bir şekilde edinebilecektir.<a href=\"#f2\">(2)</a>"
@@ -486,10 +504,15 @@
 "ücret almalısınız.\"</strong>"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If people would rather pay for GNU plus service than get GNU free without "
+#| "service, a company to provide just service to people who have obtained "
+#| "GNU free ought to be profitable.<a href=\"#f3\">(3)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
-"free ought to be profitable.<a href=\"#f3\">(3)</a>"
+"free ought to be profitable.<a href=\"#f3\">(4)</a>"
 msgstr ""
 "İnsanlar, ek hizmetler içermeyen özgür GNU’yu almaktan ek hizmetleri 
içeren "
 "GNU'ya ödeme yapmayı tercih ederlerse, GNU’yu özgür olarak edinen 
insanlara "
@@ -591,11 +614,17 @@
 "reklamdan kâr yapan kullanıcılar program için ödeme yapacaktır. "
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "On the other hand, if many people get GNU from their friends, and such "
+#| "companies don't succeed, this will show that advertising was not really "
+#| "necessary to spread GNU.  Why is it that free market advocates don't want "
+#| "to let the free market decide this?<a href=\"#f4\">(4)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
 "necessary to spread GNU.  Why is it that free market advocates don't want to "
-"let the free market decide this?<a href=\"#f4\">(4)</a>"
+"let the free market decide this?<a href=\"#f4\">(5)</a>"
 msgstr ""
 "Diğer taraftan, birçok insan GNU’yu arkadaşlarından edinirse ve bu gibi 
"
 "firmalar başarılı olamazsa, bu durum, GNU’yu yaymak için reklam 
vermenin "
@@ -629,9 +658,13 @@
 "işe atılmanızı engelleyecektir."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "I would like to see GNU development supported by gifts from many "
+#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
-"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
+"manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
 msgstr ""
 "Her birine ilişkin maliyeti düşürerek birçok kullanıcıdan ve 
üreticiden "
 "gelen hediyelerle GNU’nun gelişimini görmek isterdim.<a 
href=\"#f5\">(5)</a>"
@@ -744,9 +777,17 @@
 "şimdiki kadar çok ödeme yapılmayacaktır."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis <a href=\"#f8\">(8)</a> because it brings in the "
+#| "most money.  If it were prohibited, or rejected by the customer, software "
+#| "business would move to other bases of organization which are now used "
+#| "less often.  There are always numerous ways to organize any kind of "
+#| "business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis <a href=\"#f8\">(8)</a> because it brings in the most "
+"the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
 "money.  If it were prohibited, or rejected by the customer, software "
 "business would move to other bases of organization which are now used less "
 "often.  There are always numerous ways to organize any kind of business."
@@ -790,9 +831,16 @@
 "getirmek için kullanılır."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "People who have studied the issue of intellectual property rights<a href="
+#| "\"#f6\">(6)</a> carefully (such as lawyers) say that there is no "
+#| "intrinsic right to intellectual property.  The kinds of supposed "
+#| "intellectual property rights that the government recognizes were created "
+#| "by specific acts of legislation for specific purposes."
 msgid ""
 "People who have studied the issue of intellectual property rights<a href="
-"\"#f6\">(6)</a> carefully (such as lawyers) say that there is no intrinsic "
+"\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
 "right to intellectual property.  The kinds of supposed intellectual property "
 "rights that the government recognizes were created by specific acts of "
 "legislation for specific purposes."
@@ -1041,9 +1089,15 @@
 "gerekli olabilir."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "People with new ideas could distribute programs as freeware<a href=\"#f7"
+#| "\">(7)</a>, asking for donations from satisfied users, or selling hand-"
+#| "holding services.  I have met people who are already working this way "
+#| "successfully."
 msgid ""
 "People with new ideas could distribute programs as freeware<a href=\"#f7\">"
-"(7)</a>, asking for donations from satisfied users, or selling hand-holding "
+"(9)</a>, asking for donations from satisfied users, or selling hand-holding "
 "services.  I have met people who are already working this way successfully."
 msgstr ""
 "Yeni fikirlere sahip insanlar, freeware (ücretsiz)<a href=\"#f7\">(7)</a> "
@@ -1194,6 +1248,30 @@
 "kullanımı konusunda diğer insanlarla işbirliği yapma özgürlüğüne 
sahiptir."
 
 # type: Content of: <ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f2a\"></a>The expression ``give away'' is another indication "
+#| "that I had not yet clearly separated the issue of price from that of "
+#| "freedom.  We now recommend avoiding this expression when talking about "
+#| "free software.  See <a href=\"/philosophy/words-to-avoid."
+#| "html#GiveAwaySoftware\"> <q>Confusing Words and Phrases</q></a> for more "
+#| "explanation."
+msgid ""
+"<a name=\"f2a\"></a>The expression &ldquo;give away&rdquo; is another "
+"indication that I had not yet clearly separated the issue of price from that "
+"of freedom.  We now recommend avoiding this expression when talking about "
+"free software.  See <a href=\"/philosophy/words-to-avoid."
+"html#GiveAwaySoftware\"> <q>Confusing Words and Phrases</q></a> for more "
+"explanation."
+msgstr ""
+"<a name=\"f2a\"></a>\"Vermek\" [:give away] ifadesi, ücret ve özgürlük "
+"arasındaki ayrımın doğru konulmadığını gösteren bir başka 
belirtidir.  "
+"Günümüzde özgür yazılımdan bahsederken bu ifadeden kaçınmanızı 
öneriyoruz. "
+"Ayrıntılı bir açıklama için <a href=\"/philosophy/words-to-avoid."
+"html#GiveAwaySoftware\"> <q>kafa karıştıran kelimeler ve ifadeler</q></a> "
+"bağlantısını ziyaret ediniz."
+
+# type: Content of: <ol><li>
 msgid ""
 "<a name=\"f2\"></a>This is another place I failed to distinguish carefully "
 "between the two different meanings of &ldquo;free&rdquo;.  The statement as "
@@ -1208,21 +1286,6 @@
 "anlamı ifade etmektedir."
 
 # type: Content of: <ol><li>
-msgid ""
-"<a name=\"f2a\"></a>The expression ``give away'' is another indication that "
-"I had not yet clearly separated the issue of price from that of freedom.  We "
-"now recommend avoiding this expression when talking about free software.  "
-"See <a href=\"/philosophy/words-to-avoid.html#GiveAwaySoftware\"> "
-"<q>Confusing Words and Phrases</q></a> for more explanation."
-msgstr ""
-"<a name=\"f2a\"></a>\"Vermek\" [:give away] ifadesi, ücret ve özgürlük "
-"arasındaki ayrımın doğru konulmadığını gösteren bir başka 
belirtidir.  "
-"Günümüzde özgür yazılımdan bahsederken bu ifadeden kaçınmanızı 
öneriyoruz. "
-"Ayrıntılı bir açıklama için <a href=\"/philosophy/words-to-avoid."
-"html#GiveAwaySoftware\"> <q>kafa karıştıran kelimeler ve ifadeler</q></a> "
-"bağlantısını ziyaret ediniz."
-
-# type: Content of: <ol><li>
 msgid "<a name=\"f3\"></a>Several such companies now exist."
 msgstr "Buna benzer bir çok şirket günümüzde vardır."
 
@@ -1248,6 +1311,26 @@
 
 # type: Content of: <ol><li>
 msgid ""
+"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
+"software was the most common basis for making money in software.  It seems "
+"that actually the most common business model was and is development of "
+"custom software.  That does not offer the possibility of collecting rents, "
+"so the business has to keep doing real work in order to keep getting "
+"income.  The custom software business would continue to exist, more or less "
+"unchanged, in a free software world.  Therefore, I no longer expect that "
+"most paid programmers would earn less in a free software world."
+msgstr ""
+"<a name=\"f8\"></a>Özel mülk yazılımın yazılımda en yaygın para 
kazanma yolu "
+"olduğunu söylemekle yanılmışım. Gerçekte en yaygın iş modeli 
özelleştirilmiş "
+"yazılım geliştirilmesidir. Bu kiraların toplanması olasılığını "
+"önermemektedir, böylece firmalar getiri edinmeye yönelik olarak gerçek "
+"çalışmayı sürdürmelidir. Özelleştirilmiş yazılım iş dünyası 
özgür yazılım "
+"dünyasında da varolmaya devam edecektir, fazla veya az değişmeden. Bu "
+"yüzden, çoğu ücretli programcının özgür yazılım dünyasında daha 
az "
+"kazanmasını artık beklemiyorum."
+
+# type: Content of: <ol><li>
+msgid ""
 "<a name=\"f6\"></a>In the 1980s I had not yet realized how confusing it was "
 "to speak of &ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  "
 "That term is obviously biased; more subtle is the fact that it lumps "
@@ -1284,26 +1367,6 @@
 "değildir. Daha fazla açıklama için <a href=\"/philosophy/words-to-avoid."
 "html#Freeware\">kafa karıştıran kelimeler ve ifadeler</a>e ziyaret ediniz."
 
-# type: Content of: <ol><li>
-msgid ""
-"<a name=\"f8\"></a>I think I was mistaken in saying that proprietary "
-"software was the most common basis for making money in software.  It seems "
-"that actually the most common business model was and is development of "
-"custom software.  That does not offer the possibility of collecting rents, "
-"so the business has to keep doing real work in order to keep getting "
-"income.  The custom software business would continue to exist, more or less "
-"unchanged, in a free software world.  Therefore, I no longer expect that "
-"most paid programmers would earn less in a free software world."
-msgstr ""
-"<a name=\"f8\"></a>Özel mülk yazılımın yazılımda en yaygın para 
kazanma yolu "
-"olduğunu söylemekle yanılmışım. Gerçekte en yaygın iş modeli 
özelleştirilmiş "
-"yazılım geliştirilmesidir. Bu kiraların toplanması olasılığını "
-"önermemektedir, böylece firmalar getiri edinmeye yönelik olarak gerçek "
-"çalışmayı sürdürmelidir. Özelleştirilmiş yazılım iş dünyası 
özgür yazılım "
-"dünyasında da varolmaya devam edecektir, fazla veya az değişmeden. Bu "
-"yüzden, çoğu ücretli programcının özgür yazılım dünyasında daha 
az "
-"kazanmasını artık beklemiyorum."
-
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"

Index: people/po/people.es.po
===================================================================
RCS file: /web/www/www/people/po/people.es.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- people/po/people.es.po      28 Feb 2010 21:25:49 -0000      1.6
+++ people/po/people.es.po      23 Mar 2010 20:25:50 -0000      1.7
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: people.es\n"
-"POT-Creation-Date: 2010-02-22 04:25-0500\n"
+"POT-Creation-Date: 2010-03-23 16:25-0300\n"
 "PO-Revision-Date: 2010-02-28 19:06+0100\n"
 "Last-Translator: Xavier Reina <address@hidden>\n"
 "Language-Team: Español <address@hidden>\n"
@@ -63,9 +63,15 @@
 "escribir sus datos."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "If you are looking in particular for someone to give a speech or "
+#| "participate in an event to represent the GNU Project or the Free Software "
+#| "Movement, please <a href=\"/people/speakers.html\">see our speaker page</"
+#| "a>."
 msgid ""
 "If you are looking in particular for someone to give a speech or participate "
-"in an event to represent the GNU Project or the Free Software Movement, "
+"in an event to represent the GNU Project or the free software movement, "
 "please <a href=\"/people/speakers.html\">see our speaker page</a>."
 msgstr ""
 "Si está buscando a alguien para impartir una conferencia o para participar "
@@ -1253,11 +1259,19 @@
 msgstr "Franco Iacomella &lt;yaco (at) gnu.org&gt;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "He is an universitary investigator of Argentina. He is involved in "
+#| "multiple GNUs subprojects in relation with politics, licences, "
+#| "documentation, translations and education. Franco also usually speaks "
+#| "conferences about GNU Project and Free Software Movement. More "
+#| "information about his work in his <a href=\"http://francoiacomella.org";
+#| "\">personal site</a>."
 msgid ""
 "He is an universitary investigator of Argentina. He is involved in multiple "
 "GNUs subprojects in relation with politics, licences, documentation, "
 "translations and education. Franco also usually speaks conferences about GNU "
-"Project and Free Software Movement. More information about his work in his "
+"Project and free software movement. More information about his work in his "
 "<a href=\"http://francoiacomella.org\";>personal site</a>."
 msgstr ""
 "Es un investigador universitario de Argentina. Está involucrado en 
múltiples "
@@ -1628,12 +1642,21 @@
 "address@hidden">&lt;address@hidden&gt;</a>"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Jason is the designer, author and current mainter for GNU.FREE, a heavy "
+#| "duty internet voting system. He currently lives in Brighton, UK and works "
+#| "on various projects including his story-telling site <a href=\"http://www.";
+#| "thecouch.org\">the couch</a>.<br /> He is active in the environmental, "
+#| "human rights and Free Software movements and enjoys speaking &amp; "
+#| "writing about the issues they encompass. In his spare time he is a keen "
+#| "fencer, his preferred weapon being the sabre."
 msgid ""
 "Jason is the designer, author and current mainter for GNU.FREE, a heavy duty "
 "internet voting system. He currently lives in Brighton, UK and works on "
 "various projects including his story-telling site <a href=\"http://www.";
 "thecouch.org\">the couch</a>.<br /> He is active in the environmental, human "
-"rights and Free Software movements and enjoys speaking &amp; writing about "
+"rights and free software movements and enjoys speaking &amp; writing about "
 "the issues they encompass. In his spare time he is a keen fencer, his "
 "preferred weapon being the sabre."
 msgstr ""
@@ -2333,8 +2356,15 @@
 "it&gt;</a>"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Has been a user of GNU/Linux systems and a proud Free Software advocate "
+#| "since 1995. His current main interests are programming languages and "
+#| "their implementation.  He's author and maintainer of <a href=\"/software/"
+#| "epsilon\">GNU epsilon</a>, a purely functional language implementation.  "
+#| "Luca lives, studies and works in Tuscany, Italy."
 msgid ""
-"Has been a user of GNU/Linux systems and a proud Free Software advocate "
+"Has been a user of GNU/Linux systems and a proud free software advocate "
 "since 1995. His current main interests are programming languages and their "
 "implementation.  He's author and maintainer of <a href=\"/software/epsilon"
 "\">GNU epsilon</a>, a purely functional language implementation.  Luca "
@@ -2356,13 +2386,21 @@
 "href=\"mailto:address@hidden";>address@hidden</a>&gt;"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Formerly administered web pages written in other languages apart from "
+#| "English.  Also coordinated the <a href=\"/server/standards/README."
+#| "translations.html\">translation efforts</a> until he retired in 2003, "
+#| "also being <a href=\"/people/webmeisters.html\">listed as Webmaster</a>. "
+#| "He volunteers since 1999 and lives currently in Germany. Occasionally "
+#| "gives speeches about Free Software."
 msgid ""
 "Formerly administered web pages written in other languages apart from "
 "English.  Also coordinated the <a href=\"/server/standards/README."
 "translations.html\">translation efforts</a> until he retired in 2003, also "
 "being <a href=\"/people/webmeisters.html\">listed as Webmaster</a>. He "
 "volunteers since 1999 and lives currently in Germany. Occasionally gives "
-"speeches about Free Software."
+"speeches about free software."
 msgstr ""
 "Solía administrar páginas web escritas en idiomas distintos del inglés. "
 "Coordinaba los <a href=\"/server/standards/README.translations.html"
@@ -3056,9 +3094,14 @@
 msgstr "<a href=\"http://www.zerobeat.in\";>Ramakrishnan Muthukrishnan</a>"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Was one of the GNU webmasters. He is a strong supporter and advocate of "
+#| "Free Software and is also one of the <a href=\"http://www.debian.org\"; "
+#| ">Debian</a> Developers."
 msgid ""
-"Was one of the GNU webmasters. He is a strong supporter and advocate of Free "
-"Software and is also one of the <a href=\"http://www.debian.org\"; >Debian</"
+"Was one of the GNU webmasters. He is a strong supporter and advocate of free "
+"software and is also one of the <a href=\"http://www.debian.org\"; >Debian</"
 "a> Developers."
 msgstr ""
 "Fue uno de los webmasters de GNU. es un fuerte defensor y partidario del "
@@ -3662,9 +3705,13 @@
 "coordinar y enviar traducciones, correcciones o mejoras de este artículo."
 
 # type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2006, "
+#| "2007, 2008, 2009 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2006, 2007, "
-"2008, 2009 Free Software Foundation, Inc."
+"2008, 2009, 2010 Free Software Foundation, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2006, 2007, "
 "2008, 2009, 2010 Free Software Foundation, Inc."

Index: people/po/people.pot
===================================================================
RCS file: /web/www/www/people/po/people.pot,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- people/po/people.pot        22 Feb 2010 09:25:33 -0000      1.29
+++ people/po/people.pot        23 Mar 2010 20:25:51 -0000      1.30
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-22 04:25-0500\n"
+"POT-Creation-Date: 2010-03-23 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"
@@ -50,7 +50,7 @@
 # type: Content of: <p>
 msgid ""
 "If you are looking in particular for someone to give a speech or participate "
-"in an event to represent the GNU Project or the Free Software Movement, "
+"in an event to represent the GNU Project or the free software movement, "
 "please <a href=\"/people/speakers.html\">see our speaker page</a>."
 msgstr ""
 
@@ -960,7 +960,7 @@
 "He is an universitary investigator of Argentina. He is involved in multiple "
 "GNUs subprojects in relation with politics, licences, documentation, "
 "translations and education. Franco also usually speaks conferences about GNU "
-"Project and Free Software Movement. More information about his work in his "
+"Project and free software movement. More information about his work in his "
 "<a href=\"http://francoiacomella.org\";>personal site</a>."
 msgstr ""
 
@@ -1257,7 +1257,7 @@
 "internet voting system. He currently lives in Brighton, UK and works on "
 "various projects including his story-telling site <a "
 "href=\"http://www.thecouch.org\";>the couch</a>.<br /> He is active in the "
-"environmental, human rights and Free Software movements and enjoys speaking "
+"environmental, human rights and free software movements and enjoys speaking "
 "&amp; writing about the issues they encompass. In his spare time he is a "
 "keen fencer, his preferred weapon being the sabre."
 msgstr ""
@@ -1782,7 +1782,7 @@
 
 # type: Content of: <p>
 msgid ""
-"Has been a user of GNU/Linux systems and a proud Free Software advocate "
+"Has been a user of GNU/Linux systems and a proud free software advocate "
 "since 1995. His current main interests are programming languages and their "
 "implementation.  He's author and maintainer of <a "
 "href=\"/software/epsilon\">GNU epsilon</a>, a purely functional language "
@@ -1803,7 +1803,7 @@
 "until he retired in 2003, also being <a "
 "href=\"/people/webmeisters.html\">listed as Webmaster</a>. He volunteers "
 "since 1999 and lives currently in Germany. Occasionally gives speeches about "
-"Free Software."
+"free software."
 msgstr ""
 
 # type: Content of: <h3>
@@ -2329,8 +2329,8 @@
 
 # type: Content of: <p>
 msgid ""
-"Was one of the GNU webmasters. He is a strong supporter and advocate of Free "
-"Software and is also one of the <a href=\"http://www.debian.org\"; "
+"Was one of the GNU webmasters. He is a strong supporter and advocate of free "
+"software and is also one of the <a href=\"http://www.debian.org\"; "
 ">Debian</a> Developers."
 msgstr ""
 
@@ -2800,7 +2800,7 @@
 # type: Content of: <div><p>
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2004, 2005, 2006, 2007, "
-"2008, 2009 Free Software Foundation, Inc."
+"2008, 2009, 2010 Free Software Foundation, Inc."
 msgstr ""
 
 # type: Content of: <div><p>

Index: philosophy/po/freedom-or-copyright.fa.po
===================================================================
RCS file: /web/www/www/philosophy/po/freedom-or-copyright.fa.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/freedom-or-copyright.fa.po    16 Dec 2009 09:26:52 -0000      
1.3
+++ philosophy/po/freedom-or-copyright.fa.po    23 Mar 2010 20:25:53 -0000      
1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: freedom-or-copyright.html\n"
-"POT-Creation-Date: 2009-12-16 04:25-0500\n"
+"POT-Creation-Date: 2010-03-23 16:25-0300\n"
 "PO-Revision-Date: 2009-04-18 00:05+0330\n"
 "Last-Translator: Abbas Esmaeeli Some'eh <address@hidden>\n"
 "Language-Team: Persian <address@hidden>\n"
@@ -73,11 +73,11 @@
 #| "and offered the possibility of unlimited access to all sorts of "
 #| "data&mdash;an information utopia."
 msgid ""
-"More recently, humanity has developed a new way of distributing information: "
-"computers and networks.  They facilitate copying and manipulating "
-"information, including software, musical recordings, books, and movies, and "
-"offer the possibility of unlimited access to all sorts of data&mdash;an "
-"information utopia."
+"Now we have a new way of distributing information: computers and networks.  "
+"Their benefit is that they facilitate copying and manipulating information, "
+"including software, musical recordings, books, and movies.  They offer the "
+"possibility of unlimited access to all sorts of data&mdash;an information "
+"utopia."
 msgstr ""
 "امروزه، بشر روش نوینی را برای انتشار 
اطلاعات ابداع کرده است: کامپیوترها و "
 "شبکه‌ها. این دو کپی‌برداری و دستکاری 
اطلاعات، شامل نرم‌افزار، موسیقی، کتاب، و "
@@ -112,10 +112,12 @@
 "In a democracy, a law that prohibits a popular and useful activity is "
 "usually soon relaxed. Not so where corporations have political power.  The "
 "publishers' lobby was determined to prevent the public from taking advantage "
-"of the power of their computers, and found copyright a suitable tool.  Under "
+"of the power of their computers, and found copyright a handy weapon.  Under "
 "their influence, rather than relaxing copyright rules to suit the new "
-"circumstances, governments made them stricter than ever, forbidding the act "
-"of sharing."
+"circumstances, governments made them stricter than ever, imposing harsh "
+"penalties on the practice of sharing.  The latest fashion in supporting the "
+"publishers against the citizens, known as ``three strikes'', is to cut off "
+"people's internet connections if they share."
 msgstr ""
 "در حکومت دموکراسی، قانونی که یک فعالیت عم
ومی و مفید را منع کند به سرعت تغییر "
 "می‌کند. و شرکت‌های بزرگ قدرت سیاسی 
ندارند. انجمن ناشران تصمیم گرفتند که "
@@ -125,13 +127,23 @@
 "اشتراک گذاری ممنوع شد."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "But that wasn't the worst of it.  Computers can be powerful tools of "
+#| "domination when developers control the software that people run.  The "
+#| "publishers realized that by publishing works in encrypted format, which "
+#| "only specially authorized software could view, they could gain "
+#| "unprecedented power: they could compel readers to pay, and identify "
+#| "themselves, every time they read a book, listen to a song, or watch a "
+#| "video."
 msgid ""
 "But that wasn't the worst of it.  Computers can be powerful tools of "
-"domination when developers control the software that people run.  The "
-"publishers realized that by publishing works in encrypted format, which only "
-"specially authorized software could view, they could gain unprecedented "
-"power: they could compel readers to pay, and identify themselves, every time "
-"they read a book, listen to a song, or watch a video."
+"domination when software suppliers deny users the control of the software "
+"they run.  The publishers realized that by publishing works in encrypted "
+"format, which only specially authorized software could view, they could gain "
+"unprecedented power: they could compel readers to pay, and identify "
+"themselves, every time they read a book, listen to a song, or watch a "
+"video.  That is the publishers' dream: a pay-per-view universe."
 msgstr ""
 "اما بدترین قسمتش اینجا نبود. هنگامی که 
توسعه‌دهندگان کنترل برنامه‌ای را که "
 "اشخاص اجرا می‌کنند به دست داشته باشند، کام
پیوتر به ابزاری قدرتمند برای سلطه "
@@ -165,6 +177,18 @@
 "نامیده می‌شود.) حتی گوش کردن به موسیقی و یا 
مطالعه بدون تایید آنان، ممنوع است."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "We still have the same old freedoms in using paper books and other analog "
+#| "media.  But if e-books replace printed books, those freedoms will not "
+#| "transfer.  Imagine: no more used book stores; no more lending a book to "
+#| "your friend; no more borrowing one from the public library&mdash;no more "
+#| "&ldquo;leaks&rdquo; that might give someone a chance to read without "
+#| "paying.  No more purchasing a book anonymously with cash&mdash;you can "
+#| "only buy an e-book with a credit card.  That is the world the publishers "
+#| "want for us.  If you buy the Amazon Kindle (we call it the Swindle) or "
+#| "the Sony Reader (we call it the Shreader for what it threatens to do to "
+#| "books), you pay to establish that world."
 msgid ""
 "We still have the same old freedoms in using paper books and other analog "
 "media.  But if e-books replace printed books, those freedoms will not "
@@ -172,10 +196,10 @@
 "friend; no more borrowing one from the public library&mdash;no more &ldquo;"
 "leaks&rdquo; that might give someone a chance to read without paying.  No "
 "more purchasing a book anonymously with cash&mdash;you can only buy an e-"
-"book with a credit card.  That is the world the publishers want for us.  If "
-"you buy the Amazon Kindle (we call it the Swindle) or the Sony Reader (we "
-"call it the Shreader for what it threatens to do to books), you pay to "
-"establish that world."
+"book with a credit card.  That is the world the publishers want to impose on "
+"us.  If you buy the Amazon Kindle (we call it the Swindle) or the Sony "
+"Reader (we call it the Shreader for what it threatens to do to books), you "
+"pay to establish that world."
 msgstr ""
 "ما هنوز هم هنگام استفاده از کتاب‌های چاپی 
و یا رسانه‌های آنالوگ آزادی‌های قدیم "
 "خود را داریم. اما اگر کتاب‌های چاپی با 
نسخهٔ الکترونیکی جایگزین شوند، این "
@@ -192,14 +216,32 @@
 
 # type: Content of: <p>
 msgid ""
+"The Swindle even has an orwellian back door that can be used to erase books "
+"remotely.  Amazon demonstrated this capability by erasing copies, purchased "
+"from Amazon, of Orwell's book 1984.  Evidently Amazon's name for this "
+"product reflects the intention to burn our books."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Public anger against DRM is slowly growing, held back because propaganda "
+#| "terms such as <a href=\"/philosophy/words-to-avoid.html\">&ldquo;protect "
+#| "authors&rdquo;</a> and <a href=\"/philosophy/not-ipr.html\">&ldquo;"
+#| "intellectual property&rdquo;</a> have convinced readers that their rights "
+#| "do not count.  These terms implicitly assume that publishers deserve "
+#| "special power in the name of the authors, that we are morally obliged to "
+#| "bow to them, and that we have wronged someone if we read or listen to "
+#| "anything without paying."
+msgid ""
 "Public anger against DRM is slowly growing, held back because propaganda "
-"terms such as <a href=\"/philosophy/words-to-avoid.html\">&ldquo;protect "
-"authors&rdquo;</a> and <a href=\"/philosophy/not-ipr.html\">&ldquo;"
+"expressions such as <a href=\"/philosophy/words-to-avoid.html\">&ldquo;"
+"protect authors&rdquo;</a> and <a href=\"/philosophy/not-ipr.html\">&ldquo;"
 "intellectual property&rdquo;</a> have convinced readers that their rights do "
 "not count.  These terms implicitly assume that publishers deserve special "
 "power in the name of the authors, that we are morally obliged to bow to "
-"them, and that we have wronged someone if we read or listen to anything "
-"without paying."
+"them, and that we have wronged someone if we see or hear anything without "
+"paying for permission."
 msgstr ""
 "خشم عمومی بر علیه DRM که به آهستگی افزایش م
ی‌یابد، توسط اصطلاحات تبلیغاتی "
 "همانند <a href=\"/philosophy/words-to-avoid.html\">&rdquo;حفاظت 
از "
@@ -226,11 +268,17 @@
 "یک کشتی می‌دانند."
 
 # type: Content of: <p>
-msgid ""
-"They also tell us that a cruel War on Sharing is the only way to keep art "
-"alive.  Even if true, it would not justify such cruelty; but it isn't true.  "
-"Public sharing of copies tends to increase the sales of most works, and "
-"decrease sales only for the most successful ten percent."
+#, fuzzy
+#| msgid ""
+#| "They also tell us that a cruel War on Sharing is the only way to keep art "
+#| "alive.  Even if true, it would not justify such cruelty; but it isn't "
+#| "true.  Public sharing of copies tends to increase the sales of most "
+#| "works, and decrease sales only for the most successful ten percent."
+msgid ""
+"They also tell us that a War on Sharing is the only way to keep art alive.  "
+"Even if true, it would not justify the policy; but it isn't true.  Public "
+"sharing of copies is likely to increase the sales of most works, and "
+"decrease sales only for big hits."
 msgstr ""
 "آنها همچنین به ما می‌گویند که حملهٔ 
بی‌رحمانه به اشتراک گذاری تنها راه زنده "
 "نگاه داشتن هنر است. حتی اگر این امر درست 
باشد که نیست، توجیه کنندهٔ چنین "
@@ -252,16 +300,15 @@
 #| "album with permission to share copies</a> and made 750,000 dollars in a "
 #| "few days."
 msgid ""
-"But bestsellers also can still do well without stopping sharing.  Stephen "
-"King got hundreds of thousands of dollars selling an unencrypted e-book with "
-"no obstacle to copying and sharing.  The singer Issa, aka. Jane Siberry, "
-"asks people to <a href=\"http://www.sheeba.ca/store/help.php#sdp\";> choose "
-"their own prices</a> when they download songs, and averages more per "
-"download than the usual $0.99.  Radiohead made millions in 2007 by inviting "
-"fans to copy an album and pay what they wished, while it was also shared "
-"through P2P.  In 2008, <a href=\"http://www.boingboing.net/2008/03/05/nine-";
-"inch-nails-made.html\"> Nine Inch Nails released an album with permission to "
-"share copies</a> and made 750,000 dollars in a few days."
+"Bestsellers can still do well without forbidding sharing.  Stephen King got "
+"hundreds of thousands of dollars selling an unencrypted e-book serial with "
+"no obstacle to copying and sharing.  (He was dissatisfied with that amount "
+"and called the experiment a failure, but it looks like a success to me.)  "
+"Radiohead made millions in 2007 by inviting fans to copy an album and pay "
+"what they wished, while it was also shared through P2P.  In 2008, <a href="
+"\"http://www.boingboing.net/2008/03/05/nine-inch-nails-made.html\";> Nine "
+"Inch Nails released an album with permission to share copies</a> and made "
+"750,000 dollars in a few days."
 msgstr ""
 "اما پرفروش‌ترین‌ها نیز می‌توانند بدون م
توقف ساختن به اشتراک گذاری خوب عمل کنند. "
 "Stephen King صدها هزار دلار از فروش نسخهٔ 
الکترونیکی کتاب خود که رمزگذاری "
@@ -278,14 +325,33 @@
 
 # type: Content of: <p>
 msgid ""
+"The possibility of success without oppression is not limited to "
+"bestsellers.  Many artists of various levels of fame now make an adequate "
+"living through <a href=\" http://www.techdirt.com/";
+"articles/20091119/1634117011.shtml\">voluntary support</a>: donations and "
+"merchandise purchases of their fans.  Kevin Kelly estimates the artist need "
+"only find around <a href=\"http://www.kk.org/thetechnium/";
+"archives/2008/03/1000_true_fans.php\"> 1,000 true fans</a>."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "When computer networks provide an easy anonymous method for sending "
+#| "someone a small amount of money, without a credit card, it will be easy "
+#| "to set up a much better system to support the arts.  When you view a "
+#| "work, there will be a button you can press saying &ldquo;Click here to "
+#| "send the artist one dollar&rdquo;.  Wouldn't you press it, at least once "
+#| "a week? But voluntary contributions from fans can already support an "
+#| "artist; Kevin Kelly estimates the artist need only find approximately <a "
+#| "href=\"http://www.kk.org/thetechnium/archives/2008/03/1000_true_fans.php";
+#| "\"> 1,000 true fans</a>."
+msgid ""
 "When computer networks provide an easy anonymous method for sending someone "
 "a small amount of money, without a credit card, it will be easy to set up a "
 "much better system to support the arts.  When you view a work, there will be "
 "a button you can press saying &ldquo;Click here to send the artist one "
-"dollar&rdquo;.  Wouldn't you press it, at least once a week? But voluntary "
-"contributions from fans can already support an artist; Kevin Kelly estimates "
-"the artist need only find approximately <a href=\"http://www.kk.org/";
-"thetechnium/archives/2008/03/1000_true_fans.php\"> 1,000 true fans</a>."
+"dollar&rdquo;.  Wouldn't you press it, at least once a week?"
 msgstr ""
 "هنگامی که شبکه‌های کامپیوتری روشی را برای 
ارسال مقدار کمی پول به شخص دیگری به "
 "صورت ناشناس و بدون استفاده از کارت اعتباری 
فراهم آوردند، برپایی سیستمی برای "
@@ -314,18 +380,19 @@
 #| "to support a large number of other artists.  This system will use our tax "
 #| "money efficiently to support art."
 msgid ""
-"Another good way to support music and the arts is with a <a href=\"dat.html"
-"\"> tax on blank media</a>.  If the state distributes the tax money entirely "
-"to the artists, it will not be wasted on corporate executives.  But the "
-"state should not distribute it in linear proportion to popularity, because "
-"that would give most of it to a few superstars, leaving little to support "
-"all the other artists.  I therefore recommend using a cube-root function or "
-"something similar.  With cube root, a superstar with 1000 times the "
-"popularity of a successful artist will get 10 times as much, instead of 1000 "
-"times as much.  This way, although each superstar gets a larger share than "
-"the other artists, the superstars together will get only a small fraction of "
-"the money, leaving most of it to support a large number of other artists.  "
-"This system will use our tax money efficiently to support the arts."
+"Another good way to support music and the arts is with <a href=\"dat.html"
+"\">tax funds</a>&mdash;perhaps a tax on blank media or on Internet "
+"connectivity.  The state should distribute the tax money entirely to the "
+"artists, not waste it on corporate executives.  But the state should not "
+"distribute it in linear proportion to popularity, because that would give "
+"most of it to a few superstars, leaving little to support all the other "
+"artists.  I therefore recommend using a cube-root function or something "
+"similar.  With linear proportion, superstar A with 1000 times the popularity "
+"of a successful artist B will get 1000 times as much money as B.  With the "
+"cube root, A will get 10 times as much as B.  Thus, each superstar gets a "
+"larger share than a less popular artist, but most of the funds go to the "
+"artists who really need this support.  This system will use our tax money "
+"efficiently to support the arts."
 msgstr ""
 "روش خوب دیگری برای حمایت از موسیقی و هنر <a 
href=\"dat.html\">دریافت مالیات "
 "از رسانه‌های خام</a> است. اگر کشور م
الیات‌های کسب شده را کاملا به هنرمندان "
@@ -343,10 +410,25 @@
 
 # type: Content of: <p>
 msgid ""
+"The <a href=\"http://mecenat-global.org\";>Global Patronage</a> proposal "
+"combines aspects of those two systems, incorporating mandatory payments with "
+"voluntary allocation among artists."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "To make copyright fit the network age, we should legalize the "
+#| "noncommercial copying and sharing of all published works, and prohibit "
+#| "DRM.  But until we win this battle, you must protect yourself: don't buy "
+#| "any products with DRM unless you personally have the means to break the "
+#| "DRM and make copies."
+msgid ""
 "To make copyright fit the network age, we should legalize the noncommercial "
 "copying and sharing of all published works, and prohibit DRM.  But until we "
 "win this battle, you must protect yourself: don't buy any products with DRM "
-"unless you personally have the means to break the DRM and make copies."
+"unless you personally have the means to break the DRM.  Never use a product "
+"designed to attack your freedom unless you can nullify the attack."
 msgstr ""
 "برای تبدیل کپی‌رایت به قانونی متناسب با 
عصر شبکه، کپی‌های غیر تجاری و به "
 "اشتراک گذاریِ آثار منتشر شده باید قانونی 
شوند، و DRM تحریم شود. اما تا هنگامی "
@@ -360,12 +442,19 @@
 msgstr " "
 
 # type: Content of: <div><p>
-msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
-"\"><em>address@hidden</em></a>.  There are also <a href=\"/contact/\">other "
-"ways to contact</a> the FSF.  <br /> Please send broken links and other "
-"corrections or suggestions to <a href=\"mailto:address@hidden";
-"\"><em>address@hidden</em></a>."
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
+#| "corrections or suggestions to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>."
+msgid ""
+"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
+"address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
+"contact</a> the FSF.  <br /> Please send broken links and other corrections "
+"or suggestions to <a href=\"mailto:address@hidden";>&lt;address@hidden"
+"org&gt;</a>."
 msgstr ""
 "لطفا سوالات و پرسش‌های خود در رابطه با گنو 
و بنیاد نرم‌افزارهای آزاد را به <a "
 "href=\"mailto:address@hidden";><em>address@hidden</em></a> ارسال 
کنید. همچنین <a "

Index: philosophy/po/freedom-or-copyright.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/freedom-or-copyright.fr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/freedom-or-copyright.fr.po    16 Dec 2009 09:26:53 -0000      
1.4
+++ philosophy/po/freedom-or-copyright.fr.po    23 Mar 2010 20:25:53 -0000      
1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: freedom-or-copyright.html\n"
-"POT-Creation-Date: 2009-12-16 04:25-0500\n"
+"POT-Creation-Date: 2010-03-23 16:25-0300\n"
 "PO-Revision-Date: 2009-01-06 13:54+0100\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -79,11 +79,11 @@
 #| "and offered the possibility of unlimited access to all sorts of "
 #| "data&mdash;an information utopia."
 msgid ""
-"More recently, humanity has developed a new way of distributing information: "
-"computers and networks.  They facilitate copying and manipulating "
-"information, including software, musical recordings, books, and movies, and "
-"offer the possibility of unlimited access to all sorts of data&mdash;an "
-"information utopia."
+"Now we have a new way of distributing information: computers and networks.  "
+"Their benefit is that they facilitate copying and manipulating information, "
+"including software, musical recordings, books, and movies.  They offer the "
+"possibility of unlimited access to all sorts of data&mdash;an information "
+"utopia."
 msgstr ""
 "Plus r&eacute;cemment, l'humanit&eacute; a d&eacute;velopp&eacute; une "
 "nouvelle mani&egrave;re de distribution de l'information&nbsp;: ordinateurs "
@@ -123,10 +123,12 @@
 "In a democracy, a law that prohibits a popular and useful activity is "
 "usually soon relaxed. Not so where corporations have political power.  The "
 "publishers' lobby was determined to prevent the public from taking advantage "
-"of the power of their computers, and found copyright a suitable tool.  Under "
+"of the power of their computers, and found copyright a handy weapon.  Under "
 "their influence, rather than relaxing copyright rules to suit the new "
-"circumstances, governments made them stricter than ever, forbidding the act "
-"of sharing."
+"circumstances, governments made them stricter than ever, imposing harsh "
+"penalties on the practice of sharing.  The latest fashion in supporting the "
+"publishers against the citizens, known as ``three strikes'', is to cut off "
+"people's internet connections if they share."
 msgstr ""
 "Dans une d&eacute;mocratie, une loi qui emp&ecirc;che une activit&eacute; "
 "populaire et utile est, normalement, rapidement assouplie. Mais pas "
@@ -138,13 +140,23 @@
 "endurcirent comme jamais, oubliant le partage."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "But that wasn't the worst of it.  Computers can be powerful tools of "
+#| "domination when developers control the software that people run.  The "
+#| "publishers realized that by publishing works in encrypted format, which "
+#| "only specially authorized software could view, they could gain "
+#| "unprecedented power: they could compel readers to pay, and identify "
+#| "themselves, every time they read a book, listen to a song, or watch a "
+#| "video."
 msgid ""
 "But that wasn't the worst of it.  Computers can be powerful tools of "
-"domination when developers control the software that people run.  The "
-"publishers realized that by publishing works in encrypted format, which only "
-"specially authorized software could view, they could gain unprecedented "
-"power: they could compel readers to pay, and identify themselves, every time "
-"they read a book, listen to a song, or watch a video."
+"domination when software suppliers deny users the control of the software "
+"they run.  The publishers realized that by publishing works in encrypted "
+"format, which only specially authorized software could view, they could gain "
+"unprecedented power: they could compel readers to pay, and identify "
+"themselves, every time they read a book, listen to a song, or watch a "
+"video.  That is the publishers' dream: a pay-per-view universe."
 msgstr ""
 "Mais ce ne fut pas le pire. Les ordinateurs peuvent &ecirc;tre des outils "
 "puissants de domination quand les developpeurs contr&ocirc;lent le programme "
@@ -183,6 +195,18 @@
 "&eacute;couter sans autorisation est interdit."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "We still have the same old freedoms in using paper books and other analog "
+#| "media.  But if e-books replace printed books, those freedoms will not "
+#| "transfer.  Imagine: no more used book stores; no more lending a book to "
+#| "your friend; no more borrowing one from the public library&mdash;no more "
+#| "&ldquo;leaks&rdquo; that might give someone a chance to read without "
+#| "paying.  No more purchasing a book anonymously with cash&mdash;you can "
+#| "only buy an e-book with a credit card.  That is the world the publishers "
+#| "want for us.  If you buy the Amazon Kindle (we call it the Swindle) or "
+#| "the Sony Reader (we call it the Shreader for what it threatens to do to "
+#| "books), you pay to establish that world."
 msgid ""
 "We still have the same old freedoms in using paper books and other analog "
 "media.  But if e-books replace printed books, those freedoms will not "
@@ -190,10 +214,10 @@
 "friend; no more borrowing one from the public library&mdash;no more &ldquo;"
 "leaks&rdquo; that might give someone a chance to read without paying.  No "
 "more purchasing a book anonymously with cash&mdash;you can only buy an e-"
-"book with a credit card.  That is the world the publishers want for us.  If "
-"you buy the Amazon Kindle (we call it the Swindle) or the Sony Reader (we "
-"call it the Shreader for what it threatens to do to books), you pay to "
-"establish that world."
+"book with a credit card.  That is the world the publishers want to impose on "
+"us.  If you buy the Amazon Kindle (we call it the Swindle) or the Sony "
+"Reader (we call it the Shreader for what it threatens to do to books), you "
+"pay to establish that world."
 msgstr ""
 "Nous avons toujours les m&ecirc;mes vieilles libert&eacute;s pour "
 "l'utilisation de livre papier ou autre m&eacute;dia analogique. Mais, si les "
@@ -212,14 +236,32 @@
 
 # type: Content of: <p>
 msgid ""
+"The Swindle even has an orwellian back door that can be used to erase books "
+"remotely.  Amazon demonstrated this capability by erasing copies, purchased "
+"from Amazon, of Orwell's book 1984.  Evidently Amazon's name for this "
+"product reflects the intention to burn our books."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Public anger against DRM is slowly growing, held back because propaganda "
+#| "terms such as <a href=\"/philosophy/words-to-avoid.html\">&ldquo;protect "
+#| "authors&rdquo;</a> and <a href=\"/philosophy/not-ipr.html\">&ldquo;"
+#| "intellectual property&rdquo;</a> have convinced readers that their rights "
+#| "do not count.  These terms implicitly assume that publishers deserve "
+#| "special power in the name of the authors, that we are morally obliged to "
+#| "bow to them, and that we have wronged someone if we read or listen to "
+#| "anything without paying."
+msgid ""
 "Public anger against DRM is slowly growing, held back because propaganda "
-"terms such as <a href=\"/philosophy/words-to-avoid.html\">&ldquo;protect "
-"authors&rdquo;</a> and <a href=\"/philosophy/not-ipr.html\">&ldquo;"
+"expressions such as <a href=\"/philosophy/words-to-avoid.html\">&ldquo;"
+"protect authors&rdquo;</a> and <a href=\"/philosophy/not-ipr.html\">&ldquo;"
 "intellectual property&rdquo;</a> have convinced readers that their rights do "
 "not count.  These terms implicitly assume that publishers deserve special "
 "power in the name of the authors, that we are morally obliged to bow to "
-"them, and that we have wronged someone if we read or listen to anything "
-"without paying."
+"them, and that we have wronged someone if we see or hear anything without "
+"paying for permission."
 msgstr ""
 "La col&egrave;re du public &agrave; propos des DRM cro&icirc;t doucement,"
 "ralentie par des termes de propagande comme <a href=\"/philosophy/words-to-"
@@ -247,11 +289,17 @@
 "assimilant l'aide &agrave; son voisin &agrave; une attaque de bateau."
 
 # type: Content of: <p>
-msgid ""
-"They also tell us that a cruel War on Sharing is the only way to keep art "
-"alive.  Even if true, it would not justify such cruelty; but it isn't true.  "
-"Public sharing of copies tends to increase the sales of most works, and "
-"decrease sales only for the most successful ten percent."
+#, fuzzy
+#| msgid ""
+#| "They also tell us that a cruel War on Sharing is the only way to keep art "
+#| "alive.  Even if true, it would not justify such cruelty; but it isn't "
+#| "true.  Public sharing of copies tends to increase the sales of most "
+#| "works, and decrease sales only for the most successful ten percent."
+msgid ""
+"They also tell us that a War on Sharing is the only way to keep art alive.  "
+"Even if true, it would not justify the policy; but it isn't true.  Public "
+"sharing of copies is likely to increase the sales of most works, and "
+"decrease sales only for big hits."
 msgstr ""
 "Ils nous disent aussi qu'une guerre cruelle contre la copie est la seule "
 "mani&egrave;re de garder l'art vivant. Quoi qu'il en soit, cela ne justifie "
@@ -275,16 +323,15 @@
 #| "album with permission to share copies</a> and made 750,000 dollars in a "
 #| "few days."
 msgid ""
-"But bestsellers also can still do well without stopping sharing.  Stephen "
-"King got hundreds of thousands of dollars selling an unencrypted e-book with "
-"no obstacle to copying and sharing.  The singer Issa, aka. Jane Siberry, "
-"asks people to <a href=\"http://www.sheeba.ca/store/help.php#sdp\";> choose "
-"their own prices</a> when they download songs, and averages more per "
-"download than the usual $0.99.  Radiohead made millions in 2007 by inviting "
-"fans to copy an album and pay what they wished, while it was also shared "
-"through P2P.  In 2008, <a href=\"http://www.boingboing.net/2008/03/05/nine-";
-"inch-nails-made.html\"> Nine Inch Nails released an album with permission to "
-"share copies</a> and made 750,000 dollars in a few days."
+"Bestsellers can still do well without forbidding sharing.  Stephen King got "
+"hundreds of thousands of dollars selling an unencrypted e-book serial with "
+"no obstacle to copying and sharing.  (He was dissatisfied with that amount "
+"and called the experiment a failure, but it looks like a success to me.)  "
+"Radiohead made millions in 2007 by inviting fans to copy an album and pay "
+"what they wished, while it was also shared through P2P.  In 2008, <a href="
+"\"http://www.boingboing.net/2008/03/05/nine-inch-nails-made.html\";> Nine "
+"Inch Nails released an album with permission to share copies</a> and made "
+"750,000 dollars in a few days."
 msgstr ""
 "D'ailleurs, les meilleurs vendeurs peuvent faire encore mieux. Stephen King "
 "a gagn&eacute; des centaines de milliers de dollars en vendant un livre "
@@ -302,14 +349,33 @@
 
 # type: Content of: <p>
 msgid ""
+"The possibility of success without oppression is not limited to "
+"bestsellers.  Many artists of various levels of fame now make an adequate "
+"living through <a href=\" http://www.techdirt.com/";
+"articles/20091119/1634117011.shtml\">voluntary support</a>: donations and "
+"merchandise purchases of their fans.  Kevin Kelly estimates the artist need "
+"only find around <a href=\"http://www.kk.org/thetechnium/";
+"archives/2008/03/1000_true_fans.php\"> 1,000 true fans</a>."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "When computer networks provide an easy anonymous method for sending "
+#| "someone a small amount of money, without a credit card, it will be easy "
+#| "to set up a much better system to support the arts.  When you view a "
+#| "work, there will be a button you can press saying &ldquo;Click here to "
+#| "send the artist one dollar&rdquo;.  Wouldn't you press it, at least once "
+#| "a week? But voluntary contributions from fans can already support an "
+#| "artist; Kevin Kelly estimates the artist need only find approximately <a "
+#| "href=\"http://www.kk.org/thetechnium/archives/2008/03/1000_true_fans.php";
+#| "\"> 1,000 true fans</a>."
+msgid ""
 "When computer networks provide an easy anonymous method for sending someone "
 "a small amount of money, without a credit card, it will be easy to set up a "
 "much better system to support the arts.  When you view a work, there will be "
 "a button you can press saying &ldquo;Click here to send the artist one "
-"dollar&rdquo;.  Wouldn't you press it, at least once a week? But voluntary "
-"contributions from fans can already support an artist; Kevin Kelly estimates "
-"the artist need only find approximately <a href=\"http://www.kk.org/";
-"thetechnium/archives/2008/03/1000_true_fans.php\"> 1,000 true fans</a>."
+"dollar&rdquo;.  Wouldn't you press it, at least once a week?"
 msgstr ""
 "Lorsque les r&eacute;seaux informatiques permettent une m&eacute;thode "
 "facile et anonyme pour envoyer &agrave; quelqu'un une petite somme d'argent, "
@@ -339,18 +405,19 @@
 #| "to support a large number of other artists.  This system will use our tax "
 #| "money efficiently to support art."
 msgid ""
-"Another good way to support music and the arts is with a <a href=\"dat.html"
-"\"> tax on blank media</a>.  If the state distributes the tax money entirely "
-"to the artists, it will not be wasted on corporate executives.  But the "
-"state should not distribute it in linear proportion to popularity, because "
-"that would give most of it to a few superstars, leaving little to support "
-"all the other artists.  I therefore recommend using a cube-root function or "
-"something similar.  With cube root, a superstar with 1000 times the "
-"popularity of a successful artist will get 10 times as much, instead of 1000 "
-"times as much.  This way, although each superstar gets a larger share than "
-"the other artists, the superstars together will get only a small fraction of "
-"the money, leaving most of it to support a large number of other artists.  "
-"This system will use our tax money efficiently to support the arts."
+"Another good way to support music and the arts is with <a href=\"dat.html"
+"\">tax funds</a>&mdash;perhaps a tax on blank media or on Internet "
+"connectivity.  The state should distribute the tax money entirely to the "
+"artists, not waste it on corporate executives.  But the state should not "
+"distribute it in linear proportion to popularity, because that would give "
+"most of it to a few superstars, leaving little to support all the other "
+"artists.  I therefore recommend using a cube-root function or something "
+"similar.  With linear proportion, superstar A with 1000 times the popularity "
+"of a successful artist B will get 1000 times as much money as B.  With the "
+"cube root, A will get 10 times as much as B.  Thus, each superstar gets a "
+"larger share than a less popular artist, but most of the funds go to the "
+"artists who really need this support.  This system will use our tax money "
+"efficiently to support the arts."
 msgstr ""
 "Un autre bon moyen d'aider la musique et les arts est une taxe sur les <a "
 "href=\"dat.fr.html\">supports vierges</a><sup><a href=\"#TransNote4\">4</a></"
@@ -370,10 +437,25 @@
 
 # type: Content of: <p>
 msgid ""
+"The <a href=\"http://mecenat-global.org\";>Global Patronage</a> proposal "
+"combines aspects of those two systems, incorporating mandatory payments with "
+"voluntary allocation among artists."
+msgstr ""
+
+# type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "To make copyright fit the network age, we should legalize the "
+#| "noncommercial copying and sharing of all published works, and prohibit "
+#| "DRM.  But until we win this battle, you must protect yourself: don't buy "
+#| "any products with DRM unless you personally have the means to break the "
+#| "DRM and make copies."
+msgid ""
 "To make copyright fit the network age, we should legalize the noncommercial "
 "copying and sharing of all published works, and prohibit DRM.  But until we "
 "win this battle, you must protect yourself: don't buy any products with DRM "
-"unless you personally have the means to break the DRM and make copies."
+"unless you personally have the means to break the DRM.  Never use a product "
+"designed to attack your freedom unless you can nullify the attack."
 msgstr ""
 "Pour que le droit d'auteur colle &agrave; l'&acirc;ge du r&eacute;seau, nous "
 "devrions interdire les DRM et l&eacute;galiser les copies ou partages non "
@@ -399,12 +481,19 @@
 "\">Supports vierges&nbsp;: CD, DVD vierges.</li></ol>"
 
 # type: Content of: <div><p>
-msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
-"\"><em>address@hidden</em></a>.  There are also <a href=\"/contact/\">other "
-"ways to contact</a> the FSF.  <br /> Please send broken links and other "
-"corrections or suggestions to <a href=\"mailto:address@hidden";
-"\"><em>address@hidden</em></a>."
+#, fuzzy
+#| msgid ""
+#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other "
+#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
+#| "corrections or suggestions to <a href=\"mailto:address@hidden";
+#| "\"><em>address@hidden</em></a>."
+msgid ""
+"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
+"address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
+"contact</a> the FSF.  <br /> Please send broken links and other corrections "
+"or suggestions to <a href=\"mailto:address@hidden";>&lt;address@hidden"
+"org&gt;</a>."
 msgstr ""
 "Veuillez envoyer les requêtes concernant la FSF et GNU à <a href=\"mailto:";
 "address@hidden"><em>address@hidden</em></a>. Il existe aussi <a 
href=\"/contact/"

Index: philosophy/po/freedom-or-copyright.pot
===================================================================
RCS file: /web/www/www/philosophy/po/freedom-or-copyright.pot,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/freedom-or-copyright.pot      16 Dec 2009 09:26:53 -0000      
1.3
+++ philosophy/po/freedom-or-copyright.pot      23 Mar 2010 20:25:53 -0000      
1.4
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-16 04:25-0500\n"
+"POT-Creation-Date: 2010-03-23 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"
@@ -46,11 +46,11 @@
 
 # type: Content of: <p>
 msgid ""
-"More recently, humanity has developed a new way of distributing information: "
-"computers and networks.  They facilitate copying and manipulating "
-"information, including software, musical recordings, books, and movies, and "
-"offer the possibility of unlimited access to all sorts of data&mdash;an "
-"information utopia."
+"Now we have a new way of distributing information: computers and networks.  "
+"Their benefit is that they facilitate copying and manipulating information, "
+"including software, musical recordings, books, and movies.  They offer the "
+"possibility of unlimited access to all sorts of data&mdash;an information "
+"utopia."
 msgstr ""
 
 # type: Content of: <p>
@@ -67,20 +67,23 @@
 "In a democracy, a law that prohibits a popular and useful activity is "
 "usually soon relaxed. Not so where corporations have political power.  The "
 "publishers' lobby was determined to prevent the public from taking advantage "
-"of the power of their computers, and found copyright a suitable tool.  Under "
+"of the power of their computers, and found copyright a handy weapon.  Under "
 "their influence, rather than relaxing copyright rules to suit the new "
-"circumstances, governments made them stricter than ever, forbidding the act "
-"of sharing."
+"circumstances, governments made them stricter than ever, imposing harsh "
+"penalties on the practice of sharing.  The latest fashion in supporting the "
+"publishers against the citizens, known as ``three strikes'', is to cut off "
+"people's internet connections if they share."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "But that wasn't the worst of it.  Computers can be powerful tools of "
-"domination when developers control the software that people run.  The "
-"publishers realized that by publishing works in encrypted format, which only "
-"specially authorized software could view, they could gain unprecedented "
-"power: they could compel readers to pay, and identify themselves, every time "
-"they read a book, listen to a song, or watch a video."
+"domination when software suppliers deny users the control of the software "
+"they run.  The publishers realized that by publishing works in encrypted "
+"format, which only specially authorized software could view, they could gain "
+"unprecedented power: they could compel readers to pay, and identify "
+"themselves, every time they read a book, listen to a song, or watch a "
+"video.  That is the publishers' dream: a pay-per-view universe."
 msgstr ""
 
 # type: Content of: <p>
@@ -101,22 +104,31 @@
 "friend; no more borrowing one from the public library&mdash;no more "
 "&ldquo;leaks&rdquo; that might give someone a chance to read without "
 "paying.  No more purchasing a book anonymously with cash&mdash;you can only "
-"buy an e-book with a credit card.  That is the world the publishers want for "
-"us.  If you buy the Amazon Kindle (we call it the Swindle) or the Sony "
-"Reader (we call it the Shreader for what it threatens to do to books), you "
-"pay to establish that world."
+"buy an e-book with a credit card.  That is the world the publishers want to "
+"impose on us.  If you buy the Amazon Kindle (we call it the Swindle) or the "
+"Sony Reader (we call it the Shreader for what it threatens to do to books), "
+"you pay to establish that world."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"The Swindle even has an orwellian back door that can be used to erase books "
+"remotely.  Amazon demonstrated this capability by erasing copies, purchased "
+"from Amazon, of Orwell's book 1984.  Evidently Amazon's name for this "
+"product reflects the intention to burn our books."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "Public anger against DRM is slowly growing, held back because propaganda "
-"terms such as <a href=\"/philosophy/words-to-avoid.html\">&ldquo;protect "
-"authors&rdquo;</a> and <a "
-"href=\"/philosophy/not-ipr.html\">&ldquo;intellectual property&rdquo;</a> "
-"have convinced readers that their rights do not count.  These terms "
-"implicitly assume that publishers deserve special power in the name of the "
-"authors, that we are morally obliged to bow to them, and that we have "
-"wronged someone if we read or listen to anything without paying."
+"expressions such as <a "
+"href=\"/philosophy/words-to-avoid.html\">&ldquo;protect authors&rdquo;</a> "
+"and <a href=\"/philosophy/not-ipr.html\">&ldquo;intellectual "
+"property&rdquo;</a> have convinced readers that their rights do not count.  "
+"These terms implicitly assume that publishers deserve special power in the "
+"name of the authors, that we are morally obliged to bow to them, and that we "
+"have wronged someone if we see or hear anything without paying for "
+"permission."
 msgstr ""
 
 # type: Content of: <p>
@@ -130,22 +142,20 @@
 
 # type: Content of: <p>
 msgid ""
-"They also tell us that a cruel War on Sharing is the only way to keep art "
-"alive.  Even if true, it would not justify such cruelty; but it isn't true.  "
-"Public sharing of copies tends to increase the sales of most works, and "
-"decrease sales only for the most successful ten percent."
+"They also tell us that a War on Sharing is the only way to keep art alive.  "
+"Even if true, it would not justify the policy; but it isn't true.  Public "
+"sharing of copies is likely to increase the sales of most works, and "
+"decrease sales only for big hits."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"But bestsellers also can still do well without stopping sharing.  Stephen "
-"King got hundreds of thousands of dollars selling an unencrypted e-book with "
-"no obstacle to copying and sharing.  The singer Issa, aka. Jane Siberry, "
-"asks people to <a href=\"http://www.sheeba.ca/store/help.php#sdp\";> choose "
-"their own prices</a> when they download songs, and averages more per "
-"download than the usual $0.99.  Radiohead made millions in 2007 by inviting "
-"fans to copy an album and pay what they wished, while it was also shared "
-"through P2P.  In 2008, <a "
+"Bestsellers can still do well without forbidding sharing.  Stephen King got "
+"hundreds of thousands of dollars selling an unencrypted e-book serial with "
+"no obstacle to copying and sharing.  (He was dissatisfied with that amount "
+"and called the experiment a failure, but it looks like a success to me.)  "
+"Radiohead made millions in 2007 by inviting fans to copy an album and pay "
+"what they wished, while it was also shared through P2P.  In 2008, <a "
 "href=\"http://www.boingboing.net/2008/03/05/nine-inch-nails-made.html\";> "
 "Nine Inch Nails released an album with permission to share copies</a> and "
 "made 750,000 dollars in a few days."
@@ -153,32 +163,47 @@
 
 # type: Content of: <p>
 msgid ""
+"The possibility of success without oppression is not limited to "
+"bestsellers.  Many artists of various levels of fame now make an adequate "
+"living through <a href=\" "
+"http://www.techdirt.com/articles/20091119/1634117011.shtml\";>voluntary "
+"support</a>: donations and merchandise purchases of their fans.  Kevin Kelly "
+"estimates the artist need only find around <a "
+"href=\"http://www.kk.org/thetechnium/archives/2008/03/1000_true_fans.php\";> "
+"1,000 true fans</a>."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
 "When computer networks provide an easy anonymous method for sending someone "
 "a small amount of money, without a credit card, it will be easy to set up a "
 "much better system to support the arts.  When you view a work, there will be "
 "a button you can press saying &ldquo;Click here to send the artist one "
-"dollar&rdquo;.  Wouldn't you press it, at least once a week? But voluntary "
-"contributions from fans can already support an artist; Kevin Kelly estimates "
-"the artist need only find approximately <a "
-"href=\"http://www.kk.org/thetechnium/archives/2008/03/1000_true_fans.php\";> "
-"1,000 true fans</a>."
+"dollar&rdquo;.  Wouldn't you press it, at least once a week?"
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Another good way to support music and the arts is with <a "
+"href=\"dat.html\">tax funds</a>&mdash;perhaps a tax on blank media or on "
+"Internet connectivity.  The state should distribute the tax money entirely "
+"to the artists, not waste it on corporate executives.  But the state should "
+"not distribute it in linear proportion to popularity, because that would "
+"give most of it to a few superstars, leaving little to support all the other "
+"artists.  I therefore recommend using a cube-root function or something "
+"similar.  With linear proportion, superstar A with 1000 times the popularity "
+"of a successful artist B will get 1000 times as much money as B.  With the "
+"cube root, A will get 10 times as much as B.  Thus, each superstar gets a "
+"larger share than a less popular artist, but most of the funds go to the "
+"artists who really need this support.  This system will use our tax money "
+"efficiently to support the arts."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Another good way to support music and the arts is with a <a "
-"href=\"dat.html\"> tax on blank media</a>.  If the state distributes the tax "
-"money entirely to the artists, it will not be wasted on corporate "
-"executives.  But the state should not distribute it in linear proportion to "
-"popularity, because that would give most of it to a few superstars, leaving "
-"little to support all the other artists.  I therefore recommend using a "
-"cube-root function or something similar.  With cube root, a superstar with "
-"1000 times the popularity of a successful artist will get 10 times as much, "
-"instead of 1000 times as much.  This way, although each superstar gets a "
-"larger share than the other artists, the superstars together will get only a "
-"small fraction of the money, leaving most of it to support a large number of "
-"other artists.  This system will use our tax money efficiently to support "
-"the arts."
+"The <a href=\"http://mecenat-global.org\";>Global Patronage</a> proposal "
+"combines aspects of those two systems, incorporating mandatory payments with "
+"voluntary allocation among artists."
 msgstr ""
 
 # type: Content of: <p>
@@ -186,7 +211,8 @@
 "To make copyright fit the network age, we should legalize the noncommercial "
 "copying and sharing of all published works, and prohibit DRM.  But until we "
 "win this battle, you must protect yourself: don't buy any products with DRM "
-"unless you personally have the means to break the DRM and make copies."
+"unless you personally have the means to break the DRM.  Never use a product "
+"designed to attack your freedom unless you can nullify the attack."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -197,10 +223,10 @@
 # type: Content of: <div><p>
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>.  There are also <a 
"
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a "
 "href=\"/contact/\">other ways to contact</a> the FSF.  <br /> Please send "
 "broken links and other corrections or suggestions to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>."
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
 
 # type: Content of: <div><p>

Index: philosophy/po/who-does-that-server-really-serve.pot
===================================================================
RCS file: philosophy/po/who-does-that-server-really-serve.pot
diff -N philosophy/po/who-does-that-server-really-serve.pot
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/po/who-does-that-server-really-serve.pot 23 Mar 2010 20:25:53 
-0000      1.1
@@ -0,0 +1,429 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <address@hidden>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2010-03-23 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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING"
+
+# type: Content of: <title>
+msgid ""
+"Who does that server really serve? - GNU Project - Free Software Foundation "
+"(FSF)"
+msgstr ""
+
+# type: Content of: <h2>
+msgid "Who does that server really serve?"
+msgstr ""
+
+# type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"(First published by <a href=\"http://bostonreview.net/BR35.2/stallman.php\";> "
+"Boston Review</a>.)"
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"<strong>On the Internet, proprietary software isn't the only way to lose "
+"your freedom.  Software as a Service is another way to let someone else have "
+"power over your computing.</strong>"
+msgstr ""
+
+# type: Content of: <h3>
+msgid "Background: How Proprietary Software Takes Away Your Freedom"
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Digital technology can give you freedom; it can also take your freedom "
+"away.  The first threat to our control over our computing came from "
+"<em>proprietary software</em>: software that the users cannot control "
+"because the owner (a company such as Apple or Microsoft)  controls it.  The "
+"owner often takes advantage of this unjust power by inserting malicious "
+"features such as spyware, back doors, and <a "
+"href=\"http://DefectiveByDesign.org\";>Digital Restrictions Management "
+"(DRM)</a> (referred to as &ldquo;Digital Rights Management&rdquo; in their "
+"propaganda)."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Our solution to this problem is developing <em>free software</em> and "
+"rejecting proprietary software.  Free software means that you, as a user, "
+"have four essential freedoms: (0)&nbsp;to run the program as you wish, "
+"(1)&nbsp;to study and change the source code so it does what you wish, "
+"(2)&nbsp;to redistribute exact copies, and (3)&nbsp;to redistribute copies "
+"of your modified versions.  (See the <a "
+"href=\"/philosophy/free-sw.html\">free software definition</a>.)"
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"With free software, we, the users, take back control of our computing.  "
+"Proprietary software still exists, but we can exclude it from our lives and "
+"many of us have done so.  However, we now face a new threat to our control "
+"over our computing: Software as a Service.  For our freedom's sake, we have "
+"to reject that too."
+msgstr ""
+
+# type: Content of: <h3>
+msgid "How Software as a Service Takes Away Your Freedom"
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Software as a Service (SaaS) means that someone sets up a network server "
+"that does certain computing tasks&mdash;running spreadsheets, word "
+"processing, translating text into another language, etc.&mdash;then invites "
+"users to do their computing on that server.  Users must send their data to "
+"the server, which returns the results."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"These servers wrest control from the users even more inexorably than "
+"proprietary software.  With proprietary software, users typically get an "
+"executable file but not the source code.  That makes it hard for programmers "
+"to study the code that is running, so it's hard to determine what the "
+"program really does, and hard to change it."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"With SaaS, the users do not have even the executable file: it is on the "
+"server, where the users can't see or touch it.  Thus it is impossible for "
+"them to ascertain what it really does, and impossible to change it."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Furthermore, SaaS automatically leads to harmful consequences equivalent to "
+"the malicious features of certain proprietary software.  For instance, some "
+"proprietary programs are &ldquo;spyware&rdquo;: the program sends data about "
+"users' computing activities to the program's owner.  Microsoft Windows sends "
+"information about users' activities to Microsoft.  Windows Media Player and "
+"RealPlayer report what user watches or listens to."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Unlike proprietary software, SaaS does not require covert code to obtain the "
+"user's data.  By the very nature of SaaS, users must send their data to the "
+"server."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"SaaS gives the same results as spyware because it requires users to send "
+"their data to the server.  The server operator gets all the data with no "
+"special effort, by the nature of SaaS."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Some proprietary programs can mistreat users under remote command.  For "
+"instance, Windows has a back door with which Microsoft can forcibly change "
+"any software on the machine.  The Amazon Kindle e-book reader (whose name "
+"suggests it's intended to burn people's books) has an Orwellian back door "
+"that Amazon used in 2009 to <a "
+"href=\"http://www.nytimes.com/2009/07/18/technology/companies/18amazon.html\"; 
"
+">remotely delete</a> many Kindle copies of Orwell's books 1984 and Animal "
+"Farm which people had purchased from Amazon."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"SaaS inherently gives the server operator the power to change the software "
+"in use, or the users' data being operated on.  Once again, no special code "
+"is needed to do this."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Thus, SaaS is equivalent to total spyware and a gaping wide back door, and "
+"gives the server operator unjust power over the user.  We can't accept that."
+msgstr ""
+
+# type: Content of: <h3>
+msgid "Untangling the SaaS Issue from the Proprietary Software Issue"
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"SaaS and proprietary software lead to similar harmful results, but the "
+"causal mechanisms are different.  With proprietary software, the cause is "
+"that you have and use a copy which is difficult or illegal to change.  With "
+"SaaS, the cause is that you use a copy you don't have."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"These two issues are often confused, and not only by accident.  Web "
+"developers use the vague term &ldquo;web application&rdquo; to lump the "
+"server software together with programs run on your machine in your browser.  "
+"Some web pages install nontrivial or even large JavaScript programs "
+"temporarily into your browser without informing you.  <a "
+"href=\"/philosophy/javascript-trap.html\">When these JavaScript programs are "
+"nonfree</a>, they are as bad as any other nonfree software.  Here, however, "
+"we are concerned with the problem of the server software itself."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Many free software supporters assume that the problem of SaaS will be solved "
+"by developing free software for servers.  For the server operator's sake, "
+"the programs on the server had better be free; if they are proprietary, "
+"their owners have power over the server.  That's unfair to the operator, and "
+"doesn't help you at all.  But if the programs on the server are free, that "
+"doesn't protect you <em>as the server's user</em> from the effects of SaaS.  "
+"They give freedom to the operator, but not to you."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Releasing the server software source code does benefit the community: "
+"suitably skilled users can set up similar servers, perhaps changing the "
+"software.  But none of these servers would give you control over computing "
+"you do on it, unless it's <em>your</em> server.  The rest would all be "
+"SaaS.  SaaS always subjects you to the power of the server operator, and the "
+"only remedy is, <em>don't use SaaS</em>! Don't use someone else's server to "
+"do your own computing on data provided by you."
+msgstr ""
+
+# type: Content of: <h3>
+msgid "Distinguishing SaaS from Other Network Services"
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Does condemning SaaS mean rejecting all network server? Not at all.  Most "
+"servers do not raise this issue, because the job you do with them isn't your "
+"own computing except in a trivial sense."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"The original purpose of web servers wasn't to do computing for you, it was "
+"to publish information for you to access.  Even today this is what most web "
+"sites do, and it doesn't pose the SaaS problem, because accessing someone's "
+"published information isn't a matter of doing your own computing.  Neither "
+"is publishing your own materials via a blog site or a micro-blogging service "
+"such as Twitter.  The same goes for communication not meant to be private, "
+"such as chat groups.  Social networking can extend into SaaS; however, at "
+"root it is just a method of communication and publication, not SaaS.  If you "
+"use the service for minor editing of what you're going to communicate, that "
+"is not a significant issue."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Services such as search engines collect data from around the web and let you "
+"examine it.  Looking through their collection of data isn't your own "
+"computing in the usual sense, so these services are not SaaS."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"E-commerce is not SaaS, because the computing isn't solely yours; rather, it "
+"is done jointly for you and another party.  So there's no particular reason "
+"why you alone should expect to control that computing.  The real issue in "
+"E-commerce is whether you trust the other party with your money and personal "
+"information."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Using a joint project's servers isn't SaaS because the computing you do in "
+"this way isn't yours personally.  For instance, if you edit pages on "
+"Wikipedia, you are not doing your own computing; rather, you are "
+"collaborating in Wikipedia's computing."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Wikipedia controls its own servers, but groups can face the problem of SaaS "
+"if they do their group activities on someone else's server.  Fortunately, "
+"development hosting sites such as Savannah and Sourceforge don't pose the "
+"SaaS problem, because what groups do there is mainly publication and public "
+"communication, rather than their own private computing."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Multiplayer games are a group activity carried out on someone else's server, "
+"which makes them SaaS.  But where the data involved is just the state of "
+"play and the score, the worst wrong the operator might commit is "
+"favoritism.  You might well ignore that risk, since it seems unlikely and "
+"very little is at stake.  On the other hand, when the game becomes more than "
+"just a game, the issue changes."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Which online services are SaaS? Google Docs is a clear example.  Its basic "
+"activity is editing, and Google encourages people to use it for their own "
+"editing; this is SaaS.  It offers the added feature of collaborative "
+"editing. but adding participants doesn't alter the fact that editing on the "
+"server is SaaS.  (In addition, Google Docs is unacceptable because it "
+"installs a large nonfree JavaScript program into the users' browsers.)  If "
+"using a service for communication or collaboration requires doing "
+"substantial parts of your own computing with it too, that computing is SaaS "
+"even if the communication is not."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Some sites offer multiple services, and if one is not SaaS, another may be "
+"SaaS.  For instance, the main service of Facebook is social networking, and "
+"that is not SaaS; however, it supports third-party applications, some of "
+"which may be SaaS.  Flickr's main service is distributing photos, which is "
+"not SaaS, but it also has features for editing photos, which is SaaS."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Some sites whose main service is publication and communication extend it "
+"with &ldquo;contact management&rdquo;: keeping track of people you have "
+"relationships with.  Sending mail to those people for you is not SaaS, but "
+"keeping track of your dealings with them, if substantial, is SaaS."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"If a service is not SaaS, that does not mean it is ok.  There are other bad "
+"things a service can do.  For instance, Facebook distributes video in Flash, "
+"which pressures users to run nonfree software, and it gives users a "
+"misleading impression of privacy.  Those are important issues too, but this "
+"article's concern is the issue of SaaS."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"The IT industry discourages users from considering these distinctions.  "
+"That's what the buzzword &ldquo;cloud computing&rdquo; is for.  This term is "
+"so nebulous that it could refer to almost any use of the Internet.  It "
+"includes SaaS and it includes nearly everything else.  The term only lends "
+"itself to uselessly broad statements."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"The real meaning of &ldquo;cloud computing&rdquo; is to suggest a "
+"devil-may-care approach towards your computing.  It says, &ldquo;Don't ask "
+"questions, just trust every business without hesitation.  Don't worry about "
+"who controls your computing or who holds your data.  Don't check for a hook "
+"hidden inside our service before you swallow it.&rdquo; In other words, "
+"&ldquo;Think like a sucker.&rdquo; I prefer to avoid the term."
+msgstr ""
+
+# type: Content of: <h3>
+msgid "Dealing with the SaaS Problem"
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"Only a small fraction of all web sites do SaaS; most don't raise the issue.  "
+"But what should we do about the ones that raise it?"
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"For the simple case, where you are doing your own computing on data in your "
+"own hands, the solution is simple: use your own copy of a free software "
+"application.  Do your text editing with your copy of a free text editor such "
+"as GNU Emacs or a free word processor.  Do your photo editing with your copy "
+"of free software such as GIMP."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"But what about collaborating with other individuals? It may be hard to do "
+"this at present without using a server.  If you use one, don't trust a "
+"server run by a company.  A mere contract as a customer is no protection "
+"unless you could detect a breach and could really sue, and the company "
+"probably writes its contracts to permit a broad range of abuses.  Police can "
+"subpoena your data from the company with less basis than required to "
+"subpoena them from you, supposing the company doesn't volunteer them like "
+"the US phone companies that illegally wiretapped their customers for Bush.  "
+"If you must use a server, use a server whose operators give you a basis for "
+"trust beyond a mere commercial relationship."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"However, on a longer time scale, we can create alternatives to using "
+"servers.  For instance, we can create a distributed program through which "
+"collaborators can share data encrypted.  The free software community should "
+"develop distributed peer-to-peer replacements for important &ldquo;web "
+"applications&rdquo;.  It may be wise to release them under the <a "
+"href=\"/licenses/why-affero-gpl.html\"> GNU Affero GPL</a>, since they are "
+"likely candidates for being converted into server-based programs by someone "
+"else.  The <a href=\"/\">GNU project</a> is looking for volunteers to work "
+"on such replacements.  We also invite other free software projects to "
+"consider this issue in their design."
+msgstr ""
+
+# type: Content of: <p>
+msgid ""
+"In the meantime, if a company invites you to use its server to do your own "
+"computing tasks, don't yield; don't use SaaS.  Don't buy or install "
+"&ldquo;thin clients&rdquo;, which are simply computers so weak they make you "
+"do the real work on someone else's server.  Use a real computer and keep "
+"your data there.  Do your work with your own copy of a free program, for "
+"your freedom's sake."
+msgstr ""
+
+#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
+# type: Content of: <div>
+msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
+msgstr ""
+
+# type: Content of: <div><p>
+msgid ""
+"Please send FSF &amp; GNU inquiries to <a "
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a "
+"href=\"/contact/\">other ways to contact</a> the FSF.  <br /> Please send "
+"broken links and other corrections or suggestions to <a "
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+msgstr ""
+
+# type: Content of: <div><p>
+msgid ""
+"Please see the <a "
+"href=\"/server/standards/README.translations.html\">Translations README</a> "
+"for information on coordinating and submitting translations of this article."
+msgstr ""
+
+# type: Content of: <div><p>
+msgid ""
+"Copyright &copy; 2010 Richard Stallman <br /> Verbatim copying and "
+"distribution of this entire article is permitted in any medium, provided "
+"this notice is preserved."
+msgstr ""
+
+#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
+# type: Content of: <div><div>
+msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
+msgstr ""
+
+#.  timestamp start 
+# type: Content of: <div><p>
+msgid "Updated:"
+msgstr ""
+
+# type: Content of: <div><h4>
+msgid "Translations of this page"
+msgstr ""




reply via email to

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