www-commits
[Top][All Lists]
Advanced

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

www/philosophy/po words-to-avoid.ar-diff.html w...


From: GNUN
Subject: www/philosophy/po words-to-avoid.ar-diff.html w...
Date: Wed, 21 Jul 2021 15:32:35 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/07/21 15:32:35

Modified files:
        philosophy/po  : words-to-avoid.ar-diff.html 
                         words-to-avoid.ar.po words-to-avoid.ca.po 
                         words-to-avoid.cs.po 
                         words-to-avoid.de-diff.html 
                         words-to-avoid.de.po words-to-avoid.es.po 
                         words-to-avoid.fr.po 
                         words-to-avoid.it-diff.html 
                         words-to-avoid.it.po words-to-avoid.ja.po 
                         words-to-avoid.pl.po words-to-avoid.pot 
                         words-to-avoid.pt-br.po words-to-avoid.ro.po 
                         words-to-avoid.ru.po words-to-avoid.sq.po 
                         words-to-avoid.sr.po words-to-avoid.tr.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ar-diff.html?cvsroot=www&r1=1.105&r2=1.106
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ar.po?cvsroot=www&r1=1.128&r2=1.129
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ca.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.cs.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.de-diff.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.de.po?cvsroot=www&r1=1.200&r2=1.201
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.es.po?cvsroot=www&r1=1.276&r2=1.277
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.fr.po?cvsroot=www&r1=1.298&r2=1.299
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.it-diff.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.it.po?cvsroot=www&r1=1.257&r2=1.258
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ja.po?cvsroot=www&r1=1.185&r2=1.186
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.pl.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.pot?cvsroot=www&r1=1.133&r2=1.134
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.pt-br.po?cvsroot=www&r1=1.54&r2=1.55
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ro.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.247&r2=1.248
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sq.po?cvsroot=www&r1=1.123&r2=1.124
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sr.po?cvsroot=www&r1=1.145&r2=1.146
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.tr.po?cvsroot=www&r1=1.144&r2=1.145

Patches:
Index: words-to-avoid.ar-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ar-diff.html,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- words-to-avoid.ar-diff.html 31 May 2021 09:06:22 -0000      1.105
+++ words-to-avoid.ar-diff.html 21 Jul 2021 19:32:31 -0000      1.106
@@ -11,12 +11,24 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.70</strong></del></span> <span 
class="inserted"><ins><em>1.90</em></ins></span> --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.70</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="term" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Words to Avoid (or Use with Care) Because They Are Loaded or 
Confusing
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/banner.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/philosophy/po/words-to-avoid.translist"</em></ins></span>
 --&gt;
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/philosophy/po/words-to-avoid.translist"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/banner.html"</em></ins></span> --&gt;
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;
+&lt;style type="text/css" media="print,screen"&gt;&lt;!--
+#word-list a { line-height: 1.8em; text-decoration: none; }
+--&gt;
+&lt;/style&gt;
+&lt;!--#include virtual="/philosophy/po/words-to-avoid.translist" 
--&gt;</em></ins></span>
+&lt;!--#include virtual="/server/banner.html" --&gt;
+&lt;!--#include <span 
class="removed"><del><strong>virtual="/philosophy/po/words-to-avoid.translist"</strong></del></span>
 <span class="inserted"><ins><em>virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html"</em></ins></span> --&gt;
+<span class="inserted"><ins><em>&lt;div 
class="reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;Words to Avoid (or Use with Care) Because They Are Loaded or 
Confusing&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div 
class="thin"&gt;&lt;/div&gt;</em></ins></span>
 
 &lt;p&gt;
 There are a number of words and phrases that we recommend avoiding, or
@@ -24,17 +36,13 @@
 misleading; others presuppose a viewpoint that we <span 
class="inserted"><ins><em>disagree with, and
 we</em></ins></span> hope you disagree <span 
class="removed"><del><strong>with.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>with it too.&lt;/p&gt;</em></ins></span>
 
-&lt;div class="announcement"&gt;
-<span class="removed"><del><strong>Also</strong></del></span>
-<span 
class="inserted"><ins><em>&lt;blockquote&gt;&lt;p&gt;Also</em></ins></span> 
note &lt;a href="/philosophy/categories.html"&gt;Categories of Free <span 
class="removed"><del><strong>Software&lt;/a&gt;.&lt;/div&gt;
-
-&lt;p&gt;</strong></del></span>
-<span class="inserted"><ins><em>Software&lt;/a&gt;,</em></ins></span>
-&lt;a <span 
class="removed"><del><strong>href="/philosophy/philosophy.html"&gt;Other Texts 
to Read&lt;/a&gt;
-|</strong></del></span> <span 
class="inserted"><ins><em>href="/philosophy/why-call-it-the-swindle.html"&gt;Why
 Call It The
-Swindle?&lt;/a&gt;&lt;/p&gt;&lt;/blockquote&gt;
-&lt;/div&gt;
+&lt;div <span class="removed"><del><strong>class="announcement"&gt;
+Also note &lt;a href="/philosophy/categories.html"&gt;Categories
+of Free Software&lt;/a&gt;.&lt;/div&gt;
 
+&lt;p&gt;
+  &lt;a href="/philosophy/philosophy.html"&gt;Other Texts to Read&lt;/a&gt;
+|</strong></del></span> <span class="inserted"><ins><em>id="word-list" 
class="emph-box"&gt;
 &lt;p&gt;&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!-- GNUN-SORT-START 
--&gt; &ldquo;&lt;a
        href="#Ad-blocker"&gt;Ad-blocker&lt;/a&gt;&rdquo;
 |&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!-- GNUN-SORT-NEXT-ITEM 
--&gt; &ldquo;&lt;a
@@ -191,6 +199,16 @@
 
 &lt;h4 
id="Alternative"&gt;&ldquo;Alternative&rdquo;&lt;/h4&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;span 
class="gnun-split"&gt;&lt;/span&gt;&lt;!-- GNUN-SORT-STOP --&gt;&lt;/p&gt;
+&lt;/div&gt;
+
+&lt;hr class="no-display" /&gt;
+&lt;div class="announcement"&gt;
+&lt;p&gt;Also note &lt;a href="/philosophy/categories.html"&gt;Categories of 
Free
+Software&lt;/a&gt;,
+&lt;a href="/philosophy/why-call-it-the-swindle.html"&gt;Why Call It The
+Swindle?&lt;/a&gt;&lt;/p&gt;
+&lt;/div&gt;
+&lt;hr class="no-display" /&gt;
 
 &lt;!-- GNUN-SORT-START --&gt;
 &lt;!-- GNUN-SORT-BEGIN-KEY --&gt;
@@ -230,10 +248,10 @@
 In practice, when many users have copies of a program, someone is sure
 to post</em></ins></span> it
 <span class="removed"><del><strong>presents</strong></del></span> <span 
class="inserted"><ins><em>on the internet, giving everyone access to it.  We 
think
-people ought to do that, if the program is useful.  But that 
isn't</em></ins></span> a <span 
class="removed"><del><strong>goal</strong></del></span>
-<span class="inserted"><ins><em>requirement of free software.&lt;/p&gt;
+people ought to do that, if the program is useful.  But that isn't a
+requirement of free software.&lt;/p&gt;
 &lt;p&gt;
-There is one specific point in which a question</em></ins></span> of having 
<span class="inserted"><ins><em>access is
+There is one specific point in which</em></ins></span> a <span 
class="removed"><del><strong>goal</strong></del></span> <span 
class="inserted"><ins><em>question</em></ins></span> of having <span 
class="inserted"><ins><em>access is
 directly pertinent to free software: the GNU GPL permits giving a
 particular user access to download a program's source code as a
 substitute for physically giving that user a copy of the source.  This
@@ -370,7 +388,7 @@
 One of the many meanings of &ldquo;cloud computing&rdquo; is storing
 your data in online services.  <span 
class="removed"><del><strong>That</strong></del></span>  <span 
class="inserted"><ins><em>In most scenarios, that is foolish
 because it</em></ins></span> exposes you to
-&lt;a 
href="http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream"&gt;surveillance&lt;/a&gt;.
+&lt;a <span 
class="removed"><del><strong>href="http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream"&gt;surveillance&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream"&gt;surveillance&lt;/a&gt;.</em></ins></span>
 &lt;/p&gt;
 
 &lt;p&gt;
@@ -415,7 +433,7 @@
 
 &lt;p&gt;
 Curiously, Larry Ellison, a proprietary software developer,
-also &lt;a 
href="http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/"&gt;
+also &lt;a 
href="https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/"&gt;
 noted the vacuity of the term &ldquo;cloud computing.&rdquo;&lt;/a&gt;  He
 decided to use the term anyway because, as a proprietary software
 developer, he isn't motivated by the same ideals as we are.
@@ -490,7 +508,7 @@
 stretch.  Applying it to published works (programs, recordings on a
 disk or</em></ins></span> in a <span 
class="removed"><del><strong>way</strong></del></span> <span 
class="inserted"><ins><em>file, books on paper or in a file), whose nature is to
 last indefinitely and which can be run, played or read any number of
-times, is stretching the word so far that it snaps.  Playing a
+times, is stretching the word so far</em></ins></span> that <span 
class="inserted"><ins><em>it snaps.  Playing a
 recording, or running a program, does not consume it.&lt;/p&gt;
 
 &lt;p&gt;
@@ -498,7 +516,7 @@
 don't mean it literally.  What, then, does it mean?  It means to regard
 copies of software and other works from a narrow economistic point of
 view.  &ldquo;Consume&rdquo; is associated with the economics of
-material commodities, such as the fuel or electricity</em></ins></span> that 
<span class="inserted"><ins><em>a car</em></ins></span> uses <span 
class="removed"><del><strong>them</strong></del></span>
+material commodities, such as the fuel or electricity that a 
car</em></ins></span> uses <span 
class="removed"><del><strong>them</strong></del></span>
 up.  <span class="removed"><del><strong>However,</strong></del></span>  <span 
class="inserted"><ins><em>Gasoline is a commodity, and so is electricity.  
Commodities
 are &lt;em&gt;fungible&lt;/em&gt;: there is nothing special about a drop of
 gasoline that your car burns today versus another drop that it burned
@@ -506,19 +524,19 @@
 
 &lt;p&gt;What does</em></ins></span> it <span class="inserted"><ins><em>mean 
to think of works of authorship as a commodity,
 with the assumption that there is nothing special about any one story,
-article, program, or song?  That is the twisted viewpoint of the owner
-or the accountant of a publishing company.  It</em></ins></span> is
-<span class="removed"><del><strong>erroneous</strong></del></span> <span 
class="inserted"><ins><em>no surprise that
+article, program, or song?  That</em></ins></span> is
+<span class="removed"><del><strong>erroneous</strong></del></span> <span 
class="inserted"><ins><em>the twisted viewpoint of the owner
+or the accountant of a publishing company.  It is no surprise that
 proprietary software would like you</em></ins></span> to <span 
class="inserted"><ins><em>think of the use of software as
 a commodity.  Their twisted viewpoint comes through clearly
-in &lt;a 
href="http://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6"&gt;this
+in &lt;a 
href="https://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6"&gt;this
 article&lt;/a&gt;, which also refers to publications as
 &ldquo;&lt;a href="#Content"&gt;content&lt;/a&gt;.&rdquo;&lt;/p&gt;
 
 &lt;p&gt;
 The narrow thinking associated with the idea that we &ldquo;consume
 content&rdquo; paves the way for laws such as the DMCA that forbid
-users to break the &lt;a href="http://DefectiveByDesign.org/"&gt;Digital
+users to break the &lt;a href="https://DefectiveByDesign.org/"&gt;Digital
 Restrictions Management&lt;/a&gt; (DRM) facilities in digital devices.  If
 users think what they do with these devices is &ldquo;consume,&rdquo;
 they may see such restrictions as natural.&lt;/p&gt;
@@ -607,7 +625,7 @@
 <span class="inserted"><ins><em>&ldquo;citizens,&rdquo; rather than 
&ldquo;consumers.&rdquo;&lt;/p&gt;
 &lt;p&gt;
 This problem with the word &ldquo;consumer&rdquo; has
-been &lt;a 
href="http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams"&gt;noted
 before&lt;/a&gt;.
+been &lt;a 
href="https://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams"&gt;noted
 before&lt;/a&gt;.
 &lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -760,7 +778,7 @@
 locks, and their keys or codes as well; you may find them useful or
 troublesome, but <span class="removed"><del><strong>either 
way</strong></del></span> they don't oppress you, because you can open and
 close <span class="removed"><del><strong>them.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>them.  Likewise, we
-find &lt;a 
href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-"&gt;encryption&lt;/a&gt;
+find &lt;a 
href="https://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-"&gt;encryption&lt;/a&gt;
 invaluable for protecting our digital files.  That too is a kind
 of digital lock that you have control over.&lt;/p&gt;</em></ins></span>
 &lt;p&gt;
@@ -800,7 +818,7 @@
 
 <span class="removed"><del><strong>&lt;h4 
id="Ecosystem"&gt;&ldquo;Ecosystem&rdquo;&lt;/h4&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;p&gt;
-Please sign up to support our &lt;a href="http://DefectiveByDesign.org/"&gt;
+Please sign up to support our &lt;a href="https://DefectiveByDesign.org/"&gt;
 campaign to abolish DRM&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -964,7 +982,7 @@
 &lt;!-- GNUN-SORT-END-KEY --&gt;</em></ins></span>
 &lt;p&gt;
 A hacker is someone
-who &lt;a href="http://stallman.org/articles/on-hacking.html"&gt; enjoys
+who &lt;a <span 
class="removed"><del><strong>href="http://stallman.org/articles/on-hacking.html"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://stallman.org/articles/on-hacking.html"&gt;</em></ins></span>
 enjoys
 playful cleverness&lt;/a&gt;&mdash;not necessarily with computers.  The
 programmers in the old
 &lt;abbr title="Massachusetts Institute of Technology"&gt;MIT&lt;/abbr&gt; free
@@ -1027,7 +1045,7 @@
 &lt;p&gt;
 Experience shows that these products often do 
 &lt;a
-href="http://www.locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-things-to-be-sensed/"&gt;
+href="https://www.locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-things-to-be-sensed/"&gt;
 spy on their users&lt;/a&gt;.  They are also tailor-made for 
 &lt;a href="https://archive.ieet.org/articles/rinesi20150806.html"&gt;giving
 people biased advice&lt;/a&gt;.  In addition, the manufacturer can &lt;a
@@ -1233,11 +1251,11 @@
 any kind of photo manipulation or image editing in general.  Photoshop
 is just the name of one particular image editing program, which should
 be avoided since it is proprietary.  There are plenty of free programs
-for editing images, such as the &lt;a 
href="/software/gimp"&gt;GIMP&lt;/a&gt;.&lt;/p&gt;
+for editing images, such as the &lt;a <span 
class="removed"><del><strong>href="/software/gimp"&gt;GIMP&lt;/a&gt;.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h4 
id="Piracy"&gt;&ldquo;Piracy&rdquo;&lt;/h4&gt;</strong></del></span>
+&lt;h4 id="Piracy"&gt;&ldquo;Piracy&rdquo;&lt;/h4&gt;</strong></del></span> 
<span 
class="inserted"><ins><em>href="https://www.gimp.org/"&gt;GIMP&lt;/a&gt;.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
+&lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
 &lt;!-- GNUN-SORT-BEGIN-KEY --&gt;
 &lt;h3 id="Piracy"&gt;&ldquo;Piracy&rdquo;&lt;/h3&gt;
 &lt;!-- GNUN-SORT-END-KEY --&gt;</em></ins></span>
@@ -1265,7 +1283,7 @@
 <span class="inserted"><ins><em>&lt;p&gt;
 A US judge, presiding over a trial for copyright infringement,
 recognized that
-&lt;a 
href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;
+&lt;a 
href="https://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;
 and &ldquo;theft&rdquo; are smear words.&lt;/a&gt;&lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -1330,7 +1348,7 @@
 obstruction.  So we could call that malicious feature &ldquo;copy
 obstruction.&rdquo;  More often it is called Digital Restrictions
 Management (DRM)&mdash;see the
-&lt;a href="http://DefectiveByDesign.org"&gt; Defective by Design&lt;/a&gt;
+&lt;a <span 
class="removed"><del><strong>href="http://DefectiveByDesign.org"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://DefectiveByDesign.org"&gt;</em></ins></span>
 Defective by Design&lt;/a&gt;
 campaign.&lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;h4</strong></del></span>
@@ -1529,13 +1547,13 @@
 &lt;p&gt;
 Under the US legal system, copyright infringement is not theft.  
 <span class="inserted"><ins><em>&lt;a
-href="http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207"&gt;</em></ins></span>
+href="https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207"&gt;</em></ins></span>
 Laws about theft are not applicable to copyright <span 
class="removed"><del><strong>infringement.</strong></del></span> <span 
class="inserted"><ins><em>infringement.&lt;/a&gt;</em></ins></span>
 The <span class="inserted"><ins><em>supporters of repressive</em></ins></span> 
copyright <span class="removed"><del><strong>apologists</strong></del></span> 
are making an appeal to
 authority&mdash;and misrepresenting what authority says.&lt;/p&gt;
 &lt;p&gt;
 <span class="inserted"><ins><em>To refute them, you can point to this
-&lt;a 
href="http://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright"&gt;
+&lt;a 
href="https://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright"&gt;
 real case&lt;/a&gt; which shows what can properly be described as
 &ldquo;copyright theft.&rdquo;&lt;/p&gt;
 &lt;p&gt;</em></ins></span>
@@ -1551,7 +1569,7 @@
 <span class="inserted"><ins><em>&lt;p&gt;
 A US judge, presiding over a trial for copyright infringement,
 recognized that
-&lt;a 
href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;
+&lt;a 
href="https://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;
 and &ldquo;theft&rdquo; are smear-words.&lt;/a&gt;&lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -1589,17 +1607,18 @@
 of Free and Nonfree Software&lt;/a&gt;.&lt;/div&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;!-- GNUN-SORT-STOP --&gt;</em></ins></span>
 
-&lt;hr /&gt;
+&lt;hr <span class="inserted"><ins><em>class="thin"</em></ins></span> /&gt;
 <span class="removed"><del><strong>&lt;h4&gt;This</strong></del></span>
-<span class="inserted"><ins><em>&lt;blockquote 
id="fsfs"&gt;&lt;p&gt;This</em></ins></span> essay is published
-in &lt;a 
href="http://shop.fsf.org/product/free-software-free-society/"&gt;&lt;cite&gt;Free
+<span class="inserted"><ins><em>&lt;p id="fsfs"&gt;This</em></ins></span> 
essay is published in
+&lt;a <span 
class="removed"><del><strong>href="http://shop.fsf.org/product/free-software-free-society/"&gt;&lt;cite&gt;Free</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://shop.fsf.org/product/free-software-free-society/"&gt;&lt;cite&gt;Free</em></ins></span>
 Software, Free Society: The Selected Essays of Richard
-M. <span 
class="removed"><del><strong>Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/h4&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
+M. <span 
class="removed"><del><strong>Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/h4&gt;</strong></del></span>
 <span class="inserted"><ins><em>Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
-<span class="inserted"><ins><em>&lt;div 
class="unprintable"&gt;</em></ins></span>
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;
+&lt;div class="unprintable"&gt;</em></ins></span>
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
 &lt;a href="mailto:gnu@gnu.org"&gt;&lt;gnu@gnu.org&gt;&lt;/a&gt;.
@@ -1616,17 +1635,17 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;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 &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; 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.&lt;/p&gt;
 
 <span class="removed"><del><strong>&lt;p&gt;
-Copyright</strong></del></span>
+Copyright &copy; 1996, 1997, 1998, 1999, 2001,</strong></del></span>
 <span class="inserted"><ins><em>&lt;/div&gt;
 
 &lt;!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -1638,7 +1657,8 @@
      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
+     Either "2001,</em></ins></span> 2002, <span 
class="removed"><del><strong>2003, 2004, 2007,
+2008, 2009, 2010, 2011, 2012</strong></del></span> <span 
class="inserted"><ins><em>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).
@@ -1646,8 +1666,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright</em></ins></span> &copy; 1996, 1997, 1998, 1999, 2001, 
2002, 2003, 2004, 2007,
-2008, 2009, 2010, 2011, <span 
class="removed"><del><strong>2012</strong></del></span> <span 
class="inserted"><ins><em>2012, 2015, 2016, 2017, 2018, 2020, 
2021</em></ins></span> Free Software Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 1996-2018, 2020, 2021</em></ins></span> Free 
Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 <span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
@@ -1661,7 +1680,7 @@
 
 <span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/31 09:06:22 $
+$Date: 2021/07/21 19:32:31 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: words-to-avoid.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ar.po,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- words-to-avoid.ar.po        31 May 2021 03:56:37 -0000      1.128
+++ words-to-avoid.ar.po        21 Jul 2021 19:32:31 -0000      1.129
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2021-05-31 03:55+0000\n"
+"POT-Creation-Date: 2021-07-21 19:25+0000\n"
 "PO-Revision-Date: 2013-01-16 14:00+0200\n"
 "Last-Translator: Rafik E. Younan <rafik.yonan@phoenixegypt.com>\n"
 "Language-Team: Arabic <>\n"
@@ -34,11 +34,11 @@
 "كلمات تتحاشها (أو استخدمها بحذر) لأنها م
فخخة أو مضللة - مشروع غنو - مؤسسة "
 "البرمجيات الحرة"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Words to Avoid (or Use with Care) Because They Are Loaded or Confusing"
 msgstr "كلمات تتحاشها (أو استخدمها بحذر) لأنها 
مفخخة أو مضللة"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | There are a number of words and phrases that we recommend avoiding, or
 # | avoiding in certain contexts and usages.  Some are ambiguous or
 # | misleading; others presuppose a viewpoint that we {+disagree with, and
@@ -57,118 +57,101 @@
 "توجد كلمات وعبارات عديدة ننصف بتجنبها أو 
تتجنبها في سياقات واستخدامات محددة. "
 "بعضها غامض أو مضلل؛ وبعضها يفرض وجهة نظر 
نأمل ألا تتفق معها."
 
-#. type: Content of: <div><blockquote><p>
-# | Also note <a href=\"/philosophy/categories.html\">Categories of Free [-and
-# | Nonfree Software</a>.-] {+Software</a>, <a
-# | href=\"/philosophy/why-call-it-the-swindle.html\">Why Call It The
-# | Swindle?</a>+}
-#, fuzzy
-#| msgid ""
-#| "Also note <a href=\"/philosophy/categories.html\">Categories of Free and "
-#| "Nonfree Software</a>."
-msgid ""
-"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
-"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
-"It The Swindle?</a>"
-msgstr ""
-"أيضًا راجع <a href=\"/philosophy/categories.html\">تصانيف 
البرمجيات الحرة "
-"والمقيدة</a>."
-
 #.  GNUN-SORT-START 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ad-blocker\">Ad-blocker</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Access\">Access</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Alternative\">Alternative</a>&rdquo; |"
 msgstr "<!-- alternative -->&rdquo;<a 
href=\"#Alternative\">بديل</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Assets\">Assets</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#BSD-style\">BSD-style</a>&rdquo; |"
 msgstr "<!-- bsd -->&rdquo;<a href=\"#BSD-style\">نمط BSD</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Closed\">Closed</a>&rdquo; |"
 msgstr "<!-- closed -->&rdquo;<a href=\"#Closed\">مغلق</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CloudComputing\">Cloud Computing</a>&rdquo; |"
 msgstr ""
 "<!-- cloud -->&rdquo;<a href=\"#CloudComputing\">حوسبة 
سحابية</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Commercial\">Commercial</a>&rdquo; |"
 msgstr "<!-- commercial -->&rdquo;<a 
href=\"#Commercial\">تجاري</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Compensation\">Compensation</a>&rdquo; |"
 msgstr ""
 "<!-- compensation -->&rdquo;<a 
href=\"#Compensation\">تعوضيات</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consume\">Consume</a>&rdquo; |"
 msgstr "<!-- consume -->&rdquo;<a href=\"#Consume\">استهلك</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consumer\">Consumer</a>&rdquo; |"
 msgstr "<!-- consumer -->&rdquo;<a href=\"#Consumer\">مستهلك</a>&ldquo; 
|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Content\">Content</a>&rdquo; |"
 msgstr "<!-- content -->&rdquo;<a href=\"#Content\">محتوى</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CopyrightOwner\">Copyright Owner</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#CreativeCommonsLicensed\">Creative Commons licensed</"
 "a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Creator\">Creator</a>&rdquo; |"
 msgstr "<!-- creator -->&rdquo;<a href=\"#Creator\">منشئ</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalGoods\">Digital Goods</a>&rdquo; |"
 msgstr ""
 "<!-- digital goods-->&rdquo;<a href=\"#DigitalGoods\">منتجات رقم
ية</"
 "a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalLocks\">Digital Locks</a>&rdquo; |"
 msgstr ""
 "<!-- digital locks -->&rdquo;<a href=\"#DigitalLocks\">القيود الرقم
ية</"
 "a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#DigitalRightsManagement\">Digital Rights Management</"
 "a>&rdquo; |"
@@ -177,59 +160,59 @@
 "الرقمية</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ecosystem\">Ecosystem</a>&rdquo; |"
 msgstr ""
 "<!-- ecosystem -->&rdquo;<a href=\"#Ecosystem\">منظومة 
بيئية</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FLOSS\">FLOSS</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#ForFree\">For free</a>&rdquo; |"
 msgstr ""
 "<span dir=\"ltr\">&ldquo;<a href=\"#ForFree\">For free</a>&rdquo;</span> |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FOSS\">FOSS</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FreelyAvailable\">Freely available</a>&rdquo; |"
 msgstr ""
 "<span dir=\"ltr\">&ldquo;<a href=\"#FreelyAvailable\">Freely available</"
 "a>&rdquo;</span> |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Freeware\">Freeware</a>&rdquo; |"
 msgstr ""
 "<!-- freeware -->&rdquo;<a href=\"#Freeware\">برمجيات م
جانية</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#GiveAwaySoftware\">Give away software</a>&rdquo; |"
 msgstr ""
 "<span dir=\"ltr\">&ldquo;<a href=\"#GiveAwaySoftware\">Give away software</"
 "a>&rdquo;</span> |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Google\">Google</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Hacker\">Hacker</a>&rdquo; |"
 msgstr "<!-- hacker -->&rdquo;<a href=\"#Hacker\">هاكر</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#IntellectualProperty\">Intellectual property</a>&rdquo; |"
 msgstr ""
@@ -237,47 +220,47 @@
 "a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#InternetofThings\">Internet of Things</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#LAMP\">LAMP system</a>&rdquo; |"
 msgstr "<!-- lamp -->&rdquo;<a href=\"#LAMP\">نظام LAMP</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Linux\">Linux system</a>&rdquo; |"
 msgstr "<!-- linux -->&rdquo;<a href=\"#Linux\">نظام Linux</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Market\">Market</a>&rdquo; |"
 msgstr "<!-- market -->&rdquo;<a href=\"#Market\">سوق</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Modern\">Modern</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Monetize\">Monetize</a>&rdquo; |"
 msgstr "<!-- monetize -->&rdquo;<a href=\"#Monetize\">نقّد</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#MP3Player\">MP3 player</a>&rdquo; |"
 msgstr "<!-- mp3 -->&rdquo;<a href=\"#MP3Player\">مشغل MP3</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Open\">Open</a>&rdquo; |"
 msgstr "<!-- open -->&rdquo;<a href=\"#Open\">مفتوح</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | &ldquo;<a [-href=\"#Open\">Open</a>&rdquo;-] {+href=\"#OptOut\">Opt
 # | out</a>&rdquo;+} |
 #, fuzzy
@@ -286,78 +269,78 @@
 msgstr "<!-- open -->&rdquo;<a href=\"#Open\">مفتوح</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PC\">PC</a>&rdquo; |"
 msgstr "<span dir=\"ltr\">&ldquo;<a href=\"#PC\">PC</a>&rdquo;</span> |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Photoshop\">Photoshop</a>&rdquo; |"
 msgstr ""
 "<span dir=\"ltr\">&ldquo;<a href=\"#Photoshop\">Photoshop</a>&rdquo;</span> |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Piracy\">Piracy</a>&rdquo; |"
 msgstr "<!-- piracy -->&rdquo;<a href=\"#Piracy\">قرصنة</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PowerPoint\">PowerPoint</a>&rdquo; |"
 msgstr ""
 "<span dir=\"ltr\">&ldquo;<a href=\"#PowerPoint\">PowerPoint</a>&rdquo;</"
 "span> |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Product\">Product</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Protection\">Protection</a>&rdquo; |"
 msgstr "<!-- protection -->&rdquo;<a href=\"#Protection\">حم
اية</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#RAND\">RAND</a>&rdquo; |"
 msgstr "<span dir=\"ltr\">&ldquo;<a href=\"#RAND\">RAND</a>&rdquo;</span> |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SaaS\">SaaS</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SellSoftware\">Sell software</a>&rdquo; |"
 msgstr "<!-- sell -->&rdquo;<a href=\"#SellSoftware\">بيع البرام
ج</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#SharingPersonalData\">Sharing (personal data)</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SharingEconomy\">Sharing economy</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Skype\">Skype</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SoftwareIndustry\">Software Industry</a>&rdquo; |"
 msgstr ""
 "<!-- software -->&rdquo;<a href=\"#SoftwareIndustry\">صناعة البرم
جيات</"
 "a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SourceModel\">Source model</a>&rdquo; |"
 msgstr ""
 
@@ -367,7 +350,7 @@
 #.      language to refer to mobile computers; otherwise,
 #.      fill the translation with a space. 
 #.  GNUN-SORT-BEGIN-KEY 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Terminal\">Terminal</a>&rdquo; |"
 msgstr ""
 
@@ -375,27 +358,44 @@
 #. #endif
 #.  
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Theft\">Theft</a>&rdquo; |"
 msgstr "<!-- theft -->&rdquo;<a href=\"#Theft\">سرقة</a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#TrustedComputing\">Trusted Computing</a>&rdquo; |"
 msgstr ""
 "<!-- trusted -->&rdquo;<a href=\"#TrustedComputing\">الحوسبة الم
وثوقة</"
 "a>&ldquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Vendor\">Vendor</a>&rdquo;"
 msgstr "<!-- vendor -->&rdquo;<a href=\"#Vendor\">بائع</a>&ldquo;"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><p>
+# | Also note <a href=\"/philosophy/categories.html\">Categories of Free [-and
+# | Nonfree Software</a>.-] {+Software</a>, <a
+# | href=\"/philosophy/why-call-it-the-swindle.html\">Why Call It The
+# | Swindle?</a>+}
+#, fuzzy
+#| msgid ""
+#| "Also note <a href=\"/philosophy/categories.html\">Categories of Free and "
+#| "Nonfree Software</a>."
+msgid ""
+"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
+"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
+"It The Swindle?</a>"
+msgstr ""
+"أيضًا راجع <a href=\"/philosophy/categories.html\">تصانيف 
البرمجيات الحرة "
+"والمقيدة</a>."
+
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ad-blocker&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When the purpose of some program is to block advertisements, &ldquo;ad-"
 "blocker&rdquo; is a good term for it.  However, the GNU browser IceCat "
@@ -404,17 +404,17 @@
 "&rdquo; this is <em>surveillance protection</em>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Access&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is a common misunderstanding to think free software means that the public "
 "has &ldquo;access&rdquo; to a program.  That is not what free software means."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/philosophy/free-sw.html\">criterion for free software</a> is "
 "not about who has &ldquo;access&rdquo; to the program; the four essential "
@@ -425,7 +425,7 @@
 "that program from any user."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In particular, if you write a program yourself and never offer a copy to "
 "anyone else, that program is free software albeit in a trivial way, because "
@@ -433,7 +433,7 @@
 "such user is you)."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, when many users have copies of a program, someone is sure to "
 "post it on the internet, giving everyone access to it.  We think people "
@@ -441,7 +441,7 @@
 "free software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There is one specific point in which a question of having access is directly "
 "pertinent to free software: the GNU GPL permits giving a particular user "
@@ -450,7 +450,7 @@
 "which the user already has a copy of the program in non-source form."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>with free software, the public has access to the program</b>, "
 "we say, <b>with free software, the users have the essential freedoms</b> and "
@@ -458,11 +458,11 @@
 "them</b>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Alternative&rdquo;"
 msgstr "<!-- alternative -->&rdquo;بديل&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We don't [-present-] {+describe+} free software {+in general+} as an
 # | [-&ldquo;alternative&rdquo;,-] {+&ldquo;alternative&rdquo; to
 # | proprietary,+} because {+that word presumes all the
@@ -487,7 +487,7 @@
 "وهو وجدود البرمجيات الحرة متلازمة مع البرم
جيات الاحتكارية. وذلك بزعم أن "
 "البرمجيات الاحتكارية شرعية."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We believe that {+distribution as free software is+} the only ethical way
 # | to [-distribute software is as free software.  Thus, we aim to-] make
 # | [-free-] software [-more than an alternative.  Our goal is-] {+available
@@ -517,7 +517,7 @@
 "برمجيات حرة. لذا، فنحن نهدف لجعل البرمجيات 
الحرة أكثر من مجرد بديل. هدفنا "
 "عالم كل برمجياته حرة، حتى يكون كل المستخدم
ين أحرار."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Special circumstances can drive users toward running one particular program "
 "for a certain job.  For instance, when a web page sends JavaScript client "
@@ -526,11 +526,11 @@
 "reason to describe any other code for that job as an alternative."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Assets&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To refer to published works as &ldquo;assets&rdquo;, or &ldquo;digital "
 "assets&rdquo;, is even worse than calling them <a href=\"#Content\">&ldquo;"
@@ -538,11 +538,11 @@
 "commercial value."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;BSD-style&rdquo;"
 msgstr "<!-- BSD -->&rdquo;نمط BSD&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/licenses/bsd.html\">lumps together licenses that have important "
@@ -555,7 +555,7 @@
 "BSD الأصلية التي تحتوي شرط الدعاية متعارضة م
ع رخصة غنو العمومية، لكن رخصة "
 "BSD المُعدّلة متوافقة معها."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, it is best to name <a href=\"/licenses/license-list.html"
 "\"> the specific license in question</a> and avoid the vague term &ldquo;BSD-"
@@ -564,11 +564,11 @@
 "لتجنب اللبس، من الأفضل تسمية <a 
href=\"/licenses/license-list.html\">الرخصة "
 "المعنية</a> وتجنب المصطلح الغامض &rdquo;نمط 
BSD&ldquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Closed&rdquo;"
 msgstr "<!-- closed -->&rdquo;مغلق&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source.&rdquo; In the free software movement, <a href=\"/"
@@ -587,11 +587,11 @@
 "مغلقة&ldquo;. نسميها &rdquo;غير حرة&ldquo; أو <a 
href=\"/philosophy/"
 "categories.html#ProprietarySoftware\">محتكرة</a> (أو مملوكة)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Cloud Computing&rdquo;"
 msgstr "<!-- cloud -->&rdquo;حوسبة سحابية&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;cloud computing&rdquo; {+(or just &ldquo;cloud&rdquo;, in
 # | the context of computing)+} is a marketing buzzword with no [-clear-]
 # | {+coherent+} meaning.  It is used for a range of different activities
@@ -619,7 +619,7 @@
 "الملفات. لذلك فإن المصطلح يسبب الكثير من 
اللبس. إذا بنيت فكرتك عليه، فسوف "
 "تكون غامضة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | When thinking about or responding to a statement someone else has made
 # | using this term, the first step is to clarify the topic.  [-Which kind of
 # | activity-]  {+What scenario+} is the statement [-really about, and what-]
@@ -645,12 +645,12 @@
 "الجيد الواضح للإشارة إليه؟ عندما يتضح الأم
ر، يمكن للنقاش أن ينتهي إلى نهاية "
 "مفيدة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | One of the many meanings of &ldquo;cloud computing&rdquo; is storing your
 # | data in online services.  [-That-]  {+In most scenarios, that is foolish
 # | because it+} exposes you to <a
-# | href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-c
-# | loud-antiauthoritarian-dream\">surveillance</a>.
+# | href=\"http{+s+}://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spo
+# | oks-cloud-antiauthoritarian-dream\">surveillance</a>.
 #, fuzzy
 #| msgid ""
 #| "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
@@ -660,15 +660,15 @@
 msgid ""
 "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
 "data in online services.  In most scenarios, that is foolish because it "
-"exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/";
-"hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
+"exposes you to <a href=\"https://www.guardian.co.uk/commentisfree/2011/";
+"apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgstr ""
 "إحدى المعاني الكثيرة للحوسبة السحابية 
&ldquo;cloud computing&rdquo; تخزين "
 "البيانات على خدمات عبر الإنترنت. هذا يعرضك 
إلى <a href=\"http://www.guardian.";
 "co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream"
 "\">المراقبة</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Another meaning (which overlaps that but is not the same thing)  is <a
 # | href=\"/philosophy/who-does-that-server-really-serve.html\"> [-Software-]
 # | {+Service+} as a [-Service</a>,-] {+Software Substitute</a>,+} which
@@ -688,7 +688,7 @@
 "does-that-server-really-serve.html\"> البرمجيات كخدمة </a>، 
والذي يحرمك من "
 "التحكم في العملية الحوسبية."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Another meaning is renting a remote physical server, or virtual server. 
 # | These [-can be-] {+practices are+} ok under certain circumstances.
 #, fuzzy
@@ -702,13 +702,13 @@
 "كذلك ممكن أن يعني تأجير جهاز حوسبي خادم 
server، سواء مادي أو إفتراضي "
 "virtual. ويمكن القبول بهذه الحالة تحت ظروف م
عينة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is accessing your own server from your own mobile device.  "
 "That raises no particular ethical issues."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"https://csrc.nist.gov/publications/detail/sp/800-145/final\";> "
 "NIST definition of \"cloud computing\"</a> mentions three scenarios that "
@@ -720,7 +720,7 @@
 "mistreats the user, but the two concepts are not equivalent."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "These different computing practices don't even belong in the same "
 "discussion.  The best way to avoid the confusion the term &ldquo;cloud "
@@ -729,10 +729,22 @@
 "a specific term."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Curiously, Larry Ellison, a proprietary software developer, also <a
+# | 
href=\"http{+s+}://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\">
+# | noted the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He
+# | decided to use the term anyway because, as a proprietary software
+# | developer, he isn't motivated by the same ideals as we are.
+#, fuzzy
+#| msgid ""
+#| "Curiously, Larry Ellison, a proprietary software developer, also <a href="
+#| "\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> "
+#| "noted the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He "
+#| "decided to use the term anyway because, as a proprietary software "
+#| "developer, he isn't motivated by the same ideals as we are."
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a href="
-"\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
+"\"https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
 "the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He decided to use "
 "the term anyway because, as a proprietary software developer, he isn't "
 "motivated by the same ideals as we are."
@@ -742,11 +754,11 @@
 "&rdquo;الحوسبة السحابية&ldquo;</a> لكنه قرر 
استخدام المصطلح على كل حال لأنه -"
 "كمطور برمجيات محتكرة- لا تحفزه نفس المبادئ 
التي نتبناها."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Commercial&rdquo;"
 msgstr "<!-- commercial -->&rdquo;تجاري&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;nonfree."
 "&rdquo; That confuses two entirely different issues."
@@ -754,7 +766,7 @@
 "من فضلك لا تستخدم كلمة &rdquo;تجاري&ldquo; كم
رادفة لكلمة &rdquo;غير "
 "حر&ldquo; لأن هذا يخلط أمرين مختلفين تمامًا."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A program is commercial if it is developed as a business activity.  A "
 "commercial program can be free or nonfree, depending on its manner of "
@@ -768,7 +780,7 @@
 "مدرسة أو فرد حرًا أو غير حر، بحسب طريقة 
التوزيعة. إن الجانبين &mdash;الطرف "
 "الذي طوّر البرنامج والحرية التي يملكها م
ستخدموه&mdash; مستقلتان."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the first decade of the free software movement, free software packages "
 "were almost always noncommercial; the components of the GNU/Linux operating "
@@ -780,7 +792,7 @@
 "تجارية؛ فمكونات نظام التشغيل غنو/لينكس 
طورها أفرادأ إو منظمات غير هادفة "
 "للربح منها FSF وجامعات. لاحقًا -في 
التسعينيات- ظهرت البرمجيات الحرة التجارية."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
@@ -794,11 +806,11 @@
 "عبارة &rdquo;حر تجاري&ldquo; تناقض نفسها، ويلغون 
الاحتمالية. دعونا نحذر من "
 "استخدام كلمة &rdquo;تجاري&ldquo; على هذا النحو."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Compensation&rdquo;"
 msgstr "<!-- compensation -->&rdquo;تعوضيات&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;compensation for authors&rdquo; in connection with "
 "copyright carries the assumptions that (1) copyright exists for the sake of "
@@ -812,7 +824,7 @@
 "لمؤلفه بدين علينا سداده. إن الافتراض الأول 
<a href=\"/philosophy/"
 "misinterpreting-copyright.html\">خاطئ</a> ببساطة، والثاني 
فضيع."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Compensating the rights-holders&rdquo; adds a further swindle: you're "
 "supposed to imagine that means paying the authors, and occasionally it does, "
@@ -824,11 +836,11 @@
 "يعني ذلك بالفعل، ولكن معظم الأحيان يعنى 
تعويض نفس شركات النشر التي تحاول "
 "الدفع بقوانين جائرة."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consume&rdquo;"
 msgstr "<!-- consume -->&rdquo;استهلك&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | &ldquo;Consume&rdquo; refers to what we do with food: we ingest it, [-and
 # | use it in a way that uses it up.-] {+after which the food as such no
 # | longer exists.+}  By analogy, we employ the same word [-to describe
@@ -866,7 +878,7 @@
 "إستهلاك&ldquo;  المعلومات الرقمية، الموسيقى، 
البرمجيات، إلخ.، ﻷننا "
 "باستخدامهم لا نعرضهم للإهلاك أو النفاذ. 
أنظر أيضاً التعريف التالي."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use &ldquo;consume&rdquo; in this context will say they don't mean "
 "it literally.  What, then, does it mean? It means to regard copies of "
@@ -878,30 +890,30 @@
 "another drop that it burned last week."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What does it mean to think of works of authorship as a commodity, with the "
 "assumption that there is nothing special about any one story, article, "
 "program, or song? That is the twisted viewpoint of the owner or the "
 "accountant of a publishing company.  It is no surprise that proprietary "
 "software would like you to think of the use of software as a commodity.  "
-"Their twisted viewpoint comes through clearly in <a href=\"http://www.";
+"Their twisted viewpoint comes through clearly in <a href=\"https://www.";
 "businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-"
 "series-a-funding-2015-6\">this article</a>, which also refers to "
 "publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The narrow thinking associated with the idea that we &ldquo;consume "
 "content&rdquo; paves the way for laws such as the DMCA that forbid users to "
-"break the <a href=\"http://DefectiveByDesign.org/\";>Digital Restrictions "
+"break the <a href=\"https://DefectiveByDesign.org/\";>Digital Restrictions "
 "Management</a> (DRM) facilities in digital devices.  If users think what "
 "they do with these devices is &ldquo;consume,&rdquo; they may see such "
 "restrictions as natural."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It also encourages the acceptance of &ldquo;streaming&rdquo; services, which "
 "use DRM to perversely limit listening to music, or watching video, to "
@@ -909,7 +921,7 @@
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why is this perverse usage spreading? Some may feel that the term sounds "
 "sophisticated, but rejecting it with cogent reasons can appear even more "
@@ -920,7 +932,7 @@
 "forums gives the impression that it's the &ldquo;correct&rdquo; term."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;consuming&rdquo; music, fiction, or any other artistic "
 "works is to treat them as commodities rather than as art.  Do we want to "
@@ -928,35 +940,35 @@
 "so?"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who answer no, please join me in shunning the term &ldquo;"
 "consume&rdquo; for this."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What to use instead? You can use specific verbs such as &ldquo;read,&rdquo; "
 "&ldquo;listen to,&rdquo; &ldquo;watch&rdquo; or &ldquo;look at,&rdquo; since "
 "they help to restrain the tendency to overgeneralize."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you insist on generalizing, you can use the expression &ldquo;attend to,"
 "&rdquo; which requires less of a stretch than &ldquo;consume.&rdquo; For a "
 "work meant for practical use, &ldquo;use&rdquo; is best."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "See also the following entry."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consumer&rdquo;"
 msgstr "<!-- consumer -->&rdquo;مستهلك&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;consumer,&rdquo; when used to refer to the users of "
 "computing, is loaded with assumptions we should reject.  Some come from the "
@@ -971,7 +983,7 @@
 "نظرية اقتصادية، وجلبنا معهما أفقهما الضيق 
وافتراضهما المضلل، وهي تهدف إلى "
 "غسل تفكيرك."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | In addition, describing the users of software as &ldquo;consumers&rdquo;
 # | [-presumes a narrow role for them: it regards them as sheep that passively
 # | graze on what others make available-] {+refers+} to [-them. This kind of
@@ -1019,7 +1031,7 @@
 "فكرة أن الأعمال المنشورة مجرد <a href=\"#Content\"> 
&rdquo;محتويات&ldquo;</"
 "a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | To describe people who are not limited to passive use of works, we suggest
 # | terms such as &ldquo;individuals&rdquo; and [-&ldquo;citizens&rdquo;.-]
 # | {+&ldquo;citizens,&rdquo; rather than &ldquo;consumers.&rdquo;+}
@@ -1036,18 +1048,18 @@
 "لوصف الأشخاص غير القاصرين على الاستخدام 
السلبي للأعمال، نقترح مصطلحي &rdquo;"
 "أفراد&ldquo; و&rdquo;مواطنين&ldquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"http://";
+"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"https://";
 "www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-"
 "williams\">noted before</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Content&rdquo;"
 msgstr "<!-- content -->&rdquo;محتوى&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | If you want to describe a feeling of comfort and satisfaction, by all
 # | means say you are &ldquo;content,&rdquo; but using the word as a noun to
 # | describe [-written-] {+publications+} and [-other-] works of authorship
@@ -1077,7 +1089,7 @@
 "عليها صفة نأمل أن تتجنبها. إنها تعامل تلك 
الأعمال كما لو كانت سلعا غرضها ملء "
 "صندوق لكسب المال. في الحقيقة إنها تسيء للعم
ل ذاته."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Those who use [-this-] {+the+} term {+&ldquo;content&rdquo;+} are often
 # | the publishers that push for increased copyright power in the name of the
 # | authors (&ldquo;creators,&rdquo; as they say) of the works.  The term
@@ -1104,7 +1116,7 @@
 "باسم مؤلفي (&rdquo;منشئ&ldquo; كما يسمونهم) الم
صنفات. إن مصطلح &rdquo;"
 "محتوى&ldquo; يعكس نظرتهم الحقيقة تجاه تلك الم
صنفات ومؤلفيها."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Content itself is beside the point&mdash;as the very use of words like "
 "content suggests. The moment you start labelling every single piece of "
@@ -1112,13 +1124,13 @@
 "interchangeability: its primary purpose as mere grist to the metrical mill."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In other words, &ldquo;content&rdquo; reduces publications and writings to a "
 "sort of pap fit to be piped through the &ldquo;tubes&rdquo; of the internet."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | See {+also+} <a
 # | href=\"http{+s+}://www.salon.com/2000/06/14/love_7/\">Courtney Love's open
 # | letter to Steve Case</a> and search for &ldquo;content provider&rdquo; in
@@ -1144,14 +1156,14 @@
 "للأسف، فإن السيدة Love ليست على علم أن مصطلح 
&rdquo;ملكية فكرية&ldquo; أيضًا "
 "<a href=\"#IntellectualProperty\">متحيز ومضلل</a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "However, as long as other people use the term &ldquo;content provider,"
 "&rdquo; political dissidents can well call themselves &ldquo;malcontent "
 "providers.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
 "&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
@@ -1165,7 +1177,7 @@
 "بشيء ما بها&ldquo;. ولذا فإن &rdquo;نظام إدارة الم
حتوى&ldquo; هو نظام للقيام "
 "بشيء ما بالمعلومات. وكل البرامج تقريبًا يم
كن وصفها بذلك."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
 "web site.  For that, we recommend the term &ldquo;web site revision "
@@ -1174,11 +1186,11 @@
 "هذا المصطلح في معظم الحالات يشير إلى نظام 
لرفع الصفحات إلى موقع. ولذلك "
 "الغرض، فنحن نوصي باستخدام المصطلح &rdquo;نظام
 مراجعة موقع الوب&ldquo; (WRS)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Copyright Owner&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyright is an artificial privilege, handed out by the state to achieve a "
 "public interest and lasting a period of time &mdash; not a natural right "
@@ -1186,7 +1198,7 @@
 "to the recipient of that privilege as a &ldquo;copyright holder.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A few decades ago, copyright holders began trying to reduce awareness of "
 "this point.  In addition to citing frequently the bogus concept of <a href="
@@ -1196,11 +1208,11 @@
 "instead."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creative Commons licensed&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The most important licensing characteristic of a work is whether it is "
 "free.  Creative Commons publishes seven licenses; three are free (CC BY, CC "
@@ -1210,7 +1222,7 @@
 "but the omission is harmful."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To encourage people to pay attention to the most important distinction, "
 "always specify <em>which</em> Creative Commons license is used, as in &ldquo;"
@@ -1218,11 +1230,11 @@
 "work uses, find out and then make your statement."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creator&rdquo;"
 msgstr "<!-- creator -->&rdquo;منشئ&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
@@ -1241,11 +1253,11 @@
 "حالات كثيرة. هذان المصطلحان غير متساويان: 
في أغلب الأحيان مالك حقوق النشر "
 "ليس المؤلف."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr "<!-- digital goods -->&rdquo;منتجات رقمية&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
 "authorship, identifies them with physical goods&mdash;which cannot be "
@@ -1261,11 +1273,11 @@
 "بناءاً على رؤيتهم وحسهم الداخلي بالنسبة 
للمنتجات المحسوسة. وذلك أيضاً يحدد "
 "مشاكل بالنسبة للإقتصاد، الذي لا تتضمن قيم
ه السطحية والمحدوة، الحرية والمجتمع."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Locks&rdquo;"
 msgstr "<!-- digital locks -->&rdquo;القيود الرقمية&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | &ldquo;Digital locks&rdquo; is used to refer to Digital Restrictions
 # | Management by some who criticize it.  The problem with this term is that
 # | it fails to [-show what's wrong with-] {+do justice to+} the [-practice.-]
@@ -1285,12 +1297,12 @@
 "&rdquo;القيود الرقمية&ldquo; التعبير يستخدم 
بواسطة المنتقدين لإدارة القيود "
 "الرقمية. المشكلة أن التعبير يفشل في إيضاح 
المشكلة في هذه الممارسة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Locks are not necessarily [-an injustice.-] {+oppressive or bad.+}  You
 # | probably own several locks, and their keys or codes as well; you may find
 # | them useful or troublesome, but [-either way-] they don't oppress you,
 # | because you can open and close them.  {+Likewise, we find <a
-# | 
href=\"http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\";>encryption</a>
+# | 
href=\"https://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\";>encryption</a>
 # | invaluable for protecting our digital files.  That too is a kind of
 # | digital lock that you have control over.+}
 #, fuzzy
@@ -1303,7 +1315,7 @@
 "Locks are not necessarily oppressive or bad.  You probably own several "
 "locks, and their keys or codes as well; you may find them useful or "
 "troublesome, but they don't oppress you, because you can open and close "
-"them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+"them.  Likewise, we find <a href=\"https://www.theguardian.com/";
 "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
 "good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
 "digital files.  That too is a kind of digital lock that you have control "
@@ -1313,7 +1325,7 @@
 "أكوادهم أيضاً؛ ربما تجد فيهم إفادة أو سبب 
إزعاج، لكن في كلتا الحالتين لا "
 "يقمعوك، لانك تستطيع أن تفتحهم أو تقفلهم."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | DRM is like a lock placed on you by someone else, who refuses to give you
 # | the key&mdash;in other words, like [-handcuffs.-] {+<em>handcuffs</em>.+} 
 # | Therefore, [-we call them-] {+the proper metaphor for DRM is+}
@@ -1334,7 +1346,7 @@
 "المفتاح - بكلمات أخرى، مثل الأصفاد. لذلك 
ندعوهم &rdquo; الأصفاد الرقمية "
 "&ldquo;، وليس &rdquo; القيود الرقمية&ldquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A number of opposition campaigns have chosen the unwise term
 # | &ldquo;digital locks&rdquo;; to get things back on the right track, we
 # | must firmly [-decline to follow them in using that term.  We-] {+insist on
@@ -1364,11 +1376,11 @@
 "توافقنا موضوعياً؛ ولكن علينا عند التعبر 
عن دعمنا أن نستبدل التعبير &rdquo;"
 "بالأصفاد الرقمية&ldquo; بشكل واضح؛ ونوضح 
السبب. "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Rights Management&rdquo;"
 msgstr "<!-- drm -->&rdquo;إدارة الحقوق الرقمية&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | &ldquo;Digital Rights Management&rdquo; {+(abbreviated
 # | &ldquo;DRM&rdquo;)+} refers to technical [-schemes-] {+mechanisms+}
 # | designed to impose restrictions on computer users.  The use of the word
@@ -1397,7 +1409,7 @@
 "وغرضه أن يجعلك بدون أن تشعر تفكر في الأمر م
ن نظرة القلة الذين يفرضون القيود، "
 "وتتجاهل نظرة العامة الذين تنطبق القيود 
عليهم."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Good alternatives include &ldquo;Digital Restrictions Management,&rdquo; and "
 "&ldquo;digital handcuffs.&rdquo;"
@@ -1405,17 +1417,17 @@
 "من البدائل الجيدة &rdquo;إدارة القيود الرقم
ية&ldquo; و&rdquo;الأصفاد "
 "الرقمية&ldquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+"Please sign up to support our <a href=\"https://DefectiveByDesign.org/\";> "
 "campaign to abolish DRM</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ecosystem&rdquo;"
 msgstr "<!-- ecosystem -->&rdquo;منظومة بيئية&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is inadvisable to describe the free software community, or any human "
 "community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
@@ -1424,7 +1436,7 @@
 "من غير المحبذ وصف مجتمع البرمجيات الحرة، 
أو أي مجتمع إنساني بأنه &rdquo;"
 "منظومة بيئية&ldquo; لأن هذا يفرض غياب الجانب 
الخلقي."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;ecosystem&rdquo; implicitly suggests an attitude of "
 "nonjudgmental observation: don't ask how what <em>should</em> happen, just "
@@ -1442,7 +1454,7 @@
 "أن هذا يحدث. أعداد الكائنات الحية تزاد 
وتقل وفقًا لبعض الظروف، وهذا ليس عدلا "
 "أو ظلما، فهو مجرد ظاهرة بيئية. حتى إذا وصل 
الأمر إلى إنقراض الفصائل."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By contrast, beings that adopt an ethical stance towards their surroundings "
 "can decide to preserve things that, without their intervention, might "
@@ -1456,11 +1468,11 @@
 "الهواء الجوي والماء، والحيونات المهددة 
بالانقراض، والفنون التقليدية، وحرية "
 "مستخدمي الحاسوب."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FLOSS&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
 "Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
@@ -1469,11 +1481,11 @@
 "want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;For free&rdquo;"
 msgstr "&rdquo;For free&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to say that a program is free software, please don't say that it "
 "is available &ldquo;for free.&rdquo; That term specifically means &ldquo;for "
@@ -1484,7 +1496,7 @@
 "for free.&rdquo; لأن هذه العبارة تحديدًا تعني 
&rdquo;بلا مقابل&ldquo;. إن "
 "البرمجيات الحرة متعلقة بالحرية لا السعر."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software copies are often available for free&mdash;for example, by "
 "downloading via FTP.  But free software copies are also available for a "
@@ -1497,18 +1509,18 @@
 "المقابل، تتوفر البرمجيات المحتكرة 
أحيانًا بلا مقابل في العروض، وبعض الحزم "
 "المحتكرة متوفرة أصلا بلا مقابل لبعض الم
ستخدمين. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, you can say that the program is available &ldquo;as free "
 "software.&rdquo;"
 msgstr ""
 "لتجنب اللبس، يمكنك أن تقول: &ldquo;هذا البرنام
ج متوفر كبرمجيات حرة.&rdquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FOSS&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
 "&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
@@ -1517,17 +1529,17 @@
 "But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>FOSS</b>, we say, <b>free software</b> or <b>free (libre) "
 "software</b>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freely available&rdquo;"
 msgstr "&rdquo;Freely available&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The terms are not equivalent.  Software is &ldquo;"
@@ -1542,11 +1554,11 @@
 "البرمجيات الحرة بالحرية التي يحصل عليها 
المستخدمون الذين يملكون نسخًا منها. "
 "إن هاتين قضيتين مختلفتين."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freeware&rdquo;"
 msgstr "<!-- freeware -->&rdquo;برمجيات مجانية&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;freeware&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The term &ldquo;freeware&rdquo; was used often in the "
@@ -1558,7 +1570,7 @@
 "بكثيرة في الثمانينات للبرمجيات التي تُصدر 
بصيغة تنفيذية فقط، بدون توفر الكود "
 "المصدري. أنا اليوم فليس لها تعريف متفق 
عليه."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When using languages other than English, please avoid borrowing English "
 "terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; It is "
@@ -1570,7 +1582,7 @@
 "الأفضل أن تترجم مصطلح &rdquo;free software&ldquo; إلى <a 
href=\"/philosophy/"
 "fs-translations.html\">لغتك</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By using a word in <a href=\"/philosophy/fs-translations.html\">your own "
 "language</a>, you show that you are really referring to freedom and not just "
@@ -1584,11 +1596,11 @@
 "غامضة. قد يبدو المصطلحة غريبًا أو مربكًا لم
ن حولك، لكنهم عندما يعرفون أنه يشير "
 "إلى معناه، فسوف يفهمون القضية."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Give away software&rdquo;"
 msgstr "&rdquo;Give away software&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
 "distribute a program as free software.&rdquo; This locution has the same "
@@ -1602,11 +1614,11 @@
 "القضية هي السعر وليست الحرية. إحدة ترق 
تجنب اللبس قول: &rdquo;release as "
 "free software.&ldquo;"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Google&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;google&rdquo; as a verb, meaning to "
 "search for something on the internet. &ldquo;Google&rdquo; is just the name "
@@ -1618,13 +1630,29 @@
 "kind.)"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Hacker&rdquo;"
 msgstr "<!-- hacker -->&rdquo;هاكر&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A hacker is someone who <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\"> enjoys playful
+# | cleverness</a>&mdash;not necessarily with computers.  The programmers in
+# | the old <abbr title=\"Massachusetts Institute of Technology\">MIT</abbr>
+# | free software community of the 60s and 70s referred to themselves as
+# | hackers.  Around 1980, journalists who discovered the hacker community
+# | mistakenly took the term to mean &ldquo;security breaker.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+#| "html\"> enjoys playful cleverness</a>&mdash;not necessarily with "
+#| "computers.  The programmers in the old <abbr title=\"Massachusetts "
+#| "Institute of Technology\">MIT</abbr> free software community of the 60s "
+#| "and 70s referred to themselves as hackers.  Around 1980, journalists who "
+#| "discovered the hacker community mistakenly took the term to mean &ldquo;"
+#| "security breaker.&rdquo;"
 msgid ""
-"A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+"A hacker is someone who <a href=\"https://stallman.org/articles/on-hacking.";
 "html\"> enjoys playful cleverness</a>&mdash;not necessarily with computers.  "
 "The programmers in the old <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr> free software community of the 60s and 70s referred "
@@ -1639,18 +1667,18 @@
 "عام 1980، فهم الصحفيون الذين اكتشفوا مجتمع 
الهكر خطأً أن الكلمة تعني &rdquo;"
 "مهدد الأمن&ldquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't spread this mistake.  People who break security are &ldquo;"
 "crackers.&rdquo;"
 msgstr ""
 "من فضلك لا تنشر هذا الخطأ. إن الذين يكسرون 
الحماية &rdquo;كراكر&ldquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Intellectual property&rdquo;"
 msgstr "<!-- intellectual -->&rdquo;ملكية فكرية&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
 "property&rdquo;&mdash;a term also applied to patents, trademarks, and other "
@@ -1666,7 +1694,7 @@
 "عن &rdquo;حقوق النشر&ldquo; أو عن &rdquo;براءات 
الاختراع&ldquo; أو عن &rdquo;"
 "العلامات التجارية&ldquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;intellectual property&rdquo; carries a hidden "
 "assumption&mdash;that the way to think about all these disparate issues is "
@@ -1677,7 +1705,7 @@
 "أن كل هذه القضايا المختلفة مبنية على 
تشبيهها بالأجسام المحسوسة، وأن علينا "
 "اعتبارها كملكية الأجسام المحسوسة."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When it comes to copying, this analogy disregards the crucial difference "
 "between material objects and information: information can be copied and "
@@ -1687,7 +1715,7 @@
 "المادية والمعلومات: أن المعلومات يمكن 
نسخها ومشاركتها بدون مجهود يذكر، بينما "
 "لا يمكن القيام بذلك مع الأجسام المادية."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid spreading unnecessary bias and confusion, it is best to adopt a "
 "firm policy <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
@@ -1697,7 +1725,7 @@
 "\"/philosophy/not-ipr.html\">ضد الحديث أو حتى التفكير 
في مصطلح &rdquo;ملكية "
 "فكرية&ldquo;</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
 "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make the "
@@ -1707,11 +1735,11 @@
 "wipo-PublicAwarenessOfCopyright-2002.html\">تجعل منظمة &rdquo;الم
لكية "
 "الفكرية&ldquo; العالمية في حرج</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Internet of Things&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies decided to make computerized appliances that would connect "
 "over the internet to the manufacturer's server, and therefore could easily "
@@ -1720,9 +1748,9 @@
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Experience shows that these products often do <a href=\"http://www.locusmag.";
+"Experience shows that these products often do <a href=\"https://www.locusmag.";
 "com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-"
 "things-to-be-sensed/\"> spy on their users</a>.  They are also tailor-made "
 "for <a href=\"https://archive.ieet.org/articles/rinesi20150806.html\";>giving "
@@ -1731,15 +1759,15 @@
 "off the server it depends on."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We call them the &ldquo;Internet of Stings.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;LAMP system&rdquo;"
 msgstr "<!-- lamp -->&rdquo;نظام LAMP&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
 "&mdash;a common combination of software to use on a web server, except that "
@@ -1753,11 +1781,11 @@
 "بدلا من &ldquo;LAMP&rdquo; يجب أن تكون &ldquo;GLAMP&rdquo;: 
&rdquo;غنو "
 "ولينكس وأباتشي وماي إس كيو إل وبي إتش 
بي&ldquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Linux system&rdquo;"
 msgstr "<!-- linux -->&rdquo;نظام Linux&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
@@ -1772,11 +1800,11 @@
 "<a href=\"/gnu/linux-and-gnu.html\">غنو/لينكس</a> لتنسبه إلى 
مشروع غنو "
 "ولتفرق بين النظام الكامل والنواة وحدها."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Market&rdquo;"
 msgstr "<!-- market -->&rdquo;سوق&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is misleading to describe the users of free software, or the software "
 "users in general, as a &ldquo;market.&rdquo;"
@@ -1784,7 +1812,7 @@
 "من الخطأ وصل مستخدمي البرمجيات الحرة أو م
ستخدمي البرمجيات بشكل عام بأنهم "
 "&rdquo;سوق&ldquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not to say there is no room for markets in the free software "
 "community.  If you have a free software support business, then you have "
@@ -1795,7 +1823,7 @@
 "خدمة دعم برمجيات حرة تجارية، فعندك حينها 
عملاء، وأنت تتاجر معهم في سوق، وما "
 "دمت تحترم حريتهم، فنحن نتمنى لك النجاح في 
سوقك."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But the free software movement is a social movement, not a business, and the "
 "success it aims for is not a market success.  We are trying to serve the "
@@ -1809,18 +1837,18 @@
 "التجارة. إن تقليل الحملة من أجل نجاح 
نشاطات رجال الأعمال، هو إنكار للحرية "
 "وتشريع للبرمجيات المحتكرة."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Modern&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;modern&rdquo; makes sense from a descriptive perspective "
 "&mdash; for instance, solely to distinguish newer periods and ways from "
 "older ones."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It becomes a problem when it carries the presumption that older ways are "
 "&ldquo;old-fashioned&rdquo;; that is, presumed to be worse.  In "
@@ -1828,11 +1856,11 @@
 "users, the reverse is often true."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Monetize&rdquo;"
 msgstr "<!-- monetize -->&rdquo;نقّد&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The [-natural meaning-] {+proper definition+} of &ldquo;monetize&rdquo; is
 # | [-&ldquo;convert into money&rdquo;.  If you make-] {+&ldquo;to use+}
 # | something {+as currency.&rdquo; For instance, human societies have
@@ -1859,7 +1887,7 @@
 "أنتجت شئثم حولته إلى نقود، هذا يعني أنه لم 
يبقَ إلا النقود، وبذلك لن يستفيد "
 "أحدُُ سواك، ولم تسهم بشئ في العالم."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That usage casts the profit as primary, and the thing used to get the profit "
 "as secondary.  That attitude applied to a software project is objectionable "
@@ -1867,7 +1895,7 @@
 "they conclude that making it free/libre isn't sufficiently profitable."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-By contrast, a-]{+A+} productive and ethical business [-does not
 # | convert-] {+can make money, but if it subordinates+} all [-of its product
 # | into money.  Part of-] {+else to profit,+} it is [-a contribution-] {+not
@@ -1884,12 +1912,12 @@
 "في المقابل، التجارة المنتجة والأخلاقية لا 
تحول كل منتجاتها إلى نقود. بل "
 "تشارك العالم بجزء منها."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;MP3 Player&rdquo;"
 msgstr "<!-- mp3 -->&rdquo;مشغل MP3&ldquo;"
 
 #.  The MP3 patents will reportedly expire by 2018.  
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | In the late 1990s it became feasible to make portable, solid-state digital
 # | audio players.  Most [-support-] {+players supported+} the patented MP3
 # | codec, [-but not all.-] {+and that is still the case.+}  Some [-support-]
@@ -1929,7 +1957,7 @@
 "يجعل الناس يواصلون استخدام هذا النسق 
الخطير. إننا نقترح اسم &rdquo;مشغل صوت "
 "رقمي&ldquo; أو ببساطة &rdquo;مشغل صوت&ldquo; إذا 
ناسب السياق."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Using the term &ldquo;MP3 players&rdquo; for audio players in general has "
 "the effect of promoting the MP3 format and discouraging the other formats "
@@ -1937,18 +1965,18 @@
 "patents have expired, it is still undesirable to do that."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;digital audio player,&rdquo; or simply &ldquo;"
 "audio player&rdquo; when that's clear enough, instead of &ldquo;MP3 player."
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Open&rdquo;"
 msgstr "<!-- open -->&rdquo;مفتوح&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Please avoid using the term &ldquo;open&rdquo; or &ldquo;open
 # | source&rdquo; as a substitute for &ldquo;free software.&rdquo; Those terms
 # | refer to a <a href=\"/philosophy/open-source-misses-the-point.html\">
@@ -1986,38 +2014,38 @@
 "فضلك لا تستخدمها للإشارة إلى عملنا فهذا 
يجعل الناس يعتقدون أننا نتبنى تلك "
 "الآراء."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When referring to the open source views, it's correct to use that name, but "
 "please do not use that term when talking about us, our software, or our "
 "views&mdash;that leads people to suppose our views are similar to theirs."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>open source</b>, we say, <b>free software</b> or <b>free "
 "(libre) software</b>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | [-&ldquo;Open&rdquo;-]{+&ldquo;Opt out&rdquo;+}
 #, fuzzy
 #| msgid "&ldquo;Open&rdquo;"
 msgid "&ldquo;Opt out&rdquo;"
 msgstr "<!-- open -->&rdquo;مفتوح&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When applied to any form of computational mistreatment, &ldquo;opt "
 "out&rdquo; implies the choice is a minor matter of convenience. We recommend "
 "&ldquo;reject,&rdquo; &ldquo;shun&rdquo; or &ldquo;escape from.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PC&rdquo;"
 msgstr "&rdquo;PC&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's OK to use the abbreviation &ldquo;PC&rdquo; to refer to a certain kind "
 "of computer hardware, but please don't use it with the implication that the "
@@ -2028,33 +2056,46 @@
 "الحاسوب، لكن من فضلك لا تستخدمه لتشير ضم
نًا إلى أن الحاسوب يُشغّل مايكروسوفت "
 "ويندوز. إذا ثبّت غنو/لينكس على نفس الجهاز 
فسيظل PC."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;WC&rdquo; has been suggested for a computer running Windows."
 msgstr "اقترح الاختصار &rdquo;WC&ldquo; للحواسيب التي 
تُشغّل ويندوز."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Photoshop&rdquo;"
 msgstr "&rdquo;Photoshop&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any
+# | kind of photo manipulation or image editing in general.  Photoshop is just
+# | the name of one particular image editing program, which should be avoided
+# | since it is proprietary.  There are plenty of free programs for editing
+# | images, such as the <a [-href=\"/software/gimp\">GIMP</a>.-]
+# | {+href=\"https://www.gimp.org/\";>GIMP</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning "
+#| "any kind of photo manipulation or image editing in general.  Photoshop is "
+#| "just the name of one particular image editing program, which should be "
+#| "avoided since it is proprietary.  There are plenty of free programs for "
+#| "editing images, such as the <a href=\"/software/gimp\">GIMP</a>."
 msgid ""
 "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any "
 "kind of photo manipulation or image editing in general.  Photoshop is just "
 "the name of one particular image editing program, which should be avoided "
 "since it is proprietary.  There are plenty of free programs for editing "
-"images, such as the <a href=\"/software/gimp\">GIMP</a>."
+"images, such as the <a href=\"https://www.gimp.org/\";>GIMP</a>."
 msgstr ""
 "من فضلك تجنب كلمة &rdquo;photoshop&ldquo;  كفعل، أو 
للإشارة إلى أي نوع من "
 "معالجة الصور أو تعديلها بشكل عام. إن Photoshop م
ا هو إلا مجرد اسم لبرنامج "
 "تحرير صور معين ينبغي تجنبه لأنه محتكر. 
يوجد العديد من البدائل الحرة لتحرير "
 "الصور وتعديلها منها <a href=\"/software/gimp\">جمبGIMP 
</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Piracy&rdquo;"
 msgstr "<!-- piracy -->&rdquo;قرصنة&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers often refer to copying they don't approve of as &ldquo;piracy."
 "&rdquo; In this way, they imply that it is ethically equivalent to attacking "
@@ -2068,7 +2109,7 @@
 "البحارة وقتلهم. استنادًا على هذه الدعاية، 
مرروا قوانينًا في معظم أنحاء العالم "
 "لمنع النسخ بشتى (أو أحيانًا بشتى) طرقه. (لا 
يزالون يضغطون لجعل المنع أعم)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you don't believe that copying not approved by the publisher is just like "
 "kidnapping and murder, you might prefer not to use the word &ldquo;"
@@ -2084,19 +2125,19 @@
 "الممنوع عندما يكون النسخ غير قانوني). 
بعضنا يفضل استخدام مصطلحات إيجابية مثل "
 "&rdquo;مشاركة المعلومات مع جارك&ldquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear words.</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PowerPoint&rdquo;"
 msgstr "&rdquo;PowerPoint&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of
 # | slide presentation.  &ldquo;PowerPoint&rdquo; is just the name of one
 # | particular proprietary program to make [-presentations, and there are
@@ -2125,11 +2166,11 @@
 "وتوجد برامج حرة كثيرة لعرض الشرائح منها 
صنف LaTeXs <code>beamer</code> و "
 "LibreOffice Impress."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Product&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you're talking about a product, by all means call it that.  However, when "
 "referring to a service, please do not call it a &ldquo;product.&rdquo; If a "
@@ -2139,11 +2180,11 @@
 "&ldquo;deal.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Protection&rdquo;"
 msgstr "<!-- protection -->&rdquo;حماية&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers' lawyers love to use the term &ldquo;protection&rdquo; to "
 "describe copyright.  This word carries the implication of preventing "
@@ -2156,7 +2197,7 @@
 "يتعاطفون مع المالك والناشر الذين يستفيدان 
من حقوق النشر، بدلا من المستخدمين "
 "الذين تُقيّدهم."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms instead.  "
 "For example, instead of saying, &ldquo;Copyright protection lasts a very "
@@ -2167,7 +2208,7 @@
 "سبيل المثال، بدلا من قول &rdquo;حماية حقوق 
النشر مدتها طويلة جدًا&ldquo; يمكن "
 "أن تقول &rdquo;حقوق النشر مدتها طويلة 
جدًا&ldquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Likewise, instead of saying, &ldquo;protected by copyright,&rdquo; you can "
 "say, &ldquo;covered by copyright&rdquo; or just &ldquo;copyrighted.&rdquo;"
@@ -2175,7 +2216,7 @@
 "بالمثل بدلاً من قول &rdquo;محمي بحقوق 
الطبع&ldquo; يمكنك القول &rdquo;تحت "
 "بحقوق الطبع&rdquo; أو فقط &rdquo;حقوق الطبع م
حفوظة&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to criticize copyright rather than be neutral, you can use the "
 "term &ldquo;copyright restrictions.&rdquo; Thus, you can say, &ldquo;"
@@ -2184,14 +2225,31 @@
 "إذا أردت انتقاد حقوق النشر بدلا من الحياد، 
فإمكانك استخدام عبارة &rdquo;قيود "
 "حقوق النشر&ldquo;، فيمكنك قول &rdquo;قيود حقوق 
النشر مدتها طويلة جدًا&ldquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The term &ldquo;protection&rdquo; is also used to describe malicious
+# | features.  For instance, &ldquo;copy protection&rdquo; is a feature that
+# | interferes with copying.  From the user's point of view, this is
+# | obstruction.  So we could call that malicious feature &ldquo;copy
+# | obstruction.&rdquo; More often it is called Digital Restrictions
+# | Management (DRM)&mdash;see the <a
+# | href=\"http{+s+}://DefectiveByDesign.org\"> Defective by Design</a>
+# | campaign.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;protection&rdquo; is also used to describe malicious "
+#| "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
+#| "interferes with copying.  From the user's point of view, this is "
+#| "obstruction.  So we could call that malicious feature &ldquo;copy "
+#| "obstruction.&rdquo; More often it is called Digital Restrictions "
+#| "Management (DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> "
+#| "Defective by Design</a> campaign."
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
 "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
 "interferes with copying.  From the user's point of view, this is "
 "obstruction.  So we could call that malicious feature &ldquo;copy "
 "obstruction.&rdquo; More often it is called Digital Restrictions Management "
-"(DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> Defective by "
+"(DRM)&mdash;see the <a href=\"https://DefectiveByDesign.org\";> Defective by "
 "Design</a> campaign."
 msgstr ""
 "يستخدم مصطلح &rdquo;حماية&ldquo; أيضًا لوصف بعض 
المزايا الخبيثة. على سبيل "
@@ -2201,11 +2259,11 @@
 "<a href=\"http://DefectiveByDesign.org\";> Defective by Design معيب 
بالتصميم "
 "</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;"
 msgstr "&rdquo;RAND (معقولة وغير تميزية)&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies that promulgate patent-restricted standards that prohibit "
 "free software typically have a policy of obtaining patent licenses that "
@@ -2218,7 +2276,7 @@
 "يُشار عادة إلى تلك الرخص ب&rdquo;RAND&ldquo;، 
والتي تعني &rdquo;معقولة وغير "
 "تمييزية&ldquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That term whitewashes a class of patent licenses that are normally neither "
 "reasonable nor nondiscriminatory.  It is true that these licenses do not "
@@ -2231,7 +2289,7 @@
 "البرمجيات الحرة، وهذا يجعلها غير معقولة. 
لذلك، فإن نصف كلمة &rdquo;"
 "RAND&ldquo; خطأ والثاني متحيز."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
 "and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
@@ -2246,7 +2304,7 @@
 "يحسنون برفضها. إن استخدمها لمجرد أن شركات 
براءات الاختراع الكبرى نشرته ما هو "
 "إلا جعل تلك الشركات تملي عليك الآراء التي 
تعبر عنها."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;uniform fee only,&rdquo; or &ldquo;UFO&rdquo; for "
 "short, as a replacement.  It is accurate because the only condition in these "
@@ -2255,11 +2313,11 @@
 "إننا نقترح كلمة &rdquo;رسم موحد فقط&ldquo; أو 
للاختصار &rdquo;UFO&ldquo;. إن "
 "هذه الكلمة ديقة لأن الشرط الحيد في تلك 
الرخص أن تكون موحدة الرسوم."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;SaaS&rdquo; or &ldquo;Software as a Service&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We used to say that SaaS (short for &ldquo;Software as a Service&rdquo;) is "
 "an injustice, but then we found that there was a lot of variation in "
@@ -2269,24 +2327,24 @@
 "definition is the only one, and it explains what the injustice consists of."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/who-does-that-server-really-serve.html\">Who Does "
 "That Server Really Serve?</a> for discussion of this issue."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In Spanish we continue to use the term &ldquo;software como servicio&rdquo; "
 "because the joke of &ldquo;software como ser vicio&rdquo; (&ldquo;software, "
 "as being pernicious&rdquo;) is too good to give up."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sell software&rdquo;"
 msgstr "<!-- sell -->&rdquo;بيع البرامج&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking,
 # | exchanging a copy of a free program for a sum of money is <a
 # | href=\"/philosophy/selling.html\"> [-selling</a>; but-] {+selling the
@@ -2323,7 +2381,7 @@
 "أوضح وأن تمنع اللبس بقول &rdquo;توزيع نسخ من 
البرنامج مقابل رسوم&ldquo; أو "
 "&rdquo;فرض قيود احتكارية على استخدام البرنام
ج&ldquo; على حسب ما تقصد."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
 "further discussion of this issue."
@@ -2331,11 +2389,11 @@
 "راجع <a href=\"/philosophy/selling.html\">بيع البرمجيات 
الحرة</a> لمزيد من "
 "الشرح عن هذه القضية."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing (personal data)&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies manipulate or lure people into revealing personal data and "
 "thus ceding their privacy, please don't refer to this as &ldquo;sharing."
@@ -2345,17 +2403,17 @@
 "word to a practice which is harmful and dangerous."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When one company redistributes collected personal data to another company, "
 "that is even less deserving of the term &ldquo;sharing.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing economy&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;sharing economy&rdquo; is not a good way to refer to "
 "services such as Uber and Airbnb that arrange business transactions between "
@@ -2365,17 +2423,17 @@
 "transactions undermines its meaning, so we don't use it in this context."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A more suitable term for businesses like Uber is the &ldquo;piecework "
 "service economy&rdquo; or &ldquo;gig economy.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Skype&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;skype&rdquo; as a verb, meaning any kind "
 "of video communication or telephony over the Internet in general.  &ldquo;"
@@ -2387,11 +2445,11 @@
 "Skype_Replacement\"> numerous free Skype replacements</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Software Industry&rdquo;"
 msgstr "<!-- software -->&rdquo;صناعة البرمجيات&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;software industry&rdquo; encourages people to imagine that "
 "software is always developed by a sort of factory and then delivered to "
@@ -2406,7 +2464,7 @@
 "من الشركات برامج حرة و/أو غير حرة، لكن تلك 
الشركات التي تطور برمجيات حرة لا "
 "تعمل في إطار يشبه المصنع."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;industry&rdquo; is being used as propaganda by advocates of "
 "software patents.  They call software development &ldquo;industry&rdquo; and "
@@ -2425,11 +2483,11 @@
 "2003، وصوت على تعريف &rdquo;صناعة&ldquo; بأنها 
&rdquo;الإنتاج الآلي للمنتجات "
 "المادية&ldquo;</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Source model&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
@@ -2442,11 +2500,11 @@
 "describing free software programs."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Terminal&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Mobile phones and tablets are computers, and people should be able to do "
 "their computing on them using free software.  To call them &ldquo;"
@@ -2454,11 +2512,11 @@
 "servers, which is a bad way to do your own computing."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Theft&rdquo;"
 msgstr "<!-- theft -->&rdquo;سرقة&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-Copyright apologists-]{+The supporters of a too-strict, repressive form
 # | of copyright+} often use words like &ldquo;stolen&rdquo; and
 # | &ldquo;theft&rdquo; to refer to copyright infringement.  This is spin, but
@@ -2478,9 +2536,9 @@
 "سرقة&ldquo; للإشارة إلى خروقات حقوق النشر. 
هذا تدليس، ولكنهم يتمنون أن تأخذ "
 "الموضوع كحقيقة موضوعية."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Under the US legal system, copyright infringement is not theft.  <a
-# | 
href=\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\";>
+# | 
href=\"http{+s+}://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\">
 # | Laws about theft are not applicable to copyright infringement.</a> The
 # | {+supporters of repressive+} copyright [-apologists-] are making an appeal
 # | to authority&mdash;and misrepresenting what authority says.
@@ -2493,7 +2551,7 @@
 #| "authority&mdash;and misrepresenting what authority says."
 msgid ""
 "Under the US legal system, copyright infringement is not theft.  <a href="
-"\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
+"\"https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
 "invol=207\"> Laws about theft are not applicable to copyright infringement.</"
 "a> The supporters of repressive copyright are making an appeal to "
 "authority&mdash;and misrepresenting what authority says."
@@ -2504,14 +2562,14 @@
 "المتعلقة بالسرقة لا تنطبق على خروقات حقوق 
النشر</a>. إن المدافعين عن حقوق "
 "النشر يسألون السلطة، ثم يحرفون ما قالته."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"To refute them, you can point to this <a href=\"http://www.guardian.co.uk/";
+"To refute them, you can point to this <a href=\"https://www.guardian.co.uk/";
 "books/2013/may/04/harper-lee-kill-mockingbird-copyright\"> real case</a> "
 "which shows what can properly be described as &ldquo;copyright theft.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unauthorized copying is forbidden by copyright law in many circumstances "
 "(not all!), but being forbidden doesn't make it wrong.  In general, laws "
@@ -2525,19 +2583,19 @@
 "القوانين (التطبيق) لا يلائم معتقاداتنا عن 
الصواب والخطاء (الفطرة)، فيجب على "
 "القوانين أن تتغير."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear-words.</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Trusted Computing&rdquo;"
 msgstr "<!-- trusted -->&rdquo;الحوسبة الموثوقة&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;</"
 "a> is the proponents' name for a scheme to redesign computers so that "
@@ -2550,11 +2608,11 @@
 "بدلا منك. من جهتهم، يعتبر &rdquo;موثوقًا&ldquo;؛ 
أما من جهتك فهو &rdquo;"
 "خائن&ldquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Vendor&rdquo;"
 msgstr "<!-- vendor -->&rdquo;بائع&ldquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;vendor&rdquo; to refer generally to anyone "
 "that develops or packages software.  Many programs are developed in order to "
@@ -2572,9 +2630,18 @@
 "الذين يعجهزون توزيعات غنو/لينكس بائعين. 
إننا نوصي باستخدام اسم &rdquo;مُزوّد "
 "العام&ldquo;."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+# | This essay is published in <a
+# | 
href=\"http{+s+}://shop.fsf.org/product/free-software-free-society/\"><cite>Free
+# | Software, Free Society: The Selected Essays of Richard M.
+# | Stallman</cite></a>.
+#, fuzzy
+#| msgid ""
+#| "This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+#| "software-free-society/\"><cite>Free Software, Free Society: The Selected "
+#| "Essays of Richard M. Stallman</cite></a>."
 msgid ""
-"This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+"This essay is published in <a href=\"https://shop.fsf.org/product/free-";
 "software-free-society/\"><cite>Free Software, Free Society: The Selected "
 "Essays of Richard M. Stallman</cite></a>."
 msgstr ""
@@ -2601,6 +2668,7 @@
 "يرجى إرسال الوصلات المنقطعة وأي تصحيحات 
أو اقتراحات إلى <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
+# TODO: submitting -> contributing.
 #.  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
@@ -2608,14 +2676,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</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>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "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."
 msgstr ""
 "رغم بذلنا قصارى جهدنا لتوفير ترجمات دقيقة 
ذات جودة عالية، فإننا لا ندعي كمال "
@@ -2626,21 +2700,14 @@
 "href=\"/server/standards/README.translations.html\">دليل الترجم
Ø©</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-1996-1999، 2001-2004، 2007-2012-] {+1996, 1997, 1998,
-# | 1999, 2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2015,
-# | 2016, 2017, 2018, 2020, 2021+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2014-] {+1996-2018, 2020, 2021+} Free Software
+# | Foundation, Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 1996-1999، 2001-2004، 2007-2012 Free Software "
-#| "Foundation, Inc."
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free Software "
-"Foundation, Inc."
+#| msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 1996-2018, 2020, 2021 Free Software Foundation, Inc."
 msgstr ""
-"حقوق النشر:</p><p style=\"direction: ltr\">\n"
-"Copyright &copy; 1996-1999، 2001-2004، 2007-2012 Free Software Foundation, "
-"Inc. (مؤسسة البرمجيات الحرة)"
+"حقوق النشر:<br />\n"
+"Copyright &copy; 2014 Free Software Foundation, Inc. (مؤسسة البرم
جيات الحرة)"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -2664,6 +2731,32 @@
 msgid "Updated:"
 msgstr "حُدّثت:"
 
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "رغم بذلنا قصارى جهدنا لتوفير ترجمات 
دقيقة ذات جودة عالية، فإننا لا ندعي "
+#~ "كمال النصوص وخلوها من الأخطاء. يرجي 
إرسال التعليقات والمقترحات المتعلقة "
+#~ "بهذا الشأن إلى عنوان البريد الإلكتروني <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\"> &lt;web-translators@gnu.org&gt;</a>.</p> 
<p>للحصول "
+#~ "على أي معلومات بشأن تنسيق وتقديم ترجمات م
وقعنا الإلكتروني، يرجى الاطلاع "
+#~ "على الرابط التالي <a 
href=\"/server/standards/README.translations.html"
+#~ "\">دليل الترجمة</a>."
+
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 1996-1999، 2001-2004، 2007-2012 Free Software "
+#~| "Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~ "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "حقوق النشر:</p><p style=\"direction: ltr\">\n"
+#~ "Copyright &copy; 1996-1999، 2001-2004، 2007-2012 Free Software "
+#~ "Foundation, Inc. (مؤسسة البرمجيات الحرة)"
+
 #~ msgid "<a href=\"/philosophy/philosophy.html\">Other Texts to Read</a> |"
 #~ msgstr "<a href=\"/philosophy/philosophy.html\">نصوص أخرى</a> |"
 

Index: words-to-avoid.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ca.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- words-to-avoid.ca.po        31 May 2021 03:56:37 -0000      1.11
+++ words-to-avoid.ca.po        21 Jul 2021 19:32:31 -0000      1.12
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2021-05-31 03:55+0000\n"
+"POT-Creation-Date: 2021-07-21 19:25+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -32,7 +32,7 @@
 "Algunes paraules i frases confuses que convé evitar - Projecte GNU - Free "
 "Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 # | [-Confusing-]Words [-and Phrases that are Worth Avoiding-] {+to Avoid (or
 # | Use with Care) Because They Are Loaded or Confusing+}
 #, fuzzy
@@ -40,7 +40,7 @@
 msgid "Words to Avoid (or Use with Care) Because They Are Loaded or Confusing"
 msgstr "Algunes paraules i frases confuses que convé evitar"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | There are a number of words and phrases [-which-] {+that+} we recommend
 # | avoiding, or avoiding in certain contexts and usages.  [-The reason is
 # | either that they-]  {+Some+} are ambiguous[-,-] or {+misleading; others
@@ -63,112 +63,95 @@
 "general o bé en certs contexts i usos. La raó és que són ambigües o que "
 "impliquen una opinió que esperem que no compartiu del tot."
 
-#. type: Content of: <div><blockquote><p>
-# | Also note <a href=\"/philosophy/categories.html\">Categories of Free
-# | [-Software</a>.-] {+Software</a>, <a
-# | href=\"/philosophy/why-call-it-the-swindle.html\">Why Call It The
-# | Swindle?</a>+}
-#, fuzzy
-#| msgid ""
-#| "Also note <a href=\"/philosophy/categories.html\">Categories of Free "
-#| "Software</a>."
-msgid ""
-"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
-"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
-"It The Swindle?</a>"
-msgstr ""
-"Vegeu també <a href=\"/philosophy/categories.html\">Categories de Programari 
"
-"Lliure</a>."
-
 #.  GNUN-SORT-START 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ad-blocker\">Ad-blocker</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Access\">Access</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Alternative\">Alternative</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Assets\">Assets</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#BSD-style\">BSD-style</a>&rdquo; |"
 msgstr "«<a href=\"#BSD-style\"><!--BSD-->Estil&nbsp;BSD</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Closed\">Closed</a>&rdquo; |"
 msgstr "«<a href=\"#Closed\">Tancat</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CloudComputing\">Cloud Computing</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Commercial\">Commercial</a>&rdquo; |"
 msgstr "«<a href=\"#Commercial\">Comercial</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Compensation\">Compensation</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consume\">Consume</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consumer\">Consumer</a>&rdquo; |"
 msgstr "«<a href=\"#Consumer\">Consumidor</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Content\">Content</a>&rdquo; |"
 msgstr "«<a href=\"#Content\">Contingut</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CopyrightOwner\">Copyright Owner</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#CreativeCommonsLicensed\">Creative Commons licensed</"
 "a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Creator\">Creator</a>&rdquo; |"
 msgstr "«<a href=\"#Creator\">Creador</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalGoods\">Digital Goods</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalLocks\">Digital Locks</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#DigitalRightsManagement\">Digital Rights Management</"
 "a>&rdquo; |"
@@ -177,79 +160,79 @@
 "Digitals</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ecosystem\">Ecosystem</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FLOSS\">FLOSS</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#ForFree\">For free</a>&rdquo; |"
 msgstr "«<a href=\"#ForFree\">De&nbsp;franc</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FOSS\">FOSS</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FreelyAvailable\">Freely available</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Freeware\">Freeware</a>&rdquo; |"
 msgstr "«<a href=\"#Freeware\">Software&nbsp;gratuït</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#GiveAwaySoftware\">Give away software</a>&rdquo; |"
 msgstr "«<a href=\"#GiveAwaySoftware\">Regalar&nbsp;programari</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Google\">Google</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Hacker\">Hacker</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#IntellectualProperty\">Intellectual property</a>&rdquo; |"
 msgstr ""
 "«<a 
href=\"#IntellectualProperty\">Propietat&nbsp;Intel·lectual</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#InternetofThings\">Internet of Things</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#LAMP\">LAMP system</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Linux\">Linux system</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Market\">Market</a>&rdquo; |"
 msgstr "«<a href=\"#Market\">Mercat</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | &ldquo;<a [-href=\"#Open\">Open</a>&rdquo;-]
 # | {+href=\"#Modern\">Modern</a>&rdquo;+} |
 #, fuzzy
@@ -258,22 +241,22 @@
 msgstr "«<a href=\"#Open\">Obert</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Monetize\">Monetize</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#MP3Player\">MP3 player</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Open\">Open</a>&rdquo; |"
 msgstr "«<a href=\"#Open\">Obert</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | &ldquo;<a [-href=\"#Open\">Open</a>&rdquo;-] {+href=\"#OptOut\">Opt
 # | out</a>&rdquo;+} |
 #, fuzzy
@@ -282,74 +265,74 @@
 msgstr "«<a href=\"#Open\">Obert</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PC\">PC</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Photoshop\">Photoshop</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Piracy\">Piracy</a>&rdquo; |"
 msgstr "«<a href=\"#Piracy\">Pirateria</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PowerPoint\">PowerPoint</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Product\">Product</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Protection\">Protection</a>&rdquo; |"
 msgstr "«<a href=\"#Protection\">Protecció</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#RAND\">RAND</a>&rdquo; |"
 msgstr "«<a href=\"#RAND\">RAND</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SaaS\">SaaS</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SellSoftware\">Sell software</a>&rdquo; |"
 msgstr "«<a href=\"#SellSoftware\">Vendre&nbsp;programari</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#SharingPersonalData\">Sharing (personal data)</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SharingEconomy\">Sharing economy</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Skype\">Skype</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SoftwareIndustry\">Software Industry</a>&rdquo; |"
 msgstr ""
 "«<a 
href=\"#SoftwareIndustry\">Indústria&nbsp;del&nbsp;Programari</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SourceModel\">Source model</a>&rdquo; |"
 msgstr ""
 
@@ -359,7 +342,7 @@
 #.      language to refer to mobile computers; otherwise,
 #.      fill the translation with a space. 
 #.  GNUN-SORT-BEGIN-KEY 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Terminal\">Terminal</a>&rdquo; |"
 msgstr ""
 
@@ -367,25 +350,42 @@
 #. #endif
 #.  
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Theft\">Theft</a>&rdquo; |"
 msgstr "«<a href=\"#Theft\">Robatori</a>»&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#TrustedComputing\">Trusted Computing</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Vendor\">Vendor</a>&rdquo;"
 msgstr "«<a href=\"#Vendor\">Venedor</a>»"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><p>
+# | Also note <a href=\"/philosophy/categories.html\">Categories of Free
+# | [-Software</a>.-] {+Software</a>, <a
+# | href=\"/philosophy/why-call-it-the-swindle.html\">Why Call It The
+# | Swindle?</a>+}
+#, fuzzy
+#| msgid ""
+#| "Also note <a href=\"/philosophy/categories.html\">Categories of Free "
+#| "Software</a>."
+msgid ""
+"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
+"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
+"It The Swindle?</a>"
+msgstr ""
+"Vegeu també <a href=\"/philosophy/categories.html\">Categories de Programari 
"
+"Lliure</a>."
+
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ad-blocker&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When the purpose of some program is to block advertisements, &ldquo;ad-"
 "blocker&rdquo; is a good term for it.  However, the GNU browser IceCat "
@@ -394,17 +394,17 @@
 "&rdquo; this is <em>surveillance protection</em>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Access&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is a common misunderstanding to think free software means that the public "
 "has &ldquo;access&rdquo; to a program.  That is not what free software means."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/philosophy/free-sw.html\">criterion for free software</a> is "
 "not about who has &ldquo;access&rdquo; to the program; the four essential "
@@ -415,7 +415,7 @@
 "that program from any user."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In particular, if you write a program yourself and never offer a copy to "
 "anyone else, that program is free software albeit in a trivial way, because "
@@ -423,7 +423,7 @@
 "such user is you)."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, when many users have copies of a program, someone is sure to "
 "post it on the internet, giving everyone access to it.  We think people "
@@ -431,7 +431,7 @@
 "free software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There is one specific point in which a question of having access is directly "
 "pertinent to free software: the GNU GPL permits giving a particular user "
@@ -440,7 +440,7 @@
 "which the user already has a copy of the program in non-source form."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>with free software, the public has access to the program</b>, "
 "we say, <b>with free software, the users have the essential freedoms</b> and "
@@ -448,11 +448,11 @@
 "them</b>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Alternative&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't describe free software in general as an &ldquo;alternative&rdquo; "
 "to proprietary, because that word presumes all the &ldquo;"
@@ -461,7 +461,7 @@
 "software that does not respect users' freedom."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
@@ -471,7 +471,7 @@
 "to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Special circumstances can drive users toward running one particular program "
 "for a certain job.  For instance, when a web page sends JavaScript client "
@@ -480,11 +480,11 @@
 "reason to describe any other code for that job as an alternative."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Assets&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To refer to published works as &ldquo;assets&rdquo;, or &ldquo;digital "
 "assets&rdquo;, is even worse than calling them <a href=\"#Content\">&ldquo;"
@@ -492,11 +492,11 @@
 "commercial value."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;BSD-style&rdquo;"
 msgstr "«<!--BSD-->Estil BSD»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/licenses/bsd.html\">lumps together licenses that have important "
@@ -510,7 +510,7 @@
 "incompatible amb la Llicència Pública General de GNU, però la llicència 
BSD "
 "revisada és compatible amb la llicència GPL."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, it is best to name <a href=\"/licenses/license-list.html"
 "\"> the specific license in question</a> and avoid the vague term &ldquo;BSD-"
@@ -520,11 +520,11 @@
 "\"> la llicència específica en qüestió</a> i evitar la imprecisa 
expressió "
 "«Estil BSD«."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Closed&rdquo;"
 msgstr "«Tancat»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the
 # | term &ldquo;open [-source&rdquo;.-] {+source.&rdquo;+} In the free
 # | software movement, <a
@@ -564,11 +564,11 @@
 "descriure el programari no lliure com a «tancat». L'anomenem «no lliure» 
o "
 "«<a href=\"/philosophy/categories.html#ProprietarySoftware\">patentat</a>»."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Cloud Computing&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;cloud computing&rdquo; (or just &ldquo;cloud&rdquo;, in the "
 "context of computing) is a marketing buzzword with no coherent meaning.  It "
@@ -578,7 +578,7 @@
 "thinking will be confused (or, could we say, &ldquo;cloudy&rdquo;?)."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When thinking about or responding to a statement someone else has made using "
 "this term, the first step is to clarify the topic.  What scenario is the "
@@ -586,15 +586,15 @@
 "topic is clearly formulated, coherent thought about it becomes possible."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
 "data in online services.  In most scenarios, that is foolish because it "
-"exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/";
-"hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
+"exposes you to <a href=\"https://www.guardian.co.uk/commentisfree/2011/";
+"apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning (which overlaps that but is not the same thing)  is <a href="
 "\"/philosophy/who-does-that-server-really-serve.html\"> Service as a "
@@ -602,19 +602,19 @@
 "should never use SaaSS."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is renting a remote physical server, or virtual server.  "
 "These practices are ok under certain circumstances."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is accessing your own server from your own mobile device.  "
 "That raises no particular ethical issues."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"https://csrc.nist.gov/publications/detail/sp/800-145/final\";> "
 "NIST definition of \"cloud computing\"</a> mentions three scenarios that "
@@ -626,7 +626,7 @@
 "mistreats the user, but the two concepts are not equivalent."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "These different computing practices don't even belong in the same "
 "discussion.  The best way to avoid the confusion the term &ldquo;cloud "
@@ -635,20 +635,20 @@
 "a specific term."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a href="
-"\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
+"\"https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
 "the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He decided to use "
 "the term anyway because, as a proprietary software developer, he isn't "
 "motivated by the same ideals as we are."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Commercial&rdquo;"
 msgstr "«Comercial»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;nonfree."
 "&rdquo; That confuses two entirely different issues."
@@ -656,7 +656,7 @@
 "Si us plau, no utilitzeu «comercial» com a sinònim de «no lliure». Això 
"
 "seria confondre dos temes totalment diferents."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A program is commercial if it is developed as a business activity.  A
 # | commercial program can be free or nonfree, depending on its [-license.-]
 # | {+manner of distribution.+}  Likewise, a program developed by a school or
@@ -687,7 +687,7 @@
 "(quina classe d'entitat va desenvolupar el programa i quina llibertat tenen "
 "els seus usuaris) són independents."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the first decade of the free software movement, free software packages "
 "were almost always noncommercial; the components of the GNU/Linux operating "
@@ -702,7 +702,7 @@
 "tard, durant els anys 90, va començar a aparèixer el programari lliure "
 "comercial."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
@@ -717,11 +717,11 @@
 "comercial» és contradictòria, i en negarà la possibilitat. Tinguem cura 
de "
 "no utilitzar la paraula «comercial» d'aquesta manera."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Compensation&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;compensation for authors&rdquo; in connection with "
 "copyright carries the assumptions that (1) copyright exists for the sake of "
@@ -731,7 +731,7 @@
 "outrageous."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Compensating the rights-holders&rdquo; adds a further swindle: you're "
 "supposed to imagine that means paying the authors, and occasionally it does, "
@@ -739,11 +739,11 @@
 "that are pushing unjust laws on us."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consume&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Consume&rdquo; refers to what we do with food: we ingest it, after "
 "which the food as such no longer exists.  By analogy, we employ the same "
@@ -755,7 +755,7 @@
 "snaps.  Playing a recording, or running a program, does not consume it."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use &ldquo;consume&rdquo; in this context will say they don't mean "
 "it literally.  What, then, does it mean? It means to regard copies of "
@@ -767,30 +767,30 @@
 "another drop that it burned last week."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What does it mean to think of works of authorship as a commodity, with the "
 "assumption that there is nothing special about any one story, article, "
 "program, or song? That is the twisted viewpoint of the owner or the "
 "accountant of a publishing company.  It is no surprise that proprietary "
 "software would like you to think of the use of software as a commodity.  "
-"Their twisted viewpoint comes through clearly in <a href=\"http://www.";
+"Their twisted viewpoint comes through clearly in <a href=\"https://www.";
 "businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-"
 "series-a-funding-2015-6\">this article</a>, which also refers to "
 "publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The narrow thinking associated with the idea that we &ldquo;consume "
 "content&rdquo; paves the way for laws such as the DMCA that forbid users to "
-"break the <a href=\"http://DefectiveByDesign.org/\";>Digital Restrictions "
+"break the <a href=\"https://DefectiveByDesign.org/\";>Digital Restrictions "
 "Management</a> (DRM) facilities in digital devices.  If users think what "
 "they do with these devices is &ldquo;consume,&rdquo; they may see such "
 "restrictions as natural."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It also encourages the acceptance of &ldquo;streaming&rdquo; services, which "
 "use DRM to perversely limit listening to music, or watching video, to "
@@ -798,7 +798,7 @@
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why is this perverse usage spreading? Some may feel that the term sounds "
 "sophisticated, but rejecting it with cogent reasons can appear even more "
@@ -809,7 +809,7 @@
 "forums gives the impression that it's the &ldquo;correct&rdquo; term."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;consuming&rdquo; music, fiction, or any other artistic "
 "works is to treat them as commodities rather than as art.  Do we want to "
@@ -817,35 +817,35 @@
 "so?"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who answer no, please join me in shunning the term &ldquo;"
 "consume&rdquo; for this."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What to use instead? You can use specific verbs such as &ldquo;read,&rdquo; "
 "&ldquo;listen to,&rdquo; &ldquo;watch&rdquo; or &ldquo;look at,&rdquo; since "
 "they help to restrain the tendency to overgeneralize."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you insist on generalizing, you can use the expression &ldquo;attend to,"
 "&rdquo; which requires less of a stretch than &ldquo;consume.&rdquo; For a "
 "work meant for practical use, &ldquo;use&rdquo; is best."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "See also the following entry."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consumer&rdquo;"
 msgstr "«Consumidor»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;consumer,&rdquo; when used to refer to the users of
 # | computing, is loaded with assumptions we should
 # | [-reject.</p>\\n<p>\\nEconomic theory uses-] {+reject.  Some come from+}
@@ -884,7 +884,7 @@
 "com dir que són un bestiar que pastura passivament en un camp que altres han 
"
 "posat a la seva disposició."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-This kind of thinking leads to travesties like the CBDTPA
 # | &ldquo;Consumer Broadband and Digital Television Promotion Act&rdquo;
 # | which would require copying restriction facilities in every digital
@@ -924,7 +924,7 @@
 "L'estreta visió econòmica dels usuaris com a «consumidors» sol anar 
lligada "
 "amb la idea que les obres publicades són «continguts»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | To describe people who are not limited to passive [-consumption on their
 # | computers,-] {+use of works,+} we suggest terms such as
 # | &ldquo;individuals&rdquo; and [-&ldquo;citizens.&rdquo;-]
@@ -942,18 +942,18 @@
 "Per descriure persones que no es limiten a consumir passivament amb als seus "
 "ordinadors, suggerim termes com «individus» i «ciutadans»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"http://";
+"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"https://";
 "www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-"
 "williams\">noted before</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Content&rdquo;"
 msgstr "«Contingut»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | If you want to describe a feeling of comfort and satisfaction, by all
 # | means say you are [-&ldquo;content&rdquo;,-] {+&ldquo;content,&rdquo;+}
 # | but using [-it-] {+the word+} as a noun to describe [-written-]
@@ -989,7 +989,7 @@
 "mercaderia intercanviable el propòsit del qual és omplir una capsa i 
guanyar "
 "diners. De fet, tracta a les obres sense cap mena de respecte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Those who use [-this-] {+the+} term {+&ldquo;content&rdquo;+} are often
 # | the publishers that push for increased copyright power in the name of the
 # | authors (&ldquo;creators,&rdquo; as they say) of the works.  The term
@@ -1018,7 +1018,7 @@
 "diuen ells) de les obres. El terme <cite>content</cite> (contingut) mostra "
 "el que realment senten."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Content itself is beside the point&mdash;as the very use of words like "
 "content suggests. The moment you start labelling every single piece of "
@@ -1026,13 +1026,13 @@
 "interchangeability: its primary purpose as mere grist to the metrical mill."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In other words, &ldquo;content&rdquo; reduces publications and writings to a "
 "sort of pap fit to be piped through the &ldquo;tubes&rdquo; of the internet."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See also <a href=\"https://www.salon.com/2000/06/14/love_7/\";>Courtney "
 "Love's open letter to Steve Case</a> and search for &ldquo;content "
@@ -1041,7 +1041,7 @@
 "\"> biased and confusing</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-As-]{+However, as+} long as other people use the term &ldquo;content
 # | [-provider&rdquo;,-] {+provider,&rdquo;+} political dissidents can well
 # | call themselves &ldquo;malcontent [-providers&rdquo;.-]
@@ -1060,7 +1060,7 @@
 "de continguts), els dissidents polítics podran ben bé anomenar-se "
 "<cite>malcontent providers</cite> (proveïdors de descontent)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
 "&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
@@ -1070,18 +1070,18 @@
 "description."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
 "web site.  For that, we recommend the term &ldquo;web site revision "
 "system&rdquo; (WRS)."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Copyright Owner&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyright is an artificial privilege, handed out by the state to achieve a "
 "public interest and lasting a period of time &mdash; not a natural right "
@@ -1089,7 +1089,7 @@
 "to the recipient of that privilege as a &ldquo;copyright holder.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A few decades ago, copyright holders began trying to reduce awareness of "
 "this point.  In addition to citing frequently the bogus concept of <a href="
@@ -1099,11 +1099,11 @@
 "instead."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creative Commons licensed&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The most important licensing characteristic of a work is whether it is "
 "free.  Creative Commons publishes seven licenses; three are free (CC BY, CC "
@@ -1113,7 +1113,7 @@
 "but the omission is harmful."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To encourage people to pay attention to the most important distinction, "
 "always specify <em>which</em> Creative Commons license is used, as in &ldquo;"
@@ -1121,11 +1121,11 @@
 "work uses, find out and then make your statement."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creator&rdquo;"
 msgstr "«Creador»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;creator&rdquo; as applied to authors implicitly compares
 # | them to a deity (&ldquo;the creator&rdquo;).  The term is used by
 # | publishers to elevate [-the-] authors' moral [-stature-] {+standing+}
@@ -1161,11 +1161,11 @@
 "Recomanem dir «autor». Tanmateix, el que realment es vol dir en molts casos 
"
 "és «titular del copyright»."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
 "authorship, identifies them with physical goods&mdash;which cannot be "
@@ -1176,11 +1176,11 @@
 "don't include freedom and community."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Locks&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital locks&rdquo; is used to refer to Digital Restrictions "
 "Management by some who criticize it.  The problem with this term is that it "
@@ -1188,19 +1188,19 @@
 "did not think it through."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Locks are not necessarily oppressive or bad.  You probably own several "
 "locks, and their keys or codes as well; you may find them useful or "
 "troublesome, but they don't oppress you, because you can open and close "
-"them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+"them.  Likewise, we find <a href=\"https://www.theguardian.com/";
 "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
 "good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
 "digital files.  That too is a kind of digital lock that you have control "
 "over."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "DRM is like a lock placed on you by someone else, who refuses to give you "
 "the key&mdash;in other words, like <em>handcuffs</em>.  Therefore, the "
@@ -1208,7 +1208,7 @@
 "digital locks.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A number of opposition campaigns have chosen the unwise term &ldquo;digital "
 "locks&rdquo;; to get things back on the right track, we must firmly insist "
@@ -1218,11 +1218,11 @@
 "handcuffs&rdquo; and say why."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Rights Management&rdquo;"
 msgstr "«Gestió de Drets Digitals»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | &ldquo;Digital Rights Management&rdquo; [-(DRM) software is actually-]
 # | {+(abbreviated &ldquo;DRM&rdquo;) refers to technical mechanisms+}
 # | designed to impose restrictions on computer users.  The use of the word
@@ -1254,7 +1254,7 @@
 "s'ignoren els drets de la majoria a qui li venen imposades aquestes "
 "restriccions."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Good alternatives include &ldquo;Digital Restrictions Management,&rdquo;
 # | and [-&ldquo;handcuffware.&rdquo;-] {+&ldquo;digital handcuffs.&rdquo;+}
 #, fuzzy
@@ -1268,24 +1268,24 @@
 "Són bones alternatives «Gestió digital de restriccions», «Pessimari 
digital» "
 "i «Programari emmanillat»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+"Please sign up to support our <a href=\"https://DefectiveByDesign.org/\";> "
 "campaign to abolish DRM</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ecosystem&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is inadvisable to describe the free software community, or any human "
 "community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
 "absence of ethical judgment."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;ecosystem&rdquo; implicitly suggests an attitude of "
 "nonjudgmental observation: don't ask how what <em>should</em> happen, just "
@@ -1297,7 +1297,7 @@
 "phenomenon, even if it goes so far as the extinction of a species."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By contrast, beings that adopt an ethical stance towards their surroundings "
 "can decide to preserve things that, without their intervention, might "
@@ -1306,11 +1306,11 @@
 "traditional arts&hellip;and computer users' freedom."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FLOSS&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
 "Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
@@ -1319,11 +1319,11 @@
 "want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;For free&rdquo;"
 msgstr "«De franc»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to say that a program is free software, please don't say that it "
 "is available &ldquo;for free.&rdquo; That term specifically means &ldquo;for "
@@ -1334,7 +1334,7 @@
 "significa específicament «per zero euros». El programari lliure és una "
 "qüestió de llibertat, no de preu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software copies are often available for free&mdash;for example, by "
 "downloading via FTP.  But free software copies are also available for a "
@@ -1349,7 +1349,7 @@
 "promocions, i certs usuaris disposen normalment d'alguns paquets patentats "
 "sense pagar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, you can say that the program is available &ldquo;as free "
 "software.&rdquo;"
@@ -1357,11 +1357,11 @@
 "Per evitar confusions, podeu dir que el programa està disponible «com a "
 "programari lliure»."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FOSS&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
 "&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
@@ -1370,17 +1370,17 @@
 "But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>FOSS</b>, we say, <b>free software</b> or <b>free (libre) "
 "software</b>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freely available&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The terms are not equivalent.  Software is &ldquo;"
@@ -1389,11 +1389,11 @@
 "of it.  These are answers to different questions."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freeware&rdquo;"
 msgstr "«Software gratuït»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;freeware&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The term &ldquo;freeware&rdquo; was used often in the "
@@ -1406,7 +1406,7 @@
 "80 per a programes publicats només com a executables, sense codi font. Avui "
 "dia aquesta expressió no té una definició acceptada per tothom."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-Also, if you use other-]{+When using+} languages {+other+} than English,
 # | please [-try to-] avoid borrowing English terms such as &ldquo;free
 # | software&rdquo; or &ldquo;freeware.&rdquo; It is better to translate the
@@ -1431,7 +1431,7 @@
 "És millor que traduïu l'expressió <cite>free software</cite> a <a href=\"/"
 "philosophy/fs-translations.html\">la vostra llengua</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By using a word in <a href=\"/philosophy/fs-translations.html\">your own "
 "language</a>, you show that you are really referring to freedom and not just "
@@ -1447,11 +1447,11 @@
 "pertorbadora als vostres compatriotes, però una cop vegin que significa "
 "exactament el que diu, entendran realment quina és la qüestió."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Give away software&rdquo;"
 msgstr "«Regalar programari»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | It's misleading to use the term &ldquo;give away&rdquo; to mean
 # | &ldquo;distribute a program as free software.&rdquo; [-It-] {+This
 # | locution+} has the same problem as &ldquo;for free&rdquo;: it implies the
@@ -1476,11 +1476,11 @@
 "una qüestió de preu, no de llibertat. Una manera d'evitar la confusió és 
dir "
 "«difondre com a programari lliure»."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Google&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;google&rdquo; as a verb, meaning to "
 "search for something on the internet. &ldquo;Google&rdquo; is just the name "
@@ -1492,13 +1492,13 @@
 "kind.)"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Hacker&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+"A hacker is someone who <a href=\"https://stallman.org/articles/on-hacking.";
 "html\"> enjoys playful cleverness</a>&mdash;not necessarily with computers.  "
 "The programmers in the old <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr> free software community of the 60s and 70s referred "
@@ -1507,17 +1507,17 @@
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't spread this mistake.  People who break security are &ldquo;"
 "crackers.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Intellectual property&rdquo;"
 msgstr "«Propietat Intel·lectual»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Publishers and lawyers like to describe copyright as &ldquo;intellectual
 # | property&rdquo;&mdash;a term [-that-] also [-includes-] {+applied to+}
 # | patents, trademarks, and other more obscure areas of law.  These laws have
@@ -1548,7 +1548,7 @@
 "millor parlar específicament de «copyright», o de «patents», o de 
«marques "
 "registrades»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;intellectual property&rdquo; carries a hidden
 # | assumption&mdash;that the way to think about all these disparate issues is
 # | based on an analogy with physical objects, and our [-ideas-]
@@ -1570,7 +1570,7 @@
 "en una analogia amb els objectes físics i amb les nostres idees sobre la "
 "propietat física."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When it comes to copying, this analogy disregards the crucial difference "
 "between material objects and information: information can be copied and "
@@ -1580,7 +1580,7 @@
 "crucial entre els objectes materials i la informació: la informació es pot "
 "copiar i compartir sense gairebé cap esforç, i els objectes materials no."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | To avoid [-the-] {+spreading unnecessary+} bias and [-confusion of this
 # | term,-] {+confusion,+} it is best to [-make-] {+adopt+} a firm
 # | [-decision-] {+policy+} <a href=\"/philosophy/not-ipr.html\"> not to speak
@@ -1600,7 +1600,7 @@
 "ipr.html\">no parlar i fins i tot de no pensar en termes de «propietat "
 "intel·lectual»</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a
 # | href=\"/philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting
 # | to make [-WIPO embarassed</a>.-] {+the World &ldquo;Intellectual
@@ -1619,11 +1619,11 @@
 "wipo-PublicAwarenessOfCopyright-2002.html\">començant a posar WIPO en "
 "evidència</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Internet of Things&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies decided to make computerized appliances that would connect "
 "over the internet to the manufacturer's server, and therefore could easily "
@@ -1632,9 +1632,9 @@
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Experience shows that these products often do <a href=\"http://www.locusmag.";
+"Experience shows that these products often do <a href=\"https://www.locusmag.";
 "com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-"
 "things-to-be-sensed/\"> spy on their users</a>.  They are also tailor-made "
 "for <a href=\"https://archive.ieet.org/articles/rinesi20150806.html\";>giving "
@@ -1643,15 +1643,15 @@
 "off the server it depends on."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We call them the &ldquo;Internet of Stings.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;LAMP system&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
 "&mdash;a common combination of software to use on a web server, except that "
@@ -1660,11 +1660,11 @@
 "GNU, Linux, Apache, MySQL and PHP.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Linux system&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
@@ -1674,11 +1674,11 @@
 "distinguish the whole system from the kernel alone."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Market&rdquo;"
 msgstr "«Mercat»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is misleading to describe the users of free software, or the software "
 "users in general, as a &ldquo;market.&rdquo;"
@@ -1686,7 +1686,7 @@
 "és enganyós descriure als usuaris de programari lliure, o de programari en "
 "general, com un «mercat»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | This is not to say [-we're against markets.-] {+there is no room for
 # | markets in the free software community.+}  If you have a free software
 # | support business, then you have clients, and you trade with them in a
@@ -1708,7 +1708,7 @@
 "de programari lliure, tindreu clients, i hi comerciareu en un mercat. Mentre "
 "respecteu la seva llibertat, us desitjarem èxit en el vostre mercat."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | But the free software movement is a social movement, not a business, and
 # | the success it aims for is not a market success.  We are trying to serve
 # | the public by giving it freedom&mdash;not competing to [-take them-]
@@ -1737,21 +1737,21 @@
 "Equiparar aquesta campanya per la llibertat a la campanya que fa una empresa "
 "simplement per aconseguir èxit és disminuir la importància de la 
llibertat."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | [-&ldquo;Open&rdquo;-]{+&ldquo;Modern&rdquo;+}
 #, fuzzy
 #| msgid "&ldquo;Open&rdquo;"
 msgid "&ldquo;Modern&rdquo;"
 msgstr "«Obert»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;modern&rdquo; makes sense from a descriptive perspective "
 "&mdash; for instance, solely to distinguish newer periods and ways from "
 "older ones."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It becomes a problem when it carries the presumption that older ways are "
 "&ldquo;old-fashioned&rdquo;; that is, presumed to be worse.  In "
@@ -1759,11 +1759,11 @@
 "users, the reverse is often true."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Monetize&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The proper definition of &ldquo;monetize&rdquo; is &ldquo;to use something "
 "as currency.&rdquo; For instance, human societies have monetized gold, "
@@ -1772,7 +1772,7 @@
 "&ldquo;to use something as a basis for profit&rdquo;."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That usage casts the profit as primary, and the thing used to get the profit "
 "as secondary.  That attitude applied to a software project is objectionable "
@@ -1780,18 +1780,18 @@
 "they conclude that making it free/libre isn't sufficiently profitable."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A productive and ethical business can make money, but if it subordinates all "
 "else to profit, it is not likely to remain ethical."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;MP3 Player&rdquo;"
 msgstr ""
 
 #.  The MP3 patents will reportedly expire by 2018.  
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the late 1990s it became feasible to make portable, solid-state digital "
 "audio players.  Most players supported the patented MP3 codec, and that is "
@@ -1801,7 +1801,7 @@
 "MP3 format."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Using the term &ldquo;MP3 players&rdquo; for audio players in general has "
 "the effect of promoting the MP3 format and discouraging the other formats "
@@ -1809,18 +1809,18 @@
 "patents have expired, it is still undesirable to do that."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;digital audio player,&rdquo; or simply &ldquo;"
 "audio player&rdquo; when that's clear enough, instead of &ldquo;MP3 player."
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Open&rdquo;"
 msgstr "«Obert»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Please avoid using the [-word-] {+term+} &ldquo;open&rdquo; {+or
 # | &ldquo;open source&rdquo;+} as a substitute for &ldquo;free
 # | software.&rdquo;  [-A-] {+Those terms refer to a+} <a
@@ -1858,38 +1858,38 @@
 "feina amb la seva etiqueta (això portaria la gent a pensar que som seguidors 
"
 "seus)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When referring to the open source views, it's correct to use that name, but "
 "please do not use that term when talking about us, our software, or our "
 "views&mdash;that leads people to suppose our views are similar to theirs."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>open source</b>, we say, <b>free software</b> or <b>free "
 "(libre) software</b>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | [-&ldquo;Open&rdquo;-]{+&ldquo;Opt out&rdquo;+}
 #, fuzzy
 #| msgid "&ldquo;Open&rdquo;"
 msgid "&ldquo;Opt out&rdquo;"
 msgstr "«Obert»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When applied to any form of computational mistreatment, &ldquo;opt "
 "out&rdquo; implies the choice is a minor matter of convenience. We recommend "
 "&ldquo;reject,&rdquo; &ldquo;shun&rdquo; or &ldquo;escape from.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PC&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's OK to use the abbreviation &ldquo;PC&rdquo; to refer to a certain kind "
 "of computer hardware, but please don't use it with the implication that the "
@@ -1897,29 +1897,29 @@
 "computer, it is still a PC."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;WC&rdquo; has been suggested for a computer running Windows."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Photoshop&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any "
 "kind of photo manipulation or image editing in general.  Photoshop is just "
 "the name of one particular image editing program, which should be avoided "
 "since it is proprietary.  There are plenty of free programs for editing "
-"images, such as the <a href=\"/software/gimp\">GIMP</a>."
+"images, such as the <a href=\"https://www.gimp.org/\";>GIMP</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Piracy&rdquo;"
 msgstr "«Pirateria»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Publishers often refer to [-prohibited-] copying {+they don't approve of+}
 # | as &ldquo;piracy.&rdquo; In this way, they imply that [-illegal copying-]
 # | {+it+} is ethically equivalent to attacking ships on the high seas,
@@ -1946,7 +1946,7 @@
 "és èticament equivalent a atacar vaixells a alta mar i a segrestar i "
 "assassinar els passatgers."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | If you don't believe that [-illegal-] copying {+not approved by the
 # | publisher+} is just like kidnapping and murder, you might prefer not to
 # | use the word &ldquo;piracy&rdquo; to describe it.  Neutral terms such as
@@ -1979,19 +1979,19 @@
 "podríem fins i tot preferir utilitzar un terme positiu com «compartir "
 "informació amb el teu veí»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear words.</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PowerPoint&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
 "slide presentation.  &ldquo;PowerPoint&rdquo; is just the name of one "
@@ -2001,11 +2001,11 @@
 "<code>beamer</code> class and LibreOffice Impress."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Product&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you're talking about a product, by all means call it that.  However, when "
 "referring to a service, please do not call it a &ldquo;product.&rdquo; If a "
@@ -2015,11 +2015,11 @@
 "&ldquo;deal.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Protection&rdquo;"
 msgstr "«Protecció»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers' lawyers love to use the term &ldquo;protection&rdquo; to "
 "describe copyright.  This word carries the implication of preventing "
@@ -2034,7 +2034,7 @@
 "copyright, en lloc d'identificar-se amb els usuaris, que són els que "
 "realment pateixen les restriccions."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms instead.  "
 "For example, instead of saying, &ldquo;Copyright protection lasts a very "
@@ -2045,13 +2045,13 @@
 "exemple, en comptes de dir «la protecció del copyright dura molt temps», 
es "
 "pot dir «el copyright dura molt temps»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Likewise, instead of saying, &ldquo;protected by copyright,&rdquo; you can "
 "say, &ldquo;covered by copyright&rdquo; or just &ldquo;copyrighted.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | If you want to criticize copyright [-instead of supporting it,-] {+rather
 # | than be neutral,+} you can use the term &ldquo;copyright
 # | restrictions.&rdquo; Thus, you can say, &ldquo;Copyright restrictions last
@@ -2070,22 +2070,22 @@
 "l'expressió «restriccions del copyright». Es pot dir, per exemple, «Les "
 "restriccions del copyright duren molt temps»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
 "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
 "interferes with copying.  From the user's point of view, this is "
 "obstruction.  So we could call that malicious feature &ldquo;copy "
 "obstruction.&rdquo; More often it is called Digital Restrictions Management "
-"(DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> Defective by "
+"(DRM)&mdash;see the <a href=\"https://DefectiveByDesign.org\";> Defective by "
 "Design</a> campaign."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;"
 msgstr "«RAND (Raonable i No Discriminatori)»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies that promulgate patent-restricted standards that prohibit "
 "free software typically have a policy of obtaining patent licenses that "
@@ -2100,7 +2100,7 @@
 "a aquestes llicències amb el terme «RAND», que són les inicials de 
«raonable "
 "i no discriminatori»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | That term whitewashes a class of patent licenses that are normally neither
 # | reasonable nor nondiscriminatory.  It is true that these licenses do not
 # | discriminate against any specific person, but they do discriminate against
@@ -2128,7 +2128,7 @@
 "comunitat del programari lliure, i això les fa poc raonables. De manera que "
 "la meitat de «RAND» és enganyosa i l'altra meitat és discriminatòria."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
 "and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
@@ -2145,7 +2145,7 @@
 "que les companyies propietàries de les patents han estès el seu ús és 
deixar "
 "que aquestes companyies dictin els nostres punts de vista."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;uniform fee only,&rdquo; or &ldquo;UFO&rdquo; for "
 "short, as a replacement.  It is accurate because the only condition in these "
@@ -2155,11 +2155,11 @@
 "«UFO» (OVNI), com a substitut. És acurat perquè l'única condició en 
aquestes "
 "llicències és el pagament d'una quota uniforme."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;SaaS&rdquo; or &ldquo;Software as a Service&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We used to say that SaaS (short for &ldquo;Software as a Service&rdquo;) is "
 "an injustice, but then we found that there was a lot of variation in "
@@ -2169,24 +2169,24 @@
 "definition is the only one, and it explains what the injustice consists of."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/who-does-that-server-really-serve.html\">Who Does "
 "That Server Really Serve?</a> for discussion of this issue."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In Spanish we continue to use the term &ldquo;software como servicio&rdquo; "
 "because the joke of &ldquo;software como ser vicio&rdquo; (&ldquo;software, "
 "as being pernicious&rdquo;) is too good to give up."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sell software&rdquo;"
 msgstr "«Vendre programari»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking,
 # | exchanging a copy of a free program for a sum of money is <a
 # | [-href=\"/philosophy/selling.html\">selling</a>; but-]
@@ -2224,7 +2224,7 @@
 "«distribuir còpies d'un programa a canvi d'una quota» com «imposar "
 "restriccions de patent a l'ús d'un programa»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
 "further discussion of this issue."
@@ -2232,11 +2232,11 @@
 "Vegeu <a href=\"/philosophy/selling.html\"> Vendre programari lliure</a> per "
 "aprofundir en aquest tema."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing (personal data)&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies manipulate or lure people into revealing personal data and "
 "thus ceding their privacy, please don't refer to this as &ldquo;sharing."
@@ -2246,17 +2246,17 @@
 "word to a practice which is harmful and dangerous."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When one company redistributes collected personal data to another company, "
 "that is even less deserving of the term &ldquo;sharing.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing economy&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;sharing economy&rdquo; is not a good way to refer to "
 "services such as Uber and Airbnb that arrange business transactions between "
@@ -2266,17 +2266,17 @@
 "transactions undermines its meaning, so we don't use it in this context."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A more suitable term for businesses like Uber is the &ldquo;piecework "
 "service economy&rdquo; or &ldquo;gig economy.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Skype&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;skype&rdquo; as a verb, meaning any kind "
 "of video communication or telephony over the Internet in general.  &ldquo;"
@@ -2288,11 +2288,11 @@
 "Skype_Replacement\"> numerous free Skype replacements</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Software Industry&rdquo;"
 msgstr "«Indústria del Programari»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;software industry&rdquo; encourages people to imagine that
 # | software is always developed by a sort of factory and then delivered to
 # | &ldquo;consumers.&rdquo; The free software community shows this is not the
@@ -2322,7 +2322,7 @@
 "empreses desenvolupen programari lliure i/o no lliure, però les que "
 "desenvolupen programari lliure no són com fàbriques."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;industry&rdquo; is being used as propaganda by advocates of "
 "software patents.  They call software development &ldquo;industry&rdquo; and "
@@ -2343,11 +2343,11 @@
 "votar per definir «indústria» com «producció automatitzada de béns "
 "materials»</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Source model&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
@@ -2360,11 +2360,11 @@
 "describing free software programs."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Terminal&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Mobile phones and tablets are computers, and people should be able to do "
 "their computing on them using free software.  To call them &ldquo;"
@@ -2372,11 +2372,11 @@
 "servers, which is a bad way to do your own computing."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Theft&rdquo;"
 msgstr "«Robatori»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-Copyright apologists-]{+The supporters of a too-strict, repressive form
 # | of copyright+} often use words like &ldquo;stolen&rdquo; and
 # | &ldquo;theft&rdquo; to [-describe-] {+refer to+} copyright infringement. 
@@ -2400,13 +2400,13 @@
 "demanen que tractem el sistema legal com a una autoritat en ètica: si copiar 
"
 "està prohibit, ha d'estar malament."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-So it is pertinent to mention that-]{+Under+} the {+US+} legal
 # | [-system&mdash;at least in the US&mdash;<a
 # | 
href=\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\";>rejects
 # | the idea that-] {+system,+} copyright infringement is
 # | [-&ldquo;theft.&rdquo;</a> Copyright apologists-] {+not theft.  <a
-# | 
href=\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\";>
+# | 
href=\"https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\";>
 # | Laws about theft are not applicable to copyright infringement.</a> The
 # | supporters of repressive copyright+} are making an appeal to
 # | [-authority...and-] {+authority&mdash;and+} misrepresenting what authority
@@ -2420,7 +2420,7 @@
 #| "an appeal to authority...and misrepresenting what authority says."
 msgid ""
 "Under the US legal system, copyright infringement is not theft.  <a href="
-"\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
+"\"https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
 "invol=207\"> Laws about theft are not applicable to copyright infringement.</"
 "a> The supporters of repressive copyright are making an appeal to "
 "authority&mdash;and misrepresenting what authority says."
@@ -2432,14 +2432,14 @@
 "una apel·lació a una autoritat&hellip; tergiversant el que aquesta 
autoritat "
 "diu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"To refute them, you can point to this <a href=\"http://www.guardian.co.uk/";
+"To refute them, you can point to this <a href=\"https://www.guardian.co.uk/";
 "books/2013/may/04/harper-lee-kill-mockingbird-copyright\"> real case</a> "
 "which shows what can properly be described as &ldquo;copyright theft.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-The idea that laws decide what is right or wrong-]{+Unauthorized
 # | copying+} is [-mistaken-] {+forbidden by copyright law+} in [-general. 
 # | Laws are,-] {+many circumstances (not all!), but being forbidden doesn't
@@ -2465,19 +2465,19 @@
 "d'aconseguir justícia; dir que les lleis defineixen què és la justícia o "
 "quina conducta és ètica és posar les coses cap per avall."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear-words.</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Trusted Computing&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;</"
 "a> is the proponents' name for a scheme to redesign computers so that "
@@ -2486,11 +2486,11 @@
 "view, it is &ldquo;treacherous.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Vendor&rdquo;"
 msgstr "«Venedor»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Please don't use the term &ldquo;vendor&rdquo; to refer generally to
 # | anyone that develops or packages [-a software package.-] {+software.+} 
 # | Many programs are developed in order to sell copies, and their developers
@@ -2528,9 +2528,18 @@
 "són venedors. De la mateixa manera, només alguns dels recopiladors de "
 "distribucions de GNU/Linux són venedors."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+# | This essay is published in <a
+# | 
href=\"http{+s+}://shop.fsf.org/product/free-software-free-society/\"><cite>Free
+# | Software, Free Society: The Selected Essays of Richard M.
+# | Stallman</cite></a>.
+#, fuzzy
+#| msgid ""
+#| "This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+#| "software-free-society/\"><cite>Free Software, Free Society: The Selected "
+#| "Essays of Richard M. Stallman</cite></a>."
 msgid ""
-"This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+"This essay is published in <a href=\"https://shop.fsf.org/product/free-";
 "software-free-society/\"><cite>Free Software, Free Society: The Selected "
 "Essays of Richard M. Stallman</cite></a>."
 msgstr ""
@@ -2564,14 +2573,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</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>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "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."
 msgstr ""
 "Vegeu la <a href=\"/server/standards/README.translations.html\">Guia de "
@@ -2580,21 +2595,14 @@
 "standards/translations/ca/\">Equip de traducció</a> per col·laborar en la "
 "traducció al català del web de GNU."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, [-2004-]
-# | {+2004, 2007, 2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020,
-# | 2021+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2014, 2015-] {+1996-2018, 2020, 2021+} Free Software
+# | Foundation, Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free "
-#| "Software Foundation, Inc."
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free "
-"Software Foundation, Inc."
+#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright &copy; 1996-2018, 2020, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -2618,6 +2626,29 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Vegeu la <a href=\"/server/standards/README.translations.html\">Guia de "
+#~ "traducció</a> per informar-vos sobre la coordinació i publicació de les 
"
+#~ "traduccions d'aquest article. <br />Contacteu amb l'<a href=\"/server/"
+#~ "standards/translations/ca/\">Equip de traducció</a> per col·laborar en 
la "
+#~ "traducció al català del web de GNU."
+
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free "
+#~| "Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~ "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free "
+#~ "Software Foundation, Inc."
+
 #~ msgid "Some Confusing or Loaded Words and Phrases that are Worth Avoiding"
 #~ msgstr "Algunes paraules i frases confuses que convé evitar"
 

Index: words-to-avoid.cs.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.cs.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- words-to-avoid.cs.po        31 May 2021 03:56:37 -0000      1.23
+++ words-to-avoid.cs.po        21 Jul 2021 19:32:32 -0000      1.24
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2021-05-31 03:55+0000\n"
+"POT-Creation-Date: 2021-07-21 19:25+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <web-translators@gnu.org>\n"
@@ -32,7 +32,7 @@
 "Matoucí slova a fráze, jichž je lepší se vyvarovat - GNU projekt - 
Nadace "
 "svobodného software"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 # | [-Some Confusing or Loaded-]Words [-and Phrases that are Worth Avoiding-]
 # | {+to Avoid (or Use with Care) Because They Are Loaded or Confusing+}
 #, fuzzy
@@ -41,7 +41,7 @@
 msgstr ""
 "Některá matoucí nebo předpojatá slova a fráze, kterým je lepší se 
vyhnout"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | There are a number of words and phrases [-which-] {+that+} we recommend
 # | avoiding, [-either because they-] {+or avoiding in certain contexts and
 # | usages.  Some+} are ambiguous or [-because they imply an opinion-]
@@ -62,191 +62,174 @@
 "dvojznačné, nebo proto, že v sobě obsahují názory, se kterými, jak 
doufáme, "
 "nemůžete plně souhlasit."
 
-#. type: Content of: <div><blockquote><p>
-# | Also note <a href=\"/philosophy/categories.html\">Categories of Free
-# | [-Software</a>.-] {+Software</a>, <a
-# | href=\"/philosophy/why-call-it-the-swindle.html\">Why Call It The
-# | Swindle?</a>+}
-#, fuzzy
-#| msgid ""
-#| "Also note <a href=\"/philosophy/categories.html\">Categories of Free "
-#| "Software</a>."
-msgid ""
-"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
-"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
-"It The Swindle?</a>"
-msgstr ""
-"Také se podívejte na <a href=\"/philosophy/categories.html\">Druhy "
-"svobodného software</a>."
-
 #.  GNUN-SORT-START 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ad-blocker\">Ad-blocker</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Access\">Access</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Alternative\">Alternative</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Assets\">Assets</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#BSD-style\">BSD-style</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Closed\">Closed</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CloudComputing\">Cloud Computing</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Commercial\">Commercial</a>&rdquo; |"
 msgstr "„<a href=\"#Commercial\">Komerční</a>“&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Compensation\">Compensation</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consume\">Consume</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consumer\">Consumer</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Content\">Content</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CopyrightOwner\">Copyright Owner</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#CreativeCommonsLicensed\">Creative Commons licensed</"
 "a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Creator\">Creator</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalGoods\">Digital Goods</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalLocks\">Digital Locks</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#DigitalRightsManagement\">Digital Rights Management</"
 "a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ecosystem\">Ecosystem</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FLOSS\">FLOSS</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#ForFree\">For free</a>&rdquo; |"
 msgstr "„<a href=\"#ForFree\">Zadarmo</a>“"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FOSS\">FOSS</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FreelyAvailable\">Freely available</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Freeware\">Freeware</a>&rdquo; |"
 msgstr "„<a href=\"#Freeware\">Freeware</a>“&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#GiveAwaySoftware\">Give away software</a>&rdquo; |"
 msgstr "„<a 
href=\"#GiveAwaySoftware\">Rozdávání&nbsp;software</a>“&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Google\">Google</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Hacker\">Hacker</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#IntellectualProperty\">Intellectual property</a>&rdquo; |"
 msgstr ""
 "„<a 
href=\"#IntellectualProperty\">Intelektuální&nbsp;vlastnictví</a>“&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#InternetofThings\">Internet of Things</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#LAMP\">LAMP system</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Linux\">Linux system</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Market\">Market</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | &ldquo;<a [-href=\"#Protection\">Protection</a>&rdquo;-]
 # | {+href=\"#Modern\">Modern</a>&rdquo;+} |
 #, fuzzy
@@ -255,22 +238,22 @@
 msgstr "„<a href=\"#Protection\">Ochrana</a>“&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Monetize\">Monetize</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#MP3Player\">MP3 player</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Open\">Open</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | &ldquo;<a [-href=\"#Theft\">Theft</a>&rdquo;-] {+href=\"#OptOut\">Opt
 # | out</a>&rdquo;+} |
 #, fuzzy
@@ -279,73 +262,73 @@
 msgstr "„<a href=\"#Theft\">Krádež</a>“&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PC\">PC</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Photoshop\">Photoshop</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Piracy\">Piracy</a>&rdquo; |"
 msgstr "„<a href=\"#Piracy\">Pirátství</a>“&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PowerPoint\">PowerPoint</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Product\">Product</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Protection\">Protection</a>&rdquo; |"
 msgstr "„<a href=\"#Protection\">Ochrana</a>“&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#RAND\">RAND</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SaaS\">SaaS</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SellSoftware\">Sell software</a>&rdquo; |"
 msgstr "„<a href=\"#SellSoftware\">Prodej&nbsp;softwaru</a>“&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#SharingPersonalData\">Sharing (personal data)</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SharingEconomy\">Sharing economy</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Skype\">Skype</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SoftwareIndustry\">Software Industry</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SourceModel\">Source model</a>&rdquo; |"
 msgstr ""
 
@@ -355,7 +338,7 @@
 #.      language to refer to mobile computers; otherwise,
 #.      fill the translation with a space. 
 #.  GNUN-SORT-BEGIN-KEY 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Terminal\">Terminal</a>&rdquo; |"
 msgstr ""
 
@@ -363,25 +346,42 @@
 #. #endif
 #.  
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Theft\">Theft</a>&rdquo; |"
 msgstr "„<a href=\"#Theft\">Krádež</a>“&nbsp;|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#TrustedComputing\">Trusted Computing</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Vendor\">Vendor</a>&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><p>
+# | Also note <a href=\"/philosophy/categories.html\">Categories of Free
+# | [-Software</a>.-] {+Software</a>, <a
+# | href=\"/philosophy/why-call-it-the-swindle.html\">Why Call It The
+# | Swindle?</a>+}
+#, fuzzy
+#| msgid ""
+#| "Also note <a href=\"/philosophy/categories.html\">Categories of Free "
+#| "Software</a>."
+msgid ""
+"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
+"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
+"It The Swindle?</a>"
+msgstr ""
+"Také se podívejte na <a href=\"/philosophy/categories.html\">Druhy "
+"svobodného software</a>."
+
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ad-blocker&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When the purpose of some program is to block advertisements, &ldquo;ad-"
 "blocker&rdquo; is a good term for it.  However, the GNU browser IceCat "
@@ -390,17 +390,17 @@
 "&rdquo; this is <em>surveillance protection</em>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Access&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is a common misunderstanding to think free software means that the public "
 "has &ldquo;access&rdquo; to a program.  That is not what free software means."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/philosophy/free-sw.html\">criterion for free software</a> is "
 "not about who has &ldquo;access&rdquo; to the program; the four essential "
@@ -411,7 +411,7 @@
 "that program from any user."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In particular, if you write a program yourself and never offer a copy to "
 "anyone else, that program is free software albeit in a trivial way, because "
@@ -419,7 +419,7 @@
 "such user is you)."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, when many users have copies of a program, someone is sure to "
 "post it on the internet, giving everyone access to it.  We think people "
@@ -427,7 +427,7 @@
 "free software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There is one specific point in which a question of having access is directly "
 "pertinent to free software: the GNU GPL permits giving a particular user "
@@ -436,7 +436,7 @@
 "which the user already has a copy of the program in non-source form."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>with free software, the public has access to the program</b>, "
 "we say, <b>with free software, the users have the essential freedoms</b> and "
@@ -444,11 +444,11 @@
 "them</b>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Alternative&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't describe free software in general as an &ldquo;alternative&rdquo; "
 "to proprietary, because that word presumes all the &ldquo;"
@@ -457,7 +457,7 @@
 "software that does not respect users' freedom."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
@@ -467,7 +467,7 @@
 "to offer users those &ldquo;alternatives&rdquo; to free software."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Special circumstances can drive users toward running one particular program "
 "for a certain job.  For instance, when a web page sends JavaScript client "
@@ -476,11 +476,11 @@
 "reason to describe any other code for that job as an alternative."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Assets&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To refer to published works as &ldquo;assets&rdquo;, or &ldquo;digital "
 "assets&rdquo;, is even worse than calling them <a href=\"#Content\">&ldquo;"
@@ -488,11 +488,11 @@
 "commercial value."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;BSD-style&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/licenses/bsd.html\">lumps together licenses that have important "
@@ -501,18 +501,18 @@
 "the revised BSD license is compatible with the GPL."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, it is best to name <a href=\"/licenses/license-list.html"
 "\"> the specific license in question</a> and avoid the vague term &ldquo;BSD-"
 "style.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Closed&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source.&rdquo; In the free software movement, <a href=\"/"
@@ -524,11 +524,11 @@
 "html#ProprietarySoftware\"> &ldquo;proprietary&rdquo;</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Cloud Computing&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;cloud computing&rdquo; (or just &ldquo;cloud&rdquo;, in the "
 "context of computing) is a marketing buzzword with no coherent meaning.  It "
@@ -538,7 +538,7 @@
 "thinking will be confused (or, could we say, &ldquo;cloudy&rdquo;?)."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When thinking about or responding to a statement someone else has made using "
 "this term, the first step is to clarify the topic.  What scenario is the "
@@ -546,15 +546,15 @@
 "topic is clearly formulated, coherent thought about it becomes possible."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
 "data in online services.  In most scenarios, that is foolish because it "
-"exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/";
-"hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
+"exposes you to <a href=\"https://www.guardian.co.uk/commentisfree/2011/";
+"apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning (which overlaps that but is not the same thing)  is <a href="
 "\"/philosophy/who-does-that-server-really-serve.html\"> Service as a "
@@ -562,19 +562,19 @@
 "should never use SaaSS."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is renting a remote physical server, or virtual server.  "
 "These practices are ok under certain circumstances."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is accessing your own server from your own mobile device.  "
 "That raises no particular ethical issues."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"https://csrc.nist.gov/publications/detail/sp/800-145/final\";> "
 "NIST definition of \"cloud computing\"</a> mentions three scenarios that "
@@ -586,7 +586,7 @@
 "mistreats the user, but the two concepts are not equivalent."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "These different computing practices don't even belong in the same "
 "discussion.  The best way to avoid the confusion the term &ldquo;cloud "
@@ -595,20 +595,20 @@
 "a specific term."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a href="
-"\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
+"\"https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
 "the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He decided to use "
 "the term anyway because, as a proprietary software developer, he isn't "
 "motivated by the same ideals as we are."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Commercial&rdquo;"
 msgstr "„Komerční“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;nonfree."
 "&rdquo; That confuses two entirely different issues."
@@ -616,7 +616,7 @@
 "prosím nepoužívejte slovo „komerční“ jako synonymum pro 
„nesvobodný“. Tím se "
 "pletou dohromady dvě zcela rozdílné věci."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A program is commercial if it is developed as a business activity.  A
 # | commercial program can be free or nonfree, depending on its [-license.-]
 # | {+manner of distribution.+}  Likewise, a program developed by a school or
@@ -646,7 +646,7 @@
 "nesvobodný, v závislosti na jeho licenci. Tyto dvě otázky – který 
subjekt "
 "vyvíjí program a svobody uživatle programu jsou – na sobě nezávislé."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | In the first decade of the free software movement, free software packages
 # | were almost always noncommercial; the components of the GNU/Linux
 # | operating system were developed by individuals or by nonprofit
@@ -672,7 +672,7 @@
 "univerzitami. Ale v devadesátých letech se začal objevovat i komerční "
 "svobodný software."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Free commercial software is a contribution to our community, so we should
 # | encourage it.  But people who think that &ldquo;commercial&rdquo; means
 # | &ldquo;nonfree&rdquo; [-are likely-] {+will tend+} to [-assume-] {+think
@@ -700,11 +700,11 @@
 "mají za to, že tyto myšlenky si odporují a zavrhují je díky 
neporozumění. "
 "Proto buďte pozorní a nepoužívejte slovo „komerční“ tímto 
způsobem."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Compensation&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;compensation for authors&rdquo; in connection with "
 "copyright carries the assumptions that (1) copyright exists for the sake of "
@@ -714,7 +714,7 @@
 "outrageous."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Compensating the rights-holders&rdquo; adds a further swindle: you're "
 "supposed to imagine that means paying the authors, and occasionally it does, "
@@ -722,11 +722,11 @@
 "that are pushing unjust laws on us."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consume&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Consume&rdquo; refers to what we do with food: we ingest it, after "
 "which the food as such no longer exists.  By analogy, we employ the same "
@@ -738,7 +738,7 @@
 "snaps.  Playing a recording, or running a program, does not consume it."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use &ldquo;consume&rdquo; in this context will say they don't mean "
 "it literally.  What, then, does it mean? It means to regard copies of "
@@ -750,30 +750,30 @@
 "another drop that it burned last week."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What does it mean to think of works of authorship as a commodity, with the "
 "assumption that there is nothing special about any one story, article, "
 "program, or song? That is the twisted viewpoint of the owner or the "
 "accountant of a publishing company.  It is no surprise that proprietary "
 "software would like you to think of the use of software as a commodity.  "
-"Their twisted viewpoint comes through clearly in <a href=\"http://www.";
+"Their twisted viewpoint comes through clearly in <a href=\"https://www.";
 "businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-"
 "series-a-funding-2015-6\">this article</a>, which also refers to "
 "publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The narrow thinking associated with the idea that we &ldquo;consume "
 "content&rdquo; paves the way for laws such as the DMCA that forbid users to "
-"break the <a href=\"http://DefectiveByDesign.org/\";>Digital Restrictions "
+"break the <a href=\"https://DefectiveByDesign.org/\";>Digital Restrictions "
 "Management</a> (DRM) facilities in digital devices.  If users think what "
 "they do with these devices is &ldquo;consume,&rdquo; they may see such "
 "restrictions as natural."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It also encourages the acceptance of &ldquo;streaming&rdquo; services, which "
 "use DRM to perversely limit listening to music, or watching video, to "
@@ -781,7 +781,7 @@
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why is this perverse usage spreading? Some may feel that the term sounds "
 "sophisticated, but rejecting it with cogent reasons can appear even more "
@@ -792,7 +792,7 @@
 "forums gives the impression that it's the &ldquo;correct&rdquo; term."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;consuming&rdquo; music, fiction, or any other artistic "
 "works is to treat them as commodities rather than as art.  Do we want to "
@@ -800,35 +800,35 @@
 "so?"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who answer no, please join me in shunning the term &ldquo;"
 "consume&rdquo; for this."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What to use instead? You can use specific verbs such as &ldquo;read,&rdquo; "
 "&ldquo;listen to,&rdquo; &ldquo;watch&rdquo; or &ldquo;look at,&rdquo; since "
 "they help to restrain the tendency to overgeneralize."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you insist on generalizing, you can use the expression &ldquo;attend to,"
 "&rdquo; which requires less of a stretch than &ldquo;consume.&rdquo; For a "
 "work meant for practical use, &ldquo;use&rdquo; is best."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "See also the following entry."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consumer&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;consumer,&rdquo; when used to refer to the users of "
 "computing, is loaded with assumptions we should reject.  Some come from the "
@@ -838,7 +838,7 @@
 "uncopiable material products."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In addition, describing the users of software as &ldquo;consumers&rdquo; "
 "refers to a framing in which people are limited to selecting between "
@@ -848,25 +848,25 @@
 "control over what a program does</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To describe people who are not limited to passive use of works, we suggest "
 "terms such as &ldquo;individuals&rdquo; and &ldquo;citizens,&rdquo; rather "
 "than &ldquo;consumers.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"http://";
+"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"https://";
 "www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-"
 "williams\">noted before</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Content&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to describe a feeling of comfort and satisfaction, by all means "
 "say you are &ldquo;content,&rdquo; but using the word as a noun to describe "
@@ -877,7 +877,7 @@
 "publications.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use the term &ldquo;content&rdquo; are often the publishers that "
 "push for increased copyright power in the name of the authors (&ldquo;"
@@ -888,7 +888,7 @@
 "a>:"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Content itself is beside the point&mdash;as the very use of words like "
 "content suggests. The moment you start labelling every single piece of "
@@ -896,13 +896,13 @@
 "interchangeability: its primary purpose as mere grist to the metrical mill."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In other words, &ldquo;content&rdquo; reduces publications and writings to a "
 "sort of pap fit to be piped through the &ldquo;tubes&rdquo; of the internet."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See also <a href=\"https://www.salon.com/2000/06/14/love_7/\";>Courtney "
 "Love's open letter to Steve Case</a> and search for &ldquo;content "
@@ -911,14 +911,14 @@
 "\"> biased and confusing</a>."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "However, as long as other people use the term &ldquo;content provider,"
 "&rdquo; political dissidents can well call themselves &ldquo;malcontent "
 "providers.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
 "&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
@@ -928,18 +928,18 @@
 "description."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
 "web site.  For that, we recommend the term &ldquo;web site revision "
 "system&rdquo; (WRS)."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Copyright Owner&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyright is an artificial privilege, handed out by the state to achieve a "
 "public interest and lasting a period of time &mdash; not a natural right "
@@ -947,7 +947,7 @@
 "to the recipient of that privilege as a &ldquo;copyright holder.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A few decades ago, copyright holders began trying to reduce awareness of "
 "this point.  In addition to citing frequently the bogus concept of <a href="
@@ -957,11 +957,11 @@
 "instead."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creative Commons licensed&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The most important licensing characteristic of a work is whether it is "
 "free.  Creative Commons publishes seven licenses; three are free (CC BY, CC "
@@ -971,7 +971,7 @@
 "but the omission is harmful."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To encourage people to pay attention to the most important distinction, "
 "always specify <em>which</em> Creative Commons license is used, as in &ldquo;"
@@ -979,11 +979,11 @@
 "work uses, find out and then make your statement."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creator&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
@@ -995,11 +995,11 @@
 "the author."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
 "authorship, identifies them with physical goods&mdash;which cannot be "
@@ -1010,11 +1010,11 @@
 "don't include freedom and community."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Locks&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital locks&rdquo; is used to refer to Digital Restrictions "
 "Management by some who criticize it.  The problem with this term is that it "
@@ -1022,19 +1022,19 @@
 "did not think it through."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Locks are not necessarily oppressive or bad.  You probably own several "
 "locks, and their keys or codes as well; you may find them useful or "
 "troublesome, but they don't oppress you, because you can open and close "
-"them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+"them.  Likewise, we find <a href=\"https://www.theguardian.com/";
 "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
 "good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
 "digital files.  That too is a kind of digital lock that you have control "
 "over."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "DRM is like a lock placed on you by someone else, who refuses to give you "
 "the key&mdash;in other words, like <em>handcuffs</em>.  Therefore, the "
@@ -1042,7 +1042,7 @@
 "digital locks.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A number of opposition campaigns have chosen the unwise term &ldquo;digital "
 "locks&rdquo;; to get things back on the right track, we must firmly insist "
@@ -1052,11 +1052,11 @@
 "handcuffs&rdquo; and say why."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Rights Management&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital Rights Management&rdquo; (abbreviated &ldquo;DRM&rdquo;) "
 "refers to technical mechanisms designed to impose restrictions on computer "
@@ -1066,30 +1066,30 @@
 "public on whom these restrictions are imposed."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Good alternatives include &ldquo;Digital Restrictions Management,&rdquo; and "
 "&ldquo;digital handcuffs.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+"Please sign up to support our <a href=\"https://DefectiveByDesign.org/\";> "
 "campaign to abolish DRM</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ecosystem&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is inadvisable to describe the free software community, or any human "
 "community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
 "absence of ethical judgment."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;ecosystem&rdquo; implicitly suggests an attitude of "
 "nonjudgmental observation: don't ask how what <em>should</em> happen, just "
@@ -1101,7 +1101,7 @@
 "phenomenon, even if it goes so far as the extinction of a species."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By contrast, beings that adopt an ethical stance towards their surroundings "
 "can decide to preserve things that, without their intervention, might "
@@ -1110,11 +1110,11 @@
 "traditional arts&hellip;and computer users' freedom."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FLOSS&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
 "Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
@@ -1123,11 +1123,11 @@
 "want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;For free&rdquo;"
 msgstr "„Zadarmo“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to say that a program is free software, please don't say that it "
 "is available &ldquo;for free.&rdquo; That term specifically means &ldquo;for "
@@ -1138,7 +1138,7 @@
 "[v originále „for free“ – pozn. překl.]</i> Tento termín má význam 
„za "
 "nulovou cenu“.  Svobodný software je otázkou svobody, ne ceny."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software copies are often available for free&mdash;for example, by "
 "downloading via FTP.  But free software copies are also available for a "
@@ -1152,7 +1152,7 @@
 "zadarmo na různých předváděcích akcích a některé druhy 
proprietárního "
 "softwaru jsou běžně dostupné zadarmo – pro určité uživatele."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, you can say that the program is available &ldquo;as free "
 "software.&rdquo;"
@@ -1160,11 +1160,11 @@
 "Abyste se vyhnuli zmatku, měli byste říkat, že program je k dispozici 
jako "
 "„svobodný software.“"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FOSS&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
 "&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
@@ -1173,17 +1173,17 @@
 "But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>FOSS</b>, we say, <b>free software</b> or <b>free (libre) "
 "software</b>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freely available&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The terms are not equivalent.  Software is &ldquo;"
@@ -1192,11 +1192,11 @@
 "of it.  These are answers to different questions."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freeware&rdquo;"
 msgstr "„Freeware“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;freeware&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The term &ldquo;freeware&rdquo; was used often in the "
@@ -1208,7 +1208,7 @@
 "programy uvolněné jen jako spustitelné soubory, bez zdrojového kódu.  V "
 "dnešní době nejsou tyto termíny shodné."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-Also, if you use other-]{+When using+} languages {+other+} than English,
 # | please [-try to-] avoid borrowing English [-words-] {+terms+} such as
 # | &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo;  [-Try-] {+It is
@@ -1234,7 +1234,7 @@
 "raději použít některé slovo, často méně dvojznačné, <a 
href=\"/philosophy/fs-"
 "translations.html\">které nabízí váš jazyk jako např</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | By [-forming-] {+using+} a word in [-your-] {+<a
 # | href=\"/philosophy/fs-translations.html\">your+} own [-language,-]
 # | {+language</a>,+} you show that you are really referring to freedom and
@@ -1265,11 +1265,11 @@
 "spoluobčanům podivné, nebo tomu budou nedůvěřovat, ale brzo si na to 
zvyknou "
 "a zjistí, jaké je opravdové poselství za svobodným softwarem."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Give away software&rdquo;"
 msgstr "„Rozdávání software“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | It's misleading to use the term &ldquo;give away&rdquo; to mean
 # | &ldquo;distribute a program as free software.&rdquo; [-It-] {+This
 # | locution+} has the same problem as &ldquo;for free&rdquo;: it implies the
@@ -1294,11 +1294,11 @@
 "týká se to ceny, ne svobody. Jeden způsob jak se vyhnout zmatku je říkat 
"
 "„uvolnit jako svobodný software.“"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Google&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;google&rdquo; as a verb, meaning to "
 "search for something on the internet. &ldquo;Google&rdquo; is just the name "
@@ -1310,13 +1310,13 @@
 "kind.)"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Hacker&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+"A hacker is someone who <a href=\"https://stallman.org/articles/on-hacking.";
 "html\"> enjoys playful cleverness</a>&mdash;not necessarily with computers.  "
 "The programmers in the old <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr> free software community of the 60s and 70s referred "
@@ -1325,17 +1325,17 @@
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't spread this mistake.  People who break security are &ldquo;"
 "crackers.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Intellectual property&rdquo;"
 msgstr "„Intelektuální vlastnictví“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Publishers and lawyers like to describe copyright as &ldquo;intellectual
 # | [-property.&rdquo; This-] {+property&rdquo;&mdash;a+} term [-carries a
 # | hidden assumption&mdash;that the most natural way-] {+also applied+} to
@@ -1364,7 +1364,7 @@
 "způsob o přemýšlení o předmětu kopírování je založen na podobnosti 
s "
 "fyzickými objekty a že o nich máme přemýšlet jako o majetku."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-But this analogy overlooks-]{+The term &ldquo;intellectual
 # | property&rdquo; carries a hidden assumption&mdash;that+} the [-crucial
 # | difference between material objects and information: information can be
@@ -1390,7 +1390,7 @@
 "námahy, zatímco materiální objekty ne. Založit svoje smýšlení na 
této "
 "analogii se rovná ignorování těchto rozdílů."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-Even the US legal system does not entirely accept this analogy,
 # | since-]{+When+} it [-does not treat copyrights just like physical object
 # | property rights.-] {+comes to copying, this analogy disregards the crucial
@@ -1408,7 +1408,7 @@
 "Dokonce i americký právní systém zcela nepřijal tuto analogii, 
poněvadž "
 "nejedná s copyrightem stejně jako s vlastnickými právy na fyzické 
objekty."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-If you don't want to limit yourself to this way of thinking, <a
 # | href=\"/philosophy/not-ipr.html\">it-]{+To avoid spreading unnecessary
 # | bias and confusion, it+} is best to [-avoid using the term
@@ -1429,7 +1429,7 @@
 "philosophy/not-ipr.html\">je nejlepší vyhnout se používání termínu "
 "„intelektuální vlastnictví“</a> ve vašich slovech a myšlenkách."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-Another problem with &ldquo;intellectual property&rdquo; is that it is
 # | an attempt to generalize about several legal systems, including copyright,
 # | patents, and trademarks, which are much more different than similar. 
@@ -1469,11 +1469,11 @@
 "„intelektuální vlastnictví“. Místo toho raději mluvte o copyrightu, "
 "patentech, nebo o jakémkoliv právním termínu na toto téma."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Internet of Things&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies decided to make computerized appliances that would connect "
 "over the internet to the manufacturer's server, and therefore could easily "
@@ -1482,9 +1482,9 @@
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Experience shows that these products often do <a href=\"http://www.locusmag.";
+"Experience shows that these products often do <a href=\"https://www.locusmag.";
 "com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-"
 "things-to-be-sensed/\"> spy on their users</a>.  They are also tailor-made "
 "for <a href=\"https://archive.ieet.org/articles/rinesi20150806.html\";>giving "
@@ -1493,15 +1493,15 @@
 "off the server it depends on."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We call them the &ldquo;Internet of Stings.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;LAMP system&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
 "&mdash;a common combination of software to use on a web server, except that "
@@ -1510,11 +1510,11 @@
 "GNU, Linux, Apache, MySQL and PHP.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Linux system&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
@@ -1524,17 +1524,17 @@
 "distinguish the whole system from the kernel alone."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Market&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is misleading to describe the users of free software, or the software "
 "users in general, as a &ldquo;market.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not to say there is no room for markets in the free software "
 "community.  If you have a free software support business, then you have "
@@ -1542,7 +1542,7 @@
 "freedom, we wish you success in your market."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But the free software movement is a social movement, not a business, and the "
 "success it aims for is not a market success.  We are trying to serve the "
@@ -1552,21 +1552,21 @@
 "software."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | [-&ldquo;Protection&rdquo;-]{+&ldquo;Modern&rdquo;+}
 #, fuzzy
 #| msgid "&ldquo;Protection&rdquo;"
 msgid "&ldquo;Modern&rdquo;"
 msgstr "„Ochrana“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;modern&rdquo; makes sense from a descriptive perspective "
 "&mdash; for instance, solely to distinguish newer periods and ways from "
 "older ones."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It becomes a problem when it carries the presumption that older ways are "
 "&ldquo;old-fashioned&rdquo;; that is, presumed to be worse.  In "
@@ -1574,11 +1574,11 @@
 "users, the reverse is often true."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Monetize&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The proper definition of &ldquo;monetize&rdquo; is &ldquo;to use something "
 "as currency.&rdquo; For instance, human societies have monetized gold, "
@@ -1587,7 +1587,7 @@
 "&ldquo;to use something as a basis for profit&rdquo;."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That usage casts the profit as primary, and the thing used to get the profit "
 "as secondary.  That attitude applied to a software project is objectionable "
@@ -1595,18 +1595,18 @@
 "they conclude that making it free/libre isn't sufficiently profitable."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A productive and ethical business can make money, but if it subordinates all "
 "else to profit, it is not likely to remain ethical."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;MP3 Player&rdquo;"
 msgstr ""
 
 #.  The MP3 patents will reportedly expire by 2018.  
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the late 1990s it became feasible to make portable, solid-state digital "
 "audio players.  Most players supported the patented MP3 codec, and that is "
@@ -1616,7 +1616,7 @@
 "MP3 format."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Using the term &ldquo;MP3 players&rdquo; for audio players in general has "
 "the effect of promoting the MP3 format and discouraging the other formats "
@@ -1624,18 +1624,18 @@
 "patents have expired, it is still undesirable to do that."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;digital audio player,&rdquo; or simply &ldquo;"
 "audio player&rdquo; when that's clear enough, instead of &ldquo;MP3 player."
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Open&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open source&rdquo; "
 "as a substitute for &ldquo;free software.&rdquo; Those terms refer to a <a "
@@ -1645,38 +1645,38 @@
 "non-movement does not campaign for anything in this way."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When referring to the open source views, it's correct to use that name, but "
 "please do not use that term when talking about us, our software, or our "
 "views&mdash;that leads people to suppose our views are similar to theirs."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>open source</b>, we say, <b>free software</b> or <b>free "
 "(libre) software</b>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | [-&ldquo;Theft&rdquo;-]{+&ldquo;Opt out&rdquo;+}
 #, fuzzy
 #| msgid "&ldquo;Theft&rdquo;"
 msgid "&ldquo;Opt out&rdquo;"
 msgstr "„Krádež“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When applied to any form of computational mistreatment, &ldquo;opt "
 "out&rdquo; implies the choice is a minor matter of convenience. We recommend "
 "&ldquo;reject,&rdquo; &ldquo;shun&rdquo; or &ldquo;escape from.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PC&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's OK to use the abbreviation &ldquo;PC&rdquo; to refer to a certain kind "
 "of computer hardware, but please don't use it with the implication that the "
@@ -1684,29 +1684,29 @@
 "computer, it is still a PC."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;WC&rdquo; has been suggested for a computer running Windows."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Photoshop&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any "
 "kind of photo manipulation or image editing in general.  Photoshop is just "
 "the name of one particular image editing program, which should be avoided "
 "since it is proprietary.  There are plenty of free programs for editing "
-"images, such as the <a href=\"/software/gimp\">GIMP</a>."
+"images, such as the <a href=\"https://www.gimp.org/\";>GIMP</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Piracy&rdquo;"
 msgstr "„Pirátství“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Publishers often refer to [-prohibited-] copying {+they don't approve of+}
 # | as &ldquo;piracy.&rdquo; In this way, they imply that [-illegal copying-]
 # | {+it+} is ethically equivalent to attacking ships on the high seas,
@@ -1732,7 +1732,7 @@
 "způsobem naznačují že nezákoné kopírování je eticky stejné jako 
zaútočení na "
 "loďi na moři, vraždění a unášení lidí na nich."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | If you don't believe that [-illegal-] copying {+not approved by the
 # | publisher+} is just like kidnapping and murder, you might prefer not to
 # | use the word &ldquo;piracy&rdquo; to describe it.  Neutral terms such as
@@ -1765,19 +1765,19 @@
 "preferují použití pozitivních termínů, jako „sdílení informací s 
vašimi "
 "blízkými“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear words.</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PowerPoint&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
 "slide presentation.  &ldquo;PowerPoint&rdquo; is just the name of one "
@@ -1787,11 +1787,11 @@
 "<code>beamer</code> class and LibreOffice Impress."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Product&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you're talking about a product, by all means call it that.  However, when "
 "referring to a service, please do not call it a &ldquo;product.&rdquo; If a "
@@ -1801,11 +1801,11 @@
 "&ldquo;deal.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Protection&rdquo;"
 msgstr "„Ochrana“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers' lawyers love to use the term &ldquo;protection&rdquo; to "
 "describe copyright.  This word carries the implication of preventing "
@@ -1819,7 +1819,7 @@
 "mají z copyrightu prospěch, spíš než aby cítili s uživateli, kteří 
jsou "
 "copyrightem omezováni."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | It is easy to avoid &ldquo;protection&rdquo; and use neutral terms
 # | instead.  For example, instead of {+saying,+} &ldquo;Copyright protection
 # | lasts a very long time,&rdquo; you can say, &ldquo;Copyright lasts a very
@@ -1840,13 +1840,13 @@
 "Například místo „copyrightová ochrana vydrží velmi dlouho“ můžete 
říct "
 "„copyright vydrží velmi dlouho“."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Likewise, instead of saying, &ldquo;protected by copyright,&rdquo; you can "
 "say, &ldquo;covered by copyright&rdquo; or just &ldquo;copyrighted.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | If you want to criticize copyright [-instead of supporting it,-] {+rather
 # | than be neutral,+} you can use the term &ldquo;copyright
 # | restrictions.&rdquo; {+Thus, you can say, &ldquo;Copyright restrictions
@@ -1863,22 +1863,22 @@
 "Chcete-li kritizovat copyright místo toho abyste jej podporovali, můžete "
 "použít termín „copyrightová omezení“."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
 "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
 "interferes with copying.  From the user's point of view, this is "
 "obstruction.  So we could call that malicious feature &ldquo;copy "
 "obstruction.&rdquo; More often it is called Digital Restrictions Management "
-"(DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> Defective by "
+"(DRM)&mdash;see the <a href=\"https://DefectiveByDesign.org\";> Defective by "
 "Design</a> campaign."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies that promulgate patent-restricted standards that prohibit "
 "free software typically have a policy of obtaining patent licenses that "
@@ -1887,7 +1887,7 @@
 "reasonable and non-discriminatory.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That term whitewashes a class of patent licenses that are normally neither "
 "reasonable nor nondiscriminatory.  It is true that these licenses do not "
@@ -1896,7 +1896,7 @@
 "of the term &ldquo;RAND&rdquo; is deceptive and the other half is prejudiced."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
 "and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
@@ -1906,18 +1906,18 @@
 "widespread is to let those companies dictate the views you express."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;uniform fee only,&rdquo; or &ldquo;UFO&rdquo; for "
 "short, as a replacement.  It is accurate because the only condition in these "
 "licenses is a uniform royalty fee."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;SaaS&rdquo; or &ldquo;Software as a Service&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We used to say that SaaS (short for &ldquo;Software as a Service&rdquo;) is "
 "an injustice, but then we found that there was a lot of variation in "
@@ -1927,24 +1927,24 @@
 "definition is the only one, and it explains what the injustice consists of."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/who-does-that-server-really-serve.html\">Who Does "
 "That Server Really Serve?</a> for discussion of this issue."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In Spanish we continue to use the term &ldquo;software como servicio&rdquo; "
 "because the joke of &ldquo;software como ser vicio&rdquo; (&ldquo;software, "
 "as being pernicious&rdquo;) is too good to give up."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sell software&rdquo;"
 msgstr "„Prodej softwaru“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking,
 # | exchanging a copy of a free program for a sum of money is
 # | [-&ldquo;selling&rdquo;; but-] {+<a href=\"/philosophy/selling.html\">
@@ -1983,7 +1983,7 @@
 "kopií programu za poplatek“ nebo „uvalení proprietárních restrikcí 
na "
 "používání programu“ v závislosti na tom, co máte na mysli."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for
 # | [-more-] {+further+} discussion of this issue.
 #, fuzzy
@@ -1997,11 +1997,11 @@
 "Viz <a href=\"/philosophy/selling.html\">Prodej svobodného softwaru</a> pro "
 "víc názorů na toto téma"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing (personal data)&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies manipulate or lure people into revealing personal data and "
 "thus ceding their privacy, please don't refer to this as &ldquo;sharing."
@@ -2011,17 +2011,17 @@
 "word to a practice which is harmful and dangerous."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When one company redistributes collected personal data to another company, "
 "that is even less deserving of the term &ldquo;sharing.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing economy&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;sharing economy&rdquo; is not a good way to refer to "
 "services such as Uber and Airbnb that arrange business transactions between "
@@ -2031,17 +2031,17 @@
 "transactions undermines its meaning, so we don't use it in this context."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A more suitable term for businesses like Uber is the &ldquo;piecework "
 "service economy&rdquo; or &ldquo;gig economy.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Skype&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;skype&rdquo; as a verb, meaning any kind "
 "of video communication or telephony over the Internet in general.  &ldquo;"
@@ -2053,11 +2053,11 @@
 "Skype_Replacement\"> numerous free Skype replacements</a>."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Software Industry&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;software industry&rdquo; encourages people to imagine that "
 "software is always developed by a sort of factory and then delivered to "
@@ -2067,7 +2067,7 @@
 "factories."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;industry&rdquo; is being used as propaganda by advocates of "
 "software patents.  They call software development &ldquo;industry&rdquo; and "
@@ -2079,11 +2079,11 @@
 "automated production of material goods.&rdquo;</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Source model&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
@@ -2096,11 +2096,11 @@
 "describing free software programs."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Terminal&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Mobile phones and tablets are computers, and people should be able to do "
 "their computing on them using free software.  To call them &ldquo;"
@@ -2108,11 +2108,11 @@
 "servers, which is a bad way to do your own computing."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Theft&rdquo;"
 msgstr "„Krádež“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-Copyright apologists-]{+The supporters of a too-strict, repressive form
 # | of copyright+} often use words like &ldquo;stolen&rdquo; and
 # | &ldquo;theft&rdquo; to [-describe-] {+refer to+} copyright infringement. 
@@ -2136,14 +2136,14 @@
 "právní systém za autoritu na etiku: jestliže je kopírování zakázáno 
- musí "
 "být špatné."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-So it is pertinent to mention that-]{+Under+} the {+US+} legal
 # | [-system&mdash;at least in the US&mdash;<a
 # | 
href=\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\";>
 # | rejects the idea that-] {+system,+} copyright infringement is
 # | [-&ldquo;theft&rdquo;</a>.  Copyright advocates who use terms like
 # | &ldquo;stolen&rdquo;-] {+not theft.  <a
-# | 
href=\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\";>
+# | 
href=\"https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\";>
 # | Laws about theft are not applicable to copyright infringement.</a> The
 # | supporters of repressive copyright+} are {+making an appeal to
 # | authority&mdash;and+} misrepresenting [-the-] {+what+} authority [-that
@@ -2158,7 +2158,7 @@
 #| "they appeal to."
 msgid ""
 "Under the US legal system, copyright infringement is not theft.  <a href="
-"\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
+"\"https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
 "invol=207\"> Laws about theft are not applicable to copyright infringement.</"
 "a> The supporters of repressive copyright are making an appeal to "
 "authority&mdash;and misrepresenting what authority says."
@@ -2169,14 +2169,14 @@
 "„zlodějství“</a>. Obránci copyrightu používající termíny jako 
„krádež“ jsou "
 "špatnými zástupci práva na které se odvolávají."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"To refute them, you can point to this <a href=\"http://www.guardian.co.uk/";
+"To refute them, you can point to this <a href=\"https://www.guardian.co.uk/";
 "books/2013/may/04/harper-lee-kill-mockingbird-copyright\"> real case</a> "
 "which shows what can properly be described as &ldquo;copyright theft.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-The idea that laws decide what is right or wrong-]{+Unauthorized
 # | copying+} is [-mistaken-] {+forbidden by copyright law+} in [-general. 
 # | Laws are,-] {+many circumstances (not all!), but being forbidden doesn't
@@ -2202,19 +2202,19 @@
 "zákony definují spravedlnost, nebo etické chování, je obracení věcí 
vzhůru "
 "nohama."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear-words.</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Trusted Computing&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;</"
 "a> is the proponents' name for a scheme to redesign computers so that "
@@ -2223,11 +2223,11 @@
 "view, it is &ldquo;treacherous.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Vendor&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;vendor&rdquo; to refer generally to anyone "
 "that develops or packages software.  Many programs are developed in order to "
@@ -2239,9 +2239,18 @@
 "supplier&rdquo; instead."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+# | This essay is published in <a
+# | 
href=\"http{+s+}://shop.fsf.org/product/free-software-free-society/\"><cite>Free
+# | Software, Free Society: The Selected Essays of Richard M.
+# | Stallman</cite></a>.
+#, fuzzy
+#| msgid ""
+#| "This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+#| "software-free-society/\"><cite>Free Software, Free Society: The Selected "
+#| "Essays of Richard M. Stallman</cite></a>."
 msgid ""
-"This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+"This essay is published in <a href=\"https://shop.fsf.org/product/free-";
 "software-free-society/\"><cite>Free Software, Free Society: The Selected "
 "Essays of Richard M. Stallman</cite></a>."
 msgstr ""
@@ -2275,14 +2284,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</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>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "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."
 msgstr ""
 "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné a 
kvalitní "
@@ -2293,19 +2308,12 @@
 "se dozvíte, jak koordinovat svoji práci a posílat překlady tohoto 
článku."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, 1999, [-2001-] {+2001, 2002, 2003,
-# | 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020,
-# | 2021+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2011, 2012-] {+1996-2018, 2020, 2021+} Free Software
+# | Foundation, Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001 Free Software Foundation, "
-#| "Inc."
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc."
+#| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
+msgid "Copyright &copy; 1996-2018, 2020, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -2328,6 +2336,31 @@
 msgstr "Aktualizováno:"
 
 #~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Pracujeme tvrdě a děláme to nejlepší, abychom vám přinesli přesné 
a "
+#~ "kvalitní překlady. Nicméně i my můžeme udělat chybu. Vaše 
komentáře a "
+#~ "návrhy na vylepšení vítáme na adrese <a 
href=\"mailto:web-translators@gnu.";
+#~ "org\"> &lt;web-translators@gnu.org&gt;</a>.</p> <p>Přečtěte si prosím  
<a "
+#~ "href=\"/server/standards/README.translations.html\">Příručku "
+#~ "překladatele</a>, kde se dozvíte, jak koordinovat svoji práci a 
posílat "
+#~ "překlady tohoto článku."
+
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 1996, 1997, 1998, 1999, 2001 Free Software Foundation, "
+#~| "Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~ "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001 Free Software Foundation, "
+#~ "Inc."
+
+#~ msgid ""
 #~ "&ldquo;<a href=\"#Commercial\" id=\"TOCCommercial\">Commercial</a>&rdquo; "
 #~ "| &ldquo;<a href=\"#ForFree\" id=\"TOCForFree\">For free</a>&rdquo; | "
 #~ "&ldquo;<a href=\"#Freeware\" id=\"TOCFreeware\">Freeware</a>&rdquo; | "

Index: words-to-avoid.de-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.de-diff.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- words-to-avoid.de-diff.html 8 Jun 2021 08:44:42 -0000       1.22
+++ words-to-avoid.de-diff.html 21 Jul 2021 19:32:32 -0000      1.23
@@ -11,12 +11,24 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.90</em></ins></span> --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="term" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Words to Avoid (or Use with Care) Because They Are Loaded or 
Confusing
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+#word-list a { line-height: 1.8em; text-decoration: none; }
+--&gt;
+&lt;/style&gt;</em></ins></span>
 &lt;!--#include virtual="/philosophy/po/words-to-avoid.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;Words to Avoid (or Use with Care) Because They Are Loaded or 
Confusing&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div 
class="thin"&gt;&lt;/div&gt;</em></ins></span>
 
 &lt;p&gt;
 There are a number of words and phrases that we recommend avoiding, or
@@ -24,13 +36,12 @@
 misleading; others presuppose a viewpoint that we disagree with, and
 we hope you disagree with it too.&lt;/p&gt;
 
-&lt;div class="announcement"&gt;
+&lt;div <span class="removed"><del><strong>class="announcement"&gt;
 &lt;blockquote&gt;&lt;p&gt;Also note &lt;a 
href="/philosophy/categories.html"&gt;Categories of Free
 Software&lt;/a&gt;,
 &lt;a href="/philosophy/why-call-it-the-swindle.html"&gt;Why Call It The
 Swindle?&lt;/a&gt;&lt;/p&gt;&lt;/blockquote&gt;
-&lt;/div&gt;
-
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="word-list" class="emph-box"&gt;</em></ins></span>
 &lt;p&gt;&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!-- GNUN-SORT-START 
--&gt; &ldquo;&lt;a
        href="#Ad-blocker"&gt;Ad-blocker&lt;/a&gt;&rdquo;
 |&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!-- GNUN-SORT-NEXT-ITEM 
--&gt; &ldquo;&lt;a
@@ -148,6 +159,16 @@
 |&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!-- GNUN-SORT-NEXT-ITEM 
--&gt; &ldquo;&lt;a
        href="#Vendor"&gt;Vendor&lt;/a&gt;&rdquo;
 &lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!-- GNUN-SORT-STOP 
--&gt;&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
+
+&lt;hr class="no-display" /&gt;
+&lt;div class="announcement"&gt;
+&lt;p&gt;Also note &lt;a href="/philosophy/categories.html"&gt;Categories of 
Free
+Software&lt;/a&gt;,
+&lt;a href="/philosophy/why-call-it-the-swindle.html"&gt;Why Call It The
+Swindle?&lt;/a&gt;&lt;/p&gt;
+&lt;/div&gt;
+&lt;hr class="no-display" /&gt;</em></ins></span>
 
 &lt;!-- GNUN-SORT-START --&gt;
 &lt;!-- GNUN-SORT-BEGIN-KEY --&gt;
@@ -300,7 +321,7 @@
 One of the many meanings of &ldquo;cloud computing&rdquo; is storing
 your data in online services.  In most scenarios, that is foolish
 because it exposes you to
-&lt;a 
href="http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream"&gt;surveillance&lt;/a&gt;.
+&lt;a <span 
class="removed"><del><strong>href="http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream"&gt;surveillance&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream"&gt;surveillance&lt;/a&gt;.</em></ins></span>
 &lt;/p&gt;
 
 &lt;p&gt;
@@ -342,7 +363,7 @@
 
 &lt;p&gt;
 Curiously, Larry Ellison, a proprietary software developer,
-also &lt;a 
href="http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/"&gt;
+also &lt;a <span 
class="removed"><del><strong>href="http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/"&gt;</em></ins></span>
 noted the vacuity of the term &ldquo;cloud computing.&rdquo;&lt;/a&gt;  He
 decided to use the term anyway because, as a proprietary software
 developer, he isn't motivated by the same ideals as we are.
@@ -430,14 +451,14 @@
 or the accountant of a publishing company.  It is no surprise that
 proprietary software would like you to think of the use of software as
 a commodity.  Their twisted viewpoint comes through clearly
-in &lt;a 
href="http://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6"&gt;this
+in &lt;a <span 
class="removed"><del><strong>href="http://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6"&gt;this</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6"&gt;this</em></ins></span>
 article&lt;/a&gt;, which also refers to publications as
 &ldquo;&lt;a href="#Content"&gt;content&lt;/a&gt;.&rdquo;&lt;/p&gt;
 
 &lt;p&gt;
 The narrow thinking associated with the idea that we &ldquo;consume
 content&rdquo; paves the way for laws such as the DMCA that forbid
-users to break the &lt;a href="http://DefectiveByDesign.org/"&gt;Digital
+users to break the &lt;a <span 
class="removed"><del><strong>href="http://DefectiveByDesign.org/"&gt;Digital</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://DefectiveByDesign.org/"&gt;Digital</em></ins></span>
 Restrictions Management&lt;/a&gt; (DRM) facilities in digital devices.  If
 users think what they do with these devices is &ldquo;consume,&rdquo;
 they may see such restrictions as natural.&lt;/p&gt;
@@ -504,7 +525,7 @@
 &ldquo;citizens,&rdquo; rather than &ldquo;consumers.&rdquo;&lt;/p&gt;
 &lt;p&gt;
 This problem with the word &ldquo;consumer&rdquo; has
-been &lt;a 
href="http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams"&gt;noted
 before&lt;/a&gt;.
+been &lt;a <span 
class="removed"><del><strong>href="http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams"&gt;noted</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams"&gt;noted</em></ins></span>
 before&lt;/a&gt;.
 &lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -646,7 +667,7 @@
 locks, and their keys or codes as well; you may find them useful or
 troublesome, but they don't oppress you, because you can open and
 close them.  Likewise, we
-find &lt;a 
href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-"&gt;encryption&lt;/a&gt;
+find &lt;a <span 
class="removed"><del><strong>href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-"&gt;encryption&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-"&gt;encryption&lt;/a&gt;</em></ins></span>
 invaluable for protecting our digital files.  That too is a kind
 of digital lock that you have control over.&lt;/p&gt;
 &lt;p&gt;
@@ -678,7 +699,7 @@
 Good alternatives include &ldquo;Digital Restrictions
 Management,&rdquo; and &ldquo;digital handcuffs.&rdquo;&lt;/p&gt;
 &lt;p&gt;
-Please sign up to support our &lt;a href="http://DefectiveByDesign.org/"&gt;
+Please sign up to support our &lt;a <span 
class="removed"><del><strong>href="http://DefectiveByDesign.org/"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://DefectiveByDesign.org/"&gt;</em></ins></span>
 campaign to abolish DRM&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -827,7 +848,7 @@
 &lt;!-- GNUN-SORT-END-KEY --&gt;
 &lt;p&gt;
 A hacker is someone
-who &lt;a href="http://stallman.org/articles/on-hacking.html"&gt; enjoys
+who &lt;a <span 
class="removed"><del><strong>href="http://stallman.org/articles/on-hacking.html"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://stallman.org/articles/on-hacking.html"&gt;</em></ins></span>
 enjoys
 playful cleverness&lt;/a&gt;&mdash;not necessarily with computers.  The
 programmers in the old
 &lt;abbr title="Massachusetts Institute of Technology"&gt;MIT&lt;/abbr&gt; free
@@ -884,7 +905,7 @@
 &lt;p&gt;
 Experience shows that these products often do 
 &lt;a
-href="http://www.locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-things-to-be-sensed/"&gt;
+href="https://www.locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-things-to-be-sensed/"&gt;
 spy on their users&lt;/a&gt;.  They are also tailor-made for 
 &lt;a href="https://archive.ieet.org/articles/rinesi20150806.html"&gt;giving
 people biased advice&lt;/a&gt;.  In addition, the manufacturer can &lt;a
@@ -1058,7 +1079,7 @@
 any kind of photo manipulation or image editing in general.  Photoshop
 is just the name of one particular image editing program, which should
 be avoided since it is proprietary.  There are plenty of free programs
-for editing images, such as the &lt;a 
href="/software/gimp"&gt;GIMP&lt;/a&gt;.&lt;/p&gt;
+for editing images, such as the &lt;a <span 
class="removed"><del><strong>href="/software/gimp"&gt;GIMP&lt;/a&gt;.&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.gimp.org/"&gt;GIMP&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
 &lt;!-- GNUN-SORT-BEGIN-KEY --&gt;
@@ -1085,7 +1106,7 @@
 &lt;p&gt;
 A US judge, presiding over a trial for copyright infringement,
 recognized that
-&lt;a 
href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;
+&lt;a <span 
class="removed"><del><strong>href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;</em></ins></span>
 and &ldquo;theft&rdquo; are smear words.&lt;/a&gt;&lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -1146,7 +1167,7 @@
 obstruction.  So we could call that malicious feature &ldquo;copy
 obstruction.&rdquo;  More often it is called Digital Restrictions
 Management (DRM)&mdash;see the
-&lt;a href="http://DefectiveByDesign.org"&gt; Defective by Design&lt;/a&gt;
+&lt;a <span 
class="removed"><del><strong>href="http://DefectiveByDesign.org"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://DefectiveByDesign.org"&gt;</em></ins></span>
 Defective by Design&lt;/a&gt;
 campaign.&lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -1330,13 +1351,14 @@
 &lt;p&gt;
 Under the US legal system, copyright infringement is not theft.  
 &lt;a
-href="http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207"&gt;
+<span 
class="removed"><del><strong>href="http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207"&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207"&gt;</em></ins></span>
 Laws about theft are not applicable to copyright infringement.&lt;/a&gt;
 The supporters of repressive copyright are making an appeal to
 authority&mdash;and misrepresenting what authority says.&lt;/p&gt;
 &lt;p&gt;
 To refute them, you can point to this
-&lt;a 
href="http://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright"&gt;
+&lt;a <span 
class="removed"><del><strong>href="http://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright"&gt;</em></ins></span>
 real case&lt;/a&gt; which shows what can properly be described as
 &ldquo;copyright theft.&rdquo;&lt;/p&gt;
 &lt;p&gt;
@@ -1350,7 +1372,7 @@
 &lt;p&gt;
 A US judge, presiding over a trial for copyright infringement,
 recognized that
-&lt;a 
href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;
+&lt;a <span 
class="removed"><del><strong>href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;</em></ins></span>
 and &ldquo;theft&rdquo; are smear-words.&lt;/a&gt;&lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -1381,15 +1403,17 @@
 &lt;/p&gt;
 &lt;!-- GNUN-SORT-STOP --&gt;
 
-&lt;hr /&gt;
-&lt;blockquote <span class="removed"><del><strong>id="fsfs"&gt;&lt;p 
class="big"&gt;This</strong></del></span> <span 
class="inserted"><ins><em>id="fsfs"&gt;&lt;p&gt;This</em></ins></span> essay is 
published
-in &lt;a 
href="http://shop.fsf.org/product/free-software-free-society/"&gt;&lt;cite&gt;Free
+&lt;hr <span class="inserted"><ins><em>class="thin"</em></ins></span> /&gt;
+<span class="removed"><del><strong>&lt;blockquote id="fsfs"&gt;&lt;p 
class="big"&gt;This</strong></del></span>
+<span class="inserted"><ins><em>&lt;p id="fsfs"&gt;This</em></ins></span> 
essay is published in
+&lt;a <span 
class="removed"><del><strong>href="http://shop.fsf.org/product/free-software-free-society/"&gt;&lt;cite&gt;Free</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://shop.fsf.org/product/free-software-free-society/"&gt;&lt;cite&gt;Free</em></ins></span>
 Software, Free Society: The Selected Essays of Richard
-M. Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
+M. <span 
class="removed"><del><strong>Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
 <span class="inserted"><ins><em>Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -1407,13 +1431,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;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 &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; 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.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -1434,8 +1458,8 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
-2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, <span 
class="removed"><del><strong>2018</strong></del></span> <span 
class="inserted"><ins><em>2018, 2020, 2021</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996, 1997, 1998, 
1999, 2001, 2002, 2003, 2004, 2007,
+2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018</strong></del></span> 
<span class="inserted"><ins><em>1996-2018, 2020, 2021</em></ins></span> Free 
Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -1445,7 +1469,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/08 08:44:42 $
+$Date: 2021/07/21 19:32:32 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: words-to-avoid.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.de.po,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- words-to-avoid.de.po        31 May 2021 03:56:37 -0000      1.200
+++ words-to-avoid.de.po        21 Jul 2021 19:32:32 -0000      1.201
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2021-05-31 03:55+0000\n"
+"POT-Creation-Date: 2021-07-21 19:25+0000\n"
 "PO-Revision-Date: 2018-07-20 22:00+0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <www-de-translators@gnu.org>\n"
@@ -25,13 +25,13 @@
 "Zu vermeidende Wörter (oder mit Sorgfalt zu verwendende), weil sie "
 "voreingenommen oder irreführend sind - GNU-Projekt - Free Software 
Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Words to Avoid (or Use with Care) Because They Are Loaded or Confusing"
 msgstr ""
 "Zu vermeidende Wörter<br />&#8209;&#160;(oder mit Sorgfalt zu verwendende), "
 "weil sie voreingenommen oder irreführend sind"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are a number of words and phrases that we recommend avoiding, or "
 "avoiding in certain contexts and usages.  Some are ambiguous or misleading; "
@@ -43,37 +43,26 @@
 "mehrdeutig oder irreführend; andere setzen eine Sichtweise voraus, von der "
 "wir hoffen, dass Sie anderer Meinung sind."
 
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
-"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
-"It The Swindle?</a>"
-msgstr ""
-"Beachten Sie außerdem die <cite><a href=\"/philosophy/categories"
-"\">Kategorien freier und unfreier Software</a></cite> und <cite><a href=\"/"
-"philosophy/why-call-it-the-swindle\">Warum es den ‚Swindle‘ nennen</a></"
-"cite>."
-
 #.  GNUN-SORT-START 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ad-blocker\">Ad-blocker</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Ad-blocker\"><em>Ad-blocker</em></a> |"
 "&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Access\">Access</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Access\"><em>Access</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Alternative\">Alternative</a>&rdquo; |"
 msgstr "<a href=\"#Alternative\"><em>Alternative</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Assets\">Assets</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Assets\"><em>Assets</em></a> |&#160;"
@@ -81,7 +70,7 @@
 # <!-- <a href="#BSD-style"><em>BSD-artig</em></a> |
 # <a href="#BSD-style"><em>BSD-Stil</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#BSD-style\">BSD-style</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#BSD-style\"><em>BSD-Style</em></a> |"
@@ -89,14 +78,14 @@
 
 # <!-- <a href="#Closed"><em>Geschlossen[er Quellcode]</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Closed\">Closed</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Closed\"><em>Closed</em></a> |&#160;"
 
 # <!-- <a href="#CloudComputing"><em>Datenwolke</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CloudComputing\">Cloud Computing</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#CloudComputing\"><em>Cloud Computing</"
@@ -104,7 +93,7 @@
 
 # <!-- <a href="#Commercial"><em>Kommerziell</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Commercial\">Commercial</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Commercial\"><em>Commercial</em></a> |"
@@ -114,7 +103,7 @@
 # <a href="#Compensation"><em>Entschädigung</em></a> |
 # <a href="#Compensation"><em>Vergütung</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Compensation\">Compensation</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Compensation\"><em>Compensation</em></"
@@ -123,7 +112,7 @@
 # <!-- <a href="#Consume"><em>konsumieren</em></a> |
 # <a href="#Consume"><em>verbrauchen</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consume\">Consume</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Consume\"><em>Consume</em></a> |&#160;"
@@ -131,7 +120,7 @@
 # <!-- <a href="#Consumer"><em>Konsument</em></a> |
 # <a href="#Consumer"><em>Verbraucher</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consumer\">Consumer</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Consumer\"><em>Consumer</em></a> |"
@@ -139,7 +128,7 @@
 
 # <!-- <a href="#Content"><em>Inhalt</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Content\">Content</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Content\"><em>Content</em></a> |&#160;"
@@ -147,7 +136,7 @@
 # <!-- <a href="#Consumer"><em>Konsument</em></a> |
 # <a href="#Consumer"><em>Verbraucher</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | &ldquo;<a [-href=\"#Consumer\">Consumer</a>&rdquo;-]
 # | {+href=\"#CopyrightOwner\">Copyright Owner</a>&rdquo;+} |
 #, fuzzy
@@ -159,7 +148,7 @@
 
 # <!-- <a href="#CreativeCommonsLicensed"><em>Creative Commons 
lizenziert</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#CreativeCommonsLicensed\">Creative Commons licensed</"
 "a>&rdquo; |"
@@ -169,14 +158,14 @@
 
 # <!-- <a href="#Creator"><em>Schöpfer</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Creator\">Creator</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Creator\"><em>Creator</em></a> |&#160;"
 
 # <!-- <a href="#DigitalGoods"><em>Digitale Güter</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalGoods\">Digital Goods</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#DigitalGoods\"><em>Digital Goods</"
@@ -184,7 +173,7 @@
 
 # <!-- <a href="#DigitalLocks"><em>Digitale Schlösser</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalLocks\">Digital Locks</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#DigitalLocks\"><em>Digital Locks</"
@@ -192,7 +181,7 @@
 
 # <!-- <a href="#DigitalRightsManagement"><em>Digitale 
Rechteverwaltung</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#DigitalRightsManagement\">Digital Rights Management</"
 "a>&rdquo; |"
@@ -202,42 +191,42 @@
 
 # <!-- <a href="#Ecosystem"><em>Ökosystem</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ecosystem\">Ecosystem</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Ecosystem\"><em>Ecosystem</em></a> |"
 "&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FLOSS\">FLOSS</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#FLOSS\"><em>FLOSS</em></a> |&#160;"
 
 # <!-- <a href="#ForFree"><em>Für frei</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#ForFree\">For free</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#ForFree\"><em>For free</em></a> |"
 "&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FOSS\">FOSS</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#FOSS\"><em>FOSS</em></a> |&#160;"
 
 # <!-- <a href="#FreelyAvailable"><em>Frei verfügbar</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FreelyAvailable\">Freely available</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#FreelyAvailable\"><em>Freely "
 "available</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Freeware\">Freeware</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Freeware\"><em>Freeware</em></a> |"
@@ -246,27 +235,27 @@
 # <!-- <a href="#GiveAwaySoftware"><em>Gratissoftware</em></a> |
 # <a href="#GiveAwaySoftware"><em>Software verschenken</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#GiveAwaySoftware\">Give away software</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#GiveAwaySoftware\"><em>Give away "
 "software</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Google\">Google</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Google\"><em>Google</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Hacker\">Hacker</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Hacker\"><em>Hacker</em></a> |&#160;"
 
 # <!-- <a href="#IntellectualProperty"><em>Geistiges Eigentum</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#IntellectualProperty\">Intellectual property</a>&rdquo; |"
 msgstr ""
@@ -275,7 +264,7 @@
 
 # <!-- <a href="#Content"><em>Inhalt</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | &ldquo;<a [-href=\"#Content\">Content</a>&rdquo;-]
 # | {+href=\"#InternetofThings\">Internet of Things</a>&rdquo;+} |
 #, fuzzy
@@ -285,27 +274,27 @@
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Content\"><em>Content</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#LAMP\">LAMP system</a>&rdquo; |"
 msgstr ""
 "<a href=\"#LAMP\" title=\"Linux, Apache, MySQL und PHP\"><em>LAMP-System</"
 "em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Linux\">Linux system</a>&rdquo; |"
 msgstr "<a href=\"#Linux\"><em>Linux-System</em></a> |&#160;"
 
 # <!-- <a href="#Market"><em>Markt</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Market\">Market</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Market\"><em>Market</em></a> |&#160;"
 
 # <!-- <em>Offen[er Quellcode]</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | &ldquo;<a [-href=\"#Open\">Open</a>&rdquo;-]
 # | {+href=\"#Modern\">Modern</a>&rdquo;+} |
 #, fuzzy
@@ -316,27 +305,27 @@
 
 # <!-- <a href="#Monetize"><em>Monetarisieren</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Monetize\">Monetize</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Monetize\"><em>Monetize</em></a> |"
 "&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#MP3Player\">MP3 player</a>&rdquo; |"
 msgstr "<a href=\"#MP3Player\"><em>MP3-Player</em></a> |&#160;"
 
 # <!-- <em>Offen[er Quellcode]</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Open\">Open</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Open\"><em>Open</em></a> |&#160;"
 
 # <!-- <em>Offen[er Quellcode]</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | &ldquo;<a [-href=\"#Open\">Open</a>&rdquo;-] {+href=\"#OptOut\">Opt
 # | out</a>&rdquo;+} |
 #, fuzzy
@@ -346,65 +335,65 @@
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Open\"><em>Open</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PC\">PC</a>&rdquo; |"
 msgstr "<a href=\"#PC\"><em>PC</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Photoshop\">Photoshop</a>&rdquo; |"
 msgstr "<a href=\"#Photoshop\"><em>Photoshop</em></a> |&#160;"
 
 # <!-- <a href="#Piracy"><em>Piraterie</em></a> |
 # <a href="#Piracy"><em>Raubkopie</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Piracy\">Piracy</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Piracy\"><em>Piracy</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PowerPoint\">PowerPoint</a>&rdquo; |"
 msgstr "<a href=\"#PowerPoint\"><em>PowerPoint</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Product\">Product</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Product\"><em>Produkt</em></a> |&#160;"
 
 # <!-- <a href="#Protection"><em>Schutz</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Protection\">Protection</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Protection\"><em>Protection</em></a> |"
 "&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#RAND\">RAND</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#RAND\" title=\"Reasonable and Non-"
 "Discriminatory\"><em>RAND</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SaaS\">SaaS</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#SaaS\"><em>SaaS</em></a> |&#160;"
 
 # <!-- <a href="#SellSoftware"><em>Software verkaufen</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SellSoftware\">Sell software</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#SellSoftware\"><em>Sell Software</"
 "em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#SharingPersonalData\">Sharing (personal data)</a>&rdquo; |"
 msgstr ""
@@ -412,21 +401,21 @@
 "(Personal Data)</em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SharingEconomy\">Sharing economy</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#SharingEconomy\"><em>Sharing Economy</"
 "em></a> |&#160;"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Skype\">Skype</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Skype\"><em>Skype</em></a> |&#160;"
 
 # <!-- <a href="#SoftwareIndustry"><em>Softwareindustrie</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SoftwareIndustry\">Software Industry</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#SoftwareIndustry\"><em>Software "
@@ -434,7 +423,7 @@
 
 # Now, -> #REDIRECT Open source
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SourceModel\">Source model</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#SourceModel\"><em>Source Model</em></"
@@ -446,7 +435,7 @@
 #.      language to refer to mobile computers; otherwise,
 #.      fill the translation with a space. 
 #.  GNUN-SORT-BEGIN-KEY 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Terminal\">Terminal</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Terminal\"><em>Terminals</em></a> |"
@@ -457,14 +446,14 @@
 #. #endif
 #.  
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Theft\">Theft</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Theft\"><em>Theft</em></a> |&#160;"
 
 # <!-- <a href="#TrustedComputing"><em>Vertrauenswürdige 
Datenverarbeitung</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#TrustedComputing\">Trusted Computing</a>&rdquo; |"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#TrustedComputing\"><em>Trusted "
@@ -472,16 +461,27 @@
 
 # <!-- <a href="#Vendor"><em>Verkäufer</em></a> |-->
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Vendor\">Vendor</a>&rdquo;"
 msgstr ""
 "<a xml:lang=\"en\" lang=\"en\" href=\"#Vendor\"><em>Vendor</em></a> |&#160;"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><p>
+msgid ""
+"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
+"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
+"It The Swindle?</a>"
+msgstr ""
+"Beachten Sie außerdem die <cite><a href=\"/philosophy/categories"
+"\">Kategorien freier und unfreier Software</a></cite> und <cite><a href=\"/"
+"philosophy/why-call-it-the-swindle\">Warum es den ‚Swindle‘ nennen</a></"
+"cite>."
+
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ad-blocker&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Ad-blocker</span>“ 
(„Werbeblocker“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When the purpose of some program is to block advertisements, &ldquo;ad-"
 "blocker&rdquo; is a good term for it.  However, the GNU browser IceCat "
@@ -497,11 +497,11 @@
 "verfolgen. Dies ist kein <em>„Werbeblocker“</em>, sondern <em>Schutz vor "
 "Überwachung</em>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Access&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Access</span>“ („Zugang“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is a common misunderstanding to think free software means that the public "
 "has &ldquo;access&rdquo; to a program.  That is not what free software means."
@@ -510,7 +510,7 @@
 "bedeuten, die Öffentlichkeit hätte <em>„Zugang“</em> zu einem Programm. 
Das "
 "bedeutet Freie Software nicht."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/philosophy/free-sw.html\">criterion for free software</a> is "
 "not about who has &ldquo;access&rdquo; to the program; the four essential "
@@ -529,7 +529,7 @@
 "<em>verpflichtet</em> das<ins>, vielleicht für Sie,</ins> zu tun! Sie haben "
 "nicht das <em>Recht</em>, eine Programmkopie von irgendjemanden einzufordern."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In particular, if you write a program yourself and never offer a copy to "
 "anyone else, that program is free software albeit in a trivial way, because "
@@ -541,7 +541,7 @@
 "eine triviale Weise) Freie Software, weil jeder Nutzer, der eine Kopie "
 "besitzt, die 4 wesentlichen Freiheiten hat (da man selbst der Nutzer ist)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, when many users have copies of a program, someone is sure to "
 "post it on the internet, giving everyone access to it.  We think people "
@@ -553,7 +553,7 @@
 "denken, sofern das Programm nützlich ist, dass man das tun sollte. Aber das "
 "stellt für Freie Software keine Voraussetzung dar."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There is one specific point in which a question of having access is directly "
 "pertinent to free software: the GNU GPL permits giving a particular user "
@@ -568,7 +568,7 @@
 "Sonderfall, in dem der Benutzer bereits eine Programmkopie vorliegen hat, "
 "die nicht in Quellcode-Form ist."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>with free software, the public has access to the program</b>, "
 "we say, <b>with free software, the users have the essential freedoms</b> and "
@@ -580,11 +580,11 @@
 "Freiheiten</em> und <em>die Kontrolle darüber, was das Programm für sie "
 "macht</em>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Alternative&rdquo;"
 msgstr "„Alternative“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We don't describe free software {+in general+} as an
 # | &ldquo;alternative&rdquo; to proprietary, because that word presumes all
 # | the &ldquo;alternatives&rdquo; are legitimate and each additional one
@@ -610,7 +610,7 @@
 "davon ausgegangen, dass Freie Software mit Software koexistieren sollte, die "
 "nicht die Freiheit von Nutzern respektiert."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
@@ -628,7 +628,7 @@
 "nicht für gut Nutzern jene <em>„Alternativen“</em> zu freier Software "
 "anzubieten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Special circumstances can drive users toward running one particular program "
 "for a certain job.  For instance, when a web page sends JavaScript client "
@@ -637,13 +637,13 @@
 "reason to describe any other code for that job as an alternative."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Assets&rdquo;"
 msgstr ""
 "<em><span xml:lang=\"en\" lang=\"en\">Assets</span></em> ([digitale] "
 "<em>Medieninhalte</em>)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To refer to published works as &ldquo;assets&rdquo;, or &ldquo;digital "
 "assets&rdquo;, is even worse than calling them <a href=\"#Content\">&ldquo;"
@@ -656,12 +656,12 @@
 "„Content“</em></a> zu nennen: es setzt voraus, dass sie außer 
kommerziellen "
 "Wert keinen Wert für die Gesellschaft haben."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;BSD-style&rdquo;"
 msgstr "„BSD-Style“ („BSD-artig“, „BSD-Stil“)"
 
 # 3/2-clause BSD???
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/licenses/bsd.html\">lumps together licenses that have important "
@@ -677,7 +677,7 @@
 "Lizenz ist es."
 
 # + 'o. ä.'
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, it is best to name <a href=\"/licenses/license-list.html"
 "\"> the specific license in question</a> and avoid the vague term &ldquo;BSD-"
@@ -687,13 +687,13 @@
 "list\">die betreffende Lizenz</a> zu benennen und den vagen Begriff 
<em>„BSD-"
 "artig“</em> o.&#160;ä. zu vermeiden."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Closed&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Closed</span>“ („Geschlossen[er "
 "Quellcode]“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source.&rdquo; In the free software movement, <a href=\"/"
@@ -716,13 +716,13 @@
 "Software."
 
 # Datenspeicherung und Arbeitsprozesse im Netz/Internet
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Cloud Computing&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Cloud Computing</span>“ 
(„Rechnerwolke“, "
 "„Datenverarbeitung in der Wolke“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;cloud computing&rdquo; (or just &ldquo;cloud&rdquo;, in the "
 "context of computing) is a marketing buzzword with no coherent meaning.  It "
@@ -742,7 +742,7 @@
 "Wirrwarr. Sollte sich Ihr Denken darauf stützen, werden Sie irregeführt "
 "werden (oder könnte man „bewölkt“ sagen?)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When thinking about or responding to a statement someone else has made using "
 "this term, the first step is to clarify the topic.  What scenario is the "
@@ -756,12 +756,23 @@
 "Sobald das Thema klar formuliert ist, ist ein kohärenter Gedanke darüber "
 "möglich."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | One of the many meanings of &ldquo;cloud computing&rdquo; is storing your
+# | data in online services.  In most scenarios, that is foolish because it
+# | exposes you to <a
+# | href=\"http{+s+}://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spo
+# | oks-cloud-antiauthoritarian-dream\">surveillance</a>.
+#, fuzzy
+#| msgid ""
+#| "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
+#| "data in online services.  In most scenarios, that is foolish because it "
+#| "exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/";
+#| "apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgid ""
 "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
 "data in online services.  In most scenarios, that is foolish because it "
-"exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/";
-"hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
+"exposes you to <a href=\"https://www.guardian.co.uk/commentisfree/2011/";
+"apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgstr ""
 "Eine der vielen Bedeutungen von <em>„Rechnerwolke“</em> ist die 
Speicherung "
 "Ihrer Daten bei Onlinediensten. Das ist in den meisten Fällen töricht, weil 
"
@@ -770,7 +781,7 @@
 "hackers and spooks want our heads in the cloud, in: The Guardian London 2011."
 "\">Überwachung</a> aussetzt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning (which overlaps that but is not the same thing)  is <a href="
 "\"/philosophy/who-does-that-server-really-serve.html\"> Service as a "
@@ -783,7 +794,7 @@
 "die Ihnen die Kontrolle über Ihre Datenverarbeitung nimmt. SaaSS sollte man "
 "niemals verwenden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is renting a remote physical server, or virtual server.  "
 "These practices are ok under certain circumstances."
@@ -792,7 +803,7 @@
 "eines virtuellen Servers. Diese Praxen sind unter bestimmten Umständen in "
 "Ordnung."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is accessing your own server from your own mobile device.  "
 "That raises no particular ethical issues."
@@ -800,7 +811,7 @@
 "Eine weitere Bedeutung ist der Zugriff auf den eigenen Server über das "
 "eigene Mobilgerät. Das wirft keine besonderen ethischen Fragen auf."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"https://csrc.nist.gov/publications/detail/sp/800-145/final\";> "
 "NIST definition of \"cloud computing\"</a> mentions three scenarios that "
@@ -830,7 +841,7 @@
 "Softwareersatz</em>, der den Benutzer schlecht behandelt, aber die beiden "
 "Modelle sind nicht äquivalent. ."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "These different computing practices don't even belong in the same "
 "discussion.  The best way to avoid the confusion the term &ldquo;cloud "
@@ -844,10 +855,22 @@
 "im Zusammenhang mit Datenverarbeitung zu verwenden. Sprechen Sie über das "
 "von Ihnen gemeinte Szenario, und benennen es mit einem bestimmten Begriff."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Curiously, Larry Ellison, a proprietary software developer, also <a
+# | 
href=\"http{+s+}://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\">
+# | noted the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He
+# | decided to use the term anyway because, as a proprietary software
+# | developer, he isn't motivated by the same ideals as we are.
+#, fuzzy
+#| msgid ""
+#| "Curiously, Larry Ellison, a proprietary software developer, also <a href="
+#| "\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> "
+#| "noted the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He "
+#| "decided to use the term anyway because, as a proprietary software "
+#| "developer, he isn't motivated by the same ideals as we are."
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a href="
-"\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
+"\"https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
 "the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He decided to use "
 "the term anyway because, as a proprietary software developer, he isn't "
 "motivated by the same ideals as we are."
@@ -860,11 +883,11 @@
 "Software&#160;&#8209;&#160;nicht von denselben Idealen motiviert wird wie "
 "wir."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Commercial&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Commercial</span>“ 
(„Kommerziell“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;nonfree."
 "&rdquo; That confuses two entirely different issues."
@@ -872,7 +895,7 @@
 "Bitte verwenden Sie <em>„kommerziell“</em> nicht als Synonym für 
<em>unfrei</"
 "em>. Das wirft zwei völlig verschiedene Sachverhalte durcheinander."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A program is commercial if it is developed as a business activity.  A "
 "commercial program can be free or nonfree, depending on its manner of "
@@ -888,7 +911,7 @@
 "&#8209;&#160;welche Entität das Programm entwickelte und welche Freiheit "
 "ihre Nutzer haben&#160;&#8209;&#160;haben nichts damit zu tun."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the first decade of the free software movement, free software packages "
 "were almost always noncommercial; the components of the GNU/Linux operating "
@@ -903,7 +926,7 @@
 "entwickelt. Später, in den 1990ern, kam freie kommerzielle Software auf den "
 "Markt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
@@ -919,13 +942,13 @@
 "und tun diese Möglichkeit ab. Achten wir darauf, das Wort 
<em>„Kommerziell“</"
 "em> nicht auf diese Weise zu verwenden."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Compensation&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Compensation</span>“ („Ausgleich“, 
"
 "„Entschädigung“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;compensation for authors&rdquo; in connection with "
 "copyright carries the assumptions that (1) copyright exists for the sake of "
@@ -941,7 +964,7 @@
 "Annahme ist einfach <a href=\"/philosophy/misinterpreting-copyright"
 "\">falsch</a> und die zweite unverschämt!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Compensating the rights-holders&rdquo; adds a further swindle: you're "
 "supposed to imagine that means paying the authors, and occasionally it does, "
@@ -953,13 +976,13 @@
 "passiert; aber meistens bedeutet es eine Subventionierung derselben Verlage, "
 "die uns rücksichtslos Gesetze aufdrängen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consume&rdquo;"
 msgstr ""
 "<span xml:lang=\"en\" lang=\"en\">to <em>„consume“</em></"
 "span>“ („aufbrauchen“ bzw. „verbrauchen“, „konsumieren“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Consume&rdquo; refers to what we do with food: we ingest it, after "
 "which the food as such no longer exists.  By analogy, we employ the same "
@@ -981,7 +1004,7 @@
 "können, eine missbräuchliche Auslegung des Wortes. Durch Wiedergeben einer "
 "Aufnahme oder Ausführen eines Programms wird nichts verbraucht."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use &ldquo;consume&rdquo; in this context will say they don't mean "
 "it literally.  What, then, does it mean? It means to regard copies of "
@@ -1007,14 +1030,34 @@
 # unbewusst auf kopierbare digitale Werke zu übertragen&#160;&#8209;&#160;ein
 # Fehler, die Entwickler proprietärer Software (und andere Herausgeber) innig
 # fördern möchten.-->
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | What does it mean to think of works of authorship as a commodity, with the
+# | assumption that there is nothing special about any one story, article,
+# | program, or song? That is the twisted viewpoint of the owner or the
+# | accountant of a publishing company.  It is no surprise that proprietary
+# | software would like you to think of the use of software as a commodity. 
+# | Their twisted viewpoint comes through clearly in <a
+# | 
href=\"http{+s+}://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6\">this
+# | article</a>, which also refers to publications as &ldquo;<a
+# | href=\"#Content\">content</a>.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "What does it mean to think of works of authorship as a commodity, with "
+#| "the assumption that there is nothing special about any one story, "
+#| "article, program, or song? That is the twisted viewpoint of the owner or "
+#| "the accountant of a publishing company.  It is no surprise that "
+#| "proprietary software would like you to think of the use of software as a "
+#| "commodity.  Their twisted viewpoint comes through clearly in <a href="
+#| "\"http://www.businessinsider.com/former-google-exec-launches-sourcepoint-";
+#| "with-10-million-series-a-funding-2015-6\">this article</a>, which also "
+#| "refers to publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
 msgid ""
 "What does it mean to think of works of authorship as a commodity, with the "
 "assumption that there is nothing special about any one story, article, "
 "program, or song? That is the twisted viewpoint of the owner or the "
 "accountant of a publishing company.  It is no surprise that proprietary "
 "software would like you to think of the use of software as a commodity.  "
-"Their twisted viewpoint comes through clearly in <a href=\"http://www.";
+"Their twisted viewpoint comes through clearly in <a href=\"https://www.";
 "businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-"
 "series-a-funding-2015-6\">this article</a>, which also refers to "
 "publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
@@ -1036,11 +1079,25 @@
 
 # (forbid) -> translated with 'criminalize'
 # (inserted text) 'an US act which allows the implementation of the WIPO 
Copyright Treaty of 1996 in national law'
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The narrow thinking associated with the idea that we &ldquo;consume
+# | content&rdquo; paves the way for laws such as the DMCA that forbid users
+# | to break the <a href=\"http{+s+}://DefectiveByDesign.org/\">Digital
+# | Restrictions Management</a> (DRM) facilities in digital devices.  If users
+# | think what they do with these devices is &ldquo;consume,&rdquo; they may
+# | see such restrictions as natural.
+#, fuzzy
+#| msgid ""
+#| "The narrow thinking associated with the idea that we &ldquo;consume "
+#| "content&rdquo; paves the way for laws such as the DMCA that forbid users "
+#| "to break the <a href=\"http://DefectiveByDesign.org/\";>Digital "
+#| "Restrictions Management</a> (DRM) facilities in digital devices.  If "
+#| "users think what they do with these devices is &ldquo;consume,&rdquo; "
+#| "they may see such restrictions as natural."
 msgid ""
 "The narrow thinking associated with the idea that we &ldquo;consume "
 "content&rdquo; paves the way for laws such as the DMCA that forbid users to "
-"break the <a href=\"http://DefectiveByDesign.org/\";>Digital Restrictions "
+"break the <a href=\"https://DefectiveByDesign.org/\";>Digital Restrictions "
 "Management</a> (DRM) facilities in digital devices.  If users think what "
 "they do with these devices is &ldquo;consume,&rdquo; they may see such "
 "restrictions as natural."
@@ -1057,7 +1114,7 @@
 "dass, was sie mit diesen Geräten anstellen, sei <em>„konsumieren“</em>, "
 "könnten sie solche Beschränkungen als selbstverständlich ansehen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It also encourages the acceptance of &ldquo;streaming&rdquo; services, which "
 "use DRM to perversely limit listening to music, or watching video, to "
@@ -1069,7 +1126,7 @@
 "Filmen einzuschränken, so dass die Annahmen des Wortes 
<em>„verbrauchen“</"
 "em> treffend passt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why is this perverse usage spreading? Some may feel that the term sounds "
 "sophisticated, but rejecting it with cogent reasons can appear even more "
@@ -1088,7 +1145,7 @@
 "Arbeitgebers). Ihr Gebrauch des Begriffs in namhaften Foren erweckt den "
 "Eindruck, es würde sich um den „richtige“ Begriff handeln."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;consuming&rdquo; music, fiction, or any other artistic "
 "works is to treat them as commodities rather than as art.  Do we want to "
@@ -1100,7 +1157,7 @@
 "Kunst zu behandeln. Wollen wir von veröffentlichten Werken so denken? Wollen 
"
 "wir die Öffentlichkeit dazu ermutigen?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who answer no, please join me in shunning the term &ldquo;"
 "consume&rdquo; for this."
@@ -1108,7 +1165,7 @@
 "Diejenigen, die Nein antworten, schließen sich <!--mir -->bitte an und "
 "vermeiden den Begriff <em>„konsumieren“</em> ."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What to use instead? You can use specific verbs such as &ldquo;read,&rdquo; "
 "&ldquo;listen to,&rdquo; &ldquo;watch&rdquo; or &ldquo;look at,&rdquo; since "
@@ -1119,7 +1176,7 @@
 "sie dazu beitragen die Tendenz zur Pauschalisierung einzudämmen."
 
 # (attend to) 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you insist on generalizing, you can use the expression &ldquo;attend to,"
 "&rdquo; which requires less of a stretch than &ldquo;consume.&rdquo; For a "
@@ -1130,19 +1187,19 @@
 "weniger Dehnung als <em>„konsumieren“</em> erfordert. Für ein Werk, das 
für "
 "den praktischen Gebrauch bestimmt ist, wäre <em>„verwenden“</em> am 
besten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "See also the following entry."
 msgstr ""
 "Siehe auch <a href=\"#Consumer\" xml:lang=\"en\" 
lang=\"en\"><em>„Consumer“</"
 "em></a> („Konsument“, „Verbraucher“)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consumer&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Consumer</span>“ („Konsument“, "
 "„Verbraucher“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;consumer,&rdquo; when used to refer to the users of "
 "computing, is loaded with assumptions we should reject.  Some come from the "
@@ -1160,7 +1217,7 @@
 "Schlussfolgerungen aufzuerlegen, die über unkopierbar materielle Produkte "
 "gezogen wurden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In addition, describing the users of software as &ldquo;consumers&rdquo; "
 "refers to a framing in which people are limited to selecting between "
@@ -1176,7 +1233,7 @@
 "href=\"/philosophy/free-software-even-more-important\">direkt Kontrolle "
 "darüber ausüben können, was ein Programm tut</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To describe people who are not limited to passive use of works, we suggest "
 "terms such as &ldquo;individuals&rdquo; and &ldquo;citizens,&rdquo; rather "
@@ -1187,9 +1244,17 @@
 "em> empfohlen&#160;&#8209;&#160;nicht <em>„Konsumenten“</em> bzw. <em>"
 "„Verbraucher“</em>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This problem with the word &ldquo;consumer&rdquo; has been <a
+# | 
href=\"http{+s+}://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams\">noted
+# | before</a>.
+#, fuzzy
+#| msgid ""
+#| "This problem with the word &ldquo;consumer&rdquo; has been <a href="
+#| "\"http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-";
+#| "language-raymond-williams\">noted before</a>."
 msgid ""
-"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"http://";
+"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"https://";
 "www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-"
 "williams\">noted before</a>."
 msgstr ""
@@ -1199,11 +1264,11 @@
 "williams\" title=\"Owen Hatherley: Be a user, not a consumer. The Guardian "
 "2013.\">Be a user, not a consumer</a></cite>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Content&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Content</span>“ („Inhalt“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to describe a feeling of comfort and satisfaction, by all means "
 "say you are &ldquo;content,&rdquo; but using the word as a noun to describe "
@@ -1223,7 +1288,7 @@
 "man mit dieser Einstellung nicht einverstanden, kann man sie <em>Werke</em> "
 "oder <em>Publikationen</em> bzw. <em>Veröffentlichungen</em> nennen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use the term &ldquo;content&rdquo; are often the publishers that "
 "push for increased copyright power in the name of the authors (&ldquo;"
@@ -1242,7 +1307,7 @@
 "\" title=\"Tom Chatfield, How to deal with Trump, trolls and aggressively "
 "emotive untruths online, in: The Guardian 2016.\">The Guardian</a> erkannt:"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Content itself is beside the point&mdash;as the very use of words like "
 "content suggests. The moment you start labelling every single piece of "
@@ -1255,7 +1320,7 @@
 "<em>„Content“</em> zu bezeichnen, hat man dessen Austauschbarkeit "
 "eingeräumt: seine wichtigste Aufgabe als bloßes Mahlgut zur metrischen 
Mühle."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In other words, &ldquo;content&rdquo; reduces publications and writings to a "
 "sort of pap fit to be piped through the &ldquo;tubes&rdquo; of the internet."
@@ -1264,7 +1329,7 @@
 "zu einer Art von Brei, der geeignet ist durch die „Röhren“ des Internets 
"
 "geleitet zu werden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | See also <a href=\"http{+s+}://www.salon.com/2000/06/14/love_7/\">Courtney
 # | Love's open letter to Steve Case</a> and search for &ldquo;content
 # | provider&rdquo; in that page.  Alas, Ms. Love is unaware that the term
@@ -1291,7 +1356,7 @@
 "em> ebenfalls <a href=\"#IntellectualProperty\">voreingenommen und "
 "irreführend</a> ist)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "However, as long as other people use the term &ldquo;content provider,"
 "&rdquo; political dissidents can well call themselves &ldquo;malcontent "
@@ -1302,7 +1367,7 @@
 "Dissidenten sich selbst auch „<span xml:lang=\"en\" lang=\"en\">Malcontent "
 "Provider</span>“ („unzufriedene Anbieter“) nennen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
 "&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
@@ -1322,7 +1387,7 @@
 "irgendeiner Art von Information anstellt. Auf nahezu alle Programme trifft "
 "diese Beschreibung zu."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
 "web site.  For that, we recommend the term &ldquo;web site revision "
@@ -1333,7 +1398,7 @@
 "Begriff <em><span xml:lang=\"en\" lang=\"en\">Website Revision System</"
 "span></em> (WRS)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | [-&ldquo;Consumer&rdquo;-]{+&ldquo;Copyright Owner&rdquo;+}
 #, fuzzy
 #| msgid "&ldquo;Consumer&rdquo;"
@@ -1342,7 +1407,7 @@
 "„<span xml:lang=\"en\" lang=\"en\">Consumer</span>“ („Konsument“, "
 "„Verbraucher“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyright is an artificial privilege, handed out by the state to achieve a "
 "public interest and lasting a period of time &mdash; not a natural right "
@@ -1350,7 +1415,7 @@
 "to the recipient of that privilege as a &ldquo;copyright holder.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A few decades ago, copyright holders began trying to reduce awareness of "
 "this point.  In addition to citing frequently the bogus concept of <a href="
@@ -1360,13 +1425,13 @@
 "instead."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creative Commons licensed&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Creative Commons licensed</"
 "span>“ („Creative Commons lizenziert“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The most important licensing characteristic of a work is whether it is "
 "free.  Creative Commons publishes seven licenses; three are free (CC BY, CC "
@@ -1386,7 +1451,7 @@
 "<ins>der vollständigen Bezeichnung bzw. der entsprechenden Kürzel </ins>ist 
"
 "nachteilig."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To encourage people to pay attention to the most important distinction, "
 "always specify <em>which</em> Creative Commons license is used, as in &ldquo;"
@@ -1399,14 +1464,14 @@
 "man nicht, welche Lizenz ein bestimmtes Werk verwendet, sollte es "
 "herausgefunden und dann dem Anbieter gemeldet werden."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creator&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Creator</span>“ 
(„Schöpfer“)"
 
 # (Note) § 7 UrhG reads: „Urheber ist der Schöpfer des Werkes.“
 # (gnu.org #1088094) Add 'Urheber'.
 # (ins) Brief statement about 'exploitation right' (Verwertungsrecht).
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
@@ -1428,11 +1493,11 @@
 "Autor<ins>, also der Urheber eines Werkes, sondern vielmehr der Inhaber "
 "eines (kompletten oder teilweisen) Verwertungsrechts</ins>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr "„Digital Goods“ („Digitale Güter“, „Digitale Waren“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
 "authorship, identifies them with physical goods&mdash;which cannot be "
@@ -1451,11 +1516,11 @@
 "ebenfalls Probleme im Hinblick auf Ökonomie, deren oberflächlichen und "
 "begrenzten Werte nicht Freiheit und Gemeinschaft umfassen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Locks&rdquo;"
 msgstr "„Digital Locks“ („Digitale Schlösser“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital locks&rdquo; is used to refer to Digital Restrictions "
 "Management by some who criticize it.  The problem with this term is that it "
@@ -1470,12 +1535,29 @@
 "nicht gerecht wird. Die Leute, die diesen Begriff übernahmen, durchdachten "
 "ihn nicht."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Locks are not necessarily oppressive or bad.  You probably own several
+# | locks, and their keys or codes as well; you may find them useful or
+# | troublesome, but they don't oppress you, because you can open and close
+# | them.  Likewise, we find <a
+# | 
href=\"http{+s+}://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\">encryption</a>
+# | invaluable for protecting our digital files.  That too is a kind of
+# | digital lock that you have control over.
+#, fuzzy
+#| msgid ""
+#| "Locks are not necessarily oppressive or bad.  You probably own several "
+#| "locks, and their keys or codes as well; you may find them useful or "
+#| "troublesome, but they don't oppress you, because you can open and close "
+#| "them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+#| "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-"
+#| "the-good-guys-have-keys-to-\">encryption</a> invaluable for protecting "
+#| "our digital files.  That too is a kind of digital lock that you have "
+#| "control over."
 msgid ""
 "Locks are not necessarily oppressive or bad.  You probably own several "
 "locks, and their keys or codes as well; you may find them useful or "
 "troublesome, but they don't oppress you, because you can open and close "
-"them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+"them.  Likewise, we find <a href=\"https://www.theguardian.com/";
 "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
 "good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
 "digital files.  That too is a kind of digital lock that you have control "
@@ -1493,7 +1575,7 @@
 "unschätzbarem Wert. Auch das ist eine Art digitales Schloss, über dass man "
 "jedoch die Kontrolle hat."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "DRM is like a lock placed on you by someone else, who refuses to give you "
 "the key&mdash;in other words, like <em>handcuffs</em>.  Therefore, the "
@@ -1505,7 +1587,7 @@
 "Handschellen. Deshalb ist die richtige Metapher für DRM <em>digitale "
 "Handschellen</em>, nicht <em>„digitale Schlösser“</em>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A number of opposition campaigns have chosen the unwise term &ldquo;digital "
 "locks&rdquo;; to get things back on the right track, we must firmly insist "
@@ -1522,13 +1604,13 @@
 "allerdings, wenn wir unsere Unterstützung erklären, ersetzen wir diesen "
 "Begriff erkennbar durch <em>Digitale Handschellen</em> und sagen warum."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Rights Management&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Digital Rights Management</"
 "span>“ („Digitale Rechteverwaltung“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital Rights Management&rdquo; (abbreviated &ldquo;DRM&rdquo;) "
 "refers to technical mechanisms designed to impose restrictions on computer "
@@ -1546,7 +1628,7 @@
 "zu ignorieren, der diese Beschränkungen auferlegt werden."
 
 # „Digitale Rechte Minderung“
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Good alternatives include &ldquo;Digital Restrictions Management,&rdquo; and "
 "&ldquo;digital handcuffs.&rdquo;"
@@ -1556,20 +1638,26 @@
 "\">Digital Restrictions Management</span></em> und <em>Digitale "
 "Handschellen</em>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Please sign up to support our <a
+# | href=\"http{+s+}://DefectiveByDesign.org/\"> campaign to abolish DRM</a>.
+#, fuzzy
+#| msgid ""
+#| "Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+#| "campaign to abolish DRM</a>."
 msgid ""
-"Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+"Please sign up to support our <a href=\"https://DefectiveByDesign.org/\";> "
 "campaign to abolish DRM</a>."
 msgstr ""
 "Bitte unterstützen Sie unsere <a href=\"https://DefectiveByDesign.org/";
 "\">Kampagne zur Abschaffung von DRM</a><a href=\"#tn01\" class=\"transnote\">"
 "[1]</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ecosystem&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Ecosystem</span>“ 
(„Ökosystem“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is inadvisable to describe the free software community, or any human "
 "community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
@@ -1580,7 +1668,7 @@
 "[*]</a> als ein <em>„Ökosystem“</em> zu beschreiben, weil dieses Wort 
das "
 "Fehlen ethischen Urteils impliziert."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;ecosystem&rdquo; implicitly suggests an attitude of "
 "nonjudgmental observation: don't ask how what <em>should</em> happen, just "
@@ -1601,7 +1689,7 @@
 "recht noch unrecht, sondern nur ein ökologisches 
Phänomen&#160;&#8209;&#160;"
 "selbst wenn es so weit wie um das Aussterben einer Spezies geht."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By contrast, beings that adopt an ethical stance towards their surroundings "
 "can decide to preserve things that, without their intervention, might "
@@ -1616,11 +1704,11 @@
 "saubere Luft und Wasser, Artenschutz, traditionelle Künste&#160;&#8230; und "
 "Freiheit von Rechnernutzern."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FLOSS&rdquo;"
 msgstr "„FLOSS“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
 "Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
@@ -1636,11 +1724,11 @@
 "dass man für Freiheit eintritt, sollte kein neutraler Begriff verwendet "
 "werden."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;For free&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">For free</span>“ („für 
frei“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to say that a program is free software, please don't say that it "
 "is available &ldquo;for free.&rdquo; That term specifically means &ldquo;for "
@@ -1651,7 +1739,7 @@
 "konkret <em>zum Nullpreis</em>. Freie Software ist eine Frage der Freiheit, "
 "nicht des Preises."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software copies are often available for free&mdash;for example, by "
 "downloading via FTP.  But free software copies are also available for a "
@@ -1666,7 +1754,7 @@
 "und einige proprietäre Pakete sind für bestimmte Nutzer normalerweise "
 "kostenfrei."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, you can say that the program is available &ldquo;as free "
 "software.&rdquo;"
@@ -1674,11 +1762,11 @@
 "Um eine Verwechslung zu umgehen, kann man sagen, dass das Programm <em>als "
 "Freie Software</em> erhältlich ist."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FOSS&rdquo;"
 msgstr "„FOSS“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
 "&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
@@ -1694,7 +1782,7 @@
 "em> besser dafür geeignet. Aber wenn man zeigen möchte, dass man für "
 "Freiheit eintritt, sollte kein neutraler Begriff verwendet werden."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>FOSS</b>, we say, <b>free software</b> or <b>free (libre) "
 "software</b>."
@@ -1702,13 +1790,13 @@
 "Statt <b>FOSS</b>, sagen wir, <b>Freie Software</b> or <b>Freie (Libre) "
 "Software</b>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freely available&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Freely available</span>“ („frei "
 "verfügbar“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The terms are not equivalent.  Software is &ldquo;"
@@ -1723,11 +1811,11 @@
 "definiert, die eine Kopie davon haben. Dies sind Antworten auf verschiedene "
 "Fragen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freeware&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Freeware</span>“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;freeware&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The term &ldquo;freeware&rdquo; was used often in the "
@@ -1739,7 +1827,7 @@
 "Programme verwendet, die nur als ausführbare Dateien ohne verfügbaren "
 "Quellcode freigegeben waren. Es gibt keine eindeutige Begriffsbestimmung."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When using languages other than English, please avoid borrowing English "
 "terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; It is "
@@ -1753,7 +1841,7 @@
 "\">Free Software</span></em> in die jeweilige <a href=\"/philosophy/fs-"
 "translations\">eigene Sprache</a> zu übersetzen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By using a word in <a href=\"/philosophy/fs-translations.html\">your own "
 "language</a>, you show that you are really referring to freedom and not just "
@@ -1769,13 +1857,13 @@
 "für Landsleute befremdlich oder störend erscheint; aber sobald erkannt 
wird, "
 "dass er genau das bedeutet, wird wirklich verstanden, worum es geht."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Give away software&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Give away software</"
 "span>“ („Gratissoftware“, „Software verschenken“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
 "distribute a program as free software.&rdquo; This locution has the same "
@@ -1789,11 +1877,11 @@
 "Preis geht, nicht um Freiheit. Eine Möglichkeit zur Vermeidung einer "
 "Verwechslung wäre es <em>Freigabe als Freie Software</em> zu nennen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Google&rdquo;"
 msgstr "<span xml:lang=\"en\" lang=\"en\">to „google“</span> 
(„googeln“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;google&rdquo; as a verb, meaning to "
 "search for something on the internet. &ldquo;Google&rdquo; is just the name "
@@ -1818,13 +1906,29 @@
 "href=\"https://www.metager.de/\"; title=\"MetaGer\">MetaGer.de</a> und <a "
 "href=\"https://Startpage.com/deu/\"; title=\"Startpage\">Startpage.com</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Hacker&rdquo;"
 msgstr "„Hacker“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A hacker is someone who <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\"> enjoys playful
+# | cleverness</a>&mdash;not necessarily with computers.  The programmers in
+# | the old <abbr title=\"Massachusetts Institute of Technology\">MIT</abbr>
+# | free software community of the 60s and 70s referred to themselves as
+# | hackers.  Around 1980, journalists who discovered the hacker community
+# | mistakenly took the term to mean &ldquo;security breaker.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+#| "html\"> enjoys playful cleverness</a>&mdash;not necessarily with "
+#| "computers.  The programmers in the old <abbr title=\"Massachusetts "
+#| "Institute of Technology\">MIT</abbr> free software community of the 60s "
+#| "and 70s referred to themselves as hackers.  Around 1980, journalists who "
+#| "discovered the hacker community mistakenly took the term to mean &ldquo;"
+#| "security breaker.&rdquo;"
 msgid ""
-"A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+"A hacker is someone who <a href=\"https://stallman.org/articles/on-hacking.";
 "html\"> enjoys playful cleverness</a>&mdash;not necessarily with computers.  "
 "The programmers in the old <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr> free software community of the 60s and 70s referred "
@@ -1840,7 +1944,7 @@
 "Journalisten, wie die Hacker-Gemeinschaft die Bezeichnung fälschlicherweise "
 "für <em>Sicherheitsbrecher</em> gebrauchte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't spread this mistake.  People who break security are &ldquo;"
 "crackers.&rdquo;"
@@ -1848,13 +1952,13 @@
 "Bitte verbreiten Sie diesen Fehler nicht. Personen, die "
 "Sicherheitsmechanismen umgehen, sind <em>Cracker</em>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Intellectual property&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Intellectual Property</span>“ 
(„Geistiges "
 "Eigentum“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
 "property&rdquo;&mdash;a term also applied to patents, trademarks, and other "
@@ -1870,7 +1974,7 @@
 "schlecht beraten ist sie zu verallgemeinern. Es empfiehlt sich, ausdrücklich 
"
 "über <em>Urheberrecht“, „Patente</em> oder <em>Warenzeichen</em> zu 
sprechen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;intellectual property&rdquo; carries a hidden "
 "assumption&mdash;that the way to think about all these disparate issues is "
@@ -1882,7 +1986,7 @@
 "Angelegenheiten nachzudenken, basiert auf einer Analogie mit physischen "
 "Objekten und unserer Vorstellung als physikalische Eigenschaft."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When it comes to copying, this analogy disregards the crucial difference "
 "between material objects and information: information can be copied and "
@@ -1893,7 +1997,7 @@
 "Informationen können nahezu mühelos kopiert und gemeinsam miteinander "
 "ausgetauscht werden, was bei materiellen Objekten nicht möglich sein kann."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid spreading unnecessary bias and confusion, it is best to adopt a "
 "firm policy <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
@@ -1904,7 +2008,7 @@
 "href=\"/philosophy/not-ipr\"><em>„Geistiges Eigentum“</em> zu sprechen 
oder "
 "auch nur im Hinblick darauf zu denken</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
 "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make the "
@@ -1916,14 +2020,14 @@
 "Organization\" xml:lang=\"en\" lang=\"en\">WIPO</span>) peinlich zu "
 "berühren</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | [-&ldquo;Content&rdquo;-]{+&ldquo;Internet of Things&rdquo;+}
 #, fuzzy
 #| msgid "&ldquo;Content&rdquo;"
 msgid "&ldquo;Internet of Things&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Content</span>“ („Inhalt“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies decided to make computerized appliances that would connect "
 "over the internet to the manufacturer's server, and therefore could easily "
@@ -1932,9 +2036,9 @@
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Experience shows that these products often do <a href=\"http://www.locusmag.";
+"Experience shows that these products often do <a href=\"https://www.locusmag.";
 "com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-"
 "things-to-be-sensed/\"> spy on their users</a>.  They are also tailor-made "
 "for <a href=\"https://archive.ieet.org/articles/rinesi20150806.html\";>giving "
@@ -1943,15 +2047,15 @@
 "off the server it depends on."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We call them the &ldquo;Internet of Stings.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;LAMP system&rdquo;"
 msgstr "„<span title=\"Linux, Apache, MySQL und PHP\">LAMP-System</span>“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
 "&mdash;a common combination of software to use on a web server, except that "
@@ -1966,11 +2070,11 @@
 "„LAMP“</em> sollte es stattdessen <em>GLAMP</em> heißen: <em>GNU, Linux, 
"
 "Apache MySQL und PHP</em>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Linux system&rdquo;"
 msgstr "„Linux-System“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
@@ -1987,11 +2091,11 @@
 "Betriebssystemkern zu unterscheiden, nennen Sie das Gesamtsystem bitte "
 "<strong><a href=\"/gnu/linux-and-gnu\">GNU/Linux</a></strong>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Market&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Market</span>“ („Markt“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is misleading to describe the users of free software, or the software "
 "users in general, as a &ldquo;market.&rdquo;"
@@ -1999,7 +2103,7 @@
 "Es ist irreführend, Freie-Software-Nutzer oder Softwarenutzer im Allgemeinen 
"
 "als <em>Markt</em> zu beschreiben."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not to say there is no room for markets in the free software "
 "community.  If you have a free software support business, then you have "
@@ -2012,7 +2116,7 @@
 "einem Markt handeln. Solange Sie deren Freiheit respektieren, wünschen wir "
 "Ihnen viel Erfolg in Ihrem Markt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But the free software movement is a social movement, not a business, and the "
 "success it aims for is not a market success.  We are trying to serve the "
@@ -2029,7 +2133,7 @@
 "gleichzusetzen, bedeutet die Wichtigkeit der Freiheit zu leugnen und "
 "proprietäre Software zu legitimieren."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | [-&ldquo;Open&rdquo;-]{+&ldquo;Modern&rdquo;+}
 #, fuzzy
 #| msgid "&ldquo;Open&rdquo;"
@@ -2037,14 +2141,14 @@
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Open</span>“ („Offen[er 
Quellcode]“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;modern&rdquo; makes sense from a descriptive perspective "
 "&mdash; for instance, solely to distinguish newer periods and ways from "
 "older ones."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It becomes a problem when it carries the presumption that older ways are "
 "&ldquo;old-fashioned&rdquo;; that is, presumed to be worse.  In "
@@ -2052,11 +2156,11 @@
 "users, the reverse is often true."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Monetize&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Monetize</span>“ 
(„Monetarisieren“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The proper definition of &ldquo;monetize&rdquo; is &ldquo;to use something "
 "as currency.&rdquo; For instance, human societies have monetized gold, "
@@ -2072,7 +2176,7 @@
 "andere Weise zu gebrauchen, gleichbedeutend mit <em>etwas als Grundlage für "
 "Gewinn</em>. "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That usage casts the profit as primary, and the thing used to get the profit "
 "as secondary.  That attitude applied to a software project is objectionable "
@@ -2086,7 +2190,7 @@
 "Schluss kommen, dass es frei bzw. <span xml:lang=\"fr\" lang=\"fr\">libre</"
 "span> nicht ausreichend gewinnbringend sei."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A productive and ethical business can make money, but if it subordinates all "
 "else to profit, it is not likely to remain ethical."
@@ -2095,12 +2199,12 @@
 "aber wenn es alles andere dem Gewinn unterordnet, dürfte es wahrscheinlich "
 "nicht ethisch bleiben."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;MP3 Player&rdquo;"
 msgstr "„MP3-Player“"
 
 #.  The MP3 patents will reportedly expire by 2018.  
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the late 1990s it became feasible to make portable, solid-state digital "
 "audio players.  Most players supported the patented MP3 codec, and that is "
@@ -2117,7 +2221,7 @@
 "paar konnten MP3-codierte Dateien überhaupt nicht wiedergeben, da deren "
 "Entwickler sich vor den Patenten im MP3-Format schützen mussten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Using the term &ldquo;MP3 players&rdquo; for audio players in general has "
 "the effect of promoting the MP3 format and discouraging the other formats "
@@ -2130,7 +2234,7 @@
 "auch die MP3-Patente abgelaufen sind, ist es immer noch nicht wünschenswert, 
"
 "das zu tun."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;digital audio player,&rdquo; or simply &ldquo;"
 "audio player&rdquo; when that's clear enough, instead of &ldquo;MP3 player."
@@ -2139,12 +2243,12 @@
 "Wir empfehlen den Begriff <em>digitaler Audio-Player</em> oder einfach "
 "<em>Audio-Player</em>, wenn das klar genug ist, statt „MP3-Player“."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Open&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Open</span>“ („Offen[er 
Quellcode]“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open source&rdquo; "
 "as a substitute for &ldquo;free software.&rdquo; Those terms refer to a <a "
@@ -2163,7 +2267,7 @@
 "&#160;als eine Frage der Gerechtigkeit. Die Open-Source-Nicht-Bewegung setzt "
 "sich auf diese Art und Weise für nichts ein."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When referring to the open source views, it's correct to use that name, but "
 "please do not use that term when talking about us, our software, or our "
@@ -2174,7 +2278,7 @@
 "Software oder unsere Ansichten geht&#160;&#8209;&#160;das führt zu der "
 "Annahme, dass unsere Ansichten den ihrigen ähnlich seien."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>open source</b>, we say, <b>free software</b> or <b>free "
 "(libre) software</b>."
@@ -2182,7 +2286,7 @@
 "Statt <b>„Open Source“</b>, sagen wir, <b>Freie Software</b> oder 
<b>Freie "
 "(Libre) Software</b>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | [-&ldquo;Open&rdquo;-]{+&ldquo;Opt out&rdquo;+}
 #, fuzzy
 #| msgid "&ldquo;Open&rdquo;"
@@ -2190,18 +2294,18 @@
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Open</span>“ („Offen[er 
Quellcode]“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When applied to any form of computational mistreatment, &ldquo;opt "
 "out&rdquo; implies the choice is a minor matter of convenience. We recommend "
 "&ldquo;reject,&rdquo; &ldquo;shun&rdquo; or &ldquo;escape from.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PC&rdquo;"
 msgstr "„PC“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's OK to use the abbreviation &ldquo;PC&rdquo; to refer to a certain kind "
 "of computer hardware, but please don't use it with the implication that the "
@@ -2215,24 +2319,37 @@
 "Windows ausführt. Wenn man GNU/Linux auf demselben Rechner installiert, ist "
 "es immer noch ein PC."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;WC&rdquo; has been suggested for a computer running Windows."
 msgstr ""
 "Für einen Rechner, der Windows ausführt, wurde der Begriff <em>WC</em> "
 "vorgeschlagen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Photoshop&rdquo;"
 msgstr "„Photoshop“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any
+# | kind of photo manipulation or image editing in general.  Photoshop is just
+# | the name of one particular image editing program, which should be avoided
+# | since it is proprietary.  There are plenty of free programs for editing
+# | images, such as the <a [-href=\"/software/gimp\">GIMP</a>.-]
+# | {+href=\"https://www.gimp.org/\";>GIMP</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning "
+#| "any kind of photo manipulation or image editing in general.  Photoshop is "
+#| "just the name of one particular image editing program, which should be "
+#| "avoided since it is proprietary.  There are plenty of free programs for "
+#| "editing images, such as the <a href=\"/software/gimp\">GIMP</a>."
 msgid ""
 "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any "
 "kind of photo manipulation or image editing in general.  Photoshop is just "
 "the name of one particular image editing program, which should be avoided "
 "since it is proprietary.  There are plenty of free programs for editing "
-"images, such as the <a href=\"/software/gimp\">GIMP</a>."
+"images, such as the <a href=\"https://www.gimp.org/\";>GIMP</a>."
 msgstr ""
 "Bitte vermeiden Sie den Begriff <em>„photoshoppen“</em> als Verb zu "
 "verwenden, um damit jegliche Art von Bildmanipulation oder -bearbeitung "
@@ -2241,12 +2358,12 @@
 "ist. Es gibt viele freie Programme zur Bearbeitung von Bildern, wie <a href="
 "\"/software/gimp\">GIMP</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Piracy&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Piracy</span>“ („Piraterie“, 
„Raubkopie“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers often refer to copying they don't approve of as &ldquo;piracy."
 "&rdquo; In this way, they imply that it is ethically equivalent to attacking "
@@ -2263,7 +2380,7 @@
 "Umständen zu verbieten (es wird immer noch auf Druck gesetzt, um diese "
 "Verbote noch umfassender zu machen)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you don't believe that copying not approved by the publisher is just like "
 "kidnapping and murder, you might prefer not to use the word &ldquo;"
@@ -2282,10 +2399,20 @@
 "etwas Positiveres wie <em>Austausch von Informationen mit deinen Nächsten</"
 "em> vor."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A US judge, presiding over a trial for copyright infringement, recognized
+# | that <a
+# | 
href=\"http{+s+}://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo;
+# | and &ldquo;theft&rdquo; are smear words.</a>
+#, fuzzy
+#| msgid ""
+#| "A US judge, presiding over a trial for copyright infringement, recognized "
+#| "that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+#| "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
+#| "theft&rdquo; are smear words.</a>"
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear words.</a>"
 msgstr ""
@@ -2294,11 +2421,11 @@
 "from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\"><em>"
 "„Piraterie“</em> und <em>„Diebstahl“</em> verleumderische Wörter</a> 
sind."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PowerPoint&rdquo;"
 msgstr "„PowerPoint“"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of
 # | slide presentation.  &ldquo;PowerPoint&rdquo; is just the name of one
 # | particular proprietary program to make presentations.  For your freedom's
@@ -2330,11 +2457,11 @@
 "PowerPoint. Empfohlene Optionen sind unter anderem die <b>TeX Beamer</b>-"
 "Klasse sowie <b>LibreOffice Impress</b>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Product&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Product</span>“ („Produkt“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you're talking about a product, by all means call it that.  However, when "
 "referring to a service, please do not call it a &ldquo;product.&rdquo; If a "
@@ -2351,11 +2478,11 @@
 "ein Pauschalangebot ein <em>„Produkt“</em> nennt, sollte dringend darauf "
 "bestanden werden es schlicht ein <em>Angebot</em> zu nennen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Protection&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Protection</span>“ 
(„Schutz“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers' lawyers love to use the term &ldquo;protection&rdquo; to "
 "describe copyright.  This word carries the implication of preventing "
@@ -2369,7 +2496,7 @@
 "und Verleger, die vom Urheberrecht profitieren, zu identifizieren, anstatt "
 "mit den Benutzern, die dadurch beschränkt werden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms instead.  "
 "For example, instead of saying, &ldquo;Copyright protection lasts a very "
@@ -2381,7 +2508,7 @@
 "„Urheberrechtsschutz dauert eine sehr lange Zeit“</em> kann <em>"
 "‚Urheberrecht dauert eine sehr lange Zeit’</em> gesagt werden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Likewise, instead of saying, &ldquo;protected by copyright,&rdquo; you can "
 "say, &ldquo;covered by copyright&rdquo; or just &ldquo;copyrighted.&rdquo;"
@@ -2389,7 +2516,7 @@
 "Ebenso kann statt <em>„urheberrechtlich geschützt“</em> einfach <em>"
 "‚urheberrechtlich‘</em> oder nur <em>‚Urheberrecht‘</em> genommen 
werden."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to criticize copyright rather than be neutral, you can use the "
 "term &ldquo;copyright restrictions.&rdquo; Thus, you can say, &ldquo;"
@@ -2399,14 +2526,31 @@
 "Begriff <em>Urheberrechtbeschränkungen</em> verwenden. Daher kann man sagen, 
"
 "<em>‚Urheberrechtbeschränkungen dauern eine sehr lange Zeit‘</em>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The term &ldquo;protection&rdquo; is also used to describe malicious
+# | features.  For instance, &ldquo;copy protection&rdquo; is a feature that
+# | interferes with copying.  From the user's point of view, this is
+# | obstruction.  So we could call that malicious feature &ldquo;copy
+# | obstruction.&rdquo; More often it is called Digital Restrictions
+# | Management (DRM)&mdash;see the <a
+# | href=\"http{+s+}://DefectiveByDesign.org\"> Defective by Design</a>
+# | campaign.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;protection&rdquo; is also used to describe malicious "
+#| "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
+#| "interferes with copying.  From the user's point of view, this is "
+#| "obstruction.  So we could call that malicious feature &ldquo;copy "
+#| "obstruction.&rdquo; More often it is called Digital Restrictions "
+#| "Management (DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> "
+#| "Defective by Design</a> campaign."
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
 "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
 "interferes with copying.  From the user's point of view, this is "
 "obstruction.  So we could call that malicious feature &ldquo;copy "
 "obstruction.&rdquo; More often it is called Digital Restrictions Management "
-"(DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> Defective by "
+"(DRM)&mdash;see the <a href=\"https://DefectiveByDesign.org\";> Defective by "
 "Design</a> campaign."
 msgstr ""
 "Der Begriff <em>„Schutz“</em> wird ebenfalls verwendet, um böswillige "
@@ -2419,7 +2563,7 @@
 "Kampagne <a href=\"https://DefectiveByDesign.org\"; xml:lang=\"en\" lang=\"en"
 "\">Defective-by-Design</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;"
 msgstr ""
 "<abbr title=\"Reasonable and Non-Discriminatory\" xml:lang=\"en\" lang=\"en"
@@ -2429,7 +2573,7 @@
 # Normungsgremien/Normungsorganisationen
 # Wertvorstellungen/Standards
 # Patentlizenzen zu erhalten/bekommen
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies that promulgate patent-restricted standards that prohibit "
 "free software typically have a policy of obtaining patent licenses that "
@@ -2445,7 +2589,7 @@
 "Lizenzen bezogen, was für <em>„vernünftig und 
diskriminierungsfrei“</em> "
 "steht."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That term whitewashes a class of patent licenses that are normally neither "
 "reasonable nor nondiscriminatory.  It is true that these licenses do not "
@@ -2459,7 +2603,7 @@
 "Gemeinschaft, und das macht sie unzumutbar. Somit ist die eine Hälfte des "
 "Begriffs <em>„RAND“</em> trügerisch und die andere Hälfte 
voreingenommen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
 "and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
@@ -2477,7 +2621,7 @@
 "verbreitet haben, ist jenen Unternehmen zum Ausdruck zu bringen, sich die "
 "Ansichten diktieren zu lassen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;uniform fee only,&rdquo; or &ldquo;UFO&rdquo; for "
 "short, as a replacement.  It is accurate because the only condition in these "
@@ -2488,13 +2632,13 @@
 "<i>UFO</i>) empfohlen. Das ist präziser, weil die einzige Bedingung in "
 "diesen Lizenzen eine einheitliche Lizenzgebühr ist."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;SaaS&rdquo; or &ldquo;Software as a Service&rdquo;"
 msgstr ""
 "<span xml:lang=\"en\" lang=\"en\">„Software as a Service“</span> (SaaS) "
 "(Software als ein Dienst)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We used to say that SaaS (short for &ldquo;Software as a Service&rdquo;) is "
 "an injustice, but then we found that there was a lot of variation in "
@@ -2513,7 +2657,7 @@
 "nicht verwendet (unsere Definition ist also die einzige) und er erklärt, "
 "worin das Unrecht besteht."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/who-does-that-server-really-serve.html\">Who Does "
 "That Server Really Serve?</a> for discussion of this issue."
@@ -2521,7 +2665,7 @@
 "Weitere Informationen zu diesem Thema unter <cite><a href=\"/philosophy/who-"
 "does-that-server-really-serve\">Wem dient dieser Server wirklich?</a></cite>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In Spanish we continue to use the term &ldquo;software como servicio&rdquo; "
 "because the joke of &ldquo;software como ser vicio&rdquo; (&ldquo;software, "
@@ -2532,13 +2676,13 @@
 "Witz an <em><span xml:lang=\"es\" lang=\"es\">software como ser vicio</"
 "span></em> (in etwa Software-als-ein-Laster) zu gut ist, um ihn aufzugeben."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sell software&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Sell Software</span>“ („Software "
 "verkaufen“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
 "exchanging a copy of a free program for a sum of money is <a href=\"/"
@@ -2559,7 +2703,7 @@
 "eines Programms gegen Gebühr</em> oder <em>bestimmte proprietäre "
 "Beschränkungen bei der Nutzung eines Programms</em> lauten."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
 "further discussion of this issue."
@@ -2567,13 +2711,13 @@
 "Für weitere Informationen zu diesem Thema siehe <cite><a href=\"/philosophy/"
 "selling\">Freie Software verkaufen</a></cite>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing (personal data)&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Sharing (Personal Data)</"
 "span>“ (Austauschen (personenbezogene Daten))"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies manipulate or lure people into revealing personal data and "
 "thus ceding their privacy, please don't refer to this as &ldquo;sharing."
@@ -2590,19 +2734,19 @@
 "bezeichnen, und wir sagen, dass dies gut ist. Wir empfehlen dieses Wort "
 "nicht auf eine Praxis anzuwenden, die schädlich und gefährlich ist."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When one company redistributes collected personal data to another company, "
 "that is even less deserving of the term &ldquo;sharing.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing economy&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Sharing Economy</span>“ 
(sinn­ge­mäß "
 "„Ökonomie gemeinsam benutzend“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;sharing economy&rdquo; is not a good way to refer to "
 "services such as Uber and Airbnb that arrange business transactions between "
@@ -2624,7 +2768,7 @@
 "\">Sharing</span></em> den Sinn untergräbt, verwenden wir es nicht in diesem 
"
 "Zusammenhang."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A more suitable term for businesses like Uber is the &ldquo;piecework
 # | service {+economy&rdquo; or &ldquo;gig+} economy.&rdquo;
 #, fuzzy
@@ -2639,11 +2783,11 @@
 "\"en\" lang=\"en\">Piecework Service Economy</"
 "span>“ („Akkorddienstleistungswirtschaft“)</em>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Skype&rdquo;"
 msgstr "<span xml:lang=\"en\" lang=\"en\">to „skype“</span>“ 
(„skypen“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;skype&rdquo; as a verb, meaning any kind "
 "of video communication or telephony over the Internet in general.  &ldquo;"
@@ -2665,13 +2809,13 @@
 "a>, wenn Sie Video- und Sprachanrufe über das Internet auf eine Weise machen 
"
 "wollen, die Freiheit und Privatsphäre respektiert."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Software Industry&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Software Industry</"
 "span>“ („Softwareindustrie“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;software industry&rdquo; encourages people to imagine that "
 "software is always developed by a sort of factory and then delivered to "
@@ -2687,7 +2831,7 @@
 "entwickeln freie und/oder unfreie Software, aber diejenigen, die Freie "
 "Software entwickeln, werden nicht wie Fabriken geführt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;industry&rdquo; is being used as propaganda by advocates of "
 "software patents.  They call software development &ldquo;industry&rdquo; and "
@@ -2710,13 +2854,13 @@
 "Patentrechts] als <em>‚automatisierte Herstellung materieller 
Güter‘</em> zu "
 "definieren."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Source model&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Source Model</span>“ 
(„[Open-]Source-"
 "Modell“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
@@ -2741,7 +2885,7 @@
 "anzuführen, die <ins>eigentlich</ins> freie Softwareprogramme beschreiben."
 
 # (trans's note) not as a synonym for a console and/or Visual Display 
Terminal[/Unit]
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Terminal&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Terminals</span>“ <!--(nicht als 
Synonym "
@@ -2752,7 +2896,7 @@
 #  mobile phones, more precisely smartphones, and tablets. These are
 #  portable devices with expanded computer functionality, and are similar in
 #  scope of performance and operation. People should …'
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Mobile phones and tablets are computers, and people should be able to do "
 "their computing on them using free software.  To call them &ldquo;"
@@ -2768,11 +2912,11 @@
 "wofür sie gut sind, das Herstellen einer Verbindung mit Servern sei, was ein 
"
 "schlechtes Verfahren ist, die eigene Datenverarbeitung durchzuführen."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Theft&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Theft</span>“ („Diebstahl“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The supporters of a too-strict, repressive form of copyright often use words "
 "like &ldquo;stolen&rdquo; and &ldquo;theft&rdquo; to refer to copyright "
@@ -2784,10 +2928,22 @@
 "sich auf Urheberrechtsverletzungen zu beziehen. Das ist Blödsinn, aber sie "
 "möchten, dass man es für objektive Wahrheit hält."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Under the US legal system, copyright infringement is not theft.  <a
+# | 
href=\"http{+s+}://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\">
+# | Laws about theft are not applicable to copyright infringement.</a> The
+# | supporters of repressive copyright are making an appeal to
+# | authority&mdash;and misrepresenting what authority says.
+#, fuzzy
+#| msgid ""
+#| "Under the US legal system, copyright infringement is not theft.  <a href="
+#| "\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;";
+#| "vol=473&amp;invol=207\"> Laws about theft are not applicable to copyright "
+#| "infringement.</a> The supporters of repressive copyright are making an "
+#| "appeal to authority&mdash;and misrepresenting what authority says."
 msgid ""
 "Under the US legal system, copyright infringement is not theft.  <a href="
-"\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
+"\"https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
 "invol=207\"> Laws about theft are not applicable to copyright infringement.</"
 "a> The supporters of repressive copyright are making an appeal to "
 "authority&mdash;and misrepresenting what authority says."
@@ -2801,9 +2957,19 @@
 "repressiven Urheberrechts appellieren an die Autorität&#160;&#8209;&#160;und 
"
 "stellen falsch dar, was die Autorität sagt."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | To refute them, you can point to this <a
+# | 
href=\"http{+s+}://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright\">
+# | real case</a> which shows what can properly be described as
+# | &ldquo;copyright theft.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "To refute them, you can point to this <a href=\"http://www.guardian.co.uk/";
+#| "books/2013/may/04/harper-lee-kill-mockingbird-copyright\"> real case</a> "
+#| "which shows what can properly be described as &ldquo;copyright theft."
+#| "&rdquo;"
 msgid ""
-"To refute them, you can point to this <a href=\"http://www.guardian.co.uk/";
+"To refute them, you can point to this <a href=\"https://www.guardian.co.uk/";
 "books/2013/may/04/harper-lee-kill-mockingbird-copyright\"> real case</a> "
 "which shows what can properly be described as &ldquo;copyright theft.&rdquo;"
 msgstr ""
@@ -2813,7 +2979,7 @@
 "Fall</a> hinweisen, der darstellt, was wirklich als <em>"
 "„Urheberrechtsdiebstahl“</em> beschrieben werden kann."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unauthorized copying is forbidden by copyright law in many circumstances "
 "(not all!), but being forbidden doesn't make it wrong.  In general, laws "
@@ -2829,10 +2995,20 @@
 "Recht und Unrecht (dem Verdacht) entsprechen, sind die Gesetze das, was sich "
 "ändern sollte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A US judge, presiding over a trial for copyright infringement, recognized
+# | that <a
+# | 
href=\"http{+s+}://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo;
+# | and &ldquo;theft&rdquo; are smear-words.</a>
+#, fuzzy
+#| msgid ""
+#| "A US judge, presiding over a trial for copyright infringement, recognized "
+#| "that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+#| "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
+#| "theft&rdquo; are smear-words.</a>"
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear-words.</a>"
 msgstr ""
@@ -2843,13 +3019,13 @@
 "torrentfreak.com 2013.\"><em>„Piraterie“</em> und 
<em>„Diebstahl“</em> "
 "verleumderische Wörter</a> sind."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Trusted Computing&rdquo;"
 msgstr ""
 "„<span xml:lang=\"en\" lang=\"en\">Trusted Computing</"
 "span>“ („Vertrauenswürdige Datenverarbeitung“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;</"
 "a> is the proponents' name for a scheme to redesign computers so that "
@@ -2864,11 +3040,11 @@
 "&#160;anstelle des Nutzers! Aus deren Sicht ist es 
<em>„vertrauenswürdig“</"
 "em>, aus Sicht des Nutzers <em>verräterisch</em>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Vendor&rdquo;"
 msgstr "„<span xml:lang=\"en\" lang=\"en\">Vendor</span>“ 
(„Verkäufer“)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;vendor&rdquo; to refer generally to anyone "
 "that develops or packages software.  Many programs are developed in order to "
@@ -2889,9 +3065,18 @@
 "einige der Paketersteller von GNU/Linux-Distributionen Verkäufer. "
 "Stattdessen wird der allgemeinere Begriff <em>Anbieter</em> empfohlen."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+# | This essay is published in <a
+# | 
href=\"http{+s+}://shop.fsf.org/product/free-software-free-society/\"><cite>Free
+# | Software, Free Society: The Selected Essays of Richard M.
+# | Stallman</cite></a>.
+#, fuzzy
+#| msgid ""
+#| "This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+#| "software-free-society/\"><cite>Free Software, Free Society: The Selected "
+#| "Essays of Richard M. Stallman</cite></a>."
 msgid ""
-"This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+"This essay is published in <a href=\"https://shop.fsf.org/product/free-";
 "software-free-society/\"><cite>Free Software, Free Society: The Selected "
 "Essays of Richard M. Stallman</cite></a>."
 msgstr ""
@@ -2957,14 +3142,20 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</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>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "Please see the <a href=\"/server/standards/README.translations.html"
+#| "\">Translations README</a> for information on coordinating and "
+#| "contributing translations of this article."
 msgid ""
 "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."
 msgstr ""
 "Bei der Übersetzung dieses Werkes wurde mit größter Sorgfalt vorgegangen. "
@@ -2978,22 +3169,12 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
-# | 2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, [-2018-] {+2018, 2020,
-# | 2021+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2014, 2015-] {+1996-2018, 2020, 2021+} Free Software
+# | Foundation, Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
-#| "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018 Free Software "
-#| "Foundation, Inc."
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012<ins>, 2013, 2014</ins>, 2015, 2016, 2017, 2018 Free "
-"Software Foundation, Inc."
+#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright &copy; 1996-2018, 2020, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3017,6 +3198,20 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~| "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018 Free Software "
+#~| "Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~ "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~ "2008, 2009, 2010, 2011, 2012<ins>, 2013, 2014</ins>, 2015, 2016, 2017, "
+#~ "2018 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "The <a href=\"http://csrc.nist.gov/publications/nistpubs/800-145/";
 #~ "SP800-145.pdf\"> NIST definition of \"cloud computing\"</a> mentions "

Index: words-to-avoid.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.es.po,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -b -r1.276 -r1.277
--- words-to-avoid.es.po        31 May 2021 11:30:29 -0000      1.276
+++ words-to-avoid.es.po        21 Jul 2021 19:32:33 -0000      1.277
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-31 03:55+0000\n"
+"POT-Creation-Date: 2021-07-21 19:25+0000\n"
 "PO-Revision-Date: 2021-05-31 13:21+0200\n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: Spanish <www-es-general@gnu.org>\n"
@@ -23,6 +23,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-21 19:25+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 2.2.1\n"
 
@@ -36,14 +37,14 @@
 "inducen a confusión - Proyecto GNU - Free Software Foundation"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Words to Avoid (or Use with Care) Because They Are Loaded or Confusing"
 msgstr ""
 "Palabras y frases a evitar (o usar con cautela) porque son imprecisas o "
 "inducen a confusión"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are a number of words and phrases that we recommend avoiding, or "
 "avoiding in certain contexts and usages.  Some are ambiguous or misleading; "
@@ -55,99 +56,88 @@
 "un punto de vista con el que no estamos de acuerdo y esperamos que usted "
 "tampoco lo esté."
 
-# type: Content of: <div>
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
-"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
-"It The Swindle?</a>"
-msgstr ""
-"Véase también <a href=\"/philosophy/categories.html\">Categorías de 
software "
-"libre</a> y <a href=\"/philosophy/why-call-it-the-swindle.html\">¿Por qué 
lo "
-"llamamos «el Swindle»?</a>."
-
 # type: Content of: <h4>
 #.  GNUN-SORT-START 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ad-blocker\">Ad-blocker</a>&rdquo; |"
 msgstr "«<a href=\"#Ad-blocker\">Bloqueador de anuncios</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Access\">Access</a>&rdquo; |"
 msgstr "«<a href=\"#Access\">Acceso</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Alternative\">Alternative</a>&rdquo; |"
 msgstr "«<a href=\"#Alternative\">Alternativo</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Assets\">Assets</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Assets\">Activos</a>&rdquo; |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#BSD-style\">BSD-style</a>&rdquo; |"
 msgstr "«<a href=\"#BSD-style\">Tipo BSD</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Closed\">Closed</a>&rdquo; |"
 msgstr "«<a href=\"#Closed\">Cerrado</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CloudComputing\">Cloud Computing</a>&rdquo; |"
 msgstr "«<a href=\"#CloudComputing\">Computación en la nube</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Commercial\">Commercial</a>&rdquo; |"
 msgstr "«<a href=\"#Commercial\">Comercial</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Compensation\">Compensation</a>&rdquo; |"
 msgstr "«<a href=\"#Compensation\">Compensación</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consume\">Consume</a>&rdquo; |"
 msgstr "«<a href=\"#Consume\">Consumir</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consumer\">Consumer</a>&rdquo; |"
 msgstr "«<a href=\"#Consumer\">Consumidor</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Content\">Content</a>&rdquo; |"
 msgstr "«<a href=\"#Content\">Contenido</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CopyrightOwner\">Copyright Owner</a>&rdquo; |"
 msgstr ""
 "&ldquo;<a href=\"#CopyrightOwner\">Propietario del copyright</a>&rdquo; |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#CreativeCommonsLicensed\">Creative Commons licensed</"
 "a>&rdquo; |"
@@ -156,25 +146,25 @@
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Creator\">Creator</a>&rdquo; |"
 msgstr "«<a href=\"#Creator\">Creador</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalGoods\">Digital Goods</a>&rdquo; |"
 msgstr "«<a href=\"#DigitalGoods\">Bienes digitales</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalLocks\">Digital Locks</a>&rdquo; |"
 msgstr "«<a href=\"#DigitalLocks\">Candados digitales</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#DigitalRightsManagement\">Digital Rights Management</"
 "a>&rdquo; |"
@@ -183,176 +173,176 @@
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ecosystem\">Ecosystem</a>&rdquo; |"
 msgstr "«<a href=\"#Ecosystem\">Ecosistema</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FLOSS\">FLOSS</a>&rdquo; |"
 msgstr "«<a href=\"#FLOSS\">FLOSS</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#ForFree\">For free</a>&rdquo; |"
 msgstr "«<a href=\"#ForFree\">Gratuito</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FOSS\">FOSS</a>&rdquo; |"
 msgstr "«<a href=\"#FOSS\">FOSS</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FreelyAvailable\">Freely available</a>&rdquo; |"
 msgstr "«<a href=\"#FreelyAvailable\">Disponible libremente</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Freeware\">Freeware</a>&rdquo; |"
 msgstr "«<a href=\"#Freeware\">Freeware</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#GiveAwaySoftware\">Give away software</a>&rdquo; |"
 msgstr "«<a href=\"#GiveAwaySoftware\">Regalar software</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Google\">Google</a>&rdquo; |"
 msgstr "«<a href=\"#Google\">Google</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Hacker\">Hacker</a>&rdquo; |"
 msgstr "«<a href=\"#Hacker\">Hacker</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#IntellectualProperty\">Intellectual property</a>&rdquo; |"
 msgstr "«<a href=\"#IntellectualProperty\">Propiedad intelectual</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#InternetofThings\">Internet of Things</a>&rdquo; |"
 msgstr ""
 "&ldquo;<a href=\"#InternetofThings\">Internet de las Cosas</a>&rdquo; |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#LAMP\">LAMP system</a>&rdquo; |"
 msgstr "«<a href=\"#LAMP\">Sistema LAMP</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Linux\">Linux system</a>&rdquo; |"
 msgstr "«<a href=\"#Linux\">Sistema Linux</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Market\">Market</a>&rdquo; |"
 msgstr "«<a href=\"#Market\">Mercado</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Modern\">Modern</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Modern\">Moderno</a>&rdquo; |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Monetize\">Monetize</a>&rdquo; |"
 msgstr "«<a href=\"#Monetize\">Monetizar</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#MP3Player\">MP3 player</a>&rdquo; |"
 msgstr "«<a href=\"#MP3Player\">Reproductor MP3</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Open\">Open</a>&rdquo; |"
 msgstr "«<a href=\"#Open\">Abierto</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#OptOut\">Opt out</a>&rdquo; |"
 msgstr ""
 "&ldquo;<a href=\"#OptOut\"><cite>«Opt out»</cite> (Descartar)</a>&rdquo; |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PC\">PC</a>&rdquo; |"
 msgstr "«<a href=\"#PC\">PC</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Photoshop\">Photoshop</a>&rdquo; |"
 msgstr "«<a href=\"#Photoshop\">Photoshop</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Piracy\">Piracy</a>&rdquo; |"
 msgstr "«<a href=\"#Piracy\">Piratería</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PowerPoint\">PowerPoint</a>&rdquo; |"
 msgstr "«<a href=\"#PowerPoint\">PowerPoint</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Product\">Product</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Product\">Producto</a>&rdquo; |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Protection\">Protection</a>&rdquo; |"
 msgstr "«<a href=\"#Protection\">Protección</a>» |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#RAND\">RAND</a>&rdquo; |"
 msgstr "«<a href=\"#RAND\">RAND</a>» |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SaaS\">SaaS</a>&rdquo; |"
 msgstr "«<a href=\"#SaaS\">SaaS</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SellSoftware\">Sell software</a>&rdquo; |"
 msgstr "«<a href=\"#SellSoftware\">Vender software</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#SharingPersonalData\">Sharing (personal data)</a>&rdquo; |"
 msgstr ""
@@ -361,25 +351,25 @@
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SharingEconomy\">Sharing economy</a>&rdquo; |"
 msgstr "«<a href=\"#SharingEconomy\">Economía del compartir</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Skype\">Skype</a>&rdquo; |"
 msgstr "«<a href=\"#Skype\">Skype</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SoftwareIndustry\">Software Industry</a>&rdquo; |"
 msgstr "«<a href=\"#SoftwareIndustry\">Industria del software</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SourceModel\">Source model</a>&rdquo; |"
 msgstr "«<a href=\"#SourceModel\">Modelo de código</a>» |"
 
@@ -390,7 +380,7 @@
 #.      language to refer to mobile computers; otherwise,
 #.      fill the translation with a space. 
 #.  GNUN-SORT-BEGIN-KEY 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Terminal\">Terminal</a>&rdquo; |"
 msgstr "«<a href=\"#Terminal\">Terminal</a>» |"
 
@@ -399,28 +389,39 @@
 #. #endif
 #.  
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Theft\">Theft</a>&rdquo; |"
 msgstr "«<a href=\"#Theft\">Robo</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#TrustedComputing\">Trusted Computing</a>&rdquo; |"
 msgstr "«<a href=\"#TrustedComputing\">Computación confiable</a>» |"
 
 # type: Content of: <h4>
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Vendor\">Vendor</a>&rdquo;"
 msgstr "«<a href=\"#Vendor\">Vendedor</a>» |"
 
+# type: Content of: <div>
+#. type: Content of: <div><div><p>
+msgid ""
+"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
+"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
+"It The Swindle?</a>"
+msgstr ""
+"Véase también <a href=\"/philosophy/categories.html\">Categorías de 
software "
+"libre</a> y <a href=\"/philosophy/why-call-it-the-swindle.html\">¿Por qué 
lo "
+"llamamos «el Swindle»?</a>."
+
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ad-blocker&rdquo;"
 msgstr "«Bloqueador de anuncios»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When the purpose of some program is to block advertisements, &ldquo;ad-"
 "blocker&rdquo; is a good term for it.  However, the GNU browser IceCat "
@@ -435,11 +436,11 @@
 "«bloqueador de anuncios», es <em>protección frente a la vigilancia</em>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Access&rdquo;"
 msgstr "«Acceso»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is a common misunderstanding to think free software means that the public "
 "has &ldquo;access&rdquo; to a program.  That is not what free software means."
@@ -447,7 +448,7 @@
 "Es un error común pensar que el software libre significa que el público "
 "tiene «acceso» a un programa. No es este el sentido del software libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/philosophy/free-sw.html\">criterion for free software</a> is "
 "not about who has &ldquo;access&rdquo; to the program; the four essential "
@@ -466,7 +467,7 @@
 "hacerlo. Nadie tiene <em>derecho</em> a exigir una copia de ese programa a "
 "ningún usuario."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In particular, if you write a program yourself and never offer a copy to "
 "anyone else, that program is free software albeit in a trivial way, because "
@@ -478,7 +479,7 @@
 "usuario que dispone de una copia tiene las cuatro libertades esenciales (ya "
 "que él es el único usuario)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, when many users have copies of a program, someone is sure to "
 "post it on the internet, giving everyone access to it.  We think people "
@@ -490,7 +491,7 @@
 "acceda a él. Nosotros pensamos que, si el programa es útil, esto es algo 
que "
 "la gente debería hacer. Pero no es un requisito del software libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There is one specific point in which a question of having access is directly "
 "pertinent to free software: the GNU GPL permits giving a particular user "
@@ -505,7 +506,7 @@
 "en el que el usuario tiene ya una copia del programa en forma de código "
 "binario."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>with free software, the public has access to the program</b>, "
 "we say, <b>with free software, the users have the essential freedoms</b> and "
@@ -518,11 +519,11 @@
 "que el programa hace para ellos</b>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Alternative&rdquo;"
 msgstr "«Alternativo»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't describe free software in general as an &ldquo;alternative&rdquo; "
 "to proprietary, because that word presumes all the &ldquo;"
@@ -536,7 +537,7 @@
 "hecho, implica que el software libre debería coexistir con el software que "
 "no respeta la libertad de los usuarios."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
@@ -553,7 +554,7 @@
 "Substitute\">SaaSS</abbr>)</a>, someten a los usuarios. No pensamos que sea "
 "bueno ofrecer a los usuarios esas «alternativas» al software libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Special circumstances can drive users toward running one particular program "
 "for a certain job.  For instance, when a web page sends JavaScript client "
@@ -569,11 +570,11 @@
 "destinado a realizar esa tarea como alternativa."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Assets&rdquo;"
 msgstr "«Activos»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To refer to published works as &ldquo;assets&rdquo;, or &ldquo;digital "
 "assets&rdquo;, is even worse than calling them <a href=\"#Content\">&ldquo;"
@@ -586,12 +587,12 @@
 "comercial."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;BSD-style&rdquo;"
 msgstr "«Tipo BSD»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/licenses/bsd.html\">lumps together licenses that have important "
@@ -606,7 +607,7 @@
 "modificada de BSD sí es compatible con la GPL."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, it is best to name <a href=\"/licenses/license-list.html"
 "\"> the specific license in question</a> and avoid the vague term &ldquo;BSD-"
@@ -617,12 +618,12 @@
 "expresión «de tipo BSD»."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Closed&rdquo;"
 msgstr "«Cerrado»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source.&rdquo; In the free software movement, <a href=\"/"
@@ -644,12 +645,12 @@
 "\">«software privativo»</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Cloud Computing&rdquo;"
 msgstr "«Computación en la nube»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;cloud computing&rdquo; (or just &ldquo;cloud&rdquo;, in the "
 "context of computing) is a marketing buzzword with no coherent meaning.  It "
@@ -667,7 +668,7 @@
 "razonamiento confuso (o, ¿podríamos llamarlo «nuboso»?)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When thinking about or responding to a statement someone else has made using "
 "this term, the first step is to clarify the topic.  What scenario is the "
@@ -680,12 +681,23 @@
 "término adecuado y más claro para ese contexto? Una vez que el tema se haya 
"
 "formulado con claridad, será posible pensar con coherencia."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | One of the many meanings of &ldquo;cloud computing&rdquo; is storing your
+# | data in online services.  In most scenarios, that is foolish because it
+# | exposes you to <a
+# | href=\"http{+s+}://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spo
+# | oks-cloud-antiauthoritarian-dream\">surveillance</a>.
+#, fuzzy
+#| msgid ""
+#| "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
+#| "data in online services.  In most scenarios, that is foolish because it "
+#| "exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/";
+#| "apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgid ""
 "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
 "data in online services.  In most scenarios, that is foolish because it "
-"exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/";
-"hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
+"exposes you to <a href=\"https://www.guardian.co.uk/commentisfree/2011/";
+"apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgstr ""
 "Uno de los muchos significados de la expresión «computación en la nube» 
es "
 "el almacenamiento de datos en los servicios en línea. En la mayoría de los "
@@ -693,7 +705,7 @@
 "href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-";
 "cloud-antiauthoritarian-dream\">vigilancia</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning (which overlaps that but is not the same thing)  is <a href="
 "\"/philosophy/who-does-that-server-really-serve.html\"> Service as a "
@@ -706,7 +718,7 @@
 "Software Substitute\">SaaSS</abbr>)</a>, que le niega al usuario el control "
 "de sus tareas de computación. Nunca se debe usar el SaaSS."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is renting a remote physical server, or virtual server.  "
 "These practices are ok under certain circumstances."
@@ -714,7 +726,7 @@
 "Otro de los significados se refiere al alquiler de un servidor remoto, "
 "físico o virtual. Esto es aceptable bajo ciertas circunstancias."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is accessing your own server from your own mobile device.  "
 "That raises no particular ethical issues."
@@ -723,7 +735,7 @@
 "servidor mediante un dispositivo móvil que nos pertenece, lo cual no suscita 
"
 "ninguna cuestión ética particular."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"https://csrc.nist.gov/publications/detail/sp/800-145/final\";> "
 "NIST definition of \"cloud computing\"</a> mentions three scenarios that "
@@ -746,7 +758,7 @@
 "sustitutivo del software, que maltrata al usuario, pero los dos conceptos no "
 "son equivalentes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "These different computing practices don't even belong in the same "
 "discussion.  The best way to avoid the confusion the term &ldquo;cloud "
@@ -761,10 +773,22 @@
 "utilizando la terminología específica apropiada."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Curiously, Larry Ellison, a proprietary software developer, also <a
+# | 
href=\"http{+s+}://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\">
+# | noted the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He
+# | decided to use the term anyway because, as a proprietary software
+# | developer, he isn't motivated by the same ideals as we are.
+#, fuzzy
+#| msgid ""
+#| "Curiously, Larry Ellison, a proprietary software developer, also <a href="
+#| "\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> "
+#| "noted the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He "
+#| "decided to use the term anyway because, as a proprietary software "
+#| "developer, he isn't motivated by the same ideals as we are."
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a href="
-"\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
+"\"https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
 "the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He decided to use "
 "the term anyway because, as a proprietary software developer, he isn't "
 "motivated by the same ideals as we are."
@@ -776,12 +800,12 @@
 "mueven los mismos ideales que a nosotros."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Commercial&rdquo;"
 msgstr "«Comercial»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;nonfree."
 "&rdquo; That confuses two entirely different issues."
@@ -790,7 +814,7 @@
 "libre», ya que esto crea confusión entre dos temas completamente 
diferentes."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A program is commercial if it is developed as a business activity.  A "
 "commercial program can be free or nonfree, depending on its manner of "
@@ -807,7 +831,7 @@
 "tienen los usuarios son dos cuestiones diferentes."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the first decade of the free software movement, free software packages "
 "were almost always noncommercial; the components of the GNU/Linux operating "
@@ -822,7 +846,7 @@
 "los años noventa, empezó a aparecer software libre comercial."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
@@ -838,12 +862,12 @@
 "posibilidad. Evitemos emplear la palabra «comercial» en ese sentido."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Compensation&rdquo;"
 msgstr "«Compensación»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;compensation for authors&rdquo; in connection with "
 "copyright carries the assumptions that (1) copyright exists for the sake of "
@@ -858,7 +882,7 @@
 "pagar. La primera suposición es simplemente <a href=\"/philosophy/"
 "misinterpreting-copyright.html\">falsa</a>, y la segunda es indignante."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Compensating the rights-holders&rdquo; adds a further swindle: you're "
 "supposed to imagine that means paying the authors, and occasionally it does, "
@@ -871,11 +895,11 @@
 "mismas compañías editoriales que nos imponen leyes injustas."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consume&rdquo;"
 msgstr "«Consumir»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Consume&rdquo; refers to what we do with food: we ingest it, after "
 "which the food as such no longer exists.  By analogy, we employ the same "
@@ -897,7 +921,7 @@
 "abusiva. Al reproducir una grabación o ejecutar un programa, estos no se "
 "consumen."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use &ldquo;consume&rdquo; in this context will say they don't mean "
 "it literally.  What, then, does it mean? It means to regard copies of "
@@ -917,14 +941,34 @@
 "<em>fungibles</em>: una gota de gasolina consumida por su coche hoy, no "
 "tiene nada de particular con respecto a otra gota consumida la semana pasada."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | What does it mean to think of works of authorship as a commodity, with the
+# | assumption that there is nothing special about any one story, article,
+# | program, or song? That is the twisted viewpoint of the owner or the
+# | accountant of a publishing company.  It is no surprise that proprietary
+# | software would like you to think of the use of software as a commodity. 
+# | Their twisted viewpoint comes through clearly in <a
+# | 
href=\"http{+s+}://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6\">this
+# | article</a>, which also refers to publications as &ldquo;<a
+# | href=\"#Content\">content</a>.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "What does it mean to think of works of authorship as a commodity, with "
+#| "the assumption that there is nothing special about any one story, "
+#| "article, program, or song? That is the twisted viewpoint of the owner or "
+#| "the accountant of a publishing company.  It is no surprise that "
+#| "proprietary software would like you to think of the use of software as a "
+#| "commodity.  Their twisted viewpoint comes through clearly in <a href="
+#| "\"http://www.businessinsider.com/former-google-exec-launches-sourcepoint-";
+#| "with-10-million-series-a-funding-2015-6\">this article</a>, which also "
+#| "refers to publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
 msgid ""
 "What does it mean to think of works of authorship as a commodity, with the "
 "assumption that there is nothing special about any one story, article, "
 "program, or song? That is the twisted viewpoint of the owner or the "
 "accountant of a publishing company.  It is no surprise that proprietary "
 "software would like you to think of the use of software as a commodity.  "
-"Their twisted viewpoint comes through clearly in <a href=\"http://www.";
+"Their twisted viewpoint comes through clearly in <a href=\"https://www.";
 "businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-"
 "series-a-funding-2015-6\">this article</a>, which also refers to "
 "publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
@@ -940,11 +984,25 @@
 "publicaciones como as «<a href=\"#Content\">contenidos</a>»."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The narrow thinking associated with the idea that we &ldquo;consume
+# | content&rdquo; paves the way for laws such as the DMCA that forbid users
+# | to break the <a href=\"http{+s+}://DefectiveByDesign.org/\">Digital
+# | Restrictions Management</a> (DRM) facilities in digital devices.  If users
+# | think what they do with these devices is &ldquo;consume,&rdquo; they may
+# | see such restrictions as natural.
+#, fuzzy
+#| msgid ""
+#| "The narrow thinking associated with the idea that we &ldquo;consume "
+#| "content&rdquo; paves the way for laws such as the DMCA that forbid users "
+#| "to break the <a href=\"http://DefectiveByDesign.org/\";>Digital "
+#| "Restrictions Management</a> (DRM) facilities in digital devices.  If "
+#| "users think what they do with these devices is &ldquo;consume,&rdquo; "
+#| "they may see such restrictions as natural."
 msgid ""
 "The narrow thinking associated with the idea that we &ldquo;consume "
 "content&rdquo; paves the way for laws such as the DMCA that forbid users to "
-"break the <a href=\"http://DefectiveByDesign.org/\";>Digital Restrictions "
+"break the <a href=\"https://DefectiveByDesign.org/\";>Digital Restrictions "
 "Management</a> (DRM) facilities in digital devices.  If users think what "
 "they do with these devices is &ldquo;consume,&rdquo; they may see such "
 "restrictions as natural."
@@ -956,7 +1014,7 @@
 "usuarios piensan que lo que hacen con estos dispositivos es «consumir», es "
 "probable que tales restricciones les parezcan naturales."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It also encourages the acceptance of &ldquo;streaming&rdquo; services, which "
 "use DRM to perversely limit listening to music, or watching video, to "
@@ -968,7 +1026,7 @@
 "vídeo, y forzar estas actividades para que encajen en los supuestos de la "
 "palabra «consumir»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why is this perverse usage spreading? Some may feel that the term sounds "
 "sophisticated, but rejecting it with cogent reasons can appear even more "
@@ -986,7 +1044,7 @@
 "de sus empleadores). Su empleo en foros de prestigio produce la impresión de 
"
 "que se trata del término «correcto»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;consuming&rdquo; music, fiction, or any other artistic "
 "works is to treat them as commodities rather than as art.  Do we want to "
@@ -998,7 +1056,7 @@
 "pensar de esa manera en las obras que se publican? ¿Queremos animar al "
 "público a que piense así? "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who answer no, please join me in shunning the term &ldquo;"
 "consume&rdquo; for this."
@@ -1006,7 +1064,7 @@
 "Quienes respondan no, súmense a mí y eviten el término «consumir» para "
 "referirse a tales cosas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What to use instead? You can use specific verbs such as &ldquo;read,&rdquo; "
 "&ldquo;listen to,&rdquo; &ldquo;watch&rdquo; or &ldquo;look at,&rdquo; since "
@@ -1016,7 +1074,7 @@
 "«leer», «escuchar» o «ver», ya que ayudan a refrenar la tendencia a "
 "generalizar en exceso."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you insist on generalizing, you can use the expression &ldquo;attend to,"
 "&rdquo; which requires less of a stretch than &ldquo;consume.&rdquo; For a "
@@ -1026,16 +1084,16 @@
 "es menos forzada que «consumir». Para obras de uso práctico es mejor "
 "«utilizar»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "See also the following entry."
 msgstr "Véase también <a href=\"#Consumer\">«Consumidor»</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consumer&rdquo;"
 msgstr "«Consumidor»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;consumer,&rdquo; when used to refer to the users of "
 "computing, is loaded with assumptions we should reject.  Some come from the "
@@ -1051,7 +1109,7 @@
 "las obras digitales, que pueden copiarse, las conclusiones económicas que se 
"
 "refieren a productos materiales, que no pueden copiarse."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In addition, describing the users of software as &ldquo;consumers&rdquo; "
 "refers to a framing in which people are limited to selecting between "
@@ -1068,7 +1126,7 @@
 "un programa</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To describe people who are not limited to passive use of works, we suggest "
 "terms such as &ldquo;individuals&rdquo; and &ldquo;citizens,&rdquo; rather "
@@ -1078,9 +1136,17 @@
 "sugerimos emplear términos tales como «particulares» o «ciudadanos», en "
 "lugar de «consumidores»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This problem with the word &ldquo;consumer&rdquo; has been <a
+# | 
href=\"http{+s+}://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams\">noted
+# | before</a>.
+#, fuzzy
+#| msgid ""
+#| "This problem with the word &ldquo;consumer&rdquo; has been <a href="
+#| "\"http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-";
+#| "language-raymond-williams\">noted before</a>."
 msgid ""
-"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"http://";
+"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"https://";
 "www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-"
 "williams\">noted before</a>."
 msgstr ""
@@ -1089,11 +1155,11 @@
 "williams\">ha sido ya señalado con anterioridad</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Content&rdquo;"
 msgstr "«Contenido»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to describe a feeling of comfort and satisfaction, by all means "
 "say you are &ldquo;content,&rdquo; but using the word as a noun to describe "
@@ -1111,7 +1177,7 @@
 "pueden utilizar los términos «trabajos», «obras» o «publicaciones»."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use the term &ldquo;content&rdquo; are often the publishers that "
 "push for increased copyright power in the name of the authors (&ldquo;"
@@ -1129,7 +1195,7 @@
 "culture/2016/aug/02/how-to-deal-with-trump-trolls-online\">en el Guardian</"
 "a>:"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Content itself is beside the point&mdash;as the very use of words like "
 "content suggests. The moment you start labelling every single piece of "
@@ -1141,7 +1207,7 @@
 "fragmento de texto existente como «contenido», estos se admiten como "
 "intercambiables: su principal propósito es abastecer la factoría métrica."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In other words, &ldquo;content&rdquo; reduces publications and writings to a "
 "sort of pap fit to be piped through the &ldquo;tubes&rdquo; of the internet."
@@ -1151,7 +1217,7 @@
 "alimentación» de internet."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See also <a href=\"https://www.salon.com/2000/06/14/love_7/\";>Courtney "
 "Love's open letter to Steve Case</a> and search for &ldquo;content "
@@ -1166,7 +1232,7 @@
 "\"#IntellectualProperty\">sesgada y confusa</a>)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "However, as long as other people use the term &ldquo;content provider,"
 "&rdquo; political dissidents can well call themselves &ldquo;malcontent "
@@ -1178,7 +1244,7 @@
 "«<cite>malcontent providers</cite>» [proveedores descontentos]."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
 "&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
@@ -1195,7 +1261,7 @@
 "informáticos."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
 "web site.  For that, we recommend the term &ldquo;web site revision "
@@ -1207,11 +1273,11 @@
 "<cite>Web site Revision System</cite>)."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Copyright Owner&rdquo;"
 msgstr "«Propietario del copyright»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyright is an artificial privilege, handed out by the state to achieve a "
 "public interest and lasting a period of time &mdash; not a natural right "
@@ -1223,7 +1289,7 @@
 "posesión de una casa o una camisa. Los juristas solían reconocer esto al "
 "referirse al beneficiario de ese privilegio como «tenedor del copyright»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A few decades ago, copyright holders began trying to reduce awareness of "
 "this point.  In addition to citing frequently the bogus concept of <a href="
@@ -1240,11 +1306,11 @@
 "su lugar la expresión tradicional «tenedores del copyright»."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creative Commons licensed&rdquo;"
 msgstr "«Bajo licencia Creative Commons»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The most important licensing characteristic of a work is whether it is "
 "free.  Creative Commons publishes seven licenses; three are free (CC BY, CC "
@@ -1260,7 +1326,7 @@
 "si es libre o no, y se da a entender que la cuestión no es importante. El "
 "enunciado puede ser correcto, pero la omisión es perjudicial."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To encourage people to pay attention to the most important distinction, "
 "always specify <em>which</em> Creative Commons license is used, as in &ldquo;"
@@ -1274,12 +1340,12 @@
 "averiguarlo antes de mencionarla."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creator&rdquo;"
 msgstr "«Creador»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
@@ -1301,12 +1367,12 @@
 "equivalentes, a menudo el titular del copyright no es el autor."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr "«Bienes digitales»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
 "authorship, identifies them with physical goods&mdash;which cannot be "
@@ -1326,11 +1392,11 @@
 "libertad y la comunidad."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Locks&rdquo;"
 msgstr "«Candados digitales»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital locks&rdquo; is used to refer to Digital Restrictions "
 "Management by some who criticize it.  The problem with this term is that it "
@@ -1343,12 +1409,29 @@
 "correctamente lo maligno que es el DRM. Quienes la han adoptado no han "
 "reflexionado lo suficiente."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Locks are not necessarily oppressive or bad.  You probably own several
+# | locks, and their keys or codes as well; you may find them useful or
+# | troublesome, but they don't oppress you, because you can open and close
+# | them.  Likewise, we find <a
+# | 
href=\"http{+s+}://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\">encryption</a>
+# | invaluable for protecting our digital files.  That too is a kind of
+# | digital lock that you have control over.
+#, fuzzy
+#| msgid ""
+#| "Locks are not necessarily oppressive or bad.  You probably own several "
+#| "locks, and their keys or codes as well; you may find them useful or "
+#| "troublesome, but they don't oppress you, because you can open and close "
+#| "them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+#| "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-"
+#| "the-good-guys-have-keys-to-\">encryption</a> invaluable for protecting "
+#| "our digital files.  That too is a kind of digital lock that you have "
+#| "control over."
 msgid ""
 "Locks are not necessarily oppressive or bad.  You probably own several "
 "locks, and their keys or codes as well; you may find them useful or "
 "troublesome, but they don't oppress you, because you can open and close "
-"them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+"them.  Likewise, we find <a href=\"https://www.theguardian.com/";
 "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
 "good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
 "digital files.  That too is a kind of digital lock that you have control "
@@ -1363,7 +1446,7 @@
 "nuestros archivos digitales. Esto también es un tipo de candado digital "
 "sobre el que nosotros mantenemos el control."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "DRM is like a lock placed on you by someone else, who refuses to give you "
 "the key&mdash;in other words, like <em>handcuffs</em>.  Therefore, the "
@@ -1374,7 +1457,7 @@
 "en otras palabras, es como unas <em>esposas</em>. Por tanto, la metáfora 
más "
 "apropiada es «esposas digitales», no  «candados digitales»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A number of opposition campaigns have chosen the unwise term &ldquo;digital "
 "locks&rdquo;; to get things back on the right track, we must firmly insist "
@@ -1392,12 +1475,12 @@
 "explicamos las razones."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Rights Management&rdquo;"
 msgstr "«Gestión digital de derechos»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital Rights Management&rdquo; (abbreviated &ldquo;DRM&rdquo;) "
 "refers to technical mechanisms designed to impose restrictions on computer "
@@ -1415,7 +1498,7 @@
 "es a quien se le imponen."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Good alternatives include &ldquo;Digital Restrictions Management,&rdquo; and "
 "&ldquo;digital handcuffs.&rdquo;"
@@ -1423,21 +1506,27 @@
 "Buenas alternativas son «gestión digital de restricciones» y «esposas "
 "digitales»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Please sign up to support our <a
+# | href=\"http{+s+}://DefectiveByDesign.org/\"> campaign to abolish DRM</a>.
+#, fuzzy
+#| msgid ""
+#| "Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+#| "campaign to abolish DRM</a>."
 msgid ""
-"Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+"Please sign up to support our <a href=\"https://DefectiveByDesign.org/\";> "
 "campaign to abolish DRM</a>."
 msgstr ""
 "Apúntese para apoyar nuestra <a href=\"http://DefectiveByDesign.org/";
 "\">campaña para abolir el DRM</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ecosystem&rdquo;"
 msgstr "«Ecosistema»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is inadvisable to describe the free software community, or any human "
 "community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
@@ -1448,7 +1537,7 @@
 "ausencia de juicio ético."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;ecosystem&rdquo; implicitly suggests an attitude of "
 "nonjudgmental observation: don't ask how what <em>should</em> happen, just "
@@ -1469,7 +1558,7 @@
 "incluso cuando se llega a la extinción de una especie."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By contrast, beings that adopt an ethical stance towards their surroundings "
 "can decide to preserve things that, without their intervention, might "
@@ -1485,11 +1574,11 @@
 "tradicionales&hellip; y la libertad de los usuarios de ordenadores."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FLOSS&rdquo;"
 msgstr "«FLOSS»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
 "Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
@@ -1505,12 +1594,12 @@
 "libertad, no utilicemos un término neutral."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;For free&rdquo;"
 msgstr "«Gratuito»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to say that a program is free software, please don't say that it "
 "is available &ldquo;for free.&rdquo; That term specifically means &ldquo;for "
@@ -1521,7 +1610,7 @@
 "precio alguno». El software libre es una cuestión de libertad, no de 
precio."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software copies are often available for free&mdash;for example, by "
 "downloading via FTP.  But free software copies are also available for a "
@@ -1536,7 +1625,7 @@
 "suelen ponerse a disposición de ciertos usuarios sin coste alguno."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, you can say that the program is available &ldquo;as free "
 "software.&rdquo;"
@@ -1545,11 +1634,11 @@
 "software libre»."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FOSS&rdquo;"
 msgstr "«FOSS»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
 "&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
@@ -1564,19 +1653,19 @@
 "«FLOSS» es una mejor opción. Pero si lo que queremos es mostrar que "
 "defendemos la libertad, no utilicemos un término neutral."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>FOSS</b>, we say, <b>free software</b> or <b>free (libre) "
 "software</b>."
 msgstr "En lugar de <b>FOSS</b>, decimos <b>software libre</b>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freely available&rdquo;"
 msgstr "«Disponible libremente»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The terms are not equivalent.  Software is &ldquo;"
@@ -1591,12 +1680,12 @@
 "respuestas a preguntas diferentes."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freeware&rdquo;"
 msgstr "«Freeware»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;freeware&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The term &ldquo;freeware&rdquo; was used often in the "
@@ -1610,7 +1699,7 @@
 "existe para este término ninguna definición específica aceptada."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When using languages other than English, please avoid borrowing English "
 "terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; It is "
@@ -1624,7 +1713,7 @@
 "«software libre»)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By using a word in <a href=\"/philosophy/fs-translations.html\">your own "
 "language</a>, you show that you are really referring to freedom and not just "
@@ -1642,12 +1731,12 @@
 "de qué se trata."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Give away software&rdquo;"
 msgstr "«Regalar software»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
 "distribute a program as free software.&rdquo; This locution has the same "
@@ -1662,11 +1751,11 @@
 "como software libre»."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Google&rdquo;"
 msgstr "«Google»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;google&rdquo; as a verb, meaning to "
 "search for something on the internet. &ldquo;Google&rdquo; is just the name "
@@ -1687,14 +1776,30 @@
 "afirmaciones de este tipo desde el exterior)."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Hacker&rdquo;"
 msgstr "«Hacker»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A hacker is someone who <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\"> enjoys playful
+# | cleverness</a>&mdash;not necessarily with computers.  The programmers in
+# | the old <abbr title=\"Massachusetts Institute of Technology\">MIT</abbr>
+# | free software community of the 60s and 70s referred to themselves as
+# | hackers.  Around 1980, journalists who discovered the hacker community
+# | mistakenly took the term to mean &ldquo;security breaker.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+#| "html\"> enjoys playful cleverness</a>&mdash;not necessarily with "
+#| "computers.  The programmers in the old <abbr title=\"Massachusetts "
+#| "Institute of Technology\">MIT</abbr> free software community of the 60s "
+#| "and 70s referred to themselves as hackers.  Around 1980, journalists who "
+#| "discovered the hacker community mistakenly took the term to mean &ldquo;"
+#| "security breaker.&rdquo;"
 msgid ""
-"A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+"A hacker is someone who <a href=\"https://stallman.org/articles/on-hacking.";
 "html\"> enjoys playful cleverness</a>&mdash;not necessarily with computers.  "
 "The programmers in the old <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr> free software community of the 60s and 70s referred "
@@ -1712,7 +1817,7 @@
 "designar a alguien que «burla la seguridad»."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't spread this mistake.  People who break security are &ldquo;"
 "crackers.&rdquo;"
@@ -1721,12 +1826,12 @@
 "un sistema son «crackers»."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Intellectual property&rdquo;"
 msgstr "«Propiedad intelectual»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
 "property&rdquo;&mdash;a term also applied to patents, trademarks, and other "
@@ -1743,7 +1848,7 @@
 "registradas»."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;intellectual property&rdquo; carries a hidden "
 "assumption&mdash;that the way to think about all these disparate issues is "
@@ -1755,7 +1860,7 @@
 "físicos, conforme a nuestra idea de posesión de objetos materiales."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When it comes to copying, this analogy disregards the crucial difference "
 "between material objects and information: information can be copied and "
@@ -1767,7 +1872,7 @@
 "materiales esto no es posible."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid spreading unnecessary bias and confusion, it is best to adopt a "
 "firm policy <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
@@ -1778,7 +1883,7 @@
 "siquiera en términos de «propiedad intelectual»</a>."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
 "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make the "
@@ -1789,11 +1894,11 @@
 "a la propia Organización Mundial de la «Propiedad Intelectual»</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Internet of Things&rdquo;"
 msgstr "«Internet de las Cosas»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies decided to make computerized appliances that would connect "
 "over the internet to the manufacturer's server, and therefore could easily "
@@ -1808,9 +1913,25 @@
 "atractivo nombre de <cite>«Internet of Things»</cite> («Internet de las "
 "Cosas»)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Experience shows that these products often do <a
+# | 
href=\"http{+s+}://www.locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-things-to-be-sensed/\">
+# | spy on their users</a>.  They are also tailor-made for <a
+# | href=\"https://archive.ieet.org/articles/rinesi20150806.html\";>giving
+# | people biased advice</a>.  In addition, the manufacturer can <a
+# | href=\"/proprietary/proprietary-sabotage.html\"> sabotage the product</a>
+# | by turning off the server it depends on.
+#, fuzzy
+#| msgid ""
+#| "Experience shows that these products often do <a href=\"http://www.";
+#| "locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-"
+#| "sensors-not-things-to-be-sensed/\"> spy on their users</a>.  They are "
+#| "also tailor-made for <a href=\"https://archive.ieet.org/articles/";
+#| "rinesi20150806.html\">giving people biased advice</a>.  In addition, the "
+#| "manufacturer can <a href=\"/proprietary/proprietary-sabotage.html\"> "
+#| "sabotage the product</a> by turning off the server it depends on."
 msgid ""
-"Experience shows that these products often do <a href=\"http://www.locusmag.";
+"Experience shows that these products often do <a href=\"https://www.locusmag.";
 "com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-"
 "things-to-be-sensed/\"> spy on their users</a>.  They are also tailor-made "
 "for <a href=\"https://archive.ieet.org/articles/rinesi20150806.html\";>giving "
@@ -1826,19 +1947,19 @@
 "href=\"/proprietary/proprietary-sabotage.html\"> sabotear el producto</a> "
 "desconectando el servidor del que depende."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We call them the &ldquo;Internet of Stings.&rdquo;"
 msgstr ""
 "Nosotros lo llamamos <cite>«Internet of Stings»</cite> (Internet de las "
 "Trucosas)."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;LAMP system&rdquo;"
 msgstr "«Sistema LAMP»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
 "&mdash;a common combination of software to use on a web server, except that "
@@ -1852,12 +1973,12 @@
 "en lugar de «LAMP» debería ser «GLAMP»: «GNU, Linux, Apache, MySQL y 
PHP»."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Linux system&rdquo;"
 msgstr "«Sistema Linux»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
@@ -1875,12 +1996,12 @@
 "entero y el núcleo en sí."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Market&rdquo;"
 msgstr "«Mercado»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is misleading to describe the users of free software, or the software "
 "users in general, as a &ldquo;market.&rdquo;"
@@ -1889,7 +2010,7 @@
 "de software en general, induce a error."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not to say there is no room for markets in the free software "
 "community.  If you have a free software support business, then you have "
@@ -1903,7 +2024,7 @@
 "deseamos éxito en ese mercado."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But the free software movement is a social movement, not a business, and the "
 "success it aims for is not a market success.  We are trying to serve the "
@@ -1920,11 +2041,11 @@
 "libertad y legitimar el software privativo."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Modern&rdquo;"
 msgstr "«Moderno»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;modern&rdquo; makes sense from a descriptive perspective "
 "&mdash; for instance, solely to distinguish newer periods and ways from "
@@ -1934,7 +2055,7 @@
 "ejemplo, únicamente para distinguir épocas y usos más recientes de otros 
más "
 "antiguos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It becomes a problem when it carries the presumption that older ways are "
 "&ldquo;old-fashioned&rdquo;; that is, presumed to be worse.  In "
@@ -1947,11 +2068,11 @@
 "imponen a los usuarios, lo cierto es a menudo lo contrario."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Monetize&rdquo;"
 msgstr "«Monetizar»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The proper definition of &ldquo;monetize&rdquo; is &ldquo;to use something "
 "as currency.&rdquo; For instance, human societies have monetized gold, "
@@ -1966,7 +2087,7 @@
 "manera diferente, atribuyéndole el significado de «utilizar algo como "
 "recurso para obtener ganancias»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That usage casts the profit as primary, and the thing used to get the profit "
 "as secondary.  That attitude applied to a software project is objectionable "
@@ -1979,7 +2100,7 @@
 "inaceptable, pues si los desarrolladores concluyeran que hacer el programa "
 "libre no sería lo bastante rentable, esto los induciría a hacerlo 
privativo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A productive and ethical business can make money, but if it subordinates all "
 "else to profit, it is not likely to remain ethical."
@@ -1989,13 +2110,13 @@
 "ética."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;MP3 Player&rdquo;"
 msgstr "«Reproductor MP3»"
 
 # type: Content of: <p>
 #.  The MP3 patents will reportedly expire by 2018.  
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the late 1990s it became feasible to make portable, solid-state digital "
 "audio players.  Most players supported the patented MP3 codec, and that is "
@@ -2011,7 +2132,7 @@
 "pocos no podían reproducir archivos codificados en MP3 porque sus "
 "desarrolladores tenían que protegerse de las patentes de ese formato."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Using the term &ldquo;MP3 players&rdquo; for audio players in general has "
 "the effect of promoting the MP3 format and discouraging the other formats "
@@ -2024,7 +2145,7 @@
 "técnicamente superiores). Aun cuando las patentes de MP3 ya han expirado, "
 "sigue siendo desaconsejable emplear esa expresión."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;digital audio player,&rdquo; or simply &ldquo;"
 "audio player&rdquo; when that's clear enough, instead of &ldquo;MP3 player."
@@ -2035,12 +2156,12 @@
 "bastante claro."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Open&rdquo;"
 msgstr "«Abierto»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open source&rdquo; "
 "as a substitute for &ldquo;free software.&rdquo; Those terms refer to a <a "
@@ -2057,7 +2178,7 @@
 "operaciones informáticas, para nosotros es una cuestión de justicia. El "
 "código abierto, que no es un movimiento, no defiende nada de este tipo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When referring to the open source views, it's correct to use that name, but "
 "please do not use that term when talking about us, our software, or our "
@@ -2068,18 +2189,18 @@
 "a nuestro software o a nuestros puntos de vista; eso lleva a la gente a "
 "pensar que nuestros planteamientos son similares a los de ellos."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>open source</b>, we say, <b>free software</b> or <b>free "
 "(libre) software</b>."
 msgstr "En lugar de <b>código abierto</b>, decimos, <b>software libre</b>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Opt out&rdquo;"
 msgstr "<cite>«Opt out»</cite> (Descartar)"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When applied to any form of computational mistreatment, &ldquo;opt "
 "out&rdquo; implies the choice is a minor matter of convenience. We recommend "
@@ -2091,12 +2212,12 @@
 "«huir»."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PC&rdquo;"
 msgstr "«PC»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's OK to use the abbreviation &ldquo;PC&rdquo; to refer to a certain kind "
 "of computer hardware, but please don't use it with the implication that the "
@@ -2109,7 +2230,7 @@
 "mismo ordenador, sigue siendo un PC."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;WC&rdquo; has been suggested for a computer running Windows."
 msgstr ""
@@ -2117,18 +2238,31 @@
 "expresión «WC»."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Photoshop&rdquo;"
 msgstr "«Photoshop»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any
+# | kind of photo manipulation or image editing in general.  Photoshop is just
+# | the name of one particular image editing program, which should be avoided
+# | since it is proprietary.  There are plenty of free programs for editing
+# | images, such as the <a [-href=\"/software/gimp\">GIMP</a>.-]
+# | {+href=\"https://www.gimp.org/\";>GIMP</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning "
+#| "any kind of photo manipulation or image editing in general.  Photoshop is "
+#| "just the name of one particular image editing program, which should be "
+#| "avoided since it is proprietary.  There are plenty of free programs for "
+#| "editing images, such as the <a href=\"/software/gimp\">GIMP</a>."
 msgid ""
 "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any "
 "kind of photo manipulation or image editing in general.  Photoshop is just "
 "the name of one particular image editing program, which should be avoided "
 "since it is proprietary.  There are plenty of free programs for editing "
-"images, such as the <a href=\"/software/gimp\">GIMP</a>."
+"images, such as the <a href=\"https://www.gimp.org/\";>GIMP</a>."
 msgstr ""
 "Evite convertir el término «Photoshop» en verbo empleando expresiones 
tales "
 "como «fotoshopear» para referirse a cualquier tipo de manipulación de "
@@ -2139,12 +2273,12 @@
 "\">GIMP</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Piracy&rdquo;"
 msgstr "«Piratería»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers often refer to copying they don't approve of as &ldquo;piracy."
 "&rdquo; In this way, they imply that it is ethically equivalent to attacking "
@@ -2162,7 +2296,7 @@
 "para que las prohibiciones sean más estrictas."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you don't believe that copying not approved by the publisher is just like "
 "kidnapping and murder, you might prefer not to use the word &ldquo;"
@@ -2179,10 +2313,20 @@
 "sea ilegal). Algunos incluso podríamos preferir una fórmula positiva, tal "
 "como «compartir información con el prójimo»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A US judge, presiding over a trial for copyright infringement, recognized
+# | that <a
+# | 
href=\"http{+s+}://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo;
+# | and &ldquo;theft&rdquo; are smear words.</a>
+#, fuzzy
+#| msgid ""
+#| "A US judge, presiding over a trial for copyright infringement, recognized "
+#| "that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+#| "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
+#| "theft&rdquo; are smear words.</a>"
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear words.</a>"
 msgstr ""
@@ -2192,12 +2336,12 @@
 "son términos peyorativos</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PowerPoint&rdquo;"
 msgstr "«PowerPoint»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
 "slide presentation.  &ldquo;PowerPoint&rdquo; is just the name of one "
@@ -2215,11 +2359,11 @@
 "Impress de LibreOffice.org."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Product&rdquo;"
 msgstr "«Producto»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you're talking about a product, by all means call it that.  However, when "
 "referring to a service, please do not call it a &ldquo;product.&rdquo; If a "
@@ -2235,12 +2379,12 @@
 "«producto», insista firmemente en llamarla «oferta»."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Protection&rdquo;"
 msgstr "«Protección»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers' lawyers love to use the term &ldquo;protection&rdquo; to "
 "describe copyright.  This word carries the implication of preventing "
@@ -2256,7 +2400,7 @@
 "usuarios, que son quienes sufren la restricción."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms instead.  "
 "For example, instead of saying, &ldquo;Copyright protection lasts a very "
@@ -2267,7 +2411,7 @@
 "su lugar. Por ejemplo, en lugar de «la protección del copyright dura "
 "demasiado» se puede decir «el copyright dura demasiado»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Likewise, instead of saying, &ldquo;protected by copyright,&rdquo; you can "
 "say, &ldquo;covered by copyright&rdquo; or just &ldquo;copyrighted.&rdquo;"
@@ -2276,7 +2420,7 @@
 "«cubierto por copyright», o simplemente «con copyright»."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to criticize copyright rather than be neutral, you can use the "
 "term &ldquo;copyright restrictions.&rdquo; Thus, you can say, &ldquo;"
@@ -2287,14 +2431,31 @@
 "restricciones del copyright duran demasiado»."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The term &ldquo;protection&rdquo; is also used to describe malicious
+# | features.  For instance, &ldquo;copy protection&rdquo; is a feature that
+# | interferes with copying.  From the user's point of view, this is
+# | obstruction.  So we could call that malicious feature &ldquo;copy
+# | obstruction.&rdquo; More often it is called Digital Restrictions
+# | Management (DRM)&mdash;see the <a
+# | href=\"http{+s+}://DefectiveByDesign.org\"> Defective by Design</a>
+# | campaign.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;protection&rdquo; is also used to describe malicious "
+#| "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
+#| "interferes with copying.  From the user's point of view, this is "
+#| "obstruction.  So we could call that malicious feature &ldquo;copy "
+#| "obstruction.&rdquo; More often it is called Digital Restrictions "
+#| "Management (DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> "
+#| "Defective by Design</a> campaign."
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
 "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
 "interferes with copying.  From the user's point of view, this is "
 "obstruction.  So we could call that malicious feature &ldquo;copy "
 "obstruction.&rdquo; More often it is called Digital Restrictions Management "
-"(DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> Defective by "
+"(DRM)&mdash;see the <a href=\"https://DefectiveByDesign.org\";> Defective by "
 "Design</a> campaign."
 msgstr ""
 "El término «protección» se utiliza también para describir 
funcionalidades "
@@ -2307,12 +2468,12 @@
 "\">Defective by Design</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;"
 msgstr "«RAND» (razonable y no discriminatorio)"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies that promulgate patent-restricted standards that prohibit "
 "free software typically have a policy of obtaining patent licenses that "
@@ -2329,7 +2490,7 @@
 "cite>» (razonable y no discriminatoria)."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That term whitewashes a class of patent licenses that are normally neither "
 "reasonable nor nondiscriminatory.  It is true that these licenses do not "
@@ -2344,7 +2505,7 @@
 "parte del término «RAND» es engañosa y la otra entraña un prejuicio."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
 "and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
@@ -2362,7 +2523,7 @@
 "que expresamos."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;uniform fee only,&rdquo; or &ldquo;UFO&rdquo; for "
 "short, as a replacement.  It is accurate because the only condition in these "
@@ -2372,11 +2533,11 @@
 "tarifa uniforme) o su abreviación, «UFO». Es más precisa porque la única 
"
 "condición de estas licencias es el pago de una tarifa de regalías uniforme."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;SaaS&rdquo; or &ldquo;Software as a Service&rdquo;"
 msgstr "«SaaS» o «Software como servicio»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We used to say that SaaS (short for &ldquo;Software as a Service&rdquo;) is "
 "an injustice, but then we found that there was a lot of variation in "
@@ -2394,7 +2555,7 @@
 "la única, y explica en qué consiste la injusticia."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/who-does-that-server-really-serve.html\">Who Does "
 "That Server Really Serve?</a> for discussion of this issue."
@@ -2403,7 +2564,7 @@
 "philosophy/who-does-that-server-really-serve.html\">¿A quién sirve 
realmente "
 "ese servidor?</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In Spanish we continue to use the term &ldquo;software como servicio&rdquo; "
 "because the joke of &ldquo;software como ser vicio&rdquo; (&ldquo;software, "
@@ -2414,12 +2575,12 @@
 "bueno como para dejarlo de lado."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sell software&rdquo;"
 msgstr "«Vender software»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
 "exchanging a copy of a free program for a sum of money is <a href=\"/"
@@ -2440,7 +2601,7 @@
 "restricciones privativas al uso de un programa»."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
 "further discussion of this issue."
@@ -2449,11 +2610,11 @@
 "selling.html\">vender software libre</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing (personal data)&rdquo;"
 msgstr "«Compartir (datos personales)»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies manipulate or lure people into revealing personal data and "
 "thus ceding their privacy, please don't refer to this as &ldquo;sharing."
@@ -2469,7 +2630,7 @@
 "obras publicadas, y afirmamos que esto es <em>bueno</em>. Por favor, no "
 "aplique esa palabra a una práctica que es dañina y peligrosa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When one company redistributes collected personal data to another company, "
 "that is even less deserving of the term &ldquo;sharing.&rdquo;"
@@ -2478,11 +2639,11 @@
 "datos personales que ha recopilado."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing economy&rdquo;"
 msgstr "«Economía del compartir»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;sharing economy&rdquo; is not a good way to refer to "
 "services such as Uber and Airbnb that arrange business transactions between "
@@ -2500,7 +2661,7 @@
 "alcance del término «compartir» para incluir tales transacciones socava su 
"
 "significado, por lo que no lo usamos en esos contextos."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A more suitable term for businesses like Uber is the &ldquo;piecework "
 "service economy&rdquo; or &ldquo;gig economy.&rdquo;"
@@ -2510,11 +2671,11 @@
 "(economía de los pequeños encargos) ."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Skype&rdquo;"
 msgstr "«Skype»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;skype&rdquo; as a verb, meaning any kind "
 "of video communication or telephony over the Internet in general.  &ldquo;"
@@ -2535,12 +2696,12 @@
 "\">numerosos programas libres sustitutivos de Skype</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Software Industry&rdquo;"
 msgstr "«Industria del software»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;software industry&rdquo; encourages people to imagine that "
 "software is always developed by a sort of factory and then delivered to "
@@ -2557,7 +2718,7 @@
 "desarrollan software libre no funcionan como fábricas."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;industry&rdquo; is being used as propaganda by advocates of "
 "software patents.  They call software development &ldquo;industry&rdquo; and "
@@ -2579,11 +2740,11 @@
 "bienes materiales»</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Source model&rdquo;"
 msgstr "«Modelo de código»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
@@ -2609,11 +2770,11 @@
 "programas de software libre."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Terminal&rdquo;"
 msgstr "«Terminal»"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Mobile phones and tablets are computers, and people should be able to do "
 "their computing on them using free software.  To call them &ldquo;"
@@ -2627,12 +2788,12 @@
 "de computación."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Theft&rdquo;"
 msgstr "«Robo»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The supporters of a too-strict, repressive form of copyright often use words "
 "like &ldquo;stolen&rdquo; and &ldquo;theft&rdquo; to refer to copyright "
@@ -2644,10 +2805,22 @@
 "copyright. Es una farsa, pero esperan que se tome como una verdad objetiva."
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Under the US legal system, copyright infringement is not theft.  <a
+# | 
href=\"http{+s+}://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\">
+# | Laws about theft are not applicable to copyright infringement.</a> The
+# | supporters of repressive copyright are making an appeal to
+# | authority&mdash;and misrepresenting what authority says.
+#, fuzzy
+#| msgid ""
+#| "Under the US legal system, copyright infringement is not theft.  <a href="
+#| "\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;";
+#| "vol=473&amp;invol=207\"> Laws about theft are not applicable to copyright "
+#| "infringement.</a> The supporters of repressive copyright are making an "
+#| "appeal to authority&mdash;and misrepresenting what authority says."
 msgid ""
 "Under the US legal system, copyright infringement is not theft.  <a href="
-"\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
+"\"https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
 "invol=207\"> Laws about theft are not applicable to copyright infringement.</"
 "a> The supporters of repressive copyright are making an appeal to "
 "authority&mdash;and misrepresenting what authority says."
@@ -2659,9 +2832,19 @@
 "copyright apelan a la autoridad a la vez que tergiversan lo que la misma "
 "autoridad dice."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | To refute them, you can point to this <a
+# | 
href=\"http{+s+}://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright\">
+# | real case</a> which shows what can properly be described as
+# | &ldquo;copyright theft.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "To refute them, you can point to this <a href=\"http://www.guardian.co.uk/";
+#| "books/2013/may/04/harper-lee-kill-mockingbird-copyright\"> real case</a> "
+#| "which shows what can properly be described as &ldquo;copyright theft."
+#| "&rdquo;"
 msgid ""
-"To refute them, you can point to this <a href=\"http://www.guardian.co.uk/";
+"To refute them, you can point to this <a href=\"https://www.guardian.co.uk/";
 "books/2013/may/04/harper-lee-kill-mockingbird-copyright\"> real case</a> "
 "which shows what can properly be described as &ldquo;copyright theft.&rdquo;"
 msgstr ""
@@ -2670,7 +2853,7 @@
 "a>, un ejemplo de lo que se puede describir correctamente como «robo del "
 "copyright»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unauthorized copying is forbidden by copyright law in many circumstances "
 "(not all!), but being forbidden doesn't make it wrong.  In general, laws "
@@ -2685,10 +2868,20 @@
 "aplicación) no se ajustan a nuestra intuición de lo que es bueno o malo (la 
"
 "especificación), lo que se debería cambiar son las leyes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A US judge, presiding over a trial for copyright infringement, recognized
+# | that <a
+# | 
href=\"http{+s+}://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo;
+# | and &ldquo;theft&rdquo; are smear-words.</a>
+#, fuzzy
+#| msgid ""
+#| "A US judge, presiding over a trial for copyright infringement, recognized "
+#| "that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+#| "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
+#| "theft&rdquo; are smear-words.</a>"
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear-words.</a>"
 msgstr ""
@@ -2698,12 +2891,12 @@
 "son términos peyorativos</a>."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Trusted Computing&rdquo;"
 msgstr "«Computación confiable»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;</"
 "a> is the proponents' name for a scheme to redesign computers so that "
@@ -2719,12 +2912,12 @@
 "de vista de los usuarios, es «traicionera»."
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Vendor&rdquo;"
 msgstr "«Vendedor»"
 
 # type: Content of: <p>
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;vendor&rdquo; to refer generally to anyone "
 "that develops or packages software.  Many programs are developed in order to "
@@ -2745,9 +2938,18 @@
 "empaquetadores de las distribuciones GNU/Linux son vendedores. Recomendamos "
 "emplear «proveedor» como término general."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+# | This essay is published in <a
+# | 
href=\"http{+s+}://shop.fsf.org/product/free-software-free-society/\"><cite>Free
+# | Software, Free Society: The Selected Essays of Richard M.
+# | Stallman</cite></a>.
+#, fuzzy
+#| msgid ""
+#| "This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+#| "software-free-society/\"><cite>Free Software, Free Society: The Selected "
+#| "Essays of Richard M. Stallman</cite></a>."
 msgid ""
-"This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+"This essay is published in <a href=\"https://shop.fsf.org/product/free-";
 "software-free-society/\"><cite>Free Software, Free Society: The Selected "
 "Essays of Richard M. Stallman</cite></a>."
 msgstr ""
@@ -2781,7 +2983,6 @@
 "proponer otras correcciones o sugerencias, diríjase a <a href=\"mailto:";
 "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
-#
 #.  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
@@ -2789,14 +2990,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</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>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "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."
 msgstr ""
 "El equipo de traductores al español se esfuerza por ofrecer traducciones "
@@ -2807,16 +3008,13 @@
 "\">Guía para las traducciones</a> para obtener información sobre la "
 "coordinación y el envío de traducciones de las páginas de este sitio web."
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free Software "
-"Foundation, Inc."
+# | Copyright &copy; [-2014, 2015, 2016-] {+1996-2018, 2020, 2021+} Free
+# | Software Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 1996-2018, 2020, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -2842,3 +3040,13 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización:"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~ "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~ "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free "
+#~ "Software Foundation, Inc."

Index: words-to-avoid.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.fr.po,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -b -r1.298 -r1.299
--- words-to-avoid.fr.po        4 Jul 2021 18:22:47 -0000       1.298
+++ words-to-avoid.fr.po        21 Jul 2021 19:32:33 -0000      1.299
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2021-05-31 03:55+0000\n"
+"POT-Creation-Date: 2021-07-21 19:25+0000\n"
 "PO-Revision-Date: 2021-07-04 20:19+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-07-21 19:25+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -27,13 +28,13 @@
 "Mots à éviter (ou à utiliser avec précaution), car connotés ou prêtant 
à "
 "confusion - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Words to Avoid (or Use with Care) Because They Are Loaded or Confusing"
 msgstr ""
 "Mots à éviter ou à utiliser avec précaution,<br /><small>car connotés ou 
"
 "prêtant à confusion</small>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are a number of words and phrases that we recommend avoiding, or "
 "avoiding in certain contexts and usages.  Some are ambiguous or misleading; "
@@ -45,48 +46,38 @@
 "ou trompeurs ; d'autres présupposent un point de vue avec lequel nous ne "
 "sommes pas d'accord et, nous l'espérons, vous n'êtes pas d'accord non plus."
 
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
-"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
-"It The Swindle?</a>"
-msgstr ""
-"À consulter également : <a 
href=\"/philosophy/categories.html\">Catégories "
-"de logiciels libres et non libres</a> et <a href=\"/philosophy/why-call-it-"
-"the-swindle.html\">Pourquoi l'appeler le Swindle (l'arnaque) ?</a>"
-
 #.  GNUN-SORT-START 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ad-blocker\">Ad-blocker</a>&rdquo; |"
 msgstr "« <a href=\"#Ad-blocker\">bloqueur de pub</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Access\">Access</a>&rdquo; |"
 msgstr "« <a href=\"#Access\">accès</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Alternative\">Alternative</a>&rdquo; |"
 msgstr "« <a href=\"#Alternative\">alternative</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Assets\">Assets</a>&rdquo; |"
 msgstr "« <a href=\"#Assets\">actifs</a> |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#BSD-style\">BSD-style</a>&rdquo; |"
 msgstr "<!-- « BSD » --> « <a href=\"#BSD-style\">type BSD</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Closed\">Closed</a>&rdquo; |"
 msgstr "« <a href=\"#Closed\">fermé</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CloudComputing\">Cloud Computing</a>&rdquo; |"
 msgstr ""
 "« <a href=\"#CloudComputing\"><i>cloud computing</i></a> », « <a href="
@@ -94,37 +85,37 @@
 "\"#CloudComputing\">informatique en nuage</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Commercial\">Commercial</a>&rdquo; |"
 msgstr "« <a href=\"#Commercial\">commercial</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Compensation\">Compensation</a>&rdquo; |"
 msgstr "« <a href=\"#Compensation\">compensation</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consume\">Consume</a>&rdquo; |"
 msgstr "« <a href=\"#Consume\">consommer</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consumer\">Consumer</a>&rdquo; |"
 msgstr "« <a href=\"#Consumer\">consommateur</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Content\">Content</a>&rdquo; |"
 msgstr "« <a href=\"#Content\">contenu</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CopyrightOwner\">Copyright Owner</a>&rdquo; |"
 msgstr "« <a href=\"#CopyrightOwner\">Propriétaire de copyright</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#CreativeCommonsLicensed\">Creative Commons licensed</"
 "a>&rdquo; |"
@@ -133,24 +124,24 @@
 "\">sous licence Creative Commons</a> |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Creator\">Creator</a>&rdquo; |"
 msgstr "« <a href=\"#Creator\">créateur</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalGoods\">Digital Goods</a>&rdquo; |"
 msgstr "« <a href=\"#DigitalGoods\">biens numériques</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalLocks\">Digital Locks</a>&rdquo; |"
 msgstr ""
 "« <a href=\"#DigitalLocks\">verrous numériques</a> », « <a href="
 "\"#DigitalLocks\">serrures numériques</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#DigitalRightsManagement\">Digital Rights Management</"
 "a>&rdquo; |"
@@ -159,176 +150,176 @@
 "« <a href=\"#DigitalRightsManagement\">gestion des droits 
numériques</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ecosystem\">Ecosystem</a>&rdquo; |"
 msgstr "« <a href=\"#Ecosystem\">écosystème</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FLOSS\">FLOSS</a>&rdquo; |"
 msgstr "« <a href=\"#FLOSS\">FLOSS</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#ForFree\">For free</a>&rdquo; |"
 msgstr "« <a href=\"#ForFree\">gratuitement</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FOSS\">FOSS</a>&rdquo; |"
 msgstr "« <a href=\"#FOSS\">FOSS</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FreelyAvailable\">Freely available</a>&rdquo; |"
 msgstr ""
 "<!-- « gratuitement+ » --> « <a href=\"#FreelyAvailable"
 "\">disponible gratuitement</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Freeware\">Freeware</a>&rdquo; |"
 msgstr ""
 "« <a href=\"#Freeware\">graticiel</a> », « <a href=\"#Freeware"
 "\"><i>freeware</i></a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#GiveAwaySoftware\">Give away software</a>&rdquo; |"
 msgstr "« <a href=\"#GiveAwaySoftware\">donner des logiciels</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Google\">Google</a>&rdquo; |"
 msgstr "« <a href=\"#Google\">Google</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Hacker\">Hacker</a>&rdquo; |"
 msgstr "« <a href=\"#Hacker\">hacker</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#IntellectualProperty\">Intellectual property</a>&rdquo; |"
 msgstr "« <a href=\"#IntellectualProperty\">propriété intellectuelle</a> 
» |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#InternetofThings\">Internet of Things</a>&rdquo; |"
 msgstr "« <a href=\"#InternetofThings\">Internet des objets</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#LAMP\">LAMP system</a>&rdquo; |"
 msgstr "<!-- « LAMP » --> « <a href=\"#LAMP\">système LAMP</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Linux\">Linux system</a>&rdquo; |"
 msgstr "<!-- « Linux » --> « <a href=\"#Linux\">système Linux</a> » 
|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Market\">Market</a>&rdquo; |"
 msgstr "« <a href=\"#Market\">marché</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Modern\">Modern</a>&rdquo; |"
 msgstr "« <a href=\"#Modern\">moderne</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Monetize\">Monetize</a>&rdquo; |"
 msgstr "« <a href=\"#Monetize\">monétiser</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#MP3Player\">MP3 player</a>&rdquo; |"
 msgstr "<!-- « MP3 » --> « <a href=\"#MP3Player\">lecteur MP3</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Open\">Open</a>&rdquo; |"
 msgstr ""
 "« <a href=\"#Open\">ouvert</a> », « <a href=\"#Open\"><i>open</i></a> 
» |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#OptOut\">Opt out</a>&rdquo; |"
 msgstr "« <a href=\"#OptOut\"><i>Opt out</i></a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PC\">PC</a>&rdquo; |"
 msgstr "« <a href=\"#PC\">PC</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Photoshop\">Photoshop</a>&rdquo; |"
 msgstr "« <a href=\"#Photoshop\">Photoshop</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Piracy\">Piracy</a>&rdquo; |"
 msgstr ""
 "« <a href=\"#Piracy\">piratage</a> », « <a 
href=\"#Piracy\">piraterie</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PowerPoint\">PowerPoint</a>&rdquo; |"
 msgstr "« <a href=\"#PowerPoint\">PowerPoint</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Product\">Product</a>&rdquo; |"
 msgstr "« <a href=\"#Product\">Produit</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Protection\">Protection</a>&rdquo; |"
 msgstr "« <a href=\"#Protection\">protection</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#RAND\">RAND</a>&rdquo; |"
 msgstr "« <a href=\"#RAND\">RAND</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SaaS\">SaaS</a>&rdquo; |"
 msgstr "« <a href=\"#SaaS\">SaaS</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SellSoftware\">Sell software</a>&rdquo; |"
 msgstr "« <a href=\"#SellSoftware\">vendre des logiciels</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#SharingPersonalData\">Sharing (personal data)</a>&rdquo; |"
 msgstr ""
 "« <a href=\"#SharingPersonalData\">partage (de données personnelles)</a> 
» |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SharingEconomy\">Sharing economy</a>&rdquo; |"
 msgstr "« <a href=\"#SharingEconomy\">économie de partage</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Skype\">Skype</a>&rdquo; |"
 msgstr "« <a href=\"#Skype\">Skype</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SoftwareIndustry\">Software Industry</a>&rdquo; |"
 msgstr "« <a href=\"#SoftwareIndustry\">industrie du logiciel</a> » |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SourceModel\">Source model</a>&rdquo; |"
 msgstr ""
 "<!-- « source » --> « <a href=\"#SourceModel\">modèle de source</a> 
» |"
@@ -339,7 +330,7 @@
 #.      language to refer to mobile computers; otherwise,
 #.      fill the translation with a space. 
 #.  GNUN-SORT-BEGIN-KEY 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Terminal\">Terminal</a>&rdquo; |"
 msgstr "« <a href=\"#Terminal\">terminal</a> » |"
 
@@ -347,25 +338,35 @@
 #. #endif
 #.  
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Theft\">Theft</a>&rdquo; |"
 msgstr "« <a href=\"#Theft\">vol</a> »"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#TrustedComputing\">Trusted Computing</a>&rdquo; |"
 msgstr "« <a href=\"#TrustedComputing\">informatique de confiance</a> » 
|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Vendor\">Vendor</a>&rdquo;"
 msgstr " "
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><p>
+msgid ""
+"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
+"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
+"It The Swindle?</a>"
+msgstr ""
+"À consulter également : <a 
href=\"/philosophy/categories.html\">Catégories "
+"de logiciels libres et non libres</a> et <a href=\"/philosophy/why-call-it-"
+"the-swindle.html\">Pourquoi l'appeler le Swindle (l'arnaque) ?</a>"
+
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ad-blocker&rdquo;"
 msgstr "« Bloqueur de pub »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When the purpose of some program is to block advertisements, &ldquo;ad-"
 "blocker&rdquo; is a good term for it.  However, the GNU browser IceCat "
@@ -380,11 +381,11 @@
 "sites web. Ce n'est pas un « bloqueur de pub », c'est de la 
<em>protection "
 "contre la surveillance</em>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Access&rdquo;"
 msgstr "« Accès »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is a common misunderstanding to think free software means that the public "
 "has &ldquo;access&rdquo; to a program.  That is not what free software means."
@@ -393,7 +394,7 @@
 "logiciel est une idée erronée courante. Ce n'est pas ce que veut dire "
 "logiciel libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/philosophy/free-sw.html\">criterion for free software</a> is "
 "not about who has &ldquo;access&rdquo; to the program; the four essential "
@@ -412,7 +413,7 @@
 "vous ; vous n'avez pas le <em>droit</em> d'exiger une copie de ce programme "
 "d'un utilisateur, quel qu'il soit."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In particular, if you write a program yourself and never offer a copy to "
 "anyone else, that program is free software albeit in a trivial way, because "
@@ -424,7 +425,7 @@
 "triviale, parce chacun des utilisateurs qui en possède une copie a les "
 "quatre libertés essentielles et que le seul utilisateur, c'est vous."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, when many users have copies of a program, someone is sure to "
 "post it on the internet, giving everyone access to it.  We think people "
@@ -437,7 +438,7 @@
 "faire si le programme est utile. Mais ce n'est pas une exigence du logiciel "
 "libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There is one specific point in which a question of having access is directly "
 "pertinent to free software: the GNU GPL permits giving a particular user "
@@ -451,7 +452,7 @@
 "de lui donner une copie physique du code source. Ceci s'applique au cas "
 "spécial où l'utilisateur a déjà une copie du programme sous forme non 
source."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>with free software, the public has access to the program</b>, "
 "we say, <b>with free software, the users have the essential freedoms</b> and "
@@ -463,11 +464,11 @@
 "fondamentales</b> et <b>Avec le logiciel libre, les utilisateurs ont la "
 "maîtrise de ce que le programme fait pour eux</b>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Alternative&rdquo;"
 msgstr "« Alternative »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't describe free software in general as an &ldquo;alternative&rdquo; "
 "to proprietary, because that word presumes all the &ldquo;"
@@ -482,7 +483,7 @@
 "logiciel libre devrait coexister avec du logiciel qui ne respecte pas la "
 "liberté des utilisateurs."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
@@ -499,7 +500,7 @@
 "assujettissent leurs utilisateurs. Nous ne pensons pas que ce soit une bonne "
 "chose de proposer aux utilisateurs ces « alternatives » au logiciel 
libre."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Special circumstances can drive users toward running one particular program "
 "for a certain job.  For instance, when a web page sends JavaScript client "
@@ -514,11 +515,11 @@
 "autres codes possibles. Dans ce cas, il est justifié de décrire chacun des "
 "autres codes qui effectuent la tâche en question comme une alternative."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Assets&rdquo;"
 msgstr "« Actifs » <i>[assets]</i>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To refer to published works as &ldquo;assets&rdquo;, or &ldquo;digital "
 "assets&rdquo;, is even worse than calling them <a href=\"#Content\">&ldquo;"
@@ -530,11 +531,11 @@
 "\">contenu</a> ». Cela suppose que, pour la société, elles n'ont qu'une "
 "valeur comptable."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;BSD-style&rdquo;"
 msgstr "« Type BSD »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/licenses/bsd.html\">lumps together licenses that have important "
@@ -548,7 +549,7 @@
 "avec sa clause publicitaire, n'est pas compatible avec la GNU GPL, mais la "
 "licence BSD révisée est compatible avec la GPL."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, it is best to name <a href=\"/licenses/license-list.html"
 "\"> the specific license in question</a> and avoid the vague term &ldquo;BSD-"
@@ -558,11 +559,11 @@
 "license-list.html\">la licence spécifique en question</a> et d'éviter le "
 "terme vague « de type BSD »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Closed&rdquo;"
 msgstr "« Fermé »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source.&rdquo; In the free software movement, <a href=\"/"
@@ -584,13 +585,13 @@
 "\">privateur</a> ».<a id=\"TransNote3-rev\" href=\"#TransNote3\"><sup>3</"
 "sup></a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Cloud Computing&rdquo;"
 msgstr ""
 "« <i>Cloud computing</i> », « informatique dans les nuages » et "
 "« informatique en nuage »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;cloud computing&rdquo; (or just &ldquo;cloud&rdquo;, in the "
 "context of computing) is a marketing buzzword with no coherent meaning.  It "
@@ -610,7 +611,7 @@
 "dans vos réflexions, votre pensée sera confuse ; pourrait-on dire "
 "« nébuleuse » ?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When thinking about or responding to a statement someone else has made using "
 "this term, the first step is to clarify the topic.  What scenario is the "
@@ -623,12 +624,23 @@
 "ce scénario ? Une fois que le sujet sera formulé clairement, il deviendra "
 "possible d'y réfléchir de manière cohérente."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | One of the many meanings of &ldquo;cloud computing&rdquo; is storing your
+# | data in online services.  In most scenarios, that is foolish because it
+# | exposes you to <a
+# | href=\"http{+s+}://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spo
+# | oks-cloud-antiauthoritarian-dream\">surveillance</a>.
+#, fuzzy
+#| msgid ""
+#| "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
+#| "data in online services.  In most scenarios, that is foolish because it "
+#| "exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/";
+#| "apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgid ""
 "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
 "data in online services.  In most scenarios, that is foolish because it "
-"exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/";
-"hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
+"exposes you to <a href=\"https://www.guardian.co.uk/commentisfree/2011/";
+"apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgstr ""
 "Parmi les nombreuses significations de <i>cloud computing</i>, il y a le "
 "stockage de données sur des services en ligne. Dans la plupart des "
@@ -636,7 +648,7 @@
 "guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-"
 "antiauthoritarian-dream\">surveillance</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning (which overlaps that but is not the same thing)  is <a href="
 "\"/philosophy/who-does-that-server-really-serve.html\"> Service as a "
@@ -650,7 +662,7 @@
 "prive de tout contrôle sur votre informatique. Vous ne devriez jamais "
 "utiliser de SaaSS."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is renting a remote physical server, or virtual server.  "
 "These practices are ok under certain circumstances."
@@ -659,7 +671,7 @@
 "distant, ou d'un serveur virtuel, pratiques valables dans certaines "
 "circonstances."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is accessing your own server from your own mobile device.  "
 "That raises no particular ethical issues."
@@ -668,7 +680,7 @@
 "partir de votre propre appareil mobile, ce qui ne pose pas de problème "
 "éthique particulier."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"https://csrc.nist.gov/publications/detail/sp/800-145/final\";> "
 "NIST definition of \"cloud computing\"</a> mentions three scenarios that "
@@ -691,7 +703,7 @@
 "largement le SaaSS (service se substituant au logiciel), qui ne traite pas "
 "correctement l'utilisateur ; mais les deux concepts ne sont pas 
équivalents."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "These different computing practices don't even belong in the same "
 "discussion.  The best way to avoid the confusion the term &ldquo;cloud "
@@ -705,10 +717,22 @@
 "de « nuage », quand il s'agit d'informatique. Parlez du scénario qui 
vous "
 "occupe et désignez-le d'un nom spécifique."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Curiously, Larry Ellison, a proprietary software developer, also <a
+# | 
href=\"http{+s+}://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\">
+# | noted the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He
+# | decided to use the term anyway because, as a proprietary software
+# | developer, he isn't motivated by the same ideals as we are.
+#, fuzzy
+#| msgid ""
+#| "Curiously, Larry Ellison, a proprietary software developer, also <a href="
+#| "\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> "
+#| "noted the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He "
+#| "decided to use the term anyway because, as a proprietary software "
+#| "developer, he isn't motivated by the same ideals as we are."
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a href="
-"\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
+"\"https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
 "the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He decided to use "
 "the term anyway because, as a proprietary software developer, he isn't "
 "motivated by the same ideals as we are."
@@ -719,11 +743,11 @@
 "décidé de l'utiliser quand même, car en tant que développeur de logiciel "
 "privateur, il n'est pas motivé par les mêmes idéaux que nous."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Commercial&rdquo;"
 msgstr "« Commercial »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;nonfree."
 "&rdquo; That confuses two entirely different issues."
@@ -731,7 +755,7 @@
 "N'utilisez pas le mot « commercial » comme synonyme de « non libre ». 
Cela "
 "mélange deux notions totalement distinctes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A program is commercial if it is developed as a business activity.  A "
 "commercial program can be free or nonfree, depending on its manner of "
@@ -747,7 +771,7 @@
 "de sa licence. Les deux questions, quel type d'entité a développé le "
 "programme et quelle liberté est laissée aux utilisateurs, sont 
indépendantes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the first decade of the free software movement, free software packages "
 "were almost always noncommercial; the components of the GNU/Linux operating "
@@ -761,7 +785,7 @@
 "organisations non commerciales telles que la FSF ou des universités. Mais "
 "dans les années 1990, le logiciel commercial libre a commencé à 
apparaître."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
@@ -776,11 +800,11 @@
 "contient une contradiction interne et la rejettent. Faisons attention à ne "
 "pas utiliser le mot « commercial » dans ce sens."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Compensation&rdquo;"
 msgstr "« Compensation »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;compensation for authors&rdquo; in connection with "
 "copyright carries the assumptions that (1) copyright exists for the sake of "
@@ -796,7 +820,7 @@
 "<a href=\"/philosophy/misinterpreting-copyright.html\">fausse</a>, et la "
 "seconde est choquante."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Compensating the rights-holders&rdquo; adds a further swindle: you're "
 "supposed to imagine that means paying the authors, and occasionally it does, "
@@ -808,11 +832,11 @@
 "cas parfois, mais la plupart du temps cela induit des subsides pour les "
 "mêmes sociétés d'édition qui nous assomment de lois injustes."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consume&rdquo;"
 msgstr "« Consommer »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Consume&rdquo; refers to what we do with food: we ingest it, after "
 "which the food as such no longer exists.  By analogy, we employ the same "
@@ -834,7 +858,7 @@
 "illimité de fois, est une extension abusive. Jouer un enregistrement ou "
 "exécuter un programme ne le consomme pas."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use &ldquo;consume&rdquo; in this context will say they don't mean "
 "it literally.  What, then, does it mean? It means to regard copies of "
@@ -854,14 +878,34 @@
 "votre voiture utilise aujourd'hui d'une autre goutte qu'elle a utilisée la "
 "semaine dernière."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | What does it mean to think of works of authorship as a commodity, with the
+# | assumption that there is nothing special about any one story, article,
+# | program, or song? That is the twisted viewpoint of the owner or the
+# | accountant of a publishing company.  It is no surprise that proprietary
+# | software would like you to think of the use of software as a commodity. 
+# | Their twisted viewpoint comes through clearly in <a
+# | 
href=\"http{+s+}://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6\">this
+# | article</a>, which also refers to publications as &ldquo;<a
+# | href=\"#Content\">content</a>.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "What does it mean to think of works of authorship as a commodity, with "
+#| "the assumption that there is nothing special about any one story, "
+#| "article, program, or song? That is the twisted viewpoint of the owner or "
+#| "the accountant of a publishing company.  It is no surprise that "
+#| "proprietary software would like you to think of the use of software as a "
+#| "commodity.  Their twisted viewpoint comes through clearly in <a href="
+#| "\"http://www.businessinsider.com/former-google-exec-launches-sourcepoint-";
+#| "with-10-million-series-a-funding-2015-6\">this article</a>, which also "
+#| "refers to publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
 msgid ""
 "What does it mean to think of works of authorship as a commodity, with the "
 "assumption that there is nothing special about any one story, article, "
 "program, or song? That is the twisted viewpoint of the owner or the "
 "accountant of a publishing company.  It is no surprise that proprietary "
 "software would like you to think of the use of software as a commodity.  "
-"Their twisted viewpoint comes through clearly in <a href=\"http://www.";
+"Their twisted viewpoint comes through clearly in <a href=\"https://www.";
 "businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-"
 "series-a-funding-2015-6\">this article</a>, which also refers to "
 "publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
@@ -877,11 +921,25 @@
 "a>, qui se réfère également aux publications en tant que « <a 
href=\"#Content"
 "\">contenu</a> »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The narrow thinking associated with the idea that we &ldquo;consume
+# | content&rdquo; paves the way for laws such as the DMCA that forbid users
+# | to break the <a href=\"http{+s+}://DefectiveByDesign.org/\">Digital
+# | Restrictions Management</a> (DRM) facilities in digital devices.  If users
+# | think what they do with these devices is &ldquo;consume,&rdquo; they may
+# | see such restrictions as natural.
+#, fuzzy
+#| msgid ""
+#| "The narrow thinking associated with the idea that we &ldquo;consume "
+#| "content&rdquo; paves the way for laws such as the DMCA that forbid users "
+#| "to break the <a href=\"http://DefectiveByDesign.org/\";>Digital "
+#| "Restrictions Management</a> (DRM) facilities in digital devices.  If "
+#| "users think what they do with these devices is &ldquo;consume,&rdquo; "
+#| "they may see such restrictions as natural."
 msgid ""
 "The narrow thinking associated with the idea that we &ldquo;consume "
 "content&rdquo; paves the way for laws such as the DMCA that forbid users to "
-"break the <a href=\"http://DefectiveByDesign.org/\";>Digital Restrictions "
+"break the <a href=\"https://DefectiveByDesign.org/\";>Digital Restrictions "
 "Management</a> (DRM) facilities in digital devices.  If users think what "
 "they do with these devices is &ldquo;consume,&rdquo; they may see such "
 "restrictions as natural."
@@ -895,7 +953,7 @@
 "leur servent à « consommer », ils peuvent considérer de telles 
restrictions "
 "comme naturelles."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It also encourages the acceptance of &ldquo;streaming&rdquo; services, which "
 "use DRM to perversely limit listening to music, or watching video, to "
@@ -907,7 +965,7 @@
 "visionnage de vidéos, de manière à faire rentrer ces activités dans le 
champ "
 "de la « consommation »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why is this perverse usage spreading? Some may feel that the term sounds "
 "sophisticated, but rejecting it with cogent reasons can appear even more "
@@ -926,7 +984,7 @@
 "terme dans des forums prestigieux donne l'impression que c'est le terme "
 "« correct »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;consuming&rdquo; music, fiction, or any other artistic "
 "works is to treat them as commodities rather than as art.  Do we want to "
@@ -938,7 +996,7 @@
 "l'art. Est-ce de cette façon que nous voulons penser aux œuvres publiées 
? "
 "Est-ce à cela que nous voulons encourager le public ?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who answer no, please join me in shunning the term &ldquo;"
 "consume&rdquo; for this."
@@ -946,7 +1004,7 @@
 "Si votre réponse est non, joignez-vous à moi ; bannissez le terme "
 "« consommer » de votre vocabulaire dans ce contexte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What to use instead? You can use specific verbs such as &ldquo;read,&rdquo; "
 "&ldquo;listen to,&rdquo; &ldquo;watch&rdquo; or &ldquo;look at,&rdquo; since "
@@ -956,7 +1014,7 @@
 "comme « lire », « écouter », « visionner », « regarder », 
car ils "
 "contribuent à freiner notre tendance à la généralisation abusive."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you insist on generalizing, you can use the expression &ldquo;attend to,"
 "&rdquo; which requires less of a stretch than &ldquo;consume.&rdquo; For a "
@@ -967,15 +1025,15 @@
 "s'agit d'une œuvre à usage pratique, « utiliser » est ce qui convient 
le "
 "mieux."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "See also the following entry."
 msgstr "Voir également la rubrique précédente."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consumer&rdquo;"
 msgstr "« Consommateur »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;consumer,&rdquo; when used to refer to the users of "
 "computing, is loaded with assumptions we should reject.  Some come from the "
@@ -991,7 +1049,7 @@
 "amène les gens à transposer aux œuvres numériques copiables les 
conclusions "
 "économiques établies à propos de produits matériels non copiables."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In addition, describing the users of software as &ldquo;consumers&rdquo; "
 "refers to a framing in which people are limited to selecting between "
@@ -1007,7 +1065,7 @@
 "\"/philosophy/free-software-even-more-important.html\">avoir le contrôle "
 "direct de ce que fait un logiciel</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To describe people who are not limited to passive use of works, we suggest "
 "terms such as &ldquo;individuals&rdquo; and &ldquo;citizens,&rdquo; rather "
@@ -1017,9 +1075,17 @@
 "d'œuvres, nous suggérons des termes comme « personnes », « 
particuliers » et "
 "« citoyens », plutôt que « consommateurs »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This problem with the word &ldquo;consumer&rdquo; has been <a
+# | 
href=\"http{+s+}://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams\">noted
+# | before</a>.
+#, fuzzy
+#| msgid ""
+#| "This problem with the word &ldquo;consumer&rdquo; has been <a href="
+#| "\"http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-";
+#| "language-raymond-williams\">noted before</a>."
 msgid ""
-"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"http://";
+"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"https://";
 "www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-"
 "williams\">noted before</a>."
 msgstr ""
@@ -1027,11 +1093,11 @@
 "theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-"
 "williams\">déjà été signalé</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Content&rdquo;"
 msgstr "« Contenu »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to describe a feeling of comfort and satisfaction, by all means "
 "say you are &ldquo;content,&rdquo; but using the word as a noun to describe "
@@ -1051,7 +1117,7 @@
 "n'êtes pas d'accord avec cette attitude, vous pouvez les appeler « 
œuvres » "
 "ou « publications »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use the term &ldquo;content&rdquo; are often the publishers that "
 "push for increased copyright power in the name of the authors (&ldquo;"
@@ -1068,7 +1134,7 @@
 "également reconnu <a href=\"https://www.theguardian.com/culture/2016/aug/02/";
 "how-to-deal-with-trump-trolls-online\">dans <cite>The Guardian</cite></a>:"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Content itself is beside the point&mdash;as the very use of words like "
 "content suggests. The moment you start labelling every single piece of "
@@ -1080,7 +1146,7 @@
 "textes écrits sur la planète, vous avez admis qu'ils sont interchangeables, 
"
 "que leur but premier est d'alimenter la machine à quantifier."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In other words, &ldquo;content&rdquo; reduces publications and writings to a "
 "sort of pap fit to be piped through the &ldquo;tubes&rdquo; of the internet."
@@ -1089,7 +1155,7 @@
 "d'une bouillie tout juste bonne à être injectée dans les « tuyaux » "
 "d'Internet."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See also <a href=\"https://www.salon.com/2000/06/14/love_7/\";>Courtney "
 "Love's open letter to Steve Case</a> and search for &ldquo;content "
@@ -1103,7 +1169,7 @@
 "le terme « propriété intellectuelle », lui aussi, est entaché <a href="
 "\"#IntellectualProperty\">de parti pris et de confusion</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "However, as long as other people use the term &ldquo;content provider,"
 "&rdquo; political dissidents can well call themselves &ldquo;malcontent "
@@ -1114,7 +1180,7 @@
 "dissidents politiques peuvent tout aussi bien se donner le nom de "
 "« fournisseurs de mécontentement » <i>[malcontent providers]</i>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
 "&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
@@ -1129,7 +1195,7 @@
 "de gestion de contenu » est un système pour faire quelque chose avec un 
type "
 "d'information. Cette description correspond à la plupart des programmes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
 "web site.  For that, we recommend the term &ldquo;web site revision "
@@ -1139,11 +1205,11 @@
 "à jour des pages sur un site web. Pour cela, nous recommandons le terme "
 "« système de révision pour site web »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Copyright Owner&rdquo;"
 msgstr "« Propriétaire de copyright »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyright is an artificial privilege, handed out by the state to achieve a "
 "public interest and lasting a period of time &mdash; not a natural right "
@@ -1156,7 +1222,7 @@
 "les juristes avaient l'habitude d'appeler le récipiendaire de ce privilège "
 "« détenteur de copyright »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A few decades ago, copyright holders began trying to reduce awareness of "
 "this point.  In addition to citing frequently the bogus concept of <a href="
@@ -1172,11 +1238,11 @@
 "comme « propriétaires de copyright ». Résistez avec nous en utilisant 
le "
 "terme traditionnel de « détenteur de copyright »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creative Commons licensed&rdquo;"
 msgstr "<!-- « Creative » --> « Sous licence Creative Commons »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The most important licensing characteristic of a work is whether it is "
 "free.  Creative Commons publishes seven licenses; three are free (CC BY, CC "
@@ -1192,7 +1258,7 @@
 "ne dit pas si elle est libre et suggère que la question est sans importance. 
"
 "La réponse est peut-être positive, mais ne pas la donner est dommageable."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To encourage people to pay attention to the most important distinction, "
 "always specify <em>which</em> Creative Commons license is used, as in &ldquo;"
@@ -1205,11 +1271,11 @@
 "vous ne savez pas quelle licence régit une œuvre donnée, renseignez-vous 
et "
 "alors seulement formulez votre phrase."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creator&rdquo;"
 msgstr "« Créateur »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
@@ -1230,11 +1296,11 @@
 "réellement dire. Ces deux termes ne sont pas équivalents. Il arrive souvent 
"
 "que le détenteur du copyright ne soit pas l'auteur."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr "« Biens numériques »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
 "authorship, identifies them with physical goods&mdash;which cannot be "
@@ -1253,11 +1319,11 @@
 "ces questions dans le cadre de l'économie, dont les valeurs superficielles "
 "et limitées ne comportent pas les notions de liberté et de communauté."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Locks&rdquo;"
 msgstr "« Verrous (ou serrures) numériques »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital locks&rdquo; is used to refer to Digital Restrictions "
 "Management by some who criticize it.  The problem with this term is that it "
@@ -1271,12 +1337,29 @@
 "justice à la malignité des DRM. Les gens qui ont inventé ces expressions 
n'y "
 "ont pas bien réfléchi."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Locks are not necessarily oppressive or bad.  You probably own several
+# | locks, and their keys or codes as well; you may find them useful or
+# | troublesome, but they don't oppress you, because you can open and close
+# | them.  Likewise, we find <a
+# | 
href=\"http{+s+}://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\">encryption</a>
+# | invaluable for protecting our digital files.  That too is a kind of
+# | digital lock that you have control over.
+#, fuzzy
+#| msgid ""
+#| "Locks are not necessarily oppressive or bad.  You probably own several "
+#| "locks, and their keys or codes as well; you may find them useful or "
+#| "troublesome, but they don't oppress you, because you can open and close "
+#| "them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+#| "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-"
+#| "the-good-guys-have-keys-to-\">encryption</a> invaluable for protecting "
+#| "our digital files.  That too is a kind of digital lock that you have "
+#| "control over."
 msgid ""
 "Locks are not necessarily oppressive or bad.  You probably own several "
 "locks, and their keys or codes as well; you may find them useful or "
 "troublesome, but they don't oppress you, because you can open and close "
-"them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+"them.  Likewise, we find <a href=\"https://www.theguardian.com/";
 "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
 "good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
 "digital files.  That too is a kind of digital lock that you have control "
@@ -1292,7 +1375,7 @@
 "fichiers numériques. Cela aussi est une sorte de serrure sur laquelle vous "
 "exercez un contrôle."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "DRM is like a lock placed on you by someone else, who refuses to give you "
 "the key&mdash;in other words, like <em>handcuffs</em>.  Therefore, the "
@@ -1304,7 +1387,7 @@
 "des <em>menottes</em>. Par conséquent la métaphore appropriée au DRM est "
 "« menottes numériques » et non « verrous (ou serrures) numériques 
»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A number of opposition campaigns have chosen the unwise term &ldquo;digital "
 "locks&rdquo;; to get things back on the right track, we must firmly insist "
@@ -1321,11 +1404,11 @@
 "déclarons notre soutien, nous remplaçons ostensiblement cette expression 
par "
 "« menottes numériques » et nous disons pourquoi."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Rights Management&rdquo;"
 msgstr "« Gestion numérique des droits » ou « Gestion des droits 
numériques »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital Rights Management&rdquo; (abbreviated &ldquo;DRM&rdquo;) "
 "refers to technical mechanisms designed to impose restrictions on computer "
@@ -1342,7 +1425,7 @@
 "qui impose ces restrictions, tout en ignorant celui du grand public à qui "
 "elles sont imposées."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Good alternatives include &ldquo;Digital Restrictions Management,&rdquo; and "
 "&ldquo;digital handcuffs.&rdquo;"
@@ -1351,20 +1434,26 @@
 "[Digital Restrictions Management]</i> et « menottes numériques » 
<i>[digital "
 "handcuffs]</i>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Please sign up to support our <a
+# | href=\"http{+s+}://DefectiveByDesign.org/\"> campaign to abolish DRM</a>.
+#, fuzzy
+#| msgid ""
+#| "Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+#| "campaign to abolish DRM</a>."
 msgid ""
-"Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+"Please sign up to support our <a href=\"https://DefectiveByDesign.org/\";> "
 "campaign to abolish DRM</a>."
 msgstr ""
 "Merci de vous inscrire sur le site de notre <a href=\"http://";
 "DefectiveByDesign.org/\">campagne pour abolir les DRM</a> pour lui apporter "
 "votre soutien."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ecosystem&rdquo;"
 msgstr "« Écosystème »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is inadvisable to describe the free software community, or any human "
 "community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
@@ -1374,7 +1463,7 @@
 "communauté humaine, comme un « écosystème », parce que ce mot implique 
une "
 "absence de jugement éthique."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;ecosystem&rdquo; implicitly suggests an attitude of "
 "nonjudgmental observation: don't ask how what <em>should</em> happen, just "
@@ -1395,7 +1484,7 @@
 "leur environnement ; ce n'est ni bien ni mal, juste un phénomène 
écologique, "
 "même si cela peut aller jusqu'à l'extinction d'une espèce."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By contrast, beings that adopt an ethical stance towards their surroundings "
 "can decide to preserve things that, without their intervention, might "
@@ -1410,11 +1499,11 @@
 "du climat, la propreté de l'air et de l'eau, les espèces en danger, les 
arts "
 "traditionnels&hellip; et la liberté des utilisateurs de l'informatique."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FLOSS&rdquo;"
 msgstr "« FLOSS »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
 "Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
@@ -1429,11 +1518,11 @@
 "Mais si vous voulez montrez que vous êtes partisan de la liberté, 
n'employez "
 "pas de terme neutre."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;For free&rdquo;"
 msgstr "« Gratuitement »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to say that a program is free software, please don't say that it "
 "is available &ldquo;for free.&rdquo; That term specifically means &ldquo;for "
@@ -1445,7 +1534,7 @@
 "le logiciel libre, c'est la liberté, pas le prix.<a id=\"TransNote4-rev\" "
 "href=\"#TransNote4\"><sup>4</sup></a>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software copies are often available for free&mdash;for example, by "
 "downloading via FTP.  But free software copies are also available for a "
@@ -1459,7 +1548,7 @@
 "disponibles gratuitement et quelques-uns sont gratuits en temps normal pour "
 "certains utilisateurs."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, you can say that the program is available &ldquo;as free "
 "software.&rdquo;"
@@ -1467,11 +1556,11 @@
 "Pour éviter toute confusion, vous pouvez dire que le programme est "
 "disponible « en tant que logiciel libre »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FOSS&rdquo;"
 msgstr "« FOSS »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
 "&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
@@ -1486,17 +1575,17 @@
 "« FLOSS » est un meilleur choix. Mais si vous voulez montrez que vous 
êtes "
 "partisan de la liberté, n'employez pas de terme neutre."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>FOSS</b>, we say, <b>free software</b> or <b>free (libre) "
 "software</b>."
 msgstr "Au lieu de « FOSS », nous disons <b>logiciel libre</b>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freely available&rdquo;"
 msgstr "<!--« gratuitement+ » --> « Disponible gratuitement »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The terms are not equivalent.  Software is &ldquo;"
@@ -1511,11 +1600,11 @@
 "accordée aux utilisateurs qui en ont une copie. Ce sont des réponses à des 
"
 "questions différentes."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freeware&rdquo;"
 msgstr "« Graticiel » ou « <i>freeware</i> »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;freeware&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The term &ldquo;freeware&rdquo; was used often in the "
@@ -1528,7 +1617,7 @@
 "exécutable, sans le code source. Aujourd'hui, ce terme n'a pas vraiment de "
 "définition acceptée."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When using languages other than English, please avoid borrowing English "
 "terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; It is "
@@ -1541,7 +1630,7 @@
 "dans <a href=\"/philosophy/fs-translations.html\">votre langue</a> (en "
 "français : logiciel libre)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By using a word in <a href=\"/philosophy/fs-translations.html\">your own "
 "language</a>, you show that you are really referring to freedom and not just "
@@ -1558,11 +1647,11 @@
 "que le logiciel libre fait exactement ce qu'il dit, ils comprendront "
 "vraiment le message qu'il véhicule."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Give away software&rdquo;"
 msgstr "« Donner des logiciels »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
 "distribute a program as free software.&rdquo; This locution has the same "
@@ -1576,11 +1665,11 @@
 "liberté. Une façon d'éviter la confusion est de dire « distribuer en 
tant "
 "que logiciel libre »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Google&rdquo;"
 msgstr "« Google »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;google&rdquo; as a verb, meaning to "
 "search for something on the internet. &ldquo;Google&rdquo; is just the name "
@@ -1600,13 +1689,29 @@
 "\">DuckDuckGo</a> déclare ne pas pister ses utilisateurs (il n'y a aucun "
 "moyen de vérifier cette assertion de l'extérieur)."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Hacker&rdquo;"
 msgstr "« Hacker »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A hacker is someone who <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\"> enjoys playful
+# | cleverness</a>&mdash;not necessarily with computers.  The programmers in
+# | the old <abbr title=\"Massachusetts Institute of Technology\">MIT</abbr>
+# | free software community of the 60s and 70s referred to themselves as
+# | hackers.  Around 1980, journalists who discovered the hacker community
+# | mistakenly took the term to mean &ldquo;security breaker.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+#| "html\"> enjoys playful cleverness</a>&mdash;not necessarily with "
+#| "computers.  The programmers in the old <abbr title=\"Massachusetts "
+#| "Institute of Technology\">MIT</abbr> free software community of the 60s "
+#| "and 70s referred to themselves as hackers.  Around 1980, journalists who "
+#| "discovered the hacker community mistakenly took the term to mean &ldquo;"
+#| "security breaker.&rdquo;"
 msgid ""
-"A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+"A hacker is someone who <a href=\"https://stallman.org/articles/on-hacking.";
 "html\"> enjoys playful cleverness</a>&mdash;not necessarily with computers.  "
 "The programmers in the old <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr> free software community of the 60s and 70s referred "
@@ -1623,7 +1728,7 @@
 "communauté des hackers ont mal compris ce terme et l'ont assimilé à "
 "« casseurs de sécurité »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't spread this mistake.  People who break security are &ldquo;"
 "crackers.&rdquo;"
@@ -1631,11 +1736,11 @@
 "Merci de ne pas répandre cette erreur. Les personnes qui cassent la 
sécurité "
 "sont des « crackers »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Intellectual property&rdquo;"
 msgstr "« Propriété intellectuelle »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
 "property&rdquo;&mdash;a term also applied to patents, trademarks, and other "
@@ -1651,7 +1756,7 @@
 "généralisations. Il est beaucoup mieux de parler spécifiquement de "
 "« copyright », de « brevets » ou de « marques déposées »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;intellectual property&rdquo; carries a hidden "
 "assumption&mdash;that the way to think about all these disparate issues is "
@@ -1663,7 +1768,7 @@
 "les objets physiques et sur la notion de propriété que nous appliquons à 
ces "
 "derniers."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When it comes to copying, this analogy disregards the crucial difference "
 "between material objects and information: information can be copied and "
@@ -1674,7 +1779,7 @@
 "et partagée presque sans effort, alors que ce n'est pas possible avec les "
 "objets matériels."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid spreading unnecessary bias and confusion, it is best to adopt a "
 "firm policy <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
@@ -1684,7 +1789,7 @@
 "d'adopter fermement l'attitude <a href=\"/philosophy/not-ipr.html\">de ne "
 "pas parler ni même penser en termes de « propriété intellectuelle 
»</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
 "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make the "
@@ -1694,11 +1799,11 @@
 "PublicAwarenessOfCopyright-2002.html\">commence à embarrasser l'Organisation 
"
 "mondiale de la « propriété intellectuelle »</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Internet of Things&rdquo;"
 msgstr "« Internet des objets »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies decided to make computerized appliances that would connect "
 "over the internet to the manufacturer's server, and therefore could easily "
@@ -1712,9 +1817,25 @@
 "cela n'aurait l'air très engageant. Alors elles ont trouvé un nom innocent "
 "et sympa, l'« Internet des objets »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Experience shows that these products often do <a
+# | 
href=\"http{+s+}://www.locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-things-to-be-sensed/\">
+# | spy on their users</a>.  They are also tailor-made for <a
+# | href=\"https://archive.ieet.org/articles/rinesi20150806.html\";>giving
+# | people biased advice</a>.  In addition, the manufacturer can <a
+# | href=\"/proprietary/proprietary-sabotage.html\"> sabotage the product</a>
+# | by turning off the server it depends on.
+#, fuzzy
+#| msgid ""
+#| "Experience shows that these products often do <a href=\"http://www.";
+#| "locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-"
+#| "sensors-not-things-to-be-sensed/\"> spy on their users</a>.  They are "
+#| "also tailor-made for <a href=\"https://archive.ieet.org/articles/";
+#| "rinesi20150806.html\">giving people biased advice</a>.  In addition, the "
+#| "manufacturer can <a href=\"/proprietary/proprietary-sabotage.html\"> "
+#| "sabotage the product</a> by turning off the server it depends on."
 msgid ""
-"Experience shows that these products often do <a href=\"http://www.locusmag.";
+"Experience shows that these products often do <a href=\"https://www.locusmag.";
 "com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-"
 "things-to-be-sensed/\"> spy on their users</a>.  They are also tailor-made "
 "for <a href=\"https://archive.ieet.org/articles/rinesi20150806.html\";>giving "
@@ -1730,17 +1851,17 @@
 "fabricant peut <a href=\"/proprietary/proprietary-sabotage.html\">saboter le "
 "produit</a> en arrêtant le serveur dont il dépend."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We call them the &ldquo;Internet of Stings.&rdquo;"
 msgstr ""
 "Nous les appelons <i>« Internet of Stings »</i> (Internet des dangers).<a 
id="
 "\"TransNote5-rev\" href=\"#TransNote5\"><sup>5</sup></a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;LAMP system&rdquo;"
 msgstr "<!--« LAMP-->« Système LAMP »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
 "&mdash;a common combination of software to use on a web server, except that "
@@ -1753,11 +1874,11 @@
 "en réalité le système GNU/Linux. Donc, au lieu de « LAMP » ce devrait 
être "
 "« GLAMP » : « GNU, Linux, Apache, MySQL and PHP »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Linux system&rdquo;"
 msgstr "<!--« Linux-->« Système Linux »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
@@ -1773,11 +1894,11 @@
 "href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, pour en donner crédit au "
 "projet GNU et pour distinguer le système complet du noyau seul."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Market&rdquo;"
 msgstr "« Marché »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is misleading to describe the users of free software, or the software "
 "users in general, as a &ldquo;market.&rdquo;"
@@ -1785,7 +1906,7 @@
 "Il est trompeur de décrire les utilisateurs de logiciels libres ou les "
 "utilisateurs de logiciels en général en termes de « marché »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not to say there is no room for markets in the free software "
 "community.  If you have a free software support business, then you have "
@@ -1797,7 +1918,7 @@
 "clients et vous commercez avec eux dans un marché. Aussi longtemps que vous "
 "respectez leur liberté, nous vous souhaitons de réussir dans votre marché."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But the free software movement is a social movement, not a business, and the "
 "success it aims for is not a market success.  We are trying to serve the "
@@ -1813,11 +1934,11 @@
 "la liberté à une campagne commerciale nie l'importance de la liberté et "
 "légitime le logiciel privateur."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Modern&rdquo;"
 msgstr "« Moderne »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;modern&rdquo; makes sense from a descriptive perspective "
 "&mdash; for instance, solely to distinguish newer periods and ways from "
@@ -1826,7 +1947,7 @@
 "Le terme « moderne » a un sens dans un contexte descriptif, par exemple "
 "quand on se contente de distinguer les périodes récentes des plus 
anciennes."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It becomes a problem when it carries the presumption that older ways are "
 "&ldquo;old-fashioned&rdquo;; that is, presumed to be worse.  In "
@@ -1838,11 +1959,11 @@
 "Dans les domaines technologiques où ce sont les entreprises qui font les "
 "choix et les imposent aux utilisateurs, c'est souvent l'inverse qui est vrai."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Monetize&rdquo;"
 msgstr "« Monétiser »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The proper definition of &ldquo;monetize&rdquo; is &ldquo;to use something "
 "as currency.&rdquo; For instance, human societies have monetized gold, "
@@ -1857,7 +1978,7 @@
 "mot d'une autre façon, dans le sens d'« utiliser quelque chose comme 
centre "
 "de profit »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That usage casts the profit as primary, and the thing used to get the profit "
 "as secondary.  That attitude applied to a software project is objectionable "
@@ -1870,7 +1991,7 @@
 "développeurs à rendre le programme privateur s'ils trouvent que de le 
rendre "
 "libre n'est pas assez profitable."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A productive and ethical business can make money, but if it subordinates all "
 "else to profit, it is not likely to remain ethical."
@@ -1879,12 +2000,12 @@
 "conditionne tout le reste au profit, il est peu probable qu'elle reste "
 "éthique."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;MP3 Player&rdquo;"
 msgstr "<!--« MP3-->« Lecteur MP3 »"
 
 #.  The MP3 patents will reportedly expire by 2018.  
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the late 1990s it became feasible to make portable, solid-state digital "
 "audio players.  Most players supported the patented MP3 codec, and that is "
@@ -1900,7 +2021,7 @@
 "pouvaient même pas lire les fichiers codés en MP3, car leurs développeurs "
 "devaient se protéger des brevets sur le format MP3."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Using the term &ldquo;MP3 players&rdquo; for audio players in general has "
 "the effect of promoting the MP3 format and discouraging the other formats "
@@ -1912,7 +2033,7 @@
 "(dont certains sont en outre techniquement supérieurs). Bien que les brevets 
"
 "sur MP3 aient expiré, il n'est toujours pas souhaitable de le faire."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;digital audio player,&rdquo; or simply &ldquo;"
 "audio player&rdquo; when that's clear enough, instead of &ldquo;MP3 player."
@@ -1921,11 +2042,11 @@
 "Au lieu de « lecteur MP3 », nous suggérons le terme « lecteur audio "
 "numérique », ou simplement « lecteur audio » si le contexte le permet."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Open&rdquo;"
 msgstr "« Ouvert » ou « <i>open</i> »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open source&rdquo; "
 "as a substitute for &ldquo;free software.&rdquo; Those terms refer to a <a "
@@ -1942,7 +2063,7 @@
 "de justice. L'open source, qui n'est pas un mouvement, ne fait campagne pour "
 "aucune cause de cette façon."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When referring to the open source views, it's correct to use that name, but "
 "please do not use that term when talking about us, our software, or our "
@@ -1953,17 +2074,17 @@
 "logiciels ou de nos idées, car cela conduit les gens à supposer que nos "
 "idées sont semblables aux leurs."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>open source</b>, we say, <b>free software</b> or <b>free "
 "(libre) software</b>."
 msgstr "Au lieu d'« open source », nous disons <b>logiciel libre</b>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Opt out&rdquo;"
 msgstr "« <i>Opt out</i> »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When applied to any form of computational mistreatment, &ldquo;opt "
 "out&rdquo; implies the choice is a minor matter of convenience. We recommend "
@@ -1974,11 +2095,11 @@
 "recommandons « rejeter », « éviter » ou « fuir ».<a 
id=\"TransNote6-rev\" "
 "href=\"#TransNote6\"><sup>6</sup></a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PC&rdquo;"
 msgstr "« PC »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's OK to use the abbreviation &ldquo;PC&rdquo; to refer to a certain kind "
 "of computer hardware, but please don't use it with the implication that the "
@@ -1990,22 +2111,35 @@
 "l'ordinateur fonctionne sous Microsoft Windows. Si vous installez GNU/Linux "
 "sur le même ordinateur, cela reste un PC."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;WC&rdquo; has been suggested for a computer running Windows."
 msgstr "Le terme « WC » a été suggéré pour un ordinateur exécutant 
Windows."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Photoshop&rdquo;"
 msgstr "« Photoshop »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any
+# | kind of photo manipulation or image editing in general.  Photoshop is just
+# | the name of one particular image editing program, which should be avoided
+# | since it is proprietary.  There are plenty of free programs for editing
+# | images, such as the <a [-href=\"/software/gimp\">GIMP</a>.-]
+# | {+href=\"https://www.gimp.org/\";>GIMP</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning "
+#| "any kind of photo manipulation or image editing in general.  Photoshop is "
+#| "just the name of one particular image editing program, which should be "
+#| "avoided since it is proprietary.  There are plenty of free programs for "
+#| "editing images, such as the <a href=\"/software/gimp\">GIMP</a>."
 msgid ""
 "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any "
 "kind of photo manipulation or image editing in general.  Photoshop is just "
 "the name of one particular image editing program, which should be avoided "
 "since it is proprietary.  There are plenty of free programs for editing "
-"images, such as the <a href=\"/software/gimp\">GIMP</a>."
+"images, such as the <a href=\"https://www.gimp.org/\";>GIMP</a>."
 msgstr ""
 "Veuillez éviter d'utiliser le verbe « photoshoper », dérivé de "
 "« Photoshop », en voulant parler de manipulation d'image ou d'édition "
@@ -2014,11 +2148,11 @@
 "beaucoup de programmes libres pour l'édition d'images, comme <a href=\"/"
 "software/gimp\">GIMP</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Piracy&rdquo;"
 msgstr "« Piratage » et « piraterie »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers often refer to copying they don't approve of as &ldquo;piracy."
 "&rdquo; In this way, they imply that it is ethically equivalent to attacking "
@@ -2036,7 +2170,7 @@
 "dans toutes). Ils continuent à faire pression pour rendre cette prohibition "
 "encore plus complète."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you don't believe that copying not approved by the publisher is just like "
 "kidnapping and murder, you might prefer not to use the word &ldquo;"
@@ -2053,10 +2187,20 @@
 "illégal) peuvent le remplacer. Quelques-uns d'entre nous préfèrent même "
 "utiliser un terme positif comme « partage d'information avec son voisin 
»."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A US judge, presiding over a trial for copyright infringement, recognized
+# | that <a
+# | 
href=\"http{+s+}://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo;
+# | and &ldquo;theft&rdquo; are smear words.</a>
+#, fuzzy
+#| msgid ""
+#| "A US judge, presiding over a trial for copyright infringement, recognized "
+#| "that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+#| "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
+#| "theft&rdquo; are smear words.</a>"
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear words.</a>"
 msgstr ""
@@ -2065,11 +2209,11 @@
 "and-theft-terms-in-hotfile-trial-131129/\">« piratage » et « vol » 
étaient "
 "diffamatoires</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PowerPoint&rdquo;"
 msgstr "« PowerPoint »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
 "slide presentation.  &ldquo;PowerPoint&rdquo; is just the name of one "
@@ -2086,11 +2230,11 @@
 "Parmi les choix recommandés, il y a la classe <code>beamer</code> de LaTeX "
 "et LibreOffice Impress."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Product&rdquo;"
 msgstr "« Produit »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you're talking about a product, by all means call it that.  However, when "
 "referring to a service, please do not call it a &ldquo;product.&rdquo; If a "
@@ -2105,11 +2249,11 @@
 "« service ». Si un fournisseur de service appelle une formule forfaitaire 
"
 "« produit », insistez avec fermeté pour l'appeler « forfait »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Protection&rdquo;"
 msgstr "« Protection »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers' lawyers love to use the term &ldquo;protection&rdquo; to "
 "describe copyright.  This word carries the implication of preventing "
@@ -2123,7 +2267,7 @@
 "propriétaire et à l'éditeur qui bénéficient du copyright, plutôt qu'aux 
"
 "utilisateurs qui subissent ses restrictions."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms instead.  "
 "For example, instead of saying, &ldquo;Copyright protection lasts a very "
@@ -2134,7 +2278,7 @@
 "neutres à la place. Par exemple, au lieu de « la protection du copyright "
 "dure très longtemps », vous pouvez dire « le copyright dure très 
longtemps »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Likewise, instead of saying, &ldquo;protected by copyright,&rdquo; you can "
 "say, &ldquo;covered by copyright&rdquo; or just &ldquo;copyrighted.&rdquo;"
@@ -2142,7 +2286,7 @@
 "De même, au lieu de dire « protégé par le copyright », vous pouvez 
dire "
 "« couvert par le copyright » ou simplement « sous copyright »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to criticize copyright rather than be neutral, you can use the "
 "term &ldquo;copyright restrictions.&rdquo; Thus, you can say, &ldquo;"
@@ -2152,14 +2296,31 @@
 "utiliser le terme « restrictions du copyright ». Ainsi vous pouvez dire 
: "
 "« les restrictions du copyright durent très longtemps »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The term &ldquo;protection&rdquo; is also used to describe malicious
+# | features.  For instance, &ldquo;copy protection&rdquo; is a feature that
+# | interferes with copying.  From the user's point of view, this is
+# | obstruction.  So we could call that malicious feature &ldquo;copy
+# | obstruction.&rdquo; More often it is called Digital Restrictions
+# | Management (DRM)&mdash;see the <a
+# | href=\"http{+s+}://DefectiveByDesign.org\"> Defective by Design</a>
+# | campaign.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;protection&rdquo; is also used to describe malicious "
+#| "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
+#| "interferes with copying.  From the user's point of view, this is "
+#| "obstruction.  So we could call that malicious feature &ldquo;copy "
+#| "obstruction.&rdquo; More often it is called Digital Restrictions "
+#| "Management (DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> "
+#| "Defective by Design</a> campaign."
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
 "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
 "interferes with copying.  From the user's point of view, this is "
 "obstruction.  So we could call that malicious feature &ldquo;copy "
 "obstruction.&rdquo; More often it is called Digital Restrictions Management "
-"(DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> Defective by "
+"(DRM)&mdash;see the <a href=\"https://DefectiveByDesign.org\";> Defective by "
 "Design</a> campaign."
 msgstr ""
 "Le terme « protection » est aussi utilisé pour décrire des 
fonctionnalités "
@@ -2170,11 +2331,11 @@
 "\"Digital Restrictions Management\">DRM</abbr>. Voir la campagne <a href="
 "\"http://DefectiveByDesign.org\";>Defective by Design</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;"
 msgstr "« RAND (raisonnable et non discriminatoire) »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies that promulgate patent-restricted standards that prohibit "
 "free software typically have a policy of obtaining patent licenses that "
@@ -2189,7 +2350,7 @@
 "telles licences par le sigle « RAND », qui signifie « raisonnable et 
non "
 "discriminatoire » <i>[reasonable and non-discriminatory]</i>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That term whitewashes a class of patent licenses that are normally neither "
 "reasonable nor nondiscriminatory.  It is true that these licenses do not "
@@ -2204,7 +2365,7 @@
 "libre et cela les rend déraisonnables. Ainsi, une moitié de « RAND » 
est "
 "trompeuse, l'autre moitié est partiale."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
 "and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
@@ -2221,7 +2382,7 @@
 "sociétés qui exercent leur pouvoir par les brevets l'ont répandu, laisse à
 "
 "ces sociétés le soin de leur dicter les vues qu'ils expriment."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;uniform fee only,&rdquo; or &ldquo;UFO&rdquo; for "
 "short, as a replacement.  It is accurate because the only condition in these "
@@ -2231,11 +2392,11 @@
 "[uniform fee only]</i>, ou « UFO » en abrégé. Il est approprié, car la 
seule "
 "clause de ces licences est une redevance uniforme."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;SaaS&rdquo; or &ldquo;Software as a Service&rdquo;"
 msgstr "« SaaS » ou <i>Software as a Service</i>"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We used to say that SaaS (short for &ldquo;Software as a Service&rdquo;) is "
 "an injustice, but then we found that there was a lot of variation in "
@@ -2252,7 +2413,7 @@
 "auparavant, et donc notre définition est la seule qui existe, d'autre part "
 "elle explique en quoi consiste l'injustice."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/who-does-that-server-really-serve.html\">Who Does "
 "That Server Really Serve?</a> for discussion of this issue."
@@ -2261,7 +2422,7 @@
 "html\">Qui ce serveur sert-il réellement ?</a> pour une discussion du "
 "problème."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In Spanish we continue to use the term &ldquo;software como servicio&rdquo; "
 "because the joke of &ldquo;software como ser vicio&rdquo; (&ldquo;software, "
@@ -2271,11 +2432,11 @@
 "servicio</i> parce que le jeu de mots <i>software como ser vicio</i> "
 "(logiciel comme étant pernicieux) est trop bon pour qu'on l'abandonne."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sell software&rdquo;"
 msgstr "« Vendre des logiciels »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
 "exchanging a copy of a free program for a sum of money is <a href=\"/"
@@ -2296,7 +2457,7 @@
 "d'« imposition de restrictions privatrices sur l'utilisation d'un "
 "programme »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
 "further discussion of this issue."
@@ -2304,11 +2465,11 @@
 "Consulter l'article <a href=\"/philosophy/selling.html\">vendre des "
 "logiciels libres</a> pour une discussion plus détaillée sur le sujet."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing (personal data)&rdquo;"
 msgstr "« Partage (de données personnelles) »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies manipulate or lure people into revealing personal data and "
 "thus ceding their privacy, please don't refer to this as &ldquo;sharing."
@@ -2325,7 +2486,7 @@
 "<em>bien</em>. Ne l'appliquez pas à une pratique qui est nuisible et "
 "dangereuse."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When one company redistributes collected personal data to another company, "
 "that is even less deserving of the term &ldquo;sharing.&rdquo;"
@@ -2333,11 +2494,11 @@
 "Quand une société redistribue des données personnelles à une autre 
société, "
 "le terme « partage » est encore moins adapté."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing economy&rdquo;"
 msgstr "« Économie de partage »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;sharing economy&rdquo; is not a good way to refer to "
 "services such as Uber and Airbnb that arrange business transactions between "
@@ -2354,7 +2515,7 @@
 "aux transactions citées plus haut en dénature le sens, donc nous ne "
 "l'utilisons pas dans ce contexte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A more suitable term for businesses like Uber is the &ldquo;piecework "
 "service economy&rdquo; or &ldquo;gig economy.&rdquo;"
@@ -2363,11 +2524,11 @@
 "expressions plus appropriées : « travail à la pièce », ou « travail 
à la "
 "tâche »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Skype&rdquo;"
 msgstr "« Skype »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;skype&rdquo; as a verb, meaning any kind "
 "of video communication or telephony over the Internet in general.  &ldquo;"
@@ -2388,11 +2549,11 @@
 "org/wiki/Group:Skype_Replacement\">nombreux programmes libres remplaçant "
 "Skype</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Software Industry&rdquo;"
 msgstr "« Industrie du logiciel »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;software industry&rdquo; encourages people to imagine that "
 "software is always developed by a sort of factory and then delivered to "
@@ -2408,7 +2569,7 @@
 "entreprises développent des logiciels libres ou non libres, mais celles qui "
 "développent des logiciels libres ne sont pas gérées comme des usines."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;industry&rdquo; is being used as propaganda by advocates of "
 "software patents.  They call software development &ldquo;industry&rdquo; and "
@@ -2428,11 +2589,11 @@
 "la définition de l'« industrie » comme « production automatisée de 
biens "
 "matériels »</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Source model&rdquo;"
 msgstr "« Modèle de code source »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
@@ -2455,11 +2616,11 @@
 "d'information cohérente, mais en revanche elle donne l'occasion de parler "
 "d'« open source » dans des pages qui décrivent des programmes libres."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Terminal&rdquo;"
 msgstr "« Terminal »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Mobile phones and tablets are computers, and people should be able to do "
 "their computing on them using free software.  To call them &ldquo;"
@@ -2471,11 +2632,11 @@
 "« terminaux » suppose qu'ils ne sont bons qu'à se connecter à des 
serveurs, "
 "ce qui est une mauvaise manière de faire votre propre travail."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Theft&rdquo;"
 msgstr "« Vol »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The supporters of a too-strict, repressive form of copyright often use words "
 "like &ldquo;stolen&rdquo; and &ldquo;theft&rdquo; to refer to copyright "
@@ -2487,10 +2648,22 @@
 "au copyright. C'est du baratin, mais ils nous demandent de le prendre pour "
 "argent comptant."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Under the US legal system, copyright infringement is not theft.  <a
+# | 
href=\"http{+s+}://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\">
+# | Laws about theft are not applicable to copyright infringement.</a> The
+# | supporters of repressive copyright are making an appeal to
+# | authority&mdash;and misrepresenting what authority says.
+#, fuzzy
+#| msgid ""
+#| "Under the US legal system, copyright infringement is not theft.  <a href="
+#| "\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;";
+#| "vol=473&amp;invol=207\"> Laws about theft are not applicable to copyright "
+#| "infringement.</a> The supporters of repressive copyright are making an "
+#| "appeal to authority&mdash;and misrepresenting what authority says."
 msgid ""
 "Under the US legal system, copyright infringement is not theft.  <a href="
-"\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
+"\"https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
 "invol=207\"> Laws about theft are not applicable to copyright infringement.</"
 "a> The supporters of repressive copyright are making an appeal to "
 "authority&mdash;and misrepresenting what authority says."
@@ -2501,9 +2674,19 @@
 "aux infractions au copyright</a>. Les partisans d'un copyright répressif "
 "font appel à l'autorité – tout en dénaturant ce que dit cette 
dernière."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | To refute them, you can point to this <a
+# | 
href=\"http{+s+}://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright\">
+# | real case</a> which shows what can properly be described as
+# | &ldquo;copyright theft.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "To refute them, you can point to this <a href=\"http://www.guardian.co.uk/";
+#| "books/2013/may/04/harper-lee-kill-mockingbird-copyright\"> real case</a> "
+#| "which shows what can properly be described as &ldquo;copyright theft."
+#| "&rdquo;"
 msgid ""
-"To refute them, you can point to this <a href=\"http://www.guardian.co.uk/";
+"To refute them, you can point to this <a href=\"https://www.guardian.co.uk/";
 "books/2013/may/04/harper-lee-kill-mockingbird-copyright\"> real case</a> "
 "which shows what can properly be described as &ldquo;copyright theft.&rdquo;"
 msgstr ""
@@ -2512,7 +2695,7 @@
 "copyright\">exemple concret</a> qui montre ce qu'on peut décrire à bon "
 "escient comme un « vol de copyright »."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unauthorized copying is forbidden by copyright law in many circumstances "
 "(not all!), but being forbidden doesn't make it wrong.  In general, laws "
@@ -2527,10 +2710,20 @@
 "(l'implémentation) ne se conforment pas à nos idées du bien et du mal (les 
"
 "specs), ce sont les lois qui doivent changer."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A US judge, presiding over a trial for copyright infringement, recognized
+# | that <a
+# | 
href=\"http{+s+}://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo;
+# | and &ldquo;theft&rdquo; are smear-words.</a>
+#, fuzzy
+#| msgid ""
+#| "A US judge, presiding over a trial for copyright infringement, recognized "
+#| "that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+#| "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
+#| "theft&rdquo; are smear-words.</a>"
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear-words.</a>"
 msgstr ""
@@ -2539,11 +2732,11 @@
 "and-theft-terms-in-hotfile-trial-131129/\">« piratage » et « vol » 
étaient "
 "diffamatoires</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Trusted Computing&rdquo;"
 msgstr "« Informatique de confiance »"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;</"
 "a> is the proponents' name for a scheme to redesign computers so that "
@@ -2558,11 +2751,11 @@
 "d'informatique « de confiance ». De votre point de vue, elle est "
 "« déloyale »."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Vendor&rdquo;"
 msgstr " "
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;vendor&rdquo; to refer generally to anyone "
 "that develops or packages software.  Many programs are developed in order to "
@@ -2574,9 +2767,18 @@
 "supplier&rdquo; instead."
 msgstr " "
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+# | This essay is published in <a
+# | 
href=\"http{+s+}://shop.fsf.org/product/free-software-free-society/\"><cite>Free
+# | Software, Free Society: The Selected Essays of Richard M.
+# | Stallman</cite></a>.
+#, fuzzy
+#| msgid ""
+#| "This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+#| "software-free-society/\"><cite>Free Software, Free Society: The Selected "
+#| "Essays of Richard M. Stallman</cite></a>."
 msgid ""
-"This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+"This essay is published in <a href=\"https://shop.fsf.org/product/free-";
 "software-free-society/\"><cite>Free Software, Free Society: The Selected "
 "Essays of Richard M. Stallman</cite></a>."
 msgstr ""
@@ -2638,14 +2840,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</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>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "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."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -2656,13 +2858,12 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996-1999, 2001-2004, 2007-2012, 2015-2018, 2020, 2021 Free "
-"Software Foundation, Inc."
+# | Copyright &copy; [-2014, 2015, 2016-] {+1996-2018, 2020, 2021+} Free
+# | Software Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 1996-2018, 2020, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -2686,3 +2887,11 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~ "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996-1999, 2001-2004, 2007-2012, 2015-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."

Index: words-to-avoid.it-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.it-diff.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- words-to-avoid.it-diff.html 31 May 2021 09:06:22 -0000      1.21
+++ words-to-avoid.it-diff.html 21 Jul 2021 19:32:34 -0000      1.22
@@ -11,12 +11,24 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.90</em></ins></span> --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="term" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Words to Avoid (or Use with Care) Because They Are Loaded or 
Confusing
 - GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+#word-list a { line-height: 1.8em; text-decoration: none; }
+--&gt;
+&lt;/style&gt;</em></ins></span>
 &lt;!--#include virtual="/philosophy/po/words-to-avoid.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;Words to Avoid (or Use with Care) Because They Are Loaded or 
Confusing&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div 
class="thin"&gt;&lt;/div&gt;</em></ins></span>
 
 &lt;p&gt;
 There are a number of words and phrases that we recommend avoiding, or
@@ -24,13 +36,12 @@
 misleading; others presuppose a viewpoint that we disagree with, and
 we hope you disagree with it too.&lt;/p&gt;
 
-&lt;div class="announcement"&gt;
+&lt;div <span class="removed"><del><strong>class="announcement"&gt;
 &lt;blockquote&gt;&lt;p&gt;Also note &lt;a 
href="/philosophy/categories.html"&gt;Categories of Free
 Software&lt;/a&gt;,
 &lt;a href="/philosophy/why-call-it-the-swindle.html"&gt;Why Call It The
 Swindle?&lt;/a&gt;&lt;/p&gt;&lt;/blockquote&gt;
-&lt;/div&gt;
-
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="word-list" class="emph-box"&gt;</em></ins></span>
 &lt;p&gt;&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!-- GNUN-SORT-START 
--&gt; &ldquo;&lt;a
        href="#Ad-blocker"&gt;Ad-blocker&lt;/a&gt;&rdquo;
 |&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!-- GNUN-SORT-NEXT-ITEM 
--&gt; &ldquo;&lt;a
@@ -148,6 +159,16 @@
 |&lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!-- GNUN-SORT-NEXT-ITEM 
--&gt; &ldquo;&lt;a
        href="#Vendor"&gt;Vendor&lt;/a&gt;&rdquo;
 &lt;span class="gnun-split"&gt;&lt;/span&gt;&lt;!-- GNUN-SORT-STOP 
--&gt;&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
+
+&lt;hr class="no-display" /&gt;
+&lt;div class="announcement"&gt;
+&lt;p&gt;Also note &lt;a href="/philosophy/categories.html"&gt;Categories of 
Free
+Software&lt;/a&gt;,
+&lt;a href="/philosophy/why-call-it-the-swindle.html"&gt;Why Call It The
+Swindle?&lt;/a&gt;&lt;/p&gt;
+&lt;/div&gt;
+&lt;hr class="no-display" /&gt;</em></ins></span>
 
 &lt;!-- GNUN-SORT-START --&gt;
 &lt;!-- GNUN-SORT-BEGIN-KEY --&gt;
@@ -300,7 +321,7 @@
 One of the many meanings of &ldquo;cloud computing&rdquo; is storing
 your data in online services.  In most scenarios, that is foolish
 because it exposes you to
-&lt;a 
href="http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream"&gt;surveillance&lt;/a&gt;.
+&lt;a <span 
class="removed"><del><strong>href="http://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream"&gt;surveillance&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream"&gt;surveillance&lt;/a&gt;.</em></ins></span>
 &lt;/p&gt;
 
 &lt;p&gt;
@@ -342,7 +363,7 @@
 
 &lt;p&gt;
 Curiously, Larry Ellison, a proprietary software developer,
-also &lt;a 
href="http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/"&gt;
+also &lt;a <span 
class="removed"><del><strong>href="http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/"&gt;</em></ins></span>
 noted the vacuity of the term &ldquo;cloud computing.&rdquo;&lt;/a&gt;  He
 decided to use the term anyway because, as a proprietary software
 developer, he isn't motivated by the same ideals as we are.
@@ -435,14 +456,14 @@
 or the accountant of a publishing company.  It is no surprise that
 proprietary software would like you to think of the use of software as
 a commodity.  Their twisted viewpoint comes through clearly
-in &lt;a 
href="http://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6"&gt;this
+in &lt;a <span 
class="removed"><del><strong>href="http://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6"&gt;this</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6"&gt;this</em></ins></span>
 article&lt;/a&gt;, which also refers to publications as
 &ldquo;&lt;a href="#Content"&gt;content&lt;/a&gt;.&rdquo;&lt;/p&gt;
 
 &lt;p&gt;
 The narrow thinking associated with the idea that we &ldquo;consume
 content&rdquo; paves the way for laws such as the DMCA that forbid
-users to break the &lt;a href="http://DefectiveByDesign.org/"&gt;Digital
+users to break the &lt;a <span 
class="removed"><del><strong>href="http://DefectiveByDesign.org/"&gt;Digital</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://DefectiveByDesign.org/"&gt;Digital</em></ins></span>
 Restrictions Management&lt;/a&gt; (DRM) facilities in digital devices.  If
 users think what they do with these devices is &ldquo;consume,&rdquo;
 they may see such restrictions as natural.&lt;/p&gt;
@@ -520,7 +541,7 @@
 &ldquo;citizens,&rdquo; rather than &ldquo;consumers.&rdquo;&lt;/p&gt;
 &lt;p&gt;
 This problem with the word &ldquo;consumer&rdquo; has
-been &lt;a 
href="http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams"&gt;noted
 before&lt;/a&gt;.
+been &lt;a <span 
class="removed"><del><strong>href="http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams"&gt;noted</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams"&gt;noted</em></ins></span>
 before&lt;/a&gt;.
 &lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -662,7 +683,7 @@
 locks, and their keys or codes as well; you may find them useful or
 troublesome, but they don't oppress you, because you can open and
 close them.  Likewise, we
-find &lt;a 
href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-"&gt;encryption&lt;/a&gt;
+find &lt;a <span 
class="removed"><del><strong>href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-"&gt;encryption&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-"&gt;encryption&lt;/a&gt;</em></ins></span>
 invaluable for protecting our digital files.  That too is a kind
 of digital lock that you have control over.&lt;/p&gt;
 &lt;p&gt;
@@ -694,7 +715,7 @@
 Good alternatives include &ldquo;Digital Restrictions
 Management,&rdquo; and &ldquo;digital handcuffs.&rdquo;&lt;/p&gt;
 &lt;p&gt;
-Please sign up to support our &lt;a href="http://DefectiveByDesign.org/"&gt;
+Please sign up to support our &lt;a <span 
class="removed"><del><strong>href="http://DefectiveByDesign.org/"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://DefectiveByDesign.org/"&gt;</em></ins></span>
 campaign to abolish DRM&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -843,7 +864,7 @@
 &lt;!-- GNUN-SORT-END-KEY --&gt;
 &lt;p&gt;
 A hacker is someone
-who &lt;a href="http://stallman.org/articles/on-hacking.html"&gt; enjoys
+who &lt;a <span 
class="removed"><del><strong>href="http://stallman.org/articles/on-hacking.html"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://stallman.org/articles/on-hacking.html"&gt;</em></ins></span>
 enjoys
 playful cleverness&lt;/a&gt;&mdash;not necessarily with computers.  The
 programmers in the old
 &lt;abbr title="Massachusetts Institute of Technology"&gt;MIT&lt;/abbr&gt; free
@@ -900,7 +921,7 @@
 &lt;p&gt;
 Experience shows that these products often do 
 &lt;a
-href="http://www.locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-things-to-be-sensed/"&gt;
+href="https://www.locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-things-to-be-sensed/"&gt;
 spy on their users&lt;/a&gt;.  They are also tailor-made for 
 &lt;a href="https://archive.ieet.org/articles/rinesi20150806.html"&gt;giving
 people biased advice&lt;/a&gt;.  In addition, the manufacturer can &lt;a
@@ -1074,7 +1095,7 @@
 any kind of photo manipulation or image editing in general.  Photoshop
 is just the name of one particular image editing program, which should
 be avoided since it is proprietary.  There are plenty of free programs
-for editing images, such as the &lt;a 
href="/software/gimp"&gt;GIMP&lt;/a&gt;.&lt;/p&gt;
+for editing images, such as the &lt;a <span 
class="removed"><del><strong>href="/software/gimp"&gt;GIMP&lt;/a&gt;.&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.gimp.org/"&gt;GIMP&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
 &lt;!-- GNUN-SORT-BEGIN-KEY --&gt;
@@ -1101,7 +1122,7 @@
 &lt;p&gt;
 A US judge, presiding over a trial for copyright infringement,
 recognized that
-&lt;a 
href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;
+&lt;a <span 
class="removed"><del><strong>href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;</em></ins></span>
 and &ldquo;theft&rdquo; are smear words.&lt;/a&gt;&lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -1162,7 +1183,7 @@
 obstruction.  So we could call that malicious feature &ldquo;copy
 obstruction.&rdquo;  More often it is called Digital Restrictions
 Management (DRM)&mdash;see the
-&lt;a href="http://DefectiveByDesign.org"&gt; Defective by Design&lt;/a&gt;
+&lt;a <span 
class="removed"><del><strong>href="http://DefectiveByDesign.org"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://DefectiveByDesign.org"&gt;</em></ins></span>
 Defective by Design&lt;/a&gt;
 campaign.&lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -1346,13 +1367,14 @@
 &lt;p&gt;
 Under the US legal system, copyright infringement is not theft.  
 &lt;a
-href="http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207"&gt;
+<span 
class="removed"><del><strong>href="http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207"&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207"&gt;</em></ins></span>
 Laws about theft are not applicable to copyright infringement.&lt;/a&gt;
 The supporters of repressive copyright are making an appeal to
 authority&mdash;and misrepresenting what authority says.&lt;/p&gt;
 &lt;p&gt;
 To refute them, you can point to this
-&lt;a 
href="http://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright"&gt;
+&lt;a <span 
class="removed"><del><strong>href="http://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright"&gt;</em></ins></span>
 real case&lt;/a&gt; which shows what can properly be described as
 &ldquo;copyright theft.&rdquo;&lt;/p&gt;
 &lt;p&gt;
@@ -1366,7 +1388,7 @@
 &lt;p&gt;
 A US judge, presiding over a trial for copyright infringement,
 recognized that
-&lt;a 
href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;
+&lt;a <span 
class="removed"><del><strong>href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/"&gt;&ldquo;piracy&rdquo;</em></ins></span>
 and &ldquo;theft&rdquo; are smear-words.&lt;/a&gt;&lt;/p&gt;
 
 &lt;!-- GNUN-SORT-NEXT-ITEM --&gt;
@@ -1397,15 +1419,17 @@
 &lt;/p&gt;
 &lt;!-- GNUN-SORT-STOP --&gt;
 
-&lt;hr /&gt;
-&lt;blockquote <span class="removed"><del><strong>id="fsfs"&gt;&lt;p 
class="big"&gt;This</strong></del></span> <span 
class="inserted"><ins><em>id="fsfs"&gt;&lt;p&gt;This</em></ins></span> essay is 
published
-in &lt;a 
href="http://shop.fsf.org/product/free-software-free-society/"&gt;&lt;cite&gt;Free
+&lt;hr <span class="inserted"><ins><em>class="thin"</em></ins></span> /&gt;
+<span class="removed"><del><strong>&lt;blockquote id="fsfs"&gt;&lt;p 
class="big"&gt;This</strong></del></span>
+<span class="inserted"><ins><em>&lt;p id="fsfs"&gt;This</em></ins></span> 
essay is published in
+&lt;a <span 
class="removed"><del><strong>href="http://shop.fsf.org/product/free-software-free-society/"&gt;&lt;cite&gt;Free</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://shop.fsf.org/product/free-software-free-society/"&gt;&lt;cite&gt;Free</em></ins></span>
 Software, Free Society: The Selected Essays of Richard
-M. Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
+M. <span 
class="removed"><del><strong>Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
 <span class="inserted"><ins><em>Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -1423,13 +1447,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;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 &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; 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.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -1450,8 +1474,8 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
-2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, <span 
class="removed"><del><strong>2018</strong></del></span> <span 
class="inserted"><ins><em>2018, 2020, 2021</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996, 1997, 1998, 
1999, 2001, 2002, 2003, 2004, 2007,
+2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018</strong></del></span> 
<span class="inserted"><ins><em>1996-2018, 2020, 2021</em></ins></span> Free 
Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -1461,7 +1485,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/31 09:06:22 $
+$Date: 2021/07/21 19:32:34 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: words-to-avoid.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.it.po,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- words-to-avoid.it.po        31 May 2021 03:56:37 -0000      1.257
+++ words-to-avoid.it.po        21 Jul 2021 19:32:34 -0000      1.258
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2021-05-31 03:55+0000\n"
+"POT-Creation-Date: 2021-07-21 19:25+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: \n"
@@ -30,11 +30,11 @@
 "Termini da evitare (o usare con cura) perché imprecisi o fuorvianti - "
 "Progetto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Words to Avoid (or Use with Care) Because They Are Loaded or Confusing"
 msgstr "Termini da evitare (o usare con cura) perché imprecisi o fuorvianti"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are a number of words and phrases that we recommend avoiding, or "
 "avoiding in certain contexts and usages.  Some are ambiguous or misleading; "
@@ -45,83 +45,73 @@
 "situazioni, di evitare perché risultano ambigui  oppure implicano "
 "un'opinione che non condividiamo e che speriamo non condividiate nemmeno voi."
 
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
-"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
-"It The Swindle?</a>"
-msgstr ""
-"Vedere anche <a href=\"/philosophy/categories.html\">Categorie  di Software "
-"Libero</a> e <a href=\"/philosophy/why-call-it-the-swindle.html\">Perché lo "
-"chiamiamo Swindle</a>."
-
 #.  GNUN-SORT-START 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ad-blocker\">Ad-blocker</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Ad-blocker\">Ad-blocker</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Access\">Access</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Access\">Accesso</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Alternative\">Alternative</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Alternative\">Alternativa</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Assets\">Assets</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Assets\">Beni (digitali)</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#BSD-style\">BSD-style</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#BSD-style\">Licenze tipo-BSD</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Closed\">Closed</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Closed\">Chiuso</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CloudComputing\">Cloud Computing</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#CloudComputing\">Cloud Computing</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Commercial\">Commercial</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Commercial\">Commerciale</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Compensation\">Compensation</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Compensation\">Compenso</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consume\">Consume</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Consume\">Consumare</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consumer\">Consumer</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Consumer\">Consumatore</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Content\">Content</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Content\">Contenuto</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CopyrightOwner\">Copyright Owner</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#CreativeCommonsLicensed\">Creative Commons licensed</"
 "a>&rdquo; |"
@@ -130,25 +120,25 @@
 "a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Creator\">Creator</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Creator\">Creatore</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalGoods\">Digital Goods</a>&rdquo; |"
 msgstr ""
 "&ldquo;<a href=\"#DigitalGoods\">Beni digitali (Digital Goods)</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalLocks\">Digital Locks</a>&rdquo; |"
 msgstr ""
 "&ldquo;<a href=\"#DigitalLocks\">Lucchetti digitali (Digital Locks)</"
 "a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#DigitalRightsManagement\">Digital Rights Management</"
 "a>&rdquo; |"
@@ -157,100 +147,100 @@
 "(Gestione digitale dei diritti)</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ecosystem\">Ecosystem</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Ecosystem\">Ecosistema</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FLOSS\">FLOSS</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#FLOSS\">FLOSS</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#ForFree\">For free</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#ForFree\">For free</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FOSS\">FOSS</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#FOSS\">FOSS</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FreelyAvailable\">Freely available</a>&rdquo; |"
 msgstr ""
 "&ldquo;<a href=\"#FreelyAvailable\">Liberamente disponibile</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Freeware\">Freeware</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Freeware\">Freeware</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#GiveAwaySoftware\">Give away software</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#GiveAwaySoftware\">Regalare software</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Google\">Google</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Google\">Googlare</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Hacker\">Hacker</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Hacker\">Hacker</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#IntellectualProperty\">Intellectual property</a>&rdquo; |"
 msgstr ""
 "&ldquo;<a href=\"#IntellectualProperty\">Proprietà intellettuale</a>&rdquo; 
|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#InternetofThings\">Internet of Things</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#LAMP\">LAMP system</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#LAMP\">Sistema LAMP</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Linux\">Linux system</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Linux\">Sistema Linux</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Market\">Market</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Market\">Mercato</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Modern\">Modern</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Monetize\">Monetize</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Monetize\">Monetizzare</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#MP3Player\">MP3 player</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#MP3Player\">MP3 player</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Open\">Open</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Open\">Aperto</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 # | &ldquo;<a [-href=\"#Open\">Open</a>&rdquo;-] {+href=\"#OptOut\">Opt
 # | out</a>&rdquo;+} |
 #, fuzzy
@@ -259,76 +249,76 @@
 msgstr "&ldquo;<a href=\"#Open\">Aperto</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PC\">PC</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#PC\">PC</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Photoshop\">Photoshop</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Photoshop\">Photoshop</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Piracy\">Piracy</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Piracy\">Pirateria</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PowerPoint\">PowerPoint</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#PowerPoint\">PowerPoint</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Product\">Product</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Product\">Prodotto</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Protection\">Protection</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Protection\">Protezione</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#RAND\">RAND</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#RAND\">RAND</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SaaS\">SaaS</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#SaaS\">SaaS</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SellSoftware\">Sell software</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#SellSoftware\">Vendere software</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#SharingPersonalData\">Sharing (personal data)</a>&rdquo; |"
 msgstr ""
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SharingEconomy\">Sharing economy</a>&rdquo; |"
 msgstr ""
 "&ldquo;<a href=\"#SharingEconomy\">Economia di condivisione (Sharing economy)"
 "</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Skype\">Skype</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Skype\">Skypare</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SoftwareIndustry\">Software Industry</a>&rdquo; |"
 msgstr ""
 "&ldquo;<a href=\"#SoftwareIndustry\">Industria del software</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SourceModel\">Source model</a>&rdquo; |"
 msgstr ""
 "&ldquo;<a href=\"#SourceModel\">Modello di sorgente (Source model)</"
@@ -340,7 +330,7 @@
 #.      language to refer to mobile computers; otherwise,
 #.      fill the translation with a space. 
 #.  GNUN-SORT-BEGIN-KEY 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Terminal\">Terminal</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Terminal\">Terminale</a>&rdquo; |"
 
@@ -348,27 +338,37 @@
 #. #endif
 #.  
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Theft\">Theft</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#Theft\">Furto</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#TrustedComputing\">Trusted Computing</a>&rdquo; |"
 msgstr ""
 "&ldquo;<a href=\"#TrustedComputing\">Trusted Computing (informatica fidata)</"
 "a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Vendor\">Vendor</a>&rdquo;"
 msgstr "&ldquo;<a href=\"#Vendor\">Venditore</a>&rdquo;"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><p>
+msgid ""
+"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
+"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
+"It The Swindle?</a>"
+msgstr ""
+"Vedere anche <a href=\"/philosophy/categories.html\">Categorie  di Software "
+"Libero</a> e <a href=\"/philosophy/why-call-it-the-swindle.html\">Perché lo "
+"chiamiamo Swindle</a>."
+
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ad-blocker&rdquo;"
 msgstr "&ldquo;Ad-blocker&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When the purpose of some program is to block advertisements, &ldquo;ad-"
 "blocker&rdquo; is a good term for it.  However, the GNU browser IceCat "
@@ -383,11 +383,11 @@
 "di &ldquo;ad-blocker,&rdquo; si deve parlare di <em>protezione contro la "
 "sorveglianza</em>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Access&rdquo;"
 msgstr "&ldquo;Accesso&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is a common misunderstanding to think free software means that the public "
 "has &ldquo;access&rdquo; to a program.  That is not what free software means."
@@ -396,7 +396,7 @@
 "libero coincida con l'avere \"accesso\" pubblico a un programma, ma questo "
 "non è il significato di software libero."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/philosophy/free-sw.html\">criterion for free software</a> is "
 "not about who has &ldquo;access&rdquo; to the program; the four essential "
@@ -414,7 +414,7 @@
 "em> di fare o distribuire copie, e nessuno ha il <em>diritto</em> di "
 "pretendere una copia."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In particular, if you write a program yourself and never offer a copy to "
 "anyone else, that program is free software albeit in a trivial way, because "
@@ -426,7 +426,7 @@
 "banale) perché tutti gli utenti che ne possiedono una copia, e cioè il solo 
"
 "autore, hanno le quattro libertà essenziali."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, when many users have copies of a program, someone is sure to "
 "post it on the internet, giving everyone access to it.  We think people "
@@ -438,7 +438,7 @@
 "che questo sia sempre da farsi se il programma è utile, ma non è un "
 "requisito del software libero."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There is one specific point in which a question of having access is directly "
 "pertinent to free software: the GNU GPL permits giving a particular user "
@@ -452,7 +452,7 @@
 "vale nel caso particolare in cui l'utente ha già una copia del programma in "
 "forma non sorgente."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>with free software, the public has access to the program</b>, "
 "we say, <b>with free software, the users have the essential freedoms</b> and "
@@ -464,11 +464,11 @@
 "libertà essenziali</b> e che <b>con il software libero gli utenti hanno "
 "controllo su quello che il programma fa per loro</b>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Alternative&rdquo;"
 msgstr "&ldquo;Alternativa&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | We don't describe free software {+in general+} as an
 # | &ldquo;alternative&rdquo; to proprietary, because that word presumes all
 # | the &ldquo;alternatives&rdquo; are legitimate and each additional one
@@ -494,7 +494,7 @@
 "scontato che il software libero debba necessariamente coesistere con "
 "software che non rispetta la libertà degli utenti."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
@@ -510,7 +510,7 @@
 "del software</a> non danno libertà agli utenti. Pensiamo che non si debbano "
 "offrire agli utenti queste \"alternative\" al software libero."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Special circumstances can drive users toward running one particular program "
 "for a certain job.  For instance, when a web page sends JavaScript client "
@@ -519,11 +519,11 @@
 "reason to describe any other code for that job as an alternative."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Assets&rdquo;"
 msgstr "&ldquo;Beni (digitali)&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To refer to published works as &ldquo;assets&rdquo;, or &ldquo;digital "
 "assets&rdquo;, is even worse than calling them <a href=\"#Content\">&ldquo;"
@@ -535,11 +535,11 @@
 "perché presuppone che non abbiano alcun valore per la società tranne quello 
"
 "commerciale."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;BSD-style&rdquo;"
 msgstr "&ldquo;Licenze tipo-BSD&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/licenses/bsd.html\">lumps together licenses that have important "
@@ -553,7 +553,7 @@
 "pubblicitaria è incompatibile con  la Licenza Pubblica Generica (GPL), "
 "mentre invece la nuova  licenza BSD è compatibile con la GPL."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, it is best to name <a href=\"/licenses/license-list.html"
 "\"> the specific license in question</a> and avoid the vague term &ldquo;BSD-"
@@ -563,11 +563,11 @@
 "html\">la specifica licenza cui ci si  riferisce</a> evitando la vaga "
 "locuzione \"di tipo BSD\"."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Closed&rdquo;"
 msgstr "&ldquo;Chiuso&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source.&rdquo; In the free software movement, <a href=\"/"
@@ -588,11 +588,11 @@
 "\"non-libero\" o <a href=  \"/philosophy/categories.html#ProprietarySoftware"
 "\">  \"proprietario\"</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Cloud Computing&rdquo;"
 msgstr "&ldquo;Cloud Computing&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;cloud computing&rdquo; (or just &ldquo;cloud&rdquo;, in the "
 "context of computing) is a marketing buzzword with no coherent meaning.  It "
@@ -609,7 +609,7 @@
 "qualsiasi ragionamento basato su di esso sarà necessariamente fumoso (o "
 "\"nebuloso\"!)."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When thinking about or responding to a statement someone else has made using "
 "this term, the first step is to clarify the topic.  What scenario is the "
@@ -622,19 +622,30 @@
 "definire quello scenario? Chiarito questo, diventa possibile riflettere in "
 "maniera coerente."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | One of the many meanings of &ldquo;cloud computing&rdquo; is storing your
+# | data in online services.  In most scenarios, that is foolish because it
+# | exposes you to <a
+# | href=\"http{+s+}://www.guardian.co.uk/commentisfree/2011/apr/25/hackers-spo
+# | oks-cloud-antiauthoritarian-dream\">surveillance</a>.
+#, fuzzy
+#| msgid ""
+#| "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
+#| "data in online services.  In most scenarios, that is foolish because it "
+#| "exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/";
+#| "apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgid ""
 "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
 "data in online services.  In most scenarios, that is foolish because it "
-"exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/";
-"hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
+"exposes you to <a href=\"https://www.guardian.co.uk/commentisfree/2011/";
+"apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgstr ""
 "Uno dei tanti significati di \"cloud computing\" è la memorizzazione dei "
 "vostri dati in servizi online, cosa in molti casi sconsigliabile perché "
 "espone alla <a href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/";
 "hackers-spooks-cloud-antiauthoritarian-dream\">sorveglianza</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning (which overlaps that but is not the same thing)  is <a href="
 "\"/philosophy/who-does-that-server-really-serve.html\"> Service as a "
@@ -646,7 +657,7 @@
 "software</a> (Service as a Software Substitute, SaaSS), che vi impedisce di "
 "controllare le vostre elaborazioni. Il SaaSS va sempre evitato."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is renting a remote physical server, or virtual server.  "
 "These practices are ok under certain circumstances."
@@ -654,7 +665,7 @@
 "Un altro significato è affittare un server, fisico o virtuale, remoto; "
 "questo, sotto certe circostanze, è accettabile."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is accessing your own server from your own mobile device.  "
 "That raises no particular ethical issues."
@@ -662,7 +673,7 @@
 "Un altro significato del termine è accedere al proprio server dal proprio "
 "dispositivo mobile, e questo non causa particolari problemi etici."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"https://csrc.nist.gov/publications/detail/sp/800-145/final\";> "
 "NIST definition of \"cloud computing\"</a> mentions three scenarios that "
@@ -683,7 +694,7 @@
 "il concetto di \"servizio come surrogato del software\" (un modo di non "
 "rispettare l'utente) ma i concetti non sono completamente equivalenti."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "These different computing practices don't even belong in the same "
 "discussion.  The best way to avoid the confusion the term &ldquo;cloud "
@@ -697,10 +708,22 @@
 "cloud&rdquo;: bisogna parlare dello scenario che si ha in mente e utilizzare "
 "il termine specifico appropriato."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Curiously, Larry Ellison, a proprietary software developer, also <a
+# | 
href=\"http{+s+}://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\">
+# | noted the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He
+# | decided to use the term anyway because, as a proprietary software
+# | developer, he isn't motivated by the same ideals as we are.
+#, fuzzy
+#| msgid ""
+#| "Curiously, Larry Ellison, a proprietary software developer, also <a href="
+#| "\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> "
+#| "noted the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He "
+#| "decided to use the term anyway because, as a proprietary software "
+#| "developer, he isn't motivated by the same ideals as we are."
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a href="
-"\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
+"\"https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
 "the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He decided to use "
 "the term anyway because, as a proprietary software developer, he isn't "
 "motivated by the same ideals as we are."
@@ -712,11 +735,11 @@
 "poiché, essendo uno sviluppatore di software proprietario, non condivide gli 
"
 "ideali che animano la nostra azione."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Commercial&rdquo;"
 msgstr "&ldquo;Commerciale&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;nonfree."
 "&rdquo; That confuses two entirely different issues."
@@ -724,7 +747,7 @@
 "È bene non usare \"commerciale\" come sinonimo di \"non-libero\".  Ciò "
 "confonde due questioni del tutto diverse tra loro."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A program is commercial if it is developed as a business activity.  A "
 "commercial program can be free or nonfree, depending on its manner of "
@@ -741,7 +764,7 @@
 "sviluppato il programma e  quale libertà è concessa agli utenti, sono "
 "indipendenti tra  loro."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the first decade of the free software movement, free software packages "
 "were almost always noncommercial; the components of the GNU/Linux operating "
@@ -756,7 +779,7 @@
 "da università. Ma negli  anni '90 ha preso a circolare il software libero "
 "commerciale."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
@@ -771,11 +794,11 @@
 "combinazione \"libero commerciale\", scartando  questa possibilità. Bisogna "
 "stare attenti a non utilizzare il  termine \"commerciale\" in tal senso."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Compensation&rdquo;"
 msgstr "&ldquo;Compenso&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;compensation for authors&rdquo; in connection with "
 "copyright carries the assumptions that (1) copyright exists for the sake of "
@@ -790,7 +813,7 @@
 "e dovremmo ripagarlo. La prima assunzione è semplicemente <a href=\"/"
 "philosophy/misinterpreting-copyright.html\">falsa</a>, la seconda scandalosa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Compensating the rights-holders&rdquo; adds a further swindle: you're "
 "supposed to imagine that means paying the authors, and occasionally it does, "
@@ -802,11 +825,11 @@
 "in certe occasioni è vero, ma il più delle volte è un pagamento verso le "
 "stesse case editrici che fanno pressione per imporci leggi ingiuste."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consume&rdquo;"
 msgstr "&ldquo;Consumare&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Consume&rdquo; refers to what we do with food: we ingest it, after "
 "which the food as such no longer exists.  By analogy, we employ the same "
@@ -826,7 +849,7 @@
 "possono essere eseguite o lette un numero arbitrario di volte: ascoltare una "
 "registrazione o eseguire un programma non è \"consumo\"."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use &ldquo;consume&rdquo; in this context will say they don't mean "
 "it literally.  What, then, does it mean? It means to regard copies of "
@@ -845,7 +868,7 @@
 "carburante usata oggi è sostanzialmente identica a una goccia di carburante "
 "usata la settimana scorsa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | [-Do we want people-]{+What does it mean+} to think of [-writings
 # | (software, news, any other kind)-] {+works of authorship+} as a commodity,
 # | with the assumption that there is nothing special about any one story,
@@ -854,7 +877,7 @@
 # | of a publishing company.  It is no surprise that proprietary software
 # | would like you to think of the use of software as a commodity.  Their
 # | twisted viewpoint comes through clearly in <a
-# | 
href=\"http://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6\";>this
+# | 
href=\"http{+s+}://www.businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-series-a-funding-2015-6\">this
 # | article</a>, which also refers to publications as &ldquo;<a
 # | href=\"#Content\">content</a>.&rdquo;
 #, fuzzy
@@ -875,7 +898,7 @@
 "program, or song? That is the twisted viewpoint of the owner or the "
 "accountant of a publishing company.  It is no surprise that proprietary "
 "software would like you to think of the use of software as a commodity.  "
-"Their twisted viewpoint comes through clearly in <a href=\"http://www.";
+"Their twisted viewpoint comes through clearly in <a href=\"https://www.";
 "businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-"
 "series-a-funding-2015-6\">this article</a>, which also refers to "
 "publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
@@ -891,11 +914,25 @@
 "series-a-funding-2015-6\">questo articolo</a> (in inglese), che definisce le "
 "pubblicazioni come &ldquo;<a href=\"#Content\">contenuto</a>&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The narrow thinking associated with the idea that we &ldquo;consume
+# | content&rdquo; paves the way for laws such as the DMCA that forbid users
+# | to break the <a href=\"http{+s+}://DefectiveByDesign.org/\">Digital
+# | Restrictions Management</a> (DRM) facilities in digital devices.  If users
+# | think what they do with these devices is &ldquo;consume,&rdquo; they may
+# | see such restrictions as natural.
+#, fuzzy
+#| msgid ""
+#| "The narrow thinking associated with the idea that we &ldquo;consume "
+#| "content&rdquo; paves the way for laws such as the DMCA that forbid users "
+#| "to break the <a href=\"http://DefectiveByDesign.org/\";>Digital "
+#| "Restrictions Management</a> (DRM) facilities in digital devices.  If "
+#| "users think what they do with these devices is &ldquo;consume,&rdquo; "
+#| "they may see such restrictions as natural."
 msgid ""
 "The narrow thinking associated with the idea that we &ldquo;consume "
 "content&rdquo; paves the way for laws such as the DMCA that forbid users to "
-"break the <a href=\"http://DefectiveByDesign.org/\";>Digital Restrictions "
+"break the <a href=\"https://DefectiveByDesign.org/\";>Digital Restrictions "
 "Management</a> (DRM) facilities in digital devices.  If users think what "
 "they do with these devices is &ldquo;consume,&rdquo; they may see such "
 "restrictions as natural."
@@ -907,7 +944,7 @@
 "dispositivi è  \"consumare\", allora vedranno come naturali queste "
 "restrizioni."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | It also encourages the [-acceptation-] {+acceptance+} of
 # | &ldquo;streaming&rdquo; services, which use DRM to perversely limit
 # | listening to [-music so that it fits-] {+music, or watching video, to
@@ -929,7 +966,7 @@
 "l'ascolto di musica in modo da farla rientrare nel concetto di &ldquo;"
 "consumare&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | Why is this perverse usage spreading? Some may feel that the term sounds
 # | sophisticated, but rejecting it with cogent reasons can appear even more
 # | sophisticated.  {+Some want to generalize about all kinds of media, but
@@ -961,7 +998,7 @@
 "Il fatto che sia utilizzato in ambienti prestigiosi dà l'impressione che sia 
"
 "il temine &ldquo;corretto&rdquo; da usare."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;consuming&rdquo; music, fiction, or any other artistic "
 "works is to treat them as commodities rather than as art.  Do we want to "
@@ -969,35 +1006,35 @@
 "so?"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who answer no, please join me in shunning the term &ldquo;"
 "consume&rdquo; for this."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What to use instead? You can use specific verbs such as &ldquo;read,&rdquo; "
 "&ldquo;listen to,&rdquo; &ldquo;watch&rdquo; or &ldquo;look at,&rdquo; since "
 "they help to restrain the tendency to overgeneralize."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you insist on generalizing, you can use the expression &ldquo;attend to,"
 "&rdquo; which requires less of a stretch than &ldquo;consume.&rdquo; For a "
 "work meant for practical use, &ldquo;use&rdquo; is best."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "See also the following entry."
 msgstr "Vedere anche la voce seguente."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consumer&rdquo;"
 msgstr "&ldquo;Consumatore&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;consumer,&rdquo; when used to refer to the users of "
 "computing, is loaded with assumptions we should reject.  Some come from the "
@@ -1013,7 +1050,7 @@
 "duplicabili le stesse conclusioni che sono state tratte per beni materiali "
 "non duplicabili."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In addition, describing the users of software as &ldquo;consumers&rdquo; "
 "refers to a framing in which people are limited to selecting between "
@@ -1028,7 +1065,7 @@
 "<a href=\"/philosophy/free-software-even-more-important.html\">esercitare "
 "diretto controllo</a> sul software che utilizzano."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To describe people who are not limited to passive use of works, we suggest "
 "terms such as &ldquo;individuals&rdquo; and &ldquo;citizens,&rdquo; rather "
@@ -1038,9 +1075,17 @@
 "computer, suggeriamo termini come \"individui\" e  \"cittadini\", non "
 "\"consumatori\"."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | This problem with the word &ldquo;consumer&rdquo; has been <a
+# | 
href=\"http{+s+}://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams\">noted
+# | before</a>.
+#, fuzzy
+#| msgid ""
+#| "This problem with the word &ldquo;consumer&rdquo; has been <a href="
+#| "\"http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-";
+#| "language-raymond-williams\">noted before</a>."
 msgid ""
-"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"http://";
+"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"https://";
 "www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-"
 "williams\">noted before</a>."
 msgstr ""
@@ -1048,11 +1093,11 @@
 "già <a href=\"http://www.theguardian.com/commentisfree/2013/aug/11/";
 "capitalism-language-raymond-williams\">trattato da altri</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Content&rdquo;"
 msgstr "&ldquo;Contenuto&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to describe a feeling of comfort and satisfaction, by all means "
 "say you are &ldquo;content,&rdquo; but using the word as a noun to describe "
@@ -1071,7 +1116,7 @@
 "considerare in maniera irrispettosa le opere stesse. Chi vuole evitare "
 "questo errore può parlare di \"opere\" o di \"pubblicazioni\"."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use the term &ldquo;content&rdquo; are often the publishers that "
 "push for increased copyright power in the name of the authors (&ldquo;"
@@ -1088,7 +1133,7 @@
 "\"https://www.theguardian.com/culture/2016/aug/02/how-to-deal-with-trump-";
 "trolls-online\">nel Guardian</a>:"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Content itself is beside the point&mdash;as the very use of words like "
 "content suggests. The moment you start labelling every single piece of "
@@ -1100,7 +1145,7 @@
 "qualsiasi testo scritto al mondo, si ammette che il \"contenuto\" è "
 "intercambiabile e che è semplicemente qualcosa che è bene avere."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In other words, &ldquo;content&rdquo; reduces publications and writings to a "
 "sort of pap fit to be piped through the &ldquo;tubes&rdquo; of the internet."
@@ -1109,7 +1154,7 @@
 "di scrittura ad una sorta di minestrone da canalizzare nei &ldquo;"
 "tubi&rdquo; di Internet."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | See also <a href=\"http{+s+}://www.salon.com/2000/06/14/love_7/\">Courtney
 # | Love's open letter to Steve Case</a> and search for &ldquo;content
 # | provider&rdquo; in that page.  Alas, Ms. Love is unaware that the term
@@ -1135,7 +1180,7 @@
 "termine &ldquo;intellectual property&rdquo;, \"proprietà intellettuale\", è 
"
 "<a href=\"#IntellectualProperty\"> da evitare</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "However, as long as other people use the term &ldquo;content provider,"
 "&rdquo; political dissidents can well call themselves &ldquo;malcontent "
@@ -1146,7 +1191,7 @@
 "sconten(u)to\". (NdT. In inglese  \"content\" significa sia \"contento\" che "
 "\"contenuto\")"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
 "&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
@@ -1163,7 +1208,7 @@
 "system&rdquo;, è un sistema per fare qualcosa a qualche tipo di "
 "informazione. Quasi tutti i programmi soddisfano la definizione."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
 "web site.  For that, we recommend the term &ldquo;web site revision "
@@ -1174,11 +1219,11 @@
 "&ldquo;sistema di revisione di siti web&rdquo;, o &ldquo;web site revision "
 "system&rdquo; (WRS) in quei casi."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Copyright Owner&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyright is an artificial privilege, handed out by the state to achieve a "
 "public interest and lasting a period of time &mdash; not a natural right "
@@ -1186,7 +1231,7 @@
 "to the recipient of that privilege as a &ldquo;copyright holder.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A few decades ago, copyright holders began trying to reduce awareness of "
 "this point.  In addition to citing frequently the bogus concept of <a href="
@@ -1196,11 +1241,11 @@
 "instead."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creative Commons licensed&rdquo;"
 msgstr "&ldquo;Sotto licenza Creative Commons&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The most important licensing characteristic of a work is whether it is "
 "free.  Creative Commons publishes seven licenses; three are free (CC BY, CC "
@@ -1215,7 +1260,7 @@
 "Creative Commons\" non dice se è libera, e sminuisce l'importanza della "
 "questione: la frase può essere corretta, ma l'omissione è dannosa."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To encourage people to pay attention to the most important distinction, "
 "always specify <em>which</em> Creative Commons license is used, as in &ldquo;"
@@ -1227,11 +1272,11 @@
 "Commons è in uso, ad esempio \"rilasciato con licenza CC BY-SA\". Se non si "
 "sa quale licenza precisa è usata da una certa opera, occorre determinarla."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creator&rdquo;"
 msgstr "&ldquo;Creatore&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
@@ -1251,11 +1296,11 @@
 "copyright\" è ciò  che si intende. Questi due termini non sono equivalenti: 
"
 "è piuttosto comune che il detentore del copyright non sia l'autore."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr "&ldquo;Beni digitali (Digital Goods)&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
 "authorship, identifies them with physical goods&mdash;which cannot be "
@@ -1273,11 +1318,11 @@
 "problema in termini economici, che sono troppo poco approfonditi e limitati "
 "per cogliere i valori della libertà e della comunità."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Locks&rdquo;"
 msgstr "&ldquo;Lucchetti digitali (Digital Locks)&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital locks&rdquo; is used to refer to Digital Restrictions "
 "Management by some who criticize it.  The problem with this term is that it "
@@ -1290,12 +1335,29 @@
 "DRM è malvagia. Chi ha adottato questo termine non ci ha riflettuto "
 "abbastanza."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Locks are not necessarily oppressive or bad.  You probably own several
+# | locks, and their keys or codes as well; you may find them useful or
+# | troublesome, but they don't oppress you, because you can open and close
+# | them.  Likewise, we find <a
+# | 
href=\"http{+s+}://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-\">encryption</a>
+# | invaluable for protecting our digital files.  That too is a kind of
+# | digital lock that you have control over.
+#, fuzzy
+#| msgid ""
+#| "Locks are not necessarily oppressive or bad.  You probably own several "
+#| "locks, and their keys or codes as well; you may find them useful or "
+#| "troublesome, but they don't oppress you, because you can open and close "
+#| "them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+#| "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-"
+#| "the-good-guys-have-keys-to-\">encryption</a> invaluable for protecting "
+#| "our digital files.  That too is a kind of digital lock that you have "
+#| "control over."
 msgid ""
 "Locks are not necessarily oppressive or bad.  You probably own several "
 "locks, and their keys or codes as well; you may find them useful or "
 "troublesome, but they don't oppress you, because you can open and close "
-"them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+"them.  Likewise, we find <a href=\"https://www.theguardian.com/";
 "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
 "good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
 "digital files.  That too is a kind of digital lock that you have control "
@@ -1310,7 +1372,7 @@
 "crittografica</a> dei nostri file. Anche questo è un lucchetto digitale su "
 "cui abbiamo controllo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "DRM is like a lock placed on you by someone else, who refuses to give you "
 "the key&mdash;in other words, like <em>handcuffs</em>.  Therefore, the "
@@ -1322,7 +1384,7 @@
 "Quindi la metefora migliore quando si parla di DRM è &ldquo;manette "
 "digitali&rdquo; anziché &ldquo;lucchetti digitali&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A number of opposition campaigns have chosen the unwise term &ldquo;digital "
 "locks&rdquo;; to get things back on the right track, we must firmly insist "
@@ -1338,12 +1400,12 @@
 "d'accordo con la causa; ma quando capiterà sostituiremo il termine con "
 "&ldquo;manette digitali&rdquo;, spiegandone le ragioni."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Rights Management&rdquo;"
 msgstr ""
 "&ldquo;Digital Rights Management (Gestione digitale dei diritti)&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital Rights Management&rdquo; (abbreviated &ldquo;DRM&rdquo;) "
 "refers to technical mechanisms designed to impose restrictions on computer "
@@ -1359,7 +1421,7 @@
 "questione dal punto di vista dei pochi che impongono tali  restrizioni, "
 "ignorando al contempo quella dei molti a cui le  restrizioni vengono imposte."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Good alternatives include &ldquo;Digital Restrictions Management,&rdquo; and "
 "&ldquo;digital handcuffs.&rdquo;"
@@ -1367,19 +1429,25 @@
 "Buone alternative sono espressioni quali \"Digital Restrictions  Management"
 "\" (Gestione digitale delle restrizioni) e  \"manette digitali\"."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Please sign up to support our <a
+# | href=\"http{+s+}://DefectiveByDesign.org/\"> campaign to abolish DRM</a>.
+#, fuzzy
+#| msgid ""
+#| "Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+#| "campaign to abolish DRM</a>."
 msgid ""
-"Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+"Please sign up to support our <a href=\"https://DefectiveByDesign.org/\";> "
 "campaign to abolish DRM</a>."
 msgstr ""
 "Partecipate alla nostra <a href=\"http://DefectiveByDesign.org/\";> campagna "
 "per abolire DRM</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ecosystem&rdquo;"
 msgstr "&ldquo;Ecosistema&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is inadvisable to describe the free software community, or any human "
 "community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
@@ -1389,7 +1457,7 @@
 "comunità del software libero, come \"ecosistema\", perché quella parola "
 "implica l'assenza di senso etico."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;ecosystem&rdquo; implicitly suggests an attitude of "
 "nonjudgmental observation: don't ask how what <em>should</em> happen, just "
@@ -1410,7 +1478,7 @@
 "delle condizioni; e questo non è giusto né sbagliato, è un fenomeno "
 "ecologico, anche se comporta l'estinzione di una specie."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By contrast, beings that adopt an ethical stance towards their surroundings "
 "can decide to preserve things that, without their intervention, might "
@@ -1424,11 +1492,11 @@
 "salute pubblica, un clima stabile, l'aria e l'acqua pulite, le specie in "
 "pericolo, le arti tradizionali... e la libertà degli utenti di computer."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FLOSS&rdquo;"
 msgstr "&ldquo;FLOSS&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
 "Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
@@ -1443,11 +1511,11 @@
 "migliore; ma chi vuole difendere la libertà non dovrebbe usare termini "
 "neutrali."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;For free&rdquo;"
 msgstr "&ldquo;For free&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to say that a program is free software, please don't say that it "
 "is available &ldquo;for free.&rdquo; That term specifically means &ldquo;for "
@@ -1458,7 +1526,7 @@
 "termine (in inglese) significa  specificamente \"a costo zero\". Il software "
 "libero è una questione  di libertà, non di prezzo."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software copies are often available for free&mdash;for example, by "
 "downloading via FTP.  But free software copies are also available for a "
@@ -1473,7 +1541,7 @@
 "gratuitamente a  fini promozionali e alcuni pacchetti proprietari sono "
 "normalmente  disponibili a costo zero per determinati utenti."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, you can say that the program is available &ldquo;as free "
 "software.&rdquo;"
@@ -1481,11 +1549,11 @@
 "Onde evitare confusioni, si può dire che il programma è  disponibile \"come 
"
 "software libero\"."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FOSS&rdquo;"
 msgstr "&ldquo;FOSS&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
 "&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
@@ -1500,17 +1568,17 @@
 "neutrale, è meglio usare &ldquo;FLOSS&rdquo;; ma chi vuole difendere la "
 "libertà non dovrebbe usare termini neutrali."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>FOSS</b>, we say, <b>free software</b> or <b>free (libre) "
 "software</b>."
 msgstr "Invece di <b>FOSS</b> diciamo <b>software libero</b>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freely available&rdquo;"
 msgstr "&ldquo;Liberamente disponibile&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The terms are not equivalent.  Software is &ldquo;"
@@ -1525,11 +1593,11 @@
 "della libertà degli utenti che ne hanno una copia. Queste sono risposte a "
 "domande diverse."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freeware&rdquo;"
 msgstr "&ldquo;Freeware&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;freeware&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The term &ldquo;freeware&rdquo; was used often in the "
@@ -1542,7 +1610,7 @@
 "disponibili i codici sorgenti. Oggi  tale termine non indica alcuna "
 "specifica definizione  generale."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When using languages other than English, please avoid borrowing English "
 "terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; It is "
@@ -1554,7 +1622,7 @@
 "utilizzare le espressioni spesso meno  ambigue offerte dalla <a href=  \"/"
 "philosophy/fs-translations.html\">vostra lingua</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By using a word in <a href=\"/philosophy/fs-translations.html\">your own "
 "language</a>, you show that you are really referring to freedom and not just "
@@ -1571,11 +1639,11 @@
 "quando ne considereranno il significato preciso,  capiranno veramente di "
 "cosa si tratta."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Give away software&rdquo;"
 msgstr "&ldquo;Regalare software&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
 "distribute a program as free software.&rdquo; This locution has the same "
@@ -1589,11 +1657,11 @@
 "questione sia il prezzo, non la libertà.  Un modo per evitare questa "
 "confusione consiste nel dire:  \"rilasciare come software libero\"."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Google&rdquo;"
 msgstr "&ldquo;Googlare&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;google&rdquo; as a verb, meaning to "
 "search for something on the internet. &ldquo;Google&rdquo; is just the name "
@@ -1613,13 +1681,29 @@
 "a> garantisce di non tracciare i propri utenti, anche se nessuno "
 "dall'esterno può verificarlo in prima persona."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Hacker&rdquo;"
 msgstr "&ldquo;Hacker&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A hacker is someone who <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\"> enjoys playful
+# | cleverness</a>&mdash;not necessarily with computers.  The programmers in
+# | the old <abbr title=\"Massachusetts Institute of Technology\">MIT</abbr>
+# | free software community of the 60s and 70s referred to themselves as
+# | hackers.  Around 1980, journalists who discovered the hacker community
+# | mistakenly took the term to mean &ldquo;security breaker.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+#| "html\"> enjoys playful cleverness</a>&mdash;not necessarily with "
+#| "computers.  The programmers in the old <abbr title=\"Massachusetts "
+#| "Institute of Technology\">MIT</abbr> free software community of the 60s "
+#| "and 70s referred to themselves as hackers.  Around 1980, journalists who "
+#| "discovered the hacker community mistakenly took the term to mean &ldquo;"
+#| "security breaker.&rdquo;"
 msgid ""
-"A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+"A hacker is someone who <a href=\"https://stallman.org/articles/on-hacking.";
 "html\"> enjoys playful cleverness</a>&mdash;not necessarily with computers.  "
 "The programmers in the old <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr> free software community of the 60s and 70s referred "
@@ -1636,17 +1720,17 @@
 "comunità degli hacker pensarono per errore che il termine significasse "
 "&ldquo;chi viola la sicurezza&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't spread this mistake.  People who break security are &ldquo;"
 "crackers.&rdquo;"
 msgstr "Non diffondete questo errore: chi viola la sicurezza è un 
\"cracker\"."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Intellectual property&rdquo;"
 msgstr "&ldquo;Proprietà  intellettuale&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
 "property&rdquo;&mdash;a term also applied to patents, trademarks, and other "
@@ -1662,7 +1746,7 @@
 "generalizzazioni. È meglio parlare  specificatamente di \"copyright\", "
 "\"brevetti\" o \"marchi  registrati\"."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;intellectual property&rdquo; carries a hidden "
 "assumption&mdash;that the way to think about all these disparate issues is "
@@ -1674,7 +1758,7 @@
 "su un'analogia con gli oggetti fisici, e  sull'idea di considerarli una "
 "proprietà."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When it comes to copying, this analogy disregards the crucial difference "
 "between material objects and information: information can be copied and "
@@ -1685,7 +1769,7 @@
 "essere copiata e condivisa quasi senza sforzo,  mentre ciò non è vero degli 
"
 "oggetti materiali."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid spreading unnecessary bias and confusion, it is best to adopt a "
 "firm policy <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
@@ -1695,7 +1779,7 @@
 "decisione ferma <a href=  \"/philosophy/not-ipr.html\">di non parlare e "
 "nemmeno pensare in  termini di \"proprietà intellettuale\"</a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
 "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make the "
@@ -1705,11 +1789,11 @@
 "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\">provocando  imbarazzo "
 "nel WIPO</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Internet of Things&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies decided to make computerized appliances that would connect "
 "over the internet to the manufacturer's server, and therefore could easily "
@@ -1718,9 +1802,9 @@
 "&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Experience shows that these products often do <a href=\"http://www.locusmag.";
+"Experience shows that these products often do <a href=\"https://www.locusmag.";
 "com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-"
 "things-to-be-sensed/\"> spy on their users</a>.  They are also tailor-made "
 "for <a href=\"https://archive.ieet.org/articles/rinesi20150806.html\";>giving "
@@ -1729,15 +1813,15 @@
 "off the server it depends on."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We call them the &ldquo;Internet of Stings.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;LAMP system&rdquo;"
 msgstr "&ldquo;Sistema LAMP&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
 "&mdash;a common combination of software to use on a web server, except that "
@@ -1751,11 +1835,11 @@
 "invece di &ldquo;LAMP&rdquo; dovrebbe essere &ldquo;GLAMP&rdquo;: &ldquo;"
 "GNU, Linux, Apache, MySQL e PHP&rdquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Linux system&rdquo;"
 msgstr "&ldquo;Sistema Linux&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
@@ -1772,11 +1856,11 @@
 "riconoscere i meriti di GNU sia per distinguere l'intero sistema dal "
 "semplice kernel."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Market&rdquo;"
 msgstr "&ldquo;Mercato&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is misleading to describe the users of free software, or the software "
 "users in general, as a &ldquo;market.&rdquo;"
@@ -1784,7 +1868,7 @@
 "È fuorviante descrivere gli utenti del software libero, o gli  utenti del "
 "software in generale, come un \"mercato\"."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "This is not to say there is no room for markets in the free software "
 "community.  If you have a free software support business, then you have "
@@ -1796,7 +1880,7 @@
 "loro in un mercato. Finché rispettate la loro  libertà, vi auguriamo "
 "successo nel vostro mercato."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "But the free software movement is a social movement, not a business, and the "
 "success it aims for is not a market success.  We are trying to serve the "
@@ -1812,18 +1896,18 @@
 "libertà alla campagna di  un'impresa per il suo successo è sminuire la "
 "libertà."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Modern&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;modern&rdquo; makes sense from a descriptive perspective "
 "&mdash; for instance, solely to distinguish newer periods and ways from "
 "older ones."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It becomes a problem when it carries the presumption that older ways are "
 "&ldquo;old-fashioned&rdquo;; that is, presumed to be worse.  In "
@@ -1831,11 +1915,11 @@
 "users, the reverse is often true."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Monetize&rdquo;"
 msgstr "&ldquo;Monetizzare&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The proper definition of &ldquo;monetize&rdquo; is &ldquo;to use something "
 "as currency.&rdquo; For instance, human societies have monetized gold, "
@@ -1851,7 +1935,7 @@
 "in un senso diverso, quello di &ldquo;fare soldi sulla base di "
 "qualcosa&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That usage casts the profit as primary, and the thing used to get the profit "
 "as secondary.  That attitude applied to a software project is objectionable "
@@ -1863,7 +1947,7 @@
 "perché indurrebbe gli sviluppatori a rendere proprietario il programma, se "
 "questi concludono che renderlo libero non porta abbastanza guadagno."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A productive and ethical business can make money, but if it subordinates all "
 "else to profit, it is not likely to remain ethical."
@@ -1871,12 +1955,12 @@
 "Un'azienda produttiva ed etica può certamente fare denaro, ma se fa "
 "dipendere tutto dal profitto è difficile che rimanga etica."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;MP3 Player&rdquo;"
 msgstr "&ldquo;MP3 Player&rdquo;"
 
 #.  The MP3 patents will reportedly expire by 2018.  
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the late 1990s it became feasible to make portable, solid-state digital "
 "audio players.  Most players supported the patented MP3 codec, and that is "
@@ -1891,7 +1975,7 @@
 "brevettati Ogg Vorbis e FLAC, e alcuni non potevano riprodurre file MP3 "
 "perché i loro sviluppatori dovevano proteggersi dai brevetti sui file MP3."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Using the term &ldquo;MP3 players&rdquo; for audio players in general has "
 "the effect of promoting the MP3 format and discouraging the other formats "
@@ -1903,7 +1987,7 @@
 "altri, anche se tecnicamente superiori. Anche se i brevetti sul formato MP3 "
 "sono scaduti questo effetto collaterale è tuttora indesiderabile."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;digital audio player,&rdquo; or simply &ldquo;"
 "audio player&rdquo; when that's clear enough, instead of &ldquo;MP3 player."
@@ -1912,11 +1996,11 @@
 "Suggeriamo &ldquo;digital audio player,&rdquo; o &ldquo;audio player&rdquo; "
 "al posto di &ldquo;MP3 player.&rdquo;"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Open&rdquo;"
 msgstr "&ldquo;Aperto&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open source&rdquo; "
 "as a substitute for &ldquo;free software.&rdquo; Those terms refer to a <a "
@@ -1933,7 +2017,7 @@
 "digitali, come questione di giustizia. L'open source non fa alcun tipo di "
 "campagna del genere."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When referring to the open source views, it's correct to use that name, but "
 "please do not use that term when talking about us, our software, or our "
@@ -1944,31 +2028,31 @@
 "software, delle nostre opinioni, altrimenti si rischia che il nostro punto "
 "di vista sia confuso con il loro."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>open source</b>, we say, <b>free software</b> or <b>free "
 "(libre) software</b>."
 msgstr "Invece di <b>open source</b> diciamo <b>software libero</b>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 # | [-&ldquo;Open&rdquo;-]{+&ldquo;Opt out&rdquo;+}
 #, fuzzy
 #| msgid "&ldquo;Open&rdquo;"
 msgid "&ldquo;Opt out&rdquo;"
 msgstr "&ldquo;Aperto&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When applied to any form of computational mistreatment, &ldquo;opt "
 "out&rdquo; implies the choice is a minor matter of convenience. We recommend "
 "&ldquo;reject,&rdquo; &ldquo;shun&rdquo; or &ldquo;escape from.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PC&rdquo;"
 msgstr "&ldquo;PC&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's OK to use the abbreviation &ldquo;PC&rdquo; to refer to a certain kind "
 "of computer hardware, but please don't use it with the implication that the "
@@ -1980,23 +2064,36 @@
 "che quel computer usi Microsoft Windows. Se lo usate per installarci GNU/"
 "Linux, rimane un PC."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;WC&rdquo; has been suggested for a computer running Windows."
 msgstr ""
 "Per un computer con Windows è stato suggerito il termine &ldquo;WC&rdquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Photoshop&rdquo;"
 msgstr "&ldquo;Photoshop&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any
+# | kind of photo manipulation or image editing in general.  Photoshop is just
+# | the name of one particular image editing program, which should be avoided
+# | since it is proprietary.  There are plenty of free programs for editing
+# | images, such as the <a [-href=\"/software/gimp\">GIMP</a>.-]
+# | {+href=\"https://www.gimp.org/\";>GIMP</a>.+}
+#, fuzzy
+#| msgid ""
+#| "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning "
+#| "any kind of photo manipulation or image editing in general.  Photoshop is "
+#| "just the name of one particular image editing program, which should be "
+#| "avoided since it is proprietary.  There are plenty of free programs for "
+#| "editing images, such as the <a href=\"/software/gimp\">GIMP</a>."
 msgid ""
 "Please avoid using the term &ldquo;photoshop&rdquo; as a verb, meaning any "
 "kind of photo manipulation or image editing in general.  Photoshop is just "
 "the name of one particular image editing program, which should be avoided "
 "since it is proprietary.  There are plenty of free programs for editing "
-"images, such as the <a href=\"/software/gimp\">GIMP</a>."
+"images, such as the <a href=\"https://www.gimp.org/\";>GIMP</a>."
 msgstr ""
 "Bisogna evitare l'uso di &ldquo;photoshoppare&rdquo; come verbo legato alla "
 "manipolazione di immagini. Photoshop è solo il nome di un preciso programma "
@@ -2004,11 +2101,11 @@
 "programmi liberi per manipolare immagini, come <a href=\"/software/gimp"
 "\">GIMP</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Piracy&rdquo;"
 msgstr "&ldquo;Pirateria&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers often refer to copying they don't approve of as &ldquo;piracy."
 "&rdquo; In this way, they imply that it is ethically equivalent to attacking "
@@ -2025,7 +2122,7 @@
 "circostanze (a volte in tutte) in vari paesi del mondo, e stanno ancora "
 "facendo pressione per rendere più complete queste restrizioni."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you don't believe that copying not approved by the publisher is just like "
 "kidnapping and murder, you might prefer not to use the word &ldquo;"
@@ -2042,10 +2139,20 @@
 "Alcuni potrebbero  addirittura preferire un'espressione positiva come "
 "\"condividere  informazioni con il vicino\"."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A US judge, presiding over a trial for copyright infringement, recognized
+# | that <a
+# | 
href=\"http{+s+}://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo;
+# | and &ldquo;theft&rdquo; are smear words.</a>
+#, fuzzy
+#| msgid ""
+#| "A US judge, presiding over a trial for copyright infringement, recognized "
+#| "that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+#| "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
+#| "theft&rdquo; are smear words.</a>"
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear words.</a>"
 msgstr ""
@@ -2055,11 +2162,11 @@
 "\">&ldquo;pirateria&rdquo; e &ldquo;furto&rdquo; sono parole diffamatorie</"
 "a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;PowerPoint&rdquo;"
 msgstr "&ldquo;PowerPoint&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 #, fuzzy
 msgid ""
 "Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
@@ -2076,11 +2183,11 @@
 "<em>non PowerPoint</em>. Ci sono molte possibilità libere, ad esempio "
 "<code>beamer</code> per LaTeX e Impress, incluso anche in LibreOffice."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Product&rdquo;"
 msgstr "&ldquo;Prodotto&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you're talking about a product, by all means call it that.  However, when "
 "referring to a service, please do not call it a &ldquo;product.&rdquo; If a "
@@ -2095,11 +2202,11 @@
 "un fornitore di servizi vi fa un'offerta e la chiama &ldquo;prodotto&rdquo;, "
 "insistete affinché la chiami \"offerta\"."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Protection&rdquo;"
 msgstr "&ldquo;Protezione&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers' lawyers love to use the term &ldquo;protection&rdquo; to "
 "describe copyright.  This word carries the implication of preventing "
@@ -2114,7 +2221,7 @@
 "che traggono dei benefici dal  copyright, anziché con gli utenti che ne "
 "subiscono le  restrizioni."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms instead.  "
 "For example, instead of saying, &ldquo;Copyright protection lasts a very "
@@ -2125,7 +2232,7 @@
 "altri termini. Ad esempio, anziché: \"La tutela del  copyright dura molto a "
 "lungo\", si può dire: \"Il copyright dura  molto a lungo\"."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Likewise, instead of saying, &ldquo;protected by copyright,&rdquo; you can "
 "say, &ldquo;covered by copyright&rdquo; or just &ldquo;copyrighted.&rdquo;"
@@ -2133,7 +2240,7 @@
 "Allo stesso modo, invece di dire &ldquo;protetto da diritto d'autore&rdquo;, "
 "si può dire &ldquo;coperto da diritto d'autore&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to criticize copyright rather than be neutral, you can use the "
 "term &ldquo;copyright restrictions.&rdquo; Thus, you can say, &ldquo;"
@@ -2143,14 +2250,31 @@
 "ricorrere all'espressione \"le restrizioni del copyright\".  Così potrete "
 "dire, \"Le restrizioni del diritto d'autore durano molto a  lungo\"."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | The term &ldquo;protection&rdquo; is also used to describe malicious
+# | features.  For instance, &ldquo;copy protection&rdquo; is a feature that
+# | interferes with copying.  From the user's point of view, this is
+# | obstruction.  So we could call that malicious feature &ldquo;copy
+# | obstruction.&rdquo; More often it is called Digital Restrictions
+# | Management (DRM)&mdash;see the <a
+# | href=\"http{+s+}://DefectiveByDesign.org\"> Defective by Design</a>
+# | campaign.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;protection&rdquo; is also used to describe malicious "
+#| "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
+#| "interferes with copying.  From the user's point of view, this is "
+#| "obstruction.  So we could call that malicious feature &ldquo;copy "
+#| "obstruction.&rdquo; More often it is called Digital Restrictions "
+#| "Management (DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> "
+#| "Defective by Design</a> campaign."
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
 "features.  For instance, &ldquo;copy protection&rdquo; is a feature that "
 "interferes with copying.  From the user's point of view, this is "
 "obstruction.  So we could call that malicious feature &ldquo;copy "
 "obstruction.&rdquo; More often it is called Digital Restrictions Management "
-"(DRM)&mdash;see the <a href=\"http://DefectiveByDesign.org\";> Defective by "
+"(DRM)&mdash;see the <a href=\"https://DefectiveByDesign.org\";> Defective by "
 "Design</a> campaign."
 msgstr ""
 "Il termine &ldquo;protezione&rdquo; è usato anche per descrivere "
@@ -2161,11 +2285,11 @@
 "si veda la campagna <a href=\"http://DefectiveByDesign.org\";> Defective by "
 "Design</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;"
 msgstr "&ldquo;RAND (Reasonable and Non-Discriminatory)&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies that promulgate patent-restricted standards that prohibit "
 "free software typically have a policy of obtaining patent licenses that "
@@ -2180,7 +2304,7 @@
 "termine \"RAND\", acronimo  che sta per \"ragionevoli e non discriminatorie"
 "\"."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "That term whitewashes a class of patent licenses that are normally neither "
 "reasonable nor nondiscriminatory.  It is true that these licenses do not "
@@ -2196,7 +2320,7 @@
 "significato di \"RAND\" è  fuorviante mentre l'altra metà esprime un "
 "pregiudizio."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
 "and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
@@ -2214,7 +2338,7 @@
 "l'hanno ampiamente diffusa significa consentire a tali aziende di  imporre "
 "agli altri quelle opinioni."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We suggest the term &ldquo;uniform fee only,&rdquo; or &ldquo;UFO&rdquo; for "
 "short, as a replacement.  It is accurate because the only condition in these "
@@ -2225,11 +2349,11 @@
 "descrizione accurata perché la sola condizione per  queste licenze è il "
 "pagamento di una tariffa uniforme per le  royalty."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;SaaS&rdquo; or &ldquo;Software as a Service&rdquo;"
 msgstr "&ldquo;SaaS&rdquo; o &ldquo;Software as a Service&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We used to say that SaaS (short for &ldquo;Software as a Service&rdquo;) is "
 "an injustice, but then we found that there was a lot of variation in "
@@ -2246,7 +2370,7 @@
 "SaaSS&rdquo;, che ha il duplice vantaggio di essere nuovo (e quindi definito "
 "solo da noi) e di rendere esplicito il problema dell'ingiustizia."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/who-does-that-server-really-serve.html\">Who Does "
 "That Server Really Serve?</a> for discussion of this issue."
@@ -2254,7 +2378,7 @@
 "Vedere <a href=\"/philosophy/who-does-that-server-really-serve.html\">Chi "
 "serve davvero quel server?</a> per altre discussioni sul tema."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In Spanish we continue to use the term &ldquo;software como servicio&rdquo; "
 "because the joke of &ldquo;software como ser vicio&rdquo; (&ldquo;software, "
@@ -2264,11 +2388,11 @@
 "perché il gioco di parole con &ldquo;software como ser vicio&rdquo; "
 "(software come se fosse un vizio) è troppo azzeccato per abbandonarlo."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sell software&rdquo;"
 msgstr "&ldquo;Vendere software&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
 "exchanging a copy of a free program for a sum of money is <a href=\"/"
@@ -2288,7 +2412,7 @@
 "\"distribuire copie di un programma dietro pagamento\" oppure  \"imporre "
 "restrizioni proprietarie sull'uso di un programma\"."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for "
 "further discussion of this issue."
@@ -2296,11 +2420,11 @@
 "Vedere <a href=\"/philosophy/selling.html\">Vendere Software  Libero</a> per "
 "altre discussioni sull'argomento."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing (personal data)&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies manipulate or lure people into revealing personal data and "
 "thus ceding their privacy, please don't refer to this as &ldquo;sharing."
@@ -2310,17 +2434,17 @@
 "word to a practice which is harmful and dangerous."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When one company redistributes collected personal data to another company, "
 "that is even less deserving of the term &ldquo;sharing.&rdquo;"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Sharing economy&rdquo;"
 msgstr "&ldquo;Economia di condivisione (Sharing economy)&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;sharing economy&rdquo; is not a good way to refer to "
 "services such as Uber and Airbnb that arrange business transactions between "
@@ -2335,7 +2459,7 @@
 "esempio la ridistribuzione non commerciale di copie esatte di un'opera "
 "pubblicata. Estenderne il significato rischia di creare confusione."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 # | A more suitable term for businesses like Uber is the &ldquo;piecework
 # | service {+economy&rdquo; or &ldquo;gig+} economy.&rdquo;
 #, fuzzy
@@ -2349,11 +2473,11 @@
 "Un termine più adatto per descrivere il caso di aziende come Uber è quello "
 "di \"economia di servizi su transazioni singole\"."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Skype&rdquo;"
 msgstr "&ldquo;Skypare&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;skype&rdquo; as a verb, meaning any kind "
 "of video communication or telephony over the Internet in general.  &ldquo;"
@@ -2373,11 +2497,11 @@
 "\"https://libreplanet.org/wiki/Group:Skype_Replacement\";> programmi "
 "equivalenti a Skype</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Software Industry&rdquo;"
 msgstr "&ldquo;Industria del software&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;software industry&rdquo; encourages people to imagine that "
 "software is always developed by a sort of factory and then delivered to "
@@ -2392,7 +2516,7 @@
 "software esistono, e molte di  queste sviluppano software libero e non, ma "
 "quelle che sviluppano  software libero non sono come fabbriche."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;industry&rdquo; is being used as propaganda by advocates of "
 "software patents.  They call software development &ldquo;industry&rdquo; and "
@@ -2412,11 +2536,11 @@
 "respingendo i brevetti software nel 2003, ha stabilito  con votazione che "
 "\"industria\" è \"produzione automatica di beni  materiali\"</a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Source model&rdquo;"
 msgstr "&ldquo;Modello di sorgente (Source model)&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
@@ -2438,11 +2562,11 @@
 "informazione chiara, ma dà l'opportunità di usare &ldquo;open source&rdquo; 
"
 "in pagine dedicate al software libero."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Terminal&rdquo;"
 msgstr "&ldquo;Terminale&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Mobile phones and tablets are computers, and people should be able to do "
 "their computing on them using free software.  To call them &ldquo;"
@@ -2454,11 +2578,11 @@
 "potrebbe lasciare intendere che si possano usare solo per connettersi a "
 "server, che è un modo sbagliato di usare un computer."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Theft&rdquo;"
 msgstr "&ldquo;Furto&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The supporters of a too-strict, repressive form of copyright often use words "
 "like &ldquo;stolen&rdquo; and &ldquo;theft&rdquo; to refer to copyright "
@@ -2470,10 +2594,22 @@
 "copyright.  Questa è un'esagerazione, ma costoro vorrebbero che questa "
 "venisse considerata una verità oggettiva."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | Under the US legal system, copyright infringement is not theft.  <a
+# | 
href=\"http{+s+}://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;invol=207\">
+# | Laws about theft are not applicable to copyright infringement.</a> The
+# | supporters of repressive copyright are making an appeal to
+# | authority&mdash;and misrepresenting what authority says.
+#, fuzzy
+#| msgid ""
+#| "Under the US legal system, copyright infringement is not theft.  <a href="
+#| "\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;";
+#| "vol=473&amp;invol=207\"> Laws about theft are not applicable to copyright "
+#| "infringement.</a> The supporters of repressive copyright are making an "
+#| "appeal to authority&mdash;and misrepresenting what authority says."
 msgid ""
 "Under the US legal system, copyright infringement is not theft.  <a href="
-"\"http://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
+"\"https://caselaw.lp.findlaw.com/scripts/getcase.pl?court=us&amp;vol=473&amp;";
 "invol=207\"> Laws about theft are not applicable to copyright infringement.</"
 "a> The supporters of repressive copyright are making an appeal to "
 "authority&mdash;and misrepresenting what authority says."
@@ -2485,9 +2621,19 @@
 "una forma oppressiva di copyright si  appellano a un'autorità... e "
 "presentano in maniera sbagliata  quanto sostiene tale autorità."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | To refute them, you can point to this <a
+# | 
href=\"http{+s+}://www.guardian.co.uk/books/2013/may/04/harper-lee-kill-mockingbird-copyright\">
+# | real case</a> which shows what can properly be described as
+# | &ldquo;copyright theft.&rdquo;
+#, fuzzy
+#| msgid ""
+#| "To refute them, you can point to this <a href=\"http://www.guardian.co.uk/";
+#| "books/2013/may/04/harper-lee-kill-mockingbird-copyright\"> real case</a> "
+#| "which shows what can properly be described as &ldquo;copyright theft."
+#| "&rdquo;"
 msgid ""
-"To refute them, you can point to this <a href=\"http://www.guardian.co.uk/";
+"To refute them, you can point to this <a href=\"https://www.guardian.co.uk/";
 "books/2013/may/04/harper-lee-kill-mockingbird-copyright\"> real case</a> "
 "which shows what can properly be described as &ldquo;copyright theft.&rdquo;"
 msgstr ""
@@ -2496,7 +2642,7 @@
 "caso reale</a> che mostra quello che potrebbe essere definito &ldquo;furto "
 "di copyright&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Unauthorized copying is forbidden by copyright law in many circumstances "
 "(not all!), but being forbidden doesn't make it wrong.  In general, laws "
@@ -2511,10 +2657,20 @@
 "(l'applicazione) non rispettano le nostre idee di giusto e sbagliato (la "
 "specifica), allora le leggi dovrebbero essere cambiate."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+# | A US judge, presiding over a trial for copyright infringement, recognized
+# | that <a
+# | 
href=\"http{+s+}://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo;
+# | and &ldquo;theft&rdquo; are smear-words.</a>
+#, fuzzy
+#| msgid ""
+#| "A US judge, presiding over a trial for copyright infringement, recognized "
+#| "that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+#| "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
+#| "theft&rdquo; are smear-words.</a>"
 msgid ""
 "A US judge, presiding over a trial for copyright infringement, recognized "
-"that <a href=\"http://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
+"that <a href=\"https://torrentfreak.com/mpaa-banned-from-using-piracy-and-";
 "theft-terms-in-hotfile-trial-131129/\">&ldquo;piracy&rdquo; and &ldquo;"
 "theft&rdquo; are smear-words.</a>"
 msgstr ""
@@ -2524,11 +2680,11 @@
 "\">&ldquo;pirateria&rdquo; e &ldquo;furto&rdquo; sono parole diffamatorie</"
 "a>."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Trusted Computing&rdquo;"
 msgstr "&ldquo;Trusted Computing (informatica fidata)&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "<a href=\"/philosophy/can-you-trust.html\">&ldquo;Trusted computing&rdquo;</"
 "a> is the proponents' name for a scheme to redesign computers so that "
@@ -2543,11 +2699,11 @@
 "punto di vista, è &ldquo;fidato&rdquo;; dal punto di vista dell'utente è "
 "&ldquo;infido&rdquo;."
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Vendor&rdquo;"
 msgstr "&ldquo;Venditore&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;vendor&rdquo; to refer generally to anyone "
 "that develops or packages software.  Many programs are developed in order to "
@@ -2568,9 +2724,18 @@
 "sviluppatori di distribuzioni GNU/Linux sono venditori. Meglio utilizzare il "
 "termine generico \"fornitore\"."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+# | This essay is published in <a
+# | 
href=\"http{+s+}://shop.fsf.org/product/free-software-free-society/\"><cite>Free
+# | Software, Free Society: The Selected Essays of Richard M.
+# | Stallman</cite></a>.
+#, fuzzy
+#| msgid ""
+#| "This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+#| "software-free-society/\"><cite>Free Software, Free Society: The Selected "
+#| "Essays of Richard M. Stallman</cite></a>."
 msgid ""
-"This essay is published in <a href=\"http://shop.fsf.org/product/free-";
+"This essay is published in <a href=\"https://shop.fsf.org/product/free-";
 "software-free-society/\"><cite>Free Software, Free Society: The Selected "
 "Essays of Richard M. Stallman</cite></a>."
 msgstr ""
@@ -2604,14 +2769,14 @@
 #.         Please send your comments and general suggestions in this regard
 #.         to <a href="mailto:web-translators@gnu.org";>
 #.         &lt;web-translators@gnu.org&gt;</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>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "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."
 msgstr ""
 "Le traduzioni italiane sono effettuate ponendo la massima attenzione ai "
@@ -2625,21 +2790,12 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007,
-# | 2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, [-2018-] {+2018, 2020,
-# | 2021+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2014, 2015, 2016-] {+1996-2018, 2020, 2021+} Free
+# | Software Foundation, Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
-#| "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018 Free Software "
-#| "Foundation, Inc."
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008, "
-"2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 1996-2018, 2020, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -2664,6 +2820,20 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~| "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018 Free Software "
+#~| "Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~ "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018, 2020, 2021 Free "
+#~ "Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, "
+#~ "2008, 2009, 2010, 2011, 2012, 2015, 2016, 2017, 2018 Free Software "
+#~ "Foundation, Inc."
+
 #~ msgid ""
 #~ "To speak of &ldquo;consuming&rdquo; music, fiction, or any other artistic "
 #~ "works is to treat them as products rather than as art.  If you don't want "

Index: words-to-avoid.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ja.po,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -b -r1.185 -r1.186
--- words-to-avoid.ja.po        1 Jul 2021 02:03:52 -0000       1.185
+++ words-to-avoid.ja.po        21 Jul 2021 19:32:34 -0000      1.186
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2021-05-31 03:55+0000\n"
+"POT-Creation-Date: 2021-07-21 19:25+0000\n"
 "PO-Revision-Date: 2021-06-01 10:02+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -17,6 +17,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-07-21 19:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -26,11 +27,11 @@
 "避けるべき言葉 
(あるいは注意深く使う)、含みがあるかまぎらわしいので - 
GNU プ"
 "ロジェクト - フリーソフトウェアファウンデーション"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Words to Avoid (or Use with Care) Because They Are Loaded or Confusing"
 msgstr "避けるべき言葉 
(あるいは注意深く使う)、含みがあるかまぎらわしいので"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There are a number of words and phrases that we recommend avoiding, or "
 "avoiding in certain contexts and usages.  Some are ambiguous or misleading; "
@@ -42,83 +43,73 @@
 
"したちが同意していない見解を前提にしています(あなたにも同意しないで欲しいと思"
 "います)。"
 
-#. type: Content of: <div><blockquote><p>
-msgid ""
-"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
-"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
-"It The Swindle?</a>"
-msgstr ""
-"また、<a 
href=\"/philosophy/categories.html\">自由なソフトウェアの分類</a>と"
-"<a 
href=\"/philosophy/why-call-it-the-swindle.html\">なぜ、それをインチキンド"
-"ルと呼ぶのか?</a>もご覧ください。"
-
 #.  GNUN-SORT-START 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ad-blocker\">Ad-blocker</a>&rdquo; |"
 msgstr "「<a href=\"#Ad-blocker\">広告ブロッカー</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Access\">Access</a>&rdquo; |"
 msgstr "「<a href=\"#Access\">アクセス</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Alternative\">Alternative</a>&rdquo; |"
 msgstr "「<a href=\"#Alternative\">代替物</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Assets\">Assets</a>&rdquo; |"
 msgstr "「<a href=\"#Assets\">資産</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#BSD-style\">BSD-style</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#BSD-style\">BSDスタイル</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Closed\">Closed</a>&rdquo; |"
 msgstr "「<a href=\"#Closed\">クローズド</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CloudComputing\">Cloud Computing</a>&rdquo; |"
 msgstr "「<a 
href=\"#CloudComputing\">クラウド・コンピューティング</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Commercial\">Commercial</a>&rdquo; |"
 msgstr "「<a href=\"#Commercial\">商用</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Compensation\">Compensation</a>&rdquo; |"
 msgstr "「<a href=\"#Compensation\">補償金</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consume\">Consume</a>&rdquo; |"
 msgstr "「<a href=\"#Consume\">消費</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Consumer\">Consumer</a>&rdquo; |"
 msgstr "「<a href=\"#Consumer\">消費者</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Content\">Content</a>&rdquo; |"
 msgstr "「<a href=\"#Content\">コンテンツ</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#CopyrightOwner\">Copyright Owner</a>&rdquo; |"
 msgstr "「<a href=\"#CopyrightOwner\">著作権所有者</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#CreativeCommonsLicensed\">Creative Commons licensed</"
 "a>&rdquo; |"
@@ -127,191 +118,191 @@
 "a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Creator\">Creator</a>&rdquo; |"
 msgstr "「<a href=\"#Creator\">クリエーター</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalGoods\">Digital Goods</a>&rdquo; |"
 msgstr "「<a href=\"#DigitalGoods\">ディジタル作品</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#DigitalLocks\">Digital Locks</a>&rdquo; |"
 msgstr "「<a href=\"#DigitalLocks\">ディジタル錠</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#DigitalRightsManagement\">Digital Rights Management</"
 "a>&rdquo; |"
 msgstr "「<a 
href=\"#DigitalRightsManagement\">ディジタル権限管理</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Ecosystem\">Ecosystem</a>&rdquo; |"
 msgstr "「<a href=\"#Ecosystem\">エコシステム</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FLOSS\">FLOSS</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#FLOSS\">FLOSS</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#ForFree\">For free</a>&rdquo; |"
 msgstr "「<a href=\"#ForFree\">フリーで</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FOSS\">FOSS</a>&rdquo; |"
 msgstr "&ldquo;<a href=\"#FOSS\">FOSS</a>&rdquo; |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#FreelyAvailable\">Freely available</a>&rdquo; |"
 msgstr "「<a href=\"#FreelyAvailable\">フリーに利用可能</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Freeware\">Freeware</a>&rdquo; |"
 msgstr "「<a href=\"#Freeware\">フリーウェア</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#GiveAwaySoftware\">Give away software</a>&rdquo; |"
 msgstr "「<a href=\"#GiveAwaySoftware\">ソフトウェアをあげる</a>」 
|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Google\">Google</a>&rdquo; |"
 msgstr "「<a href=\"#Google\">グーグル</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Hacker\">Hacker</a>&rdquo; |"
 msgstr "「<a href=\"#Hacker\">ハッカー</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#IntellectualProperty\">Intellectual property</a>&rdquo; |"
 msgstr "「<a href=\"#IntellectualProperty\">知的財産</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#InternetofThings\">Internet of Things</a>&rdquo; |"
 msgstr "「<a href=\"#InternetofThings\">モノのインターネット</a>」 
|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#LAMP\">LAMP system</a>&rdquo; |"
 msgstr "「<a href=\"#LAMP\">LAMPシステム</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Linux\">Linux system</a>&rdquo; |"
 msgstr "「<a href=\"#Linux\">Linuxシステム</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Market\">Market</a>&rdquo; |"
 msgstr "「<a href=\"#Market\">マーケット</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Modern\">Modern</a>&rdquo; |"
 msgstr "「<a href=\"#Modern\">モダン</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Monetize\">Monetize</a>&rdquo; |"
 msgstr "「<a href=\"#Monetize\">マネタイズ</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#MP3Player\">MP3 player</a>&rdquo; |"
 msgstr "「<a href=\"#MP3Player\">MP3プレイヤー</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Open\">Open</a>&rdquo; |"
 msgstr "「<a href=\"#Open\">オープン</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#OptOut\">Opt out</a>&rdquo; |"
 msgstr "「<a href=\"#OpenOut\">オプトアウト</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PC\">PC</a>&rdquo; |"
 msgstr "「<a href=\"#PC\">PC</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Photoshop\">Photoshop</a>&rdquo; |"
 msgstr "「<a href=\"#Photoshop\">フォトショップ</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Piracy\">Piracy</a>&rdquo; |"
 msgstr "「<a href=\"#Piracy\">海賊行為</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#PowerPoint\">PowerPoint</a>&rdquo; |"
 msgstr "「<a href=\"#PowerPoint\">パワーポイント</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Product\">Product</a>&rdquo; |"
 msgstr "「<a href=\"#Product\">製品</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Protection\">Protection</a>&rdquo; |"
 msgstr "「<a href=\"#Protection\">保護</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#RAND\">RAND</a>&rdquo; |"
 msgstr "「<a href=\"#RAND\">RAND</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SaaS\">SaaS</a>&rdquo; |"
 msgstr "「<a href=\"#SaaS\">SaaS</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SellSoftware\">Sell software</a>&rdquo; |"
 msgstr "「<a href=\"#SellSoftware\">ソフトウェアを販売する</a>」 
|"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"#SharingPersonalData\">Sharing (personal data)</a>&rdquo; |"
 msgstr "「<a href=\"#SharingPersonalData\">共有 (個人データ)</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SharingEconomy\">Sharing economy</a>&rdquo; |"
 msgstr "「<a href=\"#SharingEconomy\">共有経済</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Skype\">Skype</a>&rdquo; |"
 msgstr "「<a href=\"#Skype\">スカイプ</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SoftwareIndustry\">Software Industry</a>&rdquo; |"
 msgstr "「<a href=\"#SoftwareIndustry\">ソフトウェア産業</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#SourceModel\">Source model</a>&rdquo; |"
 msgstr "「<a href=\"#SourceModel\">ソース・モデル</a>」 |"
 
@@ -321,7 +312,7 @@
 #.      language to refer to mobile computers; otherwise,
 #.      fill the translation with a space. 
 #.  GNUN-SORT-BEGIN-KEY 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Terminal\">Terminal</a>&rdquo; |"
 msgstr "「<a href=\"#Terminal\">端末</a>」 |"
 
@@ -329,26 +320,36 @@
 #. #endif
 #.  
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Theft\">Theft</a>&rdquo; |"
 msgstr "「<a href=\"#Theft\">窃盗</a>」 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#TrustedComputing\">Trusted Computing</a>&rdquo; |"
 msgstr ""
 "「<a 
href=\"#TrustedComputing\">トラステッド・コンピューティング</a>」
 |"
 
 #.  GNUN-SORT-NEXT-ITEM 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;<a href=\"#Vendor\">Vendor</a>&rdquo;"
 msgstr "「<a href=\"#Vendor\">ベンダー</a>」"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><p>
+msgid ""
+"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
+"Software</a>, <a href=\"/philosophy/why-call-it-the-swindle.html\">Why Call "
+"It The Swindle?</a>"
+msgstr ""
+"また、<a 
href=\"/philosophy/categories.html\">自由なソフトウェアの分類</a>と"
+"<a 
href=\"/philosophy/why-call-it-the-swindle.html\">なぜ、それをインチキンド"
+"ルと呼ぶのか?</a>もご覧ください。"
+
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ad-blocker&rdquo;"
 msgstr "「広告ブロッカー」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When the purpose of some program is to block advertisements, &ldquo;ad-"
 "blocker&rdquo; is a good term for it.  However, the GNU browser IceCat "
@@ -361,11 +362,11 @@
 
"る広告をブロックし、結果として、ウェブサイトによる監視を防止する大きな役割を"
 
"果たします。これは「広告ブロッカー」ではなく<em>監視防止</em>です。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Access&rdquo;"
 msgstr "「アクセス」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is a common misunderstanding to think free software means that the public "
 "has &ldquo;access&rdquo; to a program.  That is not what free software means."
@@ -374,7 +375,7 @@
 
"うのはよくある間違いです。これは自由ソフトウェアが意味することではありませ"
 "ん。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"/philosophy/free-sw.html\">criterion for free software</a> is "
 "not about who has &ldquo;access&rdquo; to the program; the four essential "
@@ -392,7 +393,7 @@
 
"<em>義務</em>を追うわけではありません。どんなユーザからもプログラãƒ
 ã®ã‚³ãƒ”ーを"
 
"要求する<em>権利</em>が、あなたにあるわけではありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In particular, if you write a program yourself and never offer a copy to "
 "anyone else, that program is free software albeit in a trivial way, because "
@@ -404,7 +405,7 @@
 
"有するすべてのユーザは、四つの重要な自由を有しているからです(たã
 ã²ã¨ã‚Šã®ãƒ¦ãƒ¼"
 "ザはあなたですから)。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In practice, when many users have copies of a program, someone is sure to "
 "post it on the internet, giving everyone access to it.  We think people "
@@ -416,7 +417,7 @@
 "があるでしょう。わたしたちは、そのプログラム
が有用であれば、人々はそうするべ"
 "きだ
と考えます。しかし、こうすることは自由ソフトウェアの要求ではありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "There is one specific point in which a question of having access is directly "
 "pertinent to free software: the GNU GPL permits giving a particular user "
@@ -430,7 +431,7 @@
 "とを認めます。これは、そのユーザが既にプログラム
のコピーをソースではない形態"
 "で有している特別な場合に適用されます。"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>with free software, the public has access to the program</b>, "
 "we say, <b>with free software, the users have the essential freedoms</b> and "
@@ -442,11 +443,11 @@
 "そして、<b>自由ソフトウェアでは、ユーザがプログラム
がユーザのために行うことに"
 
"対するコントロールを有する</b>とわたしたちは言います。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Alternative&rdquo;"
 msgstr "「代替物」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We don't describe free software in general as an &ldquo;alternative&rdquo; "
 "to proprietary, because that word presumes all the &ldquo;"
@@ -459,7 +460,7 @@
 
"ユーザにとって良いものであると前提しているからです。実効的に、自由ソフトウェ"
 "アは、ユーザの自由を尊重しないソフトウェアとå…
±å­˜ã™ã¹ãã¨ä»®å®šã™ã‚‹ã®ã§ã™ã€‚"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "We believe that distribution as free software is the only ethical way to "
 "make software available for others to use.  The other methods, <a href=\"/"
@@ -475,7 +476,7 @@
 
"ア代替としてのサービス</a>は、ユーザを従属させます。このような自由ソフトウェ"
 
"アの「代替物」をユーザに提供することが良い、とは、わたしたちは考えません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Special circumstances can drive users toward running one particular program "
 "for a certain job.  For instance, when a web page sends JavaScript client "
@@ -490,11 +491,11 @@
 
"なケースでは、その仕事のためのどのようなほかのコードも代替物として述べる理由"
 "があります。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Assets&rdquo;"
 msgstr "「資産」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To refer to published works as &ldquo;assets&rdquo;, or &ldquo;digital "
 "assets&rdquo;, is even worse than calling them <a href=\"#Content\">&ldquo;"
@@ -505,11 +506,11 @@
 
"\"#Content\">「コンテンツ」</a>と呼ぶよりももっと悪いでしょう。商用的な価値の"
 "ほかに社会に対する価値がå…
¨ããªã„と前提しているからです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;BSD-style&rdquo;"
 msgstr "&ldquo;BSDスタイル&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/licenses/bsd.html\">lumps together licenses that have important "
@@ -522,7 +523,7 @@
 "る</a>からです。たとえば、宣伝条項
のあるオリジナルのBSDライセンスはGNU一般公"
 
"衆ライセンスと両立しませんが、修正BSDライセンスはGPLと両立します。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, it is best to name <a href=\"/licenses/license-list.html"
 "\"> the specific license in question</a> and avoid the vague term &ldquo;BSD-"
@@ -532,11 +533,11 @@
 
"センスの特定の名称</a>を使い、「BSDスタイル」といった曖昧な用語を避けることが"
 "最適です。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Closed&rdquo;"
 msgstr "「クローズド」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Describing nonfree software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source.&rdquo; In the free software movement, <a href=\"/"
@@ -555,11 +556,11 @@
 
"ことを避けます。わたしたちはそれを「不自由」あるいは<a
 href=\"/philosophy/"
 
"categories.html#ProprietarySoftware\">「プロプライエタリ」</a>と呼びます。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Cloud Computing&rdquo;"
 msgstr "「クラウド・コンピューティング」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;cloud computing&rdquo; (or just &ldquo;cloud&rdquo;, in the "
 "context of computing) is a marketing buzzword with no coherent meaning.  It "
@@ -575,7 +576,7 @@
 
"ます。この用語に則って考察するのであれば、その考察は混乱したもの(もしくは、"
 
"「雲がかった」ものとでも言いましょうか?)となるでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When thinking about or responding to a statement someone else has made using "
 "this term, the first step is to clarify the topic.  What scenario is the "
@@ -588,12 +589,18 @@
 
"そのトピックが明確に形式化すれば、それについて整然とした考え方が可能となるで"
 "しょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
+#| "data in online services.  In most scenarios, that is foolish because it "
+#| "exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/";
+#| "apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgid ""
 "One of the many meanings of &ldquo;cloud computing&rdquo; is storing your "
 "data in online services.  In most scenarios, that is foolish because it "
-"exposes you to <a href=\"http://www.guardian.co.uk/commentisfree/2011/apr/25/";
-"hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
+"exposes you to <a href=\"https://www.guardian.co.uk/commentisfree/2011/";
+"apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">surveillance</a>."
 msgstr ""
 
"「クラウド・コンピューティング」の多くの意味の一つは、オンラインサービスにあ"
 
"なたのデータを保管することです。ほとんどの状況では、これは馬鹿げたことです。"
@@ -601,7 +608,7 @@
 
"commentisfree/2011/apr/25/hackers-spooks-cloud-antiauthoritarian-dream\">監視"
 "</a>にさらすことになるからです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning (which overlaps that but is not the same thing)  is <a href="
 "\"/philosophy/who-does-that-server-really-serve.html\"> Service as a "
@@ -613,7 +620,7 @@
 
"ソフトウェア</a>ですが、これはあなたがあなた自身のコンピューティングを制御す"
 
"ることを否定します。SaaSSを決して使うべきではありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is renting a remote physical server, or virtual server.  "
 "These practices are ok under certain circumstances."
@@ -621,7 +628,7 @@
 "もう一つの意味は、遠
隔の物理的なサーバ、もしくは仮想サーバを貸すことです。こ"
 "の慣習は特定の状況では、だ
いじょうぶということができます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Another meaning is accessing your own server from your own mobile device.  "
 "That raises no particular ethical issues."
@@ -629,7 +636,7 @@
 
"もう一つの意味は、自身のサーバに自身のモバイル・デバイスでアクセスすることで"
 
"す。これはなんの特別の倫理上の問題を引き起こしません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The <a href=\"https://csrc.nist.gov/publications/detail/sp/800-145/final\";> "
 "NIST definition of \"cloud computing\"</a> mentions three scenarios that "
@@ -649,7 +656,7 @@
 
"してのソフトウェアは、ソフトウェア代替としてのサービスと大きく重なります(それ"
 "はユーザを虐待
します)が、二つの考えは等価ではありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "These different computing practices don't even belong in the same "
 "discussion.  The best way to avoid the confusion the term &ldquo;cloud "
@@ -662,10 +669,17 @@
 
"の用語をコンピューティングと結びつけて使わないことです。あなたの意味するシナ"
 "リオについて述べ、具体的な用語で呼ぶのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Curiously, Larry Ellison, a proprietary software developer, also <a href="
+#| "\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> "
+#| "noted the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He "
+#| "decided to use the term anyway because, as a proprietary software "
+#| "developer, he isn't motivated by the same ideals as we are."
 msgid ""
 "Curiously, Larry Ellison, a proprietary software developer, also <a href="
-"\"http://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
+"\"https://www.cnet.com/news/oracles-ellison-nails-cloud-computing/\";> noted "
 "the vacuity of the term &ldquo;cloud computing.&rdquo;</a> He decided to use "
 "the term anyway because, as a proprietary software developer, he isn't "
 "motivated by the same ideals as we are."
@@ -677,11 +691,11 @@
 
"る理想と同じものには、プロプライエタリ・ソフトウェア開発è€
…として、かれはよっ"
 "ていないからです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Commercial&rdquo;"
 msgstr "「商用」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use &ldquo;commercial&rdquo; as a synonym for &ldquo;nonfree."
 "&rdquo; That confuses two entirely different issues."
@@ -689,7 +703,7 @@
 "「不自由」の同意語として「商用」は使わないでくだ
さい。これは二つのまったく異"
 "なる問題を混同させます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A program is commercial if it is developed as a business activity.  A "
 "commercial program can be free or nonfree, depending on its manner of "
@@ -704,7 +718,7 @@
 
"よって、どちらでもありえます。二つの問題、どのような主体によりそのプログラãƒ
 "
 
"が開発されたか、と、そのユーザが有する自由はどんなものか、は独立の問題です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In the first decade of the free software movement, free software packages "
 "were almost always noncommercial; the components of the GNU/Linux operating "
@@ -717,7 +731,7 @@
 
"FSFや大学などの非営利団体により開発されました。その後、1990年代に、自由な商用"
 "ソフトウェアが出始めました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
@@ -731,11 +745,11 @@
 
"用」の組み合わせを自己撞着したものであると考える傾向があり、この可能性を失わ"
 
"せます。このように「商用」を使うことのないよう注意しましょう。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Compensation&rdquo;"
 msgstr "「補償金」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;compensation for authors&rdquo; in connection with "
 "copyright carries the assumptions that (1) copyright exists for the sake of "
@@ -750,7 +764,7 @@
 "は単純に<a 
href=\"/philosophy/misinterpreting-copyright.html\">偽</a>であり、"
 "第二の仮定は暴虐です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Compensating the rights-holders&rdquo; adds a further swindle: you're "
 "supposed to imagine that means paying the authors, and occasionally it does, "
@@ -761,11 +775,11 @@
 
"するとあなたは想像するでしょうが、たしかに時にはそうですが、ほとんどのå
 ´åˆã€"
 "それは不å…
¬æ­£ãªæ³•å¾‹ã‚’わたしたちに押し付ける出版社への補助金を意味します。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consume&rdquo;"
 msgstr "「消費」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Consume&rdquo; refers to what we do with food: we ingest it, after "
 "which the food as such no longer exists.  By analogy, we employ the same "
@@ -785,7 +799,7 @@
 "だいぶ引き延ばしています。録音を再生したりプログラム
を実行することは、消費し"
 "ないからです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use &ldquo;consume&rdquo; in this context will say they don't mean "
 "it literally.  What, then, does it mean? It means to regard copies of "
@@ -803,14 +817,25 @@
 "そうです。日用品は<em>代替可能</em>です: 
今日、車を動かすのに燃やされるガソリ"
 "ンの一滴とå…
ˆé€±ã«ç‡ƒã‚„された一滴の間には何の特別な違いもありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "What does it mean to think of works of authorship as a commodity, with "
+#| "the assumption that there is nothing special about any one story, "
+#| "article, program, or song? That is the twisted viewpoint of the owner or "
+#| "the accountant of a publishing company.  It is no surprise that "
+#| "proprietary software would like you to think of the use of software as a "
+#| "commodity.  Their twisted viewpoint comes through clearly in <a href="
+#| "\"http://www.businessinsider.com/former-google-exec-launches-sourcepoint-";
+#| "with-10-million-series-a-funding-2015-6\">this article</a>, which also "
+#| "refers to publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
 msgid ""
 "What does it mean to think of works of authorship as a commodity, with the "
 "assumption that there is nothing special about any one story, article, "
 "program, or song? That is the twisted viewpoint of the owner or the "
 "accountant of a publishing company.  It is no surprise that proprietary "
 "software would like you to think of the use of software as a commodity.  "
-"Their twisted viewpoint comes through clearly in <a href=\"http://www.";
+"Their twisted viewpoint comes through clearly in <a href=\"https://www.";
 "businessinsider.com/former-google-exec-launches-sourcepoint-with-10-million-"
 "series-a-funding-2015-6\">this article</a>, which also refers to "
 "publications as &ldquo;<a href=\"#Content\">content</a>.&rdquo;"
@@ -824,11 +849,19 @@
 
"series-a-funding-2015-6\">この記事</a>に明らかに見て取れます。この記事は、ま"
 "た、出版物を「<a 
href=\"#Content\">コンテンツ</a>」と呼んでいます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The narrow thinking associated with the idea that we &ldquo;consume "
+#| "content&rdquo; paves the way for laws such as the DMCA that forbid users "
+#| "to break the <a href=\"http://DefectiveByDesign.org/\";>Digital "
+#| "Restrictions Management</a> (DRM) facilities in digital devices.  If "
+#| "users think what they do with these devices is &ldquo;consume,&rdquo; "
+#| "they may see such restrictions as natural."
 msgid ""
 "The narrow thinking associated with the idea that we &ldquo;consume "
 "content&rdquo; paves the way for laws such as the DMCA that forbid users to "
-"break the <a href=\"http://DefectiveByDesign.org/\";>Digital Restrictions "
+"break the <a href=\"https://DefectiveByDesign.org/\";>Digital Restrictions "
 "Management</a> (DRM) facilities in digital devices.  If users think what "
 "they do with these devices is &ldquo;consume,&rdquo; they may see such "
 "restrictions as natural."
@@ -839,7 +872,7 @@
 
"ユーザがこういったデバイスを「消費」すると考えていれば、そのような制限を当然"
 "と考えるでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It also encourages the acceptance of &ldquo;streaming&rdquo; services, which "
 "use DRM to perversely limit listening to music, or watching video, to "
@@ -850,7 +883,7 @@
 
"れ、音楽や動画の視聴が意地悪く制限され、これらの活動が「消費」の語の仮定に絞"
 "られるのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Why is this perverse usage spreading? Some may feel that the term sounds "
 "sophisticated, but rejecting it with cogent reasons can appear even more "
@@ -869,7 +902,7 @@
 "あるフォーラム
でのかれらのこの用語の使用は、「正しい」用語であるとの印象を与"
 "えます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To speak of &ldquo;consuming&rdquo; music, fiction, or any other artistic "
 "works is to treat them as commodities rather than as art.  Do we want to "
@@ -880,7 +913,7 @@
 "はなく、日用品として扱うことです。わたしたちはå…
¬é–‹ã•ã‚ŒãŸä½œå“ã‚’そのように考え"
 "たいでしょうか。一般å…
¬è¡†ã«ãã†ã™ã‚‹ã“とを推奨したいでしょうか?"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who answer no, please join me in shunning the term &ldquo;"
 "consume&rdquo; for this."
@@ -888,7 +921,7 @@
 
"ここで「いいえ」と答えたい方にお願いします。わたしに続いてこのために「消費」"
 "という用語を使わないようにしてください。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "What to use instead? You can use specific verbs such as &ldquo;read,&rdquo; "
 "&ldquo;listen to,&rdquo; &ldquo;watch&rdquo; or &ldquo;look at,&rdquo; since "
@@ -898,7 +931,7 @@
 
"「見る」を使うことができます行き過ぎた一般化の傾向を抑制するのに役立ちますか"
 "ら。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you insist on generalizing, you can use the expression &ldquo;attend to,"
 "&rdquo; which requires less of a stretch than &ldquo;consume.&rdquo; For a "
@@ -907,15 +940,15 @@
 "一般化にこだわるå 
´åˆã€ã€Œæ³¨æ„ã‚’払う」という表現を使えるでしょう。「消費」より"
 
"も歪曲が少なくてすみます。実用的な作品には「使う」が最適でしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "See also the following entry."
 msgstr "以下のエントリもお読みください。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Consumer&rdquo;"
 msgstr "「消費者」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;consumer,&rdquo; when used to refer to the users of "
 "computing, is loaded with assumptions we should reject.  Some come from the "
@@ -930,7 +963,7 @@
 
"ています。それは、コピーできるディジタル作品に対してコピーできないものの製品"
 "に関して引き出された経済的な結論を人々
に押し付けることにつながります。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In addition, describing the users of software as &ldquo;consumers&rdquo; "
 "refers to a framing in which people are limited to selecting between "
@@ -945,7 +978,7 @@
 "important.html\">プログラム
がなにをするかを直接コントロール</a>できる、という"
 "考えの余地はどこにもありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To describe people who are not limited to passive use of works, we suggest "
 "terms such as &ldquo;individuals&rdquo; and &ldquo;citizens,&rdquo; rather "
@@ -954,9 +987,14 @@
 "作品の受動的な利用に限定されることのない人々
を表現するのに、わたしたちは「消"
 "費者
」ではなく、「個人」や「市民」といった用語を提案します。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "This problem with the word &ldquo;consumer&rdquo; has been <a href="
+#| "\"http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-";
+#| "language-raymond-williams\">noted before</a>."
 msgid ""
-"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"http://";
+"This problem with the word &ldquo;consumer&rdquo; has been <a href=\"https://";
 "www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-"
 "williams\">noted before</a>."
 msgstr ""
@@ -964,11 +1002,11 @@
 
"commentisfree/2013/aug/11/capitalism-language-raymond-williams\">以前に言及さ"
 "れています。</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Content&rdquo;"
 msgstr "「コンテンツ」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to describe a feeling of comfort and satisfaction, by all means "
 "say you are &ldquo;content,&rdquo; but using the word as a noun to describe "
@@ -986,7 +1024,7 @@
 "し、そのæ…
‹åº¦ã‚’取らないのであれば、「作品」あるいは「刊行物」と呼ぶことができ"
 "ます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Those who use the term &ldquo;content&rdquo; are often the publishers that "
 "push for increased copyright power in the name of the authors (&ldquo;"
@@ -1003,7 +1041,7 @@
 
"culture/2016/aug/02/how-to-deal-with-trump-trolls-online\">ガーディアン</a>に"
 "書かれています:"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Content itself is beside the point&mdash;as the very use of words like "
 "content suggests. The moment you start labelling every single piece of "
@@ -1015,7 +1053,7 @@
 "ツ」としてラベルしだ
した、その瞬間その互換性を認めることになります: 
その主な"
 "目的が、計量できる製粉機の単なる穀物となるのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In other words, &ldquo;content&rdquo; reduces publications and writings to a "
 "sort of pap fit to be piped through the &ldquo;tubes&rdquo; of the internet."
@@ -1024,7 +1062,7 @@
 
"の「チューブ」に流し込むようにフィットするように、おかゆ状に削減してしまいま"
 "す。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "See also <a href=\"https://www.salon.com/2000/06/14/love_7/\";>Courtney "
 "Love's open letter to Steve Case</a> and search for &ldquo;content "
@@ -1037,7 +1075,7 @@
 "てくだ
さい。あぁ、ラブ女史は「知的財産」の用語もまた<a href="
 
"\"#IntellectualProperty\">偏見の混同</a>であることを知らないようです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "However, as long as other people use the term &ldquo;content provider,"
 "&rdquo; political dissidents can well call themselves &ldquo;malcontent "
@@ -1046,7 +1084,7 @@
 "しかしながら、ほかの人々
が「コンテント・プロバイダ」の用語を使う限り、政治的"
 
"反体派は、かれら自身を「不満なプロバイダ」と呼ぶことができます。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
 "&ldquo;Content&rdquo; means &ldquo;some sort of information,&rdquo; and "
@@ -1060,7 +1098,7 @@
 "ら、「コンテンツ管理システム」は何がしかの情å 
±ã«å¯¾ã—何かをするシステムです。"
 "ほとんどすべてのプログラム
はこの表現に当てはまります。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "In most cases, that term really refers to a system for updating pages on a "
 "web site.  For that, we recommend the term &ldquo;web site revision "
@@ -1070,11 +1108,11 @@
 
"これには、わたしたちは「ウェブサイト・リビジョン管理システãƒ
 ã€(WRS)の用語を推"
 "奨します。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Copyright Owner&rdquo;"
 msgstr "「著作権所有者」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Copyright is an artificial privilege, handed out by the state to achieve a "
 "public interest and lasting a period of time &mdash; not a natural right "
@@ -1085,7 +1123,7 @@
 
"ものです。家やシャツをを所有するといった自然権ではありません。法律家は、その"
 "特権を受ける人を「著作権者
」と呼ぶことで、このことを認識していました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A few decades ago, copyright holders began trying to reduce awareness of "
 "this point.  In addition to citing frequently the bogus concept of <a href="
@@ -1099,11 +1137,11 @@
 "て、自身を「著作権所有者
」と呼ぶことも始めました。伝統的な用語の「著作権者」"
 "を代わりに使うことで、抵抗するわたしたちに加
わってください。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creative Commons licensed&rdquo;"
 msgstr "「クリエイティブ・コモンズでライセンス」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The most important licensing characteristic of a work is whether it is "
 "free.  Creative Commons publishes seven licenses; three are free (CC BY, CC "
@@ -1118,7 +1156,7 @@
 
"ンス」と述べることは、自由かどうかについて言うことに失敗しており、その問が重"
 "要ではないと示唆しています。文章
は正確かもしれませんが、その省略は有害です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To encourage people to pay attention to the most important distinction, "
 "always specify <em>which</em> Creative Commons license is used, as in &ldquo;"
@@ -1130,11 +1168,11 @@
 
"イセンス」のように書きましょう。もし、ある作品が使っているのがどのライセンス"
 "か分からない場合、調べてから言明しましょう。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Creator&rdquo;"
 msgstr "「クリエーター」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
@@ -1153,11 +1191,11 @@
 
"う。この二つの用語は同等ではありません。しばしば、著作権è€
…は著者ではありませ"
 "ん。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr "「ディジタル作品」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;digital goods,&rdquo; as applied to copies of works of "
 "authorship, identifies them with physical goods&mdash;which cannot be "
@@ -1173,11 +1211,11 @@
 
"な品物としての見方と感覚にもとづいて判断することを促します。これはまた経済の"
 
"用語で物事をとらえ、その狭い限定的な価値は自由とコミュニティを含みません。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Locks&rdquo;"
 msgstr "「ディジタル錠」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital locks&rdquo; is used to refer to Digital Restrictions "
 "Management by some who criticize it.  The problem with this term is that it "
@@ -1188,12 +1226,22 @@
 "れます。この用語の問題は、DRMの悪に対してå…
¬æ­£ã«æ‰±ã†ã“とに失敗していることで"
 
"す。この用語を採用する人はそのように考えないでしょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Locks are not necessarily oppressive or bad.  You probably own several "
+#| "locks, and their keys or codes as well; you may find them useful or "
+#| "troublesome, but they don't oppress you, because you can open and close "
+#| "them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+#| "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-"
+#| "the-good-guys-have-keys-to-\">encryption</a> invaluable for protecting "
+#| "our digital files.  That too is a kind of digital lock that you have "
+#| "control over."
 msgid ""
 "Locks are not necessarily oppressive or bad.  You probably own several "
 "locks, and their keys or codes as well; you may find them useful or "
 "troublesome, but they don't oppress you, because you can open and close "
-"them.  Likewise, we find <a href=\"http://www.theguardian.com/";
+"them.  Likewise, we find <a href=\"https://www.theguardian.com/";
 "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
 "good-guys-have-keys-to-\">encryption</a> invaluable for protecting our "
 "digital files.  That too is a kind of digital lock that you have control "
@@ -1208,7 +1256,7 @@
 
"ことについて貴重です。これも、あなたがコントロールを持つディジタル鍵のような"
 "ものです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "DRM is like a lock placed on you by someone else, who refuses to give you "
 "the key&mdash;in other words, like <em>handcuffs</em>.  Therefore, the "
@@ -1220,7 +1268,7 @@
 "なものです。ですから、「ディジタル錠
」でなくて、これを「ディジタル手錠」と呼"
 "ぶことが適切な譬えです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "A number of opposition campaigns have chosen the unwise term &ldquo;digital "
 "locks&rdquo;; to get things back on the right track, we must firmly insist "
@@ -1235,11 +1283,11 @@
 "ル錠
」に反対するキャンペーンを支持することはできますが、わたしたちの支持を表"
 "明する場合、顕著に「ディジタル手錠
」と用語を置き換え、その理由を述べます。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Digital Rights Management&rdquo;"
 msgstr "「ディジタル権限管理」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Digital Rights Management&rdquo; (abbreviated &ldquo;DRM&rdquo;) "
 "refers to technical mechanisms designed to impose restrictions on computer "
@@ -1254,25 +1302,29 @@
 "ることを知らないままに、制限を押し付けられる一般å…
¬è¡†ã®è¦–点を無視するように設"
 "計されています。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Good alternatives include &ldquo;Digital Restrictions Management,&rdquo; and "
 "&ldquo;digital handcuffs.&rdquo;"
 msgstr 
"良い代替案には「ディジタル制限管理」と「ディジタル手éŒ
 ã€ãŒã‚ります。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+#| "campaign to abolish DRM</a>."
 msgid ""
-"Please sign up to support our <a href=\"http://DefectiveByDesign.org/\";> "
+"Please sign up to support our <a href=\"https://DefectiveByDesign.org/\";> "
 "campaign to abolish DRM</a>."
 msgstr ""
 "どうぞ、わたしたちの<a href=\"http://DefectiveByDesign.org/\";> 
DRMを廃止する"
 "キャンペーン</a>に参加して支持してください。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Ecosystem&rdquo;"
 msgstr "「エコシステム」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is inadvisable to describe the free software community, or any human "
 "community, as an &ldquo;ecosystem,&rdquo; because that word implies the "
@@ -1282,7 +1334,7 @@
 "コシステム
」と表現するのは勧められることではありません。なぜなら、そこには倫"
 "理的判断がないことを暗示しているからです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;ecosystem&rdquo; implicitly suggests an attitude of "
 "nonjudgmental observation: don't ask how what <em>should</em> happen, just "
@@ -1302,7 +1354,7 @@
 
"のように行きすぎることがあろうとも、正しいか悪いか、ではなく、たã
 ç”Ÿæ…‹ã®ç¾è±¡"
 "に過ぎません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By contrast, beings that adopt an ethical stance towards their surroundings "
 "can decide to preserve things that, without their intervention, might "
@@ -1315,11 +1367,11 @@
 "人権、平和、å…
¬è¡†è¡›ç”Ÿã€å®‰å®šã—た気候、きれいな空気と水、絶滅
危惧種、伝統芸能な"
 "どや、コンピュータのユーザの自由、をです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FLOSS&rdquo;"
 msgstr "&ldquo;FLOSS&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
 "Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
@@ -1333,11 +1385,11 @@
 
"とが目的ならば、&ldquo;FLOSS&rdquo;は良い方法でしょう。しかし、自由に立脚して"
 
"いることを示すには中立の用語を使わないようにしましょう。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;For free&rdquo;"
 msgstr "「フリーで」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to say that a program is free software, please don't say that it "
 "is available &ldquo;for free.&rdquo; That term specifically means &ldquo;for "
@@ -1348,7 +1400,7 @@
 
"いうことを意味しているからです。自由ソフトウェアであることは自由の問題であっ"
 "て値段の問題ではありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Free software copies are often available for free&mdash;for example, by "
 "downloading via FTP.  But free software copies are also available for a "
@@ -1362,7 +1414,7 @@
 "に無料で利用できるå 
´åˆã‚‚ありますし、いくつかのプロプライエタリ・パッケージの"
 "なかには特定の使用者
に対しては常に料金なしで使用できるものもあります。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid confusion, you can say that the program is available &ldquo;as free "
 "software.&rdquo;"
@@ -1370,11 +1422,11 @@
 "混乱を避けるために、そのプログラム
は「自由ソフトウェアとして」利用可能である"
 "と記すことができます。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;FOSS&rdquo;"
 msgstr "&ldquo;FOSS&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
 "&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
@@ -1388,7 +1440,7 @@
 
"せん。中立であることが目的ならば、&ldquo;FLOSS&rdquo;が良い方法でしょう。しか"
 
"し、自由に立脚していることを示すには中立の用語を使わないようにしましょう。"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "Instead of <b>FOSS</b>, we say, <b>free software</b> or <b>free (libre) "
 "software</b>."
@@ -1396,11 +1448,11 @@
 
"<b>FOSS</b>ではなく、わたしたちは<b>自由ソフトウェア</b>または<b>自由(リブレ)"
 "ソフトウェア</b>と言います。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freely available&rdquo;"
 msgstr "「フリーに利用可能」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The terms are not equivalent.  Software is &ldquo;"
@@ -1413,11 +1465,11 @@
 
"合、「フリーに利用可能」です。「自由ソフトウェア」はコピーを持つユーザの自由"
 
"として定義されます。これらは異なる問題に対して述べているのです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Freeware&rdquo;"
 msgstr "「フリーウェア」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't use the term &ldquo;freeware&rdquo; as a synonym for &ldquo;"
 "free software.&rdquo; The term &ldquo;freeware&rdquo; was used often in the "
@@ -1429,7 +1481,7 @@
 "できず実行形式としてのみリリースされたプログラム
に使われました。今日では、こ"
 "の語には皆が承諾するような特定の定義はありません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When using languages other than English, please avoid borrowing English "
 "terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; It is "
@@ -1441,7 +1493,7 @@
 "を<a 
href=\"/philosophy/fs-translations.html\">自分の言語</a>に訳す方が良いで"
 "しょう。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "By using a word in <a href=\"/philosophy/fs-translations.html\">your own "
 "language</a>, you show that you are really referring to freedom and not just "
@@ -1457,11 +1509,11 @@
 "れません。しかし、すぐにæ…
£ã‚Œã‚‹ã§ã—ょうし、自由ソフトウェアがもつ本当の意味を"
 "見い出すでしょう。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Give away software&rdquo;"
 msgstr "「ソフトウェアをあげる」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It's misleading to use the term &ldquo;give away&rdquo; to mean &ldquo;"
 "distribute a program as free software.&rdquo; This locution has the same "
@@ -1475,11 +1527,11 @@
 
"自由ではないという意味が含まれています。この混乱を避けるには「自由ソフトウエ"
 "アとしてリリースします」といえばいいのです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Google&rdquo;"
 msgstr "「グーグル」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please avoid using the term &ldquo;google&rdquo; as a verb, meaning to "
 "search for something on the internet. &ldquo;Google&rdquo; is just the name "
@@ -1498,13 +1550,22 @@
 
"トラックしないと主張しています。(外部のものがこの種の主張を検証する方法はあり"
 "ません。)"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Hacker&rdquo;"
 msgstr "「ハッカー」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+#| "html\"> enjoys playful cleverness</a>&mdash;not necessarily with "
+#| "computers.  The programmers in the old <abbr title=\"Massachusetts "
+#| "Institute of Technology\">MIT</abbr> free software community of the 60s "
+#| "and 70s referred to themselves as hackers.  Around 1980, journalists who "
+#| "discovered the hacker community mistakenly took the term to mean &ldquo;"
+#| "security breaker.&rdquo;"
 msgid ""
-"A hacker is someone who <a href=\"http://stallman.org/articles/on-hacking.";
+"A hacker is someone who <a href=\"https://stallman.org/articles/on-hacking.";
 "html\"> enjoys playful cleverness</a>&mdash;not necessarily with computers.  "
 "The programmers in the old <abbr title=\"Massachusetts Institute of "
 "Technology\">MIT</abbr> free software community of the 60s and 70s referred "
@@ -1519,18 +1580,18 @@
 "ころ、ハッカーå…
±åŒä½“を発見したジャーナリストが間違ってこの用語を「セキュリ"
 "ティç 
´ã‚Šã€ã‚’意味するものとして使うようになりました。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Please don't spread this mistake.  People who break security are &ldquo;"
 "crackers.&rdquo;"
 msgstr ""
 "この間違いを広めないでください。セキュリティをç 
´ã‚‹ã®ã¯ã€Œã‚¯ãƒ©ãƒƒã‚«ãƒ¼ã€ã§ã™ã€‚"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Intellectual property&rdquo;"
 msgstr "「知的財産」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
 "property&rdquo;&mdash;a term also applied to patents, trademarks, and other "
@@ -1545,7 +1606,7 @@
 
"無分別です。「著作権」、「特許」、「商標」と特定のものを指して述べるのがもっ"
 "ともよいことです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The term &ldquo;intellectual property&rdquo; carries a hidden "
 "assumption&mdash;that the way to think about all these disparate issues is "
@@ -1556,7 +1617,7 @@
 
"題を考える方法は、物理的なものとの類推と物理的な財産としてそれらをとらえる考"
 "え方をもととしているのです。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When it comes to copying, this analogy disregards the crucial difference "
 "between material objects and information: information can be copied and "
@@ -1566,7 +1627,7 @@
 "視しています。情å 
±ã¯ã‚³ãƒ”ーでき、ほとんど何の努力もなくå…
±æœ‰ã§ãã¾ã™ãŒã€ç‰©è³ªçš„"
 "なものはできません。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "To avoid spreading unnecessary bias and confusion, it is best to adopt a "
 "firm policy <a href=\"/philosophy/not-ipr.html\"> not to speak or even think "
@@ -1576,7 +1637,7 @@
 
"ipr.html\">「知的財産」の用語で述べたり、ましてや考えたりしない</a>といういう"
 "確固としたポリシーを採ることが最適です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a href=\"/"
 "philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to make the "
@@ -1586,11 +1647,11 @@
 
"PublicAwarenessOfCopyright-2002.html\">世界「知的財産」機構(WIPO)を当惑させ始"
 "めています</a>。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Internet of Things&rdquo;"
 msgstr "「モノのインターネット」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "When companies decided to make computerized appliances that would connect "
 "over the internet to the manufacturer's server, and therefore could easily "
@@ -1603,9 +1664,18 @@
 
"えがちょっとよくないと認識することになりました。それで、かっこよい、é­
…力的な"
 
"名前を思いついたのです。それが「モノのインターネット」です。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Experience shows that these products often do <a href=\"http://www.";
+#| "locusmag.com/Perspectives/2015/09/cory-doctorow-what-if-people-were-"
+#| "sensors-not-things-to-be-sensed/\"> spy on their users</a>.  They are "
+#| "also tailor-made for <a href=\"https://archive.ieet.org/articles/";
+#| "rinesi20150806.html\">giving people biased advice</a>.  In addition, the "
+#| "manufacturer can <a href=\"/proprietary/proprietary-sabotage.html\"> "
+#| "sabotage the product</a> by turning off the server it depends on."
 msgid ""
-"Experience shows that these products often do <a href=\"http://www.locusmag.";
+"Experience shows that these products often do <a href=\"https://www.locusmag.";
 "com/Perspectives/2015/09/cory-doctorow-what-if-people-were-sensors-not-"
 "things-to-be-sensed/\"> spy on their users</a>.  They are also tailor-made "
 "for <a href=\"https://archive.ieet.org/articles/rinesi20150806.html\";>giving "
@@ -1621,15 +1691,15 @@
 "ることによって<a 
href=\"/proprietary/proprietary-sabotage.html\">製品を妨害で"
 "きます</a>。"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "We call them the &ldquo;Internet of Stings.&rdquo;"
 msgstr 
"わたしたちはこれを「モノものしいインターネット」と呼びます。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;LAMP system&rdquo;"
 msgstr "「LAMPシステム」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and PHP&rdquo;"
 "&mdash;a common combination of software to use on a web server, except that "
@@ -1643,11 +1713,11 @@
 
"はありません。ですから、&ldquo;LAMP&rdquo;の代わりに&ldquo;GLAMP&rdquo;、"
 "&ldquo;GNU, Linux, Apache, MySQL と PHP.&rdquo;と呼ぶべきです。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Linux system&rdquo;"
 msgstr "「Linuxシステム」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
@@ -1662,11 +1732,11 @@
 "なシステムを<a 
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>と呼び、GNUプロ"
 "ジェクトに謝意を表し、単にカーネルだけとå…
¨ä½“のシステムを区別してください。"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "&ldquo;Market&rdquo;"
 msgstr "「マーケット」"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "It is misleading to describe the users of free software, or the software "
 "users in general, as a &ldquo;market.&rdquo;"
@@ -1674,7 +1744,7 @@
 
"自由ソフトウェアのユーザや一般にソフトウェアのユーザを表現するのに「マーケ