www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/gnu/po initial-announcement.ar.po initial-a...

From: Yavor Doganov
Subject: www/gnu/po initial-announcement.ar.po initial-a...
Date: Mon, 14 Dec 2009 21:25:44 +0000 
CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   09/12/14 21:25:44

Modified files:
        gnu/po         : initial-announcement.ar.po 
                         initial-announcement.bg.po 
                         initial-announcement.ca.po 
                         initial-announcement.fr.po 
                         initial-announcement.it.po 
                         initial-announcement.pot manifesto.ar.po 
                         manifesto.ca.po manifesto.fr.po manifesto.pot 
                         manifesto.sr.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.ar.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.bg.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.ca.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.fr.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.it.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/initial-announcement.pot?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ar.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ca.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.fr.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.pot?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.sr.po?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: initial-announcement.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.ar.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- initial-announcement.ar.po  18 Oct 2009 08:26:33 -0000      1.4
+++ initial-announcement.ar.po  14 Dec 2009 21:25:35 -0000      1.5
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2009-10-18 04:25-0300\n"
+"POT-Creation-Date: 2009-12-14 16:25-0500\n"
 "PO-Revision-Date: 2009-09-02 22:03+0200\n"
 "Last-Translator: Hossam Hossny <address@hidden>\n"
 "Language-Team: Arabic <>\n"
@@ -31,17 +31,23 @@
 #| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27th 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27th 1983."
+"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "هذا هو الإعلاني الأصلي لمشروع غنو، كتبه <a 
href=\"http://www.stallman.org/";
 "\">ريتشارد ستولمن</a> في السابع والعشرين من 
سبتمبر 1983."
 
 # type: Content of: <p>
-msgid ""
-"The history of the GNU Project is in many ways different from this initial "
-"plan. For example, the beginning was delayed until January, 1984 and several "
-"of the details about <a href=\"/philosophy/free-sw.html\">free software</a> "
-"had not yet been clarified."
+#, fuzzy
+#| msgid ""
+#| "The history of the GNU Project is in many ways different from this "
+#| "initial plan. For example, the beginning was delayed until January, 1984 "
+#| "and several of the details about <a href=\"/philosophy/free-sw.html"
+#| "\">free software</a> had not yet been clarified."
+msgid ""
+"The actual history of the GNU Project differs in many ways from this initial "
+"plan. For example, the beginning was delayed until January, 1984.  Several "
+"of the philosophical concepts of <a href=\"/philosophy/free-sw.html\">free "
+"software</a> had not yet been clarified."
 msgstr ""
 "إن تاريخ غنو مختلف من جوانب عديدةعن هذه 
الخطة المبدئية. على سبيل المثال، أُخّر "
 "تاريخ البدء إلى يناير 1984 ولم تكن تقاصيل 
عديدة تتعلق  <a href=\"/philosophy/"

Index: initial-announcement.bg.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.bg.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- initial-announcement.bg.po  28 Oct 2009 14:51:26 -0000      1.6
+++ initial-announcement.bg.po  14 Dec 2009 21:25:35 -0000      1.7
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2009-10-18 04:25-0300\n"
+"POT-Creation-Date: 2009-12-14 16:25-0500\n"
 "PO-Revision-Date: 2009-10-28 11:37+0200\n"
 "Last-Translator: Yavor Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -26,19 +26,29 @@
 msgstr "Първоначално обявление"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27th 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27th 1983."
+"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Това е оригиналното обявление на проекта 
GNU, изпратено от <a href=\"http://";
 "www.stallman.org/\">Ричард Столман</a> на 27 
септември 1983 г."
 
 # type: Content of: <p>
-msgid ""
-"The history of the GNU Project is in many ways different from this initial "
-"plan. For example, the beginning was delayed until January, 1984 and several "
-"of the details about <a href=\"/philosophy/free-sw.html\">free software</a> "
-"had not yet been clarified."
+#, fuzzy
+#| msgid ""
+#| "The history of the GNU Project is in many ways different from this "
+#| "initial plan. For example, the beginning was delayed until January, 1984 "
+#| "and several of the details about <a href=\"/philosophy/free-sw.html"
+#| "\">free software</a> had not yet been clarified."
+msgid ""
+"The actual history of the GNU Project differs in many ways from this initial "
+"plan. For example, the beginning was delayed until January, 1984.  Several "
+"of the philosophical concepts of <a href=\"/philosophy/free-sw.html\">free "
+"software</a> had not yet been clarified."
 msgstr ""
 "Историята на проекта GNU се различава доста 
от този първоначален план.  "
 "Например, началото бе отложено до януари 
1984 г., и някои от подробностите "

Index: initial-announcement.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.ca.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- initial-announcement.ca.po  18 Oct 2009 08:26:33 -0000      1.6
+++ initial-announcement.ca.po  14 Dec 2009 21:25:35 -0000      1.7
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2009-10-18 04:25-0300\n"
+"POT-Creation-Date: 2009-12-14 16:25-0500\n"
 "PO-Revision-Date: 2009-01-25 19:01+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -29,17 +29,23 @@
 #| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27th 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27th 1983."
+"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Aquest és l'anunci inicial del Projecte GNU, escrit per <a 
href=\"http://www.";
 "stallman.org/\">Richard Stallman</a> el 1983."
 
 # type: Content of: <p>
-msgid ""
-"The history of the GNU Project is in many ways different from this initial "
-"plan. For example, the beginning was delayed until January, 1984 and several "
-"of the details about <a href=\"/philosophy/free-sw.html\">free software</a> "
-"had not yet been clarified."
+#, fuzzy
+#| msgid ""
+#| "The history of the GNU Project is in many ways different from this "
+#| "initial plan. For example, the beginning was delayed until January, 1984 "
+#| "and several of the details about <a href=\"/philosophy/free-sw.html"
+#| "\">free software</a> had not yet been clarified."
+msgid ""
+"The actual history of the GNU Project differs in many ways from this initial "
+"plan. For example, the beginning was delayed until January, 1984.  Several "
+"of the philosophical concepts of <a href=\"/philosophy/free-sw.html\">free "
+"software</a> had not yet been clarified."
 msgstr ""
 "La història del Projecte GNU és en molts aspectes diferent d'aquest pla "
 "inicial. Per exemple, el començament es va retardar fins a gener de 1984 i "

Index: initial-announcement.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.fr.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- initial-announcement.fr.po  30 Oct 2009 08:25:47 -0000      1.6
+++ initial-announcement.fr.po  14 Dec 2009 21:25:35 -0000      1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2009-10-18 04:25-0300\n"
+"POT-Creation-Date: 2009-12-14 16:25-0500\n"
 "PO-Revision-Date: 2009-10-28 16:51+0100\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -24,19 +24,29 @@
 msgstr "Annonce initiale"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27th 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27th 1983."
+"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Ceci est l'annonce originale du Projet GNU, &eacute;crite par <a href="
 "\"http://www.stallman.org/\";>Richard Stallman</a> le 27 septembre 1983."
 
 # type: Content of: <p>
-msgid ""
-"The history of the GNU Project is in many ways different from this initial "
-"plan. For example, the beginning was delayed until January, 1984 and several "
-"of the details about <a href=\"/philosophy/free-sw.html\">free software</a> "
-"had not yet been clarified."
+#, fuzzy
+#| msgid ""
+#| "The history of the GNU Project is in many ways different from this "
+#| "initial plan. For example, the beginning was delayed until January, 1984 "
+#| "and several of the details about <a href=\"/philosophy/free-sw.html"
+#| "\">free software</a> had not yet been clarified."
+msgid ""
+"The actual history of the GNU Project differs in many ways from this initial "
+"plan. For example, the beginning was delayed until January, 1984.  Several "
+"of the philosophical concepts of <a href=\"/philosophy/free-sw.html\">free "
+"software</a> had not yet been clarified."
 msgstr ""
 "L'histoire du Projet GNU diff&egrave;re en beaucoup de points de ce plan "
 "initial. Par exemple, le d&eacute;but a &eacute;t&eacute; report&eacute; en "

Index: initial-announcement.it.po
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.it.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- initial-announcement.it.po  26 Oct 2009 08:26:40 -0000      1.17
+++ initial-announcement.it.po  14 Dec 2009 21:25:36 -0000      1.18
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: initial-announcement.html\n"
-"POT-Creation-Date: 2009-10-18 04:25-0300\n"
+"POT-Creation-Date: 2009-12-14 16:25-0500\n"
 "PO-Revision-Date: 2009-10-25 22:00+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -22,19 +22,29 @@
 msgstr "Annuncio iniziale"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "This is the original announcement of the GNU Project, posted by <a href="
+#| "\"http://www.stallman.org/\";>Richard Stallman</a> on September 27th 1983."
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a href="
-"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27th 1983."
+"\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, 1983."
 msgstr ""
 "Questo è l'annuncio ufficiale del progetto GNU, inviato da <a href=\"http://";
 "www.stallman.org/\">Richard Stallman</a> il 27 settembre 1983."
 
 # type: Content of: <p>
-msgid ""
-"The history of the GNU Project is in many ways different from this initial "
-"plan. For example, the beginning was delayed until January, 1984 and several "
-"of the details about <a href=\"/philosophy/free-sw.html\">free software</a> "
-"had not yet been clarified."
+#, fuzzy
+#| msgid ""
+#| "The history of the GNU Project is in many ways different from this "
+#| "initial plan. For example, the beginning was delayed until January, 1984 "
+#| "and several of the details about <a href=\"/philosophy/free-sw.html"
+#| "\">free software</a> had not yet been clarified."
+msgid ""
+"The actual history of the GNU Project differs in many ways from this initial "
+"plan. For example, the beginning was delayed until January, 1984.  Several "
+"of the philosophical concepts of <a href=\"/philosophy/free-sw.html\">free "
+"software</a> had not yet been clarified."
 msgstr ""
 "La storia del progetto GNU è in vari modi diversa da questo piano iniziale. "
 "Per esempio l'inizio del progetto ebbe luogo con qualche mese di ritardo, "

Index: initial-announcement.pot
===================================================================
RCS file: /web/www/www/gnu/po/initial-announcement.pot,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- initial-announcement.pot    18 Oct 2009 08:26:33 -0000      1.4
+++ initial-announcement.pot    14 Dec 2009 21:25:36 -0000      1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-10-18 04:25-0300\n"
+"POT-Creation-Date: 2009-12-14 16:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -26,16 +26,16 @@
 # type: Content of: <p>
 msgid ""
 "This is the original announcement of the GNU Project, posted by <a "
-"href=\"http://www.stallman.org/\";>Richard Stallman</a> on September 27th "
+"href=\"http://www.stallman.org/\";>Richard Stallman</a> on September 27, "
 "1983."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"The history of the GNU Project is in many ways different from this initial "
-"plan. For example, the beginning was delayed until January, 1984 and several "
-"of the details about <a href=\"/philosophy/free-sw.html\">free software</a> "
-"had not yet been clarified."
+"The actual history of the GNU Project differs in many ways from this initial "
+"plan. For example, the beginning was delayed until January, 1984.  Several "
+"of the philosophical concepts of <a href=\"/philosophy/free-sw.html\">free "
+"software</a> had not yet been clarified."
 msgstr ""
 
 # type: Content of: <h3>

Index: manifesto.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ar.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- manifesto.ar.po     21 Sep 2009 20:25:52 -0000      1.5
+++ manifesto.ar.po     14 Dec 2009 21:25:36 -0000      1.6
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto\n"
-"POT-Creation-Date: 2009-09-17 16:25-0300\n"
+"POT-Creation-Date: 2009-12-14 16:25-0500\n"
 "PO-Revision-Date: 2009-09-21 10:50+0200\n"
 "Last-Translator: Hossam Hossny <address@hidden>\n"
 "Language-Team: Arabic\n"
@@ -39,9 +39,14 @@
 "كما شاهده معظم الناس."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Since that time, we have learned about certain common misunderstandings "
+#| "that different wording could help avoid.  Footnotes added in 1993 help "
+#| "clarify these points."
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
-"different wording could help avoid.  Footnotes added in 1993 help clarify "
+"different wording could help avoid.  Footnotes added since 1993 help clarify "
 "these points."
 msgstr ""
 "ومنذ ذلك الحين، اكتشفنا إساءة فهم معينة 
ناتجة عن صياغة يمكن تفاديها. أضيفت "
@@ -165,11 +170,19 @@
 "في معهد يتبع هذه الأساليب معي وبرفض مني."
 
 # 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."
 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."
+"AI lab to deny MIT any legal excuse to prevent me from giving GNU away <a "
+"href=\"#f2a\">(2a)</a>."
 msgstr ""
 "ولأستمر في استخدام الحواسيب دون عار، 
قرّرت أن أضع كيانًا كافيًا للبرمجيات الحرة "
 "لأتمكن من المضي قدمًا بدون أي برمجيات غير 
حرة. استقلت من معهد الذكاء "
@@ -669,12 +682,19 @@
 "البرمجة؛ لكن ليس بالقدر الذي يجنونه اليوم."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis 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 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."
+"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."
 msgstr ""
 "تقييد النسخ ليس الأساس الوحيد لتجارة البرم
جيات. يعتبر أكثر الأسس شيوعًا لأنه "
 "الأكثر جذبًا للمال. لو أن هذا الأسلوب مم
نوع أو يرفضه الزبائن فإن تجارة "
@@ -1087,15 +1107,30 @@
 "لكنها لا تنفي الفهم الخاطئ."
 
 # 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>توجد شركات عديدة كهذه اليوم."
 
 # type: Content of: <ol><li>
-msgid ""
-"<a name=\"f4\"></a>The Free Software Foundation for 10 years raised most of "
-"its funds from a distribution service, although it is a charity rather than "
-"a company.  You can <a href=\"/order/order.html\">order things from the FSF</"
-"a>."
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f4\"></a>The Free Software Foundation for 10 years raised most "
+#| "of its funds from a distribution service, although it is a charity rather "
+#| "than a company.  You can <a href=\"/order/order.html\">order things from "
+#| "the FSF</a>."
+msgid ""
+"<a name=\"f4\"></a> Although it is a charity rather than a company, the Free "
+"Software Foundation for 10 years raised most of its funds from its "
+"distribution service.  You can <a href=\"/order/order.html\">order things "
+"from the FSF</a> to support its work."
 msgstr ""
 "<a name=\"f4\"></a>جمعت مؤسسة البرمجيات الحرة طوال 
العشر سنوات [الماضية] "
 "معظم أموالها من خدمة التوزيع، على الرغم من 
أنها مؤسسة خيرية وليست شركة. "
@@ -1110,9 +1145,21 @@
 "صيانة مصرّف غنو للسي."
 
 # type: Content of: <ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f6\"></a>In the 80s 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 together various disparate laws which raise very different "
+#| "issues.  Nowadays I urge people to reject the term &ldquo;intellectual "
+#| "property&rdquo; entirely, lest it lead others to suppose that those laws "
+#| "form one coherent issue.  The way to be clear is to discuss patents, "
+#| "copyrights, and trademarks separately.  See <a href=\"/philosophy/not-ipr."
+#| "html\">further explanation</a> of how this term spreads confusion and "
+#| "bias."
 msgid ""
-"<a name=\"f6\"></a>In the 80s I had not yet realized how confusing it was to "
-"speak of &ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  "
+"<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 "
 "together various disparate laws which raise very different issues.  Nowadays "
 "I urge people to reject the term &ldquo;intellectual property&rdquo; "
@@ -1131,13 +1178,21 @@
 "اللغط والانحياز."
 
 # 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=\"f7\"></a>Subsequently we have learned to distinguish between "
-"&ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+"<a name=\"f7\"></a>Subsequently we 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."
+"software.  See <a href=\"/philosophy/words-to-avoid.html#Freeware\"> "
+"<q>Confusing Words and Phrases</q></a> for more explanation."
 msgstr ""
 "<a name=\"f7\"></a>تعلمنا لاحقًا التفريق بين 
&rdquo;البرمجيات الحرة&ldquo; "
 "(بالإنجليزية &rdquo;free software&ldquo;) و&rdquo;البرامج 
المجانية&ldquo; "
@@ -1146,6 +1201,18 @@
 "الكود المصدري، ولذا فإن معظمها ليس حرًا. 
راجع <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: manifesto.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ca.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- manifesto.ca.po     17 Sep 2009 20:25:56 -0000      1.3
+++ manifesto.ca.po     14 Dec 2009 21:25:36 -0000      1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.ca\n"
-"POT-Creation-Date: 2009-09-17 16:25-0300\n"
+"POT-Creation-Date: 2009-12-14 16:25-0500\n"
 "PO-Revision-Date: 2009-04-20 20:16+0200\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -38,9 +38,14 @@
 "gent."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Since that time, we have learned about certain common misunderstandings "
+#| "that different wording could help avoid.  Footnotes added in 1993 help "
+#| "clarify these points."
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
-"different wording could help avoid.  Footnotes added in 1993 help clarify "
+"different wording could help avoid.  Footnotes added since 1993 help clarify "
 "these points."
 msgstr ""
 "Des d'aleshores, hem après que és possible ajudar a evitar certes 
confusions "
@@ -181,11 +186,19 @@
 "terme contra la meva voluntat."
 
 # 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."
 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."
+"AI lab to deny MIT any legal excuse to prevent me from giving GNU away <a "
+"href=\"#f2a\">(2a)</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ç "
@@ -745,12 +758,19 @@
 "com ara."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis 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 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."
+"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."
 msgstr ""
 "Restringir la còpia no és l'única base per al negoci del programari. És 
la "
 "més comuna perquè permet guanyar molts diners. Si aquesta es prohibís, o 
fos "
@@ -1211,15 +1231,30 @@
 "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."
 
 # type: Content of: <ol><li>
-msgid ""
-"<a name=\"f4\"></a>The Free Software Foundation for 10 years raised most of "
-"its funds from a distribution service, although it is a charity rather than "
-"a company.  You can <a href=\"/order/order.html\">order things from the FSF</"
-"a>."
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f4\"></a>The Free Software Foundation for 10 years raised most "
+#| "of its funds from a distribution service, although it is a charity rather "
+#| "than a company.  You can <a href=\"/order/order.html\">order things from "
+#| "the FSF</a>."
+msgid ""
+"<a name=\"f4\"></a> Although it is a charity rather than a company, the Free "
+"Software Foundation for 10 years raised most of its funds from its "
+"distribution service.  You can <a href=\"/order/order.html\">order things "
+"from the FSF</a> to support its work."
 msgstr ""
 "<a name=\"f4\"></a>La Free Software Foundation durant 10 anys ha aconseguit "
 "la major part dels seus fons d'un servei de distribució, encara que és més 
"
@@ -1236,9 +1271,21 @@
 "GNU."
 
 # type: Content of: <ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f6\"></a>In the 80s 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 together various disparate laws which raise very different "
+#| "issues.  Nowadays I urge people to reject the term &ldquo;intellectual "
+#| "property&rdquo; entirely, lest it lead others to suppose that those laws "
+#| "form one coherent issue.  The way to be clear is to discuss patents, "
+#| "copyrights, and trademarks separately.  See <a href=\"/philosophy/not-ipr."
+#| "html\">further explanation</a> of how this term spreads confusion and "
+#| "bias."
 msgid ""
-"<a name=\"f6\"></a>In the 80s I had not yet realized how confusing it was to "
-"speak of &ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  "
+"<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 "
 "together various disparate laws which raise very different issues.  Nowadays "
 "I urge people to reject the term &ldquo;intellectual property&rdquo; "
@@ -1258,13 +1305,21 @@
 "de com aquest terme provoca confusió i biaix."
 
 # 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=\"f7\"></a>Subsequently we have learned to distinguish between "
-"&ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+"<a name=\"f7\"></a>Subsequently we 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."
+"software.  See <a href=\"/philosophy/words-to-avoid.html#Freeware\"> "
+"<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 "
@@ -1274,6 +1329,18 @@
 "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: manifesto.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.fr.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- manifesto.fr.po     30 Oct 2009 20:25:41 -0000      1.6
+++ manifesto.fr.po     14 Dec 2009 21:25:36 -0000      1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2009-09-17 16:25-0300\n"
+"POT-Creation-Date: 2009-12-14 16:25-0500\n"
 "PO-Revision-Date: 2009-10-28 16:54+0100\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -39,9 +39,14 @@
 "semble maintenant plus judicieux de le laisser en l'&eacute;tat."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Since that time, we have learned about certain common misunderstandings "
+#| "that different wording could help avoid.  Footnotes added in 1993 help "
+#| "clarify these points."
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
-"different wording could help avoid.  Footnotes added in 1993 help clarify "
+"different wording could help avoid.  Footnotes added since 1993 help clarify "
 "these points."
 msgstr ""
 "Nous avons appris depuis qu'il y avait quelques incompr&eacute;hensions; "
@@ -192,11 +197,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."
 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."
+"AI lab to deny MIT any legal excuse to prevent me from giving GNU away <a "
+"href=\"#f2a\">(2a)</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 "
@@ -799,12 +812,19 @@
 "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 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 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."
+"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."
 msgstr ""
 "La restriction des copies n'est pas la seule base des affaires du domaine "
 "des logiciels. C'est la base la plus commune, car c'est la plus rentable. Si "
@@ -1300,16 +1320,31 @@
 "&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 ""
+
+# 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."
 
 # type: Content of: <ol><li>
-msgid ""
-"<a name=\"f4\"></a>The Free Software Foundation for 10 years raised most of "
-"its funds from a distribution service, although it is a charity rather than "
-"a company.  You can <a href=\"/order/order.html\">order things from the FSF</"
-"a>."
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f4\"></a>The Free Software Foundation for 10 years raised most "
+#| "of its funds from a distribution service, although it is a charity rather "
+#| "than a company.  You can <a href=\"/order/order.html\">order things from "
+#| "the FSF</a>."
+msgid ""
+"<a name=\"f4\"></a> Although it is a charity rather than a company, the Free "
+"Software Foundation for 10 years raised most of its funds from its "
+"distribution service.  You can <a href=\"/order/order.html\">order things "
+"from the FSF</a> to support its work."
 msgstr ""
 "<a name=\"f4\"></a>Depuis dix ans, la Free Software Foundation a lev&eacute; "
 "la plupart de ses fonds &agrave; travers un service de distribution, bien "
@@ -1326,9 +1361,21 @@
 "fonds vers 1991 pour financer la maintenance du compilateur C de GNU."
 
 # type: Content of: <ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f6\"></a>In the 80s 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 together various disparate laws which raise very different "
+#| "issues.  Nowadays I urge people to reject the term &ldquo;intellectual "
+#| "property&rdquo; entirely, lest it lead others to suppose that those laws "
+#| "form one coherent issue.  The way to be clear is to discuss patents, "
+#| "copyrights, and trademarks separately.  See <a href=\"/philosophy/not-ipr."
+#| "html\">further explanation</a> of how this term spreads confusion and "
+#| "bias."
 msgid ""
-"<a name=\"f6\"></a>In the 80s I had not yet realized how confusing it was to "
-"speak of &ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  "
+"<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 "
 "together various disparate laws which raise very different issues.  Nowadays "
 "I urge people to reject the term &ldquo;intellectual property&rdquo; "
@@ -1353,13 +1400,21 @@
 "terme s&egrave;me la confusion et le parti-pris."
 
 # 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=\"f7\"></a>Subsequently we have learned to distinguish between "
-"&ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+"<a name=\"f7\"></a>Subsequently we 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."
+"software.  See <a href=\"/philosophy/words-to-avoid.html#Freeware\"> "
+"<q>Confusing Words and Phrases</q></a> for more explanation."
 msgstr ""
 "<a name=\"f7\"></a> Par la suite, nous avons appris la distinction entre "
 "&laquo;&nbsp;logiciel libre&nbsp;&raquo; et &laquo;&nbsp;graticiel&nbsp;"
@@ -1371,6 +1426,18 @@
 "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 ""
+
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"

Index: manifesto.pot
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.pot,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- manifesto.pot       17 Sep 2009 20:25:56 -0000      1.3
+++ manifesto.pot       14 Dec 2009 21:25:36 -0000      1.4
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-09-17 16:25-0300\n"
+"POT-Creation-Date: 2009-12-14 16:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -35,7 +35,7 @@
 # type: Content of: <p>
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
-"different wording could help avoid.  Footnotes added in 1993 help clarify "
+"different wording could help avoid.  Footnotes added since 1993 help clarify "
 "these points."
 msgstr ""
 
@@ -125,7 +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."
+"AI lab to deny MIT any legal excuse to prevent me from giving GNU away <a "
+"href=\"#f2a\">(2a)</a>."
 msgstr ""
 
 # type: Content of: <h3>
@@ -492,10 +493,10 @@
 # type: Content of: <p>
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
-"the most common basis 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."
+"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."
 msgstr ""
 
 # type: Content of: <p>
@@ -793,15 +794,24 @@
 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 ""
 
 # type: Content of: <ol><li>
 msgid ""
-"<a name=\"f4\"></a>The Free Software Foundation for 10 years raised most of "
-"its funds from a distribution service, although it is a charity rather than "
-"a company.  You can <a href=\"/order/order.html\">order things from the "
-"FSF</a>."
+"<a name=\"f4\"></a> Although it is a charity rather than a company, the Free "
+"Software Foundation for 10 years raised most of its funds from its "
+"distribution service.  You can <a href=\"/order/order.html\">order things "
+"from the FSF</a> to support its work."
 msgstr ""
 
 # type: Content of: <ol><li>
@@ -812,8 +822,8 @@
 
 # type: Content of: <ol><li>
 msgid ""
-"<a name=\"f6\"></a>In the 80s I had not yet realized how confusing it was to "
-"speak of &ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  "
+"<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 "
 "together various disparate laws which raise very different issues.  Nowadays "
 "I urge people to reject the term &ldquo;intellectual property&rdquo; "
@@ -825,13 +835,25 @@
 
 # type: Content of: <ol><li>
 msgid ""
-"<a name=\"f7\"></a>Subsequently we have learned to distinguish between "
+"<a name=\"f7\"></a>Subsequently we 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."
+"href=\"/philosophy/words-to-avoid.html#Freeware\"> <q>Confusing Words and "
+"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.

Index: manifesto.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.sr.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- manifesto.sr.po     17 Sep 2009 20:25:56 -0000      1.7
+++ manifesto.sr.po     14 Dec 2009 21:25:36 -0000      1.8
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manifesto.html\n"
-"POT-Creation-Date: 2009-09-17 16:25-0300\n"
+"POT-Creation-Date: 2009-12-14 16:25-0500\n"
 "PO-Revision-Date: 2008-08-13 20:12+0200\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -37,9 +37,14 @@
 "људи."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Since that time, we have learned about certain common misunderstandings "
+#| "that different wording could help avoid.  Footnotes added in 1993 help "
+#| "clarify these points."
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
-"different wording could help avoid.  Footnotes added in 1993 help clarify "
+"different wording could help avoid.  Footnotes added since 1993 help clarify "
 "these points."
 msgstr ""
 "Од тада смо сазнали за многе уобичајене 
неспоразуме који су могли да буду "
@@ -173,11 +178,19 @@
 "институцији где ми се тако нешто намеће 
против моје воље."
 
 # 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."
 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."
+"AI lab to deny MIT any legal excuse to prevent me from giving GNU away <a "
+"href=\"#f2a\">(2a)</a>."
 msgstr ""
 "Како бих могао да наставим да користим 
рачунаре чиста образа, одлучио сам да "
 "саставим довољан корпус слободног 
софтвера како бих био у могућности да "
@@ -714,12 +727,19 @@
 "увек бити могуће да буду плаћени за 
програмирање, само не толико као сада."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Restricting copying is not the only basis for business in software.  It "
+#| "is the most common basis 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 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."
+"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."
 msgstr ""
 "Спречавање копирања није једина основа за 
пословање засновано на софтверу. "
 "То је најчешћа основа јер доноси највише 
новца. Кад би било забрањено или "
@@ -1154,15 +1174,30 @@
 "преко мреже. Али она наводи на погрешан 
закључак."
 
 # 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>Данас постоји неколико 
таквих фирми."
 
 # type: Content of: <ol><li>
-msgid ""
-"<a name=\"f4\"></a>The Free Software Foundation for 10 years raised most of "
-"its funds from a distribution service, although it is a charity rather than "
-"a company.  You can <a href=\"/order/order.html\">order things from the FSF</"
-"a>."
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f4\"></a>The Free Software Foundation for 10 years raised most "
+#| "of its funds from a distribution service, although it is a charity rather "
+#| "than a company.  You can <a href=\"/order/order.html\">order things from "
+#| "the FSF</a>."
+msgid ""
+"<a name=\"f4\"></a> Although it is a charity rather than a company, the Free "
+"Software Foundation for 10 years raised most of its funds from its "
+"distribution service.  You can <a href=\"/order/order.html\">order things "
+"from the FSF</a> to support its work."
 msgstr ""
 "<a name=\"f4\"></a>Задужбина за слободни софтвер 
се 10 година углавном "
 "финансира из службе за расподелу, иако је 
добротворна организација, а не "
@@ -1178,9 +1213,21 @@
 "одржавање ГНУ-овог преводиоца за Це."
 
 # type: Content of: <ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a name=\"f6\"></a>In the 80s 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 together various disparate laws which raise very different "
+#| "issues.  Nowadays I urge people to reject the term &ldquo;intellectual "
+#| "property&rdquo; entirely, lest it lead others to suppose that those laws "
+#| "form one coherent issue.  The way to be clear is to discuss patents, "
+#| "copyrights, and trademarks separately.  See <a href=\"/philosophy/not-ipr."
+#| "html\">further explanation</a> of how this term spreads confusion and "
+#| "bias."
 msgid ""
-"<a name=\"f6\"></a>In the 80s I had not yet realized how confusing it was to "
-"speak of &ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  "
+"<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 "
 "together various disparate laws which raise very different issues.  Nowadays "
 "I urge people to reject the term &ldquo;intellectual property&rdquo; "
@@ -1200,13 +1247,21 @@
 "на који овај израз шири конфузију и 
двосмисленост."
 
 # 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=\"f7\"></a>Subsequently we have learned to distinguish between "
-"&ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
+"<a name=\"f7\"></a>Subsequently we 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."
+"software.  See <a href=\"/philosophy/words-to-avoid.html#Freeware\"> "
+"<q>Confusing Words and Phrases</q></a> for more explanation."
 msgstr ""
 "<a name=\"f7\"></a>Накнадно смо научили да 
разликујемо „слободан софтвер“ и "
 "„фривер“. Израз „фривер“ означава 
софтвер који можете да поново "
@@ -1215,6 +1270,18 @@
 "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*"
reply via email to
[Prev in Thread] Current Thread [Next in Thread]