www home.el.shtml doc/TOC-FSFS.fr.html gnu/po/f...

www-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www home.el.shtml doc/TOC-FSFS.fr.html gnu/po/f...

From:	Yavor Doganov
Subject:	www home.el.shtml doc/TOC-FSFS.fr.html gnu/po/f...
Date:	Wed, 05 May 2010 20:26:03 +0000
CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   10/05/05 20:26:03

Modified files:
        .              : home.el.shtml 
        doc            : TOC-FSFS.fr.html 
        gnu/po         : fs-user-groups.ar.po fs-user-groups.fr.po 
                         fs-user-groups.pot 
        links          : links.es.html links.fr.html 
        philosophy     : categories.ar.html categories.ca.html 
                         categories.fr.html categories.sr.html 
                         categories.tr.html java-trap.bg.html 
                         java-trap.fr.html java-trap.sr.html 
        philosophy/po  : danger-of-software-patents.pot 
        server         : body-include-2.el.html 
        software       : software.el.html 
Added files:
        doc            : TOC-FSFS.el.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.el.shtml?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/TOC-FSFS.fr.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/TOC-FSFS.el.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/fs-user-groups.ar.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/fs-user-groups.fr.po?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/fs-user-groups.pot?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/links/links.es.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/links/links.fr.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.ar.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.ca.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.fr.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.sr.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.tr.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/java-trap.bg.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/java-trap.fr.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/java-trap.sr.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/danger-of-software-patents.pot?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-2.el.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/software/software.el.html?cvsroot=www&r1=1.5&r2=1.6

Patches:
Index: home.el.shtml
===================================================================
RCS file: /web/www/www/home.el.shtml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- home.el.shtml       30 Apr 2010 20:26:14 -0000      1.37
+++ home.el.shtml       5 May 2010 20:25:40 -0000       1.38
@@ -285,8 +285,8 @@
    </li>
   
   <!-- Keep in synch with unmaintained projects list on takeaction.html -->
-<li><a href="/server/takeaction.html#unmaint">Take over an unmaintained GNU
-package:</a> <a href="/software/alive/">alive</a>, <a
+<li><a href="/server/takeaction.html#unmaint">ÎÎ½Î±Î»Î¬Î²ÎµÏÎµ ÎÎ½Î± 
Î¼Î·-ÏÏÎ½ÏÎ·ÏÎ¿ÏÎ¼ÎµÎ½Î¿
+ÏÎ±ÎºÎÏÎ¿ GNU:</a> <a href="/software/alive/">alive</a>, <a
 href="/software/fontutils/">fontutils</a>, <a
 href="/software/gift/">gift</a>, <a href="/software/gleem/">gleem</a>, <a
 href="/software/gnatsweb/">gnatsweb</a>, <a
@@ -322,11 +322,11 @@
 <ul>
 <li><a href="/distros/free-distros.html">ÎÎ»ÎµÏÎ¸ÎµÏÎµÏ Î´Î¹Î±Î½Î¿Î¼ÎÏ 
GNU/Linux</a></li>
 <li><a href="http://directory.fsf.org/GNU/";>Î Î±ÎºÎÏÎ± GNU</a></li>
-<li><a href="/manual/manual.html">GNU Documentation</a></li>
+<li><a href="/manual/manual.html">Î¤ÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ· GNU</a></li>
 <li><a href="http://lists.gnu.org/";>ÎÎ¯ÏÏÎµÏ ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï 
GNU</a></li>
 <li><a href="http://savannah.gnu.org/";>Î£Î±Î²Î¬Î½Î±</a></li>
-<li><a href="http://ftp.gnu.org/gnu/";>GNU FTP Site</a> and <a
-href="/prep/ftp.html">mirrors</a></li>
+<li><a href="http://ftp.gnu.org/";>FTP ÏÏÏÎ¿Ï GNU</a> ÎºÎ±Î¹ <a
+href="/prep/ftp.html">ÎºÎ±Î¸ÏÎÏÏÎµÏ</a></li>
 <li><a href="/licenses/license-list.html">ÎÎ»ÎµÏÎ¸ÎµÏÎµÏ Î¬Î´ÎµÎ¹ÎµÏ 
Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï</a></li>
 <li><a href="/licenses/gpl.html">GNU GPL</a></li>
 <li><a href="/licenses/lgpl.html">GNU LGPL</a></li>
@@ -334,9 +334,9 @@
 <li><a href="/licenses/agpl.html">GNU AGPL</a></li>
 <li><a href="http://audio-video.gnu.org/";>GNU ÎÏÎ¿Ï/ÎÎ¯Î½ÏÎµÎ¿</a></li>
 <li><a href="/licenses/license-list.html">ÎÎ®Î»ÏÏÎ· 
ÏÏÎ¿ÏÎ²Î±ÏÎ¹Î¼ÏÏÎ·ÏÎ±Ï</a></li>
-<li><a href="/server/server.html">GNU Server Guidelines</a></li>
+<li><a href="/server/server.html">ÎÎ´Î·Î³Î¯ÎµÏ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏÏÎ½ 
GNU</a></li>
 <li><a href="/server/standards/">Î ÏÏÏÏÏÎ± Î¹ÏÏÎ¿Ï GNU</a></li>
-<li><a href="/links/links.html">More Free Software Links</a></li>
+<li><a href="/links/links.html">Î ÎµÏÎ¹ÏÏÏÏÎµÏÎ¿Î¹ ÏÏÎ½Î´ÎµÏÎ¼Î¿Î¹ 
ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿Ï Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï</a></li>
 </ul>
 
 </div>
@@ -347,17 +347,17 @@
   
 <ul>
 <li><a href="http://planet.gnu.org/";>Î Î»Î±Î½Î®ÏÎ·Ï.gnu.org</a></li>
-<li><a href="/people/people.html">GNU's Who</a></li>
-<li><a href="/contact/gnu-advisory.html">GNU Advisory Committee</a></li>
+<li><a href="/people/people.html">Î Î¿Î¹Î¿Ï ÎµÎ¯Î½Î±Î¹ ÏÏÎ¿ GNU</a></li>
+<li><a href="/contact/gnu-advisory.html">Î£ÏÎ¼Î²Î¿ÏÎ»ÎµÏÏÎ¹ÎºÎ® 
ÎÏÎ¹ÏÏÎ¿ÏÎ® GNU</a></li>
 <li><a href="/people/speakers.html">ÎÎ¼Î¹Î»Î·ÏÎÏ</a></li>
 <li><a href="/thankgnus/thankgnus.html">ÎÏÏÎ±ÏÎ¹ÏÏÎ¯ÎµÏ GNU</a></li>
-<li><a href="/testimonials/testimonials.html">Testimonials</a></li>
+<li><a href="/testimonials/testimonials.html">ÎÎ±ÏÏÏÏÎ¯ÎµÏ</a></li>
 <li><a href="/gnu/gnu-user-groups.html">ÎÎ¼Î¬Î´ÎµÏ ÏÏÎ·ÏÏÏÎ½ 
GNU</a></li>
-<li><a href="/jobs">Free Software Job Board</a></li>
+<li><a href="/jobs">Î Î¯Î½Î±ÎºÎ±Ï ÎÎÏÎµÏÎ½ ÎµÏÎ³Î±ÏÎ¯Î±Ï 
ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿Ï Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï</a></li>
 <li><a href="http://www.fsf.org/resources/service/";>ÎÎ±ÏÎ¬Î»Î¿Î³Î¿Ï Ï
ÏÎ·ÏÎµÏÎ¹ÏÎ½ GNU</a></li>
 <li><a href="/fun/fun.html">ÎÎ¹Î±ÏÎºÎÎ´Î±ÏÎ· GNU</a></li>
 <li><a href="/graphics/graphics.html">Î¤ÎÏÎ½Î· GNU</a></li>
-<li><a href="/music/music.html">Music &amp; Songs</a></li>
+<li><a href="/music/music.html">ÎÎ¿ÏÏÎ¹ÎºÎ® &amp; 
ÏÏÎ±Î³Î¿ÏÎ´Î¹Î±</a></li>
 </ul>
 
 </div>
@@ -380,8 +380,8 @@
 <ul class="translations-list">
   <li><a href="http://savannah.gnu.org/";>Î Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏÎ®Ï ÏÎ¿Ï 
ÏÎ¹Î»Î¿Î¾ÎµÎ½ÎµÎ¯ ÏÎ¿ ÎÏÎ³Î¿ Î¼Î±Ï,
 savannah.gnu.org</a></li>
-  <li><a href="/manual/manual.html">GNU documentation</a></li>
-  <li><a href="http://directory.fsf.org/GNU/";>All GNU packages</a></li>
+  <li><a href="/manual/manual.html">Î¤ÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ· GNU</a></li>
+  <li><a href="http://directory.fsf.org/GNU/";>ÎÎ»Î± ÏÎ± ÏÎ±ÎºÎÏÎ± 
GNU</a></li>
   <li><a href="http://lists.gnu.org/";>ÎÎ¯ÏÏÎµÏ ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï 
GNU</a></li>
 </ul>
 
@@ -427,7 +427,7 @@
  <p><!-- timestamp start -->
 Î¤ÎµÎ»ÎµÏÏÎ±Î¯Î± ÎµÎ½Î·Î¼ÎÏÏÏÎ·:
    
-   $Date: 2010/04/30 20:26:14 $
+   $Date: 2010/05/05 20:25:40 $
    
 <!-- timestamp end -->
 </p>

Index: doc/TOC-FSFS.fr.html
===================================================================
RCS file: /web/www/www/doc/TOC-FSFS.fr.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- doc/TOC-FSFS.fr.html        14 Feb 2010 21:25:24 -0000      1.5
+++ doc/TOC-FSFS.fr.html        5 May 2010 20:25:43 -0000       1.6
@@ -119,7 +119,7 @@
 <!-- timestamp start -->
 DerniÃ¨re mise Ã  jour&nbsp;:
 
-$Date: 2010/02/14 21:25:24 $
+$Date: 2010/05/05 20:25:43 $
 
 <!-- timestamp end -->
 </p>
@@ -143,6 +143,8 @@
 <!-- use the 3-letter ISO 639-2. -->
 <!-- Please use W3C normative character entities. -->
 <ul class="translations-list">
+<!-- Greek -->
+<li><a 
href="/doc/TOC-FSFS.el.html">&#x03b5;&#x03bb;&#x03bb;&#x03b7;&#x03bd;&#x03b9;&#x03ba;&#x03ac;</a>&nbsp;[el]</li>
 <!-- English -->
 <li><a href="/doc/TOC-FSFS.html">English</a>&nbsp;[en]</li>
 </ul>

Index: gnu/po/fs-user-groups.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/fs-user-groups.ar.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/po/fs-user-groups.ar.po 17 Apr 2010 20:26:03 -0000      1.9
+++ gnu/po/fs-user-groups.ar.po 5 May 2010 20:25:45 -0000       1.10
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: fs-user-groups\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-17 16:25-0300\n"
+"POT-Creation-Date: 2010-05-05 16:25-0300\n"
 "PO-Revision-Date: 2009-09-03 19:18+0200\n"
 "Last-Translator: Hossam Hossny <address@hidden>\n"
 "Language-Team: Arabic\n"
@@ -219,6 +219,11 @@
 
 # type: Content of: <ul><li>
 msgid ""
+"<a href=\"http://fsug-idk.org/\";>Free Software Users' Group - Idukki</a>"
+msgstr ""
+
+# type: Content of: <ul><li>
+msgid ""
 "<a href=\"http://fsugcalicut.org/\";>Free Software User Group - Kozhikode</a>"
 msgstr ""
 

Index: gnu/po/fs-user-groups.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/fs-user-groups.fr.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- gnu/po/fs-user-groups.fr.po 17 Apr 2010 20:26:03 -0000      1.36
+++ gnu/po/fs-user-groups.fr.po 5 May 2010 20:25:45 -0000       1.37
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fs-user-groups.html\n"
-"POT-Creation-Date: 2010-04-17 16:25-0300\n"
+"POT-Creation-Date: 2010-05-05 16:25-0300\n"
 "PO-Revision-Date: 2010-02-14 14:55+0100\n"
 "Last-Translator: CÃ©dric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -238,6 +238,17 @@
 "libres, Bangalore</a>"
 
 # type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://fsugcalicut.org/\";>Free Software User Group - Kozhikode</"
+#| "a>"
+msgid ""
+"<a href=\"http://fsug-idk.org/\";>Free Software Users' Group - Idukki</a>"
+msgstr ""
+"<a href=\"http://fsugcalicut.org/\";>Groupe d'utilisateurs de logiciels "
+"libres - Kozhikode</a>"
+
+# type: Content of: <ul><li>
 msgid ""
 "<a href=\"http://fsugcalicut.org/\";>Free Software User Group - Kozhikode</a>"
 msgstr ""

Index: gnu/po/fs-user-groups.pot
===================================================================
RCS file: /web/www/www/gnu/po/fs-user-groups.pot,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gnu/po/fs-user-groups.pot   17 Apr 2010 20:26:03 -0000      1.20
+++ gnu/po/fs-user-groups.pot   5 May 2010 20:25:45 -0000       1.21
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-04-17 16:25-0300\n"
+"POT-Creation-Date: 2010-05-05 16:25-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -203,6 +203,10 @@
 msgstr ""
 
 # type: Content of: <ul><li>
+msgid "<a href=\"http://fsug-idk.org/\";>Free Software Users' Group - 
Idukki</a>"
+msgstr ""
+
+# type: Content of: <ul><li>
 msgid "<a href=\"http://fsugcalicut.org/\";>Free Software User Group - 
Kozhikode</a>"
 msgstr ""
 

Index: links/links.es.html
===================================================================
RCS file: /web/www/www/links/links.es.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- links/links.es.html 18 Jan 2010 09:26:27 -0000      1.29
+++ links/links.es.html 5 May 2010 20:25:48 -0000       1.30
@@ -210,6 +210,8 @@
 propagaciÃ³n y el uso de GNU/Linux y del software libre entre la comunidad de
 usuarios de ordenadores en general.</li>
 
+  <li><a href="http://www.gnulinux.in/";>GnuLinux.in</a>, a FOSS Community 
site.</li>
+
   <li><a href="http://techmeet.org";>techmeet.org</a>, es una web para discutir
 sistemas libres de revisiÃ³n de pÃ¡ginas web, organizando conferencias sobre
 el asunto.</li>
@@ -337,6 +339,10 @@
 lucro nacional que representa a los usuarios de Internet preocupados por las
 libertades y derechos en la red.
     </p></li>
+
+<li><a href="http://www.libertadinformacion.org/";>Asociaci&oacute;n por la
+Libertad de la Informaci&oacute;n</a>
+    <p>An association fighting for freedom of information in Spain.</p></li>
 </ul>
 
 
@@ -439,7 +445,7 @@
 <!-- timestamp start -->
 Ãltima actualizaciÃ³n: 
 
-$Date: 2010/01/18 09:26:27 $
+$Date: 2010/05/05 20:25:48 $
 
 <!-- timestamp end -->
 </p>

Index: links/links.fr.html
===================================================================
RCS file: /web/www/www/links/links.fr.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- links/links.fr.html 18 Jan 2010 09:26:27 -0000      1.34
+++ links/links.fr.html 5 May 2010 20:25:48 -0000       1.35
@@ -214,6 +214,8 @@
 et des logiciels libres dans la communaut&eacute; g&eacute;n&eacute;rale des
 utilisateurs d'ordinateur.</li>
 
+  <li><a href="http://www.gnulinux.in/";>GnuLinux.in</a>, a FOSS Community 
site.</li>
+
   <li><a href="http://techmeet.org";>techmeet.org</a>, un site de discussion sur
 les syst&egrave;mes de r&eacute;vision de sites Web libres et d'organisation
 de conf&eacute;rences sur le sujet.</li>
@@ -355,6 +357,10 @@
 repr&eacute;sentant les internautes concern&eacute;s par les droits et
 libert&eacute;s en ligne.
     </p></li>
+
+<li><a href="http://www.libertadinformacion.org/";>Asociaci&oacute;n por la
+Libertad de la Informaci&oacute;n</a>
+    <p>An association fighting for freedom of information in Spain.</p></li>
 </ul>
 
 
@@ -454,7 +460,7 @@
 <!-- timestamp start -->
 DerniÃ¨re mise Ã  jour&nbsp;:
 
-$Date: 2010/01/18 09:26:27 $
+$Date: 2010/05/05 20:25:48 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/categories.ar.html
===================================================================
RCS file: /web/www/www/philosophy/categories.ar.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/categories.ar.html       3 Apr 2010 08:26:04 -0000       1.8
+++ philosophy/categories.ar.html       5 May 2010 20:25:50 -0000       1.9
@@ -6,7 +6,7 @@
 (Ø¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù)</title>
 
 <!--#include virtual="/server/banner.ar.html" -->
-<h2>ØªØµØ§ÙÙÙ Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø© ÙØºÙØ± Ø§ÙØØ±Ø©</h2>
+<h2>Categories of free and non-free software</h2>
 
 <!-- This document uses XHTML 1.0 Strict, but may be served as -->
 <!-- text/html.  Please ensure that markup style considers -->
@@ -14,15 +14,15 @@
 <!-- Please ensure links are consistent with Apache's MultiView. -->
 <!-- Change include statements to be consistent with the relevant -->
 <!-- language, where necessary. -->
-<p>ÙØ§ØØ¸ Ø£ÙØ¶Ø§ <a href="/philosophy/words-to-avoid.html">ÙÙÙØ§Øª Ù
ÙØ´ÙÙØ´Ø© ÙØ¯ ØªØ±ØºØ¨ ÙÙ
-ØªØ¬Ø§ÙØ²ÙØ§</a>.</p>
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing Words which You
+Might Want to Avoid</a>.</p>
 
 <p id="diagram" class="c">
 <img src="category.png" alt="" />
 </p>
 
-      <p>This diagram by Chao-Kuei explains the different categories of
-software. It's also available as an <a
+      <p>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
@@ -30,11 +30,12 @@
 
 <h3 id="FreeSoftware">Free software</h3>
 
-       <p>Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø© ÙÙ Ø¨Ø±ÙØ¬ÙØ§Øª ØªØ£ØªÙ ÙØ¹ 
Ø£Ø°ÙÙØ§Øª ÙØ£Ù Ø´Ø®Øµ Ø¨Ø§ÙØ§Ø³ØªØ®Ø¯Ø§ÙØ ÙØ§ÙÙØ´Ø±Ø
-ÙØ§ÙØªÙØ²ÙØ¹Ø Ø³ÙØ§Ø¡Ù ØØ±ÙÙØ§ Ø£Ù ÙØ¹ ØªØ¹Ø¯ÙÙØ§ØªØ Ø³ÙØ§Ø¡Ù 
ÙØ¬Ø§ÙÙØ§ Ø£Ù ÙÙØ§Ø¨Ù Ø±Ø³Ù. ØªØØ¯ÙØ¯Ø§Ø ÙØ°Ø§
-ÙØ¹ÙÙ Ø£Ù Ø§ÙØ´ÙÙØ±Ø© Ø§ÙÙØµØ¯Ø±ÙØ© ÙØ¬Ø¨ Ø£Ù ØªÙÙÙ Ù
ØªÙÙØ±Ø© &rdquo;Ø¥Ø°Ø§ ÙÙ ØªÙÙ ÙØµØ¯Ø±Ø§Ø ÙÙØ³Øª
-Ø¨Ø±ÙØ¬ÙØ§Øª&ldquo; ÙØ°Ø§ ØªØ¹Ø±ÙÙ ÙØ¨Ø³Ø·Ø Ø±Ø§Ø¬Ø¹ Ø£ÙØ¶Ø§ <a
-href="/philosophy/free-sw.ar.html">Ø§ÙØªØ¹Ø±ÙÙ Ø§ÙÙØ§ÙÙ</a>.</p>
+       <p>Free software is software that comes with permission for anyone to 
use,
+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>.</p>
 
        <p>Ø¥Ø°Ø§ ÙØ§Ù Ø§ÙØ¨Ø±ÙØ§ÙØ¬ ØØ±Ø©Ø ØÙÙÙØ§ ÙÙÙÙ Ø£Ù 
ÙÙØ¶ÙÙÙ ÙÙ ÙØ¸Ø§Ù ØªØ´ØºÙÙ ØØ± ÙØ«Ù ØºÙÙØ Ø£Ù
 Ø§ÙØ¥ØµØ¯Ø§Ø±Ø§Øª Ø§ÙØØ±Ø© ÙÙ <a 
href="/gnu/linux-and-gnu.ar.html">ÙØ¸Ø§Ù ØºÙÙ/ÙÙÙÙØ³</a>.</p>
@@ -45,11 +46,11 @@
 href="/licenses/license-list.html">ÙØ§Ø¦ÙØ© Ø§ÙØ±Ø®Øµ</a>.</p>
 
        <p>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.</p>
+buying, and the price includes both.  Either way, it has nothing to do with
+what we mean by free software in the GNU project.</p>
 
        <p>Ø¨Ø³Ø¨Ø¨ Ø§ÙØªØ´ÙØ´ Ø§ÙÙØ§ÙÙØ Ø¹ÙØ¯ÙØ§ ØªÙÙÙ Ø´Ø±ÙØ© 
Ø¨Ø±ÙØ¬ÙØ§Øª Ø£Ù ÙÙØªØ¬ÙØ§ Ø¨Ø±ÙØ§ÙØ¬ ØØ±Ø ØªØÙÙ Ø¯Ø§Ø¦ÙØ§
 ÙÙ Ø´Ø±ÙØ· Ø§ÙØªÙØ²ÙØ¹ Ø§ÙÙØ¹ÙÙØ© ÙØªØ¯Ø±Ù ÙÙÙØ§ Ø¥Ø°Ø§ ÙØ§Ù 
Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ ØÙØ§ ÙÙØªÙÙÙÙ ÙÙ Ø§ÙØØ±ÙØ§Øª
@@ -68,7 +69,7 @@
        <p>Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø© Ø¹Ø§Ø¯Ø© <a 
href="/software/reliability.html">Ø£ÙØ«Ø± ÙØ«ÙÙÙØ©</a> ÙÙ
 Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª ØºÙØ± Ø§ÙØØ±Ø©.</p>
 
-<h3 id="OpenSource">Open Source software</h3>
+<h3 id="OpenSource">Open source software</h3>
 
        <p>
        Ø§ÙÙØµØ·ÙØ Ø¨Ø±ÙØ¬ÙØ§Øª &ldquo;Ø§ÙÙØµØ¯Ø± Ø§ÙÙÙØªÙØ&rdquo; 
ÙØ³ØªØ®Ø¯Ù ÙÙ Ø¨Ø¹Ø¶ Ø§ÙÙØ§Ø³ Ø¨ÙØ¹ÙÙ Ø£ÙØ«Ø±
@@ -116,22 +117,25 @@
 available.  This shields the program, and its modified versions, from some
 of the common ways of making a program proprietary.</p>
 
-        <p>Some copyleft licenses, such as GPL version 3, block other means of 
turning
-software proprietary.</p>
-
-       <p>ÙÙ ÙØ´Ø±ÙØ¹ ØºÙÙØ ÙØªØ±Ù ØÙÙÙ ØªÙØ±ÙØ¨Ø§ ÙÙ 
Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØªÙ ÙÙØªØ¨ÙØ§Ø ÙØ£Ù ÙØ¯ÙÙØ§ ÙÙ Ø¥Ø¹Ø·Ø§Ø¡
-<em>ÙÙ</em> ÙØ³ØªØ®Ø¯Ù Ø§ÙØØ±ÙØ§Øª Ø§ÙÙÙØ¶ÙÙØ© ÙÙ ÙØµØ·ÙØ 
&rdquo;Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø©.&ldquo;Ø
-Ø±Ø§Ø¬Ø¹ <a href= "/copyleft/copyleft.ar.html">Ø§ÙØÙÙÙ Ø§ÙÙ
ØªØ±ÙÙØ©</a> ÙÙØ²ÙØ¯ ÙÙ
-ØªÙØ¶ÙØ ÙÙÙÙØ© ØªØ±Ù ØÙÙÙ Ø§ÙØ£Ø¹ÙØ§Ù ÙÙÙØ§Ø°Ø§ ÙØ³ØªØ®Ø¯Ù
Ù.</p>
-
-       <p>Ø§ÙØÙÙÙ Ø§ÙÙØªØ±ÙÙØ© ÙÙØ±Ø© Ø¹Ø§ÙØ©Ø ÙØªØ±Ù ØÙÙÙ 
Ø¨Ø±ÙØ§ÙØ¬ ÙØ¹ÙÙØ§Ø ØªØØªØ§Ø¬ Ø¥ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØ¬ÙÙØ¹Ø©
-ÙÙ Ø´Ø±ÙØ· Ø§ÙØªÙØ²ÙØ¹. ÙÙØ¬Ø¯ Ø§ÙÙØ«ÙØ± ÙÙ Ø§ÙØ·Ø±Ù Ø§ÙÙÙ
ÙÙ ÙÙØªØ§Ø¨Ø© Ø´Ø±ÙØ· ØªÙØ²ÙØ¹ ØÙÙÙ ÙØªØ±ÙÙØ©Ø
-ÙØ°Ø§ ÙÙÙÙ Ø£Ù ØªÙØ¬Ø¯ Ø§ÙÙØ«ÙØ± ÙÙ Ø±Ø®Øµ ØªØ±Ù ØÙÙÙ 
Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø©. ÙÙÙ ÙÙ Ø§ÙÙÙØ§Ø±Ø³Ø©
-Ø§ÙÙØ¹ÙÙØ© ØªÙØ±ÙØ¨Ø§ ÙÙ Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª ÙØªØ±ÙÙØ© Ø§ÙØÙÙÙ 
ØªØ³ØªØ®Ø¯Ù <a
-href="/copyleft/gpl.html">Ø±Ø®ØµØ© ØºÙÙ Ø§ÙØ¹ÙÙÙÙØ©</a>. Ø±Ø®ØµØªÙÙ Ù
Ø®ØªÙÙØªÙÙ ÙÙØÙÙÙ
-Ø§ÙÙØªØ±ÙÙØ© Ø¹Ø§Ø¯Ø© ØªÙÙÙ &rdquo;ÙØ³ØªØÙÙØ©&ldquo;Ø ÙØ§ 
ÙØ¹ÙÙ Ø£ÙÙ ÙÙ ØºÙØ± Ø§ÙÙØ§ÙÙÙÙ Ø¯ÙØ¬
-Ø§ÙØ´ÙÙØ±Ø© Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù Ø±Ø®ØµØ© ÙØ¹ Ø§ÙØ´ÙÙØ±Ø© Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù 
Ø±Ø®ØµØ© Ø£Ø®Ø±ÙØ ÙØ°ÙÙØ ÙÙ Ø§ÙØ¬ÙØ¯ ÙÙÙØ¬ØªÙØ¹
-Ø¥Ø°Ø§ Ø§Ø³ØªØ®Ø¯Ù Ø§ÙÙØ§Ø³ Ø±Ø®ØµØ© ØÙÙÙ ÙØªØ±ÙÙØ© ÙØ§ØØ¯Ø©.</p>
+        <p>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>.</p> 
+
+       <p>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 our <a href=
+"/copyleft/copyleft.html">copyleft article</a> for more explanation of how
+copyleft works and why we use it.</p>
+
+       <p>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
+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.</p>
 
 <h3 id="Non-CopyleftedFreeSoftware">Non-copylefted free software</h3>
 
@@ -281,7 +285,7 @@
        <p>ØªÙØ±ÙØ¨Ø§ ÙÙ ÙØ¸Ø§Ø¦Ù Ø§ÙÙØ¨Ø±ÙØ¬ÙÙ ÙÙ ØªØ·ÙÙØ± 
Ø¨Ø±ÙØ¬ÙØ§Øª ÙØ®ØµØµØ©Ø ÙØ°ÙÙ ÙØ¹Ø¸Ù ÙÙØ§Ù Ø§ÙÙØ¨Ø±ÙØ¬ÙÙØ
 Ø£Ù ØªÙØ§Ø¯ ØªÙÙÙØ ØªØªÙ Ø¨Ø·Ø±ÙÙØ© ÙÙØ³Ø¬ÙØ© ÙØ¹ ØØ±ÙØ© 
Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø©.</p>
 
-<h3 id="commercialSoftware">Commercial Software</h3>
+<h3 id="commercialSoftware">Commercial software</h3>
 
        <p>Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØªØ¬Ø§Ø±ÙØ© ÙÙ Ø¨Ø±ÙØ¬ÙØ§Øª ØªÙØ·ÙØ± Ù
Ù ÙØ´Ø§Ø±ÙØ¹ ØªØ¬Ø§Ø±ÙØ© ØªÙØ¯Ù Ø¥ÙÙ Ø¬ÙÙ Ø§ÙÙØ§Ù ÙÙ
 Ø§Ø³ØªØ®Ø¯Ø§Ù Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª. &rdquo;ØªØ¬Ø§Ø±Ù&ldquo; 
Ù&rdquo;Ø§ØØªÙØ§Ø±Ù&ldquo; ÙÙØ³Ø§ ÙÙØ³
@@ -350,7 +354,7 @@
 <!-- timestamp start -->
 ØÙØ¯ÙØ«Øª:
 
-$Date: 2010/04/03 08:26:04 $
+$Date: 2010/05/05 20:25:50 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/categories.ca.html
===================================================================
RCS file: /web/www/www/philosophy/categories.ca.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/categories.ca.html       3 Apr 2010 08:26:04 -0000       1.16
+++ philosophy/categories.ca.html       5 May 2010 20:25:50 -0000       1.17
@@ -6,7 +6,7 @@
 Foundation (FSF)</title>
 
 <!--#include virtual="/server/banner.ca.html" -->
-<h2>Categories de programari lliure i no lliure</h2>
+<h2>Categories of free and non-free software</h2>
 
 <!-- This document uses XHTML 1.0 Strict, but may be served as -->
 <!-- text/html.  Please ensure that markup style considers -->
@@ -14,15 +14,15 @@
 <!-- Please ensure links are consistent with Apache's MultiView. -->
 <!-- Change include statements to be consistent with the relevant -->
 <!-- language, where necessary. -->
-<p>Vegeu tamb&eacute; <a href="/philosophy/words-to-avoid.ca.html">Paraules
-confuses que conv&eacute; evitar</a>.</p>
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing Words which You
+Might Want to Avoid</a>.</p>
 
 <p id="diagram" class="c">
 <img src="category.png" alt="" />
 </p>
 
-      <p>This diagram by Chao-Kuei explains the different categories of
-software. It's also available as an <a
+      <p>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
@@ -30,13 +30,12 @@
 
 <h3 id="FreeSoftware">Free software</h3>
 
-       <p>Programari lliure &eacute;s aquell programari que concedeix a tothom
-perm&iacute;s per utilitzar-lo, copiar-lo i distribuir-lo amb o sense
-modificacions i de forma gratu&iuml;ta o a canvi d'una quota. Aix&ograve;
-implica, particularment, que el codi font ha d'estar disponible:&quot; Si no
-&eacute;s codi font, no es programari&quot;. Aquesta &eacute;s una
-definici&oacute; simplificada; vegeu tamb&eacute; una <a
-href="/philosophy/free-sw.ca.html">definici&oacute; completa</a>.</p>
+       <p>Free software is software that comes with permission for anyone to 
use,
+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>.</p>
 
        <p>Si un programa &eacute;s lliure pot ser incl&ograve;s en un sistema 
operatiu
 lliure com GNU o les versions lliures del <a
@@ -50,11 +49,11 @@
 href="/licenses/license-list.ca.html">llista de llic&egrave;ncies</a>.</p>
 
        <p>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.</p>
+buying, and the price includes both.  Either way, it has nothing to do with
+what we mean by free software in the GNU project.</p>
 
        <p>A causa d'aquesta potencial confusi&oacute;, quan una empresa de 
programari
 diu que el producte &eacute;s programari lliure, haur&iacute;eu de comprovar
@@ -76,7 +75,7 @@
 href="/software/reliability.ca.html">m&eacute;s fiable</a> que el que no ho
 &eacute;s.</p>
 
-<h3 id="OpenSource">Open Source software</h3>
+<h3 id="OpenSource">Open source software</h3>
 
        <p>
        Algunes persones utilitzen l'expressi&oacute; &quot;programari de codi
@@ -135,28 +134,25 @@
 available.  This shields the program, and its modified versions, from some
 of the common ways of making a program proprietary.</p>
 
-        <p>Some copyleft licenses, such as GPL version 3, block other means of 
turning
-software proprietary.</p>
-
-       <p>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>
-els usuaris les llibertats que comporta l'expressi&oacute; &quot;programari
-lliure&quot;. Vegeu <a href= "/copyleft/copyleft.ca.html">Qu&egrave;
-&eacute;s el copyleft?</a> per a una explicaci&oacute; m&eacute;s detallada
-sobre com funciona i per qu&egrave; el fem servir.</p>
-
-       <p>El copyleft &eacute;s un concepte general; per publicar un programa 
amb
-copyleft, haureu d'utilitzar un conjunt espec&iacute;fic de termes de
-distribuci&oacute;. Hi ha moltes maneres possibles d'exposar uns termes de
-distribuci&oacute; amb copyleft, o sigui que, en principi, pot haver-hi
-moltes menes de llic&egrave;ncies de programari lliure amb copyleft. No
-obstant, a la pr&agrave;ctica, gaireb&eacute; tot el programari amb copyleft
-utilitza actualment la <a href="/copyleft/gpl.html">Llic&egrave;ncia
-P&uacute;blica General de GNU</a>. Dues llic&egrave;ncies de copyleft
-diferents s&oacute;n normalment &quot;incompatibles&quot;, la qual cosa
-implica que pot ser il&middot;legal combinar codi sota una llic&egrave;ncia
-amb codi sota una altra. Per aquesta ra&oacute;, &eacute;s bo per a la
-comunitat que tothom utilitzi la mateixa llic&egrave;ncia de copyleft.</p>
+        <p>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>.</p> 
+
+       <p>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 our <a href=
+"/copyleft/copyleft.html">copyleft article</a> for more explanation of how
+copyleft works and why we use it.</p>
+
+       <p>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
+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.</p>
 
 <h3 id="Non-CopyleftedFreeSoftware">Non-copylefted free software</h3>
 
@@ -324,7 +320,7 @@
 de programaci&oacute; es fan o es podrien fer d'una manera compatible amb
 els principis del moviment per al programari lliure.</p>
 
-<h3 id="commercialSoftware">Commercial Software</h3>
+<h3 id="commercialSoftware">Commercial software</h3>
 
        <p>El programari comercial &eacute;s aquell programari que ha estat
 desenvolupat per empreses amb l'objectiu d'obtenir diners de l'&uacute;s del
@@ -398,7 +394,7 @@
 <!-- timestamp start -->
 Updated:
 
-$Date: 2010/04/03 08:26:04 $
+$Date: 2010/05/05 20:25:50 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/categories.fr.html
===================================================================
RCS file: /web/www/www/philosophy/categories.fr.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- philosophy/categories.fr.html       3 Apr 2010 08:26:04 -0000       1.39
+++ philosophy/categories.fr.html       5 May 2010 20:25:50 -0000       1.40
@@ -6,7 +6,7 @@
 Software Foundation (FSF)</title>
 
 <!--#include virtual="/server/banner.fr.html" -->
-<h2>Cat&eacute;gories de logiciels libres et non libres</h2>
+<h2>Categories of free and non-free software</h2>
 
 <!-- This document uses XHTML 1.0 Strict, but may be served as -->
 <!-- text/html.  Please ensure that markup style considers -->
@@ -14,30 +14,28 @@
 <!-- Please ensure links are consistent with Apache's MultiView. -->
 <!-- Change include statements to be consistent with the relevant -->
 <!-- language, where necessary. -->
-<p>Lisez aussi <a href="/philosophy/words-to-avoid.fr.html">Termes
-pr&ecirc;tant &agrave; confusion, que vous devriez &eacute;viter</a>.</p>
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing Words which You
+Might Want to Avoid</a>.</p>
 
 <p id="diagram" class="c">
 <img src="category.png" alt="" />
 </p>
 
-      <p>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">fichier SVG</a> et de <a
-href="/philosophy/category.fr.fig">fichier XFig</a>, sous les termes de la
-GNU GPL v2 ou ultÃ©rieure, de la GNU FDL v1.2 ou supÃ©rieure ou de la Creative
-Commons Attribution-Share Alike v2.0 ou ultÃ©rieure.</p>
+      <p>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.</p>
 
 <h3 id="FreeSoftware">Logiciel libre</h3>
 
-       <p>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
-forme conforme &agrave; l'original, soit avec des modifications, ou encore
-gratuitement ou contre un certain montant. Ceci signifie en particulier que
-son code source doit &ecirc;tre disponible. Â«&nbsp;S'il n'y a pas de
-sources, ce n'est pas du logiciel.&nbsp;Â» Ceci est une d&eacute;finition
-simplifi&eacute;e; voir aussi la <a
-href="/philosophy/free-sw.fr.html">d&eacute;finition compl&egrave;te</a>.</p>
+       <p>Free software is software that comes with permission for anyone to 
use,
+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>.</p>
 
        <p>Du moment qu'il est libre, tout programme peut, potentiellement, 
faire
 partie d'un syst&egrave;me d'exploitation libre tel que GNU, ou les <a
@@ -51,14 +49,12 @@
 sp&eacute;cifiques, consultez la page <a
 href="/licenses/license-list.fr.html">liste des licences</a>.</p>
 
-       <p>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;taires utilisent parfois le terme Â«&nbsp;logiciel libre&nbsp;Â»
-pour parler de logiciels gratuits. Ce qui veut parfois dire que vous pouvez
-en obtenir une copie binaire gratuitement, ou qu'une copie de ce logiciel
-est comprise dans le prix d'achat de votre ordinateur. Ceci n'a rien
-&agrave; voir avec le terme de logiciel libre, tel que nous le
-d&eacute;finissons dans le projet GNU.</p>
+       <p>Free software is a matter of freedom, not price. But proprietary 
software
+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, it has nothing to do with
+what we mean by free software in the GNU project.</p>
 
        <p>&Agrave; cause de cette confusion potentielle il serait souhaitable, 
chaque
 fois qu'une soci&eacute;t&eacute; informatique annonce que son produit est
@@ -80,7 +76,7 @@
        <p>Le logiciel libre est souvent <a 
href="/software/reliability.fr.html">plus
 fiable</a> que le logiciel non-libre.</p>
 
-<h3 id="OpenSource">Logiciel Open Source</h3>
+<h3 id="OpenSource">Open source software</h3>
 
        <p>
        Le terme logiciel Â«&nbsp;open source&nbsp;Â» (litt&eacute;ralement 
&agrave;
@@ -140,29 +136,25 @@
 source soit disponible. Ceci protÃ¨ge le programme et ses versions modifiÃ©es
 de quelques uns des moyens courants de rendre le logiciel propriÃ©taire.</p>
 
-        <p>Certaines licences avec copyleft, telle que la GPL version 3, bloque
-d'autres moyens de rendre les logiciels propriÃ©taires.</p>
-
-       <p>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;
-chaque</em> utilisateur les libert&eacute;s garanties par le terme
-Â«&nbsp;logiciel libre&nbsp;Â». Voir <a
-href="/copyleft/copyleft.fr.html">Qu'est-ce que le copyleft</a> pour plus
-d'explications sur le fonctionnement du copyleft et savoir pourquoi nous
-l'utilisons.</p>
-
-       <p>Le copyleft est un concept g&eacute;n&eacute;ral; pour l'appliquer 
&agrave;
-un programme, vous avez besoin d'un ensemble de termes relatifs &agrave; sa
-distribution. Il y a de nombreuses fa&ccedil;ons d'&eacute;crire ces
-conditions de distribution, donc en th&eacute;orie de nombreuses licences de
-logiciels libres sous copyleft peuvent exister. N&eacute;anmoins, dans la
-pratique actuelle quasiment tous les logiciels sous copyleft utilisent la <a
-href="/copyleft/gpl.html">Licence Publique G&eacute;n&eacute;rale
-GNU</a>. Deux licences diff&eacute;rentes avec copyleft sont
-g&eacute;n&eacute;ralement Â«&nbsp;incompatible&nbsp;Â», ce qui signifie qu'il
-est ill&eacute;gal de m&eacute;langer du code utilisant une de ces licences
-avec du code utilisant l'autre &agrave; partir de l&agrave;, il est bon pour
-la communaut&eacute; de n'utiliser qu'une seule licence avec copyleft.</p>
+        <p>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>.</p> 
+
+       <p>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 our <a href=
+"/copyleft/copyleft.html">copyleft article</a> for more explanation of how
+copyleft works and why we use it.</p>
+
+       <p>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
+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.</p>
 
 <h3 id="Non-CopyleftedFreeSoftware">Logiciel libre 
<em>non-copyleft&eacute;</em></h3>
 
@@ -345,7 +337,7 @@
 plupart des emplois de programmeurs sont, ou pourraient &ecirc;tre faits
 d'une mani&egrave;re compatible avec le mouvement du logiciel libre.</p>
 
-<h3 id="commercialSoftware">Logiciel commercial</h3>
+<h3 id="commercialSoftware">Commercial software</h3>
 
        <p>Le logiciel commercial est un logiciel d&eacute;velopp&eacute; par 
une
 entreprise dont le but est de gagner de l'argent sur l'utilisation du
@@ -423,7 +415,7 @@
 <!-- timestamp start -->
 DerniÃ¨re mise Ã  jour&nbsp;:
 
-$Date: 2010/04/03 08:26:04 $
+$Date: 2010/05/05 20:25:50 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/categories.sr.html
===================================================================
RCS file: /web/www/www/philosophy/categories.sr.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- philosophy/categories.sr.html       3 Apr 2010 08:26:04 -0000       1.25
+++ philosophy/categories.sr.html       5 May 2010 20:25:50 -0000       1.26
@@ -6,7 +6,7 @@
 ÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¸ ÑÐ¾ÑÑÐ²ÐµÑ (ÐÐ¡Ð¡)</title>
 
 <!--#include virtual="/server/banner.sr.html" -->
-<h2>ÐÑÑÑÐµ ÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³ Ð¸ Ð½ÐµÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³ 
ÑÐ¾ÑÑÐ²ÐµÑÐ°</h2>
+<h2>Categories of free and non-free software</h2>
 
 <!-- This document uses XHTML 1.0 Strict, but may be served as -->
 <!-- text/html.  Please ensure that markup style considers -->
@@ -14,15 +14,15 @@
 <!-- Please ensure links are consistent with Apache's MultiView. -->
 <!-- Change include statements to be consistent with the relevant -->
 <!-- language, where necessary. -->
-<p>ÐÐ¾Ð³Ð»ÐµÐ´Ð°ÑÑÐµ Ð¸ <a 
href="/philosophy/words-to-avoid.sr.html">ÐÐ±ÑÑÑÑÑÑÐµ ÑÐµÑÐ¸
-ÐºÐ¾ÑÐµ Ð±Ð¸ ÑÑÐµÐ±Ð°Ð»Ð¾ Ð¸Ð·Ð±ÐµÐ³Ð°Ð²Ð°ÑÐ¸</a>.</p>
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing Words which You
+Might Want to Avoid</a>.</p>
 
 <p id="diagram" class="c">
 <img src="category.png" alt="" />
 </p>
 
-      <p>This diagram by Chao-Kuei explains the different categories of
-software. It's also available as an <a
+      <p>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
@@ -30,11 +30,12 @@
 
 <h3 id="FreeSoftware">Free software</h3>
 
-       <p>Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¸ ÑÐ¾ÑÑÐ²ÐµÑ ÑÐµ ÑÐ¾ÑÑÐ²ÐµÑ ÐºÐ¾ÑÐ¸ 
ÑÐ²Ð°ÐºÐ¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐ¿Ð¾ÑÑÐµÐ±ÑÐ°Ð²Ð°, ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸
-ÑÐ°ÑÐ¿Ð¾Ð´ÐµÑÑÑÐµ, Ð´Ð¾ÑÐ»Ð¾Ð²Ð½Ð¾ Ð¸Ð»Ð¸ ÑÐ· Ð¸Ð·Ð¼ÐµÐ½Ðµ, 
Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½Ð¾ Ð¸Ð»Ð¸ Ð·Ð° Ð¾Ð´ÑÐµÑÐµÐ½Ñ ÑÐµÐ½Ñ. ÐÐ²Ð¾,
-Ð¸Ð·Ð¼ÐµÑÑ Ð¾ÑÑÐ°Ð»Ð¾Ð³, Ð·Ð½Ð°ÑÐ¸ Ð´Ð° Ð¸Ð·Ð²Ð¾ÑÐ½Ð¸ ÐºÐ¾Ð´ Ð¼Ð¾ÑÐ° 
Ð´Ð° Ð±ÑÐ´Ðµ Ð´Ð¾ÑÑÑÐ¿Ð°Ð½. âÐ£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½ÐµÐ¼Ð°
-Ð¸Ð·Ð²Ð¾ÑÐ½Ð¸ ÐºÐ¾Ð´, Ð½Ðµ ÑÐ°Ð´Ð¸ ÑÐµ Ð¾ ÑÐ¾ÑÑÐ²ÐµÑÑ.â ÐÐ²Ð¾ ÑÐµ 
Ð¿Ð¾ÑÐµÐ´Ð½Ð¾ÑÑÐ°Ð²ÑÐµÐ½Ð° Ð´ÐµÑÐ¸Ð½Ð¸ÑÐ¸ÑÐ°;
-Ð¿Ð¾Ð³Ð»ÐµÐ´Ð°ÑÑÐµ Ð¸ <a href="/philosophy/free-sw.sr.html">Ð¿ÑÐ½Ñ 
Ð´ÐµÑÐ¸Ð½Ð¸ÑÐ¸ÑÑ</a>.</p>
+       <p>Free software is software that comes with permission for anyone to 
use,
+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>.</p>
 
        <p>ÐÐºÐ¾ ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ ÑÐ»Ð¾Ð±Ð¾Ð´Ð°Ð½, Ð¾Ð½Ð´Ð° ÑÐµ Ð¼Ð¾Ð¶Ðµ 
ÑÐºÑÑÑÐ¸ÑÐ¸ Ñ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð²Ð½Ð¸ ÑÐ¸ÑÑÐµÐ¼, ÐºÐ°Ð¾ ÑÑÐ¾
 ÑÐµ ÐÐÐ£, Ð¸Ð»Ð¸ ÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ðµ Ð²ÐµÑÐ·Ð¸ÑÐµ <a 
href="/gnu/linux-and-gnu.sr.html">ÑÐ¸ÑÑÐµÐ¼Ð°
@@ -46,13 +47,12 @@
 ÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¾Ñ ÑÐ¾ÑÑÐ²ÐµÑÑÐºÐ¾Ñ Ð»Ð¸ÑÐµÐ½ÑÐ¸, Ð¿Ð¾Ð³Ð»ÐµÐ´Ð°ÑÑÐµ 
ÑÑÑÐ°Ð½Ð¸ÑÑ ÑÐ° <a
 href="/licenses/license-list.html">ÑÐ¿Ð¸ÑÐºÐ¾Ð¼ Ð»Ð¸ÑÐµÐ½ÑÐ¸</a>.</p>
 
-       <p>Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¸ ÑÐ¾ÑÑÐ²ÐµÑ ÑÐµ ÑÑÐ²Ð°Ñ ÑÐ»Ð¾Ð±Ð¾Ð´Ðµ, Ð° 
Ð½Ðµ ÑÐµÐ½Ðµ. ÐÐ»Ð¸ ÑÐ¸ÑÐ¼Ðµ ÐºÐ¾ÑÐµ Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ðµ
-Ð²Ð»Ð°ÑÐ½Ð¸ÑÐºÐ¸ ÑÐ¾ÑÑÐ²ÐµÑ Ð¿Ð¾Ð½ÐµÐºÐ°Ð´ ÐºÐ¾ÑÐ¸ÑÑÐµ Ð¸Ð·ÑÐ°Ð· 
âÐ±ÐµÑÐ¿Ð»Ð°ÑÐ½Ð¸ ÑÐ¾ÑÑÐ²ÐµÑâ<sup><a
-href="#TransNote1">[1]</a></sup> Ð¼Ð¸ÑÐ»ÐµÑÐ¸ Ð¿ÑÐ¸ÑÐ¾Ð¼ Ð½Ð° ÑÐµÐ½Ñ. 
ÐÐ¾Ð½ÐµÐºÐ°Ð´ Ð¾Ð½Ð¸ ÑÐ¸Ð¼Ðµ
-ÑÐ¾ÑÐµ Ð´Ð° ÐºÐ°Ð¶Ñ Ð´Ð° Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð½Ð°Ð±Ð°Ð²Ð¸ÑÐµ Ð±Ð¸Ð½Ð°ÑÐ½Ð¸ 
Ð¿ÑÐ¸Ð¼ÐµÑÐ°Ðº Ð±ÐµÐ· Ð½Ð°Ð¿Ð»Ð°ÑÐµ, Ð° Ð¿Ð¾Ð½ÐµÐºÐ°Ð´
-Ð´Ð° ÑÐµ Ð¿ÑÐ¸Ð¼ÐµÑÐ°Ðº Ð²ÐµÑ Ð½Ð°Ð»Ð°Ð·Ð¸ Ñ ÑÐ°ÑÑÐ½Ð°ÑÑ ÐºÐ¾ÑÐ¸ 
ÐºÑÐ¿ÑÑÐµÑÐµ, Ð° Ð´Ð° ÑÐµÐ½Ð° Ð¿Ð¾ÐºÑÐ¸Ð²Ð° Ð¸
-ÑÐµÐ´Ð½Ð¾ Ð¸ Ð´ÑÑÐ³Ð¾. ÐÐ²Ð¾ Ñ Ð¾Ð±Ð° Ð¾Ð²Ð° ÑÐ»ÑÑÐ°ÑÐ° Ð½ÐµÐ¼Ð° 
Ð²ÐµÐ·Ðµ ÑÐ° Ð¾Ð½Ð¸Ð¼ ÑÑÐ¾ Ð¼Ð¸ Ñ ÐÑÐ¾ÑÐµÐºÑÑ ÐÐÐ£
-Ð¿Ð¾Ð´ÑÐ°Ð·ÑÐ¼ÐµÐ²Ð°Ð¼Ð¾ Ð¿Ð¾Ð´ ÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¸Ð¼ ÑÐ¾ÑÑÐ²ÐµÑÐ¾Ð¼.</p>
+       <p>Free software is a matter of freedom, not price. But proprietary 
software
+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, it has nothing to do with
+what we mean by free software in the GNU project.</p>
 
        <p>Ð£ÑÐ»ÐµÐ´ Ð¾Ð²Ðµ Ð¿Ð¾ÑÐµÐ½ÑÐ¸ÑÐ°Ð»Ð½Ðµ Ð·Ð°Ð±ÑÐ½Ðµ, ÐºÐ°Ð´Ð° 
ÑÐ¾ÑÑÐ²ÐµÑÑÐºÐ° ÑÐ¸ÑÐ¼Ð° ÐºÐ°Ð¶Ðµ Ð´Ð° ÑÐµ ÑÐµÐ½ Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´
 <em>free software</em>, ÑÐ²ÐµÐº Ð¿ÑÐ¾Ð²ÐµÑÐ¸ÑÐµ ÑÑÐ²Ð°ÑÐ½Ðµ 
Ð¾Ð´ÑÐµÐ´Ð±Ðµ ÑÐ°ÑÐ¿Ð¾Ð´ÐµÐ»Ðµ, Ð¸
@@ -73,7 +73,7 @@
        <p>Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¸ ÑÐ¾ÑÑÐ²ÐµÑ ÑÐµ ÑÐµÑÑÐ¾ <a
 href="/software/reliability.html">Ð¿Ð¾ÑÐ·Ð´Ð°Ð½Ð¸ÑÐ¸</a> Ð¾Ð´ 
Ð½ÐµÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³ ÑÐ¾ÑÑÐ²ÐµÑÐ°.</p>
 
-<h3 id="OpenSource">Open Source software</h3>
+<h3 id="OpenSource">Open source software</h3>
 
        <p>
        ÐÐ·ÑÐ°Ð· âÑÐ¾ÑÑÐ²ÐµÑ âÐ¾ÑÐ²Ð¾ÑÐµÐ½Ð¾Ð³ Ð¸Ð·Ð²Ð¾ÑÐ½Ð¾Ð³ 
ÐºÐ¾Ð´Ð°ââ (ÐµÐ½Ð³Ð». <em>âopen sourceâ
@@ -127,24 +127,25 @@
 Ð¿ÑÐ¸ÑÑÑÐ¿Ð° Ð¸Ð·Ð²Ð¾ÑÐ½Ð¾Ð¼ ÐºÐ¾Ð´Ñ. ÐÐ²Ð¾ ÑÑÐ¸ÑÐ¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ 
Ð¸ ÑÐµÐ³Ð¾Ð²Ðµ Ð¸Ð·Ð¼ÐµÑÐµÐ½Ðµ Ð²ÐµÑÐ·Ð¸ÑÐµ Ð¾Ð´ Ð½ÐµÐºÐ¸Ñ
 Ð½Ð°ÑÑÐµÑÑÐ¸Ñ Ð½Ð°ÑÐ¸Ð½Ð° Ð¿ÑÐµÑÐ²Ð°ÑÐ°ÑÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð° Ñ 
Ð²Ð»Ð°ÑÐ½Ð¸ÑÐºÐ¸.</p>
 
-        <p>ÐÐµÐºÐµ Ð»Ð¸ÑÐµÐ½ÑÐµ ÐºÐ¾Ð¿Ð¸Ð»ÐµÑÑÐ°, ÐºÐ°Ð¾ ÑÑÐ¾ ÑÐµ 
Ð²ÐµÑÐ·Ð¸ÑÐ° 3 ÐÐÐ, Ð·Ð°ÑÑÑÐ°Ð²ÑÐ°ÑÑ Ð¸ Ð´ÑÑÐ³Ðµ Ð½Ð°ÑÐ¸Ð½Ðµ
-Ð¿ÑÐµÑÐ²Ð°ÑÐ°ÑÐ° ÑÐ¾ÑÑÐ²ÐµÑÐ° Ñ Ð²Ð»Ð°ÑÐ½Ð¸ÑÐºÐ¸.</p>
-
-       <p>ÐÐ¸ Ñ ÐÑÐ¾ÑÐµÐºÑÑ ÐÐÐ£ ÐºÐ¾Ð¿Ð¸Ð»ÐµÑÑÑÑÐµÐ¼Ð¾ 
ÑÐºÐ¾ÑÐ¾ ÑÐ°Ð² ÑÐ¾ÑÑÐ²ÐµÑ ÐºÐ¾ÑÐ¸ Ð½Ð°Ð¿Ð¸ÑÐµÐ¼Ð¾, ÑÐµÑ ÑÐµ Ð½Ð°Ñ
-ÑÐ¸Ñ Ð´Ð° ÑÐµ <em>ÑÐ²Ð°ÐºÐ¾Ð¼</em> ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÑ Ð¿ÑÐµÐ½ÐµÑÑ 
ÑÐ»Ð¾Ð±Ð¾Ð´Ðµ ÐºÐ¾ÑÐµ Ð¸Ð·ÑÐ°Ð· âÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¸
-ÑÐ¾ÑÑÐ²ÐµÑâ Ð¿Ð¾Ð´ÑÐ°Ð·ÑÐ¼ÐµÐ²Ð°. ÐÐ¾Ð³Ð»ÐµÐ´Ð°ÑÑÐµ Ð¸ ÑÐµÐºÑÑ <a
-href="/copyleft/copyleft.html">ÐÐ¾Ð¿Ð¸Ð»ÐµÑÑÐ¾Ð²Ð°ÑÐµ</a> Ð·Ð° Ð´Ð°ÑÐµ 
Ð¾Ð±ÑÐ°ÑÑÐµÑÐµ
-ÑÑÐ½ÐºÑÐ¸Ð¾Ð½Ð¸ÑÐ°ÑÐ° ÐºÐ¾Ð¿Ð¸Ð»ÐµÑÑÐ° Ð¸ Ð·Ð±Ð¾Ð³ ÑÐµÐ³Ð° Ð³Ð° Ð¼Ð¸ 
ÐºÐ¾ÑÐ¸ÑÑÐ¸Ð¼Ð¾.</p>
-
-       <p>ÐÐ¾Ð¿Ð¸Ð»ÐµÑÑ ÑÐµ ÑÐ¾Ð¿ÑÑÐµÐ½Ð° Ð·Ð°Ð¼Ð¸ÑÐ°Ð¾. ÐÐ° 
Ð±Ð¸ÑÑÐµ Ð·Ð°Ð¸ÑÑÐ° ÐºÐ¾Ð¿Ð¸Ð»ÐµÑÑÐ¾Ð²Ð°Ð»Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼, Ð¼Ð¾ÑÐ°ÑÐµ
-Ð´Ð° ÑÐ¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµ Ð¾Ð´ÑÐµÑÐµÐ½ Ð½Ð¸Ð· Ð¾Ð´ÑÐµÐ´Ð±Ð¸ Ð¾ 
ÑÐ°ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸. ÐÐ¾ÑÑÐ¾ Ð¿Ð¾ÑÑÐ¾ÑÐ¸ Ð¼Ð½Ð¾Ð³Ð¾ Ð½Ð°ÑÐ¸Ð½Ð° Ð´Ð°
-ÑÐµ ÑÐ°ÑÑÐ°Ð²Ðµ ÐºÐ¾Ð¿Ð¸Ð»ÐµÑÑÐ¾Ð²Ð°Ð½Ðµ Ð¾Ð´ÑÐµÐ´Ð±Ðµ 
ÑÐ°ÑÐ¿Ð¾Ð´ÐµÐ»Ðµ, Ñ ÑÐµÐ¾ÑÐ¸ÑÐ¸ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾ÑÑÐ¾ÑÐ°ÑÐ¸ Ð¸ Ð¼Ð½Ð¾Ð³Ð¾
-Ð»Ð¸ÑÐµÐ½ÑÐ¸ Ð·Ð° ÐºÐ¾Ð¿Ð¸Ð»ÐµÑÑÐ¾Ð²Ð°ÑÐµ ÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³ 
ÑÐ¾ÑÑÐ²ÐµÑÐ°. ÐÐµÑÑÑÐ¸Ð¼, Ñ Ð¿ÑÐ°ÐºÑÐ¸ ÑÐºÐ¾ÑÐ¾ ÑÐ°Ð²
-ÐºÐ¾Ð¿Ð¸Ð»ÐµÑÑÐ¾Ð²Ð°Ð½ ÑÐ¾ÑÑÐ²ÐµÑ ÐºÐ¾ÑÐ¸ÑÑÐ¸ <a 
href="/copyleft/gpl.html">ÐÐÐ£-Ð¾Ð²Ñ Ð¾Ð¿ÑÑÑ
-ÑÐ°Ð²Ð½Ñ Ð»Ð¸ÑÐµÐ½ÑÑ</a><sup><a href="#TransNote3">[3]</a></sup>. ÐÐ²Ðµ 
ÑÐ°Ð·Ð½Ðµ Ð»Ð¸ÑÐµÐ½ÑÐµ
-Ð¾ ÐºÐ¾Ð¿Ð¸Ð»ÐµÑÑÑ ÑÑ Ð½Ð°ÑÑÐµÑÑÐµ âÐ½ÐµÑÐ°Ð³Ð»Ð°ÑÐ½Ðµâ, ÑÑÐ¾ 
Ð·Ð½Ð°ÑÐ¸ Ð´Ð° ÑÐµ Ð½ÐµÐ·Ð°ÐºÐ¾Ð½Ð¸ÑÐ¾ ÑÐ¿Ð°ÑÐ°ÑÐ¸ ÐºÐ¾Ð´
-Ð¿Ð¾Ð´ ÑÐµÐ´Ð½Ð¾Ð¼ Ð»Ð¸ÑÐµÐ½ÑÐ¾Ð¼ ÑÐ° ÐºÐ¾Ð´Ð¾Ð¼ Ð¿Ð¾Ð´ Ð´ÑÑÐ³Ð¾Ð¼ 
Ð»Ð¸ÑÐµÐ½ÑÐ¾Ð¼; ÑÑÐ¾Ð³Ð° Ð±Ð¸ Ð±Ð¸Ð»Ð¾ Ð±Ð¾ÑÐµ Ð¿Ð¾
-Ð·Ð°ÑÐµÐ´Ð½Ð¸ÑÑ Ð°ÐºÐ¾ Ð±Ð¸ ÑÑÐ´Ð¸ ÐºÐ¾ÑÐ¸ÑÑÐ¸Ð»Ð¸ ÑÐ°Ð¼Ð¾ ÑÐµÐ´Ð½Ñ 
Ð»Ð¸ÑÐµÐ½ÑÑ Ð¾ ÐºÐ¾Ð¿Ð¸Ð»ÐµÑÑÑ.</p>
+        <p>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>.</p> 
+
+       <p>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 our <a href=
+"/copyleft/copyleft.html">copyleft article</a> for more explanation of how
+copyleft works and why we use it.</p>
+
+       <p>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
+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.</p>
 
 <h3 id="Non-CopyleftedFreeSoftware">Non-copylefted free software</h3>
 
@@ -308,7 +309,7 @@
 ÑÐ¾ÑÑÐ²ÐµÑÐ°. ÐÐ°ÑÐ¾ ÑÐ²Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ÐµÑÑÐºÐ¸ Ð¿Ð¾ÑÐ»Ð¾Ð²Ð¸ 
ÑÐµÑÑ, Ð¸Ð»Ð¸ Ð±Ð¸ Ð¼Ð¾Ð³Ð»Ð¸ Ð´Ð° Ð±ÑÐ´Ñ,
 ÑÐµÐ°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð¸ Ð½Ð° Ð½Ð°ÑÐ¸Ð½ ÐºÐ¾ÑÐ¸ ÑÐµ ÑÐ°Ð³Ð»Ð°ÑÐ°Ð½ ÑÐ° 
Ð¿Ð¾ÐºÑÐµÑÐ¾Ð¼ Ð·Ð° ÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¸ ÑÐ¾ÑÑÐ²ÐµÑ.</p>
 
-<h3 id="commercialSoftware">Commercial Software</h3>
+<h3 id="commercialSoftware">Commercial software</h3>
 
        <p>ÐÐ¾Ð¼ÐµÑÑÐ¸ÑÐ°Ð»Ð½Ð¸ ÑÐ¾ÑÑÐ²ÐµÑ ÑÐµ ÑÐ¾ÑÑÐ²ÐµÑ ÐºÐ¾ÑÐ¸ 
ÑÐ°Ð·Ð²Ð¸ÑÐ° ÑÐ¸ÑÐ¼Ð° ÐºÐ¾ÑÐ° Ð½Ð°Ð¼ÐµÑÐ°Ð²Ð° Ð´Ð° Ð·Ð°ÑÐ°Ð´Ð¸
 Ð½Ð° ÑÐ¿Ð¾ÑÑÐµÐ±Ð¸ ÑÐ¾ÑÑÐ²ÐµÑÐ°. âÐÐ¾Ð¼ÐµÑÑÐ¸ÑÐ°Ð»Ð½Ð¾â Ð¸ 
âÐ²Ð»Ð°ÑÐ½Ð¸ÑÐºÐ¾â Ð½Ð¸ÑÑ Ð¸ÑÑÐ° ÑÑÐ²Ð°Ñ! ÐÐµÑÐ¸Ð½Ð°
@@ -405,7 +406,7 @@
 <!-- timestamp start -->
 ÐÐ¶ÑÑÐ¸ÑÐ°Ð½Ð¾:
 
-$Date: 2010/04/03 08:26:04 $
+$Date: 2010/05/05 20:25:50 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/categories.tr.html
===================================================================
RCS file: /web/www/www/philosophy/categories.tr.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/categories.tr.html       3 Apr 2010 08:26:04 -0000       1.16
+++ philosophy/categories.tr.html       5 May 2010 20:25:50 -0000       1.17
@@ -6,7 +6,7 @@
 VakfÄ± (FSF)</title>
 
 <!--#include virtual="/server/banner.tr.html" -->
-<h2>ÃzgÃ¼r ve ÃzgÃ¼r-Olmayan YazÄ±lÄ±m Kategorileri</h2>
+<h2>Categories of free and non-free software</h2>
 
 <!-- This document uses XHTML 1.0 Strict, but may be served as -->
 <!-- text/html.  Please ensure that markup style considers -->
@@ -14,28 +14,28 @@
 <!-- Please ensure links are consistent with Apache's MultiView. -->
 <!-- Change include statements to be consistent with the relevant -->
 <!-- language, where necessary. -->
-<p>AyrÄ±ca <a href="/philosophy/words-to-avoid.tr.html">Uzak Durmak
-Ä°steyebileceÄiniz KarmaÅÄ±k Kelimeler</a>'e dikkat edin.</p>
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing Words which You
+Might Want to Avoid</a>.</p>
 
 <p id="diagram" class="c">
 <img src="category.png" alt="" />
 </p>
 
-      <p>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
-Attribution-Share Alike v2.0 lisanslarÄ±nÄ±n herhangi birinin koÅullarÄ±
-altÄ±nda <a href="/philosophy/category.svg">ÃlÃ§eklenebilir VektÃ¶rel Grafik
-(SVG)</a> ve <a href="/philosophy/category.fig">XFig dosyasÄ±</a>olarak da
-mevcuttur.</p>
+      <p>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.</p>
 
 <h3 id="FreeSoftware">ÃzgÃ¼r yazÄ±lÄ±m</h3>
 
-       <p>Ã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
-yazÄ±lÄ±mdÄ±r. Dikkate deÄer anlamda, bu kaynak kodun bulunmak zorunda olduÄu
-anlamÄ±na gelir. &ldquo;EÄer, kaynak deÄilse, o yazÄ±lÄ±m deÄildir.&rdquo; 
Bu
-basitleÅtirilmiÅ bir tanÄ±mdÄ±r; ayrÄ±ca <a 
href="/philosophy/free-sw.html">tam
-tanÄ±mÄ±na</a> bakÄ±n.</p>
+       <p>Free software is software that comes with permission for anyone to 
use,
+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>.</p>
 
        <p>EÄer bir program Ã¶zgÃ¼r ise GNU gibi Ã¶zgÃ¼r bir iÅletim 
sistemine veya <a
 href="/gnu/linux-and-gnu.html">GNU/Linux</a> sistemlerin Ã¶zgÃ¼r sÃ¼rÃ¼mlerine
@@ -47,13 +47,12 @@
 lisanslarÄ± hakkÄ±nda bilgi iÃ§in <a href="/licenses/license-list.html">lisans
 listesi</a> sayfasÄ±na bakÄ±n.</p>
 
-       <p>Ã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
-iÃ§in kullanmaktadÄ±rlar<sup><a id="RefTransNote1"
-href="#TransNote1">1</a></sup>. Bazen Ã§alÄ±ÅtÄ±rÄ±labilir kopyasÄ±nÄ± 
Ã¼cretsiz
-olarak elde etmek anlamÄ±nda; bazen satÄ±n almakta olduÄunuz bilgisayarÄ±n
-fiyatÄ±nÄ±n iÃ§inde olduÄu anlamÄ±nda kullanÄ±rlar. Her durumda, GNU 
projesinde
-Ã¶zgÃ¼r yazÄ±lÄ±mÄ±n bizim bahsettiÄimiz anlamÄ±yla hiÃ§bir ilgisi yoktur.</p>
+       <p>Free software is a matter of freedom, not price. But proprietary 
software
+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, it has nothing to do with
+what we mean by free software in the GNU project.</p>
 
        <p>Bu olasÄ± karmaÅÄ±klÄ±ktan dolayÄ±, ne zaman bir yazÄ±lÄ±m Åirketi 
onlarÄ±n
 Ã¼rÃ¼nlerinin Ã¶zgÃ¼r yazÄ±lÄ±m (free software) olduÄunu sÃ¶ylerse, her zaman
@@ -73,7 +72,7 @@
 
        <p>ÃzgÃ¼r yazÄ±lÄ±m, Ã§oÄunlukla, Ã¶zgÃ¼r olmayan yazÄ±lÄ±mdan daha 
gÃ¼venilirdir.</p>
 
-<h3 id="OpenSource">AÃ§Ä±k Kaynak yazÄ±lÄ±m</h3>
+<h3 id="OpenSource">Open source software</h3>
 
        <p>
        BazÄ± kiÅiler tarafÄ±ndan &ldquo;AÃ§Ä±k kaynak&rdquo; yazÄ±lÄ±m 
kavramÄ±, Ã¶zgÃ¼r
@@ -126,24 +125,25 @@
 sÃ¼rÃ¼mlerini mÃ¼lk yazÄ±lÄ±m haline getirmenin bazÄ± bilindik yollarÄ±ndan bir
 kalkan gibi korur.</p>
 
-        <p>GPL'in 3. sÃ¼rÃ¼mÃ¼ gibi bazÄ± lisanslar yazÄ±lÄ±mlarÄ±n mÃ¼lke 
dÃ¶nÃ¼Åmelerini
-saÄlayan diÄer yollarÄ± durdurur.</p>
-
-       <p>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
-edilen koÅullarÄ± vermektir; Copyleft yazÄ±lÄ±mÄ±n nasÄ±l iÅlediÄi ve neden 
onu
-kullandÄ±ÄÄ±mÄ±z hakkÄ±nda daha Ã§ok aÃ§Ä±klama iÃ§in <a
-href="/copyleft/copyleft.html">Copyleft yazÄ±lÄ±m</a> sayfasÄ±na bakÄ±n.</p>
-
-       <p>Copyleft, genel bir kavramdÄ±r; bir yazÄ±lÄ±mÄ±, copyleft yapmak 
iÃ§in, bazÄ± Ã¶zel
-daÄÄ±tÄ±m koÅullarÄ± ayarlamanÄ±z gerekir. Copyleft Ã¶zgÃ¼r yazÄ±lÄ±m 
lisansÄ±
-yazmanÄ±n bir Ã§ok olasÄ± yolu vardÄ±r, yani, aslÄ±nda bir Ã§ok copyleft 
Ã¶zgÃ¼r
-yazÄ±lÄ±m lisanslarÄ± olabilir.  Her nasÄ±lsa, asÄ±l uygulamada, neredeyse 
bÃ¼tÃ¼n
-copyleft yazÄ±lÄ±mlar, <a href="/copyleft/gpl.html">GNU Genel Kamu LisansÄ±nÄ±
-(GPL)</a>. Ä°ki farklÄ± copyleft lisansÄ±, genelde &ldquo;uyumsuzdur&rdquo;,
-yani bir lisans ile yazÄ±lmÄ±Å kodu, diÄer lisans ile yazÄ±lmÄ±Å olana
-birleÅtirmek yasal deÄildir; bÃ¶ylece, eÄer insanlar tek bir copyleft lisans
-kullanmasÄ± toplum iÃ§in iyidir.</p>
+        <p>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>.</p> 
+
+       <p>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 our <a href=
+"/copyleft/copyleft.html">copyleft article</a> for more explanation of how
+copyleft works and why we use it.</p>
+
+       <p>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
+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.</p>
 
 <h3 id="Non-CopyleftedFreeSoftware">Copyleft olmayan Ã¶zgÃ¼r yazÄ±lÄ±m</h3>
 
@@ -304,7 +304,7 @@
 Ã§oÄu programlama iÅleri, Ã¶zgÃ¼r yazÄ±lÄ±m hareketi ile uyumlu bir Åekilde
 yapÄ±labilinir veya yapÄ±labilinirdi.</p>
 
-<h3 id="commercialSoftware">Ticari YazÄ±lÄ±m</h3>
+<h3 id="commercialSoftware">Commercial software</h3>
 
        <p>Ticari yazÄ±lÄ±m, yazÄ±lÄ±mÄ±n kullanÄ±mÄ±ndan para kazanmak 
amacÄ±nda olan bir
 ticari iÅ yeri tarafÄ±ndan geliÅtirilmiÅ yazÄ±lÄ±mdÄ±r. 
&ldquo;Ticari&rdquo; ve
@@ -411,7 +411,7 @@
 <!-- timestamp start -->
 Son GÃ¼ncelleme:
 
-$Date: 2010/04/03 08:26:04 $
+$Date: 2010/05/05 20:25:50 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/java-trap.bg.html
===================================================================
RCS file: /web/www/www/philosophy/java-trap.bg.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- philosophy/java-trap.bg.html        15 Jan 2010 09:26:54 -0000      1.17
+++ philosophy/java-trap.bg.html        5 May 2010 20:25:51 -0000       1.18
@@ -13,14 +13,34 @@
 <div class="announcement"><h3>ÐÑÑÑÐ¿Ð¸ÑÐµÐ»Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°</h3>
 <p>Since this article was first published, Sun has <a
 href="http://www.fsf.org/news/fsf-welcomes-gpl-java.html";>relicensed</a>
-most of its Java platform under the GNU General Public License, and there is
-now a free Java development environment.  Thus, the Java language is no
-longer a trap.  Nonetheless, the general issue described here remains
+most of its Java platform reference implementation under the GNU General
+Public License, and there is now a free development environment for Java.
+Thus, the Java language as such is no longer a trap.</p>
+
+<p>You must be careful, however, because not every Java platform is free.  Sun
+continues distributing an excutable Java platform which is nonfree, and
+other companies do so too.</p>
+
+<p>The free environment for Java is called IcedTea; the source code Sun freed
+is included in that.  So that is the one you should use.  Many GNU/Linux
+distributions come with IcedTea, but some include nonfree Java platforms.</p>
+
+<p>To reliably ensure your Java programs run fine in a free environment, you
+need to develop them using IcedTea.  Theoretically the Java platforms should
+be compatible, but they are not compatible 100%.</p>
+
+<p>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.</p>
+
+<p>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.</p>
 
-<p>ÐÐ¸Ð¶ÑÐµ ÑÑÑÐ¾ Ð¸ <a href="javascript-trap.html">ÐÐ»Ð¾Ð¿ÐºÐ°ÑÐ° Ð½Ð° 
Javascript</a></p>
+<p>Please also see: <a href="javascript-trap.html">The Javascript Trap</a>.</p>
 
 </div>
 
@@ -202,7 +222,7 @@
 ÑÐ°Ð·Ð¸ ÑÑÐ°ÑÐ¸Ñ.
 </p>
 
-<p>ÐÐ²ÑÐ¾ÑÑÐºÐ¸ Ð¿ÑÐ°Ð²Ð° &copy; 2004 Ð Ð¸ÑÐ°ÑÐ´ Ð¡ÑÐ¾Ð»Ð¼Ð°Ð½</p>
+<p>Copyright &copy; 2004, 2010 Richard Stallman</p>
 
 <p>ÐÐ¾ÑÐ»Ð¾Ð²Ð½Ð¾ÑÐ¾ ÐºÐ¾Ð¿Ð¸ÑÐ°Ð½Ðµ Ð¸ ÑÐ°Ð·Ð¿ÑÐ¾ÑÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ 
Ð½Ð° ÑÑÐ»Ð°ÑÐ° ÑÑÐ°ÑÐ¸Ñ ÑÐ° Ð¿Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸ Ð·Ð° Ð²ÑÐµÐºÐ¸
 ÑÐ¸Ð¿ Ð½Ð¾ÑÐ¸ÑÐµÐ» Ð±ÐµÐ· Ð½ÑÐ¶Ð´Ð° Ð¾Ñ Ð·Ð°Ð¿Ð»Ð°ÑÐ°Ð½ÐµÑÐ¾ Ð½Ð° 
ÑÐ°ÐºÑÐ¸, ÑÑÐ¸Ð³Ð° ÑÐ°Ð·Ð¸ Ð±ÐµÐ»ÐµÐ¶ÐºÐ° Ð´Ð° Ð±ÑÐ´Ðµ
@@ -225,7 +245,7 @@
 <!-- timestamp start -->
 ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¾ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ:
 
-$Date: 2010/01/15 09:26:54 $
+$Date: 2010/05/05 20:25:51 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/java-trap.fr.html
===================================================================
RCS file: /web/www/www/philosophy/java-trap.fr.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/java-trap.fr.html        15 Jan 2010 09:26:54 -0000      1.23
+++ philosophy/java-trap.fr.html        5 May 2010 20:25:51 -0000       1.24
@@ -13,15 +13,34 @@
 <div class="announcement"><h3>Note</h3>
 <p>Since this article was first published, Sun has <a
 href="http://www.fsf.org/news/fsf-welcomes-gpl-java.html";>relicensed</a>
-most of its Java platform under the GNU General Public License, and there is
-now a free Java development environment.  Thus, the Java language is no
-longer a trap.  Nonetheless, the general issue described here remains
+most of its Java platform reference implementation under the GNU General
+Public License, and there is now a free development environment for Java.
+Thus, the Java language as such is no longer a trap.</p>
+
+<p>You must be careful, however, because not every Java platform is free.  Sun
+continues distributing an excutable Java platform which is nonfree, and
+other companies do so too.</p>
+
+<p>The free environment for Java is called IcedTea; the source code Sun freed
+is included in that.  So that is the one you should use.  Many GNU/Linux
+distributions come with IcedTea, but some include nonfree Java platforms.</p>
+
+<p>To reliably ensure your Java programs run fine in a free environment, you
+need to develop them using IcedTea.  Theoretically the Java platforms should
+be compatible, but they are not compatible 100%.</p>
+
+<p>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.</p>
+
+<p>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.</p>
 
-<p>Veuillez aussi consulter&nbsp;: <a href="javascript-trap.html">Le piÃ¨ge
-JavaScript</a></p>
+<p>Please also see: <a href="javascript-trap.html">The Javascript Trap</a>.</p>
 
 </div>
 
@@ -210,7 +229,7 @@
 de traductions de cet article.
 </p>
 
-<p>Copyright &copy; 2004 Richard Stallman</p>
+<p>Copyright &copy; 2004, 2010 Richard Stallman</p>
 
 <p>La reproduction exacte et la distribution intÃ©grale de cet article est
 permise sur n'importe quel support d'archivage, pourvu que cette notice soit
@@ -227,7 +246,7 @@
 <!-- timestamp start -->
 DerniÃ¨re mise Ã  jour&nbsp;:
 
-$Date: 2010/01/15 09:26:54 $
+$Date: 2010/05/05 20:25:51 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/java-trap.sr.html
===================================================================
RCS file: /web/www/www/philosophy/java-trap.sr.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/java-trap.sr.html        15 Jan 2010 09:26:55 -0000      1.10
+++ philosophy/java-trap.sr.html        5 May 2010 20:25:51 -0000       1.11
@@ -13,14 +13,34 @@
 <div class="announcement"><h3>ÐÐ°Ð¿Ð¾Ð¼ÐµÐ½Ð°</h3>
 <p>Since this article was first published, Sun has <a
 href="http://www.fsf.org/news/fsf-welcomes-gpl-java.html";>relicensed</a>
-most of its Java platform under the GNU General Public License, and there is
-now a free Java development environment.  Thus, the Java language is no
-longer a trap.  Nonetheless, the general issue described here remains
+most of its Java platform reference implementation under the GNU General
+Public License, and there is now a free development environment for Java.
+Thus, the Java language as such is no longer a trap.</p>
+
+<p>You must be careful, however, because not every Java platform is free.  Sun
+continues distributing an excutable Java platform which is nonfree, and
+other companies do so too.</p>
+
+<p>The free environment for Java is called IcedTea; the source code Sun freed
+is included in that.  So that is the one you should use.  Many GNU/Linux
+distributions come with IcedTea, but some include nonfree Java platforms.</p>
+
+<p>To reliably ensure your Java programs run fine in a free environment, you
+need to develop them using IcedTea.  Theoretically the Java platforms should
+be compatible, but they are not compatible 100%.</p>
+
+<p>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.</p>
+
+<p>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.</p>
 
-<p>ÐÐ¾Ð³Ð»ÐµÐ´Ð°ÑÑÐµ Ð¸: <a href="javascript-trap.html">ÐÐ°Ð¼ÐºÐ° 
ÐÐ°Ð²Ð°Ð¡Ð¿Ð¸ÑÐ°</a></p>
+<p>Please also see: <a href="javascript-trap.html">The Javascript Trap</a>.</p>
 
 </div>
 
@@ -199,7 +219,7 @@
 Ð·Ð° Ð²Ð¸ÑÐµ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ° Ð¾ ÐºÐ¾Ð¾ÑÐ´Ð¸Ð½Ð¸ÑÐ°ÑÑ Ð¸ ÑÐ»Ð°ÑÑ 
Ð¿ÑÐµÐ²Ð¾Ð´Ð° Ð¾Ð²Ð¾Ð³ ÑÐ»Ð°Ð½ÐºÐ°.
 </p>
 
-<p><b>ÐÑÑÐ¾ÑÑÐºÐ° Ð¿ÑÐ°Ð²Ð°:</b><br />Copyright &copy; 2004 Richard 
Stallman</p>
+<p>Copyright &copy; 2004, 2010 Richard Stallman</p>
 
 <p>ÐÐ¾Ð·Ð²Ð¾ÑÐµÐ½Ð¾ ÑÐµ Ð´Ð¾ÑÐ»Ð¾Ð²Ð½Ð¾ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐµ Ð¸ 
ÑÐ°ÑÐ¿Ð¾Ð´ÐµÐ»Ð° Ð¾Ð²Ð¾Ð³ ÑÐµÐ»Ð¾Ð³ ÑÐ»Ð°Ð½ÐºÐ° ÑÐ¸ÑÐ¾Ð¼ ÑÐ²ÐµÑÐ°,
 Ð±ÐµÐ· Ð½Ð°Ð´Ð¾ÐºÐ½Ð°Ð´Ðµ, Ð½Ð° Ð±Ð¸Ð»Ð¾ ÐºÐ¾ÑÐµÐ¼ Ð¼ÐµÐ´Ð¸ÑÑÐ¼Ñ, ÑÐ· 
ÑÑÐ»Ð¾Ð² Ð´Ð° ÑÐµ Ð¾ÑÑÐ²Ð°Ð½Ð¾ Ð¾Ð²Ð¾
@@ -229,7 +249,7 @@
 <!-- timestamp start -->
 ÐÐ¶ÑÑÐ¸ÑÐ°Ð½Ð¾:
 
-$Date: 2010/01/15 09:26:55 $
+$Date: 2010/05/05 20:25:51 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/danger-of-software-patents.pot
===================================================================
RCS file: /web/www/www/philosophy/po/danger-of-software-patents.pot,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/danger-of-software-patents.pot        25 Mar 2010 08:25:53 
-0000      1.4
+++ philosophy/po/danger-of-software-patents.pot        5 May 2010 20:25:53 
-0000       1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-25 04:25-0300\n"
+"POT-Creation-Date: 2010-05-05 16:25-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -119,11 +119,11 @@
 # type: Content of: <dl><dd><p>
 msgid ""
 "I'm most known for starting the free software movement and leading "
-"development of the GNU operating system, although most of the people who use "
-"the system mistakenly believe it's Linux and think it was started by "
+"development of the GNU operating system&mdash;although most of the people "
+"who use the system mistakenly believe it's Linux and think it was started by "
 "somebody else a decade later.  But I'm not going to be speaking about any of "
 "that today.  I'm here to talk about a legal danger to all software "
-"developers, distributors, and users, the danger of patents&mdash;on "
+"developers, distributors, and users: the danger of patents&mdash;on "
 "computational ideas, computational techniques, an idea for something you can "
 "do on a computer."
 msgstr ""
@@ -139,13 +139,13 @@
 # type: Content of: <dl><dd><p>
 msgid ""
 "So, for example, any time a person makes a statement about "
-"&ldquo;intellectual property&rdquo; that's spreading confusion, because it's "
-"lumping together not only these two laws, but also at least a dozen others.  "
-"They're all different, and the result is any statement which purports to be "
-"about &ldquo;intellectual property&rdquo; is pure confusion&mdash;either the "
-"person making the statement is confused, or the person is trying to confuse "
-"others.  But either way, whether it's accidental or malicious, it's "
-"confusion."
+"&ldquo;intellectual property,&rdquo; that's spreading confusion, because "
+"it's lumping together not only these two laws but also at least a dozen "
+"others.  They're all different, and the result is any statement which "
+"purports to be about &ldquo;intellectual property&rdquo; is pure "
+"confusion&mdash;either the person making the statement is confused, or the "
+"person is trying to confuse others.  But either way, whether it's accidental "
+"or malicious, it's confusion."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -163,8 +163,8 @@
 msgid ""
 "So, what does a patent do? A patent is an explicit, government-issued "
 "monopoly on using a certain idea.  In the patent there's a part called the "
-"claims, which describe exactly what you're not allowed to do, although "
-"they're written in a way you probably can't understand.  It's a struggle to "
+"claims, which describe exactly what you're not allowed to do (although "
+"they're written in a way you probably can't understand).  It's a struggle to "
 "figure out what those prohibitions actually mean, and they may go on for "
 "many pages of fine print."
 msgstr ""
@@ -191,17 +191,18 @@
 
 # type: Content of: <dl><dd><p>
 msgid ""
-"The Economist once referred to the patent system as &ldquo;a time-consuming "
-"lottery.&rdquo; If you've ever seen publicity for a lottery, you understand "
-"how it works: they dwell on the very unlikely probability of winning, and "
-"they don't talk about the overwhelming likelihood of losing.  In this way, "
-"they intentionally and systematically present a biased picture of what's "
-"likely to happen to you, without actually lying about any particular fact."
+"The <cite>Economist</cite> once referred to the patent system as &ldquo;a "
+"time-consuming lottery.&rdquo; If you've ever seen publicity for a lottery, "
+"you understand how it works: they dwell on the very unlikely probability of "
+"winning, and they don't talk about the overwhelming likelihood of losing.  "
+"In this way, they intentionally and systematically present a biased picture "
+"of what's likely to happen to you, without actually lying about any "
+"particular fact."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
 msgid ""
-"It's the same way for the publicity for the patent system.  They talk about "
+"It's the same way for the publicity for the patent system: they talk about "
 "what it's like to walk down the street with a patent in your pocket&mdash;or "
 "first of all, what it's like to get a patent, then what it's like to have a "
 "patent in your pocket, and every so often you can pull it out and point it "
@@ -236,12 +237,12 @@
 "The reason is&hellip; in the process you conceived of it in one particular "
 "way&mdash;you've got a mental structure to apply to your design.  And "
 "because of that, it will block you from seeing other structures that "
-"somebody might use to understand the same program, because you're not coming "
-"to it fresh; you already designed it with one structure in mind.  Someone "
-"else who sees it for the first time might see a different structure, which "
-"involves different ideas, and it would be hard for you to see what those "
-"other ideas are.  But nonetheless they're implemented in your program, and "
-"those patents could prohibit your program, if those ideas are patented."
+"somebody might use to understand the same program&mdash;because you're not "
+"coming to it fresh; you already designed it with one structure in mind.  "
+"Someone else who sees it for the first time might see a different structure, "
+"which involves different ideas, and it would be hard for you to see what "
+"those other ideas are.  But nonetheless they're implemented in your program, "
+"and those patents could prohibit your program, if those ideas are patented."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -251,7 +252,7 @@
 "bottom edge, it would prohibit your square.  You could put &ldquo;bottom "
 "edge&rdquo; on the list of all ideas implemented in your drawing.  But you "
 "might not realize that somebody else with a patent on bottom corners could "
-"sue you easily also, because he could take you drawing and turn it by 45 "
+"sue you easily also, because he could take your drawing and turn it by 45 "
 "degrees.  And now your square is like this, and it has a bottom corner."
 msgstr ""
 
@@ -286,8 +287,8 @@
 msgid ""
 "He wrote this program, he released it, and in 1985 a patent was issued on "
 "that algorithm.  But the patent holder was cunning and didn't immediately go "
-"around telling people to stop using it.  The patent holder figured "
-"&ldquo;let's let everybody dig their grave deeper.&rdquo; A few years later "
+"around telling people to stop using it.  The patent holder figured, "
+"&ldquo;Let's let everybody dig their grave deeper.&rdquo; A few years later "
 "they started threatening people; it became clear we couldn't use Compress, "
 "so I asked for people to suggest other algorithms we could use for "
 "compressing files."
@@ -298,13 +299,14 @@
 "And somebody wrote and said, \"I developed another data compression "
 "algorithm that works better, I've written a program, I'd like to give it to "
 "you.\" So we got ready to release it, and a week before it was ready to be "
-"released, I read in the New York Times weekly patent column, which I rarely "
-"saw&mdash;it's a couple of times a year I might see it&mdash;but just by "
-"luck I saw that someone had gotten a patent for &ldquo;inventing a new "
-"method of compressing data.&rdquo; And so I said we had better look at this, "
-"and sure enough it covered the program we were about to release.  But it "
-"could have been worse: the patent could have been issued a year later, or "
-"two years later, or three years later, or five years later."
+"released, I read in the <cite>New York Times</cite> weekly patent column, "
+"which I rarely saw&mdash;it's a couple of times a year I might see "
+"it&mdash;but just by luck I saw that someone had gotten a patent for "
+"&ldquo;inventing a new method of compressing data.&rdquo; And so I said we "
+"had better look at this, and sure enough it covered the program we were "
+"about to release.  But it could have been worse: the patent could have been "
+"issued a year later, or two years later, or three years later, or five years "
+"later."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -402,7 +404,7 @@
 # type: Content of: <dl><dd><p>
 msgid ""
 "In fact, I once gave this speech and Heckel was in the audience.  And at "
-"this point he jumped up and said &ldquo;That's not true, I just didn't know "
+"this point he jumped up and said, &ldquo;That's not true, I just didn't know "
 "the scope of my protection.&rdquo; And I said &ldquo;Yeah, that's what I "
 "said,&rdquo; at which point he sat down and that was the end of my "
 "experience being heckled by Heckel.  If I had said no, he probably would "
@@ -417,11 +419,11 @@
 
 # type: Content of: <dl><dd><blockquote><p>
 msgid ""
-"&ldquo;If you do something in this area you're almost certain to lose a "
-"lawsuit.  If you do something in this area there's a considerable chance of "
-"losing a lawsuit, and if you really want to be safe you've got to stay out "
-"of this area, but there's a sizeable element of chance in the outcome of any "
-"lawsuit.&rdquo;"
+"If you do something in this area, you're almost certain to lose a lawsuit; "
+"if you do something in this area, there's a considerable chance of losing a "
+"lawsuit; and if you really want to be safe you've got to stay out of this "
+"area.  But there's a sizeable element of chance in the outcome of any "
+"lawsuit."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -442,13 +444,13 @@
 
 # type: Content of: <dl><dd><p>
 msgid ""
-"A couple of years ago Kodak sued Sun using a patent for something having to "
-"do with object-oriented programming, and Sun didn't think it was infringing "
-"that patent.  But the court decided it was; and when other people look at "
-"that patent they haven't the faintest idea whether that decision was right "
-"or not.  No one can tell what that patent does or doesn't cover, but Sun had "
-"to pay hundreds of millions of dollars because of violating a completely "
-"incomprehensible law."
+"A couple of years ago Kodak sued Sun [for] using a patent for something "
+"having to do with object-oriented programming, and Sun didn't think it was "
+"infringing that patent.  But the court decided it was; and when other people "
+"look at that patent they haven't the faintest idea whether that decision was "
+"right or not.  No one can tell what that patent does or doesn't cover, but "
+"Sun had to pay hundreds of millions of dollars because of violating a "
+"completely incomprehensible law."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -472,7 +474,7 @@
 # type: Content of: <dl><dd><p>
 msgid ""
 "On the other hand, a patent on an algorithm may be impossible to avoid.  "
-"Consider the LZW data compression algorithm.  Well, as I explained we found "
+"Consider the LZW data compression algorithm.  Well, as I explained, we found "
 "a better data compression algorithm, and everybody who wanted to compress "
 "files switched to the program <tt>gzip</tt> which used the better "
 "algorithm.  And the reason is, if you just want to compress the file and "
@@ -483,9 +485,9 @@
 
 # type: Content of: <dl><dd><p>
 msgid ""
-"But LZW is used for other things too; for instance the PostScript language "
+"But LZW is used for other things, too; for instance the PostScript language "
 "specifies operators for LZW compression and LZW uncompression.  It's no use "
-"having another, better algorithm, because it makes a different format of "
+"having another, better algorithm because it makes a different format of "
 "data.  They're not interoperable.  If you compress it with the gzip "
 "algorithm, you won't be able to uncompress it using LZW.  So no matter how "
 "good your other algorithm is, and no matter what it is, it just doesn't "
@@ -513,10 +515,10 @@
 "also.  It didn't take long for people to define another image format, called "
 "<tt>png</tt>, which stands for &ldquo;Png's Not Gif&rdquo;.  I think it uses "
 "the <tt>gzip</tt> algorithm.  And we started saying to people, &ldquo;Don't "
-"use <tt>gif</tt> format, it's dangerous; switch to <tt>png</tt>.&rdquo; And "
-"the users said &ldquo;Well, maybe some day, but the browsers don't implement "
-"it yet,&rdquo; and the browser developers said, &ldquo;We may implement it "
-"someday, but there's not much demand from users.&rdquo;"
+"use <tt>gif</tt> format, it's dangerous.  Switch to <tt>png</tt>.&rdquo; And "
+"the users said, &ldquo;Well, maybe some day, but the browsers don't "
+"implement it yet,&rdquo; and the browser developers said, &ldquo;We may "
+"implement it someday, but there's not much demand from users.&rdquo;"
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -524,10 +526,10 @@
 "Well, it's pretty obvious what's going on&mdash;<tt>gif</tt> was a de facto "
 "standard.  In effect, asking people to switch to a different format, instead "
 "of their de facto standard, is like asking everyone in New Zealand to speak "
-"Hungarian.  People will say &ldquo;Well, yeah, I'll learn to speak it after "
+"Hungarian.  People will say, &ldquo;Well, yeah, I'll learn to speak it after "
 "everyone else does.&rdquo; And so we never succeeded in asking people to "
 "stop using <tt>gif</tt>, even though one of those patent holders was going "
-"around to operators of web sites, threatening to sue them unless they could "
+"around to operators of Web sites, threatening to sue them unless they could "
 "prove that all of the <tt>gif</tt>s on the site were made with authorized, "
 "licensed software."
 msgstr ""
@@ -538,7 +540,7 @@
 "thought we had an alternative to <tt>gif</tt> format, namely <tt>jpeg</tt>, "
 "but then somebody said, \"I was just looking through my portfolio of "
 "patents\"&mdash;I think it was somebody that just bought patents and used "
-"them to threaten people&mdash;and he said \"and I found that one of them "
+"them to threaten people&mdash;and he said, \"and I found that one of them "
 "covers <tt>jpeg</tt> format.\""
 msgstr ""
 
@@ -575,7 +577,7 @@
 msgid ""
 "You see, in physical engineering fields, they can use the physical nature of "
 "what's going on to narrow things down.  For instance, in chemical "
-"engineering, they can say &ldquo;What are the substances going in? What are "
+"engineering, they can say, &ldquo;What are the substances going in? What are "
 "the substances coming out?&rdquo; If two different [patent] applications are "
 "different in that way, then they're not the same process so you don't need "
 "to worry.  But the same math can be represented in ways that can look very "
@@ -639,11 +641,11 @@
 # type: Content of: <dl><dd><p>
 msgid ""
 "Now, to remove one or two features may not be a disaster.  But when you have "
-"to remove 50 features, you could do it, but people are likely to say "
+"to remove 50 features, you could do it, but people are likely to say, "
 "&ldquo;This program's no good; it's missing all the features I want.&rdquo; "
 "So it may not be a solution.  And sometimes a patent is so broad that it "
-"wipes out an entire field, like the patent on public key encryption, which "
-"in fact put public key encryption basically off limits for about ten years."
+"wipes out an entire field, like the patent on public-key encryption, which "
+"in fact put public-key encryption basically off limits for about ten years."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -661,11 +663,11 @@
 "Well, the patent holder may not offer you a license.  It's entirely up to "
 "him.  He could say, &ldquo;I just want to shut you down.&rdquo; I once got a "
 "letter from somebody whose family business was making casino games, which "
-"which were of course computerized, and he had been threatened by a patent "
-"holder who wanted to make his business shut down.  He sent me the patent.  "
-"Claim 1 was something like &ldquo;a network with a multiplicity of "
-"computers, in which each computer supports a multiplicity of games, and "
-"allows a multiplicity of game sessions at the same time&rdquo;."
+"were of course computerized, and he had been threatened by a patent holder "
+"who wanted to make his business shut down.  He sent me the patent.  Claim 1 "
+"was something like &ldquo;a network with a multiplicity of computers, in "
+"which each computer supports a multiplicity of games, and allows a "
+"multiplicity of game sessions at the same time&rdquo;."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -727,12 +729,13 @@
 
 # type: Content of: <dl><dd><p>
 msgid ""
-"IBM wrote an article in its house magazine, Think Magazine&mdash;I think "
-"it's issue 5, 1990&mdash;about the benefit IBM got from its almost 9,000 US "
-"patents at the time (now it's up to 45,000 or more).  They said that one of "
-"the benefits was that they collected money, but the main benefit, which they "
-"said was perhaps an order of magnitude greater, was &ldquo;getting access to "
-"the patents of others,&rdquo; namely cross-licensing."
+"IBM wrote an article in its house magazine, <cite>Think</cite> "
+"magazine&mdash;I think it's issue 5, 1990&mdash;about the benefit IBM got "
+"from its almost 9,000 US patents at the time (now it's up to 45,000 or "
+"more).  They said that one of the benefits was that they collected money, "
+"but the main benefit, which they said was perhaps an order of magnitude "
+"greater, was &ldquo;getting access to the patents of others,&rdquo; namely "
+"cross-licensing."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -751,9 +754,9 @@
 # type: Content of: <dl><dd><p>
 msgid ""
 "Now a lot of companies tell their employees, &ldquo;Get us patents so we can "
-"defend ourselves&rdquo; and they mean use them to try to get "
-"cross-licensing, but it just doesn't work well.  It's not an effective "
-"strategy if you've got a small number of patents."
+"defend ourselves&rdquo; and they mean, &ldquo;use them to try to get "
+"cross-licensing,&rdquo; but it just doesn't work well.  It's not an "
+"effective strategy if you've got a small number of patents."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -763,26 +766,26 @@
 "your three patents don't help you at all, because none of them points at "
 "him.  On the other hand, sooner or later, somebody in the company is going "
 "to notice that this patent is actually pointing at some people, and [the "
-"company] could threaten them and squeeze money out of them, never mind that "
-"those people didn't attack this company."
+"company] could threaten them and squeeze money out of them&mdash;never mind "
+"that those people didn't attack this company."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
 msgid ""
-"So if your employer says to you &ldquo;we need some patents to defend "
-"ourselves&rdquo;, so help us get patents, I recommend this response."
+"So if your employer says to you, &ldquo;We need some patents to defend "
+"ourselves, so help us get patents,&rdquo; I recommend this response."
 msgstr ""
 
 # type: Content of: <dl><dd><blockquote><p>
 msgid ""
-"&ldquo;Boss, I trust you and I'm sure you would only use those patents to "
-"defend the company if it's attacked.  But I don't know who's going to be the "
-"CEO of this company in five years.  For all I know, it might get acquired by "
+"Boss, I trust you and I'm sure you would only use those patents to defend "
+"the company if it's attacked.  But I don't know who's going to be the CEO of "
+"this company in five years.  For all I know, it might get acquired by "
 "Microsoft.  So I really can't trust the company's word to only use these "
 "patents for defense unless I get it in writing.  Please put it in writing "
 "that any patents I provide for the company will only be used for "
 "self-defense and collective security, and not for repression, and then I'll "
-"be able to get patents for the company with a clean conscience.&rdquo;"
+"be able to get patents for the company with a clean conscience."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -810,12 +813,12 @@
 msgid ""
 "So let's look at it.  According to this scenario, there's a brilliant "
 "designer of whatever, who's been working for years by himself in his attic "
-"coming up with a better way to do whatever it is.  And now that it's ready "
+"coming up with a better way to do whatever it is.  And now that it's ready, "
 "he wants to start a business and mass-produce this thing; and because his "
-"idea is so good his company will inevitably succeed, except for one thing: "
-"the big companies will compete with him and take all his market the away.  "
-"And because of this his business will almost certainly fail and then he will "
-"starve."
+"idea is so good his company will inevitably succeed&mdash; except for one "
+"thing: the big companies will compete with him and take all his market the "
+"away.  And because of this, his business will almost certainly fail, and "
+"then he will starve."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -841,7 +844,7 @@
 
 # type: Content of: <dl><dd><p>
 msgid ""
-"OK, let's assume that in addition to being a brilliant engineer who came up "
+"Ok, let's assume that in addition to being a brilliant engineer who came up "
 "with something great by himself, he's also talented at running businesses.  "
 "If he has a knack for running businesses, then maybe his business won't "
 "fail.  After all, not all new businesses fail, there are a certain few that "
@@ -874,10 +877,10 @@
 
 # type: Content of: <dl><dd><p>
 msgid ""
-"IBM says &ldquo;Oh, how nice, you have a patent.  Well, we have this patent, "
-"and this patent, and this patent, and this patent, and this patent, all of "
-"which cover other ideas implemented in your product, and if you think you "
-"can fight us on all those, we'll pull out some more.  So let's sign a "
+"IBM says, &ldquo;Oh, how nice, you have a patent.  Well, we have this "
+"patent, and this patent, and this patent, and this patent, and this patent, "
+"all of which cover other ideas implemented in your product, and if you think "
+"you can fight us on all those, we'll pull out some more.  So let's sign a "
 "cross-license agreement, and that way nobody will get hurt.&rdquo; Now since "
 "we've assumed that our genius understands business, he's going to realize "
 "that he has no choice.  He's going to sign the cross-license agreement, as "
@@ -912,7 +915,7 @@
 "field, but they don't have patents in their field.  There are no patents on "
 "how to send or write a threatening letter, no patents on how to file a "
 "lawsuit, and no patents on how to persuade a judge or jury, so even IBM "
-"can't make the patent trolls cross-license.  But IBM figures &ldquo;Our "
+"can't make the patent trolls cross-license.  But IBM figures, &ldquo;Our "
 "competition will have to pay them too; this is just part of the cost of "
 "doing business, and we can live with it.&rdquo; IBM and the other "
 "megacorporations figure that the general dominion over all activity that "
@@ -925,7 +928,7 @@
 "There are also certain software developers who find it particularly "
 "difficult to get a patent license, and those are the developers of free "
 "software.  The reason is that the usual patent license has conditions we "
-"can't possibly fulfil, because usual patent licenses demand a payment per "
+"can't possibly fulfill, because usual patent licenses demand a payment per "
 "copy.  But when software gives users the freedom to distribute and make more "
 "copies, we have no way to count the copies that exist."
 msgstr ""
@@ -992,7 +995,7 @@
 
 # type: Content of: <dl><dd><p>
 msgid ""
-"But lawyers in most countries tell us &ldquo;don't try to find the patents "
+"But lawyers in most countries tell us, &ldquo;Don't try to find the patents "
 "in advance&rdquo;, and the reason is that the penalty for infringement is "
 "bigger if you knew about the patent.  So what they tell you is &ldquo;Keep "
 "your eyes shut.  Don't try to find out about the patents, just go blindly "
@@ -1002,8 +1005,8 @@
 # type: Content of: <dl><dd><p>
 msgid ""
 "And of course, with each single design decision, you probably don't step on "
-"a patent.  Probably nothing happens to you.  But there's so many steps you "
-"have to take to get across the minefield it's very unlikely you will get "
+"a patent.  Probably nothing happens to you.  But there are so many steps you "
+"have to take to get across the minefield, it's very unlikely you will get "
 "through safely.  And of course, the patent holders don't all show up at the "
 "same time, so you don't know how many there are going to be."
 msgstr ""
@@ -1083,7 +1086,7 @@
 # type: Content of: <dl><dd><p>
 msgid ""
 "But there is a sensible question buried inside it, and that sensible "
-"question is, &ldquo;What differences are there between various fields that "
+"question is &ldquo;What differences are there between various fields that "
 "might affect what is good or bad patent policy in those fields?&rdquo;"
 msgstr ""
 
@@ -1107,7 +1110,7 @@
 "That's not how things work.  In the 1800s, maybe they did, but not now.  In "
 "fact, fields fall on a spectrum of how many patents [there are] per "
 "product.  The beginning of the spectrum is one, but no field is like that "
-"today; but fields are at various places on this spectrum."
+"today; fields are at various places on this spectrum."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -1143,7 +1146,7 @@
 "ideas into one usable design than anybody else, because our field is "
 "basically easier than all other fields.  I'm presuming that the intelligence "
 "of people in our field is the same as that of people in physical "
-"engineering.  It's not that we're fundamentally better than they are, it's "
+"engineering.  It's not that we're fundamentally better than they are; it's "
 "that our field is fundamentally easier, because we're working with "
 "mathematics."
 msgstr ""
@@ -1180,9 +1183,9 @@
 
 # type: Content of: <dl><dd><ul><li>
 msgid ""
-"I don't have to worry that if it resonates much faster, you know, millions "
-"of times per second, that it might generate radio frequency signals that "
-"might induce wrong values in other parts of the program;"
+"I don't have to worry that if it resonates much faster&mdash;you know, "
+"millions of times per second&mdash;that it might generate radio frequency "
+"signals that might induce wrong values in other parts of the program;"
 msgstr ""
 
 # type: Content of: <dl><dd><ul><li>
@@ -1219,7 +1222,7 @@
 
 # type: Content of: <dl><dd><p>
 msgid ""
-"If I want to make copies on CD I just have to write a master; and there's "
+"If I want to make copies on CD, I just have to write a master; and there's "
 "one program I can [use to] make a master out of anything, write any data I "
 "want.  I can make a master CD and write it and send it off to a factory, and "
 "they'll duplicate whatever I send them.  I don't have to design a different "
@@ -1238,8 +1241,8 @@
 
 # type: Content of: <dl><dd><p>
 msgid ""
-"A physical design with a million non-repeating different design elements is "
-"a gigantic project.  A program with a million different design elements, "
+"A physical design with a million nonrepeating different design elements is a "
+"gigantic project.  A program with a million different design elements, "
 "that's nothing.  It's a few hundred thousand lines of code, and a few people "
 "will write that in a few years, so it's not a big deal.  So the result is "
 "that the patent system weighs proportionately heavier on us than it does on "
@@ -1278,8 +1281,8 @@
 "software developers are not endangered by the copyrights on their work, that "
 "they won't be endangered by the patents on their work either.  They imagine "
 "that, since when you write a program you have the copyright, [therefore "
-"likewise] if you write a program you have the patents also.  This is false "
-"&mdash; so how do we give them a clue what patents would really do? What "
+"likewise] if you write a program you have the patents also.  This is "
+"false&mdash;so how do we give them a clue what patents would really do? What "
 "they really do in countries like the US?"
 msgstr ""
 
@@ -1295,7 +1298,7 @@
 "ideas.  But you can't just pick a bunch of ideas and say &ldquo;Here's my "
 "combination of ideas, do you like it?&rdquo; Because in order to make them "
 "work you have to implement them all.  You can't just pick musical ideas and "
-"list them and say &ldquo;Hey, how do you like this combination?&rdquo; You "
+"list them and say, &ldquo;Hey, how do you like this combination?&rdquo; You "
 "can't hear that [list].  You have to write notes which implement all these "
 "ideas together."
 msgstr ""
@@ -1334,9 +1337,9 @@
 "symphony.  You're going to find it's much harder to write a symphony you "
 "don't get sued for than to write one that sounds good, because you have to "
 "thread your way around all the patents that exist.  If you complained about "
-"this, the patent holders would say &ldquo;Oh, Beethoven, you're just jealous "
-"because we had these ideas first.  Why don't you go and think of some ideas "
-"of your own?&rdquo;"
+"this, the patent holders would say, &ldquo;Oh, Beethoven, you're just "
+"jealous because we had these ideas first.  Why don't you go and think of "
+"some ideas of your own?&rdquo;"
 msgstr ""
 
 # type: Content of: <dl><dd><p>
@@ -1367,7 +1370,7 @@
 msgid ""
 "When the technological context changes so frequently, you end up with a "
 "situation where what was done 20 years ago is totally inadequate.  Twenty "
-"years ago there was no World Wide Web.  So sure, people did a lot of things "
+"years ago there was no World Wide Web.  So, sure, people did a lot of things "
 "with computers back then, but what they want to do today are things that "
 "work with the World Wide Web.  And you can't do that using only the ideas "
 "that were known 20 years ago.  And I presume that the technological context "
@@ -1605,8 +1608,8 @@
 # type: Content of: <dl><dd><p>
 msgid ""
 "Yes.  You see, each country has its own patent system, and they work "
-"independently, except that countries have signed up to a treaty that says "
-"\"if you have got a patent in that country, you can basically bring your "
+"independently, except that countries have signed up to a treaty that says, "
+"\"If you have got a patent in that country, you can basically bring your "
 "application over here, and we'll judge it based on the year you applied for "
 "it over there\".  But other than that, each country has its own criteria for "
 "what can be patented and has its own set of patents."
@@ -1672,7 +1675,7 @@
 "processing unit, a memory, input/output facilities, instruction-fetching "
 "facilities, and means to perform this particular computation.  In effect "
 "they've written explicitly into the patent all the parts of an ordinary "
-"computer, and then they say &ldquo;Well, this is a physical system which we "
+"computer, and then they say, &ldquo;Well, this is a physical system which we "
 "would like to patent&rdquo;, but really it's just patenting certain software "
 "on a computer.  There are many subterfuges that they've used."
 msgstr ""
@@ -1742,7 +1745,7 @@
 "will get behind total rejection of software patents.  Whereas an exception "
 "for some special case will only win support from the people in that special "
 "case.  These partial solutions are essentially distractions.  People start "
-"by saying &ldquo;Oh, I'm sure we can't really solve the problem, so I give "
+"by saying, &ldquo;Oh, I'm sure we can't really solve the problem, so I give "
 "up on that.  Let me propose a partial solution.&rdquo; But these partial "
 "solutions don't make it safe to develop software."
 msgstr ""
@@ -1767,7 +1770,7 @@
 # type: Content of: <dl><dd>
 msgid ""
 "Something that saves only a few of us, or only certain activities, or gets "
-"rid of half the software patents, that's analogous to saying &ldquo;Well, "
+"rid of half the software patents, that's analogous to saying, &ldquo;Well, "
 "maybe we could clear part of the minefield, or maybe we could destroy half "
 "the mines in the minefield.&rdquo; [That's an improvement] but that doesn't "
 "make it safe."
@@ -1820,9 +1823,9 @@
 msgid ""
 "How many computer users were there in 1982, even in the US? It was a small "
 "fraction of the public.  But there were software developers.  They weren't "
-"saying &ldquo;We desperately want patents&rdquo;.  They weren't getting sued "
-"for patent infringement after they developed their programs.  But there is a "
-"bit of [economic] research that I saw that apparently software patents "
+"saying, &ldquo;We desperately want patents&rdquo;.  They weren't getting "
+"sued for patent infringement after they developed their programs.  But there "
+"is a bit of [economic] research that I saw that apparently software patents "
 "resulted not in an increase in research, but [in] a shift of funds from "
 "research into patenting."
 msgstr ""

Index: server/body-include-2.el.html
===================================================================
RCS file: /web/www/www/server/body-include-2.el.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/body-include-2.el.html       30 Apr 2010 20:26:23 -0000      1.8
+++ server/body-include-2.el.html       5 May 2010 20:25:56 -0000       1.9
@@ -3,8 +3,8 @@
 
         <h1 id="logo"><a href="/">Î¤Î¿ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¹ÎºÏ ÏÏÏÏÎ·Î¼Î± 
GNU</a></h1>
 
-         <div style="position: absolute; top: -20px; right: 0; width: 
344px;"><a href="http://patentabsurdity.com/watch.html"; title="Watch Patent
-Absurdity"><img src="http://static.fsf.org/nosvn/pa-gnu.jpg"; alt="" /></a>
+         <div style="position: absolute; top: -20px; right: 0; width: 
344px;"><a href="http://patentabsurdity.com/watch.html"; title="ÎÎµÎ¯ÏÎµ 
ÏÎ¿Î½ ÏÎ±ÏÎ±Î»Î¿Î³Î¹ÏÎ¼Ï
+ÏÏÎ½ ÏÎ±ÏÎµÎ½ÏÏÎ½"><img src="http://static.fsf.org/nosvn/pa-gnu.jpg"; 
alt="" /></a>
          </div>
 
 <!--           <div id="fssbox">

Index: software/software.el.html
===================================================================
RCS file: /web/www/www/software/software.el.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- software/software.el.html   25 Apr 2010 20:26:13 -0000      1.5
+++ software/software.el.html   5 May 2010 20:26:00 -0000       1.6
@@ -140,11 +140,8 @@
 Î¬ÏÎ¸ÏÎ¿Ï.
 </p>
 
-<p>
-Î Î½ÎµÏÎ¼Î±ÏÎ¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ± &copy; 1996, 1997, 1998, 1999, 2000, 
2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009, 2010 ÎÎ´ÏÏÎ¼Î± ÎÎ»ÎµÏÎ¸ÎµÏÎ¿Ï 
ÎÎ¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï, Inc.,
-</p>
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
+<p>Î Î½ÎµÏÎ¼Î±ÏÎ¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ± &copy; 1996, 1997, 1998, 1999, 
2000, 2001, 2002, 2003,
+2004, 2005, 2006, 2007, 2008, 2009, 2010 ÎÎ´ÏÏÎ¼Î± ÎÎ»ÎµÏÎ¸ÎµÏÎ¿Ï 
ÎÎ¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï, Inc.</p>
 <p>ÎÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î· ÎºÎ±ÏÎ¬ Î»ÎÎ¾Î· Î±Î½ÏÎ¹Î³ÏÎ±ÏÎ® ÎºÎ±Î¹ 
Î´Î¹Î±Î½Î¿Î¼Î® ÏÎ»Î¿Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï Î¬ÏÎ¸ÏÎ¿Ï
 ÏÎ±Î³ÎºÎ¿ÏÎ¼Î¯ÏÏ, ÏÏÏÎ¯Ï ÎµÏÎ¯Î´Î¿Î¼Î± ÏÏÎ³Î³ÏÎ±ÏÎÏÏ, ÏÎµ 
Î¿ÏÎ¿Î¹Î¿Î´Î®ÏÎ¿ÏÎµ Î¼ÎÏÎ¿, Î¼Îµ ÏÎ·Î½ ÏÏÎ¿ÏÏÏÎ¸ÎµÏÎ·
 ÏÏÎ¹ Î±ÏÏÎ® Î· ÎµÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ· Î´Î¹Î±ÏÎ·ÏÎµÎ¯ÏÎ±Î¹.
@@ -158,11 +155,10 @@
 href="http://savannah.gnu.org/users/lafs";>ÎÏÏÏÎ¬Î¸Î¹Î¿Ï Î§Î±ÏÎ¶Î·ÎºÏ
ÏÎ¹Î±ÎºÎ¯Î´Î·Ï</a>
 (2007) &amp; <a href="http://savannah.gnu.org/users/gzarkadas";>ÎÎµÏÏÎ³Î¹Î¿Ï
 ÎÎ±ÏÎºÎ¬Î´Î±Ï</a> (2010).</div>
- <p>
-<!-- timestamp start -->
+ <p><!-- timestamp start -->
 ÎÎ½Î·Î¼ÎµÏÏÎ¸Î·ÎºÎµ:
 
-$Date: 2010/04/25 20:26:13 $
+$Date: 2010/05/05 20:26:00 $
 
 <!-- timestamp end -->
 </p>
@@ -171,20 +167,20 @@
 <div id="translations">
 <h4>ÎÎµÏÎ±ÏÏÎ¬ÏÎµÎ¹Ï Î±ÏÏÎ®Ï ÏÎ·Ï ÏÎµÎ»Î¯Î´Î±Ï</h4>
 
-<!-- Please keep this list alphabetical by language code. -->
-<!-- Comment what the language is for each type, i.e. de is German. -->
-<!-- Write the language name in its own language (Deutsch) in the text. -->
-<!-- If you add a new language here, please -->
-<!-- advise address@hidden and add it to -->
-<!--  - /home/www/html/server/standards/README.translations.html -->
-<!--  - one of the lists under the section "Translations Underway" -->
-<!--  - if there is a translation team, you also have to add an alias -->
-<!--  to mail.gnu.org:/com/mailer/aliases -->
-<!-- Please also check you have the language code right; see: -->
-<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
-<!-- If the 2-letter ISO 639-1 code is not available, -->
-<!-- use the 3-letter ISO 639-2. -->
-<!-- Please use W3C normative character entities. -->
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities. -->
 <ul class="translations-list">
 <!-- Arabic -->
 <li><a 
href="/software/software.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>

Index: doc/TOC-FSFS.el.html
===================================================================
RCS file: doc/TOC-FSFS.el.html
diff -N doc/TOC-FSFS.el.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ doc/TOC-FSFS.el.html        5 May 2010 20:25:43 -0000       1.1
@@ -0,0 +1,149 @@
+
+<!--#include virtual="/server/header.el.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Î¤ÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ· ÏÎ¿Ï ÎÏÎ³Î¿Ï GNU - ÎÎ»ÎµÏÎ¸ÎµÏÎ¿ 
ÎÎ¿Î³Î¹ÏÎ¼Î¹ÎºÏ, ÎÎ»ÎµÏÎ¸ÎµÏÎ· ÎÎ¿Î¹Î½ÏÎ½Î¯Î±</title>
+
+<!--#include virtual="/server/banner.el.html" -->
+<h2>Î Î¯Î½Î±ÎºÎ±Ï ÏÎµÏÎ¹ÎµÏÎ¿Î¼ÎÎ½ÏÎ½ ÏÎ¿Ï <a
+href="http://shop.fsf.org/product/free-software-free-society/";><b>ÎÎ»ÎµÏÎ¸ÎµÏÎ¿
+ÎÎ¿Î³Î¹ÏÎ¼Î¹ÎºÏ, ÎÎ»ÎµÏÎ¸ÎµÏÎ· ÎÎ¿Î¹Î½ÏÎ½Î¯Î±</b></a></h2>
+
+<ul>
+<li>Î£Î·Î¼ÎµÎ¯ÏÏÎ· ÏÎ¿Ï ÏÏÎ½ÏÎ¬ÎºÏÎ·</li>
+<li>Î£Î·Î¼ÎµÎ¯ÏÏÎ· ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ¿ Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÏ</li>
+<li>ÎÎ´Î·Î³ÏÏ Î¸ÎµÎ¼Î±ÏÎ¿Î»Î¿Î³Î¯Î±Ï</li>
+<li><a href="/philosophy/lessig-fsfs-intro.html">ÎÎ¹ÏÎ±Î³ÏÎ³Î®</a></li>
+</ul>
+
+<h3>ÎÎ½ÏÏÎ·ÏÎ± ÏÏÏÏÎ·: Î¤Î¿ ÎÏÎ³Î¿ GNU ÎºÎ±Î¹ ÏÎ¿ ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿ 
Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÏ</h3>
+
+<ul>
+<li><a href="/gnu/thegnuproject.html">Î¤Î¿ ÎÏÎ³Î¿ GNU</a></li>
+<li><a href="/gnu/manifesto.html">Î¤Î¿ Î¼Î±Î½Î¹ÏÎÏÏÎ¿ ÏÎ¿Ï GNU</a></li>
+<li><a href="/philosophy/free-sw.html">ÎÏÎ¹ÏÎ¼ÏÏ ÏÎ¿Ï ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿Ï
 Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï</a></li>
+<li><a href="/philosophy/why-free.html">ÎÎ¹Î±ÏÎ¯ ÏÎ¿ Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÏ 
Î´ÎµÎ½ ÏÏÎÏÎµÎ¹ Î½Î± ÎÏÎµÎ¹
+Î¹Î´Î¹Î¿ÎºÏÎ®ÏÎµÏ</a></li>
+<li><a href="/gnu/why-gnu-linux.html">Î¤Î¹ ÏÎµÏÎ¹ÎÏÎµÏÎ±Î¹ Ï' ÎÎ½Î± 
ÏÎ½Î¿Î¼Î±;</a></li>
+<li><a href="/philosophy/open-source-misses-the-point.html">ÎÎ¹Î±ÏÎ¯ ÏÎ¿
+&ldquo;ÎÎ»ÎµÏÎ¸ÎµÏÎ¿ ÎÎ¿Î³Î¹ÏÎ¼Î¹ÎºÏ&rdquo; ÎµÎ¯Î½Î±Î¹ ÎºÎ±Î»ÏÏÎµÏÎ¿ 
Î±ÏÏ ÏÎ¿ &ldquo;ÎÎ½Î¿Î¹ÏÏÏÏ
+ÎÏÎ´Î¹ÎºÎ±Ï&rdquo;</a></li>
+<li><a href="/philosophy/university.html">ÎÏÎµÎ»ÎµÏÎ¸ÎµÏÏÎ½Î¿Î½ÏÎ±Ï 
ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿ Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÏ
+ÎµÎ¬Î½ Î´Î¿ÏÎ»ÎµÏÎµÏÎµ Ï' ÎÎ½Î± ÏÎ±Î½ÎµÏÎ¹ÏÏÎ®Î¼Î¹Î¿</a></li>
+<li><a href="/philosophy/selling.html">Î Î¿ÏÎ»ÏÎ½ÏÎ±Ï ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿ 
Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÏ</a></li>
+<li><a href="/philosophy/free-doc.html">Î¤Î¿ ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿ 
Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÏ ÏÏÎµÎ¹Î¬Î¶ÎµÏÎ±Î¹
+ÎµÎ»ÎµÏÎ¸ÎµÏÎ· ÏÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ·</a></li>
+<li><a href="/music/free-software-song.html">Î¤Î¿ ÏÏÎ±Î³Î¿ÏÎ´Î¹ ÏÎ¿Ï 
ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿Ï
+Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï</a></li>
+</ul>
+
+<h3>ÎÎ½ÏÏÎ·ÏÎ± Î´ÎµÏÏÎµÏÎ·: Î Î½ÎµÏÎ¼Î±ÏÎ¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ±, 
copyleft ÎºÎ±Î¹ ÏÎ±ÏÎÎ½ÏÎµÏ</h3>
+<ul>
+<li><a href="/philosophy/right-to-read.html">Î¤Î¿ Î´Î¹ÎºÎ±Î¯ÏÎ¼Î± ÏÏÎ·Î½ 
Î±Î½Î¬Î³Î½ÏÏÎ·</a></li>
+<li><a href="/philosophy/misinterpreting-copyright.html">Î 
Î±ÏÎµÏÎ¼Î·Î½ÎµÏÎ¿Î½ÏÎ±Ï ÏÎ±
+ÏÎ½ÎµÏÎ¼Î±ÏÎ¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ±&mdash;Î¼Î¹Î± ÏÎµÎ¹ÏÎ¬ 
ÏÏÎ±Î»Î¼Î¬ÏÏÎ½</a></li>
+<li><a href="/philosophy/push-copyright-aside.xhtml">Î ÎµÏÎ¹ÏÏÎ®Î¼Î· 
ÏÏÎÏÎµÎ¹ Î½Î±
+&lsquo;ÏÏÏÏÎ¾ÎµÎ¹&rsquo; ÏÎ± ÏÎ½ÎµÏÎ¼Î±ÏÎ¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ± 
ÏÏÎ·Î½ Î¬ÎºÏÎ·</a></li>
+<li><a href="/copyleft/copyleft.html">Î¤Î¹ ÎµÎ¯Î½Î±Î¹ ÏÎ¿ copyleft;</a></li>
+<li><a href="/philosophy/pragmatic.html">Copyleft: 
ÏÏÎ±Î³Î¼Î±ÏÎ¹ÏÏÎ¹ÎºÏÏ Î¹Î´ÎµÎ±Î»Î¹ÏÎ¼ÏÏ</a></li>
+<li>Î ÎºÎ¯Î½Î´ÏÎ½Î¿Ï ÏÏÎ½ ÏÎ±ÏÎµÎ½ÏÏÎ½ Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï</li>
+</ul>
+
+<h3>ÎÎ½ÏÏÎ·ÏÎ± ÏÏÎ¯ÏÎ·: ÎÎ»ÎµÏÎ¸ÎµÏÎ¯Î±, ÎºÎ¿Î¹Î½ÏÎ½Î¯Î± ÎºÎ±Î¹ 
Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÏ</h3>
+<ul>
+<li><a href="/philosophy/can-you-trust.html">ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± 
ÎµÎ¼ÏÎ¹ÏÏÎµÏÏÎµÎ¯ÏÎµ ÏÎ¿Î½
+ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï;</a></li>
+<li><a href="/philosophy/shouldbefree.html">ÎÎ¹Î±ÏÎ¯ ÏÎ¿ Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÏ 
ÏÏÎÏÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹
+ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿</a></li>
+<li><a href="/philosophy/copyright-and-globalization.html">Î Î½ÎµÏ
Î¼Î±ÏÎ¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ±
+ÎºÎ±Î¹ ÏÎ±Î³ÎºÎ¿ÏÎ¼Î¹Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÏÎ·Î½ ÎµÏÎ¿ÏÎ® ÏÏÎ½ 
Î´Î¹ÎºÏÏÏÎ½ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÏÎ½</a></li>
+<li><a href="/events/rms-nyu-2001-transcript.html">ÎÎ»ÎµÏÎ¸ÎµÏÎ¿ 
Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÏ: ÎÎ»ÎµÏÎ¸ÎµÏÎ¯Î±
+ÎºÎ±Î¹ ÏÏÎ½ÎµÏÎ³Î±ÏÎ¯Î±</a></li>
+<li><a href="/philosophy/words-to-avoid.html">ÎÎÎ¾ÎµÎ¹Ï ÏÏÎ¿Ï Î±ÏÎ¿ÏÏ
Î³Î®</a></li>
+</ul>
+
+<h3>ÎÎ½ÏÏÎ·ÏÎ± ÏÎÏÎ±ÏÏÎ·: ÎÎ¹ Î¬Î´ÎµÎ¹ÎµÏ</h3>
+<ul>
+<li><a href="/licenses/gpl.html">ÎÎµÎ½Î¹ÎºÎ® ÎÎ´ÎµÎ¹Î± ÎÎ·Î¼ÏÏÎ¹Î±Ï 
Î§ÏÎ®ÏÎ·Ï GNU (GPL)</a></li>
+<li><a href="/licenses/lgpl.html">ÎÎ»Î¬ÏÏÏÎ½ ÎÎµÎ½Î¹ÎºÎ® ÎÎ´ÎµÎ¹Î± 
ÎÎ·Î¼ÏÏÎ¹Î±Ï Î§ÏÎ®ÏÎ·Ï GNU
+(LGPL)</a></li>
+<li><a href="/licenses/fdl.html">ÎÎ´ÎµÎ¹Î± ÎÎ»ÎµÏÎ¸ÎµÏÎ·Ï 
Î¤ÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ·Ï GNU (FDL) </a></li>
+</ul>
+
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!--#include virtual="/server/footer.el.html" -->
+<div id="footer">
+
+<p>
+Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÏÏÎµÎ¯Î»ÏÎµ ÎµÏÏÏÎ®ÏÎµÎ¹Ï Î³Î¹Î± ÏÎ± ÎÎÎ 
&amp; GNU ÏÏÎ¿ <a
+href="mailto:address@hidden";><em>address@hidden</em></a>.  Î¥ÏÎ¬ÏÏÎ¿ÏÎ½ 
ÎµÏÎ¯ÏÎ·Ï <a
+href="/contact/">Î¬Î»Î»Î¿Î¹ ÏÏÏÏÎ¿Î¹ Î³Î¹Î± Î½Î± 
ÎµÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½Î®ÏÎµÏÎµ</a> Î¼Îµ ÏÎ¿ ÎÎÎ.  <br />
+Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÏÏÎµÎ¯Î»ÏÎµ Î±Î½ÎµÎ½ÎµÏÎ³Î¿ÏÏ ÏÏÎ½Î´ÎÏÎ¼Î¿Ï
Ï ÎºÎ±Î¹ Î¬Î»Î»ÎµÏ Î´Î¹Î¿ÏÎ¸ÏÏÎµÎ¹Ï Î® ÏÏÎ¿ÏÎ¬ÏÎµÎ¹Ï
+ÏÏÎ¿ <a href="mailto:address@hidden";><em>address@hidden</em></a>.
+</p>
+
+<p>
+Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Î´ÎµÎ¯ÏÎµ ÏÎ¿ <a
+href="/server/standards/README.translations.html">ÎÎµÏÎ±ÏÏÎ¬ÏÎµÎ¹Ï 
README</a> Î³Î¹Î±
+ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ¿ ÏÏÎ½ÏÎ¿Î½Î¹ÏÎ¼Ï ÎºÎ±Î¹ 
ÏÎ·Î½ ÏÏÎ¿Î²Î¿Î»Î® Î¼ÎµÏÎ±ÏÏÎ¬ÏÎµÏÎ½ Î±ÏÏÎ¿Ï ÏÎ¿Ï
+Î¬ÏÎ¸ÏÎ¿Ï.
+</p>
+
+<p>
+Î Î½ÎµÏÎ¼Î±ÏÎ¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ± &copy; 1996, 1997, 1998, 1999, 2000, 
2001, 2002, 2003,
+2004, 2005, 2006, 2009, 2010 ÎÎ´ÏÏÎ¼Î± ÎÎ»ÎµÏÎ¸ÎµÏÎ¿Ï 
ÎÎ¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï, Inc.,
+</p>
+<p>
+ÎÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î· ÎºÎ±ÏÎ¬ Î»ÎÎ¾Î· Î±Î½ÏÎ¹Î³ÏÎ±ÏÎ® ÎºÎ±Î¹ 
Î´Î¹Î±Î½Î¿Î¼Î® ÏÎ»Î¿Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï Î¬ÏÎ¸ÏÎ¿Ï ÏÎµ ÎºÎ¬Î¸Îµ
+Î¼ÎÏÎ¿, Î¼Îµ ÏÎ·Î½ ÏÏÎ¿ÏÏÏÎ¸ÎµÏÎ· ÏÏÎ¹ Î±ÏÏÎ® Î· 
ÎµÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ· Î´Î¹Î±ÏÎ·ÏÎµÎ¯ÏÎ±Î¹.
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+ÎÎµÏÎ¬ÏÏÎ±ÏÎ· ÏÏÎ± ÎµÎ»Î»Î·Î½Î¹ÎºÎ¬: <a
+href="http://savannah.gnu.org/users/gzarkadas";>ÎÎµÏÏÎ³Î¹Î¿Ï 
ÎÎ±ÏÎºÎ¬Î´Î±Ï</a> (2010).</div>
+ <p>
+<!-- timestamp start -->
+ÎÎ½Î·Î¼ÎµÏÏÎ¸Î·ÎºÎµ:
+
+$Date: 2010/05/05 20:25:43 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+<div id="translations">
+<h4>ÎÎµÏÎ±ÏÏÎ¬ÏÎµÎ¹Ï Î±ÏÏÎ®Ï ÏÎ·Ï ÏÎµÎ»Î¯Î´Î±Ï</h4>
+
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!--  - /home/www/html/server/standards/README.translations.html -->
+<!--  - one of the lists under the section "Translations Underway" -->
+<!--  - if there is a translation team, you also have to add an alias -->
+<!--  to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<ul class="translations-list">
+<!-- Greek -->
+<li><a 
href="/doc/TOC-FSFS.el.html">&#x03b5;&#x03bb;&#x03bb;&#x03b7;&#x03bd;&#x03b9;&#x03ba;&#x03ac;</a>&nbsp;[el]</li>
+<!-- English -->
+<li><a href="/doc/TOC-FSFS.html">English</a>&nbsp;[en]</li>
+</ul>
+</div>
+</div>
+</body>
+</html>
[Prev in Thread]
Current Thread
[Next in Thread]
www home.el.shtml doc/TOC-FSFS.fr.html gnu/po/f..., Yavor Doganov <=
Prev by Date: www/philosophy danger-of-software-patents.html
Next by Date: www/licenses quick-guide-gplv3.html
Previous by thread: www/gnu fs-user-groups.html
Next by thread: www/licenses quick-guide-gplv3.html
Index(es):
- Date
- Thread