trans-coord/gnun/philosophy categories.ca.html ...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   10/05/05 18:25:09

Modified files:
        gnun/philosophy: categories.ca.html java-trap.bg.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/categories.ca.html?cvsroot=trans-coord&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/java-trap.bg.html?cvsroot=trans-coord&r1=1.9&r2=1.10

Patches:
Index: categories.ca.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/categories.ca.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- categories.ca.html  3 Apr 2010 18:25:07 -0000       1.10
+++ categories.ca.html  5 May 2010 18:25:09 -0000       1.11
@@ -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.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
@@ -396,7 +392,7 @@
 <!-- timestamp start -->
 Updated:
 
-$Date: 2010/04/03 18:25:07 $
+$Date: 2010/05/05 18:25:09 $
 
 <!-- timestamp end -->
 </p>

Index: java-trap.bg.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/java-trap.bg.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- java-trap.bg.html   15 Jan 2010 19:25:10 -0000      1.9
+++ java-trap.bg.html   5 May 2010 18:25:09 -0000       1.10
@@ -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>Please also see: <a href="javascript-trap.html">The Javascript Trap</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 19:25:10 $
+$Date: 2010/05/05 18:25:09 $
 
 <!-- timestamp end -->
 </p>