[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy categories.cs.html categories.it...
|
From: |
GNUN |
|
Subject: |
www/philosophy categories.cs.html categories.it... |
|
Date: |
Sun, 19 Sep 2021 16:32:22 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 21/09/19 16:32:22
Modified files:
philosophy : categories.cs.html categories.it.html
categories.ja.html categories.pl.html
categories.zh-tw.html fs-translations.ca.html
fs-translations.de.html fs-translations.pl.html
fs-translations.ro.html
why-call-it-the-swindle.zh-tw.html
philosophy/po : categories.cs-diff.html categories.it-diff.html
categories.ja-diff.html categories.pl-diff.html
categories.zh-tw-diff.html
fs-translations.ca-diff.html
fs-translations.de-diff.html
fs-translations.pl-diff.html
fs-translations.ro-diff.html
moglen-harvard-speech-2004.fr.po
moglen-harvard-speech-2004.pot
moglen-harvard-speech-2004.ru.po
Added files:
philosophy/po : why-call-it-the-swindle.zh-tw-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.cs.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.it.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.ja.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.pl.html?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.zh-tw.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.ca.html?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.de.html?cvsroot=www&r1=1.91&r2=1.92
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.pl.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.ro.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/why-call-it-the-swindle.zh-tw.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.cs-diff.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.it-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ja-diff.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.pl-diff.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-tw-diff.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ca-diff.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.de-diff.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.pl-diff.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.ro-diff.html?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/moglen-harvard-speech-2004.fr.po?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/moglen-harvard-speech-2004.pot?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/moglen-harvard-speech-2004.ru.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-call-it-the-swindle.zh-tw-diff.html?cvsroot=www&rev=1.1
Patches:
Index: categories.cs.html
===================================================================
RCS file: /web/www/www/philosophy/categories.cs.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- categories.cs.html 30 May 2021 19:03:19 -0000 1.26
+++ categories.cs.html 19 Sep 2021 20:32:19 -0000 1.27
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/categories.cs.po">
+ https://www.gnu.org/philosophy/po/categories.cs.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/categories.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/categories.cs-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-21" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
<!--#include virtual="/server/header.cs.html" -->
<!-- Parent-Version: 1.86 -->
@@ -16,6 +21,7 @@
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.cs.html" -->
+<!--#include virtual="/server/outdated.cs.html" -->
<h2>Kategorie svobodného a nesvobodného softwaru</h2>
<p>Také si pÅeÄtÄte <a href="/philosophy/words-to-avoid.html">MatoucÃ
slova,
@@ -411,7 +417,7 @@
<p class="unprintable"><!-- timestamp start -->
Aktualizováno:
-$Date: 2021/05/30 19:03:19 $
+$Date: 2021/09/19 20:32:19 $
<!-- timestamp end -->
</p>
Index: categories.it.html
===================================================================
RCS file: /web/www/www/philosophy/categories.it.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- categories.it.html 30 Apr 2021 06:36:15 -0000 1.26
+++ categories.it.html 19 Sep 2021 20:32:20 -0000 1.27
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/categories.it.po">
+ https://www.gnu.org/philosophy/po/categories.it.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/categories.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/categories.it-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-21" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
<!--#include virtual="/server/header.it.html" -->
<!-- Parent-Version: 1.86 -->
@@ -16,6 +21,7 @@
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.it.html" -->
+<!--#include virtual="/server/outdated.it.html" -->
<h2>Classificazione del Software Libero e non libero</h2>
<p>Vedere anche <a href="/philosophy/words-to-avoid.html">Termini da
@@ -450,7 +456,7 @@
<p class="unprintable"><!-- timestamp start -->
Ultimo aggiornamento:
-$Date: 2021/04/30 06:36:15 $
+$Date: 2021/09/19 20:32:20 $
<!-- timestamp end -->
</p>
Index: categories.ja.html
===================================================================
RCS file: /web/www/www/philosophy/categories.ja.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- categories.ja.html 1 Jul 2021 02:03:51 -0000 1.37
+++ categories.ja.html 19 Sep 2021 20:32:20 -0000 1.38
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/categories.ja.po">
+ https://www.gnu.org/philosophy/po/categories.ja.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/categories.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/categories.ja-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-21" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
<!--#include virtual="/server/header.ja.html" -->
<!-- Parent-Version: 1.86 -->
@@ -15,6 +20,7 @@
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.ja.html" -->
+<!--#include virtual="/server/outdated.ja.html" -->
<h2>èªç±ããã³ä¸èªç±ãªã½ããã¦ã§ã¢ã®åé¡</h2>
<p><a
href="/philosophy/words-to-avoid.html">ã§ããã°é¿ãããæ··ä¹±ãæããã¨ã°</a>ãã覧ãã
ããã</p>
@@ -261,7 +267,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2021/07/01 02:03:51 $
+$Date: 2021/09/19 20:32:20 $
<!-- timestamp end -->
</p>
Index: categories.pl.html
===================================================================
RCS file: /web/www/www/philosophy/categories.pl.html,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- categories.pl.html 25 Mar 2021 18:01:04 -0000 1.77
+++ categories.pl.html 19 Sep 2021 20:32:20 -0000 1.78
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/categories.pl.po">
+ https://www.gnu.org/philosophy/po/categories.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/categories.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/categories.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-21" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
<!--#include virtual="/server/header.pl.html" -->
<!-- Parent-Version: 1.86 -->
@@ -16,6 +21,7 @@
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
<h2>Kategorie wolnego i niewolnego oprogramowania</h2>
<p>ZwróÄcie też uwagÄ na <a
href="/philosophy/words-to-avoid.html">MylÄ
ce
@@ -490,7 +496,7 @@
<p class="unprintable"><!-- timestamp start -->
Aktualizowane:
-$Date: 2021/03/25 18:01:04 $
+$Date: 2021/09/19 20:32:20 $
<!-- timestamp end -->
</p>
Index: categories.zh-tw.html
===================================================================
RCS file: /web/www/www/philosophy/categories.zh-tw.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- categories.zh-tw.html 8 Feb 2020 09:59:58 -0000 1.13
+++ categories.zh-tw.html 19 Sep 2021 20:32:20 -0000 1.14
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/categories.zh-tw.po">
+ https://www.gnu.org/philosophy/po/categories.zh-tw.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/categories.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/categories.zh-tw-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-21" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
<!--#include virtual="/server/header.zh-tw.html" -->
<!-- Parent-Version: 1.86 -->
@@ -15,6 +20,7 @@
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.zh-tw.html" -->
+<!--#include virtual="/server/outdated.zh-tw.html" -->
<h2>èªç±èéèªç±è»é«çé¡å¥</h2>
<p>ä¹è«åé±<a href="/philosophy/words-to-avoid.html">ä½ æ許æ³é¿å
çæ··æ·è©èª</a>ã</p>
@@ -271,7 +277,7 @@
<p class="unprintable"><!-- timestamp start -->
æ´æ°æé︰
-$Date: 2020/02/08 09:59:58 $
+$Date: 2021/09/19 20:32:20 $
<!-- timestamp end -->
</p>
Index: fs-translations.ca.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.ca.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- fs-translations.ca.html 30 May 2021 19:03:19 -0000 1.59
+++ fs-translations.ca.html 19 Sep 2021 20:32:20 -0000 1.60
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/fs-translations.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/fs-translations.ca.po">
+ https://www.gnu.org/philosophy/po/fs-translations.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/fs-translations.html"
+ --><!--#set var="DIFF_FILE"
value="/philosophy/po/fs-translations.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-21" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/fs-translations.en.html" -->
<!--#include virtual="/server/html5-header.ca.html" -->
<!-- Parent-Version: 1.96 -->
@@ -22,6 +27,7 @@
</style>
<!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/server/outdated.ca.html" -->
<div class="reduced-width">
<h2>Traduccions del terme "programari lliure"</h2>
<div class="thin"></div>
@@ -1216,7 +1222,7 @@
<p class="unprintable"><!-- timestamp start -->
Updated:
-$Date: 2021/05/30 19:03:19 $
+$Date: 2021/09/19 20:32:20 $
<!-- timestamp end -->
</p>
Index: fs-translations.de.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.de.html,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- fs-translations.de.html 31 May 2021 13:39:52 -0000 1.91
+++ fs-translations.de.html 19 Sep 2021 20:32:20 -0000 1.92
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/fs-translations.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/fs-translations.de.po">
+ https://www.gnu.org/philosophy/po/fs-translations.de.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/fs-translations.html"
+ --><!--#set var="DIFF_FILE"
value="/philosophy/po/fs-translations.de-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-21" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/fs-translations.en.html" -->
<!--#include virtual="/server/html5-header.de.html" -->
<!-- Parent-Version: 1.96 -->
@@ -22,6 +27,7 @@
</style>
<!--#include virtual="/server/banner.de.html" -->
+<!--#include virtual="/server/outdated.de.html" -->
<div class="reduced-width">
<h2>Ãbersetzungen des Begriffs <em>âFree Softwareâ</em></h2>
<div class="thin"></div>
@@ -1226,7 +1232,7 @@
<p class="unprintable"><!-- timestamp start -->
Letzte Ãnderung:
-$Date: 2021/05/31 13:39:52 $
+$Date: 2021/09/19 20:32:20 $
<!-- timestamp end -->
</p>
Index: fs-translations.pl.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.pl.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- fs-translations.pl.html 3 May 2021 20:30:52 -0000 1.42
+++ fs-translations.pl.html 19 Sep 2021 20:32:20 -0000 1.43
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/fs-translations.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/fs-translations.pl.po">
+ https://www.gnu.org/philosophy/po/fs-translations.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/fs-translations.html"
+ --><!--#set var="DIFF_FILE"
value="/philosophy/po/fs-translations.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-21" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/fs-translations.en.html" -->
<!--#include virtual="/server/html5-header.pl.html" -->
<!-- Parent-Version: 1.96 -->
@@ -22,6 +27,7 @@
</style>
<!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
<div class="reduced-width">
<h2>TÅumaczenia terminu „free software”</h2>
<div class="thin"></div>
@@ -1223,7 +1229,7 @@
<p class="unprintable"><!-- timestamp start -->
Aktualizowane:
-$Date: 2021/05/03 20:30:52 $
+$Date: 2021/09/19 20:32:20 $
<!-- timestamp end -->
</p>
Index: fs-translations.ro.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.ro.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- fs-translations.ro.html 31 May 2021 09:06:19 -0000 1.19
+++ fs-translations.ro.html 19 Sep 2021 20:32:20 -0000 1.20
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/fs-translations.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/fs-translations.ro.po">
+ https://www.gnu.org/philosophy/po/fs-translations.ro.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/fs-translations.html"
+ --><!--#set var="DIFF_FILE"
value="/philosophy/po/fs-translations.ro-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-21" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/fs-translations.en.html" -->
<!--#include virtual="/server/html5-header.ro.html" -->
<!-- Parent-Version: 1.96 -->
@@ -22,6 +27,7 @@
</style>
<!--#include virtual="/server/banner.ro.html" -->
+<!--#include virtual="/server/outdated.ro.html" -->
<div class="reduced-width">
<h2>Traducerile termenului englezesc „free software”</h2>
<div class="thin"></div>
@@ -1221,7 +1227,7 @@
<p class="unprintable"><!-- timestamp start -->
ActualizatÄ:
-$Date: 2021/05/31 09:06:19 $
+$Date: 2021/09/19 20:32:20 $
<!-- timestamp end -->
</p>
Index: why-call-it-the-swindle.zh-tw.html
===================================================================
RCS file: /web/www/www/philosophy/why-call-it-the-swindle.zh-tw.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- why-call-it-the-swindle.zh-tw.html 27 Aug 2019 15:31:22 -0000 1.2
+++ why-call-it-the-swindle.zh-tw.html 19 Sep 2021 20:32:20 -0000 1.3
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE"
value="/philosophy/why-call-it-the-swindle.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/why-call-it-the-swindle.zh-tw.po">
+ https://www.gnu.org/philosophy/po/why-call-it-the-swindle.zh-tw.po</a>'
+ --><!--#set var="ORIGINAL_FILE"
value="/philosophy/why-call-it-the-swindle.html"
+ --><!--#set var="DIFF_FILE"
value="/philosophy/po/why-call-it-the-swindle.zh-tw-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-21" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/why-call-it-the-swindle.en.html" -->
<!--#include virtual="/server/header.zh-tw.html" -->
<!-- Parent-Version: 1.86 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/philosophy/po/why-call-it-the-swindle.translist" -->
<!--#include virtual="/server/banner.zh-tw.html" -->
+<!--#include virtual="/server/outdated.zh-tw.html" -->
<h2>çºä»éº¼å«å® Swindleï¼</h2>
<p>ä½è
çº <a href="http://www.stallman.org/";><strong>Richard
Stallman</strong></a></p>
@@ -126,7 +132,7 @@
<p class="unprintable"><!-- timestamp start -->
æ´æ°æé︰
-$Date: 2019/08/27 15:31:22 $
+$Date: 2021/09/19 20:32:20 $
<!-- timestamp end -->
</p>
Index: po/categories.cs-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.cs-diff.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/categories.cs-diff.html 27 Oct 2019 09:59:50 -0000 1.22
+++ po/categories.cs-diff.html 19 Sep 2021 20:32:21 -0000 1.23
@@ -11,34 +11,53 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: <span
class="removed"><del><strong>1.86</strong></del></span> <span
class="inserted"><ins><em>1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> -->
<title>Categories of Free and Nonfree Software
- GNU Project - Free Software Foundation</title>
-<style type="text/css" media="screen">
+<style type="text/css" <span class="removed"><del><strong>media="screen">
<!--
-#content #diagram { overflow: auto; margin: 2em 0; }
-#diagram img { width: 31.7em; }
--->
-</style>
+#content</strong></del></span> <span
class="inserted"><ins><em>media="screen"><!--</em></ins></span>
+#diagram { <span class="removed"><del><strong>overflow:
auto;</strong></del></span> <span class="inserted"><ins><em>width: 32em;
max-width: 100%;</em></ins></span> margin: <span
class="removed"><del><strong>2em 0;</strong></del></span> <span
class="inserted"><ins><em>2.5em auto 2em;</em></ins></span> }
+#diagram img { width: <span
class="removed"><del><strong>31.7em;</strong></del></span> <span
class="inserted"><ins><em>29.9em; height: auto; overflow:
auto;</em></ins></span> }
+<span class="removed"><del><strong>-->
+</style></strong></del></span>
+<span class="inserted"><ins><em>#diagram p { font-size: .88em; text-align:
justify; }
+--></style></em></ins></span>
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.html" -->
-<h2>Categories of free and nonfree software</h2>
+<span class="inserted"><ins><em><!--#include
virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="article reduced-width"></em></ins></span>
+<h2>Categories of <span
class="removed"><del><strong>free</strong></del></span> <span
class="inserted"><ins><em>Free</em></ins></span> and <span
class="removed"><del><strong>nonfree software</h2>
<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
- Words which You Might Want to Avoid</a>.</p>
+ Words which You Might Want to
Avoid</a>.</p></strong></del></span> <span
class="inserted"><ins><em>Nonfree Software</h2></em></ins></span>
<!-- GNUN: localize URL /philosophy/category.png -->
-<p id="diagram" class="c">
+<span class="removed"><del><strong><p</strong></del></span>
+<span class="inserted"><ins><em><div</em></ins></span> id="diagram" <span
class="removed"><del><strong>class="c"></strong></del></span> <span
class="inserted"><ins><em>class="c" role="figure"
aria-labelledby="caption"></em></ins></span>
<img src="/philosophy/category.png" alt=" [Categories of software] " />
-</p>
+<span class="removed"><del><strong></p>
- <p>This diagram, originally by Chao-Kuei and updated by several
+ <p>This</strong></del></span>
+ <span class="inserted"><ins><em><p id="caption">
+ This</em></ins></span> 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>
+<span class="inserted"><ins><em></div>
+
+<div class="announcement" role="complementary">
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
+ Words which You Might Want to Avoid</a>.</p>
+</div></em></ins></span>
<h3 id="FreeSoftware">Free software</h3>
@@ -81,7 +100,8 @@
<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
+ <span
class="removed"><del><strong>“gratuit”.</strong></del></span>
+ <span
class="inserted"><ins><em>“gratuit.”</em></ins></span> 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
@@ -102,11 +122,10 @@
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: <span class="removed"><del><strong>nearly all free
software</strong></del></span> <span class="inserted"><ins><em>we know of only
a few cases of source code that</em></ins></span>
- is open <span class="removed"><del><strong>source,
- and nearly all open</strong></del></span> source <span
class="removed"><del><strong>software is free.</p></strong></del></span>
<span class="inserted"><ins><em>but not free. In principle it could happen
+ category are small: we know of only a few cases of source code that
+ is open source but not free. In principle it could happen
that some free programs are rejected as open source, but
- we don't know if that has ever happened.</p></em></ins></span>
+ we don't know if that has ever happened.</p>
<p>We prefer the term “<a
href="/philosophy/open-source-misses-the-point.html">free
software</a>” because it refers to
@@ -135,7 +154,8 @@
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
+ <span
class="removed"><del><strong>copyrighted”.</strong></del></span>
+ <span class="inserted"><ins><em>copyrighted.”</em></ins></span>
For clarity, we recommend using
“public domain” for that meaning only, and using
other terms to convey the other meanings.</p>
@@ -175,7 +195,8 @@
However, in actual practice nearly all copylefted software uses the
<a href="/licenses/gpl.html">GNU General Public
License</a>. Two different copyleft licenses are usually
- “incompatible”, which means it is illegal to merge
+ <span
class="removed"><del><strong>“incompatible”,</strong></del></span>
+ <span
class="inserted"><ins><em>“incompatible,”</em></ins></span> 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>
@@ -193,7 +214,7 @@
a <a href="#ProprietarySoftware">proprietary</a> software
product.</p>
- <p>The <a href="http://www.x.org">X Window System</a>
+ <p>The <a <span
class="removed"><del><strong>href="http://www.x.org">X</strong></del></span>
<span
class="inserted"><ins><em>href="https://www.x.org/wiki/">X</em></ins></span>
Window System</a>
illustrates this. The X Consortium released X11 with
distribution terms that made it noncopylefted free
software, and subsequent developers have mostly followed the
@@ -260,13 +281,14 @@
<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>
+ is a “GNU <span
class="removed"><del><strong>package”.</p></strong></del></span>
<span class="inserted"><ins><em>package.”</p></em></ins></span>
<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 that is released under the auspices of the <a <span
class="removed"><del><strong>href=
+ "/gnu/gnu-history.html">GNU</strong></del></span>
+ <span
class="inserted"><ins><em>href="/gnu/gnu-history.html">GNU</em></ins></span>
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
@@ -277,9 +299,10 @@
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
+ <p>Some GNU software was written by <a <span
class="removed"><del><strong>href=
+
"http://www.fsf.org/about/staff/">staff</a></strong></del></span>
+ <span
class="inserted"><ins><em>href="https://www.fsf.org/about/staff/">staff</a></em></ins></span>
of
+ the <a <span
class="removed"><del><strong>href="http://www.fsf.org/">Free</strong></del></span>
<span
class="inserted"><ins><em>href="https://www.fsf.org/">Free</em></ins></span>
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
@@ -311,9 +334,10 @@
<p>Proprietary software is another name for nonfree software.
In the past we subdivided nonfree software into
- “semifree software”, which could be modified and
+ “semifree <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span> which could be
modified and
redistributed noncommercially, and “proprietary
- software”, which could not be. But we have dropped that
+ <span
class="removed"><del><strong>software”,</strong></del></span>
+ <span class="inserted"><ins><em>software,”</em></ins></span>
which could not be. But we have dropped that
distinction and now use “proprietary software” as
synonymous with nonfree software.</p>
@@ -416,15 +440,17 @@
to say “commercial” when you mean
“proprietary.”</p>
-<!-- If needed, change the copyright block at the bottom. In general, -->
+<span class="removed"><del><strong><!-- 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." -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002."
--></strong></del></span>
+<span class="inserted"><ins><em></div></em></ins></span>
+
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div <span
class="removed"><del><strong>id="footer"></strong></del></span> <span
class="inserted"><ins><em>id="footer" role="contentinfo"></em></ins></span>
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to <a
@@ -442,16 +468,33 @@
to <a href="mailto:web-translators@gnu.org">
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</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>
+information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of this
article.</p>
</div>
-<p>Copyright © 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010,
2014, 2015, 2016, 2017, <span
class="removed"><del><strong>2018</strong></del></span> <span
class="inserted"><ins><em>2018, 2019</em></ins></span> Free
+<span class="inserted"><ins><em><!-- Regarding copyright, in general,
standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. 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. --></em></ins></span>
+
+<p>Copyright © <span class="removed"><del><strong>1996, 1997, 1998,
2001, 2006,</strong></del></span> <span class="inserted"><ins><em>1996-1998,
2001-2005,</em></ins></span> 2007, <span class="removed"><del><strong>2009,
2010, 2014,</strong></del></span> <span
class="inserted"><ins><em>2009-2012,</em></ins></span> 2015, <span
class="removed"><del><strong>2016, 2017, 2018, 2019</strong></del></span> <span
class="inserted"><ins><em>2019, 2021</em></ins></span> Free
Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -462,7 +505,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/10/27 09:59:50 $
+$Date: 2021/09/19 20:32:21 $
<!-- timestamp end -->
</p>
</div>
Index: po/categories.it-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.it-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/categories.it-diff.html 5 Sep 2017 12:29:48 -0000 1.1
+++ po/categories.it-diff.html 19 Sep 2021 20:32:22 -0000 1.2
@@ -11,34 +11,53 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.83 -->
+<!-- Parent-Version: <span
class="removed"><del><strong>1.86</strong></del></span> <span
class="inserted"><ins><em>1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> -->
<title>Categories of Free and Nonfree Software
- GNU Project - Free Software Foundation</title>
-<style type="text/css" media="screen">
+<style type="text/css" <span class="removed"><del><strong>media="screen">
<!--
-#content #diagram { overflow: auto; margin: 2em 0; }
-#diagram img { width: 31.7em; }
--->
-</style>
+#content</strong></del></span> <span
class="inserted"><ins><em>media="screen"><!--</em></ins></span>
+#diagram { <span class="removed"><del><strong>overflow:
auto;</strong></del></span> <span class="inserted"><ins><em>width: 32em;
max-width: 100%;</em></ins></span> margin: <span
class="removed"><del><strong>2em 0;</strong></del></span> <span
class="inserted"><ins><em>2.5em auto 2em;</em></ins></span> }
+#diagram img { width: <span
class="removed"><del><strong>31.7em;</strong></del></span> <span
class="inserted"><ins><em>29.9em; height: auto; overflow:
auto;</em></ins></span> }
+<span class="removed"><del><strong>-->
+</style></strong></del></span>
+<span class="inserted"><ins><em>#diagram p { font-size: .88em; text-align:
justify; }
+--></style></em></ins></span>
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.html" -->
-<h2>Categories of free and nonfree software</h2>
+<span class="inserted"><ins><em><!--#include
virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="article reduced-width"></em></ins></span>
+<h2>Categories of <span
class="removed"><del><strong>free</strong></del></span> <span
class="inserted"><ins><em>Free</em></ins></span> and <span
class="removed"><del><strong>nonfree software</h2>
<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
- Words which You Might Want to Avoid</a>.</p>
+ Words which You Might Want to
Avoid</a>.</p></strong></del></span> <span
class="inserted"><ins><em>Nonfree Software</h2></em></ins></span>
<!-- GNUN: localize URL /philosophy/category.png -->
-<p id="diagram" class="c">
+<span class="removed"><del><strong><p</strong></del></span>
+<span class="inserted"><ins><em><div</em></ins></span> id="diagram" <span
class="removed"><del><strong>class="c"></strong></del></span> <span
class="inserted"><ins><em>class="c" role="figure"
aria-labelledby="caption"></em></ins></span>
<img src="/philosophy/category.png" alt=" [Categories of software] " />
-</p>
+<span class="removed"><del><strong></p>
- <p>This diagram, originally by Chao-Kuei and updated by several
+ <p>This</strong></del></span>
+ <span class="inserted"><ins><em><p id="caption">
+ This</em></ins></span> 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>
+<span class="inserted"><ins><em></div>
+
+<div class="announcement" role="complementary">
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
+ Words which You Might Want to Avoid</a>.</p>
+</div></em></ins></span>
<h3 id="FreeSoftware">Free software</h3>
@@ -81,7 +100,8 @@
<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
+ <span
class="removed"><del><strong>“gratuit”.</strong></del></span>
+ <span
class="inserted"><ins><em>“gratuit.”</em></ins></span> 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
@@ -102,8 +122,10 @@
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>
+ category are small: we know of only a few cases of source code that
+ is open source but not free. In principle it could happen
+ that some free programs are rejected as open source, but
+ we don't know if that has ever happened.</p>
<p>We prefer the term “<a
href="/philosophy/open-source-misses-the-point.html">free
software</a>” because it refers to
@@ -132,7 +154,8 @@
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
+ <span
class="removed"><del><strong>copyrighted”.</strong></del></span>
+ <span class="inserted"><ins><em>copyrighted.”</em></ins></span>
For clarity, we recommend using
“public domain” for that meaning only, and using
other terms to convey the other meanings.</p>
@@ -172,7 +195,8 @@
However, in actual practice nearly all copylefted software uses the
<a href="/licenses/gpl.html">GNU General Public
License</a>. Two different copyleft licenses are usually
- “incompatible”, which means it is illegal to merge
+ <span
class="removed"><del><strong>“incompatible”,</strong></del></span>
+ <span
class="inserted"><ins><em>“incompatible,”</em></ins></span> 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>
@@ -190,7 +214,7 @@
a <a href="#ProprietarySoftware">proprietary</a> software
product.</p>
- <p>The <a href="http://www.x.org">X Window System</a>
+ <p>The <a <span
class="removed"><del><strong>href="http://www.x.org">X</strong></del></span>
<span
class="inserted"><ins><em>href="https://www.x.org/wiki/">X</em></ins></span>
Window System</a>
illustrates this. The X Consortium released X11 with
distribution terms that made it noncopylefted free
software, and subsequent developers have mostly followed the
@@ -257,13 +281,14 @@
<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>
+ is a “GNU <span
class="removed"><del><strong>package”.</p></strong></del></span>
<span class="inserted"><ins><em>package.”</p></em></ins></span>
<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 that is released under the auspices of the <a <span
class="removed"><del><strong>href=
+ "/gnu/gnu-history.html">GNU</strong></del></span>
+ <span
class="inserted"><ins><em>href="/gnu/gnu-history.html">GNU</em></ins></span>
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
@@ -274,9 +299,10 @@
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
+ <p>Some GNU software was written by <a <span
class="removed"><del><strong>href=
+
"http://www.fsf.org/about/staff/">staff</a></strong></del></span>
+ <span
class="inserted"><ins><em>href="https://www.fsf.org/about/staff/">staff</a></em></ins></span>
of
+ the <a <span
class="removed"><del><strong>href="http://www.fsf.org/">Free</strong></del></span>
<span
class="inserted"><ins><em>href="https://www.fsf.org/">Free</em></ins></span>
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
@@ -289,7 +315,7 @@
<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 <span
class="removed"><del><strong>transfered</strong></del></span> <span
class="inserted"><ins><em>transferred</em></ins></span> the copyright to the
FSF, the program
+ <p>If they have transferred 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>
@@ -308,9 +334,10 @@
<p>Proprietary software is another name for nonfree software.
In the past we subdivided nonfree software into
- “semifree software”, which could be modified and
+ “semifree <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span> which could be
modified and
redistributed noncommercially, and “proprietary
- software”, which could not be. But we have dropped that
+ <span
class="removed"><del><strong>software”,</strong></del></span>
+ <span class="inserted"><ins><em>software,”</em></ins></span>
which could not be. But we have dropped that
distinction and now use “proprietary software” as
synonymous with nonfree software.</p>
@@ -413,15 +440,17 @@
to say “commercial” when you mean
“proprietary.”</p>
-<!-- If needed, change the copyright block at the bottom. In general, -->
+<span class="removed"><del><strong><!-- 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." -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002."
--></strong></del></span>
+<span class="inserted"><ins><em></div></em></ins></span>
+
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div <span
class="removed"><del><strong>id="footer"></strong></del></span> <span
class="inserted"><ins><em>id="footer" role="contentinfo"></em></ins></span>
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to <a
@@ -439,16 +468,33 @@
to <a href="mailto:web-translators@gnu.org">
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</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>
+information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of this
article.</p>
</div>
-<p>Copyright © 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010,
2014, 2015, 2016, 2017 Free
+<span class="inserted"><ins><em><!-- Regarding copyright, in general,
standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. 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. --></em></ins></span>
+
+<p>Copyright © <span class="removed"><del><strong>1996, 1997, 1998,
2001, 2006,</strong></del></span> <span class="inserted"><ins><em>1996-1998,
2001-2005,</em></ins></span> 2007, <span class="removed"><del><strong>2009,
2010, 2014,</strong></del></span> <span
class="inserted"><ins><em>2009-2012,</em></ins></span> 2015, <span
class="removed"><del><strong>2016, 2017, 2018, 2019</strong></del></span> <span
class="inserted"><ins><em>2019, 2021</em></ins></span> Free
Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -459,11 +505,11 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/09/05 12:29:48 $
+$Date: 2021/09/19 20:32:22 $
<!-- timestamp end -->
</p>
</div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
</body>
</html>
</pre></body></html>
Index: po/categories.ja-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ja-diff.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/categories.ja-diff.html 26 Jun 2019 20:32:25 -0000 1.9
+++ po/categories.ja-diff.html 19 Sep 2021 20:32:22 -0000 1.10
@@ -11,34 +11,53 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: <span
class="removed"><del><strong>1.79</strong></del></span> <span
class="inserted"><ins><em>1.86</em></ins></span> -->
+<!-- Parent-Version: <span
class="removed"><del><strong>1.86</strong></del></span> <span
class="inserted"><ins><em>1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> -->
<title>Categories of Free and Nonfree Software
- GNU Project - Free Software Foundation</title>
-<style type="text/css" media="screen">
+<style type="text/css" <span class="removed"><del><strong>media="screen">
<!--
-#content #diagram { overflow: auto; margin: 2em 0; }
-#diagram img { width: 31.7em; }
--->
-</style>
+#content</strong></del></span> <span
class="inserted"><ins><em>media="screen"><!--</em></ins></span>
+#diagram { <span class="removed"><del><strong>overflow:
auto;</strong></del></span> <span class="inserted"><ins><em>width: 32em;
max-width: 100%;</em></ins></span> margin: <span
class="removed"><del><strong>2em 0;</strong></del></span> <span
class="inserted"><ins><em>2.5em auto 2em;</em></ins></span> }
+#diagram img { width: <span
class="removed"><del><strong>31.7em;</strong></del></span> <span
class="inserted"><ins><em>29.9em; height: auto; overflow:
auto;</em></ins></span> }
+<span class="removed"><del><strong>-->
+</style></strong></del></span>
+<span class="inserted"><ins><em>#diagram p { font-size: .88em; text-align:
justify; }
+--></style></em></ins></span>
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.html" -->
-<h2>Categories of free and nonfree software</h2>
+<span class="inserted"><ins><em><!--#include
virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="article reduced-width"></em></ins></span>
+<h2>Categories of <span
class="removed"><del><strong>free</strong></del></span> <span
class="inserted"><ins><em>Free</em></ins></span> and <span
class="removed"><del><strong>nonfree software</h2>
<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
- Words which You Might Want to Avoid</a>.</p>
+ Words which You Might Want to
Avoid</a>.</p></strong></del></span> <span
class="inserted"><ins><em>Nonfree Software</h2></em></ins></span>
<!-- GNUN: localize URL /philosophy/category.png -->
-<p id="diagram" class="c">
+<span class="removed"><del><strong><p</strong></del></span>
+<span class="inserted"><ins><em><div</em></ins></span> id="diagram" <span
class="removed"><del><strong>class="c"></strong></del></span> <span
class="inserted"><ins><em>class="c" role="figure"
aria-labelledby="caption"></em></ins></span>
<img src="/philosophy/category.png" alt=" [Categories of software] " />
-</p>
+<span class="removed"><del><strong></p>
- <p>This diagram, originally by Chao-Kuei and updated by several
+ <p>This</strong></del></span>
+ <span class="inserted"><ins><em><p id="caption">
+ This</em></ins></span> 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>
+<span class="inserted"><ins><em></div>
+
+<div class="announcement" role="complementary">
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
+ Words which You Might Want to Avoid</a>.</p>
+</div></em></ins></span>
<h3 id="FreeSoftware">Free software</h3>
@@ -81,7 +100,8 @@
<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
+ <span
class="removed"><del><strong>“gratuit”.</strong></del></span>
+ <span
class="inserted"><ins><em>“gratuit.”</em></ins></span> 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
@@ -102,14 +122,12 @@
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: <span class="removed"><del><strong>nearly all free
software</strong></del></span> <span class="inserted"><ins><em>we know of only
a few cases of source code that</em></ins></span>
- is open <span class="removed"><del><strong>source,
- and nearly all open</strong></del></span> source <span
class="removed"><del><strong>software is free.</p></strong></del></span>
<span class="inserted"><ins><em>but not free. In principle it could happen
+ category are small: we know of only a few cases of source code that
+ is open source but not free. In principle it could happen
that some free programs are rejected as open source, but
- we don't know if that has ever happened.</p></em></ins></span>
- <p>We prefer the term “<a <span
class="removed"><del><strong>href=
-
"/philosophy/open-source-misses-the-point.html">free</strong></del></span>
- <span
class="inserted"><ins><em>href="/philosophy/open-source-misses-the-point.html">free</em></ins></span>
+ we don't know if that has ever happened.</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>
@@ -136,7 +154,8 @@
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
+ <span
class="removed"><del><strong>copyrighted”.</strong></del></span>
+ <span class="inserted"><ins><em>copyrighted.”</em></ins></span>
For clarity, we recommend using
“public domain” for that meaning only, and using
other terms to convey the other meanings.</p>
@@ -161,14 +180,12 @@
<p>Some copyleft licenses, such as GPL version 3, block
other means of turning software proprietary, such as <a
- <span
class="removed"><del><strong>href="http://www.gnu.org/licenses/rms-why-gplv3.html">tivoization</a>.</p></strong></del></span>
- <span
class="inserted"><ins><em>href="/licenses/rms-why-gplv3.html">tivoization</a>.</p></em></ins></span>
+ href="/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 <span
class="removed"><del><strong>href=
- "/copyleft/copyleft.html">copyleft</strong></del></span>
- <span
class="inserted"><ins><em>href="/licenses/copyleft.html">copyleft</em></ins></span>
article</a> for more explanation of
+ implied by the term “free software.” See our <a
+ href="/licenses/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,
@@ -176,9 +193,10 @@
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 <span
class="removed"><del><strong>href="/copyleft/gpl.html">GNU</strong></del></span>
<span
class="inserted"><ins><em>href="/licenses/gpl.html">GNU</em></ins></span>
General Public
+ <a href="/licenses/gpl.html">GNU General Public
License</a>. Two different copyleft licenses are usually
- “incompatible”, which means it is illegal to merge
+ <span
class="removed"><del><strong>“incompatible”,</strong></del></span>
+ <span
class="inserted"><ins><em>“incompatible,”</em></ins></span> 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>
@@ -196,7 +214,7 @@
a <a href="#ProprietarySoftware">proprietary</a> software
product.</p>
- <p>The <a href="http://www.x.org">X Window System</a>
+ <p>The <a <span
class="removed"><del><strong>href="http://www.x.org">X</strong></del></span>
<span
class="inserted"><ins><em>href="https://www.x.org/wiki/">X</em></ins></span>
Window System</a>
illustrates this. The X Consortium released X11 with
distribution terms that made it noncopylefted free
software, and subsequent developers have mostly followed the
@@ -214,13 +232,13 @@
<h3 id="LaxPermissiveLicensedSoftware">Lax permissive licensed
software</h3>
<p>Lax permissive licenses include the X11 license and the
- <a <span
class="removed"><del><strong>href="bsd.html">two</strong></del></span> <span
class="inserted"><ins><em>href="/licenses/bsd.html">two</em></ins></span>
BSD licenses</a>. These licenses permit
+ <a href="/licenses/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 <span
class="removed"><del><strong>href="/copyleft/gpl.html">GNU</strong></del></span>
<span
class="inserted"><ins><em>href="/licenses/gpl.html">GNU</em></ins></span>
GPL (General Public
+ <p>The <a href="/licenses/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>
@@ -263,27 +281,28 @@
<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>
+ is a “GNU <span
class="removed"><del><strong>package”.</p></strong></del></span>
<span class="inserted"><ins><em>package.”</p></em></ins></span>
<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 that is released under the auspices of the <a <span
class="removed"><del><strong>href=
+ "/gnu/gnu-history.html">GNU</strong></del></span>
+ <span
class="inserted"><ins><em>href="/gnu/gnu-history.html">GNU</em></ins></span>
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=
- <span
class="removed"><del><strong>"/copyleft/copyleft.html">copylefted</a>,</strong></del></span>
- <span
class="inserted"><ins><em>"/licenses/copyleft.html">copylefted</a>,</em></ins></span>
but not all; however,
+ "/licenses/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
+ <p>Some GNU software was written by <a <span
class="removed"><del><strong>href=
+
"http://www.fsf.org/about/staff/">staff</a></strong></del></span>
+ <span
class="inserted"><ins><em>href="https://www.fsf.org/about/staff/">staff</a></em></ins></span>
of
+ the <a <span
class="removed"><del><strong>href="http://www.fsf.org/">Free</strong></del></span>
<span
class="inserted"><ins><em>href="https://www.fsf.org/">Free</em></ins></span>
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
@@ -296,7 +315,7 @@
<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 <span
class="removed"><del><strong>transfered</strong></del></span> <span
class="inserted"><ins><em>transferred</em></ins></span> the copyright to the
FSF, the program
+ <p>If they have transferred 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>
@@ -315,9 +334,10 @@
<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 <span
class="removed"><del><strong>“ proprietary</strong></del></span> <span
class="inserted"><ins><em>“proprietary</em></ins></span>
- software”, which could not be. But we have dropped that
+ “semifree <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span> which could be
modified and
+ redistributed noncommercially, and “proprietary
+ <span
class="removed"><del><strong>software”,</strong></del></span>
+ <span class="inserted"><ins><em>software,”</em></ins></span>
which could not be. But we have dropped that
distinction and now use “proprietary software” as
synonymous with nonfree software.</p>
@@ -420,15 +440,17 @@
to say “commercial” when you mean
“proprietary.”</p>
-<!-- If needed, change the copyright block at the bottom. In general, -->
+<span class="removed"><del><strong><!-- 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." -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002."
--></strong></del></span>
+<span class="inserted"><ins><em></div></em></ins></span>
+
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div <span
class="removed"><del><strong>id="footer"></strong></del></span> <span
class="inserted"><ins><em>id="footer" role="contentinfo"></em></ins></span>
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to <a
@@ -446,16 +468,33 @@
to <a href="mailto:web-translators@gnu.org">
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</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>
+information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of this
article.</p>
</div>
-<p>Copyright © 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010,
2014, 2015, <span class="removed"><del><strong>2016</strong></del></span> <span
class="inserted"><ins><em>2016, 2017, 2018, 2019</em></ins></span> Free
+<span class="inserted"><ins><em><!-- Regarding copyright, in general,
standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. 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. --></em></ins></span>
+
+<p>Copyright © <span class="removed"><del><strong>1996, 1997, 1998,
2001, 2006,</strong></del></span> <span class="inserted"><ins><em>1996-1998,
2001-2005,</em></ins></span> 2007, <span class="removed"><del><strong>2009,
2010, 2014,</strong></del></span> <span
class="inserted"><ins><em>2009-2012,</em></ins></span> 2015, <span
class="removed"><del><strong>2016, 2017, 2018, 2019</strong></del></span> <span
class="inserted"><ins><em>2019, 2021</em></ins></span> Free
Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -466,12 +505,11 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/06/26 20:32:25 $
+$Date: 2021/09/19 20:32:22 $
<!-- timestamp end -->
</p>
</div>
-<span class="removed"><del><strong></div></strong></del></span>
-<span class="inserted"><ins><em></div><!-- for class="inner", starts
in the banner include --></em></ins></span>
+</div><!-- for class="inner", starts in the banner include -->
</body>
</html>
</pre></body></html>
Index: po/categories.pl-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.pl-diff.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/categories.pl-diff.html 9 Jul 2019 14:59:14 -0000 1.11
+++ po/categories.pl-diff.html 19 Sep 2021 20:32:22 -0000 1.12
@@ -11,34 +11,53 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: <span
class="removed"><del><strong>1.79</strong></del></span> <span
class="inserted"><ins><em>1.86</em></ins></span> -->
+<!-- Parent-Version: <span
class="removed"><del><strong>1.86</strong></del></span> <span
class="inserted"><ins><em>1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> -->
<title>Categories of Free and Nonfree Software
- GNU Project - Free Software Foundation</title>
-<style type="text/css" media="screen">
+<style type="text/css" <span class="removed"><del><strong>media="screen">
<!--
-#content #diagram { overflow: auto; margin: 2em 0; }
-#diagram img { width: 31.7em; }
--->
-</style>
+#content</strong></del></span> <span
class="inserted"><ins><em>media="screen"><!--</em></ins></span>
+#diagram { <span class="removed"><del><strong>overflow:
auto;</strong></del></span> <span class="inserted"><ins><em>width: 32em;
max-width: 100%;</em></ins></span> margin: <span
class="removed"><del><strong>2em 0;</strong></del></span> <span
class="inserted"><ins><em>2.5em auto 2em;</em></ins></span> }
+#diagram img { width: <span
class="removed"><del><strong>31.7em;</strong></del></span> <span
class="inserted"><ins><em>29.9em; height: auto; overflow:
auto;</em></ins></span> }
+<span class="removed"><del><strong>-->
+</style></strong></del></span>
+<span class="inserted"><ins><em>#diagram p { font-size: .88em; text-align:
justify; }
+--></style></em></ins></span>
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.html" -->
-<h2>Categories of free and nonfree software</h2>
+<span class="inserted"><ins><em><!--#include
virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="article reduced-width"></em></ins></span>
+<h2>Categories of <span
class="removed"><del><strong>free</strong></del></span> <span
class="inserted"><ins><em>Free</em></ins></span> and <span
class="removed"><del><strong>nonfree software</h2>
<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
- Words which You Might Want to Avoid</a>.</p>
+ Words which You Might Want to
Avoid</a>.</p></strong></del></span> <span
class="inserted"><ins><em>Nonfree Software</h2></em></ins></span>
<!-- GNUN: localize URL /philosophy/category.png -->
-<p id="diagram" class="c">
+<span class="removed"><del><strong><p</strong></del></span>
+<span class="inserted"><ins><em><div</em></ins></span> id="diagram" <span
class="removed"><del><strong>class="c"></strong></del></span> <span
class="inserted"><ins><em>class="c" role="figure"
aria-labelledby="caption"></em></ins></span>
<img src="/philosophy/category.png" alt=" [Categories of software] " />
-</p>
+<span class="removed"><del><strong></p>
- <p>This diagram, originally by Chao-Kuei and updated by several
+ <p>This</strong></del></span>
+ <span class="inserted"><ins><em><p id="caption">
+ This</em></ins></span> 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>
+<span class="inserted"><ins><em></div>
+
+<div class="announcement" role="complementary">
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
+ Words which You Might Want to Avoid</a>.</p>
+</div></em></ins></span>
<h3 id="FreeSoftware">Free software</h3>
@@ -81,7 +100,8 @@
<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
+ <span
class="removed"><del><strong>“gratuit”.</strong></del></span>
+ <span
class="inserted"><ins><em>“gratuit.”</em></ins></span> 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
@@ -102,14 +122,12 @@
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: <span class="removed"><del><strong>nearly all free
software</strong></del></span> <span class="inserted"><ins><em>we know of only
a few cases of source code that</em></ins></span>
- is open <span class="removed"><del><strong>source,
- and nearly all open</strong></del></span> source <span
class="removed"><del><strong>software is free.</p></strong></del></span>
<span class="inserted"><ins><em>but not free. In principle it could happen
+ category are small: we know of only a few cases of source code that
+ is open source but not free. In principle it could happen
that some free programs are rejected as open source, but
- we don't know if that has ever happened.</p></em></ins></span>
- <p>We prefer the term “<a <span
class="removed"><del><strong>href=
-
"/philosophy/open-source-misses-the-point.html">free</strong></del></span>
- <span
class="inserted"><ins><em>href="/philosophy/open-source-misses-the-point.html">free</em></ins></span>
+ we don't know if that has ever happened.</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>
@@ -136,7 +154,8 @@
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
+ <span
class="removed"><del><strong>copyrighted”.</strong></del></span>
+ <span class="inserted"><ins><em>copyrighted.”</em></ins></span>
For clarity, we recommend using
“public domain” for that meaning only, and using
other terms to convey the other meanings.</p>
@@ -161,14 +180,12 @@
<p>Some copyleft licenses, such as GPL version 3, block
other means of turning software proprietary, such as <a
- <span
class="removed"><del><strong>href="http://www.gnu.org/licenses/rms-why-gplv3.html">tivoization</a>.</p></strong></del></span>
- <span
class="inserted"><ins><em>href="/licenses/rms-why-gplv3.html">tivoization</a>.</p></em></ins></span>
+ href="/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 <span
class="removed"><del><strong>href=
- "/copyleft/copyleft.html">copyleft</strong></del></span>
- <span
class="inserted"><ins><em>href="/licenses/copyleft.html">copyleft</em></ins></span>
article</a> for more explanation of
+ implied by the term “free software.” See our <a
+ href="/licenses/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,
@@ -176,9 +193,10 @@
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 <span
class="removed"><del><strong>href="/copyleft/gpl.html">GNU</strong></del></span>
<span
class="inserted"><ins><em>href="/licenses/gpl.html">GNU</em></ins></span>
General Public
+ <a href="/licenses/gpl.html">GNU General Public
License</a>. Two different copyleft licenses are usually
- “incompatible”, which means it is illegal to merge
+ <span
class="removed"><del><strong>“incompatible”,</strong></del></span>
+ <span
class="inserted"><ins><em>“incompatible,”</em></ins></span> 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>
@@ -196,7 +214,7 @@
a <a href="#ProprietarySoftware">proprietary</a> software
product.</p>
- <p>The <a href="http://www.x.org">X Window System</a>
+ <p>The <a <span
class="removed"><del><strong>href="http://www.x.org">X</strong></del></span>
<span
class="inserted"><ins><em>href="https://www.x.org/wiki/">X</em></ins></span>
Window System</a>
illustrates this. The X Consortium released X11 with
distribution terms that made it noncopylefted free
software, and subsequent developers have mostly followed the
@@ -214,13 +232,13 @@
<h3 id="LaxPermissiveLicensedSoftware">Lax permissive licensed
software</h3>
<p>Lax permissive licenses include the X11 license and the
- <a <span
class="removed"><del><strong>href="bsd.html">two</strong></del></span> <span
class="inserted"><ins><em>href="/licenses/bsd.html">two</em></ins></span>
BSD licenses</a>. These licenses permit
+ <a href="/licenses/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 <span
class="removed"><del><strong>href="/copyleft/gpl.html">GNU</strong></del></span>
<span
class="inserted"><ins><em>href="/licenses/gpl.html">GNU</em></ins></span>
GPL (General Public
+ <p>The <a href="/licenses/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>
@@ -263,27 +281,28 @@
<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>
+ is a “GNU <span
class="removed"><del><strong>package”.</p></strong></del></span>
<span class="inserted"><ins><em>package.”</p></em></ins></span>
<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 that is released under the auspices of the <a <span
class="removed"><del><strong>href=
+ "/gnu/gnu-history.html">GNU</strong></del></span>
+ <span
class="inserted"><ins><em>href="/gnu/gnu-history.html">GNU</em></ins></span>
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=
- <span
class="removed"><del><strong>"/copyleft/copyleft.html">copylefted</a>,</strong></del></span>
- <span
class="inserted"><ins><em>"/licenses/copyleft.html">copylefted</a>,</em></ins></span>
but not all; however,
+ "/licenses/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
+ <p>Some GNU software was written by <a <span
class="removed"><del><strong>href=
+
"http://www.fsf.org/about/staff/">staff</a></strong></del></span>
+ <span
class="inserted"><ins><em>href="https://www.fsf.org/about/staff/">staff</a></em></ins></span>
of
+ the <a <span
class="removed"><del><strong>href="http://www.fsf.org/">Free</strong></del></span>
<span
class="inserted"><ins><em>href="https://www.fsf.org/">Free</em></ins></span>
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
@@ -296,7 +315,7 @@
<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 <span
class="removed"><del><strong>transfered</strong></del></span> <span
class="inserted"><ins><em>transferred</em></ins></span> the copyright to the
FSF, the program
+ <p>If they have transferred 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>
@@ -315,9 +334,10 @@
<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 <span
class="removed"><del><strong>“ proprietary</strong></del></span> <span
class="inserted"><ins><em>“proprietary</em></ins></span>
- software”, which could not be. But we have dropped that
+ “semifree <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span> which could be
modified and
+ redistributed noncommercially, and “proprietary
+ <span
class="removed"><del><strong>software”,</strong></del></span>
+ <span class="inserted"><ins><em>software,”</em></ins></span>
which could not be. But we have dropped that
distinction and now use “proprietary software” as
synonymous with nonfree software.</p>
@@ -420,15 +440,17 @@
to say “commercial” when you mean
“proprietary.”</p>
-<!-- If needed, change the copyright block at the bottom. In general, -->
+<span class="removed"><del><strong><!-- 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." -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002."
--></strong></del></span>
+<span class="inserted"><ins><em></div></em></ins></span>
+
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div <span
class="removed"><del><strong>id="footer"></strong></del></span> <span
class="inserted"><ins><em>id="footer" role="contentinfo"></em></ins></span>
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to <a
@@ -446,16 +468,33 @@
to <a href="mailto:web-translators@gnu.org">
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</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>
+information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of this
article.</p>
</div>
-<p>Copyright © 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010,
2014, 2015, <span class="removed"><del><strong>2016</strong></del></span> <span
class="inserted"><ins><em>2016, 2017, 2018, 2019</em></ins></span> Free
+<span class="inserted"><ins><em><!-- Regarding copyright, in general,
standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. 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. --></em></ins></span>
+
+<p>Copyright © <span class="removed"><del><strong>1996, 1997, 1998,
2001, 2006,</strong></del></span> <span class="inserted"><ins><em>1996-1998,
2001-2005,</em></ins></span> 2007, <span class="removed"><del><strong>2009,
2010, 2014,</strong></del></span> <span
class="inserted"><ins><em>2009-2012,</em></ins></span> 2015, <span
class="removed"><del><strong>2016, 2017, 2018, 2019</strong></del></span> <span
class="inserted"><ins><em>2019, 2021</em></ins></span> Free
Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -466,12 +505,11 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/07/09 14:59:14 $
+$Date: 2021/09/19 20:32:22 $
<!-- timestamp end -->
</p>
</div>
-<span class="removed"><del><strong></div></strong></del></span>
-<span class="inserted"><ins><em></div><!-- for class="inner", starts
in the banner include --></em></ins></span>
+</div><!-- for class="inner", starts in the banner include -->
</body>
</html>
</pre></body></html>
Index: po/categories.zh-tw-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-tw-diff.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/categories.zh-tw-diff.html 27 Aug 2019 15:31:23 -0000 1.3
+++ po/categories.zh-tw-diff.html 19 Sep 2021 20:32:22 -0000 1.4
@@ -11,34 +11,53 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: <span
class="removed"><del><strong>1.86</strong></del></span> <span
class="inserted"><ins><em>1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> -->
<title>Categories of Free and Nonfree Software
- GNU Project - Free Software Foundation</title>
-<style type="text/css" media="screen">
+<style type="text/css" <span class="removed"><del><strong>media="screen">
<!--
-#content #diagram { overflow: auto; margin: 2em 0; }
-#diagram img { width: 31.7em; }
--->
-</style>
+#content</strong></del></span> <span
class="inserted"><ins><em>media="screen"><!--</em></ins></span>
+#diagram { <span class="removed"><del><strong>overflow:
auto;</strong></del></span> <span class="inserted"><ins><em>width: 32em;
max-width: 100%;</em></ins></span> margin: <span
class="removed"><del><strong>2em 0;</strong></del></span> <span
class="inserted"><ins><em>2.5em auto 2em;</em></ins></span> }
+#diagram img { width: <span
class="removed"><del><strong>31.7em;</strong></del></span> <span
class="inserted"><ins><em>29.9em; height: auto; overflow:
auto;</em></ins></span> }
+<span class="removed"><del><strong>-->
+</style></strong></del></span>
+<span class="inserted"><ins><em>#diagram p { font-size: .88em; text-align:
justify; }
+--></style></em></ins></span>
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.html" -->
-<h2>Categories of free and nonfree software</h2>
+<span class="inserted"><ins><em><!--#include
virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="article reduced-width"></em></ins></span>
+<h2>Categories of <span
class="removed"><del><strong>free</strong></del></span> <span
class="inserted"><ins><em>Free</em></ins></span> and <span
class="removed"><del><strong>nonfree software</h2>
<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
- Words which You Might Want to Avoid</a>.</p>
+ Words which You Might Want to
Avoid</a>.</p></strong></del></span> <span
class="inserted"><ins><em>Nonfree Software</h2></em></ins></span>
<!-- GNUN: localize URL /philosophy/category.png -->
-<p id="diagram" class="c">
+<span class="removed"><del><strong><p</strong></del></span>
+<span class="inserted"><ins><em><div</em></ins></span> id="diagram" <span
class="removed"><del><strong>class="c"></strong></del></span> <span
class="inserted"><ins><em>class="c" role="figure"
aria-labelledby="caption"></em></ins></span>
<img src="/philosophy/category.png" alt=" [Categories of software] " />
-</p>
+<span class="removed"><del><strong></p>
- <p>This diagram, originally by Chao-Kuei and updated by several
+ <p>This</strong></del></span>
+ <span class="inserted"><ins><em><p id="caption">
+ This</em></ins></span> 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>
+<span class="inserted"><ins><em></div>
+
+<div class="announcement" role="complementary">
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
+ Words which You Might Want to Avoid</a>.</p>
+</div></em></ins></span>
<h3 id="FreeSoftware">Free software</h3>
@@ -81,7 +100,8 @@
<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
+ <span
class="removed"><del><strong>“gratuit”.</strong></del></span>
+ <span
class="inserted"><ins><em>“gratuit.”</em></ins></span> 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
@@ -102,11 +122,10 @@
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: <span class="removed"><del><strong>nearly all free
software</strong></del></span> <span class="inserted"><ins><em>we know of only
a few cases of source code that</em></ins></span>
- is open <span class="removed"><del><strong>source,
- and nearly all open</strong></del></span> source <span
class="removed"><del><strong>software is free.</p></strong></del></span>
<span class="inserted"><ins><em>but not free. In principle it could happen
+ category are small: we know of only a few cases of source code that
+ is open source but not free. In principle it could happen
that some free programs are rejected as open source, but
- we don't know if that has ever happened.</p></em></ins></span>
+ we don't know if that has ever happened.</p>
<p>We prefer the term “<a
href="/philosophy/open-source-misses-the-point.html">free
software</a>” because it refers to
@@ -135,7 +154,8 @@
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
+ <span
class="removed"><del><strong>copyrighted”.</strong></del></span>
+ <span class="inserted"><ins><em>copyrighted.”</em></ins></span>
For clarity, we recommend using
“public domain” for that meaning only, and using
other terms to convey the other meanings.</p>
@@ -175,7 +195,8 @@
However, in actual practice nearly all copylefted software uses the
<a href="/licenses/gpl.html">GNU General Public
License</a>. Two different copyleft licenses are usually
- “incompatible”, which means it is illegal to merge
+ <span
class="removed"><del><strong>“incompatible”,</strong></del></span>
+ <span
class="inserted"><ins><em>“incompatible,”</em></ins></span> 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>
@@ -193,7 +214,7 @@
a <a href="#ProprietarySoftware">proprietary</a> software
product.</p>
- <p>The <a href="http://www.x.org">X Window System</a>
+ <p>The <a <span
class="removed"><del><strong>href="http://www.x.org">X</strong></del></span>
<span
class="inserted"><ins><em>href="https://www.x.org/wiki/">X</em></ins></span>
Window System</a>
illustrates this. The X Consortium released X11 with
distribution terms that made it noncopylefted free
software, and subsequent developers have mostly followed the
@@ -260,13 +281,14 @@
<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>
+ is a “GNU <span
class="removed"><del><strong>package”.</p></strong></del></span>
<span class="inserted"><ins><em>package.”</p></em></ins></span>
<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 that is released under the auspices of the <a <span
class="removed"><del><strong>href=
+ "/gnu/gnu-history.html">GNU</strong></del></span>
+ <span
class="inserted"><ins><em>href="/gnu/gnu-history.html">GNU</em></ins></span>
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
@@ -277,9 +299,10 @@
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
+ <p>Some GNU software was written by <a <span
class="removed"><del><strong>href=
+
"http://www.fsf.org/about/staff/">staff</a></strong></del></span>
+ <span
class="inserted"><ins><em>href="https://www.fsf.org/about/staff/">staff</a></em></ins></span>
of
+ the <a <span
class="removed"><del><strong>href="http://www.fsf.org/">Free</strong></del></span>
<span
class="inserted"><ins><em>href="https://www.fsf.org/">Free</em></ins></span>
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
@@ -311,9 +334,10 @@
<p>Proprietary software is another name for nonfree software.
In the past we subdivided nonfree software into
- “semifree software”, which could be modified and
+ “semifree <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span> which could be
modified and
redistributed noncommercially, and “proprietary
- software”, which could not be. But we have dropped that
+ <span
class="removed"><del><strong>software”,</strong></del></span>
+ <span class="inserted"><ins><em>software,”</em></ins></span>
which could not be. But we have dropped that
distinction and now use “proprietary software” as
synonymous with nonfree software.</p>
@@ -416,15 +440,17 @@
to say “commercial” when you mean
“proprietary.”</p>
-<!-- If needed, change the copyright block at the bottom. In general, -->
+<span class="removed"><del><strong><!-- 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." -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002."
--></strong></del></span>
+<span class="inserted"><ins><em></div></em></ins></span>
+
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div <span
class="removed"><del><strong>id="footer"></strong></del></span> <span
class="inserted"><ins><em>id="footer" role="contentinfo"></em></ins></span>
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to <a
@@ -442,16 +468,33 @@
to <a href="mailto:web-translators@gnu.org">
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</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>
+information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of this
article.</p>
</div>
-<p>Copyright © 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010,
2014, 2015, 2016, 2017, <span
class="removed"><del><strong>2018</strong></del></span> <span
class="inserted"><ins><em>2018, 2019</em></ins></span> Free
+<span class="inserted"><ins><em><!-- Regarding copyright, in general,
standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. 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. --></em></ins></span>
+
+<p>Copyright © <span class="removed"><del><strong>1996, 1997, 1998,
2001, 2006,</strong></del></span> <span class="inserted"><ins><em>1996-1998,
2001-2005,</em></ins></span> 2007, <span class="removed"><del><strong>2009,
2010, 2014,</strong></del></span> <span
class="inserted"><ins><em>2009-2012,</em></ins></span> 2015, <span
class="removed"><del><strong>2016, 2017, 2018, 2019</strong></del></span> <span
class="inserted"><ins><em>2019, 2021</em></ins></span> Free
Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -462,7 +505,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/08/27 15:31:23 $
+$Date: 2021/09/19 20:32:22 $
<!-- timestamp end -->
</p>
</div>
Index: po/fs-translations.ca-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.ca-diff.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- po/fs-translations.ca-diff.html 3 May 2021 18:02:25 -0000 1.43
+++ po/fs-translations.ca-diff.html 19 Sep 2021 20:32:22 -0000 1.44
@@ -10,8 +10,11 @@
span.inserted { background-color: #2f2; color: #000; }
</style></head>
<body><pre>
-<!--#include <span
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span>
-->
-<!-- Parent-Version: <span
class="removed"><del><strong>1.87</strong></del></span> <span
class="inserted"><ins><em>1.96</em></ins></span> -->
+<!--#include <span
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> -->
+<!-- Parent-Version: 1.96 -->
+<span class="inserted"><ins><em><!-- This page is derived from
/server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --></em></ins></span>
<title>Translations of the term “free software”
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/fs-translations.translist" -->
@@ -23,17 +26,20 @@
--><!--#endif -->
</style>
<!--#include virtual="/server/banner.html" -->
-<span class="inserted"><ins><em><div
class="reduced-width"></em></ins></span>
+<span class="inserted"><ins><em><!--#include
virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" --></em></ins></span>
+<div class="reduced-width">
<h2>Translations of the term “free software”</h2>
-<span class="inserted"><ins><em><div
class="thin"></div></em></ins></span>
+<div class="thin"></div>
<p>This is a list of recommended unambiguous translations for the term
“free software” (<a
href="/philosophy/open-source-misses-the-point.html">free as in
freedom</a>) into various languages.</p>
-<p>We also provide translations of “gratis software”,
-“proprietary software”, and “commercial software”
+<p>We also provide translations of “gratis <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span>
+“proprietary <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span> and
“commercial software”
to show how to make the contrast in various languages.</p>
<p>If you know a correction or addition to the list, please email it to
@@ -130,7 +136,7 @@
সà§à¦¬à¦¾à¦§à§à¦¨ সফà¦à¦à§à§à¦¯à¦¾à¦°
(swadhin software)
</td></tr>
-<span class="inserted"><ins><em><tr><th>Gratis Software</th>
+<tr><th>Gratis Software</th>
<td lang="bn" xml:lang="bn">
বিনামà§à¦²à§à¦¯à§à¦° সফà¦à¦à§à§à¦¯à¦¾à¦°
(binamuller software)
@@ -144,7 +150,7 @@
<td lang="bn" xml:lang="bn">
বাণিà¦à§à¦¯à¦¿à¦ সফà¦à¦à§à§à¦¯à¦¾à¦°
(banijjik software)
-</td></tr></em></ins></span>
+</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -629,7 +635,7 @@
<tr><th>Free Software</th>
<td lang="ms" xml:lang="ms">
perisian bebas</td></tr>
-<span class="inserted"><ins><em><tr><th>Gratis Software</th>
+<tr><th>Gratis Software</th>
<td lang="ms" xml:lang="ms">
perisian percuma</td></tr>
<tr><th>Proprietary Software</th>
@@ -637,7 +643,7 @@
perisian hakmilik</td></tr>
<tr><th>Commercial Software</th>
<td lang="ms" xml:lang="ms">
-perisian dagangan</td></tr></em></ins></span>
+perisian dagangan</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -722,7 +728,7 @@
software gratuito</td></tr>
<tr><th>Proprietary Software</th>
<td lang="pt" xml:lang="pt">
-software <span
class="removed"><del><strong>proprietário</td></tr></strong></del></span>
<span
class="inserted"><ins><em>privativo</td></tr></em></ins></span>
+software privativo</td></tr>
<tr><th>Commercial Software</th>
<td lang="pt" xml:lang="pt">
software comercial</td></tr>
@@ -963,15 +969,14 @@
<td lang="tr" xml:lang="tr">
özgür yazılım</td></tr>
<tr><th>Gratis Software</th>
-<span class="removed"><del><strong><td>bedava</strong></del></span>
-<span class="inserted"><ins><em><td lang="tr" xml:lang="tr">
+<td lang="tr" xml:lang="tr">
bedava yazılım</td></tr>
<tr><th>Proprietary Software</th>
<td lang="tr" xml:lang="tr">
özel mülk yazılım</td></tr>
<tr><th>Commercial Software</th>
<td lang="tr" xml:lang="tr">
-ticari</em></ins></span> yazılım</td></tr>
+ticari yazılım</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -1030,11 +1035,11 @@
Isoftware Ekhululekile</td></tr>
</table>
<!-- GNUN-SORT-STOP -->
-<span class="inserted"><ins><em></div></em></ins></span>
+</div>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div <span
class="removed"><del><strong>id="footer"></strong></del></span> <span
class="inserted"><ins><em>id="footer" role="contentinfo"></em></ins></span>
+<div id="footer" role="contentinfo">
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
@@ -1052,13 +1057,13 @@
to <a href="mailto:web-translators@gnu.org">
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of
+ <p>For information on coordinating and contributing translations
of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations
+README</a> for information on coordinating and contributing translations
of this article.</p>
</div>
@@ -1079,9 +1084,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, <span
class="removed"><del><strong>2019</strong></del></span> <span
class="inserted"><ins><em>2019, 2020, 2021</em></ins></span>
-Free Software Foundation, Inc.</p>
+<p>Copyright © <span class="removed"><del><strong>1999, 2000, 2004,
2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020,
2021</strong></del></span> <span
class="inserted"><ins><em>1999-2021</em></ins></span> Free Software Foundation,
Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -1091,7 +1095,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2021/05/03 18:02:25 $
+$Date: 2021/09/19 20:32:22 $
<!-- timestamp end -->
</p>
</div>
Index: po/fs-translations.de-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.de-diff.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/fs-translations.de-diff.html 9 Mar 2021 16:31:30 -0000 1.13
+++ po/fs-translations.de-diff.html 19 Sep 2021 20:32:22 -0000 1.14
@@ -10,8 +10,11 @@
span.inserted { background-color: #2f2; color: #000; }
</style></head>
<body><pre>
-<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: <span
class="removed"><del><strong>1.85</strong></del></span> <span
class="inserted"><ins><em>1.87</em></ins></span> -->
+<!--#include <span
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> -->
+<!-- Parent-Version: 1.96 -->
+<span class="inserted"><ins><em><!-- This page is derived from
/server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --></em></ins></span>
<title>Translations of the term “free software”
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/fs-translations.translist" -->
@@ -23,15 +26,20 @@
--><!--#endif -->
</style>
<!--#include virtual="/server/banner.html" -->
+<span class="inserted"><ins><em><!--#include
virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" --></em></ins></span>
+<div class="reduced-width">
<h2>Translations of the term “free software”</h2>
+<div class="thin"></div>
<p>This is a list of recommended unambiguous translations for the term
“free software” (<a
href="/philosophy/open-source-misses-the-point.html">free as in
freedom</a>) into various languages.</p>
-<p>We also provide translations of “gratis software”,
-“proprietary software”, and “commercial software”
+<p>We also provide translations of “gratis <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span>
+“proprietary <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span> and
“commercial software”
to show how to make the contrast in various languages.</p>
<p>If you know a correction or addition to the list, please email it to
@@ -128,7 +136,7 @@
সà§à¦¬à¦¾à¦§à§à¦¨ সফà¦à¦à§à§à¦¯à¦¾à¦°
(swadhin software)
</td></tr>
-<span class="inserted"><ins><em><tr><th>Gratis Software</th>
+<tr><th>Gratis Software</th>
<td lang="bn" xml:lang="bn">
বিনামà§à¦²à§à¦¯à§à¦° সফà¦à¦à§à§à¦¯à¦¾à¦°
(binamuller software)
@@ -142,7 +150,7 @@
<td lang="bn" xml:lang="bn">
বাণিà¦à§à¦¯à¦¿à¦ সফà¦à¦à§à§à¦¯à¦¾à¦°
(banijjik software)
-</td></tr></em></ins></span>
+</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -246,12 +254,12 @@
<tr><th>Gratis Software</th>
<td lang="cs" xml:lang="cs">
bezplatný software</td></tr>
-<span class="inserted"><ins><em><tr><th>Proprietary
Software</th>
+<tr><th>Proprietary Software</th>
<td lang="cs" xml:lang="cs">
proprietárnà software</td></tr>
<tr><th>Commercial Software</th>
<td lang="cs" xml:lang="cs">
-komerÄnà software</td></tr></em></ins></span>
+komerÄnà software</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -297,7 +305,7 @@
<tr><th>Free Software</th>
<td lang="eo" xml:lang="eo">
libera programaro / programo</td></tr>
-<span class="inserted"><ins><em><tr><th>Gratis Software</th>
+<tr><th>Gratis Software</th>
<td lang="eo" xml:lang="eo">
senpaga programaro / programo</td></tr>
<tr><th>Proprietary Software</th>
@@ -305,7 +313,7 @@
mallibera programaro / programo</td></tr>
<tr><th>Commercial Software</th>
<td lang="eo" xml:lang="eo">
-komerca programaro / programo</td></tr></em></ins></span>
+komerca programaro / programo</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -627,7 +635,7 @@
<tr><th>Free Software</th>
<td lang="ms" xml:lang="ms">
perisian bebas</td></tr>
-<span class="inserted"><ins><em><tr><th>Gratis Software</th>
+<tr><th>Gratis Software</th>
<td lang="ms" xml:lang="ms">
perisian percuma</td></tr>
<tr><th>Proprietary Software</th>
@@ -635,7 +643,7 @@
perisian hakmilik</td></tr>
<tr><th>Commercial Software</th>
<td lang="ms" xml:lang="ms">
-perisian dagangan</td></tr></em></ins></span>
+perisian dagangan</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -720,7 +728,7 @@
software gratuito</td></tr>
<tr><th>Proprietary Software</th>
<td lang="pt" xml:lang="pt">
-software proprietário</td></tr>
+software privativo</td></tr>
<tr><th>Commercial Software</th>
<td lang="pt" xml:lang="pt">
software comercial</td></tr>
@@ -912,7 +920,7 @@
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
-<h3 <span class="inserted"><ins><em>id="te">Telugu</h3>
+<h3 id="te">Telugu</h3>
<!-- GNUN-SORT-END-KEY -->
<table border="1">
<tr><th>Language Code</th>
@@ -940,7 +948,7 @@
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
-<h3</em></ins></span> id="th">Thai</h3>
+<h3 id="th">Thai</h3>
<!-- GNUN-SORT-END-KEY -->
<table border="1">
<tr><th>Language Code</th>
@@ -961,15 +969,14 @@
<td lang="tr" xml:lang="tr">
özgür yazılım</td></tr>
<tr><th>Gratis Software</th>
-<span class="removed"><del><strong><td>bedava</strong></del></span>
-<span class="inserted"><ins><em><td lang="tr" xml:lang="tr">
+<td lang="tr" xml:lang="tr">
bedava yazılım</td></tr>
<tr><th>Proprietary Software</th>
<td lang="tr" xml:lang="tr">
özel mülk yazılım</td></tr>
<tr><th>Commercial Software</th>
<td lang="tr" xml:lang="tr">
-ticari</em></ins></span> yazılım</td></tr>
+ticari yazılım</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -1028,10 +1035,11 @@
Isoftware Ekhululekile</td></tr>
</table>
<!-- GNUN-SORT-STOP -->
+</div>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
@@ -1049,13 +1057,13 @@
to <a href="mailto:web-translators@gnu.org">
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and contributing translations
of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
of this article.</p>
</div>
@@ -1076,9 +1084,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016, 2017, <span
class="removed"><del><strong>2018</strong></del></span> <span
class="inserted"><ins><em>2018, 2019, 2020, 2021</em></ins></span>
-Free Software Foundation, Inc.</p>
+<p>Copyright © <span class="removed"><del><strong>1999, 2000, 2004,
2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020,
2021</strong></del></span> <span
class="inserted"><ins><em>1999-2021</em></ins></span> Free Software Foundation,
Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -1088,12 +1095,11 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2021/03/09 16:31:30 $
+$Date: 2021/09/19 20:32:22 $
<!-- timestamp end -->
</p>
</div>
-<span class="removed"><del><strong></div></strong></del></span>
-<span class="inserted"><ins><em></div><!-- for class="inner", starts
in the banner include --></em></ins></span>
+</div><!-- for class="inner", starts in the banner include -->
</body>
</html>
</pre></body></html>
Index: po/fs-translations.pl-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.pl-diff.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- po/fs-translations.pl-diff.html 9 Mar 2021 16:31:30 -0000 1.27
+++ po/fs-translations.pl-diff.html 19 Sep 2021 20:32:22 -0000 1.28
@@ -10,8 +10,11 @@
span.inserted { background-color: #2f2; color: #000; }
</style></head>
<body><pre>
-<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.87 -->
+<!--#include <span
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> -->
+<!-- Parent-Version: 1.96 -->
+<span class="inserted"><ins><em><!-- This page is derived from
/server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --></em></ins></span>
<title>Translations of the term “free software”
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/fs-translations.translist" -->
@@ -23,15 +26,20 @@
--><!--#endif -->
</style>
<!--#include virtual="/server/banner.html" -->
+<span class="inserted"><ins><em><!--#include
virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" --></em></ins></span>
+<div class="reduced-width">
<h2>Translations of the term “free software”</h2>
+<div class="thin"></div>
<p>This is a list of recommended unambiguous translations for the term
“free software” (<a
href="/philosophy/open-source-misses-the-point.html">free as in
freedom</a>) into various languages.</p>
-<p>We also provide translations of “gratis software”,
-“proprietary software”, and “commercial software”
+<p>We also provide translations of “gratis <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span>
+“proprietary <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span> and
“commercial software”
to show how to make the contrast in various languages.</p>
<p>If you know a correction or addition to the list, please email it to
@@ -128,7 +136,7 @@
সà§à¦¬à¦¾à¦§à§à¦¨ সফà¦à¦à§à§à¦¯à¦¾à¦°
(swadhin software)
</td></tr>
-<span class="inserted"><ins><em><tr><th>Gratis Software</th>
+<tr><th>Gratis Software</th>
<td lang="bn" xml:lang="bn">
বিনামà§à¦²à§à¦¯à§à¦° সফà¦à¦à§à§à¦¯à¦¾à¦°
(binamuller software)
@@ -142,7 +150,7 @@
<td lang="bn" xml:lang="bn">
বাণিà¦à§à¦¯à¦¿à¦ সফà¦à¦à§à§à¦¯à¦¾à¦°
(banijjik software)
-</td></tr></em></ins></span>
+</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -627,7 +635,7 @@
<tr><th>Free Software</th>
<td lang="ms" xml:lang="ms">
perisian bebas</td></tr>
-<span class="inserted"><ins><em><tr><th>Gratis Software</th>
+<tr><th>Gratis Software</th>
<td lang="ms" xml:lang="ms">
perisian percuma</td></tr>
<tr><th>Proprietary Software</th>
@@ -635,7 +643,7 @@
perisian hakmilik</td></tr>
<tr><th>Commercial Software</th>
<td lang="ms" xml:lang="ms">
-perisian dagangan</td></tr></em></ins></span>
+perisian dagangan</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -720,7 +728,7 @@
software gratuito</td></tr>
<tr><th>Proprietary Software</th>
<td lang="pt" xml:lang="pt">
-software proprietário</td></tr>
+software privativo</td></tr>
<tr><th>Commercial Software</th>
<td lang="pt" xml:lang="pt">
software comercial</td></tr>
@@ -961,15 +969,14 @@
<td lang="tr" xml:lang="tr">
özgür yazılım</td></tr>
<tr><th>Gratis Software</th>
-<span class="removed"><del><strong><td>bedava</strong></del></span>
-<span class="inserted"><ins><em><td lang="tr" xml:lang="tr">
+<td lang="tr" xml:lang="tr">
bedava yazılım</td></tr>
<tr><th>Proprietary Software</th>
<td lang="tr" xml:lang="tr">
özel mülk yazılım</td></tr>
<tr><th>Commercial Software</th>
<td lang="tr" xml:lang="tr">
-ticari</em></ins></span> yazılım</td></tr>
+ticari yazılım</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -1028,10 +1035,11 @@
Isoftware Ekhululekile</td></tr>
</table>
<!-- GNUN-SORT-STOP -->
+</div>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
@@ -1049,13 +1057,13 @@
to <a href="mailto:web-translators@gnu.org">
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and contributing translations
of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
of this article.</p>
</div>
@@ -1076,9 +1084,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, <span
class="removed"><del><strong>2019</strong></del></span> <span
class="inserted"><ins><em>2019, 2020, 2021</em></ins></span>
-Free Software Foundation, Inc.</p>
+<p>Copyright © <span class="removed"><del><strong>1999, 2000, 2004,
2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020,
2021</strong></del></span> <span
class="inserted"><ins><em>1999-2021</em></ins></span> Free Software Foundation,
Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -1088,7 +1095,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2021/03/09 16:31:30 $
+$Date: 2021/09/19 20:32:22 $
<!-- timestamp end -->
</p>
</div>
Index: po/fs-translations.ro-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.ro-diff.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- po/fs-translations.ro-diff.html 3 May 2021 18:02:27 -0000 1.47
+++ po/fs-translations.ro-diff.html 19 Sep 2021 20:32:22 -0000 1.48
@@ -10,8 +10,11 @@
span.inserted { background-color: #2f2; color: #000; }
</style></head>
<body><pre>
-<!--#include <span
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span>
-->
-<!-- Parent-Version: <span
class="removed"><del><strong>1.87</strong></del></span> <span
class="inserted"><ins><em>1.96</em></ins></span> -->
+<!--#include <span
class="removed"><del><strong>virtual="/server/html5-header.html"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/server/header.html"</em></ins></span> -->
+<!-- Parent-Version: 1.96 -->
+<span class="inserted"><ins><em><!-- This page is derived from
/server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --></em></ins></span>
<title>Translations of the term “free software”
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/fs-translations.translist" -->
@@ -23,17 +26,20 @@
--><!--#endif -->
</style>
<!--#include virtual="/server/banner.html" -->
-<span class="inserted"><ins><em><div
class="reduced-width"></em></ins></span>
+<span class="inserted"><ins><em><!--#include
virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" --></em></ins></span>
+<div class="reduced-width">
<h2>Translations of the term “free software”</h2>
-<span class="inserted"><ins><em><div
class="thin"></div></em></ins></span>
+<div class="thin"></div>
<p>This is a list of recommended unambiguous translations for the term
“free software” (<a
href="/philosophy/open-source-misses-the-point.html">free as in
freedom</a>) into various languages.</p>
-<p>We also provide translations of “gratis software”,
-“proprietary software”, and “commercial software”
+<p>We also provide translations of “gratis <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span>
+“proprietary <span
class="removed"><del><strong>software”,</strong></del></span> <span
class="inserted"><ins><em>software,”</em></ins></span> and
“commercial software”
to show how to make the contrast in various languages.</p>
<p>If you know a correction or addition to the list, please email it to
@@ -130,7 +136,7 @@
সà§à¦¬à¦¾à¦§à§à¦¨ সফà¦à¦à§à§à¦¯à¦¾à¦°
(swadhin software)
</td></tr>
-<span class="inserted"><ins><em><tr><th>Gratis Software</th>
+<tr><th>Gratis Software</th>
<td lang="bn" xml:lang="bn">
বিনামà§à¦²à§à¦¯à§à¦° সফà¦à¦à§à§à¦¯à¦¾à¦°
(binamuller software)
@@ -144,7 +150,7 @@
<td lang="bn" xml:lang="bn">
বাণিà¦à§à¦¯à¦¿à¦ সফà¦à¦à§à§à¦¯à¦¾à¦°
(banijjik software)
-</td></tr></em></ins></span>
+</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -629,7 +635,7 @@
<tr><th>Free Software</th>
<td lang="ms" xml:lang="ms">
perisian bebas</td></tr>
-<span class="inserted"><ins><em><tr><th>Gratis Software</th>
+<tr><th>Gratis Software</th>
<td lang="ms" xml:lang="ms">
perisian percuma</td></tr>
<tr><th>Proprietary Software</th>
@@ -637,7 +643,7 @@
perisian hakmilik</td></tr>
<tr><th>Commercial Software</th>
<td lang="ms" xml:lang="ms">
-perisian dagangan</td></tr></em></ins></span>
+perisian dagangan</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -722,7 +728,7 @@
software gratuito</td></tr>
<tr><th>Proprietary Software</th>
<td lang="pt" xml:lang="pt">
-software <span
class="removed"><del><strong>proprietário</td></tr></strong></del></span>
<span
class="inserted"><ins><em>privativo</td></tr></em></ins></span>
+software privativo</td></tr>
<tr><th>Commercial Software</th>
<td lang="pt" xml:lang="pt">
software comercial</td></tr>
@@ -963,15 +969,14 @@
<td lang="tr" xml:lang="tr">
özgür yazılım</td></tr>
<tr><th>Gratis Software</th>
-<span class="removed"><del><strong><td>bedava</strong></del></span>
-<span class="inserted"><ins><em><td lang="tr" xml:lang="tr">
+<td lang="tr" xml:lang="tr">
bedava yazılım</td></tr>
<tr><th>Proprietary Software</th>
<td lang="tr" xml:lang="tr">
özel mülk yazılım</td></tr>
<tr><th>Commercial Software</th>
<td lang="tr" xml:lang="tr">
-ticari</em></ins></span> yazılım</td></tr>
+ticari yazılım</td></tr>
</table>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -1030,11 +1035,11 @@
Isoftware Ekhululekile</td></tr>
</table>
<!-- GNUN-SORT-STOP -->
-<span class="inserted"><ins><em></div></em></ins></span>
+</div>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div <span
class="removed"><del><strong>id="footer"></strong></del></span> <span
class="inserted"><ins><em>id="footer" role="contentinfo"></em></ins></span>
+<div id="footer" role="contentinfo">
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
@@ -1052,13 +1057,13 @@
to <a href="mailto:web-translators@gnu.org">
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of
+ <p>For information on coordinating and contributing translations
of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations
+README</a> for information on coordinating and contributing translations
of this article.</p>
</div>
@@ -1079,9 +1084,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, <span
class="removed"><del><strong>2019</strong></del></span> <span
class="inserted"><ins><em>2019, 2020, 2021</em></ins></span>
-Free Software Foundation, Inc.</p>
+<p>Copyright © <span class="removed"><del><strong>1999, 2000, 2004,
2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020,
2021</strong></del></span> <span
class="inserted"><ins><em>1999-2021</em></ins></span> Free Software Foundation,
Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -1091,7 +1095,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2021/05/03 18:02:27 $
+$Date: 2021/09/19 20:32:22 $
<!-- timestamp end -->
</p>
</div>
Index: po/moglen-harvard-speech-2004.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/moglen-harvard-speech-2004.fr.po,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- po/moglen-harvard-speech-2004.fr.po 19 Sep 2021 17:59:50 -0000 1.49
+++ po/moglen-harvard-speech-2004.fr.po 19 Sep 2021 20:32:22 -0000 1.50
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: moglen-harvard-speech-2004.html\n"
-"POT-Creation-Date: 2021-09-19 14:56+0000\n"
+"POT-Creation-Date: 2021-09-19 20:25+0000\n"
"PO-Revision-Date: 2021-09-19 19:54+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <trad-gnu@april.org>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-09-19 20:25+0000\n"
"Plural-Forms: \n"
"X-Generator: Gtranslator 2.91.5\n"
@@ -352,6 +353,36 @@
"manière qui contribue à la perfectibilité de l'être humain."
#. type: Content of: <div><p>
+# | That's what we were trying to do, and we have done it. We are, as it
+# | happens, driving out of business a firm called the Santa Cruz Operation
+# | <i>[sic]</i>—or SCO Ltd. That was not our intention. That's a result
+# | of something called the creative destruction potential of capitalism, once
+# | upon a time identified by Joseph Schumpeter. We are doing a thing better
+# | at lower cost than it is presently being done by those people using other
+# | people's money to do it. The [-result - celebrated-]
+# | {+result—celebrated+} everywhere that capitalism is actually
+# | believed in—is that existing firms are going to have to change their
+# | way of operation or leave the market. This is usually regarded as a
+# | positive outcome, associated with enormous welfare increases of which
+# | capitalism celebrates at every opportunity everywhere all the time in the
+# | hope that the few defects that capitalism may possess will be less
+# | prominently visible once that enormous benefit is carefully observed.
+#, fuzzy
+#| msgid ""
+#| "That's what we were trying to do, and we have done it. We are, as it "
+#| "happens, driving out of business a firm called the Santa Cruz Operation "
+#| "<i>[sic]</i>—or SCO Ltd. That was not our intention. That's a "
+#| "result of something called the creative destruction potential of "
+#| "capitalism, once upon a time identified by Joseph Schumpeter. We are "
+#| "doing a thing better at lower cost than it is presently being done by "
+#| "those people using other people's money to do it. The result - celebrated "
+#| "everywhere that capitalism is actually believed in—is that existing "
+#| "firms are going to have to change their way of operation or leave the "
+#| "market. This is usually regarded as a positive outcome, associated with "
+#| "enormous welfare increases of which capitalism celebrates at every "
+#| "opportunity everywhere all the time in the hope that the few defects that "
+#| "capitalism may possess will be less prominently visible once that "
+#| "enormous benefit is carefully observed."
msgid ""
"That's what we were trying to do, and we have done it. We are, as it "
"happens, driving out of business a firm called the Santa Cruz Operation <i>"
@@ -359,7 +390,7 @@
"something called the creative destruction potential of capitalism, once upon "
"a time identified by Joseph Schumpeter. We are doing a thing better at lower "
"cost than it is presently being done by those people using other people's "
-"money to do it. The result - celebrated everywhere that capitalism is "
+"money to do it. The result—celebrated everywhere that capitalism is "
"actually believed in—is that existing firms are going to have to "
"change their way of operation or leave the market. This is usually regarded "
"as a positive outcome, associated with enormous welfare increases of which "
Index: po/moglen-harvard-speech-2004.pot
===================================================================
RCS file: /web/www/www/philosophy/po/moglen-harvard-speech-2004.pot,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/moglen-harvard-speech-2004.pot 19 Sep 2021 15:05:55 -0000 1.14
+++ po/moglen-harvard-speech-2004.pot 19 Sep 2021 20:32:22 -0000 1.15
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: moglen-harvard-speech-2004.html\n"
-"POT-Creation-Date: 2021-09-19 14:56+0000\n"
+"POT-Creation-Date: 2021-09-19 20:25+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -238,12 +238,12 @@
"of something called the creative destruction potential of capitalism, once "
"upon a time identified by Joseph Schumpeter. We are doing a thing better at "
"lower cost than it is presently being done by those people using other "
-"people's money to do it. The result - celebrated everywhere that capitalism "
-"is actually believed in—is that existing firms are going to have to "
-"change their way of operation or leave the market. This is usually regarded "
-"as a positive outcome, associated with enormous welfare increases of which "
-"capitalism celebrates at every opportunity everywhere all the time in the "
-"hope that the few defects that capitalism may possess will be less "
+"people's money to do it. The result—celebrated everywhere that "
+"capitalism is actually believed in—is that existing firms are going to "
+"have to change their way of operation or leave the market. This is usually "
+"regarded as a positive outcome, associated with enormous welfare increases "
+"of which capitalism celebrates at every opportunity everywhere all the time "
+"in the hope that the few defects that capitalism may possess will be less "
"prominently visible once that enormous benefit is carefully observed."
msgstr ""
Index: po/moglen-harvard-speech-2004.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/moglen-harvard-speech-2004.ru.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/moglen-harvard-speech-2004.ru.po 19 Sep 2021 16:36:52 -0000 1.14
+++ po/moglen-harvard-speech-2004.ru.po 19 Sep 2021 20:32:22 -0000 1.15
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: moglen-harvard-speech-2004.html\n"
-"POT-Creation-Date: 2021-09-19 14:56+0000\n"
+"POT-Creation-Date: 2021-09-19 20:25+0000\n"
"PO-Revision-Date: 2021-09-19 17:00+0000\n"
"Last-Translator: Ineiev <ineiev@gnu.org>\n"
"Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-09-19 20:25+0000\n"
#. type: Content of: <title>
msgid "Eben Moglen Harvard Speech - GNU Project - Free Software Foundation"
@@ -350,6 +351,36 @@
"одновÑеменно вноÑÐ¸Ñ Ð²ÐºÐ»Ð°Ð´ в
ÑовеÑÑенÑÑвование ÑеловеÑеÑкой пÑиÑодÑ."
#. type: Content of: <div><p>
+# | That's what we were trying to do, and we have done it. We are, as it
+# | happens, driving out of business a firm called the Santa Cruz Operation
+# | <i>[sic]</i>—or SCO Ltd. That was not our intention. That's a result
+# | of something called the creative destruction potential of capitalism, once
+# | upon a time identified by Joseph Schumpeter. We are doing a thing better
+# | at lower cost than it is presently being done by those people using other
+# | people's money to do it. The [-result - celebrated-]
+# | {+result—celebrated+} everywhere that capitalism is actually
+# | believed in—is that existing firms are going to have to change their
+# | way of operation or leave the market. This is usually regarded as a
+# | positive outcome, associated with enormous welfare increases of which
+# | capitalism celebrates at every opportunity everywhere all the time in the
+# | hope that the few defects that capitalism may possess will be less
+# | prominently visible once that enormous benefit is carefully observed.
+#, fuzzy
+#| msgid ""
+#| "That's what we were trying to do, and we have done it. We are, as it "
+#| "happens, driving out of business a firm called the Santa Cruz Operation "
+#| "<i>[sic]</i>—or SCO Ltd. That was not our intention. That's a "
+#| "result of something called the creative destruction potential of "
+#| "capitalism, once upon a time identified by Joseph Schumpeter. We are "
+#| "doing a thing better at lower cost than it is presently being done by "
+#| "those people using other people's money to do it. The result - celebrated "
+#| "everywhere that capitalism is actually believed in—is that existing "
+#| "firms are going to have to change their way of operation or leave the "
+#| "market. This is usually regarded as a positive outcome, associated with "
+#| "enormous welfare increases of which capitalism celebrates at every "
+#| "opportunity everywhere all the time in the hope that the few defects that "
+#| "capitalism may possess will be less prominently visible once that "
+#| "enormous benefit is carefully observed."
msgid ""
"That's what we were trying to do, and we have done it. We are, as it "
"happens, driving out of business a firm called the Santa Cruz Operation <i>"
@@ -357,7 +388,7 @@
"something called the creative destruction potential of capitalism, once upon "
"a time identified by Joseph Schumpeter. We are doing a thing better at lower "
"cost than it is presently being done by those people using other people's "
-"money to do it. The result - celebrated everywhere that capitalism is "
+"money to do it. The result—celebrated everywhere that capitalism is "
"actually believed in—is that existing firms are going to have to "
"change their way of operation or leave the market. This is usually regarded "
"as a positive outcome, associated with enormous welfare increases of which "
Index: po/why-call-it-the-swindle.zh-tw-diff.html
===================================================================
RCS file: po/why-call-it-the-swindle.zh-tw-diff.html
diff -N po/why-call-it-the-swindle.zh-tw-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/why-call-it-the-swindle.zh-tw-diff.html 19 Sep 2021 20:32:22 -0000
1.1
@@ -0,0 +1,208 @@
+<!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/why-call-it-the-swindle.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" -->
+<!-- Parent-Version: <span
class="removed"><del><strong>1.86</strong></del></span> <span
class="inserted"><ins><em>1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> -->
+<title>Why call it the Swindle
+- GNU Project - Free Software Foundation</title>
+ <!--#include virtual="/philosophy/po/why-call-it-the-swindle.translist"
-->
+<!--#include virtual="/server/banner.html" -->
+<span class="inserted"><ins><em><!--#include
virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="article reduced-width"></em></ins></span>
+<h2>Why Call It The Swindle?</h2>
+
+<span class="removed"><del><strong><p>by</strong></del></span>
+
+<span class="inserted"><ins><em><address
class="byline">by</em></ins></span> <a <span
class="removed"><del><strong>href="http://www.stallman.org/"><strong>Richard
+Stallman</strong></a></p></strong></del></span> <span
class="inserted"><ins><em>href="https://www.stallman.org/">Richard
+Stallman</a></address></em></ins></span>
+
+<p>I go out of my way to call nasty things by names that criticize
+them. I call Apple's user-subjugating computers the
+“iThings,” and Amazon's abusive e-reader the
+“Swindle.” Sometimes I refer to Microsoft's operating
+system as “Losedows”; I referred to Microsoft's first
+operating system as “MS-Dog.”[<a href="#f1">1</a>] Of
+course, I do this to vent my feelings and have fun. But this fun is
+more than personal; it serves an important purpose. Mocking our
+enemies recruits the power of humor into our cause.</p>
+
+<p>Twisting a name is disrespectful. If we respected the makers of
+these products, we would use the names that they chose … and that's
+exactly the point. These noxious products deserve our contempt, not
+our respect. Every proprietary program subjects its users to some
+entity's power, but nowadays most widely used ones go beyond that to spy on
+users, restrict them and even push them around: the trend is for
+products to get nastier. These products deserve to be wiped out. Those
+with DRM ought to be illegal.</p>
+
+<p>When we mention them, we should show that we condemn them, and what
+easier way than by twisting their names? If we don't do that, it is
+all too easy to mention them and fail to present the condemnation.
+When the product comes up in the middle of some other topic, for
+instance, explaining at greater length that the product is bad might
+seem like a long digression.</p>
+
+<p>To mention these products by name and fail to condemn them has the
+effect of legitimizing them, which is the opposite of what they call
+for.</p>
+
+<p>Companies choose names for products as part of a marketing plan.
+They choose names they think people will be likely to repeat, then
+invest millions of dollars in marketing campaigns to make people
+repeat and think about those names. Usually these marketing
+campaigns are intended to convince people to admire the products based
+on their superficial attractions and overlook the harm they do.</p>
+
+<p>Every time we call these products by the names the companies use,
+we contribute to their marketing campaigns. Repeating those names is
+active support for the products; twisting them denies the products our
+support.</p>
+
+<p>Other terminology besides product names can raise a similar issue.
+For instance, DRM refers to building technology products to restrict
+their users for the benefit of someone else. This inexcusable practice
+deserves our burning hatred until we wipe it out. Naturally, those
+responsible gave it a name that frames the issue from their point of
+view: “Digital Rights Management.” This name is the basis
+of a public relations campaign that aims to win support from entities
+ranging from governments to the W3C.[<a href="#f2">2</a>]</p>
+
+<p>To use their term is to take their side. If that's not the side
+you're on, why give it your implicit support?</p>
+
+<p>We take the users' side, and from the users' point of view, what
+these malfeatures manage are not rights but restrictions. So we call
+them “Digital Restrictions Management.”</p>
+
+<p>Neither of those terms is neutral: choose a term, and you choose a
+side. Please choose the users' side and please let it show.</p>
+
+<p>Once, a man in the audience at my speech claimed that the name
+“Digital Rights Management” was the official name of
+“DRM,” the only
+possible correct name, because it was the first name. He argued that
+as a consequence it was wrong for us to say “Digital Restrictions
+Management.”</p>
+
+<p>Those who make a product or carry out a business practice typically
+choose a name for it before we even know it exists. If their temporal
+precedence obligated us to use their name, they would have an
+additional automatic advantage, on top of their money, their media
+influence and their technological position. We would have to fight
+them with our mouths tied behind our backs.</p>
+
+<p>Some people feel a distaste for twisting names and say it sounds
+“juvenile” or “unprofessional.” What they mean
+is, it doesn't sound humorless and stodgy—and that's a good
+thing, because we would not have laughter on our side if we tried to
+sound “professional.” Fighting oppression is far more
+serious than professional work, so we've got to add comic relief. It
+calls for real maturity, which includes some childishness, not
+“acting like an adult.”</p>
+
+<p>If you don't like our choice of name parodies, you can invent your
+own. The more, the merrier. Of course, there are other ways to express
+condemnation. If you want to sound “professional,” you can
+show it in other ways. They can get the point across, but they
+require more time and effort, especially if you don't make use of
+mockery. Take care this does not lead you to skimp; don't let the
+pressure against such “digression” push you into
+insufficiently criticizing the nasty things you mention, because that
+would have the effect of legitimizing them.</p>
+
+<span
class="removed"><del><strong><h3>Footnotes</h3></strong></del></span>
+<span class="inserted"><ins><em><div class="column-limit"></div>
+
+<h3 class="footnote">Footnotes</h3></em></ins></span>
+
+<ol>
+<li id="f1">Take action against these products:
+<a href="https://u.fsf.org/ithings">u.fsf.org/ithings</a>,
+<a href="https://u.fsf.org/swindle">u.fsf.org/swindle</a>,
+<a href="https://u.fsf.org/ebookslist">u.fsf.org/ebookslist</a>,
+<a href="https://upgradefromwindows.org">upgradefromwindows.org</a>
+</li>
+<li id="f2"><a
href="https://u.fsf.org/drm">u.fsf.org/drm</a></li>
+</ol>
+<span class="inserted"><ins><em></div></em></ins></span>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div <span
class="removed"><del><strong>id="footer"></strong></del></span> <span
class="inserted"><ins><em>id="footer" role="contentinfo"></em></ins></span>
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:gnu@gnu.org"><gnu@gnu.org></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:webmasters@gnu.org"><webmasters@gnu.org></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:web-translators@gnu.org">
+ <web-translators@gnu.org></a>.</p>
+
+ <p>For information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and <span
class="removed"><del><strong>submitting</strong></del></span> <span
class="inserted"><ins><em>contributing</em></ins></span> translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. 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. -->
+
+<p>Copyright © 2013, <span
class="removed"><del><strong>2018</strong></del></span> <span
class="inserted"><ins><em>2021</em></ins></span> Richard Stallman</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
+Commons Attribution-NoDerivatives 4.0 International
License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2021/09/19 20:32:22 $
+<!-- timestamp end -->
+</p>
+</div>
+</div><!-- for class="inner", starts in the banner include -->
+</body>
+</html>
+</pre></body></html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy categories.cs.html categories.it...,
GNUN <=