www-commits
[Top][All Lists]
Advanced

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

www licenses/translations.fr.html licenses/tran...


From: Yavor Doganov
Subject: www licenses/translations.fr.html licenses/tran...
Date: Tue, 15 Nov 2011 01:34:35 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   11/11/15 01:34:35

Modified files:
        licenses       : translations.fr.html translations.pl.html 
        licenses/po    : translations.pl-en.html 
        philosophy     : categories.ar.html categories.ca.html 
                         categories.pl.html categories.ru.html 
                         who-does-that-server-really-serve.ro.html 
Added files:
        philosophy/po  : categories.ca-en.html categories.pl-en.html 
                         categories.ru-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/translations.fr.html?cvsroot=www&r1=1.66&r2=1.67
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/translations.pl.html?cvsroot=www&r1=1.94&r2=1.95
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.pl-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.ar.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.ca.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.pl.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.ru.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/who-does-that-server-really-serve.ro.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ca-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.pl-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ru-en.html?cvsroot=www&rev=1.1

Patches:
Index: licenses/translations.fr.html
===================================================================
RCS file: /web/www/www/licenses/translations.fr.html,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- licenses/translations.fr.html       3 Sep 2011 09:16:53 -0000       1.66
+++ licenses/translations.fr.html       15 Nov 2011 01:34:01 -0000      1.67
@@ -7,6 +7,12 @@
 <meta http-equiv="keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Copyleft, Licences" />
 
 <!--#include virtual="/server/banner.fr.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/licenses/po/translations.fr.po";>
+ http://www.gnu.org/licenses/po/translations.fr.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/licenses/translations.html" -->
+ <!--#set var="DIFF_FILE" value="" -->
+ <!--#include virtual="/server/outdated.fr.html" -->
 <h2>Traductions non officielles</h2>
 
 <h3 id="UnofficialTranslations">&Agrave; propos des traductions non 
officielles</h3>
@@ -319,7 +325,7 @@
  <p><!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2011/09/03 09:16:53 $
+$Date: 2011/11/15 01:34:01 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/translations.pl.html
===================================================================
RCS file: /web/www/www/licenses/translations.pl.html,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- licenses/translations.pl.html       6 Nov 2011 09:34:52 -0000       1.94
+++ licenses/translations.pl.html       15 Nov 2011 01:34:01 -0000      1.95
@@ -155,9 +155,9 @@
 <code>[zh-tw]</code> <a 
href="http://www.certifiedchinesetranslation.com/openaccess/gnuv3-tc.html";>
   Chinese (Traditional)</a> translation of the GPL</li>
 -->
-<li><!-- RT #709555 -->
+<li><!-- RT #710854 -->
 <code>[cs]</code> Tłumaczenie GPL na&nbsp;<a
-href="http://www.gnugpl.cz/v3";>czeski</a></li>
+href="http://jxself.org/translations/gpl-3.cz.shtml";>czeski</a></li>
   <li><code>[nl]</code> Tłumaczenie GPL na&nbsp;<a
 href="http://bartbeuving.files.wordpress.com/2008/07/gpl-v3-nl-101.pdf";>
 holenderski</a> (PDF)</li>
@@ -516,7 +516,7 @@
  <p><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2011/11/06 09:34:52 $
+$Date: 2011/11/15 01:34:01 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/translations.pl-en.html
===================================================================
RCS file: /web/www/www/licenses/po/translations.pl-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/translations.pl-en.html 6 Nov 2011 09:35:00 -0000       1.1
+++ licenses/po/translations.pl-en.html 15 Nov 2011 01:34:10 -0000      1.2
@@ -132,8 +132,9 @@
   <li><code>[zh-tw]</code> <a 
href="http://www.certifiedchinesetranslation.com/openaccess/gnuv3-tc.html";>
   Chinese (Traditional)</a> translation of the GPL</li>
 -->
-  <li><code>[cs]</code> <!-- RT #709555 -->
-  <a href="http://www.gnugpl.cz/v3";>Czech</a> translation of the GPL</li>
+  <li><code>[cs]</code> <!-- RT #710854 -->
+  <a href="http://jxself.org/translations/gpl-3.cz.shtml";>Czech</a>
+  translation of the GPL</li>
   <li><code>[nl]</code> <a 
href="http://bartbeuving.files.wordpress.com/2008/07/gpl-v3-nl-101.pdf";>
   Dutch</a> translation of the GPL (PDF)</li>
 <!-- link to browsehappy.com; other links
@@ -438,7 +439,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/11/06 09:35:00 $
+$Date: 2011/11/15 01:34:10 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/categories.ar.html
===================================================================
RCS file: /web/www/www/philosophy/categories.ar.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/categories.ar.html       14 Nov 2011 17:01:17 -0000      1.16
+++ philosophy/categories.ar.html       15 Nov 2011 01:34:17 -0000      1.17
@@ -9,8 +9,8 @@
 <!--#set var="PO_FILE"
  value='<a href="http://www.gnu.org/philosophy/po/categories.ar.po";>
  http://www.gnu.org/philosophy/po/categories.ar.po</a>' -->
-<!--#set var="ORIGINAL_FILE" value="/philosophy/categories.html" -->
-<!--#set var="DIFF_FILE" value="" -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/categories.html" -->
+ <!--#set var="DIFF_FILE" value="" -->
  <!--#include virtual="/server/outdated.ar.html" -->
 <h2>تصانيف البرمجيات الحرة وغير الحرة</h2>
 
@@ -359,7 +359,7 @@
 <!-- timestamp start -->
 حُدّثت:
 
-$Date: 2011/11/14 17:01:17 $
+$Date: 2011/11/15 01:34:17 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/categories.ca.html
===================================================================
RCS file: /web/www/www/philosophy/categories.ca.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/categories.ca.html       22 Oct 2011 16:37:43 -0000      1.22
+++ philosophy/categories.ca.html       15 Nov 2011 01:34:18 -0000      1.23
@@ -12,17 +12,9 @@
 <p>Vegeu també <a href="/philosophy/words-to-avoid.ca.html">Paraules confuses
 que convé evitar</a>.</p>
 
+<!-- GNUN: localize URL /philosophy/category.png -->
 <p id="diagram" class="c">
-
-<!--#set var="IMAGE_BASE" value="/philosophy/category" -->
-<!--#set var="IMAGE_LANG" value="" -->
-<!--#set var="IMAGE_EXT"  value=".png" -->
-<!--#if expr="-A ${DOCUMENT_ROOT}${IMAGE_BASE}${LANGUAGE_SUFFIX}${IMAGE_EXT}" 
-->
-<!--#set var="IMAGE_LANG" value="${LANGUAGE_SUFFIX}" -->
-<!--#endif -->
-<!--#set var="IMAGE_LINK"
-       value="<img src=\"${IMAGE_BASE}${IMAGE_LANG}${IMAGE_EXT}\" />" -->
-<!--#echo encoding="none" var="IMAGE_LINK" -->
+<img src="/philosophy/category.png" alt="" />
 </p>
 
       <p>Aquest diagrama original de Chao-Kuei i posteriorment actualitzat per 
altres
@@ -436,11 +428,13 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 Traducci&oacute;: David, 24 d'abril de 2000<br />Darrera revisi&oacute;: <a
 href="http://www.puigpe.org/";>puigpe</a>, 5 de setembre de 2011.</div>
+
+
  <p>
 <!-- timestamp start -->
 Updated:
 
-$Date: 2011/10/22 16:37:43 $
+$Date: 2011/11/15 01:34:18 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/categories.pl.html
===================================================================
RCS file: /web/www/www/philosophy/categories.pl.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- philosophy/categories.pl.html       22 Oct 2011 16:37:43 -0000      1.42
+++ philosophy/categories.pl.html       15 Nov 2011 01:34:18 -0000      1.43
@@ -12,17 +12,9 @@
 <p>Zwróćcie też uwagę na&nbsp;<a 
href="/philosophy/words-to-avoid.html">Mylące
 słowa, których prawdopodobnie wolelibyście unikać</a>.</p>
 
+<!-- GNUN: localize URL /philosophy/category.png -->
 <p id="diagram" class="c">
-
-<!--#set var="IMAGE_BASE" value="/philosophy/category" -->
-<!--#set var="IMAGE_LANG" value="" -->
-<!--#set var="IMAGE_EXT"  value=".png" -->
-<!--#if expr="-A ${DOCUMENT_ROOT}${IMAGE_BASE}${LANGUAGE_SUFFIX}${IMAGE_EXT}" 
-->
-<!--#set var="IMAGE_LANG" value="${LANGUAGE_SUFFIX}" -->
-<!--#endif -->
-<!--#set var="IMAGE_LINK"
-       value="<img src=\"${IMAGE_BASE}${IMAGE_LANG}${IMAGE_EXT}\" />" -->
-<!--#echo encoding="none" var="IMAGE_LINK" -->
+<img src="/philosophy/category.png" alt="" />
 </p>
 
       <p>Ten diagram, autorstwa Chao-Kuei a&nbsp;niedawno zaktualizowany przez 
kilka
@@ -458,11 +450,13 @@
 Tłumaczenie: Wojciech Kotwica 2001; poprawki: Wojciech Kotwica 2001, 2002,
 2003, 2004, 2005, Radosław Moszczyński 2004, Marcin Wolak 2010, 2011, Jan
 Owoc 2010, 2011.</div>
+
+
  <p>
 <!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2011/10/22 16:37:43 $
+$Date: 2011/11/15 01:34:18 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/categories.ru.html
===================================================================
RCS file: /web/www/www/philosophy/categories.ru.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/categories.ru.html       22 Oct 2011 16:37:43 -0000      1.10
+++ philosophy/categories.ru.html       15 Nov 2011 01:34:18 -0000      1.11
@@ -12,17 +12,9 @@
 <p>См. также <a 
href="/philosophy/words-to-avoid.html">Сбивающие с толку 
слова,
 которых вам стоило бы избегать</a>.</p>
 
+<!-- GNUN: localize URL /philosophy/category.ru.png -->
 <p id="diagram" class="c">
-
-<!--#set var="IMAGE_BASE" value="/philosophy/category" -->
-<!--#set var="IMAGE_LANG" value="" -->
-<!--#set var="IMAGE_EXT"  value=".png" -->
-<!--#if expr="-A ${DOCUMENT_ROOT}${IMAGE_BASE}${LANGUAGE_SUFFIX}${IMAGE_EXT}" 
-->
-<!--#set var="IMAGE_LANG" value="${LANGUAGE_SUFFIX}" -->
-<!--#endif -->
-<!--#set var="IMAGE_LINK"
-       value="<img src=\"${IMAGE_BASE}${IMAGE_LANG}${IMAGE_EXT}\" />" -->
-<!--#echo encoding="none" var="IMAGE_LINK" -->
+<img src="/philosophy/category.ru.png" alt="" />
 </p>
 
       <p>Эта диаграмма иллюстрирует отношение 
различных категорий программ друг к
@@ -421,11 +413,13 @@
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
  </div>
+
+
  <p>
 <!-- timestamp start -->
 Обновлено:
 
-$Date: 2011/10/22 16:37:43 $
+$Date: 2011/11/15 01:34:18 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/who-does-that-server-really-serve.ro.html
===================================================================
RCS file: /web/www/www/philosophy/who-does-that-server-really-serve.ro.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/who-does-that-server-really-serve.ro.html        3 Sep 2011 
09:18:05 -0000       1.3
+++ philosophy/who-does-that-server-really-serve.ro.html        15 Nov 2011 
01:34:18 -0000      1.4
@@ -7,6 +7,12 @@
 Software Liber (FSF)</title>
 
 <!--#include virtual="/server/banner.ro.html" -->
+<!--#set var="PO_FILE"
+ value='<a 
href="http://www.gnu.org/philosophy/po/who-does-that-server-really-serve.ro.po";>
+ http://www.gnu.org/philosophy/po/who-does-that-server-really-serve.ro.po</a>' 
-->
+ <!--#set var="ORIGINAL_FILE" 
value="/philosophy/who-does-that-server-really-serve.html" -->
+ <!--#set var="DIFF_FILE" value="" -->
+ <!--#include virtual="/server/outdated.ro.html" -->
 <h2>Pe cine servește cu adevărat acel server?</h2>
 
 <p>de <strong>Richard Stallman</strong></p>
@@ -307,7 +313,7 @@
  <p><!-- timestamp start -->
 Actualizată:
 
-$Date: 2011/09/03 09:18:05 $
+$Date: 2011/11/15 01:34:18 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/categories.ca-en.html
===================================================================
RCS file: philosophy/po/categories.ca-en.html
diff -N philosophy/po/categories.ca-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/po/categories.ca-en.html 15 Nov 2011 01:34:24 -0000      1.1
@@ -0,0 +1,430 @@
+<!--#include virtual="/server/header.html" -->
+<title>Categories of Free and Nonfree Software - GNU Project - Free Software 
Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/po/categories.translist" -->
+<h2>Categories of free and nonfree software</h2>
+
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
+       Words which You Might Want to Avoid</a>.</p>
+
+<!-- GNUN: localize URL /philosophy/category.png -->
+<p id="diagram" class="c">
+<img src="/philosophy/category.png" alt="" />
+</p>
+
+      <p>This diagram, originally by Chao-Kuei and updated by several
+      others since, explains the different categories of software. It's
+      available as a <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">Free software</h3>
+
+       <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>If a program is free, then it can potentially be included
+       in a free operating system such as GNU, or free versions of
+       the <a href="/gnu/linux-and-gnu.html">GNU/Linux
+       system</a>.</p>
+
+       <p>There are many different ways to make a program free&mdash;many
+       questions of detail, which could be decided in more than one way
+       and still make the program free. Some of the possible variations
+       are described below. For information on specific free software
+       licenses, see the <a href="/licenses/license-list.html">license
+       list</a> page.</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>Because of this potential confusion, when a software company
+       says its product is free software, always check the actual
+       distribution terms to see whether users really have all the
+       freedoms that free software implies. Sometimes it really is free
+       software; sometimes it isn't.</p>
+
+       <p>Many languages have two separate words for
+       &ldquo;free&rdquo; as in freedom and &ldquo;free&rdquo; as in
+       zero price. For example, French has &ldquo;libre&rdquo; and
+       &ldquo;gratuit&rdquo;. Not so English; there is a word
+       &ldquo;gratis&rdquo; that refers unambiguously to price, but
+       no common adjective that refers unambiguously to freedom. So
+       if you are speaking another language, we suggest you translate
+       &ldquo;free&rdquo; into your language to make it clearer. See
+       our list of <a href= "/philosophy/fs-translations.html">
+       translations of the term &ldquo;free software&rdquo;</a> into
+       various other languages.</p>
+
+       <p>Free software is often <a href="/software/reliability.html">more
+       reliable</a> than nonfree software.</p>
+
+<h3 id="OpenSource">Open source software</h3>
+
+       <p>
+       The term &ldquo;open source&rdquo; software is used by some
+       people to mean more or less the same category as free
+       software. It is not exactly the same class of software: they
+       accept some licenses that we consider too restrictive, and
+       there are free software licenses they have not
+       accepted. However, the differences in extension of the
+       category are small: nearly all free software is open source,
+       and nearly all open source software is free.</p>
+       <p>We prefer the term &ldquo;<a href=
+       "/philosophy/open-source-misses-the-point.html">free
+       software</a>&rdquo; because it refers to
+       freedom&mdash;something that the term &ldquo;open
+       source&ldquo; does not do.</p>
+
+<h3 id="PublicDomainSoftware">Public domain
+       software</h3>
+
+       <p>Public domain software is software that is not copyrighted. If
+       the source code is in the public domain, that is a special case of
+       <a href="#Non-CopyleftedFreeSoftware">noncopylefted free
+       software</a>, which means that some copies or modified versions
+       may not be free at all.</p>
+
+       <p>In some cases, an executable program can be in the public domain
+       but the source code is not available. This is not free software,
+       because free software requires accessibility of source code.
+       Meanwhile, most free software is not in the public domain; it is
+       copyrighted, and the copyright holders have legally given
+       permission for everyone to use it in freedom, using a free software
+       license.</p>
+
+       <p>Sometimes people use the term &ldquo;public domain&rdquo;
+       in a loose fashion to
+       mean <a href="#FreeSoftware">&ldquo;free&rdquo;</a> or
+       &ldquo;available gratis.&rdquo; However, &ldquo;public
+       domain&rdquo; is a legal term and means, precisely, &ldquo;not
+       copyrighted&rdquo;. For clarity, we recommend using
+       &ldquo;public domain&rdquo; for that meaning only, and using
+       other terms to convey the other meanings.</p>
+
+       <p>Under the Berne Convention, which most countries have
+       signed, anything written down is automatically
+       copyrighted. This includes programs. Therefore, if you want a
+       program you have written to be in the public domain, you must
+       take some legal steps to disclaim the copyright on it;
+       otherwise, the program is copyrighted.</p>
+
+<h3 id="CopyleftedSoftware">Copylefted software</h3>
+
+       <p>Copylefted software is free software whose distribution
+       terms ensure that all copies of all versions carry more or
+       less the same distribution terms.  This means, for instance,
+       that copyleft licenses generally disallow others to add
+       additional requirements to the software (though a limited set
+       of safe added requirements can be allowed) and require making
+       source code 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&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">Noncopylefted free software</h3>
+
+       <p>Noncopylefted free software comes from the author with
+       permission to redistribute and modify, and also to add additional
+       restrictions to it.</p>
+
+       <p>If a program is free but not copylefted, then some copies
+       or modified versions may not be free at all. A software
+       company can compile the program, with or without
+       modifications, and distribute the executable file as
+       a <a href="#ProprietarySoftware">proprietary</a> software
+       product.</p>
+
+       <p>The <a href="http://www.x.org";>X Window System</a>
+       illustrates this. The X Consortium releases X11 with
+       distribution terms that make it noncopylefted free
+       software. If you wish, you can get a copy which has those
+       distribution terms and is free. However, there are nonfree
+       versions as well, and there are (or at least were) popular
+       workstations and PC graphics boards for which nonfree
+       versions are the only ones that work. If you are using this
+       hardware, X11 is not free software for
+       you. <a href="/philosophy/x.html">The developers of X11 even
+       made X11 nonfree</a> for a while; they were able to do this
+       because others had contributed their code under the same
+       noncopyleft license.</p>
+
+<h3 id="LaxPermissiveLicensedSoftware">Lax permissive licensed software</h3>
+
+       <p>Lax permissive licenses include the X11 license and the
+       <a href="bsd.html">two BSD licenses</a>.  These licenses permit
+       almost any use of the code, including distributing proprietary
+       binaries with or without changing the source code.</p>
+
+<h3 id="GPL-CoveredSoftware">GPL-covered software</h3>
+
+       <p>The <a href="/copyleft/gpl.html">GNU GPL (General Public
+       License)</a> is one specific set of distribution terms for
+       copylefting a program. The GNU Project uses it as the distribution
+       terms for most GNU software.</p>
+
+       <p>To equate free software with GPL-covered software is therefore
+       an error.</p>
+
+<h3 id="TheGNUsystem">The GNU operating system</h3>
+
+       <p>The <a href="/gnu/gnu-history.html">GNU operating system</a> is the
+       Unix-like operating system, which is entirely free software, that
+       we in the GNU Project have developed since 1984.</p>
+
+       <p>A Unix-like operating system consists of many programs. The GNU
+       system includes all the GNU software, as well as many other
+       packages such as the X Window System and TeX which are not GNU
+       software.</p>
+
+       <p>The first test release of the complete GNU system was in
+       1996.  This includes the GNU Hurd, our kernel, developed since
+       1990. In 2001 the GNU system (including the GNU Hurd) began
+       working fairly reliably, but the Hurd still lacks some
+       important features, so it is not widely used. Meanwhile,
+       the <a href= "/gnu/linux-and-gnu.html">GNU/Linux system</a>,
+       an offshoot of the GNU operating system which uses Linux as
+       the kernel instead of the GNU Hurd, has been a great success
+       since the 90s.</p>
+
+       <p>Since the purpose of GNU is to be free, every single
+       component in the GNU operating system has to be free
+       software. They don't all have to be copylefted, however; any
+       kind of free software is legally suitable to include if it
+       helps meet technical goals. And it isn't necessary for all the
+       components to be GNU software, individually.  GNU can and does
+       include noncopylefted free software such as the X Window
+       System that were developed by other projects.</p>
+
+<h3 id="GNUprograms">GNU programs</h3>
+
+       <p>&ldquo;GNU programs&rdquo; is equivalent
+       to <a href="#GNUsoftware">GNU software.</a> A program Foo is a
+       GNU program if it is GNU software.  We also sometimes say it
+       is a &ldquo;GNU package&rdquo;.</p>
+
+<h3 id="GNUsoftware">GNU software</h3>
+
+       <p><a href="/software/software.html">GNU software</a> is
+       software that is released under the auspices of the <a href=
+       "/gnu/gnu-history.html">GNU Project</a>. If a program is GNU
+       software, we also say that it is a GNU program or a GNU
+       package.  The README or manual of a GNU package should say it
+       is one; also, the <a href="/directory">Free Software
+       Directory</a> identifies all GNU packages.</p>
+
+       <p>Most GNU software is <a href=
+       "/copyleft/copyleft.html">copylefted</a> , but not all; however,
+       all GNU software must be <a href="/philosophy/free-sw.html">free
+       software</a>.</p>
+
+       <p>Some GNU software was written by <a href=
+       "http://www.fsf.org/about/staff/";>staff</a> of
+       the <a href="http://www.fsf.org/";>Free Software
+       Foundation</a>, but most GNU software comes from many
+       <a href="/people/people.html">volunteers</a>.  (Some of these
+       volunteers are paid by companies or universities, but they are
+       volunteers for us.)  Some contributed software is copyrighted
+       by the Free Software Foundation; some is copyrighted by the
+       contributors who wrote it.</p>
+
+<h3 id="FSF-CopyrightedGNUSoftware">FSF-copyrighted GNU software</h3>
+
+        <p>The developers of GNU packages can transfer the copyright
+        to the FSF, or they can keep it.  The choice is theirs.</p>
+
+        <p>If they have transfered the copyright to the FSF, the program
+       is FSF-copyrighted GNU software, and the FSF can enforce
+       its license.  If they have kept the copyright, enforcing the license
+       is their responsibility.</p>
+
+<h3 id="non-freeSoftware">Nonfree software</h3>
+
+       <p>Nonfree software is any software that is not free.
+       Its use, redistribution or modification is prohibited, or
+       requires you to ask for permission, or is restricted so much
+       that you effectively can't do it freely.</p>
+
+<h3 id="ProprietarySoftware">Proprietary software</h3>
+
+       <p>Proprietary software is another name for nonfree software.
+       In the past we subdivided nonfree software into
+       &ldquo;semifree software&rdquo;, which could be modified and
+       redistributed noncommercially, and &ldquo; proprietary
+       software&rdquo;, which could not be.  But we have dropped that
+       distinction and now use &ldquo;proprietary software&rdquo; as
+       synonymous with nonfree software.</p>
+
+       <p>The Free Software Foundation follows the rule that we cannot
+       install any proprietary program on our computers except temporarily
+       for the specific purpose of writing a free replacement for that
+       very program. Aside from that, we feel there is no possible excuse
+       for installing a proprietary program.</p>
+
+       <p>For example, we felt justified in installing Unix on our
+       computer in the 1980s, because we were using it to write a free
+       replacement for Unix. Nowadays, since free operating systems are
+       available, the excuse is no longer applicable; we do not use any
+       nonfree operating systems, and any new computer we install
+       must run a completely free operating system.</p>
+
+       <p>We don't insist that users of GNU, or contributors to GNU, have
+       to live by this rule. It is a rule we made for ourselves. But we
+       hope you will follow it too, for your freedom's sake.</p>
+
+
+<h3 id="freeware">Freeware</h3>
+
+       <p>The term &ldquo;freeware&rdquo; has no clear accepted
+       definition, but it is commonly used for packages which permit
+       redistribution but not modification (and their source code is
+       not available). These packages are <em>not</em> free software,
+       so please don't use &ldquo;freeware&rdquo; to refer to free
+       software.</p>
+
+<h3 id="shareware">Shareware</h3>
+
+       <p>Shareware is software which comes with permission for people to
+       redistribute copies, but says that anyone who continues to use a
+       copy is <em>required</em> to pay a license fee.</p>
+
+       <p>Shareware is not free software, or even semifree. There are two
+       reasons it is not:</p>
+
+       <ul>
+       <li>For most shareware, source code is not available; thus, you
+       cannot modify the program at all.</li>
+       <li>Shareware does not come with permission to make a copy and
+       install it without paying a license fee, not even for individuals
+       engaging in nonprofit activity. (In practice, people often
+       disregard the distribution terms and do this anyway, but the terms
+       don't permit it.)</li>
+       </ul>
+
+<h3 id="PrivateSoftware">Private software</h3>
+       <p>Private or custom software is software developed for one user
+       (typically an organization or company). That user keeps it and uses
+       it, and does not release it to the public either as source code or
+       as binaries.</p>
+       <p>A private program is free software in a trivial sense if its
+       sole user has full rights to it.</p>
+       <p>In general we do not believe it is wrong to develop a program
+       and not release it. There are occasions when a program is so useful
+       that withholding it from release is treating humanity badly.
+       However, most programs are not that important, so not releasing them
+       is not particularly harmful. Thus, there is no conflict between the
+       development of private or custom software and the principles of the
+       free software movement.</p>
+       <p>Nearly all employment for programmers is in development of
+       custom software; therefore most programming jobs are, or could be,
+       done in a way compatible with the free software movement.</p>
+
+<h3 id="commercialSoftware">Commercial software</h3>
+
+       <p>Commercial software is software being developed by a
+       business which aims to make money from the use of the
+       software. &ldquo;Commercial&rdquo; and
+       &ldquo;proprietary&rdquo; are not the same thing! Most
+       commercial software
+       is <a href="#ProprietarySoftware">proprietary</a>, but there
+       is commercial free software, and there is noncommercial
+       nonfree software.</p>
+
+       <p>For example, GNU Ada is developed by a company.  It is always
+       distributed under the terms of the GNU GPL, and every copy is
+       free software; but its developers sell support contracts. When
+       their salesmen speak to prospective customers, sometimes the
+       customers say, &ldquo;We would feel safer with a commercial
+       compiler.&rdquo; The salesmen reply, &ldquo;GNU
+       Ada <em>is</em> a commercial compiler; it happens to be free
+       software.&rdquo;</p>
+       <p>For the GNU Project, the emphasis is in the other order:
+       the important thing is that GNU Ada is free software; whether
+       it is commercial is just a detail. However, the additional
+       development of GNU Ada that results from its being commercial
+       is definitely beneficial.</p>
+       <p>Please help spread the awareness that free commercial
+       software is possible. You can do this by making an effort not
+       to say &ldquo;commercial&rdquo; when you mean
+       &ldquo;proprietary.&rdquo;</p>
+
+<!-- If needed, change the copyright block at the bottom. In general, -->
+<!-- all pages on the GNU web server should have the section about    -->
+<!-- verbatim copying.  Please do NOT remove this without talking     -->
+<!-- with the webmasters first. --> 
+<!-- Please make sure the copyright date is consistent with the document -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<p>
+Please send FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are
+also <a href="/contact/">other ways to contact</a> the FSF.
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p>
+
+<p>
+Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.
+</p>
+
+<p>
+Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010 Free
+Software Foundation, Inc.
+</p>
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2011/11/15 01:34:24 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: philosophy/po/categories.pl-en.html
===================================================================
RCS file: philosophy/po/categories.pl-en.html
diff -N philosophy/po/categories.pl-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/po/categories.pl-en.html 15 Nov 2011 01:34:25 -0000      1.1
@@ -0,0 +1,430 @@
+<!--#include virtual="/server/header.html" -->
+<title>Categories of Free and Nonfree Software - GNU Project - Free Software 
Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/po/categories.translist" -->
+<h2>Categories of free and nonfree software</h2>
+
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
+       Words which You Might Want to Avoid</a>.</p>
+
+<!-- GNUN: localize URL /philosophy/category.png -->
+<p id="diagram" class="c">
+<img src="/philosophy/category.png" alt="" />
+</p>
+
+      <p>This diagram, originally by Chao-Kuei and updated by several
+      others since, explains the different categories of software. It's
+      available as a <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">Free software</h3>
+
+       <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>If a program is free, then it can potentially be included
+       in a free operating system such as GNU, or free versions of
+       the <a href="/gnu/linux-and-gnu.html">GNU/Linux
+       system</a>.</p>
+
+       <p>There are many different ways to make a program free&mdash;many
+       questions of detail, which could be decided in more than one way
+       and still make the program free. Some of the possible variations
+       are described below. For information on specific free software
+       licenses, see the <a href="/licenses/license-list.html">license
+       list</a> page.</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>Because of this potential confusion, when a software company
+       says its product is free software, always check the actual
+       distribution terms to see whether users really have all the
+       freedoms that free software implies. Sometimes it really is free
+       software; sometimes it isn't.</p>
+
+       <p>Many languages have two separate words for
+       &ldquo;free&rdquo; as in freedom and &ldquo;free&rdquo; as in
+       zero price. For example, French has &ldquo;libre&rdquo; and
+       &ldquo;gratuit&rdquo;. Not so English; there is a word
+       &ldquo;gratis&rdquo; that refers unambiguously to price, but
+       no common adjective that refers unambiguously to freedom. So
+       if you are speaking another language, we suggest you translate
+       &ldquo;free&rdquo; into your language to make it clearer. See
+       our list of <a href= "/philosophy/fs-translations.html">
+       translations of the term &ldquo;free software&rdquo;</a> into
+       various other languages.</p>
+
+       <p>Free software is often <a href="/software/reliability.html">more
+       reliable</a> than nonfree software.</p>
+
+<h3 id="OpenSource">Open source software</h3>
+
+       <p>
+       The term &ldquo;open source&rdquo; software is used by some
+       people to mean more or less the same category as free
+       software. It is not exactly the same class of software: they
+       accept some licenses that we consider too restrictive, and
+       there are free software licenses they have not
+       accepted. However, the differences in extension of the
+       category are small: nearly all free software is open source,
+       and nearly all open source software is free.</p>
+       <p>We prefer the term &ldquo;<a href=
+       "/philosophy/open-source-misses-the-point.html">free
+       software</a>&rdquo; because it refers to
+       freedom&mdash;something that the term &ldquo;open
+       source&ldquo; does not do.</p>
+
+<h3 id="PublicDomainSoftware">Public domain
+       software</h3>
+
+       <p>Public domain software is software that is not copyrighted. If
+       the source code is in the public domain, that is a special case of
+       <a href="#Non-CopyleftedFreeSoftware">noncopylefted free
+       software</a>, which means that some copies or modified versions
+       may not be free at all.</p>
+
+       <p>In some cases, an executable program can be in the public domain
+       but the source code is not available. This is not free software,
+       because free software requires accessibility of source code.
+       Meanwhile, most free software is not in the public domain; it is
+       copyrighted, and the copyright holders have legally given
+       permission for everyone to use it in freedom, using a free software
+       license.</p>
+
+       <p>Sometimes people use the term &ldquo;public domain&rdquo;
+       in a loose fashion to
+       mean <a href="#FreeSoftware">&ldquo;free&rdquo;</a> or
+       &ldquo;available gratis.&rdquo; However, &ldquo;public
+       domain&rdquo; is a legal term and means, precisely, &ldquo;not
+       copyrighted&rdquo;. For clarity, we recommend using
+       &ldquo;public domain&rdquo; for that meaning only, and using
+       other terms to convey the other meanings.</p>
+
+       <p>Under the Berne Convention, which most countries have
+       signed, anything written down is automatically
+       copyrighted. This includes programs. Therefore, if you want a
+       program you have written to be in the public domain, you must
+       take some legal steps to disclaim the copyright on it;
+       otherwise, the program is copyrighted.</p>
+
+<h3 id="CopyleftedSoftware">Copylefted software</h3>
+
+       <p>Copylefted software is free software whose distribution
+       terms ensure that all copies of all versions carry more or
+       less the same distribution terms.  This means, for instance,
+       that copyleft licenses generally disallow others to add
+       additional requirements to the software (though a limited set
+       of safe added requirements can be allowed) and require making
+       source code 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&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">Noncopylefted free software</h3>
+
+       <p>Noncopylefted free software comes from the author with
+       permission to redistribute and modify, and also to add additional
+       restrictions to it.</p>
+
+       <p>If a program is free but not copylefted, then some copies
+       or modified versions may not be free at all. A software
+       company can compile the program, with or without
+       modifications, and distribute the executable file as
+       a <a href="#ProprietarySoftware">proprietary</a> software
+       product.</p>
+
+       <p>The <a href="http://www.x.org";>X Window System</a>
+       illustrates this. The X Consortium releases X11 with
+       distribution terms that make it noncopylefted free
+       software. If you wish, you can get a copy which has those
+       distribution terms and is free. However, there are nonfree
+       versions as well, and there are (or at least were) popular
+       workstations and PC graphics boards for which nonfree
+       versions are the only ones that work. If you are using this
+       hardware, X11 is not free software for
+       you. <a href="/philosophy/x.html">The developers of X11 even
+       made X11 nonfree</a> for a while; they were able to do this
+       because others had contributed their code under the same
+       noncopyleft license.</p>
+
+<h3 id="LaxPermissiveLicensedSoftware">Lax permissive licensed software</h3>
+
+       <p>Lax permissive licenses include the X11 license and the
+       <a href="bsd.html">two BSD licenses</a>.  These licenses permit
+       almost any use of the code, including distributing proprietary
+       binaries with or without changing the source code.</p>
+
+<h3 id="GPL-CoveredSoftware">GPL-covered software</h3>
+
+       <p>The <a href="/copyleft/gpl.html">GNU GPL (General Public
+       License)</a> is one specific set of distribution terms for
+       copylefting a program. The GNU Project uses it as the distribution
+       terms for most GNU software.</p>
+
+       <p>To equate free software with GPL-covered software is therefore
+       an error.</p>
+
+<h3 id="TheGNUsystem">The GNU operating system</h3>
+
+       <p>The <a href="/gnu/gnu-history.html">GNU operating system</a> is the
+       Unix-like operating system, which is entirely free software, that
+       we in the GNU Project have developed since 1984.</p>
+
+       <p>A Unix-like operating system consists of many programs. The GNU
+       system includes all the GNU software, as well as many other
+       packages such as the X Window System and TeX which are not GNU
+       software.</p>
+
+       <p>The first test release of the complete GNU system was in
+       1996.  This includes the GNU Hurd, our kernel, developed since
+       1990. In 2001 the GNU system (including the GNU Hurd) began
+       working fairly reliably, but the Hurd still lacks some
+       important features, so it is not widely used. Meanwhile,
+       the <a href= "/gnu/linux-and-gnu.html">GNU/Linux system</a>,
+       an offshoot of the GNU operating system which uses Linux as
+       the kernel instead of the GNU Hurd, has been a great success
+       since the 90s.</p>
+
+       <p>Since the purpose of GNU is to be free, every single
+       component in the GNU operating system has to be free
+       software. They don't all have to be copylefted, however; any
+       kind of free software is legally suitable to include if it
+       helps meet technical goals. And it isn't necessary for all the
+       components to be GNU software, individually.  GNU can and does
+       include noncopylefted free software such as the X Window
+       System that were developed by other projects.</p>
+
+<h3 id="GNUprograms">GNU programs</h3>
+
+       <p>&ldquo;GNU programs&rdquo; is equivalent
+       to <a href="#GNUsoftware">GNU software.</a> A program Foo is a
+       GNU program if it is GNU software.  We also sometimes say it
+       is a &ldquo;GNU package&rdquo;.</p>
+
+<h3 id="GNUsoftware">GNU software</h3>
+
+       <p><a href="/software/software.html">GNU software</a> is
+       software that is released under the auspices of the <a href=
+       "/gnu/gnu-history.html">GNU Project</a>. If a program is GNU
+       software, we also say that it is a GNU program or a GNU
+       package.  The README or manual of a GNU package should say it
+       is one; also, the <a href="/directory">Free Software
+       Directory</a> identifies all GNU packages.</p>
+
+       <p>Most GNU software is <a href=
+       "/copyleft/copyleft.html">copylefted</a> , but not all; however,
+       all GNU software must be <a href="/philosophy/free-sw.html">free
+       software</a>.</p>
+
+       <p>Some GNU software was written by <a href=
+       "http://www.fsf.org/about/staff/";>staff</a> of
+       the <a href="http://www.fsf.org/";>Free Software
+       Foundation</a>, but most GNU software comes from many
+       <a href="/people/people.html">volunteers</a>.  (Some of these
+       volunteers are paid by companies or universities, but they are
+       volunteers for us.)  Some contributed software is copyrighted
+       by the Free Software Foundation; some is copyrighted by the
+       contributors who wrote it.</p>
+
+<h3 id="FSF-CopyrightedGNUSoftware">FSF-copyrighted GNU software</h3>
+
+        <p>The developers of GNU packages can transfer the copyright
+        to the FSF, or they can keep it.  The choice is theirs.</p>
+
+        <p>If they have transfered the copyright to the FSF, the program
+       is FSF-copyrighted GNU software, and the FSF can enforce
+       its license.  If they have kept the copyright, enforcing the license
+       is their responsibility.</p>
+
+<h3 id="non-freeSoftware">Nonfree software</h3>
+
+       <p>Nonfree software is any software that is not free.
+       Its use, redistribution or modification is prohibited, or
+       requires you to ask for permission, or is restricted so much
+       that you effectively can't do it freely.</p>
+
+<h3 id="ProprietarySoftware">Proprietary software</h3>
+
+       <p>Proprietary software is another name for nonfree software.
+       In the past we subdivided nonfree software into
+       &ldquo;semifree software&rdquo;, which could be modified and
+       redistributed noncommercially, and &ldquo; proprietary
+       software&rdquo;, which could not be.  But we have dropped that
+       distinction and now use &ldquo;proprietary software&rdquo; as
+       synonymous with nonfree software.</p>
+
+       <p>The Free Software Foundation follows the rule that we cannot
+       install any proprietary program on our computers except temporarily
+       for the specific purpose of writing a free replacement for that
+       very program. Aside from that, we feel there is no possible excuse
+       for installing a proprietary program.</p>
+
+       <p>For example, we felt justified in installing Unix on our
+       computer in the 1980s, because we were using it to write a free
+       replacement for Unix. Nowadays, since free operating systems are
+       available, the excuse is no longer applicable; we do not use any
+       nonfree operating systems, and any new computer we install
+       must run a completely free operating system.</p>
+
+       <p>We don't insist that users of GNU, or contributors to GNU, have
+       to live by this rule. It is a rule we made for ourselves. But we
+       hope you will follow it too, for your freedom's sake.</p>
+
+
+<h3 id="freeware">Freeware</h3>
+
+       <p>The term &ldquo;freeware&rdquo; has no clear accepted
+       definition, but it is commonly used for packages which permit
+       redistribution but not modification (and their source code is
+       not available). These packages are <em>not</em> free software,
+       so please don't use &ldquo;freeware&rdquo; to refer to free
+       software.</p>
+
+<h3 id="shareware">Shareware</h3>
+
+       <p>Shareware is software which comes with permission for people to
+       redistribute copies, but says that anyone who continues to use a
+       copy is <em>required</em> to pay a license fee.</p>
+
+       <p>Shareware is not free software, or even semifree. There are two
+       reasons it is not:</p>
+
+       <ul>
+       <li>For most shareware, source code is not available; thus, you
+       cannot modify the program at all.</li>
+       <li>Shareware does not come with permission to make a copy and
+       install it without paying a license fee, not even for individuals
+       engaging in nonprofit activity. (In practice, people often
+       disregard the distribution terms and do this anyway, but the terms
+       don't permit it.)</li>
+       </ul>
+
+<h3 id="PrivateSoftware">Private software</h3>
+       <p>Private or custom software is software developed for one user
+       (typically an organization or company). That user keeps it and uses
+       it, and does not release it to the public either as source code or
+       as binaries.</p>
+       <p>A private program is free software in a trivial sense if its
+       sole user has full rights to it.</p>
+       <p>In general we do not believe it is wrong to develop a program
+       and not release it. There are occasions when a program is so useful
+       that withholding it from release is treating humanity badly.
+       However, most programs are not that important, so not releasing them
+       is not particularly harmful. Thus, there is no conflict between the
+       development of private or custom software and the principles of the
+       free software movement.</p>
+       <p>Nearly all employment for programmers is in development of
+       custom software; therefore most programming jobs are, or could be,
+       done in a way compatible with the free software movement.</p>
+
+<h3 id="commercialSoftware">Commercial software</h3>
+
+       <p>Commercial software is software being developed by a
+       business which aims to make money from the use of the
+       software. &ldquo;Commercial&rdquo; and
+       &ldquo;proprietary&rdquo; are not the same thing! Most
+       commercial software
+       is <a href="#ProprietarySoftware">proprietary</a>, but there
+       is commercial free software, and there is noncommercial
+       nonfree software.</p>
+
+       <p>For example, GNU Ada is developed by a company.  It is always
+       distributed under the terms of the GNU GPL, and every copy is
+       free software; but its developers sell support contracts. When
+       their salesmen speak to prospective customers, sometimes the
+       customers say, &ldquo;We would feel safer with a commercial
+       compiler.&rdquo; The salesmen reply, &ldquo;GNU
+       Ada <em>is</em> a commercial compiler; it happens to be free
+       software.&rdquo;</p>
+       <p>For the GNU Project, the emphasis is in the other order:
+       the important thing is that GNU Ada is free software; whether
+       it is commercial is just a detail. However, the additional
+       development of GNU Ada that results from its being commercial
+       is definitely beneficial.</p>
+       <p>Please help spread the awareness that free commercial
+       software is possible. You can do this by making an effort not
+       to say &ldquo;commercial&rdquo; when you mean
+       &ldquo;proprietary.&rdquo;</p>
+
+<!-- If needed, change the copyright block at the bottom. In general, -->
+<!-- all pages on the GNU web server should have the section about    -->
+<!-- verbatim copying.  Please do NOT remove this without talking     -->
+<!-- with the webmasters first. --> 
+<!-- Please make sure the copyright date is consistent with the document -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<p>
+Please send FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are
+also <a href="/contact/">other ways to contact</a> the FSF.
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p>
+
+<p>
+Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.
+</p>
+
+<p>
+Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010 Free
+Software Foundation, Inc.
+</p>
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2011/11/15 01:34:25 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: philosophy/po/categories.ru-en.html
===================================================================
RCS file: philosophy/po/categories.ru-en.html
diff -N philosophy/po/categories.ru-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/po/categories.ru-en.html 15 Nov 2011 01:34:25 -0000      1.1
@@ -0,0 +1,430 @@
+<!--#include virtual="/server/header.html" -->
+<title>Categories of Free and Nonfree Software - GNU Project - Free Software 
Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/po/categories.translist" -->
+<h2>Categories of free and nonfree software</h2>
+
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
+       Words which You Might Want to Avoid</a>.</p>
+
+<!-- GNUN: localize URL /philosophy/category.png -->
+<p id="diagram" class="c">
+<img src="/philosophy/category.png" alt="" />
+</p>
+
+      <p>This diagram, originally by Chao-Kuei and updated by several
+      others since, explains the different categories of software. It's
+      available as a <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">Free software</h3>
+
+       <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>If a program is free, then it can potentially be included
+       in a free operating system such as GNU, or free versions of
+       the <a href="/gnu/linux-and-gnu.html">GNU/Linux
+       system</a>.</p>
+
+       <p>There are many different ways to make a program free&mdash;many
+       questions of detail, which could be decided in more than one way
+       and still make the program free. Some of the possible variations
+       are described below. For information on specific free software
+       licenses, see the <a href="/licenses/license-list.html">license
+       list</a> page.</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>Because of this potential confusion, when a software company
+       says its product is free software, always check the actual
+       distribution terms to see whether users really have all the
+       freedoms that free software implies. Sometimes it really is free
+       software; sometimes it isn't.</p>
+
+       <p>Many languages have two separate words for
+       &ldquo;free&rdquo; as in freedom and &ldquo;free&rdquo; as in
+       zero price. For example, French has &ldquo;libre&rdquo; and
+       &ldquo;gratuit&rdquo;. Not so English; there is a word
+       &ldquo;gratis&rdquo; that refers unambiguously to price, but
+       no common adjective that refers unambiguously to freedom. So
+       if you are speaking another language, we suggest you translate
+       &ldquo;free&rdquo; into your language to make it clearer. See
+       our list of <a href= "/philosophy/fs-translations.html">
+       translations of the term &ldquo;free software&rdquo;</a> into
+       various other languages.</p>
+
+       <p>Free software is often <a href="/software/reliability.html">more
+       reliable</a> than nonfree software.</p>
+
+<h3 id="OpenSource">Open source software</h3>
+
+       <p>
+       The term &ldquo;open source&rdquo; software is used by some
+       people to mean more or less the same category as free
+       software. It is not exactly the same class of software: they
+       accept some licenses that we consider too restrictive, and
+       there are free software licenses they have not
+       accepted. However, the differences in extension of the
+       category are small: nearly all free software is open source,
+       and nearly all open source software is free.</p>
+       <p>We prefer the term &ldquo;<a href=
+       "/philosophy/open-source-misses-the-point.html">free
+       software</a>&rdquo; because it refers to
+       freedom&mdash;something that the term &ldquo;open
+       source&ldquo; does not do.</p>
+
+<h3 id="PublicDomainSoftware">Public domain
+       software</h3>
+
+       <p>Public domain software is software that is not copyrighted. If
+       the source code is in the public domain, that is a special case of
+       <a href="#Non-CopyleftedFreeSoftware">noncopylefted free
+       software</a>, which means that some copies or modified versions
+       may not be free at all.</p>
+
+       <p>In some cases, an executable program can be in the public domain
+       but the source code is not available. This is not free software,
+       because free software requires accessibility of source code.
+       Meanwhile, most free software is not in the public domain; it is
+       copyrighted, and the copyright holders have legally given
+       permission for everyone to use it in freedom, using a free software
+       license.</p>
+
+       <p>Sometimes people use the term &ldquo;public domain&rdquo;
+       in a loose fashion to
+       mean <a href="#FreeSoftware">&ldquo;free&rdquo;</a> or
+       &ldquo;available gratis.&rdquo; However, &ldquo;public
+       domain&rdquo; is a legal term and means, precisely, &ldquo;not
+       copyrighted&rdquo;. For clarity, we recommend using
+       &ldquo;public domain&rdquo; for that meaning only, and using
+       other terms to convey the other meanings.</p>
+
+       <p>Under the Berne Convention, which most countries have
+       signed, anything written down is automatically
+       copyrighted. This includes programs. Therefore, if you want a
+       program you have written to be in the public domain, you must
+       take some legal steps to disclaim the copyright on it;
+       otherwise, the program is copyrighted.</p>
+
+<h3 id="CopyleftedSoftware">Copylefted software</h3>
+
+       <p>Copylefted software is free software whose distribution
+       terms ensure that all copies of all versions carry more or
+       less the same distribution terms.  This means, for instance,
+       that copyleft licenses generally disallow others to add
+       additional requirements to the software (though a limited set
+       of safe added requirements can be allowed) and require making
+       source code 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&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">Noncopylefted free software</h3>
+
+       <p>Noncopylefted free software comes from the author with
+       permission to redistribute and modify, and also to add additional
+       restrictions to it.</p>
+
+       <p>If a program is free but not copylefted, then some copies
+       or modified versions may not be free at all. A software
+       company can compile the program, with or without
+       modifications, and distribute the executable file as
+       a <a href="#ProprietarySoftware">proprietary</a> software
+       product.</p>
+
+       <p>The <a href="http://www.x.org";>X Window System</a>
+       illustrates this. The X Consortium releases X11 with
+       distribution terms that make it noncopylefted free
+       software. If you wish, you can get a copy which has those
+       distribution terms and is free. However, there are nonfree
+       versions as well, and there are (or at least were) popular
+       workstations and PC graphics boards for which nonfree
+       versions are the only ones that work. If you are using this
+       hardware, X11 is not free software for
+       you. <a href="/philosophy/x.html">The developers of X11 even
+       made X11 nonfree</a> for a while; they were able to do this
+       because others had contributed their code under the same
+       noncopyleft license.</p>
+
+<h3 id="LaxPermissiveLicensedSoftware">Lax permissive licensed software</h3>
+
+       <p>Lax permissive licenses include the X11 license and the
+       <a href="bsd.html">two BSD licenses</a>.  These licenses permit
+       almost any use of the code, including distributing proprietary
+       binaries with or without changing the source code.</p>
+
+<h3 id="GPL-CoveredSoftware">GPL-covered software</h3>
+
+       <p>The <a href="/copyleft/gpl.html">GNU GPL (General Public
+       License)</a> is one specific set of distribution terms for
+       copylefting a program. The GNU Project uses it as the distribution
+       terms for most GNU software.</p>
+
+       <p>To equate free software with GPL-covered software is therefore
+       an error.</p>
+
+<h3 id="TheGNUsystem">The GNU operating system</h3>
+
+       <p>The <a href="/gnu/gnu-history.html">GNU operating system</a> is the
+       Unix-like operating system, which is entirely free software, that
+       we in the GNU Project have developed since 1984.</p>
+
+       <p>A Unix-like operating system consists of many programs. The GNU
+       system includes all the GNU software, as well as many other
+       packages such as the X Window System and TeX which are not GNU
+       software.</p>
+
+       <p>The first test release of the complete GNU system was in
+       1996.  This includes the GNU Hurd, our kernel, developed since
+       1990. In 2001 the GNU system (including the GNU Hurd) began
+       working fairly reliably, but the Hurd still lacks some
+       important features, so it is not widely used. Meanwhile,
+       the <a href= "/gnu/linux-and-gnu.html">GNU/Linux system</a>,
+       an offshoot of the GNU operating system which uses Linux as
+       the kernel instead of the GNU Hurd, has been a great success
+       since the 90s.</p>
+
+       <p>Since the purpose of GNU is to be free, every single
+       component in the GNU operating system has to be free
+       software. They don't all have to be copylefted, however; any
+       kind of free software is legally suitable to include if it
+       helps meet technical goals. And it isn't necessary for all the
+       components to be GNU software, individually.  GNU can and does
+       include noncopylefted free software such as the X Window
+       System that were developed by other projects.</p>
+
+<h3 id="GNUprograms">GNU programs</h3>
+
+       <p>&ldquo;GNU programs&rdquo; is equivalent
+       to <a href="#GNUsoftware">GNU software.</a> A program Foo is a
+       GNU program if it is GNU software.  We also sometimes say it
+       is a &ldquo;GNU package&rdquo;.</p>
+
+<h3 id="GNUsoftware">GNU software</h3>
+
+       <p><a href="/software/software.html">GNU software</a> is
+       software that is released under the auspices of the <a href=
+       "/gnu/gnu-history.html">GNU Project</a>. If a program is GNU
+       software, we also say that it is a GNU program or a GNU
+       package.  The README or manual of a GNU package should say it
+       is one; also, the <a href="/directory">Free Software
+       Directory</a> identifies all GNU packages.</p>
+
+       <p>Most GNU software is <a href=
+       "/copyleft/copyleft.html">copylefted</a> , but not all; however,
+       all GNU software must be <a href="/philosophy/free-sw.html">free
+       software</a>.</p>
+
+       <p>Some GNU software was written by <a href=
+       "http://www.fsf.org/about/staff/";>staff</a> of
+       the <a href="http://www.fsf.org/";>Free Software
+       Foundation</a>, but most GNU software comes from many
+       <a href="/people/people.html">volunteers</a>.  (Some of these
+       volunteers are paid by companies or universities, but they are
+       volunteers for us.)  Some contributed software is copyrighted
+       by the Free Software Foundation; some is copyrighted by the
+       contributors who wrote it.</p>
+
+<h3 id="FSF-CopyrightedGNUSoftware">FSF-copyrighted GNU software</h3>
+
+        <p>The developers of GNU packages can transfer the copyright
+        to the FSF, or they can keep it.  The choice is theirs.</p>
+
+        <p>If they have transfered the copyright to the FSF, the program
+       is FSF-copyrighted GNU software, and the FSF can enforce
+       its license.  If they have kept the copyright, enforcing the license
+       is their responsibility.</p>
+
+<h3 id="non-freeSoftware">Nonfree software</h3>
+
+       <p>Nonfree software is any software that is not free.
+       Its use, redistribution or modification is prohibited, or
+       requires you to ask for permission, or is restricted so much
+       that you effectively can't do it freely.</p>
+
+<h3 id="ProprietarySoftware">Proprietary software</h3>
+
+       <p>Proprietary software is another name for nonfree software.
+       In the past we subdivided nonfree software into
+       &ldquo;semifree software&rdquo;, which could be modified and
+       redistributed noncommercially, and &ldquo; proprietary
+       software&rdquo;, which could not be.  But we have dropped that
+       distinction and now use &ldquo;proprietary software&rdquo; as
+       synonymous with nonfree software.</p>
+
+       <p>The Free Software Foundation follows the rule that we cannot
+       install any proprietary program on our computers except temporarily
+       for the specific purpose of writing a free replacement for that
+       very program. Aside from that, we feel there is no possible excuse
+       for installing a proprietary program.</p>
+
+       <p>For example, we felt justified in installing Unix on our
+       computer in the 1980s, because we were using it to write a free
+       replacement for Unix. Nowadays, since free operating systems are
+       available, the excuse is no longer applicable; we do not use any
+       nonfree operating systems, and any new computer we install
+       must run a completely free operating system.</p>
+
+       <p>We don't insist that users of GNU, or contributors to GNU, have
+       to live by this rule. It is a rule we made for ourselves. But we
+       hope you will follow it too, for your freedom's sake.</p>
+
+
+<h3 id="freeware">Freeware</h3>
+
+       <p>The term &ldquo;freeware&rdquo; has no clear accepted
+       definition, but it is commonly used for packages which permit
+       redistribution but not modification (and their source code is
+       not available). These packages are <em>not</em> free software,
+       so please don't use &ldquo;freeware&rdquo; to refer to free
+       software.</p>
+
+<h3 id="shareware">Shareware</h3>
+
+       <p>Shareware is software which comes with permission for people to
+       redistribute copies, but says that anyone who continues to use a
+       copy is <em>required</em> to pay a license fee.</p>
+
+       <p>Shareware is not free software, or even semifree. There are two
+       reasons it is not:</p>
+
+       <ul>
+       <li>For most shareware, source code is not available; thus, you
+       cannot modify the program at all.</li>
+       <li>Shareware does not come with permission to make a copy and
+       install it without paying a license fee, not even for individuals
+       engaging in nonprofit activity. (In practice, people often
+       disregard the distribution terms and do this anyway, but the terms
+       don't permit it.)</li>
+       </ul>
+
+<h3 id="PrivateSoftware">Private software</h3>
+       <p>Private or custom software is software developed for one user
+       (typically an organization or company). That user keeps it and uses
+       it, and does not release it to the public either as source code or
+       as binaries.</p>
+       <p>A private program is free software in a trivial sense if its
+       sole user has full rights to it.</p>
+       <p>In general we do not believe it is wrong to develop a program
+       and not release it. There are occasions when a program is so useful
+       that withholding it from release is treating humanity badly.
+       However, most programs are not that important, so not releasing them
+       is not particularly harmful. Thus, there is no conflict between the
+       development of private or custom software and the principles of the
+       free software movement.</p>
+       <p>Nearly all employment for programmers is in development of
+       custom software; therefore most programming jobs are, or could be,
+       done in a way compatible with the free software movement.</p>
+
+<h3 id="commercialSoftware">Commercial software</h3>
+
+       <p>Commercial software is software being developed by a
+       business which aims to make money from the use of the
+       software. &ldquo;Commercial&rdquo; and
+       &ldquo;proprietary&rdquo; are not the same thing! Most
+       commercial software
+       is <a href="#ProprietarySoftware">proprietary</a>, but there
+       is commercial free software, and there is noncommercial
+       nonfree software.</p>
+
+       <p>For example, GNU Ada is developed by a company.  It is always
+       distributed under the terms of the GNU GPL, and every copy is
+       free software; but its developers sell support contracts. When
+       their salesmen speak to prospective customers, sometimes the
+       customers say, &ldquo;We would feel safer with a commercial
+       compiler.&rdquo; The salesmen reply, &ldquo;GNU
+       Ada <em>is</em> a commercial compiler; it happens to be free
+       software.&rdquo;</p>
+       <p>For the GNU Project, the emphasis is in the other order:
+       the important thing is that GNU Ada is free software; whether
+       it is commercial is just a detail. However, the additional
+       development of GNU Ada that results from its being commercial
+       is definitely beneficial.</p>
+       <p>Please help spread the awareness that free commercial
+       software is possible. You can do this by making an effort not
+       to say &ldquo;commercial&rdquo; when you mean
+       &ldquo;proprietary.&rdquo;</p>
+
+<!-- If needed, change the copyright block at the bottom. In general, -->
+<!-- all pages on the GNU web server should have the section about    -->
+<!-- verbatim copying.  Please do NOT remove this without talking     -->
+<!-- with the webmasters first. --> 
+<!-- Please make sure the copyright date is consistent with the document -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<p>
+Please send FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are
+also <a href="/contact/">other ways to contact</a> the FSF.
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p>
+
+<p>
+Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.
+</p>
+
+<p>
+Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010 Free
+Software Foundation, Inc.
+</p>
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2011/11/15 01:34:25 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>



reply via email to

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