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

www gnu/po/gnu-user-groups.fr.po gnu/po/gnu-use...

From: Yavor Doganov
Subject: www gnu/po/gnu-user-groups.fr.po gnu/po/gnu-use...
Date: Mon, 05 Apr 2010 08:26:25 +0000 
CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   10/04/05 08:26:24

Modified files:
        gnu/po         : gnu-user-groups.fr.po gnu-user-groups.pot 
        links/po       : links.es.po links.fr.po links.pot 
        philosophy/po  : categories.ar.po categories.ca.po 
                         categories.fr.po categories.pot 
                         categories.sr.po categories.tr.po 
                         java-trap.bg.po java-trap.fr.po java-trap.it.po 
                         java-trap.pot java-trap.sr.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-user-groups.fr.po?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-user-groups.pot?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.es.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.fr.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.pot?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ar.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ca.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.fr.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.pot?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.sr.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.tr.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.bg.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.fr.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.it.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.pot?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.sr.po?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: gnu/po/gnu-user-groups.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-user-groups.fr.po,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- gnu/po/gnu-user-groups.fr.po        4 Mar 2010 21:26:02 -0000       1.42
+++ gnu/po/gnu-user-groups.fr.po        5 Apr 2010 08:26:10 -0000       1.43
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-user-groups.html\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2010-02-14 15:03+0100\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -150,21 +150,37 @@
 "s&nbsp;:"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"#GLArgentina\">Argentina</a> - <a href=\"#GLBrazil\">Brazil</a> "
+#| "- <a href=\"#GLBulgaria\">Bulgaria</a> - <a href=\"#GLChile\">Chile</a> - "
+#| "<a href=\"#GLChina\">China</a> - <a href=\"#GLColombia\">Colombia</a> - "
+#| "<a href=\"#GLEgypt\">Egypt</a> - <a href=\"#GLFinland\">Finland</a> - <a "
+#| "href=\"#GLFrance\">France</a> - <a href=\"#GLGermany\">Germany</a> - <a "
+#| "href=\"#GLGreenland\">Greenland</a> - <a href=\"#GLIceland\">Iceland</a> "
+#| "- <a href=\"#GLIndia\">India</a> - <a href=\"#GLItaly\">Italy</a> - <a "
+#| "href=\"#GLLebanon\">Lebanon</a> - <a href=\"#GLMadagascar\">Madagascar</"
+#| "a> - <a href=\"#GLMexico\">Mexico</a> - <a href=\"#GLNewZealand\">New "
+#| "Zealand</a> - <a href=\"#GLPeru\">Peru</a> - <a href=\"#GLPhilippines"
+#| "\">Philippines</a> - <a href=\"#GLPortugal\">Portugal</a> - <a href="
+#| "\"#GLSingapore\">Singapore</a> - <a href=\"#GLSpain\">Spain</a> - <a href="
+#| "\"#GLUnitedKingdom\">United Kingdom</a> - <a href=\"#GLUnitedStates"
+#| "\">United States</a> - <a href=\"#GLVenezuela\">Venezuela</a>"
 msgid ""
 "<a href=\"#GLArgentina\">Argentina</a> - <a href=\"#GLBrazil\">Brazil</a> - "
 "<a href=\"#GLBulgaria\">Bulgaria</a> - <a href=\"#GLChile\">Chile</a> - <a "
 "href=\"#GLChina\">China</a> - <a href=\"#GLColombia\">Colombia</a> - <a href="
 "\"#GLEgypt\">Egypt</a> - <a href=\"#GLFinland\">Finland</a> - <a href="
 "\"#GLFrance\">France</a> - <a href=\"#GLGermany\">Germany</a> - <a href="
-"\"#GLGreenland\">Greenland</a> - <a href=\"#GLIceland\">Iceland</a> - <a "
-"href=\"#GLIndia\">India</a> - <a href=\"#GLItaly\">Italy</a> - <a href="
-"\"#GLLebanon\">Lebanon</a> - <a href=\"#GLMadagascar\">Madagascar</a> - <a "
-"href=\"#GLMexico\">Mexico</a> - <a href=\"#GLNewZealand\">New Zealand</a> - "
-"<a href=\"#GLPeru\">Peru</a> - <a href=\"#GLPhilippines\">Philippines</a> - "
-"<a href=\"#GLPortugal\">Portugal</a> - <a href=\"#GLSingapore\">Singapore</"
-"a> - <a href=\"#GLSpain\">Spain</a> - <a href=\"#GLUnitedKingdom\">United "
-"Kingdom</a> - <a href=\"#GLUnitedStates\">United States</a> - <a href="
-"\"#GLVenezuela\">Venezuela</a>"
+"\"#GLGreece\">Greece</a> - <a href=\"#GLGreenland\">Greenland</a> - <a href="
+"\"#GLIceland\">Iceland</a> - <a href=\"#GLIndia\">India</a> - <a href="
+"\"#GLItaly\">Italy</a> - <a href=\"#GLLebanon\">Lebanon</a> - <a href="
+"\"#GLMadagascar\">Madagascar</a> - <a href=\"#GLMexico\">Mexico</a> - <a "
+"href=\"#GLNewZealand\">New Zealand</a> - <a href=\"#GLPeru\">Peru</a> - <a "
+"href=\"#GLPhilippines\">Philippines</a> - <a href=\"#GLPortugal\">Portugal</"
+"a> - <a href=\"#GLSingapore\">Singapore</a> - <a href=\"#GLSpain\">Spain</a> "
+"- <a href=\"#GLUnitedKingdom\">United Kingdom</a> - <a href=\"#GLUnitedStates"
+"\">United States</a> - <a href=\"#GLVenezuela\">Venezuela</a>"
 msgstr ""
 "<a href=\"#GLArgentina\">Argentine</a> - <a href=\"#GLBrazil\">Brésil</a> - "
 "<a href=\"#GLBulgaria\">Bulgarie</a> - <a href=\"#GLChile\">Chili</a> - <a "
@@ -396,6 +412,16 @@
 "Bochum, Germany"
 
 # type: Content of: <h4>
+msgid "Greece"
+msgstr ""
+
+# type: Content of: <ul><li>
+#, fuzzy
+#| msgid "<a href=\"http://www.gnu.org/gugve/\";>GUGve</a>"
+msgid "<a href=\"http://trikiglug.gr/\";>Triki GLUG</a>"
+msgstr "<a href=\"http://www.gnu.org/gugve/\";>GUGve</a>"
+
+# type: Content of: <h4>
 msgid "Greenland"
 msgstr "Groenland"
 

Index: gnu/po/gnu-user-groups.pot
===================================================================
RCS file: /web/www/www/gnu/po/gnu-user-groups.pot,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- gnu/po/gnu-user-groups.pot  4 Mar 2010 21:26:02 -0000       1.29
+++ gnu/po/gnu-user-groups.pot  5 Apr 2010 08:26:11 -0000       1.30
@@ -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-04-05 04: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"
@@ -109,15 +109,15 @@
 "href=\"#GLChina\">China</a> - <a href=\"#GLColombia\">Colombia</a> - <a "
 "href=\"#GLEgypt\">Egypt</a> - <a href=\"#GLFinland\">Finland</a> - <a "
 "href=\"#GLFrance\">France</a> - <a href=\"#GLGermany\">Germany</a> - <a "
-"href=\"#GLGreenland\">Greenland</a> - <a href=\"#GLIceland\">Iceland</a> - "
-"<a href=\"#GLIndia\">India</a> - <a href=\"#GLItaly\">Italy</a> - <a "
-"href=\"#GLLebanon\">Lebanon</a> - <a href=\"#GLMadagascar\">Madagascar</a> - "
-"<a href=\"#GLMexico\">Mexico</a> - <a href=\"#GLNewZealand\">New Zealand</a> "
-"- <a href=\"#GLPeru\">Peru</a> - <a href=\"#GLPhilippines\">Philippines</a> "
-"- <a href=\"#GLPortugal\">Portugal</a> - <a "
-"href=\"#GLSingapore\">Singapore</a> - <a href=\"#GLSpain\">Spain</a> - <a "
-"href=\"#GLUnitedKingdom\">United Kingdom</a> - <a "
-"href=\"#GLUnitedStates\">United States</a> - <a "
+"href=\"#GLGreece\">Greece</a> - <a href=\"#GLGreenland\">Greenland</a> - <a "
+"href=\"#GLIceland\">Iceland</a> - <a href=\"#GLIndia\">India</a> - <a "
+"href=\"#GLItaly\">Italy</a> - <a href=\"#GLLebanon\">Lebanon</a> - <a "
+"href=\"#GLMadagascar\">Madagascar</a> - <a href=\"#GLMexico\">Mexico</a> - "
+"<a href=\"#GLNewZealand\">New Zealand</a> - <a href=\"#GLPeru\">Peru</a> - "
+"<a href=\"#GLPhilippines\">Philippines</a> - <a "
+"href=\"#GLPortugal\">Portugal</a> - <a href=\"#GLSingapore\">Singapore</a> - "
+"<a href=\"#GLSpain\">Spain</a> - <a href=\"#GLUnitedKingdom\">United "
+"Kingdom</a> - <a href=\"#GLUnitedStates\">United States</a> - <a "
 "href=\"#GLVenezuela\">Venezuela</a>"
 msgstr ""
 
@@ -300,6 +300,14 @@
 msgstr ""
 
 # type: Content of: <h4>
+msgid "Greece"
+msgstr ""
+
+# type: Content of: <ul><li>
+msgid "<a href=\"http://trikiglug.gr/\";>Triki GLUG</a>"
+msgstr ""
+
+# type: Content of: <h4>
 msgid "Greenland"
 msgstr ""
 

Index: links/po/links.es.po
===================================================================
RCS file: /web/www/www/links/po/links.es.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- links/po/links.es.po        25 Dec 2009 21:27:20 -0000      1.28
+++ links/po/links.es.po        5 Apr 2010 08:26:15 -0000       1.29
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: links.es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-18 04:25-0500\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2009-12-24 23:03+0100\n"
 "Last-Translator: Xavier Reina <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -474,6 +474,11 @@
 
 # type: Content of: <ul><li>
 msgid ""
+"<a href=\"http://www.gnulinux.in/\";>GnuLinux.in</a>, a FOSS Community site."
+msgstr ""
+
+# type: Content of: <ul><li>
+msgid ""
 "<a href=\"http://techmeet.org\";>techmeet.org</a>, a site for discussing free "
 "website revision systems and arranging conferences on the topic."
 msgstr ""
@@ -745,6 +750,23 @@
 "lucro nacional que representa a los usuarios de Internet preocupados por las "
 "libertades y derechos en la red."
 
+# type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://www.ffii.org\";>Association For a Free Informational "
+#| "Infrastructure (FFII)</a>"
+msgid ""
+"<a href=\"http://www.libertadinformacion.org/\";>Asociaci&oacute;n por la "
+"Libertad de la Informaci&oacute;n</a>"
+msgstr ""
+"<a href=\"http://www.ffii.org/\";>Association For a Free Informational "
+"Infrastructure (FFII)</a> (Asociación para una infraestructura libre de la "
+"información)"
+
+# type: Content of: <ul><li><p>
+msgid "An association fighting for freedom of information in Spain."
+msgstr ""
+
 # type: Content of: <h3>
 msgid "Hosting"
 msgstr "Hospedaje "

Index: links/po/links.fr.po
===================================================================
RCS file: /web/www/www/links/po/links.fr.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- links/po/links.fr.po        18 Dec 2009 09:26:31 -0000      1.25
+++ links/po/links.fr.po        5 Apr 2010 08:26:15 -0000       1.26
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: links.html\n"
-"POT-Creation-Date: 2009-12-18 04:25-0500\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2009-10-28 17:23+0100\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -476,6 +476,11 @@
 
 # type: Content of: <ul><li>
 msgid ""
+"<a href=\"http://www.gnulinux.in/\";>GnuLinux.in</a>, a FOSS Community site."
+msgstr ""
+
+# type: Content of: <ul><li>
+msgid ""
 "<a href=\"http://techmeet.org\";>techmeet.org</a>, a site for discussing free "
 "website revision systems and arranging conferences on the topic."
 msgstr ""
@@ -759,6 +764,22 @@
 "repr&eacute;sentant les internautes concern&eacute;s par les droits et "
 "libert&eacute;s en ligne."
 
+# type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://www.ffii.org\";>Association For a Free Informational "
+#| "Infrastructure (FFII)</a>"
+msgid ""
+"<a href=\"http://www.libertadinformacion.org/\";>Asociaci&oacute;n por la "
+"Libertad de la Informaci&oacute;n</a>"
+msgstr ""
+"<a href=\"http://www.ffii.org\";>Association pour une infrastructure "
+"informationnelle libre (FFII)</a>"
+
+# type: Content of: <ul><li><p>
+msgid "An association fighting for freedom of information in Spain."
+msgstr ""
+
 # type: Content of: <h3>
 msgid "Hosting"
 msgstr "H&eacute;bergement"

Index: links/po/links.pot
===================================================================
RCS file: /web/www/www/links/po/links.pot,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- links/po/links.pot  18 Dec 2009 09:26:31 -0000      1.17
+++ links/po/links.pot  5 Apr 2010 08:26:15 -0000       1.18
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-12-18 04:25-0500\n"
+"POT-Creation-Date: 2010-04-05 04: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"
@@ -359,6 +359,10 @@
 msgstr ""
 
 # type: Content of: <ul><li>
+msgid "<a href=\"http://www.gnulinux.in/\";>GnuLinux.in</a>, a FOSS Community 
site."
+msgstr ""
+
+# type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://techmeet.org\";>techmeet.org</a>, a site for discussing free "
 "website revision systems and arranging conferences on the topic."
@@ -560,6 +564,16 @@
 "rights."
 msgstr ""
 
+# type: Content of: <ul><li>
+msgid ""
+"<a href=\"http://www.libertadinformacion.org/\";>Asociaci&oacute;n por la "
+"Libertad de la Informaci&oacute;n</a>"
+msgstr ""
+
+# type: Content of: <ul><li><p>
+msgid "An association fighting for freedom of information in Spain."
+msgstr ""
+
 # type: Content of: <h3>
 msgid "Hosting"
 msgstr ""

Index: philosophy/po/categories.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ar.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/po/categories.ar.po      4 Mar 2010 21:26:08 -0000       1.11
+++ philosophy/po/categories.ar.po      5 Apr 2010 08:26:20 -0000       1.12
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2009-09-02 22:33+0200\n"
 "Last-Translator: Hossam Hossny <address@hidden>\n"
 "Language-Team: Arabic\n"
@@ -25,12 +25,18 @@
 "(إف&#8204;إس&#8204;إف)"
 
 # type: Content of: <h2>
-msgid "Categories of Free and Non-Free Software"
+#, fuzzy
+#| msgid "Categories of Free and Non-Free Software"
+msgid "Categories of free and non-free software"
 msgstr "تصانيف البرمجيات الحرة وغير الحرة"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words "
+#| "which You Might Want to Avoid</a>."
 msgid ""
-"Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
+"Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
 msgstr ""
 "لاحظ أيضا <a href=\"/philosophy/words-to-avoid.html\">كلمات م
ُشوّشة قد ترغب في "
@@ -47,11 +53,12 @@
 #| "GNU GPL v2 or later, the GNU FDL v1.2 or later, or the Creative Commons "
 #| "Attribution-Share Alike v2.0 or later."
 msgid ""
-"This diagram by Chao-Kuei explains the different categories of software. "
-"It's also available as an <a href=\"/philosophy/category.svg\">Scalable "
-"Vector Graphic</a> and as an <a href=\"/philosophy/category.fig\">XFig "
-"document</a>, under the terms of any of the GNU GPL v2 or later, the GNU FDL "
-"v1.2 or later, or the Creative Commons Attribution-Share Alike v2.0 or later."
+"This diagram, originally by Chao-Kuei and updated in 2010 by Ineiev, "
+"explains the different categories of software. It's also available as an <a "
+"href=\"/philosophy/category.svg\">Scalable Vector Graphic</a> and as an <a "
+"href=\"/philosophy/category.fig\">XFig document</a>, under the terms of any "
+"of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or the Creative "
+"Commons Attribution-Share Alike v2.0 or later."
 msgstr ""
 "هذا <a id=\"diagram\" name=\"diagram\">المخطط</a> بواسطة 
شاو-كوي يوضح الفرق "
 "بين تصانيف البرمجيات. متاح <a 
href=\"/philosophy/category.fig\">كملف "
@@ -68,13 +75,21 @@
 msgstr "<strong>البرمجيات الحرة</strong>"
 
 # type: Content of: <dl><dd>
+#, fuzzy
+#| msgid ""
+#| "Free software is software that comes with permission for anyone to use, "
+#| "copy, and distribute, either verbatim or with modifications, either "
+#| "gratis or for a fee. In particular, this means that source code must be "
+#| "available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+#| "simplified definition; see also the <a href=\"/philosophy/free-sw.html"
+#| "\">full definition</a>."
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
-"copy, and distribute, either verbatim or with modifications, either gratis "
-"or for a fee. In particular, this means that source code must be available. "
-"&ldquo;If it's not source, it's not software.&rdquo; This is a simplified "
-"definition; see also the <a href=\"/philosophy/free-sw.html\">full "
-"definition</a>."
+"copy, and/or distribute, either verbatim or with modifications, either "
+"gratis or for a fee. In particular, this means that source code must be "
+"available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+"simplified description; see also the <a href=\"/philosophy/free-sw.html"
+"\">full definition</a>."
 msgstr ""
 "البرمجيات الحرة هي برمجيات تأتي مع أذونات 
لأي شخص بالاستخدام، والنشر، "
 "والتوزيع، سواءً حرفيا أو مع تعديلات، 
سواءً مجانًا أو مقابل رسم. تحديدا، هذا "
@@ -115,11 +130,11 @@
 #| "in the GNU project."
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
-"companies sometimes use the term &ldquo;free software&rdquo; to refer to "
+"companies typically use the term &ldquo;free software&rdquo; to refer to "
 "price. Sometimes they mean that you can obtain a binary copy at no charge; "
 "sometimes they mean that a copy is bundled with a computer that you are "
-"buying, and the price includes both.  Either way, this has nothing to do "
-"with what we mean by free software in the GNU project."
+"buying, and the price includes both.  Either way, it has nothing to do with "
+"what we mean by free software in the GNU project."
 msgstr ""
 "البرمجيات الحرة مهتمة بالحرية، ليس السعر. 
لكن شركات البرمجيات الاحتكارية "
 "أحيانا تستخدم مصطلح &ldquo;free software&rdquo;  
للإشارة إلى السعر. أحيانا "
@@ -181,7 +196,7 @@
 # type: Content of: <dl><dt>
 #, fuzzy
 #| msgid "<strong>Open Source software</strong>"
-msgid "Open Source software"
+msgid "Open source software"
 msgstr "<strong>برمجيات المصدر المفتوح</strong>"
 
 # type: Content of: <dl><dd>
@@ -302,19 +317,27 @@
 "متاحة. بعض رخص الحقوق المتروكة، مثل 
جي&#8204;بي&#8204;إل الإصدار 3، تمنع "
 "معاني أخرى لتحويل البرمجيات إلى احتكارية."
 
-# type: Content of: <dl><dd><p>
+# type: Content of: <p>
 msgid ""
-"Some copyleft licenses, such as GPL version 3, block other means of turning "
-"software proprietary."
+"Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
+"turning software proprietary, such as <a href=\"http://www.gnu.org/licenses/";
+"rms-why-gplv3.html\">tivoization</a>."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "In the GNU Project, we copyleft almost all the software we write, because "
+#| "our goal is to give <em>every</em> user the freedoms implied by the term "
+#| "&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
+#| "\">Copylefted</a> for more explanation of how copyleft works and why we "
+#| "use it."
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
-"&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
-"\">Copylefted</a> for more explanation of how copyleft works and why we use "
-"it."
+"&ldquo;free software.&rdquo; See our <a href= \"/copyleft/copyleft.html"
+"\">copyleft article</a> for more explanation of how copyleft works and why "
+"we use it."
 msgstr ""
 "في مشروع غنو، نترك حقوق تقريبا كل البرم
جيات التي نكتبها، لأن هدفنا هو إعطاء "
 "<em>كل</em> مستخدم الحريات المُضمنة في مصطلح 
&rdquo;البرمجيات الحرة.&ldquo;، "
@@ -322,8 +345,19 @@
 "توضيح كيفية ترك حقوق الأعمال ولماذا نستخدم
ه."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Copyleft is a general concept; to actually copyleft a program, you need "
+#| "to use a specific set of distribution terms. There are many possible ways "
+#| "to write copyleft distribution terms, so in principle there can be many "
+#| "copyleft free software licenses.  However, in actual practice nearly all "
+#| "copylefted software uses the <a href=\"/copyleft/gpl.html\">GNU General "
+#| "Public License</a>. Two different copyleft licenses are usually &ldquo;"
+#| "incompatible&rdquo;, which means it is illegal to merge the code using "
+#| "one license with the code using the other license; therefore, it is good "
+#| "for the community if people use a single copyleft license."
 msgid ""
-"Copyleft is a general concept; to actually copyleft a program, you need to "
+"Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
 "write copyleft distribution terms, so in principle there can be many "
 "copyleft free software licenses.  However, in actual practice nearly all "
@@ -768,7 +802,7 @@
 # type: Content of: <dl><dt>
 #, fuzzy
 #| msgid "<strong>Commercial Software</strong>"
-msgid "Commercial Software"
+msgid "Commercial software"
 msgstr "<strong>البرمجيات التجارية</strong>"
 
 # type: Content of: <dl><dd>

Index: philosophy/po/categories.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ca.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/po/categories.ca.po      4 Mar 2010 21:26:08 -0000       1.10
+++ philosophy/po/categories.ca.po      5 Apr 2010 08:26:20 -0000       1.11
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2009-01-25 20:39+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -23,12 +23,18 @@
 "Foundation (FSF)"
 
 # type: Content of: <h2>
-msgid "Categories of Free and Non-Free Software"
+#, fuzzy
+#| msgid "Categories of Free and Non-Free Software"
+msgid "Categories of free and non-free software"
 msgstr "Categories de programari lliure i no lliure"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words "
+#| "which You Might Want to Avoid</a>."
 msgid ""
-"Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
+"Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
 msgstr ""
 "Vegeu tamb&eacute; <a href=\"/philosophy/words-to-avoid.ca.html\">Paraules "
@@ -44,11 +50,12 @@
 #| "terms of any of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or "
 #| "the Creative Commons Attribution-Share Alike v2.0 or later."
 msgid ""
-"This diagram by Chao-Kuei explains the different categories of software. "
-"It's also available as an <a href=\"/philosophy/category.svg\">Scalable "
-"Vector Graphic</a> and as an <a href=\"/philosophy/category.fig\">XFig "
-"document</a>, under the terms of any of the GNU GPL v2 or later, the GNU FDL "
-"v1.2 or later, or the Creative Commons Attribution-Share Alike v2.0 or later."
+"This diagram, originally by Chao-Kuei and updated in 2010 by Ineiev, "
+"explains the different categories of software. It's also available as an <a "
+"href=\"/philosophy/category.svg\">Scalable Vector Graphic</a> and as an <a "
+"href=\"/philosophy/category.fig\">XFig document</a>, under the terms of any "
+"of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or the Creative "
+"Commons Attribution-Share Alike v2.0 or later."
 msgstr ""
 "Aquest diagrama de Chao-Kuei il&middot;lustra les diferents categories de "
 "programari. Est&agrave; disponible en els formats <a href=\"/philosophy/"
@@ -64,13 +71,21 @@
 msgstr "<strong>Programari lliure</strong>"
 
 # type: Content of: <dl><dd>
+#, fuzzy
+#| msgid ""
+#| "Free software is software that comes with permission for anyone to use, "
+#| "copy, and distribute, either verbatim or with modifications, either "
+#| "gratis or for a fee. In particular, this means that source code must be "
+#| "available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+#| "simplified definition; see also the <a href=\"/philosophy/free-sw.html"
+#| "\">full definition</a>."
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
-"copy, and distribute, either verbatim or with modifications, either gratis "
-"or for a fee. In particular, this means that source code must be available. "
-"&ldquo;If it's not source, it's not software.&rdquo; This is a simplified "
-"definition; see also the <a href=\"/philosophy/free-sw.html\">full "
-"definition</a>."
+"copy, and/or distribute, either verbatim or with modifications, either "
+"gratis or for a fee. In particular, this means that source code must be "
+"available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+"simplified description; see also the <a href=\"/philosophy/free-sw.html"
+"\">full definition</a>."
 msgstr ""
 "Programari lliure &eacute;s aquell programari que concedeix a tothom "
 "perm&iacute;s per utilitzar-lo, copiar-lo i distribuir-lo amb o sense "
@@ -109,11 +124,11 @@
 #, fuzzy
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
-"companies sometimes use the term &ldquo;free software&rdquo; to refer to "
+"companies typically use the term &ldquo;free software&rdquo; to refer to "
 "price. Sometimes they mean that you can obtain a binary copy at no charge; "
 "sometimes they mean that a copy is bundled with a computer that you are "
-"buying, and the price includes both.  Either way, this has nothing to do "
-"with what we mean by free software in the GNU project."
+"buying, and the price includes both.  Either way, it has nothing to do with "
+"what we mean by free software in the GNU project."
 msgstr ""
 "L'ess&egrave;ncia del programari lliure &eacute;s la llibertat, no el preu. "
 "Les empreses de programari privatiu sovint utilitzen el terme &ldquo;free "
@@ -182,7 +197,7 @@
 # type: Content of: <dl><dt>
 #, fuzzy
 #| msgid "<strong>Open Source software</strong>"
-msgid "Open Source software"
+msgid "Open source software"
 msgstr "<strong>Programari de codi obert</strong>"
 
 # type: Content of: <dl><dd>
@@ -307,19 +322,27 @@
 "s&egrave;rie limitada de requeriments per protegir-los) i estableixen que el "
 "codi font ha de continuar estant disponible."
 
-# type: Content of: <dl><dd><p>
+# type: Content of: <p>
 msgid ""
-"Some copyleft licenses, such as GPL version 3, block other means of turning "
-"software proprietary."
+"Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
+"turning software proprietary, such as <a href=\"http://www.gnu.org/licenses/";
+"rms-why-gplv3.html\">tivoization</a>."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "In the GNU Project, we copyleft almost all the software we write, because "
+#| "our goal is to give <em>every</em> user the freedoms implied by the term "
+#| "&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
+#| "\">Copylefted</a> for more explanation of how copyleft works and why we "
+#| "use it."
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
-"&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
-"\">Copylefted</a> for more explanation of how copyleft works and why we use "
-"it."
+"&ldquo;free software.&rdquo; See our <a href= \"/copyleft/copyleft.html"
+"\">copyleft article</a> for more explanation of how copyleft works and why "
+"we use it."
 msgstr ""
 "Al projecte GNU publiquem amb copyleft gaireb&eacute; tot el programari que "
 "escrivim, perqu&egrave; el nostre objectiu &eacute;s donar a <em>tots</em> "
@@ -329,8 +352,19 @@
 "sobre com funciona i per qu&egrave; el fem servir."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Copyleft is a general concept; to actually copyleft a program, you need "
+#| "to use a specific set of distribution terms. There are many possible ways "
+#| "to write copyleft distribution terms, so in principle there can be many "
+#| "copyleft free software licenses.  However, in actual practice nearly all "
+#| "copylefted software uses the <a href=\"/copyleft/gpl.html\">GNU General "
+#| "Public License</a>. Two different copyleft licenses are usually &ldquo;"
+#| "incompatible&rdquo;, which means it is illegal to merge the code using "
+#| "one license with the code using the other license; therefore, it is good "
+#| "for the community if people use a single copyleft license."
 msgid ""
-"Copyleft is a general concept; to actually copyleft a program, you need to "
+"Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
 "write copyleft distribution terms, so in principle there can be many "
 "copyleft free software licenses.  However, in actual practice nearly all "
@@ -800,7 +834,7 @@
 # type: Content of: <dl><dt>
 #, fuzzy
 #| msgid "<strong>Commercial Software</strong>"
-msgid "Commercial Software"
+msgid "Commercial software"
 msgstr "<strong>Programari comercial</strong>"
 
 # type: Content of: <dl><dd>

Index: philosophy/po/categories.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.fr.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/po/categories.fr.po      4 Mar 2010 21:26:08 -0000       1.13
+++ philosophy/po/categories.fr.po      5 Apr 2010 08:26:20 -0000       1.14
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2009-11-29 15:47+0100\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -24,24 +24,39 @@
 "Software Foundation (FSF)"
 
 # type: Content of: <h2>
-msgid "Categories of Free and Non-Free Software"
+#, fuzzy
+#| msgid "Categories of Free and Non-Free Software"
+msgid "Categories of free and non-free software"
 msgstr "Cat&eacute;gories de logiciels libres et non libres"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words "
+#| "which You Might Want to Avoid</a>."
 msgid ""
-"Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
+"Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
 msgstr ""
 "Lisez aussi <a href=\"/philosophy/words-to-avoid.fr.html\">Termes pr&ecirc;"
 "tant &agrave; confusion, que vous devriez &eacute;viter</a>."
 
 # type: Content of: <p>
-msgid ""
-"This diagram by Chao-Kuei explains the different categories of software. "
-"It's also available as an <a href=\"/philosophy/category.svg\">Scalable "
-"Vector Graphic</a> and as an <a href=\"/philosophy/category.fig\">XFig "
-"document</a>, under the terms of any of the GNU GPL v2 or later, the GNU FDL "
-"v1.2 or later, or the Creative Commons Attribution-Share Alike v2.0 or later."
+#, fuzzy
+#| msgid ""
+#| "This diagram by Chao-Kuei explains the different categories of software. "
+#| "It's also available as an <a href=\"/philosophy/category.svg\">Scalable "
+#| "Vector Graphic</a> and as an <a href=\"/philosophy/category.fig\">XFig "
+#| "document</a>, under the terms of any of the GNU GPL v2 or later, the GNU "
+#| "FDL v1.2 or later, or the Creative Commons Attribution-Share Alike v2.0 "
+#| "or later."
+msgid ""
+"This diagram, originally by Chao-Kuei and updated in 2010 by Ineiev, "
+"explains the different categories of software. It's also available as an <a "
+"href=\"/philosophy/category.svg\">Scalable Vector Graphic</a> and as an <a "
+"href=\"/philosophy/category.fig\">XFig document</a>, under the terms of any "
+"of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or the Creative "
+"Commons Attribution-Share Alike v2.0 or later."
 msgstr ""
 "Ce diagramme de Chao-Kuei explique les différentes catégories de logiciels. 
"
 "Il est disponible sous forme de <a href=\"/philosophy/category.fr.svg"
@@ -55,13 +70,21 @@
 msgstr "Logiciel libre"
 
 # type: Content of: <dl><dd>
+#, fuzzy
+#| msgid ""
+#| "Free software is software that comes with permission for anyone to use, "
+#| "copy, and distribute, either verbatim or with modifications, either "
+#| "gratis or for a fee. In particular, this means that source code must be "
+#| "available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+#| "simplified definition; see also the <a href=\"/philosophy/free-sw.html"
+#| "\">full definition</a>."
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
-"copy, and distribute, either verbatim or with modifications, either gratis "
-"or for a fee. In particular, this means that source code must be available. "
-"&ldquo;If it's not source, it's not software.&rdquo; This is a simplified "
-"definition; see also the <a href=\"/philosophy/free-sw.html\">full "
-"definition</a>."
+"copy, and/or distribute, either verbatim or with modifications, either "
+"gratis or for a fee. In particular, this means that source code must be "
+"available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+"simplified description; see also the <a href=\"/philosophy/free-sw.html"
+"\">full definition</a>."
 msgstr ""
 "Un logiciel libre est un logiciel qui est fourni avec l'autorisation pour "
 "quiconque de l'utiliser, de le copier, et de le distribuer, soit sous une "
@@ -99,13 +122,21 @@
 "des licences</a>."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Free software is a matter of freedom, not price. But proprietary software "
+#| "companies sometimes use the term &ldquo;free software&rdquo; to refer to "
+#| "price. Sometimes they mean that you can obtain a binary copy at no "
+#| "charge; sometimes they mean that a copy is bundled with a computer that "
+#| "you are buying, and the price includes both.  Either way, this has "
+#| "nothing to do with what we mean by free software in the GNU project."
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
-"companies sometimes use the term &ldquo;free software&rdquo; to refer to "
+"companies typically use the term &ldquo;free software&rdquo; to refer to "
 "price. Sometimes they mean that you can obtain a binary copy at no charge; "
 "sometimes they mean that a copy is bundled with a computer that you are "
-"buying, and the price includes both.  Either way, this has nothing to do "
-"with what we mean by free software in the GNU project."
+"buying, and the price includes both.  Either way, it has nothing to do with "
+"what we mean by free software in the GNU project."
 msgstr ""
 "Un logiciel est libre du point de vue de la libert&eacute;, et non du prix. "
 "Mais les soci&eacute;t&eacute;s &eacute;ditrices de logiciels propri&eacute;"
@@ -174,7 +205,9 @@
 "fiable</a> que le logiciel non-libre."
 
 # type: Content of: <dl><dt>
-msgid "Open Source software"
+#, fuzzy
+#| msgid "Open Source software"
+msgid "Open source software"
 msgstr "Logiciel Open Source"
 
 # type: Content of: <dl><dd>
@@ -298,20 +331,32 @@
 "de quelques uns des moyens courants de rendre le logiciel propriétaire."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Some copyleft licenses, such as GPL version 3, block other means of "
+#| "turning software proprietary."
 msgid ""
-"Some copyleft licenses, such as GPL version 3, block other means of turning "
-"software proprietary."
+"Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
+"turning software proprietary, such as <a href=\"http://www.gnu.org/licenses/";
+"rms-why-gplv3.html\">tivoization</a>."
 msgstr ""
 "Certaines licences avec copyleft, telle que la GPL version 3, bloque "
 "d'autres moyens de rendre les logiciels propriétaires."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "In the GNU Project, we copyleft almost all the software we write, because "
+#| "our goal is to give <em>every</em> user the freedoms implied by the term "
+#| "&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
+#| "\">Copylefted</a> for more explanation of how copyleft works and why we "
+#| "use it."
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
-"&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
-"\">Copylefted</a> for more explanation of how copyleft works and why we use "
-"it."
+"&ldquo;free software.&rdquo; See our <a href= \"/copyleft/copyleft.html"
+"\">copyleft article</a> for more explanation of how copyleft works and why "
+"we use it."
 msgstr ""
 "Dans le projet GNU, presque tous les logiciels que nous cr&eacute;ons sont "
 "soumis au <em>copyleft</em>, car notre but est de donner <em>&agrave; "
@@ -321,8 +366,19 @@
 "copyleft et savoir pourquoi nous l'utilisons."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Copyleft is a general concept; to actually copyleft a program, you need "
+#| "to use a specific set of distribution terms. There are many possible ways "
+#| "to write copyleft distribution terms, so in principle there can be many "
+#| "copyleft free software licenses.  However, in actual practice nearly all "
+#| "copylefted software uses the <a href=\"/copyleft/gpl.html\">GNU General "
+#| "Public License</a>. Two different copyleft licenses are usually &ldquo;"
+#| "incompatible&rdquo;, which means it is illegal to merge the code using "
+#| "one license with the code using the other license; therefore, it is good "
+#| "for the community if people use a single copyleft license."
 msgid ""
-"Copyleft is a general concept; to actually copyleft a program, you need to "
+"Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
 "write copyleft distribution terms, so in principle there can be many "
 "copyleft free software licenses.  However, in actual practice nearly all "
@@ -763,7 +819,9 @@
 "mani&egrave;re compatible avec le mouvement du logiciel libre."
 
 # type: Content of: <dl><dt>
-msgid "Commercial Software"
+#, fuzzy
+#| msgid "Commercial Software"
+msgid "Commercial software"
 msgstr "Logiciel commercial"
 
 # type: Content of: <dl><dd>

Index: philosophy/po/categories.pot
===================================================================
RCS file: /web/www/www/philosophy/po/categories.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/categories.pot        4 Mar 2010 21:26:08 -0000       1.7
+++ philosophy/po/categories.pot        5 Apr 2010 08:26:20 -0000       1.8
@@ -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-04-05 04: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"
@@ -22,19 +22,19 @@
 msgstr ""
 
 # type: Content of: <h2>
-msgid "Categories of Free and Non-Free Software"
+msgid "Categories of free and non-free software"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
+"Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"This diagram by Chao-Kuei explains the different categories of "
-"software. It's also available as an <a "
+"This diagram, originally by Chao-Kuei and updated in 2010 by Ineiev, "
+"explains the different categories of software. It's also available as an <a "
 "href=\"/philosophy/category.svg\">Scalable Vector Graphic</a> and as an <a "
 "href=\"/philosophy/category.fig\">XFig document</a>, under the terms of any "
 "of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or the Creative "
@@ -48,10 +48,10 @@
 # type: Content of: <p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
-"copy, and distribute, either verbatim or with modifications, either gratis "
-"or for a fee. In particular, this means that source code must be "
+"copy, and/or distribute, either verbatim or with modifications, either "
+"gratis or for a fee. In particular, this means that source code must be "
 "available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
-"simplified definition; see also the <a "
+"simplified description; see also the <a "
 "href=\"/philosophy/free-sw.html\">full definition</a>."
 msgstr ""
 
@@ -74,11 +74,11 @@
 # type: Content of: <p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
-"companies sometimes use the term &ldquo;free software&rdquo; to refer to "
+"companies typically use the term &ldquo;free software&rdquo; to refer to "
 "price. Sometimes they mean that you can obtain a binary copy at no charge; "
 "sometimes they mean that a copy is bundled with a computer that you are "
-"buying, and the price includes both.  Either way, this has nothing to do "
-"with what we mean by free software in the GNU project."
+"buying, and the price includes both.  Either way, it has nothing to do with "
+"what we mean by free software in the GNU project."
 msgstr ""
 
 # type: Content of: <p>
@@ -109,7 +109,7 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "Open Source software"
+msgid "Open source software"
 msgstr ""
 
 # type: Content of: <p>
@@ -189,22 +189,23 @@
 
 # type: Content of: <p>
 msgid ""
-"Some copyleft licenses, such as GPL version 3, block other means of turning "
-"software proprietary."
+"Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
+"turning software proprietary, such as <a "
+"href=\"http://www.gnu.org/licenses/rms-why-gplv3.html\";>tivoization</a>."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
-"&ldquo;free software.&rdquo; See <a href= "
-"\"/copyleft/copyleft.html\">Copylefted</a> for more explanation of how "
+"&ldquo;free software.&rdquo; See our <a href= "
+"\"/copyleft/copyleft.html\">copyleft article</a> for more explanation of how "
 "copyleft works and why we use it."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Copyleft is a general concept; to actually copyleft a program, you need to "
+"Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
 "write copyleft distribution terms, so in principle there can be many "
 "copyleft free software licenses.  However, in actual practice nearly all "
@@ -475,7 +476,7 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "Commercial Software"
+msgid "Commercial software"
 msgstr ""
 
 # type: Content of: <p>

Index: philosophy/po/categories.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.sr.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/po/categories.sr.po      4 Mar 2010 21:26:08 -0000       1.11
+++ philosophy/po/categories.sr.po      5 Apr 2010 08:26:20 -0000       1.12
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2009-07-05 21:49+0200\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -23,12 +23,18 @@
 "слободни софтвер (ЗСС)"
 
 # type: Content of: <h2>
-msgid "Categories of Free and Non-Free Software"
+#, fuzzy
+#| msgid "Categories of Free and Non-Free Software"
+msgid "Categories of free and non-free software"
 msgstr "Врсте слободног и неслободног 
софтвера"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words "
+#| "which You Might Want to Avoid</a>."
 msgid ""
-"Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
+"Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
 msgstr ""
 "Погледајте и <a 
href=\"/philosophy/words-to-avoid.sr.html\">Збуњујуће речи "
@@ -44,11 +50,12 @@
 #| "terms of any of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or "
 #| "the Creative Commons Attribution-Share Alike v2.0 or later."
 msgid ""
-"This diagram by Chao-Kuei explains the different categories of software. "
-"It's also available as an <a href=\"/philosophy/category.svg\">Scalable "
-"Vector Graphic</a> and as an <a href=\"/philosophy/category.fig\">XFig "
-"document</a>, under the terms of any of the GNU GPL v2 or later, the GNU FDL "
-"v1.2 or later, or the Creative Commons Attribution-Share Alike v2.0 or later."
+"This diagram, originally by Chao-Kuei and updated in 2010 by Ineiev, "
+"explains the different categories of software. It's also available as an <a "
+"href=\"/philosophy/category.svg\">Scalable Vector Graphic</a> and as an <a "
+"href=\"/philosophy/category.fig\">XFig document</a>, under the terms of any "
+"of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or the Creative "
+"Commons Attribution-Share Alike v2.0 or later."
 msgstr ""
 "Овај дијаграм, који је нацртао Чао Квеј 
(<em>Chao-Kuei</em>), пружа увид у "
 "различите врсте софтвера. Можете га 
преузети у виду <a href=\"/philosophy/"
@@ -66,13 +73,21 @@
 msgstr "<strong>Слободни софтвер</strong>"
 
 # type: Content of: <dl><dd>
+#, fuzzy
+#| msgid ""
+#| "Free software is software that comes with permission for anyone to use, "
+#| "copy, and distribute, either verbatim or with modifications, either "
+#| "gratis or for a fee. In particular, this means that source code must be "
+#| "available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+#| "simplified definition; see also the <a href=\"/philosophy/free-sw.html"
+#| "\">full definition</a>."
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
-"copy, and distribute, either verbatim or with modifications, either gratis "
-"or for a fee. In particular, this means that source code must be available. "
-"&ldquo;If it's not source, it's not software.&rdquo; This is a simplified "
-"definition; see also the <a href=\"/philosophy/free-sw.html\">full "
-"definition</a>."
+"copy, and/or distribute, either verbatim or with modifications, either "
+"gratis or for a fee. In particular, this means that source code must be "
+"available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+"simplified description; see also the <a href=\"/philosophy/free-sw.html"
+"\">full definition</a>."
 msgstr ""
 "Слободни софтвер је софтвер који свако 
може да употребљава, умножава и "
 "расподељује, дословно или уз измене, 
бесплатно или за одређену цену. Ово, "
@@ -105,13 +120,21 @@
 "license-list.html\">списком лиценци</a>."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Free software is a matter of freedom, not price. But proprietary software "
+#| "companies sometimes use the term &ldquo;free software&rdquo; to refer to "
+#| "price. Sometimes they mean that you can obtain a binary copy at no "
+#| "charge; sometimes they mean that a copy is bundled with a computer that "
+#| "you are buying, and the price includes both.  Either way, this has "
+#| "nothing to do with what we mean by free software in the GNU project."
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
-"companies sometimes use the term &ldquo;free software&rdquo; to refer to "
+"companies typically use the term &ldquo;free software&rdquo; to refer to "
 "price. Sometimes they mean that you can obtain a binary copy at no charge; "
 "sometimes they mean that a copy is bundled with a computer that you are "
-"buying, and the price includes both.  Either way, this has nothing to do "
-"with what we mean by free software in the GNU project."
+"buying, and the price includes both.  Either way, it has nothing to do with "
+"what we mean by free software in the GNU project."
 msgstr ""
 "Слободни софтвер је ствар слободе, а не 
цене. Али фирме које производе "
 "власнички софтвер понекад користе израз 
„бесплатни софтвер“<sup><a href="
@@ -178,7 +201,7 @@
 # type: Content of: <dl><dt>
 #, fuzzy
 #| msgid "<strong>Open Source software</strong>"
-msgid "Open Source software"
+msgid "Open source software"
 msgstr "<strong>Софтвер отвореног изворног 
кода</strong>"
 
 # type: Content of: <dl><dd>
@@ -299,20 +322,32 @@
 "најчешћих начина претварања програма у 
власнички."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Some copyleft licenses, such as GPL version 3, block other means of "
+#| "turning software proprietary."
 msgid ""
-"Some copyleft licenses, such as GPL version 3, block other means of turning "
-"software proprietary."
+"Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
+"turning software proprietary, such as <a href=\"http://www.gnu.org/licenses/";
+"rms-why-gplv3.html\">tivoization</a>."
 msgstr ""
 "Неке лиценце копилефта, као што је верзија 
3 ОЈЛ, заустављају и друге начине "
 "претварања софтвера у власнички."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "In the GNU Project, we copyleft almost all the software we write, because "
+#| "our goal is to give <em>every</em> user the freedoms implied by the term "
+#| "&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
+#| "\">Copylefted</a> for more explanation of how copyleft works and why we "
+#| "use it."
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
-"&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
-"\">Copylefted</a> for more explanation of how copyleft works and why we use "
-"it."
+"&ldquo;free software.&rdquo; See our <a href= \"/copyleft/copyleft.html"
+"\">copyleft article</a> for more explanation of how copyleft works and why "
+"we use it."
 msgstr ""
 "Ми у Пројекту ГНУ копилефтујемо скоро сав 
софтвер који напишемо, јер је наш "
 "циљ да се <em>сваком</em> кориснику пренесу 
слободе које израз „слободни "
@@ -321,8 +356,19 @@
 "га ми користимо."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Copyleft is a general concept; to actually copyleft a program, you need "
+#| "to use a specific set of distribution terms. There are many possible ways "
+#| "to write copyleft distribution terms, so in principle there can be many "
+#| "copyleft free software licenses.  However, in actual practice nearly all "
+#| "copylefted software uses the <a href=\"/copyleft/gpl.html\">GNU General "
+#| "Public License</a>. Two different copyleft licenses are usually &ldquo;"
+#| "incompatible&rdquo;, which means it is illegal to merge the code using "
+#| "one license with the code using the other license; therefore, it is good "
+#| "for the community if people use a single copyleft license."
 msgid ""
-"Copyleft is a general concept; to actually copyleft a program, you need to "
+"Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
 "write copyleft distribution terms, so in principle there can be many "
 "copyleft free software licenses.  However, in actual practice nearly all "
@@ -777,7 +823,7 @@
 # type: Content of: <dl><dt>
 #, fuzzy
 #| msgid "<strong>Commercial Software</strong>"
-msgid "Commercial Software"
+msgid "Commercial software"
 msgstr "<strong>Комерцијални софтвер</strong>"
 
 # type: Content of: <dl><dd>

Index: philosophy/po/categories.tr.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.tr.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/categories.tr.po      4 Mar 2010 21:26:08 -0000       1.19
+++ philosophy/po/categories.tr.po      5 Apr 2010 08:26:20 -0000       1.20
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2010-03-04 16:25-0500\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2010-01-25 16:21+0100\n"
 "Last-Translator: Ali Servet Dönmez <address@hidden>\n"
 "Language-Team: Turkish <address@hidden>\n"
@@ -26,24 +26,39 @@
 "Vakfı (FSF)"
 
 # type: Content of: <h2>
-msgid "Categories of Free and Non-Free Software"
+#, fuzzy
+#| msgid "Categories of Free and Non-Free Software"
+msgid "Categories of free and non-free software"
 msgstr "Özgür ve Özgür-Olmayan Yazılım Kategorileri"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words "
+#| "which You Might Want to Avoid</a>."
 msgid ""
-"Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
+"Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
 msgstr ""
 "Ayrıca <a href=\"/philosophy/words-to-avoid.tr.html\">Uzak Durmak "
 "İsteyebileceğiniz Karmaşık Kelimeler</a>'e dikkat edin."
 
 # type: Content of: <p>
-msgid ""
-"This diagram by Chao-Kuei explains the different categories of software. "
-"It's also available as an <a href=\"/philosophy/category.svg\">Scalable "
-"Vector Graphic</a> and as an <a href=\"/philosophy/category.fig\">XFig "
-"document</a>, under the terms of any of the GNU GPL v2 or later, the GNU FDL "
-"v1.2 or later, or the Creative Commons Attribution-Share Alike v2.0 or later."
+#, fuzzy
+#| msgid ""
+#| "This diagram by Chao-Kuei explains the different categories of software. "
+#| "It's also available as an <a href=\"/philosophy/category.svg\">Scalable "
+#| "Vector Graphic</a> and as an <a href=\"/philosophy/category.fig\">XFig "
+#| "document</a>, under the terms of any of the GNU GPL v2 or later, the GNU "
+#| "FDL v1.2 or later, or the Creative Commons Attribution-Share Alike v2.0 "
+#| "or later."
+msgid ""
+"This diagram, originally by Chao-Kuei and updated in 2010 by Ineiev, "
+"explains the different categories of software. It's also available as an <a "
+"href=\"/philosophy/category.svg\">Scalable Vector Graphic</a> and as an <a "
+"href=\"/philosophy/category.fig\">XFig document</a>, under the terms of any "
+"of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or the Creative "
+"Commons Attribution-Share Alike v2.0 or later."
 msgstr ""
 "Chao-Kuei'nin bu şeması, farklı yazılım kategorilerini açıklıyor. GNU 
GPL v2 "
 "veya daha yenisi, GNU FDL v1.2 veya daha yenisi veya Creative Commons "
@@ -57,13 +72,21 @@
 msgstr "Özgür yazılım"
 
 # type: Content of: <dl><dd>
+#, fuzzy
+#| msgid ""
+#| "Free software is software that comes with permission for anyone to use, "
+#| "copy, and distribute, either verbatim or with modifications, either "
+#| "gratis or for a fee. In particular, this means that source code must be "
+#| "available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+#| "simplified definition; see also the <a href=\"/philosophy/free-sw.html"
+#| "\">full definition</a>."
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
-"copy, and distribute, either verbatim or with modifications, either gratis "
-"or for a fee. In particular, this means that source code must be available. "
-"&ldquo;If it's not source, it's not software.&rdquo; This is a simplified "
-"definition; see also the <a href=\"/philosophy/free-sw.html\">full "
-"definition</a>."
+"copy, and/or distribute, either verbatim or with modifications, either "
+"gratis or for a fee. In particular, this means that source code must be "
+"available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+"simplified description; see also the <a href=\"/philosophy/free-sw.html"
+"\">full definition</a>."
 msgstr ""
 "Özgür yazılım, herkese kullanma, çoğaltma ve dağıtma izinlerini, 
bire-bir "
 "aynısı veya değişiklikler ile, bedava veya bir ücret karşılığında 
gelen "
@@ -97,13 +120,21 @@
 "\">lisans listesi</a> sayfasına bakın."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Free software is a matter of freedom, not price. But proprietary software "
+#| "companies sometimes use the term &ldquo;free software&rdquo; to refer to "
+#| "price. Sometimes they mean that you can obtain a binary copy at no "
+#| "charge; sometimes they mean that a copy is bundled with a computer that "
+#| "you are buying, and the price includes both.  Either way, this has "
+#| "nothing to do with what we mean by free software in the GNU project."
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
-"companies sometimes use the term &ldquo;free software&rdquo; to refer to "
+"companies typically use the term &ldquo;free software&rdquo; to refer to "
 "price. Sometimes they mean that you can obtain a binary copy at no charge; "
 "sometimes they mean that a copy is bundled with a computer that you are "
-"buying, and the price includes both.  Either way, this has nothing to do "
-"with what we mean by free software in the GNU project."
+"buying, and the price includes both.  Either way, it has nothing to do with "
+"what we mean by free software in the GNU project."
 msgstr ""
 "Özgür yazılım, bir özgürlük meselesidir, fiyat değil. Ama, mülk 
yazılım "
 "şirketleri bazen, &ldquo;free software (özgür yazılım)&rdquo; 
tanımını fiyat "
@@ -166,7 +197,9 @@
 msgstr "Özgür yazılım, çoğunlukla, özgür olmayan yazılımdan daha 
güvenilirdir."
 
 # type: Content of: <dl><dt>
-msgid "Open Source software"
+#, fuzzy
+#| msgid "Open Source software"
+msgid "Open source software"
 msgstr "Açık Kaynak yazılım"
 
 # type: Content of: <dl><dd>
@@ -283,20 +316,32 @@
 "kalkan gibi korur."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Some copyleft licenses, such as GPL version 3, block other means of "
+#| "turning software proprietary."
 msgid ""
-"Some copyleft licenses, such as GPL version 3, block other means of turning "
-"software proprietary."
+"Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
+"turning software proprietary, such as <a href=\"http://www.gnu.org/licenses/";
+"rms-why-gplv3.html\">tivoization</a>."
 msgstr ""
 "GPL'in 3. sürümü gibi bazı lisanslar yazılımların mülke 
dönüşmelerini "
 "sağlayan diğer yolları durdurur."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "In the GNU Project, we copyleft almost all the software we write, because "
+#| "our goal is to give <em>every</em> user the freedoms implied by the term "
+#| "&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
+#| "\">Copylefted</a> for more explanation of how copyleft works and why we "
+#| "use it."
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
-"&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
-"\">Copylefted</a> for more explanation of how copyleft works and why we use "
-"it."
+"&ldquo;free software.&rdquo; See our <a href= \"/copyleft/copyleft.html"
+"\">copyleft article</a> for more explanation of how copyleft works and why "
+"we use it."
 msgstr ""
 "GNU projesinde, yazdığımız her yazılımı copyleft yazılım yaparız, 
çünkü "
 "hedefimiz, <em>her</em> kullanıcıya, &ldquo;özgür yazılım&rdquo; ile 
ifade "
@@ -305,8 +350,19 @@
 "html\">Copyleft yazılım</a> sayfasına bakın."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Copyleft is a general concept; to actually copyleft a program, you need "
+#| "to use a specific set of distribution terms. There are many possible ways "
+#| "to write copyleft distribution terms, so in principle there can be many "
+#| "copyleft free software licenses.  However, in actual practice nearly all "
+#| "copylefted software uses the <a href=\"/copyleft/gpl.html\">GNU General "
+#| "Public License</a>. Two different copyleft licenses are usually &ldquo;"
+#| "incompatible&rdquo;, which means it is illegal to merge the code using "
+#| "one license with the code using the other license; therefore, it is good "
+#| "for the community if people use a single copyleft license."
 msgid ""
-"Copyleft is a general concept; to actually copyleft a program, you need to "
+"Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
 "write copyleft distribution terms, so in principle there can be many "
 "copyleft free software licenses.  However, in actual practice nearly all "
@@ -717,7 +773,9 @@
 "yapılabilinir veya yapılabilinirdi."
 
 # type: Content of: <dl><dt>
-msgid "Commercial Software"
+#, fuzzy
+#| msgid "Commercial Software"
+msgid "Commercial software"
 msgstr "Ticari Yazılım"
 
 # type: Content of: <dl><dd>

Index: philosophy/po/java-trap.bg.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.bg.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/java-trap.bg.po       4 Apr 2010 08:25:53 -0000       1.8
+++ philosophy/po/java-trap.bg.po       5 Apr 2010 08:26:20 -0000       1.9
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2010-04-04 04:25-0300\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2009-06-24 15:08+0300\n"
 "Last-Translator: Kaloian Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -76,10 +76,11 @@
 
 # type: Content of: <div><p>
 msgid ""
-"In addition, there are nonfree programs with ``Java'' in their name, such as "
-"JavaFX, and there are nonfree Java packages you might find tempting but need "
-"to reject.  So check the licenses of whatever packages you plan to use.  If "
-"you use Swing, make sure to use the free version, which comes with IcedTea.,"
+"In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+"name, such as JavaFX, and there are nonfree Java packages you might find "
+"tempting but need to reject.  So check the licenses of whatever packages you "
+"plan to use.  If you use Swing, make sure to use the free version, which "
+"comes with IcedTea."
 msgstr ""
 
 # type: Content of: <div><p>
@@ -93,7 +94,7 @@
 #| "platform can cause a similar problem. We must learn a lesson from the "
 #| "history of Java, so we can avoid other traps in the future."
 msgid ""
-"Aside from those Java specifics, general issue described here remains "
+"Aside from those Java specifics, the general issue described here remains "
 "important, because any nonfree library or programming platform can cause a "
 "similar problem.  We must learn a lesson from the history of Java, so we can "
 "avoid other traps in the future."
@@ -107,8 +108,11 @@
 "историята на Джава, така че да избягваме 
други клопки за в бъдеще."
 
 # type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
 msgid ""
-"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
+"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
 msgstr ""
 "Вижте също и <a href=\"javascript-trap.html\">Клопката на 
Javascript</a>"
 
@@ -550,7 +554,9 @@
 "тази статия."
 
 # type: Content of: <div><p>
-msgid "Copyright &copy; 2004 Richard Stallman"
+#, fuzzy
+#| msgid "Copyright &copy; 2004 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010 Richard Stallman"
 msgstr "Авторски права &copy; 2004 Ричард Столман"
 
 # type: Content of: <div><p>

Index: philosophy/po/java-trap.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.fr.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/java-trap.fr.po       4 Apr 2010 08:25:53 -0000       1.8
+++ philosophy/po/java-trap.fr.po       5 Apr 2010 08:26:20 -0000       1.9
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2010-04-04 04:25-0300\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2009-03-29 18:45+0100\n"
 "Last-Translator: Cédric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -79,10 +79,11 @@
 
 # type: Content of: <div><p>
 msgid ""
-"In addition, there are nonfree programs with ``Java'' in their name, such as "
-"JavaFX, and there are nonfree Java packages you might find tempting but need "
-"to reject.  So check the licenses of whatever packages you plan to use.  If "
-"you use Swing, make sure to use the free version, which comes with IcedTea.,"
+"In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+"name, such as JavaFX, and there are nonfree Java packages you might find "
+"tempting but need to reject.  So check the licenses of whatever packages you "
+"plan to use.  If you use Swing, make sure to use the free version, which "
+"comes with IcedTea."
 msgstr ""
 
 # type: Content of: <div><p>
@@ -96,7 +97,7 @@
 #| "platform can cause a similar problem. We must learn a lesson from the "
 #| "history of Java, so we can avoid other traps in the future."
 msgid ""
-"Aside from those Java specifics, general issue described here remains "
+"Aside from those Java specifics, the general issue described here remains "
 "important, because any nonfree library or programming platform can cause a "
 "similar problem.  We must learn a lesson from the history of Java, so we can "
 "avoid other traps in the future."
@@ -112,8 +113,11 @@
 "&agrave; l'avenir."
 
 # type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
 msgid ""
-"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
+"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
 msgstr ""
 "Veuillez aussi consulter&nbsp;: <a href=\"javascript-trap.html\">Le piège "
 "JavaScript</a>"
@@ -581,7 +585,9 @@
 "la soumission de traductions de cet article."
 
 # type: Content of: <div><p>
-msgid "Copyright &copy; 2004 Richard Stallman"
+#, fuzzy
+#| msgid "Copyright &copy; 2004 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010 Richard Stallman"
 msgstr "Copyright &copy; 2004 Richard Stallman"
 
 # type: Content of: <div><p>

Index: philosophy/po/java-trap.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.it.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/po/java-trap.it.po       4 Apr 2010 08:25:53 -0000       1.13
+++ philosophy/po/java-trap.it.po       5 Apr 2010 08:26:20 -0000       1.14
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2010-04-04 04:25-0300\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2010-03-26 22:56+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -57,23 +57,27 @@
 
 # type: Content of: <div><p>
 msgid ""
-"In addition, there are nonfree programs with ``Java'' in their name, such as "
-"JavaFX, and there are nonfree Java packages you might find tempting but need "
-"to reject.  So check the licenses of whatever packages you plan to use.  If "
-"you use Swing, make sure to use the free version, which comes with IcedTea.,"
+"In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+"name, such as JavaFX, and there are nonfree Java packages you might find "
+"tempting but need to reject.  So check the licenses of whatever packages you "
+"plan to use.  If you use Swing, make sure to use the free version, which "
+"comes with IcedTea."
 msgstr ""
 
 # type: Content of: <div><p>
 msgid ""
-"Aside from those Java specifics, general issue described here remains "
+"Aside from those Java specifics, the general issue described here remains "
 "important, because any nonfree library or programming platform can cause a "
 "similar problem.  We must learn a lesson from the history of Java, so we can "
 "avoid other traps in the future."
 msgstr ""
 
 # type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
 msgid ""
-"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
+"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
 msgstr ""
 "Vedete anche: <a href=\"javascript-trap.html\">La trappola Javascript</a>"
 
@@ -401,7 +405,9 @@
 "projects/www-it/\">gruppo dei traduttori italiani</a>."
 
 # type: Content of: <div><p>
-msgid "Copyright &copy; 2004 Richard Stallman"
+#, fuzzy
+#| msgid "Copyright &copy; 2004 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010 Richard Stallman"
 msgstr "Copyright &copy; 2004 Richard Stallman"
 
 # type: Content of: <div><p>

Index: philosophy/po/java-trap.pot
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.pot,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/java-trap.pot 4 Apr 2010 08:25:53 -0000       1.6
+++ philosophy/po/java-trap.pot 5 Apr 2010 08:26:20 -0000       1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-04-04 04:25-0300\n"
+"POT-Creation-Date: 2010-04-05 04: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"
@@ -60,22 +60,23 @@
 
 # type: Content of: <div><p>
 msgid ""
-"In addition, there are nonfree programs with ``Java'' in their name, such as "
-"JavaFX, and there are nonfree Java packages you might find tempting but need "
-"to reject.  So check the licenses of whatever packages you plan to use.  If "
-"you use Swing, make sure to use the free version, which comes with IcedTea.,"
+"In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+"name, such as JavaFX, and there are nonfree Java packages you might find "
+"tempting but need to reject.  So check the licenses of whatever packages you "
+"plan to use.  If you use Swing, make sure to use the free version, which "
+"comes with IcedTea."
 msgstr ""
 
 # type: Content of: <div><p>
 msgid ""
-"Aside from those Java specifics, general issue described here remains "
+"Aside from those Java specifics, the general issue described here remains "
 "important, because any nonfree library or programming platform can cause a "
 "similar problem.  We must learn a lesson from the history of Java, so we can "
 "avoid other traps in the future."
 msgstr ""
 
 # type: Content of: <div><p>
-msgid "Please also see: <a href=\"javascript-trap.html\">The Javascript 
Trap</a>"
+msgid "Please also see: <a href=\"javascript-trap.html\">The Javascript 
Trap</a>."
 msgstr ""
 
 # type: Content of: <p>
@@ -274,7 +275,7 @@
 msgstr ""
 
 # type: Content of: <div><p>
-msgid "Copyright &copy; 2004 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010 Richard Stallman"
 msgstr ""
 
 # type: Content of: <div><p>

Index: philosophy/po/java-trap.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.sr.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/java-trap.sr.po       4 Apr 2010 08:25:53 -0000       1.7
+++ philosophy/po/java-trap.sr.po       5 Apr 2010 08:26:20 -0000       1.8
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2010-04-04 04:25-0300\n"
+"POT-Creation-Date: 2010-04-05 04:25-0300\n"
 "PO-Revision-Date: 2009-07-05 20:52+0200\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -76,10 +76,11 @@
 
 # type: Content of: <div><p>
 msgid ""
-"In addition, there are nonfree programs with ``Java'' in their name, such as "
-"JavaFX, and there are nonfree Java packages you might find tempting but need "
-"to reject.  So check the licenses of whatever packages you plan to use.  If "
-"you use Swing, make sure to use the free version, which comes with IcedTea.,"
+"In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+"name, such as JavaFX, and there are nonfree Java packages you might find "
+"tempting but need to reject.  So check the licenses of whatever packages you "
+"plan to use.  If you use Swing, make sure to use the free version, which "
+"comes with IcedTea."
 msgstr ""
 
 # type: Content of: <div><p>
@@ -93,7 +94,7 @@
 #| "platform can cause a similar problem. We must learn a lesson from the "
 #| "history of Java, so we can avoid other traps in the future."
 msgid ""
-"Aside from those Java specifics, general issue described here remains "
+"Aside from those Java specifics, the general issue described here remains "
 "important, because any nonfree library or programming platform can cause a "
 "similar problem.  We must learn a lesson from the history of Java, so we can "
 "avoid other traps in the future."
@@ -107,8 +108,11 @@
 "Јавине историје, како бисмо убудуће 
избегли друге замке."
 
 # type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
 msgid ""
-"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
+"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
 msgstr "Погледајте и: <a href=\"javascript-trap.html\">Замка 
ЈаваСписа</a>"
 
 # type: Content of: <p>
@@ -544,7 +548,9 @@
 "превода овог чланка."
 
 # type: Content of: <div><p>
-msgid "Copyright &copy; 2004 Richard Stallman"
+#, fuzzy
+#| msgid "Copyright &copy; 2004 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010 Richard Stallman"
 msgstr "<b>Ауторска права:</b><br />Copyright &copy; 2004 Richard 
Stallman"
 
 # type: Content of: <div><p>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]