[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy categories.ca.html keep-control-...
|
From: |
GNUN |
|
Subject: |
www/philosophy categories.ca.html keep-control-... |
|
Date: |
Tue, 31 Jul 2012 00:27:47 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 12/07/31 00:27:47
Modified files:
philosophy : categories.ca.html
keep-control-of-your-computing.de.html
microsoft.de.html
philosophy/po : keep-control-of-your-computing.de-en.html
keep-control-of-your-computing.de.po
microsoft.de-en.html microsoft.de.po
Added files:
philosophy/po : categories.ca-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.ca.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/keep-control-of-your-computing.de.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/microsoft.de.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/keep-control-of-your-computing.de-en.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/keep-control-of-your-computing.de.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft.de-en.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft.de.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ca-diff.html?cvsroot=www&rev=1.1
Patches:
Index: categories.ca.html
===================================================================
RCS file: /web/www/www/philosophy/categories.ca.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- categories.ca.html 2 Feb 2012 02:11:35 -0000 1.25
+++ categories.ca.html 31 Jul 2012 00:27:18 -0000 1.26
@@ -6,6 +6,12 @@
Foundation (FSF)</title>
<!--#include virtual="/server/banner.ca.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/philosophy/po/categories.ca.po";>
+ http://www.gnu.org/philosophy/po/categories.ca.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/categories.html" -->
+ <!--#set var="DIFF_FILE" value="/philosophy/po/categories.ca-diff.html" -->
+ <!--#include virtual="/server/outdated.ca.html" -->
<!--#include virtual="/philosophy/po/categories.translist" -->
<h2>Categories de programari lliure i no lliure</h2>
@@ -435,7 +441,7 @@
<!-- timestamp start -->
Updated:
-$Date: 2012/02/02 02:11:35 $
+$Date: 2012/07/31 00:27:18 $
<!-- timestamp end -->
</p>
Index: keep-control-of-your-computing.de.html
===================================================================
RCS file: /web/www/www/philosophy/keep-control-of-your-computing.de.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- keep-control-of-your-computing.de.html 3 Jul 2012 16:49:01 -0000
1.21
+++ keep-control-of-your-computing.de.html 31 Jul 2012 00:27:18 -0000
1.22
@@ -1,7 +1,7 @@
-<!-- Parent-Version: 1.57 -->
<!--#include virtual="/server/header.de.html" -->
+<!-- Parent-Version: 1.69 -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>Behalten Sie die Kontrolle über Ihre EDV, damit sie nicht Sie
kontrolliert!
@@ -43,13 +43,13 @@
Ordnung, wenn Software den Nutzer beherrscht.</p>
<p>Deshalb habe ich 1983 die Freie-Software-Bewegung ins Leben gerufen. Wir
-entschieden ein Betriebssystem und Anwendungen, die völlig frei wären, zu
-entwickeln, das den Nutzern die volle Kontrolle bewahrt. Ich nannte das
-System GNU (oft fälschlicherweise als „Linux“ bezeichnet). Wer
-auf dieses System umsteigt und nur noch Freie Software nutzt, hat die volle
-Kontrolle über seine Datenverarbeitung. Wir haben bisher nur einen kleinen
-Teil des Cyberspace befreit, aber dies ist ein wichtiges Standbein für die
-Freiheit.</p>
+entschieden ein Betriebssystem und Anwendungen zu entwickeln, die völlig
+frei wären, über die die Nutzer die Kontrolle haben würden. Ich gab diesem
+System den Namen GNU (oft fälschlicherweise als „Linux“
+bezeichnet). Wer auf dieses System umsteigt und darauf besteht, nur Freie
+Software zu nutzten, hat die volle Kontrolle über seine
+Datenverarbeitung. Wir haben bisher nur einen kleinen Teil des Cyberspaces
+befreit, aber das ist ein wichtiges Standbein für Freiheit.</p>
<p>Einige Entwicklungen im Netz bedrohen diesen Erfolg. Das erste Problem war
das Auftauchen unsichtbarer Verweise auf Webangeboten zu anderen Servern,
@@ -80,8 +80,8 @@
Muttergesellschaft aus den USA, kann das <abbr>FBI</abbr> die Daten der
Nutzer nach Lust und Laune und ohne jede gerichtliche Verfügung, aufgrund
eines äuÃerst unamerikanischen Gesetzes – beschönigend
-<em>Patriot Act</em><sup><a href="#transnote1">1</a></sup>
-benannt – auswerten.</p>
+<em>Patriot Act</em><a href="#transnote1" id="transnote1-ref"
+class="transnote">1</a> benannt – auswerten.</p>
<p>Manche Dienste bieten auch die Verarbeitung der Daten ihrer Nutzer
an. Tatsächlich bedeutet dies, dass die Server der Anbieter die vollständige
@@ -111,25 +111,36 @@
Strom schwimmen müssen, um sie zu bekommen.</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". -->
+ pages on the GNU web server should be under CC BY-ND 3.0 US.
+ Please do NOT change or remove this without talking
+ with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the document.
+ For web pages, it is ok to list just the latest year the document
+ was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
<div style="font-size: small;">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
<strong>Anmerkungen der ÃbersetzerInnen:</strong>
-<ol>
-<li id="transnote1"><acronym title="Uniting and Strengthening America by
-Providing Appropriate Tools Required to Intercept and Obstruct Terrorism Act
-of 2001" xml:lang="en" lang="en"><em>USA PATRIOT Act</em></acronym>,
-dt. etwa ‚Gesetz zur Einigung und Stärkung Amerikas durch
-Bereitstellung notwendiger Instrumente, um Terrorismus abzufangen und zu
-behindern‘, ein am 25.10.2001 verabschiedetes US-Bundesgesetz als
-direkte Reaktion auf die Terroranschläge am 11.09.2001 sowie die wenig
-später erfolgten Milzbrand-Anschläge, dass nicht nur eine Einschränkung der
-US-Bürgerrechte sondern auch Auswirkungen für USA-Reisende hat.</li>
+<ol id="transnote">
+<li id="transnote1"><a href="#transnote1-ref">1.</a> <acronym title="Uniting
+and Strengthening America by Providing Appropriate Tools Required to
+Intercept and Obstruct Terrorism Act of 2001" xml:lang="en"
+lang="en"><em>USA PATRIOT Act</em></acronym>, dt. etwa ‚Gesetz zur
+Einigung und Stärkung Amerikas durch Bereitstellung notwendiger Instrumente,
+um Terrorismus abzufangen und zu behindern‘, ein am 25.10.2001
+verabschiedetes US-Bundesgesetz als direkte Reaktion auf die Terroranschläge
+am 11.09.2001 sowie die wenig später erfolgten Milzbrand-Anschläge, dass
+nicht nur eine Einschränkung der US-Bürgerrechte sondern auch Auswirkungen
+für USA-Reisende hat.</li>
</ol></div>
</div>
@@ -139,11 +150,28 @@
<p>Bitte senden Sie Fragen zur FSF & GNU an <a
href="mailto:address@hidden";><address@hidden></a>. Sie können auch die
<a
-href="/contact/">Free Software Foundation kontaktieren</a>.<br />
-Bitte senden Sie ungültige Verweise und andere Korrekturen oder Vorschläge
-an <a href="mailto:address@hidden";><address@hidden></a>.</p>
-
-<p>Bei der Ãbersetzung dieses Werkes wurde mit gröÃter Sorgfalt
+href="/contact/">Free Software Foundation kontaktieren</a>. Ungültige
+Verweise und andere Korrekturen oder Vorschläge können an <a
+href="mailto:address@hidden";><address@hidden></a> gesendet
+werden.</p>
+
+<p>
+
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Bei der Ãbersetzung dieses Werkes wurde mit gröÃter Sorgfalt
vorgegangen. Trotzdem können Fehler nicht völlig ausgeschlossen
werden. Sollten Sie Fehler bemerken oder Vorschläge, Kommentare oder
Anfragen zu dieser Webseite haben, kontaktieren Sie bitte unser
@@ -153,7 +181,7 @@
Ãbersetzungen unserer Webseiten finden Sie in der <a
href="/server/standards/README.translations">LIESMICH für
Ãbersetzungen</a>.</p>
-<p>Copyright © 2011 Richard Stallman</p>
+<p>Copyright © 2011 Richard Stallman.</p>
<p>Dieses Werk steht unter einer <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.de";>Creative
@@ -170,7 +198,7 @@
<p><!-- timestamp start -->
Aktualisierung:
-$Date: 2012/07/03 16:49:01 $
+$Date: 2012/07/31 00:27:18 $
<!-- timestamp end -->
</p>
Index: microsoft.de.html
===================================================================
RCS file: /web/www/www/philosophy/microsoft.de.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- microsoft.de.html 3 Jul 2012 16:49:01 -0000 1.16
+++ microsoft.de.html 31 Jul 2012 00:27:18 -0000 1.17
@@ -65,7 +65,7 @@
anrichten. Für den GroÃteil der Unternehmen ist es die Hauptmotivation, sich
gegenseitig anzugreifen. Jetzt, so scheint es, werden wir ausdrücklich
anvisiert. Microsoft verwendet seine Patente direkt, um die <a
-href="http://press.redhat.com/2009/09/09/microsoft-and-patent-trolls/";>Freie-Software-Gemeinschaft
+href="http://www.redhat.com/about/news/archive/2009/9/microsoft-and-patent-trolls";>Freie-Software-Gemeinschaft
anzugreifen</a> ‑ und unsere Gemeinschaft schlägt zurück.</p>
<p>Aber Microsofts Patente sind nicht die Einzigen, die uns bedrohen (und
@@ -156,7 +156,7 @@
<!-- timestamp start -->
Aktualisierung:
-$Date: 2012/07/03 16:49:01 $
+$Date: 2012/07/31 00:27:18 $
<!-- timestamp end -->
</p>
Index: po/keep-control-of-your-computing.de-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/keep-control-of-your-computing.de-en.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/keep-control-of-your-computing.de-en.html 3 Jul 2012 16:49:24
-0000 1.16
+++ po/keep-control-of-your-computing.de-en.html 31 Jul 2012 00:27:31
-0000 1.17
@@ -1,5 +1,5 @@
-<!-- Parent-Version: 1.57 -->
<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.69 -->
<title>Keep control of your computing, so it doesn't control you!
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/banner.html" -->
@@ -39,7 +39,7 @@
to develop an operating system and applications that would be entirely
free (libre, freie), so that the users would have control over them.
I gave this system the name GNU. (You have probably heard people call
-it "Linux", but that's an error.) People who switch to this system,
+it “Linux”, but that's an error.) People who switch to this system,
and insist on using only free software, are in a position to control
their computing. We have liberated only a small part of cyberspace,
as yet, but that is a foothold for freedom.</p>
@@ -52,10 +52,10 @@
that site too, and it recorded permanently that this user had visited
certain pages.</p>
-<p>Javascript created a further problem. Initially used for harmless
+<p>JavaScript created a further problem. Initially used for harmless
things such as unusual-looking menus, its capabilities have been
extended to the point where it can do nontrivial computing. Services
-such as Google Docs install large Javascript programs into the user's
+such as Google Docs install large JavaScript programs into the user's
browser. Even though they run in your computer, you have no control
over what they do there.</p>
@@ -72,7 +72,7 @@
its merchandise, to be sold to other businesses. If the company is in
the US, or is a subsidiary of a US company, the FBI can collect this
data at whim without even a court order under an un-American US law,
-named in purest blackwhiting the "Patriot Act".</p>
+named in purest blackwhiting the “Patriot Act”.</p>
<p>Services also offer to operate on the users data. In effect, this
means that users do their computing on the servers, and the servers
@@ -80,15 +80,15 @@
<p>There is a systematic marketing campaign to drive users to entrusting
their computing and their data to companies they have absolutely no
-reason to trust. Its buzzword is "cloud computing", a term used for
+reason to trust. Its buzzword is “cloud computing”, a term used for
so many different computing structures that its only real meaning is,
-"Do it without thinking about what you're doing".</p>
+“Do it without thinking about what you're doing”.</p>
<p>There is even a product, Google ChromeOS, designed so that it can only
store data remotely, and the user must do her computing remotely.
Ironically, it is free software, a version of GNU/Linux. Users will
have access to the source code, and could change it so as to support
-local computing and local data storage — if the machine has enough
+local computing and local data storage—if the machine has enough
memory to store it, and if it permits users to install their own
versions of the software. If Android phones are any guide, most
ChromeOS devices will be designed to prevent users from doing that.</p>
@@ -98,11 +98,22 @@
does mean that you'll have to swim against the current to have them.</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". -->
+ pages on the GNU web server should be under CC BY-ND 3.0 US.
+ Please do NOT change or remove this without talking
+ with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the document.
+ For web pages, it is ok to list just the latest year the document
+ was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
@@ -110,11 +121,24 @@
<p>Please send general FSF & GNU inquiries to
<a href="mailto:address@hidden";><address@hidden></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";><address@hidden></a>.</p>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
-<p>Please see the <a
+Please see the <a
href="/server/standards/README.translations.html">Translations
README</a> for information on coordinating and submitting translations
of this article.</p>
@@ -127,7 +151,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2012/07/03 16:49:24 $
+$Date: 2012/07/31 00:27:31 $
<!-- timestamp end -->
</p>
</div>
Index: po/keep-control-of-your-computing.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/keep-control-of-your-computing.de.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po/keep-control-of-your-computing.de.po 30 Jul 2012 21:13:42 -0000
1.21
+++ po/keep-control-of-your-computing.de.po 31 Jul 2012 00:27:31 -0000
1.22
@@ -433,22 +433,5 @@
#~ "Versionen erlaubt. Sollte es wie bei Android-Telefonen sein, werden die "
#~ "meisten ChromeOS-Geräte das wohl nicht zulassen."
-#~ msgid ""
-#~ "Please send general FSF & GNU inquiries to <a
href=\"mailto:address@hidden";
-#~ "org\"><address@hidden></a>. There are also <a href=\"/contact/"
-#~ "\">other ways to contact</a> the FSF."
-#~ msgstr ""
-#~ "Bitte senden Sie Fragen zur FSF & GNU an <a
href=\"mailto:address@hidden";
-#~ "\"><address@hidden></a>. Sie können auch die <a href=\"/contact/"
-#~ "\">Free Software Foundation kontaktieren</a>."
-
-#~ msgid ""
-#~ "Please send broken links and other corrections or suggestions to <a href="
-#~ "\"mailto:address@hidden";><address@hidden></a>."
-#~ msgstr ""
-#~ "Bitte senden Sie ungültige Verweise und andere Korrekturen oder "
-#~ "Vorschläge an <a href=\"mailto:address@hidden";><web-"
-#~ "address@hidden></a>."
-
#~ msgid "Translations of this page"
#~ msgstr "Ãbersetzungen dieser Seite"
Index: po/microsoft.de-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft.de-en.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/microsoft.de-en.html 3 Jul 2012 16:49:25 -0000 1.16
+++ po/microsoft.de-en.html 31 Jul 2012 00:27:31 -0000 1.17
@@ -60,7 +60,7 @@
in the future. For the most part, the companies' main motivation in
doing these things is to attack each other; now, it seems, we are
specifically targeted. Microsoft is using its patents directly to
-<a href="http://press.redhat.com/2009/09/09/microsoft-and-patent-trolls/";>
+<a
href="http://www.redhat.com/about/news/archive/2009/9/microsoft-and-patent-trolls";>
attack the free software community</a>, and our community is fighting
back.</p>
@@ -128,7 +128,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2012/07/03 16:49:25 $
+$Date: 2012/07/31 00:27:31 $
<!-- timestamp end -->
</p>
</div>
Index: po/microsoft.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft.de.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- po/microsoft.de.po 30 Jul 2012 21:13:41 -0000 1.17
+++ po/microsoft.de.po 31 Jul 2012 00:27:31 -0000 1.18
@@ -246,8 +246,7 @@
"\"mailto:address@hidden";><address@hidden></a>."
msgstr ""
"Bitte senden Sie ungültige Verweise und andere Korrekturen oder Vorschläge "
-"an <a href=\"mailto:address@hidden";><address@hidden>"
-"</a>."
+"an <a href=\"mailto:address@hidden";><address@hidden></a>."
#. type: Content of: <div><p>
msgid ""
@@ -255,9 +254,15 @@
"\">Translations README</a> for information on coordinating and submitting "
"translations of this article."
msgstr ""
-"Bitte beachten Sie die <a href=\"/server/standards/README.translations"
-"\">LIESMICH für Ãbersetzungen</a>, um weitere Informationen über die "
-"Koordinierung und Einsendung von Ãbersetzungen zu erhalten."
+"Bei der Ãbersetzung dieses Werkes wurde mit gröÃter Sorgfalt vorgegangen. "
+"Trotzdem können Fehler nicht völlig ausgeschlossen werden. Sollten Sie "
+"Fehler bemerken oder Vorschläge, Kommentare oder Anfragen zu dieser Webseite
"
+"haben, kontaktieren Sie bitte unser Ãbersetzungsteam <a href=\"mailto:web-";
+"address@hidden@gnu.org\"><address@hidden"
+"org></a>.</p>\n"
+"<p>Weitere Informationen über die Koordinierung und Einsendung von "
+"Ãbersetzungen unserer Webseiten finden Sie in der <a href=\"/server/"
+"standards/README.translations\">LIESMICH für Ãbersetzungen</a>."
#. type: Content of: <div><p>
msgid ""
Index: po/categories.ca-diff.html
===================================================================
RCS file: po/categories.ca-diff.html
diff -N po/categories.ca-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/categories.ca-diff.html 31 Jul 2012 00:27:31 -0000 1.1
@@ -0,0 +1,446 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/philosophy/categories.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!--#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. “If it's not
+ source, it's not software.” 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—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
+ “free software” 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
+ “free” as in freedom and “free” as in
+ zero price. For example, French has “libre” and
+ “gratuit”. Not so English; there is a word
+ “gratis” 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
+ “free” into your language to make it clearer. See
+ our list of <a href= "/philosophy/fs-translations.html">
+ translations of the term “free software”</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 “open source” 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 “<a href=
+ "/philosophy/open-source-misses-the-point.html">free
+ software</a>” because it refers to
+ freedom—something that the term “open
+ source“ 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 “public domain”
+ in a loose fashion to
+ mean <a href="#FreeSoftware">“free”</a> or
+ “available gratis.” However, “public
+ domain” is a legal term and means, precisely, “not
+ copyrighted”. For clarity, we recommend using
+ “public domain” 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 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 “free software.” 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
+ “incompatible”, 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 of the <a href="#GNUsoftware">offical
+ GNU packages</a>. It also includes 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. As this shows, the GNU system is not a single
+ static set of programs; users and distributors may select
+ different packages according to their needs and desires. The
+ result is still a variant of the GNU system.</p>
+
+ <p>Since the purpose of GNU is to be free, every single
+ component in the GNU operating system is 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.</p>
+
+<h3 id="GNUprograms">GNU programs</h3>
+
+ <p>“GNU programs” 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 “GNU package”.</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>
+
+ <span class="inserted"><ins><em><p>The FSF does not accept
copyright assignments of software
+ that is not an official GNU package, as a
rule.</p></em></ins></span>
+
+<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
+ “semifree software”, which could be modified and
+ redistributed noncommercially, and “ proprietary
+ software”, which could not be. But we have dropped that
+ distinction and now use “proprietary software” 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 “freeware” 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 “freeware” 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. “Commercial” and
+ “proprietary” 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, “We would feel safer with a commercial
+ compiler.” The salesmen reply, “GNU
+ Ada <em>is</em> a commercial compiler; it happens to be free
+ software.”</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 “commercial” when you mean
+ “proprietary.”</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 & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></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"><address@hidden></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 © 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: 2012/07/31 00:27:31 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy categories.ca.html keep-control-...,
GNUN <=